~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", !Globals.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, !Globals.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(JTabbedPane.LEFT);
	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,118 @@
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	+
	769	+ if (Globals.ADVANCED)
	770	+ {
	771	+ attributeItem = menu.add(new MenuItem("Attribute"));
	772	+ attributeItem.addActionListener(this);
	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	+ }
	781	+ menu.add("-");
	782	+ textureRatioRItem = menu.add(new MenuItem("Texture Ratio Red"));
	783	+ textureRatioRItem.addActionListener(this);
	784	+ textureRatioGItem = menu.add(new MenuItem("Texture Ratio Green"));
	785	+ textureRatioGItem.addActionListener(this);
	786	+ textureRatioBItem = menu.add(new MenuItem("Texture Ratio Blue"));
	787	+ textureRatioBItem.addActionListener(this);
279	788	menu.add("-");
280	789	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
281	790	resetTransformItem.addActionListener(this);
282	791	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
283	792	resetCentroidItem.addActionListener(this);
284		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
285		- transformgeometryItem.addActionListener(this);
	793	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XZ"));
	794	+ resetCentroidXZItem.addActionListener(this);
	795	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	796	+ transformGeometryItem.addActionListener(this);
	797	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	798	+ transformChildrenItem.addActionListener(this);
286	799
287	800	oe.menuBar.add(menu = new Menu("Geometry"));
288	801	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -293,8 +806,11 @@
293	806	genNormalsCADItem.addActionListener(this);
294	807	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
295	808	genNormalsMESHItem.addActionListener(this);
296		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	809	+ if (Globals.ADVANCED)
	810	+ {
	811	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
297	812	genNormalsMINEItem.addActionListener(this);
	813	+ }
298	814	stripifyItem = menu.add(new MenuItem("Stripify"));
299	815	stripifyItem.addActionListener(this);
300	816	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -316,31 +832,52 @@
316	832	reduce34MeshItem.addActionListener(this);
317	833	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
318	834	increaseMeshItem.addActionListener(this);
319		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
320		- smoothMeshItem.addActionListener(this);
321	835	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
322	836	clipMeshItem.addActionListener(this);
	837	+
	838	+ if (Globals.ADVANCED)
	839	+ {
	840	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	841	+ smoothMeshItem.addActionListener(this);
	842	+ }
323	843
324	844	oe.menuBar.add(menu = new Menu("Attributes"));
	845	+ clearVersionsItem = menu.add(new MenuItem("Clear Versions"));
	846	+ clearVersionsItem.addActionListener(this);
325	847	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
326	848	clearMaterialsItem.addActionListener(this);
	849	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	850	+ resetAllItem.addActionListener(this);
	851	+ stepAllItem = menu.add(new MenuItem("Step All"));
	852	+ stepAllItem.addActionListener(this);
327	853	menu.add("-");
328	854	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
329	855	liveleavesItem.addActionListener(this);
330	856	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
331	857	unliveleavesItem.addActionListener(this);
	858	+ if (Globals.ADVANCED)
	859	+ {
332	860	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
333	861	supportleavesItem.addActionListener(this);
334	862	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
335	863	unsupportleavesItem.addActionListener(this);
	864	+ }
336	865	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
337	866	hideleavesItem.addActionListener(this);
338	867	showleavesItem = menu.add(new MenuItem("Show Leaves"));
339	868	showleavesItem.addActionListener(this);
340		- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
	869	+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
341	870	markleavesItem.addActionListener(this);
342		- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
	871	+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
343	872	unmarkleavesItem.addActionListener(this);
	873	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	874	+ rewindleavesItem.addActionListener(this);
	875	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	876	+ unrewindleavesItem.addActionListener(this);
	877	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	878	+ randomleavesItem.addActionListener(this);
	879	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	880	+ unrandomleavesItem.addActionListener(this);
344	881	menu.add("-");
345	882	flipVItem = menu.add(new MenuItem("Flip V"));
346	883	flipVItem.addActionListener(this);
..	..	@@ -366,53 +903,135 @@
366	903	attachBumpItem.addActionListener(this);
367	904	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
368	905	pigmentBumpItem.addActionListener(this);
	906	+ //embedTexturesItem
369	907	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
370	908	detachPigmentItem.addActionListener(this);
371	909	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
372	910	detachBumpItem.addActionListener(this);
	911	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	912	+ embedTexturesItem.addActionListener(this);
	913	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	914	+ deEmbedTexturesItem.addActionListener(this);
373	915	menu.add("-");
374	916	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
375	917	sortbysizeItem.addActionListener(this);
376	918	sortbynameItem = menu.add(new MenuItem("Sort by name"));
377	919	sortbynameItem.addActionListener(this);
378	920	menu.add("-");
	921	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	922	+ shareGeometriesItem.addActionListener(this);
	923	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	924	+ mergeGeometriesItem.addActionListener(this);
	925	+ menu.add("-");
	926	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	927	+ editLeafItem.addActionListener(this);
	928	+ if (Globals.ADVANCED)
	929	+ {
	930	+ // Pretty much the same as duplicate and clone.
379	931	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
380	932	extractGeometriesItem.addActionListener(this);
381	933	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
382	934	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);
	935	+ }
387	936
388	937	oe.menuBar.add(menu = new Menu("Insert"));
389	938	buildCreateMenu(menu);
390	939
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	940	oe.menuBar.add(menu = new Menu("Tools"));
403	941	buildToolsMenu(menu);
404	942	}
405	943
	944	+ JTabbedPane resourcecontainer;
	945	+ cGridBag currenttab;
	946	+ //boolean added; // patch for jar
	947	+
	948	+ int totalcount = 0;
	949	+
	950	+ int tabcount = 0;
	951	+ int colcount = 0;
	952	+ int rowcount = 0;
	953	+ int texturecount = 0;
	954	+
	955	+ int columns = 5;
	956	+ int rows = 7;
	957	+
	958	+ public void ResourceCallBack(String[] path)
	959	+ {
	960	+// for (int i = 0; i < path.length; i++)
	961	+// System.out.print(path[i] + "/");
	962	+// System.out.println();
	963	+
	964	+ if (//rowcount == 0 \|\|
	965	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	966	+ {
	967	+ currenttab = new cGridBag();
	968	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	969	+ currenttab.setName(tabname);
	970	+ //added = false;
	971	+ resourcecontainer.add(currenttab);
	972	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	973	+ rowcount = 1;
	974	+ colcount = 0;
	975	+ texturecount = 0;
	976	+ }
	977	+
	978	+ if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") \|\| path[2].toLowerCase().endsWith(".png")))
	979	+ {
	980	+ //if (!added)
	981	+ {
	982	+ //added = true;
	983	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	984	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	985	+ }
	986	+
	987	+ AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
	988	+ totalcount++;
	989	+
	990	+ if (++colcount >= columns)
	991	+ {
	992	+ colcount = 0;
	993	+ currenttab.Return();
	994	+
	995	+ if (rowcount++ >= rows)
	996	+ {
	997	+ rowcount = 0;
	998	+ }
	999	+ }
	1000	+ }
	1001	+ else
	1002	+ {
	1003	+// if (!path[path.length-1].equals("icons"))
	1004	+// resourcecontainer.Return();
	1005	+ }
	1006	+ }
	1007	+
	1008	+ void CreateTexturePanel(cGridBag container)
	1009	+ {
	1010	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	1011	+ container.add(resourcecontainer);
	1012	+
	1013	+ Grafreed.ParseResources("textures", this);
	1014	+
	1015	+ // 935. System.out.println("Total = " + totalcount);
	1016	+ }
	1017	+
406	1018	void SetupUI2(ObjEditor oe)
407	1019	{
	1020	+ // June 2019
	1021	+ if (oe == null)
	1022	+ {
	1023	+ //super.SetupUI2(this);
	1024	+ //return;
	1025	+ }
	1026	+
	1027	+ if (copy != group)
	1028	+ {
	1029	+ //super.SetupUI2(this);
	1030	+ }
	1031	+
408	1032	//new Exception().printStackTrace();
409	1033
410	1034	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	1035	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
417	1036
418	1037	oe.buttonGroup = new ButtonGroup();
..	..	@@ -433,153 +1052,269 @@
433	1052	oe.radioPanel.add(dummyButton);
434	1053	oe.buttonGroup.add(dummyButton);
435	1054	*/
436		- aConstraints.gridy += 1;
437		- oe.aConstraints.gridwidth = 1;
438		- oe.aConstraints.gridx = 0;
	1055	+ cGridBag versionManagerPanel = new cGridBag();
	1056	+
	1057	+ versionManagerPanel.preferredHeight = 4;
439	1058
440		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
	1059	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
	1060	+
	1061	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1062	+ //minButton.setToolTipText("Minimize window");
	1063	+ //minButton.addActionListener(this);
	1064	+
	1065	+ if (Globals.ADVANCED)
	1066	+ {
	1067	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1068	+// maxButton.setToolTipText("Maximize window");
	1069	+// maxButton.addActionListener(this);
	1070	+ }
	1071	+
	1072	+ cButton gcButton;
	1073	+
	1074	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1075	+// gcButton.setToolTipText("Garbage collect");
	1076	+// gcButton.addActionListener(new ActionListener()
	1077	+// {
	1078	+// public void actionPerformed(ActionEvent e)
	1079	+// {
	1080	+// System.gc();
	1081	+// }
	1082	+// });
	1083	+
	1084	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1085	+ collapseButton.setToolTipText("Collapse toolbar");
	1086	+ collapseButton.addActionListener(this);
	1087	+
	1088	+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1089	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1090	+ maximize3DButton.addActionListener(this);
	1091	+
	1092	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1093	+ twoButton.setToolTipText("Show 3D view only");
	1094	+ twoButton.addActionListener(this);
	1095	+ this.fullscreenLayout = twoButton;
	1096	+
	1097	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1098	+ threeButton.setToolTipText("Show controls and 3D view");
	1099	+ threeButton.addActionListener(this);
	1100	+ if (Globals.ADVANCED)
	1101	+ {
	1102	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1103	+ sixButton.setToolTipText("Show 3D view and controls");
	1104	+ sixButton.addActionListener(this);
	1105	+ }
	1106	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1107	+// sevenButton.setToolTipText("3-column layout");
	1108	+// sevenButton.addActionListener(this);
	1109	+ //
	1110	+
	1111	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1112	+ fullButton.setToolTipText("Full-screen window");
	1113	+ fullButton.addActionListener(this);
	1114	+
	1115	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1116	+ screenfitButton.setToolTipText("Screen fit");
	1117	+ screenfitButton.addActionListener(this);
	1118	+
	1119	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1120	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1121	+ restoreCameraButton.addActionListener(this);
	1122	+
	1123	+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1124	+ saveVersionButton.setToolTipText("Duplicate current version");
	1125	+ saveVersionButton.addActionListener(this);
	1126	+
	1127	+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1128	+ deleteVersionButton.setToolTipText("Delete current version");
	1129	+ deleteVersionButton.addActionListener(this);
	1130	+ deleteVersionButton.setEnabled(false);
	1131	+
	1132	+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1133	+ previousVersionButton.setToolTipText("Previous version");
	1134	+ previousVersionButton.addActionListener(this);
	1135	+ previousVersionButton.setEnabled(false);
	1136	+
	1137	+ cGridBag updown = new cGridBag().setVertical(true);
	1138	+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1139	+ restoreButton.setToolTipText("Undo (restore current version)");
	1140	+ restoreButton.addActionListener(this);
	1141	+ restoreButton.setEnabled(false);
	1142	+
	1143	+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1144	+ replaceButton.setToolTipText("Save (replace current version)");
	1145	+ replaceButton.addActionListener(this);
	1146	+ replaceButton.setEnabled(false);
	1147	+
	1148	+ versionManagerPanel.add(updown);
	1149	+
	1150	+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1151	+ nextVersionButton.setToolTipText("Next version");
	1152	+ nextVersionButton.addActionListener(this);
	1153	+ nextVersionButton.setEnabled(false);
	1154	+
	1155	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1156	+ oneStepButton.setToolTipText("Animate one step forward");
	1157	+ oneStepButton.addActionListener(this);
	1158	+
	1159	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1160	+ liveCB.setToolTipText("Enable animation");
441	1161	liveCB.addItemListener(this);
442	1162
443		- oe.aConstraints.gridx += 1;
444		- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
445		- supportCB.addItemListener(this);
446		-
447		- // oe.aConstraints.gridx += 1;
448		- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
449		- // localCB.addItemListener(this);
450		-
451		- oe.aConstraints.gridx += 1;
452		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD), oe.aConstraints);
453		- crowdCB.addItemListener(this);
454		-
455		- oe.aConstraints.gridx += 1;
456		- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
457		- smoothCB.addItemListener(this);
458		-
459		- oe.aConstraints.gridx += 1;
460		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
	1163	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	1164	+ fastCB.setToolTipText("Fast mode");
461	1165	fastCB.addItemListener(this);
462		- oe.aConstraints.gridx += 1;
463		- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
464		- slowCB.addItemListener(this);
465		- oe.aConstraints.gridx += 1;
466		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.FAST), oe.aConstraints);
467		- boxCB.addItemListener(this);
	1166	+
	1167	+ //oe.toolboxPanel.Return();
	1168	+
	1169	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1170	+// trackCB.setToolTipText("Enable tracking");
	1171	+// trackCB.addItemListener(this);
468	1172
469		-// oe.aConstraints.gridx += 1;
470		-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
471		-// speakerMocapCB.addItemListener(this);
472		-
473		- if (false)
474		- {
475		- // handled in scripts
476		- oe.aConstraints.gridx += 1;
477		- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
478		- speakerCameraCB.addItemListener(this);
479		-
480		- oe.aConstraints.gridx += 1;
481		- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
482		- speakerFocusCB.addItemListener(this);
483		-
484		- oe.aConstraints.gridx += 1;
485		- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
486		- smoothfocusCB.addItemListener(this);
487		- }
488		-
489		-//oe.aConstraints.gridx += 1;
490		-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
491		-// debugCB.addItemListener(this);
492		-
493		- oe.aConstraints.gridx += 1;
494		- oe.toolbarPanel.add(oeilCB = new cCheckBox("O", CameraPane.OEIL), oe.aConstraints);
495		- oeilCB.addItemListener(this);
496		-
497		- oe.aConstraints.gridx += 1;
498		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("T", CameraPane.LOOKAT), oe.aConstraints);
499		- lookAtCB.addItemListener(this);
500		-
501		- oe.aConstraints.gridx += 1;
502		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
503		- trackCB.addItemListener(this);
504		-
505		- oe.aConstraints.gridx += 1;
506		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
507		- screenfitButton.addActionListener(this);
508		- oe.aConstraints.gridx += 1;
509	1173	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
510	1174	// screenfitpointButton.addActionListener(this);
511		-// oe.aConstraints.gridx += 1;
512		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
513		- snapobjectButton.addActionListener(this);
514		- oe.aConstraints.gridx += 1;
515	1175
516		- //aConstraints.gridx = 0;
517		- //aConstraints.gridy += 1;
518		- oe.aConstraints.weighty = 0;
519		- oe.aConstraints.gridwidth = 1;
520		-
521		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
522		- flashSelectionButton.addActionListener(this);
523		-
524		- oe.toolbarPanel.add(new cButton(" ", false));
525		-
526		- oe.aConstraints.gridx += 1;
527		- oe.aConstraints.weighty = 0;
528		- oe.aConstraints.gridwidth = 1;
529		-
530		- //
531		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
532		- twoButton.addActionListener(this);
533		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	1176	+ if (Globals.ADVANCED)
	1177	+ {
	1178	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1179	+ snapobjectButton.addActionListener(this);
	1180	+ snapobjectButton.setToolTipText("Snap Object");
	1181	+
	1182	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
534	1183	fourButton.addActionListener(this);
535		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
536		- sixButton.addActionListener(this);
537		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
538		- threeButton.addActionListener(this);
539		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
540		- sevenButton.addActionListener(this);
541		- //
	1184	+ fourButton.setToolTipText("Show control panel only");
	1185	+ }
542	1186
543		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	1187	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	1188	+
	1189	+
	1190	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1191	+ rootButton.setToolTipText("Open selection in new tab");
544	1192	rootButton.addActionListener(this);
545		- oe.aConstraints.gridx += 1;
546		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	1193	+
	1194	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1195	+ closeButton.setToolTipText("Close tab");
547	1196	closeButton.addActionListener(this);
548	1197	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
549	1198	//clearButton.addActionListener(this);
550		- oe.aConstraints.gridx += 1;
551		-
552		- oe.aConstraints.gridx = 1; //
553		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
554		- editButton.addActionListener(this);
555		- oe.aConstraints.gridx += 1;
556		- oe.aConstraints.weighty = 0;
557		- oe.aConstraints.gridwidth = 1;
558	1199
559		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	1200	+ cGridBag row1 = new cGridBag();
	1201	+
	1202	+ // INSERT
	1203	+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1204	+ gridButton.setToolTipText("Create ground");
	1205	+ gridButton.addActionListener(this);
	1206	+
	1207	+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1208	+ boxButton.setToolTipText("Create box");
	1209	+ boxButton.addActionListener(this);
	1210	+
	1211	+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1212	+ superButton.setToolTipText("Create superellipsoid");
	1213	+ superButton.addActionListener(this);
	1214	+
	1215	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1216	+ sphereButton.setToolTipText("Create sphere");
	1217	+ sphereButton.addActionListener(this);
	1218	+
	1219	+ row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1220	+ coneButton.setToolTipText("Create cone");
	1221	+ coneButton.addActionListener(this);
	1222	+
	1223	+ row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1224	+ torusButton.setToolTipText("Create torus");
	1225	+ torusButton.addActionListener(this);
	1226	+
	1227	+ if (false) //Globals.ADVANCED)
	1228	+ {
	1229	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1230	+ kleinButton.setToolTipText("Create Klein bottle");
	1231	+ kleinButton.addActionListener(this);
	1232	+ }
	1233	+
	1234	+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1235	+ particlesButton.setToolTipText("Create particle system");
	1236	+ particlesButton.addActionListener(this);
	1237	+
	1238	+ oe.toolboxPanel.add(row1);
	1239	+
	1240	+ cGridBag row2 = new cGridBag();
	1241	+
	1242	+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1243	+ groupButton.setToolTipText("Create group");
	1244	+ groupButton.addActionListener(this);
	1245	+
	1246	+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1247	+ compositeButton.setToolTipText("Create composite");
	1248	+ compositeButton.addActionListener(this);
	1249	+
	1250	+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1251	+ switchButton.setToolTipText("Create item switcher");
	1252	+ switchButton.addActionListener(this);
	1253	+
	1254	+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1255	+ loopButton.setToolTipText("Create loop");
	1256	+ loopButton.addActionListener(this);
	1257	+
	1258	+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1259	+ textureButton.setToolTipText("Create texture");
	1260	+ textureButton.addActionListener(this);
	1261	+
	1262	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1263	+ overlayButton.setToolTipText("Create overlay");
	1264	+ overlayButton.addActionListener(this);
	1265	+
	1266	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1267	+ lightButton.setToolTipText("Create light");
	1268	+ lightButton.addActionListener(this);
	1269	+
	1270	+ oe.toolboxPanel.add(row2);
	1271	+
	1272	+ cGridBag textures = new cGridBag();
	1273	+
	1274	+ CreateTexturePanel(textures);
	1275	+
	1276	+ int tabCount = resourcecontainer.getTabCount();
	1277	+
	1278	+ if (tabCount > 0)
	1279	+ resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
	1280	+
	1281	+ oe.toolboxPanel.add(textures);
	1282	+
	1283	+ textures.preferredHeight = 100;
	1284	+
	1285	+ CreateSkyboxPanel(oe.skyboxPanel);
	1286	+
	1287	+ // EDIT panel
	1288	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1289	+ editButton.setToolTipText("Pin selection controls");
	1290	+ editButton.addActionListener(this);
	1291	+
	1292	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1293	+ uneditButton.setToolTipText("Unpin and remove selection controls");
