~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,150 +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", CameraPane.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", CameraPane.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		- oe.aConstraints.gridx += 1;
524		- oe.aConstraints.weighty = 0;
525		- oe.aConstraints.gridwidth = 1;
526		-
527		- //
528		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
529		- twoButton.addActionListener(this);
530		- 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);
531	1162	fourButton.addActionListener(this);
532		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
533		- sixButton.addActionListener(this);
534		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
535		- threeButton.addActionListener(this);
536		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
537		- sevenButton.addActionListener(this);
538		- //
	1163	+ fourButton.setToolTipText("Show control panel only");
	1164	+ }
539	1165
540		- 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");
541	1171	rootButton.addActionListener(this);
542		- oe.aConstraints.gridx += 1;
543		- 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");
544	1175	closeButton.addActionListener(this);
545	1176	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
546	1177	//clearButton.addActionListener(this);
547		- oe.aConstraints.gridx += 1;
548		-
549		- oe.aConstraints.gridx = 1; //
550		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
551		- editButton.addActionListener(this);
552		- oe.aConstraints.gridx += 1;
553		- oe.aConstraints.weighty = 0;
554		- oe.aConstraints.gridwidth = 1;
555	1178
556		- 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(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1191	+ superButton.setToolTipText("Create superellipsoid");
	1192	+ superButton.addActionListener(this);
	1193	+
	1194	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1195	+ sphereButton.setToolTipText("Create sphere");
	1196	+ sphereButton.addActionListener(this);
	1197	+
	1198	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1199	+ coneButton.setToolTipText("Create cone");
	1200	+ coneButton.addActionListener(this);
	1201	+
	1202	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1203	+ torusButton.setToolTipText("Create torus");
	1204	+ torusButton.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");
557	1268	uneditButton.addActionListener(this);
558	1269
559		- oe.aConstraints.gridx += 1;
560		- oe.aConstraints.weighty = 0;
561		- oe.aConstraints.gridwidth = 1;
562		-
563		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
564		- clearPanelButton.addActionListener(this);
565		-
566		- oe.aConstraints.gridx += 1;
567		- oe.aConstraints.weighty = 0;
568		- oe.aConstraints.gridwidth = 1;
569		-
570		- 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");
571	1272	allParamsButton.addActionListener(this);
572	1273
573		- oe.aConstraints.gridx += 1;
574		- oe.aConstraints.weighty = 0;
575		- oe.aConstraints.gridwidth = 1;
576		-
577		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
578		- 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);
579	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	+
580	1292	// oe.aConstraints.gridx += 1;
581	1293	// oe.aConstraints.weighty = 0;
582	1294	// oe.aConstraints.gridwidth = 1;
..	..	@@ -588,47 +1300,32 @@
588	1300	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
589	1301	// gcButton.addActionListener(this);
590	1302
591		- oe.aConstraints.gridx = 0;
592		- oe.aConstraints.gridy += 1;
593		-
594		- //ctrlPanel.add(objList = new List(5, true));
595		- oe.aConstraints.gridwidth = 100;
596		- // oe.aConstraints.gridheight = 100;
597		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
598		- oe.aConstraints.gridheight = 1;
599		- oe.aConstraints.weighty = 0.5;
600		- oe.aConstraints.gridx = 0;
601		- JScrollPane jSP;
	1303	+ cGridBag jSPPanel = new cGridBag();
	1304	+
	1305	+ JScrollPane jSP;
602	1306	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
603		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	1307	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
604	1308	ResetModel();
605		- oe.aConstraints.weighty = 0.5;
606		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
607		- oe.aConstraints.gridy += 1;
608		- oe.aConstraints.gridwidth = 1;
609		-
610		- oe.aConstraints.weighty = 0;
611		- oe.aConstraints.gridwidth = 2;
612		-
613		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
614		- colorCB.addItemListener(this);
615		- oe.aConstraints.gridx += 2;
616		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
617		- materialCB.addItemListener(this);
618		- oe.aConstraints.gridx += 2;
619		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
620		- textureCB.addItemListener(this);
621		-
622		- oe.aConstraints.gridx = 0;
623		- oe.aConstraints.gridy += 1;
624	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	+
625	1322	//jList.addListSelectionListener(this);
626	1323	oe.jTree.addTreeSelectionListener(this);
627	1324	//jTree.setRootVisible(false);
628	1325	//jTree.setEditable(true);
629	1326	oe.jTree.setDragEnabled(true);
630	1327	//jTree.setPreferredSize(new Dimension(10,10));
631		- jSP.setPreferredSize(new Dimension(100,200));
	1328	+ //jSP.setPreferredSize(new Dimension(100,200));
632	1329
633	1330	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
634	1331
..	..	@@ -640,23 +1337,171 @@
640	1337	dgr.addDragGestureListener(this);
641	1338	}catch(Exception e) {}
642	1339	*/
643		- radio.layout = sevenButton;
	1340	+ radio.layout = threeButton; // sixButton;
644	1341	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
645	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	+ }
646	1472
647	1473	void EditObject(Object3D obj)
648	1474	{
649		- cRadio dummyButton = new cRadio(obj.name);
650		- dummyButton.SetObject(obj);
651		- dummyButton.layout = sevenButton;
652		- dummyButton.SetCamera(cameraView.renderCamera, false);
653		- dummyButton.addActionListener(this);
654		- radioPanel.add(dummyButton);
655		- buttonGroup.add(dummyButton);
656		- dummyButton.doClick();
	1475	+ assert(obj instanceof Composite);
	1476	+
	1477	+// if (obj.versionlist == null)
	1478	+// {
	1479	+// obj.versionlist = new Object3D[100];
	1480	+// obj.versionindex = -1;
	1481	+// }
	1482	+
	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	+
	1492	+ radioButton.SetObject(obj);
	1493	+ radioButton.layout = threeButton; // sixButton;
	1494	+ radioButton.SetCamera(cameraView.renderCamera, false);
	1495	+ radioButton.addActionListener(this);
	1496	+ radioPanel.add(radioButton);
	1497	+ buttonGroup.add(radioButton);
	1498	+ radioButton.doClick();
657	1499	}
	1500	+
658	1501	void SetupViews(ObjEditor oe)
659	1502	{
	1503	+ theFrame = this;
	1504	+
660	1505	oe.SetupViews();
661	1506
662	1507	System.out.println("SetupViews");
..	..	@@ -665,22 +1510,30 @@
665	1510	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
666	1511	}
667	1512
668		- JCheckBox liveCB;
669		- JCheckBox supportCB;
670		- JCheckBox localCB;
671		- JCheckBox crowdCB;
672		- JCheckBox smoothCB;
673		- JCheckBox fastCB;
674		- JCheckBox slowCB;
675		- JCheckBox boxCB;
676		- JCheckBox trackCB;
677		- 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;
678	1528	// JCheckBox speakerMocapCB;
679		- JCheckBox speakerCameraCB;
680		- JCheckBox speakerFocusCB;
681		- JCheckBox debugCB;
682		- JCheckBox oeilCB;
683		- JCheckBox lookAtCB;
	1529	+ cCheckBox speakerCameraCB;
	1530	+ cCheckBox speakerFocusCB;
	1531	+ cCheckBox debugCB;
	1532	+
	1533	+ cCheckBox oeilCB;
	1534	+ cCheckBox shadowCB;
	1535	+ cCheckBox autokeepCB;
	1536	+ cCheckBox lookAtCB;
684	1537
685	1538	// static int COLOR = 1;
686	1539	// static int MATERIAL = 2;
..	..	@@ -688,9 +1541,9 @@
688	1541
689	1542	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
690	1543
691		- JCheckBox colorCB;
692		- JCheckBox materialCB;
693		- JCheckBox textureCB;
	1544	+ cCheckBox colorCB;
	1545	+ cCheckBox materialCB;
	1546	+ cCheckBox textureCB;
694	1547
695	1548	public void itemStateChanged(ItemEvent e)
696	1549	{
..	..	@@ -715,10 +1568,10 @@
715	1568	dropAttributes \|= Object3D.TEXTURE;
716	1569	else
717	1570	dropAttributes &= ~Object3D.TEXTURE;
718		- }
719		- else if(e.getSource() == liveCB)
	1571	+ } else if(e.getSource() == liveCB)
720	1572	{
721	1573	cameraView.ToggleLive();
	1574	+ refreshContents(false);
722	1575	}
723	1576	else if(e.getSource() == supportCB)
724	1577	{
..	..	@@ -734,6 +1587,12 @@
734	1587	{
735	1588	cameraView.ToggleInertia();
736	1589	cameraView.repaint();
	1590	+ }
	1591	+ else if(e.getSource() == minshaderCB)
	1592	+ {
	1593	+ Globals.MINSHADER ^= true;
	1594	+ cameraView.programInitialized = false;
	1595	+ cameraView.repaint();
737	1596	}
738	1597	else if(e.getSource() == localCB)
739	1598	{
..	..	@@ -753,6 +1612,10 @@
753	1612	Recompile();
754	1613	cameraView.repaint();
755	1614	// refreshContents();
	1615	+ }
	1616	+ else if(e.getSource() == zoomBoxCB)
	1617	+ {
	1618	+ cameraView.ToggleZoomBoxMode();
756	1619	}
757	1620	else if(e.getSource() == smoothfocusCB)
758	1621	{
..	..	@@ -779,6 +1642,18 @@
779	1642	{
780	1643	cameraView.ToggleOeil();
781	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	+ }
782	1657	else if(e.getSource() == lookAtCB)
783	1658	{
784	1659	cameraView.ToggleLookAt();
..	..	@@ -795,7 +1670,8 @@
795	1670
796	1671	/**/
797	1672	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
798		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1673	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1674	+ TreePath path = objEditor.jTree.getSelectionPath();
799	1675	if ((path == null) \|\| (path.getPathCount() <= 1)) {
800	1676	// We can't move the root node or an empty selection
801	1677	return;
..	..	@@ -858,8 +1734,6 @@
858	1734	}
859	1735	}
860	1736
861		- String string = (String) object;
862		-
863	1737	System.out.println("Transfer = " + object + "; drop : " + target);
864	1738	// if( object instanceof java.io.File[])
865	1739	// {
..	..	@@ -867,7 +1741,11 @@
867	1741	// objEditor.DropFile((java.io.File[]) object, true);
868	1742	// return;
869	1743	// }
870		- 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) == ':')
871	1749	{
872	1750	// file(s)
873	1751	String[] names = string.split("\n");
..	..	@@ -894,7 +1772,7 @@
894	1772
895	1773	flashIt = false;
896	1774	CameraPane pane = (CameraPane) target;
897		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1775	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
898	1776	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
899	1777
900	1778	if (group.selection.size() == 1)
..	..	@@ -910,23 +1788,33 @@
910	1788
911	1789	assert target == objEditor.jTree;
912	1790	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1791	+ Object3D destinationLeaf;
913	1792	try {
914		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1793	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
915	1794	} catch (Exception e) {
916	1795	System.out.println("destinationPath : " + destinationPath);
917	1796	return;
918	1797	}
919	1798
920		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1799	+ for (int i=group.selection.size(); --i>=0;)
921	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	+// {
922	1810	loadClipboard(true);
923	1811	objEditor.jTree.setSelectionPath(destinationPath);
924		- pasteInto(false);
925		- } else {
926		- loadClipboard(false);
927		- objEditor.jTree.setSelectionPath(destinationPath);
928		- pasteInto(false); // true); // ???
929		- }
	1812	+ pasteInto(false, false);
	1813	+// } else {
	1814	+// loadClipboard(false);
	1815	+// objEditor.jTree.setSelectionPath(destinationPath);
	1816	+// pasteInto(false, false); // true); // ???
	1817	+// }
930	1818	}
931	1819	public void dropActionChanged(DropTargetDragEvent dtde)
932	1820	// Called if the user has modified the current drop gesture
..	..	@@ -982,7 +1870,12 @@
982	1870	TreePath path;
983	1871
984	1872	public TransferableTreePath(TreePath tp) {
985		- 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);
986	1879	}
987	1880
988	1881	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1031,85 +1924,107 @@
1031	1924	{
1032	1925	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1033	1926	//heightFieldItem.addActionListener(this);
1034		- gridItem = menu.add(new MenuItem("Grid"));
1035		- gridItem.addActionListener(this);
1036		- rectoidItem = menu.add(new MenuItem("Box"));
1037		- rectoidItem.addActionListener(this);
1038		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1039		- ellipsoidItem.addActionListener(this);
1040		- coneItem = menu.add(new MenuItem("Cone"));
1041		- coneItem.addActionListener(this);
1042		- torusItem = menu.add(new MenuItem("Torus"));
1043		- torusItem.addActionListener(this);
1044		- superItem = menu.add(new MenuItem("Superellipsoid"));
1045		- 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	+ {
1046	1945	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1047	1946	kleinItem.addActionListener(this);
1048		- particleItem = menu.add(new MenuItem("Particle system"));
1049		- particleItem.addActionListener(this);
	1947	+ }
	1948	+
	1949	+// particleItem = menu.add(new MenuItem("Particle system"));
	1950	+// particleItem.addActionListener(this);
	1951	+ if (Globals.ADVANCED)
	1952	+ {
1050	1953	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1051	1954	ragdollItem.addActionListener(this);
1052	1955	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1053	1956	ragdoll2Item.addActionListener(this);
	1957	+ }
1054	1958	menu.add("-");
1055		- meshItem = menu.add(new MenuItem("Mesh"));
	1959	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1056	1960	meshItem.addActionListener(this);
1057	1961	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1058	1962	// meshGroupItem.addActionListener(this);
	1963	+ if (Globals.ADVANCED)
	1964	+ {
1059	1965	springItem = menu.add(new MenuItem("Spring"));
1060	1966	springItem.addActionListener(this);
1061	1967	flagItem = menu.add(new MenuItem("Flag"));
1062	1968	flagItem.addActionListener(this);
1063		- bezierItem = menu.add(new MenuItem("Patch"));
1064		- bezierItem.addActionListener(this);
1065		- checkerItem = menu.add(new MenuItem("Checker"));
1066		- checkerItem.addActionListener(this);
1067	1969	blobItem = menu.add(new MenuItem("Blob"));
1068	1970	blobItem.addActionListener(this);
1069	1971	latheItem = menu.add(new MenuItem("Lathe"));
1070	1972	latheItem.addActionListener(this);
1071		- lightItem = menu.add(new MenuItem("Light"));
1072		- 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);
1073	1980	menu.add("-");
1074	1981	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1075	1982	//superLoopItem.addActionListener(this);
1076		- loopItem = menu.add(new MenuItem("Loop"));
1077		- loopItem.addActionListener(this);
	1983	+// loopItem = menu.add(new MenuItem("Loop"));
	1984	+// loopItem.addActionListener(this);
1078	1985	doubleItem = menu.add(new MenuItem("Fork"));
1079	1986	doubleItem.addActionListener(this);
	1987	+ if (Globals.ADVANCED)
	1988	+ {
1080	1989	tripleItem = menu.add(new MenuItem("Trident"));
1081	1990	tripleItem.addActionListener(this);
	1991	+ }
1082	1992	}
1083	1993
1084	1994	void buildToolsMenu(Menu menu)
1085	1995	{
1086	1996	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1087	1997	animationItem.addItemListener(this);
1088		- animationItem.setState(CameraPane.ANIMATION);
	1998	+ animationItem.setState(Globals.ANIMATION);
	1999	+
	2000	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	2001	+ archiveItem.addActionListener(this);
1089	2002
1090	2003	menu.add("-");
1091	2004	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1092	2005	parseverticesItem.addActionListener(this);
1093	2006	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1094	2007	textureFieldItem.addActionListener(this);
1095		- alignItem = menu.add(new MenuItem("Align"));
	2008	+ alignItem = menu.add(new MenuItem("Align Objects"));
1096	2009	alignItem.addActionListener(this);
1097		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1098		- mirrorItem.addActionListener(this);
1099	2010	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1100	2011	reduceMorphItem.addActionListener(this);
1101	2012	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1102	2013	reduce34MorphItem.addActionListener(this);
1103		-
1104		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1105		- computeAOItem.addActionListener(this);
1106	2014	menu.add("-");
1107		-
1108	2015	menu.add(memoryItem = new MenuItem("Memory Usage"));
1109	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("-");
1110	2025	menu.add(analyzeItem = new MenuItem("Analyze"));
1111	2026	analyzeItem.addActionListener(this);
1112		- menu.add(dumpItem = new MenuItem("Dump"));
	2027	+ menu.add(dumpItem = new MenuItem("Print"));
1113	2028	dumpItem.addActionListener(this);
1114	2029	// menu.add(pathItem = new MenuItem("From-to path"));
1115	2030	// pathItem.addActionListener(this);
..	..	@@ -1118,6 +2033,8 @@
1118	2033	resetParentItem.addActionListener(this);
1119	2034	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1120	2035	repairParentItem.addActionListener(this);
	2036	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	2037	+ repairShadowItem.addActionListener(this);
1121	2038	menu.add(invariantsItem = new MenuItem("Invariants"));
1122	2039	invariantsItem.addActionListener(this);
1123	2040	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1125,6 +2042,7 @@
1125	2042	menu.add("-");
1126	2043	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1127	2044	editScriptItem.addActionListener(this);
	2045	+ }
