~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -12,9 +12,11 @@
12	12	import com.jme.math.Vector3f;
13	13	import com.jme.renderer.ColorRGBA;
14	14
	15	+import grafeme.ui.*;
15	16	//import buoy.widget.BFileChooser;
16	17
17	18	class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
	19	+ Grafreed.iResourceCallBack,
18	20	ObjectUI,
19	21	Runnable,
20	22	ActionListener,
..	..	@@ -22,6 +24,360 @@
22	24	DragGestureListener, DragSourceListener, DropTargetListener,
23	25	ItemListener // ListSelectionListener
24	26	{
	27	+
	28	+ public void AddSkyboxButton(String f, String s, cGridBag row)
	29	+ {
	30	+ cButton skyboxButton;
	31	+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
	32	+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
	33	+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
	34	+ skyboxButton.setToolTipText(s.equals("") ? "No background" : s);
	35	+ skyboxButton.addActionListener(new ActionListener()
	36	+ {
	37	+ @Override
	38	+ public void actionPerformed(ActionEvent e)
	39	+ {
	40	+ ChangeSkybox(path);
	41	+ }
	42	+ });
	43	+ }
	44	+
	45	+ public void AddTextureButton(String f, String c, final String t, int count, cGridBag row)
	46	+ {
	47	+ cButton textureButton;
	48	+ final String path = "textures/" + f + "/" + c + "/"; // + t;
	49	+ row.add(textureButton = GetButton(path + "icons/" + t, !Grafreed.NIMBUSLAF));
	50	+ textureButton.setToolTipText(c + count);
	51	+ textureButton.addActionListener(new ActionListener()
	52	+ {
	53	+ @Override
	54	+ public void actionPerformed(ActionEvent e)
	55	+ {
	56	+ ChangeTexture(path + t);
	57	+ }
	58	+ });
	59	+ }
	60	+
	61	+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
	62	+ {
	63	+ cGridBag tab0 = new cGridBag().setVertical(true);
	64	+
	65	+ tab0.setName("Urban");
	66	+ skyboxpanel.add(tab0);
	67	+
	68	+ cGridBag row0 = new cGridBag();
	69	+ cGridBag row1 = new cGridBag();
	70	+ cGridBag row2 = new cGridBag();
	71	+ cGridBag row3 = new cGridBag();
	72	+ cGridBag row4 = new cGridBag();
	73	+ cGridBag row5 = new cGridBag();
	74	+ cGridBag row6 = new cGridBag();
	75	+
	76	+ AddSkyboxButton("default", "", row0);
	77	+ //AddSkyboxButton("default", "cornell", row0);
	78	+ AddSkyboxButton("penguins", "dust", row0);
	79	+ AddSkyboxButton("penguins", "tropic", row0);
	80	+ AddSkyboxButton("penguins", "yonder", row0);
	81	+
	82	+ AddSkyboxButton("default", "uffizi", row1);
	83	+ AddSkyboxButton("bridge", "Bridge", row1);
	84	+ AddSkyboxButton("bridge", "Bridge2", row1);
	85	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	86	+
	87	+ AddSkyboxButton("urban", "Parliament", row2);
	88	+ AddSkyboxButton("urban", "Roundabout", row2);
	89	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	90	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	91	+
	92	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	93	+ AddSkyboxButton("urban", "UnionSquare", row3);
	94	+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
	95	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	96	+
	97	+ AddSkyboxButton("park", "Buddha", row4);
	98	+ AddSkyboxButton("park", "CNTower2", row4);
	99	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	100	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	101	+
	102	+ AddSkyboxButton("park", "Park", row5);
	103	+ AddSkyboxButton("park", "Pond", row5);
	104	+ AddSkyboxButton("park", "Skansen", row5);
	105	+ AddSkyboxButton("park", "Skansen2", row5);
	106	+
	107	+ AddSkyboxButton("park", "Skansen3", row6);
	108	+ AddSkyboxButton("park", "Skansen4", row6);
	109	+ AddSkyboxButton("park", "Skansen5", row6);
	110	+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
	111	+
	112	+ tab0.add(row0);
	113	+ tab0.add(row1);
	114	+ tab0.add(row2);
	115	+ tab0.add(row3);
	116	+ tab0.add(row4);
	117	+ tab0.add(row5);
	118	+ tab0.add(row6);
	119	+
	120	+ for (int i=5; --i>=0;)
	121	+ {
	122	+ //oe.toolboxPanel.Return();
	123	+ //tab0.add(new cGridBag());
	124	+ }
	125	+ }
	126	+
	127	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	128	+ {
	129	+ cGridBag tab0 = new cGridBag().setVertical(true);
	130	+
	131	+ tab0.setName("Nature");
	132	+ skyboxpanel.add(tab0);
	133	+
	134	+ cGridBag row0 = new cGridBag();
	135	+ cGridBag row1 = new cGridBag();
	136	+ cGridBag row2 = new cGridBag();
	137	+ cGridBag row3 = new cGridBag();
	138	+ cGridBag row4 = new cGridBag();
	139	+ cGridBag row5 = new cGridBag();
	140	+ cGridBag row6 = new cGridBag();
	141	+
	142	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	143	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	144	+ AddSkyboxButton("beach", "PalmTrees", row0);
	145	+ AddSkyboxButton("beach", "Tenerife", row0);
	146	+
	147	+ AddSkyboxButton("beach", "Tenerife2", row1);
	148	+ AddSkyboxButton("beach", "Tenerife3", row1);
	149	+ AddSkyboxButton("field", "FishPond", row1);
	150	+ AddSkyboxButton("field", "Footballfield", row1);
	151	+
	152	+ AddSkyboxButton("field", "Meadow", row2);
	153	+ AddSkyboxButton("field", "Sorsele", row2);
	154	+ AddSkyboxButton("field", "Sorsele2", row2);
	155	+ AddSkyboxButton("field", "Sorsele3", row2);
	156	+
	157	+ AddSkyboxButton("forest", "Brudslojan", row3);
	158	+ AddSkyboxButton("forest", "Langholmen2", row3);
	159	+ AddSkyboxButton("forest", "Plants", row3);
	160	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	161	+
	162	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	163	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	164	+ AddSkyboxButton("mountain", "Teide", row4);
	165	+ AddSkyboxButton("park", "Tantolunden4", row4);
	166	+
	167	+ AddSkyboxButton("park", "Stairs", row5);
	168	+ AddSkyboxButton("default", "skycube", row6);
	169	+ AddSkyboxButton("rocky", "Langholmen", row5);
	170	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	171	+
	172	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	173	+ AddSkyboxButton("default", "CloudyHills", row6);
	174	+ AddSkyboxButton("daz", "Autumn", row6);
	175	+ AddSkyboxButton("daz", "MountainTrail", row6);
	176	+ /*
	177	+Autumn
	178	+Greenlands
	179	+MountainTrail
	180	+Oasis
	181	+TheRock
	182	+TopOfTheWorld
	183	+Winter
	184	+ */
	185	+
	186	+ tab0.add(row0);
	187	+ tab0.add(row1);
	188	+ tab0.add(row2);
	189	+ tab0.add(row3);
	190	+ tab0.add(row4);
	191	+ tab0.add(row5);
	192	+ tab0.add(row6);
	193	+
	194	+ for (int i=5; --i>=0;)
	195	+ {
	196	+ //oe.toolboxPanel.Return();
	197	+ //tab0.add(new cGridBag());
	198	+ }
	199	+ }
	200	+
	201	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	202	+ {
	203	+ cGridBag tab0 = new cGridBag().setVertical(true);
	204	+
	205	+ tab0.setName("Night");
	206	+ skyboxpanel.add(tab0);
	207	+
	208	+ cGridBag row0 = new cGridBag();
	209	+ cGridBag row1 = new cGridBag();
	210	+ cGridBag row2 = new cGridBag();
	211	+ cGridBag row3 = new cGridBag();
	212	+ cGridBag row4 = new cGridBag();
	213	+ cGridBag row5 = new cGridBag();
	214	+ cGridBag row6 = new cGridBag();
	215	+
	216	+ AddSkyboxButton("night", "NightPath", row0);
	217	+ AddSkyboxButton("night", "PondNight", row0);
	218	+ AddSkyboxButton("night", "Powerlines", row0);
	219	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	220	+
	221	+ AddSkyboxButton("urban", "CNTower", row1);
	222	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	223	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	224	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
	225	+
	226	+ AddSkyboxButton("penguins", "kenon_star", row2);
	227	+ AddSkyboxButton("persson", "corona", row2);
	228	+ AddSkyboxButton("persson", "spaceskybox", row2);
	229	+ AddSkyboxButton("indoors", "Vasa", row2);
	230	+
	231	+ AddSkyboxButton("winter", "Backyard", row3);
	232	+ AddSkyboxButton("winter", "Creek", row3);
	233	+ AddSkyboxButton("winter", "FootballField3", row3);
	234	+ AddSkyboxButton("winter", "Forest", row3);
	235	+
	236	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	237	+ AddSkyboxButton("winter", "House", row4);
	238	+ AddSkyboxButton("winter", "IceLake", row4);
	239	+ AddSkyboxButton("winter", "IceRiver", row4);
	240	+
	241	+ AddSkyboxButton("winter", "Park3", row5);
	242	+ AddSkyboxButton("winter", "PondWinter", row5);
	243	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	244	+ AddSkyboxButton("winter", "Vindelalven", row5);
	245	+
	246	+ AddSkyboxButton("daz", "TheRock", row6);
	247	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	248	+ AddSkyboxButton("daz", "Winter", row6);
	249	+ AddSkyboxButton("mountain", "Ryfjallet", row6);
	250	+
	251	+ tab0.add(row0);
	252	+ tab0.add(row1);
	253	+ tab0.add(row2);
	254	+ tab0.add(row3);
	255	+ tab0.add(row4);
	256	+ tab0.add(row5);
	257	+ tab0.add(row6);
	258	+
	259	+ for (int i=5; --i>=0;)
	260	+ {
	261	+ //oe.toolboxPanel.Return();
	262	+ //tab0.add(new cGridBag());
	263	+ }
	264	+ }
	265	+
	266	+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
	267	+ {
	268	+ cGridBag tab0 = new cGridBag().setVertical(true);
	269	+
	270	+ tab0.setName("Others");
	271	+ skyboxpanel.add(tab0);
	272	+
	273	+ cGridBag row0 = new cGridBag();
	274	+ cGridBag row1 = new cGridBag();
	275	+ cGridBag row2 = new cGridBag();
	276	+ cGridBag row3 = new cGridBag();
	277	+ cGridBag row4 = new cGridBag();
	278	+ cGridBag row5 = new cGridBag();
	279	+ cGridBag row6 = new cGridBag();
	280	+
	281	+ AddSkyboxButton("mayhem", "afterrain", row0);
	282	+ AddSkyboxButton("mayhem", "aqua4", row0);
	283	+ AddSkyboxButton("mayhem", "aqua9", row0);
	284	+ AddSkyboxButton("mayhem", "flame", row0);
	285	+
	286	+ AddSkyboxButton("mayhem", "h2s", row1);
	287	+ AddSkyboxButton("mayhem", "prehistoric", row1);
	288	+ AddSkyboxButton("mayhem", "scorched", row1);
	289	+ AddSkyboxButton("penguins", "desertdawn", row1);
	290	+
	291	+ AddSkyboxButton("persson", "Citadella", row2);
	292	+ AddSkyboxButton("persson", "Citadella2", row2);
	293	+ AddSkyboxButton("persson", "clouds1", row2);
	294	+ AddSkyboxButton("penguins", "wrath", row2);
	295	+
	296	+ AddSkyboxButton("persson", "FishermansBastion", row3);
	297	+ AddSkyboxButton("persson", "HeroesSquare", row3);
	298	+ AddSkyboxButton("indoors", "DallasW", row3);
	299	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
	300	+
	301	+ AddSkyboxButton("persson", "LancellottiChapel", row4);
	302	+ AddSkyboxButton("persson", "PereaBeach1", row4);
	303	+ AddSkyboxButton("persson", "PereaBeach2", row4);
	304	+ AddSkyboxButton("persson", "redeclipse", row4);
	305	+
	306	+ AddSkyboxButton("daz", "Greenlands", row5);
	307	+ AddSkyboxButton("daz", "Oasis", row5);
	308	+ AddSkyboxButton("elyvisions", "arch3", row5);
	309	+ AddSkyboxButton("elyvisions", "calm_sea", row5);
	310	+
	311	+ AddSkyboxButton("elyvisions", "rainbow", row6);
	312	+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
	313	+ AddSkyboxButton("elyvisions", "heaven", row6);
	314	+ AddSkyboxButton("elyvisions", "hot", row6);
	315	+
	316	+ tab0.add(row0);
	317	+ tab0.add(row1);
	318	+ tab0.add(row2);
	319	+ tab0.add(row3);
	320	+ tab0.add(row4);
	321	+ tab0.add(row5);
	322	+ tab0.add(row6);
	323	+
	324	+ for (int i=5; --i>=0;)
	325	+ {
	326	+ //oe.toolboxPanel.Return();
	327	+ //tab0.add(new cGridBag());
	328	+ }
	329	+ }
	330	+
	331	+ public void ChangeSkybox(String skybox)
	332	+ {
	333	+ if (skybox.endsWith("/"))
	334	+ {
	335	+ group.skyboxname = null;
	336	+ group.skyboxext = null;
	337	+ cameraView.repaint();
	338	+ }
	339	+ else
	340	+ {
	341	+ //cameraView.envyoff = false;
	342	+ group.skyboxname = skybox;
	343	+ group.skyboxext = "jpg";
	344	+ cameraView.repaint();
	345	+ }
	346	+ }
	347	+
	348	+ public void CreateSkyboxPanel(cGridBag skyboxPanel)
	349	+ {
	350	+ JTabbedPane skyboxpane = new JTabbedPane();
	351	+
	352	+ AddSkyboxTab0(skyboxpane);
	353	+ AddSkyboxTab1(skyboxpane);
	354	+ AddSkyboxTab2(skyboxpane);
	355	+ AddSkyboxTab3(skyboxpane);
	356	+
	357	+ skyboxPanel.add(skyboxpane);
	358	+ }
	359	+
	360	+ public void ChangeTexture(String texture)
	361	+ {
	362	+ for (int i=0; i<group.selection.size(); i++)
	363	+ {
	364	+ Object3D obj = group.selection.get(i);
	365	+ obj.SetPigmentTexture("@" + texture);
	366	+ }
	367	+
	368	+ refreshContents();
	369	+ }
	370	+
	371	+ public void Show3DView()
	372	+ {
	373	+ // bug
	374	+ //gridPanel.setDividerLocation(1.0);
	375	+ //bigPanel.setDividerLocation(0.0);
	376	+ bigThree.ClearUI();
	377	+ bigThree.add(centralPanel);
	378	+ bigThree.FlushUI();
	379	+ }
	380	+
25	381	//ObjEditor objEditor;
26	382	public void closeUI2()
27	383	{
..	..	@@ -59,6 +415,14 @@
59	415	this.copy = this.group = group;
60	416	//selectees = this.group.selectees;
61	417
	418	+ if (copy.versionlist == null)
	419	+ {
	420	+ copy.versionlist = new Object3D[100];
	421	+ copy.versionindex = -1;
	422	+
	423	+ Save(true);
	424	+ }
	425	+
62	426	if(ui)
63	427	SetupUI(objEditor);
64	428	}
..	..	@@ -73,17 +437,29 @@
73	437	this.copy = this.group = copy;
74	438	//selectees = this.group.selectees;
75	439
76		- SetupMenu2(objEditor);
	440	+ SetupMenu2(this); //objEditor);
77	441	SetupUI2(objEditor);
78	442	objEditor.SetupUI(true);
79	443	SetupViews(objEditor);
80	444
81	445	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	446	+
	447	+ if (copy.versionlist == null)
	448	+ {
	449	+ copy.versionlist = new Object3D[100];
	450	+ copy.versionindex = -1;
	451	+
	452	+ Save(true);
	453	+ }
82	454	}
83	455
84	456	void CloneSelection(boolean supports)
85	457	{
86		- // Object3D keep = GraphreeD.clipboard;
	458	+ if (Globals.REPLACEONMAKE)
	459	+ Save();
	460	+ boolean keep = Globals.REPLACEONMAKE;
	461	+ Globals.REPLACEONMAKE = false;
	462	+ // Object3D keep = GrafreeD.clipboard;
87	463	//Object3D obj;
88	464	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
89	465	{
..	..	@@ -93,18 +469,19 @@
93	469
94	470	makeSomething(clone, i==group.selection.size()-1);
95	471	}
	472	+ Globals.REPLACEONMAKE = keep;
96	473	}
97	474
98	475	void CloneClipboard(boolean supports)
99	476	{
100		- assert(GraphreeD.clipboard.parent == null);
101		- Object3D /Composite/ keepparent = GraphreeD.clipboard.get(0).parent;
102		- GraphreeD.clipboard.get(0).parent = null; // Avoid copy?
103		- if (LA.isIdentity(GraphreeD.clipboard.toParent))
104		- makeSomething(CloneObject(GraphreeD.clipboard.get(0), false));
	477	+ assert(Grafreed.clipboard.parent == null);
	478	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	479	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	480	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	481	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
105	482	else
106		- makeSomething(CloneObject(GraphreeD.clipboard, false));
107		- GraphreeD.clipboard.get(0).parent = keepparent;
	483	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	484	+ Grafreed.clipboard.get(0).parent = keepparent;
108	485	}
109	486
110	487	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -118,7 +495,7 @@
118	495	// obj.support = null;
119	496	if (!supports)
120	497	obj.SaveSupports();
121		- Object3D clone = (Object3D)GraphreeD.clone(obj);
	498	+ Object3D clone = (Object3D)Grafreed.clone(obj);
122	499	obj.parent = parent;
123	500	// obj.support = support;
124	501	// clone.support = support; // aout 2013
..	..	@@ -147,58 +524,156 @@
147	524
148	525	//JTextField nameField;
149	526
150		- void SetupMenu2(ObjEditor oe)
	527	+ void SetupMenu2(GroupEditor oe)