560	1294	uneditButton.addActionListener(this);
561	1295
562		- oe.aConstraints.gridx += 1;
563		- oe.aConstraints.weighty = 0;
564		- oe.aConstraints.gridwidth = 1;
565		-
566		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
567		- clearPanelButton.addActionListener(this);
568		-
569		- oe.aConstraints.gridx += 1;
570		- oe.aConstraints.weighty = 0;
571		- oe.aConstraints.gridwidth = 1;
572		-
573		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	1296	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1297	+ allParamsButton.setToolTipText("Show all controls");
574	1298	allParamsButton.addActionListener(this);
575	1299
576		- oe.aConstraints.gridx += 1;
577		- oe.aConstraints.weighty = 0;
578		- oe.aConstraints.gridwidth = 1;
579		-
580		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
581		- unselectButton.addActionListener(this);
	1300	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1301	+ clearPanelButton.setToolTipText("Clear all controls");
	1302	+ clearPanelButton.addActionListener(this);
582	1303
	1304	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1305	+ //unselectButton.setToolTipText("Unselect");
	1306	+ //unselectButton.addActionListener(this);
	1307	+
	1308	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1309	+ flashSelectionButton.setToolTipText("Highlight selection");
	1310	+ flashSelectionButton.addActionListener(this);
	1311	+
	1312	+ editCommandsPanel.preferredHeight = 1;
	1313	+
	1314	+ SetPinStates(false);
	1315	+// oe.treePanel.add(commandsPanel);
	1316	+// oe.treePanel.Return();
	1317	+
583	1318	// oe.aConstraints.gridx += 1;
584	1319	// oe.aConstraints.weighty = 0;
585	1320	// oe.aConstraints.gridwidth = 1;
..	..	@@ -591,47 +1326,34 @@
591	1326	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
592	1327	// gcButton.addActionListener(this);
593	1328
594		- oe.aConstraints.gridx = 0;
595		- oe.aConstraints.gridy += 1;
596		-
597		- //ctrlPanel.add(objList = new List(5, true));
598		- oe.aConstraints.gridwidth = 100;
599		- // oe.aConstraints.gridheight = 100;
600		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
601		- oe.aConstraints.gridheight = 1;
602		- oe.aConstraints.weighty = 0.5;
603		- oe.aConstraints.gridx = 0;
604		- JScrollPane jSP;
	1329	+ cGridBag jSPPanel = new cGridBag();
	1330	+
	1331	+ jSPPanel.preferredHeight = 20;
	1332	+
	1333	+ JScrollPane jSP;
605	1334	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
606		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	1335	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
607	1336	ResetModel();
608		- oe.aConstraints.weighty = 0.5;
609		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
610		- oe.aConstraints.gridy += 1;
611		- oe.aConstraints.gridwidth = 1;
612		-
613		- oe.aConstraints.weighty = 0;
614		- oe.aConstraints.gridwidth = 2;
615		-
616		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
617		- colorCB.addItemListener(this);
618		- oe.aConstraints.gridx += 2;
619		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
620		- materialCB.addItemListener(this);
621		- oe.aConstraints.gridx += 2;
622		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
623		- textureCB.addItemListener(this);
624		-
625		- oe.aConstraints.gridx = 0;
626		- oe.aConstraints.gridy += 1;
627	1337
	1338	+ oe.treePanel.add(jSPPanel);
	1339	+ oe.treePanel.Return();
	1340	+
	1341	+ oe.treePanel.add(versionManagerPanel);
	1342	+ oe.treePanel.Return();
	1343	+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1344	+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
	1345	+ versionSliderPane.preferredHeight = 3;
	1346	+
	1347	+// mainPanel.setDividerLocation(0.1); //1.0);
	1348	+ mainPanel.setResizeWeight(0.4);
	1349	+
628	1350	//jList.addListSelectionListener(this);
629	1351	oe.jTree.addTreeSelectionListener(this);
630	1352	//jTree.setRootVisible(false);
631	1353	//jTree.setEditable(true);
632	1354	oe.jTree.setDragEnabled(true);
633	1355	//jTree.setPreferredSize(new Dimension(10,10));
634		- jSP.setPreferredSize(new Dimension(100,200));
	1356	+ //jSP.setPreferredSize(new Dimension(100,200));
635	1357
636	1358	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
637	1359
..	..	@@ -643,47 +1365,204 @@
643	1365	dgr.addDragGestureListener(this);
644	1366	}catch(Exception e) {}
645	1367	*/
646		- radio.layout = sevenButton;
	1368	+ radio.layout = threeButton; // sixButton;
647	1369	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
648	1370	}
	1371	+
	1372	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	1373	+ {
	1374	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1375	+ colorCB.setToolTipText("Copy color when dropped");
	1376	+ colorCB.addItemListener(this);
	1377	+
	1378	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1379	+ materialCB.setToolTipText("Copy material when dropped");
	1380	+ materialCB.addItemListener(this);
	1381	+
	1382	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1383	+ textureCB.setToolTipText("Copy texture when dropped");
	1384	+ textureCB.addItemListener(this);
	1385	+
	1386	+ panel.Return();
	1387	+
	1388	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	1389	+ boxCB.setToolTipText("Display bounding boxes");
	1390	+ boxCB.addItemListener(this);
	1391	+
	1392	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	1393	+ zoomBoxCB.setToolTipText("Display only for wheel");
	1394	+ zoomBoxCB.addItemListener(this);
	1395	+
	1396	+ if (true) // Globals.ADVANCED)
	1397	+ {
	1398	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1399	+// supportCB.setToolTipText("Enable rigging");
	1400	+// supportCB.addItemListener(this);
	1401	+
	1402	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1403	+ freezeCB.setToolTipText("Fast moving camera");
	1404	+ freezeCB.addItemListener(this);
	1405	+
	1406	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	1407	+ // localCB.addItemListener(this);
	1408	+
	1409	+ panel.Return();
	1410	+
	1411	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	1412	+ crowdCB.setToolTipText("Used for crowds");
	1413	+ crowdCB.addItemListener(this);
	1414	+
	1415	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	1416	+ smoothCB.setToolTipText("Snapping delay");
	1417	+ smoothCB.addItemListener(this);
	1418	+
	1419	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1420	+// slowCB.setToolTipText("Smooth interpolation");
	1421	+// slowCB.addItemListener(this);
	1422	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1423	+ minshaderCB.setToolTipText("Minimal fast shader");
	1424	+ minshaderCB.addItemListener(this);
	1425	+
	1426	+// constraints.gridy += 1;
	1427	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	1428	+// speakerMocapCB.addItemListener(this);
	1429	+
	1430	+ panel.Return();
	1431	+
	1432	+ if (false)
	1433	+ {
	1434	+ // handled in scripts
	1435	+ //constraints.gridy += 1;
	1436	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	1437	+ speakerCameraCB.addItemListener(this);
	1438	+
	1439	+ //constraints.gridy += 1;
	1440	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	1441	+ speakerFocusCB.addItemListener(this);
	1442	+
	1443	+ //constraints.gridy += 1;
	1444	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	1445	+ smoothfocusCB.addItemListener(this);
	1446	+ panel.Return();
	1447	+ }
	1448	+
	1449	+//constraints.gridx += 1;
	1450	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	1451	+// debugCB.addItemListener(this);
	1452	+
	1453	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1454	+ trackCB.setToolTipText("Enable tracking target");
	1455	+ trackCB.addItemListener(this);
	1456	+
	1457	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1458	+ oeilCB.setToolTipText("Move camera when tracking");
	1459	+ oeilCB.addItemListener(this);
	1460	+
	1461	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1462	+ shadowCB.setToolTipText("When live compute shadows");
	1463	+ shadowCB.addItemListener(this);
	1464	+
	1465	+ panel.Return();
	1466	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1467	+ toggleTextureCB.setToolTipText("Load textures");
	1468	+ toggleTextureCB.addItemListener(this);
	1469	+
	1470	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1471	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1472	+ toggleSwitchCB.addItemListener(this);
	1473	+
	1474	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1475	+ autokeepCB.setToolTipText("On structure change");
	1476	+ autokeepCB.addItemListener(this);
	1477	+
	1478	+ panel.Return();
	1479	+ if (Globals.ADVANCED)
	1480	+ {
	1481	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	1482	+ lookAtCB.setToolTipText("Look-at target");
	1483	+ lookAtCB.addItemListener(this);
	1484	+ }
	1485	+
	1486	+ }
	1487	+
	1488	+ cGridBag fill = new cGridBag();
	1489	+ fill.preferredHeight = 200;
	1490	+ cGridBag fill2 = new cGridBag();
	1491	+ fill2.preferredHeight = 200;
	1492	+ cGridBag fill3 = new cGridBag();
	1493	+ fill3.preferredHeight = 200;
	1494	+
	1495	+ panel.add(fill);
	1496	+ panel.add(fill2);
	1497	+ panel.add(fill3);
	1498	+
	1499	+ }
649	1500
650	1501	void EditObject(Object3D obj)
651	1502	{
	1503	+ //assert(obj instanceof Composite);
	1504	+
	1505	+// if (obj.versionlist == null)
	1506	+// {
	1507	+// obj.versionlist = new Object3D[100];
	1508	+// obj.versionindex = -1;
	1509	+// }
	1510	+
652	1511	cRadio radioButton = new cRadio(obj.name);
	1512	+
	1513	+ // June 2019. Patch to avoid bug with transparency.
	1514	+ radioButton.hadMaterial = obj.material != null;
	1515	+ if (!radioButton.hadMaterial)
	1516	+ {
	1517	+ obj.material = new cMaterial();
	1518	+ }
	1519	+
653	1520	radioButton.SetObject(obj);
654		- radioButton.layout = sevenButton;
	1521	+ radioButton.layout = threeButton; // sixButton;
655	1522	radioButton.SetCamera(cameraView.renderCamera, false);
656	1523	radioButton.addActionListener(this);
657	1524	radioPanel.add(radioButton);
658	1525	buttonGroup.add(radioButton);
659	1526	radioButton.doClick();
660	1527	}
	1528	+
661	1529	void SetupViews(ObjEditor oe)
662	1530	{
	1531	+ theFrame = this;
	1532	+
663	1533	oe.SetupViews();
664	1534
	1535	+ if (Globals.DEBUG)
665	1536	System.out.println("SetupViews");
666	1537	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
667	1538	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
668	1539	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
669	1540	}
670	1541
671		- JCheckBox liveCB;
672		- JCheckBox supportCB;
673		- JCheckBox localCB;
674		- JCheckBox crowdCB;
675		- JCheckBox smoothCB;
676		- JCheckBox fastCB;
677		- JCheckBox slowCB;
678		- JCheckBox boxCB;
679		- JCheckBox trackCB;
680		- JCheckBox smoothfocusCB;
	1542	+ cToggleButton liveCB;
	1543	+ cCheckBox supportCB;
	1544	+ cCheckBox localCB;
	1545	+ cCheckBox crowdCB;
	1546	+ cCheckBox smoothCB;
	1547	+ cCheckBox minshaderCB;
	1548	+
	1549	+ cToggleButton fastCB;
	1550	+ cCheckBox slowCB;
	1551	+ cCheckBox boxCB;
	1552	+ cCheckBox zoomBoxCB;
	1553	+ cCheckBox freezeCB;
	1554	+ //cToggleButton trackCB;
	1555	+ cCheckBox trackCB;
	1556	+ cCheckBox smoothfocusCB;
681	1557	// JCheckBox speakerMocapCB;
682		- JCheckBox speakerCameraCB;
683		- JCheckBox speakerFocusCB;
684		- JCheckBox debugCB;
685		- JCheckBox oeilCB;
686		- JCheckBox lookAtCB;
	1558	+ cCheckBox speakerCameraCB;
	1559	+ cCheckBox speakerFocusCB;
	1560	+ cCheckBox debugCB;
	1561	+
	1562	+ cCheckBox oeilCB;
	1563	+ cCheckBox shadowCB;
	1564	+ cCheckBox autokeepCB;
	1565	+ cCheckBox lookAtCB;
687	1566
688	1567	// static int COLOR = 1;
689	1568	// static int MATERIAL = 2;
..	..	@@ -691,9 +1570,9 @@
691	1570
692	1571	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
693	1572
694		- JCheckBox colorCB;
695		- JCheckBox materialCB;
696		- JCheckBox textureCB;
	1573	+ cCheckBox colorCB;
	1574	+ cCheckBox materialCB;
	1575	+ cCheckBox textureCB;