1128	2046	}
1129	2047
1130	2048	void ScreenFit()
..	..	@@ -1247,9 +2165,38 @@
1247	2165	shadow.material = new cMaterial(obj.material);
1248	2166	shadow.material.diffuse = 0.0001f;
1249	2167	shadow.material.specular = 0.0001f;
	2168	+ shadow.material.opacity = 0.75f;
	2169	+
	2170	+ AllocProjectedVertices(shadow);
	2171	+
	2172	+ shadow.projectedVertices[1].x = 300;
1250	2173
1251	2174	makeSomething(shadow);
1252	2175	}
	2176	+
	2177	+ private void ClearUnpinned()
	2178	+ {
	2179	+ //for (Object3D obj : listUI)
	2180	+ for (int i=listUI.size(); --i>=0;)
	2181	+ {
	2182	+ Object3D obj = listUI.elementAt(i);
	2183	+ if (!obj.pinned)
	2184	+ {
	2185	+ obj.CloseUI();
	2186	+ listUI.remove(i);
	2187	+ }
	2188	+ }
	2189	+ }
	2190	+
	2191	+ private void EditElement(Object3D elem, boolean newWindow)
	2192	+ {
	2193	+ // if (!(elem instanceof Composite))
	2194	+ // newWindow = false;
	2195	+ listUI.add(elem);
	2196	+ elem.openEditWindow(this, newWindow); //, false);
	2197	+ System.out.println("edit : " + elem);
	2198	+ elem.editWindow.refreshContents(true); // ? new
	2199	+ }
1253	2200
1254	2201	/**
1255	2202	* applyExample
..	..	@@ -1453,9 +2400,9 @@
1453	2400
1454	2401	void Overwrite(int mask)
1455	2402	{
1456		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2403	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1457	2404	{
1458		- Object3D content = GrafreeD.clipboard.get(0);
	2405	+ Object3D content = Grafreed.clipboard.get(0);
1459	2406
1460	2407	if (content instanceof cGroup && ((cGroup)content).transientlink )
1461	2408	content = ((cGroup)content).get(0);
..	..	@@ -1478,6 +2425,7 @@
1478	2425	//
1479	2426	public void actionPerformed(ActionEvent event) // , Object arg)
1480	2427	{
	2428	+ Object source = event.getSource();
1481	2429	/*
1482	2430	if (event.getSource() == nameField)
1483	2431	{
..	..	@@ -1489,11 +2437,11 @@
1489	2437	}
1490	2438	else
1491	2439	*/
1492		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	2440	+ if (source == lookAtItem \|\| source == lookFromItem)
1493	2441	{
1494	2442	ScreenFit();
1495	2443	} else
1496		- if (event.getSource() == switchItem)
	2444	+ if (source == switchViewItem)
1497	2445	{
1498	2446	cVector v1 = new cVector();
1499	2447	cVector v2 = new cVector();
..	..	@@ -1502,11 +2450,11 @@
1502	2450	objEditor.cameraView.renderCamera.setAim(v2, v1);
1503	2451	objEditor.cameraView.repaint();
1504	2452	} else
1505		- if (event.getSource() == rectoidItem)
	2453	+ if (source == rectoidItem \|\| source == boxButton)
1506	2454	{
1507	2455	makeSomething(new Box());
1508	2456	} else
1509		- if (event.getSource() == particleItem)
	2457	+ if (source == particleItem \|\| source == particlesButton)
1510	2458	{
1511	2459	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1512	2460	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1527,9 +2475,9 @@
1527	2475	applyExample(particleGeom, "SMOKE");
1528	2476	makeSomething(particleGeom);
1529	2477	} else
1530		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	2478	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1531	2479	{
1532		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	2480	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1533	2481
1534	2482	ragdoll.toParent = LA.newMatrix();
1535	2483	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1547,7 +2495,7 @@
1547	2495	} else
1548	2496	/*
1549	2497	*/
1550		- if (event.getSource() == heightFieldItem)
	2498	+ if (source == heightFieldItem)
1551	2499	{
1552	2500	Object3D obj = new Object3D();
1553	2501
..	..	@@ -1585,31 +2533,31 @@
1585	2533
1586	2534	makeSomething(obj);
1587	2535	} else
1588		- if (event.getSource() == gridItem)
	2536	+ if (source == gridItem \|\| source == gridButton)
1589	2537	{
1590	2538	makeSomething(new Grid());
1591	2539	} else
1592		- if (event.getSource() == ellipsoidItem)
	2540	+ if (source == ellipsoidItem \|\| source == sphereButton)
1593	2541	{
1594	2542	makeSomething(new Sphere());
1595	2543	} else
1596		- if (event.getSource() == coneItem)
	2544	+ if (source == coneItem \|\| source == coneButton)
1597	2545	{
1598	2546	makeSomething(new Cone());
1599	2547	} else
1600		- if (event.getSource() == torusItem)
	2548	+ if (source == torusItem \|\| source == torusButton)
1601	2549	{
1602	2550	makeSomething(new Torus());
1603	2551	} else
1604		- if (event.getSource() == superItem)
	2552	+ if (source == superItem \|\| source == superButton)
1605	2553	{
1606	2554	makeSomething(new Superellipsoid());
1607	2555	} else
1608		- if (event.getSource() == kleinItem)
	2556	+ if (source == kleinItem \|\| source == kleinButton)
1609	2557	{
1610	2558	makeSomething(new Klein());
1611	2559	} else
1612		- if (event.getSource() == blobItem)
	2560	+ if (source == blobItem)
1613	2561	{
1614	2562	Blob blob = new Blob();
1615	2563	BlobComponent comp = new BlobComponent();
..	..	@@ -1617,15 +2565,15 @@
1617	2565	//blob.retile();
1618	2566	makeSomething(blob);
1619	2567	} else
1620		- if (event.getSource() == latheItem)
	2568	+ if (source == latheItem)
1621	2569	{
1622	2570	makeSomething(new Lathe());
1623	2571	} else
1624		- if (event.getSource() == bezierItem)
	2572	+ if (source == bezierItem)
1625	2573	{
1626	2574	makeSomething(new BezierSurface());
1627	2575	} else
1628		- if (event.getSource() == checkerItem)
	2576	+ if (source == overlayItem \|\| source == overlayButton)
1629	2577	{
1630	2578	/*
1631	2579	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1640,7 +2588,7 @@
1640	2588	*/
1641	2589	makeSomething(new Checker());
1642	2590	} else
1643		- if (event.getSource() == meshItem)
	2591	+ if (source == meshItem)
1644	2592	{
1645	2593	Object3D itemtomake = new Object3D();
1646	2594	Object3D child;
..	..	@@ -1661,35 +2609,52 @@
1661	2609	makeSomething(child);
1662	2610	}
1663	2611	} else
1664		- if (event.getSource() == springItem)
	2612	+ if (source == springItem)
1665	2613	{
1666	2614	cSpring s = new cSpring();
1667	2615	s.setup();
1668	2616	makeSomething(s);
1669	2617	} else
1670		- if (event.getSource() == flagItem)
	2618	+ if (source == flagItem)
1671	2619	{
1672	2620	cSpring s = new cFlag();
1673	2621	s.setup();
1674	2622	makeSomething(s);
1675	2623	} else
1676		- if (event.getSource() == lightItem)
	2624	+ if (source == lightItem \|\| source == lightButton)
1677	2625	{
1678	2626	makeSomething(new Light());
1679	2627	} else
1680		- if (event.getSource() == csgItem)
	2628	+// if (source == skybox1Button \|\|
	2629	+// source == skybox2Button \|\|
	2630	+// source == skybox3Button \|\|
	2631	+// source == skybox4Button \|\|
	2632	+// source == skybox5Button \|\|
	2633	+// source == skybox6Button \|\|
	2634	+// source == skybox7Button \|\|
	2635	+// source == skybox11Button \|\|
	2636	+// source == skybox12Button \|\|
	2637	+// source == skybox13Button \|\|
	2638	+// source == skybox14Button \|\|
	2639	+// source == skybox15Button \|\|
	2640	+// source == skybox16Button \|\|
	2641	+// source == skybox17Button)
	2642	+// {
	2643	+// ChangeSkybox(source);
	2644	+// } else
	2645	+ if (source == csgItem)
1681	2646	{
1682	2647	group(new CSG());
1683	2648	} else
1684		- if (event.getSource() == templateItem)
	2649	+ if (source == templateItem)
1685	2650	{
1686	2651	group(new cTemplate());
1687	2652	} else
1688		- if (event.getSource() == attributeItem)
	2653	+ if (source == attributeItem)
1689	2654	{
1690	2655	makeSomething(new Attribute());
1691	2656	} else
1692		- if (event.getSource() == pointflowItem)
	2657	+ if (source == pointflowItem)
1693	2658	{
1694	2659	makeSomething(new PointFlow());
1695	2660	} else
..	..	@@ -1701,7 +2666,7 @@
1701	2666	} else
1702	2667	*/
1703	2668
1704		- if (event.getSource() == superLoopItem)
	2669	+ if (source == superLoopItem)
1705	2670	{
1706	2671	Composite g = new cGroup();
1707	2672	for (int i=0; i<15; i++)
..	..	@@ -1723,30 +2688,38 @@
1723	2688
1724	2689	group(g);
1725	2690	} else
1726		- if (event.getSource() == loopItem)
	2691	+ if (source == loopItem \|\| source == loopButton)
1727	2692	{
	2693	+ if (!group.selection.isEmpty())
	2694	+ {
1728	2695	Composite csg = new GroupLeaf();
1729	2696	csg.count = 5;
1730		- group(csg);
1731		- Composite child = new cGroup();
	2697	+ Composite child = new cGroup("Branch");
1732	2698	csg.addChild(child);
1733	2699	child.addChild(csg);
	2700	+ group(csg);
	2701	+ }
1734	2702	} else
1735		- if (event.getSource() == doubleItem)
	2703	+ if (source == doubleItem)
1736	2704	{
1737		- Composite csg = new GroupLeaf();
	2705	+ if (!group.selection.isEmpty())
	2706	+ {
	2707	+ Composite csg = new GroupLeaf("Fork");
1738	2708	csg.count = 5;
	2709	+ Composite child = new cGroup("Branch A");
	2710	+ csg.addChild(child);
	2711	+ child.addChild(csg);
	2712	+ child = new cGroup("Branch B");
	2713	+ csg.addChild(child);
	2714	+ child.addChild(csg);
1739	2715	group(csg);
1740		- Composite child = new cGroup();
1741		- csg.addChild(child);
1742		- child.addChild(csg);
1743		- child = new cGroup();
1744		- csg.addChild(child);
1745		- child.addChild(csg);
	2716	+ }
1746	2717	} else
1747		- if (event.getSource() == tripleItem)
	2718	+ if (source == tripleItem)
1748	2719	{
1749		- Composite csg = new GroupLeaf();
	2720	+ if (!group.selection.isEmpty())
	2721	+ {
	2722	+ Composite csg = new GroupLeaf("Trident");
1750	2723	csg.count = 4;
1751	2724	group(csg);
1752	2725	Composite child = new cGroup();
..	..	@@ -1758,74 +2731,119 @@
1758	2731	child = new cGroup();
1759	2732	csg.addChild(child);
1760	2733	child.addChild(csg);
	2734	+ }
1761	2735	} else
1762		-
1763		- if (event.getSource() == importGFDItem)
	2736	+ if (source == computeAOItem)
1764	2737	{
1765		- ImportGFD();
	2738	+ Globals.drawMode = CameraPane.OCCLUSION;
	2739	+ cameraView.repaint();
1766	2740	} else
1767		- if (event.getSource() == importVRMLX3DItem)
1768		- {
1769		- ImportVRMLX3D();
1770		- } else
1771		- if (event.getSource() == import3DSItem)
1772		- {
1773		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1774		- } else
1775		- if (event.getSource() == importOBJItem)
1776		- {
1777		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1778		- } else
1779		- if (event.getSource() == computeAOItem)
1780		- {
1781		- CameraPane.drawMode = CameraPane.OCCLUSION;
1782		- CameraPane.theRenderer.repaint();
1783		- } else
1784		- if (event.getSource() == recompileItem)
	2741	+ if (source == recompileItem)
