~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,73 +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);
	700	+ relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
	701	+ relinkverticesItem.addActionListener(this);
	702	+
	703	+ if (Globals.ADVANCED)
	704	+ {
222	705	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
223	706	setMasterItem.addActionListener(this);
	707	+ }
224	708
225	709	oe.menuBar.add(menu = new Menu("Group"));
226		- grabItem = menu.add(new MenuItem("Grab"));
227		- grabItem.addActionListener(this);
	710	+// grabItem = menu.add(new MenuItem("Grab"));
	711	+// grabItem.addActionListener(this);
228	712	backItem = menu.add(new MenuItem("Back"));
229	713	backItem.addActionListener(this);
230	714	frontItem = menu.add(new MenuItem("Front"));
231	715	frontItem.addActionListener(this);
232		- compositeItem = menu.add(new MenuItem("Composite"));
233		- compositeItem.addActionListener(this);
234		- menu.add("-");
235		- randomItem = menu.add(new MenuItem("Random"));
236		- randomItem.addActionListener(this);
237		- physicsItem = menu.add(new MenuItem("Physics"));
238		- physicsItem.addActionListener(this);
239		- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
240		- frameselectorItem.addActionListener(this);
	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"));
	722	+ hideItem.addActionListener(this);
	723	+ }
	724	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
	725	+ ungroupItem.addActionListener(this);
	726	+
	727	+// menu.add("-");
	728	+//
	729	+// switchItem = menu.add(new MenuItem("Switch node"));
	730	+// switchItem.addActionListener(this);
	731	+ if (Globals.ADVANCED)
	732	+ {
241	733	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
242	734	switchGeoItem.addActionListener(this);
243	735	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
244	736	switchTransfoItem.addActionListener(this);
245		- morphItem = menu.add(new MenuItem("Morph"));
	737	+ morphItem = menu.add(new MenuItem("Morph Group"));
246	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);
247	745	scriptNodeItem = menu.add(new MenuItem("Script Node"));
248	746	scriptNodeItem.addActionListener(this);
249		- cameraItem = menu.add(new MenuItem("Camera"));
250		- cameraItem.addActionListener(this);
	747	+ }
251	748
252	749	oe.menuBar.add(menu = new Menu("Object"));
253		- textureItem = menu.add(new MenuItem("Texture"));
254		- textureItem.addActionListener(this);
	750	+// textureItem = menu.add(new MenuItem("Texture"));
	751	+// textureItem.addActionListener(this);
	752	+ billboardItem = menu.add(new MenuItem("Billboard"));
	753	+ billboardItem.addActionListener(this);
255	754	csgItem = menu.add(new MenuItem("CSG"));
256	755	csgItem.addActionListener(this);
257		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	756	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
258	757	shadowXItem.addActionListener(this);
259		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	758	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
260	759	shadowYItem.addActionListener(this);
261		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	760	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
262	761	shadowZItem.addActionListener(this);
	762	+ attributeItem = menu.add(new MenuItem("Attribute"));
	763	+ attributeItem.addActionListener(this);
	764	+
	765	+ if (Globals.ADVANCED)
	766	+ {
	767	+ menu.add("-");
263	768	linkerItem = menu.add(new MenuItem("Linker"));
264	769	linkerItem.addActionListener(this);
265	770	templateItem = menu.add(new MenuItem("Template"));
266	771	templateItem.addActionListener(this);
267		- attributeItem = menu.add(new MenuItem("Attribute"));
268		- attributeItem.addActionListener(this);
269	772	pointflowItem = menu.add(new MenuItem("Point Flow"));
270	773	pointflowItem.addActionListener(this);
	774	+ }
271	775	menu.add("-");
272		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
273		- transformgeometryItem.addActionListener(this);
274	776	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
275	777	resetTransformItem.addActionListener(this);
276	778	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
277	779	resetCentroidItem.addActionListener(this);
278		- ungroupItem = menu.add(new MenuItem("Ungroup"));
279		- ungroupItem.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);
280	786
281	787	oe.menuBar.add(menu = new Menu("Geometry"));
282	788	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -287,6 +793,11 @@
287	793	genNormalsCADItem.addActionListener(this);
288	794	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
289	795	genNormalsMESHItem.addActionListener(this);
	796	+ if (Globals.ADVANCED)
	797	+ {
	798	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
	799	+ genNormalsMINEItem.addActionListener(this);
	800	+ }
290	801	stripifyItem = menu.add(new MenuItem("Stripify"));
291	802	stripifyItem.addActionListener(this);
292	803	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -308,23 +819,34 @@
308	819	reduce34MeshItem.addActionListener(this);
309	820	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
310	821	increaseMeshItem.addActionListener(this);
311		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
312		- smoothMeshItem.addActionListener(this);
313	822	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
314	823	clipMeshItem.addActionListener(this);
	824	+
	825	+ if (Globals.ADVANCED)
	826	+ {
	827	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	828	+ smoothMeshItem.addActionListener(this);
	829	+ }
315	830
316	831	oe.menuBar.add(menu = new Menu("Attributes"));
317	832	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
318	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);
319	838	menu.add("-");
320	839	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
321	840	liveleavesItem.addActionListener(this);
322	841	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
323	842	unliveleavesItem.addActionListener(this);
	843	+ if (Globals.ADVANCED)
	844	+ {
324	845	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
325	846	supportleavesItem.addActionListener(this);
326	847	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
327	848	unsupportleavesItem.addActionListener(this);
	849	+ }
328	850	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
329	851	hideleavesItem.addActionListener(this);
330	852	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -333,6 +855,14 @@
333	855	markleavesItem.addActionListener(this);
334	856	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
335	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);
336	866	menu.add("-");
337	867	flipVItem = menu.add(new MenuItem("Flip V"));
338	868	flipVItem.addActionListener(this);
..	..	@@ -358,53 +888,130 @@
358	888	attachBumpItem.addActionListener(this);
359	889	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
360	890	pigmentBumpItem.addActionListener(this);
	891	+ //embedTexturesItem
361	892	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
362	893	detachPigmentItem.addActionListener(this);
363	894	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
364	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);
365	900	menu.add("-");
366	901	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
367	902	sortbysizeItem.addActionListener(this);
368	903	sortbynameItem = menu.add(new MenuItem("Sort by name"));
369	904	sortbynameItem.addActionListener(this);
370	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.
371	916	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
372	917	extractGeometriesItem.addActionListener(this);
373	918	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
374	919	cloneGeometriesItem.addActionListener(this);
375		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
376		- shareGeometriesItem.addActionListener(this);
377		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
378		- mergeGeometriesItem.addActionListener(this);
	920	+ }
379	921
380	922	oe.menuBar.add(menu = new Menu("Insert"));
381	923	buildCreateMenu(menu);
382	924
383		-
384		- oe.menuBar.add(menu = new Menu("Include"));
385		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
386		- importGFDItem.addActionListener(this);
387		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
388		- importVRMLX3DItem.addActionListener(this);
389		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
390		- importOBJItem.addActionListener(this);
391		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
392		- import3DSItem.addActionListener(this);
393		-
394	925	oe.menuBar.add(menu = new Menu("Tools"));
395	926	buildToolsMenu(menu);
396	927	}
397	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	+
398	998	void SetupUI2(ObjEditor oe)
399	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	+
400	1012	//new Exception().printStackTrace();
401	1013
402	1014	oe.radioPanel = new JPanel(new GridBagLayout());
403		- oe.aConstraints.weightx = 1;
404		- oe.aConstraints.weighty = 0;
405		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
406		- oe.aConstraints.gridwidth = 100;
407		- oe.aConstraints.gridheight = 1;
408	1015	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
409	1016
410	1017	oe.buttonGroup = new ButtonGroup();
..	..	@@ -425,150 +1032,263 @@
425	1032	oe.radioPanel.add(dummyButton);
426	1033	oe.buttonGroup.add(dummyButton);
427	1034	*/
428		- aConstraints.gridy += 1;
429		- oe.aConstraints.gridwidth = 1;
430		- oe.aConstraints.gridx = 0;
	1035	+ cGridBag copyOptionsPanel = new cGridBag();
	1036	+
	1037	+ copyOptionsPanel.preferredHeight = 2;
431	1038
432		- 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");
433	1140	liveCB.addItemListener(this);
434	1141
435		- oe.aConstraints.gridx += 1;
436		- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
437		- supportCB.addItemListener(this);
438		-
439		- // oe.aConstraints.gridx += 1;
440		- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
441		- // localCB.addItemListener(this);
442		-
443		- oe.aConstraints.gridx += 1;
444		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", CameraPane.CROWD), oe.aConstraints);
445		- crowdCB.addItemListener(this);
446		-
447		- oe.aConstraints.gridx += 1;
448		- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
449		- smoothCB.addItemListener(this);
450		-
451		- oe.aConstraints.gridx += 1;
452		- 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");
453	1144	fastCB.addItemListener(this);
454		- oe.aConstraints.gridx += 1;
455		- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
456		- slowCB.addItemListener(this);
457		- oe.aConstraints.gridx += 1;
458		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.FAST), oe.aConstraints);
459		- 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);
460	1151
461		-// oe.aConstraints.gridx += 1;
462		-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
463		-// speakerMocapCB.addItemListener(this);
464		-
465		- if (false)
466		- {
467		- // handled in scripts
468		- oe.aConstraints.gridx += 1;
469		- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
470		- speakerCameraCB.addItemListener(this);
471		-
472		- oe.aConstraints.gridx += 1;
473		- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
474		- speakerFocusCB.addItemListener(this);
475		-
476		- oe.aConstraints.gridx += 1;
477		- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
478		- smoothfocusCB.addItemListener(this);
479		- }
480		-
481		-//oe.aConstraints.gridx += 1;
482		-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
483		-// debugCB.addItemListener(this);
484		-
485		- oe.aConstraints.gridx += 1;
486		- oe.toolbarPanel.add(oeilCB = new cCheckBox("O", CameraPane.OEIL), oe.aConstraints);
487		- oeilCB.addItemListener(this);
488		-
489		- oe.aConstraints.gridx += 1;
490		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("T", CameraPane.LOOKAT), oe.aConstraints);
491		- lookAtCB.addItemListener(this);
492		-
493		- oe.aConstraints.gridx += 1;
494		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
495		- trackCB.addItemListener(this);
496		-
497		- oe.aConstraints.gridx += 1;
498		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
499		- screenfitButton.addActionListener(this);
500		- oe.aConstraints.gridx += 1;
501	1152	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
502	1153	// screenfitpointButton.addActionListener(this);
503		-// oe.aConstraints.gridx += 1;
504		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
505		- snapobjectButton.addActionListener(this);
506		- oe.aConstraints.gridx += 1;
507	1154
508		- //aConstraints.gridx = 0;
509		- //aConstraints.gridy += 1;
510		- oe.aConstraints.weighty = 0;
511		- oe.aConstraints.gridwidth = 1;
512		-
513		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
514		- flashSelectionButton.addActionListener(this);
515		- oe.aConstraints.gridx += 1;
516		- oe.aConstraints.weighty = 0;
517		- oe.aConstraints.gridwidth = 1;
518		-
519		- //
520		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
521		- twoButton.addActionListener(this);
522		- 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);
523	1162	fourButton.addActionListener(this);
524		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
525		- sixButton.addActionListener(this);
526		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
527		- threeButton.addActionListener(this);
528		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
529		- sevenButton.addActionListener(this);
530		- //
	1163	+ fourButton.setToolTipText("Show control panel only");
	1164	+ }
531	1165
532		- 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");
533	1171	rootButton.addActionListener(this);
534		- oe.aConstraints.gridx += 1;
535		- 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");
536	1175	closeButton.addActionListener(this);
537	1176	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
538	1177	//clearButton.addActionListener(this);
539		- oe.aConstraints.gridx += 1;
540		-
541		- oe.aConstraints.gridx = 1; //
542		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
543		- editButton.addActionListener(this);
544		- oe.aConstraints.gridx += 1;
545		- oe.aConstraints.weighty = 0;
546		- oe.aConstraints.gridwidth = 1;
547	1178
548		- 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");
549	1268	uneditButton.addActionListener(this);
550	1269
551		- oe.aConstraints.gridx += 1;
552		- oe.aConstraints.weighty = 0;
553		- oe.aConstraints.gridwidth = 1;
554		-
555		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
556		- clearPanelButton.addActionListener(this);
557		-
558		- oe.aConstraints.gridx += 1;
559		- oe.aConstraints.weighty = 0;
560		- oe.aConstraints.gridwidth = 1;
561		-
562		- 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");
563	1272	allParamsButton.addActionListener(this);
564	1273
565		- oe.aConstraints.gridx += 1;
566		- oe.aConstraints.weighty = 0;
567		- oe.aConstraints.gridwidth = 1;
568		-
569		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
570		- 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);
571	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	+
572	1292	// oe.aConstraints.gridx += 1;
573	1293	// oe.aConstraints.weighty = 0;
574	1294	// oe.aConstraints.gridwidth = 1;
..	..	@@ -580,47 +1300,32 @@
580	1300	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
581	1301	// gcButton.addActionListener(this);
582	1302
583		- oe.aConstraints.gridx = 0;
584		- oe.aConstraints.gridy += 1;
585		-
586		- //ctrlPanel.add(objList = new List(5, true));
587		- oe.aConstraints.gridwidth = 100;
588		- // oe.aConstraints.gridheight = 100;
589		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
590		- oe.aConstraints.gridheight = 1;
591		- oe.aConstraints.weighty = 0.5;
592		- oe.aConstraints.gridx = 0;
593		- JScrollPane jSP;
	1303	+ cGridBag jSPPanel = new cGridBag();
	1304	+
	1305	+ JScrollPane jSP;
