~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,153 @@
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	+ if (Globals.ADVANCED)
	574	+ {
	575	+ // Deletes the cameras...
189	576	clearAllItem = menu.add(new MenuItem("Clear All"));
190	577	clearAllItem.addActionListener(this);
	578	+ }
	579	+
	580	+ menuBar.add(cameraMenu = new Menu("View"));
	581	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	582	+ //zBufferItem.addActionListener(this);
	583	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	584	+ //normalLensItem.addActionListener(this);
	585	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	586	+ restoreCameraItem.addActionListener(this);
	587	+
	588	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	589	+// toggleFullScreenItem.addItemListener(this);
	590	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	591	+// cameraMenu.add("-");
	592	+//
	593	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	594	+// toggleTextureItem.addItemListener(this);
	595	+// toggleTextureItem.setState(CameraPane.textureon);
	596	+//
	597	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	598	+// toggleSwitchItem.addItemListener(this);
	599	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	600	+
	601	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	602	+ toggleHandleItem.addItemListener(this);
	603	+ toggleHandleItem.setState(CameraPane.HANDLES);
	604	+
	605	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	606	+ togglePaintItem.addItemListener(this);
	607	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	608	+
	609	+ if (Globals.ADVANCED)
	610	+ {
	611	+ cameraMenu.add("-");
	612	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	613	+ toggleLiveItem.addItemListener(this);
	614	+ toggleLiveItem.setState(Globals.isLIVE());
191	615
	616	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	617	+ stepItem.addActionListener(this);
	618	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	619	+ // toggleDLItem.addItemListener(this);
	620	+ // toggleDLItem.setState(false);
	621	+
	622	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	623	+ toggleRenderItem.addItemListener(this);
	624	+ toggleRenderItem.setState(!CameraPane.frozen);
	625	+
	626	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	627	+ toggleDebugItem.addItemListener(this);
	628	+ toggleDebugItem.setState(Globals.DEBUG);
	629	+
	630	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	631	+ toggleFrustumItem.addItemListener(this);
	632	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	633	+
	634	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	635	+ toggleFootContactItem.addItemListener(this);
	636	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	637	+
	638	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	639	+ toggleTimelineItem.addItemListener(this);
	640	+ }
	641	+
	642	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	643	+// toggleRootItem.addItemListener(this);
	644	+// toggleRootItem.setState(false);
	645	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	646	+// animationItem.addItemListener(this);
	647	+// animationItem.setState(CameraPane.ANIMATION);
	648	+ cameraMenu.add("-");
	649	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	650	+ editCameraItem.addActionListener(this);
	651	+
	652	+ if (Globals.ADVANCED)
	653	+ {
	654	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	655	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	656	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	657	+ oe.cameraMenu.add("-");
	658	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	659	+ openWindowItem.addActionListener(this);
	660	+ lookAtItem.addActionListener(this);
	661	+ //lookFromItem.addActinoListener(this);
	662	+ //switchViewItem.addActionListener(this);
	663	+ }
	664	+
192	665	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);
	666	+ if (Globals.ADVANCED)
	667	+ {
197	668	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
198	669	revertMeshItem.addActionListener(this);
199	670	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
200	671	resetreferencesItem.addActionListener(this);
201	672	menu.add("-");
	673	+ }
202	674	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
203	675	overwriteGeoItem.addActionListener(this);
204	676	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -210,73 +682,111 @@
210	682	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211	683	overwriteUVItem.addActionListener(this);
212	684	menu.add("-");
	685	+ if (Globals.ADVANCED)
	686	+ {
213	687	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214	688	generateMeshItem.addActionListener(this);
215	689	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216	690	poseMeshItem.addActionListener(this);
217	691	menu.add("-");
	692	+ }
218	693	resetsupportItem = menu.add(new MenuItem("Reset support"));
219	694	resetsupportItem.addActionListener(this);
220	695	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	696	linkverticesItem.addActionListener(this);
	697	+ relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
	698	+ relinkverticesItem.addActionListener(this);
	699	+
	700	+ if (Globals.ADVANCED)
	701	+ {
222	702	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
223	703	setMasterItem.addActionListener(this);
	704	+ }
224	705
225		- oe.menuBar.add(menu = new Menu("Group"));
226		- grabItem = menu.add(new MenuItem("Grab"));
227		- grabItem.addActionListener(this);
	706	+ oe.menuBar.add(menu = new Menu("Order"));
	707	+
228	708	backItem = menu.add(new MenuItem("Back"));
229	709	backItem.addActionListener(this);
230	710	frontItem = menu.add(new MenuItem("Front"));
231	711	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);
	712	+// compositeItem = menu.add(new MenuItem("Composite"));
	713	+// compositeItem.addActionListener(this);
	714	+
	715	+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
	716	+ grabItem.addActionListener(this);
	717	+
	718	+ if (Globals.ADVANCED)
	719	+ {
	720	+ hideItem = menu.add(new MenuItem("Hidden Group"));
	721	+ hideItem.addActionListener(this);
	722	+ }
	723	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
	724	+ ungroupItem.addActionListener(this);
	725	+
	726	+ oe.jTree.popup.addSeparator();
	727	+
	728	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	729	+ deleteItem.addActionListener(this);
	730	+
	731	+// menu.add("-");
	732	+//
	733	+// switchItem = menu.add(new MenuItem("Switch node"));
	734	+// switchItem.addActionListener(this);
	735	+ if (Globals.ADVANCED)
	736	+ {
241	737	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
242	738	switchGeoItem.addActionListener(this);
243	739	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
244	740	switchTransfoItem.addActionListener(this);
245		- morphItem = menu.add(new MenuItem("Morph"));
	741	+ morphItem = menu.add(new MenuItem("Morph Group"));
246	742	morphItem.addActionListener(this);
	743	+
	744	+ menu.add("-");
	745	+ physicsItem = menu.add(new MenuItem("Physics"));
	746	+ physicsItem.addActionListener(this);
	747	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	748	+ frameselectorItem.addActionListener(this);
247	749	scriptNodeItem = menu.add(new MenuItem("Script Node"));
248	750	scriptNodeItem.addActionListener(this);
249		- cameraItem = menu.add(new MenuItem("Camera"));
250		- cameraItem.addActionListener(this);
	751	+ }
251	752
252	753	oe.menuBar.add(menu = new Menu("Object"));
253		- textureItem = menu.add(new MenuItem("Texture"));
254		- textureItem.addActionListener(this);
	754	+// textureItem = menu.add(new MenuItem("Texture"));
	755	+// textureItem.addActionListener(this);
	756	+ billboardItem = menu.add(new MenuItem("Billboard"));
	757	+ billboardItem.addActionListener(this);
255	758	csgItem = menu.add(new MenuItem("CSG"));
256	759	csgItem.addActionListener(this);
257		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	760	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
258	761	shadowXItem.addActionListener(this);
259		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	762	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
260	763	shadowYItem.addActionListener(this);
261		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	764	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
262	765	shadowZItem.addActionListener(this);
	766	+ attributeItem = menu.add(new MenuItem("Attribute"));
	767	+ attributeItem.addActionListener(this);
	768	+
	769	+ if (Globals.ADVANCED)
	770	+ {
	771	+ menu.add("-");
263	772	linkerItem = menu.add(new MenuItem("Linker"));
264	773	linkerItem.addActionListener(this);
265	774	templateItem = menu.add(new MenuItem("Template"));
266	775	templateItem.addActionListener(this);
267		- attributeItem = menu.add(new MenuItem("Attribute"));
268		- attributeItem.addActionListener(this);
269	776	pointflowItem = menu.add(new MenuItem("Point Flow"));
270	777	pointflowItem.addActionListener(this);
	778	+ }
271	779	menu.add("-");
272		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
273		- transformgeometryItem.addActionListener(this);
274	780	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
275	781	resetTransformItem.addActionListener(this);
276	782	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
277	783	resetCentroidItem.addActionListener(this);
278		- ungroupItem = menu.add(new MenuItem("Ungroup"));
279		- ungroupItem.addActionListener(this);
	784	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	785	+ resetCentroidXZItem.addActionListener(this);
	786	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	787	+ transformGeometryItem.addActionListener(this);
	788	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	789	+ transformChildrenItem.addActionListener(this);
280	790
281	791	oe.menuBar.add(menu = new Menu("Geometry"));
282	792	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -285,6 +795,13 @@
285	795	genNormalsORGANItem.addActionListener(this);
286	796	genNormalsCADItem = menu.add(new MenuItem("CAD Normals"));
287	797	genNormalsCADItem.addActionListener(this);
	798	+ genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
	799	+ genNormalsMESHItem.addActionListener(this);
	800	+ if (Globals.ADVANCED)
	801	+ {
	802	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
	803	+ genNormalsMINEItem.addActionListener(this);
	804	+ }
288	805	stripifyItem = menu.add(new MenuItem("Stripify"));
289	806	stripifyItem.addActionListener(this);
290	807	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -306,23 +823,34 @@
306	823	reduce34MeshItem.addActionListener(this);
307	824	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
308	825	increaseMeshItem.addActionListener(this);
309		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
310		- smoothMeshItem.addActionListener(this);
311	826	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
312	827	clipMeshItem.addActionListener(this);
	828	+
	829	+ if (Globals.ADVANCED)
	830	+ {
	831	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	832	+ smoothMeshItem.addActionListener(this);
	833	+ }
313	834
314	835	oe.menuBar.add(menu = new Menu("Attributes"));
315	836	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
316	837	clearMaterialsItem.addActionListener(this);
	838	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	839	+ resetAllItem.addActionListener(this);
	840	+ stepAllItem = menu.add(new MenuItem("Step All"));
	841	+ stepAllItem.addActionListener(this);
317	842	menu.add("-");
318	843	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
319	844	liveleavesItem.addActionListener(this);
320	845	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
321	846	unliveleavesItem.addActionListener(this);
	847	+ if (Globals.ADVANCED)
	848	+ {
322	849	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
323	850	supportleavesItem.addActionListener(this);
324	851	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
325	852	unsupportleavesItem.addActionListener(this);
	853	+ }
326	854	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
327	855	hideleavesItem.addActionListener(this);
328	856	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -331,6 +859,14 @@
331	859	markleavesItem.addActionListener(this);
332	860	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
333	861	unmarkleavesItem.addActionListener(this);
	862	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	863	+ rewindleavesItem.addActionListener(this);
	864	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	865	+ unrewindleavesItem.addActionListener(this);
	866	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	867	+ randomleavesItem.addActionListener(this);
	868	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	869	+ unrandomleavesItem.addActionListener(this);
334	870	menu.add("-");
335	871	flipVItem = menu.add(new MenuItem("Flip V"));
336	872	flipVItem.addActionListener(this);
..	..	@@ -356,53 +892,130 @@
356	892	attachBumpItem.addActionListener(this);
357	893	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
358	894	pigmentBumpItem.addActionListener(this);
	895	+ //embedTexturesItem
359	896	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
360	897	detachPigmentItem.addActionListener(this);
361	898	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
362	899	detachBumpItem.addActionListener(this);
	900	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	901	+ embedTexturesItem.addActionListener(this);
	902	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	903	+ deEmbedTexturesItem.addActionListener(this);
363	904	menu.add("-");
364	905	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
365	906	sortbysizeItem.addActionListener(this);
366	907	sortbynameItem = menu.add(new MenuItem("Sort by name"));
367	908	sortbynameItem.addActionListener(this);
368	909	menu.add("-");
	910	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	911	+ shareGeometriesItem.addActionListener(this);
	912	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	913	+ mergeGeometriesItem.addActionListener(this);
	914	+ menu.add("-");
	915	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	916	+ editLeafItem.addActionListener(this);
	917	+ if (Globals.ADVANCED)
	918	+ {
	919	+ // Pretty much the same as duplicate and clone.
369	920	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
370	921	extractGeometriesItem.addActionListener(this);
371	922	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
372	923	cloneGeometriesItem.addActionListener(this);
373		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
374		- shareGeometriesItem.addActionListener(this);
375		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
376		- mergeGeometriesItem.addActionListener(this);
	924	+ }
377	925
378	926	oe.menuBar.add(menu = new Menu("Insert"));
379	927	buildCreateMenu(menu);
380	928
381		-
382		- oe.menuBar.add(menu = new Menu("Include"));
383		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
384		- importGFDItem.addActionListener(this);
385		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
386		- importVRMLX3DItem.addActionListener(this);
387		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
388		- importOBJItem.addActionListener(this);
389		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
390		- import3DSItem.addActionListener(this);
391		-
392	929	oe.menuBar.add(menu = new Menu("Tools"));
393	930	buildToolsMenu(menu);
394	931	}
395	932
	933	+ JTabbedPane resourcecontainer;
	934	+ cGridBag currenttab;
	935	+ //boolean added; // patch for jar
	936	+
	937	+ int tabcount = 0;
	938	+ int colcount = 0;
	939	+ int rowcount = 0;
	940	+ int texturecount = 0;
	941	+
	942	+ int columns = 5;
	943	+ int rows = 7;
	944	+
	945	+ public void ResourceCallBack(String[] path)
	946	+ {
	947	+// for (int i = 0; i < path.length; i++)
	948	+// System.out.print(path[i] + "/");
	949	+// System.out.println();
	950	+
	951	+ if (//rowcount == 0 \|\|
	952	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	953	+ {
	954	+ currenttab = new cGridBag();
	955	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	956	+ currenttab.setName(tabname);
	957	+ //added = false;
	958	+ resourcecontainer.add(currenttab);
	959	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	960	+ rowcount = 1;
	961	+ colcount = 0;
	962	+ texturecount = 0;
	963	+ }
	964	+
	965	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	966	+ {
	967	+ //if (!added)
	968	+ {
	969	+ //added = true;
	970	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	971	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	972	+ }
	973	+
	974	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	975	+
	976	+ if (++colcount >= columns)
	977	+ {
	978	+ colcount = 0;
	979	+ currenttab.Return();
	980	+
	981	+ if (rowcount++ >= rows)
	982	+ {
	983	+ rowcount = 0;
	984	+ }
	985	+ }
	986	+ }
	987	+ else
	988	+ {
	989	+// if (!path[path.length-1].equals("icons"))
	990	+// resourcecontainer.Return();
	991	+ }
	992	+ }
	993	+
	994	+ void CreateTexturePanel(cGridBag container)
	995	+ {
	996	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	997	+ container.add(resourcecontainer);
	998	+
	999	+ Grafreed.ParseResources("textures", this);
	1000	+ }
	1001	+
396	1002	void SetupUI2(ObjEditor oe)
397	1003	{
	1004	+ // June 2019
	1005	+ if (oe == null)
	1006	+ {
	1007	+ //super.SetupUI2(this);
	1008	+ //return;
	1009	+ }
	1010	+
	1011	+ if (copy != group)
	1012	+ {
	1013	+ //super.SetupUI2(this);
	1014	+ }
	1015	+
398	1016	//new Exception().printStackTrace();
399	1017
400	1018	oe.radioPanel = new JPanel(new GridBagLayout());
401		- oe.aConstraints.weightx = 1;
402		- oe.aConstraints.weighty = 0;
403		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
404		- oe.aConstraints.gridwidth = 100;
405		- oe.aConstraints.gridheight = 1;
406	1019	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
407	1020
408	1021	oe.buttonGroup = new ButtonGroup();
..	..	@@ -423,150 +1036,263 @@
423	1036	oe.radioPanel.add(dummyButton);
424	1037	oe.buttonGroup.add(dummyButton);
425	1038	*/
426		- aConstraints.gridy += 1;
427		- oe.aConstraints.gridwidth = 1;
428		- oe.aConstraints.gridx = 0;
	1039	+ cGridBag copyOptionsPanel = new cGridBag();
	1040	+
	1041	+ copyOptionsPanel.preferredHeight = 2;
429	1042
430		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
	1043	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
	1044	+
	1045	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1046	+ //minButton.setToolTipText("Minimize window");
	1047	+ //minButton.addActionListener(this);
	1048	+
	1049	+ if (Globals.ADVANCED)
	1050	+ {
	1051	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1052	+// maxButton.setToolTipText("Maximize window");
	1053	+// maxButton.addActionListener(this);
	1054	+ }
	1055	+
	1056	+ cButton gcButton;
	1057	+
	1058	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1059	+// gcButton.setToolTipText("Garbage collect");
	1060	+// gcButton.addActionListener(new ActionListener()
	1061	+// {
	1062	+// public void actionPerformed(ActionEvent e)
	1063	+// {
	1064	+// System.gc();
	1065	+// }
	1066	+// });
	1067	+
	1068	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1069	+ collapseButton.setToolTipText("Collapse toolbar");
	1070	+ collapseButton.addActionListener(this);
	1071	+
	1072	+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/empty.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1073	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1074	+ maximize3DButton.addActionListener(this);
	1075	+
	1076	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1077	+ twoButton.setToolTipText("Show 3D view only");
	1078	+ twoButton.addActionListener(this);
	1079	+ this.fullscreenLayout = twoButton;
	1080	+
	1081	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1082	+ threeButton.setToolTipText("Show controls and 3D view");
	1083	+ threeButton.addActionListener(this);
	1084	+ if (Globals.ADVANCED)
	1085	+ {
	1086	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1087	+ sixButton.setToolTipText("Show 3D view and controls");
	1088	+ sixButton.addActionListener(this);
	1089	+ }
	1090	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1091	+// sevenButton.setToolTipText("3-column layout");
	1092	+// sevenButton.addActionListener(this);
	1093	+ //
	1094	+
	1095	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1096	+ fullButton.setToolTipText("Full-screen window");
	1097	+ fullButton.addActionListener(this);
	1098	+
	1099	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1100	+ screenfitButton.setToolTipText("Screen fit");
	1101	+ screenfitButton.addActionListener(this);
	1102	+
	1103	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1104	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1105	+ restoreCameraButton.addActionListener(this);
	1106	+
	1107	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1108	+ saveVersionButton.setToolTipText("Duplicate current version");
	1109	+ saveVersionButton.addActionListener(this);
	1110	+
	1111	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1112	+ deleteVersionButton.setToolTipText("Delete current version");
	1113	+ deleteVersionButton.addActionListener(this);
	1114	+
	1115	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1116	+ previousVersionButton.setToolTipText("Previous version");
	1117	+ previousVersionButton.addActionListener(this);
	1118	+ previousVersionButton.setEnabled(false);
	1119	+
	1120	+ cGridBag updown = new cGridBag().setVertical(true);
	1121	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1122	+ restoreButton.setToolTipText("Undo (restore current version)");
	1123	+ restoreButton.addActionListener(this);
	1124	+ //restoreButton.setEnabled(false);
	1125	+
	1126	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1127	+ replaceButton.setToolTipText("Save (replace current version)");
	1128	+ replaceButton.addActionListener(this);
	1129	+ //replaceButton.setEnabled(false);
	1130	+
	1131	+ copyOptionsPanel.add(updown);
	1132	+
	1133	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1134	+ nextVersionButton.setToolTipText("Next version");
	1135	+ nextVersionButton.addActionListener(this);
	1136	+ nextVersionButton.setEnabled(false);
	1137	+
	1138	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1139	+ oneStepButton.setToolTipText("Animate one step forward");
	1140	+ oneStepButton.addActionListener(this);
	1141	+
	1142	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1143	+ liveCB.setToolTipText("Enable animation");
431	1144	liveCB.addItemListener(this);
432	1145
433		- oe.aConstraints.gridx += 1;
434		- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
435		- supportCB.addItemListener(this);
436		-
437		- // oe.aConstraints.gridx += 1;
438		- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
439		- // localCB.addItemListener(this);
440		-
441		- oe.aConstraints.gridx += 1;
442		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", CameraPane.CROWD), oe.aConstraints);
443		- crowdCB.addItemListener(this);
444		-
445		- oe.aConstraints.gridx += 1;
446		- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
447		- smoothCB.addItemListener(this);
448		-
449		- oe.aConstraints.gridx += 1;
450		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
	1146	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	1147	+ fastCB.setToolTipText("Fast mode");
451	1148	fastCB.addItemListener(this);
452		- oe.aConstraints.gridx += 1;
453		- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
454		- slowCB.addItemListener(this);
455		- oe.aConstraints.gridx += 1;
456		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.FAST), oe.aConstraints);
457		- boxCB.addItemListener(this);
	1149	+
	1150	+ //oe.toolboxPanel.Return();
	1151	+
	1152	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1153	+// trackCB.setToolTipText("Enable tracking");
	1154	+// trackCB.addItemListener(this);