151	528	{
152		- oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
153		- //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
154		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
155		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
156		- oe.cameraMenu.add("-");
157		- openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
158		- openWindowItem.addActionListener(this);
159		- editLeafItem.addActionListener(this);
160		- lookAtItem.addActionListener(this);
161		- //lookFromItem.addActinoListener(this);
162		- //switchItem.addActionListener(this);
	529	+ oe.jTree = new cTree();
	530	+
163	531	Menu menu;
164	532	oe.menuBar.add(menu = new Menu("Edit"));
165	533	//editItem = menu.add(new MenuItem("Edit"));
166	534	//editItem.addActionListener(this);
167		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	535	+
	536	+// undoItem = menu.add(new MenuItem("Undo"));
	537	+// undoItem.addActionListener(this);
	538	+// redoItem = menu.add(new MenuItem("Redo"));
	539	+// redoItem.addActionListener(this);
	540	+// menu.add("-");
	541	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
168	542	duplicateItem.addActionListener(this);
169		- menu.add("-");
170		- cloneItem = menu.add(new MenuItem("Clone"));
	543	+
	544	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
171	545	cloneItem.addActionListener(this);
	546	+ //if (Globals.ADVANCED)
	547	+ {
172	548	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
173	549	cloneSupportItem.addActionListener(this);
	550	+ }
	551	+ oe.jTree.popup.addSeparator();
174	552	menu.add("-");
175		- cutItem = menu.add(new MenuItem("Cut"));
	553	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
176	554	cutItem.addActionListener(this);
177		- copyItem = menu.add(new MenuItem("Copy"));
	555	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
178	556	copyItem.addActionListener(this);
179	557	pasteItem = menu.add(new MenuItem("Paste"));
180	558	pasteItem.addActionListener(this);
181		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	559	+
	560	+ oe.jTree.popup.addSeparator();
	561	+ //menu.add("-");
	562	+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
	563	+ pasteIntoItem.addActionListener(this);
	564	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
182	565	pasteLinkItem.addActionListener(this);
183		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	566	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
184	567	pasteCloneItem.addActionListener(this);
185		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	568	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
186	569	// pasteExpandItem.addActionListener(this);
187		- clearItem = menu.add(new MenuItem("Clear"));
188		- clearItem.addActionListener(this);
	570	+ //menu.add("-");
	571	+ oe.jTree.popup.addSeparator();
	572	+
	573	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	574	+ deleteItem.addActionListener(this);
	575	+
	576	+ if (Globals.ADVANCED)
	577	+ {
	578	+ // Deletes the cameras...
189	579	clearAllItem = menu.add(new MenuItem("Clear All"));
190	580	clearAllItem.addActionListener(this);
	581	+ }
	582	+
	583	+ menuBar.add(cameraMenu = new Menu("View"));
	584	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	585	+ //zBufferItem.addActionListener(this);
	586	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	587	+ //normalLensItem.addActionListener(this);
	588	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	589	+ restoreCameraItem.addActionListener(this);
	590	+
	591	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	592	+// toggleFullScreenItem.addItemListener(this);
	593	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	594	+// cameraMenu.add("-");
	595	+//
	596	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	597	+// toggleTextureItem.addItemListener(this);
	598	+// toggleTextureItem.setState(CameraPane.textureon);
	599	+//
	600	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	601	+// toggleSwitchItem.addItemListener(this);
	602	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	603	+
	604	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	605	+ toggleHandleItem.addItemListener(this);
	606	+ toggleHandleItem.setState(CameraPane.HANDLES);
	607	+
	608	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	609	+ togglePaintItem.addItemListener(this);
	610	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	611	+
	612	+ if (Globals.ADVANCED)
	613	+ {
	614	+ cameraMenu.add("-");
	615	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	616	+ toggleLiveItem.addItemListener(this);
	617	+ toggleLiveItem.setState(Globals.isLIVE());
191	618
	619	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	620	+ stepItem.addActionListener(this);
	621	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	622	+ // toggleDLItem.addItemListener(this);
	623	+ // toggleDLItem.setState(false);
	624	+
	625	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	626	+ toggleRenderItem.addItemListener(this);
	627	+ toggleRenderItem.setState(!CameraPane.frozen);
	628	+
	629	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	630	+ toggleDebugItem.addItemListener(this);
	631	+ toggleDebugItem.setState(Globals.DEBUG);
	632	+
	633	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	634	+ toggleFrustumItem.addItemListener(this);
	635	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	636	+
	637	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	638	+ toggleFootContactItem.addItemListener(this);
	639	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	640	+
	641	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	642	+ toggleTimelineItem.addItemListener(this);
	643	+ }
	644	+
	645	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	646	+// toggleRootItem.addItemListener(this);
	647	+// toggleRootItem.setState(false);
	648	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	649	+// animationItem.addItemListener(this);
	650	+// animationItem.setState(CameraPane.ANIMATION);
	651	+ cameraMenu.add("-");
	652	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	653	+ editCameraItem.addActionListener(this);
	654	+
	655	+ if (Globals.ADVANCED)
	656	+ {
	657	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	658	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	659	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	660	+ oe.cameraMenu.add("-");
	661	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	662	+ openWindowItem.addActionListener(this);
	663	+ lookAtItem.addActionListener(this);
	664	+ //lookFromItem.addActinoListener(this);
	665	+ //switchViewItem.addActionListener(this);
	666	+ }
	667	+
192	668	oe.menuBar.add(menu = new Menu("Setting"));
193		- resetMeshItem = menu.add(new MenuItem("Reset All"));
194		- resetMeshItem.addActionListener(this);
195		- stepAllItem = menu.add(new MenuItem("Step All"));
196		- stepAllItem.addActionListener(this);
	669	+ if (Globals.ADVANCED)
	670	+ {
197	671	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
198	672	revertMeshItem.addActionListener(this);
199	673	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
200	674	resetreferencesItem.addActionListener(this);
201	675	menu.add("-");
	676	+ }
202	677	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
203	678	overwriteGeoItem.addActionListener(this);
204	679	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -210,73 +685,104 @@
210	685	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211	686	overwriteUVItem.addActionListener(this);
212	687	menu.add("-");
	688	+ if (Globals.ADVANCED)
	689	+ {
213	690	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214	691	generateMeshItem.addActionListener(this);
215	692	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216	693	poseMeshItem.addActionListener(this);
217	694	menu.add("-");
	695	+ }
218	696	resetsupportItem = menu.add(new MenuItem("Reset support"));
219	697	resetsupportItem.addActionListener(this);
220	698	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	699	linkverticesItem.addActionListener(this);
	700	+ relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
	701	+ relinkverticesItem.addActionListener(this);
	702	+
	703	+ if (Globals.ADVANCED)
	704	+ {
222	705	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
223	706	setMasterItem.addActionListener(this);
	707	+ }
224	708
225	709	oe.menuBar.add(menu = new Menu("Group"));
226		- grabItem = menu.add(new MenuItem("Grab"));
227		- grabItem.addActionListener(this);
228		- frontItem = menu.add(new MenuItem("Front"));
229		- frontItem.addActionListener(this);
	710	+// grabItem = menu.add(new MenuItem("Grab"));
	711	+// grabItem.addActionListener(this);
230	712	backItem = menu.add(new MenuItem("Back"));
231	713	backItem.addActionListener(this);
232		- compositeItem = menu.add(new MenuItem("Composite"));
233		- compositeItem.addActionListener(this);
234		- menu.add("-");
235		- randomItem = menu.add(new MenuItem("Random"));
236		- randomItem.addActionListener(this);
237		- physicsItem = menu.add(new MenuItem("Physics"));
238		- physicsItem.addActionListener(this);
239		- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
240		- frameselectorItem.addActionListener(this);
	714	+ frontItem = menu.add(new MenuItem("Front"));
	715	+ frontItem.addActionListener(this);
	716	+// compositeItem = menu.add(new MenuItem("Composite"));
	717	+// compositeItem.addActionListener(this);
	718	+
	719	+ if (Globals.ADVANCED)
	720	+ {
	721	+ hideItem = menu.add(new MenuItem("Hidden Group"));
	722	+ hideItem.addActionListener(this);
	723	+ }
	724	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
	725	+ ungroupItem.addActionListener(this);
	726	+
	727	+// menu.add("-");
	728	+//
	729	+// switchItem = menu.add(new MenuItem("Switch node"));
	730	+// switchItem.addActionListener(this);
	731	+ if (Globals.ADVANCED)
	732	+ {
241	733	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
242	734	switchGeoItem.addActionListener(this);
243	735	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
244	736	switchTransfoItem.addActionListener(this);
245		- morphItem = menu.add(new MenuItem("Morph"));
	737	+ morphItem = menu.add(new MenuItem("Morph Group"));
246	738	morphItem.addActionListener(this);
	739	+
	740	+ menu.add("-");
	741	+ physicsItem = menu.add(new MenuItem("Physics"));
	742	+ physicsItem.addActionListener(this);
	743	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	744	+ frameselectorItem.addActionListener(this);
247	745	scriptNodeItem = menu.add(new MenuItem("Script Node"));
248	746	scriptNodeItem.addActionListener(this);
249		- cameraItem = menu.add(new MenuItem("Camera"));
250		- cameraItem.addActionListener(this);
	747	+ }
251	748
252	749	oe.menuBar.add(menu = new Menu("Object"));
253		- textureItem = menu.add(new MenuItem("Texture"));
254		- textureItem.addActionListener(this);
	750	+// textureItem = menu.add(new MenuItem("Texture"));
	751	+// textureItem.addActionListener(this);
	752	+ billboardItem = menu.add(new MenuItem("Billboard"));
	753	+ billboardItem.addActionListener(this);
255	754	csgItem = menu.add(new MenuItem("CSG"));
256	755	csgItem.addActionListener(this);
257		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	756	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
258	757	shadowXItem.addActionListener(this);
259		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	758	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
260	759	shadowYItem.addActionListener(this);
261		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	760	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
262	761	shadowZItem.addActionListener(this);
	762	+ attributeItem = menu.add(new MenuItem("Attribute"));
	763	+ attributeItem.addActionListener(this);
	764	+
	765	+ if (Globals.ADVANCED)
	766	+ {
	767	+ menu.add("-");
263	768	linkerItem = menu.add(new MenuItem("Linker"));
264	769	linkerItem.addActionListener(this);
265	770	templateItem = menu.add(new MenuItem("Template"));
266	771	templateItem.addActionListener(this);
267		- attributeItem = menu.add(new MenuItem("Attribute"));
268		- attributeItem.addActionListener(this);
269	772	pointflowItem = menu.add(new MenuItem("Point Flow"));
270	773	pointflowItem.addActionListener(this);
	774	+ }
271	775	menu.add("-");
272		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
273		- transformgeometryItem.addActionListener(this);
274	776	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
275	777	resetTransformItem.addActionListener(this);
276	778	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
277	779	resetCentroidItem.addActionListener(this);
278		- ungroupItem = menu.add(new MenuItem("Ungroup"));
279		- ungroupItem.addActionListener(this);
	780	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	781	+ resetCentroidXZItem.addActionListener(this);
	782	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	783	+ transformGeometryItem.addActionListener(this);
	784	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	785	+ transformChildrenItem.addActionListener(this);
280	786
281	787	oe.menuBar.add(menu = new Menu("Geometry"));
282	788	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -285,6 +791,13 @@
285	791	genNormalsORGANItem.addActionListener(this);
286	792	genNormalsCADItem = menu.add(new MenuItem("CAD Normals"));
287	793	genNormalsCADItem.addActionListener(this);
	794	+ genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
	795	+ genNormalsMESHItem.addActionListener(this);
	796	+ if (Globals.ADVANCED)
	797	+ {
	798	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
	799	+ genNormalsMINEItem.addActionListener(this);
	800	+ }
288	801	stripifyItem = menu.add(new MenuItem("Stripify"));
289	802	stripifyItem.addActionListener(this);
290	803	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -306,23 +819,34 @@
306	819	reduce34MeshItem.addActionListener(this);
307	820	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
308	821	increaseMeshItem.addActionListener(this);
309		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
310		- smoothMeshItem.addActionListener(this);
311	822	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
312	823	clipMeshItem.addActionListener(this);
	824	+
	825	+ if (Globals.ADVANCED)
	826	+ {
	827	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	828	+ smoothMeshItem.addActionListener(this);
	829	+ }
313	830
314	831	oe.menuBar.add(menu = new Menu("Attributes"));
315	832	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
316	833	clearMaterialsItem.addActionListener(this);
	834	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	835	+ resetAllItem.addActionListener(this);
	836	+ stepAllItem = menu.add(new MenuItem("Step All"));
	837	+ stepAllItem.addActionListener(this);
317	838	menu.add("-");
318	839	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
319	840	liveleavesItem.addActionListener(this);
320	841	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
321	842	unliveleavesItem.addActionListener(this);
	843	+ if (Globals.ADVANCED)
	844	+ {
322	845	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
323	846	supportleavesItem.addActionListener(this);
324	847	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
325	848	unsupportleavesItem.addActionListener(this);
	849	+ }
326	850	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
327	851	hideleavesItem.addActionListener(this);
328	852	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -331,6 +855,14 @@
331	855	markleavesItem.addActionListener(this);
332	856	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
333	857	unmarkleavesItem.addActionListener(this);
	858	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	859	+ rewindleavesItem.addActionListener(this);
	860	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	861	+ unrewindleavesItem.addActionListener(this);
	862	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	863	+ randomleavesItem.addActionListener(this);
	864	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	865	+ unrandomleavesItem.addActionListener(this);
334	866	menu.add("-");
335	867	flipVItem = menu.add(new MenuItem("Flip V"));
336	868	flipVItem.addActionListener(this);
..	..	@@ -356,53 +888,129 @@
356	888	attachBumpItem.addActionListener(this);
357	889	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
358	890	pigmentBumpItem.addActionListener(this);
	891	+ //embedTexturesItem
359	892	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
360	893	detachPigmentItem.addActionListener(this);
361	894	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
362	895	detachBumpItem.addActionListener(this);
	896	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	897	+ embedTexturesItem.addActionListener(this);
	898	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	899	+ deEmbedTexturesItem.addActionListener(this);
363	900	menu.add("-");
364	901	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
365	902	sortbysizeItem.addActionListener(this);
366	903	sortbynameItem = menu.add(new MenuItem("Sort by name"));
367	904	sortbynameItem.addActionListener(this);
368	905	menu.add("-");
	906	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	907	+ shareGeometriesItem.addActionListener(this);
	908	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	909	+ mergeGeometriesItem.addActionListener(this);
	910	+ menu.add("-");
	911	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	912	+ editLeafItem.addActionListener(this);
	913	+ if (Globals.ADVANCED)
	914	+ {
	915	+ // Pretty much the same as duplicate and clone.
369	916	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
370	917	extractGeometriesItem.addActionListener(this);
371	918	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
372	919	cloneGeometriesItem.addActionListener(this);
373		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
374		- shareGeometriesItem.addActionListener(this);
375		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
376		- mergeGeometriesItem.addActionListener(this);
	920	+ }
377	921
378	922	oe.menuBar.add(menu = new Menu("Insert"));
379	923	buildCreateMenu(menu);
380	924
381		-
382		- oe.menuBar.add(menu = new Menu("Include"));
383		- importGFDItem = menu.add(new MenuItem("GraphreeD Object..."));
384		- importGFDItem.addActionListener(this);
385		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
386		- importVRMLX3DItem.addActionListener(this);
387		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
388		- importOBJItem.addActionListener(this);
389		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
390		- import3DSItem.addActionListener(this);
391		-
392	925	oe.menuBar.add(menu = new Menu("Tools"));
393	926	buildToolsMenu(menu);
394	927	}
395	928
	929	+ JTabbedPane resourcecontainer;
	930	+ cGridBag currenttab;
	931	+ boolean added; // patch for jar
	932	+
	933	+ int tabcount = 0;
	934	+ int colcount = 0;
	935	+ int rowcount = 0;
	936	+ int texturecount = 0;
	937	+
	938	+ int columns = 5;
	939	+ int rows = 7;
	940	+
	941	+ public void ResourceCallBack(String[] path)
	942	+ {
	943	+ for (int i = 0; i < path.length; i++)
	944	+ System.out.print(path[i] + "/");
	945	+ System.out.println();
	946	+
	947	+ if (//rowcount == 0 \|\|
	948	+ path.length == 1)
	949	+ {
	950	+ currenttab = new cGridBag();
	951	+ added = false;
	952	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	953	+ currenttab.setName(tabname);
	954	+ rowcount = 1;
	955	+ colcount = 0;
	956	+ texturecount = 0;
	957	+ }
	958	+
	959	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	960	+ {
	961	+ if (!added)
	962	+ {
	963	+ added = true;
	964	+ resourcecontainer.add(currenttab);
	965	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	966	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	967	+ }
	968	+
	969	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	970	+
	971	+ if (++colcount >= columns)
	972	+ {
	973	+ colcount = 0;
	974	+ currenttab.Return();
	975	+
	976	+ if (rowcount++ >= rows)
	977	+ {
	978	+ rowcount = 0;
	979	+ }
	980	+ }
	981	+ }
	982	+ else
	983	+ {
	984	+// if (!path[path.length-1].equals("icons"))
	985	+// resourcecontainer.Return();
	986	+ }
	987	+ }
	988	+
	989	+ void CreateTexturePanel(cGridBag container)
	990	+ {
	991	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	992	+ container.add(resourcecontainer);
	993	+
	994	+ Grafreed.ParseResources("textures", this);
	995	+ }
	996	+
396	997	void SetupUI2(ObjEditor oe)
397	998	{
	999	+ // June 2019
	1000	+ if (oe == null)
	1001	+ {
	1002	+ //super.SetupUI2(this);
	1003	+ //return;
	1004	+ }
	1005	+
	1006	+ if (copy != group)
	1007	+ {
	1008	+ //super.SetupUI2(this);
	1009	+ }
	1010	+
398	1011	//new Exception().printStackTrace();
399	1012
400	1013	oe.radioPanel = new JPanel(new GridBagLayout());
401		- oe.aConstraints.weightx = 1;
402		- oe.aConstraints.weighty = 0;
403		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
404		- oe.aConstraints.gridwidth = 100;
405		- oe.aConstraints.gridheight = 1;
406	1014	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
407	1015
408	1016	oe.buttonGroup = new ButtonGroup();
..	..	@@ -423,150 +1031,263 @@
423	1031	oe.radioPanel.add(dummyButton);
424	1032	oe.buttonGroup.add(dummyButton);
425	1033	*/
426		- aConstraints.gridy += 1;
427		- oe.aConstraints.gridwidth = 1;
428		- oe.aConstraints.gridx = 0;
	1034	+ cGridBag copyOptionsPanel = new cGridBag();
	1035	+
	1036	+ copyOptionsPanel.preferredHeight = 2;
429	1037
430		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
	1038	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
	1039	+
	1040	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1041	+ //minButton.setToolTipText("Minimize window");
	1042	+ //minButton.addActionListener(this);
	1043	+
	1044	+ if (Globals.ADVANCED)
	1045	+ {
	1046	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1047	+// maxButton.setToolTipText("Maximize window");
	1048	+// maxButton.addActionListener(this);
	1049	+ }
	1050	+
	1051	+ cButton gcButton;
	1052	+
	1053	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1054	+// gcButton.setToolTipText("Garbage collect");
	1055	+// gcButton.addActionListener(new ActionListener()
	1056	+// {
	1057	+// public void actionPerformed(ActionEvent e)
	1058	+// {
	1059	+// System.gc();
	1060	+// }
	1061	+// });
	1062	+
	1063	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1064	+ collapseButton.setToolTipText("Collapse toolbar");
	1065	+ collapseButton.addActionListener(this);
	1066	+
	1067	+ oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1068	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1069	+ maximize3DButton.addActionListener(this);
	1070	+
	1071	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1072	+ twoButton.setToolTipText("Show 3D view only");
	1073	+ twoButton.addActionListener(this);
	1074	+ this.fullscreenLayout = twoButton;
	1075	+
	1076	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1077	+ threeButton.setToolTipText("Show controls and 3D view");
	1078	+ threeButton.addActionListener(this);
	1079	+ if (Globals.ADVANCED)
	1080	+ {
	1081	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1082	+ sixButton.setToolTipText("Show 3D view and controls");
	1083	+ sixButton.addActionListener(this);
	1084	+ }
	1085	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1086	+// sevenButton.setToolTipText("3-column layout");
	1087	+// sevenButton.addActionListener(this);
	1088	+ //
	1089	+
	1090	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1091	+ fullButton.setToolTipText("Full-screen window");
	1092	+ fullButton.addActionListener(this);
	1093	+
	1094	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1095	+ screenfitButton.setToolTipText("Screen fit");
	1096	+ screenfitButton.addActionListener(this);
	1097	+
	1098	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1099	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1100	+ restoreCameraButton.addActionListener(this);
	1101	+
	1102	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1103	+ saveVersionButton.setToolTipText("Duplicate current version");
	1104	+ saveVersionButton.addActionListener(this);
	1105	+
	1106	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1107	+ deleteVersionButton.setToolTipText("Delete current version");
	1108	+ deleteVersionButton.addActionListener(this);
	1109	+
	1110	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1111	+ previousVersionButton.setToolTipText("Previous version");
	1112	+ previousVersionButton.addActionListener(this);
	1113	+ previousVersionButton.setEnabled(false);
	1114	+
	1115	+ cGridBag updown = new cGridBag().setVertical(true);
	1116	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1117	+ restoreButton.setToolTipText("Undo (restore current version)");
	1118	+ restoreButton.addActionListener(this);
	1119	+ //restoreButton.setEnabled(false);
	1120	+
	1121	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1122	+ replaceButton.setToolTipText("Save (replace current version)");
	1123	+ replaceButton.addActionListener(this);
	1124	+ //replaceButton.setEnabled(false);
	1125	+
	1126	+ copyOptionsPanel.add(updown);
	1127	+
	1128	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1129	+ nextVersionButton.setToolTipText("Next version");
	1130	+ nextVersionButton.addActionListener(this);
	1131	+ nextVersionButton.setEnabled(false);
	1132	+
	1133	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1134	+ oneStepButton.setToolTipText("Animate one step forward");
	1135	+ oneStepButton.addActionListener(this);
	1136	+
	1137	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1138	+ liveCB.setToolTipText("Enable animation");
431	1139	liveCB.addItemListener(this);
432	1140
433		- oe.aConstraints.gridx += 1;
434		- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
435		- supportCB.addItemListener(this);
436		-
437		- // oe.aConstraints.gridx += 1;
438		- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
439		- // localCB.addItemListener(this);
440		-
441		- oe.aConstraints.gridx += 1;
442		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", CameraPane.CROWD), oe.aConstraints);
443		- crowdCB.addItemListener(this);
444		-
445		- oe.aConstraints.gridx += 1;
446		- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
447		- smoothCB.addItemListener(this);
448		-
449		- oe.aConstraints.gridx += 1;
450		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
	1141	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	1142	+ fastCB.setToolTipText("Fast mode");
451	1143	fastCB.addItemListener(this);
452		- oe.aConstraints.gridx += 1;
453		- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
454		- slowCB.addItemListener(this);
455		- oe.aConstraints.gridx += 1;
456		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.FAST), oe.aConstraints);
457		- boxCB.addItemListener(this);
	1144	+
	1145	+ //oe.toolboxPanel.Return();
	1146	+
	1147	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1148	+// trackCB.setToolTipText("Enable tracking");
	1149	+// trackCB.addItemListener(this);
458	1150
459		-// oe.aConstraints.gridx += 1;
460		-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
461		-// speakerMocapCB.addItemListener(this);
462		-
463		- if (false)
464		- {
465		- // handled in scripts
466		- oe.aConstraints.gridx += 1;
467		- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
468		- speakerCameraCB.addItemListener(this);
469		-
470		- oe.aConstraints.gridx += 1;
471		- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
472		- speakerFocusCB.addItemListener(this);
473		-
474		- oe.aConstraints.gridx += 1;
475		- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
476		- smoothfocusCB.addItemListener(this);
477		- }
478		-
479		-//oe.aConstraints.gridx += 1;
480		-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
481		-// debugCB.addItemListener(this);
482		-
483		- oe.aConstraints.gridx += 1;
484		- oe.toolbarPanel.add(oeilCB = new cCheckBox("O", CameraPane.OEIL), oe.aConstraints);
485		- oeilCB.addItemListener(this);
486		-
487		- oe.aConstraints.gridx += 1;
488		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("T", CameraPane.LOOKAT), oe.aConstraints);
489		- lookAtCB.addItemListener(this);
490		-
491		- oe.aConstraints.gridx += 1;
492		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
493		- trackCB.addItemListener(this);
494		-
495		- oe.aConstraints.gridx += 1;
496		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
497		- screenfitButton.addActionListener(this);
498		- oe.aConstraints.gridx += 1;
499	1151	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
500	1152	// screenfitpointButton.addActionListener(this);
501		-// oe.aConstraints.gridx += 1;
502		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
503		- snapobjectButton.addActionListener(this);
504		- oe.aConstraints.gridx += 1;
505	1153
506		- //aConstraints.gridx = 0;
507		- //aConstraints.gridy += 1;
508		- oe.aConstraints.weighty = 0;
509		- oe.aConstraints.gridwidth = 1;
510		-
511		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
512		- flashSelectionButton.addActionListener(this);
513		- oe.aConstraints.gridx += 1;
514		- oe.aConstraints.weighty = 0;
515		- oe.aConstraints.gridwidth = 1;
516		-
517		- //
518		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
519		- twoButton.addActionListener(this);
520		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	1154	+ if (Globals.ADVANCED)
	1155	+ {
	1156	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1157	+ snapobjectButton.addActionListener(this);
	1158	+ snapobjectButton.setToolTipText("Snap Object");
	1159	+
	1160	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
521	1161	fourButton.addActionListener(this);
522		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
523		- sixButton.addActionListener(this);
524		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
525		- threeButton.addActionListener(this);
526		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
527		- sevenButton.addActionListener(this);
528		- //
	1162	+ fourButton.setToolTipText("Show control panel only");
	1163	+ }
529	1164
530		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	1165	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	1166	+
	1167	+
	1168	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1169	+ rootButton.setToolTipText("Open selection in new tab");
531	1170	rootButton.addActionListener(this);
532		- oe.aConstraints.gridx += 1;
533		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	1171	+
	1172	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1173	+ closeButton.setToolTipText("Close tab");