594	1306	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
595		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	1307	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
596	1308	ResetModel();
597		- oe.aConstraints.weighty = 0.5;
598		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
599		- oe.aConstraints.gridy += 1;
600		- oe.aConstraints.gridwidth = 1;
601		-
602		- oe.aConstraints.weighty = 0;
603		- oe.aConstraints.gridwidth = 2;
604		-
605		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
606		- colorCB.addItemListener(this);
607		- oe.aConstraints.gridx += 2;
608		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
609		- materialCB.addItemListener(this);
610		- oe.aConstraints.gridx += 2;
611		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
612		- textureCB.addItemListener(this);
613		-
614		- oe.aConstraints.gridx = 0;
615		- oe.aConstraints.gridy += 1;
616	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	+
617	1322	//jList.addListSelectionListener(this);
618	1323	oe.jTree.addTreeSelectionListener(this);
619	1324	//jTree.setRootVisible(false);
620	1325	//jTree.setEditable(true);
621	1326	oe.jTree.setDragEnabled(true);
622	1327	//jTree.setPreferredSize(new Dimension(10,10));
623		- jSP.setPreferredSize(new Dimension(100,200));
	1328	+ //jSP.setPreferredSize(new Dimension(100,200));
624	1329
625	1330	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
626	1331
..	..	@@ -632,23 +1337,171 @@
632	1337	dgr.addDragGestureListener(this);
633	1338	}catch(Exception e) {}
634	1339	*/
635		- radio.layout = sevenButton;
	1340	+ radio.layout = threeButton; // sixButton;
636	1341	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
637	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	+ }
638	1472
639	1473	void EditObject(Object3D obj)
640	1474	{
641		- cRadio dummyButton = new cRadio(obj.name);
642		- dummyButton.SetObject(obj);
643		- dummyButton.layout = sevenButton;
644		- dummyButton.SetCamera(cameraView.renderCamera, false);
645		- dummyButton.addActionListener(this);
646		- radioPanel.add(dummyButton);
647		- buttonGroup.add(dummyButton);
648		- 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();
649	1499	}
	1500	+
650	1501	void SetupViews(ObjEditor oe)
651	1502	{
	1503	+ theFrame = this;
	1504	+
652	1505	oe.SetupViews();
653	1506
654	1507	System.out.println("SetupViews");
..	..	@@ -657,22 +1510,30 @@
657	1510	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
658	1511	}
659	1512
660		- JCheckBox liveCB;
661		- JCheckBox supportCB;
662		- JCheckBox localCB;
663		- JCheckBox crowdCB;
664		- JCheckBox smoothCB;
665		- JCheckBox fastCB;
666		- JCheckBox slowCB;
667		- JCheckBox boxCB;
668		- JCheckBox trackCB;
669		- 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;
670	1528	// JCheckBox speakerMocapCB;
671		- JCheckBox speakerCameraCB;
672		- JCheckBox speakerFocusCB;
673		- JCheckBox debugCB;
674		- JCheckBox oeilCB;
675		- JCheckBox lookAtCB;
	1529	+ cCheckBox speakerCameraCB;
	1530	+ cCheckBox speakerFocusCB;
	1531	+ cCheckBox debugCB;
	1532	+
	1533	+ cCheckBox oeilCB;
	1534	+ cCheckBox shadowCB;
	1535	+ cCheckBox autokeepCB;
	1536	+ cCheckBox lookAtCB;
676	1537
677	1538	// static int COLOR = 1;
678	1539	// static int MATERIAL = 2;
..	..	@@ -680,9 +1541,9 @@
680	1541
681	1542	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
682	1543
683		- JCheckBox colorCB;
684		- JCheckBox materialCB;
685		- JCheckBox textureCB;
	1544	+ cCheckBox colorCB;
	1545	+ cCheckBox materialCB;
	1546	+ cCheckBox textureCB;
686	1547
687	1548	public void itemStateChanged(ItemEvent e)
688	1549	{
..	..	@@ -707,10 +1568,10 @@
707	1568	dropAttributes \|= Object3D.TEXTURE;
708	1569	else
709	1570	dropAttributes &= ~Object3D.TEXTURE;
710		- }
711		- else if(e.getSource() == liveCB)
	1571	+ } else if(e.getSource() == liveCB)
712	1572	{
713	1573	cameraView.ToggleLive();
	1574	+ refreshContents(false);
714	1575	}
715	1576	else if(e.getSource() == supportCB)
716	1577	{
..	..	@@ -726,6 +1587,12 @@
726	1587	{
727	1588	cameraView.ToggleInertia();
728	1589	cameraView.repaint();
	1590	+ }
	1591	+ else if(e.getSource() == minshaderCB)
	1592	+ {
	1593	+ Globals.MINSHADER ^= true;
	1594	+ cameraView.programInitialized = false;
	1595	+ cameraView.repaint();
729	1596	}
730	1597	else if(e.getSource() == localCB)
731	1598	{
..	..	@@ -745,6 +1612,10 @@
745	1612	Recompile();
746	1613	cameraView.repaint();
747	1614	// refreshContents();
	1615	+ }
	1616	+ else if(e.getSource() == zoomBoxCB)
	1617	+ {
	1618	+ cameraView.ToggleZoomBoxMode();
748	1619	}
749	1620	else if(e.getSource() == smoothfocusCB)
750	1621	{
..	..	@@ -771,6 +1642,18 @@
771	1642	{
772	1643	cameraView.ToggleOeil();
773	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	+ }
774	1657	else if(e.getSource() == lookAtCB)
775	1658	{
776	1659	cameraView.ToggleLookAt();
..	..	@@ -787,7 +1670,8 @@
787	1670
788	1671	/**/
789	1672	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
790		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1673	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1674	+ TreePath path = objEditor.jTree.getSelectionPath();
791	1675	if ((path == null) \|\| (path.getPathCount() <= 1)) {
792	1676	// We can't move the root node or an empty selection
793	1677	return;
..	..	@@ -850,8 +1734,6 @@
850	1734	}
851	1735	}
852	1736
853		- String string = (String) object;
854		-
855	1737	System.out.println("Transfer = " + object + "; drop : " + target);
856	1738	// if( object instanceof java.io.File[])
857	1739	// {
..	..	@@ -859,7 +1741,11 @@
859	1741	// objEditor.DropFile((java.io.File[]) object, true);
860	1742	// return;
861	1743	// }
862		- 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) == ':')
863	1749	{
864	1750	// file(s)
865	1751	String[] names = string.split("\n");
..	..	@@ -886,7 +1772,7 @@
886	1772
887	1773	flashIt = false;
888	1774	CameraPane pane = (CameraPane) target;
889		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1775	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
890	1776	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
891	1777
892	1778	if (group.selection.size() == 1)
..	..	@@ -902,23 +1788,33 @@
902	1788
903	1789	assert target == objEditor.jTree;
904	1790	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1791	+ Object3D destinationLeaf;
905	1792	try {
906		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1793	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
907	1794	} catch (Exception e) {
908	1795	System.out.println("destinationPath : " + destinationPath);
909	1796	return;
910	1797	}
911	1798
912		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1799	+ for (int i=group.selection.size(); --i>=0;)
913	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	+// {
914	1810	loadClipboard(true);
915	1811	objEditor.jTree.setSelectionPath(destinationPath);
916		- pasteInto(false);
917		- } else {
918		- loadClipboard(false);
919		- objEditor.jTree.setSelectionPath(destinationPath);
920		- pasteInto(false); // true); // ???
921		- }
	1812	+ pasteInto(false, false);
	1813	+// } else {
	1814	+// loadClipboard(false);
	1815	+// objEditor.jTree.setSelectionPath(destinationPath);
	1816	+// pasteInto(false, false); // true); // ???
	1817	+// }
922	1818	}
923	1819	public void dropActionChanged(DropTargetDragEvent dtde)
924	1820	// Called if the user has modified the current drop gesture
..	..	@@ -974,7 +1870,12 @@
974	1870	TreePath path;
975	1871
976	1872	public TransferableTreePath(TreePath tp) {
977		- 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);
978	1879	}
979	1880
980	1881	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1023,83 +1924,107 @@
1023	1924	{
1024	1925	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1025	1926	//heightFieldItem.addActionListener(this);
1026		- gridItem = menu.add(new MenuItem("Grid"));
1027		- gridItem.addActionListener(this);
1028		- rectoidItem = menu.add(new MenuItem("Box"));
1029		- rectoidItem.addActionListener(this);
1030		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1031		- ellipsoidItem.addActionListener(this);
1032		- coneItem = menu.add(new MenuItem("Cone"));
1033		- coneItem.addActionListener(this);
1034		- torusItem = menu.add(new MenuItem("Torus"));
1035		- torusItem.addActionListener(this);
1036		- superItem = menu.add(new MenuItem("Superellipsoid"));
1037		- superItem.addActionListener(this);
1038		- particleItem = menu.add(new MenuItem("Particle system"));
1039		- particleItem.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	+ {
	1945	+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
	1946	+ kleinItem.addActionListener(this);
	1947	+ }
	1948	+
	1949	+// particleItem = menu.add(new MenuItem("Particle system"));
	1950	+// particleItem.addActionListener(this);
	1951	+ if (Globals.ADVANCED)
	1952	+ {
1040	1953	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1041	1954	ragdollItem.addActionListener(this);
1042	1955	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1043	1956	ragdoll2Item.addActionListener(this);
	1957	+ }
1044	1958	menu.add("-");
1045		- meshItem = menu.add(new MenuItem("Mesh"));
	1959	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1046	1960	meshItem.addActionListener(this);
1047	1961	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1048	1962	// meshGroupItem.addActionListener(this);
	1963	+ if (Globals.ADVANCED)
	1964	+ {
1049	1965	springItem = menu.add(new MenuItem("Spring"));
1050	1966	springItem.addActionListener(this);
1051	1967	flagItem = menu.add(new MenuItem("Flag"));
1052	1968	flagItem.addActionListener(this);
1053		- bezierItem = menu.add(new MenuItem("Patch"));
1054		- bezierItem.addActionListener(this);
1055		- checkerItem = menu.add(new MenuItem("Checker"));
1056		- checkerItem.addActionListener(this);
1057	1969	blobItem = menu.add(new MenuItem("Blob"));
1058	1970	blobItem.addActionListener(this);
1059	1971	latheItem = menu.add(new MenuItem("Lathe"));
1060	1972	latheItem.addActionListener(this);
1061		- lightItem = menu.add(new MenuItem("Light"));
1062		- 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);
1063	1980	menu.add("-");
1064	1981	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1065	1982	//superLoopItem.addActionListener(this);
1066		- loopItem = menu.add(new MenuItem("Loop"));
1067		- loopItem.addActionListener(this);
	1983	+// loopItem = menu.add(new MenuItem("Loop"));
	1984	+// loopItem.addActionListener(this);
1068	1985	doubleItem = menu.add(new MenuItem("Fork"));
1069	1986	doubleItem.addActionListener(this);
	1987	+ if (Globals.ADVANCED)
	1988	+ {
1070	1989	tripleItem = menu.add(new MenuItem("Trident"));
1071	1990	tripleItem.addActionListener(this);
	1991	+ }
1072	1992	}
1073	1993
1074	1994	void buildToolsMenu(Menu menu)
1075	1995	{
1076	1996	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1077	1997	animationItem.addItemListener(this);
1078		- animationItem.setState(CameraPane.ANIMATION);
	1998	+ animationItem.setState(Globals.ANIMATION);
	1999	+
	2000	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	2001	+ archiveItem.addActionListener(this);
1079	2002
1080	2003	menu.add("-");
1081	2004	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1082	2005	parseverticesItem.addActionListener(this);
1083	2006	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1084	2007	textureFieldItem.addActionListener(this);
1085		- alignItem = menu.add(new MenuItem("Align"));
	2008	+ alignItem = menu.add(new MenuItem("Align Objects"));
1086	2009	alignItem.addActionListener(this);
1087		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1088		- mirrorItem.addActionListener(this);
1089	2010	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1090	2011	reduceMorphItem.addActionListener(this);
1091	2012	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1092	2013	reduce34MorphItem.addActionListener(this);
1093		-
1094		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1095		- computeAOItem.addActionListener(this);
1096	2014	menu.add("-");
1097		-
1098	2015	menu.add(memoryItem = new MenuItem("Memory Usage"));
1099	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("-");
1100	2025	menu.add(analyzeItem = new MenuItem("Analyze"));
1101	2026	analyzeItem.addActionListener(this);
1102		- menu.add(dumpItem = new MenuItem("Dump"));
	2027	+ menu.add(dumpItem = new MenuItem("Print"));
1103	2028	dumpItem.addActionListener(this);
1104	2029	// menu.add(pathItem = new MenuItem("From-to path"));
1105	2030	// pathItem.addActionListener(this);
..	..	@@ -1108,6 +2033,8 @@
1108	2033	resetParentItem.addActionListener(this);
1109	2034	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1110	2035	repairParentItem.addActionListener(this);
	2036	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	2037	+ repairShadowItem.addActionListener(this);
1111	2038	menu.add(invariantsItem = new MenuItem("Invariants"));
1112	2039	invariantsItem.addActionListener(this);
1113	2040	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1115,6 +2042,7 @@
1115	2042	menu.add("-");
1116	2043	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1117	2044	editScriptItem.addActionListener(this);
	2045	+ }