1785	2742	{
1786	2743	Recompile();
1787	2744	refreshContents();
1788	2745	} else
1789		- if (event.getSource() == editScriptItem)
	2746	+ if (source == editScriptItem)
1790	2747	{
1791	2748	OpenDialog();
1792	2749	refreshContents();
1793	2750	} else
1794		- if (event.getSource() == invariantsItem)
	2751	+ if (source == invariantsItem)
1795	2752	{
1796	2753	System.out.println("Invariants:");
1797		- GrafreeD.grafreeD.universe.invariants();
	2754	+ Grafreed.grafreed.universe.invariants();
1798	2755	} else
1799		- if (event.getSource() == memoryItem)
	2756	+ if (source == memoryItem)
1800	2757	{
1801	2758	//System.out.println("Invariants:");
1802	2759	PrintMemory();
1803	2760	} else
1804		- if (event.getSource() == pathItem)
	2761	+ if (source == pathItem)
1805	2762	{
1806	2763	PrintPath();
1807	2764	} else
1808		- if (event.getSource() == analyzeItem)
	2765	+ if (source == analyzeItem)
1809	2766	{
1810	2767	AnalyzeObject();
1811	2768	} else
1812		- if (event.getSource() == dumpItem)
	2769	+ if (source == dumpItem)
1813	2770	{
1814	2771	DumpObject();
1815	2772	} else
1816		- if (event.getSource() == screenfitButton)
	2773	+ if (source == minButton)
1817	2774	{
1818		- //Reload(lastConverter, lastFilename, true);
	2775	+ Minimize();
	2776	+ } else
	2777	+ if (source == maxButton)
	2778	+ {
	2779	+ Maximize();
	2780	+ } else
	2781	+ if (source == fullButton)
	2782	+ {
	2783	+ ToggleFullScreen();
	2784	+ } else
	2785	+ if (source == collapseButton)
	2786	+ {
	2787	+ this.expandedLayout = radio.layout;
	2788	+ CollapseToolbar();
	2789	+ } else
	2790	+ if (source == maximize3DButton)
	2791	+ {
	2792	+ this.expandedLayout = radio.layout;
	2793	+ radio.layout = twoButton;
	2794	+ Show3DView();
	2795	+ CollapseToolbar();
	2796	+ } else
	2797	+ if (source == previousVersionButton)
	2798	+ {
	2799	+ // Go to previous version
	2800	+ //if (!Undo())
	2801	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2802	+ PreviousVersion();
	2803	+ } else
	2804	+ if (source == restoreButton)
	2805	+ {
	2806	+ // Restore current version
	2807	+ Restore();
	2808	+ //restoreButton.setEnabled(false);
	2809	+ } else
	2810	+ if (source == replaceButton)
	2811	+ {
	2812	+ // Overwrite current version
	2813	+ Replace();
	2814	+ //replaceButton.setEnabled(false);
	2815	+ } else
	2816	+ if (source == nextVersionButton)
	2817	+ {
	2818	+ // Go to next version
	2819	+ NextVersion();
	2820	+ } else
	2821	+ if (source == saveVersionButton)
	2822	+ {
	2823	+ // Save a new version
	2824	+ if (!Save(true))
	2825	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2826	+ } else
	2827	+ if (source == deleteVersionButton)
	2828	+ {
	2829	+ // Delete a new version
	2830	+ DeleteVersion();
	2831	+ } else
	2832	+ if (source == oneStepButton)
	2833	+ {
	2834	+ Globals.ONESTEP = true;
	2835	+ cameraView.repaint();
	2836	+ } else
	2837	+ if (source == screenfitButton)
	2838	+ {
1819	2839	ScreenFit();
1820	2840	} else
1821		- if (event.getSource() == screenfitpointButton)
	2841	+ if (source == screenfitpointButton)
1822	2842	{
1823		- //Reload(lastConverter, lastFilename, true);
1824	2843	ScreenFitPoint();
1825	2844	} else
1826		- if (event.getSource() == snapobjectButton)
	2845	+ if (source == snapobjectButton)
1827	2846	{
1828		- //Reload(lastConverter, lastFilename, true);
1829	2847	SnapObject();
1830	2848	} else
1831	2849	// if (event.getSource() == recompileButton)
..	..	@@ -1834,13 +2852,13 @@
1834	2852	// Recompile();
1835	2853	// refreshContents();
1836	2854	// } else
1837		- if (event.getSource() == gcButton)
	2855	+ if (source == gcButton)
1838	2856	{
1839	2857	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1840	2858	System.gc();
1841	2859	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1842	2860	} else
1843		- if (event.getSource() == editLeafItem)
	2861	+ if (source == editLeafItem)
1844	2862	{
1845	2863	Object3D obj;
1846	2864	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1854,62 +2872,74 @@
1854	2872	}
1855	2873	refreshContents(true);
1856	2874	} else
1857		- if (event.getSource() == openWindowItem)
	2875	+ if (source == openWindowItem)
1858	2876	{
1859	2877	EditSelection(true);
1860	2878	} else
1861		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2879	+ if (source == cutItem \|\| source == clearButton)
1862	2880	{
1863	2881	loadClipboard(true);
1864	2882	} else
1865		- if (event.getSource() == duplicateItem)
	2883	+ if (source == undoItem)
1866	2884	{
1867		- Object3D keep = GrafreeD.clipboard;
	2885	+ PreviousVersion();
	2886	+ } else
	2887	+ if (source == redoItem)
	2888	+ {
	2889	+ NextVersion();
	2890	+ } else
	2891	+ if (source == duplicateItem)
	2892	+ {
	2893	+ Object3D keep = Grafreed.clipboard;
1868	2894	loadClipboard(false);
1869	2895	paste(false);
1870		- GrafreeD.clipboard = keep;
	2896	+ Grafreed.clipboard = keep;
1871	2897	} else
1872		- if (event.getSource() == cloneItem)
	2898	+ if (source == cloneItem)
1873	2899	{
1874	2900	CloneSelection(false);
1875	2901	} else
1876		- if (event.getSource() == cloneSupportItem)
	2902	+ if (source == cloneSupportItem)
1877	2903	{
1878	2904	CloneSelection(true);
1879	2905	} else
1880		- if (event.getSource() == copyItem)
	2906	+ if (source == copyItem)
1881	2907	{
1882	2908	loadClipboard(false);
1883	2909	} else
1884		- if (event.getSource() == pasteItem)
	2910	+ if (source == pasteItem)
1885	2911	{
1886	2912	paste(false);
1887	2913	} else
1888		- if (event.getSource() == pasteLinkItem)
	2914	+ if (source == pasteIntoItem)
1889	2915	{
1890		- pasteInto(false);
	2916	+ pasteInto(true, false);
1891	2917	} else
1892		- if (event.getSource() == pasteCloneItem)
	2918	+ if (source == pasteLinkItem)
1893	2919	{
1894		- pasteInto(true);
	2920	+ pasteInto(false, false);
1895	2921	} else
1896		- if (event.getSource() == pasteExpandItem)
	2922	+ if (source == pasteCloneItem)
	2923	+ {
	2924	+ pasteInto(true, true);
	2925	+ } else
	2926	+ if (source == pasteExpandItem)
1897	2927	{
1898	2928	paste(true);
1899	2929	} else
1900		- if (event.getSource() == synchronizeItem)
	2930	+ if (source == synchronizeItem)
1901	2931	{
1902	2932	Overwrite(Object3D.TRANSFORM);
1903	2933	} else
1904		- if (event.getSource() == overwriteNameItem)
	2934	+ if (source == overwriteNameItem)
1905	2935	{
1906	2936	Overwrite(Object3D.NAME);
1907	2937	} else
1908		- if (event.getSource() == overwriteUVItem)
	2938	+ if (source == overwriteUVItem)
1909	2939	{
1910	2940	Overwrite(Object3D.UV);
1911	2941	} else
1912		- if (event.getSource() == overwriteMatItem)
	2942	+ if (source == overwriteMatItem)
