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