1118	2046	}
1119	2047
1120	2048	void ScreenFit()
..	..	@@ -1237,9 +2165,38 @@
1237	2165	shadow.material = new cMaterial(obj.material);
1238	2166	shadow.material.diffuse = 0.0001f;
1239	2167	shadow.material.specular = 0.0001f;
	2168	+ shadow.material.opacity = 0.75f;
	2169	+
	2170	+ AllocProjectedVertices(shadow);
	2171	+
	2172	+ shadow.projectedVertices[1].x = 300;
1240	2173
1241	2174	makeSomething(shadow);
1242	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	+ }
1243	2200
1244	2201	/**
1245	2202	* applyExample
..	..	@@ -1443,9 +2400,9 @@
1443	2400
1444	2401	void Overwrite(int mask)
1445	2402	{
1446		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2403	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1447	2404	{
1448		- Object3D content = GrafreeD.clipboard.get(0);
	2405	+ Object3D content = Grafreed.clipboard.get(0);
1449	2406
1450	2407	if (content instanceof cGroup && ((cGroup)content).transientlink )
1451	2408	content = ((cGroup)content).get(0);
..	..	@@ -1468,6 +2425,7 @@
1468	2425	//
1469	2426	public void actionPerformed(ActionEvent event) // , Object arg)
1470	2427	{
	2428	+ Object source = event.getSource();
1471	2429	/*
1472	2430	if (event.getSource() == nameField)
1473	2431	{
..	..	@@ -1479,11 +2437,11 @@
1479	2437	}
1480	2438	else
1481	2439	*/
1482		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	2440	+ if (source == lookAtItem \|\| source == lookFromItem)
1483	2441	{
1484	2442	ScreenFit();
1485	2443	} else
1486		- if (event.getSource() == switchItem)
	2444	+ if (source == switchViewItem)
1487	2445	{
1488	2446	cVector v1 = new cVector();
1489	2447	cVector v2 = new cVector();
..	..	@@ -1492,11 +2450,11 @@
1492	2450	objEditor.cameraView.renderCamera.setAim(v2, v1);
1493	2451	objEditor.cameraView.repaint();
1494	2452	} else
1495		- if (event.getSource() == rectoidItem)
	2453	+ if (source == rectoidItem \|\| source == boxButton)
1496	2454	{
1497	2455	makeSomething(new Box());
1498	2456	} else
1499		- if (event.getSource() == particleItem)
	2457	+ if (source == particleItem \|\| source == particlesButton)
1500	2458	{
1501	2459	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1502	2460	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1517,9 +2475,9 @@
1517	2475	applyExample(particleGeom, "SMOKE");
1518	2476	makeSomething(particleGeom);
1519	2477	} else
1520		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	2478	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1521	2479	{
1522		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	2480	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1523	2481
1524	2482	ragdoll.toParent = LA.newMatrix();
1525	2483	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1537,7 +2495,7 @@
1537	2495	} else
1538	2496	/*
1539	2497	*/
1540		- if (event.getSource() == heightFieldItem)
	2498	+ if (source == heightFieldItem)
1541	2499	{
1542	2500	Object3D obj = new Object3D();
1543	2501
..	..	@@ -1575,27 +2533,31 @@
1575	2533
1576	2534	makeSomething(obj);
1577	2535	} else
1578		- if (event.getSource() == gridItem)
	2536	+ if (source == gridItem \|\| source == gridButton)
1579	2537	{
1580	2538	makeSomething(new Grid());
1581	2539	} else
1582		- if (event.getSource() == ellipsoidItem)
	2540	+ if (source == ellipsoidItem \|\| source == sphereButton)
1583	2541	{
1584	2542	makeSomething(new Sphere());
1585	2543	} else
1586		- if (event.getSource() == coneItem)
	2544	+ if (source == coneItem \|\| source == coneButton)
1587	2545	{
1588	2546	makeSomething(new Cone());
1589	2547	} else
1590		- if (event.getSource() == torusItem)
	2548	+ if (source == torusItem \|\| source == torusButton)
1591	2549	{
1592	2550	makeSomething(new Torus());
1593	2551	} else
1594		- if (event.getSource() == superItem)
	2552	+ if (source == superItem \|\| source == superButton)
1595	2553	{
1596	2554	makeSomething(new Superellipsoid());
1597	2555	} else
1598		- if (event.getSource() == blobItem)
	2556	+ if (source == kleinItem \|\| source == kleinButton)
	2557	+ {
	2558	+ makeSomething(new Klein());
	2559	+ } else
	2560	+ if (source == blobItem)
1599	2561	{
1600	2562	Blob blob = new Blob();
1601	2563	BlobComponent comp = new BlobComponent();
..	..	@@ -1603,15 +2565,15 @@
1603	2565	//blob.retile();
1604	2566	makeSomething(blob);
1605	2567	} else
1606		- if (event.getSource() == latheItem)
	2568	+ if (source == latheItem)
1607	2569	{
1608	2570	makeSomething(new Lathe());
1609	2571	} else
1610		- if (event.getSource() == bezierItem)
	2572	+ if (source == bezierItem)
1611	2573	{
1612	2574	makeSomething(new BezierSurface());
1613	2575	} else
1614		- if (event.getSource() == checkerItem)
	2576	+ if (source == overlayItem \|\| source == overlayButton)
1615	2577	{
1616	2578	/*
1617	2579	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1626,7 +2588,7 @@
1626	2588	*/
1627	2589	makeSomething(new Checker());
1628	2590	} else
1629		- if (event.getSource() == meshItem)
	2591	+ if (source == meshItem)
1630	2592	{
1631	2593	Object3D itemtomake = new Object3D();
1632	2594	Object3D child;
..	..	@@ -1647,35 +2609,52 @@
1647	2609	makeSomething(child);
1648	2610	}
1649	2611	} else
1650		- if (event.getSource() == springItem)
	2612	+ if (source == springItem)
1651	2613	{
1652	2614	cSpring s = new cSpring();
1653	2615	s.setup();
1654	2616	makeSomething(s);
1655	2617	} else
1656		- if (event.getSource() == flagItem)
	2618	+ if (source == flagItem)
1657	2619	{
1658	2620	cSpring s = new cFlag();
1659	2621	s.setup();
1660	2622	makeSomething(s);
1661	2623	} else
1662		- if (event.getSource() == lightItem)
	2624	+ if (source == lightItem \|\| source == lightButton)
1663	2625	{
1664	2626	makeSomething(new Light());
1665	2627	} else
1666		- 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)
1667	2646	{
1668	2647	group(new CSG());
1669	2648	} else
1670		- if (event.getSource() == templateItem)
	2649	+ if (source == templateItem)
1671	2650	{
1672	2651	group(new cTemplate());
1673	2652	} else
1674		- if (event.getSource() == attributeItem)
	2653	+ if (source == attributeItem)
1675	2654	{
1676	2655	makeSomething(new Attribute());
1677	2656	} else
1678		- if (event.getSource() == pointflowItem)
	2657	+ if (source == pointflowItem)
1679	2658	{
1680	2659	makeSomething(new PointFlow());
1681	2660	} else
..	..	@@ -1687,7 +2666,7 @@
1687	2666	} else
1688	2667	*/
1689	2668
1690		- if (event.getSource() == superLoopItem)
	2669	+ if (source == superLoopItem)
1691	2670	{
1692	2671	Composite g = new cGroup();
1693	2672	for (int i=0; i<15; i++)
..	..	@@ -1709,30 +2688,38 @@
1709	2688
1710	2689	group(g);
1711	2690	} else
1712		- if (event.getSource() == loopItem)
	2691	+ if (source == loopItem \|\| source == loopButton)
1713	2692	{
	2693	+ if (!group.selection.isEmpty())
	2694	+ {
1714	2695	Composite csg = new GroupLeaf();
1715	2696	csg.count = 5;
1716		- group(csg);
1717		- Composite child = new cGroup();
	2697	+ Composite child = new cGroup("Branch");
1718	2698	csg.addChild(child);
1719	2699	child.addChild(csg);
	2700	+ group(csg);
	2701	+ }
1720	2702	} else
1721		- if (event.getSource() == doubleItem)
	2703	+ if (source == doubleItem)
1722	2704	{
1723		- Composite csg = new GroupLeaf();
	2705	+ if (!group.selection.isEmpty())
	2706	+ {
	2707	+ Composite csg = new GroupLeaf("Fork");
1724	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);
1725	2715	group(csg);
1726		- Composite child = new cGroup();
1727		- csg.addChild(child);
1728		- child.addChild(csg);
1729		- child = new cGroup();
1730		- csg.addChild(child);
1731		- child.addChild(csg);
	2716	+ }
1732	2717	} else
1733		- if (event.getSource() == tripleItem)
	2718	+ if (source == tripleItem)
1734	2719	{
1735		- Composite csg = new GroupLeaf();
	2720	+ if (!group.selection.isEmpty())
	2721	+ {
	2722	+ Composite csg = new GroupLeaf("Trident");
1736	2723	csg.count = 4;
1737	2724	group(csg);
1738	2725	Composite child = new cGroup();
..	..	@@ -1744,74 +2731,119 @@
1744	2731	child = new cGroup();
1745	2732	csg.addChild(child);
1746	2733	child.addChild(csg);
	2734	+ }
1747	2735	} else
1748		-
1749		- if (event.getSource() == importGFDItem)
	2736	+ if (source == computeAOItem)
1750	2737	{
1751		- ImportGFD();
	2738	+ Globals.drawMode = CameraPane.OCCLUSION;
	2739	+ cameraView.repaint();
1752	2740	} else
1753		- if (event.getSource() == importVRMLX3DItem)
1754		- {
1755		- ImportVRMLX3D();
1756		- } else
1757		- if (event.getSource() == import3DSItem)
1758		- {
1759		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1760		- } else
1761		- if (event.getSource() == importOBJItem)
1762		- {
1763		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1764		- } else
1765		- if (event.getSource() == computeAOItem)
1766		- {
1767		- CameraPane.drawMode = CameraPane.OCCLUSION;
1768		- CameraPane.theRenderer.repaint();
1769		- } else
1770		- if (event.getSource() == recompileItem)
	2741	+ if (source == recompileItem)
1771	2742	{
1772	2743	Recompile();
1773	2744	refreshContents();
1774	2745	} else
1775		- if (event.getSource() == editScriptItem)
	2746	+ if (source == editScriptItem)
1776	2747	{
1777	2748	OpenDialog();
1778	2749	refreshContents();
1779	2750	} else
1780		- if (event.getSource() == invariantsItem)
	2751	+ if (source == invariantsItem)
1781	2752	{
1782	2753	System.out.println("Invariants:");
1783		- GrafreeD.theApplet3D.universe.invariants();
	2754	+ Grafreed.grafreed.universe.invariants();
1784	2755	} else
1785		- if (event.getSource() == memoryItem)
	2756	+ if (source == memoryItem)
1786	2757	{
1787	2758	//System.out.println("Invariants:");
1788	2759	PrintMemory();
1789	2760	} else
1790		- if (event.getSource() == pathItem)
	2761	+ if (source == pathItem)
1791	2762	{
1792	2763	PrintPath();
1793	2764	} else
1794		- if (event.getSource() == analyzeItem)
	2765	+ if (source == analyzeItem)
1795	2766	{
1796	2767	AnalyzeObject();
1797	2768	} else
1798		- if (event.getSource() == dumpItem)
	2769	+ if (source == dumpItem)
1799	2770	{
1800	2771	DumpObject();
1801	2772	} else
1802		- if (event.getSource() == screenfitButton)
	2773	+ if (source == minButton)
1803	2774	{
1804		- //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	+ {
1805	2839	ScreenFit();
1806	2840	} else
1807		- if (event.getSource() == screenfitpointButton)
	2841	+ if (source == screenfitpointButton)
1808	2842	{
1809		- //Reload(lastConverter, lastFilename, true);
1810	2843	ScreenFitPoint();
1811	2844	} else
1812		- if (event.getSource() == snapobjectButton)
	2845	+ if (source == snapobjectButton)
1813	2846	{
1814		- //Reload(lastConverter, lastFilename, true);
1815	2847	SnapObject();
1816	2848	} else
1817	2849	// if (event.getSource() == recompileButton)
..	..	@@ -1820,13 +2852,13 @@
1820	2852	// Recompile();
1821	2853	// refreshContents();
1822	2854	// } else
1823		- if (event.getSource() == gcButton)
	2855	+ if (source == gcButton)
1824	2856	{
1825	2857	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1826	2858	System.gc();
1827	2859	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1828	2860	} else
1829		- if (event.getSource() == editLeafItem)
	2861	+ if (source == editLeafItem)
1830	2862	{
1831	2863	Object3D obj;
1832	2864	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1840,62 +2872,74 @@
1840	2872	}
1841	2873	refreshContents(true);
1842	2874	} else
1843		- if (event.getSource() == openWindowItem)
	2875	+ if (source == openWindowItem)
1844	2876	{
1845	2877	EditSelection(true);
1846	2878	} else
1847		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2879	+ if (source == cutItem \|\| source == clearButton)
1848	2880	{
1849	2881	loadClipboard(true);
1850	2882	} else
1851		- if (event.getSource() == duplicateItem)
	2883	+ if (source == undoItem)
1852	2884	{
1853		- 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;
1854	2894	loadClipboard(false);
1855	2895	paste(false);
1856		- GrafreeD.clipboard = keep;
	2896	+ Grafreed.clipboard = keep;
1857	2897	} else
1858		- if (event.getSource() == cloneItem)
	2898	+ if (source == cloneItem)
1859	2899	{
1860	2900	CloneSelection(false);
1861	2901	} else
1862		- if (event.getSource() == cloneSupportItem)
	2902	+ if (source == cloneSupportItem)