458	1155
459		-// oe.aConstraints.gridx += 1;
460		-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
461		-// speakerMocapCB.addItemListener(this);
462		-
463		- if (false)
464		- {
465		- // handled in scripts
466		- oe.aConstraints.gridx += 1;
467		- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
468		- speakerCameraCB.addItemListener(this);
469		-
470		- oe.aConstraints.gridx += 1;
471		- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
472		- speakerFocusCB.addItemListener(this);
473		-
474		- oe.aConstraints.gridx += 1;
475		- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
476		- smoothfocusCB.addItemListener(this);
477		- }
478		-
479		-//oe.aConstraints.gridx += 1;
480		-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
481		-// debugCB.addItemListener(this);
482		-
483		- oe.aConstraints.gridx += 1;
484		- oe.toolbarPanel.add(oeilCB = new cCheckBox("O", CameraPane.OEIL), oe.aConstraints);
485		- oeilCB.addItemListener(this);
486		-
487		- oe.aConstraints.gridx += 1;
488		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("T", CameraPane.LOOKAT), oe.aConstraints);
489		- lookAtCB.addItemListener(this);
490		-
491		- oe.aConstraints.gridx += 1;
492		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
493		- trackCB.addItemListener(this);
494		-
495		- oe.aConstraints.gridx += 1;
496		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
497		- screenfitButton.addActionListener(this);
498		- oe.aConstraints.gridx += 1;
499	1156	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
500	1157	// screenfitpointButton.addActionListener(this);
501		-// oe.aConstraints.gridx += 1;
502		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
503		- snapobjectButton.addActionListener(this);
504		- oe.aConstraints.gridx += 1;
505	1158
506		- //aConstraints.gridx = 0;
507		- //aConstraints.gridy += 1;
508		- oe.aConstraints.weighty = 0;
509		- oe.aConstraints.gridwidth = 1;
510		-
511		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
512		- flashSelectionButton.addActionListener(this);
513		- oe.aConstraints.gridx += 1;
514		- oe.aConstraints.weighty = 0;
515		- oe.aConstraints.gridwidth = 1;
516		-
517		- //
518		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
519		- twoButton.addActionListener(this);
520		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	1159	+ if (Globals.ADVANCED)
	1160	+ {
	1161	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1162	+ snapobjectButton.addActionListener(this);
	1163	+ snapobjectButton.setToolTipText("Snap Object");
	1164	+
	1165	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
521	1166	fourButton.addActionListener(this);
522		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
523		- sixButton.addActionListener(this);
524		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
525		- threeButton.addActionListener(this);
526		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
527		- sevenButton.addActionListener(this);
528		- //
	1167	+ fourButton.setToolTipText("Show control panel only");
	1168	+ }
529	1169
530		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	1170	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	1171	+
	1172	+
	1173	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1174	+ rootButton.setToolTipText("Open selection in new tab");
531	1175	rootButton.addActionListener(this);
532		- oe.aConstraints.gridx += 1;
533		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	1176	+
	1177	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1178	+ closeButton.setToolTipText("Close tab");
534	1179	closeButton.addActionListener(this);
535	1180	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
536	1181	//clearButton.addActionListener(this);
537		- oe.aConstraints.gridx += 1;
538		-
539		- oe.aConstraints.gridx = 1; //
540		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
541		- editButton.addActionListener(this);
542		- oe.aConstraints.gridx += 1;
543		- oe.aConstraints.weighty = 0;
544		- oe.aConstraints.gridwidth = 1;
545	1182
546		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	1183	+ cGridBag row1 = new cGridBag();
	1184	+
	1185	+ // INSERT
	1186	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1187	+ gridButton.setToolTipText("Create ground");
	1188	+ gridButton.addActionListener(this);
	1189	+
	1190	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1191	+ boxButton.setToolTipText("Create box");
	1192	+ boxButton.addActionListener(this);
	1193	+
	1194	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1195	+ superButton.setToolTipText("Create superellipsoid");
	1196	+ superButton.addActionListener(this);
	1197	+
	1198	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1199	+ sphereButton.setToolTipText("Create sphere");
	1200	+ sphereButton.addActionListener(this);
	1201	+
	1202	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1203	+ coneButton.setToolTipText("Create cone");
	1204	+ coneButton.addActionListener(this);
	1205	+
	1206	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1207	+ torusButton.setToolTipText("Create torus");
	1208	+ torusButton.addActionListener(this);
	1209	+
	1210	+ if (Globals.ADVANCED)
	1211	+ {
	1212	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1213	+ kleinButton.setToolTipText("Create Klein bottle");
	1214	+ kleinButton.addActionListener(this);
	1215	+ }
	1216	+
	1217	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1218	+ particlesButton.setToolTipText("Create particle system");
	1219	+ particlesButton.addActionListener(this);
	1220	+
	1221	+ oe.toolboxPanel.add(row1);
	1222	+
	1223	+ cGridBag row2 = new cGridBag();
	1224	+
	1225	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1226	+ groupButton.setToolTipText("Create group");
	1227	+ groupButton.addActionListener(this);
	1228	+
	1229	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1230	+ compositeButton.setToolTipText("Create composite");
	1231	+ compositeButton.addActionListener(this);
	1232	+
	1233	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1234	+ switchButton.setToolTipText("Create item switcher");
	1235	+ switchButton.addActionListener(this);
	1236	+
	1237	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1238	+ loopButton.setToolTipText("Create loop");
	1239	+ loopButton.addActionListener(this);
	1240	+
	1241	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1242	+ textureButton.setToolTipText("Create texture");
	1243	+ textureButton.addActionListener(this);
	1244	+
	1245	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1246	+ overlayButton.setToolTipText("Create overlay");
	1247	+ overlayButton.addActionListener(this);
	1248	+
	1249	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1250	+ lightButton.setToolTipText("Create light");
	1251	+ lightButton.addActionListener(this);
	1252	+
	1253	+ oe.toolboxPanel.add(row2);
	1254	+
	1255	+ cGridBag textures = new cGridBag();
	1256	+
	1257	+ CreateTexturePanel(textures);
	1258	+
	1259	+ oe.toolboxPanel.add(textures);
	1260	+
	1261	+ textures.preferredHeight = 100;
	1262	+
	1263	+ CreateSkyboxPanel(oe.skyboxPanel);
	1264	+
	1265	+ // EDIT panel
	1266	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1267	+ editButton.setToolTipText("Pin selection controls");
	1268	+ editButton.addActionListener(this);
	1269	+
	1270	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1271	+ uneditButton.setToolTipText("Unpin and remove selection controls");
547	1272	uneditButton.addActionListener(this);
548	1273
549		- oe.aConstraints.gridx += 1;
550		- oe.aConstraints.weighty = 0;
551		- oe.aConstraints.gridwidth = 1;
552		-
553		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
554		- clearPanelButton.addActionListener(this);
555		-
556		- oe.aConstraints.gridx += 1;
557		- oe.aConstraints.weighty = 0;
558		- oe.aConstraints.gridwidth = 1;
559		-
560		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	1274	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1275	+ allParamsButton.setToolTipText("Show all controls");
561	1276	allParamsButton.addActionListener(this);
562	1277
563		- oe.aConstraints.gridx += 1;
564		- oe.aConstraints.weighty = 0;
565		- oe.aConstraints.gridwidth = 1;
566		-
567		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
568		- unselectButton.addActionListener(this);
	1278	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1279	+ clearPanelButton.setToolTipText("Clear all controls");
	1280	+ clearPanelButton.addActionListener(this);
569	1281
	1282	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1283	+ //unselectButton.setToolTipText("Unselect");
	1284	+ //unselectButton.addActionListener(this);
	1285	+
	1286	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1287	+ flashSelectionButton.setToolTipText("Highlight selection");
	1288	+ flashSelectionButton.addActionListener(this);
	1289	+
	1290	+ editCommandsPanel.preferredHeight = 1;
	1291	+
	1292	+ SetPinStates(false);
	1293	+// oe.treePanel.add(commandsPanel);
	1294	+// oe.treePanel.Return();
	1295	+
570	1296	// oe.aConstraints.gridx += 1;
571	1297	// oe.aConstraints.weighty = 0;
572	1298	// oe.aConstraints.gridwidth = 1;
..	..	@@ -578,47 +1304,32 @@
578	1304	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
579	1305	// gcButton.addActionListener(this);
580	1306
581		- oe.aConstraints.gridx = 0;
582		- oe.aConstraints.gridy += 1;
583		-
584		- //ctrlPanel.add(objList = new List(5, true));
585		- oe.aConstraints.gridwidth = 100;
586		- // oe.aConstraints.gridheight = 100;
587		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
588		- oe.aConstraints.gridheight = 1;
589		- oe.aConstraints.weighty = 0.5;
590		- oe.aConstraints.gridx = 0;
591		- JScrollPane jSP;
	1307	+ cGridBag jSPPanel = new cGridBag();
	1308	+
	1309	+ JScrollPane jSP;
592	1310	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
593		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	1311	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
594	1312	ResetModel();
595		- oe.aConstraints.weighty = 0.5;
596		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
597		- oe.aConstraints.gridy += 1;
598		- oe.aConstraints.gridwidth = 1;
599		-
600		- oe.aConstraints.weighty = 0;
601		- oe.aConstraints.gridwidth = 2;
602		-
603		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
604		- colorCB.addItemListener(this);
605		- oe.aConstraints.gridx += 2;
606		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
607		- materialCB.addItemListener(this);
608		- oe.aConstraints.gridx += 2;
609		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
610		- textureCB.addItemListener(this);
611		-
612		- oe.aConstraints.gridx = 0;
613		- oe.aConstraints.gridy += 1;
614	1313
	1314	+ oe.treePanel.add(jSPPanel);
	1315	+ oe.treePanel.Return();
	1316	+
	1317	+ oe.treePanel.add(copyOptionsPanel);
	1318	+ oe.treePanel.Return();
	1319	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1320	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1321	+ sliderPane.preferredHeight = 1;
	1322	+
	1323	+// mainPanel.setDividerLocation(0.1); //1.0);
	1324	+ mainPanel.setResizeWeight(0.4);
	1325	+
615	1326	//jList.addListSelectionListener(this);
616	1327	oe.jTree.addTreeSelectionListener(this);
617	1328	//jTree.setRootVisible(false);
618	1329	//jTree.setEditable(true);
619	1330	oe.jTree.setDragEnabled(true);
620	1331	//jTree.setPreferredSize(new Dimension(10,10));
621		- jSP.setPreferredSize(new Dimension(100,200));
	1332	+ //jSP.setPreferredSize(new Dimension(100,200));
622	1333
623	1334	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
624	1335
..	..	@@ -630,47 +1341,204 @@
630	1341	dgr.addDragGestureListener(this);
631	1342	}catch(Exception e) {}
632	1343	*/
633		- radio.layout = sevenButton;
	1344	+ radio.layout = threeButton; // sixButton;
634	1345	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
635	1346	}
	1347	+
	1348	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	1349	+ {
	1350	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1351	+ colorCB.setToolTipText("Copy color when dropped");
	1352	+ colorCB.addItemListener(this);
	1353	+
	1354	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1355	+ materialCB.setToolTipText("Copy material when dropped");
	1356	+ materialCB.addItemListener(this);
	1357	+
	1358	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1359	+ textureCB.setToolTipText("Copy texture when dropped");
	1360	+ textureCB.addItemListener(this);
	1361	+
	1362	+ panel.Return();
	1363	+
	1364	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	1365	+ boxCB.setToolTipText("Display bounding boxes");
	1366	+ boxCB.addItemListener(this);
	1367	+
	1368	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	1369	+ zoomBoxCB.setToolTipText("Display only for wheel");
	1370	+ zoomBoxCB.addItemListener(this);
	1371	+
	1372	+ if (true) // Globals.ADVANCED)
	1373	+ {
	1374	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1375	+// supportCB.setToolTipText("Enable rigging");
	1376	+// supportCB.addItemListener(this);
	1377	+
	1378	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1379	+ freezeCB.setToolTipText("Fast moving camera");
	1380	+ freezeCB.addItemListener(this);
	1381	+
	1382	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	1383	+ // localCB.addItemListener(this);
	1384	+
	1385	+ panel.Return();
	1386	+
	1387	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	1388	+ crowdCB.setToolTipText("Used for crowds");
	1389	+ crowdCB.addItemListener(this);
	1390	+
	1391	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	1392	+ smoothCB.setToolTipText("Snapping delay");
	1393	+ smoothCB.addItemListener(this);
	1394	+
	1395	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1396	+// slowCB.setToolTipText("Smooth interpolation");
	1397	+// slowCB.addItemListener(this);
	1398	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1399	+ minshaderCB.setToolTipText("Minimal fast shader");
	1400	+ minshaderCB.addItemListener(this);
	1401	+
	1402	+// constraints.gridy += 1;
	1403	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	1404	+// speakerMocapCB.addItemListener(this);
	1405	+
	1406	+ panel.Return();
	1407	+
	1408	+ if (false)
	1409	+ {
	1410	+ // handled in scripts
	1411	+ //constraints.gridy += 1;
	1412	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	1413	+ speakerCameraCB.addItemListener(this);
	1414	+
	1415	+ //constraints.gridy += 1;
	1416	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	1417	+ speakerFocusCB.addItemListener(this);
	1418	+
	1419	+ //constraints.gridy += 1;
	1420	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	1421	+ smoothfocusCB.addItemListener(this);
	1422	+ panel.Return();
	1423	+ }
	1424	+
	1425	+//constraints.gridx += 1;
	1426	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	1427	+// debugCB.addItemListener(this);
	1428	+
	1429	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1430	+ trackCB.setToolTipText("Enable tracking target");
	1431	+ trackCB.addItemListener(this);
	1432	+
	1433	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1434	+ oeilCB.setToolTipText("Move camera when tracking");
	1435	+ oeilCB.addItemListener(this);
	1436	+
	1437	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1438	+ shadowCB.setToolTipText("When live compute shadows");
	1439	+ shadowCB.addItemListener(this);
	1440	+
	1441	+ panel.Return();
	1442	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1443	+ toggleTextureCB.setToolTipText("Load textures");
	1444	+ toggleTextureCB.addItemListener(this);
	1445	+
	1446	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1447	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1448	+ toggleSwitchCB.addItemListener(this);
	1449	+
	1450	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1451	+ autokeepCB.setToolTipText("On structure change");
	1452	+ autokeepCB.addItemListener(this);
	1453	+
	1454	+ panel.Return();
	1455	+ if (Globals.ADVANCED)
	1456	+ {
	1457	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	1458	+ lookAtCB.setToolTipText("Look-at target");
	1459	+ lookAtCB.addItemListener(this);
	1460	+ }
	1461	+
	1462	+ }
	1463	+
	1464	+ cGridBag fill = new cGridBag();
	1465	+ fill.preferredHeight = 200;
	1466	+ cGridBag fill2 = new cGridBag();
	1467	+ fill2.preferredHeight = 200;
	1468	+ cGridBag fill3 = new cGridBag();
	1469	+ fill3.preferredHeight = 200;
	1470	+
	1471	+ panel.add(fill);
	1472	+ panel.add(fill2);
	1473	+ panel.add(fill3);
	1474	+
	1475	+ }
636	1476
637	1477	void EditObject(Object3D obj)
638	1478	{
639		- cRadio dummyButton = new cRadio(obj.name);
640		- dummyButton.SetObject(obj);
641		- dummyButton.layout = sevenButton;
642		- dummyButton.SetCamera(cameraView.renderCamera, false);
643		- dummyButton.addActionListener(this);
644		- radioPanel.add(dummyButton);
645		- buttonGroup.add(dummyButton);
646		- dummyButton.doClick();
	1479	+ assert(obj instanceof Composite);
	1480	+
	1481	+// if (obj.versionlist == null)
	1482	+// {
	1483	+// obj.versionlist = new Object3D[100];
	1484	+// obj.versionindex = -1;
	1485	+// }
	1486	+
	1487	+ cRadio radioButton = new cRadio(obj.name);
	1488	+
	1489	+ // June 2019. Patch to avoid bug with transparency.
	1490	+ radioButton.hadMaterial = obj.material != null;
	1491	+ if (!radioButton.hadMaterial)
	1492	+ {
	1493	+ obj.material = new cMaterial();
	1494	+ }
	1495	+
	1496	+ radioButton.SetObject(obj);
	1497	+ radioButton.layout = threeButton; // sixButton;
	1498	+ radioButton.SetCamera(cameraView.renderCamera, false);
	1499	+ radioButton.addActionListener(this);
	1500	+ radioPanel.add(radioButton);
	1501	+ buttonGroup.add(radioButton);
	1502	+ radioButton.doClick();
647	1503	}
	1504	+
648	1505	void SetupViews(ObjEditor oe)
649	1506	{
	1507	+ theFrame = this;
	1508	+
650	1509	oe.SetupViews();
651	1510
	1511	+ if (Globals.DEBUG)
652	1512	System.out.println("SetupViews");
653	1513	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
654	1514	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
655	1515	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
656	1516	}
657	1517
658		- JCheckBox liveCB;
659		- JCheckBox supportCB;
660		- JCheckBox localCB;
661		- JCheckBox crowdCB;
662		- JCheckBox smoothCB;
663		- JCheckBox fastCB;
664		- JCheckBox slowCB;
665		- JCheckBox boxCB;
666		- JCheckBox trackCB;
667		- JCheckBox smoothfocusCB;
	1518	+ cToggleButton liveCB;
	1519	+ cCheckBox supportCB;
	1520	+ cCheckBox localCB;
	1521	+ cCheckBox crowdCB;
	1522	+ cCheckBox smoothCB;
	1523	+ cCheckBox minshaderCB;
	1524	+
	1525	+ cToggleButton fastCB;
	1526	+ cCheckBox slowCB;
	1527	+ cCheckBox boxCB;
	1528	+ cCheckBox zoomBoxCB;
	1529	+ cCheckBox freezeCB;
	1530	+ //cToggleButton trackCB;
	1531	+ cCheckBox trackCB;
	1532	+ cCheckBox smoothfocusCB;