534	1174	closeButton.addActionListener(this);
535	1175	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
536	1176	//clearButton.addActionListener(this);
537		- oe.aConstraints.gridx += 1;
538		-
539		- oe.aConstraints.gridx = 1; //
540		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
541		- editButton.addActionListener(this);
542		- oe.aConstraints.gridx += 1;
543		- oe.aConstraints.weighty = 0;
544		- oe.aConstraints.gridwidth = 1;
545	1177
546		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	1178	+ cGridBag row1 = new cGridBag();
	1179	+
	1180	+ // INSERT
	1181	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1182	+ gridButton.setToolTipText("Create ground");
	1183	+ gridButton.addActionListener(this);
	1184	+
	1185	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1186	+ boxButton.setToolTipText("Create box");
	1187	+ boxButton.addActionListener(this);
	1188	+
	1189	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1190	+ sphereButton.setToolTipText("Create sphere");
	1191	+ sphereButton.addActionListener(this);
	1192	+
	1193	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1194	+ coneButton.setToolTipText("Create cone");
	1195	+ coneButton.addActionListener(this);
	1196	+
	1197	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1198	+ torusButton.setToolTipText("Create torus");
	1199	+ torusButton.addActionListener(this);
	1200	+
	1201	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1202	+ superButton.setToolTipText("Create superellipsoid");
	1203	+ superButton.addActionListener(this);
	1204	+
	1205	+ if (Globals.ADVANCED)
	1206	+ {
	1207	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1208	+ kleinButton.setToolTipText("Create Klein bottle");
	1209	+ kleinButton.addActionListener(this);
	1210	+ }
	1211	+
	1212	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1213	+ particlesButton.setToolTipText("Create particle system");
	1214	+ particlesButton.addActionListener(this);
	1215	+
	1216	+ oe.toolboxPanel.add(row1);
	1217	+
	1218	+ cGridBag row2 = new cGridBag();
	1219	+
	1220	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1221	+ groupButton.setToolTipText("Create group");
	1222	+ groupButton.addActionListener(this);
	1223	+
	1224	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1225	+ compositeButton.setToolTipText("Create composite");
	1226	+ compositeButton.addActionListener(this);
	1227	+
	1228	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1229	+ switchButton.setToolTipText("Create item switcher");
	1230	+ switchButton.addActionListener(this);
	1231	+
	1232	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1233	+ loopButton.setToolTipText("Create loop");
	1234	+ loopButton.addActionListener(this);
	1235	+
	1236	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1237	+ textureButton.setToolTipText("Create texture");
	1238	+ textureButton.addActionListener(this);
	1239	+
	1240	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1241	+ overlayButton.setToolTipText("Create overlay");
	1242	+ overlayButton.addActionListener(this);
	1243	+
	1244	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1245	+ lightButton.setToolTipText("Create light");
	1246	+ lightButton.addActionListener(this);
	1247	+
	1248	+ oe.toolboxPanel.add(row2);
	1249	+
	1250	+ cGridBag textures = new cGridBag();
	1251	+
	1252	+ CreateTexturePanel(textures);
	1253	+
	1254	+ oe.toolboxPanel.add(textures);
	1255	+
	1256	+ textures.preferredHeight = 100;
	1257	+
	1258	+ CreateSkyboxPanel(oe.skyboxPanel);
	1259	+
	1260	+ // EDIT panel
	1261	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1262	+ editButton.setToolTipText("Pin selection controls");
	1263	+ editButton.addActionListener(this);
	1264	+
	1265	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1266	+ uneditButton.setToolTipText("Unpin and remove selection controls");
547	1267	uneditButton.addActionListener(this);
548	1268
549		- oe.aConstraints.gridx += 1;
550		- oe.aConstraints.weighty = 0;
551		- oe.aConstraints.gridwidth = 1;
552		-
553		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
554		- clearPanelButton.addActionListener(this);
555		-
556		- oe.aConstraints.gridx += 1;
557		- oe.aConstraints.weighty = 0;
558		- oe.aConstraints.gridwidth = 1;
559		-
560		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	1269	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1270	+ allParamsButton.setToolTipText("Show all controls");
561	1271	allParamsButton.addActionListener(this);
562	1272
563		- oe.aConstraints.gridx += 1;
564		- oe.aConstraints.weighty = 0;
565		- oe.aConstraints.gridwidth = 1;
566		-
567		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
568		- unselectButton.addActionListener(this);
	1273	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1274	+ clearPanelButton.setToolTipText("Clear all controls");
	1275	+ clearPanelButton.addActionListener(this);
569	1276
	1277	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1278	+ //unselectButton.setToolTipText("Unselect");
	1279	+ //unselectButton.addActionListener(this);
	1280	+
	1281	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1282	+ flashSelectionButton.setToolTipText("Highlight selection");
	1283	+ flashSelectionButton.addActionListener(this);
	1284	+
	1285	+ editCommandsPanel.preferredHeight = 1;
	1286	+
	1287	+ SetPinStates(false);
	1288	+// oe.treePanel.add(commandsPanel);
	1289	+// oe.treePanel.Return();
	1290	+
570	1291	// oe.aConstraints.gridx += 1;
571	1292	// oe.aConstraints.weighty = 0;
572	1293	// oe.aConstraints.gridwidth = 1;
..	..	@@ -578,47 +1299,32 @@
578	1299	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
579	1300	// gcButton.addActionListener(this);
580	1301
581		- oe.aConstraints.gridx = 0;
582		- oe.aConstraints.gridy += 1;
583		-
584		- //ctrlPanel.add(objList = new List(5, true));
585		- oe.aConstraints.gridwidth = 100;
586		- // oe.aConstraints.gridheight = 100;
587		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
588		- oe.aConstraints.gridheight = 1;
589		- oe.aConstraints.weighty = 0.5;
590		- oe.aConstraints.gridx = 0;
591		- JScrollPane jSP;
	1302	+ cGridBag jSPPanel = new cGridBag();
	1303	+
	1304	+ JScrollPane jSP;
592	1305	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
593		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	1306	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
594	1307	ResetModel();
595		- oe.aConstraints.weighty = 0.5;
596		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
597		- oe.aConstraints.gridy += 1;
598		- oe.aConstraints.gridwidth = 1;
599		-
600		- oe.aConstraints.weighty = 0;
601		- oe.aConstraints.gridwidth = 2;
602		-
603		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
604		- colorCB.addItemListener(this);
605		- oe.aConstraints.gridx += 2;
606		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
607		- materialCB.addItemListener(this);
608		- oe.aConstraints.gridx += 2;
609		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
610		- textureCB.addItemListener(this);
611		-
612		- oe.aConstraints.gridx = 0;
613		- oe.aConstraints.gridy += 1;
614	1308
	1309	+ oe.treePanel.add(jSPPanel);
	1310	+ oe.treePanel.Return();
	1311	+
	1312	+ oe.treePanel.add(copyOptionsPanel);
	1313	+ oe.treePanel.Return();
	1314	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1315	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1316	+ sliderPane.preferredHeight = 1;
	1317	+
	1318	+// mainPanel.setDividerLocation(0.1); //1.0);
	1319	+ mainPanel.setResizeWeight(0.4);
	1320	+
615	1321	//jList.addListSelectionListener(this);
616	1322	oe.jTree.addTreeSelectionListener(this);
617	1323	//jTree.setRootVisible(false);
618	1324	//jTree.setEditable(true);
619	1325	oe.jTree.setDragEnabled(true);
620	1326	//jTree.setPreferredSize(new Dimension(10,10));
621		- jSP.setPreferredSize(new Dimension(100,200));
	1327	+ //jSP.setPreferredSize(new Dimension(100,200));
622	1328
623	1329	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
624	1330
..	..	@@ -630,23 +1336,171 @@
630	1336	dgr.addDragGestureListener(this);
631	1337	}catch(Exception e) {}
632	1338	*/
633		- radio.layout = sevenButton;
	1339	+ radio.layout = threeButton; // sixButton;
634	1340	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
635	1341	}
	1342	+
	1343	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	1344	+ {
	1345	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1346	+ colorCB.setToolTipText("Copy color when dropped");
	1347	+ colorCB.addItemListener(this);
	1348	+
	1349	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1350	+ materialCB.setToolTipText("Copy material when dropped");
	1351	+ materialCB.addItemListener(this);
	1352	+
	1353	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1354	+ textureCB.setToolTipText("Copy texture when dropped");
	1355	+ textureCB.addItemListener(this);
	1356	+
	1357	+ panel.Return();
	1358	+
	1359	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	1360	+ boxCB.setToolTipText("Display bounding boxes");
	1361	+ boxCB.addItemListener(this);
	1362	+
	1363	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	1364	+ zoomBoxCB.setToolTipText("Display only for wheel");
	1365	+ zoomBoxCB.addItemListener(this);
	1366	+
	1367	+ if (true) // Globals.ADVANCED)
	1368	+ {
	1369	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1370	+// supportCB.setToolTipText("Enable rigging");
	1371	+// supportCB.addItemListener(this);
	1372	+
	1373	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1374	+ freezeCB.setToolTipText("Fast moving camera");
	1375	+ freezeCB.addItemListener(this);
	1376	+
	1377	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	1378	+ // localCB.addItemListener(this);
	1379	+
	1380	+ panel.Return();
	1381	+
	1382	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	1383	+ crowdCB.setToolTipText("Used for crowds");
	1384	+ crowdCB.addItemListener(this);
	1385	+
	1386	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	1387	+ smoothCB.setToolTipText("Snapping delay");
	1388	+ smoothCB.addItemListener(this);
	1389	+
	1390	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1391	+// slowCB.setToolTipText("Smooth interpolation");
	1392	+// slowCB.addItemListener(this);
	1393	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1394	+ minshaderCB.setToolTipText("Minimal fast shader");
	1395	+ minshaderCB.addItemListener(this);
	1396	+
	1397	+// constraints.gridy += 1;
	1398	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	1399	+// speakerMocapCB.addItemListener(this);
	1400	+
	1401	+ panel.Return();
	1402	+
	1403	+ if (false)
	1404	+ {
	1405	+ // handled in scripts
	1406	+ //constraints.gridy += 1;
	1407	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	1408	+ speakerCameraCB.addItemListener(this);
	1409	+
	1410	+ //constraints.gridy += 1;
	1411	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	1412	+ speakerFocusCB.addItemListener(this);
	1413	+
	1414	+ //constraints.gridy += 1;
	1415	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	1416	+ smoothfocusCB.addItemListener(this);
	1417	+ panel.Return();
	1418	+ }
	1419	+
	1420	+//constraints.gridx += 1;
	1421	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	1422	+// debugCB.addItemListener(this);
	1423	+
	1424	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1425	+ trackCB.setToolTipText("Enable tracking target");
	1426	+ trackCB.addItemListener(this);
	1427	+
	1428	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1429	+ oeilCB.setToolTipText("Move camera when tracking");
	1430	+ oeilCB.addItemListener(this);
	1431	+
	1432	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1433	+ shadowCB.setToolTipText("When live compute shadows");
	1434	+ shadowCB.addItemListener(this);
	1435	+
	1436	+ panel.Return();
	1437	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1438	+ toggleTextureCB.setToolTipText("Load textures");
	1439	+ toggleTextureCB.addItemListener(this);
	1440	+
	1441	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1442	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1443	+ toggleSwitchCB.addItemListener(this);
	1444	+
	1445	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1446	+ autokeepCB.setToolTipText("On structure change");
	1447	+ autokeepCB.addItemListener(this);
	1448	+
	1449	+ panel.Return();
	1450	+ if (Globals.ADVANCED)
	1451	+ {
	1452	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	1453	+ lookAtCB.setToolTipText("Look-at target");
	1454	+ lookAtCB.addItemListener(this);
	1455	+ }
	1456	+
	1457	+ }
	1458	+
	1459	+ cGridBag fill = new cGridBag();
	1460	+ fill.preferredHeight = 200;
	1461	+ cGridBag fill2 = new cGridBag();
	1462	+ fill2.preferredHeight = 200;
	1463	+ cGridBag fill3 = new cGridBag();
	1464	+ fill3.preferredHeight = 200;
	1465	+
	1466	+ panel.add(fill);
	1467	+ panel.add(fill2);
	1468	+ panel.add(fill3);
	1469	+
	1470	+ }
636	1471
637	1472	void EditObject(Object3D obj)
638	1473	{
639		- cRadio dummyButton = new cRadio(obj.name);
640		- dummyButton.SetObject(obj);
641		- dummyButton.layout = sevenButton;
642		- dummyButton.SetCamera(cameraView.renderCamera, false);
643		- dummyButton.addActionListener(this);
644		- radioPanel.add(dummyButton);
645		- buttonGroup.add(dummyButton);
646		- dummyButton.doClick();
	1474	+ assert(obj instanceof Composite);
	1475	+
	1476	+// if (obj.versionlist == null)
	1477	+// {
	1478	+// obj.versionlist = new Object3D[100];
	1479	+// obj.versionindex = -1;
	1480	+// }
	1481	+
	1482	+ cRadio radioButton = new cRadio(obj.name);
	1483	+
	1484	+ // June 2019. Patch to avoid bug with transparency.
	1485	+ radioButton.hadMaterial = obj.material != null;
	1486	+ if (!radioButton.hadMaterial)
	1487	+ {
	1488	+ obj.material = new cMaterial();
	1489	+ }
	1490	+
	1491	+ radioButton.SetObject(obj);
	1492	+ radioButton.layout = threeButton; // sixButton;
	1493	+ radioButton.SetCamera(cameraView.renderCamera, false);
	1494	+ radioButton.addActionListener(this);
	1495	+ radioPanel.add(radioButton);
	1496	+ buttonGroup.add(radioButton);
	1497	+ radioButton.doClick();
647	1498	}
	1499	+
648	1500	void SetupViews(ObjEditor oe)
649	1501	{
	1502	+ theFrame = this;
	1503	+
650	1504	oe.SetupViews();
651	1505
652	1506	System.out.println("SetupViews");
..	..	@@ -655,22 +1509,30 @@
655	1509	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
656	1510	}
657	1511
658		- JCheckBox liveCB;
659		- JCheckBox supportCB;
660		- JCheckBox localCB;
661		- JCheckBox crowdCB;
662		- JCheckBox smoothCB;
663		- JCheckBox fastCB;
664		- JCheckBox slowCB;
665		- JCheckBox boxCB;
666		- JCheckBox trackCB;
667		- JCheckBox smoothfocusCB;
	1512	+ cToggleButton liveCB;
	1513	+ cCheckBox supportCB;
	1514	+ cCheckBox localCB;
	1515	+ cCheckBox crowdCB;
	1516	+ cCheckBox smoothCB;
	1517	+ cCheckBox minshaderCB;
	1518	+
	1519	+ cToggleButton fastCB;
	1520	+ cCheckBox slowCB;
	1521	+ cCheckBox boxCB;
	1522	+ cCheckBox zoomBoxCB;
	1523	+ cCheckBox freezeCB;
	1524	+ //cToggleButton trackCB;
	1525	+ cCheckBox trackCB;
	1526	+ cCheckBox smoothfocusCB;
668	1527	// JCheckBox speakerMocapCB;
669		- JCheckBox speakerCameraCB;
670		- JCheckBox speakerFocusCB;
671		- JCheckBox debugCB;
672		- JCheckBox oeilCB;
673		- JCheckBox lookAtCB;
	1528	+ cCheckBox speakerCameraCB;
	1529	+ cCheckBox speakerFocusCB;
	1530	+ cCheckBox debugCB;
	1531	+
	1532	+ cCheckBox oeilCB;
	1533	+ cCheckBox shadowCB;
	1534	+ cCheckBox autokeepCB;
	1535	+ cCheckBox lookAtCB;
674	1536
675	1537	// static int COLOR = 1;
676	1538	// static int MATERIAL = 2;
..	..	@@ -678,9 +1540,9 @@
678	1540
679	1541	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
680	1542
681		- JCheckBox colorCB;
682		- JCheckBox materialCB;
683		- JCheckBox textureCB;
	1543	+ cCheckBox colorCB;
	1544	+ cCheckBox materialCB;
	1545	+ cCheckBox textureCB;
684	1546
685	1547	public void itemStateChanged(ItemEvent e)
686	1548	{
..	..	@@ -705,10 +1567,10 @@
705	1567	dropAttributes \|= Object3D.TEXTURE;
706	1568	else
707	1569	dropAttributes &= ~Object3D.TEXTURE;
708		- }
709		- else if(e.getSource() == liveCB)
	1570	+ } else if(e.getSource() == liveCB)