1863	2903	{
1864	2904	CloneSelection(true);
1865	2905	} else
1866		- if (event.getSource() == copyItem)
	2906	+ if (source == copyItem)
1867	2907	{
1868	2908	loadClipboard(false);
1869	2909	} else
1870		- if (event.getSource() == pasteItem)
	2910	+ if (source == pasteItem)
1871	2911	{
1872	2912	paste(false);
1873	2913	} else
1874		- if (event.getSource() == pasteLinkItem)
	2914	+ if (source == pasteIntoItem)
1875	2915	{
1876		- pasteInto(false);
	2916	+ pasteInto(true, false);
1877	2917	} else
1878		- if (event.getSource() == pasteCloneItem)
	2918	+ if (source == pasteLinkItem)
1879	2919	{
1880		- pasteInto(true);
	2920	+ pasteInto(false, false);
1881	2921	} else
1882		- if (event.getSource() == pasteExpandItem)
	2922	+ if (source == pasteCloneItem)
	2923	+ {
	2924	+ pasteInto(true, true);
	2925	+ } else
	2926	+ if (source == pasteExpandItem)
1883	2927	{
1884	2928	paste(true);
1885	2929	} else
1886		- if (event.getSource() == synchronizeItem)
	2930	+ if (source == synchronizeItem)
1887	2931	{
1888	2932	Overwrite(Object3D.TRANSFORM);
1889	2933	} else
1890		- if (event.getSource() == overwriteNameItem)
	2934	+ if (source == overwriteNameItem)
1891	2935	{
1892	2936	Overwrite(Object3D.NAME);
1893	2937	} else
1894		- if (event.getSource() == overwriteUVItem)
	2938	+ if (source == overwriteUVItem)
1895	2939	{
1896	2940	Overwrite(Object3D.UV);
1897	2941	} else
1898		- if (event.getSource() == overwriteMatItem)
	2942	+ if (source == overwriteMatItem)