697	1576
698	1577	public void itemStateChanged(ItemEvent e)
699	1578	{
..	..	@@ -721,6 +1600,7 @@
721	1600	} else if(e.getSource() == liveCB)
722	1601	{
723	1602	cameraView.ToggleLive();
	1603	+ refreshContents(false);
724	1604	}
725	1605	else if(e.getSource() == supportCB)
726	1606	{
..	..	@@ -736,6 +1616,12 @@
736	1616	{
737	1617	cameraView.ToggleInertia();
738	1618	cameraView.repaint();
	1619	+ }
	1620	+ else if(e.getSource() == minshaderCB)
	1621	+ {
	1622	+ Globals.MINSHADER ^= true;
	1623	+ cameraView.programInitialized = false;
	1624	+ cameraView.repaint();
739	1625	}
740	1626	else if(e.getSource() == localCB)
741	1627	{
..	..	@@ -755,6 +1641,10 @@
755	1641	Recompile();
756	1642	cameraView.repaint();
757	1643	// refreshContents();
	1644	+ }
	1645	+ else if(e.getSource() == zoomBoxCB)
	1646	+ {
	1647	+ cameraView.ToggleZoomBoxMode();
758	1648	}
759	1649	else if(e.getSource() == smoothfocusCB)
760	1650	{
..	..	@@ -781,6 +1671,18 @@
781	1671	{
782	1672	cameraView.ToggleOeil();
783	1673	}
	1674	+ else if(e.getSource() == shadowCB)
	1675	+ {
	1676	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1677	+ }
	1678	+ else if(e.getSource() == freezeCB)
	1679	+ {
	1680	+ Globals.FREEZEONMOVE ^= true;
	1681	+ }
	1682	+ else if(e.getSource() == autokeepCB)
	1683	+ {
	1684	+ Globals.REPLACEONMAKE ^= true;
	1685	+ }
784	1686	else if(e.getSource() == lookAtCB)
785	1687	{
786	1688	cameraView.ToggleLookAt();
..	..	@@ -797,7 +1699,8 @@
797	1699
798	1700	/**/
799	1701	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
800		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1702	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1703	+ TreePath path = objEditor.jTree.getSelectionPath();
801	1704	if ((path == null) \|\| (path.getPathCount() <= 1)) {
802	1705	// We can't move the root node or an empty selection
803	1706	return;
..	..	@@ -860,8 +1763,6 @@
860	1763	}
861	1764	}
862	1765
863		- String string = (String) object;
864		-
865	1766	System.out.println("Transfer = " + object + "; drop : " + target);
866	1767	// if( object instanceof java.io.File[])
867	1768	// {
..	..	@@ -869,7 +1770,11 @@
869	1770	// objEditor.DropFile((java.io.File[]) object, true);
870	1771	// return;
871	1772	// }
872		- if (string.charAt(0) == '/')
	1773	+
	1774	+ String string = object.toString();
	1775	+
	1776	+ // File path for Mac and Windows
	1777	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
873	1778	{
874	1779	// file(s)
875	1780	String[] names = string.split("\n");
..	..	@@ -896,7 +1801,7 @@
896	1801
897	1802	flashIt = false;
898	1803	CameraPane pane = (CameraPane) target;
899		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1804	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
900	1805	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
901	1806
902	1807	if (group.selection.size() == 1)
..	..	@@ -912,23 +1817,33 @@
912	1817
913	1818	assert target == objEditor.jTree;
914	1819	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1820	+ Object3D destinationLeaf;
915	1821	try {
916		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1822	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
917	1823	} catch (Exception e) {
918	1824	System.out.println("destinationPath : " + destinationPath);
919	1825	return;
920	1826	}
921	1827
922		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1828	+ for (int i=group.selection.size(); --i>=0;)
923	1829	{
	1830	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1831	+
	1832	+ // Cannot move into itself
	1833	+ if (child == destinationLeaf)
	1834	+ return;
	1835	+ }
	1836	+
	1837	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1838	+// {
924	1839	loadClipboard(true);
925	1840	objEditor.jTree.setSelectionPath(destinationPath);
926		- pasteInto(false);
927		- } else {
928		- loadClipboard(false);
929		- objEditor.jTree.setSelectionPath(destinationPath);
930		- pasteInto(false); // true); // ???
931		- }
	1841	+ pasteInto(false, false);
	1842	+// } else {
	1843	+// loadClipboard(false);
	1844	+// objEditor.jTree.setSelectionPath(destinationPath);
	1845	+// pasteInto(false, false); // true); // ???
	1846	+// }
932	1847	}
933	1848	public void dropActionChanged(DropTargetDragEvent dtde)
934	1849	// Called if the user has modified the current drop gesture
..	..	@@ -984,7 +1899,12 @@
984	1899	TreePath path;
985	1900
986	1901	public TransferableTreePath(TreePath tp) {
987		- path = tp;
	1902	+ Object[] objs = new Object[tp.getPathCount()];
	1903	+ for (int i=0; i<objs.length; i++)
	1904	+ {
	1905	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1906	+ }
	1907	+ path = new TreePath(objs);
988	1908	}
989	1909
990	1910	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1033,85 +1953,107 @@
1033	1953	{
1034	1954	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1035	1955	//heightFieldItem.addActionListener(this);
1036		- gridItem = menu.add(new MenuItem("Grid"));
1037		- gridItem.addActionListener(this);
1038		- rectoidItem = menu.add(new MenuItem("Box"));
1039		- rectoidItem.addActionListener(this);
1040		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1041		- ellipsoidItem.addActionListener(this);
1042		- coneItem = menu.add(new MenuItem("Cone"));
1043		- coneItem.addActionListener(this);
1044		- torusItem = menu.add(new MenuItem("Torus"));
1045		- torusItem.addActionListener(this);
1046		- superItem = menu.add(new MenuItem("Superellipsoid"));
1047		- superItem.addActionListener(this);
	1956	+// gridItem = menu.add(new MenuItem("Grid"));
	1957	+// gridItem.addActionListener(this);
	1958	+// rectoidItem = menu.add(new MenuItem("Box"));
	1959	+// rectoidItem.addActionListener(this);
	1960	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1961	+// ellipsoidItem.addActionListener(this);
	1962	+// coneItem = menu.add(new MenuItem("Cone"));
	1963	+// coneItem.addActionListener(this);
	1964	+// torusItem = menu.add(new MenuItem("Torus"));
	1965	+// torusItem.addActionListener(this);
	1966	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1967	+// superItem.addActionListener(this);
	1968	+
	1969	+ cameraItem = menu.add(new MenuItem("Camera"));
	1970	+ cameraItem.addActionListener(this);
	1971	+
	1972	+ if (!Globals.ADVANCED)
	1973	+ {
1048	1974	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1049	1975	kleinItem.addActionListener(this);
1050		- particleItem = menu.add(new MenuItem("Particle system"));
1051		- particleItem.addActionListener(this);
	1976	+ }
	1977	+
	1978	+// particleItem = menu.add(new MenuItem("Particle system"));
	1979	+// particleItem.addActionListener(this);
	1980	+ if (Globals.ADVANCED)
	1981	+ {
1052	1982	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1053	1983	ragdollItem.addActionListener(this);
1054	1984	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1055	1985	ragdoll2Item.addActionListener(this);
	1986	+ }
1056	1987	menu.add("-");
1057		- meshItem = menu.add(new MenuItem("Mesh"));
	1988	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1058	1989	meshItem.addActionListener(this);
1059	1990	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1060	1991	// meshGroupItem.addActionListener(this);
	1992	+ if (Globals.ADVANCED)
	1993	+ {
1061	1994	springItem = menu.add(new MenuItem("Spring"));
1062	1995	springItem.addActionListener(this);
1063	1996	flagItem = menu.add(new MenuItem("Flag"));
1064	1997	flagItem.addActionListener(this);
1065		- bezierItem = menu.add(new MenuItem("Patch"));
1066		- bezierItem.addActionListener(this);
1067		- checkerItem = menu.add(new MenuItem("Checker"));
1068		- checkerItem.addActionListener(this);
1069	1998	blobItem = menu.add(new MenuItem("Blob"));
1070	1999	blobItem.addActionListener(this);
1071	2000	latheItem = menu.add(new MenuItem("Lathe"));
1072	2001	latheItem.addActionListener(this);
1073		- lightItem = menu.add(new MenuItem("Light"));
1074		- lightItem.addActionListener(this);
	2002	+ }
	2003	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	2004	+ bezierItem.addActionListener(this);
	2005	+// overlayItem = menu.add(new MenuItem("Overlay"));
	2006	+// overlayItem.addActionListener(this);
	2007	+// lightItem = menu.add(new MenuItem("Light"));
	2008	+// lightItem.addActionListener(this);
1075	2009	menu.add("-");
1076	2010	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1077	2011	//superLoopItem.addActionListener(this);
1078		- loopItem = menu.add(new MenuItem("Loop"));
1079		- loopItem.addActionListener(this);
	2012	+// loopItem = menu.add(new MenuItem("Loop"));
	2013	+// loopItem.addActionListener(this);
1080	2014	doubleItem = menu.add(new MenuItem("Fork"));
1081	2015	doubleItem.addActionListener(this);
	2016	+ if (Globals.ADVANCED)
	2017	+ {
1082	2018	tripleItem = menu.add(new MenuItem("Trident"));
1083	2019	tripleItem.addActionListener(this);
	2020	+ }
1084	2021	}
1085	2022
1086	2023	void buildToolsMenu(Menu menu)
1087	2024	{
1088	2025	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1089	2026	animationItem.addItemListener(this);
1090		- animationItem.setState(CameraPane.ANIMATION);
	2027	+ animationItem.setState(Globals.ANIMATION);
	2028	+
	2029	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	2030	+ archiveItem.addActionListener(this);
1091	2031
1092	2032	menu.add("-");
1093	2033	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1094	2034	parseverticesItem.addActionListener(this);
1095	2035	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1096	2036	textureFieldItem.addActionListener(this);
1097		- alignItem = menu.add(new MenuItem("Align"));
	2037	+ alignItem = menu.add(new MenuItem("Align Objects"));
1098	2038	alignItem.addActionListener(this);
1099		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1100		- mirrorItem.addActionListener(this);
1101	2039	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1102	2040	reduceMorphItem.addActionListener(this);
1103	2041	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1104	2042	reduce34MorphItem.addActionListener(this);
1105		-
1106		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1107		- computeAOItem.addActionListener(this);
1108	2043	menu.add("-");
1109		-
1110	2044	menu.add(memoryItem = new MenuItem("Memory Usage"));
1111	2045	memoryItem.addActionListener(this);
	2046	+ menu.add(computeAOItem = new MenuItem("Compute AO"));
	2047	+ computeAOItem.addActionListener(this);
	2048	+
	2049	+ if (Globals.ADVANCED)
	2050	+ {
	2051	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	2052	+ mirrorItem.addActionListener(this);
	2053	+ menu.add("-");
1112	2054	menu.add(analyzeItem = new MenuItem("Analyze"));
1113	2055	analyzeItem.addActionListener(this);
1114		- menu.add(dumpItem = new MenuItem("Dump"));
	2056	+ menu.add(dumpItem = new MenuItem("Print"));
1115	2057	dumpItem.addActionListener(this);
1116	2058	// menu.add(pathItem = new MenuItem("From-to path"));
1117	2059	// pathItem.addActionListener(this);
..	..	@@ -1129,6 +2071,7 @@
1129	2071	menu.add("-");
1130	2072	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1131	2073	editScriptItem.addActionListener(this);
	2074	+ }
1132	2075	}
1133	2076
1134	2077	void ScreenFit()
..	..	@@ -1193,24 +2136,24 @@
1193	2136	switch(axis)
1194	2137	{
1195	2138	case 0 :
1196		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1197		- vert2.x = minima.x; vert2.y = maxima.y; vert2.z = minima.z;
1198		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1199		- vert4.x = minima.x; vert4.y = maxima.y; vert4.z = maxima.z;
	2139	+ vert1.x = minima.x + 0.001f; vert1.y = minima.y; vert1.z = minima.z;
	2140	+ vert2.x = minima.x + 0.001f; vert2.y = maxima.y; vert2.z = minima.z;
	2141	+ vert3.x = minima.x + 0.001f; vert3.y = minima.y; vert3.z = maxima.z;
	2142	+ vert4.x = minima.x + 0.001f; vert4.y = maxima.y; vert4.z = maxima.z;
1200	2143	norm = cVector.X;
1201	2144	break;
1202	2145	case 1 :
1203		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1204		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1205		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1206		- vert4.x = maxima.x; vert4.y = minima.y; vert4.z = maxima.z;
	2146	+ vert1.x = minima.x; vert1.y = minima.y + 0.001f; vert1.z = minima.z;
	2147	+ vert2.x = maxima.x; vert2.y = minima.y + 0.001f; vert2.z = minima.z;
	2148	+ vert3.x = minima.x; vert3.y = minima.y + 0.001f; vert3.z = maxima.z;
	2149	+ vert4.x = maxima.x; vert4.y = minima.y + 0.001f; vert4.z = maxima.z;
1207	2150	norm = cVector.Y;
1208	2151	break;
1209	2152	case 2 :
1210		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1211		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1212		- vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z;
1213		- vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z;
	2153	+ vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z + 0.001f;
	2154	+ vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z + 0.001f;
	2155	+ vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z + 0.001f;
	2156	+ vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z + 0.001f;
1214	2157	norm = cVector.Z;
1215	2158	break;
1216	2159	}
..	..	@@ -1251,9 +2194,38 @@
1251	2194	shadow.material = new cMaterial(obj.material);
1252	2195	shadow.material.diffuse = 0.0001f;
1253	2196	shadow.material.specular = 0.0001f;
	2197	+ shadow.material.opacity = 0.75f;
	2198	+
	2199	+ AllocProjectedVertices(shadow);
	2200	+
	2201	+ shadow.projectedVertices[1].x = 300;
1254	2202
1255	2203	makeSomething(shadow);
1256	2204	}
	2205	+
	2206	+ private void ClearUnpinned()
	2207	+ {
	2208	+ //for (Object3D obj : listUI)
	2209	+ for (int i=listUI.size(); --i>=0;)
	2210	+ {
	2211	+ Object3D obj = listUI.elementAt(i);
	2212	+ if (!obj.pinned)
	2213	+ {
	2214	+ obj.CloseUI();
	2215	+ listUI.remove(i);
	2216	+ }
	2217	+ }
	2218	+ }
	2219	+
	2220	+ private void EditElement(Object3D elem, boolean newWindow)
	2221	+ {
	2222	+ // if (!(elem instanceof Composite))
	2223	+ // newWindow = false;
	2224	+ listUI.add(elem);
	2225	+ elem.openEditWindow(this, newWindow); //, false);
	2226	+ System.out.println("edit : " + elem);
	2227	+ elem.editWindow.refreshContents(true); // ? new
	2228	+ }
1257	2229
1258	2230	/**
1259	2231	* applyExample
..	..	@@ -1457,9 +2429,9 @@
1457	2429
1458	2430	void Overwrite(int mask)
1459	2431	{
1460		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2432	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1461	2433	{
1462		- Object3D content = GrafreeD.clipboard.get(0);
	2434	+ Object3D content = Grafreed.clipboard.get(0);
1463	2435
1464	2436	if (content instanceof cGroup && ((cGroup)content).transientlink )
1465	2437	content = ((cGroup)content).get(0);
..	..	@@ -1482,6 +2454,7 @@
1482	2454	//
1483	2455	public void actionPerformed(ActionEvent event) // , Object arg)
1484	2456	{
	2457	+ Object source = event.getSource();
1485	2458	/*
1486	2459	if (event.getSource() == nameField)
1487	2460	{
..	..	@@ -1493,11 +2466,11 @@
1493	2466	}
1494	2467	else
1495	2468	*/
1496		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	2469	+ if (source == lookAtItem \|\| source == lookFromItem)
1497	2470	{
1498	2471	ScreenFit();
1499	2472	} else
1500		- if (event.getSource() == switchItem)
	2473	+ if (source == switchViewItem)
1501	2474	{
1502	2475	cVector v1 = new cVector();
1503	2476	cVector v2 = new cVector();
..	..	@@ -1506,11 +2479,11 @@
1506	2479	objEditor.cameraView.renderCamera.setAim(v2, v1);
1507	2480	objEditor.cameraView.repaint();
1508	2481	} else
1509		- if (event.getSource() == rectoidItem)
	2482	+ if (source == rectoidItem \|\| source == boxButton)
1510	2483	{
1511	2484	makeSomething(new Box());
1512	2485	} else
1513		- if (event.getSource() == particleItem)
	2486	+ if (source == particleItem \|\| source == particlesButton)
1514	2487	{
1515	2488	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1516	2489	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1531,9 +2504,9 @@
1531	2504	applyExample(particleGeom, "SMOKE");
1532	2505	makeSomething(particleGeom);
1533	2506	} else
1534		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	2507	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1535	2508	{
1536		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	2509	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1537	2510
1538	2511	ragdoll.toParent = LA.newMatrix();
1539	2512	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1551,7 +2524,7 @@
1551	2524	} else
1552	2525	/*
1553	2526	*/
1554		- if (event.getSource() == heightFieldItem)
	2527	+ if (source == heightFieldItem)
1555	2528	{
1556	2529	Object3D obj = new Object3D();
1557	2530
..	..	@@ -1589,31 +2562,31 @@
1589	2562
1590	2563	makeSomething(obj);
1591	2564	} else
1592		- if (event.getSource() == gridItem)
	2565	+ if (source == gridItem \|\| source == gridButton)
1593	2566	{
1594	2567	makeSomething(new Grid());
1595	2568	} else
1596		- if (event.getSource() == ellipsoidItem)
	2569	+ if (source == ellipsoidItem \|\| source == sphereButton)
1597	2570	{
1598	2571	makeSomething(new Sphere());
1599	2572	} else
1600		- if (event.getSource() == coneItem)
	2573	+ if (source == coneItem \|\| source == coneButton)
1601	2574	{
1602	2575	makeSomething(new Cone());
1603	2576	} else
1604		- if (event.getSource() == torusItem)
	2577	+ if (source == torusItem \|\| source == torusButton)
1605	2578	{
1606	2579	makeSomething(new Torus());
1607	2580	} else
1608		- if (event.getSource() == superItem)
	2581	+ if (source == superItem \|\| source == superButton)
1609	2582	{
1610	2583	makeSomething(new Superellipsoid());
1611	2584	} else
1612		- if (event.getSource() == kleinItem)
	2585	+ if (source == kleinItem \|\| source == kleinButton)
1613	2586	{
1614	2587	makeSomething(new Klein());
1615	2588	} else
1616		- if (event.getSource() == blobItem)
	2589	+ if (source == blobItem)
1617	2590	{
1618	2591	Blob blob = new Blob();
1619	2592	BlobComponent comp = new BlobComponent();
..	..	@@ -1621,15 +2594,15 @@
1621	2594	//blob.retile();
1622	2595	makeSomething(blob);
1623	2596	} else
1624		- if (event.getSource() == latheItem)
	2597	+ if (source == latheItem)
1625	2598	{
1626	2599	makeSomething(new Lathe());
1627	2600	} else
1628		- if (event.getSource() == bezierItem)
	2601	+ if (source == bezierItem)
1629	2602	{
1630	2603	makeSomething(new BezierSurface());
1631	2604	} else
1632		- if (event.getSource() == checkerItem)
	2605	+ if (source == overlayItem \|\| source == overlayButton)
1633	2606	{
1634	2607	/*
1635	2608	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1644,7 +2617,7 @@
1644	2617	*/
1645	2618	makeSomething(new Checker());
1646	2619	} else
1647		- if (event.getSource() == meshItem)
	2620	+ if (source == meshItem)
1648	2621	{
1649	2622	Object3D itemtomake = new Object3D();
1650	2623	Object3D child;
..	..	@@ -1665,35 +2638,52 @@
1665	2638	makeSomething(child);
1666	2639	}
1667	2640	} else
1668		- if (event.getSource() == springItem)
	2641	+ if (source == springItem)
1669	2642	{
1670	2643	cSpring s = new cSpring();
1671	2644	s.setup();
1672	2645	makeSomething(s);
1673	2646	} else
1674		- if (event.getSource() == flagItem)
	2647	+ if (source == flagItem)
1675	2648	{
1676	2649	cSpring s = new cFlag();
1677	2650	s.setup();
1678	2651	makeSomething(s);
1679	2652	} else
1680		- if (event.getSource() == lightItem)
	2653	+ if (source == lightItem \|\| source == lightButton)
1681	2654	{
1682	2655	makeSomething(new Light());
1683	2656	} else
1684		- if (event.getSource() == csgItem)
	2657	+// if (source == skybox1Button \|\|
	2658	+// source == skybox2Button \|\|
	2659	+// source == skybox3Button \|\|
	2660	+// source == skybox4Button \|\|
	2661	+// source == skybox5Button \|\|
	2662	+// source == skybox6Button \|\|
	2663	+// source == skybox7Button \|\|
	2664	+// source == skybox11Button \|\|
	2665	+// source == skybox12Button \|\|
	2666	+// source == skybox13Button \|\|
	2667	+// source == skybox14Button \|\|
	2668	+// source == skybox15Button \|\|
	2669	+// source == skybox16Button \|\|
	2670	+// source == skybox17Button)
	2671	+// {
	2672	+// ChangeSkybox(source);
	2673	+// } else
	2674	+ if (source == csgItem)
1685	2675	{
1686	2676	group(new CSG());
1687	2677	} else
1688		- if (event.getSource() == templateItem)
	2678	+ if (source == templateItem)
1689	2679	{
1690	2680	group(new cTemplate());
1691	2681	} else
1692		- if (event.getSource() == attributeItem)
	2682	+ if (source == attributeItem)
1693	2683	{
1694	2684	makeSomething(new Attribute());
1695	2685	} else
1696		- if (event.getSource() == pointflowItem)
	2686	+ if (source == pointflowItem)
1697	2687	{
1698	2688	makeSomething(new PointFlow());
1699	2689	} else
..	..	@@ -1705,7 +2695,7 @@
1705	2695	} else
1706	2696	*/
1707	2697
1708		- if (event.getSource() == superLoopItem)
	2698	+ if (source == superLoopItem)
1709	2699	{
1710	2700	Composite g = new cGroup();
1711	2701	for (int i=0; i<15; i++)
..	..	@@ -1727,30 +2717,38 @@
1727	2717
1728	2718	group(g);
1729	2719	} else
1730		- if (event.getSource() == loopItem)
	2720	+ if (source == loopItem \|\| source == loopButton)
1731	2721	{
	2722	+ if (!group.selection.isEmpty())
	2723	+ {
1732	2724	Composite csg = new GroupLeaf();
1733	2725	csg.count = 5;
1734		- group(csg);
1735		- Composite child = new cGroup();
	2726	+ Composite child = new cGroup("Branch");
1736	2727	csg.addChild(child);
1737	2728	child.addChild(csg);
	2729	+ group(csg);
	2730	+ }
1738	2731	} else
1739		- if (event.getSource() == doubleItem)
	2732	+ if (source == doubleItem)