668	1533	// JCheckBox speakerMocapCB;
669		- JCheckBox speakerCameraCB;
670		- JCheckBox speakerFocusCB;
671		- JCheckBox debugCB;
672		- JCheckBox oeilCB;
673		- JCheckBox lookAtCB;
	1534	+ cCheckBox speakerCameraCB;
	1535	+ cCheckBox speakerFocusCB;
	1536	+ cCheckBox debugCB;
	1537	+
	1538	+ cCheckBox oeilCB;
	1539	+ cCheckBox shadowCB;
	1540	+ cCheckBox autokeepCB;
	1541	+ cCheckBox lookAtCB;
674	1542
675	1543	// static int COLOR = 1;
676	1544	// static int MATERIAL = 2;
..	..	@@ -678,9 +1546,9 @@
678	1546
679	1547	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
680	1548
681		- JCheckBox colorCB;
682		- JCheckBox materialCB;
683		- JCheckBox textureCB;
	1549	+ cCheckBox colorCB;
	1550	+ cCheckBox materialCB;
	1551	+ cCheckBox textureCB;
684	1552
685	1553	public void itemStateChanged(ItemEvent e)
686	1554	{
..	..	@@ -705,10 +1573,10 @@
705	1573	dropAttributes \|= Object3D.TEXTURE;
706	1574	else
707	1575	dropAttributes &= ~Object3D.TEXTURE;
708		- }
709		- else if(e.getSource() == liveCB)
	1576	+ } else if(e.getSource() == liveCB)
710	1577	{
711	1578	cameraView.ToggleLive();
	1579	+ refreshContents(false);
712	1580	}
713	1581	else if(e.getSource() == supportCB)
714	1582	{
..	..	@@ -724,6 +1592,12 @@
724	1592	{
725	1593	cameraView.ToggleInertia();
726	1594	cameraView.repaint();
	1595	+ }
	1596	+ else if(e.getSource() == minshaderCB)
	1597	+ {
	1598	+ Globals.MINSHADER ^= true;
	1599	+ cameraView.programInitialized = false;
	1600	+ cameraView.repaint();
727	1601	}
728	1602	else if(e.getSource() == localCB)
729	1603	{
..	..	@@ -743,6 +1617,10 @@
743	1617	Recompile();
744	1618	cameraView.repaint();
745	1619	// refreshContents();
	1620	+ }
	1621	+ else if(e.getSource() == zoomBoxCB)
	1622	+ {
	1623	+ cameraView.ToggleZoomBoxMode();
746	1624	}
747	1625	else if(e.getSource() == smoothfocusCB)
748	1626	{
..	..	@@ -769,6 +1647,18 @@
769	1647	{
770	1648	cameraView.ToggleOeil();
771	1649	}
	1650	+ else if(e.getSource() == shadowCB)
	1651	+ {
	1652	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1653	+ }
	1654	+ else if(e.getSource() == freezeCB)
	1655	+ {
	1656	+ Globals.FREEZEONMOVE ^= true;
	1657	+ }
	1658	+ else if(e.getSource() == autokeepCB)
	1659	+ {
	1660	+ Globals.REPLACEONMAKE ^= true;
	1661	+ }
772	1662	else if(e.getSource() == lookAtCB)
773	1663	{
774	1664	cameraView.ToggleLookAt();
..	..	@@ -785,7 +1675,8 @@
785	1675
786	1676	/**/
787	1677	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
788		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1678	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1679	+ TreePath path = objEditor.jTree.getSelectionPath();
789	1680	if ((path == null) \|\| (path.getPathCount() <= 1)) {
790	1681	// We can't move the root node or an empty selection
791	1682	return;
..	..	@@ -848,8 +1739,6 @@
848	1739	}
849	1740	}
850	1741
851		- String string = (String) object;
852		-
853	1742	System.out.println("Transfer = " + object + "; drop : " + target);
854	1743	// if( object instanceof java.io.File[])
855	1744	// {
..	..	@@ -857,7 +1746,11 @@
857	1746	// objEditor.DropFile((java.io.File[]) object, true);
858	1747	// return;
859	1748	// }
860		- if (string.charAt(0) == '/')
	1749	+
	1750	+ String string = object.toString();
	1751	+
	1752	+ // File path for Mac and Windows
	1753	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
861	1754	{
862	1755	// file(s)
863	1756	String[] names = string.split("\n");
..	..	@@ -884,7 +1777,7 @@
884	1777
885	1778	flashIt = false;
886	1779	CameraPane pane = (CameraPane) target;
887		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1780	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
888	1781	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
889	1782
890	1783	if (group.selection.size() == 1)
..	..	@@ -900,23 +1793,33 @@
900	1793
901	1794	assert target == objEditor.jTree;
902	1795	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1796	+ Object3D destinationLeaf;
903	1797	try {
904		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1798	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
905	1799	} catch (Exception e) {
906	1800	System.out.println("destinationPath : " + destinationPath);
907	1801	return;
908	1802	}
909	1803
910		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1804	+ for (int i=group.selection.size(); --i>=0;)
911	1805	{
	1806	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1807	+
	1808	+ // Cannot move into itself
	1809	+ if (child == destinationLeaf)
	1810	+ return;
	1811	+ }
	1812	+
	1813	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1814	+// {
912	1815	loadClipboard(true);
913	1816	objEditor.jTree.setSelectionPath(destinationPath);
914		- pasteInto(false);
915		- } else {
916		- loadClipboard(false);
917		- objEditor.jTree.setSelectionPath(destinationPath);
918		- pasteInto(false); // true); // ???
919		- }
	1817	+ pasteInto(false, false);
	1818	+// } else {
	1819	+// loadClipboard(false);
	1820	+// objEditor.jTree.setSelectionPath(destinationPath);
	1821	+// pasteInto(false, false); // true); // ???
	1822	+// }
920	1823	}
921	1824	public void dropActionChanged(DropTargetDragEvent dtde)
922	1825	// Called if the user has modified the current drop gesture
..	..	@@ -972,7 +1875,12 @@
972	1875	TreePath path;
973	1876
974	1877	public TransferableTreePath(TreePath tp) {
975		- path = tp;
	1878	+ Object[] objs = new Object[tp.getPathCount()];
	1879	+ for (int i=0; i<objs.length; i++)
	1880	+ {
	1881	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1882	+ }
	1883	+ path = new TreePath(objs);
976	1884	}
977	1885
978	1886	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1021,83 +1929,107 @@
1021	1929	{
1022	1930	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1023	1931	//heightFieldItem.addActionListener(this);
1024		- gridItem = menu.add(new MenuItem("Grid"));
1025		- gridItem.addActionListener(this);
1026		- rectoidItem = menu.add(new MenuItem("Box"));
1027		- rectoidItem.addActionListener(this);
1028		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1029		- ellipsoidItem.addActionListener(this);
1030		- coneItem = menu.add(new MenuItem("Cone"));
1031		- coneItem.addActionListener(this);
1032		- torusItem = menu.add(new MenuItem("Torus"));
1033		- torusItem.addActionListener(this);
1034		- superItem = menu.add(new MenuItem("Superellipsoid"));
1035		- superItem.addActionListener(this);
1036		- particleItem = menu.add(new MenuItem("Particle system"));
1037		- particleItem.addActionListener(this);
	1932	+// gridItem = menu.add(new MenuItem("Grid"));
	1933	+// gridItem.addActionListener(this);
	1934	+// rectoidItem = menu.add(new MenuItem("Box"));
	1935	+// rectoidItem.addActionListener(this);
	1936	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1937	+// ellipsoidItem.addActionListener(this);
	1938	+// coneItem = menu.add(new MenuItem("Cone"));
	1939	+// coneItem.addActionListener(this);
	1940	+// torusItem = menu.add(new MenuItem("Torus"));
	1941	+// torusItem.addActionListener(this);
	1942	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1943	+// superItem.addActionListener(this);
	1944	+
	1945	+ cameraItem = menu.add(new MenuItem("Camera"));
	1946	+ cameraItem.addActionListener(this);
	1947	+
	1948	+ if (!Globals.ADVANCED)
	1949	+ {
	1950	+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
	1951	+ kleinItem.addActionListener(this);
	1952	+ }
	1953	+
	1954	+// particleItem = menu.add(new MenuItem("Particle system"));
	1955	+// particleItem.addActionListener(this);
	1956	+ if (Globals.ADVANCED)
	1957	+ {
1038	1958	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1039	1959	ragdollItem.addActionListener(this);
1040	1960	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1041	1961	ragdoll2Item.addActionListener(this);
	1962	+ }
1042	1963	menu.add("-");
1043		- meshItem = menu.add(new MenuItem("Mesh"));
	1964	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1044	1965	meshItem.addActionListener(this);
1045	1966	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1046	1967	// meshGroupItem.addActionListener(this);
	1968	+ if (Globals.ADVANCED)
	1969	+ {
1047	1970	springItem = menu.add(new MenuItem("Spring"));
1048	1971	springItem.addActionListener(this);
1049	1972	flagItem = menu.add(new MenuItem("Flag"));
1050	1973	flagItem.addActionListener(this);
1051		- bezierItem = menu.add(new MenuItem("Patch"));
1052		- bezierItem.addActionListener(this);
1053		- checkerItem = menu.add(new MenuItem("Checker"));
1054		- checkerItem.addActionListener(this);
1055	1974	blobItem = menu.add(new MenuItem("Blob"));
1056	1975	blobItem.addActionListener(this);
1057	1976	latheItem = menu.add(new MenuItem("Lathe"));
1058	1977	latheItem.addActionListener(this);
1059		- lightItem = menu.add(new MenuItem("Light"));
1060		- lightItem.addActionListener(this);
	1978	+ }
	1979	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1980	+ bezierItem.addActionListener(this);
	1981	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1982	+// overlayItem.addActionListener(this);
	1983	+// lightItem = menu.add(new MenuItem("Light"));
	1984	+// lightItem.addActionListener(this);
1061	1985	menu.add("-");
1062	1986	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1063	1987	//superLoopItem.addActionListener(this);
1064		- loopItem = menu.add(new MenuItem("Loop"));
1065		- loopItem.addActionListener(this);
	1988	+// loopItem = menu.add(new MenuItem("Loop"));
	1989	+// loopItem.addActionListener(this);
1066	1990	doubleItem = menu.add(new MenuItem("Fork"));
1067	1991	doubleItem.addActionListener(this);
	1992	+ if (Globals.ADVANCED)
	1993	+ {
1068	1994	tripleItem = menu.add(new MenuItem("Trident"));
1069	1995	tripleItem.addActionListener(this);
	1996	+ }
1070	1997	}
1071	1998
1072	1999	void buildToolsMenu(Menu menu)
1073	2000	{
1074	2001	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1075	2002	animationItem.addItemListener(this);
1076		- animationItem.setState(CameraPane.ANIMATION);
	2003	+ animationItem.setState(Globals.ANIMATION);
	2004	+
	2005	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	2006	+ archiveItem.addActionListener(this);
1077	2007
1078	2008	menu.add("-");
1079	2009	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1080	2010	parseverticesItem.addActionListener(this);
1081	2011	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1082	2012	textureFieldItem.addActionListener(this);
1083		- alignItem = menu.add(new MenuItem("Align"));
	2013	+ alignItem = menu.add(new MenuItem("Align Objects"));
1084	2014	alignItem.addActionListener(this);
1085		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1086		- mirrorItem.addActionListener(this);
1087	2015	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1088	2016	reduceMorphItem.addActionListener(this);
1089	2017	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1090	2018	reduce34MorphItem.addActionListener(this);
1091		-
1092		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1093		- computeAOItem.addActionListener(this);
1094	2019	menu.add("-");
1095		-
1096	2020	menu.add(memoryItem = new MenuItem("Memory Usage"));
1097	2021	memoryItem.addActionListener(this);
	2022	+ menu.add(computeAOItem = new MenuItem("Compute AO"));
	2023	+ computeAOItem.addActionListener(this);
	2024	+
	2025	+ if (Globals.ADVANCED)
	2026	+ {
	2027	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	2028	+ mirrorItem.addActionListener(this);
	2029	+ menu.add("-");
1098	2030	menu.add(analyzeItem = new MenuItem("Analyze"));
1099	2031	analyzeItem.addActionListener(this);
1100		- menu.add(dumpItem = new MenuItem("Dump"));
	2032	+ menu.add(dumpItem = new MenuItem("Print"));
1101	2033	dumpItem.addActionListener(this);
1102	2034	// menu.add(pathItem = new MenuItem("From-to path"));
1103	2035	// pathItem.addActionListener(this);
..	..	@@ -1106,6 +2038,8 @@
1106	2038	resetParentItem.addActionListener(this);
1107	2039	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1108	2040	repairParentItem.addActionListener(this);
	2041	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	2042	+ repairShadowItem.addActionListener(this);
1109	2043	menu.add(invariantsItem = new MenuItem("Invariants"));
1110	2044	invariantsItem.addActionListener(this);
1111	2045	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1113,6 +2047,7 @@
1113	2047	menu.add("-");
1114	2048	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1115	2049	editScriptItem.addActionListener(this);
	2050	+ }
1116	2051	}
1117	2052
1118	2053	void ScreenFit()
..	..	@@ -1235,9 +2170,38 @@
1235	2170	shadow.material = new cMaterial(obj.material);
1236	2171	shadow.material.diffuse = 0.0001f;
1237	2172	shadow.material.specular = 0.0001f;
	2173	+ shadow.material.opacity = 0.75f;
	2174	+
	2175	+ AllocProjectedVertices(shadow);
	2176	+
	2177	+ shadow.projectedVertices[1].x = 300;
1238	2178
1239	2179	makeSomething(shadow);
1240	2180	}
	2181	+
	2182	+ private void ClearUnpinned()
	2183	+ {
	2184	+ //for (Object3D obj : listUI)
	2185	+ for (int i=listUI.size(); --i>=0;)
	2186	+ {
	2187	+ Object3D obj = listUI.elementAt(i);
	2188	+ if (!obj.pinned)
	2189	+ {
	2190	+ obj.CloseUI();
	2191	+ listUI.remove(i);
	2192	+ }
	2193	+ }
	2194	+ }
	2195	+
	2196	+ private void EditElement(Object3D elem, boolean newWindow)
	2197	+ {
	2198	+ // if (!(elem instanceof Composite))
	2199	+ // newWindow = false;
	2200	+ listUI.add(elem);
	2201	+ elem.openEditWindow(this, newWindow); //, false);
	2202	+ System.out.println("edit : " + elem);
	2203	+ elem.editWindow.refreshContents(true); // ? new
	2204	+ }
1241	2205
1242	2206	/**
1243	2207	* applyExample
..	..	@@ -1441,9 +2405,9 @@
1441	2405
1442	2406	void Overwrite(int mask)
1443	2407	{
1444		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2408	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1445	2409	{
1446		- Object3D content = GrafreeD.clipboard.get(0);
	2410	+ Object3D content = Grafreed.clipboard.get(0);
1447	2411
1448	2412	if (content instanceof cGroup && ((cGroup)content).transientlink )
1449	2413	content = ((cGroup)content).get(0);
..	..	@@ -1466,6 +2430,7 @@
1466	2430	//
1467	2431	public void actionPerformed(ActionEvent event) // , Object arg)
1468	2432	{
	2433	+ Object source = event.getSource();
1469	2434	/*
1470	2435	if (event.getSource() == nameField)
1471	2436	{
..	..	@@ -1477,11 +2442,11 @@
1477	2442	}
1478	2443	else
1479	2444	*/
1480		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	2445	+ if (source == lookAtItem \|\| source == lookFromItem)
1481	2446	{
1482	2447	ScreenFit();
1483	2448	} else
1484		- if (event.getSource() == switchItem)
	2449	+ if (source == switchViewItem)
1485	2450	{
1486	2451	cVector v1 = new cVector();
1487	2452	cVector v2 = new cVector();
..	..	@@ -1490,11 +2455,11 @@
1490	2455	objEditor.cameraView.renderCamera.setAim(v2, v1);
1491	2456	objEditor.cameraView.repaint();
1492	2457	} else
1493		- if (event.getSource() == rectoidItem)
	2458	+ if (source == rectoidItem \|\| source == boxButton)
1494	2459	{
1495	2460	makeSomething(new Box());
1496	2461	} else
1497		- if (event.getSource() == particleItem)
	2462	+ if (source == particleItem \|\| source == particlesButton)
1498	2463	{
1499	2464	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1500	2465	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1515,9 +2480,9 @@
1515	2480	applyExample(particleGeom, "SMOKE");
1516	2481	makeSomething(particleGeom);
1517	2482	} else
1518		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	2483	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1519	2484	{
1520		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	2485	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1521	2486
1522	2487	ragdoll.toParent = LA.newMatrix();
1523	2488	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1535,7 +2500,7 @@
1535	2500	} else
1536	2501	/*
1537	2502	*/
1538		- if (event.getSource() == heightFieldItem)
	2503	+ if (source == heightFieldItem)
1539	2504	{
1540	2505	Object3D obj = new Object3D();
1541	2506
..	..	@@ -1573,27 +2538,31 @@
1573	2538
1574	2539	makeSomething(obj);
1575	2540	} else
1576		- if (event.getSource() == gridItem)
	2541	+ if (source == gridItem \|\| source == gridButton)
1577	2542	{
1578	2543	makeSomething(new Grid());
1579	2544	} else
1580		- if (event.getSource() == ellipsoidItem)
	2545	+ if (source == ellipsoidItem \|\| source == sphereButton)
1581	2546	{
1582	2547	makeSomething(new Sphere());
1583	2548	} else
1584		- if (event.getSource() == coneItem)
	2549	+ if (source == coneItem \|\| source == coneButton)
1585	2550	{
1586	2551	makeSomething(new Cone());
1587	2552	} else
1588		- if (event.getSource() == torusItem)
	2553	+ if (source == torusItem \|\| source == torusButton)
1589	2554	{
1590	2555	makeSomething(new Torus());
1591	2556	} else
1592		- if (event.getSource() == superItem)
	2557	+ if (source == superItem \|\| source == superButton)
1593	2558	{
1594	2559	makeSomething(new Superellipsoid());
1595	2560	} else
1596		- if (event.getSource() == blobItem)
	2561	+ if (source == kleinItem \|\| source == kleinButton)
	2562	+ {
	2563	+ makeSomething(new Klein());
	2564	+ } else
	2565	+ if (source == blobItem)
1597	2566	{
1598	2567	Blob blob = new Blob();
1599	2568	BlobComponent comp = new BlobComponent();
..	..	@@ -1601,15 +2570,15 @@
1601	2570	//blob.retile();
1602	2571	makeSomething(blob);
1603	2572	} else
1604		- if (event.getSource() == latheItem)
	2573	+ if (source == latheItem)
1605	2574	{
1606	2575	makeSomething(new Lathe());
1607	2576	} else
1608		- if (event.getSource() == bezierItem)
	2577	+ if (source == bezierItem)
1609	2578	{
1610	2579	makeSomething(new BezierSurface());
1611	2580	} else
1612		- if (event.getSource() == checkerItem)
	2581	+ if (source == overlayItem \|\| source == overlayButton)