1899	2943	{
1900	2944	/* july 2015
1901	2945	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1915,7 +2959,7 @@
1915	2959
1916	2960	Overwrite(dropAttributes);
1917	2961	}
1918		- if (event.getSource() == overwriteGeoItem)
	2962	+ if (source == overwriteGeoItem)
1919	2963	{
1920	2964	Overwrite(Object3D.GEOMETRY);
1921	2965	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1932,7 +2976,7 @@
1932	2976	// refreshContents();
1933	2977	// }
1934	2978	} else
1935		- if (event.getSource() == generateMeshItem)
	2979	+ if (source == generateMeshItem)
1936	2980	{
1937	2981	//if (group.selection.size() == 1)
1938	2982	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1943,7 +2987,7 @@
1943	2987	ResetModel();
1944	2988	refreshContents();
1945	2989	} else
1946		- if (event.getSource() == extractGeometriesItem)
	2990	+ if (source == extractGeometriesItem)
1947	2991	{
1948	2992	boolean one = false;
1949	2993
..	..	@@ -1970,7 +3014,7 @@
1970	3014	ResetModel();
1971	3015	refreshContents();
1972	3016	} else
1973		- if (event.getSource() == cloneGeometriesItem)
	3017	+ if (source == cloneGeometriesItem)
1974	3018	{
1975	3019	boolean one = false;
1976	3020
..	..	@@ -1996,32 +3040,37 @@
1996	3040	ResetModel();
1997	3041	refreshContents();
1998	3042	} else
1999		- if (event.getSource() == shareGeometriesItem)
	3043	+ if (source == shareGeometriesItem)
2000	3044	{
2001	3045	boolean one = false;
2002	3046
2003	3047	if (group.selection.size() == 1)
2004	3048	one = true;
2005	3049
	3050	+ Object3D merge = null;
	3051	+
2006	3052	Object3D content = new cGroup();
2007	3053
2008	3054	for (int i=0; i<group.selection.size(); i++)
2009	3055	{
2010		- Object3D sel = new Merge(group.selection.get(i));
	3056	+ merge = new Merge(group.selection.get(i));
2011	3057
2012	3058	if (one)
2013		- makeSomething(sel, false);
	3059	+ makeSomething(merge, false);
2014	3060	else
2015		- content.addChild(sel);
	3061	+ content.addChild(merge);
2016	3062	}
2017	3063
2018	3064	if (!one)
2019		- makeSomething(content, false);
2020		-
2021		- ResetModel();
2022		- refreshContents();
	3065	+ makeSomething(content, true);
	3066	+ else
	3067	+ {
	3068	+ ResetModel();
	3069	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	3070	+ refreshContents();
	3071	+ }
2023	3072	} else
2024		- if (event.getSource() == mergeGeometriesItem)
	3073	+ if (source == mergeGeometriesItem)
2025	3074	{
2026	3075	boolean one = false;
2027	3076
..	..	@@ -2051,7 +3100,7 @@
2051	3100	ResetModel();
2052	3101	refreshContents();
2053	3102	} else
2054		- if (event.getSource() == linkverticesItem)
	3103	+ if (source == linkverticesItem)
2055	3104	{
2056	3105	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2057	3106	// {
..	..	@@ -2064,39 +3113,48 @@
2064	3113	// group.selection.get(0).setMasterThis(content); // should be identity
2065	3114	// refreshContents();
2066	3115	// }
2067		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	3116	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2068	3117	{
2069		- Object3D content = GrafreeD.clipboard.get(0);
	3118	+ Object3D content = Grafreed.clipboard.get(0);
2070	3119
2071	3120	if (content instanceof cGroup && ((cGroup)content).transientlink )
2072	3121	content = ((cGroup)content).get(0);
2073	3122
2074		- 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));
2075	3124	for (int i=0; i<group.selection.size(); i++)
2076	3125	{
2077		- boolean random = CameraPane.RANDOM;
2078		- CameraPane.RANDOM = false; // parse all random nodes
	3126	+ boolean random = CameraPane.SWITCH;
	3127	+ CameraPane.SWITCH = false; // parse all random nodes
2079	3128	group.selection.get(i).linkVerticesThis(content);
2080	3129	// group.selection.get(i).setMasterThis(content); // should be identity
2081		- CameraPane.RANDOM = random;
	3130	+ CameraPane.SWITCH = random;
2082	3131	}
2083		- 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));
2084	3133	refreshContents();
2085	3134	}
2086	3135	} else
2087		- if (event.getSource() == resetsupportItem)
	3136	+ if (source == resetsupportItem)
2088	3137	{
2089	3138	for (int i=0; i<group.selection.size(); i++)
2090	3139	{
2091		- boolean random = CameraPane.RANDOM;
2092		- CameraPane.RANDOM = false; // parse all random nodes
	3140	+ boolean random = CameraPane.SWITCH;
	3141	+ CameraPane.SWITCH = false; // parse all random nodes
2093	3142	group.selection.get(i).linkVerticesThis(null);
2094		- CameraPane.RANDOM = random;
	3143	+ CameraPane.SWITCH = random;
2095	3144	}
2096	3145
2097	3146	refreshContents();
2098	3147	} else
2099		- if (event.getSource() == resetreferencesItem)
	3148	+ if (source == relinkverticesItem)
	3149	+ {
	3150	+ boolean random = CameraPane.SWITCH;
	3151	+ CameraPane.SWITCH = false; // parse all random nodes
	3152	+ group.selection.RelinkToSupport();
	3153	+ CameraPane.SWITCH = random;
	3154	+
	3155	+ refreshContents();
	3156	+ } else
	3157	+ if (source == resetreferencesItem)
2100	3158	{
2101	3159	for (int i=0; i<group.selection.size(); i++)
2102	3160	{
..	..	@@ -2105,11 +3163,11 @@
2105	3163
2106	3164	refreshContents();
2107	3165	} else
2108		- if (event.getSource() == setMasterItem)
	3166	+ if (source == setMasterItem)
2109	3167	{
2110		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	3168	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2111	3169	{
2112		- Object3D content = GrafreeD.clipboard.get(0);
	3170	+ Object3D content = Grafreed.clipboard.get(0);
2113	3171
2114	3172	if (content instanceof cGroup && ((cGroup)content).transientlink )
2115	3173	content = ((cGroup)content).get(0);
..	..	@@ -2118,13 +3176,13 @@
2118	3176	refreshContents();
2119	3177	}
2120	3178	} else
2121		- if (event.getSource() == poseMeshItem)
	3179	+ if (source == poseMeshItem)
2122	3180	{
2123	3181	if (group.selection.size() == 1)
2124	3182	{
2125		- if (GrafreeD.clipboard.size() == 1)
	3183	+ if (Grafreed.clipboard.size() == 1)
2126	3184	{
2127		- Object3D content = GrafreeD.clipboard.get(0);
	3185	+ Object3D content = Grafreed.clipboard.get(0);
2128	3186
2129	3187	if (content instanceof cGroup && ((cGroup)content).transientlink )
2130	3188	content = ((cGroup)content).get(0);
..	..	@@ -2137,19 +3195,19 @@
2137	3195	}
2138	3196
2139	3197	} else
2140		- if (event.getSource() == revertMeshItem)
	3198	+ if (source == revertMeshItem)
2141	3199	{
2142	3200	RevertMeshes();
2143	3201	} else
2144		- if (event.getSource() == resetMeshItem)
	3202	+ if (source == resetAllItem)
2145	3203	{
2146	3204	ResetAll();
2147	3205	} else
2148		- if (event.getSource() == stepAllItem)
	3206	+ if (source == stepAllItem)
2149	3207	{
2150	3208	StepAll();
2151	3209	} else
2152		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	3210	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2153	3211	{
2154	3212	//int indices[] = jList.getSelectedIndices();
2155	3213	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2157,42 +3215,46 @@
2157	3215
2158	3216	ClearSelection(false);
2159	3217	} else
2160		- if (event.getSource() == clearAllItem)
	3218	+ if (source == clearAllItem)
2161	3219	{
2162	3220	ClearSelection(true);
2163	3221	} else
2164		- if (event.getSource() == grabItem)
	3222	+ if (source == grabItem \|\| source == groupButton)
2165	3223	{
2166		- group(new cGroup(), true);
	3224	+ group(new cGroup(), false); // true);
2167	3225	} else
2168		- if (event.getSource() == frontItem)
	3226	+ if (source == hideItem)
	3227	+ {
	3228	+ group(new HiddenObject());
	3229	+ } else
	3230	+ if (source == frontItem)
2169	3231	{
2170	3232	front();
2171	3233	} else
2172		- if (event.getSource() == backItem)
	3234	+ if (source == backItem)
2173	3235	{
2174	3236	back();
2175	3237	} else
2176		- if (event.getSource() == cameraItem)
	3238	+ if (source == cameraItem)
2177	3239	{
2178	3240	makeSomething(new Camera());
2179	3241	} else
2180		- if (event.getSource() == compositeItem)
	3242	+ if (source == compositeItem \|\| source == compositeButton)
2181	3243	{
2182	3244	group(new Composite());
2183	3245	} else
2184		- if (event.getSource() == randomItem)
	3246	+ if (source == switchItem \|\| source == switchButton)
2185	3247	{
2186	3248	RandomNode random = new RandomNode();
2187	3249	group(random);
2188	3250	if (random.size() > 0)
2189		- random.name = random.get(0).name + "Rnd";
	3251	+ random.name = random.get(0).name + "Switch";
2190	3252	} else
2191		- if (event.getSource() == physicsItem)
	3253	+ if (source == physicsItem)
2192	3254	{
2193	3255	group(new PhysicsNode());
2194	3256	} else
2195		- if (event.getSource() == frameselectorItem)
	3257	+ if (source == frameselectorItem)
2196	3258	{
2197	3259	for (int i=0; i<group.selection.size(); i++)
2198	3260	{
..	..	@@ -2204,7 +3266,7 @@
2204	3266	ResetModel();
2205	3267	refreshContents();
2206	3268	} else
2207		- if (event.getSource() == switchGeoItem)
	3269	+ if (source == switchGeoItem)
2208	3270	{
2209	3271	for (int i=0; i<group.selection.size(); i++)
2210	3272	{
..	..	@@ -2216,7 +3278,7 @@
2216	3278	ResetModel();
2217	3279	refreshContents();
2218	3280	} else
2219		- if (event.getSource() == switchTransfoItem)
	3281	+ if (source == switchTransfoItem)
2220	3282	{
2221	3283	for (int i=0; i<group.selection.size(); i++)
2222	3284	{
..	..	@@ -2228,7 +3290,7 @@
2228	3290	ResetModel();
2229	3291	refreshContents();
2230	3292	} else
2231		- if (event.getSource() == morphItem)
	3293	+ if (source == morphItem)
2232	3294	{
2233	3295	for (int i=0; i<group.selection.size(); i++)
2234	3296	{
..	..	@@ -2240,7 +3302,7 @@
2240	3302	ResetModel();
2241	3303	refreshContents();
2242	3304	} else
2243		- if (event.getSource() == scriptNodeItem)
	3305	+ if (source == scriptNodeItem)
2244	3306	{
2245	3307	boolean atleastone = false;
2246	3308
..	..	@@ -2279,199 +3341,264 @@
2279	3341	}
2280	3342	}
2281	3343	} else
2282		- if (event.getSource() == linkerItem)
	3344	+ if (source == linkerItem)
2283	3345	{
2284	3346	group(new cLinker());
2285	3347	} else
2286		- if (event.getSource() == textureItem)
	3348	+ if (source == textureItem \|\| source == textureButton)
2287	3349	{
2288	3350	group(new TextureNode());
2289	3351	} else
2290		- if (event.getSource() == shadowXItem)
	3352	+ if (source == billboardItem)
	3353	+ {
	3354	+ group(new BillboardNode());
	3355	+ } else
	3356	+ if (source == shadowXItem)
2291	3357	{
2292	3358	CastShadow(0);
2293	3359	} else
2294		- if (event.getSource() == shadowYItem)
	3360	+ if (source == shadowYItem)
2295	3361	{
2296	3362	CastShadow(1);
2297	3363	} else
2298		- if (event.getSource() == shadowZItem)
	3364	+ if (source == shadowZItem)
2299	3365	{
2300	3366	CastShadow(2);
2301	3367	} else
2302		- if (event.getSource() == ungroupItem)
	3368	+ if (source == ungroupItem \|\| source == ungroupButton)
2303	3369	{
2304		- ungroup();
	3370	+ boolean canUngroup = true;
	3371	+
	3372	+ for (int i=0; i<group.selection.size(); i++)
	3373	+ {
	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	+ }
	3389	+ }
	3390	+
	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	+ }
2305	3404	} else
2306		- if (event.getSource() == genUVItem)
	3405	+ if (source == genUVItem)
2307	3406	{
2308	3407	GenUV();
2309	3408	} else
2310		- if (event.getSource() == genNormalsCADItem)
	3409	+ if (source == genNormalsCADItem)
2311	3410	{
2312	3411	GenNormals(true);
2313	3412	} else
2314		- if (event.getSource() == genNormalsMESHItem)
	3413	+ if (source == genNormalsMESHItem)
2315	3414	{
2316		- GenNormals(true); // TODO
	3415	+ GenNormalsMESH();
2317	3416	} else
2318		- if (event.getSource() == genNormalsORGANItem)
	3417	+ if (source == genNormalsORGANItem)
2319	3418	{
2320	3419	GenNormals(false);
2321	3420	} else
2322		- if (event.getSource() == stripifyItem)
	3421	+ if (source == genNormalsMINEItem)
	3422	+ {
	3423	+ GenNormalsMINE();
	3424	+ } else
	3425	+ if (source == stripifyItem)
2323	3426	{
2324	3427	Stripify();
2325	3428	} else
2326		- if (event.getSource() == unstripifyItem)
	3429	+ if (source == unstripifyItem)
2327	3430	{
2328	3431	Unstripify();
2329	3432	} else
2330		- if (event.getSource() == trimItem)
	3433	+ if (source == trimItem)
2331	3434	{
2332	3435	Trim();
2333	3436	} else
2334		- if (event.getSource() == untrimItem)
	3437	+ if (source == untrimItem)
2335	3438	{
2336	3439	Untrim();
2337	3440	} else
2338		- if (event.getSource() == clearColorsItem)
	3441	+ if (source == clearColorsItem)
2339	3442	{
2340	3443	ClearColors();
2341	3444	} else
2342		- if (event.getSource() == clearMaterialsItem)
	3445	+ if (source == clearMaterialsItem)
2343	3446	{
2344	3447	ClearMaterials();
2345	3448	} else
2346		- if (event.getSource() == liveleavesItem)
	3449	+ if (source == liveleavesItem)
2347	3450	{
2348	3451	LiveLeaves(true);
2349	3452	} else
2350		- if (event.getSource() == unliveleavesItem)
	3453	+ if (source == unliveleavesItem)
2351	3454	{
2352	3455	LiveLeaves(false);
2353	3456	} else
2354		- if (event.getSource() == supportleavesItem)
	3457	+ if (source == supportleavesItem)
2355	3458	{
2356	3459	SupportLeaves(true);
2357	3460	} else
2358		- if (event.getSource() == unsupportleavesItem)
	3461	+ if (source == unsupportleavesItem)
2359	3462	{
2360	3463	SupportLeaves(false);
2361	3464	} else
2362		- if (event.getSource() == hideleavesItem)
	3465	+ if (source == hideleavesItem)
2363	3466	{
2364	3467	HideLeaves(true);
2365	3468	} else
2366		- if (event.getSource() == showleavesItem)
	3469	+ if (source == showleavesItem)
2367	3470	{
2368	3471	HideLeaves(false);
2369	3472	} else
2370		- if (event.getSource() == markleavesItem)
	3473	+ if (source == markleavesItem)
2371	3474	{
2372	3475	MarkLeaves(true);
2373	3476	} else
2374		- if (event.getSource() == unmarkleavesItem)
	3477	+ if (source == unmarkleavesItem)
2375	3478	{
2376	3479	MarkLeaves(false);
2377	3480	} else
2378		- 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)
2379	3498	{
2380	3499	FlipV(true);
2381	3500	} else
2382		- if (event.getSource() == unflipVItem)
	3501	+ if (source == unflipVItem)
2383	3502	{
2384	3503	FlipV(false);
2385	3504	} else
2386		- if (event.getSource() == lowTexturesItem)
	3505	+ if (source == lowTexturesItem)
2387	3506	{
2388	3507	SetTexRes(0);
2389	3508	} else
2390		- if (event.getSource() == normalTexturesItem)
	3509	+ if (source == normalTexturesItem)
2391	3510	{
2392	3511	SetTexRes(1);
2393	3512	} else
2394		- if (event.getSource() == highTexturesItem)
	3513	+ if (source == highTexturesItem)
2395	3514	{
2396	3515	SetTexRes(2);
2397	3516	} else
2398		- if (event.getSource() == veryhighTexturesItem)
	3517	+ if (source == veryhighTexturesItem)
2399	3518	{
2400	3519	SetTexRes(3);
2401	3520	} else
2402		- if (event.getSource() == maxTexturesItem)
	3521	+ if (source == maxTexturesItem)
2403	3522	{
2404	3523	SetTexRes(4);
2405	3524	} else
2406		- if (event.getSource() == panoTexturesItem)
	3525	+ if (source == panoTexturesItem)
2407	3526	{
2408	3527	SetTexRes(5);
2409	3528	} else
2410		- if (event.getSource() == reverseNormalsItem)
	3529	+ if (source == reverseNormalsItem)
2411	3530	{
2412	3531	ReverseNormals();
2413	3532	} else
2414		- if (event.getSource() == parseverticesItem)
	3533	+ if (source == parseverticesItem)
2415	3534	{
2416	3535	ParseVertices();
2417	3536	} else
2418		- if (event.getSource() == textureFieldItem)
	3537	+ if (source == textureFieldItem)
2419	3538	{
2420	3539	TextureVertices();
2421	3540	} else
2422		- if (event.getSource() == alignItem)
	3541	+ if (source == alignItem)
2423	3542	{
2424	3543	Align();
2425	3544	} else
2426		- if (event.getSource() == mirrorItem)
	3545	+ if (source == mirrorItem)
2427	3546	{
2428	3547	MirrorPoses();
2429	3548	} else
2430		- if (event.getSource() == reduceMorphItem)
	3549	+ if (source == reduceMorphItem)
2431	3550	{
2432	3551	MeshReduction(false);
2433	3552	} else
2434		- if (event.getSource() == reduce34MorphItem)
	3553	+ if (source == reduce34MorphItem)
2435	3554	{
2436	3555	MeshReduction(true);
2437	3556	} else
2438		- if (event.getSource() == reverseTrianglesItem)
	3557	+ if (source == reverseTrianglesItem)
2439	3558	{
2440	3559	ReverseTriangles();
2441	3560	} else
2442		- if (event.getSource() == reduceMeshItem)
	3561	+ if (source == reduceMeshItem)
2443	3562	{
2444	3563	ReduceMesh(false);
2445	3564	} else
2446		- if (event.getSource() == reduce34MeshItem)
	3565	+ if (source == reduce34MeshItem)
2447	3566	{
2448	3567	ReduceMesh(true);
2449	3568	} else
2450		- if (event.getSource() == increaseMeshItem)
	3569	+ if (source == increaseMeshItem)
2451	3570	{
2452	3571	IncreaseMesh();
2453	3572	} else
2454		- if (event.getSource() == clipMeshItem)
	3573	+ if (source == clipMeshItem)
2455	3574	{
2456	3575	ClipMesh();
2457	3576	} else
2458		- if (event.getSource() == smoothMeshItem)
	3577	+ if (source == smoothMeshItem)
2459	3578	{
2460	3579	SmoothMesh();
2461	3580	} else
2462		- if (event.getSource() == transformgeometryItem)
	3581	+ if (source == transformGeometryItem)
2463	3582	{
2464	3583	TransformGeometry();
2465	3584	} else
2466		- if (event.getSource() == resetTransformItem)
	3585	+ if (source == transformChildrenItem)
	3586	+ {
	3587	+ TransformChildren();
	3588	+ } else
	3589	+ if (source == resetTransformItem)
2467	3590	{
2468	3591	ResetTransform();
2469	3592	} else
2470		- if (event.getSource() == resetCentroidItem)
	3593	+ if (source == resetCentroidItem)
2471	3594	{
2472		- ResetCentroid();
	3595	+ ResetCentroid(true);
2473	3596	} else
2474		- if (event.getSource() == resetParentItem)
	3597	+ if (source == resetCentroidXZItem)
	3598	+ {
	3599	+ ResetCentroid(false);
	3600	+ } else
	3601	+ if (source == resetParentItem)
2475	3602	{
2476	3603	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2477	3604	{
..	..	@@ -2481,7 +3608,7 @@
2481	3608
2482	3609	refreshContents();
2483	3610	} else
2484		- if (event.getSource() == repairParentItem)
	3611	+ if (source == repairParentItem)
2485	3612	{
2486	3613	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2487	3614	{
..	..	@@ -2495,7 +3622,21 @@
2495	3622
2496	3623	refreshContents();
2497	3624	} else
2498		- 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)
2499	3640	{
2500	3641	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2501	3642	{
..	..	@@ -2507,7 +3648,7 @@
2507	3648	ResetModel();
2508	3649	refreshContents();
2509	3650	} else
2510		- if (event.getSource() == sortbynameItem)
	3651	+ if (source == sortbynameItem)
2511	3652	{
2512	3653	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2513	3654	{
..	..	@@ -2519,7 +3660,7 @@
2519	3660	ResetModel();
2520	3661	refreshContents();
2521	3662	} else
2522		- if (event.getSource() == attachPigmentItem)
	3663	+ if (source == attachPigmentItem)
2523	3664	{
2524	3665	String texture = GetFile("Attach pigment");
2525	3666	Object3D obj;
..	..	@@ -2531,7 +3672,7 @@
2531	3672
2532	3673	refreshContents();
2533	3674	} else
2534		- if (event.getSource() == detachPigmentItem)
	3675	+ if (source == detachPigmentItem)
2535	3676	{
2536	3677	Object3D obj;
2537	3678	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2542,7 +3683,7 @@
2542	3683
2543	3684	refreshContents();
2544	3685	} else
2545		- if (event.getSource() == attachBumpItem)
	3686	+ if (source == attachBumpItem)
2546	3687	{
2547	3688	String texture = GetFile("Attach bump");
2548	3689	Object3D obj;
..	..	@@ -2554,18 +3695,18 @@
2554	3695
2555	3696	refreshContents();
2556	3697	} else
2557		- if (event.getSource() == detachBumpItem)
	3698	+ if (source == detachBumpItem)
2558	3699	{
2559	3700	Object3D obj;
2560	3701	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2561	3702	{
2562	3703	obj = (Object3D)e.nextElement();
2563		- obj.SetBumpTexture(null);
	3704	+ obj.ResetBumpTexture();
2564	3705	}
2565	3706
2566	3707	refreshContents();
2567	3708	} else
2568		- if (event.getSource() == pigmentBumpItem)
	3709	+ if (source == pigmentBumpItem)
2569	3710	{
2570	3711	Object3D obj;
2571	3712	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2576,159 +3717,233 @@
2576	3717
2577	3718	refreshContents();
2578	3719	} else
2579		- 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)
2580	3746	{
2581	3747	CameraPane.flash = true;
2582	3748	refreshContents();
2583	3749	} else
2584		- if (event.getSource() == oneButton)
	3750	+ if (source == oneButton)
2585	3751	{
2586	3752	} else
2587		- if (event.getSource() == twoButton)
	3753	+ if (source == twoButton)
2588	3754	{
2589	3755	radio.layout = twoButton;
2590		- // bug
2591		- //gridPanel.setDividerLocation(1.0);
2592		- //bigPanel.setDividerLocation(0.0);
2593		- bigThree.remove(jtp);
2594		- bigThree.remove(cameraPanel);
2595		- bigThree.remove(XYZPanel);
2596		- aWindowConstraints.gridx = 0;
2597		- aWindowConstraints.gridy = 0;
2598		- aWindowConstraints.gridwidth = 1;
2599		- // aConstraints.gridheight = 3;
2600		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2601		- aWindowConstraints.weightx = 0;
2602		- aWindowConstraints.weighty = 1;
2603		- //bigThree.add(jtp, aWindowConstraints);
2604		- aWindowConstraints.weightx = 1;
2605		- aWindowConstraints.gridwidth = 3;
2606		- // aConstraints.gridheight = 3;
2607		- aWindowConstraints.gridx = 1;
2608		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2609		- bigThree.add(cameraPanel, aWindowConstraints);
2610		- aWindowConstraints.weightx = 0;
2611		- aWindowConstraints.gridx = 4;
2612		- aWindowConstraints.gridwidth = 1;
2613		- // aConstraints.gridheight = 3;
2614		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2615		- //bigThree.add(XYZPanel, aWindowConstraints);
2616		- 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	+
2617	3779	} else
2618		- if (event.getSource() == threeButton)
	3780	+ if (source == threeButton)
2619	3781	{
2620	3782	radio.layout = threeButton;
2621		- bigThree.remove(jtp);
2622		- bigThree.remove(cameraPanel);
2623		- bigThree.remove(XYZPanel);
2624		- aWindowConstraints.gridx = 0;
2625		- aWindowConstraints.gridy = 0;
2626		- aWindowConstraints.gridwidth = 1;
2627		- // aConstraints.gridheight = 3;
2628		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2629		- aWindowConstraints.weightx = 0;
2630		- aWindowConstraints.weighty = 1;
2631		- //bigThree.add(jtp, aWindowConstraints);
2632		- aWindowConstraints.weightx = 1;
2633		- aWindowConstraints.gridwidth = 3;
2634		- // aConstraints.gridheight = 3;
2635		- aWindowConstraints.gridx = 1;
2636		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2637		- bigThree.add(cameraPanel, aWindowConstraints);
2638		- aWindowConstraints.weightx = 0;
2639		- aWindowConstraints.gridx = 4;
2640		- aWindowConstraints.gridwidth = 1;
2641		- // aConstraints.gridheight = 3;
2642		- aConstraints.fill = GridBagConstraints.VERTICAL;
2643		- bigThree.add(XYZPanel, aWindowConstraints);
2644		- 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();
2645	3820	} else
2646		- if (event.getSource() == fourButton)
	3821	+ if (source == fourButton)
2647	3822	{
2648	3823	radio.layout = fourButton;
2649		- bigThree.remove(jtp);
2650		- bigThree.remove(cameraPanel);
2651		- bigThree.remove(XYZPanel);
2652		- aWindowConstraints.gridx = 0;
2653		- aWindowConstraints.gridy = 0;
2654		- aWindowConstraints.gridwidth = 1;
2655		- // aWindowConstraints.gridheight = 3;
2656		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2657		- aWindowConstraints.weightx = 1;
2658		- aWindowConstraints.weighty = 1;
2659		- bigThree.add(jtp, aWindowConstraints);
2660		- aWindowConstraints.weightx = 1;
2661		- aWindowConstraints.gridwidth = 3;
2662		- // aConstraints.gridheight = 3;
2663		- aWindowConstraints.gridx = 1;
2664		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2665		- //bigThree.add(cameraPanel, aWindowConstraints);
2666		- aWindowConstraints.weightx = 0;
2667		- aWindowConstraints.gridx = 4;
2668		- aWindowConstraints.gridwidth = 1;
2669		- // aWindowConstraints.gridheight = 3;
2670		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2671		- //bigThree.add(XYZPanel, aWindowConstraints);
2672		- 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();
2673	3860	} else
2674		- if (event.getSource() == sixButton)
	3861	+ if (source == sixButton)
2675	3862	{
2676	3863	radio.layout = sixButton;
2677		- bigThree.remove(jtp);
2678		- bigThree.remove(cameraPanel);
2679		- bigThree.remove(XYZPanel);
2680		- aWindowConstraints.gridx = 0;
2681		- aWindowConstraints.gridy = 0;
2682		- aWindowConstraints.gridwidth = 1;
2683		- // aConstraints.gridheight = 3;
2684		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2685		- aWindowConstraints.weightx = 0;
2686		- aWindowConstraints.weighty = 1;
2687		- bigThree.add(jtp, aWindowConstraints);
2688		- aWindowConstraints.weightx = 1;
2689		- aWindowConstraints.gridwidth = 3;
2690		- // aWindowConstraints.gridheight = 3;
2691		- aWindowConstraints.gridx = 1;
2692		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2693		- bigThree.add(cameraPanel, aWindowConstraints);
2694		- aWindowConstraints.weightx = 0;
2695		- aWindowConstraints.gridx = 4;
2696		- aWindowConstraints.gridwidth = 1;
2697		- // aWindowConstraints.gridheight = 3;
2698		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2699		- //bigThree.add(XYZPanel, aConstraints);
2700		- 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();
2701	3901	} else
2702		- if (event.getSource() == sevenButton)
	3902	+ if (source == sevenButton)
2703	3903	{
2704	3904	radio.layout = sevenButton;
2705		- bigThree.remove(jtp);
2706		- bigThree.remove(cameraPanel);
2707		- bigThree.remove(XYZPanel);
2708		- aWindowConstraints.gridx = 0;
2709		- aWindowConstraints.gridy = 0;
2710		- aWindowConstraints.gridwidth = 1;
2711		- // aWindowConstraints.gridheight = 3;
2712		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2713		- aWindowConstraints.weightx = 0;
2714		- aWindowConstraints.weighty = 1;
2715		- bigThree.add(jtp, aWindowConstraints);
2716		- aWindowConstraints.weightx = 1;
2717		- aWindowConstraints.gridwidth = 3;
2718		- // aWindowConstraints.gridheight = 3;
2719		- aWindowConstraints.gridx = 1;
2720		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2721		- bigThree.add(cameraPanel, aWindowConstraints);
2722		- aWindowConstraints.weightx = 0;
2723		- aWindowConstraints.gridx = 4;
2724		- aWindowConstraints.gridwidth = 1;
2725		- // aConstraints.gridheight = 3;
2726		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2727		- bigThree.add(XYZPanel, aWindowConstraints);
2728		- 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();
2729	3943	} else
2730		- if (event.getSource() == rootButton)
	3944	+ if (source == rootButton)
2731	3945	{
	3946	+ Replace();
2732	3947	Object3D obj;
2733	3948	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2734	3949	{
..	..	@@ -2737,66 +3952,85 @@
2737	3952	EditObject(obj);
2738	3953	}
2739	3954
	3955	+ cameraView.requestFocusInWindow();
2740	3956	refreshContents(true);
2741	3957	} else
2742		- if (event.getSource() == closeButton)
	3958	+ if (source == closeButton)
2743	3959	{
2744	3960	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2745	3961	cRadio ab;
2746	3962	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2747	3963	{
2748	3964	ab = (cRadio)e.nextElement();
2749		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3965	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2750	3966	{
	3967	+ // Patch to avoid bug with transparency.
	3968	+ if (!ab.hadMaterial)
	3969	+ {
	3970	+ ab.object.material = null;
	3971	+ }
	3972	+
2751	3973	buttonGroup.remove(ab);
2752	3974	radioPanel.remove(ab);
2753	3975
2754		- ab.GetObject().editWindow = null;
	3976	+ //ab.GetObject().editWindow = null;
	3977	+ ab.GetObject().manipWindow = null;
2755	3978	// ab.GetObject().objectUI = null; // ?????????
2756	3979
2757	3980	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2758	3981	break;
2759	3982	}
2760	3983	}
	3984	+
	3985	+ cameraView.requestFocusInWindow();
2761	3986	refreshContents(true);
2762	3987	} else
2763		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3988	+ if (source == editItem \|\| source == editButton)
2764	3989	{
	3990	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3991	+ {
	3992	+ Object3D child = (Object3D)e.nextElement();
	3993	+ child.pinned = true;
	3994	+ }
	3995	+
2765	3996	EditSelection(false);
2766	3997	} else
2767		- if (event.getSource() == uneditButton)
	3998	+ if (source == uneditButton)
2768	3999	{
2769	4000	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2770	4001	{
2771	4002	Object3D child = (Object3D)e.nextElement();
2772	4003	if(child.editWindow != null)
2773		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4004	+ child.pinned = false;
2774	4005	child.CloseUI();
2775	4006	listUI.remove(child);
	4007	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2776	4008
2777		- child.editWindow = null; // ???????????
	4009	+ //child.editWindow = null; // ???????????
2778	4010	}
2779		- objEditor.ctrlPanel.revalidate();
	4011	+ objEditor.ctrlPanel.FlushUI();
2780	4012	//objEditor.jTree.clearSelection();
2781	4013	//objEditor.ResetSliders();
2782	4014	refreshContents(true);
2783	4015	} else
2784		- if (event.getSource() == clearPanelButton)
	4016	+ if (source == clearPanelButton)
2785	4017	{
2786	4018	assert(copy == group);
2787	4019	//copy.ClearUI();
2788	4020	for (Object3D obj : listUI)
2789	4021	{
	4022	+ obj.pinned = false;
2790	4023	obj.CloseUI();
2791	4024	}
2792	4025	listUI.clear();
	4026	+ SetPinStates(group.selection.size() > 0);
2793	4027	refreshContents(true);
2794	4028	} else
2795		- if (event.getSource() == allParamsButton)
	4029	+ if (source == allParamsButton)
2796	4030	{
2797	4031	assert(copy == group);
2798	4032
2799		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4033	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2800	4034
2801	4035	for (Object3D obj : listUI)
2802	4036	{
..	..	@@ -2813,19 +4047,19 @@
2813	4047
2814	4048	refreshContents(true);
2815	4049	} else
2816		- if (event.getSource() == unselectButton)
	4050	+ if (source == unselectButton)
2817	4051	{
2818	4052	objEditor.jTree.clearSelection();
2819	4053	// ?? oct 2012 GrafreeD.clipboard.clear();
2820	4054	objEditor.ResetSliders();
2821	4055	refreshContents(true);
2822	4056	} else
2823		- if(event.getSource() instanceof cRadio)
	4057	+ if(source instanceof cRadio)
2824	4058	{
2825	4059	group.parent = keepparent;
2826	4060	group.attributes = 0;
2827	4061	//group.editWindow = null;
2828		- /cRadio/ radio = (cRadio)event.getSource();
	4062	+ /cRadio/ radio = (cRadio)source;
2829	4063	Object3D obj = radio.GetObject();
2830	4064	System.out.println("Edit " + obj);
2831	4065	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2845,7 +4079,8 @@
2845	4079	}
2846	4080
2847	4081	copy = group;
2848		- //CameraPane.theRenderer.object = group;
	4082	+
	4083	+ //Globals.theRenderer.object = group;
2849	4084	if(!useclient)
2850	4085	{
2851	4086	cameraView.renderCamera = radio.camera;
..	..	@@ -2854,25 +4089,67 @@
2854	4089	cameraView.cameras[cameraView.cameracount] = radio.camera;
2855	4090	cameraView.targetLookAt.set(radio.camera.lookAt);
2856	4091	cameraView.object = group;
2857		- cameraView.lighttouched = true;
	4092	+ //cameraView.lighttouched = true;
	4093	+ Globals.lighttouched = true;
2858	4094	topView.object = group;
2859	4095	frontView.object = group;
2860	4096	sideView.object = group;
2861	4097	}
2862		- group.editWindow = this;
	4098	+
	4099	+// fix "+" issue
	4100	+ //group.editWindow = this;
	4101	+ group.manipWindow = this;
	4102	+
2863	4103	/*
2864	4104	currentLayout = radio.layout;
2865	4105	if (currentLayout == null)
2866	4106	currentLayout = sevenButton;
2867	4107	*/
2868	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);
2869	4129	keepparent = group.parent;
2870	4130	// PARENT = NULL or not???
2871	4131	//group.parent = null; // ROOT
2872	4132	//group.attributes = -1;
2873	4133	ResetModel();
	4134	+
	4135	+ cameraView.requestFocusInWindow();