1740	2733	{
1741		- Composite csg = new GroupLeaf();
	2734	+ if (!group.selection.isEmpty())
	2735	+ {
	2736	+ Composite csg = new GroupLeaf("Fork");
1742	2737	csg.count = 5;
	2738	+ Composite child = new cGroup("Branch A");
	2739	+ csg.addChild(child);
	2740	+ child.addChild(csg);
	2741	+ child = new cGroup("Branch B");
	2742	+ csg.addChild(child);
	2743	+ child.addChild(csg);
1743	2744	group(csg);
1744		- Composite child = new cGroup();
1745		- csg.addChild(child);
1746		- child.addChild(csg);
1747		- child = new cGroup();
1748		- csg.addChild(child);
1749		- child.addChild(csg);
	2745	+ }
1750	2746	} else
1751		- if (event.getSource() == tripleItem)
	2747	+ if (source == tripleItem)
1752	2748	{
1753		- Composite csg = new GroupLeaf();
	2749	+ if (!group.selection.isEmpty())
	2750	+ {
	2751	+ Composite csg = new GroupLeaf("Trident");
1754	2752	csg.count = 4;
1755	2753	group(csg);
1756	2754	Composite child = new cGroup();
..	..	@@ -1762,74 +2760,119 @@
1762	2760	child = new cGroup();
1763	2761	csg.addChild(child);
1764	2762	child.addChild(csg);
	2763	+ }
1765	2764	} else
1766		-
1767		- if (event.getSource() == importGFDItem)
1768		- {
1769		- ImportGFD();
1770		- } else
1771		- if (event.getSource() == importVRMLX3DItem)
1772		- {
1773		- ImportVRMLX3D();
1774		- } else
1775		- if (event.getSource() == import3DSItem)
1776		- {
1777		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1778		- } else
1779		- if (event.getSource() == importOBJItem)
1780		- {
1781		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1782		- } else
1783		- if (event.getSource() == computeAOItem)
	2765	+ if (source == computeAOItem)
1784	2766	{
1785	2767	Globals.drawMode = CameraPane.OCCLUSION;
1786		- Globals.theRenderer.repaint();
	2768	+ cameraView.repaint();
1787	2769	} else
1788		- if (event.getSource() == recompileItem)
	2770	+ if (source == recompileItem)
1789	2771	{
1790	2772	Recompile();
1791	2773	refreshContents();
1792	2774	} else
1793		- if (event.getSource() == editScriptItem)
	2775	+ if (source == editScriptItem)
1794	2776	{
1795	2777	OpenDialog();
1796	2778	refreshContents();
1797	2779	} else
1798		- if (event.getSource() == invariantsItem)
	2780	+ if (source == invariantsItem)
1799	2781	{
1800	2782	System.out.println("Invariants:");
1801		- GrafreeD.grafreeD.universe.invariants();
	2783	+ Grafreed.grafreed.universe.invariants();
1802	2784	} else
1803		- if (event.getSource() == memoryItem)
	2785	+ if (source == memoryItem)
1804	2786	{
1805	2787	//System.out.println("Invariants:");
1806	2788	PrintMemory();
1807	2789	} else
1808		- if (event.getSource() == pathItem)
	2790	+ if (source == pathItem)
1809	2791	{
1810	2792	PrintPath();
1811	2793	} else
1812		- if (event.getSource() == analyzeItem)
	2794	+ if (source == analyzeItem)
1813	2795	{
1814	2796	AnalyzeObject();
1815	2797	} else
1816		- if (event.getSource() == dumpItem)
	2798	+ if (source == dumpItem)
1817	2799	{
1818	2800	DumpObject();
1819	2801	} else
1820		- if (event.getSource() == screenfitButton)
	2802	+ if (source == minButton)
1821	2803	{
1822		- //Reload(lastConverter, lastFilename, true);
	2804	+ Minimize();
	2805	+ } else
	2806	+ if (source == maxButton)
	2807	+ {
	2808	+ Maximize();
	2809	+ } else
	2810	+ if (source == fullButton)
	2811	+ {
	2812	+ ToggleFullScreen();
	2813	+ } else
	2814	+ if (source == collapseButton)
	2815	+ {
	2816	+ this.expandedLayout = radio.layout;
	2817	+ CollapseToolbar();
	2818	+ } else
	2819	+ if (source == maximize3DButton)
	2820	+ {
	2821	+ this.expandedLayout = radio.layout;
	2822	+ radio.layout = twoButton;
	2823	+ Show3DView();
	2824	+ CollapseToolbar();
	2825	+ } else
	2826	+ if (source == previousVersionButton)
	2827	+ {
	2828	+ // Go to previous version
	2829	+ //if (!Undo())
	2830	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2831	+ PreviousVersion();
	2832	+ } else
	2833	+ if (source == restoreButton)
	2834	+ {
	2835	+ // Restore current version
	2836	+ Restore();
	2837	+ //restoreButton.setEnabled(false);
	2838	+ } else
	2839	+ if (source == replaceButton)
	2840	+ {
	2841	+ // Overwrite current version
	2842	+ Replace();
	2843	+ //replaceButton.setEnabled(false);
	2844	+ } else
	2845	+ if (source == nextVersionButton)
	2846	+ {
	2847	+ // Go to next version
	2848	+ NextVersion();
	2849	+ } else
	2850	+ if (source == saveVersionButton)
	2851	+ {
	2852	+ // Save a new version
	2853	+ if (!Save(true))
	2854	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2855	+ } else
	2856	+ if (source == deleteVersionButton)
	2857	+ {
	2858	+ // Delete a new version
	2859	+ DeleteVersion();
	2860	+ } else
	2861	+ if (source == oneStepButton)
	2862	+ {
	2863	+ Globals.ONESTEP = true;
	2864	+ cameraView.repaint();
	2865	+ } else
	2866	+ if (source == screenfitButton)
	2867	+ {
1823	2868	ScreenFit();
1824	2869	} else
1825		- if (event.getSource() == screenfitpointButton)
	2870	+ if (source == screenfitpointButton)
1826	2871	{
1827		- //Reload(lastConverter, lastFilename, true);
1828	2872	ScreenFitPoint();
1829	2873	} else
1830		- if (event.getSource() == snapobjectButton)
	2874	+ if (source == snapobjectButton)
1831	2875	{
1832		- //Reload(lastConverter, lastFilename, true);
1833	2876	SnapObject();
1834	2877	} else
1835	2878	// if (event.getSource() == recompileButton)
..	..	@@ -1838,13 +2881,13 @@
1838	2881	// Recompile();
1839	2882	// refreshContents();
1840	2883	// } else
1841		- if (event.getSource() == gcButton)
	2884	+ if (source == gcButton)
1842	2885	{
1843	2886	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1844	2887	System.gc();
1845	2888	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1846	2889	} else
1847		- if (event.getSource() == editLeafItem)
	2890	+ if (source == editLeafItem)
1848	2891	{
1849	2892	Object3D obj;
1850	2893	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1858,62 +2901,74 @@
1858	2901	}
1859	2902	refreshContents(true);
1860	2903	} else
1861		- if (event.getSource() == openWindowItem)
	2904	+ if (source == openWindowItem)
1862	2905	{
1863	2906	EditSelection(true);
1864	2907	} else
1865		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2908	+ if (source == cutItem \|\| source == clearButton)
1866	2909	{
1867	2910	loadClipboard(true);
1868	2911	} else
1869		- if (event.getSource() == duplicateItem)
	2912	+ if (source == undoItem)
1870	2913	{
1871		- Object3D keep = GrafreeD.clipboard;
	2914	+ PreviousVersion();
	2915	+ } else
	2916	+ if (source == redoItem)
	2917	+ {
	2918	+ NextVersion();
	2919	+ } else
	2920	+ if (source == duplicateItem)
	2921	+ {
	2922	+ Object3D keep = Grafreed.clipboard;
1872	2923	loadClipboard(false);
1873	2924	paste(false);
1874		- GrafreeD.clipboard = keep;
	2925	+ Grafreed.clipboard = keep;
1875	2926	} else
1876		- if (event.getSource() == cloneItem)
	2927	+ if (source == cloneItem)
1877	2928	{
1878	2929	CloneSelection(false);
1879	2930	} else
1880		- if (event.getSource() == cloneSupportItem)
	2931	+ if (source == cloneSupportItem)
1881	2932	{
1882	2933	CloneSelection(true);
1883	2934	} else
1884		- if (event.getSource() == copyItem)
	2935	+ if (source == copyItem)
1885	2936	{
1886	2937	loadClipboard(false);
1887	2938	} else
1888		- if (event.getSource() == pasteItem)
	2939	+ if (source == pasteItem)
1889	2940	{
1890	2941	paste(false);
1891	2942	} else
1892		- if (event.getSource() == pasteLinkItem)
	2943	+ if (source == pasteIntoItem)
1893	2944	{
1894		- pasteInto(false);
	2945	+ pasteInto(true, false);
1895	2946	} else
1896		- if (event.getSource() == pasteCloneItem)
	2947	+ if (source == pasteLinkItem)
1897	2948	{
1898		- pasteInto(true);
	2949	+ pasteInto(false, false);
1899	2950	} else
1900		- if (event.getSource() == pasteExpandItem)
	2951	+ if (source == pasteCloneItem)
	2952	+ {
	2953	+ pasteInto(true, true);
	2954	+ } else
	2955	+ if (source == pasteExpandItem)
1901	2956	{
1902	2957	paste(true);
1903	2958	} else
1904		- if (event.getSource() == synchronizeItem)
	2959	+ if (source == synchronizeItem)
1905	2960	{
1906	2961	Overwrite(Object3D.TRANSFORM);
1907	2962	} else
1908		- if (event.getSource() == overwriteNameItem)
	2963	+ if (source == overwriteNameItem)
1909	2964	{
1910	2965	Overwrite(Object3D.NAME);
1911	2966	} else
1912		- if (event.getSource() == overwriteUVItem)
	2967	+ if (source == overwriteUVItem)
1913	2968	{
1914	2969	Overwrite(Object3D.UV);
1915	2970	} else
1916		- if (event.getSource() == overwriteMatItem)
	2971	+ if (source == overwriteMatItem)