710	1571	{
711	1572	cameraView.ToggleLive();
	1573	+ refreshContents(false);
712	1574	}
713	1575	else if(e.getSource() == supportCB)
714	1576	{
..	..	@@ -724,6 +1586,12 @@
724	1586	{
725	1587	cameraView.ToggleInertia();
726	1588	cameraView.repaint();
	1589	+ }
	1590	+ else if(e.getSource() == minshaderCB)
	1591	+ {
	1592	+ Globals.MINSHADER ^= true;
	1593	+ cameraView.programInitialized = false;
	1594	+ cameraView.repaint();
727	1595	}
728	1596	else if(e.getSource() == localCB)
729	1597	{
..	..	@@ -743,6 +1611,10 @@
743	1611	Recompile();
744	1612	cameraView.repaint();
745	1613	// refreshContents();
	1614	+ }
	1615	+ else if(e.getSource() == zoomBoxCB)
	1616	+ {
	1617	+ cameraView.ToggleZoomBoxMode();
746	1618	}
747	1619	else if(e.getSource() == smoothfocusCB)
748	1620	{
..	..	@@ -769,6 +1641,18 @@
769	1641	{
770	1642	cameraView.ToggleOeil();
771	1643	}
	1644	+ else if(e.getSource() == shadowCB)
	1645	+ {
	1646	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1647	+ }
	1648	+ else if(e.getSource() == freezeCB)
	1649	+ {
	1650	+ Globals.FREEZEONMOVE ^= true;
	1651	+ }
	1652	+ else if(e.getSource() == autokeepCB)
	1653	+ {
	1654	+ Globals.REPLACEONMAKE ^= true;
	1655	+ }
772	1656	else if(e.getSource() == lookAtCB)
773	1657	{
774	1658	cameraView.ToggleLookAt();
..	..	@@ -785,7 +1669,8 @@
785	1669
786	1670	/**/
787	1671	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
788		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1672	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1673	+ TreePath path = objEditor.jTree.getSelectionPath();
789	1674	if ((path == null) \|\| (path.getPathCount() <= 1)) {
790	1675	// We can't move the root node or an empty selection
791	1676	return;
..	..	@@ -848,8 +1733,6 @@
848	1733	}
849	1734	}
850	1735
851		- String string = (String) object;
852		-
853	1736	System.out.println("Transfer = " + object + "; drop : " + target);
854	1737	// if( object instanceof java.io.File[])
855	1738	// {
..	..	@@ -857,7 +1740,11 @@
857	1740	// objEditor.DropFile((java.io.File[]) object, true);
858	1741	// return;
859	1742	// }
860		- if (string.charAt(0) == '/')
	1743	+
	1744	+ String string = object.toString();
	1745	+
	1746	+ // File path for Mac and Windows
	1747	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
861	1748	{
862	1749	// file(s)
863	1750	String[] names = string.split("\n");
..	..	@@ -884,7 +1771,7 @@
884	1771
885	1772	flashIt = false;
886	1773	CameraPane pane = (CameraPane) target;
887		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1774	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
888	1775	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
889	1776
890	1777	if (group.selection.size() == 1)
..	..	@@ -900,23 +1787,33 @@
900	1787
901	1788	assert target == objEditor.jTree;
902	1789	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1790	+ Object3D destinationLeaf;
903	1791	try {
904		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1792	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
905	1793	} catch (Exception e) {
906	1794	System.out.println("destinationPath : " + destinationPath);
907	1795	return;
908	1796	}
909	1797
910		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1798	+ for (int i=group.selection.size(); --i>=0;)
911	1799	{
	1800	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1801	+
	1802	+ // Cannot move into itself
	1803	+ if (child == destinationLeaf)
	1804	+ return;
	1805	+ }
	1806	+
	1807	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1808	+// {
912	1809	loadClipboard(true);
913	1810	objEditor.jTree.setSelectionPath(destinationPath);
914		- pasteInto(false);
915		- } else {
916		- loadClipboard(false);
917		- objEditor.jTree.setSelectionPath(destinationPath);
918		- pasteInto(false); // true); // ???
919		- }
	1811	+ pasteInto(false, false);
	1812	+// } else {
	1813	+// loadClipboard(false);
	1814	+// objEditor.jTree.setSelectionPath(destinationPath);
	1815	+// pasteInto(false, false); // true); // ???
	1816	+// }
920	1817	}
921	1818	public void dropActionChanged(DropTargetDragEvent dtde)
922	1819	// Called if the user has modified the current drop gesture
..	..	@@ -972,7 +1869,12 @@
972	1869	TreePath path;
973	1870
974	1871	public TransferableTreePath(TreePath tp) {
975		- path = tp;
	1872	+ Object[] objs = new Object[tp.getPathCount()];
	1873	+ for (int i=0; i<objs.length; i++)
	1874	+ {
	1875	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1876	+ }
	1877	+ path = new TreePath(objs);
976	1878	}
977	1879
978	1880	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1021,83 +1923,107 @@
1021	1923	{
1022	1924	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1023	1925	//heightFieldItem.addActionListener(this);
1024		- gridItem = menu.add(new MenuItem("Grid"));
1025		- gridItem.addActionListener(this);
1026		- rectoidItem = menu.add(new MenuItem("Box"));
1027		- rectoidItem.addActionListener(this);
1028		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1029		- ellipsoidItem.addActionListener(this);
1030		- coneItem = menu.add(new MenuItem("Cone"));
1031		- coneItem.addActionListener(this);
1032		- torusItem = menu.add(new MenuItem("Torus"));
1033		- torusItem.addActionListener(this);
1034		- superItem = menu.add(new MenuItem("Superellipsoid"));
1035		- superItem.addActionListener(this);
1036		- particleItem = menu.add(new MenuItem("Particle system"));
1037		- particleItem.addActionListener(this);
	1926	+// gridItem = menu.add(new MenuItem("Grid"));
	1927	+// gridItem.addActionListener(this);
	1928	+// rectoidItem = menu.add(new MenuItem("Box"));
	1929	+// rectoidItem.addActionListener(this);
	1930	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1931	+// ellipsoidItem.addActionListener(this);
	1932	+// coneItem = menu.add(new MenuItem("Cone"));
	1933	+// coneItem.addActionListener(this);
	1934	+// torusItem = menu.add(new MenuItem("Torus"));
	1935	+// torusItem.addActionListener(this);
	1936	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1937	+// superItem.addActionListener(this);
	1938	+
	1939	+ cameraItem = menu.add(new MenuItem("Camera"));
	1940	+ cameraItem.addActionListener(this);
	1941	+
	1942	+ if (!Globals.ADVANCED)
	1943	+ {
	1944	+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
	1945	+ kleinItem.addActionListener(this);
	1946	+ }
	1947	+
	1948	+// particleItem = menu.add(new MenuItem("Particle system"));
	1949	+// particleItem.addActionListener(this);
	1950	+ if (Globals.ADVANCED)
	1951	+ {
1038	1952	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1039	1953	ragdollItem.addActionListener(this);
1040	1954	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1041	1955	ragdoll2Item.addActionListener(this);
	1956	+ }
1042	1957	menu.add("-");
1043		- meshItem = menu.add(new MenuItem("Mesh"));
	1958	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1044	1959	meshItem.addActionListener(this);
1045	1960	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1046	1961	// meshGroupItem.addActionListener(this);
	1962	+ if (Globals.ADVANCED)
	1963	+ {
1047	1964	springItem = menu.add(new MenuItem("Spring"));
1048	1965	springItem.addActionListener(this);
1049	1966	flagItem = menu.add(new MenuItem("Flag"));
1050	1967	flagItem.addActionListener(this);
1051		- bezierItem = menu.add(new MenuItem("Patch"));
1052		- bezierItem.addActionListener(this);
1053		- checkerItem = menu.add(new MenuItem("Checker"));
1054		- checkerItem.addActionListener(this);
1055	1968	blobItem = menu.add(new MenuItem("Blob"));
1056	1969	blobItem.addActionListener(this);
1057	1970	latheItem = menu.add(new MenuItem("Lathe"));
1058	1971	latheItem.addActionListener(this);
1059		- lightItem = menu.add(new MenuItem("Light"));
1060		- lightItem.addActionListener(this);
	1972	+ }
	1973	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1974	+ bezierItem.addActionListener(this);
	1975	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1976	+// overlayItem.addActionListener(this);
	1977	+// lightItem = menu.add(new MenuItem("Light"));
	1978	+// lightItem.addActionListener(this);
1061	1979	menu.add("-");
1062	1980	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1063	1981	//superLoopItem.addActionListener(this);
1064		- loopItem = menu.add(new MenuItem("Loop"));
1065		- loopItem.addActionListener(this);
	1982	+// loopItem = menu.add(new MenuItem("Loop"));
	1983	+// loopItem.addActionListener(this);
1066	1984	doubleItem = menu.add(new MenuItem("Fork"));
1067	1985	doubleItem.addActionListener(this);
	1986	+ if (Globals.ADVANCED)
	1987	+ {
1068	1988	tripleItem = menu.add(new MenuItem("Trident"));
1069	1989	tripleItem.addActionListener(this);
	1990	+ }
1070	1991	}
1071	1992
1072	1993	void buildToolsMenu(Menu menu)
1073	1994	{
1074	1995	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1075	1996	animationItem.addItemListener(this);
1076		- animationItem.setState(CameraPane.ANIMATION);
	1997	+ animationItem.setState(Globals.ANIMATION);
	1998	+
	1999	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	2000	+ archiveItem.addActionListener(this);
1077	2001
1078	2002	menu.add("-");
1079	2003	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1080	2004	parseverticesItem.addActionListener(this);
1081	2005	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1082	2006	textureFieldItem.addActionListener(this);
1083		- alignItem = menu.add(new MenuItem("Align"));
	2007	+ alignItem = menu.add(new MenuItem("Align Objects"));
1084	2008	alignItem.addActionListener(this);
1085		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1086		- mirrorItem.addActionListener(this);
1087	2009	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1088	2010	reduceMorphItem.addActionListener(this);
1089	2011	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1090	2012	reduce34MorphItem.addActionListener(this);
1091		-
1092		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1093		- computeAOItem.addActionListener(this);
1094	2013	menu.add("-");
1095		-
1096	2014	menu.add(memoryItem = new MenuItem("Memory Usage"));
1097	2015	memoryItem.addActionListener(this);
	2016	+ menu.add(computeAOItem = new MenuItem("Compute AO"));
	2017	+ computeAOItem.addActionListener(this);
	2018	+
	2019	+ if (Globals.ADVANCED)
	2020	+ {
	2021	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	2022	+ mirrorItem.addActionListener(this);
	2023	+ menu.add("-");
1098	2024	menu.add(analyzeItem = new MenuItem("Analyze"));
1099	2025	analyzeItem.addActionListener(this);
1100		- menu.add(dumpItem = new MenuItem("Dump"));
	2026	+ menu.add(dumpItem = new MenuItem("Print"));
1101	2027	dumpItem.addActionListener(this);
1102	2028	// menu.add(pathItem = new MenuItem("From-to path"));
1103	2029	// pathItem.addActionListener(this);
..	..	@@ -1106,6 +2032,8 @@
1106	2032	resetParentItem.addActionListener(this);
1107	2033	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1108	2034	repairParentItem.addActionListener(this);
	2035	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	2036	+ repairShadowItem.addActionListener(this);
1109	2037	menu.add(invariantsItem = new MenuItem("Invariants"));
1110	2038	invariantsItem.addActionListener(this);
1111	2039	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1113,6 +2041,7 @@
1113	2041	menu.add("-");
1114	2042	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1115	2043	editScriptItem.addActionListener(this);
	2044	+ }
1116	2045	}
1117	2046
1118	2047	void ScreenFit()
..	..	@@ -1235,9 +2164,34 @@
1235	2164	shadow.material = new cMaterial(obj.material);
1236	2165	shadow.material.diffuse = 0.0001f;
1237	2166	shadow.material.specular = 0.0001f;
	2167	+ //shadow.projectedVertices[1].x = 300;
1238	2168
1239	2169	makeSomething(shadow);
1240	2170	}
	2171	+
	2172	+ private void ClearUnpinned()
	2173	+ {
	2174	+ //for (Object3D obj : listUI)
	2175	+ for (int i=listUI.size(); --i>=0;)
	2176	+ {
	2177	+ Object3D obj = listUI.elementAt(i);
	2178	+ if (!obj.pinned)
	2179	+ {
	2180	+ obj.CloseUI();
	2181	+ listUI.remove(i);
	2182	+ }
	2183	+ }
	2184	+ }
	2185	+
	2186	+ private void EditElement(Object3D elem, boolean newWindow)
	2187	+ {
	2188	+ // if (!(elem instanceof Composite))
	2189	+ // newWindow = false;
	2190	+ listUI.add(elem);
	2191	+ elem.openEditWindow(this, newWindow); //, false);
	2192	+ System.out.println("edit : " + elem);
	2193	+ elem.editWindow.refreshContents(true); // ? new
	2194	+ }
1241	2195
1242	2196	/**
1243	2197	* applyExample
..	..	@@ -1441,9 +2395,9 @@
1441	2395
1442	2396	void Overwrite(int mask)
1443	2397	{
1444		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2398	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1445	2399	{
1446		- Object3D content = GraphreeD.clipboard.get(0);
	2400	+ Object3D content = Grafreed.clipboard.get(0);
1447	2401
1448	2402	if (content instanceof cGroup && ((cGroup)content).transientlink )
1449	2403	content = ((cGroup)content).get(0);
..	..	@@ -1466,6 +2420,7 @@
1466	2420	//
1467	2421	public void actionPerformed(ActionEvent event) // , Object arg)
1468	2422	{
	2423	+ Object source = event.getSource();
1469	2424	/*
1470	2425	if (event.getSource() == nameField)
1471	2426	{
..	..	@@ -1477,11 +2432,11 @@
1477	2432	}
1478	2433	else
1479	2434	*/
1480		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	2435	+ if (source == lookAtItem \|\| source == lookFromItem)
1481	2436	{
1482	2437	ScreenFit();
1483	2438	} else
1484		- if (event.getSource() == switchItem)
	2439	+ if (source == switchViewItem)
1485	2440	{
1486	2441	cVector v1 = new cVector();
1487	2442	cVector v2 = new cVector();
..	..	@@ -1490,11 +2445,11 @@
1490	2445	objEditor.cameraView.renderCamera.setAim(v2, v1);
1491	2446	objEditor.cameraView.repaint();
1492	2447	} else
1493		- if (event.getSource() == rectoidItem)
	2448	+ if (source == rectoidItem \|\| source == boxButton)
1494	2449	{
1495	2450	makeSomething(new Box());
1496	2451	} else
1497		- if (event.getSource() == particleItem)
	2452	+ if (source == particleItem \|\| source == particlesButton)
1498	2453	{
1499	2454	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1500	2455	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1515,9 +2470,9 @@
1515	2470	applyExample(particleGeom, "SMOKE");
1516	2471	makeSomething(particleGeom);
1517	2472	} else
1518		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	2473	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1519	2474	{
1520		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	2475	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1521	2476
1522	2477	ragdoll.toParent = LA.newMatrix();
1523	2478	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1535,7 +2490,7 @@
1535	2490	} else
1536	2491	/*
1537	2492	*/
1538		- if (event.getSource() == heightFieldItem)
	2493	+ if (source == heightFieldItem)
1539	2494	{
1540	2495	Object3D obj = new Object3D();
1541	2496
..	..	@@ -1573,27 +2528,31 @@
1573	2528
1574	2529	makeSomething(obj);
1575	2530	} else
1576		- if (event.getSource() == gridItem)
	2531	+ if (source == gridItem \|\| source == gridButton)
1577	2532	{
1578	2533	makeSomething(new Grid());
1579	2534	} else
1580		- if (event.getSource() == ellipsoidItem)
	2535	+ if (source == ellipsoidItem \|\| source == sphereButton)
1581	2536	{
1582	2537	makeSomething(new Sphere());
1583	2538	} else
1584		- if (event.getSource() == coneItem)
	2539	+ if (source == coneItem \|\| source == coneButton)
1585	2540	{
1586	2541	makeSomething(new Cone());
1587	2542	} else
1588		- if (event.getSource() == torusItem)
	2543	+ if (source == torusItem \|\| source == torusButton)
1589	2544	{
1590	2545	makeSomething(new Torus());
1591	2546	} else
1592		- if (event.getSource() == superItem)
	2547	+ if (source == superItem \|\| source == superButton)
1593	2548	{
1594	2549	makeSomething(new Superellipsoid());
1595	2550	} else
1596		- if (event.getSource() == blobItem)
	2551	+ if (source == kleinItem \|\| source == kleinButton)
	2552	+ {
	2553	+ makeSomething(new Klein());
	2554	+ } else
	2555	+ if (source == blobItem)
1597	2556	{
1598	2557	Blob blob = new Blob();
1599	2558	BlobComponent comp = new BlobComponent();
..	..	@@ -1601,15 +2560,15 @@
1601	2560	//blob.retile();
1602	2561	makeSomething(blob);
1603	2562	} else
1604		- if (event.getSource() == latheItem)
	2563	+ if (source == latheItem)
1605	2564	{
1606	2565	makeSomething(new Lathe());
1607	2566	} else
1608		- if (event.getSource() == bezierItem)
	2567	+ if (source == bezierItem)
1609	2568	{
1610	2569	makeSomething(new BezierSurface());
1611	2570	} else
1612		- if (event.getSource() == checkerItem)
	2571	+ if (source == overlayItem \|\| source == overlayButton)
1613	2572	{
1614	2573	/*
1615	2574	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1624,7 +2583,7 @@
1624	2583	*/
1625	2584	makeSomething(new Checker());
1626	2585	} else
1627		- if (event.getSource() == meshItem)
	2586	+ if (source == meshItem)
1628	2587	{
1629	2588	Object3D itemtomake = new Object3D();
1630	2589	Object3D child;
..	..	@@ -1645,35 +2604,52 @@
1645	2604	makeSomething(child);
1646	2605	}
1647	2606	} else
1648		- if (event.getSource() == springItem)
	2607	+ if (source == springItem)
1649	2608	{
1650	2609	cSpring s = new cSpring();
1651	2610	s.setup();
1652	2611	makeSomething(s);
1653	2612	} else
1654		- if (event.getSource() == flagItem)
	2613	+ if (source == flagItem)
1655	2614	{
1656	2615	cSpring s = new cFlag();
1657	2616	s.setup();
1658	2617	makeSomething(s);
1659	2618	} else
1660		- if (event.getSource() == lightItem)
	2619	+ if (source == lightItem \|\| source == lightButton)
1661	2620	{
1662	2621	makeSomething(new Light());
1663	2622	} else
1664		- if (event.getSource() == csgItem)
	2623	+// if (source == skybox1Button \|\|
	2624	+// source == skybox2Button \|\|
	2625	+// source == skybox3Button \|\|
	2626	+// source == skybox4Button \|\|
	2627	+// source == skybox5Button \|\|
	2628	+// source == skybox6Button \|\|
	2629	+// source == skybox7Button \|\|
	2630	+// source == skybox11Button \|\|
	2631	+// source == skybox12Button \|\|
	2632	+// source == skybox13Button \|\|
	2633	+// source == skybox14Button \|\|
	2634	+// source == skybox15Button \|\|
	2635	+// source == skybox16Button \|\|
	2636	+// source == skybox17Button)
	2637	+// {
	2638	+// ChangeSkybox(source);
	2639	+// } else
	2640	+ if (source == csgItem)
1665	2641	{
1666	2642	group(new CSG());
1667	2643	} else
1668		- if (event.getSource() == templateItem)
	2644	+ if (source == templateItem)
1669	2645	{
1670	2646	group(new cTemplate());
1671	2647	} else
1672		- if (event.getSource() == attributeItem)
	2648	+ if (source == attributeItem)
1673	2649	{
1674	2650	makeSomething(new Attribute());
1675	2651	} else
1676		- if (event.getSource() == pointflowItem)
	2652	+ if (source == pointflowItem)
1677	2653	{
1678	2654	makeSomething(new PointFlow());
1679	2655	} else
..	..	@@ -1685,7 +2661,7 @@
1685	2661	} else
1686	2662	*/
1687	2663
1688		- if (event.getSource() == superLoopItem)
	2664	+ if (source == superLoopItem)
1689	2665	{
1690	2666	Composite g = new cGroup();
1691	2667	for (int i=0; i<15; i++)
..	..	@@ -1707,30 +2683,38 @@
1707	2683
1708	2684	group(g);
1709	2685	} else
1710		- if (event.getSource() == loopItem)
	2686	+ if (source == loopItem \|\| source == loopButton)
1711	2687	{
	2688	+ if (!group.selection.isEmpty())
	2689	+ {
1712	2690	Composite csg = new GroupLeaf();
1713	2691	csg.count = 5;
1714		- group(csg);
1715		- Composite child = new cGroup();
	2692	+ Composite child = new cGroup("Branch");
1716	2693	csg.addChild(child);
1717	2694	child.addChild(csg);
	2695	+ group(csg);
	2696	+ }
1718	2697	} else
1719		- if (event.getSource() == doubleItem)
	2698	+ if (source == doubleItem)
1720	2699	{
1721		- Composite csg = new GroupLeaf();
	2700	+ if (!group.selection.isEmpty())
	2701	+ {
	2702	+ Composite csg = new GroupLeaf("Fork");
1722	2703	csg.count = 5;
	2704	+ Composite child = new cGroup("Branch A");
	2705	+ csg.addChild(child);
	2706	+ child.addChild(csg);
	2707	+ child = new cGroup("Branch B");
	2708	+ csg.addChild(child);
	2709	+ child.addChild(csg);
1723	2710	group(csg);
1724		- Composite child = new cGroup();
1725		- csg.addChild(child);
1726		- child.addChild(csg);
1727		- child = new cGroup();
1728		- csg.addChild(child);
1729		- child.addChild(csg);
	2711	+ }
1730	2712	} else
1731		- if (event.getSource() == tripleItem)
	2713	+ if (source == tripleItem)
1732	2714	{
1733		- Composite csg = new GroupLeaf();
	2715	+ if (!group.selection.isEmpty())
	2716	+ {
	2717	+ Composite csg = new GroupLeaf("Trident");
1734	2718	csg.count = 4;
1735	2719	group(csg);
1736	2720	Composite child = new cGroup();
..	..	@@ -1742,74 +2726,119 @@
1742	2726	child = new cGroup();
1743	2727	csg.addChild(child);
1744	2728	child.addChild(csg);
	2729	+ }
1745	2730	} else
1746		-
1747		- if (event.getSource() == importGFDItem)
	2731	+ if (source == computeAOItem)
1748	2732	{
1749		- ImportGFD();
	2733	+ Globals.drawMode = CameraPane.OCCLUSION;
	2734	+ cameraView.repaint();
1750	2735	} else
1751		- if (event.getSource() == importVRMLX3DItem)
1752		- {
1753		- ImportVRMLX3D();
1754		- } else
1755		- if (event.getSource() == import3DSItem)
1756		- {
1757		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1758		- } else
1759		- if (event.getSource() == importOBJItem)
1760		- {
1761		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1762		- } else
1763		- if (event.getSource() == computeAOItem)
1764		- {
1765		- CameraPane.drawMode = CameraPane.OCCLUSION;
1766		- CameraPane.theRenderer.repaint();
1767		- } else
1768		- if (event.getSource() == recompileItem)
	2736	+ if (source == recompileItem)
1769	2737	{
1770	2738	Recompile();
1771	2739	refreshContents();
1772	2740	} else
1773		- if (event.getSource() == editScriptItem)
	2741	+ if (source == editScriptItem)
1774	2742	{
1775	2743	OpenDialog();
1776	2744	refreshContents();
1777	2745	} else
1778		- if (event.getSource() == invariantsItem)
	2746	+ if (source == invariantsItem)
1779	2747	{
1780	2748	System.out.println("Invariants:");
1781		- GraphreeD.theApplet3D.universe.invariants();
	2749	+ Grafreed.grafreed.universe.invariants();
1782	2750	} else
1783		- if (event.getSource() == memoryItem)
	2751	+ if (source == memoryItem)
1784	2752	{
1785	2753	//System.out.println("Invariants:");
1786	2754	PrintMemory();
1787	2755	} else
1788		- if (event.getSource() == pathItem)
	2756	+ if (source == pathItem)
1789	2757	{
1790	2758	PrintPath();
1791	2759	} else
1792		- if (event.getSource() == analyzeItem)
	2760	+ if (source == analyzeItem)
1793	2761	{
1794	2762	AnalyzeObject();
1795	2763	} else
1796		- if (event.getSource() == dumpItem)
	2764	+ if (source == dumpItem)
1797	2765	{
1798	2766	DumpObject();
1799	2767	} else
1800		- if (event.getSource() == screenfitButton)
	2768	+ if (source == minButton)
1801	2769	{
1802		- //Reload(lastConverter, lastFilename, true);
	2770	+ Minimize();
	2771	+ } else
	2772	+ if (source == maxButton)
	2773	+ {
	2774	+ Maximize();
	2775	+ } else
	2776	+ if (source == fullButton)
	2777	+ {
	2778	+ ToggleFullScreen();
	2779	+ } else
	2780	+ if (source == collapseButton)
	2781	+ {
	2782	+ this.expandedLayout = radio.layout;
	2783	+ CollapseToolbar();
	2784	+ } else
	2785	+ if (source == maximize3DButton)
	2786	+ {
	2787	+ this.expandedLayout = radio.layout;
	2788	+ radio.layout = twoButton;
	2789	+ Show3DView();
	2790	+ CollapseToolbar();
	2791	+ } else
	2792	+ if (source == previousVersionButton)
	2793	+ {
	2794	+ // Go to previous version
	2795	+ //if (!Undo())
	2796	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2797	+ PreviousVersion();
	2798	+ } else
	2799	+ if (source == restoreButton)
	2800	+ {
	2801	+ // Restore current version
	2802	+ Restore();
	2803	+ //restoreButton.setEnabled(false);
	2804	+ } else
	2805	+ if (source == replaceButton)
	2806	+ {
	2807	+ // Overwrite current version
	2808	+ Replace();
	2809	+ //replaceButton.setEnabled(false);
	2810	+ } else
	2811	+ if (source == nextVersionButton)
	2812	+ {
	2813	+ // Go to next version
	2814	+ NextVersion();
	2815	+ } else
	2816	+ if (source == saveVersionButton)
	2817	+ {
	2818	+ // Save a new version
	2819	+ if (!Save(true))
	2820	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2821	+ } else
	2822	+ if (source == deleteVersionButton)
	2823	+ {
	2824	+ // Delete a new version
	2825	+ DeleteVersion();
	2826	+ } else
	2827	+ if (source == oneStepButton)
	2828	+ {
	2829	+ Globals.ONESTEP = true;
	2830	+ cameraView.repaint();
	2831	+ } else
	2832	+ if (source == screenfitButton)
	2833	+ {
1803	2834	ScreenFit();
1804	2835	} else
1805		- if (event.getSource() == screenfitpointButton)
	2836	+ if (source == screenfitpointButton)
1806	2837	{
1807		- //Reload(lastConverter, lastFilename, true);
1808	2838	ScreenFitPoint();
1809	2839	} else
1810		- if (event.getSource() == snapobjectButton)
	2840	+ if (source == snapobjectButton)
1811	2841	{
1812		- //Reload(lastConverter, lastFilename, true);
1813	2842	SnapObject();
1814	2843	} else
1815	2844	// if (event.getSource() == recompileButton)
..	..	@@ -1818,13 +2847,13 @@
1818	2847	// Recompile();
1819	2848	// refreshContents();
1820	2849	// } else
1821		- if (event.getSource() == gcButton)
	2850	+ if (source == gcButton)
1822	2851	{
1823	2852	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1824	2853	System.gc();
1825	2854	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1826	2855	} else
1827		- if (event.getSource() == editLeafItem)
	2856	+ if (source == editLeafItem)
1828	2857	{
1829	2858	Object3D obj;
1830	2859	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1838,65 +2867,78 @@
1838	2867	}
1839	2868	refreshContents(true);
1840	2869	} else
1841		- if (event.getSource() == openWindowItem)
	2870	+ if (source == openWindowItem)
1842	2871	{
1843	2872	EditSelection(true);
1844	2873	} else
1845		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2874	+ if (source == cutItem \|\| source == clearButton)
1846	2875	{
1847	2876	loadClipboard(true);
1848	2877	} else
1849		- if (event.getSource() == duplicateItem)
	2878	+ if (source == undoItem)
1850	2879	{
1851		- Object3D keep = GraphreeD.clipboard;
	2880	+ PreviousVersion();
	2881	+ } else
	2882	+ if (source == redoItem)
	2883	+ {
	2884	+ NextVersion();
	2885	+ } else
	2886	+ if (source == duplicateItem)
	2887	+ {
	2888	+ Object3D keep = Grafreed.clipboard;
1852	2889	loadClipboard(false);
1853	2890	paste(false);
1854		- GraphreeD.clipboard = keep;
	2891	+ Grafreed.clipboard = keep;
1855	2892	} else
1856		- if (event.getSource() == cloneItem)
	2893	+ if (source == cloneItem)