2874	4136	refreshContents(true);
2875		- }
	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	+ }
2876	4153	else
2877	4154	{
2878	4155	//return super.action(event, arg);
..	..	@@ -2881,7 +4158,6 @@
2881	4158	}
2882	4159
2883	4160	boolean useclient = false;
2884		- cRadio radio;
2885	4161
2886	4162	void ToggleRoot()
2887	4163	{
..	..	@@ -2890,7 +4166,7 @@
2890	4166	if (useclient)
2891	4167	{
2892	4168	cameraView.object = client;
2893		- cameraView.lighttouched = true;
	4169	+ Globals.lighttouched = true;
2894	4170	//topView.object = client;
2895	4171	//frontView.object = client;
2896	4172	//sideView.object = client;
..	..	@@ -2898,7 +4174,7 @@
2898	4174	else
2899	4175	{
2900	4176	cameraView.object = group;
2901		- cameraView.lighttouched = true;
	4177	+ Globals.lighttouched = true;
2902	4178	//topView.object = group;
2903	4179	//frontView.object = group;
2904	4180	//sideView.object = group;
..	..	@@ -2933,6 +4209,28 @@
2933	4209	refreshContents();
2934	4210	}
2935	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	+ }
2936	4234
2937	4235	void ResetTransform()
2938	4236	{
..	..	@@ -3045,7 +4343,7 @@
3045	4343	refreshContents();
3046	4344	}
3047	4345
3048		- void ResetCentroid()
	4346	+ void ResetCentroid(boolean full)
3049	4347	{
3050	4348	Object3D obj;
3051	4349	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3060,12 +4358,16 @@
3060	4358	LA.matIdentity(Object3D.mat);
3061	4359	obj.getBounds(minima, maxima, false);
3062	4360	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3063		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	4361	+ if (full)
	4362	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3064	4363	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3065	4364	obj.TransformMesh(Object3D.mat);
	4365	+
3066	4366	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3067		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	4367	+ if (full)
	4368	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3068	4369	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	4370	+
3069	4371	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3070	4372	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3071	4373	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3094,7 +4396,8 @@
3094	4396
3095	4397	int size = obj.MemorySize();
3096	4398
3097		- 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)");
3098	4401	}
3099	4402	}
3100	4403	catch (Exception e)
..	..	@@ -3131,9 +4434,9 @@
3131	4434	obj = (Object3D)e.nextElement();
3132	4435
3133	4436	System.out.println("Object is: " + obj);
3134		- GrafreeD.AnalyzeObject(obj);
	4437	+ Grafreed.AnalyzeObject(obj);