1917	2972	{
1918	2973	/* july 2015
1919	2974	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1933,7 +2988,7 @@
1933	2988
1934	2989	Overwrite(dropAttributes);
1935	2990	}
1936		- if (event.getSource() == overwriteGeoItem)
	2991	+ if (source == overwriteGeoItem)
1937	2992	{
1938	2993	Overwrite(Object3D.GEOMETRY);
1939	2994	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1950,7 +3005,7 @@
1950	3005	// refreshContents();
1951	3006	// }
1952	3007	} else
1953		- if (event.getSource() == generateMeshItem)
	3008	+ if (source == generateMeshItem)
1954	3009	{
1955	3010	//if (group.selection.size() == 1)
1956	3011	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1961,7 +3016,7 @@
1961	3016	ResetModel();
1962	3017	refreshContents();
1963	3018	} else
1964		- if (event.getSource() == extractGeometriesItem)
	3019	+ if (source == extractGeometriesItem)
1965	3020	{
1966	3021	boolean one = false;
1967	3022
..	..	@@ -1988,7 +3043,7 @@
1988	3043	ResetModel();
1989	3044	refreshContents();
1990	3045	} else
1991		- if (event.getSource() == cloneGeometriesItem)
	3046	+ if (source == cloneGeometriesItem)
1992	3047	{
1993	3048	boolean one = false;
1994	3049
..	..	@@ -2014,7 +3069,7 @@
2014	3069	ResetModel();
2015	3070	refreshContents();
2016	3071	} else
2017		- if (event.getSource() == shareGeometriesItem)
	3072	+ if (source == shareGeometriesItem)
2018	3073	{
2019	3074	boolean one = false;
2020	3075
..	..	@@ -2044,7 +3099,7 @@
2044	3099	refreshContents();
2045	3100	}
2046	3101	} else
2047		- if (event.getSource() == mergeGeometriesItem)
	3102	+ if (source == mergeGeometriesItem)
2048	3103	{
2049	3104	boolean one = false;
2050	3105
..	..	@@ -2074,7 +3129,7 @@
2074	3129	ResetModel();
2075	3130	refreshContents();
2076	3131	} else
2077		- if (event.getSource() == linkverticesItem)
	3132	+ if (source == linkverticesItem)
2078	3133	{
2079	3134	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2080	3135	// {
..	..	@@ -2087,9 +3142,9 @@
2087	3142	// group.selection.get(0).setMasterThis(content); // should be identity
2088	3143	// refreshContents();
2089	3144	// }
2090		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	3145	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2091	3146	{
2092		- Object3D content = GrafreeD.clipboard.get(0);
	3147	+ Object3D content = Grafreed.clipboard.get(0);
2093	3148
2094	3149	if (content instanceof cGroup && ((cGroup)content).transientlink )
2095	3150	content = ((cGroup)content).get(0);
..	..	@@ -2097,38 +3152,38 @@
2097	3152	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2098	3153	for (int i=0; i<group.selection.size(); i++)
2099	3154	{
2100		- boolean random = CameraPane.RANDOM;
2101		- CameraPane.RANDOM = false; // parse all random nodes
	3155	+ boolean random = CameraPane.SWITCH;
	3156	+ CameraPane.SWITCH = false; // parse all random nodes
2102	3157	group.selection.get(i).linkVerticesThis(content);
2103	3158	// group.selection.get(i).setMasterThis(content); // should be identity
2104		- CameraPane.RANDOM = random;
	3159	+ CameraPane.SWITCH = random;
2105	3160	}
2106	3161	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2107	3162	refreshContents();
2108	3163	}
2109	3164	} else
2110		- if (event.getSource() == resetsupportItem)
	3165	+ if (source == resetsupportItem)
2111	3166	{
2112	3167	for (int i=0; i<group.selection.size(); i++)
2113	3168	{
2114		- boolean random = CameraPane.RANDOM;
2115		- CameraPane.RANDOM = false; // parse all random nodes
	3169	+ boolean random = CameraPane.SWITCH;
	3170	+ CameraPane.SWITCH = false; // parse all random nodes
2116	3171	group.selection.get(i).linkVerticesThis(null);
2117		- CameraPane.RANDOM = random;
	3172	+ CameraPane.SWITCH = random;
2118	3173	}
2119	3174
2120	3175	refreshContents();
2121	3176	} else
2122		- if (event.getSource() == relinkverticesItem)
	3177	+ if (source == relinkverticesItem)
2123	3178	{
2124		- boolean random = CameraPane.RANDOM;
2125		- CameraPane.RANDOM = false; // parse all random nodes
	3179	+ boolean random = CameraPane.SWITCH;
	3180	+ CameraPane.SWITCH = false; // parse all random nodes
2126	3181	group.selection.RelinkToSupport();
2127		- CameraPane.RANDOM = random;
	3182	+ CameraPane.SWITCH = random;
2128	3183
2129	3184	refreshContents();
2130	3185	} else
2131		- if (event.getSource() == resetreferencesItem)
	3186	+ if (source == resetreferencesItem)
2132	3187	{
2133	3188	for (int i=0; i<group.selection.size(); i++)
2134	3189	{
..	..	@@ -2137,11 +3192,11 @@
2137	3192
2138	3193	refreshContents();
2139	3194	} else
2140		- if (event.getSource() == setMasterItem)
	3195	+ if (source == setMasterItem)
2141	3196	{
2142		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	3197	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2143	3198	{
2144		- Object3D content = GrafreeD.clipboard.get(0);
	3199	+ Object3D content = Grafreed.clipboard.get(0);
2145	3200
2146	3201	if (content instanceof cGroup && ((cGroup)content).transientlink )
2147	3202	content = ((cGroup)content).get(0);
..	..	@@ -2150,13 +3205,13 @@
2150	3205	refreshContents();
2151	3206	}
2152	3207	} else
2153		- if (event.getSource() == poseMeshItem)
	3208	+ if (source == poseMeshItem)
2154	3209	{
2155	3210	if (group.selection.size() == 1)
2156	3211	{
2157		- if (GrafreeD.clipboard.size() == 1)
	3212	+ if (Grafreed.clipboard.size() == 1)
2158	3213	{
2159		- Object3D content = GrafreeD.clipboard.get(0);
	3214	+ Object3D content = Grafreed.clipboard.get(0);
2160	3215
2161	3216	if (content instanceof cGroup && ((cGroup)content).transientlink )
2162	3217	content = ((cGroup)content).get(0);
..	..	@@ -2169,19 +3224,19 @@
2169	3224	}
2170	3225
2171	3226	} else
2172		- if (event.getSource() == revertMeshItem)
	3227	+ if (source == revertMeshItem)
2173	3228	{
2174	3229	RevertMeshes();
2175	3230	} else
2176		- if (event.getSource() == resetMeshItem)
	3231	+ if (source == resetAllItem)
2177	3232	{
2178	3233	ResetAll();
2179	3234	} else
2180		- if (event.getSource() == stepAllItem)
	3235	+ if (source == stepAllItem)
2181	3236	{
2182	3237	StepAll();
2183	3238	} else
2184		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	3239	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2185	3240	{
2186	3241	//int indices[] = jList.getSelectedIndices();
2187	3242	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2189,46 +3244,46 @@
2189	3244
2190	3245	ClearSelection(false);
2191	3246	} else
2192		- if (event.getSource() == clearAllItem)
	3247	+ if (source == clearAllItem)
2193	3248	{
2194	3249	ClearSelection(true);
2195	3250	} else
2196		- if (event.getSource() == grabItem)
	3251	+ if (source == grabItem \|\| source == groupButton)
2197	3252	{
2198		- group(new cGroup(), true);
	3253	+ group(new cGroup(), false); // true);
2199	3254	} else
2200		- if (event.getSource() == hideItem)
	3255	+ if (source == hideItem)
2201	3256	{
2202	3257	group(new HiddenObject());
2203	3258	} else
2204		- if (event.getSource() == frontItem)
	3259	+ if (source == frontItem)
2205	3260	{
2206	3261	front();
2207	3262	} else
2208		- if (event.getSource() == backItem)
	3263	+ if (source == backItem)
2209	3264	{
2210	3265	back();
2211	3266	} else
2212		- if (event.getSource() == cameraItem)
	3267	+ if (source == cameraItem)
2213	3268	{
2214	3269	makeSomething(new Camera());
2215	3270	} else
2216		- if (event.getSource() == compositeItem)
	3271	+ if (source == compositeItem \|\| source == compositeButton)
2217	3272	{
2218	3273	group(new Composite());
2219	3274	} else
2220		- if (event.getSource() == randomItem)
	3275	+ if (source == switchItem \|\| source == switchButton)
2221	3276	{
2222	3277	RandomNode random = new RandomNode();
2223	3278	group(random);
2224	3279	if (random.size() > 0)
2225		- random.name = random.get(0).name + "Rnd";
	3280	+ random.name = random.get(0).name + "Switch";
2226	3281	} else
2227		- if (event.getSource() == physicsItem)
	3282	+ if (source == physicsItem)
2228	3283	{
2229	3284	group(new PhysicsNode());
2230	3285	} else
2231		- if (event.getSource() == frameselectorItem)
	3286	+ if (source == frameselectorItem)
2232	3287	{
2233	3288	for (int i=0; i<group.selection.size(); i++)
2234	3289	{
..	..	@@ -2240,7 +3295,7 @@
2240	3295	ResetModel();
2241	3296	refreshContents();
2242	3297	} else
2243		- if (event.getSource() == switchGeoItem)
	3298	+ if (source == switchGeoItem)
2244	3299	{
2245	3300	for (int i=0; i<group.selection.size(); i++)
2246	3301	{
..	..	@@ -2252,7 +3307,7 @@
2252	3307	ResetModel();
2253	3308	refreshContents();
2254	3309	} else
2255		- if (event.getSource() == switchTransfoItem)
	3310	+ if (source == switchTransfoItem)
2256	3311	{
2257	3312	for (int i=0; i<group.selection.size(); i++)
2258	3313	{
..	..	@@ -2264,7 +3319,7 @@
2264	3319	ResetModel();
2265	3320	refreshContents();
2266	3321	} else
2267		- if (event.getSource() == morphItem)
	3322	+ if (source == morphItem)
2268	3323	{
2269	3324	for (int i=0; i<group.selection.size(); i++)
2270	3325	{
..	..	@@ -2276,7 +3331,7 @@
2276	3331	ResetModel();
2277	3332	refreshContents();
2278	3333	} else
2279		- if (event.getSource() == scriptNodeItem)
	3334	+ if (source == scriptNodeItem)
2280	3335	{
2281	3336	boolean atleastone = false;
2282	3337
..	..	@@ -2315,215 +3370,280 @@
2315	3370	}
2316	3371	}
2317	3372	} else
2318		- if (event.getSource() == linkerItem)
	3373	+ if (source == linkerItem)
2319	3374	{
2320	3375	group(new cLinker());
2321	3376	} else
2322		- if (event.getSource() == textureItem)
	3377	+ if (source == textureItem \|\| source == textureButton)
2323	3378	{
2324	3379	group(new TextureNode());
2325	3380	} else
2326		- if (event.getSource() == billboardItem)
	3381	+ if (source == billboardItem)
2327	3382	{
2328	3383	group(new BillboardNode());
2329	3384	} else
2330		- if (event.getSource() == shadowXItem)
	3385	+ if (source == shadowXItem)
2331	3386	{
2332	3387	CastShadow(0);
2333	3388	} else
2334		- if (event.getSource() == shadowYItem)
	3389	+ if (source == shadowYItem)
2335	3390	{
2336	3391	CastShadow(1);
2337	3392	} else
2338		- if (event.getSource() == shadowZItem)
	3393	+ if (source == shadowZItem)
2339	3394	{
2340	3395	CastShadow(2);
2341	3396	} else
2342		- if (event.getSource() == ungroupItem)
	3397	+ if (source == ungroupItem \|\| source == ungroupButton)
2343	3398	{
2344		- //ungroup();
	3399	+ boolean canUngroup = true;
	3400	+
2345	3401	for (int i=0; i<group.selection.size(); i++)
2346	3402	{
2347		- Ungroup(group.selection.get(i));
	3403	+ Object3D selectedItem = group.selection.get(i);
	3404	+
	3405	+ if (selectedItem.Size() == 0)
	3406	+ {
	3407	+ // Cannot ungroup leaves
	3408	+ canUngroup = false;
	3409	+ break;
	3410	+ }
	3411	+
	3412	+ if (selectedItem == group)
	3413	+ {
	3414	+ // Cannot ungroup root
	3415	+ canUngroup = false;
	3416	+ break;
	3417	+ }
2348	3418	}
2349	3419
2350		- ClearSelection(false);
2351		-
2352		- refreshContents();
	3420	+ if (canUngroup)
	3421	+ {
	3422	+ for (int i=0; i<group.selection.size(); i++)
	3423	+ {
	3424	+ Object3D selectedItem = group.selection.get(i);
	3425	+
	3426	+ Ungroup(selectedItem);
	3427	+ }
	3428	+
	3429	+ ClearSelection(false);
	3430	+
	3431	+ refreshContents();
	3432	+ }
2353	3433	} else
2354		- if (event.getSource() == genUVItem)
	3434	+ if (source == genUVItem)
2355	3435	{
2356	3436	GenUV();
2357	3437	} else
2358		- if (event.getSource() == genNormalsCADItem)
	3438	+ if (source == genNormalsCADItem)
2359	3439	{
2360	3440	GenNormals(true);
2361	3441	} else
2362		- if (event.getSource() == genNormalsMESHItem)
	3442	+ if (source == genNormalsMESHItem)
2363	3443	{
2364		- GenNormals(true); // TODO
	3444	+ GenNormalsMESH();
2365	3445	} else
2366		- if (event.getSource() == genNormalsORGANItem)
	3446	+ if (source == genNormalsORGANItem)
2367	3447	{
2368	3448	GenNormals(false);
2369	3449	} else
2370		- if (event.getSource() == genNormalsMINEItem)
	3450	+ if (source == genNormalsMINEItem)
2371	3451	{
2372	3452	GenNormalsMINE();
2373	3453	} else
2374		- if (event.getSource() == stripifyItem)
	3454	+ if (source == stripifyItem)
2375	3455	{
2376	3456	Stripify();
2377	3457	} else
2378		- if (event.getSource() == unstripifyItem)
	3458	+ if (source == unstripifyItem)
2379	3459	{
2380	3460	Unstripify();
2381	3461	} else
2382		- if (event.getSource() == trimItem)
	3462	+ if (source == trimItem)
2383	3463	{
2384	3464	Trim();
2385	3465	} else
2386		- if (event.getSource() == untrimItem)
	3466	+ if (source == untrimItem)
2387	3467	{
2388	3468	Untrim();
2389	3469	} else
2390		- if (event.getSource() == clearColorsItem)
	3470	+ if (source == clearColorsItem)
2391	3471	{
2392	3472	ClearColors();
2393	3473	} else
2394		- if (event.getSource() == clearMaterialsItem)
	3474	+ if (source == clearMaterialsItem)
2395	3475	{
2396	3476	ClearMaterials();
2397	3477	} else
2398		- if (event.getSource() == liveleavesItem)
	3478	+ if (source == clearVersionsItem)
	3479	+ {
	3480	+ ClearVersions();
	3481	+ } else
	3482	+ if (source == liveleavesItem)
2399	3483	{
2400	3484	LiveLeaves(true);
2401	3485	} else
2402		- if (event.getSource() == unliveleavesItem)
	3486	+ if (source == unliveleavesItem)
2403	3487	{
2404	3488	LiveLeaves(false);
2405	3489	} else
2406		- if (event.getSource() == supportleavesItem)
	3490	+ if (source == supportleavesItem)
2407	3491	{
2408	3492	SupportLeaves(true);
2409	3493	} else
2410		- if (event.getSource() == unsupportleavesItem)
	3494	+ if (source == unsupportleavesItem)
2411	3495	{
2412	3496	SupportLeaves(false);
2413	3497	} else
2414		- if (event.getSource() == hideleavesItem)
	3498	+ if (source == hideleavesItem)
2415	3499	{
2416	3500	HideLeaves(true);
2417	3501	} else
2418		- if (event.getSource() == showleavesItem)
	3502	+ if (source == showleavesItem)
2419	3503	{
2420	3504	HideLeaves(false);
2421	3505	} else
2422		- if (event.getSource() == markleavesItem)
	3506	+ if (source == markleavesItem)
2423	3507	{
2424	3508	MarkLeaves(true);
2425	3509	} else
2426		- if (event.getSource() == unmarkleavesItem)
	3510	+ if (source == unmarkleavesItem)
2427	3511	{
2428	3512	MarkLeaves(false);
2429	3513	} else
2430		- if (event.getSource() == flipVItem)
	3514	+ if (source == rewindleavesItem)
	3515	+ {
	3516	+ RewindLeaves(true);
	3517	+ } else
	3518	+ if (source == unrewindleavesItem)
	3519	+ {
	3520	+ RewindLeaves(false);
	3521	+ } else
	3522	+ if (source == randomleavesItem)
	3523	+ {
	3524	+ RandomLeaves(true);
	3525	+ } else
	3526	+ if (source == unrandomleavesItem)
	3527	+ {
	3528	+ RandomLeaves(false);
	3529	+ } else
	3530	+ if (source == flipVItem)
2431	3531	{
2432	3532	FlipV(true);
2433	3533	} else
2434		- if (event.getSource() == unflipVItem)
	3534	+ if (source == unflipVItem)
2435	3535	{
2436	3536	FlipV(false);
2437	3537	} else
2438		- if (event.getSource() == lowTexturesItem)
	3538	+ if (source == lowTexturesItem)
2439	3539	{
2440	3540	SetTexRes(0);
2441	3541	} else
2442		- if (event.getSource() == normalTexturesItem)
	3542	+ if (source == normalTexturesItem)
2443	3543	{
2444	3544	SetTexRes(1);
2445	3545	} else
2446		- if (event.getSource() == highTexturesItem)
	3546	+ if (source == highTexturesItem)
2447	3547	{
2448	3548	SetTexRes(2);
2449	3549	} else
2450		- if (event.getSource() == veryhighTexturesItem)
	3550	+ if (source == veryhighTexturesItem)
2451	3551	{
2452	3552	SetTexRes(3);
2453	3553	} else
2454		- if (event.getSource() == maxTexturesItem)
	3554	+ if (source == maxTexturesItem)
2455	3555	{
2456	3556	SetTexRes(4);
2457	3557	} else
2458		- if (event.getSource() == panoTexturesItem)
	3558	+ if (source == panoTexturesItem)
2459	3559	{
2460	3560	SetTexRes(5);
2461	3561	} else
2462		- if (event.getSource() == reverseNormalsItem)
	3562	+ if (source == reverseNormalsItem)
2463	3563	{
2464	3564	ReverseNormals();
2465	3565	} else
2466		- if (event.getSource() == parseverticesItem)
	3566	+ if (source == parseverticesItem)
2467	3567	{
2468	3568	ParseVertices();
2469	3569	} else
2470		- if (event.getSource() == textureFieldItem)
	3570	+ if (source == textureFieldItem)
2471	3571	{
2472	3572	TextureVertices();
2473	3573	} else
2474		- if (event.getSource() == alignItem)
	3574	+ if (source == alignItem)
2475	3575	{
2476	3576	Align();
2477	3577	} else
2478		- if (event.getSource() == mirrorItem)
	3578	+ if (source == mirrorItem)
2479	3579	{
2480	3580	MirrorPoses();
2481	3581	} else
2482		- if (event.getSource() == reduceMorphItem)
	3582	+ if (source == reduceMorphItem)
2483	3583	{
2484	3584	MeshReduction(false);
2485	3585	} else
2486		- if (event.getSource() == reduce34MorphItem)
	3586	+ if (source == reduce34MorphItem)
2487	3587	{
2488	3588	MeshReduction(true);
2489	3589	} else
2490		- if (event.getSource() == reverseTrianglesItem)
	3590	+ if (source == reverseTrianglesItem)
2491	3591	{
2492	3592	ReverseTriangles();
2493	3593	} else
2494		- if (event.getSource() == reduceMeshItem)
	3594	+ if (source == reduceMeshItem)
2495	3595	{
2496	3596	ReduceMesh(false);
2497	3597	} else
2498		- if (event.getSource() == reduce34MeshItem)
	3598	+ if (source == reduce34MeshItem)
2499	3599	{
2500	3600	ReduceMesh(true);
2501	3601	} else
2502		- if (event.getSource() == increaseMeshItem)
	3602	+ if (source == increaseMeshItem)
2503	3603	{
2504	3604	IncreaseMesh();
2505	3605	} else
2506		- if (event.getSource() == clipMeshItem)
	3606	+ if (source == clipMeshItem)
2507	3607	{
2508	3608	ClipMesh();
2509	3609	} else
2510		- if (event.getSource() == smoothMeshItem)
	3610	+ if (source == smoothMeshItem)
2511	3611	{
2512	3612	SmoothMesh();
2513	3613	} else
2514		- if (event.getSource() == transformgeometryItem)
	3614	+ if (source == transformGeometryItem)
2515	3615	{
2516	3616	TransformGeometry();
2517	3617	} else
2518		- if (event.getSource() == resetTransformItem)
	3618	+ if (source == transformChildrenItem)
	3619	+ {
	3620	+ TransformChildren();
	3621	+ } else
	3622	+ if (source == textureRatioRItem)
	3623	+ {
	3624	+ TextureRatio(0);
	3625	+ } else
	3626	+ if (source == textureRatioGItem)
	3627	+ {
	3628	+ TextureRatio(1);
	3629	+ } else
	3630	+ if (source == textureRatioBItem)
	3631	+ {
	3632	+ TextureRatio(2);
	3633	+ } else
	3634	+ if (source == resetTransformItem)
2519	3635	{
2520	3636	ResetTransform();
2521	3637	} else
2522		- if (event.getSource() == resetCentroidItem)
	3638	+ if (source == resetCentroidItem)
2523	3639	{
2524		- ResetCentroid();
	3640	+ ResetCentroid(true);
2525	3641	} else
2526		- if (event.getSource() == resetParentItem)
	3642	+ if (source == resetCentroidXZItem)
	3643	+ {
	3644	+ ResetCentroid(false);
	3645	+ } else
	3646	+ if (source == resetParentItem)
2527	3647	{
2528	3648	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2529	3649	{
..	..	@@ -2533,7 +3653,7 @@
2533	3653
2534	3654	refreshContents();
2535	3655	} else
2536		- if (event.getSource() == repairParentItem)
	3656	+ if (source == repairParentItem)
2537	3657	{
2538	3658	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2539	3659	{
..	..	@@ -2547,7 +3667,7 @@
2547	3667
2548	3668	refreshContents();
2549	3669	} else
2550		- if (event.getSource() == repairShadowItem)
	3670	+ if (source == repairShadowItem)
2551	3671	{
2552	3672	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2553	3673	{
..	..	@@ -2561,7 +3681,7 @@
2561	3681
2562	3682	refreshContents();
2563	3683	} else
2564		- if (event.getSource() == sortbysizeItem)
	3684	+ if (source == sortbysizeItem)
2565	3685	{
2566	3686	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2567	3687	{
..	..	@@ -2573,7 +3693,7 @@
2573	3693	ResetModel();
2574	3694	refreshContents();
2575	3695	} else
2576		- if (event.getSource() == sortbynameItem)
	3696	+ if (source == sortbynameItem)
2577	3697	{
2578	3698	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2579	3699	{
..	..	@@ -2585,7 +3705,7 @@
2585	3705	ResetModel();
2586	3706	refreshContents();
2587	3707	} else
2588		- if (event.getSource() == attachPigmentItem)
	3708	+ if (source == attachPigmentItem)
2589	3709	{
2590	3710	String texture = GetFile("Attach pigment");
2591	3711	Object3D obj;
..	..	@@ -2597,7 +3717,7 @@
2597	3717
2598	3718	refreshContents();
2599	3719	} else
2600		- if (event.getSource() == detachPigmentItem)
	3720	+ if (source == detachPigmentItem)
2601	3721	{
2602	3722	Object3D obj;
2603	3723	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2608,7 +3728,7 @@
2608	3728
2609	3729	refreshContents();
2610	3730	} else
2611		- if (event.getSource() == attachBumpItem)
	3731	+ if (source == attachBumpItem)
2612	3732	{
2613	3733	String texture = GetFile("Attach bump");
2614	3734	Object3D obj;
..	..	@@ -2620,18 +3740,18 @@
2620	3740
2621	3741	refreshContents();
2622	3742	} else
2623		- if (event.getSource() == detachBumpItem)
	3743	+ if (source == detachBumpItem)
2624	3744	{
2625	3745	Object3D obj;
2626	3746	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2627	3747	{
2628	3748	obj = (Object3D)e.nextElement();
2629		- obj.SetBumpTexture(null);
	3749	+ obj.ResetBumpTexture();
2630	3750	}
2631	3751
2632	3752	refreshContents();
2633	3753	} else
2634		- if (event.getSource() == pigmentBumpItem)
	3754	+ if (source == pigmentBumpItem)
2635	3755	{
2636	3756	Object3D obj;
2637	3757	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2642,159 +3762,233 @@
2642	3762
2643	3763	refreshContents();
2644	3764	} else
2645		- if (event.getSource() == flashSelectionButton)
	3765	+ if (source == embedTexturesItem)
	3766	+ {
	3767	+ Object3D obj;
	3768	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3769	+ {
	3770	+ obj = (Object3D)e.nextElement();
	3771	+ obj.EmbedTextures(true);
	3772	+ }
	3773	+
	3774	+ refreshContents();
	3775	+ } else
	3776	+ if (source == deEmbedTexturesItem)
	3777	+ {
	3778	+ Object3D obj;
	3779	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3780	+ {
	3781	+ obj = (Object3D)e.nextElement();
	3782	+ obj.EmbedTextures(false);
	3783	+ }
	3784	+
	3785	+ CameraPane.texturepigment.clear();
	3786	+ CameraPane.texturebump.clear();
	3787	+
	3788	+ refreshContents();
	3789	+ } else
	3790	+ if (source == flashSelectionButton)
2646	3791	{
2647	3792	CameraPane.flash = true;
2648	3793	refreshContents();
2649	3794	} else
2650		- if (event.getSource() == oneButton)
	3795	+ if (source == oneButton)
2651	3796	{
2652	3797	} else
2653		- if (event.getSource() == twoButton)
	3798	+ if (source == twoButton)
2654	3799	{
2655	3800	radio.layout = twoButton;
2656		- // bug
2657		- //gridPanel.setDividerLocation(1.0);
2658		- //bigPanel.setDividerLocation(0.0);
2659		- bigThree.remove(scenePanel);
2660		- bigThree.remove(centralPanel);
2661		- bigThree.remove(XYZPanel);
2662		- aWindowConstraints.gridx = 0;
2663		- aWindowConstraints.gridy = 0;
2664		- aWindowConstraints.gridwidth = 1;
2665		- // aConstraints.gridheight = 3;
2666		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2667		- aWindowConstraints.weightx = 0;
2668		- aWindowConstraints.weighty = 1;
2669		- //bigThree.add(jtp, aWindowConstraints);
2670		- aWindowConstraints.weightx = 1;
2671		- aWindowConstraints.gridwidth = 3;
2672		- // aConstraints.gridheight = 3;
2673		- aWindowConstraints.gridx = 1;
2674		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2675		- bigThree.add(centralPanel, aWindowConstraints);
2676		- aWindowConstraints.weightx = 0;
2677		- aWindowConstraints.gridx = 4;
2678		- aWindowConstraints.gridwidth = 1;
2679		- // aConstraints.gridheight = 3;
2680		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2681		- //bigThree.add(XYZPanel, aWindowConstraints);
2682		- bigThree.revalidate();
	3801	+
	3802	+ if (CameraPane.FULLSCREEN)
	3803	+ fullscreenLayout = radio.layout;
	3804	+
	3805	+ Show3DView();
	3806	+
	3807	+ cameraView.requestFocusInWindow();
	3808	+
	3809	+// refreshContents(true);
	3810	+//
	3811	+// try
	3812	+// {
	3813	+// java.awt.Robot bot = new java.awt.Robot();
	3814	+// int mask = InputEvent.BUTTON1_MASK;
	3815	+// bot.mouseMove(100, 100);
	3816	+// bot.mousePress(mask);
	3817	+// bot.mouseRelease(mask);
	3818	+// }
	3819	+// catch (Exception e)
	3820	+// {
	3821	+//
	3822	+// }
	3823	+
2683	3824	} else
2684		- if (event.getSource() == threeButton)
	3825	+ if (source == threeButton)
2685	3826	{
2686	3827	radio.layout = threeButton;
2687		- bigThree.remove(scenePanel);
2688		- bigThree.remove(centralPanel);
2689		- bigThree.remove(XYZPanel);
2690		- aWindowConstraints.gridx = 0;
2691		- aWindowConstraints.gridy = 0;
2692		- aWindowConstraints.gridwidth = 1;
2693		- // aConstraints.gridheight = 3;
2694		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2695		- aWindowConstraints.weightx = 0;
2696		- aWindowConstraints.weighty = 1;
2697		- //bigThree.add(jtp, aWindowConstraints);
2698		- aWindowConstraints.weightx = 1;
2699		- aWindowConstraints.gridwidth = 3;
2700		- // aConstraints.gridheight = 3;
2701		- aWindowConstraints.gridx = 1;
2702		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2703		- bigThree.add(centralPanel, aWindowConstraints);
2704		- aWindowConstraints.weightx = 0;
2705		- aWindowConstraints.gridx = 4;
2706		- aWindowConstraints.gridwidth = 1;
2707		- // aConstraints.gridheight = 3;
2708		- aConstraints.fill = GridBagConstraints.VERTICAL;
2709		- bigThree.add(XYZPanel, aWindowConstraints);
2710		- bigThree.revalidate();
	3828	+
	3829	+ if (CameraPane.FULLSCREEN)
	3830	+ fullscreenLayout = radio.layout;
	3831	+
	3832	+// bigThree.remove(scenePanel);
	3833	+// bigThree.remove(centralPanel);
	3834	+// bigThree.remove(XYZPanel);
	3835	+// aWindowConstraints.gridx = 0;
	3836	+// aWindowConstraints.gridy = 0;
	3837	+// aWindowConstraints.gridwidth = 1;
	3838	+// // aConstraints.gridheight = 3;
	3839	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3840	+// aWindowConstraints.weightx = 0;
	3841	+// aWindowConstraints.weighty = 1;
	3842	+// //bigThree.add(jtp, aWindowConstraints);
	3843	+// aWindowConstraints.weightx = 1;
	3844	+// aWindowConstraints.gridwidth = 3;
	3845	+// // aConstraints.gridheight = 3;
	3846	+// aWindowConstraints.gridx = 1;
	3847	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3848	+// bigThree.add(centralPanel, aWindowConstraints);
	3849	+// aWindowConstraints.weightx = 0;
	3850	+// aWindowConstraints.gridx = 4;
	3851	+// aWindowConstraints.gridwidth = 1;
	3852	+// // aConstraints.gridheight = 3;
	3853	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	3854	+// bigThree.add(XYZPanel, aWindowConstraints);
	3855	+// bigThree.validate();
	3856	+// scenePanel.setVisible(false);
	3857	+// centralPanel.setVisible(true);
	3858	+// XYZPanel.setVisible(true);
	3859	+ bigThree.ClearUI();
	3860	+ bigThree.add(scenePanel);
	3861	+ bigThree.add(centralPanel);
	3862	+ bigThree.FlushUI();
	3863	+
	3864	+ cameraView.requestFocusInWindow();
2711	3865	} else
2712		- if (event.getSource() == fourButton)
	3866	+ if (source == fourButton)
2713	3867	{
2714	3868	radio.layout = fourButton;
2715		- bigThree.remove(scenePanel);
2716		- bigThree.remove(centralPanel);
2717		- bigThree.remove(XYZPanel);
2718		- aWindowConstraints.gridx = 0;
2719		- aWindowConstraints.gridy = 0;
2720		- aWindowConstraints.gridwidth = 1;
2721		- // aWindowConstraints.gridheight = 3;
2722		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2723		- aWindowConstraints.weightx = 1;
2724		- aWindowConstraints.weighty = 1;
2725		- bigThree.add(scenePanel, aWindowConstraints);
2726		- aWindowConstraints.weightx = 1;
2727		- aWindowConstraints.gridwidth = 3;
2728		- // aConstraints.gridheight = 3;
2729		- aWindowConstraints.gridx = 1;
2730		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2731		- //bigThree.add(cameraPanel, aWindowConstraints);
2732		- aWindowConstraints.weightx = 0;
2733		- aWindowConstraints.gridx = 4;
2734		- aWindowConstraints.gridwidth = 1;
2735		- // aWindowConstraints.gridheight = 3;
2736		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2737		- //bigThree.add(XYZPanel, aWindowConstraints);
2738		- bigThree.revalidate();
	3869	+
	3870	+ if (CameraPane.FULLSCREEN)
	3871	+ fullscreenLayout = radio.layout;
	3872	+
	3873	+// bigThree.remove(scenePanel);
	3874	+// bigThree.remove(centralPanel);
	3875	+// bigThree.remove(XYZPanel);
	3876	+// aWindowConstraints.gridx = 0;
	3877	+// aWindowConstraints.gridy = 0;
	3878	+// aWindowConstraints.gridwidth = 1;
	3879	+// // aWindowConstraints.gridheight = 3;
	3880	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3881	+// aWindowConstraints.weightx = 1;
	3882	+// aWindowConstraints.weighty = 1;
	3883	+// bigThree.add(scenePanel, aWindowConstraints);
	3884	+// aWindowConstraints.weightx = 1;
	3885	+// aWindowConstraints.gridwidth = 3;
	3886	+// // aConstraints.gridheight = 3;
	3887	+// aWindowConstraints.gridx = 1;
	3888	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3889	+// //bigThree.add(cameraPanel, aWindowConstraints);
	3890	+// aWindowConstraints.weightx = 0;
	3891	+// aWindowConstraints.gridx = 4;
	3892	+// aWindowConstraints.gridwidth = 1;
	3893	+// // aWindowConstraints.gridheight = 3;
	3894	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3895	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3896	+// bigThree.validate();
	3897	+// scenePanel.setVisible(true);
	3898	+// centralPanel.setVisible(false);
	3899	+// XYZPanel.setVisible(false);
	3900	+ bigThree.ClearUI();
	3901	+ bigThree.add(scenePanel);
	3902	+ bigThree.FlushUI();
	3903	+
	3904	+ cameraView.requestFocusInWindow();
2739	3905	} else
2740		- if (event.getSource() == sixButton)
	3906	+ if (source == sixButton)
2741	3907	{
2742	3908	radio.layout = sixButton;
2743		- bigThree.remove(scenePanel);
2744		- bigThree.remove(centralPanel);
2745		- bigThree.remove(XYZPanel);
2746		- aWindowConstraints.gridx = 0;
2747		- aWindowConstraints.gridy = 0;
2748		- aWindowConstraints.gridwidth = 1;
2749		- // aConstraints.gridheight = 3;
2750		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2751		- aWindowConstraints.weightx = 0;
2752		- aWindowConstraints.weighty = 1;
2753		- bigThree.add(scenePanel, aWindowConstraints);
2754		- aWindowConstraints.weightx = 1;
2755		- aWindowConstraints.gridwidth = 3;
2756		- // aWindowConstraints.gridheight = 3;
2757		- aWindowConstraints.gridx = 1;
2758		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2759		- bigThree.add(centralPanel, aWindowConstraints);
2760		- aWindowConstraints.weightx = 0;
2761		- aWindowConstraints.gridx = 4;
2762		- aWindowConstraints.gridwidth = 1;
2763		- // aWindowConstraints.gridheight = 3;
2764		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2765		- //bigThree.add(XYZPanel, aConstraints);
2766		- bigThree.revalidate();
	3909	+
	3910	+ if (CameraPane.FULLSCREEN)
	3911	+ fullscreenLayout = radio.layout;
	3912	+
	3913	+// bigThree.remove(scenePanel);
	3914	+// bigThree.remove(centralPanel);
	3915	+// bigThree.remove(XYZPanel);
	3916	+// aWindowConstraints.gridx = 0;
	3917	+// aWindowConstraints.gridy = 0;
	3918	+// aWindowConstraints.gridwidth = 1;
	3919	+// // aConstraints.gridheight = 3;
	3920	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3921	+// aWindowConstraints.weightx = 0;
	3922	+// aWindowConstraints.weighty = 1;
	3923	+// bigThree.add(scenePanel, aWindowConstraints);
	3924	+// aWindowConstraints.weightx = 1;
	3925	+// aWindowConstraints.gridwidth = 3;
	3926	+// // aWindowConstraints.gridheight = 3;
	3927	+// aWindowConstraints.gridx = 1;
	3928	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3929	+// bigThree.add(centralPanel, aWindowConstraints);
	3930	+// aWindowConstraints.weightx = 0;
	3931	+// aWindowConstraints.gridx = 4;
	3932	+// aWindowConstraints.gridwidth = 1;
	3933	+// // aWindowConstraints.gridheight = 3;
	3934	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3935	+// //bigThree.add(XYZPanel, aConstraints);
	3936	+// bigThree.validate();
	3937	+// scenePanel.setVisible(true);
	3938	+// centralPanel.setVisible(true);
	3939	+// XYZPanel.setVisible(false);
	3940	+ bigThree.ClearUI();
	3941	+ bigThree.add(centralPanel);
	3942	+ bigThree.add(scenePanel);
	3943	+ bigThree.FlushUI();
	3944	+
	3945	+ cameraView.requestFocusInWindow();
2767	3946	} else
2768		- if (event.getSource() == sevenButton)
	3947	+ if (source == sevenButton)
2769	3948	{
2770	3949	radio.layout = sevenButton;
2771		- bigThree.remove(scenePanel);
2772		- bigThree.remove(centralPanel);
2773		- bigThree.remove(XYZPanel);
2774		- aWindowConstraints.gridx = 0;
2775		- aWindowConstraints.gridy = 0;
2776		- aWindowConstraints.gridwidth = 1;
2777		- // aWindowConstraints.gridheight = 3;
2778		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2779		- aWindowConstraints.weightx = 0;
2780		- aWindowConstraints.weighty = 1;
2781		- bigThree.add(scenePanel, aWindowConstraints);
2782		- aWindowConstraints.weightx = 1;
2783		- aWindowConstraints.gridwidth = 3;
2784		- // aWindowConstraints.gridheight = 3;
2785		- aWindowConstraints.gridx = 1;
2786		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2787		- bigThree.add(centralPanel, aWindowConstraints);
2788		- aWindowConstraints.weightx = 0;
2789		- aWindowConstraints.gridx = 4;
2790		- aWindowConstraints.gridwidth = 1;
2791		- // aConstraints.gridheight = 3;
2792		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2793		- bigThree.add(XYZPanel, aWindowConstraints);
2794		- bigThree.revalidate();
	3950	+
	3951	+ if (CameraPane.FULLSCREEN)
	3952	+ fullscreenLayout = radio.layout;
	3953	+
	3954	+// bigThree.remove(scenePanel);
	3955	+// bigThree.remove(centralPanel);
	3956	+// bigThree.remove(XYZPanel);
	3957	+// aWindowConstraints.gridx = 0;
	3958	+// aWindowConstraints.gridy = 0;
	3959	+// aWindowConstraints.gridwidth = 1;
	3960	+// // aWindowConstraints.gridheight = 3;
	3961	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3962	+// aWindowConstraints.weightx = 0;
	3963	+// aWindowConstraints.weighty = 1;
	3964	+// bigThree.add(scenePanel, aWindowConstraints);
	3965	+// aWindowConstraints.weightx = 1;
	3966	+// aWindowConstraints.gridwidth = 3;
	3967	+// // aWindowConstraints.gridheight = 3;
	3968	+// aWindowConstraints.gridx = 1;
	3969	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3970	+// bigThree.add(centralPanel, aWindowConstraints);
	3971	+// aWindowConstraints.weightx = 0;
	3972	+// aWindowConstraints.gridx = 4;
	3973	+// aWindowConstraints.gridwidth = 1;
	3974	+// // aConstraints.gridheight = 3;
	3975	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3976	+// bigThree.add(XYZPanel, aWindowConstraints);
	3977	+// bigThree.validate();
	3978	+// scenePanel.setVisible(true);
	3979	+// centralPanel.setVisible(true);
	3980	+// XYZPanel.setVisible(true);
	3981	+ bigThree.ClearUI();
	3982	+ bigThree.add(scenePanel);
	3983	+ bigThree.add(centralPanel);
	3984	+ bigThree.add(XYZPanel);
	3985	+ bigThree.FlushUI();
	3986	+
	3987	+ cameraView.requestFocusInWindow();
2795	3988	} else
2796		- if (event.getSource() == rootButton)
	3989	+ if (source == rootButton)
2797	3990	{
	3991	+ Replace();
2798	3992	Object3D obj;
2799	3993	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2800	3994	{
..	..	@@ -2803,66 +3997,88 @@
2803	3997	EditObject(obj);
2804	3998	}
2805	3999
	4000	+ cameraView.requestFocusInWindow();
2806	4001	refreshContents(true);
2807	4002	} else
2808		- if (event.getSource() == closeButton)
	4003	+ if (source == closeButton)
2809	4004	{
2810	4005	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	4006	+ if (copy.versionlist != null)
	4007	+ Replace();
	4008	+
2811	4009	cRadio ab;
2812	4010	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2813	4011	{
2814	4012	ab = (cRadio)e.nextElement();
2815		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	4013	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2816	4014	{
	4015	+ // Patch to avoid bug with transparency.
	4016	+ if (!ab.hadMaterial)
	4017	+ {
	4018	+ ab.object.material = null;
	4019	+ }
	4020	+
2817	4021	buttonGroup.remove(ab);
2818	4022	radioPanel.remove(ab);
2819	4023
2820		- ab.GetObject().editWindow = null;
	4024	+ //ab.GetObject().editWindow = null;
	4025	+ ab.GetObject().manipWindow = null;
2821	4026	// ab.GetObject().objectUI = null; // ?????????
2822	4027
2823	4028	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2824	4029	break;
2825	4030	}
2826	4031	}
	4032	+
	4033	+ cameraView.requestFocusInWindow();
2827	4034	refreshContents(true);
2828	4035	} else
2829		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	4036	+ if (source == editItem \|\| source == editButton)
2830	4037	{
	4038	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4039	+ {
	4040	+ Object3D child = (Object3D)e.nextElement();
	4041	+ child.pinned = true;
	4042	+ }
	4043	+
2831	4044	EditSelection(false);
2832	4045	} else
2833		- if (event.getSource() == uneditButton)
	4046	+ if (source == uneditButton)
2834	4047	{
2835	4048	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2836	4049	{
2837	4050	Object3D child = (Object3D)e.nextElement();
2838	4051	if(child.editWindow != null)
2839		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4052	+ child.pinned = false;
2840	4053	child.CloseUI();
2841	4054	listUI.remove(child);
	4055	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2842	4056
2843		- child.editWindow = null; // ???????????
	4057	+ //child.editWindow = null; // ???????????
2844	4058	}
2845		- objEditor.ctrlPanel.revalidate();
	4059	+ objEditor.ctrlPanel.FlushUI();
2846	4060	//objEditor.jTree.clearSelection();
2847	4061	//objEditor.ResetSliders();
2848	4062	refreshContents(true);
2849	4063	} else
2850		- if (event.getSource() == clearPanelButton)
	4064	+ if (source == clearPanelButton)
2851	4065	{
2852	4066	assert(copy == group);
2853	4067	//copy.ClearUI();
2854	4068	for (Object3D obj : listUI)
2855	4069	{
	4070	+ obj.pinned = false;
2856	4071	obj.CloseUI();
2857	4072	}
2858	4073	listUI.clear();
	4074	+ SetPinStates(group.selection.size() > 0);
2859	4075	refreshContents(true);
2860	4076	} else
2861		- if (event.getSource() == allParamsButton)
	4077	+ if (source == allParamsButton)
2862	4078	{
2863	4079	assert(copy == group);
2864	4080
2865		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4081	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2866	4082
2867	4083	for (Object3D obj : listUI)
2868	4084	{
..	..	@@ -2879,19 +4095,22 @@
2879	4095
2880	4096	refreshContents(true);
2881	4097	} else
2882		- if (event.getSource() == unselectButton)
	4098	+ if (source == unselectButton)
2883	4099	{
2884	4100	objEditor.jTree.clearSelection();
2885	4101	// ?? oct 2012 GrafreeD.clipboard.clear();
2886	4102	objEditor.ResetSliders();
2887	4103	refreshContents(true);
2888	4104	} else
2889		- if(event.getSource() instanceof cRadio)
	4105	+ if(source instanceof cRadio)
2890	4106	{
	4107	+ if (copy.versionlist != null)
	4108	+ Replace();
	4109	+
2891	4110	group.parent = keepparent;
2892	4111	group.attributes = 0;
2893	4112	//group.editWindow = null;
2894		- /cRadio/ radio = (cRadio)event.getSource();
	4113	+ /cRadio/ radio = (cRadio)source;
2895	4114	Object3D obj = radio.GetObject();
2896	4115	System.out.println("Edit " + obj);
2897	4116	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2911,6 +4130,7 @@
2911	4130	}
2912	4131
2913	4132	copy = group;
	4133	+
2914	4134	//Globals.theRenderer.object = group;
2915	4135	if(!useclient)
2916	4136	{
..	..	@@ -2926,20 +4146,74 @@
2926	4146	frontView.object = group;
2927	4147	sideView.object = group;
2928	4148	}
2929		- group.editWindow = this;
	4149	+
	4150	+// fix "+" issue
	4151	+ //group.editWindow = this;
	4152	+ group.manipWindow = this;
	4153	+
2930	4154	/*
2931	4155	currentLayout = radio.layout;
2932	4156	if (currentLayout == null)
2933	4157	currentLayout = sevenButton;
2934	4158	*/
2935	4159	radio.layout.doClick();
	4160	+
	4161	+ //assert(copy instanceof Composite);
	4162	+
	4163	+ if (copy.versionlist == null)
	4164	+ {
	4165	+ copy.versionindex = -1;
	4166	+
	4167	+ // Cannot work with loops
	4168	+ // To fix this issue, we first mark all nodes above the root,
	4169	+ // and check if any of these nodes are reachable below the root.
	4170	+ Grafreed.grafreed.universe.TagObjects(copy, true);
	4171	+
	4172	+ if (copy instanceof Composite && copy.versionlist == null && !copy.HasTags())
	4173	+ {
	4174	+ copy.versionlist = new Object3D[100];
	4175	+
	4176	+ //Save(true);
	4177	+ }
	4178	+ else
	4179	+ copy.versionindex = -2;
	4180	+
	4181	+ Grafreed.grafreed.universe.TagObjects(copy, false);
	4182	+ }
	4183	+
	4184	+ SetVersionStates();
	4185	+
	4186	+ ClearUnpinned();
	4187	+
	4188	+ //Grafreed.Assert(group != null);
	4189	+ //Grafreed.Assert(group.selection != null);
	4190	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4191	+ if (group.selection == null \|\| group.selection.size() == 1)
	4192	+ EditSelection(false);
2936	4193	keepparent = group.parent;
2937	4194	// PARENT = NULL or not???
2938	4195	//group.parent = null; // ROOT
2939	4196	//group.attributes = -1;
2940	4197	ResetModel();
	4198	+
	4199	+ cameraView.requestFocusInWindow();
2941	4200	refreshContents(true);
2942		- }
	4201	+ } else if (event.getSource() == editCameraItem)
	4202	+ {
	4203	+ cameraView.ProtectCamera();
	4204	+ cameraView.requestFocusInWindow();
	4205	+ cameraView.repaint();
	4206	+ return;
	4207	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	4208	+ {
	4209	+ cameraView.RevertCamera();
	4210	+ cameraView.requestFocusInWindow();
	4211	+ cameraView.repaint();
	4212	+ return;
	4213	+ // } else if (event.getSource() == textureButton)
	4214	+ // {
	4215	+ // return; // true;
	4216	+ }
2943	4217	else
2944	4218	{
2945	4219	//return super.action(event, arg);
..	..	@@ -2948,7 +4222,6 @@
2948	4222	}
2949	4223
2950	4224	boolean useclient = false;
2951		- cRadio radio;
2952	4225
2953	4226	void ToggleRoot()
2954	4227	{
..	..	@@ -3000,6 +4273,40 @@
3000	4273	refreshContents();
3001	4274	}
3002	4275
	4276	+ void TransformChildren()
	4277	+ {
	4278	+ Object3D obj;
	4279	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4280	+ {
	4281	+ obj = (Object3D)e.nextElement();
	4282	+ obj.KeepTextureMatrices();
	4283	+ obj.TransformChildren();
	4284	+ obj.RestoreTextureMatrices();
	4285	+
	4286	+// if (obj.parent == null)
	4287	+// {
	4288	+// System.out.println("NULL PARENT!");
	4289	+// new Exception().printStackTrace();
	4290	+// }
	4291	+// else
	4292	+// TouchTransform(obj);
	4293	+// //obj.parent.Touch();
	4294	+ }
	4295	+
	4296	+ refreshContents();
	4297	+ }
	4298	+
	4299	+ void TextureRatio(int axis)
	4300	+ {
	4301	+ Object3D obj;
	4302	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4303	+ {
	4304	+ obj = (Object3D)e.nextElement();
	4305	+ obj.TextureRatio(axis);
	4306	+ }
	4307	+
	4308	+ refreshContents();
	4309	+ }
3003	4310
3004	4311	void ResetTransform()
3005	4312	{
..	..	@@ -3016,42 +4323,8 @@
3016	4323	if (obj.toParent == null)
3017	4324	continue;
3018	4325
3019		- if (mask == -1)
3020		- {
3021		- if (obj instanceof Camera) // jan 2014
3022		- {
3023		- LA.matIdentity(obj.toParent);
3024		- LA.matIdentity(obj.fromParent);
3025		- }
3026		- else
3027		- {
3028		- obj.toParent = null; // jan 2014 LA.matIdentity(obj.toParent);
3029		- obj.fromParent = null; // LA.matIdentity(obj.fromParent);
3030		- }
3031		- TouchTransform(obj);
3032		- continue;
3033		- }
3034		- if ((mask&2) != 0) // Scale
3035		- {
3036		- obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
3037		- obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
3038		- obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
3039		- obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
3040		- obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
3041		- obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
3042		- }
3043		- if ((mask&4) != 0) // Rotation
3044		- {
3045		- // ?
3046		- }
3047		- if ((mask&1) != 0) // Translation
3048		- {
3049		- if (obj.toParent != null)
3050		- {
3051		- obj.toParent[3][0] = obj.toParent[3][1] = obj.toParent[3][2] = 0;
3052		- obj.fromParent[3][0] = obj.fromParent[3][1] = obj.fromParent[3][2] = 0;
3053		- }
3054		- }
	4326	+ obj.ResetTransform(mask);
	4327	+
3055	4328	if (obj.parent == null)
3056	4329	{
3057	4330	System.out.println("NULL PARENT!");
..	..	@@ -3112,7 +4385,7 @@
3112	4385	refreshContents();
3113	4386	}
3114	4387
3115		- void ResetCentroid()
	4388	+ void ResetCentroid(boolean full)
3116	4389	{
3117	4390	Object3D obj;
3118	4391	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3127,12 +4400,16 @@
3127	4400	LA.matIdentity(Object3D.mat);
3128	4401	obj.getBounds(minima, maxima, false);
3129	4402	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3130		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	4403	+ if (full)
	4404	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3131	4405	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3132	4406	obj.TransformMesh(Object3D.mat);
	4407	+
3133	4408	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3134		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	4409	+ if (full)
	4410	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3135	4411	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	4412	+
3136	4413	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3137	4414	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3138	4415	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3161,7 +4438,8 @@
3161	4438
3162	4439	int size = obj.MemorySize();
3163	4440
3164		- System.err.println((size/1024) + " KB is the size of " + obj);
	4441	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4442	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3165	4443	}
3166	4444	}
3167	4445	catch (Exception e)
..	..	@@ -3198,9 +4476,9 @@
3198	4476	obj = (Object3D)e.nextElement();
3199	4477
3200	4478	System.out.println("Object is: " + obj);
3201		- GrafreeD.AnalyzeObject(obj);
	4479	+ Grafreed.AnalyzeObject(obj);
3202	4480	System.out.println("Boundary rep: " + obj.bRep);
3203		- GrafreeD.AnalyzeObject(obj.bRep);
	4481	+ Grafreed.AnalyzeObject(obj.bRep);
3204	4482
3205	4483	// System.err.println((size/1024) + " KB is the size of " + obj);
3206	4484	}
..	..	@@ -3242,6 +4520,13 @@
3242	4520	void GenNormals(boolean crease)
3243	4521	{
3244	4522	group.GenNormalsS(crease);
	4523	+
	4524	+ refreshContents();
	4525	+ }
	4526	+
	4527	+ void GenNormalsMESH()
	4528	+ {
	4529	+ group.GenNormalsMeshS();
3245	4530
3246	4531	refreshContents();
3247	4532	}
..	..	@@ -3414,8 +4699,8 @@
3414	4699
3415	4700	void ParseVertices()
3416	4701	{
3417		- boolean epsequal = GrafreeD.epsequal;
3418		- GrafreeD.epsequal = true;
	4702	+ boolean epsequal = Grafreed.epsequal;
	4703	+ Grafreed.epsequal = true;
3419	4704
3420	4705	for (int i=0; i<group.selection.size(); i++)
3421	4706	{
..	..	@@ -3440,7 +4725,7 @@
3440	4725	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3441	4726	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3442	4727
3443		- g.add(GrafreeD.clipboard);
	4728	+ g.add(Grafreed.clipboard);
3444	4729
3445	4730	buffer.add(g);
3446	4731	}
..	..	@@ -3455,7 +4740,7 @@
3455	4740	makeSomething(buffer, i==group.selection.size()-1);
3456	4741	}
3457	4742
3458		- GrafreeD.epsequal = epsequal;
	4743	+ Grafreed.epsequal = epsequal;