1913	2943	{
1914	2944	/* july 2015
1915	2945	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1929,7 +2959,7 @@
1929	2959
1930	2960	Overwrite(dropAttributes);
1931	2961	}
1932		- if (event.getSource() == overwriteGeoItem)
	2962	+ if (source == overwriteGeoItem)
1933	2963	{
1934	2964	Overwrite(Object3D.GEOMETRY);
1935	2965	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1946,7 +2976,7 @@
1946	2976	// refreshContents();
1947	2977	// }
1948	2978	} else
1949		- if (event.getSource() == generateMeshItem)
	2979	+ if (source == generateMeshItem)
1950	2980	{
1951	2981	//if (group.selection.size() == 1)
1952	2982	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1957,7 +2987,7 @@
1957	2987	ResetModel();
1958	2988	refreshContents();
1959	2989	} else
1960		- if (event.getSource() == extractGeometriesItem)
	2990	+ if (source == extractGeometriesItem)
1961	2991	{
1962	2992	boolean one = false;
1963	2993
..	..	@@ -1984,7 +3014,7 @@
1984	3014	ResetModel();
1985	3015	refreshContents();
1986	3016	} else
1987		- if (event.getSource() == cloneGeometriesItem)
	3017	+ if (source == cloneGeometriesItem)
1988	3018	{
1989	3019	boolean one = false;
1990	3020
..	..	@@ -2010,7 +3040,7 @@
2010	3040	ResetModel();
2011	3041	refreshContents();
2012	3042	} else
2013		- if (event.getSource() == shareGeometriesItem)
	3043	+ if (source == shareGeometriesItem)
2014	3044	{
2015	3045	boolean one = false;
2016	3046
..	..	@@ -2040,7 +3070,7 @@
2040	3070	refreshContents();
2041	3071	}
2042	3072	} else
2043		- if (event.getSource() == mergeGeometriesItem)
	3073	+ if (source == mergeGeometriesItem)
2044	3074	{
2045	3075	boolean one = false;
2046	3076
..	..	@@ -2070,7 +3100,7 @@
2070	3100	ResetModel();
2071	3101	refreshContents();
2072	3102	} else
2073		- if (event.getSource() == linkverticesItem)
	3103	+ if (source == linkverticesItem)
2074	3104	{
2075	3105	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2076	3106	// {
..	..	@@ -2083,48 +3113,48 @@
2083	3113	// group.selection.get(0).setMasterThis(content); // should be identity
2084	3114	// refreshContents();
2085	3115	// }
2086		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	3116	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2087	3117	{
2088		- Object3D content = GrafreeD.clipboard.get(0);
	3118	+ Object3D content = Grafreed.clipboard.get(0);
2089	3119
2090	3120	if (content instanceof cGroup && ((cGroup)content).transientlink )
2091	3121	content = ((cGroup)content).get(0);
2092	3122
2093		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	3123	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2094	3124	for (int i=0; i<group.selection.size(); i++)
2095	3125	{
2096		- boolean random = CameraPane.RANDOM;
2097		- CameraPane.RANDOM = false; // parse all random nodes
	3126	+ boolean random = CameraPane.SWITCH;
	3127	+ CameraPane.SWITCH = false; // parse all random nodes
2098	3128	group.selection.get(i).linkVerticesThis(content);
2099	3129	// group.selection.get(i).setMasterThis(content); // should be identity
2100		- CameraPane.RANDOM = random;
	3130	+ CameraPane.SWITCH = random;
2101	3131	}
2102		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	3132	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2103	3133	refreshContents();
2104	3134	}
2105	3135	} else
2106		- if (event.getSource() == resetsupportItem)
	3136	+ if (source == resetsupportItem)
2107	3137	{
2108	3138	for (int i=0; i<group.selection.size(); i++)
2109	3139	{
2110		- boolean random = CameraPane.RANDOM;
2111		- CameraPane.RANDOM = false; // parse all random nodes
	3140	+ boolean random = CameraPane.SWITCH;
	3141	+ CameraPane.SWITCH = false; // parse all random nodes
2112	3142	group.selection.get(i).linkVerticesThis(null);
2113		- CameraPane.RANDOM = random;
	3143	+ CameraPane.SWITCH = random;
2114	3144	}
2115	3145
2116	3146	refreshContents();
2117	3147	} else
2118		- if (event.getSource() == relinkverticesItem)
	3148	+ if (source == relinkverticesItem)
2119	3149	{
2120		- boolean random = CameraPane.RANDOM;
2121		- CameraPane.RANDOM = false; // parse all random nodes
	3150	+ boolean random = CameraPane.SWITCH;
	3151	+ CameraPane.SWITCH = false; // parse all random nodes
2122	3152	group.selection.RelinkToSupport();
2123		- CameraPane.RANDOM = random;
	3153	+ CameraPane.SWITCH = random;
2124	3154
2125	3155	refreshContents();
2126	3156	} else
2127		- if (event.getSource() == resetreferencesItem)
	3157	+ if (source == resetreferencesItem)
2128	3158	{
2129	3159	for (int i=0; i<group.selection.size(); i++)
2130	3160	{
..	..	@@ -2133,11 +3163,11 @@
2133	3163
2134	3164	refreshContents();
2135	3165	} else
2136		- if (event.getSource() == setMasterItem)
	3166	+ if (source == setMasterItem)
2137	3167	{
2138		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	3168	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2139	3169	{
2140		- Object3D content = GrafreeD.clipboard.get(0);
	3170	+ Object3D content = Grafreed.clipboard.get(0);
2141	3171
2142	3172	if (content instanceof cGroup && ((cGroup)content).transientlink )
2143	3173	content = ((cGroup)content).get(0);
..	..	@@ -2146,13 +3176,13 @@
2146	3176	refreshContents();
2147	3177	}
2148	3178	} else
2149		- if (event.getSource() == poseMeshItem)
	3179	+ if (source == poseMeshItem)
2150	3180	{
2151	3181	if (group.selection.size() == 1)
2152	3182	{
2153		- if (GrafreeD.clipboard.size() == 1)
	3183	+ if (Grafreed.clipboard.size() == 1)
2154	3184	{
2155		- Object3D content = GrafreeD.clipboard.get(0);
	3185	+ Object3D content = Grafreed.clipboard.get(0);
2156	3186
2157	3187	if (content instanceof cGroup && ((cGroup)content).transientlink )
2158	3188	content = ((cGroup)content).get(0);
..	..	@@ -2165,19 +3195,19 @@
2165	3195	}
2166	3196
2167	3197	} else
2168		- if (event.getSource() == revertMeshItem)
	3198	+ if (source == revertMeshItem)
2169	3199	{
2170	3200	RevertMeshes();
2171	3201	} else
2172		- if (event.getSource() == resetMeshItem)
	3202	+ if (source == resetAllItem)
2173	3203	{
2174	3204	ResetAll();
2175	3205	} else
2176		- if (event.getSource() == stepAllItem)
	3206	+ if (source == stepAllItem)
2177	3207	{
2178	3208	StepAll();
2179	3209	} else
2180		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	3210	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2181	3211	{
2182	3212	//int indices[] = jList.getSelectedIndices();
2183	3213	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2185,46 +3215,46 @@
2185	3215
2186	3216	ClearSelection(false);
2187	3217	} else
2188		- if (event.getSource() == clearAllItem)
	3218	+ if (source == clearAllItem)
2189	3219	{
2190	3220	ClearSelection(true);
2191	3221	} else
2192		- if (event.getSource() == grabItem)
	3222	+ if (source == grabItem \|\| source == groupButton)
2193	3223	{
2194		- group(new cGroup(), true);
	3224	+ group(new cGroup(), false); // true);
2195	3225	} else
2196		- if (event.getSource() == hideItem)
	3226	+ if (source == hideItem)
2197	3227	{
2198	3228	group(new HiddenObject());
2199	3229	} else
2200		- if (event.getSource() == frontItem)
	3230	+ if (source == frontItem)
2201	3231	{
2202	3232	front();
2203	3233	} else
2204		- if (event.getSource() == backItem)
	3234	+ if (source == backItem)
2205	3235	{
2206	3236	back();
2207	3237	} else
2208		- if (event.getSource() == cameraItem)
	3238	+ if (source == cameraItem)
2209	3239	{
2210	3240	makeSomething(new Camera());
2211	3241	} else
2212		- if (event.getSource() == compositeItem)
	3242	+ if (source == compositeItem \|\| source == compositeButton)
2213	3243	{
2214	3244	group(new Composite());
2215	3245	} else
2216		- if (event.getSource() == randomItem)
	3246	+ if (source == switchItem \|\| source == switchButton)
2217	3247	{
2218	3248	RandomNode random = new RandomNode();
2219	3249	group(random);
2220	3250	if (random.size() > 0)
2221		- random.name = random.get(0).name + "Rnd";
	3251	+ random.name = random.get(0).name + "Switch";
2222	3252	} else
2223		- if (event.getSource() == physicsItem)
	3253	+ if (source == physicsItem)
2224	3254	{
2225	3255	group(new PhysicsNode());
2226	3256	} else
2227		- if (event.getSource() == frameselectorItem)
	3257	+ if (source == frameselectorItem)
2228	3258	{
2229	3259	for (int i=0; i<group.selection.size(); i++)
2230	3260	{
..	..	@@ -2236,7 +3266,7 @@
2236	3266	ResetModel();
2237	3267	refreshContents();
2238	3268	} else
2239		- if (event.getSource() == switchGeoItem)
	3269	+ if (source == switchGeoItem)
2240	3270	{
2241	3271	for (int i=0; i<group.selection.size(); i++)
2242	3272	{
..	..	@@ -2248,7 +3278,7 @@
2248	3278	ResetModel();
2249	3279	refreshContents();
2250	3280	} else
2251		- if (event.getSource() == switchTransfoItem)
	3281	+ if (source == switchTransfoItem)
2252	3282	{
2253	3283	for (int i=0; i<group.selection.size(); i++)
2254	3284	{
..	..	@@ -2260,7 +3290,7 @@
2260	3290	ResetModel();
2261	3291	refreshContents();
2262	3292	} else
2263		- if (event.getSource() == morphItem)
	3293	+ if (source == morphItem)
2264	3294	{
2265	3295	for (int i=0; i<group.selection.size(); i++)
2266	3296	{
..	..	@@ -2272,7 +3302,7 @@
2272	3302	ResetModel();
2273	3303	refreshContents();
2274	3304	} else
2275		- if (event.getSource() == scriptNodeItem)
	3305	+ if (source == scriptNodeItem)
2276	3306	{
2277	3307	boolean atleastone = false;
2278	3308
..	..	@@ -2311,215 +3341,264 @@
2311	3341	}
2312	3342	}
2313	3343	} else
2314		- if (event.getSource() == linkerItem)
	3344	+ if (source == linkerItem)
2315	3345	{
2316	3346	group(new cLinker());
2317	3347	} else
2318		- if (event.getSource() == textureItem)
	3348	+ if (source == textureItem \|\| source == textureButton)
2319	3349	{
2320	3350	group(new TextureNode());
2321	3351	} else
2322		- if (event.getSource() == billboardItem)
	3352	+ if (source == billboardItem)
2323	3353	{
2324	3354	group(new BillboardNode());
2325	3355	} else
2326		- if (event.getSource() == shadowXItem)
	3356	+ if (source == shadowXItem)
2327	3357	{
2328	3358	CastShadow(0);
2329	3359	} else
2330		- if (event.getSource() == shadowYItem)
	3360	+ if (source == shadowYItem)
2331	3361	{
2332	3362	CastShadow(1);
2333	3363	} else
2334		- if (event.getSource() == shadowZItem)
	3364	+ if (source == shadowZItem)
2335	3365	{
2336	3366	CastShadow(2);
2337	3367	} else
2338		- if (event.getSource() == ungroupItem)
	3368	+ if (source == ungroupItem \|\| source == ungroupButton)
2339	3369	{
2340		- //ungroup();
	3370	+ boolean canUngroup = true;
	3371	+
2341	3372	for (int i=0; i<group.selection.size(); i++)
2342	3373	{
2343		- Ungroup(group.selection.get(i));
	3374	+ Object3D selectedItem = group.selection.get(i);
	3375	+
	3376	+ if (selectedItem.Size() == 0)
	3377	+ {
	3378	+ // Cannot ungroup leaves
	3379	+ canUngroup = false;
	3380	+ break;
	3381	+ }
	3382	+
	3383	+ if (selectedItem == group)
	3384	+ {
	3385	+ // Cannot ungroup root
	3386	+ canUngroup = false;
	3387	+ break;
	3388	+ }
2344	3389	}
2345	3390
2346		- ClearSelection(false);
2347		-
2348		- refreshContents();
	3391	+ if (canUngroup)
	3392	+ {
	3393	+ for (int i=0; i<group.selection.size(); i++)
	3394	+ {
	3395	+ Object3D selectedItem = group.selection.get(i);
	3396	+
	3397	+ Ungroup(selectedItem);
	3398	+ }
	3399	+
	3400	+ ClearSelection(false);
	3401	+
	3402	+ refreshContents();
	3403	+ }
2349	3404	} else
2350		- if (event.getSource() == genUVItem)
	3405	+ if (source == genUVItem)
2351	3406	{
2352	3407	GenUV();
2353	3408	} else
2354		- if (event.getSource() == genNormalsCADItem)
	3409	+ if (source == genNormalsCADItem)
2355	3410	{
2356	3411	GenNormals(true);
2357	3412	} else
2358		- if (event.getSource() == genNormalsMESHItem)
	3413	+ if (source == genNormalsMESHItem)
2359	3414	{
2360		- GenNormals(true); // TODO
	3415	+ GenNormalsMESH();
2361	3416	} else
2362		- if (event.getSource() == genNormalsORGANItem)
	3417	+ if (source == genNormalsORGANItem)
2363	3418	{
2364	3419	GenNormals(false);
2365	3420	} else
2366		- if (event.getSource() == genNormalsMINEItem)
	3421	+ if (source == genNormalsMINEItem)
2367	3422	{
2368	3423	GenNormalsMINE();
2369	3424	} else
2370		- if (event.getSource() == stripifyItem)
	3425	+ if (source == stripifyItem)
2371	3426	{
2372	3427	Stripify();
2373	3428	} else
2374		- if (event.getSource() == unstripifyItem)
	3429	+ if (source == unstripifyItem)
2375	3430	{
2376	3431	Unstripify();
2377	3432	} else
2378		- if (event.getSource() == trimItem)
	3433	+ if (source == trimItem)
2379	3434	{
2380	3435	Trim();
2381	3436	} else
2382		- if (event.getSource() == untrimItem)
	3437	+ if (source == untrimItem)
2383	3438	{
2384	3439	Untrim();
2385	3440	} else
2386		- if (event.getSource() == clearColorsItem)
	3441	+ if (source == clearColorsItem)
2387	3442	{
2388	3443	ClearColors();
2389	3444	} else
2390		- if (event.getSource() == clearMaterialsItem)
	3445	+ if (source == clearMaterialsItem)
2391	3446	{
2392	3447	ClearMaterials();
2393	3448	} else
2394		- if (event.getSource() == liveleavesItem)
	3449	+ if (source == liveleavesItem)
2395	3450	{
2396	3451	LiveLeaves(true);
2397	3452	} else
2398		- if (event.getSource() == unliveleavesItem)
	3453	+ if (source == unliveleavesItem)
2399	3454	{
2400	3455	LiveLeaves(false);
2401	3456	} else
2402		- if (event.getSource() == supportleavesItem)
	3457	+ if (source == supportleavesItem)
2403	3458	{
2404	3459	SupportLeaves(true);
2405	3460	} else
2406		- if (event.getSource() == unsupportleavesItem)
	3461	+ if (source == unsupportleavesItem)
2407	3462	{
2408	3463	SupportLeaves(false);
2409	3464	} else
2410		- if (event.getSource() == hideleavesItem)
	3465	+ if (source == hideleavesItem)
2411	3466	{
2412	3467	HideLeaves(true);
2413	3468	} else
2414		- if (event.getSource() == showleavesItem)
	3469	+ if (source == showleavesItem)
2415	3470	{
2416	3471	HideLeaves(false);
2417	3472	} else
2418		- if (event.getSource() == markleavesItem)
	3473	+ if (source == markleavesItem)
2419	3474	{
2420	3475	MarkLeaves(true);
2421	3476	} else
2422		- if (event.getSource() == unmarkleavesItem)
	3477	+ if (source == unmarkleavesItem)
2423	3478	{
2424	3479	MarkLeaves(false);
2425	3480	} else
2426		- if (event.getSource() == flipVItem)
	3481	+ if (source == rewindleavesItem)
	3482	+ {
	3483	+ RewindLeaves(true);
	3484	+ } else
	3485	+ if (source == unrewindleavesItem)
	3486	+ {
	3487	+ RewindLeaves(false);
	3488	+ } else
	3489	+ if (source == randomleavesItem)
	3490	+ {
	3491	+ RandomLeaves(true);
	3492	+ } else
	3493	+ if (source == unrandomleavesItem)
	3494	+ {
	3495	+ RandomLeaves(false);
	3496	+ } else
	3497	+ if (source == flipVItem)
2427	3498	{
2428	3499	FlipV(true);
2429	3500	} else
2430		- if (event.getSource() == unflipVItem)
	3501	+ if (source == unflipVItem)
2431	3502	{
2432	3503	FlipV(false);
2433	3504	} else
2434		- if (event.getSource() == lowTexturesItem)
	3505	+ if (source == lowTexturesItem)
2435	3506	{
2436	3507	SetTexRes(0);
2437	3508	} else
2438		- if (event.getSource() == normalTexturesItem)
	3509	+ if (source == normalTexturesItem)
2439	3510	{
2440	3511	SetTexRes(1);
2441	3512	} else
2442		- if (event.getSource() == highTexturesItem)
	3513	+ if (source == highTexturesItem)
2443	3514	{
2444	3515	SetTexRes(2);
2445	3516	} else
2446		- if (event.getSource() == veryhighTexturesItem)
	3517	+ if (source == veryhighTexturesItem)
2447	3518	{
2448	3519	SetTexRes(3);
2449	3520	} else
2450		- if (event.getSource() == maxTexturesItem)
	3521	+ if (source == maxTexturesItem)
2451	3522	{
2452	3523	SetTexRes(4);
2453	3524	} else
2454		- if (event.getSource() == panoTexturesItem)
	3525	+ if (source == panoTexturesItem)
2455	3526	{
2456	3527	SetTexRes(5);
2457	3528	} else
2458		- if (event.getSource() == reverseNormalsItem)
	3529	+ if (source == reverseNormalsItem)
2459	3530	{
2460	3531	ReverseNormals();
2461	3532	} else
2462		- if (event.getSource() == parseverticesItem)
	3533	+ if (source == parseverticesItem)
2463	3534	{
2464	3535	ParseVertices();
2465	3536	} else
2466		- if (event.getSource() == textureFieldItem)
	3537	+ if (source == textureFieldItem)
2467	3538	{
2468	3539	TextureVertices();
2469	3540	} else
2470		- if (event.getSource() == alignItem)
	3541	+ if (source == alignItem)
2471	3542	{
2472	3543	Align();
2473	3544	} else
2474		- if (event.getSource() == mirrorItem)
	3545	+ if (source == mirrorItem)
2475	3546	{
2476	3547	MirrorPoses();
2477	3548	} else
2478		- if (event.getSource() == reduceMorphItem)
	3549	+ if (source == reduceMorphItem)
2479	3550	{
2480	3551	MeshReduction(false);
2481	3552	} else
2482		- if (event.getSource() == reduce34MorphItem)
	3553	+ if (source == reduce34MorphItem)
2483	3554	{
2484	3555	MeshReduction(true);
2485	3556	} else
2486		- if (event.getSource() == reverseTrianglesItem)
	3557	+ if (source == reverseTrianglesItem)
2487	3558	{
2488	3559	ReverseTriangles();
2489	3560	} else
2490		- if (event.getSource() == reduceMeshItem)
	3561	+ if (source == reduceMeshItem)
2491	3562	{
2492	3563	ReduceMesh(false);
2493	3564	} else
2494		- if (event.getSource() == reduce34MeshItem)
	3565	+ if (source == reduce34MeshItem)
2495	3566	{
2496	3567	ReduceMesh(true);
2497	3568	} else
2498		- if (event.getSource() == increaseMeshItem)
	3569	+ if (source == increaseMeshItem)
2499	3570	{
2500	3571	IncreaseMesh();
2501	3572	} else
2502		- if (event.getSource() == clipMeshItem)
	3573	+ if (source == clipMeshItem)
2503	3574	{
2504	3575	ClipMesh();
2505	3576	} else
2506		- if (event.getSource() == smoothMeshItem)
	3577	+ if (source == smoothMeshItem)
2507	3578	{
2508	3579	SmoothMesh();
2509	3580	} else
2510		- if (event.getSource() == transformgeometryItem)
	3581	+ if (source == transformGeometryItem)
2511	3582	{
2512	3583	TransformGeometry();
2513	3584	} else
2514		- if (event.getSource() == resetTransformItem)
	3585	+ if (source == transformChildrenItem)
	3586	+ {
	3587	+ TransformChildren();
	3588	+ } else
	3589	+ if (source == resetTransformItem)
2515	3590	{
2516	3591	ResetTransform();
2517	3592	} else
2518		- if (event.getSource() == resetCentroidItem)
	3593	+ if (source == resetCentroidItem)
2519	3594	{
2520		- ResetCentroid();
	3595	+ ResetCentroid(true);
2521	3596	} else
2522		- if (event.getSource() == resetParentItem)
	3597	+ if (source == resetCentroidXZItem)
	3598	+ {
	3599	+ ResetCentroid(false);
	3600	+ } else
	3601	+ if (source == resetParentItem)
2523	3602	{
2524	3603	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2525	3604	{
..	..	@@ -2529,7 +3608,7 @@
2529	3608
2530	3609	refreshContents();
2531	3610	} else
2532		- if (event.getSource() == repairParentItem)
	3611	+ if (source == repairParentItem)
2533	3612	{
2534	3613	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2535	3614	{
..	..	@@ -2543,7 +3622,21 @@
2543	3622
2544	3623	refreshContents();
2545	3624	} else
2546		- if (event.getSource() == sortbysizeItem)
	3625	+ if (source == repairShadowItem)
	3626	+ {
	3627	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3628	+ {
	3629	+ Object3D obj = (Object3D)e.nextElement();
	3630	+ obj.RepairShadow();
	3631	+// for (int i=0; i<obj.size(); i++)
	3632	+// {
	3633	+// obj.get(i).parent = obj;
	3634	+// }
	3635	+ }
	3636	+
	3637	+ refreshContents();
	3638	+ } else
	3639	+ if (source == sortbysizeItem)
2547	3640	{
2548	3641	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2549	3642	{
..	..	@@ -2555,7 +3648,7 @@
2555	3648	ResetModel();
2556	3649	refreshContents();
2557	3650	} else
2558		- if (event.getSource() == sortbynameItem)
	3651	+ if (source == sortbynameItem)
2559	3652	{
2560	3653	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2561	3654	{
..	..	@@ -2567,7 +3660,7 @@
2567	3660	ResetModel();
2568	3661	refreshContents();
2569	3662	} else
2570		- if (event.getSource() == attachPigmentItem)
	3663	+ if (source == attachPigmentItem)
2571	3664	{
2572	3665	String texture = GetFile("Attach pigment");
2573	3666	Object3D obj;
..	..	@@ -2579,7 +3672,7 @@
2579	3672
2580	3673	refreshContents();
2581	3674	} else
2582		- if (event.getSource() == detachPigmentItem)
	3675	+ if (source == detachPigmentItem)
2583	3676	{
2584	3677	Object3D obj;
2585	3678	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2590,7 +3683,7 @@
2590	3683
2591	3684	refreshContents();
2592	3685	} else
2593		- if (event.getSource() == attachBumpItem)
	3686	+ if (source == attachBumpItem)
2594	3687	{
2595	3688	String texture = GetFile("Attach bump");
2596	3689	Object3D obj;
..	..	@@ -2602,18 +3695,18 @@
2602	3695
2603	3696	refreshContents();
2604	3697	} else
2605		- if (event.getSource() == detachBumpItem)
	3698	+ if (source == detachBumpItem)
2606	3699	{
2607	3700	Object3D obj;
2608	3701	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2609	3702	{
2610	3703	obj = (Object3D)e.nextElement();
2611		- obj.SetBumpTexture(null);
	3704	+ obj.ResetBumpTexture();
2612	3705	}
2613	3706
2614	3707	refreshContents();
2615	3708	} else
2616		- if (event.getSource() == pigmentBumpItem)
	3709	+ if (source == pigmentBumpItem)
2617	3710	{
2618	3711	Object3D obj;
2619	3712	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2624,159 +3717,233 @@
2624	3717
2625	3718	refreshContents();
2626	3719	} else
2627		- if (event.getSource() == flashSelectionButton)
	3720	+ if (source == embedTexturesItem)
	3721	+ {
	3722	+ Object3D obj;
	3723	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3724	+ {
	3725	+ obj = (Object3D)e.nextElement();
	3726	+ obj.EmbedTextures(true);
	3727	+ }
	3728	+
	3729	+ refreshContents();
	3730	+ } else
	3731	+ if (source == deEmbedTexturesItem)
	3732	+ {
	3733	+ Object3D obj;
	3734	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3735	+ {
	3736	+ obj = (Object3D)e.nextElement();
	3737	+ obj.EmbedTextures(false);
	3738	+ }
	3739	+
	3740	+ CameraPane.texturepigment.clear();
	3741	+ CameraPane.texturebump.clear();
	3742	+
	3743	+ refreshContents();
	3744	+ } else
	3745	+ if (source == flashSelectionButton)
2628	3746	{
2629	3747	CameraPane.flash = true;
2630	3748	refreshContents();
2631	3749	} else
2632		- if (event.getSource() == oneButton)
	3750	+ if (source == oneButton)
2633	3751	{
2634	3752	} else
2635		- if (event.getSource() == twoButton)
	3753	+ if (source == twoButton)
2636	3754	{
2637	3755	radio.layout = twoButton;
2638		- // bug
2639		- //gridPanel.setDividerLocation(1.0);
2640		- //bigPanel.setDividerLocation(0.0);
2641		- bigThree.remove(scenePanel);
2642		- bigThree.remove(cameraPanel);
2643		- bigThree.remove(XYZPanel);
2644		- aWindowConstraints.gridx = 0;
2645		- aWindowConstraints.gridy = 0;
2646		- aWindowConstraints.gridwidth = 1;
2647		- // aConstraints.gridheight = 3;
2648		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2649		- aWindowConstraints.weightx = 0;
2650		- aWindowConstraints.weighty = 1;
2651		- //bigThree.add(jtp, aWindowConstraints);
2652		- aWindowConstraints.weightx = 1;
2653		- aWindowConstraints.gridwidth = 3;
2654		- // aConstraints.gridheight = 3;
2655		- aWindowConstraints.gridx = 1;
2656		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2657		- bigThree.add(cameraPanel, aWindowConstraints);
2658		- aWindowConstraints.weightx = 0;
2659		- aWindowConstraints.gridx = 4;
2660		- aWindowConstraints.gridwidth = 1;
2661		- // aConstraints.gridheight = 3;
2662		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2663		- //bigThree.add(XYZPanel, aWindowConstraints);
2664		- bigThree.revalidate();
	3756	+
	3757	+ if (CameraPane.FULLSCREEN)
	3758	+ fullscreenLayout = radio.layout;
	3759	+
	3760	+ Show3DView();
	3761	+
	3762	+ cameraView.requestFocusInWindow();
	3763	+
	3764	+// refreshContents(true);
	3765	+//
	3766	+// try
	3767	+// {
	3768	+// java.awt.Robot bot = new java.awt.Robot();
	3769	+// int mask = InputEvent.BUTTON1_MASK;
	3770	+// bot.mouseMove(100, 100);
	3771	+// bot.mousePress(mask);
	3772	+// bot.mouseRelease(mask);
	3773	+// }
	3774	+// catch (Exception e)
	3775	+// {
	3776	+//
	3777	+// }
	3778	+
2665	3779	} else
2666		- if (event.getSource() == threeButton)
	3780	+ if (source == threeButton)
2667	3781	{
2668	3782	radio.layout = threeButton;
2669		- bigThree.remove(scenePanel);
2670		- bigThree.remove(cameraPanel);
2671		- bigThree.remove(XYZPanel);
2672		- aWindowConstraints.gridx = 0;
2673		- aWindowConstraints.gridy = 0;
2674		- aWindowConstraints.gridwidth = 1;
2675		- // aConstraints.gridheight = 3;
2676		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2677		- aWindowConstraints.weightx = 0;
2678		- aWindowConstraints.weighty = 1;
2679		- //bigThree.add(jtp, aWindowConstraints);
2680		- aWindowConstraints.weightx = 1;
2681		- aWindowConstraints.gridwidth = 3;
2682		- // aConstraints.gridheight = 3;
2683		- aWindowConstraints.gridx = 1;
2684		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2685		- bigThree.add(cameraPanel, aWindowConstraints);
2686		- aWindowConstraints.weightx = 0;
2687		- aWindowConstraints.gridx = 4;
2688		- aWindowConstraints.gridwidth = 1;
2689		- // aConstraints.gridheight = 3;
2690		- aConstraints.fill = GridBagConstraints.VERTICAL;
2691		- bigThree.add(XYZPanel, aWindowConstraints);
2692		- bigThree.revalidate();
	3783	+
	3784	+ if (CameraPane.FULLSCREEN)
	3785	+ fullscreenLayout = radio.layout;
	3786	+
	3787	+// bigThree.remove(scenePanel);
	3788	+// bigThree.remove(centralPanel);
	3789	+// bigThree.remove(XYZPanel);
	3790	+// aWindowConstraints.gridx = 0;
	3791	+// aWindowConstraints.gridy = 0;
	3792	+// aWindowConstraints.gridwidth = 1;
	3793	+// // aConstraints.gridheight = 3;
	3794	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3795	+// aWindowConstraints.weightx = 0;
	3796	+// aWindowConstraints.weighty = 1;
	3797	+// //bigThree.add(jtp, aWindowConstraints);
	3798	+// aWindowConstraints.weightx = 1;
	3799	+// aWindowConstraints.gridwidth = 3;
	3800	+// // aConstraints.gridheight = 3;
	3801	+// aWindowConstraints.gridx = 1;
	3802	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3803	+// bigThree.add(centralPanel, aWindowConstraints);
	3804	+// aWindowConstraints.weightx = 0;
	3805	+// aWindowConstraints.gridx = 4;
	3806	+// aWindowConstraints.gridwidth = 1;
	3807	+// // aConstraints.gridheight = 3;
	3808	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	3809	+// bigThree.add(XYZPanel, aWindowConstraints);
	3810	+// bigThree.validate();
	3811	+// scenePanel.setVisible(false);
	3812	+// centralPanel.setVisible(true);
	3813	+// XYZPanel.setVisible(true);
	3814	+ bigThree.ClearUI();
	3815	+ bigThree.add(scenePanel);
	3816	+ bigThree.add(centralPanel);
	3817	+ bigThree.FlushUI();
	3818	+
	3819	+ cameraView.requestFocusInWindow();
2693	3820	} else
2694		- if (event.getSource() == fourButton)
	3821	+ if (source == fourButton)
2695	3822	{
2696	3823	radio.layout = fourButton;
2697		- bigThree.remove(scenePanel);
2698		- bigThree.remove(cameraPanel);
2699		- bigThree.remove(XYZPanel);
2700		- aWindowConstraints.gridx = 0;
2701		- aWindowConstraints.gridy = 0;
2702		- aWindowConstraints.gridwidth = 1;
2703		- // aWindowConstraints.gridheight = 3;
2704		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2705		- aWindowConstraints.weightx = 1;
2706		- aWindowConstraints.weighty = 1;
2707		- bigThree.add(scenePanel, aWindowConstraints);
2708		- aWindowConstraints.weightx = 1;
2709		- aWindowConstraints.gridwidth = 3;
2710		- // aConstraints.gridheight = 3;
2711		- aWindowConstraints.gridx = 1;
2712		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2713		- //bigThree.add(cameraPanel, aWindowConstraints);
2714		- aWindowConstraints.weightx = 0;
2715		- aWindowConstraints.gridx = 4;
2716		- aWindowConstraints.gridwidth = 1;
2717		- // aWindowConstraints.gridheight = 3;
2718		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2719		- //bigThree.add(XYZPanel, aWindowConstraints);
2720		- bigThree.revalidate();
	3824	+
	3825	+ if (CameraPane.FULLSCREEN)
	3826	+ fullscreenLayout = radio.layout;
	3827	+
	3828	+// bigThree.remove(scenePanel);
	3829	+// bigThree.remove(centralPanel);
	3830	+// bigThree.remove(XYZPanel);
	3831	+// aWindowConstraints.gridx = 0;
	3832	+// aWindowConstraints.gridy = 0;
	3833	+// aWindowConstraints.gridwidth = 1;
	3834	+// // aWindowConstraints.gridheight = 3;
	3835	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3836	+// aWindowConstraints.weightx = 1;
	3837	+// aWindowConstraints.weighty = 1;
	3838	+// bigThree.add(scenePanel, aWindowConstraints);
	3839	+// aWindowConstraints.weightx = 1;
	3840	+// aWindowConstraints.gridwidth = 3;
	3841	+// // aConstraints.gridheight = 3;
	3842	+// aWindowConstraints.gridx = 1;
	3843	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3844	+// //bigThree.add(cameraPanel, aWindowConstraints);
	3845	+// aWindowConstraints.weightx = 0;
	3846	+// aWindowConstraints.gridx = 4;
	3847	+// aWindowConstraints.gridwidth = 1;
	3848	+// // aWindowConstraints.gridheight = 3;
	3849	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3850	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3851	+// bigThree.validate();
	3852	+// scenePanel.setVisible(true);
	3853	+// centralPanel.setVisible(false);
	3854	+// XYZPanel.setVisible(false);
	3855	+ bigThree.ClearUI();
	3856	+ bigThree.add(scenePanel);
	3857	+ bigThree.FlushUI();
	3858	+
	3859	+ cameraView.requestFocusInWindow();
2721	3860	} else
2722		- if (event.getSource() == sixButton)
	3861	+ if (source == sixButton)
2723	3862	{
2724	3863	radio.layout = sixButton;
2725		- bigThree.remove(scenePanel);
2726		- bigThree.remove(cameraPanel);
2727		- bigThree.remove(XYZPanel);
2728		- aWindowConstraints.gridx = 0;
2729		- aWindowConstraints.gridy = 0;
2730		- aWindowConstraints.gridwidth = 1;
2731		- // aConstraints.gridheight = 3;
2732		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2733		- aWindowConstraints.weightx = 0;
2734		- aWindowConstraints.weighty = 1;
2735		- bigThree.add(scenePanel, aWindowConstraints);
2736		- aWindowConstraints.weightx = 1;
2737		- aWindowConstraints.gridwidth = 3;
2738		- // aWindowConstraints.gridheight = 3;
2739		- aWindowConstraints.gridx = 1;
2740		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2741		- bigThree.add(cameraPanel, aWindowConstraints);
2742		- aWindowConstraints.weightx = 0;
2743		- aWindowConstraints.gridx = 4;
2744		- aWindowConstraints.gridwidth = 1;
2745		- // aWindowConstraints.gridheight = 3;
2746		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2747		- //bigThree.add(XYZPanel, aConstraints);
2748		- bigThree.revalidate();
	3864	+
	3865	+ if (CameraPane.FULLSCREEN)
	3866	+ fullscreenLayout = radio.layout;
	3867	+
	3868	+// bigThree.remove(scenePanel);
	3869	+// bigThree.remove(centralPanel);
	3870	+// bigThree.remove(XYZPanel);
	3871	+// aWindowConstraints.gridx = 0;
	3872	+// aWindowConstraints.gridy = 0;
	3873	+// aWindowConstraints.gridwidth = 1;
	3874	+// // aConstraints.gridheight = 3;
	3875	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3876	+// aWindowConstraints.weightx = 0;
	3877	+// aWindowConstraints.weighty = 1;
	3878	+// bigThree.add(scenePanel, aWindowConstraints);
	3879	+// aWindowConstraints.weightx = 1;
	3880	+// aWindowConstraints.gridwidth = 3;
	3881	+// // aWindowConstraints.gridheight = 3;
	3882	+// aWindowConstraints.gridx = 1;
	3883	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3884	+// bigThree.add(centralPanel, aWindowConstraints);
	3885	+// aWindowConstraints.weightx = 0;
	3886	+// aWindowConstraints.gridx = 4;
	3887	+// aWindowConstraints.gridwidth = 1;
	3888	+// // aWindowConstraints.gridheight = 3;
	3889	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3890	+// //bigThree.add(XYZPanel, aConstraints);
	3891	+// bigThree.validate();
	3892	+// scenePanel.setVisible(true);
	3893	+// centralPanel.setVisible(true);
	3894	+// XYZPanel.setVisible(false);
	3895	+ bigThree.ClearUI();
	3896	+ bigThree.add(centralPanel);
	3897	+ bigThree.add(scenePanel);
	3898	+ bigThree.FlushUI();
	3899	+
	3900	+ cameraView.requestFocusInWindow();
2749	3901	} else
2750		- if (event.getSource() == sevenButton)
	3902	+ if (source == sevenButton)
2751	3903	{
2752	3904	radio.layout = sevenButton;
2753		- bigThree.remove(scenePanel);
2754		- bigThree.remove(cameraPanel);
2755		- bigThree.remove(XYZPanel);
2756		- aWindowConstraints.gridx = 0;
2757		- aWindowConstraints.gridy = 0;
2758		- aWindowConstraints.gridwidth = 1;
2759		- // aWindowConstraints.gridheight = 3;
2760		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2761		- aWindowConstraints.weightx = 0;
2762		- aWindowConstraints.weighty = 1;
2763		- bigThree.add(scenePanel, aWindowConstraints);
2764		- aWindowConstraints.weightx = 1;
2765		- aWindowConstraints.gridwidth = 3;
2766		- // aWindowConstraints.gridheight = 3;
2767		- aWindowConstraints.gridx = 1;
2768		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2769		- bigThree.add(cameraPanel, aWindowConstraints);
2770		- aWindowConstraints.weightx = 0;
2771		- aWindowConstraints.gridx = 4;
2772		- aWindowConstraints.gridwidth = 1;
2773		- // aConstraints.gridheight = 3;
2774		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2775		- bigThree.add(XYZPanel, aWindowConstraints);
2776		- bigThree.revalidate();
	3905	+
	3906	+ if (CameraPane.FULLSCREEN)
	3907	+ fullscreenLayout = radio.layout;
	3908	+
	3909	+// bigThree.remove(scenePanel);
	3910	+// bigThree.remove(centralPanel);
	3911	+// bigThree.remove(XYZPanel);
	3912	+// aWindowConstraints.gridx = 0;
	3913	+// aWindowConstraints.gridy = 0;
	3914	+// aWindowConstraints.gridwidth = 1;
	3915	+// // aWindowConstraints.gridheight = 3;
	3916	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3917	+// aWindowConstraints.weightx = 0;
	3918	+// aWindowConstraints.weighty = 1;
	3919	+// bigThree.add(scenePanel, aWindowConstraints);
	3920	+// aWindowConstraints.weightx = 1;
	3921	+// aWindowConstraints.gridwidth = 3;
	3922	+// // aWindowConstraints.gridheight = 3;
	3923	+// aWindowConstraints.gridx = 1;
	3924	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3925	+// bigThree.add(centralPanel, aWindowConstraints);
	3926	+// aWindowConstraints.weightx = 0;
	3927	+// aWindowConstraints.gridx = 4;
	3928	+// aWindowConstraints.gridwidth = 1;
	3929	+// // aConstraints.gridheight = 3;
	3930	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3931	+// bigThree.add(XYZPanel, aWindowConstraints);
	3932	+// bigThree.validate();
	3933	+// scenePanel.setVisible(true);
	3934	+// centralPanel.setVisible(true);
	3935	+// XYZPanel.setVisible(true);
	3936	+ bigThree.ClearUI();
	3937	+ bigThree.add(scenePanel);
	3938	+ bigThree.add(centralPanel);
	3939	+ bigThree.add(XYZPanel);
	3940	+ bigThree.FlushUI();
	3941	+
	3942	+ cameraView.requestFocusInWindow();
2777	3943	} else
2778		- if (event.getSource() == rootButton)
	3944	+ if (source == rootButton)
2779	3945	{
	3946	+ Replace();
2780	3947	Object3D obj;
2781	3948	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2782	3949	{
..	..	@@ -2785,66 +3952,85 @@
2785	3952	EditObject(obj);
2786	3953	}
2787	3954
	3955	+ cameraView.requestFocusInWindow();
2788	3956	refreshContents(true);
2789	3957	} else
2790		- if (event.getSource() == closeButton)
	3958	+ if (source == closeButton)
2791	3959	{
2792	3960	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2793	3961	cRadio ab;
2794	3962	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2795	3963	{
2796	3964	ab = (cRadio)e.nextElement();
2797		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3965	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2798	3966	{
	3967	+ // Patch to avoid bug with transparency.
	3968	+ if (!ab.hadMaterial)
	3969	+ {
	3970	+ ab.object.material = null;
	3971	+ }
	3972	+
2799	3973	buttonGroup.remove(ab);
2800	3974	radioPanel.remove(ab);
2801	3975
2802		- ab.GetObject().editWindow = null;
	3976	+ //ab.GetObject().editWindow = null;
	3977	+ ab.GetObject().manipWindow = null;
2803	3978	// ab.GetObject().objectUI = null; // ?????????
2804	3979
2805	3980	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2806	3981	break;
2807	3982	}
2808	3983	}
	3984	+
	3985	+ cameraView.requestFocusInWindow();
2809	3986	refreshContents(true);
2810	3987	} else
2811		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3988	+ if (source == editItem \|\| source == editButton)
2812	3989	{
	3990	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3991	+ {
	3992	+ Object3D child = (Object3D)e.nextElement();
	3993	+ child.pinned = true;
	3994	+ }
	3995	+
2813	3996	EditSelection(false);
2814	3997	} else
2815		- if (event.getSource() == uneditButton)
	3998	+ if (source == uneditButton)
2816	3999	{
2817	4000	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2818	4001	{
2819	4002	Object3D child = (Object3D)e.nextElement();
2820	4003	if(child.editWindow != null)
2821		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4004	+ child.pinned = false;
2822	4005	child.CloseUI();
2823	4006	listUI.remove(child);
	4007	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2824	4008
2825		- child.editWindow = null; // ???????????
	4009	+ //child.editWindow = null; // ???????????
2826	4010	}
2827		- objEditor.ctrlPanel.revalidate();
	4011	+ objEditor.ctrlPanel.FlushUI();
2828	4012	//objEditor.jTree.clearSelection();
2829	4013	//objEditor.ResetSliders();
2830	4014	refreshContents(true);
2831	4015	} else
2832		- if (event.getSource() == clearPanelButton)
	4016	+ if (source == clearPanelButton)
2833	4017	{
2834	4018	assert(copy == group);
2835	4019	//copy.ClearUI();
2836	4020	for (Object3D obj : listUI)
2837	4021	{
	4022	+ obj.pinned = false;
2838	4023	obj.CloseUI();
2839	4024	}
2840	4025	listUI.clear();
	4026	+ SetPinStates(group.selection.size() > 0);
2841	4027	refreshContents(true);
2842	4028	} else
2843		- if (event.getSource() == allParamsButton)
	4029	+ if (source == allParamsButton)
2844	4030	{
2845	4031	assert(copy == group);
2846	4032
2847		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4033	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2848	4034
2849	4035	for (Object3D obj : listUI)
2850	4036	{
..	..	@@ -2861,19 +4047,19 @@
2861	4047
2862	4048	refreshContents(true);
2863	4049	} else
2864		- if (event.getSource() == unselectButton)
	4050	+ if (source == unselectButton)
2865	4051	{
2866	4052	objEditor.jTree.clearSelection();
2867	4053	// ?? oct 2012 GrafreeD.clipboard.clear();
2868	4054	objEditor.ResetSliders();
2869	4055	refreshContents(true);
2870	4056	} else
2871		- if(event.getSource() instanceof cRadio)
	4057	+ if(source instanceof cRadio)
2872	4058	{
2873	4059	group.parent = keepparent;
2874	4060	group.attributes = 0;
2875	4061	//group.editWindow = null;
2876		- /cRadio/ radio = (cRadio)event.getSource();
	4062	+ /cRadio/ radio = (cRadio)source;
2877	4063	Object3D obj = radio.GetObject();
2878	4064	System.out.println("Edit " + obj);
2879	4065	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2893,7 +4079,8 @@
2893	4079	}
2894	4080
2895	4081	copy = group;
2896		- //CameraPane.theRenderer.object = group;
	4082	+
	4083	+ //Globals.theRenderer.object = group;
2897	4084	if(!useclient)
2898	4085	{
2899	4086	cameraView.renderCamera = radio.camera;
..	..	@@ -2902,25 +4089,67 @@
2902	4089	cameraView.cameras[cameraView.cameracount] = radio.camera;
2903	4090	cameraView.targetLookAt.set(radio.camera.lookAt);
2904	4091	cameraView.object = group;
2905		- cameraView.lighttouched = true;
	4092	+ //cameraView.lighttouched = true;
	4093	+ Globals.lighttouched = true;
2906	4094	topView.object = group;
2907	4095	frontView.object = group;
2908	4096	sideView.object = group;
2909	4097	}
2910		- group.editWindow = this;
	4098	+
	4099	+// fix "+" issue
	4100	+ //group.editWindow = this;
	4101	+ group.manipWindow = this;
	4102	+
2911	4103	/*
2912	4104	currentLayout = radio.layout;
2913	4105	if (currentLayout == null)
2914	4106	currentLayout = sevenButton;
2915	4107	*/
2916	4108	radio.layout.doClick();
	4109	+
	4110	+ assert(copy instanceof Composite);
	4111	+
	4112	+ if (copy.versionlist == null)
	4113	+ {
	4114	+ copy.versionlist = new Object3D[100];
	4115	+ copy.versionindex = -1;
	4116	+
	4117	+ Save(true);
	4118	+ }
	4119	+
	4120	+ SetVersionStates();
	4121	+
	4122	+ ClearUnpinned();
	4123	+
	4124	+ //Grafreed.Assert(group != null);
	4125	+ //Grafreed.Assert(group.selection != null);
	4126	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4127	+ if (group.selection == null \|\| group.selection.size() == 1)
	4128	+ EditSelection(false);
2917	4129	keepparent = group.parent;
2918	4130	// PARENT = NULL or not???
2919	4131	//group.parent = null; // ROOT
2920	4132	//group.attributes = -1;
2921	4133	ResetModel();
	4134	+
	4135	+ cameraView.requestFocusInWindow();
2922	4136	refreshContents(true);
2923		- }
	4137	+ } else if (event.getSource() == editCameraItem)
	4138	+ {
	4139	+ cameraView.ProtectCamera();
	4140	+ cameraView.requestFocusInWindow();
	4141	+ cameraView.repaint();
	4142	+ return;
	4143	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	4144	+ {
	4145	+ cameraView.RevertCamera();
	4146	+ cameraView.requestFocusInWindow();
	4147	+ cameraView.repaint();
	4148	+ return;
	4149	+ // } else if (event.getSource() == textureButton)
	4150	+ // {
	4151	+ // return; // true;
	4152	+ }
2924	4153	else
2925	4154	{
2926	4155	//return super.action(event, arg);
..	..	@@ -2929,7 +4158,6 @@
2929	4158	}
2930	4159
2931	4160	boolean useclient = false;
2932		- cRadio radio;
2933	4161
2934	4162	void ToggleRoot()
2935	4163	{
..	..	@@ -2938,7 +4166,7 @@
2938	4166	if (useclient)
2939	4167	{
2940	4168	cameraView.object = client;
2941		- cameraView.lighttouched = true;
	4169	+ Globals.lighttouched = true;
2942	4170	//topView.object = client;
2943	4171	//frontView.object = client;
2944	4172	//sideView.object = client;
..	..	@@ -2946,7 +4174,7 @@
2946	4174	else
2947	4175	{
2948	4176	cameraView.object = group;
2949		- cameraView.lighttouched = true;
	4177	+ Globals.lighttouched = true;
2950	4178	//topView.object = group;
2951	4179	//frontView.object = group;
2952	4180	//sideView.object = group;
..	..	@@ -2981,6 +4209,28 @@
2981	4209	refreshContents();
2982	4210	}
2983	4211
	4212	+ void TransformChildren()
	4213	+ {
	4214	+ Object3D obj;
	4215	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4216	+ {
	4217	+ obj = (Object3D)e.nextElement();
	4218	+ obj.KeepTextureMatrices();
	4219	+ obj.TransformChildren();
	4220	+ obj.RestoreTextureMatrices();
	4221	+
	4222	+// if (obj.parent == null)
	4223	+// {
	4224	+// System.out.println("NULL PARENT!");
	4225	+// new Exception().printStackTrace();
	4226	+// }
	4227	+// else
	4228	+// TouchTransform(obj);
	4229	+// //obj.parent.Touch();
	4230	+ }
	4231	+
	4232	+ refreshContents();
	4233	+ }
2984	4234
2985	4235	void ResetTransform()
2986	4236	{
..	..	@@ -3093,7 +4343,7 @@
3093	4343	refreshContents();
3094	4344	}
3095	4345
3096		- void ResetCentroid()
	4346	+ void ResetCentroid(boolean full)
3097	4347	{
3098	4348	Object3D obj;
3099	4349	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3108,12 +4358,16 @@
3108	4358	LA.matIdentity(Object3D.mat);
3109	4359	obj.getBounds(minima, maxima, false);
3110	4360	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3111		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	4361	+ if (full)
	4362	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3112	4363	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3113	4364	obj.TransformMesh(Object3D.mat);
	4365	+
3114	4366	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3115		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	4367	+ if (full)
	4368	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3116	4369	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	4370	+
3117	4371	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3118	4372	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3119	4373	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3142,7 +4396,8 @@
3142	4396
3143	4397	int size = obj.MemorySize();
3144	4398
3145		- System.err.println((size/1024) + " KB is the size of " + obj);
	4399	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4400	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3146	4401	}
3147	4402	}
3148	4403	catch (Exception e)
..	..	@@ -3179,9 +4434,9 @@
3179	4434	obj = (Object3D)e.nextElement();
3180	4435
3181	4436	System.out.println("Object is: " + obj);
3182		- GrafreeD.AnalyzeObject(obj);
	4437	+ Grafreed.AnalyzeObject(obj);
3183	4438	System.out.println("Boundary rep: " + obj.bRep);
3184		- GrafreeD.AnalyzeObject(obj.bRep);
	4439	+ Grafreed.AnalyzeObject(obj.bRep);
3185	4440
3186	4441	// System.err.println((size/1024) + " KB is the size of " + obj);
3187	4442	}
..	..	@@ -3223,6 +4478,13 @@
3223	4478	void GenNormals(boolean crease)
3224	4479	{
3225	4480	group.GenNormalsS(crease);
	4481	+
	4482	+ refreshContents();
	4483	+ }
	4484	+
	4485	+ void GenNormalsMESH()
	4486	+ {
	4487	+ group.GenNormalsMeshS();
3226	4488
3227	4489	refreshContents();
3228	4490	}
..	..	@@ -3395,8 +4657,8 @@
3395	4657
3396	4658	void ParseVertices()
3397	4659	{
3398		- boolean epsequal = GrafreeD.epsequal;
3399		- GrafreeD.epsequal = true;
	4660	+ boolean epsequal = Grafreed.epsequal;
	4661	+ Grafreed.epsequal = true;
3400	4662
3401	4663	for (int i=0; i<group.selection.size(); i++)
3402	4664	{
..	..	@@ -3421,7 +4683,7 @@
3421	4683	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3422	4684	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3423	4685
3424		- g.add(GrafreeD.clipboard);
	4686	+ g.add(Grafreed.clipboard);
3425	4687
3426	4688	buffer.add(g);
3427	4689	}
..	..	@@ -3436,7 +4698,7 @@
3436	4698	makeSomething(buffer, i==group.selection.size()-1);
3437	4699	}
3438	4700
3439		- GrafreeD.epsequal = epsequal;
	4701	+ Grafreed.epsequal = epsequal;
3440	4702
3441	4703	refreshContents();
3442	4704	}
..	..	@@ -3454,7 +4716,16 @@
3454	4716	String pigment = Object3D.GetPigment(tex);
3455	4717	//String bump = Object3D.GetBump(tex);
3456	4718
3457		- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
	4719	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4720	+
	4721	+ try
	4722	+ {
	4723	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
	4724	+ }
	4725	+ catch (Exception e)
	4726	+ {
	4727	+ System.err.println("FAIL: " + node);
	4728	+ }