3135	4438	System.out.println("Boundary rep: " + obj.bRep);
3136		- GrafreeD.AnalyzeObject(obj.bRep);
	4439	+ Grafreed.AnalyzeObject(obj.bRep);
3137	4440
3138	4441	// System.err.println((size/1024) + " KB is the size of " + obj);
3139	4442	}
..	..	@@ -3175,6 +4478,20 @@
3175	4478	void GenNormals(boolean crease)
3176	4479	{
3177	4480	group.GenNormalsS(crease);
	4481	+
	4482	+ refreshContents();
	4483	+ }
	4484	+
	4485	+ void GenNormalsMESH()
	4486	+ {
	4487	+ group.GenNormalsMeshS();
	4488	+
	4489	+ refreshContents();
	4490	+ }
	4491	+
	4492	+ void GenNormalsMINE()
	4493	+ {
	4494	+ group.selection.GenNormalsMINE();
3178	4495
3179	4496	refreshContents();
3180	4497	}
..	..	@@ -3340,8 +4657,8 @@
3340	4657
3341	4658	void ParseVertices()
3342	4659	{
3343		- boolean epsequal = GrafreeD.epsequal;
3344		- GrafreeD.epsequal = true;
	4660	+ boolean epsequal = Grafreed.epsequal;
	4661	+ Grafreed.epsequal = true;
3345	4662
3346	4663	for (int i=0; i<group.selection.size(); i++)
3347	4664	{
..	..	@@ -3366,7 +4683,7 @@
3366	4683	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3367	4684	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3368	4685
3369		- g.add(GrafreeD.clipboard);
	4686	+ g.add(Grafreed.clipboard);
3370	4687
3371	4688	buffer.add(g);
3372	4689	}
..	..	@@ -3381,7 +4698,7 @@
3381	4698	makeSomething(buffer, i==group.selection.size()-1);
3382	4699	}
3383	4700
3384		- GrafreeD.epsequal = epsequal;
	4701	+ Grafreed.epsequal = epsequal;
3385	4702
3386	4703	refreshContents();
3387	4704	}
..	..	@@ -3399,7 +4716,16 @@
3399	4716	String pigment = Object3D.GetPigment(tex);
3400	4717	//String bump = Object3D.GetBump(tex);
3401	4718
3402		- 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	+ }
3403	4729
3404	4730	double s = v.s;
3405	4731
..	..	@@ -3447,12 +4773,26 @@
3447	4773
3448	4774	void Align()
3449	4775	{
	4776	+ if (group.selection.size() == 0)
	4777	+ return;
	4778	+
	4779	+ cVector bbmin = new cVector();
	4780	+ cVector bbmax = new cVector();
	4781	+
	4782	+ group.selection.get(0).getBounds(bbmin, bbmax, true);
	4783	+
	4784	+ double dx = bbmax.x - bbmin.x;
	4785	+ double dy = bbmax.y - bbmin.y;
	4786	+ double dz = bbmax.z - bbmin.z;
	4787	+
	4788	+ double scale = Math.sqrt(dxdx + dydy + dz*dz);
	4789	+
3450	4790	for (int i=0; i<group.selection.size(); i++)
3451	4791	{
3452	4792	Object3D obj = group.selection.get(i);
3453	4793
3454		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3455		- LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
	4794	+ LA.matTranslate(obj.toParent, i * scale, 0, 0);
	4795	+ LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3456	4796	}
3457	4797
3458	4798	refreshContents();
..	..	@@ -3473,11 +4813,11 @@
3473	4813
3474	4814	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3475	4815
3476		- boolean random = CameraPane.RANDOM;
3477		- CameraPane.RANDOM = false; // parse all random nodes
	4816	+ boolean random = CameraPane.SWITCH;
	4817	+ CameraPane.SWITCH = false; // parse all random nodes
3478	4818	lowres.linkVerticesThis(null);
3479	4819	lowres.linkVerticesThis(sn);
3480		- CameraPane.RANDOM = random;
	4820	+ CameraPane.SWITCH = random;
3481	4821
3482	4822	System.err.flush();
3483	4823
..	..	@@ -3517,7 +4857,7 @@
3517	4857	return;
3518	4858
3519	4859	Object3D poses = group.selection.get(0);
3520		- Object3D ref = GrafreeD.clipboard.get(0);
	4860	+ Object3D ref = Grafreed.clipboard.get(0);
3521	4861
3522	4862	Object3D newgroup = new Object3D("Po:" + poses.name);
3523	4863
..	..	@@ -3686,7 +5026,7 @@
3686	5026	group.selection.RelinkToSupport(); // july 2014
3687	5027	System.out.println("DONE.");
3688	5028	refreshContents();
3689		- 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));
3690	5030	}
3691	5031
3692	5032	void ReduceMesh(boolean reduction34)
..	..	@@ -3711,9 +5051,9 @@
3711	5051
3712	5052	void ClipMesh()
3713	5053	{
3714		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	5054	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3715	5055	{
3716		- Object3D content = GrafreeD.clipboard.get(0);
	5056	+ Object3D content = Grafreed.clipboard.get(0);
3717	5057
3718	5058	if (content instanceof cGroup && ((cGroup)content).transientlink )
3719	5059	content = ((cGroup)content).get(0);
..	..	@@ -3722,7 +5062,7 @@
3722	5062	// {
3723	5063	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3724	5064	// }
3725		- group.selection.ClipMesh(GrafreeD.clipboard);
	5065	+ group.selection.ClipMesh(Grafreed.clipboard);
3726	5066	}
3727	5067	// group.selection.ClipMesh(GrafreeD.clipboard);
3728	5068	System.out.println("DONE.");
..	..	@@ -3769,6 +5109,18 @@
3769	5109	void MarkLeaves(boolean hide)
3770	5110	{
3771	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);
3772	5124	refreshContents();
3773	5125	}
3774	5126
..	..	@@ -3843,28 +5195,25 @@
3843	5195	// }
3844	5196	// }
3845	5197
3846		- static boolean allparams = true;
3847		-
3848		- static Vector<Object3D> listUI = new Vector<Object3D>();
3849		-
3850	5198	void EditSelection(boolean newWindow)
3851	5199	{
	5200	+ if (group.selection == null)
	5201	+ {
	5202	+ EditElement(group, newWindow); // ? new
	5203	+ return;
	5204	+ }
	5205	+
3852	5206	// aConstraints.gridy = 0;
3853	5207	for (int i=0; i<group.selection.size(); i++)
3854	5208	{
3855	5209	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
3856	5210	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3857		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5211	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3858	5212
3859	5213	Object3D elem = (Object3D)group.selection.elementAt(i);
3860		- if(elem != group)
	5214	+ if(elem != group \|\| !newWindow)
3861	5215	{
3862		- // if (!(elem instanceof Composite))
3863		- // newWindow = false;
3864		- listUI.add(elem);
3865		- elem.openEditWindow(this, newWindow); //, false);
3866		- System.out.println("edit : " + elem);
3867		- elem.editWindow.refreshContents(true); // ? new
	5216	+ EditElement(elem, newWindow); // ? new
3868	5217	}
3869	5218	}
3870	5219	}
..	..	@@ -3927,9 +5276,7 @@
3927	5276
3928	5277	freezemodel = false;
3929	5278	}
3930		-
3931		- boolean flashIt = true;
3932		-
	5279	+
3933	5280	public void valueChanged(TreeSelectionEvent e)
3934	5281	//public boolean handleEvent(Event event)
3935	5282	{
..	..	@@ -3939,7 +5286,8 @@
3939	5286	//new Exception().printStackTrace();
3940	5287
3941	5288	freezemodel = true;
3942		-
	5289	+ ClearUnpinned();
	5290	+
3943	5291	/**/
3944	5292	//switch (event.id)
3945	5293	{
..	..	@@ -3947,7 +5295,6 @@
3947	5295	//case 702: // Event.LIST_DESELECT
3948	5296	group.deselectAll();
3949	5297	TreePath tps[] = objEditor.jTree.getSelectionPaths();
3950		- objEditor.ClearInfo(); // .GetMaterial());
3951	5298	if (tps != null)
3952	5299	{
3953	5300	for (int i=0; i < tps.length; i++)
..	..	@@ -3956,33 +5303,39 @@
3956	5303
3957	5304	//if (child.parent != null)
3958	5305	//child.parent.addSelectee(child);
	5306	+ objEditor.SetMaterial(child);
3959	5307	group.addSelectee(child);
3960		- objEditor.SetMaterial(child); // .GetMaterial());
3961		- objEditor.AddInfo(child, this, true); // .GetMaterial());
3962		- System.err.println("info : " + child.GetPath());
3963	5308	}
3964	5309	}
3965		- else
3966		- {
3967		- objEditor.SetMaterial(group); // .GetMaterial());
3968		- objEditor.AddInfo(group, this, true); // .GetMaterial());
3969		- System.err.println("info : " + group.GetPath());
3970		- }
	5310	+// else
	5311	+// {
	5312	+// objEditor.SetMaterial(group); // .GetMaterial());
	5313	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	5314	+// System.err.println("info : " + group.GetPath());
	5315	+// }
3971	5316
3972		- objEditor.SetText(); // jan 2014
3973		-
3974		- 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))
3975	5318	CameraPane.flash = true;
3976	5319
3977		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5320	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
3978	5321	// a camera
3979	5322	{
3980		- CameraPane.camerachangeframe = 0; // don't refuse it
3981		- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
3982		- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
3983		- // 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;
3984	5330	}
3985	5331
	5332	+ if (tps != null && tps.length == 1)
	5333	+ {
	5334	+ EditSelection(false);
	5335	+ }
	5336	+
	5337	+ SetPinStates(tps != null && tps.length > 0);
	5338	+
3986	5339	refreshContents();
3987	5340	//return true;
3988	5341	}
..	..	@@ -3991,6 +5344,51 @@
3991	5344
3992	5345	freezemodel = false;
3993	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	+ }
3994	5392
3995	5393	void linkSomething(Object3D thing)
3996	5394	{
..	..	@@ -4062,16 +5460,19 @@
4062	5460	{
4063	5461	if (group.selection.isEmpty())
4064	5462	return;
4065		- GrafreeD.clipboardIsTempGroup = false;
	5463	+
	5464	+ Grafreed.clipboardIsTempGroup = false;
4066	5465	Composite tGroup = null;
4067	5466	if (group.selection.size() > 0) // 1)
4068	5467	{
4069	5468	tGroup = new cGroup();
4070		- GrafreeD.clipboardIsTempGroup = true;
	5469	+ Grafreed.clipboardIsTempGroup = true;
4071	5470	}
4072	5471
4073	5472	if (cut)
4074	5473	{
	5474	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5475	+// Save();
4075	5476	//int indices[] = jList.getSelectedIndices();
4076	5477	//for (int i = indices.length - 1; i >= 0; i--)
4077	5478	//jList.remove(indices[i]);
..	..	@@ -4107,16 +5508,16 @@
4107	5508	//System.out.println("cut " + child);
4108	5509	//System.out.println("parent = " + child.parent);
4109	5510	// tmp.addChild(child);
4110		- if (GrafreeD.clipboardIsTempGroup)
	5511	+ if (Grafreed.clipboardIsTempGroup)
4111	5512	tGroup.add/Child/(tmp);
4112	5513	else
4113		- GrafreeD.clipboard = tmp;
	5514	+ Grafreed.clipboard = tmp;
4114	5515	}
4115	5516	else
4116		- if (GrafreeD.clipboardIsTempGroup)
	5517	+ if (Grafreed.clipboardIsTempGroup)
4117	5518	tGroup.add/Child/(child);
4118	5519	else
4119		- GrafreeD.clipboard = child;
	5520	+ Grafreed.clipboard = child;
4120	5521	}
4121	5522
4122	5523	//ResetModel();
..	..	@@ -4148,21 +5549,23 @@
4148	5549	//System.out.println("cut " + elem);
4149	5550	//System.out.println("parent = " + elem.parent);
4150	5551	// tmp.addChild(elem);
4151		- if (GrafreeD.clipboardIsTempGroup)
	5552	+ if (Grafreed.clipboardIsTempGroup)
4152	5553	tGroup.add/Child/(tmp);
4153	5554	else
4154		- GrafreeD.clipboard = tmp;
	5555	+ Grafreed.clipboard = tmp;
4155	5556	}
4156	5557	else
4157		- if (GrafreeD.clipboardIsTempGroup)
	5558	+ if (Grafreed.clipboardIsTempGroup)
4158	5559	tGroup.add/Child/(child);
4159	5560	else
4160		- GrafreeD.clipboard = child;
	5561	+ Grafreed.clipboard = child;
4161	5562	}
4162	5563
4163	5564	}
4164		- if (GrafreeD.clipboardIsTempGroup)
4165		- GrafreeD.clipboard = tGroup;
	5565	+
	5566	+ if (Grafreed.clipboardIsTempGroup)
	5567	+ Grafreed.clipboard = tGroup;
	5568	+
