~nbriere/GrafreeD.git - Noware Git Repository

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