3458	4729
3459	4730	double s = v.s;
3460	4731
..	..	@@ -3542,11 +4813,11 @@
3542	4813
3543	4814	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3544	4815
3545		- boolean random = CameraPane.RANDOM;
3546		- CameraPane.RANDOM = false; // parse all random nodes
	4816	+ boolean random = CameraPane.SWITCH;
	4817	+ CameraPane.SWITCH = false; // parse all random nodes
3547	4818	lowres.linkVerticesThis(null);
3548	4819	lowres.linkVerticesThis(sn);
3549		- CameraPane.RANDOM = random;
	4820	+ CameraPane.SWITCH = random;
3550	4821
3551	4822	System.err.flush();
3552	4823
..	..	@@ -3586,7 +4857,7 @@
3586	4857	return;
3587	4858
3588	4859	Object3D poses = group.selection.get(0);
3589		- Object3D ref = GrafreeD.clipboard.get(0);
	4860	+ Object3D ref = Grafreed.clipboard.get(0);
3590	4861
3591	4862	Object3D newgroup = new Object3D("Po:" + poses.name);
3592	4863
..	..	@@ -3755,7 +5026,7 @@
3755	5026	group.selection.RelinkToSupport(); // july 2014
3756	5027	System.out.println("DONE.");
3757	5028	refreshContents();
3758		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	5029	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3759	5030	}
3760	5031
3761	5032	void ReduceMesh(boolean reduction34)
..	..	@@ -3780,9 +5051,9 @@
3780	5051
3781	5052	void ClipMesh()
3782	5053	{
3783		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	5054	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3784	5055	{
3785		- Object3D content = GrafreeD.clipboard.get(0);
	5056	+ Object3D content = Grafreed.clipboard.get(0);
3786	5057
3787	5058	if (content instanceof cGroup && ((cGroup)content).transientlink )
3788	5059	content = ((cGroup)content).get(0);
..	..	@@ -3791,7 +5062,7 @@
3791	5062	// {
3792	5063	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3793	5064	// }
3794		- group.selection.ClipMesh(GrafreeD.clipboard);
	5065	+ group.selection.ClipMesh(Grafreed.clipboard);
3795	5066	}
3796	5067	// group.selection.ClipMesh(GrafreeD.clipboard);
3797	5068	System.out.println("DONE.");
..	..	@@ -3838,6 +5109,18 @@
3838	5109	void MarkLeaves(boolean hide)
3839	5110	{
3840	5111	group.selection.MarkLeaves(hide);
	5112	+ refreshContents();
	5113	+ }
	5114	+
	5115	+ void RewindLeaves(boolean hide)
	5116	+ {
	5117	+ group.selection.RewindLeaves(hide);
	5118	+ refreshContents();
	5119	+ }
	5120	+
	5121	+ void RandomLeaves(boolean hide)
	5122	+ {
	5123	+ group.selection.RandomLeaves(hide);
3841	5124	refreshContents();
3842	5125	}
3843	5126
..	..	@@ -3912,28 +5195,25 @@
3912	5195	// }
3913	5196	// }
3914	5197
3915		- static boolean allparams = true;
3916		-
3917		- static Vector<Object3D> listUI = new Vector<Object3D>();
3918		-
3919	5198	void EditSelection(boolean newWindow)
3920	5199	{
	5200	+ if (group.selection == null)
	5201	+ {
	5202	+ EditElement(group, newWindow); // ? new
	5203	+ return;
	5204	+ }
	5205	+
3921	5206	// aConstraints.gridy = 0;
3922	5207	for (int i=0; i<group.selection.size(); i++)
3923	5208	{
3924	5209	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
3925	5210	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3926		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5211	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3927	5212
3928	5213	Object3D elem = (Object3D)group.selection.elementAt(i);
3929		- if(elem != group)
	5214	+ if(elem != group \|\| !newWindow)
3930	5215	{
3931		- // if (!(elem instanceof Composite))
3932		- // newWindow = false;
3933		- listUI.add(elem);
3934		- elem.openEditWindow(this, newWindow); //, false);
3935		- System.out.println("edit : " + elem);
3936		- elem.editWindow.refreshContents(true); // ? new
	5216	+ EditElement(elem, newWindow); // ? new
3937	5217	}
3938	5218	}
3939	5219	}
..	..	@@ -3996,9 +5276,7 @@
3996	5276
3997	5277	freezemodel = false;
3998	5278	}
3999		-
4000		- boolean flashIt = true;
4001		-
	5279	+