4166	5569	if (cut)
4167	5570	{
4168	5571	ResetModel();
..	..	@@ -4172,11 +5575,15 @@
4172	5575
4173	5576	void paste(boolean expand)
4174	5577	{
	5578	+ if (Globals.REPLACEONMAKE)
	5579	+ Save();
	5580	+ boolean keep = Globals.REPLACEONMAKE;
	5581	+ Globals.REPLACEONMAKE = false;
4175	5582	// if (GrafreeD.clipboard == null)
4176	5583	// return;
4177	5584	boolean first = true;
4178	5585
4179		- if (GrafreeD.clipboardIsTempGroup)
	5586	+ if (Grafreed.clipboardIsTempGroup)
4180	5587	{
4181	5588	Composite temp;
4182	5589
..	..	@@ -4187,7 +5594,7 @@
4187	5594	temp = (Composite)Applet3D.clipboard.deepCopy();
4188	5595	*/
4189	5596	Object3D elem;
4190		- 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))
4191	5598	{
4192	5599	Object3D child = (Object3D)e.nextElement();
4193	5600
..	..	@@ -4221,21 +5628,22 @@
4221	5628	//Object3D cb = Applet3D.clipboard;
4222	5629	//temp.addChild(cb);
4223	5630	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4224		- assert(GrafreeD.clipboard.parent == null);
4225		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4226		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4227		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4228		- 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());
4229	5636	else
4230		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4231		- GrafreeD.clipboard.get(0).parent = keepparent;
	5637	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5638	+ Grafreed.clipboard.get(0).parent = keepparent;
4232	5639	}
4233	5640
	5641	+ Globals.REPLACEONMAKE = keep;
4234	5642	ResetModel();
4235	5643	refreshContents();
4236	5644	}
4237	5645
4238		- void pasteInto(boolean copyit)
	5646	+ void pasteInto(boolean copyit, boolean clone)
4239	5647	{
4240	5648	// if (GrafreeD.clipboard == null)
4241	5649	// return;
..	..	@@ -4264,15 +5672,22 @@
4264	5672	if (copyit)
4265	5673	{
4266	5674	// paste(false);
4267		- CloneClipboard(false); // sept 2014
	5675	+ if (clone)
	5676	+ {
	5677	+ CloneClipboard(false); // sept 2014
	5678	+ }
	5679	+ else
	5680	+ {
	5681	+ paste(false);
	5682	+ }
4268	5683	}
4269	5684	else
4270	5685	{
4271	5686	boolean first = true;
4272	5687
4273		- if (GrafreeD.clipboardIsTempGroup)
	5688	+ if (Grafreed.clipboardIsTempGroup)
4274	5689	{
4275		- Composite temp = (Composite)GrafreeD.clipboard;
	5690	+ Composite temp = (Composite)Grafreed.clipboard;
4276	5691	Object3D copy;
4277	5692	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4278	5693	{
..	..	@@ -4282,7 +5697,7 @@
4282	5697	}
4283	5698	} else
4284	5699	{
4285		- linkSomething(GrafreeD.clipboard); //.get(0));
	5700	+ linkSomething(Grafreed.clipboard); //.get(0));
4286	5701	}
4287	5702	}
4288	5703	}
..	..	@@ -4359,6 +5774,10 @@
4359	5774
4360	5775	void group(Object3D csg, boolean grab)
4361	5776	{
	5777	+ if (Globals.REPLACEONMAKE)
	5778	+ Save();
	5779	+ boolean keep = Globals.REPLACEONMAKE;
	5780	+ Globals.REPLACEONMAKE = false;
4362	5781	if (//false) // why??
4363	5782	!group.selection.isEmpty())
4364	5783	{
..	..	@@ -4472,8 +5891,34 @@
4472	5891	//node.add(csg);
4473	5892	//makeSomething(node);
4474	5893	makeSomething(csg);
	5894	+ Globals.REPLACEONMAKE = keep;
4475	5895	}
4476	5896
	5897	+ void Ungroup(Object3D g)
	5898	+ {
	5899	+ if (Globals.REPLACEONMAKE)
	5900	+ Save();
	5901	+ boolean keep = Globals.REPLACEONMAKE;
	5902	+ Globals.REPLACEONMAKE = false;
	5903	+ if (g instanceof HiddenObject)
	5904	+ {
	5905	+ HiddenObject h = (HiddenObject) g;
	5906	+
	5907	+ for (int i=0; i<h.ActualSize(); i++)
	5908	+ {
	5909	+ objEditor.makeSomething(h.get(i), false);
	5910	+ }
	5911	+ }
	5912	+ else
	5913	+ {
	5914	+ for (int i=0; i<g.Size(); i++)
	5915	+ {
	5916	+ objEditor.makeSomething(g.get(i), false);
	5917	+ }
	5918	+ }
	5919	+ Globals.REPLACEONMAKE = keep;
	5920	+ }
	5921	+
4477	5922	void ungroup()
4478	5923	{
4479	5924	/*
..	..	@@ -4667,21 +6112,6 @@
4667	6112	}
4668	6113	*/
4669	6114
4670		- void ImportGFD()
4671		- {
4672		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4673		- browser.show();
4674		- String filename = browser.getFile();
4675		- if (filename != null && filename.length() > 0)
4676		- {
4677		- String fullname = browser.getDirectory() + filename;
4678		-
4679		- //Object3D readobj =
4680		- objEditor.ReadGFD(fullname, objEditor);
4681		- //makeSomething(readobj);
4682		- }
4683		- }
4684		-
4685	6115	/*
4686	6116	public void Callback(Object obj)
4687	6117	{
..	..	@@ -4705,26 +6135,9 @@
4705	6135	}
4706	6136	*/
4707	6137
4708		- void ImportVRMLX3D()
4709		- {
4710		- if (GrafreeD.standAlone)
4711		- {
4712		- /**/
4713		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4714		- browser.show();
4715		- String filename = browser.getFile();
4716		- if (filename != null && filename.length() > 0)
4717		- {
4718		- String fullname = browser.getDirectory() + filename;
4719		- LoadVRMLX3D(fullname);
4720		- }
4721		- /**/
4722		- }
4723		- }
4724		-
4725	6138	String GetFile(String dialogName)
4726	6139	{
4727		- if (GrafreeD.standAlone)
	6140	+ if (Grafreed.standAlone)
4728	6141	{
4729	6142	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4730	6143	browser.show();
..	..	@@ -4788,10 +6201,48 @@
4788	6201	cButton flashSelectionButton;
4789	6202	cButton editButton;
4790	6203	cButton uneditButton;
	6204	+ JCheckBox allParamsButton;
4791	6205	cButton clearpanelButton;
4792		- cButton allParamsButton;
4793	6206	cButton unselectButton;
4794	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	+
4795	6246	cButton screenfitButton;
4796	6247	cButton screenfitpointButton;
4797	6248	cButton snapobjectButton;
..	..	@@ -4803,14 +6254,6 @@
4803	6254
4804	6255	cButton setsupportButton;
4805	6256
4806		- cButton twoButton;
4807		- cButton sixButton;
4808		- cButton threeButton;
4809		- cButton sevenButton;
4810		- cButton fourButton; // full panel
4811		- cButton oneButton; // full XYZ
4812		- //cButton currentLayout;
4813		-
4814	6257	//
4815	6258	//Composite
4816	6259	Object3D // to do !!
..	..	@@ -4820,10 +6263,12 @@
4820	6263	//JTree jTree;
4821	6264	private MenuItem lookAtItem;
4822	6265	private MenuItem lookFromItem;
4823		- private MenuItem switchItem;
4824		- private MenuItem cutItem;
4825		- private MenuItem duplicateItem;
4826		- 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;
4827	6272	private MenuItem cloneSupportItem;
4828	6273	private MenuItem overwriteGeoItem;
4829	6274	private MenuItem overwriteMatItem;
..	..	@@ -4833,8 +6278,9 @@
4833	6278	private MenuItem resetsupportItem;
4834	6279	private MenuItem resetreferencesItem;
4835	6280	private MenuItem linkverticesItem;
	6281	+ private MenuItem relinkverticesItem;
4836	6282	private MenuItem setMasterItem;
4837		- private MenuItem resetMeshItem;
	6283	+ private MenuItem resetAllItem;
4838	6284	private MenuItem stepAllItem;
4839	6285	private MenuItem revertMeshItem;
4840	6286	private MenuItem poseMeshItem;
..	..	@@ -4843,17 +6289,19 @@
4843	6289	private MenuItem cloneGeometriesItem;
4844	6290	private MenuItem shareGeometriesItem;
4845	6291	private MenuItem mergeGeometriesItem;
4846		- private MenuItem copyItem;
	6292	+ private JMenuItem copyItem;
4847	6293	private MenuItem pasteItem;
4848		- private MenuItem pasteLinkItem;
4849		- private MenuItem pasteCloneItem;
4850		- private MenuItem pasteExpandItem;
4851		- private MenuItem clearItem;
	6294	+ private JMenuItem pasteIntoItem;
	6295	+ private JMenuItem pasteLinkItem;
	6296	+ private JMenuItem pasteCloneItem;
	6297	+ private JMenuItem pasteExpandItem;
	6298	+ private JMenuItem deleteItem;
4852	6299	private MenuItem clearAllItem;
4853	6300	private MenuItem genUVItem;
4854	6301	private MenuItem genNormalsMESHItem;
4855	6302	private MenuItem genNormalsCADItem;
4856	6303	private MenuItem genNormalsORGANItem;
	6304	+ private MenuItem genNormalsMINEItem;
4857	6305	private MenuItem stripifyItem;
4858	6306	private MenuItem unstripifyItem;
4859	6307	private MenuItem trimItem;
..	..	@@ -4882,6 +6330,10 @@
4882	6330	private MenuItem showleavesItem;
4883	6331	private MenuItem markleavesItem;
4884	6332	private MenuItem unmarkleavesItem;
	6333	+ private MenuItem rewindleavesItem;
	6334	+ private MenuItem unrewindleavesItem;
	6335	+ private MenuItem randomleavesItem;
	6336	+ private MenuItem unrandomleavesItem;
4885	6337
4886	6338	private MenuItem flipVItem;
4887	6339	private MenuItem unflipVItem;
..	..	@@ -4893,14 +6345,17 @@
4893	6345	private MenuItem panoTexturesItem;
4894	6346
4895	6347	private MenuItem resetCentroidItem;
4896		- private MenuItem transformgeometryItem;
	6348	+ private MenuItem resetCentroidXZItem;
4897	6349	private MenuItem resetTransformItem;
	6350	+ private MenuItem transformGeometryItem;
	6351	+ private MenuItem transformChildrenItem;
	6352	+ private MenuItem hideItem;
4898	6353	private MenuItem grabItem;
4899	6354	private MenuItem backItem;
4900	6355	private MenuItem frontItem;
4901	6356	private MenuItem cameraItem;
4902	6357	private MenuItem compositeItem;
4903		- private MenuItem randomItem;
	6358	+ private MenuItem switchItem;
4904	6359	private MenuItem physicsItem;
4905	6360	private MenuItem frameselectorItem;
4906	6361	private MenuItem scriptNodeItem;
..	..	@@ -4908,13 +6363,14 @@
4908	6363	private MenuItem switchTransfoItem;
4909	6364	private MenuItem morphItem;
4910	6365	private MenuItem linkerItem;
4911		- private MenuItem ungroupItem;
	6366	+ private JMenuItem ungroupItem;
4912	6367	private MenuItem editItem;
4913	6368	private MenuItem openWindowItem;
4914	6369	private MenuItem editLeafItem;
4915	6370
4916	6371	private MenuItem resetParentItem;
4917	6372	private MenuItem repairParentItem;
	6373	+ private MenuItem repairShadowItem;
4918	6374	private MenuItem sortbysizeItem;
4919	6375	private MenuItem sortbynameItem;
4920	6376
..	..	@@ -4923,6 +6379,8 @@
4923	6379	private MenuItem attachBumpItem;
4924	6380	private MenuItem detachBumpItem;
4925	6381	private MenuItem pigmentBumpItem;
	6382	+ private MenuItem embedTexturesItem;
	6383	+ private MenuItem deEmbedTexturesItem;
4926	6384
4927	6385	private MenuItem particleItem;
4928	6386	private MenuItem ragdollItem;
..	..	@@ -4935,10 +6393,11 @@
4935	6393	private MenuItem coneItem;
4936	6394	private MenuItem torusItem;
4937	6395	private MenuItem superItem;
	6396	+ private MenuItem kleinItem;
4938	6397	private MenuItem blobItem;
4939	6398	private MenuItem latheItem;
4940	6399	private MenuItem bezierItem;
4941		- private MenuItem checkerItem;
	6400	+ private MenuItem overlayItem;
4942	6401	private MenuItem meshItem;
4943	6402	// private MenuItem meshGroupItem;
4944	6403	private MenuItem springItem;
..	..	@@ -4947,6 +6406,7 @@
4947	6406	private MenuItem csgItem;
4948	6407	private MenuItem templateItem;
4949	6408	private MenuItem textureItem;
	6409	+ private MenuItem billboardItem;
4950	6410	private MenuItem shadowXItem;
4951	6411	private MenuItem shadowYItem;
4952	6412	private MenuItem shadowZItem;
..	..	@@ -4959,11 +6419,6 @@
4959	6419	private MenuItem doubleItem;
4960	6420	private MenuItem tripleItem;
4961	6421
4962		- private MenuItem importGFDItem;
4963		- private MenuItem importVRMLX3DItem;
4964		- private MenuItem import3DSItem;
4965		- private MenuItem importOBJItem;
4966		-
4967	6422	private MenuItem computeAOItem;
4968	6423	private MenuItem recompileItem;
4969	6424	private MenuItem editScriptItem;
..	..	@@ -4973,4 +6428,8 @@
4973	6428	private MenuItem analyzeItem;
4974	6429	private MenuItem dumpItem;
4975	6430	//boolean freezemodel = false;
	6431	+
	6432	+ Menu cameraMenu;
	6433	+ MenuItem editCameraItem;
	6434	+ MenuItem restoreCameraItem;
4976	6435	}