3459	4744
3460	4745	refreshContents();
3461	4746	}
..	..	@@ -3473,7 +4758,16 @@
3473	4758	String pigment = Object3D.GetPigment(tex);
3474	4759	//String bump = Object3D.GetBump(tex);
3475	4760
3476		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4761	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4762	+
	4763	+ try
	4764	+ {
	4765	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
	4766	+ }
	4767	+ catch (Exception e)
	4768	+ {
	4769	+ System.err.println("FAIL: " + node);
	4770	+ }
3477	4771
3478	4772	double s = v.s;
3479	4773
..	..	@@ -3539,6 +4833,12 @@
3539	4833	{
3540	4834	Object3D obj = group.selection.get(i);
3541	4835
	4836	+ if (obj.toParent == null)
	4837	+ {
	4838	+ obj.toParent = LA.newMatrix();
	4839	+ obj.fromParent = LA.newMatrix();
	4840	+ }
	4841	+
3542	4842	LA.matTranslate(obj.toParent, i * scale, 0, 0);
3543	4843	LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3544	4844	}
..	..	@@ -3561,11 +4861,11 @@
3561	4861
3562	4862	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3563	4863
3564		- boolean random = CameraPane.RANDOM;
3565		- CameraPane.RANDOM = false; // parse all random nodes
	4864	+ boolean random = CameraPane.SWITCH;
	4865	+ CameraPane.SWITCH = false; // parse all random nodes