4002	5280	public void valueChanged(TreeSelectionEvent e)
4003	5281	//public boolean handleEvent(Event event)
4004	5282	{
..	..	@@ -4008,7 +5286,8 @@
4008	5286	//new Exception().printStackTrace();
4009	5287
4010	5288	freezemodel = true;
4011		-
	5289	+ ClearUnpinned();
	5290	+
4012	5291	/**/
4013	5292	//switch (event.id)
4014	5293	{
..	..	@@ -4016,7 +5295,6 @@
4016	5295	//case 702: // Event.LIST_DESELECT
4017	5296	group.deselectAll();
4018	5297	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4019		- objEditor.ClearInfo(); // .GetMaterial());
4020	5298	if (tps != null)
4021	5299	{
4022	5300	for (int i=0; i < tps.length; i++)
..	..	@@ -4025,33 +5303,39 @@
4025	5303
4026	5304	//if (child.parent != null)
4027	5305	//child.parent.addSelectee(child);
	5306	+ objEditor.SetMaterial(child);
4028	5307	group.addSelectee(child);
4029		- objEditor.SetMaterial(child); // .GetMaterial());
4030		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4031		- System.err.println("info : " + child.GetPath());
4032	5308	}
4033	5309	}
4034		- else
4035		- {
4036		- objEditor.SetMaterial(group); // .GetMaterial());
4037		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4038		- System.err.println("info : " + group.GetPath());
4039		- }
	5310	+// else
	5311	+// {
	5312	+// objEditor.SetMaterial(group); // .GetMaterial());
	5313	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	5314	+// System.err.println("info : " + group.GetPath());
	5315	+// }
4040	5316
4041		- objEditor.SetText(); // jan 2014
4042		-
4043		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	5317	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4044	5318	CameraPane.flash = true;
4045	5319
4046		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5320	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4047	5321	// a camera
4048	5322	{
4049		- CameraPane.camerachangeframe = 0; // don't refuse it
4050		- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
4051		- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
4052		- // CameraPane.theRenderer.eyeCamera = CameraPane.theRenderer.manipCamera;
	5323	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5324	+ {
	5325	+ CameraPane.camerachangeframe = 0; // don't refuse it
	5326	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5327	+ }
	5328	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	5329	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4053	5330	}
4054	5331
	5332	+ if (tps != null && tps.length == 1)
	5333	+ {
	5334	+ EditSelection(false);
	5335	+ }
	5336	+
	5337	+ SetPinStates(tps != null && tps.length > 0);
	5338	+
4055	5339	refreshContents();
4056	5340	//return true;
4057	5341	}
..	..	@@ -4060,6 +5344,51 @@
4060	5344
4061	5345	freezemodel = false;
4062	5346	}
	5347	+
	5348	+ void SetPinStates(boolean enabled)
	5349	+ {
	5350	+ editButton.setEnabled(enabled);
	5351	+ uneditButton.setEnabled(enabled);
	5352	+ //unselectButton.setEnabled(enabled);
	5353	+ flashSelectionButton.setEnabled(enabled);
	5354	+
	5355	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5356	+
	5357	+ boolean allComposites = true;
	5358	+
	5359	+ if (group.selection != null)
	5360	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5361	+ {
	5362	+ if (!(e.nextElement() instanceof Composite))
	5363	+ {
	5364	+ allComposites = false;
	5365	+ break;
	5366	+ }
	5367	+ }
	5368	+
	5369	+ rootButton.setEnabled(allComposites);
	5370	+ }
	5371	+
	5372	+ void refreshContents(boolean cp)
	5373	+ {
	5374	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5375	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5376	+ {
	5377	+ objEditor.ClearInfo(); // .GetMaterial());
	5378	+
	5379	+ for (int i=0; i < group.selection.Size(); i++)
	5380	+ {
	5381	+ Object3D child = (Object3D) group.selection.get(i);
	5382	+
	5383	+ objEditor.AddInfo(child, this, true);
	5384	+// System.err.println("info : " + child.GetPath());
	5385	+ }
	5386	+
	5387	+ objEditor.SetText(); // jan 2014
	5388	+ }
	5389	+
	5390	+ super.refreshContents(cp);
	5391	+ }