1857	2894	{
1858	2895	CloneSelection(false);
1859	2896	} else
1860		- if (event.getSource() == cloneSupportItem)
	2897	+ if (source == cloneSupportItem)
1861	2898	{
1862	2899	CloneSelection(true);
1863	2900	} else
1864		- if (event.getSource() == copyItem)
	2901	+ if (source == copyItem)
1865	2902	{
1866	2903	loadClipboard(false);
1867	2904	} else
1868		- if (event.getSource() == pasteItem)
	2905	+ if (source == pasteItem)
1869	2906	{
1870	2907	paste(false);
1871	2908	} else
1872		- if (event.getSource() == pasteLinkItem)
	2909	+ if (source == pasteIntoItem)
1873	2910	{
1874		- pasteInto(false);
	2911	+ pasteInto(true, false);
1875	2912	} else
1876		- if (event.getSource() == pasteCloneItem)
	2913	+ if (source == pasteLinkItem)
1877	2914	{
1878		- pasteInto(true);
	2915	+ pasteInto(false, false);
1879	2916	} else
1880		- if (event.getSource() == pasteExpandItem)
	2917	+ if (source == pasteCloneItem)
	2918	+ {
	2919	+ pasteInto(true, true);
	2920	+ } else
	2921	+ if (source == pasteExpandItem)
1881	2922	{
1882	2923	paste(true);
1883	2924	} else
1884		- if (event.getSource() == synchronizeItem)
	2925	+ if (source == synchronizeItem)
1885	2926	{
1886	2927	Overwrite(Object3D.TRANSFORM);
1887	2928	} else
1888		- if (event.getSource() == overwriteNameItem)
	2929	+ if (source == overwriteNameItem)
1889	2930	{
1890	2931	Overwrite(Object3D.NAME);
1891	2932	} else
1892		- if (event.getSource() == overwriteUVItem)
	2933	+ if (source == overwriteUVItem)
1893	2934	{
1894	2935	Overwrite(Object3D.UV);
1895	2936	} else
1896		- if (event.getSource() == overwriteMatItem)
	2937	+ if (source == overwriteMatItem)
1897	2938	{
	2939	+ /* july 2015
1898	2940	if ((dropAttributes & Object3D.TEXTURE) == 0)
1899		- Overwrite(Object3D.MATERIAL);
	2941	+ Overwrite(Object3D.MATERIAL \| Object3D.COLOR);
1900	2942	else
1901	2943	{
1902	2944	if ((dropAttributes & Object3D.COLOR) == 0 && (dropAttributes & Object3D.MATERIAL) == 0)
..	..	@@ -1908,13 +2950,16 @@
1908	2950	Overwrite(Object3D.MATERIAL \| Object3D.TEXTURE);
1909	2951	}
1910	2952	}
	2953	+ */
	2954	+
	2955	+ Overwrite(dropAttributes);
1911	2956	}
1912		- if (event.getSource() == overwriteGeoItem)
	2957	+ if (source == overwriteGeoItem)
1913	2958	{
1914	2959	Overwrite(Object3D.GEOMETRY);
1915		-// if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2960	+// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
1916	2961	// {
1917		-// Object3D content = GraphreeD.clipboard.get(0);
	2962	+// Object3D content = GrafreeD.clipboard.get(0);
1918	2963	//
1919	2964	// if (content instanceof cGroup && ((cGroup)content).transientlink )
1920	2965	// content = ((cGroup)content).get(0);
..	..	@@ -1926,7 +2971,7 @@
1926	2971	// refreshContents();
1927	2972	// }
1928	2973	} else
1929		- if (event.getSource() == generateMeshItem)
	2974	+ if (source == generateMeshItem)
1930	2975	{
1931	2976	//if (group.selection.size() == 1)
1932	2977	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1937,7 +2982,7 @@
1937	2982	ResetModel();
1938	2983	refreshContents();
1939	2984	} else
1940		- if (event.getSource() == extractGeometriesItem)
	2985	+ if (source == extractGeometriesItem)
1941	2986	{
1942	2987	boolean one = false;
1943	2988
..	..	@@ -1964,7 +3009,7 @@
1964	3009	ResetModel();
1965	3010	refreshContents();
1966	3011	} else
1967		- if (event.getSource() == cloneGeometriesItem)
	3012	+ if (source == cloneGeometriesItem)
1968	3013	{
1969	3014	boolean one = false;
1970	3015
..	..	@@ -1990,32 +3035,37 @@
1990	3035	ResetModel();
1991	3036	refreshContents();
1992	3037	} else
1993		- if (event.getSource() == shareGeometriesItem)
	3038	+ if (source == shareGeometriesItem)
1994	3039	{
1995	3040	boolean one = false;
1996	3041
1997	3042	if (group.selection.size() == 1)
1998	3043	one = true;
1999	3044
	3045	+ Object3D merge = null;
	3046	+
2000	3047	Object3D content = new cGroup();
2001	3048
2002	3049	for (int i=0; i<group.selection.size(); i++)
2003	3050	{
2004		- Object3D sel = new Merge(group.selection.get(i));
	3051	+ merge = new Merge(group.selection.get(i));
2005	3052
2006	3053	if (one)
2007		- makeSomething(sel, false);
	3054	+ makeSomething(merge, false);
2008	3055	else
2009		- content.addChild(sel);
	3056	+ content.addChild(merge);
2010	3057	}
2011	3058
2012	3059	if (!one)
2013		- makeSomething(content, false);
2014		-
2015		- ResetModel();
2016		- refreshContents();
	3060	+ makeSomething(content, true);
	3061	+ else
	3062	+ {
	3063	+ ResetModel();
	3064	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	3065	+ refreshContents();
	3066	+ }
2017	3067	} else
2018		- if (event.getSource() == mergeGeometriesItem)
	3068	+ if (source == mergeGeometriesItem)
2019	3069	{
2020	3070	boolean one = false;
2021	3071
..	..	@@ -2045,11 +3095,11 @@
2045	3095	ResetModel();
2046	3096	refreshContents();
2047	3097	} else
2048		- if (event.getSource() == linkverticesItem)
	3098	+ if (source == linkverticesItem)
2049	3099	{
2050		-// if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	3100	+// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2051	3101	// {
2052		-// Object3D content = GraphreeD.clipboard.get(0);
	3102	+// Object3D content = GrafreeD.clipboard.get(0);
2053	3103	//
2054	3104	// if (content instanceof cGroup && ((cGroup)content).transientlink )
2055	3105	// content = ((cGroup)content).get(0);
..	..	@@ -2058,39 +3108,48 @@
2058	3108	// group.selection.get(0).setMasterThis(content); // should be identity
2059	3109	// refreshContents();
2060	3110	// }
2061		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	3111	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2062	3112	{
2063		- Object3D content = GraphreeD.clipboard.get(0);
	3113	+ Object3D content = Grafreed.clipboard.get(0);
2064	3114
2065	3115	if (content instanceof cGroup && ((cGroup)content).transientlink )
2066	3116	content = ((cGroup)content).get(0);
2067	3117
2068		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	3118	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2069	3119	for (int i=0; i<group.selection.size(); i++)
2070	3120	{
2071		- boolean random = CameraPane.RANDOM;
2072		- CameraPane.RANDOM = false; // parse all random nodes
	3121	+ boolean random = CameraPane.SWITCH;
	3122	+ CameraPane.SWITCH = false; // parse all random nodes
2073	3123	group.selection.get(i).linkVerticesThis(content);
2074	3124	// group.selection.get(i).setMasterThis(content); // should be identity
2075		- CameraPane.RANDOM = random;
	3125	+ CameraPane.SWITCH = random;
2076	3126	}
2077		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	3127	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2078	3128	refreshContents();
2079	3129	}
2080	3130	} else
2081		- if (event.getSource() == resetsupportItem)
	3131	+ if (source == resetsupportItem)
2082	3132	{
2083	3133	for (int i=0; i<group.selection.size(); i++)
2084	3134	{
2085		- boolean random = CameraPane.RANDOM;
2086		- CameraPane.RANDOM = false; // parse all random nodes
	3135	+ boolean random = CameraPane.SWITCH;
	3136	+ CameraPane.SWITCH = false; // parse all random nodes
2087	3137	group.selection.get(i).linkVerticesThis(null);
2088		- CameraPane.RANDOM = random;
	3138	+ CameraPane.SWITCH = random;
2089	3139	}
2090	3140
2091	3141	refreshContents();
2092	3142	} else
2093		- if (event.getSource() == resetreferencesItem)
	3143	+ if (source == relinkverticesItem)
	3144	+ {
	3145	+ boolean random = CameraPane.SWITCH;
	3146	+ CameraPane.SWITCH = false; // parse all random nodes
	3147	+ group.selection.RelinkToSupport();
	3148	+ CameraPane.SWITCH = random;
	3149	+
	3150	+ refreshContents();
	3151	+ } else
	3152	+ if (source == resetreferencesItem)