3566	4866	lowres.linkVerticesThis(null);
3567	4867	lowres.linkVerticesThis(sn);
3568		- CameraPane.RANDOM = random;
	4868	+ CameraPane.SWITCH = random;
3569	4869
3570	4870	System.err.flush();
3571	4871
..	..	@@ -3605,7 +4905,7 @@
3605	4905	return;
3606	4906
3607	4907	Object3D poses = group.selection.get(0);
3608		- Object3D ref = GrafreeD.clipboard.get(0);
	4908	+ Object3D ref = Grafreed.clipboard.get(0);
3609	4909
3610	4910	Object3D newgroup = new Object3D("Po:" + poses.name);
3611	4911
..	..	@@ -3799,9 +5099,9 @@
3799	5099
3800	5100	void ClipMesh()
3801	5101	{
3802		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	5102	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3803	5103	{
3804		- Object3D content = GrafreeD.clipboard.get(0);
	5104	+ Object3D content = Grafreed.clipboard.get(0);
3805	5105
3806	5106	if (content instanceof cGroup && ((cGroup)content).transientlink )
3807	5107	content = ((cGroup)content).get(0);
..	..	@@ -3810,7 +5110,7 @@
3810	5110	// {
3811	5111	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3812	5112	// }
3813		- group.selection.ClipMesh(GrafreeD.clipboard);
	5113	+ group.selection.ClipMesh(Grafreed.clipboard);
3814	5114	}
3815	5115	// group.selection.ClipMesh(GrafreeD.clipboard);
3816	5116	System.out.println("DONE.");
..	..	@@ -3827,6 +5127,12 @@
3827	5127	void ClearMaterials()
3828	5128	{
3829	5129	group.selection.ClearMaterials();
	5130	+ refreshContents();
	5131	+ }
	5132	+
	5133	+ void ClearVersions()
	5134	+ {
	5135	+ group.selection.ClearVersions();
3830	5136	refreshContents();
3831	5137	}
3832	5138
..	..	@@ -3857,6 +5163,18 @@
3857	5163	void MarkLeaves(boolean hide)
3858	5164	{
3859	5165	group.selection.MarkLeaves(hide);
	5166	+ refreshContents();
	5167	+ }
	5168	+
	5169	+ void RewindLeaves(boolean hide)
	5170	+ {
	5171	+ group.selection.RewindLeaves(hide);
	5172	+ refreshContents();
	5173	+ }
	5174	+
	5175	+ void RandomLeaves(boolean hide)
	5176	+ {
	5177	+ group.selection.RandomLeaves(hide);
3860	5178	refreshContents();
3861	5179	}
3862	5180
..	..	@@ -3931,28 +5249,25 @@
3931	5249	// }
3932	5250	// }
3933	5251
3934		- static boolean allparams = true;
3935		-
3936		- static Vector<Object3D> listUI = new Vector<Object3D>();
3937		-
3938	5252	void EditSelection(boolean newWindow)
3939	5253	{
	5254	+ if (group.selection == null)
	5255	+ {
	5256	+ EditElement(group, newWindow); // ? new
	5257	+ return;
	5258	+ }
	5259	+
3940	5260	// aConstraints.gridy = 0;
3941	5261	for (int i=0; i<group.selection.size(); i++)
3942	5262	{
3943	5263	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
3944	5264	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3945		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5265	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3946	5266
3947	5267	Object3D elem = (Object3D)group.selection.elementAt(i);
3948		- if(elem != group)
	5268	+ if(elem != group \|\| !newWindow)
3949	5269	{
3950		- // if (!(elem instanceof Composite))
3951		- // newWindow = false;
3952		- listUI.add(elem);
3953		- elem.openEditWindow(this, newWindow); //, false);
3954		- System.out.println("edit : " + elem);
3955		- elem.editWindow.refreshContents(true); // ? new
	5270	+ EditElement(elem, newWindow); // ? new
3956	5271	}
3957	5272	}
3958	5273	}
..	..	@@ -4015,9 +5330,7 @@
4015	5330
4016	5331	freezemodel = false;
4017	5332	}
4018		-
4019		- boolean flashIt = true;
4020		-
	5333	+
4021	5334	public void valueChanged(TreeSelectionEvent e)
4022	5335	//public boolean handleEvent(Event event)
4023	5336	{
..	..	@@ -4027,7 +5340,8 @@
4027	5340	//new Exception().printStackTrace();
4028	5341
4029	5342	freezemodel = true;
4030		-
	5343	+ ClearUnpinned();
	5344	+
4031	5345	/**/
4032	5346	//switch (event.id)
4033	5347	{
..	..	@@ -4035,7 +5349,6 @@
4035	5349	//case 702: // Event.LIST_DESELECT
4036	5350	group.deselectAll();
4037	5351	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4038		- objEditor.ClearInfo(); // .GetMaterial());
4039	5352	if (tps != null)
4040	5353	{
4041	5354	for (int i=0; i < tps.length; i++)
..	..	@@ -4044,33 +5357,39 @@
4044	5357
4045	5358	//if (child.parent != null)
4046	5359	//child.parent.addSelectee(child);
	5360	+ objEditor.SetMaterial(child);
4047	5361	group.addSelectee(child);
4048		- objEditor.SetMaterial(child); // .GetMaterial());
4049		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4050		- System.err.println("info : " + child.GetPath());
4051	5362	}
4052	5363	}
4053		- else
4054		- {
4055		- objEditor.SetMaterial(group); // .GetMaterial());
4056		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4057		- System.err.println("info : " + group.GetPath());
4058		- }
	5364	+// else
	5365	+// {
	5366	+// objEditor.SetMaterial(group); // .GetMaterial());
	5367	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	5368	+// System.err.println("info : " + group.GetPath());
	5369	+// }
4059	5370
4060		- objEditor.SetText(); // jan 2014
4061		-
4062		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	5371	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4063	5372	CameraPane.flash = true;
4064	5373
4065		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5374	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4066	5375	// a camera
4067	5376	{
4068		- CameraPane.camerachangeframe = 0; // don't refuse it
4069		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5377	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5378	+ {
	5379	+ CameraPane.camerachangeframe = 0; // don't refuse it
	5380	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5381	+ }
4070	5382	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4071	5383	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4072	5384	}
4073	5385
	5386	+ if (tps != null && tps.length == 1)
	5387	+ {
	5388	+ EditSelection(false);
	5389	+ }
	5390	+
	5391	+ SetPinStates(tps != null && tps.length > 0);
	5392	+
4074	5393	refreshContents();
4075	5394	//return true;
4076	5395	}
..	..	@@ -4079,6 +5398,53 @@
4079	5398
4080	5399	freezemodel = false;
4081	5400	}
	5401	+
	5402	+ void SetPinStates(boolean enabled)
	5403	+ {
	5404	+ editButton.setEnabled(enabled);
	5405	+ uneditButton.setEnabled(enabled);
	5406	+ //unselectButton.setEnabled(enabled);
	5407	+ flashSelectionButton.setEnabled(enabled);
	5408	+
	5409	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5410	+
	5411	+ boolean allComposites = true;
	5412	+
	5413	+ if (group.selection != null)
	5414	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5415	+ {
	5416	+ Object next = e.nextElement();
	5417	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5418	+ {
	5419	+ allComposites = false;
	5420	+ break;
	5421	+ }
	5422	+ }
	5423	+
	5424	+ rootButton.setEnabled(true); // allComposites);
	5425	+ }
	5426	+
	5427	+ void refreshContents(boolean cp)
	5428	+ {
	5429	+ if (Globals.ADVANCED)
	5430	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5431	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5432	+ {
	5433	+ objEditor.ClearInfo(); // .GetMaterial());
	5434	+
	5435	+ for (int i=0; i < group.selection.Size(); i++)
	5436	+ {
	5437	+ Object3D child = (Object3D) group.selection.get(i);
	5438	+
	5439	+ objEditor.AddInfo(child, this, true);
	5440	+// System.err.println("info : " + child.GetPath());
	5441	+ }
	5442	+
	5443	+ objEditor.SetText(); // jan 2014
	5444	+ }
	5445	+
	5446	+ super.refreshContents(cp);
	5447	+ }