1613	2582	{
1614	2583	/*
1615	2584	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1624,7 +2593,7 @@
1624	2593	*/
1625	2594	makeSomething(new Checker());
1626	2595	} else
1627		- if (event.getSource() == meshItem)
	2596	+ if (source == meshItem)
1628	2597	{
1629	2598	Object3D itemtomake = new Object3D();
1630	2599	Object3D child;
..	..	@@ -1645,35 +2614,52 @@
1645	2614	makeSomething(child);
1646	2615	}
1647	2616	} else
1648		- if (event.getSource() == springItem)
	2617	+ if (source == springItem)
1649	2618	{
1650	2619	cSpring s = new cSpring();
1651	2620	s.setup();
1652	2621	makeSomething(s);
1653	2622	} else
1654		- if (event.getSource() == flagItem)
	2623	+ if (source == flagItem)
1655	2624	{
1656	2625	cSpring s = new cFlag();
1657	2626	s.setup();
1658	2627	makeSomething(s);
1659	2628	} else
1660		- if (event.getSource() == lightItem)
	2629	+ if (source == lightItem \|\| source == lightButton)
1661	2630	{
1662	2631	makeSomething(new Light());
1663	2632	} else
1664		- if (event.getSource() == csgItem)
	2633	+// if (source == skybox1Button \|\|
	2634	+// source == skybox2Button \|\|
	2635	+// source == skybox3Button \|\|
	2636	+// source == skybox4Button \|\|
	2637	+// source == skybox5Button \|\|
	2638	+// source == skybox6Button \|\|
	2639	+// source == skybox7Button \|\|
	2640	+// source == skybox11Button \|\|
	2641	+// source == skybox12Button \|\|
	2642	+// source == skybox13Button \|\|
	2643	+// source == skybox14Button \|\|
	2644	+// source == skybox15Button \|\|
	2645	+// source == skybox16Button \|\|
	2646	+// source == skybox17Button)
	2647	+// {
	2648	+// ChangeSkybox(source);
	2649	+// } else
	2650	+ if (source == csgItem)
1665	2651	{
1666	2652	group(new CSG());
1667	2653	} else
1668		- if (event.getSource() == templateItem)
	2654	+ if (source == templateItem)
1669	2655	{
1670	2656	group(new cTemplate());
1671	2657	} else
1672		- if (event.getSource() == attributeItem)
	2658	+ if (source == attributeItem)
1673	2659	{
1674	2660	makeSomething(new Attribute());
1675	2661	} else
1676		- if (event.getSource() == pointflowItem)
	2662	+ if (source == pointflowItem)
1677	2663	{
1678	2664	makeSomething(new PointFlow());
1679	2665	} else
..	..	@@ -1685,7 +2671,7 @@
1685	2671	} else
1686	2672	*/
1687	2673
1688		- if (event.getSource() == superLoopItem)
	2674	+ if (source == superLoopItem)
1689	2675	{
1690	2676	Composite g = new cGroup();
1691	2677	for (int i=0; i<15; i++)
..	..	@@ -1707,30 +2693,38 @@
1707	2693
1708	2694	group(g);
1709	2695	} else
1710		- if (event.getSource() == loopItem)
	2696	+ if (source == loopItem \|\| source == loopButton)
1711	2697	{
	2698	+ if (!group.selection.isEmpty())
	2699	+ {
1712	2700	Composite csg = new GroupLeaf();
1713	2701	csg.count = 5;
1714		- group(csg);
1715		- Composite child = new cGroup();
	2702	+ Composite child = new cGroup("Branch");
1716	2703	csg.addChild(child);
1717	2704	child.addChild(csg);
	2705	+ group(csg);
	2706	+ }
1718	2707	} else
1719		- if (event.getSource() == doubleItem)
	2708	+ if (source == doubleItem)
1720	2709	{
1721		- Composite csg = new GroupLeaf();
	2710	+ if (!group.selection.isEmpty())
	2711	+ {
	2712	+ Composite csg = new GroupLeaf("Fork");
1722	2713	csg.count = 5;
	2714	+ Composite child = new cGroup("Branch A");
	2715	+ csg.addChild(child);
	2716	+ child.addChild(csg);
	2717	+ child = new cGroup("Branch B");
	2718	+ csg.addChild(child);
	2719	+ child.addChild(csg);
1723	2720	group(csg);
1724		- Composite child = new cGroup();
1725		- csg.addChild(child);
1726		- child.addChild(csg);
1727		- child = new cGroup();
1728		- csg.addChild(child);
1729		- child.addChild(csg);
	2721	+ }
1730	2722	} else
1731		- if (event.getSource() == tripleItem)
	2723	+ if (source == tripleItem)
1732	2724	{
1733		- Composite csg = new GroupLeaf();
	2725	+ if (!group.selection.isEmpty())
	2726	+ {
	2727	+ Composite csg = new GroupLeaf("Trident");
1734	2728	csg.count = 4;
1735	2729	group(csg);
1736	2730	Composite child = new cGroup();
..	..	@@ -1742,74 +2736,119 @@
1742	2736	child = new cGroup();
1743	2737	csg.addChild(child);
1744	2738	child.addChild(csg);
	2739	+ }
1745	2740	} else
1746		-
1747		- if (event.getSource() == importGFDItem)
	2741	+ if (source == computeAOItem)
1748	2742	{
1749		- ImportGFD();
	2743	+ Globals.drawMode = CameraPane.OCCLUSION;
	2744	+ cameraView.repaint();
1750	2745	} else
1751		- if (event.getSource() == importVRMLX3DItem)
1752		- {
1753		- ImportVRMLX3D();
1754		- } else
1755		- if (event.getSource() == import3DSItem)
1756		- {
1757		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1758		- } else
1759		- if (event.getSource() == importOBJItem)
1760		- {
1761		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1762		- } else
1763		- if (event.getSource() == computeAOItem)
1764		- {
1765		- CameraPane.drawMode = CameraPane.OCCLUSION;
1766		- CameraPane.theRenderer.repaint();
1767		- } else
1768		- if (event.getSource() == recompileItem)
	2746	+ if (source == recompileItem)
1769	2747	{
1770	2748	Recompile();
1771	2749	refreshContents();
1772	2750	} else
1773		- if (event.getSource() == editScriptItem)
	2751	+ if (source == editScriptItem)
1774	2752	{
1775	2753	OpenDialog();
1776	2754	refreshContents();
1777	2755	} else
1778		- if (event.getSource() == invariantsItem)
	2756	+ if (source == invariantsItem)
1779	2757	{
1780	2758	System.out.println("Invariants:");
1781		- GrafreeD.theApplet3D.universe.invariants();
	2759	+ Grafreed.grafreed.universe.invariants();
1782	2760	} else
1783		- if (event.getSource() == memoryItem)
	2761	+ if (source == memoryItem)
1784	2762	{
1785	2763	//System.out.println("Invariants:");
1786	2764	PrintMemory();
1787	2765	} else
1788		- if (event.getSource() == pathItem)
	2766	+ if (source == pathItem)
1789	2767	{
1790	2768	PrintPath();
1791	2769	} else
1792		- if (event.getSource() == analyzeItem)
	2770	+ if (source == analyzeItem)
1793	2771	{
1794	2772	AnalyzeObject();
1795	2773	} else
1796		- if (event.getSource() == dumpItem)
	2774	+ if (source == dumpItem)
1797	2775	{
1798	2776	DumpObject();
1799	2777	} else
1800		- if (event.getSource() == screenfitButton)
	2778	+ if (source == minButton)
1801	2779	{
1802		- //Reload(lastConverter, lastFilename, true);
	2780	+ Minimize();
	2781	+ } else
	2782	+ if (source == maxButton)
	2783	+ {
	2784	+ Maximize();
	2785	+ } else
	2786	+ if (source == fullButton)
	2787	+ {
	2788	+ ToggleFullScreen();
	2789	+ } else
	2790	+ if (source == collapseButton)
	2791	+ {
	2792	+ this.expandedLayout = radio.layout;
	2793	+ CollapseToolbar();
	2794	+ } else
	2795	+ if (source == maximize3DButton)
	2796	+ {
	2797	+ this.expandedLayout = radio.layout;
	2798	+ radio.layout = twoButton;
	2799	+ Show3DView();
	2800	+ CollapseToolbar();
	2801	+ } else
	2802	+ if (source == previousVersionButton)
	2803	+ {
	2804	+ // Go to previous version
	2805	+ //if (!Undo())
	2806	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2807	+ PreviousVersion();
	2808	+ } else
	2809	+ if (source == restoreButton)
	2810	+ {
	2811	+ // Restore current version
	2812	+ Restore();
	2813	+ //restoreButton.setEnabled(false);
	2814	+ } else
	2815	+ if (source == replaceButton)
	2816	+ {
	2817	+ // Overwrite current version
	2818	+ Replace();
	2819	+ //replaceButton.setEnabled(false);
	2820	+ } else
	2821	+ if (source == nextVersionButton)
	2822	+ {
	2823	+ // Go to next version
	2824	+ NextVersion();
	2825	+ } else
	2826	+ if (source == saveVersionButton)
	2827	+ {
	2828	+ // Save a new version
	2829	+ if (!Save(true))
	2830	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2831	+ } else
	2832	+ if (source == deleteVersionButton)
	2833	+ {
	2834	+ // Delete a new version
	2835	+ DeleteVersion();
	2836	+ } else
	2837	+ if (source == oneStepButton)
	2838	+ {
	2839	+ Globals.ONESTEP = true;
	2840	+ cameraView.repaint();
	2841	+ } else
	2842	+ if (source == screenfitButton)
	2843	+ {
1803	2844	ScreenFit();
1804	2845	} else
1805		- if (event.getSource() == screenfitpointButton)
	2846	+ if (source == screenfitpointButton)
1806	2847	{
1807		- //Reload(lastConverter, lastFilename, true);
1808	2848	ScreenFitPoint();
1809	2849	} else
1810		- if (event.getSource() == snapobjectButton)
	2850	+ if (source == snapobjectButton)
1811	2851	{
1812		- //Reload(lastConverter, lastFilename, true);
1813	2852	SnapObject();
1814	2853	} else
1815	2854	// if (event.getSource() == recompileButton)
..	..	@@ -1818,13 +2857,13 @@
1818	2857	// Recompile();
1819	2858	// refreshContents();
1820	2859	// } else
1821		- if (event.getSource() == gcButton)
	2860	+ if (source == gcButton)
1822	2861	{
1823	2862	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1824	2863	System.gc();
1825	2864	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1826	2865	} else
1827		- if (event.getSource() == editLeafItem)
	2866	+ if (source == editLeafItem)
1828	2867	{
1829	2868	Object3D obj;
1830	2869	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1838,62 +2877,74 @@
1838	2877	}
1839	2878	refreshContents(true);
1840	2879	} else
1841		- if (event.getSource() == openWindowItem)
	2880	+ if (source == openWindowItem)
1842	2881	{
1843	2882	EditSelection(true);
1844	2883	} else
1845		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2884	+ if (source == cutItem \|\| source == clearButton)
1846	2885	{
1847	2886	loadClipboard(true);
1848	2887	} else
1849		- if (event.getSource() == duplicateItem)
	2888	+ if (source == undoItem)
1850	2889	{
1851		- Object3D keep = GrafreeD.clipboard;
	2890	+ PreviousVersion();
	2891	+ } else
	2892	+ if (source == redoItem)
	2893	+ {
	2894	+ NextVersion();
	2895	+ } else
	2896	+ if (source == duplicateItem)
	2897	+ {
	2898	+ Object3D keep = Grafreed.clipboard;
1852	2899	loadClipboard(false);
1853	2900	paste(false);
1854		- GrafreeD.clipboard = keep;
	2901	+ Grafreed.clipboard = keep;
1855	2902	} else
1856		- if (event.getSource() == cloneItem)
	2903	+ if (source == cloneItem)
1857	2904	{
1858	2905	CloneSelection(false);
1859	2906	} else
1860		- if (event.getSource() == cloneSupportItem)
	2907	+ if (source == cloneSupportItem)
1861	2908	{
1862	2909	CloneSelection(true);
1863	2910	} else
1864		- if (event.getSource() == copyItem)
	2911	+ if (source == copyItem)
1865	2912	{
1866	2913	loadClipboard(false);
1867	2914	} else
1868		- if (event.getSource() == pasteItem)
	2915	+ if (source == pasteItem)
1869	2916	{
1870	2917	paste(false);
1871	2918	} else
1872		- if (event.getSource() == pasteLinkItem)
	2919	+ if (source == pasteIntoItem)
1873	2920	{
1874		- pasteInto(false);
	2921	+ pasteInto(true, false);
1875	2922	} else
1876		- if (event.getSource() == pasteCloneItem)
	2923	+ if (source == pasteLinkItem)
1877	2924	{
1878		- pasteInto(true);
	2925	+ pasteInto(false, false);
1879	2926	} else
1880		- if (event.getSource() == pasteExpandItem)
	2927	+ if (source == pasteCloneItem)
	2928	+ {
	2929	+ pasteInto(true, true);
	2930	+ } else
	2931	+ if (source == pasteExpandItem)
1881	2932	{
1882	2933	paste(true);
1883	2934	} else
1884		- if (event.getSource() == synchronizeItem)
	2935	+ if (source == synchronizeItem)
1885	2936	{
1886	2937	Overwrite(Object3D.TRANSFORM);
1887	2938	} else
1888		- if (event.getSource() == overwriteNameItem)
	2939	+ if (source == overwriteNameItem)
1889	2940	{
1890	2941	Overwrite(Object3D.NAME);
1891	2942	} else
1892		- if (event.getSource() == overwriteUVItem)
	2943	+ if (source == overwriteUVItem)
1893	2944	{
1894	2945	Overwrite(Object3D.UV);
1895	2946	} else
1896		- if (event.getSource() == overwriteMatItem)
	2947	+ if (source == overwriteMatItem)