4063	5392
4064	5393	void linkSomething(Object3D thing)
4065	5394	{
..	..	@@ -4131,16 +5460,19 @@
4131	5460	{
4132	5461	if (group.selection.isEmpty())
4133	5462	return;
4134		- GrafreeD.clipboardIsTempGroup = false;
	5463	+
	5464	+ Grafreed.clipboardIsTempGroup = false;
4135	5465	Composite tGroup = null;
4136	5466	if (group.selection.size() > 0) // 1)
4137	5467	{
4138	5468	tGroup = new cGroup();
4139		- GrafreeD.clipboardIsTempGroup = true;
	5469	+ Grafreed.clipboardIsTempGroup = true;
4140	5470	}
4141	5471
4142	5472	if (cut)
4143	5473	{
	5474	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5475	+// Save();
4144	5476	//int indices[] = jList.getSelectedIndices();
4145	5477	//for (int i = indices.length - 1; i >= 0; i--)
4146	5478	//jList.remove(indices[i]);
..	..	@@ -4176,16 +5508,16 @@
4176	5508	//System.out.println("cut " + child);
4177	5509	//System.out.println("parent = " + child.parent);
4178	5510	// tmp.addChild(child);
4179		- if (GrafreeD.clipboardIsTempGroup)
	5511	+ if (Grafreed.clipboardIsTempGroup)
4180	5512	tGroup.add/Child/(tmp);
4181	5513	else
4182		- GrafreeD.clipboard = tmp;
	5514	+ Grafreed.clipboard = tmp;
4183	5515	}
4184	5516	else
4185		- if (GrafreeD.clipboardIsTempGroup)
	5517	+ if (Grafreed.clipboardIsTempGroup)
4186	5518	tGroup.add/Child/(child);
4187	5519	else
4188		- GrafreeD.clipboard = child;
	5520	+ Grafreed.clipboard = child;
4189	5521	}
4190	5522
4191	5523	//ResetModel();
..	..	@@ -4217,21 +5549,23 @@
4217	5549	//System.out.println("cut " + elem);
4218	5550	//System.out.println("parent = " + elem.parent);
4219	5551	// tmp.addChild(elem);
4220		- if (GrafreeD.clipboardIsTempGroup)
	5552	+ if (Grafreed.clipboardIsTempGroup)
4221	5553	tGroup.add/Child/(tmp);
4222	5554	else
4223		- GrafreeD.clipboard = tmp;
	5555	+ Grafreed.clipboard = tmp;
4224	5556	}
4225	5557	else
4226		- if (GrafreeD.clipboardIsTempGroup)
	5558	+ if (Grafreed.clipboardIsTempGroup)
4227	5559	tGroup.add/Child/(child);
4228	5560	else
4229		- GrafreeD.clipboard = child;
	5561	+ Grafreed.clipboard = child;
4230	5562	}
4231	5563
4232	5564	}
4233		- if (GrafreeD.clipboardIsTempGroup)
4234		- GrafreeD.clipboard = tGroup;
	5565	+
	5566	+ if (Grafreed.clipboardIsTempGroup)
	5567	+ Grafreed.clipboard = tGroup;
	5568	+