2094	3153	{
2095	3154	for (int i=0; i<group.selection.size(); i++)
2096	3155	{
..	..	@@ -2099,11 +3158,11 @@
2099	3158
2100	3159	refreshContents();
2101	3160	} else
2102		- if (event.getSource() == setMasterItem)
	3161	+ if (source == setMasterItem)
2103	3162	{
2104		- if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	3163	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2105	3164	{
2106		- Object3D content = GraphreeD.clipboard.get(0);
	3165	+ Object3D content = Grafreed.clipboard.get(0);
2107	3166
2108	3167	if (content instanceof cGroup && ((cGroup)content).transientlink )
2109	3168	content = ((cGroup)content).get(0);
..	..	@@ -2112,13 +3171,13 @@
2112	3171	refreshContents();
2113	3172	}
2114	3173	} else
2115		- if (event.getSource() == poseMeshItem)
	3174	+ if (source == poseMeshItem)
2116	3175	{
2117	3176	if (group.selection.size() == 1)
2118	3177	{
2119		- if (GraphreeD.clipboard.size() == 1)
	3178	+ if (Grafreed.clipboard.size() == 1)
2120	3179	{
2121		- Object3D content = GraphreeD.clipboard.get(0);
	3180	+ Object3D content = Grafreed.clipboard.get(0);
2122	3181
2123	3182	if (content instanceof cGroup && ((cGroup)content).transientlink )
2124	3183	content = ((cGroup)content).get(0);
..	..	@@ -2131,19 +3190,19 @@
2131	3190	}
2132	3191
2133	3192	} else
2134		- if (event.getSource() == revertMeshItem)
	3193	+ if (source == revertMeshItem)
2135	3194	{
2136	3195	RevertMeshes();
2137	3196	} else
2138		- if (event.getSource() == resetMeshItem)
	3197	+ if (source == resetAllItem)
2139	3198	{
2140	3199	ResetAll();
2141	3200	} else
2142		- if (event.getSource() == stepAllItem)
	3201	+ if (source == stepAllItem)
2143	3202	{
2144	3203	StepAll();
2145	3204	} else
2146		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	3205	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2147	3206	{
2148	3207	//int indices[] = jList.getSelectedIndices();
2149	3208	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2151,42 +3210,46 @@
2151	3210
2152	3211	ClearSelection(false);
2153	3212	} else
2154		- if (event.getSource() == clearAllItem)
	3213	+ if (source == clearAllItem)
2155	3214	{
2156	3215	ClearSelection(true);
2157	3216	} else
2158		- if (event.getSource() == grabItem)
	3217	+ if (source == grabItem \|\| source == groupButton)
2159	3218	{
2160		- group(new cGroup(), true);
	3219	+ group(new cGroup(), false); // true);
2161	3220	} else
2162		- if (event.getSource() == frontItem)
	3221	+ if (source == hideItem)
	3222	+ {
	3223	+ group(new HiddenObject());
	3224	+ } else
	3225	+ if (source == frontItem)
2163	3226	{
2164	3227	front();
2165	3228	} else
2166		- if (event.getSource() == backItem)
	3229	+ if (source == backItem)
2167	3230	{
2168	3231	back();
2169	3232	} else
2170		- if (event.getSource() == cameraItem)
	3233	+ if (source == cameraItem)
2171	3234	{
2172	3235	makeSomething(new Camera());
2173	3236	} else
2174		- if (event.getSource() == compositeItem)
	3237	+ if (source == compositeItem \|\| source == compositeButton)
2175	3238	{
2176	3239	group(new Composite());
2177	3240	} else
2178		- if (event.getSource() == randomItem)
	3241	+ if (source == switchItem \|\| source == switchButton)
2179	3242	{
2180	3243	RandomNode random = new RandomNode();
2181	3244	group(random);
2182	3245	if (random.size() > 0)
2183		- random.name = random.get(0).name + "Rnd";
	3246	+ random.name = random.get(0).name + "Switch";
2184	3247	} else
2185		- if (event.getSource() == physicsItem)
	3248	+ if (source == physicsItem)
2186	3249	{
2187	3250	group(new PhysicsNode());
2188	3251	} else
2189		- if (event.getSource() == frameselectorItem)
	3252	+ if (source == frameselectorItem)
2190	3253	{
2191	3254	for (int i=0; i<group.selection.size(); i++)
2192	3255	{
..	..	@@ -2198,7 +3261,7 @@
2198	3261	ResetModel();
2199	3262	refreshContents();
2200	3263	} else
2201		- if (event.getSource() == switchGeoItem)
	3264	+ if (source == switchGeoItem)
2202	3265	{
2203	3266	for (int i=0; i<group.selection.size(); i++)
2204	3267	{
..	..	@@ -2210,7 +3273,7 @@
2210	3273	ResetModel();
2211	3274	refreshContents();
2212	3275	} else
2213		- if (event.getSource() == switchTransfoItem)
	3276	+ if (source == switchTransfoItem)
2214	3277	{
2215	3278	for (int i=0; i<group.selection.size(); i++)
2216	3279	{
..	..	@@ -2222,7 +3285,7 @@
2222	3285	ResetModel();
2223	3286	refreshContents();
2224	3287	} else
2225		- if (event.getSource() == morphItem)
	3288	+ if (source == morphItem)
2226	3289	{
2227	3290	for (int i=0; i<group.selection.size(); i++)
2228	3291	{
..	..	@@ -2234,7 +3297,7 @@
2234	3297	ResetModel();
2235	3298	refreshContents();
2236	3299	} else
2237		- if (event.getSource() == scriptNodeItem)
	3300	+ if (source == scriptNodeItem)
2238	3301	{
2239	3302	boolean atleastone = false;
2240	3303
..	..	@@ -2273,195 +3336,264 @@
2273	3336	}
2274	3337	}
2275	3338	} else
2276		- if (event.getSource() == linkerItem)
	3339	+ if (source == linkerItem)
2277	3340	{
2278	3341	group(new cLinker());
2279	3342	} else
2280		- if (event.getSource() == textureItem)
	3343	+ if (source == textureItem \|\| source == textureButton)
2281	3344	{
2282	3345	group(new TextureNode());
2283	3346	} else
2284		- if (event.getSource() == shadowXItem)
	3347	+ if (source == billboardItem)
	3348	+ {
	3349	+ group(new BillboardNode());
	3350	+ } else
	3351	+ if (source == shadowXItem)
2285	3352	{
2286	3353	CastShadow(0);
2287	3354	} else
2288		- if (event.getSource() == shadowYItem)
	3355	+ if (source == shadowYItem)
2289	3356	{
2290	3357	CastShadow(1);
2291	3358	} else
2292		- if (event.getSource() == shadowZItem)
	3359	+ if (source == shadowZItem)
2293	3360	{
2294	3361	CastShadow(2);
2295	3362	} else
2296		- if (event.getSource() == ungroupItem)
	3363	+ if (source == ungroupItem \|\| source == ungroupButton)
2297	3364	{
2298		- ungroup();
	3365	+ boolean canUngroup = true;
	3366	+
	3367	+ for (int i=0; i<group.selection.size(); i++)
	3368	+ {
	3369	+ Object3D selectedItem = group.selection.get(i);
	3370	+
	3371	+ if (selectedItem.Size() == 0)
	3372	+ {
	3373	+ // Cannot ungroup leaves
	3374	+ canUngroup = false;
	3375	+ break;
	3376	+ }
	3377	+
	3378	+ if (selectedItem == group)
	3379	+ {
	3380	+ // Cannot ungroup root
	3381	+ canUngroup = false;
	3382	+ break;
	3383	+ }
	3384	+ }
	3385	+
	3386	+ if (canUngroup)
	3387	+ {
	3388	+ for (int i=0; i<group.selection.size(); i++)
	3389	+ {
	3390	+ Object3D selectedItem = group.selection.get(i);
	3391	+
	3392	+ Ungroup(selectedItem);
	3393	+ }
	3394	+
	3395	+ ClearSelection(false);
	3396	+
	3397	+ refreshContents();
	3398	+ }
2299	3399	} else
2300		- if (event.getSource() == genUVItem)
	3400	+ if (source == genUVItem)
2301	3401	{
2302	3402	GenUV();
2303	3403	} else
2304		- if (event.getSource() == genNormalsCADItem)
	3404	+ if (source == genNormalsCADItem)
2305	3405	{
2306	3406	GenNormals(true);
2307	3407	} else
2308		- if (event.getSource() == genNormalsORGANItem)
	3408	+ if (source == genNormalsMESHItem)
	3409	+ {
	3410	+ GenNormalsMESH();
	3411	+ } else
	3412	+ if (source == genNormalsORGANItem)
2309	3413	{
2310	3414	GenNormals(false);
2311	3415	} else
2312		- if (event.getSource() == stripifyItem)
	3416	+ if (source == genNormalsMINEItem)
	3417	+ {
	3418	+ GenNormalsMINE();
	3419	+ } else
	3420	+ if (source == stripifyItem)
2313	3421	{
2314	3422	Stripify();
2315	3423	} else
2316		- if (event.getSource() == unstripifyItem)
	3424	+ if (source == unstripifyItem)
2317	3425	{
2318	3426	Unstripify();
2319	3427	} else
2320		- if (event.getSource() == trimItem)
	3428	+ if (source == trimItem)
2321	3429	{
2322	3430	Trim();
2323	3431	} else
2324		- if (event.getSource() == untrimItem)
	3432	+ if (source == untrimItem)
2325	3433	{
2326	3434	Untrim();
2327	3435	} else
2328		- if (event.getSource() == clearColorsItem)
	3436	+ if (source == clearColorsItem)
2329	3437	{
2330	3438	ClearColors();
2331	3439	} else
2332		- if (event.getSource() == clearMaterialsItem)
	3440	+ if (source == clearMaterialsItem)
2333	3441	{
2334	3442	ClearMaterials();
2335	3443	} else
2336		- if (event.getSource() == liveleavesItem)
	3444	+ if (source == liveleavesItem)
2337	3445	{
2338	3446	LiveLeaves(true);
2339	3447	} else
2340		- if (event.getSource() == unliveleavesItem)
	3448	+ if (source == unliveleavesItem)
2341	3449	{
2342	3450	LiveLeaves(false);
2343	3451	} else
2344		- if (event.getSource() == supportleavesItem)
	3452	+ if (source == supportleavesItem)
2345	3453	{
2346	3454	SupportLeaves(true);
2347	3455	} else
2348		- if (event.getSource() == unsupportleavesItem)
	3456	+ if (source == unsupportleavesItem)
2349	3457	{
2350	3458	SupportLeaves(false);
2351	3459	} else
2352		- if (event.getSource() == hideleavesItem)
	3460	+ if (source == hideleavesItem)
2353	3461	{
2354	3462	HideLeaves(true);
2355	3463	} else
2356		- if (event.getSource() == showleavesItem)
	3464	+ if (source == showleavesItem)
2357	3465	{
2358	3466	HideLeaves(false);
2359	3467	} else
2360		- if (event.getSource() == markleavesItem)
	3468	+ if (source == markleavesItem)
2361	3469	{
2362	3470	MarkLeaves(true);
2363	3471	} else
2364		- if (event.getSource() == unmarkleavesItem)
	3472	+ if (source == unmarkleavesItem)
2365	3473	{
2366	3474	MarkLeaves(false);
2367	3475	} else
2368		- if (event.getSource() == flipVItem)
	3476	+ if (source == rewindleavesItem)
	3477	+ {
	3478	+ RewindLeaves(true);
	3479	+ } else
	3480	+ if (source == unrewindleavesItem)
	3481	+ {
	3482	+ RewindLeaves(false);
	3483	+ } else
	3484	+ if (source == randomleavesItem)
	3485	+ {
	3486	+ RandomLeaves(true);
	3487	+ } else
	3488	+ if (source == unrandomleavesItem)
	3489	+ {
	3490	+ RandomLeaves(false);
	3491	+ } else
	3492	+ if (source == flipVItem)
2369	3493	{
2370	3494	FlipV(true);
2371	3495	} else
2372		- if (event.getSource() == unflipVItem)
	3496	+ if (source == unflipVItem)
2373	3497	{
2374	3498	FlipV(false);
2375	3499	} else
2376		- if (event.getSource() == lowTexturesItem)
	3500	+ if (source == lowTexturesItem)
2377	3501	{
2378	3502	SetTexRes(0);
2379	3503	} else
2380		- if (event.getSource() == normalTexturesItem)
	3504	+ if (source == normalTexturesItem)
2381	3505	{
2382	3506	SetTexRes(1);
2383	3507	} else
2384		- if (event.getSource() == highTexturesItem)
	3508	+ if (source == highTexturesItem)
2385	3509	{
2386	3510	SetTexRes(2);
2387	3511	} else
2388		- if (event.getSource() == veryhighTexturesItem)
	3512	+ if (source == veryhighTexturesItem)
2389	3513	{
2390	3514	SetTexRes(3);
2391	3515	} else
2392		- if (event.getSource() == maxTexturesItem)
	3516	+ if (source == maxTexturesItem)
2393	3517	{
2394	3518	SetTexRes(4);
2395	3519	} else
2396		- if (event.getSource() == panoTexturesItem)
	3520	+ if (source == panoTexturesItem)
2397	3521	{
2398	3522	SetTexRes(5);
2399	3523	} else
2400		- if (event.getSource() == reverseNormalsItem)
	3524	+ if (source == reverseNormalsItem)
2401	3525	{
2402	3526	ReverseNormals();
2403	3527	} else
2404		- if (event.getSource() == parseverticesItem)
	3528	+ if (source == parseverticesItem)
2405	3529	{
2406	3530	ParseVertices();
2407	3531	} else
2408		- if (event.getSource() == textureFieldItem)
	3532	+ if (source == textureFieldItem)
2409	3533	{
2410	3534	TextureVertices();
2411	3535	} else
2412		- if (event.getSource() == alignItem)
	3536	+ if (source == alignItem)
2413	3537	{
2414	3538	Align();
2415	3539	} else
2416		- if (event.getSource() == mirrorItem)
	3540	+ if (source == mirrorItem)
2417	3541	{
2418	3542	MirrorPoses();
2419	3543	} else
2420		- if (event.getSource() == reduceMorphItem)
	3544	+ if (source == reduceMorphItem)
2421	3545	{
2422	3546	MeshReduction(false);
2423	3547	} else
2424		- if (event.getSource() == reduce34MorphItem)
	3548	+ if (source == reduce34MorphItem)
2425	3549	{
2426	3550	MeshReduction(true);
2427	3551	} else
2428		- if (event.getSource() == reverseTrianglesItem)
	3552	+ if (source == reverseTrianglesItem)
2429	3553	{
2430	3554	ReverseTriangles();
2431	3555	} else
2432		- if (event.getSource() == reduceMeshItem)
	3556	+ if (source == reduceMeshItem)
2433	3557	{
2434	3558	ReduceMesh(false);
2435	3559	} else
2436		- if (event.getSource() == reduce34MeshItem)
	3560	+ if (source == reduce34MeshItem)
2437	3561	{
2438	3562	ReduceMesh(true);
2439	3563	} else
2440		- if (event.getSource() == increaseMeshItem)
	3564	+ if (source == increaseMeshItem)
2441	3565	{
2442	3566	IncreaseMesh();
2443	3567	} else
2444		- if (event.getSource() == clipMeshItem)
	3568	+ if (source == clipMeshItem)
2445	3569	{
2446	3570	ClipMesh();
2447	3571	} else
2448		- if (event.getSource() == smoothMeshItem)
	3572	+ if (source == smoothMeshItem)
2449	3573	{
2450	3574	SmoothMesh();
2451	3575	} else
2452		- if (event.getSource() == transformgeometryItem)
	3576	+ if (source == transformGeometryItem)
2453	3577	{
2454	3578	TransformGeometry();
2455	3579	} else
2456		- if (event.getSource() == resetTransformItem)
	3580	+ if (source == transformChildrenItem)
	3581	+ {
	3582	+ TransformChildren();
	3583	+ } else
	3584	+ if (source == resetTransformItem)
2457	3585	{
2458	3586	ResetTransform();
2459	3587	} else
2460		- if (event.getSource() == resetCentroidItem)
	3588	+ if (source == resetCentroidItem)
2461	3589	{
2462		- ResetCentroid();
	3590	+ ResetCentroid(true);
2463	3591	} else
2464		- if (event.getSource() == resetParentItem)
	3592	+ if (source == resetCentroidXZItem)
	3593	+ {
	3594	+ ResetCentroid(false);
	3595	+ } else
	3596	+ if (source == resetParentItem)
2465	3597	{
2466	3598	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2467	3599	{
..	..	@@ -2471,7 +3603,7 @@
2471	3603
2472	3604	refreshContents();
2473	3605	} else
2474		- if (event.getSource() == repairParentItem)
	3606	+ if (source == repairParentItem)
2475	3607	{
2476	3608	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2477	3609	{
..	..	@@ -2485,7 +3617,21 @@
2485	3617
2486	3618	refreshContents();
2487	3619	} else
2488		- if (event.getSource() == sortbysizeItem)
	3620	+ if (source == repairShadowItem)
	3621	+ {
	3622	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3623	+ {
	3624	+ Object3D obj = (Object3D)e.nextElement();
	3625	+ obj.RepairShadow();
	3626	+// for (int i=0; i<obj.size(); i++)
	3627	+// {
	3628	+// obj.get(i).parent = obj;
	3629	+// }
	3630	+ }
	3631	+
	3632	+ refreshContents();
	3633	+ } else
	3634	+ if (source == sortbysizeItem)
2489	3635	{
2490	3636	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2491	3637	{
..	..	@@ -2497,7 +3643,7 @@
2497	3643	ResetModel();
2498	3644	refreshContents();
2499	3645	} else
2500		- if (event.getSource() == sortbynameItem)
	3646	+ if (source == sortbynameItem)
2501	3647	{
2502	3648	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2503	3649	{
..	..	@@ -2509,7 +3655,7 @@
2509	3655	ResetModel();
2510	3656	refreshContents();
2511	3657	} else
2512		- if (event.getSource() == attachPigmentItem)
	3658	+ if (source == attachPigmentItem)
2513	3659	{
2514	3660	String texture = GetFile("Attach pigment");
2515	3661	Object3D obj;
..	..	@@ -2521,7 +3667,7 @@
2521	3667
2522	3668	refreshContents();
2523	3669	} else
2524		- if (event.getSource() == detachPigmentItem)
	3670	+ if (source == detachPigmentItem)
2525	3671	{
2526	3672	Object3D obj;
2527	3673	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2532,7 +3678,7 @@
2532	3678
2533	3679	refreshContents();
2534	3680	} else
2535		- if (event.getSource() == attachBumpItem)
	3681	+ if (source == attachBumpItem)
2536	3682	{
2537	3683	String texture = GetFile("Attach bump");
2538	3684	Object3D obj;
..	..	@@ -2544,18 +3690,18 @@
2544	3690
2545	3691	refreshContents();
2546	3692	} else
2547		- if (event.getSource() == detachBumpItem)
	3693	+ if (source == detachBumpItem)
2548	3694	{
2549	3695	Object3D obj;
2550	3696	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2551	3697	{
2552	3698	obj = (Object3D)e.nextElement();
2553		- obj.SetBumpTexture(null);
	3699	+ obj.ResetBumpTexture();
2554	3700	}
2555	3701
2556	3702	refreshContents();
2557	3703	} else
2558		- if (event.getSource() == pigmentBumpItem)
	3704	+ if (source == pigmentBumpItem)
2559	3705	{
2560	3706	Object3D obj;
2561	3707	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2566,159 +3712,233 @@
2566	3712
2567	3713	refreshContents();
2568	3714	} else
2569		- if (event.getSource() == flashSelectionButton)
	3715	+ if (source == embedTexturesItem)
	3716	+ {
	3717	+ Object3D obj;
	3718	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3719	+ {
	3720	+ obj = (Object3D)e.nextElement();
	3721	+ obj.EmbedTextures(true);
	3722	+ }
	3723	+
	3724	+ refreshContents();
	3725	+ } else
	3726	+ if (source == deEmbedTexturesItem)
	3727	+ {
	3728	+ Object3D obj;
	3729	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3730	+ {
	3731	+ obj = (Object3D)e.nextElement();
	3732	+ obj.EmbedTextures(false);
	3733	+ }
	3734	+
	3735	+ CameraPane.texturepigment.clear();
	3736	+ CameraPane.texturebump.clear();
	3737	+
	3738	+ refreshContents();
	3739	+ } else
	3740	+ if (source == flashSelectionButton)
2570	3741	{
2571	3742	CameraPane.flash = true;
2572	3743	refreshContents();
2573	3744	} else
2574		- if (event.getSource() == oneButton)
	3745	+ if (source == oneButton)
2575	3746	{
2576	3747	} else
2577		- if (event.getSource() == twoButton)
	3748	+ if (source == twoButton)
2578	3749	{
2579	3750	radio.layout = twoButton;
2580		- // bug
2581		- //gridPanel.setDividerLocation(1.0);
2582		- //bigPanel.setDividerLocation(0.0);
2583		- bigThree.remove(jtp);
2584		- bigThree.remove(cameraPanel);
2585		- bigThree.remove(XYZPanel);
2586		- aWindowConstraints.gridx = 0;
2587		- aWindowConstraints.gridy = 0;
2588		- aWindowConstraints.gridwidth = 1;
2589		- // aConstraints.gridheight = 3;
2590		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2591		- aWindowConstraints.weightx = 0;
2592		- aWindowConstraints.weighty = 1;
2593		- //bigThree.add(jtp, aWindowConstraints);
2594		- aWindowConstraints.weightx = 1;
2595		- aWindowConstraints.gridwidth = 3;
2596		- // aConstraints.gridheight = 3;
2597		- aWindowConstraints.gridx = 1;
2598		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2599		- bigThree.add(cameraPanel, aWindowConstraints);
2600		- aWindowConstraints.weightx = 0;
2601		- aWindowConstraints.gridx = 4;
2602		- aWindowConstraints.gridwidth = 1;
2603		- // aConstraints.gridheight = 3;
2604		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2605		- //bigThree.add(XYZPanel, aWindowConstraints);
2606		- bigThree.revalidate();
	3751	+
	3752	+ if (CameraPane.FULLSCREEN)
	3753	+ fullscreenLayout = radio.layout;
	3754	+
	3755	+ Show3DView();
	3756	+
	3757	+ cameraView.requestFocusInWindow();
	3758	+
	3759	+// refreshContents(true);
	3760	+//
	3761	+// try
	3762	+// {
	3763	+// java.awt.Robot bot = new java.awt.Robot();
	3764	+// int mask = InputEvent.BUTTON1_MASK;
	3765	+// bot.mouseMove(100, 100);
	3766	+// bot.mousePress(mask);
	3767	+// bot.mouseRelease(mask);
	3768	+// }
	3769	+// catch (Exception e)
	3770	+// {
	3771	+//
	3772	+// }
	3773	+
2607	3774	} else
2608		- if (event.getSource() == threeButton)
	3775	+ if (source == threeButton)
2609	3776	{
2610	3777	radio.layout = threeButton;
2611		- bigThree.remove(jtp);
2612		- bigThree.remove(cameraPanel);
2613		- bigThree.remove(XYZPanel);
2614		- aWindowConstraints.gridx = 0;
2615		- aWindowConstraints.gridy = 0;
2616		- aWindowConstraints.gridwidth = 1;
2617		- // aConstraints.gridheight = 3;
2618		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2619		- aWindowConstraints.weightx = 0;
2620		- aWindowConstraints.weighty = 1;
2621		- //bigThree.add(jtp, aWindowConstraints);
2622		- aWindowConstraints.weightx = 1;
2623		- aWindowConstraints.gridwidth = 3;
2624		- // aConstraints.gridheight = 3;
2625		- aWindowConstraints.gridx = 1;
2626		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2627		- bigThree.add(cameraPanel, aWindowConstraints);
2628		- aWindowConstraints.weightx = 0;
2629		- aWindowConstraints.gridx = 4;
2630		- aWindowConstraints.gridwidth = 1;
2631		- // aConstraints.gridheight = 3;
2632		- aConstraints.fill = GridBagConstraints.VERTICAL;
2633		- bigThree.add(XYZPanel, aWindowConstraints);
2634		- bigThree.revalidate();
	3778	+
	3779	+ if (CameraPane.FULLSCREEN)
	3780	+ fullscreenLayout = radio.layout;
	3781	+
	3782	+// bigThree.remove(scenePanel);
	3783	+// bigThree.remove(centralPanel);
	3784	+// bigThree.remove(XYZPanel);
	3785	+// aWindowConstraints.gridx = 0;
	3786	+// aWindowConstraints.gridy = 0;
	3787	+// aWindowConstraints.gridwidth = 1;
	3788	+// // aConstraints.gridheight = 3;
	3789	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3790	+// aWindowConstraints.weightx = 0;
	3791	+// aWindowConstraints.weighty = 1;
	3792	+// //bigThree.add(jtp, aWindowConstraints);
	3793	+// aWindowConstraints.weightx = 1;
	3794	+// aWindowConstraints.gridwidth = 3;
	3795	+// // aConstraints.gridheight = 3;
	3796	+// aWindowConstraints.gridx = 1;
	3797	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3798	+// bigThree.add(centralPanel, aWindowConstraints);
	3799	+// aWindowConstraints.weightx = 0;
	3800	+// aWindowConstraints.gridx = 4;
	3801	+// aWindowConstraints.gridwidth = 1;
	3802	+// // aConstraints.gridheight = 3;
	3803	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	3804	+// bigThree.add(XYZPanel, aWindowConstraints);
	3805	+// bigThree.validate();
	3806	+// scenePanel.setVisible(false);
	3807	+// centralPanel.setVisible(true);
	3808	+// XYZPanel.setVisible(true);
	3809	+ bigThree.ClearUI();
	3810	+ bigThree.add(scenePanel);
	3811	+ bigThree.add(centralPanel);
	3812	+ bigThree.FlushUI();
	3813	+
	3814	+ cameraView.requestFocusInWindow();
2635	3815	} else
2636		- if (event.getSource() == fourButton)
	3816	+ if (source == fourButton)
2637	3817	{
2638	3818	radio.layout = fourButton;
2639		- bigThree.remove(jtp);
2640		- bigThree.remove(cameraPanel);
2641		- bigThree.remove(XYZPanel);
2642		- aWindowConstraints.gridx = 0;
2643		- aWindowConstraints.gridy = 0;
2644		- aWindowConstraints.gridwidth = 1;
2645		- // aWindowConstraints.gridheight = 3;
2646		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2647		- aWindowConstraints.weightx = 1;
2648		- aWindowConstraints.weighty = 1;
2649		- bigThree.add(jtp, aWindowConstraints);
2650		- aWindowConstraints.weightx = 1;
2651		- aWindowConstraints.gridwidth = 3;
2652		- // aConstraints.gridheight = 3;
2653		- aWindowConstraints.gridx = 1;
2654		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2655		- //bigThree.add(cameraPanel, aWindowConstraints);
2656		- aWindowConstraints.weightx = 0;
2657		- aWindowConstraints.gridx = 4;
2658		- aWindowConstraints.gridwidth = 1;
2659		- // aWindowConstraints.gridheight = 3;
2660		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2661		- //bigThree.add(XYZPanel, aWindowConstraints);
2662		- bigThree.revalidate();
	3819	+
	3820	+ if (CameraPane.FULLSCREEN)
	3821	+ fullscreenLayout = radio.layout;
	3822	+
	3823	+// bigThree.remove(scenePanel);
	3824	+// bigThree.remove(centralPanel);
	3825	+// bigThree.remove(XYZPanel);
	3826	+// aWindowConstraints.gridx = 0;
	3827	+// aWindowConstraints.gridy = 0;
	3828	+// aWindowConstraints.gridwidth = 1;
	3829	+// // aWindowConstraints.gridheight = 3;
	3830	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3831	+// aWindowConstraints.weightx = 1;
	3832	+// aWindowConstraints.weighty = 1;
	3833	+// bigThree.add(scenePanel, aWindowConstraints);
	3834	+// aWindowConstraints.weightx = 1;
	3835	+// aWindowConstraints.gridwidth = 3;
	3836	+// // aConstraints.gridheight = 3;
	3837	+// aWindowConstraints.gridx = 1;
	3838	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3839	+// //bigThree.add(cameraPanel, aWindowConstraints);
	3840	+// aWindowConstraints.weightx = 0;
	3841	+// aWindowConstraints.gridx = 4;
	3842	+// aWindowConstraints.gridwidth = 1;
	3843	+// // aWindowConstraints.gridheight = 3;
	3844	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3845	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3846	+// bigThree.validate();
	3847	+// scenePanel.setVisible(true);
	3848	+// centralPanel.setVisible(false);
	3849	+// XYZPanel.setVisible(false);
	3850	+ bigThree.ClearUI();
	3851	+ bigThree.add(scenePanel);
	3852	+ bigThree.FlushUI();
	3853	+
	3854	+ cameraView.requestFocusInWindow();
2663	3855	} else
2664		- if (event.getSource() == sixButton)
	3856	+ if (source == sixButton)
2665	3857	{
2666	3858	radio.layout = sixButton;
2667		- bigThree.remove(jtp);
2668		- bigThree.remove(cameraPanel);
2669		- bigThree.remove(XYZPanel);
2670		- aWindowConstraints.gridx = 0;
2671		- aWindowConstraints.gridy = 0;
2672		- aWindowConstraints.gridwidth = 1;
2673		- // aConstraints.gridheight = 3;
2674		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2675		- aWindowConstraints.weightx = 0;
2676		- aWindowConstraints.weighty = 1;
2677		- bigThree.add(jtp, aWindowConstraints);
2678		- aWindowConstraints.weightx = 1;
2679		- aWindowConstraints.gridwidth = 3;
2680		- // aWindowConstraints.gridheight = 3;
2681		- aWindowConstraints.gridx = 1;
2682		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2683		- bigThree.add(cameraPanel, aWindowConstraints);
2684		- aWindowConstraints.weightx = 0;
2685		- aWindowConstraints.gridx = 4;
2686		- aWindowConstraints.gridwidth = 1;
2687		- // aWindowConstraints.gridheight = 3;
2688		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2689		- //bigThree.add(XYZPanel, aConstraints);
2690		- bigThree.revalidate();
	3859	+
	3860	+ if (CameraPane.FULLSCREEN)
	3861	+ fullscreenLayout = radio.layout;
	3862	+
	3863	+// bigThree.remove(scenePanel);
	3864	+// bigThree.remove(centralPanel);
	3865	+// bigThree.remove(XYZPanel);
	3866	+// aWindowConstraints.gridx = 0;
	3867	+// aWindowConstraints.gridy = 0;
	3868	+// aWindowConstraints.gridwidth = 1;
	3869	+// // aConstraints.gridheight = 3;
	3870	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3871	+// aWindowConstraints.weightx = 0;
	3872	+// aWindowConstraints.weighty = 1;
	3873	+// bigThree.add(scenePanel, aWindowConstraints);
	3874	+// aWindowConstraints.weightx = 1;
	3875	+// aWindowConstraints.gridwidth = 3;
	3876	+// // aWindowConstraints.gridheight = 3;
	3877	+// aWindowConstraints.gridx = 1;
	3878	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3879	+// bigThree.add(centralPanel, aWindowConstraints);
	3880	+// aWindowConstraints.weightx = 0;
	3881	+// aWindowConstraints.gridx = 4;
	3882	+// aWindowConstraints.gridwidth = 1;
	3883	+// // aWindowConstraints.gridheight = 3;
	3884	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3885	+// //bigThree.add(XYZPanel, aConstraints);
	3886	+// bigThree.validate();
	3887	+// scenePanel.setVisible(true);
	3888	+// centralPanel.setVisible(true);
	3889	+// XYZPanel.setVisible(false);
	3890	+ bigThree.ClearUI();
	3891	+ bigThree.add(centralPanel);
	3892	+ bigThree.add(scenePanel);
	3893	+ bigThree.FlushUI();
	3894	+
	3895	+ cameraView.requestFocusInWindow();
2691	3896	} else
2692		- if (event.getSource() == sevenButton)
	3897	+ if (source == sevenButton)
2693	3898	{
2694	3899	radio.layout = sevenButton;
2695		- bigThree.remove(jtp);
2696		- bigThree.remove(cameraPanel);
2697		- bigThree.remove(XYZPanel);
2698		- aWindowConstraints.gridx = 0;
2699		- aWindowConstraints.gridy = 0;
2700		- aWindowConstraints.gridwidth = 1;
2701		- // aWindowConstraints.gridheight = 3;
2702		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2703		- aWindowConstraints.weightx = 0;
2704		- aWindowConstraints.weighty = 1;
2705		- bigThree.add(jtp, aWindowConstraints);
2706		- aWindowConstraints.weightx = 1;
2707		- aWindowConstraints.gridwidth = 3;
2708		- // aWindowConstraints.gridheight = 3;
2709		- aWindowConstraints.gridx = 1;
2710		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2711		- bigThree.add(cameraPanel, aWindowConstraints);
2712		- aWindowConstraints.weightx = 0;
2713		- aWindowConstraints.gridx = 4;
2714		- aWindowConstraints.gridwidth = 1;
2715		- // aConstraints.gridheight = 3;
2716		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2717		- bigThree.add(XYZPanel, aWindowConstraints);
2718		- bigThree.revalidate();
	3900	+
	3901	+ if (CameraPane.FULLSCREEN)
	3902	+ fullscreenLayout = radio.layout;
	3903	+
	3904	+// bigThree.remove(scenePanel);
	3905	+// bigThree.remove(centralPanel);
	3906	+// bigThree.remove(XYZPanel);
	3907	+// aWindowConstraints.gridx = 0;
	3908	+// aWindowConstraints.gridy = 0;
	3909	+// aWindowConstraints.gridwidth = 1;
	3910	+// // aWindowConstraints.gridheight = 3;
	3911	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3912	+// aWindowConstraints.weightx = 0;
	3913	+// aWindowConstraints.weighty = 1;
	3914	+// bigThree.add(scenePanel, aWindowConstraints);
	3915	+// aWindowConstraints.weightx = 1;
	3916	+// aWindowConstraints.gridwidth = 3;
	3917	+// // aWindowConstraints.gridheight = 3;
	3918	+// aWindowConstraints.gridx = 1;
	3919	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3920	+// bigThree.add(centralPanel, aWindowConstraints);
	3921	+// aWindowConstraints.weightx = 0;
	3922	+// aWindowConstraints.gridx = 4;
	3923	+// aWindowConstraints.gridwidth = 1;
	3924	+// // aConstraints.gridheight = 3;
	3925	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3926	+// bigThree.add(XYZPanel, aWindowConstraints);
	3927	+// bigThree.validate();
	3928	+// scenePanel.setVisible(true);
	3929	+// centralPanel.setVisible(true);
	3930	+// XYZPanel.setVisible(true);
	3931	+ bigThree.ClearUI();
	3932	+ bigThree.add(scenePanel);
	3933	+ bigThree.add(centralPanel);
	3934	+ bigThree.add(XYZPanel);
	3935	+ bigThree.FlushUI();
	3936	+
	3937	+ cameraView.requestFocusInWindow();
2719	3938	} else
2720		- if (event.getSource() == rootButton)
	3939	+ if (source == rootButton)
2721	3940	{
	3941	+ Replace();
2722	3942	Object3D obj;
2723	3943	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2724	3944	{
..	..	@@ -2727,66 +3947,85 @@
2727	3947	EditObject(obj);
2728	3948	}
2729	3949
	3950	+ cameraView.requestFocusInWindow();
2730	3951	refreshContents(true);
2731	3952	} else
2732		- if (event.getSource() == closeButton)
	3953	+ if (source == closeButton)
2733	3954	{
2734	3955	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2735	3956	cRadio ab;
2736	3957	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2737	3958	{
2738	3959	ab = (cRadio)e.nextElement();
2739		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3960	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2740	3961	{
	3962	+ // Patch to avoid bug with transparency.
	3963	+ if (!ab.hadMaterial)
	3964	+ {
	3965	+ ab.object.material = null;
	3966	+ }
	3967	+
2741	3968	buttonGroup.remove(ab);
2742	3969	radioPanel.remove(ab);
2743	3970
2744		- ab.GetObject().editWindow = null;
	3971	+ //ab.GetObject().editWindow = null;
	3972	+ ab.GetObject().manipWindow = null;
2745	3973	// ab.GetObject().objectUI = null; // ?????????
2746	3974
2747	3975	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2748	3976	break;
2749	3977	}
2750	3978	}
	3979	+
	3980	+ cameraView.requestFocusInWindow();
2751	3981	refreshContents(true);
2752	3982	} else
2753		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3983	+ if (source == editItem \|\| source == editButton)
2754	3984	{
	3985	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3986	+ {
	3987	+ Object3D child = (Object3D)e.nextElement();
	3988	+ child.pinned = true;
	3989	+ }
	3990	+
2755	3991	EditSelection(false);
2756	3992	} else
2757		- if (event.getSource() == uneditButton)
	3993	+ if (source == uneditButton)
2758	3994	{
2759	3995	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2760	3996	{
2761	3997	Object3D child = (Object3D)e.nextElement();
2762	3998	if(child.editWindow != null)
2763		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3999	+ child.pinned = false;
2764	4000	child.CloseUI();
2765	4001	listUI.remove(child);
	4002	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2766	4003
2767		- child.editWindow = null; // ???????????
	4004	+ //child.editWindow = null; // ???????????
2768	4005	}
2769		- objEditor.ctrlPanel.revalidate();
	4006	+ objEditor.ctrlPanel.FlushUI();
2770	4007	//objEditor.jTree.clearSelection();
2771	4008	//objEditor.ResetSliders();
2772	4009	refreshContents(true);
2773	4010	} else
2774		- if (event.getSource() == clearPanelButton)
	4011	+ if (source == clearPanelButton)
2775	4012	{
2776	4013	assert(copy == group);
2777	4014	//copy.ClearUI();
2778	4015	for (Object3D obj : listUI)
2779	4016	{
	4017	+ obj.pinned = false;
2780	4018	obj.CloseUI();
2781	4019	}
2782	4020	listUI.clear();
	4021	+ SetPinStates(group.selection.size() > 0);
2783	4022	refreshContents(true);
2784	4023	} else
2785		- if (event.getSource() == allParamsButton)
	4024	+ if (source == allParamsButton)
2786	4025	{
2787	4026	assert(copy == group);
2788	4027
2789		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4028	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2790	4029
2791	4030	for (Object3D obj : listUI)
2792	4031	{
..	..	@@ -2803,19 +4042,19 @@
2803	4042
2804	4043	refreshContents(true);
2805	4044	} else
2806		- if (event.getSource() == unselectButton)
	4045	+ if (source == unselectButton)
2807	4046	{
2808	4047	objEditor.jTree.clearSelection();
2809		- // ?? oct 2012 GraphreeD.clipboard.clear();
	4048	+ // ?? oct 2012 GrafreeD.clipboard.clear();
2810	4049	objEditor.ResetSliders();
2811	4050	refreshContents(true);
2812	4051	} else
2813		- if(event.getSource() instanceof cRadio)
	4052	+ if(source instanceof cRadio)
2814	4053	{
2815	4054	group.parent = keepparent;
2816	4055	group.attributes = 0;
2817	4056	//group.editWindow = null;
2818		- /cRadio/ radio = (cRadio)event.getSource();
	4057	+ /cRadio/ radio = (cRadio)source;
2819	4058	Object3D obj = radio.GetObject();
2820	4059	System.out.println("Edit " + obj);
2821	4060	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2835,7 +4074,8 @@
2835	4074	}
2836	4075
2837	4076	copy = group;
2838		- //CameraPane.theRenderer.object = group;
	4077	+
	4078	+ //Globals.theRenderer.object = group;
2839	4079	if(!useclient)
2840	4080	{
2841	4081	cameraView.renderCamera = radio.camera;
..	..	@@ -2844,25 +4084,67 @@
2844	4084	cameraView.cameras[cameraView.cameracount] = radio.camera;
2845	4085	cameraView.targetLookAt.set(radio.camera.lookAt);
2846	4086	cameraView.object = group;
2847		- cameraView.lighttouched = true;
	4087	+ //cameraView.lighttouched = true;
	4088	+ Globals.lighttouched = true;
2848	4089	topView.object = group;
2849	4090	frontView.object = group;
2850	4091	sideView.object = group;
2851	4092	}
2852		- group.editWindow = this;
	4093	+
	4094	+// fix "+" issue
	4095	+ //group.editWindow = this;
	4096	+ group.manipWindow = this;
	4097	+
2853	4098	/*
2854	4099	currentLayout = radio.layout;
2855	4100	if (currentLayout == null)
2856	4101	currentLayout = sevenButton;
2857	4102	*/
2858	4103	radio.layout.doClick();
	4104	+
	4105	+ assert(copy instanceof Composite);
	4106	+
	4107	+ if (copy.versionlist == null)
	4108	+ {
	4109	+ copy.versionlist = new Object3D[100];
	4110	+ copy.versionindex = -1;
	4111	+
	4112	+ Save(true);
	4113	+ }
	4114	+
	4115	+ SetVersionStates();
	4116	+
	4117	+ ClearUnpinned();
	4118	+
	4119	+ //Grafreed.Assert(group != null);
	4120	+ //Grafreed.Assert(group.selection != null);
	4121	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4122	+ if (group.selection == null \|\| group.selection.size() == 1)
	4123	+ EditSelection(false);
2859	4124	keepparent = group.parent;
2860	4125	// PARENT = NULL or not???
2861	4126	//group.parent = null; // ROOT
2862	4127	//group.attributes = -1;
2863	4128	ResetModel();
	4129	+
	4130	+ cameraView.requestFocusInWindow();
2864	4131	refreshContents(true);
2865		- }
	4132	+ } else if (event.getSource() == editCameraItem)
	4133	+ {
	4134	+ cameraView.ProtectCamera();
	4135	+ cameraView.requestFocusInWindow();
	4136	+ cameraView.repaint();
	4137	+ return;
	4138	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	4139	+ {
	4140	+ cameraView.RevertCamera();
	4141	+ cameraView.requestFocusInWindow();
	4142	+ cameraView.repaint();
	4143	+ return;
	4144	+ // } else if (event.getSource() == textureButton)
	4145	+ // {
	4146	+ // return; // true;
	4147	+ }
2866	4148	else
2867	4149	{
2868	4150	//return super.action(event, arg);
..	..	@@ -2871,7 +4153,6 @@
2871	4153	}
2872	4154
2873	4155	boolean useclient = false;
2874		- cRadio radio;
2875	4156
2876	4157	void ToggleRoot()
2877	4158	{
..	..	@@ -2880,7 +4161,7 @@
2880	4161	if (useclient)
2881	4162	{
2882	4163	cameraView.object = client;
2883		- cameraView.lighttouched = true;
	4164	+ Globals.lighttouched = true;
2884	4165	//topView.object = client;
2885	4166	//frontView.object = client;
2886	4167	//sideView.object = client;
..	..	@@ -2888,7 +4169,7 @@
2888	4169	else
2889	4170	{
2890	4171	cameraView.object = group;
2891		- cameraView.lighttouched = true;
	4172	+ Globals.lighttouched = true;
2892	4173	//topView.object = group;
2893	4174	//frontView.object = group;
2894	4175	//sideView.object = group;
..	..	@@ -2923,6 +4204,28 @@
2923	4204	refreshContents();
2924	4205	}
2925	4206
	4207	+ void TransformChildren()
	4208	+ {
	4209	+ Object3D obj;
	4210	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4211	+ {
	4212	+ obj = (Object3D)e.nextElement();
	4213	+ obj.KeepTextureMatrices();
	4214	+ obj.TransformChildren();
	4215	+ obj.RestoreTextureMatrices();
	4216	+
	4217	+// if (obj.parent == null)
	4218	+// {
	4219	+// System.out.println("NULL PARENT!");
	4220	+// new Exception().printStackTrace();
	4221	+// }
	4222	+// else
	4223	+// TouchTransform(obj);
	4224	+// //obj.parent.Touch();
	4225	+ }
	4226	+
	4227	+ refreshContents();
	4228	+ }
2926	4229
2927	4230	void ResetTransform()
2928	4231	{
..	..	@@ -3035,7 +4338,7 @@
3035	4338	refreshContents();
3036	4339	}
3037	4340
3038		- void ResetCentroid()
	4341	+ void ResetCentroid(boolean full)
3039	4342	{
3040	4343	Object3D obj;
3041	4344	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3050,12 +4353,16 @@
3050	4353	LA.matIdentity(Object3D.mat);
3051	4354	obj.getBounds(minima, maxima, false);
3052	4355	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3053		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	4356	+ if (full)
	4357	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3054	4358	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3055	4359	obj.TransformMesh(Object3D.mat);
	4360	+
3056	4361	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3057		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	4362	+ if (full)
	4363	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3058	4364	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	4365	+
3059	4366	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3060	4367	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3061	4368	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3084,7 +4391,8 @@
3084	4391
3085	4392	int size = obj.MemorySize();
3086	4393
3087		- System.err.println((size/1024) + " KB is the size of " + obj);
	4394	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4395	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3088	4396	}
3089	4397	}
3090	4398	catch (Exception e)
..	..	@@ -3121,9 +4429,9 @@
3121	4429	obj = (Object3D)e.nextElement();
3122	4430
3123	4431	System.out.println("Object is: " + obj);
3124		- GraphreeD.AnalyzeObject(obj);
	4432	+ Grafreed.AnalyzeObject(obj);
3125	4433	System.out.println("Boundary rep: " + obj.bRep);
3126		- GraphreeD.AnalyzeObject(obj.bRep);
	4434	+ Grafreed.AnalyzeObject(obj.bRep);
3127	4435
3128	4436	// System.err.println((size/1024) + " KB is the size of " + obj);
3129	4437	}
..	..	@@ -3165,6 +4473,20 @@
3165	4473	void GenNormals(boolean crease)
3166	4474	{
3167	4475	group.GenNormalsS(crease);
	4476	+
	4477	+ refreshContents();
	4478	+ }
	4479	+
	4480	+ void GenNormalsMESH()
	4481	+ {
	4482	+ group.GenNormalsMeshS();
	4483	+
	4484	+ refreshContents();
	4485	+ }
	4486	+
	4487	+ void GenNormalsMINE()
	4488	+ {
	4489	+ group.selection.GenNormalsMINE();
3168	4490
3169	4491	refreshContents();
3170	4492	}
..	..	@@ -3250,7 +4572,7 @@
3250	4572	// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3251	4573	// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3252	4574	//
3253		-// g.add(GraphreeD.clipboard);
	4575	+// g.add(GrafreeD.clipboard);
3254	4576	//
3255	4577	// buffer.add(g);
3256	4578	// }
..	..	@@ -3269,8 +4591,8 @@
3269	4591	// nodes = new Object3D();
3270	4592	// vertices = new Vector<Vertex>();
3271	4593	//
3272		-// boolean epsequal = GraphreeD.epsequal;
3273		-// GraphreeD.epsequal = true;
	4594	+// boolean epsequal = GrafreeD.epsequal;
	4595	+// GrafreeD.epsequal = true;
3274	4596	//
3275	4597	// for (int i=0; i<group.selection.size(); i++)
3276	4598	// {
..	..	@@ -3311,7 +4633,7 @@
3311	4633	// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3312	4634	// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3313	4635	//
3314		-// g.add(GraphreeD.clipboard);
	4636	+// g.add(GrafreeD.clipboard);
3315	4637	//
3316	4638	// buffer.add(g);
3317	4639	// }
..	..	@@ -3319,7 +4641,7 @@
3319	4641	// makeSomething(buffer, i==group.selection.size()-1);
3320	4642	// }
3321	4643	//
3322		-// GraphreeD.epsequal = epsequal;
	4644	+// GrafreeD.epsequal = epsequal;
3323	4645	//
3324	4646	// //buffer = null;
3325	4647	// temprep = null;
..	..	@@ -3330,8 +4652,8 @@
3330	4652
3331	4653	void ParseVertices()
3332	4654	{
3333		- boolean epsequal = GraphreeD.epsequal;
3334		- GraphreeD.epsequal = true;
	4655	+ boolean epsequal = Grafreed.epsequal;
	4656	+ Grafreed.epsequal = true;
3335	4657
3336	4658	for (int i=0; i<group.selection.size(); i++)
3337	4659	{
..	..	@@ -3356,7 +4678,7 @@
3356	4678	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3357	4679	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3358	4680
3359		- g.add(GraphreeD.clipboard);
	4681	+ g.add(Grafreed.clipboard);
3360	4682
3361	4683	buffer.add(g);
3362	4684	}
..	..	@@ -3371,7 +4693,7 @@
3371	4693	makeSomething(buffer, i==group.selection.size()-1);
3372	4694	}
3373	4695
3374		- GraphreeD.epsequal = epsequal;
	4696	+ Grafreed.epsequal = epsequal;
3375	4697
3376	4698	refreshContents();
3377	4699	}
..	..	@@ -3389,7 +4711,16 @@
3389	4711	String pigment = Object3D.GetPigment(tex);
3390	4712	//String bump = Object3D.GetBump(tex);
3391	4713
3392		- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
	4714	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4715	+
	4716	+ try
	4717	+ {
	4718	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
	4719	+ }
	4720	+ catch (Exception e)
	4721	+ {
	4722	+ System.err.println("FAIL: " + node);
	4723	+ }
3393	4724
3394	4725	double s = v.s;
3395	4726
..	..	@@ -3416,7 +4747,7 @@
3416	4747	scale /= 3;
3417	4748
3418	4749	scale /= 0xFF;
3419		- scale /= 4;
	4750	+ // c'est quoi ca? scale /= 4;
3420	4751
3421	4752	//v.AO = scale;
3422	4753
..	..	@@ -3437,12 +4768,26 @@
3437	4768
3438	4769	void Align()
3439	4770	{
	4771	+ if (group.selection.size() == 0)
	4772	+ return;
	4773	+
	4774	+ cVector bbmin = new cVector();
	4775	+ cVector bbmax = new cVector();
	4776	+
	4777	+ group.selection.get(0).getBounds(bbmin, bbmax, true);
	4778	+
	4779	+ double dx = bbmax.x - bbmin.x;
	4780	+ double dy = bbmax.y - bbmin.y;
	4781	+ double dz = bbmax.z - bbmin.z;
	4782	+
	4783	+ double scale = Math.sqrt(dxdx + dydy + dz*dz);
	4784	+
3440	4785	for (int i=0; i<group.selection.size(); i++)
3441	4786	{
3442	4787	Object3D obj = group.selection.get(i);
3443	4788
3444		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3445		- LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
	4789	+ LA.matTranslate(obj.toParent, i * scale, 0, 0);
	4790	+ LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3446	4791	}
3447	4792
3448	4793	refreshContents();
..	..	@@ -3455,7 +4800,7 @@
3455	4800	// ref.SaveSupports();
3456	4801	// Object3D par = ref.parent;
3457	4802	// ref.parent = null;
3458		-// Object3D lowres = (Object3D) GraphreeD.clone(ref);
	4803	+// Object3D lowres = (Object3D) GrafreeD.clone(ref);
3459	4804	// ref.parent = par;
3460	4805	// ref.RestoreSupports();
3461	4806
..	..	@@ -3463,11 +4808,11 @@
3463	4808
3464	4809	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3465	4810
3466		- boolean random = CameraPane.RANDOM;
3467		- CameraPane.RANDOM = false; // parse all random nodes
	4811	+ boolean random = CameraPane.SWITCH;
	4812	+ CameraPane.SWITCH = false; // parse all random nodes
3468	4813	lowres.linkVerticesThis(null);
3469	4814	lowres.linkVerticesThis(sn);
3470		- CameraPane.RANDOM = random;
	4815	+ CameraPane.SWITCH = random;
3471	4816
3472	4817	System.err.flush();
3473	4818
..	..	@@ -3485,7 +4830,7 @@
3485	4830	// lowres.SaveSupports();
3486	4831	// par = lowres.parent;
3487	4832	// lowres.parent = null;
3488		-// Object3D newlow = (Object3D) GraphreeD.clone(lowres);
	4833	+// Object3D newlow = (Object3D) GrafreeD.clone(lowres);
3489	4834	Object3D newlow = CloneObject(lowres, false);
3490	4835	newlow.name = sn.switchobject.get(i).name;
3491	4836	System.out.println(" pose#" + i + " = " + newlow);
..	..	@@ -3507,7 +4852,7 @@
3507	4852	return;
3508	4853
3509	4854	Object3D poses = group.selection.get(0);
3510		- Object3D ref = GraphreeD.clipboard.get(0);
	4855	+ Object3D ref = Grafreed.clipboard.get(0);
3511	4856
3512	4857	Object3D newgroup = new Object3D("Po:" + poses.name);
3513	4858
..	..	@@ -3676,7 +5021,7 @@
3676	5021	group.selection.RelinkToSupport(); // july 2014
3677	5022	System.out.println("DONE.");
3678	5023	refreshContents();
3679		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	5024	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3680	5025	}
3681	5026
3682	5027	void ReduceMesh(boolean reduction34)
..	..	@@ -3701,20 +5046,20 @@
3701	5046
3702	5047	void ClipMesh()
3703	5048	{
3704		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	5049	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3705	5050	{
3706		- Object3D content = GraphreeD.clipboard.get(0);
	5051	+ Object3D content = Grafreed.clipboard.get(0);
3707	5052
3708	5053	if (content instanceof cGroup && ((cGroup)content).transientlink )
3709	5054	content = ((cGroup)content).get(0);
3710	5055
3711	5056	// for (int i=0; i<group.selection.size(); i++)
3712	5057	// {
3713		-// group.selection.get(i).ClipMesh(GraphreeD.clipboard);
	5058	+// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3714	5059	// }
3715		- group.selection.ClipMesh(GraphreeD.clipboard);
	5060	+ group.selection.ClipMesh(Grafreed.clipboard);
3716	5061	}
3717		-// group.selection.ClipMesh(GraphreeD.clipboard);
	5062	+// group.selection.ClipMesh(GrafreeD.clipboard);
3718	5063	System.out.println("DONE.");
3719	5064	refreshContents();
3720	5065	}
..	..	@@ -3759,6 +5104,18 @@
3759	5104	void MarkLeaves(boolean hide)
3760	5105	{
3761	5106	group.selection.MarkLeaves(hide);
	5107	+ refreshContents();
	5108	+ }
	5109	+
	5110	+ void RewindLeaves(boolean hide)
	5111	+ {
	5112	+ group.selection.RewindLeaves(hide);
	5113	+ refreshContents();
	5114	+ }
	5115	+
	5116	+ void RandomLeaves(boolean hide)
	5117	+ {
	5118	+ group.selection.RandomLeaves(hide);
3762	5119	refreshContents();
3763	5120	}
3764	5121
..	..	@@ -3833,28 +5190,25 @@
3833	5190	// }
3834	5191	// }
3835	5192
3836		- static boolean allparams = true;
3837		-
3838		- static Vector<Object3D> listUI = new Vector<Object3D>();
3839		-
3840	5193	void EditSelection(boolean newWindow)
3841	5194	{
	5195	+ if (group.selection == null)
	5196	+ {
	5197	+ EditElement(group, newWindow); // ? new
	5198	+ return;
	5199	+ }
	5200	+
3842	5201	// aConstraints.gridy = 0;
3843	5202	for (int i=0; i<group.selection.size(); i++)
3844	5203	{
3845	5204	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
3846	5205	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3847		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5206	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3848	5207
3849	5208	Object3D elem = (Object3D)group.selection.elementAt(i);
3850		- if(elem != group)
	5209	+ if(elem != group \|\| !newWindow)
3851	5210	{
3852		- // if (!(elem instanceof Composite))
3853		- // newWindow = false;
3854		- listUI.add(elem);
3855		- elem.openEditWindow(this, newWindow); //, false);
3856		- System.out.println("edit : " + elem);
3857		- elem.editWindow.refreshContents(true); // ? new
	5211	+ EditElement(elem, newWindow); // ? new
3858	5212	}
3859	5213	}
3860	5214	}
..	..	@@ -3917,9 +5271,7 @@
3917	5271
3918	5272	freezemodel = false;
3919	5273	}
3920		-
3921		- boolean flashIt = true;
3922		-
	5274	+
3923	5275	public void valueChanged(TreeSelectionEvent e)
3924	5276	//public boolean handleEvent(Event event)
3925	5277	{
..	..	@@ -3929,7 +5281,8 @@
3929	5281	//new Exception().printStackTrace();
3930	5282
3931	5283	freezemodel = true;
3932		-
	5284	+ ClearUnpinned();
	5285	+
3933	5286	/**/
3934	5287	//switch (event.id)
3935	5288	{
..	..	@@ -3937,7 +5290,6 @@
3937	5290	//case 702: // Event.LIST_DESELECT
3938	5291	group.deselectAll();
3939	5292	TreePath tps[] = objEditor.jTree.getSelectionPaths();
3940		- objEditor.ClearInfo(); // .GetMaterial());
3941	5293	if (tps != null)
3942	5294	{
3943	5295	for (int i=0; i < tps.length; i++)
..	..	@@ -3946,33 +5298,39 @@
3946	5298
3947	5299	//if (child.parent != null)
3948	5300	//child.parent.addSelectee(child);
	5301	+ objEditor.SetMaterial(child);
3949	5302	group.addSelectee(child);
3950		- objEditor.SetMaterial(child); // .GetMaterial());
3951		- objEditor.AddInfo(child, this, true); // .GetMaterial());
3952		- System.err.println("info : " + child.GetPath());
3953	5303	}
3954	5304	}
3955		- else
3956		- {
3957		- objEditor.SetMaterial(group); // .GetMaterial());
3958		- objEditor.AddInfo(group, this, true); // .GetMaterial());
3959		- System.err.println("info : " + group.GetPath());
3960		- }
	5305	+// else
	5306	+// {
	5307	+// objEditor.SetMaterial(group); // .GetMaterial());
	5308	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	5309	+// System.err.println("info : " + group.GetPath());
	5310	+// }
3961	5311
3962		- objEditor.SetText(); // jan 2014
3963		-
3964		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	5312	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
3965	5313	CameraPane.flash = true;
3966	5314
3967		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5315	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
3968	5316	// a camera
3969	5317	{
3970		- CameraPane.camerachangeframe = 0; // don't refuse it
3971		- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
3972		- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
3973		- // CameraPane.theRenderer.eyeCamera = CameraPane.theRenderer.manipCamera;
	5318	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5319	+ {
	5320	+ CameraPane.camerachangeframe = 0; // don't refuse it
	5321	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5322	+ }
	5323	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	5324	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
3974	5325	}
3975	5326
	5327	+ if (tps != null && tps.length == 1)
	5328	+ {
	5329	+ EditSelection(false);
	5330	+ }
	5331	+
	5332	+ SetPinStates(tps != null && tps.length > 0);
	5333	+
3976	5334	refreshContents();
3977	5335	//return true;
3978	5336	}
..	..	@@ -3981,6 +5339,51 @@
3981	5339
3982	5340	freezemodel = false;
3983	5341	}
	5342	+
	5343	+ void SetPinStates(boolean enabled)
	5344	+ {
	5345	+ editButton.setEnabled(enabled);
	5346	+ uneditButton.setEnabled(enabled);
	5347	+ //unselectButton.setEnabled(enabled);
	5348	+ flashSelectionButton.setEnabled(enabled);
	5349	+
	5350	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5351	+
	5352	+ boolean allComposites = true;
	5353	+
	5354	+ if (group.selection != null)
	5355	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5356	+ {
	5357	+ if (!(e.nextElement() instanceof Composite))
	5358	+ {
	5359	+ allComposites = false;
	5360	+ break;
	5361	+ }
	5362	+ }
	5363	+
	5364	+ rootButton.setEnabled(allComposites);
	5365	+ }
	5366	+
	5367	+ void refreshContents(boolean cp)
	5368	+ {
	5369	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5370	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5371	+ {
	5372	+ objEditor.ClearInfo(); // .GetMaterial());
	5373	+
	5374	+ for (int i=0; i < group.selection.Size(); i++)
	5375	+ {
	5376	+ Object3D child = (Object3D) group.selection.get(i);
	5377	+
	5378	+ objEditor.AddInfo(child, this, true);
	5379	+// System.err.println("info : " + child.GetPath());
	5380	+ }
	5381	+
	5382	+ objEditor.SetText(); // jan 2014
	5383	+ }
	5384	+
	5385	+ super.refreshContents(cp);
	5386	+ }
3984	5387
3985	5388	void linkSomething(Object3D thing)
3986	5389	{
..	..	@@ -4052,16 +5455,19 @@
4052	5455	{
4053	5456	if (group.selection.isEmpty())
4054	5457	return;
4055		- GraphreeD.clipboardIsTempGroup = false;
	5458	+
	5459	+ Grafreed.clipboardIsTempGroup = false;
4056	5460	Composite tGroup = null;
4057	5461	if (group.selection.size() > 0) // 1)
4058	5462	{
4059	5463	tGroup = new cGroup();
4060		- GraphreeD.clipboardIsTempGroup = true;
	5464	+ Grafreed.clipboardIsTempGroup = true;
4061	5465	}
4062	5466
4063	5467	if (cut)
4064	5468	{
	5469	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5470	+// Save();
4065	5471	//int indices[] = jList.getSelectedIndices();
4066	5472	//for (int i = indices.length - 1; i >= 0; i--)
4067	5473	//jList.remove(indices[i]);
..	..	@@ -4097,16 +5503,16 @@
4097	5503	//System.out.println("cut " + child);
4098	5504	//System.out.println("parent = " + child.parent);
4099	5505	// tmp.addChild(child);
4100		- if (GraphreeD.clipboardIsTempGroup)
	5506	+ if (Grafreed.clipboardIsTempGroup)
4101	5507	tGroup.add/Child/(tmp);
4102	5508	else
4103		- GraphreeD.clipboard = tmp;
	5509	+ Grafreed.clipboard = tmp;
4104	5510	}
4105	5511	else
4106		- if (GraphreeD.clipboardIsTempGroup)
	5512	+ if (Grafreed.clipboardIsTempGroup)
4107	5513	tGroup.add/Child/(child);
4108	5514	else
4109		- GraphreeD.clipboard = child;
	5515	+ Grafreed.clipboard = child;
4110	5516	}
4111	5517
4112	5518	//ResetModel();
..	..	@@ -4138,21 +5544,23 @@
4138	5544	//System.out.println("cut " + elem);
4139	5545	//System.out.println("parent = " + elem.parent);
4140	5546	// tmp.addChild(elem);
4141		- if (GraphreeD.clipboardIsTempGroup)
	5547	+ if (Grafreed.clipboardIsTempGroup)
4142	5548	tGroup.add/Child/(tmp);
4143	5549	else
4144		- GraphreeD.clipboard = tmp;
	5550	+ Grafreed.clipboard = tmp;
4145	5551	}
4146	5552	else
4147		- if (GraphreeD.clipboardIsTempGroup)
	5553	+ if (Grafreed.clipboardIsTempGroup)
4148	5554	tGroup.add/Child/(child);
4149	5555	else
4150		- GraphreeD.clipboard = child;
	5556	+ Grafreed.clipboard = child;
4151	5557	}
4152	5558
4153	5559	}
4154		- if (GraphreeD.clipboardIsTempGroup)
4155		- GraphreeD.clipboard = tGroup;
	5560	+
	5561	+ if (Grafreed.clipboardIsTempGroup)
	5562	+ Grafreed.clipboard = tGroup;
	5563	+
4156	5564	if (cut)
4157	5565	{
4158	5566	ResetModel();
..	..	@@ -4162,11 +5570,15 @@
4162	5570
4163	5571	void paste(boolean expand)
4164	5572	{
4165		- // if (GraphreeD.clipboard == null)
	5573	+ if (Globals.REPLACEONMAKE)
	5574	+ Save();
	5575	+ boolean keep = Globals.REPLACEONMAKE;
	5576	+ Globals.REPLACEONMAKE = false;
	5577	+ // if (GrafreeD.clipboard == null)
4166	5578	// return;
4167	5579	boolean first = true;
4168	5580
4169		- if (GraphreeD.clipboardIsTempGroup)
	5581	+ if (Grafreed.clipboardIsTempGroup)
4170	5582	{
4171	5583	Composite temp;
4172	5584
..	..	@@ -4177,7 +5589,7 @@
4177	5589	temp = (Composite)Applet3D.clipboard.deepCopy();
4178	5590	*/
4179	5591	Object3D elem;
4180		- for (Enumeration e = /temp.children/GraphreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5592	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4181	5593	{
4182	5594	Object3D child = (Object3D)e.nextElement();
4183	5595
..	..	@@ -4191,7 +5603,7 @@
4191	5603	else
4192	5604	elem = child.deepCopy(); // ?
4193	5605	child.parent = keepparent;
4194		- //if (GraphreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
	5606	+ //if (GrafreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
4195	5607	// elem = elem.get(0);
4196	5608	makeSomething(elem, true); // ?? first);
4197	5609	//group.addChild(elem);
..	..	@@ -4211,23 +5623,24 @@
4211	5623	//Object3D cb = Applet3D.clipboard;
4212	5624	//temp.addChild(cb);
4213	5625	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4214		- assert(GraphreeD.clipboard.parent == null);
4215		- Object3D /Composite/ keepparent = GraphreeD.clipboard.get(0).parent;
4216		- GraphreeD.clipboard.get(0).parent = null; // Avoid copy?
4217		- if (LA.isIdentity(GraphreeD.clipboard.toParent))
4218		- makeSomething(expand?GraphreeD.clipboard.get(0).copyExpand():GraphreeD.clipboard.get(0).deepCopy());
	5626	+ assert(Grafreed.clipboard.parent == null);
	5627	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5628	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5629	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5630	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4219	5631	else
4220		- makeSomething(expand?GraphreeD.clipboard.copyExpand():GraphreeD.clipboard.deepCopy());
4221		- GraphreeD.clipboard.get(0).parent = keepparent;
	5632	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5633	+ Grafreed.clipboard.get(0).parent = keepparent;
4222	5634	}
4223	5635
	5636	+ Globals.REPLACEONMAKE = keep;
4224	5637	ResetModel();
4225	5638	refreshContents();
4226	5639	}
4227	5640
4228		- void pasteInto(boolean copyit)
	5641	+ void pasteInto(boolean copyit, boolean clone)
4229	5642	{
4230		-// if (GraphreeD.clipboard == null)
	5643	+// if (GrafreeD.clipboard == null)
4231	5644	// return;
4232	5645
4233	5646	if (group.selection.size() != 1)
..	..	@@ -4254,15 +5667,22 @@
4254	5667	if (copyit)
4255	5668	{
4256	5669	// paste(false);
4257		- CloneClipboard(false); // sept 2014
	5670	+ if (clone)
	5671	+ {
	5672	+ CloneClipboard(false); // sept 2014
	5673	+ }
	5674	+ else
	5675	+ {
	5676	+ paste(false);
	5677	+ }
4258	5678	}
4259	5679	else
4260	5680	{
4261	5681	boolean first = true;
4262	5682
4263		- if (GraphreeD.clipboardIsTempGroup)
	5683	+ if (Grafreed.clipboardIsTempGroup)
4264	5684	{
4265		- Composite temp = (Composite)GraphreeD.clipboard;
	5685	+ Composite temp = (Composite)Grafreed.clipboard;
4266	5686	Object3D copy;
4267	5687	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4268	5688	{
..	..	@@ -4272,7 +5692,7 @@
4272	5692	}
4273	5693	} else
4274	5694	{
4275		- linkSomething(GraphreeD.clipboard); //.get(0));
	5695	+ linkSomething(Grafreed.clipboard); //.get(0));
4276	5696	}
4277	5697	}
4278	5698	}
..	..	@@ -4349,6 +5769,10 @@
4349	5769
4350	5770	void group(Object3D csg, boolean grab)
4351	5771	{
	5772	+ if (Globals.REPLACEONMAKE)
	5773	+ Save();
	5774	+ boolean keep = Globals.REPLACEONMAKE;
	5775	+ Globals.REPLACEONMAKE = false;
4352	5776	if (//false) // why??
4353	5777	!group.selection.isEmpty())
4354	5778	{
..	..	@@ -4462,8 +5886,34 @@
4462	5886	//node.add(csg);
4463	5887	//makeSomething(node);
4464	5888	makeSomething(csg);
	5889	+ Globals.REPLACEONMAKE = keep;
4465	5890	}
4466	5891
	5892	+ void Ungroup(Object3D g)
	5893	+ {
	5894	+ if (Globals.REPLACEONMAKE)
	5895	+ Save();
	5896	+ boolean keep = Globals.REPLACEONMAKE;
	5897	+ Globals.REPLACEONMAKE = false;
	5898	+ if (g instanceof HiddenObject)
	5899	+ {
	5900	+ HiddenObject h = (HiddenObject) g;
	5901	+
	5902	+ for (int i=0; i<h.ActualSize(); i++)
	5903	+ {
	5904	+ objEditor.makeSomething(h.get(i), false);
	5905	+ }
	5906	+ }
	5907	+ else
	5908	+ {
	5909	+ for (int i=0; i<g.Size(); i++)
	5910	+ {
	5911	+ objEditor.makeSomething(g.get(i), false);
	5912	+ }
	5913	+ }
	5914	+ Globals.REPLACEONMAKE = keep;
	5915	+ }
	5916	+
4467	5917	void ungroup()
4468	5918	{
4469	5919	/*
..	..	@@ -4657,21 +6107,6 @@
4657	6107	}
4658	6108	*/
4659	6109
4660		- void ImportGFD()
4661		- {
4662		- FileDialog browser = new FileDialog(objEditor.frame, "Import GraphreeD", FileDialog.LOAD);
4663		- browser.show();
4664		- String filename = browser.getFile();
4665		- if (filename != null && filename.length() > 0)
4666		- {
4667		- String fullname = browser.getDirectory() + filename;
4668		-
4669		- //Object3D readobj =
4670		- objEditor.ReadGFD(fullname, objEditor);
4671		- //makeSomething(readobj);
4672		- }
4673		- }
4674		-
4675	6110	/*
4676	6111	public void Callback(Object obj)
4677	6112	{
..	..	@@ -4695,26 +6130,9 @@
4695	6130	}
4696	6131	*/
4697	6132
4698		- void ImportVRMLX3D()
4699		- {
4700		- if (GraphreeD.standAlone)
4701		- {
4702		- /**/
4703		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4704		- browser.show();
4705		- String filename = browser.getFile();
4706		- if (filename != null && filename.length() > 0)
4707		- {
4708		- String fullname = browser.getDirectory() + filename;
4709		- LoadVRMLX3D(fullname);
4710		- }
4711		- /**/
4712		- }
4713		- }
4714		-
4715	6133	String GetFile(String dialogName)
4716	6134	{
4717		- if (GraphreeD.standAlone)
	6135	+ if (Grafreed.standAlone)
4718	6136	{
4719	6137	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4720	6138	browser.show();
..	..	@@ -4778,10 +6196,48 @@
4778	6196	cButton flashSelectionButton;
4779	6197	cButton editButton;
4780	6198	cButton uneditButton;
	6199	+ JCheckBox allParamsButton;
4781	6200	cButton clearpanelButton;
4782		- cButton allParamsButton;
4783	6201	cButton unselectButton;
4784	6202
	6203	+ cButton restoreCameraButton;
	6204	+
	6205	+ cButton oneStepButton;
	6206	+
	6207	+ cButton groupButton;
	6208	+ cButton ungroupButton;
	6209	+ cButton compositeButton;
	6210	+ cButton switchButton;
	6211	+ cButton loopButton;
	6212	+ cButton textureButton;
	6213	+
	6214	+ cButton skybox1Button;
	6215	+ cButton skybox2Button;
	6216	+ cButton skybox3Button;
	6217	+ cButton skybox4Button;
	6218	+ cButton skybox5Button;
	6219	+ cButton skybox6Button;
	6220	+ cButton skybox7Button;
	6221	+
	6222	+ cButton skybox11Button;
	6223	+ cButton skybox12Button;
	6224	+ cButton skybox13Button;
	6225	+ cButton skybox14Button;
	6226	+ cButton skybox15Button;
	6227	+ cButton skybox16Button;
	6228	+ cButton skybox17Button;
	6229	+
	6230	+ cButton gridButton;
	6231	+ cButton boxButton;
	6232	+ cButton sphereButton;
	6233	+ cButton coneButton;
	6234	+ cButton torusButton;
	6235	+ cButton superButton;
	6236	+ cButton kleinButton;
	6237	+ cButton particlesButton;
	6238	+ cButton overlayButton;
	6239	+ cButton lightButton;
	6240	+
4785	6241	cButton screenfitButton;
4786	6242	cButton screenfitpointButton;
4787	6243	cButton snapobjectButton;
..	..	@@ -4793,14 +6249,6 @@
4793	6249
4794	6250	cButton setsupportButton;
4795	6251
4796		- cButton twoButton;
4797		- cButton sixButton;
4798		- cButton threeButton;
4799		- cButton sevenButton;
4800		- cButton fourButton; // full panel
4801		- cButton oneButton; // full XYZ
4802		- //cButton currentLayout;
4803		-
4804	6252	//
4805	6253	//Composite
4806	6254	Object3D // to do !!
..	..	@@ -4810,10 +6258,12 @@
4810	6258	//JTree jTree;
4811	6259	private MenuItem lookAtItem;
4812	6260	private MenuItem lookFromItem;
4813		- private MenuItem switchItem;
4814		- private MenuItem cutItem;
4815		- private MenuItem duplicateItem;
4816		- private MenuItem cloneItem;
	6261	+ private MenuItem switchViewItem;
	6262	+ private JMenuItem cutItem;
	6263	+ private MenuItem undoItem;
	6264	+ private MenuItem redoItem;
	6265	+ private JMenuItem duplicateItem;
	6266	+ private JMenuItem cloneItem;
4817	6267	private MenuItem cloneSupportItem;
4818	6268	private MenuItem overwriteGeoItem;
4819	6269	private MenuItem overwriteMatItem;
..	..	@@ -4823,8 +6273,9 @@
4823	6273	private MenuItem resetsupportItem;
4824	6274	private MenuItem resetreferencesItem;
4825	6275	private MenuItem linkverticesItem;
	6276	+ private MenuItem relinkverticesItem;
4826	6277	private MenuItem setMasterItem;
4827		- private MenuItem resetMeshItem;
	6278	+ private MenuItem resetAllItem;
4828	6279	private MenuItem stepAllItem;
4829	6280	private MenuItem revertMeshItem;
4830	6281	private MenuItem poseMeshItem;
..	..	@@ -4833,16 +6284,19 @@
4833	6284	private MenuItem cloneGeometriesItem;
4834	6285	private MenuItem shareGeometriesItem;
4835	6286	private MenuItem mergeGeometriesItem;
4836		- private MenuItem copyItem;
	6287	+ private JMenuItem copyItem;
4837	6288	private MenuItem pasteItem;
4838		- private MenuItem pasteLinkItem;
4839		- private MenuItem pasteCloneItem;
4840		- private MenuItem pasteExpandItem;
4841		- private MenuItem clearItem;
	6289	+ private JMenuItem pasteIntoItem;
	6290	+ private JMenuItem pasteLinkItem;
	6291	+ private JMenuItem pasteCloneItem;
	6292	+ private JMenuItem pasteExpandItem;
	6293	+ private JMenuItem deleteItem;
4842	6294	private MenuItem clearAllItem;
4843	6295	private MenuItem genUVItem;
	6296	+ private MenuItem genNormalsMESHItem;
4844	6297	private MenuItem genNormalsCADItem;
4845	6298	private MenuItem genNormalsORGANItem;
	6299	+ private MenuItem genNormalsMINEItem;
4846	6300	private MenuItem stripifyItem;
4847	6301	private MenuItem unstripifyItem;
4848	6302	private MenuItem trimItem;
..	..	@@ -4871,6 +6325,10 @@
4871	6325	private MenuItem showleavesItem;
4872	6326	private MenuItem markleavesItem;
4873	6327	private MenuItem unmarkleavesItem;
	6328	+ private MenuItem rewindleavesItem;
	6329	+ private MenuItem unrewindleavesItem;
	6330	+ private MenuItem randomleavesItem;
	6331	+ private MenuItem unrandomleavesItem;
4874	6332
4875	6333	private MenuItem flipVItem;
4876	6334	private MenuItem unflipVItem;
..	..	@@ -4882,14 +6340,17 @@
4882	6340	private MenuItem panoTexturesItem;
4883	6341
4884	6342	private MenuItem resetCentroidItem;
4885		- private MenuItem transformgeometryItem;
	6343	+ private MenuItem resetCentroidXZItem;
4886	6344	private MenuItem resetTransformItem;
	6345	+ private MenuItem transformGeometryItem;
	6346	+ private MenuItem transformChildrenItem;
	6347	+ private MenuItem hideItem;
4887	6348	private MenuItem grabItem;
4888	6349	private MenuItem backItem;
4889	6350	private MenuItem frontItem;
4890	6351	private MenuItem cameraItem;
4891	6352	private MenuItem compositeItem;
4892		- private MenuItem randomItem;
	6353	+ private MenuItem switchItem;
4893	6354	private MenuItem physicsItem;
4894	6355	private MenuItem frameselectorItem;
4895	6356	private MenuItem scriptNodeItem;
..	..	@@ -4897,13 +6358,14 @@
4897	6358	private MenuItem switchTransfoItem;
4898	6359	private MenuItem morphItem;
4899	6360	private MenuItem linkerItem;
4900		- private MenuItem ungroupItem;
	6361	+ private JMenuItem ungroupItem;
4901	6362	private MenuItem editItem;
4902	6363	private MenuItem openWindowItem;
4903	6364	private MenuItem editLeafItem;
4904	6365
4905	6366	private MenuItem resetParentItem;
4906	6367	private MenuItem repairParentItem;
	6368	+ private MenuItem repairShadowItem;
4907	6369	private MenuItem sortbysizeItem;
4908	6370	private MenuItem sortbynameItem;
4909	6371
..	..	@@ -4912,6 +6374,8 @@
4912	6374	private MenuItem attachBumpItem;
4913	6375	private MenuItem detachBumpItem;
4914	6376	private MenuItem pigmentBumpItem;
	6377	+ private MenuItem embedTexturesItem;
	6378	+ private MenuItem deEmbedTexturesItem;
4915	6379
4916	6380	private MenuItem particleItem;
4917	6381	private MenuItem ragdollItem;
..	..	@@ -4924,10 +6388,11 @@
4924	6388	private MenuItem coneItem;
4925	6389	private MenuItem torusItem;
4926	6390	private MenuItem superItem;
	6391	+ private MenuItem kleinItem;
4927	6392	private MenuItem blobItem;
4928	6393	private MenuItem latheItem;
4929	6394	private MenuItem bezierItem;
4930		- private MenuItem checkerItem;
	6395	+ private MenuItem overlayItem;
4931	6396	private MenuItem meshItem;
4932	6397	// private MenuItem meshGroupItem;
4933	6398	private MenuItem springItem;
..	..	@@ -4936,6 +6401,7 @@
4936	6401	private MenuItem csgItem;
4937	6402	private MenuItem templateItem;
4938	6403	private MenuItem textureItem;
	6404	+ private MenuItem billboardItem;
4939	6405	private MenuItem shadowXItem;
4940	6406	private MenuItem shadowYItem;
4941	6407	private MenuItem shadowZItem;
..	..	@@ -4948,11 +6414,6 @@
4948	6414	private MenuItem doubleItem;
4949	6415	private MenuItem tripleItem;
4950	6416
4951		- private MenuItem importGFDItem;
4952		- private MenuItem importVRMLX3DItem;
4953		- private MenuItem import3DSItem;
4954		- private MenuItem importOBJItem;
4955		-
4956	6417	private MenuItem computeAOItem;
4957	6418	private MenuItem recompileItem;
4958	6419	private MenuItem editScriptItem;
..	..	@@ -4962,4 +6423,8 @@
4962	6423	private MenuItem analyzeItem;
4963	6424	private MenuItem dumpItem;
4964	6425	//boolean freezemodel = false;
	6426	+
	6427	+ Menu cameraMenu;
	6428	+ MenuItem editCameraItem;
	6429	+ MenuItem restoreCameraItem;
4965	6430	}