1897	2948	{
1898	2949	/* july 2015
1899	2950	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1913,7 +2964,7 @@
1913	2964
1914	2965	Overwrite(dropAttributes);
1915	2966	}
1916		- if (event.getSource() == overwriteGeoItem)
	2967	+ if (source == overwriteGeoItem)
1917	2968	{
1918	2969	Overwrite(Object3D.GEOMETRY);
1919	2970	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1930,7 +2981,7 @@
1930	2981	// refreshContents();
1931	2982	// }
1932	2983	} else
1933		- if (event.getSource() == generateMeshItem)
	2984	+ if (source == generateMeshItem)
1934	2985	{
1935	2986	//if (group.selection.size() == 1)
1936	2987	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1941,7 +2992,7 @@
1941	2992	ResetModel();
1942	2993	refreshContents();
1943	2994	} else
1944		- if (event.getSource() == extractGeometriesItem)
	2995	+ if (source == extractGeometriesItem)
1945	2996	{
1946	2997	boolean one = false;
1947	2998
..	..	@@ -1968,7 +3019,7 @@
1968	3019	ResetModel();
1969	3020	refreshContents();
1970	3021	} else
1971		- if (event.getSource() == cloneGeometriesItem)
	3022	+ if (source == cloneGeometriesItem)
1972	3023	{
1973	3024	boolean one = false;
1974	3025
..	..	@@ -1994,32 +3045,37 @@
1994	3045	ResetModel();
1995	3046	refreshContents();
1996	3047	} else
1997		- if (event.getSource() == shareGeometriesItem)
	3048	+ if (source == shareGeometriesItem)
1998	3049	{
1999	3050	boolean one = false;
2000	3051
2001	3052	if (group.selection.size() == 1)
2002	3053	one = true;
2003	3054
	3055	+ Object3D merge = null;
	3056	+
2004	3057	Object3D content = new cGroup();
2005	3058
2006	3059	for (int i=0; i<group.selection.size(); i++)
2007	3060	{
2008		- Object3D sel = new Merge(group.selection.get(i));
	3061	+ merge = new Merge(group.selection.get(i));
2009	3062
2010	3063	if (one)
2011		- makeSomething(sel, false);
	3064	+ makeSomething(merge, false);
2012	3065	else
2013		- content.addChild(sel);
	3066	+ content.addChild(merge);
2014	3067	}
2015	3068
2016	3069	if (!one)
2017		- makeSomething(content, false);
2018		-
2019		- ResetModel();
2020		- refreshContents();
	3070	+ makeSomething(content, true);
	3071	+ else
	3072	+ {
	3073	+ ResetModel();
	3074	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	3075	+ refreshContents();
	3076	+ }
2021	3077	} else
2022		- if (event.getSource() == mergeGeometriesItem)
	3078	+ if (source == mergeGeometriesItem)
2023	3079	{
2024	3080	boolean one = false;
2025	3081
..	..	@@ -2049,7 +3105,7 @@
2049	3105	ResetModel();
2050	3106	refreshContents();
2051	3107	} else
2052		- if (event.getSource() == linkverticesItem)
	3108	+ if (source == linkverticesItem)
2053	3109	{
2054	3110	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2055	3111	// {
..	..	@@ -2062,39 +3118,48 @@
2062	3118	// group.selection.get(0).setMasterThis(content); // should be identity
2063	3119	// refreshContents();
2064	3120	// }
2065		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	3121	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2066	3122	{
2067		- Object3D content = GrafreeD.clipboard.get(0);
	3123	+ Object3D content = Grafreed.clipboard.get(0);
2068	3124
2069	3125	if (content instanceof cGroup && ((cGroup)content).transientlink )
2070	3126	content = ((cGroup)content).get(0);
2071	3127
2072		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	3128	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2073	3129	for (int i=0; i<group.selection.size(); i++)
2074	3130	{
2075		- boolean random = CameraPane.RANDOM;
2076		- CameraPane.RANDOM = false; // parse all random nodes
	3131	+ boolean random = CameraPane.SWITCH;
	3132	+ CameraPane.SWITCH = false; // parse all random nodes
2077	3133	group.selection.get(i).linkVerticesThis(content);
2078	3134	// group.selection.get(i).setMasterThis(content); // should be identity
2079		- CameraPane.RANDOM = random;
	3135	+ CameraPane.SWITCH = random;
2080	3136	}
2081		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	3137	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2082	3138	refreshContents();
2083	3139	}
2084	3140	} else
2085		- if (event.getSource() == resetsupportItem)
	3141	+ if (source == resetsupportItem)
2086	3142	{
2087	3143	for (int i=0; i<group.selection.size(); i++)
2088	3144	{
2089		- boolean random = CameraPane.RANDOM;
2090		- CameraPane.RANDOM = false; // parse all random nodes
	3145	+ boolean random = CameraPane.SWITCH;
	3146	+ CameraPane.SWITCH = false; // parse all random nodes
2091	3147	group.selection.get(i).linkVerticesThis(null);
2092		- CameraPane.RANDOM = random;
	3148	+ CameraPane.SWITCH = random;
2093	3149	}
2094	3150
2095	3151	refreshContents();
2096	3152	} else
2097		- if (event.getSource() == resetreferencesItem)
	3153	+ if (source == relinkverticesItem)
	3154	+ {
	3155	+ boolean random = CameraPane.SWITCH;
	3156	+ CameraPane.SWITCH = false; // parse all random nodes
	3157	+ group.selection.RelinkToSupport();
	3158	+ CameraPane.SWITCH = random;
	3159	+
	3160	+ refreshContents();
	3161	+ } else
	3162	+ if (source == resetreferencesItem)
2098	3163	{
2099	3164	for (int i=0; i<group.selection.size(); i++)
2100	3165	{
..	..	@@ -2103,11 +3168,11 @@
2103	3168
2104	3169	refreshContents();
2105	3170	} else
2106		- if (event.getSource() == setMasterItem)
	3171	+ if (source == setMasterItem)
2107	3172	{
2108		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	3173	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2109	3174	{
2110		- Object3D content = GrafreeD.clipboard.get(0);
	3175	+ Object3D content = Grafreed.clipboard.get(0);
2111	3176
2112	3177	if (content instanceof cGroup && ((cGroup)content).transientlink )
2113	3178	content = ((cGroup)content).get(0);
..	..	@@ -2116,13 +3181,13 @@
2116	3181	refreshContents();
2117	3182	}
2118	3183	} else
2119		- if (event.getSource() == poseMeshItem)
	3184	+ if (source == poseMeshItem)
2120	3185	{
2121	3186	if (group.selection.size() == 1)
2122	3187	{
2123		- if (GrafreeD.clipboard.size() == 1)
	3188	+ if (Grafreed.clipboard.size() == 1)
2124	3189	{
2125		- Object3D content = GrafreeD.clipboard.get(0);
	3190	+ Object3D content = Grafreed.clipboard.get(0);
2126	3191
2127	3192	if (content instanceof cGroup && ((cGroup)content).transientlink )
2128	3193	content = ((cGroup)content).get(0);
..	..	@@ -2135,19 +3200,19 @@
2135	3200	}
2136	3201
2137	3202	} else
2138		- if (event.getSource() == revertMeshItem)
	3203	+ if (source == revertMeshItem)
2139	3204	{
2140	3205	RevertMeshes();
2141	3206	} else
2142		- if (event.getSource() == resetMeshItem)
	3207	+ if (source == resetAllItem)
2143	3208	{
2144	3209	ResetAll();
2145	3210	} else
2146		- if (event.getSource() == stepAllItem)
	3211	+ if (source == stepAllItem)
2147	3212	{
2148	3213	StepAll();
2149	3214	} else
2150		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	3215	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2151	3216	{
2152	3217	//int indices[] = jList.getSelectedIndices();
2153	3218	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2155,42 +3220,46 @@
2155	3220
2156	3221	ClearSelection(false);
2157	3222	} else
2158		- if (event.getSource() == clearAllItem)
	3223	+ if (source == clearAllItem)
2159	3224	{
2160	3225	ClearSelection(true);
2161	3226	} else
2162		- if (event.getSource() == grabItem)
	3227	+ if (source == grabItem \|\| source == groupButton)
2163	3228	{
2164		- group(new cGroup(), true);
	3229	+ group(new cGroup(), false); // true);
2165	3230	} else
2166		- if (event.getSource() == frontItem)
	3231	+ if (source == hideItem)
	3232	+ {
	3233	+ group(new HiddenObject());
	3234	+ } else
	3235	+ if (source == frontItem)
2167	3236	{
2168	3237	front();
2169	3238	} else
2170		- if (event.getSource() == backItem)
	3239	+ if (source == backItem)
2171	3240	{
2172	3241	back();
2173	3242	} else
2174		- if (event.getSource() == cameraItem)
	3243	+ if (source == cameraItem)
2175	3244	{
2176	3245	makeSomething(new Camera());
2177	3246	} else
2178		- if (event.getSource() == compositeItem)
	3247	+ if (source == compositeItem \|\| source == compositeButton)
2179	3248	{
2180	3249	group(new Composite());
2181	3250	} else
2182		- if (event.getSource() == randomItem)
	3251	+ if (source == switchItem \|\| source == switchButton)
2183	3252	{
2184	3253	RandomNode random = new RandomNode();
2185	3254	group(random);
2186	3255	if (random.size() > 0)
2187		- random.name = random.get(0).name + "Rnd";
	3256	+ random.name = random.get(0).name + "Switch";
2188	3257	} else
2189		- if (event.getSource() == physicsItem)
	3258	+ if (source == physicsItem)
2190	3259	{
2191	3260	group(new PhysicsNode());
2192	3261	} else
2193		- if (event.getSource() == frameselectorItem)
	3262	+ if (source == frameselectorItem)
2194	3263	{
2195	3264	for (int i=0; i<group.selection.size(); i++)
2196	3265	{
..	..	@@ -2202,7 +3271,7 @@
2202	3271	ResetModel();
2203	3272	refreshContents();
2204	3273	} else
2205		- if (event.getSource() == switchGeoItem)
	3274	+ if (source == switchGeoItem)
2206	3275	{
2207	3276	for (int i=0; i<group.selection.size(); i++)
2208	3277	{
..	..	@@ -2214,7 +3283,7 @@
2214	3283	ResetModel();
2215	3284	refreshContents();
2216	3285	} else
2217		- if (event.getSource() == switchTransfoItem)
	3286	+ if (source == switchTransfoItem)
2218	3287	{
2219	3288	for (int i=0; i<group.selection.size(); i++)
2220	3289	{
..	..	@@ -2226,7 +3295,7 @@
2226	3295	ResetModel();
2227	3296	refreshContents();
2228	3297	} else
2229		- if (event.getSource() == morphItem)
	3298	+ if (source == morphItem)
2230	3299	{
2231	3300	for (int i=0; i<group.selection.size(); i++)
2232	3301	{
..	..	@@ -2238,7 +3307,7 @@
2238	3307	ResetModel();
2239	3308	refreshContents();
2240	3309	} else
2241		- if (event.getSource() == scriptNodeItem)
	3310	+ if (source == scriptNodeItem)
2242	3311	{
2243	3312	boolean atleastone = false;
2244	3313
..	..	@@ -2277,195 +3346,264 @@
2277	3346	}
2278	3347	}
2279	3348	} else
2280		- if (event.getSource() == linkerItem)
	3349	+ if (source == linkerItem)
2281	3350	{
2282	3351	group(new cLinker());
2283	3352	} else
2284		- if (event.getSource() == textureItem)
	3353	+ if (source == textureItem \|\| source == textureButton)
2285	3354	{
2286	3355	group(new TextureNode());
2287	3356	} else
2288		- if (event.getSource() == shadowXItem)
	3357	+ if (source == billboardItem)
	3358	+ {
	3359	+ group(new BillboardNode());
	3360	+ } else
	3361	+ if (source == shadowXItem)
2289	3362	{
2290	3363	CastShadow(0);
2291	3364	} else
2292		- if (event.getSource() == shadowYItem)
	3365	+ if (source == shadowYItem)
2293	3366	{
2294	3367	CastShadow(1);
2295	3368	} else
2296		- if (event.getSource() == shadowZItem)
	3369	+ if (source == shadowZItem)
2297	3370	{
2298	3371	CastShadow(2);
2299	3372	} else
2300		- if (event.getSource() == ungroupItem)
	3373	+ if (source == ungroupItem \|\| source == ungroupButton)
2301	3374	{
2302		- ungroup();
	3375	+ boolean canUngroup = true;
	3376	+
	3377	+ for (int i=0; i<group.selection.size(); i++)
	3378	+ {
	3379	+ Object3D selectedItem = group.selection.get(i);
	3380	+
	3381	+ if (selectedItem.Size() == 0)
	3382	+ {
	3383	+ // Cannot ungroup leaves
	3384	+ canUngroup = false;
	3385	+ break;
	3386	+ }
	3387	+
	3388	+ if (selectedItem == group)
	3389	+ {
	3390	+ // Cannot ungroup root
	3391	+ canUngroup = false;
	3392	+ break;
	3393	+ }
	3394	+ }
	3395	+
	3396	+ if (canUngroup)
	3397	+ {
	3398	+ for (int i=0; i<group.selection.size(); i++)
	3399	+ {
	3400	+ Object3D selectedItem = group.selection.get(i);
	3401	+
	3402	+ Ungroup(selectedItem);
	3403	+ }
	3404	+
	3405	+ ClearSelection(false);
	3406	+
	3407	+ refreshContents();
	3408	+ }
2303	3409	} else
2304		- if (event.getSource() == genUVItem)
	3410	+ if (source == genUVItem)
2305	3411	{
2306	3412	GenUV();
2307	3413	} else
2308		- if (event.getSource() == genNormalsCADItem)
	3414	+ if (source == genNormalsCADItem)
2309	3415	{
2310	3416	GenNormals(true);
2311	3417	} else
2312		- if (event.getSource() == genNormalsORGANItem)
	3418	+ if (source == genNormalsMESHItem)
	3419	+ {
	3420	+ GenNormalsMESH();
	3421	+ } else
	3422	+ if (source == genNormalsORGANItem)
2313	3423	{
2314	3424	GenNormals(false);
2315	3425	} else
2316		- if (event.getSource() == stripifyItem)
	3426	+ if (source == genNormalsMINEItem)
	3427	+ {
	3428	+ GenNormalsMINE();
	3429	+ } else
	3430	+ if (source == stripifyItem)
2317	3431	{
2318	3432	Stripify();
2319	3433	} else
2320		- if (event.getSource() == unstripifyItem)
	3434	+ if (source == unstripifyItem)
2321	3435	{
2322	3436	Unstripify();
2323	3437	} else
2324		- if (event.getSource() == trimItem)
	3438	+ if (source == trimItem)
2325	3439	{
2326	3440	Trim();
2327	3441	} else
2328		- if (event.getSource() == untrimItem)
	3442	+ if (source == untrimItem)
2329	3443	{
2330	3444	Untrim();
2331	3445	} else
2332		- if (event.getSource() == clearColorsItem)
	3446	+ if (source == clearColorsItem)
2333	3447	{
2334	3448	ClearColors();
2335	3449	} else
2336		- if (event.getSource() == clearMaterialsItem)
	3450	+ if (source == clearMaterialsItem)
2337	3451	{
2338	3452	ClearMaterials();
2339	3453	} else
2340		- if (event.getSource() == liveleavesItem)
	3454	+ if (source == liveleavesItem)
2341	3455	{
2342	3456	LiveLeaves(true);
2343	3457	} else
2344		- if (event.getSource() == unliveleavesItem)
	3458	+ if (source == unliveleavesItem)
2345	3459	{
2346	3460	LiveLeaves(false);
2347	3461	} else
2348		- if (event.getSource() == supportleavesItem)
	3462	+ if (source == supportleavesItem)
2349	3463	{
2350	3464	SupportLeaves(true);
2351	3465	} else
2352		- if (event.getSource() == unsupportleavesItem)
	3466	+ if (source == unsupportleavesItem)
2353	3467	{
2354	3468	SupportLeaves(false);
2355	3469	} else
2356		- if (event.getSource() == hideleavesItem)
	3470	+ if (source == hideleavesItem)
2357	3471	{
2358	3472	HideLeaves(true);
2359	3473	} else
2360		- if (event.getSource() == showleavesItem)
	3474	+ if (source == showleavesItem)
2361	3475	{
2362	3476	HideLeaves(false);
2363	3477	} else
2364		- if (event.getSource() == markleavesItem)
	3478	+ if (source == markleavesItem)
2365	3479	{
2366	3480	MarkLeaves(true);
2367	3481	} else
2368		- if (event.getSource() == unmarkleavesItem)
	3482	+ if (source == unmarkleavesItem)
2369	3483	{
2370	3484	MarkLeaves(false);
2371	3485	} else
2372		- if (event.getSource() == flipVItem)
	3486	+ if (source == rewindleavesItem)
	3487	+ {
	3488	+ RewindLeaves(true);
	3489	+ } else
	3490	+ if (source == unrewindleavesItem)
	3491	+ {
	3492	+ RewindLeaves(false);
	3493	+ } else
	3494	+ if (source == randomleavesItem)
	3495	+ {
	3496	+ RandomLeaves(true);
	3497	+ } else
	3498	+ if (source == unrandomleavesItem)
	3499	+ {
	3500	+ RandomLeaves(false);
	3501	+ } else
	3502	+ if (source == flipVItem)
2373	3503	{
2374	3504	FlipV(true);
2375	3505	} else
2376		- if (event.getSource() == unflipVItem)
	3506	+ if (source == unflipVItem)
2377	3507	{
2378	3508	FlipV(false);
2379	3509	} else
2380		- if (event.getSource() == lowTexturesItem)
	3510	+ if (source == lowTexturesItem)
2381	3511	{
2382	3512	SetTexRes(0);
2383	3513	} else
2384		- if (event.getSource() == normalTexturesItem)
	3514	+ if (source == normalTexturesItem)
2385	3515	{
2386	3516	SetTexRes(1);
2387	3517	} else
2388		- if (event.getSource() == highTexturesItem)
	3518	+ if (source == highTexturesItem)
2389	3519	{
2390	3520	SetTexRes(2);
2391	3521	} else
2392		- if (event.getSource() == veryhighTexturesItem)
	3522	+ if (source == veryhighTexturesItem)
2393	3523	{
2394	3524	SetTexRes(3);
2395	3525	} else
2396		- if (event.getSource() == maxTexturesItem)
	3526	+ if (source == maxTexturesItem)
2397	3527	{
2398	3528	SetTexRes(4);
2399	3529	} else
2400		- if (event.getSource() == panoTexturesItem)
	3530	+ if (source == panoTexturesItem)
2401	3531	{
2402	3532	SetTexRes(5);
2403	3533	} else
2404		- if (event.getSource() == reverseNormalsItem)
	3534	+ if (source == reverseNormalsItem)
2405	3535	{
2406	3536	ReverseNormals();
2407	3537	} else
2408		- if (event.getSource() == parseverticesItem)
	3538	+ if (source == parseverticesItem)
2409	3539	{
2410	3540	ParseVertices();
2411	3541	} else
2412		- if (event.getSource() == textureFieldItem)
	3542	+ if (source == textureFieldItem)
2413	3543	{
2414	3544	TextureVertices();
2415	3545	} else
2416		- if (event.getSource() == alignItem)
	3546	+ if (source == alignItem)
2417	3547	{
2418	3548	Align();
2419	3549	} else
2420		- if (event.getSource() == mirrorItem)
	3550	+ if (source == mirrorItem)
2421	3551	{
2422	3552	MirrorPoses();
2423	3553	} else
2424		- if (event.getSource() == reduceMorphItem)
	3554	+ if (source == reduceMorphItem)
2425	3555	{
2426	3556	MeshReduction(false);
2427	3557	} else
2428		- if (event.getSource() == reduce34MorphItem)
	3558	+ if (source == reduce34MorphItem)
2429	3559	{
2430	3560	MeshReduction(true);
2431	3561	} else
2432		- if (event.getSource() == reverseTrianglesItem)
	3562	+ if (source == reverseTrianglesItem)
2433	3563	{
2434	3564	ReverseTriangles();
2435	3565	} else
2436		- if (event.getSource() == reduceMeshItem)
	3566	+ if (source == reduceMeshItem)
2437	3567	{
2438	3568	ReduceMesh(false);
2439	3569	} else
2440		- if (event.getSource() == reduce34MeshItem)
	3570	+ if (source == reduce34MeshItem)
2441	3571	{
2442	3572	ReduceMesh(true);
2443	3573	} else
2444		- if (event.getSource() == increaseMeshItem)
	3574	+ if (source == increaseMeshItem)
2445	3575	{
2446	3576	IncreaseMesh();
2447	3577	} else
2448		- if (event.getSource() == clipMeshItem)
	3578	+ if (source == clipMeshItem)
2449	3579	{
2450	3580	ClipMesh();
2451	3581	} else
2452		- if (event.getSource() == smoothMeshItem)
	3582	+ if (source == smoothMeshItem)
2453	3583	{
2454	3584	SmoothMesh();
2455	3585	} else
2456		- if (event.getSource() == transformgeometryItem)
	3586	+ if (source == transformGeometryItem)
2457	3587	{
2458	3588	TransformGeometry();
2459	3589	} else
2460		- if (event.getSource() == resetTransformItem)
	3590	+ if (source == transformChildrenItem)
	3591	+ {
	3592	+ TransformChildren();
	3593	+ } else
	3594	+ if (source == resetTransformItem)
2461	3595	{
2462	3596	ResetTransform();
2463	3597	} else
2464		- if (event.getSource() == resetCentroidItem)
	3598	+ if (source == resetCentroidItem)
2465	3599	{
2466		- ResetCentroid();
	3600	+ ResetCentroid(true);
2467	3601	} else
2468		- if (event.getSource() == resetParentItem)
	3602	+ if (source == resetCentroidXZItem)
	3603	+ {
	3604	+ ResetCentroid(false);
	3605	+ } else
	3606	+ if (source == resetParentItem)
2469	3607	{
2470	3608	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2471	3609	{
..	..	@@ -2475,7 +3613,7 @@
2475	3613
2476	3614	refreshContents();
2477	3615	} else
2478		- if (event.getSource() == repairParentItem)
	3616	+ if (source == repairParentItem)
2479	3617	{
2480	3618	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2481	3619	{
..	..	@@ -2489,7 +3627,21 @@
2489	3627
2490	3628	refreshContents();
2491	3629	} else
2492		- if (event.getSource() == sortbysizeItem)
	3630	+ if (source == repairShadowItem)
	3631	+ {
	3632	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3633	+ {
	3634	+ Object3D obj = (Object3D)e.nextElement();
	3635	+ obj.RepairShadow();
	3636	+// for (int i=0; i<obj.size(); i++)
	3637	+// {
	3638	+// obj.get(i).parent = obj;
	3639	+// }
	3640	+ }
	3641	+
	3642	+ refreshContents();
	3643	+ } else
	3644	+ if (source == sortbysizeItem)
2493	3645	{
2494	3646	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2495	3647	{
..	..	@@ -2501,7 +3653,7 @@
2501	3653	ResetModel();
2502	3654	refreshContents();
2503	3655	} else
2504		- if (event.getSource() == sortbynameItem)
	3656	+ if (source == sortbynameItem)
2505	3657	{
2506	3658	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2507	3659	{
..	..	@@ -2513,7 +3665,7 @@
2513	3665	ResetModel();
2514	3666	refreshContents();
2515	3667	} else
2516		- if (event.getSource() == attachPigmentItem)
	3668	+ if (source == attachPigmentItem)
2517	3669	{
2518	3670	String texture = GetFile("Attach pigment");
2519	3671	Object3D obj;
..	..	@@ -2525,7 +3677,7 @@
2525	3677
2526	3678	refreshContents();
2527	3679	} else
2528		- if (event.getSource() == detachPigmentItem)
	3680	+ if (source == detachPigmentItem)
2529	3681	{
2530	3682	Object3D obj;
2531	3683	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2536,7 +3688,7 @@
2536	3688
2537	3689	refreshContents();
2538	3690	} else
2539		- if (event.getSource() == attachBumpItem)
	3691	+ if (source == attachBumpItem)
2540	3692	{
2541	3693	String texture = GetFile("Attach bump");
2542	3694	Object3D obj;
..	..	@@ -2548,18 +3700,18 @@
2548	3700
2549	3701	refreshContents();
2550	3702	} else
2551		- if (event.getSource() == detachBumpItem)
	3703	+ if (source == detachBumpItem)
2552	3704	{
2553	3705	Object3D obj;
2554	3706	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2555	3707	{
2556	3708	obj = (Object3D)e.nextElement();
2557		- obj.SetBumpTexture(null);
	3709	+ obj.ResetBumpTexture();
2558	3710	}
2559	3711
2560	3712	refreshContents();
2561	3713	} else
2562		- if (event.getSource() == pigmentBumpItem)
	3714	+ if (source == pigmentBumpItem)
2563	3715	{
2564	3716	Object3D obj;
2565	3717	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2570,159 +3722,233 @@
2570	3722
2571	3723	refreshContents();
2572	3724	} else
2573		- if (event.getSource() == flashSelectionButton)
	3725	+ if (source == embedTexturesItem)
	3726	+ {
	3727	+ Object3D obj;
	3728	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3729	+ {
	3730	+ obj = (Object3D)e.nextElement();
	3731	+ obj.EmbedTextures(true);
	3732	+ }
	3733	+
	3734	+ refreshContents();
	3735	+ } else
	3736	+ if (source == deEmbedTexturesItem)
	3737	+ {
	3738	+ Object3D obj;
	3739	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3740	+ {
	3741	+ obj = (Object3D)e.nextElement();
	3742	+ obj.EmbedTextures(false);
	3743	+ }
	3744	+
	3745	+ CameraPane.texturepigment.clear();
	3746	+ CameraPane.texturebump.clear();
	3747	+
	3748	+ refreshContents();
	3749	+ } else
	3750	+ if (source == flashSelectionButton)
2574	3751	{
2575	3752	CameraPane.flash = true;
2576	3753	refreshContents();
2577	3754	} else
2578		- if (event.getSource() == oneButton)
	3755	+ if (source == oneButton)
2579	3756	{
2580	3757	} else
2581		- if (event.getSource() == twoButton)
	3758	+ if (source == twoButton)
2582	3759	{
2583	3760	radio.layout = twoButton;
2584		- // bug
2585		- //gridPanel.setDividerLocation(1.0);
2586		- //bigPanel.setDividerLocation(0.0);
2587		- bigThree.remove(jtp);
2588		- bigThree.remove(cameraPanel);
2589		- bigThree.remove(XYZPanel);
2590		- aWindowConstraints.gridx = 0;
2591		- aWindowConstraints.gridy = 0;
2592		- aWindowConstraints.gridwidth = 1;
2593		- // aConstraints.gridheight = 3;
2594		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2595		- aWindowConstraints.weightx = 0;
2596		- aWindowConstraints.weighty = 1;
2597		- //bigThree.add(jtp, aWindowConstraints);
2598		- aWindowConstraints.weightx = 1;
2599		- aWindowConstraints.gridwidth = 3;
2600		- // aConstraints.gridheight = 3;
2601		- aWindowConstraints.gridx = 1;
2602		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2603		- bigThree.add(cameraPanel, aWindowConstraints);
2604		- aWindowConstraints.weightx = 0;
2605		- aWindowConstraints.gridx = 4;
2606		- aWindowConstraints.gridwidth = 1;
2607		- // aConstraints.gridheight = 3;
2608		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2609		- //bigThree.add(XYZPanel, aWindowConstraints);
2610		- bigThree.revalidate();
	3761	+
	3762	+ if (CameraPane.FULLSCREEN)
	3763	+ fullscreenLayout = radio.layout;
	3764	+
	3765	+ Show3DView();
	3766	+
	3767	+ cameraView.requestFocusInWindow();
	3768	+
	3769	+// refreshContents(true);
	3770	+//
	3771	+// try
	3772	+// {
	3773	+// java.awt.Robot bot = new java.awt.Robot();
	3774	+// int mask = InputEvent.BUTTON1_MASK;
	3775	+// bot.mouseMove(100, 100);
	3776	+// bot.mousePress(mask);
	3777	+// bot.mouseRelease(mask);
	3778	+// }
	3779	+// catch (Exception e)
	3780	+// {
	3781	+//
	3782	+// }
	3783	+
2611	3784	} else
2612		- if (event.getSource() == threeButton)
	3785	+ if (source == threeButton)
2613	3786	{
2614	3787	radio.layout = threeButton;
2615		- bigThree.remove(jtp);
2616		- bigThree.remove(cameraPanel);
2617		- bigThree.remove(XYZPanel);
2618		- aWindowConstraints.gridx = 0;
2619		- aWindowConstraints.gridy = 0;
2620		- aWindowConstraints.gridwidth = 1;
2621		- // aConstraints.gridheight = 3;
2622		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2623		- aWindowConstraints.weightx = 0;
2624		- aWindowConstraints.weighty = 1;
2625		- //bigThree.add(jtp, aWindowConstraints);
2626		- aWindowConstraints.weightx = 1;
2627		- aWindowConstraints.gridwidth = 3;
2628		- // aConstraints.gridheight = 3;
2629		- aWindowConstraints.gridx = 1;
2630		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2631		- bigThree.add(cameraPanel, aWindowConstraints);
2632		- aWindowConstraints.weightx = 0;
2633		- aWindowConstraints.gridx = 4;
2634		- aWindowConstraints.gridwidth = 1;
2635		- // aConstraints.gridheight = 3;
2636		- aConstraints.fill = GridBagConstraints.VERTICAL;
2637		- bigThree.add(XYZPanel, aWindowConstraints);
2638		- bigThree.revalidate();
	3788	+
	3789	+ if (CameraPane.FULLSCREEN)
	3790	+ fullscreenLayout = radio.layout;
	3791	+
	3792	+// bigThree.remove(scenePanel);
	3793	+// bigThree.remove(centralPanel);
	3794	+// bigThree.remove(XYZPanel);
	3795	+// aWindowConstraints.gridx = 0;
	3796	+// aWindowConstraints.gridy = 0;
	3797	+// aWindowConstraints.gridwidth = 1;
	3798	+// // aConstraints.gridheight = 3;
	3799	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3800	+// aWindowConstraints.weightx = 0;
	3801	+// aWindowConstraints.weighty = 1;
	3802	+// //bigThree.add(jtp, aWindowConstraints);
	3803	+// aWindowConstraints.weightx = 1;
	3804	+// aWindowConstraints.gridwidth = 3;
	3805	+// // aConstraints.gridheight = 3;
	3806	+// aWindowConstraints.gridx = 1;
	3807	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3808	+// bigThree.add(centralPanel, aWindowConstraints);
	3809	+// aWindowConstraints.weightx = 0;
	3810	+// aWindowConstraints.gridx = 4;
	3811	+// aWindowConstraints.gridwidth = 1;
	3812	+// // aConstraints.gridheight = 3;
	3813	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	3814	+// bigThree.add(XYZPanel, aWindowConstraints);
	3815	+// bigThree.validate();
	3816	+// scenePanel.setVisible(false);
	3817	+// centralPanel.setVisible(true);
	3818	+// XYZPanel.setVisible(true);
	3819	+ bigThree.ClearUI();
	3820	+ bigThree.add(scenePanel);
	3821	+ bigThree.add(centralPanel);
	3822	+ bigThree.FlushUI();
	3823	+
	3824	+ cameraView.requestFocusInWindow();
2639	3825	} else
2640		- if (event.getSource() == fourButton)
	3826	+ if (source == fourButton)
2641	3827	{
2642	3828	radio.layout = fourButton;
2643		- bigThree.remove(jtp);
2644		- bigThree.remove(cameraPanel);
2645		- bigThree.remove(XYZPanel);
2646		- aWindowConstraints.gridx = 0;
2647		- aWindowConstraints.gridy = 0;
2648		- aWindowConstraints.gridwidth = 1;
2649		- // aWindowConstraints.gridheight = 3;
2650		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2651		- aWindowConstraints.weightx = 1;
2652		- aWindowConstraints.weighty = 1;
2653		- bigThree.add(jtp, aWindowConstraints);
2654		- aWindowConstraints.weightx = 1;
2655		- aWindowConstraints.gridwidth = 3;
2656		- // aConstraints.gridheight = 3;
2657		- aWindowConstraints.gridx = 1;
2658		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2659		- //bigThree.add(cameraPanel, aWindowConstraints);
2660		- aWindowConstraints.weightx = 0;
2661		- aWindowConstraints.gridx = 4;
2662		- aWindowConstraints.gridwidth = 1;
2663		- // aWindowConstraints.gridheight = 3;
2664		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2665		- //bigThree.add(XYZPanel, aWindowConstraints);
2666		- bigThree.revalidate();
	3829	+
	3830	+ if (CameraPane.FULLSCREEN)
	3831	+ fullscreenLayout = radio.layout;
	3832	+
	3833	+// bigThree.remove(scenePanel);
	3834	+// bigThree.remove(centralPanel);
	3835	+// bigThree.remove(XYZPanel);
	3836	+// aWindowConstraints.gridx = 0;
	3837	+// aWindowConstraints.gridy = 0;
	3838	+// aWindowConstraints.gridwidth = 1;
	3839	+// // aWindowConstraints.gridheight = 3;
	3840	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3841	+// aWindowConstraints.weightx = 1;
	3842	+// aWindowConstraints.weighty = 1;
	3843	+// bigThree.add(scenePanel, aWindowConstraints);
	3844	+// aWindowConstraints.weightx = 1;
	3845	+// aWindowConstraints.gridwidth = 3;
	3846	+// // aConstraints.gridheight = 3;
	3847	+// aWindowConstraints.gridx = 1;
	3848	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3849	+// //bigThree.add(cameraPanel, aWindowConstraints);
	3850	+// aWindowConstraints.weightx = 0;
	3851	+// aWindowConstraints.gridx = 4;
	3852	+// aWindowConstraints.gridwidth = 1;
	3853	+// // aWindowConstraints.gridheight = 3;
	3854	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3855	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3856	+// bigThree.validate();
	3857	+// scenePanel.setVisible(true);
	3858	+// centralPanel.setVisible(false);
	3859	+// XYZPanel.setVisible(false);
	3860	+ bigThree.ClearUI();
	3861	+ bigThree.add(scenePanel);
	3862	+ bigThree.FlushUI();
	3863	+
	3864	+ cameraView.requestFocusInWindow();
2667	3865	} else
2668		- if (event.getSource() == sixButton)
	3866	+ if (source == sixButton)
2669	3867	{
2670	3868	radio.layout = sixButton;
2671		- bigThree.remove(jtp);
2672		- bigThree.remove(cameraPanel);
2673		- bigThree.remove(XYZPanel);
2674		- aWindowConstraints.gridx = 0;
2675		- aWindowConstraints.gridy = 0;
2676		- aWindowConstraints.gridwidth = 1;
2677		- // aConstraints.gridheight = 3;
2678		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2679		- aWindowConstraints.weightx = 0;
2680		- aWindowConstraints.weighty = 1;
2681		- bigThree.add(jtp, aWindowConstraints);
2682		- aWindowConstraints.weightx = 1;
2683		- aWindowConstraints.gridwidth = 3;
2684		- // aWindowConstraints.gridheight = 3;
2685		- aWindowConstraints.gridx = 1;
2686		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2687		- bigThree.add(cameraPanel, aWindowConstraints);
2688		- aWindowConstraints.weightx = 0;
2689		- aWindowConstraints.gridx = 4;
2690		- aWindowConstraints.gridwidth = 1;
2691		- // aWindowConstraints.gridheight = 3;
2692		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2693		- //bigThree.add(XYZPanel, aConstraints);
2694		- bigThree.revalidate();
	3869	+
	3870	+ if (CameraPane.FULLSCREEN)
	3871	+ fullscreenLayout = radio.layout;
	3872	+
	3873	+// bigThree.remove(scenePanel);
	3874	+// bigThree.remove(centralPanel);
	3875	+// bigThree.remove(XYZPanel);
	3876	+// aWindowConstraints.gridx = 0;
	3877	+// aWindowConstraints.gridy = 0;
	3878	+// aWindowConstraints.gridwidth = 1;
	3879	+// // aConstraints.gridheight = 3;
	3880	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3881	+// aWindowConstraints.weightx = 0;
	3882	+// aWindowConstraints.weighty = 1;
	3883	+// bigThree.add(scenePanel, aWindowConstraints);
	3884	+// aWindowConstraints.weightx = 1;
	3885	+// aWindowConstraints.gridwidth = 3;
	3886	+// // aWindowConstraints.gridheight = 3;
	3887	+// aWindowConstraints.gridx = 1;
	3888	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3889	+// bigThree.add(centralPanel, aWindowConstraints);
	3890	+// aWindowConstraints.weightx = 0;
	3891	+// aWindowConstraints.gridx = 4;
	3892	+// aWindowConstraints.gridwidth = 1;
	3893	+// // aWindowConstraints.gridheight = 3;
	3894	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3895	+// //bigThree.add(XYZPanel, aConstraints);
	3896	+// bigThree.validate();
	3897	+// scenePanel.setVisible(true);
	3898	+// centralPanel.setVisible(true);
	3899	+// XYZPanel.setVisible(false);
	3900	+ bigThree.ClearUI();
	3901	+ bigThree.add(centralPanel);
	3902	+ bigThree.add(scenePanel);
	3903	+ bigThree.FlushUI();
	3904	+
	3905	+ cameraView.requestFocusInWindow();
2695	3906	} else
2696		- if (event.getSource() == sevenButton)
	3907	+ if (source == sevenButton)
2697	3908	{
2698	3909	radio.layout = sevenButton;
2699		- bigThree.remove(jtp);
2700		- bigThree.remove(cameraPanel);
2701		- bigThree.remove(XYZPanel);
2702		- aWindowConstraints.gridx = 0;
2703		- aWindowConstraints.gridy = 0;
2704		- aWindowConstraints.gridwidth = 1;
2705		- // aWindowConstraints.gridheight = 3;
2706		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2707		- aWindowConstraints.weightx = 0;
2708		- aWindowConstraints.weighty = 1;
2709		- bigThree.add(jtp, aWindowConstraints);
2710		- aWindowConstraints.weightx = 1;
2711		- aWindowConstraints.gridwidth = 3;
2712		- // aWindowConstraints.gridheight = 3;
2713		- aWindowConstraints.gridx = 1;
2714		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2715		- bigThree.add(cameraPanel, aWindowConstraints);
2716		- aWindowConstraints.weightx = 0;
2717		- aWindowConstraints.gridx = 4;
2718		- aWindowConstraints.gridwidth = 1;
2719		- // aConstraints.gridheight = 3;
2720		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2721		- bigThree.add(XYZPanel, aWindowConstraints);
2722		- bigThree.revalidate();
	3910	+
	3911	+ if (CameraPane.FULLSCREEN)
	3912	+ fullscreenLayout = radio.layout;
	3913	+
	3914	+// bigThree.remove(scenePanel);
	3915	+// bigThree.remove(centralPanel);
	3916	+// bigThree.remove(XYZPanel);
	3917	+// aWindowConstraints.gridx = 0;
	3918	+// aWindowConstraints.gridy = 0;
	3919	+// aWindowConstraints.gridwidth = 1;
	3920	+// // aWindowConstraints.gridheight = 3;
	3921	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3922	+// aWindowConstraints.weightx = 0;
	3923	+// aWindowConstraints.weighty = 1;
	3924	+// bigThree.add(scenePanel, aWindowConstraints);
	3925	+// aWindowConstraints.weightx = 1;
	3926	+// aWindowConstraints.gridwidth = 3;
	3927	+// // aWindowConstraints.gridheight = 3;
	3928	+// aWindowConstraints.gridx = 1;
	3929	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3930	+// bigThree.add(centralPanel, aWindowConstraints);
	3931	+// aWindowConstraints.weightx = 0;
	3932	+// aWindowConstraints.gridx = 4;
	3933	+// aWindowConstraints.gridwidth = 1;
	3934	+// // aConstraints.gridheight = 3;
	3935	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3936	+// bigThree.add(XYZPanel, aWindowConstraints);
	3937	+// bigThree.validate();
	3938	+// scenePanel.setVisible(true);
	3939	+// centralPanel.setVisible(true);
	3940	+// XYZPanel.setVisible(true);
	3941	+ bigThree.ClearUI();
	3942	+ bigThree.add(scenePanel);
	3943	+ bigThree.add(centralPanel);
	3944	+ bigThree.add(XYZPanel);
	3945	+ bigThree.FlushUI();
	3946	+
	3947	+ cameraView.requestFocusInWindow();
2723	3948	} else
2724		- if (event.getSource() == rootButton)
	3949	+ if (source == rootButton)
2725	3950	{
	3951	+ Replace();
2726	3952	Object3D obj;
2727	3953	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2728	3954	{
..	..	@@ -2731,66 +3957,85 @@
2731	3957	EditObject(obj);
2732	3958	}
2733	3959
	3960	+ cameraView.requestFocusInWindow();
2734	3961	refreshContents(true);
2735	3962	} else
2736		- if (event.getSource() == closeButton)
	3963	+ if (source == closeButton)
2737	3964	{
2738	3965	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2739	3966	cRadio ab;
2740	3967	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2741	3968	{
2742	3969	ab = (cRadio)e.nextElement();
2743		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3970	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2744	3971	{
	3972	+ // Patch to avoid bug with transparency.
	3973	+ if (!ab.hadMaterial)
	3974	+ {
	3975	+ ab.object.material = null;
	3976	+ }
	3977	+
2745	3978	buttonGroup.remove(ab);
2746	3979	radioPanel.remove(ab);
2747	3980
2748		- ab.GetObject().editWindow = null;
	3981	+ //ab.GetObject().editWindow = null;
	3982	+ ab.GetObject().manipWindow = null;
2749	3983	// ab.GetObject().objectUI = null; // ?????????
2750	3984
2751	3985	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2752	3986	break;
2753	3987	}
2754	3988	}
	3989	+
	3990	+ cameraView.requestFocusInWindow();
2755	3991	refreshContents(true);
2756	3992	} else
2757		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3993	+ if (source == editItem \|\| source == editButton)
2758	3994	{
	3995	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3996	+ {
	3997	+ Object3D child = (Object3D)e.nextElement();
	3998	+ child.pinned = true;
	3999	+ }
	4000	+
2759	4001	EditSelection(false);
2760	4002	} else
2761		- if (event.getSource() == uneditButton)
	4003	+ if (source == uneditButton)
2762	4004	{
2763	4005	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2764	4006	{
2765	4007	Object3D child = (Object3D)e.nextElement();
2766	4008	if(child.editWindow != null)
2767		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4009	+ child.pinned = false;
2768	4010	child.CloseUI();
2769	4011	listUI.remove(child);
	4012	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2770	4013
2771		- child.editWindow = null; // ???????????
	4014	+ //child.editWindow = null; // ???????????
2772	4015	}
2773		- objEditor.ctrlPanel.revalidate();
	4016	+ objEditor.ctrlPanel.FlushUI();
2774	4017	//objEditor.jTree.clearSelection();
2775	4018	//objEditor.ResetSliders();
2776	4019	refreshContents(true);
2777	4020	} else
2778		- if (event.getSource() == clearPanelButton)
	4021	+ if (source == clearPanelButton)
2779	4022	{
2780	4023	assert(copy == group);
2781	4024	//copy.ClearUI();
2782	4025	for (Object3D obj : listUI)
2783	4026	{
	4027	+ obj.pinned = false;
2784	4028	obj.CloseUI();
2785	4029	}
2786	4030	listUI.clear();
	4031	+ SetPinStates(group.selection.size() > 0);
2787	4032	refreshContents(true);
2788	4033	} else
2789		- if (event.getSource() == allParamsButton)
	4034	+ if (source == allParamsButton)
2790	4035	{
2791	4036	assert(copy == group);
2792	4037
2793		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4038	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2794	4039
2795	4040	for (Object3D obj : listUI)
2796	4041	{
..	..	@@ -2807,19 +4052,19 @@
2807	4052
2808	4053	refreshContents(true);
2809	4054	} else
2810		- if (event.getSource() == unselectButton)
	4055	+ if (source == unselectButton)
2811	4056	{
2812	4057	objEditor.jTree.clearSelection();
2813	4058	// ?? oct 2012 GrafreeD.clipboard.clear();
2814	4059	objEditor.ResetSliders();
2815	4060	refreshContents(true);
2816	4061	} else
2817		- if(event.getSource() instanceof cRadio)
	4062	+ if(source instanceof cRadio)
2818	4063	{
2819	4064	group.parent = keepparent;
2820	4065	group.attributes = 0;
2821	4066	//group.editWindow = null;
2822		- /cRadio/ radio = (cRadio)event.getSource();
	4067	+ /cRadio/ radio = (cRadio)source;
2823	4068	Object3D obj = radio.GetObject();
2824	4069	System.out.println("Edit " + obj);
2825	4070	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2839,7 +4084,8 @@
2839	4084	}
2840	4085
2841	4086	copy = group;
2842		- //CameraPane.theRenderer.object = group;
	4087	+
	4088	+ //Globals.theRenderer.object = group;
2843	4089	if(!useclient)
2844	4090	{
2845	4091	cameraView.renderCamera = radio.camera;
..	..	@@ -2848,25 +4094,70 @@
2848	4094	cameraView.cameras[cameraView.cameracount] = radio.camera;
2849	4095	cameraView.targetLookAt.set(radio.camera.lookAt);
2850	4096	cameraView.object = group;
2851		- cameraView.lighttouched = true;
	4097	+ //cameraView.lighttouched = true;
	4098	+ Globals.lighttouched = true;
2852	4099	topView.object = group;
2853	4100	frontView.object = group;
2854	4101	sideView.object = group;
2855	4102	}
2856		- group.editWindow = this;
	4103	+
	4104	+// fix "+" issue
	4105	+ //group.editWindow = this;
	4106	+ group.manipWindow = this;
	4107	+
2857	4108	/*
2858	4109	currentLayout = radio.layout;
2859	4110	if (currentLayout == null)
2860	4111	currentLayout = sevenButton;
2861	4112	*/
2862	4113	radio.layout.doClick();
	4114	+
	4115	+ assert(copy instanceof Composite);
	4116	+
	4117	+ if (copy.versionlist == null)
	4118	+ {
	4119	+ copy.versionlist = new Object3D[100];
	4120	+ copy.versionindex = -1;
	4121	+
	4122	+ // Cannot work with loops
	4123	+ // To fix this issue, first mark all nodes above the root,
	4124	+ // and check if any of these nodes are reachable below the root.
	4125	+ //Save(true);
	4126	+ }
	4127	+
	4128	+ SetVersionStates();
	4129	+
	4130	+ ClearUnpinned();
	4131	+
	4132	+ //Grafreed.Assert(group != null);
	4133	+ //Grafreed.Assert(group.selection != null);
	4134	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4135	+ if (group.selection == null \|\| group.selection.size() == 1)
	4136	+ EditSelection(false);
2863	4137	keepparent = group.parent;
2864	4138	// PARENT = NULL or not???
2865	4139	//group.parent = null; // ROOT
2866	4140	//group.attributes = -1;
2867	4141	ResetModel();
	4142	+
	4143	+ cameraView.requestFocusInWindow();
2868	4144	refreshContents(true);
2869		- }
	4145	+ } else if (event.getSource() == editCameraItem)
	4146	+ {
	4147	+ cameraView.ProtectCamera();
	4148	+ cameraView.requestFocusInWindow();
	4149	+ cameraView.repaint();
	4150	+ return;
	4151	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	4152	+ {
	4153	+ cameraView.RevertCamera();
	4154	+ cameraView.requestFocusInWindow();
	4155	+ cameraView.repaint();
	4156	+ return;
	4157	+ // } else if (event.getSource() == textureButton)
	4158	+ // {
	4159	+ // return; // true;
	4160	+ }
2870	4161	else
2871	4162	{
2872	4163	//return super.action(event, arg);
..	..	@@ -2875,7 +4166,6 @@
2875	4166	}
2876	4167
2877	4168	boolean useclient = false;
2878		- cRadio radio;
2879	4169
2880	4170	void ToggleRoot()
2881	4171	{
..	..	@@ -2884,7 +4174,7 @@
2884	4174	if (useclient)
2885	4175	{
2886	4176	cameraView.object = client;
2887		- cameraView.lighttouched = true;
	4177	+ Globals.lighttouched = true;
2888	4178	//topView.object = client;
2889	4179	//frontView.object = client;
2890	4180	//sideView.object = client;
..	..	@@ -2892,7 +4182,7 @@
2892	4182	else
2893	4183	{
2894	4184	cameraView.object = group;
2895		- cameraView.lighttouched = true;
	4185	+ Globals.lighttouched = true;
2896	4186	//topView.object = group;
2897	4187	//frontView.object = group;
2898	4188	//sideView.object = group;
..	..	@@ -2927,6 +4217,28 @@
2927	4217	refreshContents();
2928	4218	}
2929	4219
	4220	+ void TransformChildren()
	4221	+ {
	4222	+ Object3D obj;
	4223	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4224	+ {
	4225	+ obj = (Object3D)e.nextElement();
	4226	+ obj.KeepTextureMatrices();
	4227	+ obj.TransformChildren();
	4228	+ obj.RestoreTextureMatrices();
	4229	+
	4230	+// if (obj.parent == null)
	4231	+// {
	4232	+// System.out.println("NULL PARENT!");
	4233	+// new Exception().printStackTrace();
	4234	+// }
	4235	+// else
	4236	+// TouchTransform(obj);
	4237	+// //obj.parent.Touch();
	4238	+ }
	4239	+
	4240	+ refreshContents();
	4241	+ }
2930	4242
2931	4243	void ResetTransform()
2932	4244	{
..	..	@@ -3039,7 +4351,7 @@
3039	4351	refreshContents();
3040	4352	}
3041	4353
3042		- void ResetCentroid()
	4354	+ void ResetCentroid(boolean full)
3043	4355	{
3044	4356	Object3D obj;
3045	4357	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3054,12 +4366,16 @@
3054	4366	LA.matIdentity(Object3D.mat);
3055	4367	obj.getBounds(minima, maxima, false);
3056	4368	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3057		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	4369	+ if (full)
	4370	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3058	4371	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3059	4372	obj.TransformMesh(Object3D.mat);
	4373	+
3060	4374	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3061		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	4375	+ if (full)
	4376	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3062	4377	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	4378	+
3063	4379	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3064	4380	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3065	4381	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3088,7 +4404,8 @@
3088	4404
3089	4405	int size = obj.MemorySize();
3090	4406
3091		- System.err.println((size/1024) + " KB is the size of " + obj);
	4407	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4408	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3092	4409	}
3093	4410	}
3094	4411	catch (Exception e)
..	..	@@ -3125,9 +4442,9 @@
3125	4442	obj = (Object3D)e.nextElement();
3126	4443
3127	4444	System.out.println("Object is: " + obj);
3128		- GrafreeD.AnalyzeObject(obj);
	4445	+ Grafreed.AnalyzeObject(obj);
3129	4446	System.out.println("Boundary rep: " + obj.bRep);
3130		- GrafreeD.AnalyzeObject(obj.bRep);
	4447	+ Grafreed.AnalyzeObject(obj.bRep);
3131	4448
3132	4449	// System.err.println((size/1024) + " KB is the size of " + obj);
3133	4450	}
..	..	@@ -3169,6 +4486,20 @@
3169	4486	void GenNormals(boolean crease)
3170	4487	{
3171	4488	group.GenNormalsS(crease);
	4489	+
	4490	+ refreshContents();
	4491	+ }
	4492	+
	4493	+ void GenNormalsMESH()
	4494	+ {
	4495	+ group.GenNormalsMeshS();
	4496	+
	4497	+ refreshContents();
	4498	+ }
	4499	+
	4500	+ void GenNormalsMINE()
	4501	+ {
	4502	+ group.selection.GenNormalsMINE();
3172	4503
3173	4504	refreshContents();
3174	4505	}
..	..	@@ -3334,8 +4665,8 @@
3334	4665
3335	4666	void ParseVertices()
3336	4667	{
3337		- boolean epsequal = GrafreeD.epsequal;
3338		- GrafreeD.epsequal = true;
	4668	+ boolean epsequal = Grafreed.epsequal;
	4669	+ Grafreed.epsequal = true;
3339	4670
3340	4671	for (int i=0; i<group.selection.size(); i++)
3341	4672	{
..	..	@@ -3360,7 +4691,7 @@
3360	4691	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3361	4692	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3362	4693
3363		- g.add(GrafreeD.clipboard);
	4694	+ g.add(Grafreed.clipboard);
3364	4695
3365	4696	buffer.add(g);
3366	4697	}
..	..	@@ -3375,7 +4706,7 @@
3375	4706	makeSomething(buffer, i==group.selection.size()-1);
3376	4707	}
3377	4708
3378		- GrafreeD.epsequal = epsequal;
	4709	+ Grafreed.epsequal = epsequal;
3379	4710
3380	4711	refreshContents();
3381	4712	}
..	..	@@ -3393,7 +4724,16 @@
3393	4724	String pigment = Object3D.GetPigment(tex);
3394	4725	//String bump = Object3D.GetBump(tex);
3395	4726
3396		- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
	4727	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4728	+
	4729	+ try
	4730	+ {
	4731	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
	4732	+ }
	4733	+ catch (Exception e)
	4734	+ {
	4735	+ System.err.println("FAIL: " + node);
	4736	+ }