4235	5569	if (cut)
4236	5570	{
4237	5571	ResetModel();
..	..	@@ -4241,11 +5575,15 @@
4241	5575
4242	5576	void paste(boolean expand)
4243	5577	{
	5578	+ if (Globals.REPLACEONMAKE)
	5579	+ Save();
	5580	+ boolean keep = Globals.REPLACEONMAKE;
	5581	+ Globals.REPLACEONMAKE = false;
4244	5582	// if (GrafreeD.clipboard == null)
4245	5583	// return;
4246	5584	boolean first = true;
4247	5585
4248		- if (GrafreeD.clipboardIsTempGroup)
	5586	+ if (Grafreed.clipboardIsTempGroup)
4249	5587	{
4250	5588	Composite temp;
4251	5589
..	..	@@ -4256,7 +5594,7 @@
4256	5594	temp = (Composite)Applet3D.clipboard.deepCopy();
4257	5595	*/
4258	5596	Object3D elem;
4259		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5597	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4260	5598	{
4261	5599	Object3D child = (Object3D)e.nextElement();
4262	5600
..	..	@@ -4290,21 +5628,22 @@
4290	5628	//Object3D cb = Applet3D.clipboard;
4291	5629	//temp.addChild(cb);
4292	5630	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4293		- assert(GrafreeD.clipboard.parent == null);
4294		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4295		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4296		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4297		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	5631	+ assert(Grafreed.clipboard.parent == null);
	5632	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5633	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5634	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5635	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4298	5636	else
4299		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4300		- GrafreeD.clipboard.get(0).parent = keepparent;
	5637	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5638	+ Grafreed.clipboard.get(0).parent = keepparent;
4301	5639	}
4302	5640
	5641	+ Globals.REPLACEONMAKE = keep;
4303	5642	ResetModel();
4304	5643	refreshContents();
4305	5644	}
4306	5645
4307		- void pasteInto(boolean copyit)
	5646	+ void pasteInto(boolean copyit, boolean clone)
4308	5647	{
4309	5648	// if (GrafreeD.clipboard == null)
4310	5649	// return;
..	..	@@ -4333,15 +5672,22 @@
4333	5672	if (copyit)
4334	5673	{
4335	5674	// paste(false);
4336		- CloneClipboard(false); // sept 2014
	5675	+ if (clone)
	5676	+ {
	5677	+ CloneClipboard(false); // sept 2014
	5678	+ }
	5679	+ else
	5680	+ {
	5681	+ paste(false);
	5682	+ }
4337	5683	}
4338	5684	else
4339	5685	{
4340	5686	boolean first = true;
4341	5687
4342		- if (GrafreeD.clipboardIsTempGroup)
	5688	+ if (Grafreed.clipboardIsTempGroup)
4343	5689	{
4344		- Composite temp = (Composite)GrafreeD.clipboard;
	5690	+ Composite temp = (Composite)Grafreed.clipboard;
4345	5691	Object3D copy;
4346	5692	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4347	5693	{
..	..	@@ -4351,7 +5697,7 @@
4351	5697	}
4352	5698	} else
4353	5699	{
4354		- linkSomething(GrafreeD.clipboard); //.get(0));
	5700	+ linkSomething(Grafreed.clipboard); //.get(0));
4355	5701	}
4356	5702	}
4357	5703	}
..	..	@@ -4428,6 +5774,10 @@
4428	5774
4429	5775	void group(Object3D csg, boolean grab)
4430	5776	{
	5777	+ if (Globals.REPLACEONMAKE)
	5778	+ Save();
	5779	+ boolean keep = Globals.REPLACEONMAKE;
	5780	+ Globals.REPLACEONMAKE = false;
4431	5781	if (//false) // why??
4432	5782	!group.selection.isEmpty())
4433	5783	{
..	..	@@ -4541,10 +5891,15 @@
4541	5891	//node.add(csg);
4542	5892	//makeSomething(node);
4543	5893	makeSomething(csg);
	5894	+ Globals.REPLACEONMAKE = keep;
4544	5895	}
4545	5896
4546	5897	void Ungroup(Object3D g)
4547	5898	{
	5899	+ if (Globals.REPLACEONMAKE)
	5900	+ Save();
	5901	+ boolean keep = Globals.REPLACEONMAKE;
	5902	+ Globals.REPLACEONMAKE = false;
4548	5903	if (g instanceof HiddenObject)
4549	5904	{
4550	5905	HiddenObject h = (HiddenObject) g;
..	..	@@ -4561,6 +5916,7 @@
4561	5916	objEditor.makeSomething(g.get(i), false);
4562	5917	}
4563	5918	}
	5919	+ Globals.REPLACEONMAKE = keep;
4564	5920	}
4565	5921
4566	5922	void ungroup()
..	..	@@ -4756,21 +6112,6 @@
4756	6112	}
4757	6113	*/
4758	6114
4759		- void ImportGFD()
4760		- {
4761		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4762		- browser.show();
4763		- String filename = browser.getFile();
4764		- if (filename != null && filename.length() > 0)
4765		- {
4766		- String fullname = browser.getDirectory() + filename;
4767		-
4768		- //Object3D readobj =
4769		- objEditor.ReadGFD(fullname, objEditor);
4770		- //makeSomething(readobj);
4771		- }
4772		- }
4773		-
4774	6115	/*
4775	6116	public void Callback(Object obj)
4776	6117	{
..	..	@@ -4794,26 +6135,9 @@
4794	6135	}
4795	6136	*/
4796	6137
4797		- void ImportVRMLX3D()
4798		- {
4799		- if (GrafreeD.standAlone)
4800		- {
4801		- /**/
4802		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4803		- browser.show();
4804		- String filename = browser.getFile();
4805		- if (filename != null && filename.length() > 0)
4806		- {
4807		- String fullname = browser.getDirectory() + filename;
4808		- LoadVRMLX3D(fullname);
4809		- }
4810		- /**/
4811		- }
4812		- }
4813		-
4814	6138	String GetFile(String dialogName)
4815	6139	{
4816		- if (GrafreeD.standAlone)
	6140	+ if (Grafreed.standAlone)
4817	6141	{
4818	6142	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4819	6143	browser.show();
..	..	@@ -4877,10 +6201,48 @@
4877	6201	cButton flashSelectionButton;
4878	6202	cButton editButton;
4879	6203	cButton uneditButton;
	6204	+ JCheckBox allParamsButton;
4880	6205	cButton clearpanelButton;
4881		- cButton allParamsButton;
4882	6206	cButton unselectButton;
4883	6207
	6208	+ cButton restoreCameraButton;
	6209	+
	6210	+ cButton oneStepButton;
	6211	+
	6212	+ cButton groupButton;
	6213	+ cButton ungroupButton;
	6214	+ cButton compositeButton;
	6215	+ cButton switchButton;
	6216	+ cButton loopButton;
	6217	+ cButton textureButton;
	6218	+
	6219	+ cButton skybox1Button;
	6220	+ cButton skybox2Button;
	6221	+ cButton skybox3Button;
	6222	+ cButton skybox4Button;
	6223	+ cButton skybox5Button;
	6224	+ cButton skybox6Button;
	6225	+ cButton skybox7Button;
	6226	+
	6227	+ cButton skybox11Button;
	6228	+ cButton skybox12Button;
	6229	+ cButton skybox13Button;
	6230	+ cButton skybox14Button;
	6231	+ cButton skybox15Button;
	6232	+ cButton skybox16Button;
	6233	+ cButton skybox17Button;
	6234	+
	6235	+ cButton gridButton;
	6236	+ cButton boxButton;
	6237	+ cButton sphereButton;
	6238	+ cButton coneButton;
	6239	+ cButton torusButton;
	6240	+ cButton superButton;
	6241	+ cButton kleinButton;
	6242	+ cButton particlesButton;
	6243	+ cButton overlayButton;
	6244	+ cButton lightButton;
	6245	+
4884	6246	cButton screenfitButton;
4885	6247	cButton screenfitpointButton;
4886	6248	cButton snapobjectButton;
..	..	@@ -4892,14 +6254,6 @@
4892	6254
4893	6255	cButton setsupportButton;
4894	6256
4895		- cButton twoButton;
4896		- cButton sixButton;
4897		- cButton threeButton;
4898		- cButton sevenButton;
4899		- cButton fourButton; // full panel
4900		- cButton oneButton; // full XYZ
4901		- //cButton currentLayout;
4902		-
4903	6257	//
4904	6258	//Composite
4905	6259	Object3D // to do !!
..	..	@@ -4909,10 +6263,12 @@
4909	6263	//JTree jTree;
4910	6264	private MenuItem lookAtItem;
4911	6265	private MenuItem lookFromItem;
4912		- private MenuItem switchItem;
4913		- private MenuItem cutItem;
4914		- private MenuItem duplicateItem;
4915		- private MenuItem cloneItem;
	6266	+ private MenuItem switchViewItem;
	6267	+ private JMenuItem cutItem;
	6268	+ private MenuItem undoItem;
	6269	+ private MenuItem redoItem;
	6270	+ private JMenuItem duplicateItem;
	6271	+ private JMenuItem cloneItem;
4916	6272	private MenuItem cloneSupportItem;
4917	6273	private MenuItem overwriteGeoItem;
4918	6274	private MenuItem overwriteMatItem;
..	..	@@ -4924,7 +6280,7 @@
4924	6280	private MenuItem linkverticesItem;
4925	6281	private MenuItem relinkverticesItem;
4926	6282	private MenuItem setMasterItem;
4927		- private MenuItem resetMeshItem;
	6283	+ private MenuItem resetAllItem;
4928	6284	private MenuItem stepAllItem;
4929	6285	private MenuItem revertMeshItem;
4930	6286	private MenuItem poseMeshItem;
..	..	@@ -4933,12 +6289,13 @@
4933	6289	private MenuItem cloneGeometriesItem;
4934	6290	private MenuItem shareGeometriesItem;
4935	6291	private MenuItem mergeGeometriesItem;
4936		- private MenuItem copyItem;
	6292	+ private JMenuItem copyItem;
4937	6293	private MenuItem pasteItem;
4938		- private MenuItem pasteLinkItem;
4939		- private MenuItem pasteCloneItem;
4940		- private MenuItem pasteExpandItem;
4941		- private MenuItem clearItem;
	6294	+ private JMenuItem pasteIntoItem;
	6295	+ private JMenuItem pasteLinkItem;
	6296	+ private JMenuItem pasteCloneItem;
	6297	+ private JMenuItem pasteExpandItem;
	6298	+ private JMenuItem deleteItem;
4942	6299	private MenuItem clearAllItem;
4943	6300	private MenuItem genUVItem;
4944	6301	private MenuItem genNormalsMESHItem;
..	..	@@ -4973,6 +6330,10 @@
4973	6330	private MenuItem showleavesItem;
4974	6331	private MenuItem markleavesItem;
4975	6332	private MenuItem unmarkleavesItem;
	6333	+ private MenuItem rewindleavesItem;
	6334	+ private MenuItem unrewindleavesItem;
	6335	+ private MenuItem randomleavesItem;
	6336	+ private MenuItem unrandomleavesItem;
4976	6337
4977	6338	private MenuItem flipVItem;
4978	6339	private MenuItem unflipVItem;
..	..	@@ -4984,15 +6345,17 @@
4984	6345	private MenuItem panoTexturesItem;
4985	6346
4986	6347	private MenuItem resetCentroidItem;
4987		- private MenuItem transformgeometryItem;
	6348	+ private MenuItem resetCentroidXZItem;
4988	6349	private MenuItem resetTransformItem;
	6350	+ private MenuItem transformGeometryItem;
	6351	+ private MenuItem transformChildrenItem;
4989	6352	private MenuItem hideItem;
4990	6353	private MenuItem grabItem;
4991	6354	private MenuItem backItem;
4992	6355	private MenuItem frontItem;
4993	6356	private MenuItem cameraItem;
4994	6357	private MenuItem compositeItem;
4995		- private MenuItem randomItem;
	6358	+ private MenuItem switchItem;
4996	6359	private MenuItem physicsItem;
4997	6360	private MenuItem frameselectorItem;
4998	6361	private MenuItem scriptNodeItem;
..	..	@@ -5000,13 +6363,14 @@
5000	6363	private MenuItem switchTransfoItem;
5001	6364	private MenuItem morphItem;
5002	6365	private MenuItem linkerItem;
5003		- private MenuItem ungroupItem;
	6366	+ private JMenuItem ungroupItem;
5004	6367	private MenuItem editItem;
5005	6368	private MenuItem openWindowItem;
5006	6369	private MenuItem editLeafItem;
5007	6370
5008	6371	private MenuItem resetParentItem;
5009	6372	private MenuItem repairParentItem;
	6373	+ private MenuItem repairShadowItem;
5010	6374	private MenuItem sortbysizeItem;
5011	6375	private MenuItem sortbynameItem;
5012	6376
..	..	@@ -5015,6 +6379,8 @@
5015	6379	private MenuItem attachBumpItem;
5016	6380	private MenuItem detachBumpItem;
5017	6381	private MenuItem pigmentBumpItem;
	6382	+ private MenuItem embedTexturesItem;
	6383	+ private MenuItem deEmbedTexturesItem;
5018	6384
5019	6385	private MenuItem particleItem;
5020	6386	private MenuItem ragdollItem;
..	..	@@ -5031,7 +6397,7 @@
5031	6397	private MenuItem blobItem;
5032	6398	private MenuItem latheItem;
5033	6399	private MenuItem bezierItem;
5034		- private MenuItem checkerItem;
	6400	+ private MenuItem overlayItem;
5035	6401	private MenuItem meshItem;
5036	6402	// private MenuItem meshGroupItem;
5037	6403	private MenuItem springItem;
..	..	@@ -5053,11 +6419,6 @@
5053	6419	private MenuItem doubleItem;
5054	6420	private MenuItem tripleItem;
5055	6421
5056		- private MenuItem importGFDItem;
5057		- private MenuItem importVRMLX3DItem;
5058		- private MenuItem import3DSItem;
5059		- private MenuItem importOBJItem;
5060		-
5061	6422	private MenuItem computeAOItem;
5062	6423	private MenuItem recompileItem;
5063	6424	private MenuItem editScriptItem;
..	..	@@ -5067,4 +6428,8 @@
5067	6428	private MenuItem analyzeItem;
5068	6429	private MenuItem dumpItem;
5069	6430	//boolean freezemodel = false;
	6431	+
	6432	+ Menu cameraMenu;
	6433	+ MenuItem editCameraItem;
	6434	+ MenuItem restoreCameraItem;
5070	6435	}