4082	5448
4083	5449	void linkSomething(Object3D thing)
4084	5450	{
..	..	@@ -4150,16 +5516,19 @@
4150	5516	{
4151	5517	if (group.selection.isEmpty())
4152	5518	return;
4153		- GrafreeD.clipboardIsTempGroup = false;
	5519	+
	5520	+ Grafreed.clipboardIsTempGroup = false;
4154	5521	Composite tGroup = null;
4155	5522	if (group.selection.size() > 0) // 1)
4156	5523	{
4157	5524	tGroup = new cGroup();
4158		- GrafreeD.clipboardIsTempGroup = true;
	5525	+ Grafreed.clipboardIsTempGroup = true;
4159	5526	}
4160	5527
4161	5528	if (cut)
4162	5529	{
	5530	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5531	+// Save();
4163	5532	//int indices[] = jList.getSelectedIndices();
4164	5533	//for (int i = indices.length - 1; i >= 0; i--)
4165	5534	//jList.remove(indices[i]);
..	..	@@ -4195,16 +5564,16 @@
4195	5564	//System.out.println("cut " + child);
4196	5565	//System.out.println("parent = " + child.parent);
4197	5566	// tmp.addChild(child);
4198		- if (GrafreeD.clipboardIsTempGroup)
	5567	+ if (Grafreed.clipboardIsTempGroup)
4199	5568	tGroup.add/Child/(tmp);
4200	5569	else
4201		- GrafreeD.clipboard = tmp;
	5570	+ Grafreed.clipboard = tmp;
4202	5571	}
4203	5572	else
4204		- if (GrafreeD.clipboardIsTempGroup)
	5573	+ if (Grafreed.clipboardIsTempGroup)
4205	5574	tGroup.add/Child/(child);
4206	5575	else
4207		- GrafreeD.clipboard = child;
	5576	+ Grafreed.clipboard = child;
4208	5577	}
4209	5578
4210	5579	//ResetModel();
..	..	@@ -4236,21 +5605,23 @@
4236	5605	//System.out.println("cut " + elem);
4237	5606	//System.out.println("parent = " + elem.parent);
4238	5607	// tmp.addChild(elem);
4239		- if (GrafreeD.clipboardIsTempGroup)
	5608	+ if (Grafreed.clipboardIsTempGroup)
4240	5609	tGroup.add/Child/(tmp);
4241	5610	else
4242		- GrafreeD.clipboard = tmp;
	5611	+ Grafreed.clipboard = tmp;
4243	5612	}
4244	5613	else
4245		- if (GrafreeD.clipboardIsTempGroup)
	5614	+ if (Grafreed.clipboardIsTempGroup)
4246	5615	tGroup.add/Child/(child);
4247	5616	else
4248		- GrafreeD.clipboard = child;
	5617	+ Grafreed.clipboard = child;
4249	5618	}
4250	5619
4251	5620	}
4252		- if (GrafreeD.clipboardIsTempGroup)
4253		- GrafreeD.clipboard = tGroup;
	5621	+
	5622	+ if (Grafreed.clipboardIsTempGroup)
	5623	+ Grafreed.clipboard = tGroup;
	5624	+
4254	5625	if (cut)
4255	5626	{
4256	5627	ResetModel();
..	..	@@ -4260,11 +5631,15 @@
4260	5631
4261	5632	void paste(boolean expand)
4262	5633	{
	5634	+ if (Globals.REPLACEONMAKE)
	5635	+ Save();
	5636	+ boolean keep = Globals.REPLACEONMAKE;
	5637	+ Globals.REPLACEONMAKE = false;
4263	5638	// if (GrafreeD.clipboard == null)
4264	5639	// return;
4265	5640	boolean first = true;
4266	5641
4267		- if (GrafreeD.clipboardIsTempGroup)
	5642	+ if (Grafreed.clipboardIsTempGroup)
4268	5643	{
4269	5644	Composite temp;
4270	5645
..	..	@@ -4275,7 +5650,7 @@
4275	5650	temp = (Composite)Applet3D.clipboard.deepCopy();
4276	5651	*/
4277	5652	Object3D elem;
4278		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5653	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4279	5654	{
4280	5655	Object3D child = (Object3D)e.nextElement();
4281	5656
..	..	@@ -4309,21 +5684,22 @@
4309	5684	//Object3D cb = Applet3D.clipboard;
4310	5685	//temp.addChild(cb);
4311	5686	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4312		- assert(GrafreeD.clipboard.parent == null);
4313		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4314		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4315		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4316		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	5687	+ assert(Grafreed.clipboard.parent == null);
	5688	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5689	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5690	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5691	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4317	5692	else
4318		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4319		- GrafreeD.clipboard.get(0).parent = keepparent;
	5693	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5694	+ Grafreed.clipboard.get(0).parent = keepparent;
4320	5695	}
4321	5696
	5697	+ Globals.REPLACEONMAKE = keep;
4322	5698	ResetModel();
4323	5699	refreshContents();
4324	5700	}
4325	5701
4326		- void pasteInto(boolean copyit)
	5702	+ void pasteInto(boolean copyit, boolean clone)
4327	5703	{
4328	5704	// if (GrafreeD.clipboard == null)
4329	5705	// return;
..	..	@@ -4352,15 +5728,22 @@
4352	5728	if (copyit)
4353	5729	{
4354	5730	// paste(false);
4355		- CloneClipboard(false); // sept 2014
	5731	+ if (clone)
	5732	+ {
	5733	+ CloneClipboard(false); // sept 2014
	5734	+ }
	5735	+ else
	5736	+ {
	5737	+ paste(false);
	5738	+ }
4356	5739	}
4357	5740	else
4358	5741	{
4359	5742	boolean first = true;
4360	5743
4361		- if (GrafreeD.clipboardIsTempGroup)
	5744	+ if (Grafreed.clipboardIsTempGroup)
4362	5745	{
4363		- Composite temp = (Composite)GrafreeD.clipboard;
	5746	+ Composite temp = (Composite)Grafreed.clipboard;
4364	5747	Object3D copy;
4365	5748	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4366	5749	{
..	..	@@ -4370,7 +5753,7 @@
4370	5753	}
4371	5754	} else
4372	5755	{
4373		- linkSomething(GrafreeD.clipboard); //.get(0));
	5756	+ linkSomething(Grafreed.clipboard); //.get(0));
4374	5757	}
4375	5758	}
4376	5759	}
..	..	@@ -4447,6 +5830,10 @@
4447	5830
4448	5831	void group(Object3D csg, boolean grab)
4449	5832	{
	5833	+ if (Globals.REPLACEONMAKE)
	5834	+ Save();
	5835	+ boolean keep = Globals.REPLACEONMAKE;
	5836	+ Globals.REPLACEONMAKE = false;
4450	5837	if (//false) // why??
4451	5838	!group.selection.isEmpty())
4452	5839	{
..	..	@@ -4560,10 +5947,15 @@
4560	5947	//node.add(csg);
4561	5948	//makeSomething(node);
4562	5949	makeSomething(csg);
	5950	+ Globals.REPLACEONMAKE = keep;
4563	5951	}
4564	5952
4565	5953	void Ungroup(Object3D g)
4566	5954	{
	5955	+ if (Globals.REPLACEONMAKE)
	5956	+ Save();
	5957	+ boolean keep = Globals.REPLACEONMAKE;
	5958	+ Globals.REPLACEONMAKE = false;
4567	5959	if (g instanceof HiddenObject)
4568	5960	{
4569	5961	HiddenObject h = (HiddenObject) g;
..	..	@@ -4580,6 +5972,7 @@
4580	5972	objEditor.makeSomething(g.get(i), false);
4581	5973	}
4582	5974	}
	5975	+ Globals.REPLACEONMAKE = keep;
4583	5976	}
4584	5977
4585	5978	void ungroup()
..	..	@@ -4775,21 +6168,6 @@
4775	6168	}
4776	6169	*/
4777	6170
4778		- void ImportGFD()
4779		- {
4780		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4781		- browser.show();
4782		- String filename = browser.getFile();
4783		- if (filename != null && filename.length() > 0)
4784		- {
4785		- String fullname = browser.getDirectory() + filename;
4786		-
4787		- //Object3D readobj =
4788		- objEditor.ReadGFD(fullname, objEditor);
4789		- //makeSomething(readobj);
4790		- }
4791		- }
4792		-
4793	6171	/*
4794	6172	public void Callback(Object obj)
4795	6173	{
..	..	@@ -4813,26 +6191,9 @@
4813	6191	}
4814	6192	*/
4815	6193
4816		- void ImportVRMLX3D()
4817		- {
4818		- if (GrafreeD.standAlone)
4819		- {
4820		- /**/
4821		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4822		- browser.show();
4823		- String filename = browser.getFile();
4824		- if (filename != null && filename.length() > 0)
4825		- {
4826		- String fullname = browser.getDirectory() + filename;
4827		- LoadVRMLX3D(fullname);
4828		- }
4829		- /**/
4830		- }
4831		- }
4832		-
4833	6194	String GetFile(String dialogName)
4834	6195	{
4835		- if (GrafreeD.standAlone)
	6196	+ if (Grafreed.standAlone)
4836	6197	{
4837	6198	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4838	6199	browser.show();
..	..	@@ -4896,10 +6257,48 @@
4896	6257	cButton flashSelectionButton;
4897	6258	cButton editButton;
4898	6259	cButton uneditButton;
	6260	+ JCheckBox allParamsButton;
4899	6261	cButton clearpanelButton;
4900		- cButton allParamsButton;
4901	6262	cButton unselectButton;
4902	6263
	6264	+ cButton restoreCameraButton;
	6265	+
	6266	+ cButton oneStepButton;
	6267	+
	6268	+ cButton groupButton;
	6269	+ cButton ungroupButton;
	6270	+ cButton compositeButton;
	6271	+ cButton switchButton;
	6272	+ cButton loopButton;
	6273	+ cButton textureButton;
	6274	+
	6275	+ cButton skybox1Button;
	6276	+ cButton skybox2Button;
	6277	+ cButton skybox3Button;
	6278	+ cButton skybox4Button;
	6279	+ cButton skybox5Button;
	6280	+ cButton skybox6Button;
	6281	+ cButton skybox7Button;
	6282	+
	6283	+ cButton skybox11Button;
	6284	+ cButton skybox12Button;
	6285	+ cButton skybox13Button;
	6286	+ cButton skybox14Button;
	6287	+ cButton skybox15Button;
	6288	+ cButton skybox16Button;
	6289	+ cButton skybox17Button;
	6290	+
	6291	+ cButton gridButton;
	6292	+ cButton boxButton;
	6293	+ cButton sphereButton;
	6294	+ cButton coneButton;
	6295	+ cButton torusButton;
	6296	+ cButton superButton;
	6297	+ cButton kleinButton;
	6298	+ cButton particlesButton;
	6299	+ cButton overlayButton;
	6300	+ cButton lightButton;
	6301	+
4903	6302	cButton screenfitButton;
4904	6303	cButton screenfitpointButton;
4905	6304	cButton snapobjectButton;
..	..	@@ -4911,14 +6310,6 @@
4911	6310
4912	6311	cButton setsupportButton;
4913	6312
4914		- cButton twoButton;
4915		- cButton sixButton;
4916		- cButton threeButton;
4917		- cButton sevenButton;
4918		- cButton fourButton; // full panel
4919		- cButton oneButton; // full XYZ
4920		- //cButton currentLayout;
4921		-
4922	6313	//
4923	6314	//Composite
4924	6315	Object3D // to do !!
..	..	@@ -4928,10 +6319,12 @@
4928	6319	//JTree jTree;
4929	6320	private MenuItem lookAtItem;
4930	6321	private MenuItem lookFromItem;
4931		- private MenuItem switchItem;
4932		- private MenuItem cutItem;
4933		- private MenuItem duplicateItem;
4934		- private MenuItem cloneItem;
	6322	+ private MenuItem switchViewItem;
	6323	+ private JMenuItem cutItem;
	6324	+ private MenuItem undoItem;
	6325	+ private MenuItem redoItem;
	6326	+ private JMenuItem duplicateItem;
	6327	+ private JMenuItem cloneItem;
4935	6328	private MenuItem cloneSupportItem;
4936	6329	private MenuItem overwriteGeoItem;
4937	6330	private MenuItem overwriteMatItem;
..	..	@@ -4943,7 +6336,7 @@
4943	6336	private MenuItem linkverticesItem;
4944	6337	private MenuItem relinkverticesItem;
4945	6338	private MenuItem setMasterItem;
4946		- private MenuItem resetMeshItem;
	6339	+ private MenuItem resetAllItem;
4947	6340	private MenuItem stepAllItem;
4948	6341	private MenuItem revertMeshItem;
4949	6342	private MenuItem poseMeshItem;
..	..	@@ -4952,12 +6345,13 @@
4952	6345	private MenuItem cloneGeometriesItem;
4953	6346	private MenuItem shareGeometriesItem;
4954	6347	private MenuItem mergeGeometriesItem;
4955		- private MenuItem copyItem;
	6348	+ private JMenuItem copyItem;
4956	6349	private MenuItem pasteItem;
4957		- private MenuItem pasteLinkItem;
4958		- private MenuItem pasteCloneItem;
4959		- private MenuItem pasteExpandItem;
4960		- private MenuItem clearItem;
	6350	+ private JMenuItem pasteIntoItem;
	6351	+ private JMenuItem pasteLinkItem;
	6352	+ private JMenuItem pasteCloneItem;
	6353	+ private JMenuItem pasteExpandItem;
	6354	+ private JMenuItem deleteItem;
4961	6355	private MenuItem clearAllItem;
4962	6356	private MenuItem genUVItem;
4963	6357	private MenuItem genNormalsMESHItem;
..	..	@@ -4983,6 +6377,7 @@
4983	6377	private MenuItem clipMeshItem;
4984	6378	private MenuItem smoothMeshItem;
4985	6379	private MenuItem clearMaterialsItem;
	6380	+ private MenuItem clearVersionsItem;
4986	6381
4987	6382	private MenuItem liveleavesItem;
4988	6383	private MenuItem unliveleavesItem;
..	..	@@ -4992,6 +6387,10 @@
4992	6387	private MenuItem showleavesItem;
4993	6388	private MenuItem markleavesItem;
4994	6389	private MenuItem unmarkleavesItem;
	6390	+ private MenuItem rewindleavesItem;
	6391	+ private MenuItem unrewindleavesItem;
	6392	+ private MenuItem randomleavesItem;
	6393	+ private MenuItem unrandomleavesItem;
4995	6394
4996	6395	private MenuItem flipVItem;
4997	6396	private MenuItem unflipVItem;
..	..	@@ -5002,16 +6401,21 @@
5002	6401	private MenuItem maxTexturesItem;
5003	6402	private MenuItem panoTexturesItem;
5004	6403
	6404	+ private MenuItem textureRatioRItem;
	6405	+ private MenuItem textureRatioGItem;
	6406	+ private MenuItem textureRatioBItem;
5005	6407	private MenuItem resetCentroidItem;
5006		- private MenuItem transformgeometryItem;
	6408	+ private MenuItem resetCentroidXZItem;
5007	6409	private MenuItem resetTransformItem;
	6410	+ private MenuItem transformGeometryItem;
	6411	+ private MenuItem transformChildrenItem;
5008	6412	private MenuItem hideItem;
5009		- private MenuItem grabItem;
	6413	+ private JMenuItem grabItem;
5010	6414	private MenuItem backItem;
5011	6415	private MenuItem frontItem;
5012	6416	private MenuItem cameraItem;
5013	6417	private MenuItem compositeItem;
5014		- private MenuItem randomItem;
	6418	+ private MenuItem switchItem;
5015	6419	private MenuItem physicsItem;
5016	6420	private MenuItem frameselectorItem;
5017	6421	private MenuItem scriptNodeItem;
..	..	@@ -5019,7 +6423,7 @@
5019	6423	private MenuItem switchTransfoItem;
5020	6424	private MenuItem morphItem;
5021	6425	private MenuItem linkerItem;
5022		- private MenuItem ungroupItem;
	6426	+ private JMenuItem ungroupItem;
5023	6427	private MenuItem editItem;
5024	6428	private MenuItem openWindowItem;
5025	6429	private MenuItem editLeafItem;
..	..	@@ -5035,6 +6439,8 @@
5035	6439	private MenuItem attachBumpItem;
5036	6440	private MenuItem detachBumpItem;
5037	6441	private MenuItem pigmentBumpItem;
	6442	+ private MenuItem embedTexturesItem;
	6443	+ private MenuItem deEmbedTexturesItem;
5038	6444
5039	6445	private MenuItem particleItem;
5040	6446	private MenuItem ragdollItem;
..	..	@@ -5051,7 +6457,7 @@
5051	6457	private MenuItem blobItem;
5052	6458	private MenuItem latheItem;
5053	6459	private MenuItem bezierItem;
5054		- private MenuItem checkerItem;
	6460	+ private MenuItem overlayItem;
5055	6461	private MenuItem meshItem;
5056	6462	// private MenuItem meshGroupItem;
5057	6463	private MenuItem springItem;
..	..	@@ -5073,11 +6479,6 @@
5073	6479	private MenuItem doubleItem;
5074	6480	private MenuItem tripleItem;
5075	6481
5076		- private MenuItem importGFDItem;
5077		- private MenuItem importVRMLX3DItem;
5078		- private MenuItem import3DSItem;
5079		- private MenuItem importOBJItem;
5080		-
5081	6482	private MenuItem computeAOItem;
5082	6483	private MenuItem recompileItem;
5083	6484	private MenuItem editScriptItem;
..	..	@@ -5087,4 +6488,8 @@
5087	6488	private MenuItem analyzeItem;
5088	6489	private MenuItem dumpItem;
5089	6490	//boolean freezemodel = false;
	6491	+
	6492	+ Menu cameraMenu;
	6493	+ MenuItem editCameraItem;
	6494	+ MenuItem restoreCameraItem;
5090	6495	}