3397	4737
3398	4738	double s = v.s;
3399	4739
..	..	@@ -3441,12 +4781,26 @@
3441	4781
3442	4782	void Align()
3443	4783	{
	4784	+ if (group.selection.size() == 0)
	4785	+ return;
	4786	+
	4787	+ cVector bbmin = new cVector();
	4788	+ cVector bbmax = new cVector();
	4789	+
	4790	+ group.selection.get(0).getBounds(bbmin, bbmax, true);
	4791	+
	4792	+ double dx = bbmax.x - bbmin.x;
	4793	+ double dy = bbmax.y - bbmin.y;
	4794	+ double dz = bbmax.z - bbmin.z;
	4795	+
	4796	+ double scale = Math.sqrt(dxdx + dydy + dz*dz);
	4797	+
3444	4798	for (int i=0; i<group.selection.size(); i++)
3445	4799	{
3446	4800	Object3D obj = group.selection.get(i);
3447	4801
3448		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3449		- LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
	4802	+ LA.matTranslate(obj.toParent, i * scale, 0, 0);
	4803	+ LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3450	4804	}
3451	4805
3452	4806	refreshContents();
..	..	@@ -3467,11 +4821,11 @@
3467	4821
3468	4822	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3469	4823
3470		- boolean random = CameraPane.RANDOM;
3471		- CameraPane.RANDOM = false; // parse all random nodes
	4824	+ boolean random = CameraPane.SWITCH;
	4825	+ CameraPane.SWITCH = false; // parse all random nodes
3472	4826	lowres.linkVerticesThis(null);
3473	4827	lowres.linkVerticesThis(sn);
3474		- CameraPane.RANDOM = random;
	4828	+ CameraPane.SWITCH = random;
3475	4829
3476	4830	System.err.flush();
3477	4831
..	..	@@ -3511,7 +4865,7 @@
3511	4865	return;
3512	4866
3513	4867	Object3D poses = group.selection.get(0);
3514		- Object3D ref = GrafreeD.clipboard.get(0);
	4868	+ Object3D ref = Grafreed.clipboard.get(0);
3515	4869
3516	4870	Object3D newgroup = new Object3D("Po:" + poses.name);
3517	4871
..	..	@@ -3680,7 +5034,7 @@
3680	5034	group.selection.RelinkToSupport(); // july 2014
3681	5035	System.out.println("DONE.");
3682	5036	refreshContents();
3683		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	5037	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3684	5038	}
3685	5039
3686	5040	void ReduceMesh(boolean reduction34)
..	..	@@ -3705,9 +5059,9 @@
3705	5059
3706	5060	void ClipMesh()
3707	5061	{
3708		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	5062	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3709	5063	{
3710		- Object3D content = GrafreeD.clipboard.get(0);
	5064	+ Object3D content = Grafreed.clipboard.get(0);
3711	5065
3712	5066	if (content instanceof cGroup && ((cGroup)content).transientlink )
3713	5067	content = ((cGroup)content).get(0);
..	..	@@ -3716,7 +5070,7 @@
3716	5070	// {
3717	5071	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3718	5072	// }
3719		- group.selection.ClipMesh(GrafreeD.clipboard);
	5073	+ group.selection.ClipMesh(Grafreed.clipboard);
3720	5074	}
3721	5075	// group.selection.ClipMesh(GrafreeD.clipboard);
3722	5076	System.out.println("DONE.");
..	..	@@ -3763,6 +5117,18 @@
3763	5117	void MarkLeaves(boolean hide)
3764	5118	{
3765	5119	group.selection.MarkLeaves(hide);
	5120	+ refreshContents();
	5121	+ }
	5122	+
	5123	+ void RewindLeaves(boolean hide)
	5124	+ {
	5125	+ group.selection.RewindLeaves(hide);
	5126	+ refreshContents();
	5127	+ }
	5128	+
	5129	+ void RandomLeaves(boolean hide)
	5130	+ {
	5131	+ group.selection.RandomLeaves(hide);
3766	5132	refreshContents();
3767	5133	}
3768	5134
..	..	@@ -3837,28 +5203,25 @@
3837	5203	// }
3838	5204	// }
3839	5205
3840		- static boolean allparams = true;
3841		-
3842		- static Vector<Object3D> listUI = new Vector<Object3D>();
3843		-
3844	5206	void EditSelection(boolean newWindow)
3845	5207	{
	5208	+ if (group.selection == null)
	5209	+ {
	5210	+ EditElement(group, newWindow); // ? new
	5211	+ return;
	5212	+ }
	5213	+
3846	5214	// aConstraints.gridy = 0;
3847	5215	for (int i=0; i<group.selection.size(); i++)
3848	5216	{
3849	5217	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
3850	5218	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3851		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5219	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3852	5220
3853	5221	Object3D elem = (Object3D)group.selection.elementAt(i);
3854		- if(elem != group)
	5222	+ if(elem != group \|\| !newWindow)
3855	5223	{
3856		- // if (!(elem instanceof Composite))
3857		- // newWindow = false;
3858		- listUI.add(elem);
3859		- elem.openEditWindow(this, newWindow); //, false);
3860		- System.out.println("edit : " + elem);
3861		- elem.editWindow.refreshContents(true); // ? new
	5224	+ EditElement(elem, newWindow); // ? new
3862	5225	}
3863	5226	}
3864	5227	}
..	..	@@ -3921,9 +5284,7 @@
3921	5284
3922	5285	freezemodel = false;
3923	5286	}
3924		-
3925		- boolean flashIt = true;
3926		-
	5287	+
3927	5288	public void valueChanged(TreeSelectionEvent e)
3928	5289	//public boolean handleEvent(Event event)
3929	5290	{
..	..	@@ -3933,7 +5294,8 @@
3933	5294	//new Exception().printStackTrace();
3934	5295
3935	5296	freezemodel = true;
3936		-
	5297	+ ClearUnpinned();
	5298	+
3937	5299	/**/
3938	5300	//switch (event.id)
3939	5301	{
..	..	@@ -3941,7 +5303,6 @@
3941	5303	//case 702: // Event.LIST_DESELECT
3942	5304	group.deselectAll();
3943	5305	TreePath tps[] = objEditor.jTree.getSelectionPaths();
3944		- objEditor.ClearInfo(); // .GetMaterial());
3945	5306	if (tps != null)
3946	5307	{
3947	5308	for (int i=0; i < tps.length; i++)
..	..	@@ -3950,33 +5311,39 @@
3950	5311
3951	5312	//if (child.parent != null)
3952	5313	//child.parent.addSelectee(child);
	5314	+ objEditor.SetMaterial(child);
3953	5315	group.addSelectee(child);
3954		- objEditor.SetMaterial(child); // .GetMaterial());
3955		- objEditor.AddInfo(child, this, true); // .GetMaterial());
3956		- System.err.println("info : " + child.GetPath());
3957	5316	}
3958	5317	}
3959		- else
3960		- {
3961		- objEditor.SetMaterial(group); // .GetMaterial());
3962		- objEditor.AddInfo(group, this, true); // .GetMaterial());
3963		- System.err.println("info : " + group.GetPath());
3964		- }
	5318	+// else
	5319	+// {
	5320	+// objEditor.SetMaterial(group); // .GetMaterial());
	5321	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	5322	+// System.err.println("info : " + group.GetPath());
	5323	+// }
3965	5324
3966		- objEditor.SetText(); // jan 2014
3967		-
3968		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	5325	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
3969	5326	CameraPane.flash = true;
3970	5327
3971		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5328	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
3972	5329	// a camera
3973	5330	{
3974		- CameraPane.camerachangeframe = 0; // don't refuse it
3975		- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
3976		- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
3977		- // CameraPane.theRenderer.eyeCamera = CameraPane.theRenderer.manipCamera;
	5331	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5332	+ {
	5333	+ CameraPane.camerachangeframe = 0; // don't refuse it
	5334	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5335	+ }
	5336	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	5337	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
3978	5338	}
3979	5339
	5340	+ if (tps != null && tps.length == 1)
	5341	+ {
	5342	+ EditSelection(false);
	5343	+ }
	5344	+
	5345	+ SetPinStates(tps != null && tps.length > 0);
	5346	+
3980	5347	refreshContents();
3981	5348	//return true;
3982	5349	}
..	..	@@ -3985,6 +5352,52 @@
3985	5352
3986	5353	freezemodel = false;
3987	5354	}
	5355	+
	5356	+ void SetPinStates(boolean enabled)
	5357	+ {
	5358	+ editButton.setEnabled(enabled);
	5359	+ uneditButton.setEnabled(enabled);
	5360	+ //unselectButton.setEnabled(enabled);
	5361	+ flashSelectionButton.setEnabled(enabled);
	5362	+
	5363	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5364	+
	5365	+ boolean allComposites = true;
	5366	+
	5367	+ if (group.selection != null)
	5368	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5369	+ {
	5370	+ Object next = e.nextElement();
	5371	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5372	+ {
	5373	+ allComposites = false;
	5374	+ break;
	5375	+ }
	5376	+ }
	5377	+
	5378	+ rootButton.setEnabled(allComposites);
	5379	+ }
	5380	+
	5381	+ void refreshContents(boolean cp)
	5382	+ {
	5383	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5384	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5385	+ {
	5386	+ objEditor.ClearInfo(); // .GetMaterial());
	5387	+
	5388	+ for (int i=0; i < group.selection.Size(); i++)
	5389	+ {
	5390	+ Object3D child = (Object3D) group.selection.get(i);
	5391	+
	5392	+ objEditor.AddInfo(child, this, true);
	5393	+// System.err.println("info : " + child.GetPath());
	5394	+ }
	5395	+
	5396	+ objEditor.SetText(); // jan 2014
	5397	+ }
	5398	+
	5399	+ super.refreshContents(cp);
	5400	+ }
3988	5401
3989	5402	void linkSomething(Object3D thing)
3990	5403	{
..	..	@@ -4056,16 +5469,19 @@
4056	5469	{
4057	5470	if (group.selection.isEmpty())
4058	5471	return;
4059		- GrafreeD.clipboardIsTempGroup = false;
	5472	+
	5473	+ Grafreed.clipboardIsTempGroup = false;
4060	5474	Composite tGroup = null;
4061	5475	if (group.selection.size() > 0) // 1)
4062	5476	{
4063	5477	tGroup = new cGroup();
4064		- GrafreeD.clipboardIsTempGroup = true;
	5478	+ Grafreed.clipboardIsTempGroup = true;
4065	5479	}
4066	5480
4067	5481	if (cut)
4068	5482	{
	5483	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5484	+// Save();
4069	5485	//int indices[] = jList.getSelectedIndices();
4070	5486	//for (int i = indices.length - 1; i >= 0; i--)
4071	5487	//jList.remove(indices[i]);
..	..	@@ -4101,16 +5517,16 @@
4101	5517	//System.out.println("cut " + child);
4102	5518	//System.out.println("parent = " + child.parent);
4103	5519	// tmp.addChild(child);
4104		- if (GrafreeD.clipboardIsTempGroup)
	5520	+ if (Grafreed.clipboardIsTempGroup)
4105	5521	tGroup.add/Child/(tmp);
4106	5522	else
4107		- GrafreeD.clipboard = tmp;
	5523	+ Grafreed.clipboard = tmp;
4108	5524	}
4109	5525	else
4110		- if (GrafreeD.clipboardIsTempGroup)
	5526	+ if (Grafreed.clipboardIsTempGroup)
4111	5527	tGroup.add/Child/(child);
4112	5528	else
4113		- GrafreeD.clipboard = child;
	5529	+ Grafreed.clipboard = child;
4114	5530	}
4115	5531
4116	5532	//ResetModel();
..	..	@@ -4142,21 +5558,23 @@
4142	5558	//System.out.println("cut " + elem);
4143	5559	//System.out.println("parent = " + elem.parent);
4144	5560	// tmp.addChild(elem);
4145		- if (GrafreeD.clipboardIsTempGroup)
	5561	+ if (Grafreed.clipboardIsTempGroup)
4146	5562	tGroup.add/Child/(tmp);
4147	5563	else
4148		- GrafreeD.clipboard = tmp;
	5564	+ Grafreed.clipboard = tmp;
4149	5565	}
4150	5566	else
4151		- if (GrafreeD.clipboardIsTempGroup)
	5567	+ if (Grafreed.clipboardIsTempGroup)
4152	5568	tGroup.add/Child/(child);
4153	5569	else
4154		- GrafreeD.clipboard = child;
	5570	+ Grafreed.clipboard = child;
4155	5571	}
4156	5572
4157	5573	}
4158		- if (GrafreeD.clipboardIsTempGroup)
4159		- GrafreeD.clipboard = tGroup;
	5574	+
	5575	+ if (Grafreed.clipboardIsTempGroup)
	5576	+ Grafreed.clipboard = tGroup;
	5577	+
4160	5578	if (cut)
4161	5579	{
4162	5580	ResetModel();
..	..	@@ -4166,11 +5584,15 @@
4166	5584
4167	5585	void paste(boolean expand)
4168	5586	{
	5587	+ if (Globals.REPLACEONMAKE)
	5588	+ Save();
	5589	+ boolean keep = Globals.REPLACEONMAKE;
	5590	+ Globals.REPLACEONMAKE = false;
4169	5591	// if (GrafreeD.clipboard == null)
4170	5592	// return;
4171	5593	boolean first = true;
4172	5594
4173		- if (GrafreeD.clipboardIsTempGroup)
	5595	+ if (Grafreed.clipboardIsTempGroup)
4174	5596	{
4175	5597	Composite temp;
4176	5598
..	..	@@ -4181,7 +5603,7 @@
4181	5603	temp = (Composite)Applet3D.clipboard.deepCopy();
4182	5604	*/
4183	5605	Object3D elem;
4184		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5606	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4185	5607	{
4186	5608	Object3D child = (Object3D)e.nextElement();
4187	5609
..	..	@@ -4215,21 +5637,22 @@
4215	5637	//Object3D cb = Applet3D.clipboard;
4216	5638	//temp.addChild(cb);
4217	5639	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4218		- assert(GrafreeD.clipboard.parent == null);
4219		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4220		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4221		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4222		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	5640	+ assert(Grafreed.clipboard.parent == null);
	5641	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5642	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5643	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5644	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4223	5645	else
4224		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4225		- GrafreeD.clipboard.get(0).parent = keepparent;
	5646	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5647	+ Grafreed.clipboard.get(0).parent = keepparent;
4226	5648	}
4227	5649
	5650	+ Globals.REPLACEONMAKE = keep;
4228	5651	ResetModel();
4229	5652	refreshContents();
4230	5653	}
4231	5654
4232		- void pasteInto(boolean copyit)
	5655	+ void pasteInto(boolean copyit, boolean clone)
4233	5656	{
4234	5657	// if (GrafreeD.clipboard == null)
4235	5658	// return;
..	..	@@ -4258,15 +5681,22 @@
4258	5681	if (copyit)
4259	5682	{
4260	5683	// paste(false);
4261		- CloneClipboard(false); // sept 2014
	5684	+ if (clone)
	5685	+ {
	5686	+ CloneClipboard(false); // sept 2014
	5687	+ }
	5688	+ else
	5689	+ {
	5690	+ paste(false);
	5691	+ }
4262	5692	}
4263	5693	else
4264	5694	{
4265	5695	boolean first = true;
4266	5696
4267		- if (GrafreeD.clipboardIsTempGroup)
	5697	+ if (Grafreed.clipboardIsTempGroup)
4268	5698	{
4269		- Composite temp = (Composite)GrafreeD.clipboard;
	5699	+ Composite temp = (Composite)Grafreed.clipboard;
4270	5700	Object3D copy;
4271	5701	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4272	5702	{
..	..	@@ -4276,7 +5706,7 @@
4276	5706	}
4277	5707	} else
4278	5708	{
4279		- linkSomething(GrafreeD.clipboard); //.get(0));
	5709	+ linkSomething(Grafreed.clipboard); //.get(0));
4280	5710	}
4281	5711	}
4282	5712	}
..	..	@@ -4353,6 +5783,10 @@
4353	5783
4354	5784	void group(Object3D csg, boolean grab)
4355	5785	{
	5786	+ if (Globals.REPLACEONMAKE)
	5787	+ Save();
	5788	+ boolean keep = Globals.REPLACEONMAKE;
	5789	+ Globals.REPLACEONMAKE = false;
4356	5790	if (//false) // why??
4357	5791	!group.selection.isEmpty())
4358	5792	{
..	..	@@ -4466,8 +5900,34 @@
4466	5900	//node.add(csg);
4467	5901	//makeSomething(node);
4468	5902	makeSomething(csg);
	5903	+ Globals.REPLACEONMAKE = keep;
4469	5904	}
4470	5905
	5906	+ void Ungroup(Object3D g)
	5907	+ {
	5908	+ if (Globals.REPLACEONMAKE)
	5909	+ Save();
	5910	+ boolean keep = Globals.REPLACEONMAKE;
	5911	+ Globals.REPLACEONMAKE = false;
	5912	+ if (g instanceof HiddenObject)
	5913	+ {
	5914	+ HiddenObject h = (HiddenObject) g;
	5915	+
	5916	+ for (int i=0; i<h.ActualSize(); i++)
	5917	+ {
	5918	+ objEditor.makeSomething(h.get(i), false);
	5919	+ }
	5920	+ }
	5921	+ else
	5922	+ {
	5923	+ for (int i=0; i<g.Size(); i++)
	5924	+ {
	5925	+ objEditor.makeSomething(g.get(i), false);
	5926	+ }
	5927	+ }
	5928	+ Globals.REPLACEONMAKE = keep;
	5929	+ }
	5930	+
4471	5931	void ungroup()
4472	5932	{
4473	5933	/*
..	..	@@ -4661,21 +6121,6 @@
4661	6121	}
4662	6122	*/
4663	6123
4664		- void ImportGFD()
4665		- {
4666		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4667		- browser.show();
4668		- String filename = browser.getFile();
4669		- if (filename != null && filename.length() > 0)
4670		- {
4671		- String fullname = browser.getDirectory() + filename;
4672		-
4673		- //Object3D readobj =
4674		- objEditor.ReadGFD(fullname, objEditor);
4675		- //makeSomething(readobj);
4676		- }
4677		- }
4678		-
4679	6124	/*
4680	6125	public void Callback(Object obj)
4681	6126	{
..	..	@@ -4699,26 +6144,9 @@
4699	6144	}
4700	6145	*/
4701	6146
4702		- void ImportVRMLX3D()
4703		- {
4704		- if (GrafreeD.standAlone)
4705		- {
4706		- /**/
4707		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4708		- browser.show();
4709		- String filename = browser.getFile();
4710		- if (filename != null && filename.length() > 0)
4711		- {
4712		- String fullname = browser.getDirectory() + filename;
4713		- LoadVRMLX3D(fullname);
4714		- }
4715		- /**/
4716		- }
4717		- }
4718		-
4719	6147	String GetFile(String dialogName)
4720	6148	{
4721		- if (GrafreeD.standAlone)
	6149	+ if (Grafreed.standAlone)
4722	6150	{
4723	6151	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4724	6152	browser.show();
..	..	@@ -4782,10 +6210,48 @@
4782	6210	cButton flashSelectionButton;
4783	6211	cButton editButton;
4784	6212	cButton uneditButton;
	6213	+ JCheckBox allParamsButton;
4785	6214	cButton clearpanelButton;
4786		- cButton allParamsButton;
4787	6215	cButton unselectButton;
4788	6216
	6217	+ cButton restoreCameraButton;
	6218	+
	6219	+ cButton oneStepButton;
	6220	+
	6221	+ cButton groupButton;
	6222	+ cButton ungroupButton;
	6223	+ cButton compositeButton;
	6224	+ cButton switchButton;
	6225	+ cButton loopButton;
	6226	+ cButton textureButton;
	6227	+
	6228	+ cButton skybox1Button;
	6229	+ cButton skybox2Button;
	6230	+ cButton skybox3Button;
	6231	+ cButton skybox4Button;
	6232	+ cButton skybox5Button;
	6233	+ cButton skybox6Button;
	6234	+ cButton skybox7Button;
	6235	+
	6236	+ cButton skybox11Button;
	6237	+ cButton skybox12Button;
	6238	+ cButton skybox13Button;
	6239	+ cButton skybox14Button;
	6240	+ cButton skybox15Button;
	6241	+ cButton skybox16Button;
	6242	+ cButton skybox17Button;
	6243	+
	6244	+ cButton gridButton;
	6245	+ cButton boxButton;
	6246	+ cButton sphereButton;
	6247	+ cButton coneButton;
	6248	+ cButton torusButton;
	6249	+ cButton superButton;
	6250	+ cButton kleinButton;
	6251	+ cButton particlesButton;
	6252	+ cButton overlayButton;
	6253	+ cButton lightButton;
	6254	+
4789	6255	cButton screenfitButton;
4790	6256	cButton screenfitpointButton;
4791	6257	cButton snapobjectButton;
..	..	@@ -4797,14 +6263,6 @@
4797	6263
4798	6264	cButton setsupportButton;
4799	6265
4800		- cButton twoButton;
4801		- cButton sixButton;
4802		- cButton threeButton;
4803		- cButton sevenButton;
4804		- cButton fourButton; // full panel
4805		- cButton oneButton; // full XYZ
4806		- //cButton currentLayout;
4807		-
4808	6266	//
4809	6267	//Composite
4810	6268	Object3D // to do !!
..	..	@@ -4814,10 +6272,12 @@
4814	6272	//JTree jTree;
4815	6273	private MenuItem lookAtItem;
4816	6274	private MenuItem lookFromItem;
4817		- private MenuItem switchItem;
4818		- private MenuItem cutItem;
4819		- private MenuItem duplicateItem;
4820		- private MenuItem cloneItem;
	6275	+ private MenuItem switchViewItem;
	6276	+ private JMenuItem cutItem;
	6277	+ private MenuItem undoItem;
	6278	+ private MenuItem redoItem;
	6279	+ private JMenuItem duplicateItem;
	6280	+ private JMenuItem cloneItem;
4821	6281	private MenuItem cloneSupportItem;
4822	6282	private MenuItem overwriteGeoItem;
4823	6283	private MenuItem overwriteMatItem;
..	..	@@ -4827,8 +6287,9 @@
4827	6287	private MenuItem resetsupportItem;
4828	6288	private MenuItem resetreferencesItem;
4829	6289	private MenuItem linkverticesItem;
	6290	+ private MenuItem relinkverticesItem;
4830	6291	private MenuItem setMasterItem;
4831		- private MenuItem resetMeshItem;
	6292	+ private MenuItem resetAllItem;
4832	6293	private MenuItem stepAllItem;
4833	6294	private MenuItem revertMeshItem;
4834	6295	private MenuItem poseMeshItem;
..	..	@@ -4837,16 +6298,19 @@
4837	6298	private MenuItem cloneGeometriesItem;
4838	6299	private MenuItem shareGeometriesItem;
4839	6300	private MenuItem mergeGeometriesItem;
4840		- private MenuItem copyItem;
	6301	+ private JMenuItem copyItem;
4841	6302	private MenuItem pasteItem;
4842		- private MenuItem pasteLinkItem;
4843		- private MenuItem pasteCloneItem;
4844		- private MenuItem pasteExpandItem;
4845		- private MenuItem clearItem;
	6303	+ private JMenuItem pasteIntoItem;
	6304	+ private JMenuItem pasteLinkItem;
	6305	+ private JMenuItem pasteCloneItem;
	6306	+ private JMenuItem pasteExpandItem;
	6307	+ private JMenuItem deleteItem;
4846	6308	private MenuItem clearAllItem;
4847	6309	private MenuItem genUVItem;
	6310	+ private MenuItem genNormalsMESHItem;
4848	6311	private MenuItem genNormalsCADItem;
4849	6312	private MenuItem genNormalsORGANItem;
	6313	+ private MenuItem genNormalsMINEItem;
4850	6314	private MenuItem stripifyItem;
4851	6315	private MenuItem unstripifyItem;
4852	6316	private MenuItem trimItem;
..	..	@@ -4875,6 +6339,10 @@
4875	6339	private MenuItem showleavesItem;
4876	6340	private MenuItem markleavesItem;
4877	6341	private MenuItem unmarkleavesItem;
	6342	+ private MenuItem rewindleavesItem;
	6343	+ private MenuItem unrewindleavesItem;
	6344	+ private MenuItem randomleavesItem;
	6345	+ private MenuItem unrandomleavesItem;
4878	6346
4879	6347	private MenuItem flipVItem;
4880	6348	private MenuItem unflipVItem;
..	..	@@ -4886,14 +6354,17 @@
4886	6354	private MenuItem panoTexturesItem;
4887	6355
4888	6356	private MenuItem resetCentroidItem;
4889		- private MenuItem transformgeometryItem;
	6357	+ private MenuItem resetCentroidXZItem;
4890	6358	private MenuItem resetTransformItem;
4891		- private MenuItem grabItem;
	6359	+ private MenuItem transformGeometryItem;
	6360	+ private MenuItem transformChildrenItem;
	6361	+ private MenuItem hideItem;
	6362	+ private JMenuItem grabItem;
4892	6363	private MenuItem backItem;
4893	6364	private MenuItem frontItem;
4894	6365	private MenuItem cameraItem;
4895	6366	private MenuItem compositeItem;
4896		- private MenuItem randomItem;
	6367	+ private MenuItem switchItem;
4897	6368	private MenuItem physicsItem;
4898	6369	private MenuItem frameselectorItem;
4899	6370	private MenuItem scriptNodeItem;
..	..	@@ -4901,13 +6372,14 @@
4901	6372	private MenuItem switchTransfoItem;
4902	6373	private MenuItem morphItem;
4903	6374	private MenuItem linkerItem;
4904		- private MenuItem ungroupItem;
	6375	+ private JMenuItem ungroupItem;
4905	6376	private MenuItem editItem;
4906	6377	private MenuItem openWindowItem;
4907	6378	private MenuItem editLeafItem;
4908	6379
4909	6380	private MenuItem resetParentItem;
4910	6381	private MenuItem repairParentItem;
	6382	+ private MenuItem repairShadowItem;
4911	6383	private MenuItem sortbysizeItem;
4912	6384	private MenuItem sortbynameItem;
4913	6385
..	..	@@ -4916,6 +6388,8 @@
4916	6388	private MenuItem attachBumpItem;
4917	6389	private MenuItem detachBumpItem;
4918	6390	private MenuItem pigmentBumpItem;
	6391	+ private MenuItem embedTexturesItem;
	6392	+ private MenuItem deEmbedTexturesItem;
4919	6393
4920	6394	private MenuItem particleItem;
4921	6395	private MenuItem ragdollItem;
..	..	@@ -4928,10 +6402,11 @@
4928	6402	private MenuItem coneItem;
4929	6403	private MenuItem torusItem;
4930	6404	private MenuItem superItem;
	6405	+ private MenuItem kleinItem;
4931	6406	private MenuItem blobItem;
4932	6407	private MenuItem latheItem;
4933	6408	private MenuItem bezierItem;
4934		- private MenuItem checkerItem;
	6409	+ private MenuItem overlayItem;
4935	6410	private MenuItem meshItem;
4936	6411	// private MenuItem meshGroupItem;
4937	6412	private MenuItem springItem;
..	..	@@ -4940,6 +6415,7 @@
4940	6415	private MenuItem csgItem;
4941	6416	private MenuItem templateItem;
4942	6417	private MenuItem textureItem;
	6418	+ private MenuItem billboardItem;
4943	6419	private MenuItem shadowXItem;
4944	6420	private MenuItem shadowYItem;
4945	6421	private MenuItem shadowZItem;
..	..	@@ -4952,11 +6428,6 @@
4952	6428	private MenuItem doubleItem;
4953	6429	private MenuItem tripleItem;
4954	6430
4955		- private MenuItem importGFDItem;
4956		- private MenuItem importVRMLX3DItem;
4957		- private MenuItem import3DSItem;
4958		- private MenuItem importOBJItem;
4959		-
4960	6431	private MenuItem computeAOItem;
4961	6432	private MenuItem recompileItem;
4962	6433	private MenuItem editScriptItem;
..	..	@@ -4966,4 +6437,8 @@
4966	6437	private MenuItem analyzeItem;
4967	6438	private MenuItem dumpItem;
4968	6439	//boolean freezemodel = false;
	6440	+
	6441	+ Menu cameraMenu;
	6442	+ MenuItem editCameraItem;
	6443	+ MenuItem restoreCameraItem;
4969	6444	}