~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -12,9 +12,11 @@
12	12	import com.jme.math.Vector3f;
13	13	import com.jme.renderer.ColorRGBA;
14	14
	15	+import grafeme.ui.*;
15	16	//import buoy.widget.BFileChooser;
16	17
17	18	class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
	19	+ Grafreed.iResourceCallBack,
18	20	ObjectUI,
19	21	Runnable,
20	22	ActionListener,
..	..	@@ -22,6 +24,360 @@
22	24	DragGestureListener, DragSourceListener, DropTargetListener,
23	25	ItemListener // ListSelectionListener
24	26	{
	27	+
	28	+ public void AddSkyboxButton(String f, String s, cGridBag row)
	29	+ {
	30	+ cButton skyboxButton;
	31	+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
	32	+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
	33	+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
	34	+ skyboxButton.setToolTipText(s.equals("") ? "No background" : s);
	35	+ skyboxButton.addActionListener(new ActionListener()
	36	+ {
	37	+ @Override
	38	+ public void actionPerformed(ActionEvent e)
	39	+ {
	40	+ ChangeSkybox(path);
	41	+ }
	42	+ });
	43	+ }
	44	+
	45	+ public void AddTextureButton(String f, String c, final String t, int count, cGridBag row)
	46	+ {
	47	+ cButton textureButton;
	48	+ final String path = "textures/" + f + "/" + c + "/"; // + t;
	49	+ row.add(textureButton = GetButton(path + "icons/" + t, !Grafreed.NIMBUSLAF));
	50	+ textureButton.setToolTipText(c + count);
	51	+ textureButton.addActionListener(new ActionListener()
	52	+ {
	53	+ @Override
	54	+ public void actionPerformed(ActionEvent e)
	55	+ {
	56	+ ChangeTexture(path + t);
	57	+ }
	58	+ });
	59	+ }
	60	+
	61	+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
	62	+ {
	63	+ cGridBag tab0 = new cGridBag().setVertical(true);
	64	+
	65	+ tab0.setName("Urban");
	66	+ skyboxpanel.add(tab0);
	67	+
	68	+ cGridBag row0 = new cGridBag();
	69	+ cGridBag row1 = new cGridBag();
	70	+ cGridBag row2 = new cGridBag();
	71	+ cGridBag row3 = new cGridBag();
	72	+ cGridBag row4 = new cGridBag();
	73	+ cGridBag row5 = new cGridBag();
	74	+ cGridBag row6 = new cGridBag();
	75	+
	76	+ AddSkyboxButton("default", "", row0);
	77	+ //AddSkyboxButton("default", "cornell", row0);
	78	+ AddSkyboxButton("penguins", "dust", row0);
	79	+ AddSkyboxButton("penguins", "tropic", row0);
	80	+ AddSkyboxButton("penguins", "yonder", row0);
	81	+
	82	+ AddSkyboxButton("default", "uffizi", row1);
	83	+ AddSkyboxButton("bridge", "Bridge", row1);
	84	+ AddSkyboxButton("bridge", "Bridge2", row1);
	85	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	86	+
	87	+ AddSkyboxButton("urban", "Parliament", row2);
	88	+ AddSkyboxButton("urban", "Roundabout", row2);
	89	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	90	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	91	+
	92	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	93	+ AddSkyboxButton("urban", "UnionSquare", row3);
	94	+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
	95	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	96	+
	97	+ AddSkyboxButton("park", "Buddha", row4);
	98	+ AddSkyboxButton("park", "CNTower2", row4);
	99	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	100	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	101	+
	102	+ AddSkyboxButton("park", "Park", row5);
	103	+ AddSkyboxButton("park", "Pond", row5);
	104	+ AddSkyboxButton("park", "Skansen", row5);
	105	+ AddSkyboxButton("park", "Skansen2", row5);
	106	+
	107	+ AddSkyboxButton("park", "Skansen3", row6);
	108	+ AddSkyboxButton("park", "Skansen4", row6);
	109	+ AddSkyboxButton("park", "Skansen5", row6);
	110	+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
	111	+
	112	+ tab0.add(row0);
	113	+ tab0.add(row1);
	114	+ tab0.add(row2);
	115	+ tab0.add(row3);
	116	+ tab0.add(row4);
	117	+ tab0.add(row5);
	118	+ tab0.add(row6);
	119	+
	120	+ for (int i=5; --i>=0;)
	121	+ {
	122	+ //oe.toolboxPanel.Return();
	123	+ //tab0.add(new cGridBag());
	124	+ }
	125	+ }
	126	+
	127	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	128	+ {
	129	+ cGridBag tab0 = new cGridBag().setVertical(true);
	130	+
	131	+ tab0.setName("Nature");
	132	+ skyboxpanel.add(tab0);
	133	+
	134	+ cGridBag row0 = new cGridBag();
	135	+ cGridBag row1 = new cGridBag();
	136	+ cGridBag row2 = new cGridBag();
	137	+ cGridBag row3 = new cGridBag();
	138	+ cGridBag row4 = new cGridBag();
	139	+ cGridBag row5 = new cGridBag();
	140	+ cGridBag row6 = new cGridBag();
	141	+
	142	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	143	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	144	+ AddSkyboxButton("beach", "PalmTrees", row0);
	145	+ AddSkyboxButton("beach", "Tenerife", row0);
	146	+
	147	+ AddSkyboxButton("beach", "Tenerife2", row1);
	148	+ AddSkyboxButton("beach", "Tenerife3", row1);
	149	+ AddSkyboxButton("field", "FishPond", row1);
	150	+ AddSkyboxButton("field", "Footballfield", row1);
	151	+
	152	+ AddSkyboxButton("field", "Meadow", row2);
	153	+ AddSkyboxButton("field", "Sorsele", row2);
	154	+ AddSkyboxButton("field", "Sorsele2", row2);
	155	+ AddSkyboxButton("field", "Sorsele3", row2);
	156	+
	157	+ AddSkyboxButton("forest", "Brudslojan", row3);
	158	+ AddSkyboxButton("forest", "Langholmen2", row3);
	159	+ AddSkyboxButton("forest", "Plants", row3);
	160	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	161	+
	162	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	163	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	164	+ AddSkyboxButton("mountain", "Teide", row4);
	165	+ AddSkyboxButton("park", "Tantolunden4", row4);
	166	+
	167	+ AddSkyboxButton("park", "Stairs", row5);
	168	+ AddSkyboxButton("default", "skycube", row6);
	169	+ AddSkyboxButton("rocky", "Langholmen", row5);
	170	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	171	+
	172	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	173	+ AddSkyboxButton("default", "CloudyHills", row6);
	174	+ AddSkyboxButton("daz", "Autumn", row6);
	175	+ AddSkyboxButton("daz", "MountainTrail", row6);
	176	+ /*
	177	+Autumn
	178	+Greenlands
	179	+MountainTrail
	180	+Oasis
	181	+TheRock
	182	+TopOfTheWorld
	183	+Winter
	184	+ */
	185	+
	186	+ tab0.add(row0);
	187	+ tab0.add(row1);
	188	+ tab0.add(row2);
	189	+ tab0.add(row3);
	190	+ tab0.add(row4);
	191	+ tab0.add(row5);
	192	+ tab0.add(row6);
	193	+
	194	+ for (int i=5; --i>=0;)
	195	+ {
	196	+ //oe.toolboxPanel.Return();
	197	+ //tab0.add(new cGridBag());
	198	+ }
	199	+ }
	200	+
	201	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	202	+ {
	203	+ cGridBag tab0 = new cGridBag().setVertical(true);
	204	+
	205	+ tab0.setName("Night");
	206	+ skyboxpanel.add(tab0);
	207	+
	208	+ cGridBag row0 = new cGridBag();
	209	+ cGridBag row1 = new cGridBag();
	210	+ cGridBag row2 = new cGridBag();
	211	+ cGridBag row3 = new cGridBag();
	212	+ cGridBag row4 = new cGridBag();
	213	+ cGridBag row5 = new cGridBag();
	214	+ cGridBag row6 = new cGridBag();
	215	+
	216	+ AddSkyboxButton("night", "NightPath", row0);
	217	+ AddSkyboxButton("night", "PondNight", row0);
	218	+ AddSkyboxButton("night", "Powerlines", row0);
	219	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	220	+
	221	+ AddSkyboxButton("urban", "CNTower", row1);
	222	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	223	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	224	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
	225	+
	226	+ AddSkyboxButton("penguins", "kenon_star", row2);
	227	+ AddSkyboxButton("persson", "corona", row2);
	228	+ AddSkyboxButton("persson", "spaceskybox", row2);
	229	+ AddSkyboxButton("indoors", "Vasa", row2);
	230	+
	231	+ AddSkyboxButton("winter", "Backyard", row3);
	232	+ AddSkyboxButton("winter", "Creek", row3);
	233	+ AddSkyboxButton("winter", "FootballField3", row3);
	234	+ AddSkyboxButton("winter", "Forest", row3);
	235	+
	236	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	237	+ AddSkyboxButton("winter", "House", row4);
	238	+ AddSkyboxButton("winter", "IceLake", row4);
	239	+ AddSkyboxButton("winter", "IceRiver", row4);
	240	+
	241	+ AddSkyboxButton("winter", "Park3", row5);
	242	+ AddSkyboxButton("winter", "PondWinter", row5);
	243	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	244	+ AddSkyboxButton("winter", "Vindelalven", row5);
	245	+
	246	+ AddSkyboxButton("daz", "TheRock", row6);
	247	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	248	+ AddSkyboxButton("daz", "Winter", row6);
	249	+ AddSkyboxButton("mountain", "Ryfjallet", row6);
	250	+
	251	+ tab0.add(row0);
	252	+ tab0.add(row1);
	253	+ tab0.add(row2);
	254	+ tab0.add(row3);
	255	+ tab0.add(row4);
	256	+ tab0.add(row5);
	257	+ tab0.add(row6);
	258	+
	259	+ for (int i=5; --i>=0;)
	260	+ {
	261	+ //oe.toolboxPanel.Return();
	262	+ //tab0.add(new cGridBag());
	263	+ }
	264	+ }
	265	+
	266	+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
	267	+ {
	268	+ cGridBag tab0 = new cGridBag().setVertical(true);
	269	+
	270	+ tab0.setName("Others");
	271	+ skyboxpanel.add(tab0);
	272	+
	273	+ cGridBag row0 = new cGridBag();
	274	+ cGridBag row1 = new cGridBag();
	275	+ cGridBag row2 = new cGridBag();
	276	+ cGridBag row3 = new cGridBag();
	277	+ cGridBag row4 = new cGridBag();
	278	+ cGridBag row5 = new cGridBag();
	279	+ cGridBag row6 = new cGridBag();
	280	+
	281	+ AddSkyboxButton("mayhem", "afterrain", row0);
	282	+ AddSkyboxButton("mayhem", "aqua4", row0);
	283	+ AddSkyboxButton("mayhem", "aqua9", row0);
	284	+ AddSkyboxButton("mayhem", "flame", row0);
	285	+
	286	+ AddSkyboxButton("mayhem", "h2s", row1);
	287	+ AddSkyboxButton("mayhem", "prehistoric", row1);
	288	+ AddSkyboxButton("mayhem", "scorched", row1);
	289	+ AddSkyboxButton("penguins", "desertdawn", row1);
	290	+
	291	+ AddSkyboxButton("persson", "Citadella", row2);
	292	+ AddSkyboxButton("persson", "Citadella2", row2);
	293	+ AddSkyboxButton("persson", "clouds1", row2);
	294	+ AddSkyboxButton("penguins", "wrath", row2);
	295	+
	296	+ AddSkyboxButton("persson", "FishermansBastion", row3);
	297	+ AddSkyboxButton("persson", "HeroesSquare", row3);
	298	+ AddSkyboxButton("indoors", "DallasW", row3);
	299	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
	300	+
	301	+ AddSkyboxButton("persson", "LancellottiChapel", row4);
	302	+ AddSkyboxButton("persson", "PereaBeach1", row4);
	303	+ AddSkyboxButton("persson", "PereaBeach2", row4);
	304	+ AddSkyboxButton("persson", "redeclipse", row4);
	305	+
	306	+ AddSkyboxButton("daz", "Greenlands", row5);
	307	+ AddSkyboxButton("daz", "Oasis", row5);
	308	+ AddSkyboxButton("elyvisions", "arch3", row5);
	309	+ AddSkyboxButton("elyvisions", "calm_sea", row5);
	310	+
	311	+ AddSkyboxButton("elyvisions", "rainbow", row6);
	312	+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
	313	+ AddSkyboxButton("elyvisions", "heaven", row6);
	314	+ AddSkyboxButton("elyvisions", "hot", row6);
	315	+
	316	+ tab0.add(row0);
	317	+ tab0.add(row1);
	318	+ tab0.add(row2);
	319	+ tab0.add(row3);
	320	+ tab0.add(row4);
	321	+ tab0.add(row5);
	322	+ tab0.add(row6);
	323	+
	324	+ for (int i=5; --i>=0;)
	325	+ {
	326	+ //oe.toolboxPanel.Return();
	327	+ //tab0.add(new cGridBag());
	328	+ }
	329	+ }
	330	+
	331	+ public void ChangeSkybox(String skybox)
	332	+ {
	333	+ if (skybox.endsWith("/"))
	334	+ {
	335	+ group.skyboxname = null;
	336	+ group.skyboxext = null;
	337	+ cameraView.repaint();
	338	+ }
	339	+ else
	340	+ {
	341	+ //cameraView.envyoff = false;
	342	+ group.skyboxname = skybox;
	343	+ group.skyboxext = "jpg";
	344	+ cameraView.repaint();
	345	+ }
	346	+ }
	347	+
	348	+ public void CreateSkyboxPanel(cGridBag skyboxPanel)
	349	+ {
	350	+ JTabbedPane skyboxpane = new JTabbedPane();
	351	+
	352	+ AddSkyboxTab0(skyboxpane);
	353	+ AddSkyboxTab1(skyboxpane);
	354	+ AddSkyboxTab2(skyboxpane);
	355	+ AddSkyboxTab3(skyboxpane);
	356	+
	357	+ skyboxPanel.add(skyboxpane);
	358	+ }
	359	+
	360	+ public void ChangeTexture(String texture)
	361	+ {
	362	+ for (int i=0; i<group.selection.size(); i++)
	363	+ {
	364	+ Object3D obj = group.selection.get(i);
	365	+ obj.SetPigmentTexture("@" + texture);
	366	+ }
	367	+
	368	+ refreshContents();
	369	+ }
	370	+
	371	+ public void Show3DView()
	372	+ {
	373	+ // bug
	374	+ //gridPanel.setDividerLocation(1.0);
	375	+ //bigPanel.setDividerLocation(0.0);
	376	+ bigThree.ClearUI();
	377	+ bigThree.add(centralPanel);
	378	+ bigThree.FlushUI();
	379	+ }
	380	+
25	381	//ObjEditor objEditor;
26	382	public void closeUI2()
27	383	{
..	..	@@ -59,6 +415,16 @@
59	415	this.copy = this.group = group;
60	416	//selectees = this.group.selectees;
61	417
	418	+ assert(false);
	419	+
	420	+ if (copy.versionlist == null)
	421	+ {
	422	+ copy.versionlist = new Object3D[100];
	423	+ copy.versionindex = -1;
	424	+
	425	+ //Save(true);
	426	+ }
	427	+
62	428	if(ui)
63	429	SetupUI(objEditor);
64	430	}
..	..	@@ -73,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,23 +825,34 @@
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"));
..	..	@@ -331,6 +861,14 @@
331	861	markleavesItem.addActionListener(this);
332	862	unmarkleavesItem = menu.add(new MenuItem("Unmark 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,130 @@
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 tabcount = 0;
	940	+ int colcount = 0;
	941	+ int rowcount = 0;
	942	+ int texturecount = 0;
	943	+
	944	+ int columns = 5;
	945	+ int rows = 7;
	946	+
	947	+ public void ResourceCallBack(String[] path)
	948	+ {
	949	+// for (int i = 0; i < path.length; i++)
	950	+// System.out.print(path[i] + "/");
	951	+// System.out.println();
	952	+
	953	+ if (//rowcount == 0 \|\|
	954	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	955	+ {
	956	+ currenttab = new cGridBag();
	957	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	958	+ currenttab.setName(tabname);
	959	+ //added = false;
	960	+ resourcecontainer.add(currenttab);
	961	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	962	+ rowcount = 1;
	963	+ colcount = 0;
	964	+ texturecount = 0;
	965	+ }
	966	+
	967	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	968	+ {
	969	+ //if (!added)
	970	+ {
	971	+ //added = true;
	972	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	973	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	974	+ }
	975	+
	976	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	977	+
	978	+ if (++colcount >= columns)
	979	+ {
	980	+ colcount = 0;
	981	+ currenttab.Return();
	982	+
	983	+ if (rowcount++ >= rows)
	984	+ {
	985	+ rowcount = 0;
	986	+ }
	987	+ }
	988	+ }
	989	+ else
	990	+ {
	991	+// if (!path[path.length-1].equals("icons"))
	992	+// resourcecontainer.Return();
	993	+ }
	994	+ }
	995	+
	996	+ void CreateTexturePanel(cGridBag container)
	997	+ {
	998	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	999	+ container.add(resourcecontainer);
	1000	+
	1001	+ Grafreed.ParseResources("textures", this);
	1002	+ }
	1003	+
396	1004	void SetupUI2(ObjEditor oe)
397	1005	{
	1006	+ // June 2019
	1007	+ if (oe == null)
	1008	+ {
	1009	+ //super.SetupUI2(this);
	1010	+ //return;
	1011	+ }
	1012	+
	1013	+ if (copy != group)
	1014	+ {
	1015	+ //super.SetupUI2(this);
	1016	+ }
	1017	+
398	1018	//new Exception().printStackTrace();
399	1019
400	1020	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	1021	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
407	1022
408	1023	oe.buttonGroup = new ButtonGroup();
..	..	@@ -423,150 +1038,266 @@
423	1038	oe.radioPanel.add(dummyButton);
424	1039	oe.buttonGroup.add(dummyButton);
425	1040	*/
426		- aConstraints.gridy += 1;
427		- oe.aConstraints.gridwidth = 1;
428		- oe.aConstraints.gridx = 0;
	1041	+ cGridBag copyOptionsPanel = new cGridBag();
	1042	+
	1043	+ copyOptionsPanel.preferredHeight = 2;
429	1044
430		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
	1045	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
	1046	+
	1047	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1048	+ //minButton.setToolTipText("Minimize window");
	1049	+ //minButton.addActionListener(this);
	1050	+
	1051	+ if (Globals.ADVANCED)
	1052	+ {
	1053	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1054	+// maxButton.setToolTipText("Maximize window");
	1055	+// maxButton.addActionListener(this);
	1056	+ }
	1057	+
	1058	+ cButton gcButton;
	1059	+
	1060	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1061	+// gcButton.setToolTipText("Garbage collect");
	1062	+// gcButton.addActionListener(new ActionListener()
	1063	+// {
	1064	+// public void actionPerformed(ActionEvent e)
	1065	+// {
	1066	+// System.gc();
	1067	+// }
	1068	+// });
	1069	+
	1070	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1071	+ collapseButton.setToolTipText("Collapse toolbar");
	1072	+ collapseButton.addActionListener(this);
	1073	+
	1074	+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/empty.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1075	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1076	+ maximize3DButton.addActionListener(this);
	1077	+
	1078	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1079	+ twoButton.setToolTipText("Show 3D view only");
	1080	+ twoButton.addActionListener(this);
	1081	+ this.fullscreenLayout = twoButton;
	1082	+
	1083	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1084	+ threeButton.setToolTipText("Show controls and 3D view");
	1085	+ threeButton.addActionListener(this);
	1086	+ if (Globals.ADVANCED)
	1087	+ {
	1088	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1089	+ sixButton.setToolTipText("Show 3D view and controls");
	1090	+ sixButton.addActionListener(this);
	1091	+ }
	1092	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1093	+// sevenButton.setToolTipText("3-column layout");
	1094	+// sevenButton.addActionListener(this);
	1095	+ //
	1096	+
	1097	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1098	+ fullButton.setToolTipText("Full-screen window");
	1099	+ fullButton.addActionListener(this);
	1100	+
	1101	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1102	+ screenfitButton.setToolTipText("Screen fit");
	1103	+ screenfitButton.addActionListener(this);
	1104	+
	1105	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1106	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1107	+ restoreCameraButton.addActionListener(this);
	1108	+
	1109	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1110	+ saveVersionButton.setToolTipText("Duplicate current version");
	1111	+ saveVersionButton.addActionListener(this);
	1112	+
	1113	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1114	+ deleteVersionButton.setToolTipText("Delete current version");
	1115	+ deleteVersionButton.addActionListener(this);
	1116	+ deleteVersionButton.setEnabled(false);
	1117	+
	1118	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1119	+ previousVersionButton.setToolTipText("Previous version");
	1120	+ previousVersionButton.addActionListener(this);
	1121	+ previousVersionButton.setEnabled(false);
	1122	+
	1123	+ cGridBag updown = new cGridBag().setVertical(true);
	1124	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1125	+ restoreButton.setToolTipText("Undo (restore current version)");
	1126	+ restoreButton.addActionListener(this);
	1127	+ restoreButton.setEnabled(false);
	1128	+
	1129	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1130	+ replaceButton.setToolTipText("Save (replace current version)");
	1131	+ replaceButton.addActionListener(this);
	1132	+ replaceButton.setEnabled(false);
	1133	+
	1134	+ copyOptionsPanel.add(updown);
	1135	+
	1136	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1137	+ nextVersionButton.setToolTipText("Next version");
	1138	+ nextVersionButton.addActionListener(this);
	1139	+ nextVersionButton.setEnabled(false);
	1140	+
	1141	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1142	+ oneStepButton.setToolTipText("Animate one step forward");
	1143	+ oneStepButton.addActionListener(this);
	1144	+
	1145	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1146	+ liveCB.setToolTipText("Enable animation");
431	1147	liveCB.addItemListener(this);
432	1148
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);
	1149	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	1150	+ fastCB.setToolTipText("Fast mode");
451	1151	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);
	1152	+
	1153	+ //oe.toolboxPanel.Return();
	1154	+
	1155	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1156	+// trackCB.setToolTipText("Enable tracking");
	1157	+// trackCB.addItemListener(this);
458	1158
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	1159	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
500	1160	// 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	1161
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);
	1162	+ if (Globals.ADVANCED)
	1163	+ {
	1164	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1165	+ snapobjectButton.addActionListener(this);
	1166	+ snapobjectButton.setToolTipText("Snap Object");
	1167	+
	1168	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
521	1169	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		- //
	1170	+ fourButton.setToolTipText("Show control panel only");
	1171	+ }
529	1172
530		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	1173	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	1174	+
	1175	+
	1176	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1177	+ rootButton.setToolTipText("Open selection in new tab");
531	1178	rootButton.addActionListener(this);
532		- oe.aConstraints.gridx += 1;
533		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	1179	+
	1180	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1181	+ closeButton.setToolTipText("Close tab");
534	1182	closeButton.addActionListener(this);
535	1183	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
536	1184	//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	1185
546		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	1186	+ cGridBag row1 = new cGridBag();
	1187	+
	1188	+ // INSERT
	1189	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1190	+ gridButton.setToolTipText("Create ground");
	1191	+ gridButton.addActionListener(this);
	1192	+
	1193	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1194	+ boxButton.setToolTipText("Create box");
	1195	+ boxButton.addActionListener(this);
	1196	+
	1197	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1198	+ superButton.setToolTipText("Create superellipsoid");
	1199	+ superButton.addActionListener(this);
	1200	+
	1201	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1202	+ sphereButton.setToolTipText("Create sphere");
	1203	+ sphereButton.addActionListener(this);
	1204	+
	1205	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1206	+ coneButton.setToolTipText("Create cone");
	1207	+ coneButton.addActionListener(this);
	1208	+
	1209	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1210	+ torusButton.setToolTipText("Create torus");
	1211	+ torusButton.addActionListener(this);
	1212	+
	1213	+ if (Globals.ADVANCED)
	1214	+ {
	1215	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1216	+ kleinButton.setToolTipText("Create Klein bottle");
	1217	+ kleinButton.addActionListener(this);
	1218	+ }
	1219	+
	1220	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1221	+ particlesButton.setToolTipText("Create particle system");
	1222	+ particlesButton.addActionListener(this);
	1223	+
	1224	+ oe.toolboxPanel.add(row1);
	1225	+
	1226	+ cGridBag row2 = new cGridBag();
	1227	+
	1228	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1229	+ groupButton.setToolTipText("Create group");
	1230	+ groupButton.addActionListener(this);
	1231	+
	1232	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1233	+ compositeButton.setToolTipText("Create composite");
	1234	+ compositeButton.addActionListener(this);
	1235	+
	1236	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1237	+ switchButton.setToolTipText("Create item switcher");
	1238	+ switchButton.addActionListener(this);
	1239	+
	1240	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1241	+ loopButton.setToolTipText("Create loop");
	1242	+ loopButton.addActionListener(this);
	1243	+
	1244	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1245	+ textureButton.setToolTipText("Create texture");
	1246	+ textureButton.addActionListener(this);
	1247	+
	1248	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1249	+ overlayButton.setToolTipText("Create overlay");
	1250	+ overlayButton.addActionListener(this);
	1251	+
	1252	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1253	+ lightButton.setToolTipText("Create light");
	1254	+ lightButton.addActionListener(this);
	1255	+
	1256	+ oe.toolboxPanel.add(row2);
	1257	+
	1258	+ cGridBag textures = new cGridBag();
	1259	+
	1260	+ CreateTexturePanel(textures);
	1261	+
	1262	+ resourcecontainer.setSelectedIndex((int)(Math.random() * resourcecontainer.getTabCount()));
	1263	+
	1264	+ oe.toolboxPanel.add(textures);
	1265	+
	1266	+ textures.preferredHeight = 100;
	1267	+
	1268	+ CreateSkyboxPanel(oe.skyboxPanel);
	1269	+
	1270	+ // EDIT panel
	1271	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1272	+ editButton.setToolTipText("Pin selection controls");
	1273	+ editButton.addActionListener(this);
	1274	+
	1275	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1276	+ uneditButton.setToolTipText("Unpin and remove selection controls");
547	1277	uneditButton.addActionListener(this);
548	1278
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);
	1279	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1280	+ allParamsButton.setToolTipText("Show all controls");
561	1281	allParamsButton.addActionListener(this);
562	1282
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);
	1283	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1284	+ clearPanelButton.setToolTipText("Clear all controls");
	1285	+ clearPanelButton.addActionListener(this);
569	1286
	1287	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1288	+ //unselectButton.setToolTipText("Unselect");
	1289	+ //unselectButton.addActionListener(this);
	1290	+
	1291	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1292	+ flashSelectionButton.setToolTipText("Highlight selection");
	1293	+ flashSelectionButton.addActionListener(this);
	1294	+
	1295	+ editCommandsPanel.preferredHeight = 1;
	1296	+
	1297	+ SetPinStates(false);
	1298	+// oe.treePanel.add(commandsPanel);
	1299	+// oe.treePanel.Return();
	1300	+
570	1301	// oe.aConstraints.gridx += 1;
571	1302	// oe.aConstraints.weighty = 0;
572	1303	// oe.aConstraints.gridwidth = 1;
..	..	@@ -578,47 +1309,32 @@
578	1309	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
579	1310	// gcButton.addActionListener(this);
580	1311
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;
	1312	+ cGridBag jSPPanel = new cGridBag();
	1313	+
	1314	+ JScrollPane jSP;
592	1315	//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);
	1316	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
594	1317	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	1318
	1319	+ oe.treePanel.add(jSPPanel);
	1320	+ oe.treePanel.Return();
	1321	+
	1322	+ oe.treePanel.add(copyOptionsPanel);
	1323	+ oe.treePanel.Return();
	1324	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1325	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1326	+ sliderPane.preferredHeight = 1;
	1327	+
	1328	+// mainPanel.setDividerLocation(0.1); //1.0);
	1329	+ mainPanel.setResizeWeight(0.4);
	1330	+
615	1331	//jList.addListSelectionListener(this);
616	1332	oe.jTree.addTreeSelectionListener(this);
617	1333	//jTree.setRootVisible(false);
618	1334	//jTree.setEditable(true);
619	1335	oe.jTree.setDragEnabled(true);
620	1336	//jTree.setPreferredSize(new Dimension(10,10));
621		- jSP.setPreferredSize(new Dimension(100,200));
	1337	+ //jSP.setPreferredSize(new Dimension(100,200));
622	1338
623	1339	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
624	1340
..	..	@@ -630,47 +1346,204 @@
630	1346	dgr.addDragGestureListener(this);
631	1347	}catch(Exception e) {}
632	1348	*/
633		- radio.layout = sevenButton;
	1349	+ radio.layout = threeButton; // sixButton;
634	1350	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
635	1351	}
	1352	+
	1353	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	1354	+ {
	1355	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1356	+ colorCB.setToolTipText("Copy color when dropped");
	1357	+ colorCB.addItemListener(this);
	1358	+
	1359	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1360	+ materialCB.setToolTipText("Copy material when dropped");
	1361	+ materialCB.addItemListener(this);
	1362	+
	1363	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1364	+ textureCB.setToolTipText("Copy texture when dropped");
	1365	+ textureCB.addItemListener(this);
	1366	+
	1367	+ panel.Return();
	1368	+
	1369	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	1370	+ boxCB.setToolTipText("Display bounding boxes");
	1371	+ boxCB.addItemListener(this);
	1372	+
	1373	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	1374	+ zoomBoxCB.setToolTipText("Display only for wheel");
	1375	+ zoomBoxCB.addItemListener(this);
	1376	+
	1377	+ if (true) // Globals.ADVANCED)
	1378	+ {
	1379	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1380	+// supportCB.setToolTipText("Enable rigging");
	1381	+// supportCB.addItemListener(this);
	1382	+
	1383	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1384	+ freezeCB.setToolTipText("Fast moving camera");
	1385	+ freezeCB.addItemListener(this);
	1386	+
	1387	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	1388	+ // localCB.addItemListener(this);
	1389	+
	1390	+ panel.Return();
	1391	+
	1392	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	1393	+ crowdCB.setToolTipText("Used for crowds");
	1394	+ crowdCB.addItemListener(this);
	1395	+
	1396	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	1397	+ smoothCB.setToolTipText("Snapping delay");
	1398	+ smoothCB.addItemListener(this);
	1399	+
	1400	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1401	+// slowCB.setToolTipText("Smooth interpolation");
	1402	+// slowCB.addItemListener(this);
	1403	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1404	+ minshaderCB.setToolTipText("Minimal fast shader");
	1405	+ minshaderCB.addItemListener(this);
	1406	+
	1407	+// constraints.gridy += 1;
	1408	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	1409	+// speakerMocapCB.addItemListener(this);
	1410	+
	1411	+ panel.Return();
	1412	+
	1413	+ if (false)
	1414	+ {
	1415	+ // handled in scripts
	1416	+ //constraints.gridy += 1;
	1417	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	1418	+ speakerCameraCB.addItemListener(this);
	1419	+
	1420	+ //constraints.gridy += 1;
	1421	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	1422	+ speakerFocusCB.addItemListener(this);
	1423	+
	1424	+ //constraints.gridy += 1;
	1425	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	1426	+ smoothfocusCB.addItemListener(this);
	1427	+ panel.Return();
	1428	+ }
	1429	+
	1430	+//constraints.gridx += 1;
	1431	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	1432	+// debugCB.addItemListener(this);
	1433	+
	1434	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1435	+ trackCB.setToolTipText("Enable tracking target");
	1436	+ trackCB.addItemListener(this);
	1437	+
	1438	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1439	+ oeilCB.setToolTipText("Move camera when tracking");
	1440	+ oeilCB.addItemListener(this);
	1441	+
	1442	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1443	+ shadowCB.setToolTipText("When live compute shadows");
	1444	+ shadowCB.addItemListener(this);
	1445	+
	1446	+ panel.Return();
	1447	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1448	+ toggleTextureCB.setToolTipText("Load textures");
	1449	+ toggleTextureCB.addItemListener(this);
	1450	+
	1451	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1452	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1453	+ toggleSwitchCB.addItemListener(this);
	1454	+
	1455	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1456	+ autokeepCB.setToolTipText("On structure change");
	1457	+ autokeepCB.addItemListener(this);
	1458	+
	1459	+ panel.Return();
	1460	+ if (Globals.ADVANCED)
	1461	+ {
	1462	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	1463	+ lookAtCB.setToolTipText("Look-at target");
	1464	+ lookAtCB.addItemListener(this);
	1465	+ }
	1466	+
	1467	+ }
	1468	+
	1469	+ cGridBag fill = new cGridBag();
	1470	+ fill.preferredHeight = 200;
	1471	+ cGridBag fill2 = new cGridBag();
	1472	+ fill2.preferredHeight = 200;
	1473	+ cGridBag fill3 = new cGridBag();
	1474	+ fill3.preferredHeight = 200;
	1475	+
	1476	+ panel.add(fill);
	1477	+ panel.add(fill2);
	1478	+ panel.add(fill3);
	1479	+
	1480	+ }
636	1481
637	1482	void EditObject(Object3D obj)
638	1483	{
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();
	1484	+ assert(obj instanceof Composite);
	1485	+
	1486	+// if (obj.versionlist == null)
	1487	+// {
	1488	+// obj.versionlist = new Object3D[100];
	1489	+// obj.versionindex = -1;
	1490	+// }
	1491	+
	1492	+ cRadio radioButton = new cRadio(obj.name);
	1493	+
	1494	+ // June 2019. Patch to avoid bug with transparency.
	1495	+ radioButton.hadMaterial = obj.material != null;
	1496	+ if (!radioButton.hadMaterial)
	1497	+ {
	1498	+ obj.material = new cMaterial();
	1499	+ }
	1500	+
	1501	+ radioButton.SetObject(obj);
	1502	+ radioButton.layout = threeButton; // sixButton;
	1503	+ radioButton.SetCamera(cameraView.renderCamera, false);
	1504	+ radioButton.addActionListener(this);
	1505	+ radioPanel.add(radioButton);
	1506	+ buttonGroup.add(radioButton);
	1507	+ radioButton.doClick();
647	1508	}
	1509	+
648	1510	void SetupViews(ObjEditor oe)
649	1511	{
	1512	+ theFrame = this;
	1513	+
650	1514	oe.SetupViews();
651	1515
	1516	+ if (Globals.DEBUG)
652	1517	System.out.println("SetupViews");
653	1518	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
654	1519	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
655	1520	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
656	1521	}
657	1522
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;
	1523	+ cToggleButton liveCB;
	1524	+ cCheckBox supportCB;
	1525	+ cCheckBox localCB;
	1526	+ cCheckBox crowdCB;
	1527	+ cCheckBox smoothCB;
	1528	+ cCheckBox minshaderCB;
	1529	+
	1530	+ cToggleButton fastCB;
	1531	+ cCheckBox slowCB;
	1532	+ cCheckBox boxCB;
	1533	+ cCheckBox zoomBoxCB;
	1534	+ cCheckBox freezeCB;
	1535	+ //cToggleButton trackCB;
	1536	+ cCheckBox trackCB;
	1537	+ cCheckBox smoothfocusCB;
668	1538	// JCheckBox speakerMocapCB;
669		- JCheckBox speakerCameraCB;
670		- JCheckBox speakerFocusCB;
671		- JCheckBox debugCB;
672		- JCheckBox oeilCB;
673		- JCheckBox lookAtCB;
	1539	+ cCheckBox speakerCameraCB;
	1540	+ cCheckBox speakerFocusCB;
	1541	+ cCheckBox debugCB;
	1542	+
	1543	+ cCheckBox oeilCB;
	1544	+ cCheckBox shadowCB;
	1545	+ cCheckBox autokeepCB;
	1546	+ cCheckBox lookAtCB;
674	1547
675	1548	// static int COLOR = 1;
676	1549	// static int MATERIAL = 2;
..	..	@@ -678,9 +1551,9 @@
678	1551
679	1552	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
680	1553
681		- JCheckBox colorCB;
682		- JCheckBox materialCB;
683		- JCheckBox textureCB;
	1554	+ cCheckBox colorCB;
	1555	+ cCheckBox materialCB;
	1556	+ cCheckBox textureCB;
684	1557
685	1558	public void itemStateChanged(ItemEvent e)
686	1559	{
..	..	@@ -705,10 +1578,10 @@
705	1578	dropAttributes \|= Object3D.TEXTURE;
706	1579	else
707	1580	dropAttributes &= ~Object3D.TEXTURE;
708		- }
709		- else if(e.getSource() == liveCB)
	1581	+ } else if(e.getSource() == liveCB)
710	1582	{
711	1583	cameraView.ToggleLive();
	1584	+ refreshContents(false);
712	1585	}
713	1586	else if(e.getSource() == supportCB)
714	1587	{
..	..	@@ -724,6 +1597,12 @@
724	1597	{
725	1598	cameraView.ToggleInertia();
726	1599	cameraView.repaint();
	1600	+ }
	1601	+ else if(e.getSource() == minshaderCB)
	1602	+ {
	1603	+ Globals.MINSHADER ^= true;
	1604	+ cameraView.programInitialized = false;
	1605	+ cameraView.repaint();
727	1606	}
728	1607	else if(e.getSource() == localCB)
729	1608	{
..	..	@@ -743,6 +1622,10 @@
743	1622	Recompile();
744	1623	cameraView.repaint();
745	1624	// refreshContents();
	1625	+ }
	1626	+ else if(e.getSource() == zoomBoxCB)
	1627	+ {
	1628	+ cameraView.ToggleZoomBoxMode();
746	1629	}
747	1630	else if(e.getSource() == smoothfocusCB)
748	1631	{
..	..	@@ -769,6 +1652,18 @@
769	1652	{
770	1653	cameraView.ToggleOeil();
771	1654	}
	1655	+ else if(e.getSource() == shadowCB)
	1656	+ {
	1657	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1658	+ }
	1659	+ else if(e.getSource() == freezeCB)
	1660	+ {
	1661	+ Globals.FREEZEONMOVE ^= true;
	1662	+ }
	1663	+ else if(e.getSource() == autokeepCB)
	1664	+ {
	1665	+ Globals.REPLACEONMAKE ^= true;
	1666	+ }
772	1667	else if(e.getSource() == lookAtCB)
773	1668	{
774	1669	cameraView.ToggleLookAt();
..	..	@@ -785,7 +1680,8 @@
785	1680
786	1681	/**/
787	1682	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
788		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1683	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1684	+ TreePath path = objEditor.jTree.getSelectionPath();
789	1685	if ((path == null) \|\| (path.getPathCount() <= 1)) {
790	1686	// We can't move the root node or an empty selection
791	1687	return;
..	..	@@ -848,8 +1744,6 @@
848	1744	}
849	1745	}
850	1746
851		- String string = (String) object;
852		-
853	1747	System.out.println("Transfer = " + object + "; drop : " + target);
854	1748	// if( object instanceof java.io.File[])
855	1749	// {
..	..	@@ -857,7 +1751,11 @@
857	1751	// objEditor.DropFile((java.io.File[]) object, true);
858	1752	// return;
859	1753	// }
860		- if (string.charAt(0) == '/')
	1754	+
	1755	+ String string = object.toString();
	1756	+
	1757	+ // File path for Mac and Windows
	1758	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
861	1759	{
862	1760	// file(s)
863	1761	String[] names = string.split("\n");
..	..	@@ -884,7 +1782,7 @@
884	1782
885	1783	flashIt = false;
886	1784	CameraPane pane = (CameraPane) target;
887		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1785	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
888	1786	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
889	1787
890	1788	if (group.selection.size() == 1)
..	..	@@ -900,23 +1798,33 @@
900	1798
901	1799	assert target == objEditor.jTree;
902	1800	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1801	+ Object3D destinationLeaf;
903	1802	try {
904		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1803	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
905	1804	} catch (Exception e) {
906	1805	System.out.println("destinationPath : " + destinationPath);
907	1806	return;
908	1807	}
909	1808
910		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1809	+ for (int i=group.selection.size(); --i>=0;)
911	1810	{
	1811	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1812	+
	1813	+ // Cannot move into itself
	1814	+ if (child == destinationLeaf)
	1815	+ return;
	1816	+ }
	1817	+
	1818	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1819	+// {
912	1820	loadClipboard(true);
913	1821	objEditor.jTree.setSelectionPath(destinationPath);
914		- pasteInto(false);
915		- } else {
916		- loadClipboard(false);
917		- objEditor.jTree.setSelectionPath(destinationPath);
918		- pasteInto(false); // true); // ???
919		- }
	1822	+ pasteInto(false, false);
	1823	+// } else {
	1824	+// loadClipboard(false);
	1825	+// objEditor.jTree.setSelectionPath(destinationPath);
	1826	+// pasteInto(false, false); // true); // ???
	1827	+// }
920	1828	}
921	1829	public void dropActionChanged(DropTargetDragEvent dtde)
922	1830	// Called if the user has modified the current drop gesture
..	..	@@ -972,7 +1880,12 @@
972	1880	TreePath path;
973	1881
974	1882	public TransferableTreePath(TreePath tp) {
975		- path = tp;
	1883	+ Object[] objs = new Object[tp.getPathCount()];
	1884	+ for (int i=0; i<objs.length; i++)
	1885	+ {
	1886	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1887	+ }
	1888	+ path = new TreePath(objs);
976	1889	}
977	1890
978	1891	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1021,83 +1934,107 @@
1021	1934	{
1022	1935	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1023	1936	//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);
	1937	+// gridItem = menu.add(new MenuItem("Grid"));
	1938	+// gridItem.addActionListener(this);
	1939	+// rectoidItem = menu.add(new MenuItem("Box"));
	1940	+// rectoidItem.addActionListener(this);
	1941	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1942	+// ellipsoidItem.addActionListener(this);
	1943	+// coneItem = menu.add(new MenuItem("Cone"));
	1944	+// coneItem.addActionListener(this);
	1945	+// torusItem = menu.add(new MenuItem("Torus"));
	1946	+// torusItem.addActionListener(this);
	1947	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1948	+// superItem.addActionListener(this);
	1949	+
	1950	+ cameraItem = menu.add(new MenuItem("Camera"));
	1951	+ cameraItem.addActionListener(this);
	1952	+
	1953	+ if (!Globals.ADVANCED)
	1954	+ {
	1955	+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
	1956	+ kleinItem.addActionListener(this);
	1957	+ }
	1958	+
	1959	+// particleItem = menu.add(new MenuItem("Particle system"));
	1960	+// particleItem.addActionListener(this);
	1961	+ if (Globals.ADVANCED)
	1962	+ {
1038	1963	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1039	1964	ragdollItem.addActionListener(this);
1040	1965	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1041	1966	ragdoll2Item.addActionListener(this);
	1967	+ }
1042	1968	menu.add("-");
1043		- meshItem = menu.add(new MenuItem("Mesh"));
	1969	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1044	1970	meshItem.addActionListener(this);
1045	1971	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1046	1972	// meshGroupItem.addActionListener(this);
	1973	+ if (Globals.ADVANCED)
	1974	+ {
1047	1975	springItem = menu.add(new MenuItem("Spring"));
1048	1976	springItem.addActionListener(this);
1049	1977	flagItem = menu.add(new MenuItem("Flag"));
1050	1978	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	1979	blobItem = menu.add(new MenuItem("Blob"));
1056	1980	blobItem.addActionListener(this);
1057	1981	latheItem = menu.add(new MenuItem("Lathe"));
1058	1982	latheItem.addActionListener(this);
1059		- lightItem = menu.add(new MenuItem("Light"));
1060		- lightItem.addActionListener(this);
	1983	+ }
	1984	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1985	+ bezierItem.addActionListener(this);
	1986	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1987	+// overlayItem.addActionListener(this);
	1988	+// lightItem = menu.add(new MenuItem("Light"));
	1989	+// lightItem.addActionListener(this);
1061	1990	menu.add("-");
1062	1991	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1063	1992	//superLoopItem.addActionListener(this);
1064		- loopItem = menu.add(new MenuItem("Loop"));
1065		- loopItem.addActionListener(this);
	1993	+// loopItem = menu.add(new MenuItem("Loop"));
	1994	+// loopItem.addActionListener(this);
1066	1995	doubleItem = menu.add(new MenuItem("Fork"));
1067	1996	doubleItem.addActionListener(this);
	1997	+ if (Globals.ADVANCED)
	1998	+ {
1068	1999	tripleItem = menu.add(new MenuItem("Trident"));
1069	2000	tripleItem.addActionListener(this);
	2001	+ }
1070	2002	}
1071	2003
1072	2004	void buildToolsMenu(Menu menu)
1073	2005	{
1074	2006	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1075	2007	animationItem.addItemListener(this);
1076		- animationItem.setState(CameraPane.ANIMATION);
	2008	+ animationItem.setState(Globals.ANIMATION);
	2009	+
	2010	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	2011	+ archiveItem.addActionListener(this);
1077	2012
1078	2013	menu.add("-");
1079	2014	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1080	2015	parseverticesItem.addActionListener(this);
1081	2016	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1082	2017	textureFieldItem.addActionListener(this);
1083		- alignItem = menu.add(new MenuItem("Align"));
	2018	+ alignItem = menu.add(new MenuItem("Align Objects"));
1084	2019	alignItem.addActionListener(this);
1085		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1086		- mirrorItem.addActionListener(this);
1087	2020	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1088	2021	reduceMorphItem.addActionListener(this);
1089	2022	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1090	2023	reduce34MorphItem.addActionListener(this);
1091		-
1092		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1093		- computeAOItem.addActionListener(this);
1094	2024	menu.add("-");
1095		-
1096	2025	menu.add(memoryItem = new MenuItem("Memory Usage"));
1097	2026	memoryItem.addActionListener(this);
	2027	+ menu.add(computeAOItem = new MenuItem("Compute AO"));
	2028	+ computeAOItem.addActionListener(this);
	2029	+
	2030	+ if (Globals.ADVANCED)
	2031	+ {
	2032	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	2033	+ mirrorItem.addActionListener(this);
	2034	+ menu.add("-");
1098	2035	menu.add(analyzeItem = new MenuItem("Analyze"));
1099	2036	analyzeItem.addActionListener(this);
1100		- menu.add(dumpItem = new MenuItem("Dump"));
	2037	+ menu.add(dumpItem = new MenuItem("Print"));
1101	2038	dumpItem.addActionListener(this);
1102	2039	// menu.add(pathItem = new MenuItem("From-to path"));
1103	2040	// pathItem.addActionListener(this);
..	..	@@ -1106,6 +2043,8 @@
1106	2043	resetParentItem.addActionListener(this);
1107	2044	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1108	2045	repairParentItem.addActionListener(this);
	2046	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	2047	+ repairShadowItem.addActionListener(this);
1109	2048	menu.add(invariantsItem = new MenuItem("Invariants"));
1110	2049	invariantsItem.addActionListener(this);
1111	2050	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1113,6 +2052,7 @@
1113	2052	menu.add("-");
1114	2053	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1115	2054	editScriptItem.addActionListener(this);
	2055	+ }
1116	2056	}
1117	2057
1118	2058	void ScreenFit()
..	..	@@ -1235,9 +2175,38 @@
1235	2175	shadow.material = new cMaterial(obj.material);
1236	2176	shadow.material.diffuse = 0.0001f;
1237	2177	shadow.material.specular = 0.0001f;
	2178	+ shadow.material.opacity = 0.75f;
	2179	+
	2180	+ AllocProjectedVertices(shadow);
	2181	+
	2182	+ shadow.projectedVertices[1].x = 300;
1238	2183
1239	2184	makeSomething(shadow);
1240	2185	}
	2186	+
	2187	+ private void ClearUnpinned()
	2188	+ {
	2189	+ //for (Object3D obj : listUI)
	2190	+ for (int i=listUI.size(); --i>=0;)
	2191	+ {
	2192	+ Object3D obj = listUI.elementAt(i);
	2193	+ if (!obj.pinned)
	2194	+ {
	2195	+ obj.CloseUI();
	2196	+ listUI.remove(i);
	2197	+ }
	2198	+ }
	2199	+ }
	2200	+
	2201	+ private void EditElement(Object3D elem, boolean newWindow)
	2202	+ {
	2203	+ // if (!(elem instanceof Composite))
	2204	+ // newWindow = false;
	2205	+ listUI.add(elem);
	2206	+ elem.openEditWindow(this, newWindow); //, false);
	2207	+ System.out.println("edit : " + elem);
	2208	+ elem.editWindow.refreshContents(true); // ? new
	2209	+ }
1241	2210
1242	2211	/**
1243	2212	* applyExample
..	..	@@ -1441,9 +2410,9 @@
1441	2410
1442	2411	void Overwrite(int mask)
1443	2412	{
1444		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2413	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1445	2414	{
1446		- Object3D content = GraphreeD.clipboard.get(0);
	2415	+ Object3D content = Grafreed.clipboard.get(0);
1447	2416
1448	2417	if (content instanceof cGroup && ((cGroup)content).transientlink )
1449	2418	content = ((cGroup)content).get(0);
..	..	@@ -1466,6 +2435,7 @@
1466	2435	//
1467	2436	public void actionPerformed(ActionEvent event) // , Object arg)
1468	2437	{
	2438	+ Object source = event.getSource();
1469	2439	/*
1470	2440	if (event.getSource() == nameField)
1471	2441	{
..	..	@@ -1477,11 +2447,11 @@
1477	2447	}
1478	2448	else
1479	2449	*/
1480		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	2450	+ if (source == lookAtItem \|\| source == lookFromItem)
1481	2451	{
1482	2452	ScreenFit();
1483	2453	} else
1484		- if (event.getSource() == switchItem)
	2454	+ if (source == switchViewItem)
1485	2455	{
1486	2456	cVector v1 = new cVector();
1487	2457	cVector v2 = new cVector();
..	..	@@ -1490,11 +2460,11 @@
1490	2460	objEditor.cameraView.renderCamera.setAim(v2, v1);
1491	2461	objEditor.cameraView.repaint();
1492	2462	} else
1493		- if (event.getSource() == rectoidItem)
	2463	+ if (source == rectoidItem \|\| source == boxButton)
1494	2464	{
1495	2465	makeSomething(new Box());
1496	2466	} else
1497		- if (event.getSource() == particleItem)
	2467	+ if (source == particleItem \|\| source == particlesButton)
1498	2468	{
1499	2469	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1500	2470	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1515,9 +2485,9 @@
1515	2485	applyExample(particleGeom, "SMOKE");
1516	2486	makeSomething(particleGeom);
1517	2487	} else
1518		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	2488	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1519	2489	{
1520		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	2490	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1521	2491
1522	2492	ragdoll.toParent = LA.newMatrix();
1523	2493	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1535,7 +2505,7 @@
1535	2505	} else
1536	2506	/*
1537	2507	*/
1538		- if (event.getSource() == heightFieldItem)
	2508	+ if (source == heightFieldItem)
1539	2509	{
1540	2510	Object3D obj = new Object3D();
1541	2511
..	..	@@ -1573,27 +2543,31 @@
1573	2543
1574	2544	makeSomething(obj);
1575	2545	} else
1576		- if (event.getSource() == gridItem)
	2546	+ if (source == gridItem \|\| source == gridButton)
1577	2547	{
1578	2548	makeSomething(new Grid());
1579	2549	} else
1580		- if (event.getSource() == ellipsoidItem)
	2550	+ if (source == ellipsoidItem \|\| source == sphereButton)
1581	2551	{
1582	2552	makeSomething(new Sphere());
1583	2553	} else
1584		- if (event.getSource() == coneItem)
	2554	+ if (source == coneItem \|\| source == coneButton)
1585	2555	{
1586	2556	makeSomething(new Cone());
1587	2557	} else
1588		- if (event.getSource() == torusItem)
	2558	+ if (source == torusItem \|\| source == torusButton)
1589	2559	{
1590	2560	makeSomething(new Torus());
1591	2561	} else
1592		- if (event.getSource() == superItem)
	2562	+ if (source == superItem \|\| source == superButton)
1593	2563	{
1594	2564	makeSomething(new Superellipsoid());
1595	2565	} else
1596		- if (event.getSource() == blobItem)
	2566	+ if (source == kleinItem \|\| source == kleinButton)
	2567	+ {
	2568	+ makeSomething(new Klein());
	2569	+ } else
	2570	+ if (source == blobItem)
1597	2571	{
1598	2572	Blob blob = new Blob();
1599	2573	BlobComponent comp = new BlobComponent();
..	..	@@ -1601,15 +2575,15 @@
1601	2575	//blob.retile();
1602	2576	makeSomething(blob);
1603	2577	} else
1604		- if (event.getSource() == latheItem)
	2578	+ if (source == latheItem)
1605	2579	{
1606	2580	makeSomething(new Lathe());
1607	2581	} else
1608		- if (event.getSource() == bezierItem)
	2582	+ if (source == bezierItem)
1609	2583	{
1610	2584	makeSomething(new BezierSurface());
1611	2585	} else
1612		- if (event.getSource() == checkerItem)
	2586	+ if (source == overlayItem \|\| source == overlayButton)
1613	2587	{
1614	2588	/*
1615	2589	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1624,7 +2598,7 @@
1624	2598	*/
1625	2599	makeSomething(new Checker());
1626	2600	} else
1627		- if (event.getSource() == meshItem)
	2601	+ if (source == meshItem)
1628	2602	{
1629	2603	Object3D itemtomake = new Object3D();
1630	2604	Object3D child;
..	..	@@ -1645,35 +2619,52 @@
1645	2619	makeSomething(child);
1646	2620	}
1647	2621	} else
1648		- if (event.getSource() == springItem)
	2622	+ if (source == springItem)
1649	2623	{
1650	2624	cSpring s = new cSpring();
1651	2625	s.setup();
1652	2626	makeSomething(s);
1653	2627	} else
1654		- if (event.getSource() == flagItem)
	2628	+ if (source == flagItem)
1655	2629	{
1656	2630	cSpring s = new cFlag();
1657	2631	s.setup();
1658	2632	makeSomething(s);
1659	2633	} else
1660		- if (event.getSource() == lightItem)
	2634	+ if (source == lightItem \|\| source == lightButton)
1661	2635	{
1662	2636	makeSomething(new Light());
1663	2637	} else
1664		- if (event.getSource() == csgItem)
	2638	+// if (source == skybox1Button \|\|
	2639	+// source == skybox2Button \|\|
	2640	+// source == skybox3Button \|\|
	2641	+// source == skybox4Button \|\|
	2642	+// source == skybox5Button \|\|
	2643	+// source == skybox6Button \|\|
	2644	+// source == skybox7Button \|\|
	2645	+// source == skybox11Button \|\|
	2646	+// source == skybox12Button \|\|
	2647	+// source == skybox13Button \|\|
	2648	+// source == skybox14Button \|\|
	2649	+// source == skybox15Button \|\|
	2650	+// source == skybox16Button \|\|
	2651	+// source == skybox17Button)
	2652	+// {
	2653	+// ChangeSkybox(source);
	2654	+// } else
	2655	+ if (source == csgItem)
1665	2656	{
1666	2657	group(new CSG());
1667	2658	} else
1668		- if (event.getSource() == templateItem)
	2659	+ if (source == templateItem)
1669	2660	{
1670	2661	group(new cTemplate());
1671	2662	} else
1672		- if (event.getSource() == attributeItem)
	2663	+ if (source == attributeItem)
1673	2664	{
1674	2665	makeSomething(new Attribute());
1675	2666	} else
1676		- if (event.getSource() == pointflowItem)
	2667	+ if (source == pointflowItem)
1677	2668	{
1678	2669	makeSomething(new PointFlow());
1679	2670	} else
..	..	@@ -1685,7 +2676,7 @@
1685	2676	} else
1686	2677	*/
1687	2678
1688		- if (event.getSource() == superLoopItem)
	2679	+ if (source == superLoopItem)
1689	2680	{
1690	2681	Composite g = new cGroup();
1691	2682	for (int i=0; i<15; i++)
..	..	@@ -1707,30 +2698,38 @@
1707	2698
1708	2699	group(g);
1709	2700	} else
1710		- if (event.getSource() == loopItem)
	2701	+ if (source == loopItem \|\| source == loopButton)
1711	2702	{
	2703	+ if (!group.selection.isEmpty())
	2704	+ {
1712	2705	Composite csg = new GroupLeaf();
1713	2706	csg.count = 5;
1714		- group(csg);
1715		- Composite child = new cGroup();
	2707	+ Composite child = new cGroup("Branch");
1716	2708	csg.addChild(child);
1717	2709	child.addChild(csg);
	2710	+ group(csg);
	2711	+ }
1718	2712	} else
1719		- if (event.getSource() == doubleItem)
	2713	+ if (source == doubleItem)
1720	2714	{
1721		- Composite csg = new GroupLeaf();
	2715	+ if (!group.selection.isEmpty())
	2716	+ {
	2717	+ Composite csg = new GroupLeaf("Fork");
1722	2718	csg.count = 5;
	2719	+ Composite child = new cGroup("Branch A");
	2720	+ csg.addChild(child);
	2721	+ child.addChild(csg);
	2722	+ child = new cGroup("Branch B");
	2723	+ csg.addChild(child);
	2724	+ child.addChild(csg);
1723	2725	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);
	2726	+ }
1730	2727	} else
1731		- if (event.getSource() == tripleItem)
	2728	+ if (source == tripleItem)
1732	2729	{
1733		- Composite csg = new GroupLeaf();
	2730	+ if (!group.selection.isEmpty())
	2731	+ {
	2732	+ Composite csg = new GroupLeaf("Trident");
1734	2733	csg.count = 4;
1735	2734	group(csg);
1736	2735	Composite child = new cGroup();
..	..	@@ -1742,74 +2741,119 @@
1742	2741	child = new cGroup();
1743	2742	csg.addChild(child);
1744	2743	child.addChild(csg);
	2744	+ }
1745	2745	} else
1746		-
1747		- if (event.getSource() == importGFDItem)
	2746	+ if (source == computeAOItem)
1748	2747	{
1749		- ImportGFD();
	2748	+ Globals.drawMode = CameraPane.OCCLUSION;
	2749	+ cameraView.repaint();
1750	2750	} 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)
	2751	+ if (source == recompileItem)
1769	2752	{
1770	2753	Recompile();
1771	2754	refreshContents();
1772	2755	} else
1773		- if (event.getSource() == editScriptItem)
	2756	+ if (source == editScriptItem)
1774	2757	{
1775	2758	OpenDialog();
1776	2759	refreshContents();
1777	2760	} else
1778		- if (event.getSource() == invariantsItem)
	2761	+ if (source == invariantsItem)
1779	2762	{
1780	2763	System.out.println("Invariants:");
1781		- GraphreeD.theApplet3D.universe.invariants();
	2764	+ Grafreed.grafreed.universe.invariants();
1782	2765	} else
1783		- if (event.getSource() == memoryItem)
	2766	+ if (source == memoryItem)
1784	2767	{
1785	2768	//System.out.println("Invariants:");
1786	2769	PrintMemory();
1787	2770	} else
1788		- if (event.getSource() == pathItem)
	2771	+ if (source == pathItem)
1789	2772	{
1790	2773	PrintPath();
1791	2774	} else
1792		- if (event.getSource() == analyzeItem)
	2775	+ if (source == analyzeItem)
1793	2776	{
1794	2777	AnalyzeObject();
1795	2778	} else
1796		- if (event.getSource() == dumpItem)
	2779	+ if (source == dumpItem)
1797	2780	{
1798	2781	DumpObject();
1799	2782	} else
1800		- if (event.getSource() == screenfitButton)
	2783	+ if (source == minButton)
1801	2784	{
1802		- //Reload(lastConverter, lastFilename, true);
	2785	+ Minimize();
	2786	+ } else
	2787	+ if (source == maxButton)
	2788	+ {
	2789	+ Maximize();
	2790	+ } else
	2791	+ if (source == fullButton)
	2792	+ {
	2793	+ ToggleFullScreen();
	2794	+ } else
	2795	+ if (source == collapseButton)
	2796	+ {
	2797	+ this.expandedLayout = radio.layout;
	2798	+ CollapseToolbar();
	2799	+ } else
	2800	+ if (source == maximize3DButton)
	2801	+ {
	2802	+ this.expandedLayout = radio.layout;
	2803	+ radio.layout = twoButton;
	2804	+ Show3DView();
	2805	+ CollapseToolbar();
	2806	+ } else
	2807	+ if (source == previousVersionButton)
	2808	+ {
	2809	+ // Go to previous version
	2810	+ //if (!Undo())
	2811	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2812	+ PreviousVersion();
	2813	+ } else
	2814	+ if (source == restoreButton)
	2815	+ {
	2816	+ // Restore current version
	2817	+ Restore();
	2818	+ //restoreButton.setEnabled(false);
	2819	+ } else
	2820	+ if (source == replaceButton)
	2821	+ {
	2822	+ // Overwrite current version
	2823	+ Replace();
	2824	+ //replaceButton.setEnabled(false);
	2825	+ } else
	2826	+ if (source == nextVersionButton)
	2827	+ {
	2828	+ // Go to next version
	2829	+ NextVersion();
	2830	+ } else
	2831	+ if (source == saveVersionButton)
	2832	+ {
	2833	+ // Save a new version
	2834	+ if (!Save(true))
	2835	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2836	+ } else
	2837	+ if (source == deleteVersionButton)
	2838	+ {
	2839	+ // Delete a new version
	2840	+ DeleteVersion();
	2841	+ } else
	2842	+ if (source == oneStepButton)
	2843	+ {
	2844	+ Globals.ONESTEP = true;
	2845	+ cameraView.repaint();
	2846	+ } else
	2847	+ if (source == screenfitButton)
	2848	+ {
1803	2849	ScreenFit();
1804	2850	} else
1805		- if (event.getSource() == screenfitpointButton)
	2851	+ if (source == screenfitpointButton)
1806	2852	{
1807		- //Reload(lastConverter, lastFilename, true);
1808	2853	ScreenFitPoint();
1809	2854	} else
1810		- if (event.getSource() == snapobjectButton)
	2855	+ if (source == snapobjectButton)
1811	2856	{
1812		- //Reload(lastConverter, lastFilename, true);
1813	2857	SnapObject();
1814	2858	} else
1815	2859	// if (event.getSource() == recompileButton)
..	..	@@ -1818,13 +2862,13 @@
1818	2862	// Recompile();
1819	2863	// refreshContents();
1820	2864	// } else
1821		- if (event.getSource() == gcButton)
	2865	+ if (source == gcButton)
1822	2866	{
1823	2867	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1824	2868	System.gc();
1825	2869	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1826	2870	} else
1827		- if (event.getSource() == editLeafItem)
	2871	+ if (source == editLeafItem)
1828	2872	{
1829	2873	Object3D obj;
1830	2874	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1838,65 +2882,78 @@
1838	2882	}
1839	2883	refreshContents(true);
1840	2884	} else
1841		- if (event.getSource() == openWindowItem)
	2885	+ if (source == openWindowItem)
1842	2886	{
1843	2887	EditSelection(true);
1844	2888	} else
1845		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2889	+ if (source == cutItem \|\| source == clearButton)
1846	2890	{
1847	2891	loadClipboard(true);
1848	2892	} else
1849		- if (event.getSource() == duplicateItem)
	2893	+ if (source == undoItem)
1850	2894	{
1851		- Object3D keep = GraphreeD.clipboard;
	2895	+ PreviousVersion();
	2896	+ } else
	2897	+ if (source == redoItem)
	2898	+ {
	2899	+ NextVersion();
	2900	+ } else
	2901	+ if (source == duplicateItem)
	2902	+ {
	2903	+ Object3D keep = Grafreed.clipboard;
1852	2904	loadClipboard(false);
1853	2905	paste(false);
1854		- GraphreeD.clipboard = keep;
	2906	+ Grafreed.clipboard = keep;
1855	2907	} else
1856		- if (event.getSource() == cloneItem)
	2908	+ if (source == cloneItem)
1857	2909	{
1858	2910	CloneSelection(false);
1859	2911	} else
1860		- if (event.getSource() == cloneSupportItem)
	2912	+ if (source == cloneSupportItem)
1861	2913	{
1862	2914	CloneSelection(true);
1863	2915	} else
1864		- if (event.getSource() == copyItem)
	2916	+ if (source == copyItem)
1865	2917	{
1866	2918	loadClipboard(false);
1867	2919	} else
1868		- if (event.getSource() == pasteItem)
	2920	+ if (source == pasteItem)
1869	2921	{
1870	2922	paste(false);
1871	2923	} else
1872		- if (event.getSource() == pasteLinkItem)
	2924	+ if (source == pasteIntoItem)
1873	2925	{
1874		- pasteInto(false);
	2926	+ pasteInto(true, false);
1875	2927	} else
1876		- if (event.getSource() == pasteCloneItem)
	2928	+ if (source == pasteLinkItem)
1877	2929	{
1878		- pasteInto(true);
	2930	+ pasteInto(false, false);
1879	2931	} else
1880		- if (event.getSource() == pasteExpandItem)
	2932	+ if (source == pasteCloneItem)
	2933	+ {
	2934	+ pasteInto(true, true);
	2935	+ } else
	2936	+ if (source == pasteExpandItem)
1881	2937	{
1882	2938	paste(true);
1883	2939	} else
1884		- if (event.getSource() == synchronizeItem)
	2940	+ if (source == synchronizeItem)
1885	2941	{
1886	2942	Overwrite(Object3D.TRANSFORM);
1887	2943	} else
1888		- if (event.getSource() == overwriteNameItem)
	2944	+ if (source == overwriteNameItem)
1889	2945	{
1890	2946	Overwrite(Object3D.NAME);
1891	2947	} else
1892		- if (event.getSource() == overwriteUVItem)
	2948	+ if (source == overwriteUVItem)
1893	2949	{
1894	2950	Overwrite(Object3D.UV);
1895	2951	} else
1896		- if (event.getSource() == overwriteMatItem)
	2952	+ if (source == overwriteMatItem)
1897	2953	{
	2954	+ /* july 2015
1898	2955	if ((dropAttributes & Object3D.TEXTURE) == 0)
1899		- Overwrite(Object3D.MATERIAL);
	2956	+ Overwrite(Object3D.MATERIAL \| Object3D.COLOR);
1900	2957	else
1901	2958	{
1902	2959	if ((dropAttributes & Object3D.COLOR) == 0 && (dropAttributes & Object3D.MATERIAL) == 0)
..	..	@@ -1908,13 +2965,16 @@
1908	2965	Overwrite(Object3D.MATERIAL \| Object3D.TEXTURE);
1909	2966	}
1910	2967	}
	2968	+ */
	2969	+
	2970	+ Overwrite(dropAttributes);
1911	2971	}
1912		- if (event.getSource() == overwriteGeoItem)
	2972	+ if (source == overwriteGeoItem)
1913	2973	{
1914	2974	Overwrite(Object3D.GEOMETRY);
1915		-// if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2975	+// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
1916	2976	// {
1917		-// Object3D content = GraphreeD.clipboard.get(0);
	2977	+// Object3D content = GrafreeD.clipboard.get(0);
1918	2978	//
1919	2979	// if (content instanceof cGroup && ((cGroup)content).transientlink )
1920	2980	// content = ((cGroup)content).get(0);
..	..	@@ -1926,7 +2986,7 @@
1926	2986	// refreshContents();
1927	2987	// }
1928	2988	} else
1929		- if (event.getSource() == generateMeshItem)
	2989	+ if (source == generateMeshItem)
1930	2990	{
1931	2991	//if (group.selection.size() == 1)
1932	2992	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1937,7 +2997,7 @@
1937	2997	ResetModel();
1938	2998	refreshContents();
1939	2999	} else
1940		- if (event.getSource() == extractGeometriesItem)
	3000	+ if (source == extractGeometriesItem)
1941	3001	{
1942	3002	boolean one = false;
1943	3003
..	..	@@ -1964,7 +3024,7 @@
1964	3024	ResetModel();
1965	3025	refreshContents();
1966	3026	} else
1967		- if (event.getSource() == cloneGeometriesItem)
	3027	+ if (source == cloneGeometriesItem)
1968	3028	{
1969	3029	boolean one = false;
1970	3030
..	..	@@ -1990,32 +3050,37 @@
1990	3050	ResetModel();
1991	3051	refreshContents();
1992	3052	} else
1993		- if (event.getSource() == shareGeometriesItem)
	3053	+ if (source == shareGeometriesItem)
1994	3054	{
1995	3055	boolean one = false;
1996	3056
1997	3057	if (group.selection.size() == 1)
1998	3058	one = true;
1999	3059
	3060	+ Object3D merge = null;
	3061	+
2000	3062	Object3D content = new cGroup();
2001	3063
2002	3064	for (int i=0; i<group.selection.size(); i++)
2003	3065	{
2004		- Object3D sel = new Merge(group.selection.get(i));
	3066	+ merge = new Merge(group.selection.get(i));
2005	3067
2006	3068	if (one)
2007		- makeSomething(sel, false);
	3069	+ makeSomething(merge, false);
2008	3070	else
2009		- content.addChild(sel);
	3071	+ content.addChild(merge);
2010	3072	}
2011	3073
2012	3074	if (!one)
2013		- makeSomething(content, false);
2014		-
2015		- ResetModel();
2016		- refreshContents();
	3075	+ makeSomething(content, true);
	3076	+ else
	3077	+ {
	3078	+ ResetModel();
	3079	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	3080	+ refreshContents();
	3081	+ }
2017	3082	} else
2018		- if (event.getSource() == mergeGeometriesItem)
	3083	+ if (source == mergeGeometriesItem)
2019	3084	{
2020	3085	boolean one = false;
2021	3086
..	..	@@ -2045,11 +3110,11 @@
2045	3110	ResetModel();
2046	3111	refreshContents();
2047	3112	} else
2048		- if (event.getSource() == linkverticesItem)
	3113	+ if (source == linkverticesItem)
2049	3114	{
2050		-// if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	3115	+// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2051	3116	// {
2052		-// Object3D content = GraphreeD.clipboard.get(0);
	3117	+// Object3D content = GrafreeD.clipboard.get(0);
2053	3118	//
2054	3119	// if (content instanceof cGroup && ((cGroup)content).transientlink )
2055	3120	// content = ((cGroup)content).get(0);
..	..	@@ -2058,39 +3123,48 @@
2058	3123	// group.selection.get(0).setMasterThis(content); // should be identity
2059	3124	// refreshContents();
2060	3125	// }
2061		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	3126	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2062	3127	{
2063		- Object3D content = GraphreeD.clipboard.get(0);
	3128	+ Object3D content = Grafreed.clipboard.get(0);
2064	3129
2065	3130	if (content instanceof cGroup && ((cGroup)content).transientlink )
2066	3131	content = ((cGroup)content).get(0);
2067	3132
2068		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	3133	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2069	3134	for (int i=0; i<group.selection.size(); i++)
2070	3135	{
2071		- boolean random = CameraPane.RANDOM;
2072		- CameraPane.RANDOM = false; // parse all random nodes
	3136	+ boolean random = CameraPane.SWITCH;
	3137	+ CameraPane.SWITCH = false; // parse all random nodes
2073	3138	group.selection.get(i).linkVerticesThis(content);
2074	3139	// group.selection.get(i).setMasterThis(content); // should be identity
2075		- CameraPane.RANDOM = random;
	3140	+ CameraPane.SWITCH = random;
2076	3141	}
2077		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	3142	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2078	3143	refreshContents();
2079	3144	}
2080	3145	} else
2081		- if (event.getSource() == resetsupportItem)
	3146	+ if (source == resetsupportItem)
2082	3147	{
2083	3148	for (int i=0; i<group.selection.size(); i++)
2084	3149	{
2085		- boolean random = CameraPane.RANDOM;
2086		- CameraPane.RANDOM = false; // parse all random nodes
	3150	+ boolean random = CameraPane.SWITCH;
	3151	+ CameraPane.SWITCH = false; // parse all random nodes
2087	3152	group.selection.get(i).linkVerticesThis(null);
2088		- CameraPane.RANDOM = random;
	3153	+ CameraPane.SWITCH = random;
2089	3154	}
2090	3155
2091	3156	refreshContents();
2092	3157	} else
2093		- if (event.getSource() == resetreferencesItem)
	3158	+ if (source == relinkverticesItem)
	3159	+ {
	3160	+ boolean random = CameraPane.SWITCH;
	3161	+ CameraPane.SWITCH = false; // parse all random nodes
	3162	+ group.selection.RelinkToSupport();
	3163	+ CameraPane.SWITCH = random;
	3164	+
	3165	+ refreshContents();
	3166	+ } else
	3167	+ if (source == resetreferencesItem)
2094	3168	{
2095	3169	for (int i=0; i<group.selection.size(); i++)
2096	3170	{
..	..	@@ -2099,11 +3173,11 @@
2099	3173
2100	3174	refreshContents();
2101	3175	} else
2102		- if (event.getSource() == setMasterItem)
	3176	+ if (source == setMasterItem)
2103	3177	{
2104		- if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	3178	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2105	3179	{
2106		- Object3D content = GraphreeD.clipboard.get(0);
	3180	+ Object3D content = Grafreed.clipboard.get(0);
2107	3181
2108	3182	if (content instanceof cGroup && ((cGroup)content).transientlink )
2109	3183	content = ((cGroup)content).get(0);
..	..	@@ -2112,13 +3186,13 @@
2112	3186	refreshContents();
2113	3187	}
2114	3188	} else
2115		- if (event.getSource() == poseMeshItem)
	3189	+ if (source == poseMeshItem)
2116	3190	{
2117	3191	if (group.selection.size() == 1)
2118	3192	{
2119		- if (GraphreeD.clipboard.size() == 1)
	3193	+ if (Grafreed.clipboard.size() == 1)
2120	3194	{
2121		- Object3D content = GraphreeD.clipboard.get(0);
	3195	+ Object3D content = Grafreed.clipboard.get(0);
2122	3196
2123	3197	if (content instanceof cGroup && ((cGroup)content).transientlink )
2124	3198	content = ((cGroup)content).get(0);
..	..	@@ -2131,19 +3205,19 @@
2131	3205	}
2132	3206
2133	3207	} else
2134		- if (event.getSource() == revertMeshItem)
	3208	+ if (source == revertMeshItem)
2135	3209	{
2136	3210	RevertMeshes();
2137	3211	} else
2138		- if (event.getSource() == resetMeshItem)
	3212	+ if (source == resetAllItem)
2139	3213	{
2140	3214	ResetAll();
2141	3215	} else
2142		- if (event.getSource() == stepAllItem)
	3216	+ if (source == stepAllItem)
2143	3217	{
2144	3218	StepAll();
2145	3219	} else
2146		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	3220	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2147	3221	{
2148	3222	//int indices[] = jList.getSelectedIndices();
2149	3223	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2151,42 +3225,46 @@
2151	3225
2152	3226	ClearSelection(false);
2153	3227	} else
2154		- if (event.getSource() == clearAllItem)
	3228	+ if (source == clearAllItem)
2155	3229	{
2156	3230	ClearSelection(true);
2157	3231	} else
2158		- if (event.getSource() == grabItem)
	3232	+ if (source == grabItem \|\| source == groupButton)
2159	3233	{
2160		- group(new cGroup(), true);
	3234	+ group(new cGroup(), false); // true);
2161	3235	} else
2162		- if (event.getSource() == frontItem)
	3236	+ if (source == hideItem)
	3237	+ {
	3238	+ group(new HiddenObject());
	3239	+ } else
	3240	+ if (source == frontItem)
2163	3241	{
2164	3242	front();
2165	3243	} else
2166		- if (event.getSource() == backItem)
	3244	+ if (source == backItem)
2167	3245	{
2168	3246	back();
2169	3247	} else
2170		- if (event.getSource() == cameraItem)
	3248	+ if (source == cameraItem)
2171	3249	{
2172	3250	makeSomething(new Camera());
2173	3251	} else
2174		- if (event.getSource() == compositeItem)
	3252	+ if (source == compositeItem \|\| source == compositeButton)
2175	3253	{
2176	3254	group(new Composite());
2177	3255	} else
2178		- if (event.getSource() == randomItem)
	3256	+ if (source == switchItem \|\| source == switchButton)
2179	3257	{
2180	3258	RandomNode random = new RandomNode();
2181	3259	group(random);
2182	3260	if (random.size() > 0)
2183		- random.name = random.get(0).name + "Rnd";
	3261	+ random.name = random.get(0).name + "Switch";
2184	3262	} else
2185		- if (event.getSource() == physicsItem)
	3263	+ if (source == physicsItem)
2186	3264	{
2187	3265	group(new PhysicsNode());
2188	3266	} else
2189		- if (event.getSource() == frameselectorItem)
	3267	+ if (source == frameselectorItem)
2190	3268	{
2191	3269	for (int i=0; i<group.selection.size(); i++)
2192	3270	{
..	..	@@ -2198,7 +3276,7 @@
2198	3276	ResetModel();
2199	3277	refreshContents();
2200	3278	} else
2201		- if (event.getSource() == switchGeoItem)
	3279	+ if (source == switchGeoItem)
2202	3280	{
2203	3281	for (int i=0; i<group.selection.size(); i++)
2204	3282	{
..	..	@@ -2210,7 +3288,7 @@
2210	3288	ResetModel();
2211	3289	refreshContents();
2212	3290	} else
2213		- if (event.getSource() == switchTransfoItem)
	3291	+ if (source == switchTransfoItem)
2214	3292	{
2215	3293	for (int i=0; i<group.selection.size(); i++)
2216	3294	{
..	..	@@ -2222,7 +3300,7 @@
2222	3300	ResetModel();
2223	3301	refreshContents();
2224	3302	} else
2225		- if (event.getSource() == morphItem)
	3303	+ if (source == morphItem)
2226	3304	{
2227	3305	for (int i=0; i<group.selection.size(); i++)
2228	3306	{
..	..	@@ -2234,7 +3312,7 @@
2234	3312	ResetModel();
2235	3313	refreshContents();
2236	3314	} else
2237		- if (event.getSource() == scriptNodeItem)
	3315	+ if (source == scriptNodeItem)
2238	3316	{
2239	3317	boolean atleastone = false;
2240	3318
..	..	@@ -2273,195 +3351,264 @@
2273	3351	}
2274	3352	}
2275	3353	} else
2276		- if (event.getSource() == linkerItem)
	3354	+ if (source == linkerItem)
2277	3355	{
2278	3356	group(new cLinker());
2279	3357	} else
2280		- if (event.getSource() == textureItem)
	3358	+ if (source == textureItem \|\| source == textureButton)
2281	3359	{
2282	3360	group(new TextureNode());
2283	3361	} else
2284		- if (event.getSource() == shadowXItem)
	3362	+ if (source == billboardItem)
	3363	+ {
	3364	+ group(new BillboardNode());
	3365	+ } else
	3366	+ if (source == shadowXItem)
2285	3367	{
2286	3368	CastShadow(0);
2287	3369	} else
2288		- if (event.getSource() == shadowYItem)
	3370	+ if (source == shadowYItem)
2289	3371	{
2290	3372	CastShadow(1);
2291	3373	} else
2292		- if (event.getSource() == shadowZItem)
	3374	+ if (source == shadowZItem)
2293	3375	{
2294	3376	CastShadow(2);
2295	3377	} else
2296		- if (event.getSource() == ungroupItem)
	3378	+ if (source == ungroupItem \|\| source == ungroupButton)
2297	3379	{
2298		- ungroup();
	3380	+ boolean canUngroup = true;
	3381	+
	3382	+ for (int i=0; i<group.selection.size(); i++)
	3383	+ {
	3384	+ Object3D selectedItem = group.selection.get(i);
	3385	+
	3386	+ if (selectedItem.Size() == 0)
	3387	+ {
	3388	+ // Cannot ungroup leaves
	3389	+ canUngroup = false;
	3390	+ break;
	3391	+ }
	3392	+
	3393	+ if (selectedItem == group)
	3394	+ {
	3395	+ // Cannot ungroup root
	3396	+ canUngroup = false;
	3397	+ break;
	3398	+ }
	3399	+ }
	3400	+
	3401	+ if (canUngroup)
	3402	+ {
	3403	+ for (int i=0; i<group.selection.size(); i++)
	3404	+ {
	3405	+ Object3D selectedItem = group.selection.get(i);
	3406	+
	3407	+ Ungroup(selectedItem);
	3408	+ }
	3409	+
	3410	+ ClearSelection(false);
	3411	+
	3412	+ refreshContents();
	3413	+ }
2299	3414	} else
2300		- if (event.getSource() == genUVItem)
	3415	+ if (source == genUVItem)
2301	3416	{
2302	3417	GenUV();
2303	3418	} else
2304		- if (event.getSource() == genNormalsCADItem)
	3419	+ if (source == genNormalsCADItem)
2305	3420	{
2306	3421	GenNormals(true);
2307	3422	} else
2308		- if (event.getSource() == genNormalsORGANItem)
	3423	+ if (source == genNormalsMESHItem)
	3424	+ {
	3425	+ GenNormalsMESH();
	3426	+ } else
	3427	+ if (source == genNormalsORGANItem)
2309	3428	{
2310	3429	GenNormals(false);
2311	3430	} else
2312		- if (event.getSource() == stripifyItem)
	3431	+ if (source == genNormalsMINEItem)
	3432	+ {
	3433	+ GenNormalsMINE();
	3434	+ } else
	3435	+ if (source == stripifyItem)
2313	3436	{
2314	3437	Stripify();
2315	3438	} else
2316		- if (event.getSource() == unstripifyItem)
	3439	+ if (source == unstripifyItem)
2317	3440	{
2318	3441	Unstripify();
2319	3442	} else
2320		- if (event.getSource() == trimItem)
	3443	+ if (source == trimItem)
2321	3444	{
2322	3445	Trim();
2323	3446	} else
2324		- if (event.getSource() == untrimItem)
	3447	+ if (source == untrimItem)
2325	3448	{
2326	3449	Untrim();
2327	3450	} else
2328		- if (event.getSource() == clearColorsItem)
	3451	+ if (source == clearColorsItem)
2329	3452	{
2330	3453	ClearColors();
2331	3454	} else
2332		- if (event.getSource() == clearMaterialsItem)
	3455	+ if (source == clearMaterialsItem)
2333	3456	{
2334	3457	ClearMaterials();
2335	3458	} else
2336		- if (event.getSource() == liveleavesItem)
	3459	+ if (source == liveleavesItem)
2337	3460	{
2338	3461	LiveLeaves(true);
2339	3462	} else
2340		- if (event.getSource() == unliveleavesItem)
	3463	+ if (source == unliveleavesItem)
2341	3464	{
2342	3465	LiveLeaves(false);
2343	3466	} else
2344		- if (event.getSource() == supportleavesItem)
	3467	+ if (source == supportleavesItem)
2345	3468	{
2346	3469	SupportLeaves(true);
2347	3470	} else
2348		- if (event.getSource() == unsupportleavesItem)
	3471	+ if (source == unsupportleavesItem)
2349	3472	{
2350	3473	SupportLeaves(false);
2351	3474	} else
2352		- if (event.getSource() == hideleavesItem)
	3475	+ if (source == hideleavesItem)
2353	3476	{
2354	3477	HideLeaves(true);
2355	3478	} else
2356		- if (event.getSource() == showleavesItem)
	3479	+ if (source == showleavesItem)
2357	3480	{
2358	3481	HideLeaves(false);
2359	3482	} else
2360		- if (event.getSource() == markleavesItem)
	3483	+ if (source == markleavesItem)
2361	3484	{
2362	3485	MarkLeaves(true);
2363	3486	} else
2364		- if (event.getSource() == unmarkleavesItem)
	3487	+ if (source == unmarkleavesItem)
2365	3488	{
2366	3489	MarkLeaves(false);
2367	3490	} else
2368		- if (event.getSource() == flipVItem)
	3491	+ if (source == rewindleavesItem)
	3492	+ {
	3493	+ RewindLeaves(true);
	3494	+ } else
	3495	+ if (source == unrewindleavesItem)
	3496	+ {
	3497	+ RewindLeaves(false);
	3498	+ } else
	3499	+ if (source == randomleavesItem)
	3500	+ {
	3501	+ RandomLeaves(true);
	3502	+ } else
	3503	+ if (source == unrandomleavesItem)
	3504	+ {
	3505	+ RandomLeaves(false);
	3506	+ } else
	3507	+ if (source == flipVItem)
2369	3508	{
2370	3509	FlipV(true);
2371	3510	} else
2372		- if (event.getSource() == unflipVItem)
	3511	+ if (source == unflipVItem)
2373	3512	{
2374	3513	FlipV(false);
2375	3514	} else
2376		- if (event.getSource() == lowTexturesItem)
	3515	+ if (source == lowTexturesItem)
2377	3516	{
2378	3517	SetTexRes(0);
2379	3518	} else
2380		- if (event.getSource() == normalTexturesItem)
	3519	+ if (source == normalTexturesItem)
2381	3520	{
2382	3521	SetTexRes(1);
2383	3522	} else
2384		- if (event.getSource() == highTexturesItem)
	3523	+ if (source == highTexturesItem)
2385	3524	{
2386	3525	SetTexRes(2);
2387	3526	} else
2388		- if (event.getSource() == veryhighTexturesItem)
	3527	+ if (source == veryhighTexturesItem)
2389	3528	{
2390	3529	SetTexRes(3);
2391	3530	} else
2392		- if (event.getSource() == maxTexturesItem)
	3531	+ if (source == maxTexturesItem)
2393	3532	{
2394	3533	SetTexRes(4);
2395	3534	} else
2396		- if (event.getSource() == panoTexturesItem)
	3535	+ if (source == panoTexturesItem)
2397	3536	{
2398	3537	SetTexRes(5);
2399	3538	} else
2400		- if (event.getSource() == reverseNormalsItem)
	3539	+ if (source == reverseNormalsItem)
2401	3540	{
2402	3541	ReverseNormals();
2403	3542	} else
2404		- if (event.getSource() == parseverticesItem)
	3543	+ if (source == parseverticesItem)
2405	3544	{
2406	3545	ParseVertices();
2407	3546	} else
2408		- if (event.getSource() == textureFieldItem)
	3547	+ if (source == textureFieldItem)
2409	3548	{
2410	3549	TextureVertices();
2411	3550	} else
2412		- if (event.getSource() == alignItem)
	3551	+ if (source == alignItem)
2413	3552	{
2414	3553	Align();
2415	3554	} else
2416		- if (event.getSource() == mirrorItem)
	3555	+ if (source == mirrorItem)
2417	3556	{
2418	3557	MirrorPoses();
2419	3558	} else
2420		- if (event.getSource() == reduceMorphItem)
	3559	+ if (source == reduceMorphItem)
2421	3560	{
2422	3561	MeshReduction(false);
2423	3562	} else
2424		- if (event.getSource() == reduce34MorphItem)
	3563	+ if (source == reduce34MorphItem)
2425	3564	{
2426	3565	MeshReduction(true);
2427	3566	} else
2428		- if (event.getSource() == reverseTrianglesItem)
	3567	+ if (source == reverseTrianglesItem)
2429	3568	{
2430	3569	ReverseTriangles();
2431	3570	} else
2432		- if (event.getSource() == reduceMeshItem)
	3571	+ if (source == reduceMeshItem)
2433	3572	{
2434	3573	ReduceMesh(false);
2435	3574	} else
2436		- if (event.getSource() == reduce34MeshItem)
	3575	+ if (source == reduce34MeshItem)
2437	3576	{
2438	3577	ReduceMesh(true);
2439	3578	} else
2440		- if (event.getSource() == increaseMeshItem)
	3579	+ if (source == increaseMeshItem)
2441	3580	{
2442	3581	IncreaseMesh();
2443	3582	} else
2444		- if (event.getSource() == clipMeshItem)
	3583	+ if (source == clipMeshItem)
2445	3584	{
2446	3585	ClipMesh();
2447	3586	} else
2448		- if (event.getSource() == smoothMeshItem)
	3587	+ if (source == smoothMeshItem)
2449	3588	{
2450	3589	SmoothMesh();
2451	3590	} else
2452		- if (event.getSource() == transformgeometryItem)
	3591	+ if (source == transformGeometryItem)
2453	3592	{
2454	3593	TransformGeometry();
2455	3594	} else
2456		- if (event.getSource() == resetTransformItem)
	3595	+ if (source == transformChildrenItem)
	3596	+ {
	3597	+ TransformChildren();
	3598	+ } else
	3599	+ if (source == resetTransformItem)
2457	3600	{
2458	3601	ResetTransform();
2459	3602	} else
2460		- if (event.getSource() == resetCentroidItem)
	3603	+ if (source == resetCentroidItem)
2461	3604	{
2462		- ResetCentroid();
	3605	+ ResetCentroid(true);
2463	3606	} else
2464		- if (event.getSource() == resetParentItem)
	3607	+ if (source == resetCentroidXZItem)
	3608	+ {
	3609	+ ResetCentroid(false);
	3610	+ } else
	3611	+ if (source == resetParentItem)
2465	3612	{
2466	3613	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2467	3614	{
..	..	@@ -2471,7 +3618,7 @@
2471	3618
2472	3619	refreshContents();
2473	3620	} else
2474		- if (event.getSource() == repairParentItem)
	3621	+ if (source == repairParentItem)
2475	3622	{
2476	3623	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2477	3624	{
..	..	@@ -2485,7 +3632,21 @@
2485	3632
2486	3633	refreshContents();
2487	3634	} else
2488		- if (event.getSource() == sortbysizeItem)
	3635	+ if (source == repairShadowItem)
	3636	+ {
	3637	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3638	+ {
	3639	+ Object3D obj = (Object3D)e.nextElement();
	3640	+ obj.RepairShadow();
	3641	+// for (int i=0; i<obj.size(); i++)
	3642	+// {
	3643	+// obj.get(i).parent = obj;
	3644	+// }
	3645	+ }
	3646	+
	3647	+ refreshContents();
	3648	+ } else
	3649	+ if (source == sortbysizeItem)
2489	3650	{
2490	3651	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2491	3652	{
..	..	@@ -2497,7 +3658,7 @@
2497	3658	ResetModel();
2498	3659	refreshContents();
2499	3660	} else
2500		- if (event.getSource() == sortbynameItem)
	3661	+ if (source == sortbynameItem)
2501	3662	{
2502	3663	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2503	3664	{
..	..	@@ -2509,7 +3670,7 @@
2509	3670	ResetModel();
2510	3671	refreshContents();
2511	3672	} else
2512		- if (event.getSource() == attachPigmentItem)
	3673	+ if (source == attachPigmentItem)
2513	3674	{
2514	3675	String texture = GetFile("Attach pigment");
2515	3676	Object3D obj;
..	..	@@ -2521,7 +3682,7 @@
2521	3682
2522	3683	refreshContents();
2523	3684	} else
2524		- if (event.getSource() == detachPigmentItem)
	3685	+ if (source == detachPigmentItem)
2525	3686	{
2526	3687	Object3D obj;
2527	3688	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2532,7 +3693,7 @@
2532	3693
2533	3694	refreshContents();
2534	3695	} else
2535		- if (event.getSource() == attachBumpItem)
	3696	+ if (source == attachBumpItem)
2536	3697	{
2537	3698	String texture = GetFile("Attach bump");
2538	3699	Object3D obj;
..	..	@@ -2544,18 +3705,18 @@
2544	3705
2545	3706	refreshContents();
2546	3707	} else
2547		- if (event.getSource() == detachBumpItem)
	3708	+ if (source == detachBumpItem)
2548	3709	{
2549	3710	Object3D obj;
2550	3711	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2551	3712	{
2552	3713	obj = (Object3D)e.nextElement();
2553		- obj.SetBumpTexture(null);
	3714	+ obj.ResetBumpTexture();
2554	3715	}
2555	3716
2556	3717	refreshContents();
2557	3718	} else
2558		- if (event.getSource() == pigmentBumpItem)
	3719	+ if (source == pigmentBumpItem)
2559	3720	{
2560	3721	Object3D obj;
2561	3722	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2566,159 +3727,233 @@
2566	3727
2567	3728	refreshContents();
2568	3729	} else
2569		- if (event.getSource() == flashSelectionButton)
	3730	+ if (source == embedTexturesItem)
	3731	+ {
	3732	+ Object3D obj;
	3733	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3734	+ {
	3735	+ obj = (Object3D)e.nextElement();
	3736	+ obj.EmbedTextures(true);
	3737	+ }
	3738	+
	3739	+ refreshContents();
	3740	+ } else
	3741	+ if (source == deEmbedTexturesItem)
	3742	+ {
	3743	+ Object3D obj;
	3744	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3745	+ {
	3746	+ obj = (Object3D)e.nextElement();
	3747	+ obj.EmbedTextures(false);
	3748	+ }
	3749	+
	3750	+ CameraPane.texturepigment.clear();
	3751	+ CameraPane.texturebump.clear();
	3752	+
	3753	+ refreshContents();
	3754	+ } else
	3755	+ if (source == flashSelectionButton)
2570	3756	{
2571	3757	CameraPane.flash = true;
2572	3758	refreshContents();
2573	3759	} else
2574		- if (event.getSource() == oneButton)
	3760	+ if (source == oneButton)
2575	3761	{
2576	3762	} else
2577		- if (event.getSource() == twoButton)
	3763	+ if (source == twoButton)
2578	3764	{
2579	3765	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();
	3766	+
	3767	+ if (CameraPane.FULLSCREEN)
	3768	+ fullscreenLayout = radio.layout;
	3769	+
	3770	+ Show3DView();
	3771	+
	3772	+ cameraView.requestFocusInWindow();
	3773	+
	3774	+// refreshContents(true);
	3775	+//
	3776	+// try
	3777	+// {
	3778	+// java.awt.Robot bot = new java.awt.Robot();
	3779	+// int mask = InputEvent.BUTTON1_MASK;
	3780	+// bot.mouseMove(100, 100);
	3781	+// bot.mousePress(mask);
	3782	+// bot.mouseRelease(mask);
	3783	+// }
	3784	+// catch (Exception e)
	3785	+// {
	3786	+//
	3787	+// }
	3788	+
2607	3789	} else
2608		- if (event.getSource() == threeButton)
	3790	+ if (source == threeButton)
2609	3791	{
2610	3792	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();
	3793	+
	3794	+ if (CameraPane.FULLSCREEN)
	3795	+ fullscreenLayout = radio.layout;
	3796	+
	3797	+// bigThree.remove(scenePanel);
	3798	+// bigThree.remove(centralPanel);
	3799	+// bigThree.remove(XYZPanel);
	3800	+// aWindowConstraints.gridx = 0;
	3801	+// aWindowConstraints.gridy = 0;
	3802	+// aWindowConstraints.gridwidth = 1;
	3803	+// // aConstraints.gridheight = 3;
	3804	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3805	+// aWindowConstraints.weightx = 0;
	3806	+// aWindowConstraints.weighty = 1;
	3807	+// //bigThree.add(jtp, aWindowConstraints);
	3808	+// aWindowConstraints.weightx = 1;
	3809	+// aWindowConstraints.gridwidth = 3;
	3810	+// // aConstraints.gridheight = 3;
	3811	+// aWindowConstraints.gridx = 1;
	3812	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3813	+// bigThree.add(centralPanel, aWindowConstraints);
	3814	+// aWindowConstraints.weightx = 0;
	3815	+// aWindowConstraints.gridx = 4;
	3816	+// aWindowConstraints.gridwidth = 1;
	3817	+// // aConstraints.gridheight = 3;
	3818	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	3819	+// bigThree.add(XYZPanel, aWindowConstraints);
	3820	+// bigThree.validate();
	3821	+// scenePanel.setVisible(false);
	3822	+// centralPanel.setVisible(true);
	3823	+// XYZPanel.setVisible(true);
	3824	+ bigThree.ClearUI();
	3825	+ bigThree.add(scenePanel);
	3826	+ bigThree.add(centralPanel);
	3827	+ bigThree.FlushUI();
	3828	+
	3829	+ cameraView.requestFocusInWindow();
2635	3830	} else
2636		- if (event.getSource() == fourButton)
	3831	+ if (source == fourButton)
2637	3832	{
2638	3833	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();
	3834	+
	3835	+ if (CameraPane.FULLSCREEN)
	3836	+ fullscreenLayout = radio.layout;
	3837	+
	3838	+// bigThree.remove(scenePanel);
	3839	+// bigThree.remove(centralPanel);
	3840	+// bigThree.remove(XYZPanel);
	3841	+// aWindowConstraints.gridx = 0;
	3842	+// aWindowConstraints.gridy = 0;
	3843	+// aWindowConstraints.gridwidth = 1;
	3844	+// // aWindowConstraints.gridheight = 3;
	3845	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3846	+// aWindowConstraints.weightx = 1;
	3847	+// aWindowConstraints.weighty = 1;
	3848	+// bigThree.add(scenePanel, aWindowConstraints);
	3849	+// aWindowConstraints.weightx = 1;
	3850	+// aWindowConstraints.gridwidth = 3;
	3851	+// // aConstraints.gridheight = 3;
	3852	+// aWindowConstraints.gridx = 1;
	3853	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3854	+// //bigThree.add(cameraPanel, aWindowConstraints);
	3855	+// aWindowConstraints.weightx = 0;
	3856	+// aWindowConstraints.gridx = 4;
	3857	+// aWindowConstraints.gridwidth = 1;
	3858	+// // aWindowConstraints.gridheight = 3;
	3859	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3860	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3861	+// bigThree.validate();
	3862	+// scenePanel.setVisible(true);
	3863	+// centralPanel.setVisible(false);
	3864	+// XYZPanel.setVisible(false);
	3865	+ bigThree.ClearUI();
	3866	+ bigThree.add(scenePanel);
	3867	+ bigThree.FlushUI();
	3868	+
	3869	+ cameraView.requestFocusInWindow();
2663	3870	} else
2664		- if (event.getSource() == sixButton)
	3871	+ if (source == sixButton)
2665	3872	{
2666	3873	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();
	3874	+
	3875	+ if (CameraPane.FULLSCREEN)
	3876	+ fullscreenLayout = radio.layout;
	3877	+
	3878	+// bigThree.remove(scenePanel);
	3879	+// bigThree.remove(centralPanel);
	3880	+// bigThree.remove(XYZPanel);
	3881	+// aWindowConstraints.gridx = 0;
	3882	+// aWindowConstraints.gridy = 0;
	3883	+// aWindowConstraints.gridwidth = 1;
	3884	+// // aConstraints.gridheight = 3;
	3885	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3886	+// aWindowConstraints.weightx = 0;
	3887	+// aWindowConstraints.weighty = 1;
	3888	+// bigThree.add(scenePanel, aWindowConstraints);
	3889	+// aWindowConstraints.weightx = 1;
	3890	+// aWindowConstraints.gridwidth = 3;
	3891	+// // aWindowConstraints.gridheight = 3;
	3892	+// aWindowConstraints.gridx = 1;
	3893	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3894	+// bigThree.add(centralPanel, aWindowConstraints);
	3895	+// aWindowConstraints.weightx = 0;
	3896	+// aWindowConstraints.gridx = 4;
	3897	+// aWindowConstraints.gridwidth = 1;
	3898	+// // aWindowConstraints.gridheight = 3;
	3899	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3900	+// //bigThree.add(XYZPanel, aConstraints);
	3901	+// bigThree.validate();
	3902	+// scenePanel.setVisible(true);
	3903	+// centralPanel.setVisible(true);
	3904	+// XYZPanel.setVisible(false);
	3905	+ bigThree.ClearUI();
	3906	+ bigThree.add(centralPanel);
	3907	+ bigThree.add(scenePanel);
	3908	+ bigThree.FlushUI();
	3909	+
	3910	+ cameraView.requestFocusInWindow();
2691	3911	} else
2692		- if (event.getSource() == sevenButton)
	3912	+ if (source == sevenButton)
2693	3913	{
2694	3914	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();
	3915	+
	3916	+ if (CameraPane.FULLSCREEN)
	3917	+ fullscreenLayout = radio.layout;
	3918	+
	3919	+// bigThree.remove(scenePanel);
	3920	+// bigThree.remove(centralPanel);
	3921	+// bigThree.remove(XYZPanel);
	3922	+// aWindowConstraints.gridx = 0;
	3923	+// aWindowConstraints.gridy = 0;
	3924	+// aWindowConstraints.gridwidth = 1;
	3925	+// // aWindowConstraints.gridheight = 3;
	3926	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3927	+// aWindowConstraints.weightx = 0;
	3928	+// aWindowConstraints.weighty = 1;
	3929	+// bigThree.add(scenePanel, aWindowConstraints);
	3930	+// aWindowConstraints.weightx = 1;
	3931	+// aWindowConstraints.gridwidth = 3;
	3932	+// // aWindowConstraints.gridheight = 3;
	3933	+// aWindowConstraints.gridx = 1;
	3934	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3935	+// bigThree.add(centralPanel, aWindowConstraints);
	3936	+// aWindowConstraints.weightx = 0;
	3937	+// aWindowConstraints.gridx = 4;
	3938	+// aWindowConstraints.gridwidth = 1;
	3939	+// // aConstraints.gridheight = 3;
	3940	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3941	+// bigThree.add(XYZPanel, aWindowConstraints);
	3942	+// bigThree.validate();
	3943	+// scenePanel.setVisible(true);
	3944	+// centralPanel.setVisible(true);
	3945	+// XYZPanel.setVisible(true);
	3946	+ bigThree.ClearUI();
	3947	+ bigThree.add(scenePanel);
	3948	+ bigThree.add(centralPanel);
	3949	+ bigThree.add(XYZPanel);
	3950	+ bigThree.FlushUI();
	3951	+
	3952	+ cameraView.requestFocusInWindow();
2719	3953	} else
2720		- if (event.getSource() == rootButton)
	3954	+ if (source == rootButton)
2721	3955	{
	3956	+ Replace();
2722	3957	Object3D obj;
2723	3958	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2724	3959	{
..	..	@@ -2727,66 +3962,85 @@
2727	3962	EditObject(obj);
2728	3963	}
2729	3964
	3965	+ cameraView.requestFocusInWindow();
2730	3966	refreshContents(true);
2731	3967	} else
2732		- if (event.getSource() == closeButton)
	3968	+ if (source == closeButton)
2733	3969	{
2734	3970	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2735	3971	cRadio ab;
2736	3972	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2737	3973	{
2738	3974	ab = (cRadio)e.nextElement();
2739		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3975	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2740	3976	{
	3977	+ // Patch to avoid bug with transparency.
	3978	+ if (!ab.hadMaterial)
	3979	+ {
	3980	+ ab.object.material = null;
	3981	+ }
	3982	+
2741	3983	buttonGroup.remove(ab);
2742	3984	radioPanel.remove(ab);
2743	3985
2744		- ab.GetObject().editWindow = null;
	3986	+ //ab.GetObject().editWindow = null;
	3987	+ ab.GetObject().manipWindow = null;
2745	3988	// ab.GetObject().objectUI = null; // ?????????
2746	3989
2747	3990	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2748	3991	break;
2749	3992	}
2750	3993	}
	3994	+
	3995	+ cameraView.requestFocusInWindow();
2751	3996	refreshContents(true);
2752	3997	} else
2753		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3998	+ if (source == editItem \|\| source == editButton)
2754	3999	{
	4000	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4001	+ {
	4002	+ Object3D child = (Object3D)e.nextElement();
	4003	+ child.pinned = true;
	4004	+ }
	4005	+
2755	4006	EditSelection(false);
2756	4007	} else
2757		- if (event.getSource() == uneditButton)
	4008	+ if (source == uneditButton)
2758	4009	{
2759	4010	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2760	4011	{
2761	4012	Object3D child = (Object3D)e.nextElement();
2762	4013	if(child.editWindow != null)
2763		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4014	+ child.pinned = false;
2764	4015	child.CloseUI();
2765	4016	listUI.remove(child);
	4017	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2766	4018
2767		- child.editWindow = null; // ???????????
	4019	+ //child.editWindow = null; // ???????????
2768	4020	}
2769		- objEditor.ctrlPanel.revalidate();
	4021	+ objEditor.ctrlPanel.FlushUI();
2770	4022	//objEditor.jTree.clearSelection();
2771	4023	//objEditor.ResetSliders();
2772	4024	refreshContents(true);
2773	4025	} else
2774		- if (event.getSource() == clearPanelButton)
	4026	+ if (source == clearPanelButton)
2775	4027	{
2776	4028	assert(copy == group);
2777	4029	//copy.ClearUI();
2778	4030	for (Object3D obj : listUI)
2779	4031	{
	4032	+ obj.pinned = false;
2780	4033	obj.CloseUI();
2781	4034	}
2782	4035	listUI.clear();
	4036	+ SetPinStates(group.selection.size() > 0);
2783	4037	refreshContents(true);
2784	4038	} else
2785		- if (event.getSource() == allParamsButton)
	4039	+ if (source == allParamsButton)
2786	4040	{
2787	4041	assert(copy == group);
2788	4042
2789		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4043	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2790	4044
2791	4045	for (Object3D obj : listUI)
2792	4046	{
..	..	@@ -2803,19 +4057,19 @@
2803	4057
2804	4058	refreshContents(true);
2805	4059	} else
2806		- if (event.getSource() == unselectButton)
	4060	+ if (source == unselectButton)
2807	4061	{
2808	4062	objEditor.jTree.clearSelection();
2809		- // ?? oct 2012 GraphreeD.clipboard.clear();
	4063	+ // ?? oct 2012 GrafreeD.clipboard.clear();
2810	4064	objEditor.ResetSliders();
2811	4065	refreshContents(true);
2812	4066	} else
2813		- if(event.getSource() instanceof cRadio)
	4067	+ if(source instanceof cRadio)
2814	4068	{
2815	4069	group.parent = keepparent;
2816	4070	group.attributes = 0;
2817	4071	//group.editWindow = null;
2818		- /cRadio/ radio = (cRadio)event.getSource();
	4072	+ /cRadio/ radio = (cRadio)source;
2819	4073	Object3D obj = radio.GetObject();
2820	4074	System.out.println("Edit " + obj);
2821	4075	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2835,7 +4089,8 @@
2835	4089	}
2836	4090
2837	4091	copy = group;
2838		- //CameraPane.theRenderer.object = group;
	4092	+
	4093	+ //Globals.theRenderer.object = group;
2839	4094	if(!useclient)
2840	4095	{
2841	4096	cameraView.renderCamera = radio.camera;
..	..	@@ -2844,25 +4099,70 @@
2844	4099	cameraView.cameras[cameraView.cameracount] = radio.camera;
2845	4100	cameraView.targetLookAt.set(radio.camera.lookAt);
2846	4101	cameraView.object = group;
2847		- cameraView.lighttouched = true;
	4102	+ //cameraView.lighttouched = true;
	4103	+ Globals.lighttouched = true;
2848	4104	topView.object = group;
2849	4105	frontView.object = group;
2850	4106	sideView.object = group;
2851	4107	}
2852		- group.editWindow = this;
	4108	+
	4109	+// fix "+" issue
	4110	+ //group.editWindow = this;
	4111	+ group.manipWindow = this;
	4112	+
2853	4113	/*
2854	4114	currentLayout = radio.layout;
2855	4115	if (currentLayout == null)
2856	4116	currentLayout = sevenButton;
2857	4117	*/
2858	4118	radio.layout.doClick();
	4119	+
	4120	+ assert(copy instanceof Composite);
	4121	+
	4122	+ if (copy.versionlist == null)
	4123	+ {
	4124	+ copy.versionlist = new Object3D[100];
	4125	+ copy.versionindex = -1;
	4126	+
	4127	+ // Cannot work with loops
	4128	+ // To fix this issue, first mark all nodes above the root,
	4129	+ // and check if any of these nodes are reachable below the root.
	4130	+ //Save(true);
	4131	+ }
	4132	+
	4133	+ SetVersionStates();
	4134	+
	4135	+ ClearUnpinned();
	4136	+
	4137	+ //Grafreed.Assert(group != null);
	4138	+ //Grafreed.Assert(group.selection != null);
	4139	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4140	+ if (group.selection == null \|\| group.selection.size() == 1)
	4141	+ EditSelection(false);
2859	4142	keepparent = group.parent;
2860	4143	// PARENT = NULL or not???
2861	4144	//group.parent = null; // ROOT
2862	4145	//group.attributes = -1;
2863	4146	ResetModel();
	4147	+
	4148	+ cameraView.requestFocusInWindow();
2864	4149	refreshContents(true);
2865		- }
	4150	+ } else if (event.getSource() == editCameraItem)
	4151	+ {
	4152	+ cameraView.ProtectCamera();
	4153	+ cameraView.requestFocusInWindow();
	4154	+ cameraView.repaint();
	4155	+ return;
	4156	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	4157	+ {
	4158	+ cameraView.RevertCamera();
	4159	+ cameraView.requestFocusInWindow();
	4160	+ cameraView.repaint();
	4161	+ return;
	4162	+ // } else if (event.getSource() == textureButton)
	4163	+ // {
	4164	+ // return; // true;
	4165	+ }
2866	4166	else
2867	4167	{
2868	4168	//return super.action(event, arg);
..	..	@@ -2871,7 +4171,6 @@
2871	4171	}
2872	4172
2873	4173	boolean useclient = false;
2874		- cRadio radio;
2875	4174
2876	4175	void ToggleRoot()
2877	4176	{
..	..	@@ -2880,7 +4179,7 @@
2880	4179	if (useclient)
2881	4180	{
2882	4181	cameraView.object = client;
2883		- cameraView.lighttouched = true;
	4182	+ Globals.lighttouched = true;
2884	4183	//topView.object = client;
2885	4184	//frontView.object = client;
2886	4185	//sideView.object = client;
..	..	@@ -2888,7 +4187,7 @@
2888	4187	else
2889	4188	{
2890	4189	cameraView.object = group;
2891		- cameraView.lighttouched = true;
	4190	+ Globals.lighttouched = true;
2892	4191	//topView.object = group;
2893	4192	//frontView.object = group;
2894	4193	//sideView.object = group;
..	..	@@ -2923,6 +4222,28 @@
2923	4222	refreshContents();
2924	4223	}
2925	4224
	4225	+ void TransformChildren()
	4226	+ {
	4227	+ Object3D obj;
	4228	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4229	+ {
	4230	+ obj = (Object3D)e.nextElement();
	4231	+ obj.KeepTextureMatrices();
	4232	+ obj.TransformChildren();
	4233	+ obj.RestoreTextureMatrices();
	4234	+
	4235	+// if (obj.parent == null)
	4236	+// {
	4237	+// System.out.println("NULL PARENT!");
	4238	+// new Exception().printStackTrace();
	4239	+// }
	4240	+// else
	4241	+// TouchTransform(obj);
	4242	+// //obj.parent.Touch();
	4243	+ }
	4244	+
	4245	+ refreshContents();
	4246	+ }
2926	4247
2927	4248	void ResetTransform()
2928	4249	{
..	..	@@ -3035,7 +4356,7 @@
3035	4356	refreshContents();
3036	4357	}
3037	4358
3038		- void ResetCentroid()
	4359	+ void ResetCentroid(boolean full)
3039	4360	{
3040	4361	Object3D obj;
3041	4362	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3050,12 +4371,16 @@
3050	4371	LA.matIdentity(Object3D.mat);
3051	4372	obj.getBounds(minima, maxima, false);
3052	4373	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3053		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	4374	+ if (full)
	4375	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3054	4376	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3055	4377	obj.TransformMesh(Object3D.mat);
	4378	+
3056	4379	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3057		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	4380	+ if (full)
	4381	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3058	4382	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	4383	+
3059	4384	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3060	4385	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3061	4386	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3084,7 +4409,8 @@
3084	4409
3085	4410	int size = obj.MemorySize();
3086	4411
3087		- System.err.println((size/1024) + " KB is the size of " + obj);
	4412	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4413	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3088	4414	}
3089	4415	}
3090	4416	catch (Exception e)
..	..	@@ -3121,9 +4447,9 @@
3121	4447	obj = (Object3D)e.nextElement();
3122	4448
3123	4449	System.out.println("Object is: " + obj);
3124		- GraphreeD.AnalyzeObject(obj);
	4450	+ Grafreed.AnalyzeObject(obj);
3125	4451	System.out.println("Boundary rep: " + obj.bRep);
3126		- GraphreeD.AnalyzeObject(obj.bRep);
	4452	+ Grafreed.AnalyzeObject(obj.bRep);
3127	4453
3128	4454	// System.err.println((size/1024) + " KB is the size of " + obj);
3129	4455	}
..	..	@@ -3165,6 +4491,20 @@
3165	4491	void GenNormals(boolean crease)
3166	4492	{
3167	4493	group.GenNormalsS(crease);
	4494	+
	4495	+ refreshContents();
	4496	+ }
	4497	+
	4498	+ void GenNormalsMESH()
	4499	+ {
	4500	+ group.GenNormalsMeshS();
	4501	+
	4502	+ refreshContents();
	4503	+ }
	4504	+
	4505	+ void GenNormalsMINE()
	4506	+ {
	4507	+ group.selection.GenNormalsMINE();
3168	4508
3169	4509	refreshContents();
3170	4510	}
..	..	@@ -3250,7 +4590,7 @@
3250	4590	// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3251	4591	// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3252	4592	//
3253		-// g.add(GraphreeD.clipboard);
	4593	+// g.add(GrafreeD.clipboard);
3254	4594	//
3255	4595	// buffer.add(g);
3256	4596	// }
..	..	@@ -3269,8 +4609,8 @@
3269	4609	// nodes = new Object3D();
3270	4610	// vertices = new Vector<Vertex>();
3271	4611	//
3272		-// boolean epsequal = GraphreeD.epsequal;
3273		-// GraphreeD.epsequal = true;
	4612	+// boolean epsequal = GrafreeD.epsequal;
	4613	+// GrafreeD.epsequal = true;
3274	4614	//
3275	4615	// for (int i=0; i<group.selection.size(); i++)
3276	4616	// {
..	..	@@ -3311,7 +4651,7 @@
3311	4651	// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3312	4652	// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3313	4653	//
3314		-// g.add(GraphreeD.clipboard);
	4654	+// g.add(GrafreeD.clipboard);
3315	4655	//
3316	4656	// buffer.add(g);
3317	4657	// }
..	..	@@ -3319,7 +4659,7 @@
3319	4659	// makeSomething(buffer, i==group.selection.size()-1);
3320	4660	// }
3321	4661	//
3322		-// GraphreeD.epsequal = epsequal;
	4662	+// GrafreeD.epsequal = epsequal;
3323	4663	//
3324	4664	// //buffer = null;
3325	4665	// temprep = null;
..	..	@@ -3330,8 +4670,8 @@
3330	4670
3331	4671	void ParseVertices()
3332	4672	{
3333		- boolean epsequal = GraphreeD.epsequal;
3334		- GraphreeD.epsequal = true;
	4673	+ boolean epsequal = Grafreed.epsequal;
	4674	+ Grafreed.epsequal = true;
3335	4675
3336	4676	for (int i=0; i<group.selection.size(); i++)
3337	4677	{
..	..	@@ -3356,7 +4696,7 @@
3356	4696	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3357	4697	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3358	4698
3359		- g.add(GraphreeD.clipboard);
	4699	+ g.add(Grafreed.clipboard);
3360	4700
3361	4701	buffer.add(g);
3362	4702	}
..	..	@@ -3371,7 +4711,7 @@
3371	4711	makeSomething(buffer, i==group.selection.size()-1);
3372	4712	}
3373	4713
3374		- GraphreeD.epsequal = epsequal;
	4714	+ Grafreed.epsequal = epsequal;
3375	4715
3376	4716	refreshContents();
3377	4717	}
..	..	@@ -3389,7 +4729,16 @@
3389	4729	String pigment = Object3D.GetPigment(tex);
3390	4730	//String bump = Object3D.GetBump(tex);
3391	4731
3392		- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
	4732	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4733	+
	4734	+ try
	4735	+ {
	4736	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
	4737	+ }
	4738	+ catch (Exception e)
	4739	+ {
	4740	+ System.err.println("FAIL: " + node);
	4741	+ }
3393	4742
3394	4743	double s = v.s;
3395	4744
..	..	@@ -3416,7 +4765,7 @@
3416	4765	scale /= 3;
3417	4766
3418	4767	scale /= 0xFF;
3419		- scale /= 4;
	4768	+ // c'est quoi ca? scale /= 4;
3420	4769
3421	4770	//v.AO = scale;
3422	4771
..	..	@@ -3437,12 +4786,26 @@
3437	4786
3438	4787	void Align()
3439	4788	{
	4789	+ if (group.selection.size() == 0)
	4790	+ return;
	4791	+
	4792	+ cVector bbmin = new cVector();
	4793	+ cVector bbmax = new cVector();
	4794	+
	4795	+ group.selection.get(0).getBounds(bbmin, bbmax, true);
	4796	+
	4797	+ double dx = bbmax.x - bbmin.x;
	4798	+ double dy = bbmax.y - bbmin.y;
	4799	+ double dz = bbmax.z - bbmin.z;
	4800	+
	4801	+ double scale = Math.sqrt(dxdx + dydy + dz*dz);
	4802	+
3440	4803	for (int i=0; i<group.selection.size(); i++)
3441	4804	{
3442	4805	Object3D obj = group.selection.get(i);
3443	4806
3444		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3445		- LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
	4807	+ LA.matTranslate(obj.toParent, i * scale, 0, 0);
	4808	+ LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3446	4809	}
3447	4810
3448	4811	refreshContents();
..	..	@@ -3455,7 +4818,7 @@
3455	4818	// ref.SaveSupports();
3456	4819	// Object3D par = ref.parent;
3457	4820	// ref.parent = null;
3458		-// Object3D lowres = (Object3D) GraphreeD.clone(ref);
	4821	+// Object3D lowres = (Object3D) GrafreeD.clone(ref);
3459	4822	// ref.parent = par;
3460	4823	// ref.RestoreSupports();
3461	4824
..	..	@@ -3463,11 +4826,11 @@
3463	4826
3464	4827	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3465	4828
3466		- boolean random = CameraPane.RANDOM;
3467		- CameraPane.RANDOM = false; // parse all random nodes
	4829	+ boolean random = CameraPane.SWITCH;
	4830	+ CameraPane.SWITCH = false; // parse all random nodes
3468	4831	lowres.linkVerticesThis(null);
3469	4832	lowres.linkVerticesThis(sn);
3470		- CameraPane.RANDOM = random;
	4833	+ CameraPane.SWITCH = random;
3471	4834
3472	4835	System.err.flush();
3473	4836
..	..	@@ -3485,7 +4848,7 @@
3485	4848	// lowres.SaveSupports();
3486	4849	// par = lowres.parent;
3487	4850	// lowres.parent = null;
3488		-// Object3D newlow = (Object3D) GraphreeD.clone(lowres);
	4851	+// Object3D newlow = (Object3D) GrafreeD.clone(lowres);
3489	4852	Object3D newlow = CloneObject(lowres, false);
3490	4853	newlow.name = sn.switchobject.get(i).name;
3491	4854	System.out.println(" pose#" + i + " = " + newlow);
..	..	@@ -3507,7 +4870,7 @@
3507	4870	return;
3508	4871
3509	4872	Object3D poses = group.selection.get(0);
3510		- Object3D ref = GraphreeD.clipboard.get(0);
	4873	+ Object3D ref = Grafreed.clipboard.get(0);
3511	4874
3512	4875	Object3D newgroup = new Object3D("Po:" + poses.name);
3513	4876
..	..	@@ -3676,7 +5039,7 @@
3676	5039	group.selection.RelinkToSupport(); // july 2014
3677	5040	System.out.println("DONE.");
3678	5041	refreshContents();
3679		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	5042	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3680	5043	}
3681	5044
3682	5045	void ReduceMesh(boolean reduction34)
..	..	@@ -3701,20 +5064,20 @@
3701	5064
3702	5065	void ClipMesh()
3703	5066	{
3704		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	5067	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3705	5068	{
3706		- Object3D content = GraphreeD.clipboard.get(0);
	5069	+ Object3D content = Grafreed.clipboard.get(0);
3707	5070
3708	5071	if (content instanceof cGroup && ((cGroup)content).transientlink )
3709	5072	content = ((cGroup)content).get(0);
3710	5073
3711	5074	// for (int i=0; i<group.selection.size(); i++)
3712	5075	// {
3713		-// group.selection.get(i).ClipMesh(GraphreeD.clipboard);
	5076	+// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3714	5077	// }
3715		- group.selection.ClipMesh(GraphreeD.clipboard);
	5078	+ group.selection.ClipMesh(Grafreed.clipboard);
3716	5079	}
3717		-// group.selection.ClipMesh(GraphreeD.clipboard);
	5080	+// group.selection.ClipMesh(GrafreeD.clipboard);
3718	5081	System.out.println("DONE.");
3719	5082	refreshContents();
3720	5083	}
..	..	@@ -3759,6 +5122,18 @@
3759	5122	void MarkLeaves(boolean hide)
3760	5123	{
3761	5124	group.selection.MarkLeaves(hide);
	5125	+ refreshContents();
	5126	+ }
	5127	+
	5128	+ void RewindLeaves(boolean hide)
	5129	+ {
	5130	+ group.selection.RewindLeaves(hide);
	5131	+ refreshContents();
	5132	+ }
	5133	+
	5134	+ void RandomLeaves(boolean hide)
	5135	+ {
	5136	+ group.selection.RandomLeaves(hide);
3762	5137	refreshContents();
3763	5138	}
3764	5139
..	..	@@ -3833,28 +5208,25 @@
3833	5208	// }
3834	5209	// }
3835	5210
3836		- static boolean allparams = true;
3837		-
3838		- static Vector<Object3D> listUI = new Vector<Object3D>();
3839		-
3840	5211	void EditSelection(boolean newWindow)
3841	5212	{
	5213	+ if (group.selection == null)
	5214	+ {
	5215	+ EditElement(group, newWindow); // ? new
	5216	+ return;
	5217	+ }
	5218	+
3842	5219	// aConstraints.gridy = 0;
3843	5220	for (int i=0; i<group.selection.size(); i++)
3844	5221	{
3845	5222	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
3846	5223	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3847		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5224	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3848	5225
3849	5226	Object3D elem = (Object3D)group.selection.elementAt(i);
3850		- if(elem != group)
	5227	+ if(elem != group \|\| !newWindow)
3851	5228	{
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
	5229	+ EditElement(elem, newWindow); // ? new
3858	5230	}
3859	5231	}
3860	5232	}
..	..	@@ -3917,9 +5289,7 @@
3917	5289
3918	5290	freezemodel = false;
3919	5291	}
3920		-
3921		- boolean flashIt = true;
3922		-
	5292	+
3923	5293	public void valueChanged(TreeSelectionEvent e)
3924	5294	//public boolean handleEvent(Event event)
3925	5295	{
..	..	@@ -3929,7 +5299,8 @@
3929	5299	//new Exception().printStackTrace();
3930	5300
3931	5301	freezemodel = true;
3932		-
	5302	+ ClearUnpinned();
	5303	+
3933	5304	/**/
3934	5305	//switch (event.id)
3935	5306	{
..	..	@@ -3937,7 +5308,6 @@
3937	5308	//case 702: // Event.LIST_DESELECT
3938	5309	group.deselectAll();
3939	5310	TreePath tps[] = objEditor.jTree.getSelectionPaths();
3940		- objEditor.ClearInfo(); // .GetMaterial());
3941	5311	if (tps != null)
3942	5312	{
3943	5313	for (int i=0; i < tps.length; i++)
..	..	@@ -3946,33 +5316,39 @@
3946	5316
3947	5317	//if (child.parent != null)
3948	5318	//child.parent.addSelectee(child);
	5319	+ objEditor.SetMaterial(child);
3949	5320	group.addSelectee(child);
3950		- objEditor.SetMaterial(child); // .GetMaterial());
3951		- objEditor.AddInfo(child, this, true); // .GetMaterial());
3952		- System.err.println("info : " + child.GetPath());
3953	5321	}
3954	5322	}
3955		- else
3956		- {
3957		- objEditor.SetMaterial(group); // .GetMaterial());
3958		- objEditor.AddInfo(group, this, true); // .GetMaterial());
3959		- System.err.println("info : " + group.GetPath());
3960		- }
	5323	+// else
	5324	+// {
	5325	+// objEditor.SetMaterial(group); // .GetMaterial());
	5326	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	5327	+// System.err.println("info : " + group.GetPath());
	5328	+// }
3961	5329
3962		- objEditor.SetText(); // jan 2014
3963		-
3964		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	5330	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
3965	5331	CameraPane.flash = true;
3966	5332
3967		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5333	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
3968	5334	// a camera
3969	5335	{
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;
	5336	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5337	+ {
	5338	+ CameraPane.camerachangeframe = 0; // don't refuse it
	5339	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5340	+ }
	5341	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	5342	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
3974	5343	}
3975	5344
	5345	+ if (tps != null && tps.length == 1)
	5346	+ {
	5347	+ EditSelection(false);
	5348	+ }
	5349	+
	5350	+ SetPinStates(tps != null && tps.length > 0);
	5351	+
3976	5352	refreshContents();
3977	5353	//return true;
3978	5354	}
..	..	@@ -3981,6 +5357,52 @@
3981	5357
3982	5358	freezemodel = false;
3983	5359	}
	5360	+
	5361	+ void SetPinStates(boolean enabled)
	5362	+ {
	5363	+ editButton.setEnabled(enabled);
	5364	+ uneditButton.setEnabled(enabled);
	5365	+ //unselectButton.setEnabled(enabled);
	5366	+ flashSelectionButton.setEnabled(enabled);
	5367	+
	5368	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5369	+
	5370	+ boolean allComposites = true;
	5371	+
	5372	+ if (group.selection != null)
	5373	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5374	+ {
	5375	+ Object next = e.nextElement();
	5376	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5377	+ {
	5378	+ allComposites = false;
	5379	+ break;
	5380	+ }
	5381	+ }
	5382	+
	5383	+ rootButton.setEnabled(allComposites);
	5384	+ }
	5385	+
	5386	+ void refreshContents(boolean cp)
	5387	+ {
	5388	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5389	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5390	+ {
	5391	+ objEditor.ClearInfo(); // .GetMaterial());
	5392	+
	5393	+ for (int i=0; i < group.selection.Size(); i++)
	5394	+ {
	5395	+ Object3D child = (Object3D) group.selection.get(i);
	5396	+
	5397	+ objEditor.AddInfo(child, this, true);
	5398	+// System.err.println("info : " + child.GetPath());
	5399	+ }
	5400	+
	5401	+ objEditor.SetText(); // jan 2014
	5402	+ }
	5403	+
	5404	+ super.refreshContents(cp);
	5405	+ }
3984	5406
3985	5407	void linkSomething(Object3D thing)
3986	5408	{
..	..	@@ -4052,16 +5474,19 @@
4052	5474	{
4053	5475	if (group.selection.isEmpty())
4054	5476	return;
4055		- GraphreeD.clipboardIsTempGroup = false;
	5477	+
	5478	+ Grafreed.clipboardIsTempGroup = false;
4056	5479	Composite tGroup = null;
4057	5480	if (group.selection.size() > 0) // 1)
4058	5481	{
4059	5482	tGroup = new cGroup();
4060		- GraphreeD.clipboardIsTempGroup = true;
	5483	+ Grafreed.clipboardIsTempGroup = true;
4061	5484	}
4062	5485
4063	5486	if (cut)
4064	5487	{
	5488	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5489	+// Save();
4065	5490	//int indices[] = jList.getSelectedIndices();
4066	5491	//for (int i = indices.length - 1; i >= 0; i--)
4067	5492	//jList.remove(indices[i]);
..	..	@@ -4097,16 +5522,16 @@
4097	5522	//System.out.println("cut " + child);
4098	5523	//System.out.println("parent = " + child.parent);
4099	5524	// tmp.addChild(child);
4100		- if (GraphreeD.clipboardIsTempGroup)
	5525	+ if (Grafreed.clipboardIsTempGroup)
4101	5526	tGroup.add/Child/(tmp);
4102	5527	else
4103		- GraphreeD.clipboard = tmp;
	5528	+ Grafreed.clipboard = tmp;
4104	5529	}
4105	5530	else
4106		- if (GraphreeD.clipboardIsTempGroup)
	5531	+ if (Grafreed.clipboardIsTempGroup)
4107	5532	tGroup.add/Child/(child);
4108	5533	else
4109		- GraphreeD.clipboard = child;
	5534	+ Grafreed.clipboard = child;
4110	5535	}
4111	5536
4112	5537	//ResetModel();
..	..	@@ -4138,21 +5563,23 @@
4138	5563	//System.out.println("cut " + elem);
4139	5564	//System.out.println("parent = " + elem.parent);
4140	5565	// tmp.addChild(elem);
4141		- if (GraphreeD.clipboardIsTempGroup)
	5566	+ if (Grafreed.clipboardIsTempGroup)
4142	5567	tGroup.add/Child/(tmp);
4143	5568	else
4144		- GraphreeD.clipboard = tmp;
	5569	+ Grafreed.clipboard = tmp;
4145	5570	}
4146	5571	else
4147		- if (GraphreeD.clipboardIsTempGroup)
	5572	+ if (Grafreed.clipboardIsTempGroup)
4148	5573	tGroup.add/Child/(child);
4149	5574	else
4150		- GraphreeD.clipboard = child;
	5575	+ Grafreed.clipboard = child;
4151	5576	}
4152	5577
4153	5578	}
4154		- if (GraphreeD.clipboardIsTempGroup)
4155		- GraphreeD.clipboard = tGroup;
	5579	+
	5580	+ if (Grafreed.clipboardIsTempGroup)
	5581	+ Grafreed.clipboard = tGroup;
	5582	+
4156	5583	if (cut)
4157	5584	{
4158	5585	ResetModel();
..	..	@@ -4162,11 +5589,15 @@
4162	5589
4163	5590	void paste(boolean expand)
4164	5591	{
4165		- // if (GraphreeD.clipboard == null)
	5592	+ if (Globals.REPLACEONMAKE)
	5593	+ Save();
	5594	+ boolean keep = Globals.REPLACEONMAKE;
	5595	+ Globals.REPLACEONMAKE = false;
	5596	+ // if (GrafreeD.clipboard == null)
4166	5597	// return;
4167	5598	boolean first = true;
4168	5599
4169		- if (GraphreeD.clipboardIsTempGroup)
	5600	+ if (Grafreed.clipboardIsTempGroup)
4170	5601	{
4171	5602	Composite temp;
4172	5603
..	..	@@ -4177,7 +5608,7 @@
4177	5608	temp = (Composite)Applet3D.clipboard.deepCopy();
4178	5609	*/
4179	5610	Object3D elem;
4180		- for (Enumeration e = /temp.children/GraphreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5611	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4181	5612	{
4182	5613	Object3D child = (Object3D)e.nextElement();
4183	5614
..	..	@@ -4191,7 +5622,7 @@
4191	5622	else
4192	5623	elem = child.deepCopy(); // ?
4193	5624	child.parent = keepparent;
4194		- //if (GraphreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
	5625	+ //if (GrafreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
4195	5626	// elem = elem.get(0);
4196	5627	makeSomething(elem, true); // ?? first);
4197	5628	//group.addChild(elem);
..	..	@@ -4211,23 +5642,24 @@
4211	5642	//Object3D cb = Applet3D.clipboard;
4212	5643	//temp.addChild(cb);
4213	5644	//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());
	5645	+ assert(Grafreed.clipboard.parent == null);
	5646	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5647	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5648	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5649	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4219	5650	else
4220		- makeSomething(expand?GraphreeD.clipboard.copyExpand():GraphreeD.clipboard.deepCopy());
4221		- GraphreeD.clipboard.get(0).parent = keepparent;
	5651	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5652	+ Grafreed.clipboard.get(0).parent = keepparent;
4222	5653	}
4223	5654
	5655	+ Globals.REPLACEONMAKE = keep;
4224	5656	ResetModel();
4225	5657	refreshContents();
4226	5658	}
4227	5659
4228		- void pasteInto(boolean copyit)
	5660	+ void pasteInto(boolean copyit, boolean clone)
4229	5661	{
4230		-// if (GraphreeD.clipboard == null)
	5662	+// if (GrafreeD.clipboard == null)
4231	5663	// return;
4232	5664
4233	5665	if (group.selection.size() != 1)
..	..	@@ -4254,15 +5686,22 @@
4254	5686	if (copyit)
4255	5687	{
4256	5688	// paste(false);
4257		- CloneClipboard(false); // sept 2014
	5689	+ if (clone)
	5690	+ {
	5691	+ CloneClipboard(false); // sept 2014
	5692	+ }
	5693	+ else
	5694	+ {
	5695	+ paste(false);
	5696	+ }
4258	5697	}
4259	5698	else
4260	5699	{
4261	5700	boolean first = true;
4262	5701
4263		- if (GraphreeD.clipboardIsTempGroup)
	5702	+ if (Grafreed.clipboardIsTempGroup)
4264	5703	{
4265		- Composite temp = (Composite)GraphreeD.clipboard;
	5704	+ Composite temp = (Composite)Grafreed.clipboard;
4266	5705	Object3D copy;
4267	5706	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4268	5707	{
..	..	@@ -4272,7 +5711,7 @@
4272	5711	}
4273	5712	} else
4274	5713	{
4275		- linkSomething(GraphreeD.clipboard); //.get(0));
	5714	+ linkSomething(Grafreed.clipboard); //.get(0));
4276	5715	}
4277	5716	}
4278	5717	}
..	..	@@ -4349,6 +5788,10 @@
4349	5788
4350	5789	void group(Object3D csg, boolean grab)
4351	5790	{
	5791	+ if (Globals.REPLACEONMAKE)
	5792	+ Save();
	5793	+ boolean keep = Globals.REPLACEONMAKE;
	5794	+ Globals.REPLACEONMAKE = false;
4352	5795	if (//false) // why??
4353	5796	!group.selection.isEmpty())
4354	5797	{
..	..	@@ -4462,8 +5905,34 @@
4462	5905	//node.add(csg);
4463	5906	//makeSomething(node);
4464	5907	makeSomething(csg);
	5908	+ Globals.REPLACEONMAKE = keep;
4465	5909	}
4466	5910
	5911	+ void Ungroup(Object3D g)
	5912	+ {
	5913	+ if (Globals.REPLACEONMAKE)
	5914	+ Save();
	5915	+ boolean keep = Globals.REPLACEONMAKE;
	5916	+ Globals.REPLACEONMAKE = false;
	5917	+ if (g instanceof HiddenObject)
	5918	+ {
	5919	+ HiddenObject h = (HiddenObject) g;
	5920	+
	5921	+ for (int i=0; i<h.ActualSize(); i++)
	5922	+ {
	5923	+ objEditor.makeSomething(h.get(i), false);
	5924	+ }
	5925	+ }
	5926	+ else
	5927	+ {
	5928	+ for (int i=0; i<g.Size(); i++)
	5929	+ {
	5930	+ objEditor.makeSomething(g.get(i), false);
	5931	+ }
	5932	+ }
	5933	+ Globals.REPLACEONMAKE = keep;
	5934	+ }
	5935	+
4467	5936	void ungroup()
4468	5937	{
4469	5938	/*
..	..	@@ -4657,21 +6126,6 @@
4657	6126	}
4658	6127	*/
4659	6128
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	6129	/*
4676	6130	public void Callback(Object obj)
4677	6131	{
..	..	@@ -4695,26 +6149,9 @@
4695	6149	}
4696	6150	*/
4697	6151
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	6152	String GetFile(String dialogName)
4716	6153	{
4717		- if (GraphreeD.standAlone)
	6154	+ if (Grafreed.standAlone)
4718	6155	{
4719	6156	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4720	6157	browser.show();
..	..	@@ -4778,10 +6215,48 @@
4778	6215	cButton flashSelectionButton;
4779	6216	cButton editButton;
4780	6217	cButton uneditButton;
	6218	+ JCheckBox allParamsButton;
4781	6219	cButton clearpanelButton;
4782		- cButton allParamsButton;
4783	6220	cButton unselectButton;
4784	6221
	6222	+ cButton restoreCameraButton;
	6223	+
	6224	+ cButton oneStepButton;
	6225	+
	6226	+ cButton groupButton;
	6227	+ cButton ungroupButton;
	6228	+ cButton compositeButton;
	6229	+ cButton switchButton;
	6230	+ cButton loopButton;
	6231	+ cButton textureButton;
	6232	+
	6233	+ cButton skybox1Button;
	6234	+ cButton skybox2Button;
	6235	+ cButton skybox3Button;
	6236	+ cButton skybox4Button;
	6237	+ cButton skybox5Button;
	6238	+ cButton skybox6Button;
	6239	+ cButton skybox7Button;
	6240	+
	6241	+ cButton skybox11Button;
	6242	+ cButton skybox12Button;
	6243	+ cButton skybox13Button;
	6244	+ cButton skybox14Button;
	6245	+ cButton skybox15Button;
	6246	+ cButton skybox16Button;
	6247	+ cButton skybox17Button;
	6248	+
	6249	+ cButton gridButton;
	6250	+ cButton boxButton;
	6251	+ cButton sphereButton;
	6252	+ cButton coneButton;
	6253	+ cButton torusButton;
	6254	+ cButton superButton;
	6255	+ cButton kleinButton;
	6256	+ cButton particlesButton;
	6257	+ cButton overlayButton;
	6258	+ cButton lightButton;
	6259	+
4785	6260	cButton screenfitButton;
4786	6261	cButton screenfitpointButton;
4787	6262	cButton snapobjectButton;
..	..	@@ -4793,14 +6268,6 @@
4793	6268
4794	6269	cButton setsupportButton;
4795	6270
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	6271	//
4805	6272	//Composite
4806	6273	Object3D // to do !!
..	..	@@ -4810,10 +6277,12 @@
4810	6277	//JTree jTree;
4811	6278	private MenuItem lookAtItem;
4812	6279	private MenuItem lookFromItem;
4813		- private MenuItem switchItem;
4814		- private MenuItem cutItem;
4815		- private MenuItem duplicateItem;
4816		- private MenuItem cloneItem;
	6280	+ private MenuItem switchViewItem;
	6281	+ private JMenuItem cutItem;
	6282	+ private MenuItem undoItem;
	6283	+ private MenuItem redoItem;
	6284	+ private JMenuItem duplicateItem;
	6285	+ private JMenuItem cloneItem;
4817	6286	private MenuItem cloneSupportItem;
4818	6287	private MenuItem overwriteGeoItem;
4819	6288	private MenuItem overwriteMatItem;
..	..	@@ -4823,8 +6292,9 @@
4823	6292	private MenuItem resetsupportItem;
4824	6293	private MenuItem resetreferencesItem;
4825	6294	private MenuItem linkverticesItem;
	6295	+ private MenuItem relinkverticesItem;
4826	6296	private MenuItem setMasterItem;
4827		- private MenuItem resetMeshItem;
	6297	+ private MenuItem resetAllItem;
4828	6298	private MenuItem stepAllItem;
4829	6299	private MenuItem revertMeshItem;
4830	6300	private MenuItem poseMeshItem;
..	..	@@ -4833,16 +6303,19 @@
4833	6303	private MenuItem cloneGeometriesItem;
4834	6304	private MenuItem shareGeometriesItem;
4835	6305	private MenuItem mergeGeometriesItem;
4836		- private MenuItem copyItem;
	6306	+ private JMenuItem copyItem;
4837	6307	private MenuItem pasteItem;
4838		- private MenuItem pasteLinkItem;
4839		- private MenuItem pasteCloneItem;
4840		- private MenuItem pasteExpandItem;
4841		- private MenuItem clearItem;
	6308	+ private JMenuItem pasteIntoItem;
	6309	+ private JMenuItem pasteLinkItem;
	6310	+ private JMenuItem pasteCloneItem;
	6311	+ private JMenuItem pasteExpandItem;
	6312	+ private JMenuItem deleteItem;
4842	6313	private MenuItem clearAllItem;
4843	6314	private MenuItem genUVItem;
	6315	+ private MenuItem genNormalsMESHItem;
4844	6316	private MenuItem genNormalsCADItem;
4845	6317	private MenuItem genNormalsORGANItem;
	6318	+ private MenuItem genNormalsMINEItem;
4846	6319	private MenuItem stripifyItem;
4847	6320	private MenuItem unstripifyItem;
4848	6321	private MenuItem trimItem;
..	..	@@ -4871,6 +6344,10 @@
4871	6344	private MenuItem showleavesItem;
4872	6345	private MenuItem markleavesItem;
4873	6346	private MenuItem unmarkleavesItem;
	6347	+ private MenuItem rewindleavesItem;
	6348	+ private MenuItem unrewindleavesItem;
	6349	+ private MenuItem randomleavesItem;
	6350	+ private MenuItem unrandomleavesItem;
4874	6351
4875	6352	private MenuItem flipVItem;
4876	6353	private MenuItem unflipVItem;
..	..	@@ -4882,14 +6359,17 @@
4882	6359	private MenuItem panoTexturesItem;
4883	6360
4884	6361	private MenuItem resetCentroidItem;
4885		- private MenuItem transformgeometryItem;
	6362	+ private MenuItem resetCentroidXZItem;
4886	6363	private MenuItem resetTransformItem;
4887		- private MenuItem grabItem;
	6364	+ private MenuItem transformGeometryItem;
	6365	+ private MenuItem transformChildrenItem;
	6366	+ private MenuItem hideItem;
	6367	+ private JMenuItem grabItem;
4888	6368	private MenuItem backItem;
4889	6369	private MenuItem frontItem;
4890	6370	private MenuItem cameraItem;
4891	6371	private MenuItem compositeItem;
4892		- private MenuItem randomItem;
	6372	+ private MenuItem switchItem;
4893	6373	private MenuItem physicsItem;
4894	6374	private MenuItem frameselectorItem;
4895	6375	private MenuItem scriptNodeItem;
..	..	@@ -4897,13 +6377,14 @@
4897	6377	private MenuItem switchTransfoItem;
4898	6378	private MenuItem morphItem;
4899	6379	private MenuItem linkerItem;
4900		- private MenuItem ungroupItem;
	6380	+ private JMenuItem ungroupItem;
4901	6381	private MenuItem editItem;
4902	6382	private MenuItem openWindowItem;
4903	6383	private MenuItem editLeafItem;
4904	6384
4905	6385	private MenuItem resetParentItem;
4906	6386	private MenuItem repairParentItem;
	6387	+ private MenuItem repairShadowItem;
4907	6388	private MenuItem sortbysizeItem;
4908	6389	private MenuItem sortbynameItem;
4909	6390
..	..	@@ -4912,6 +6393,8 @@
4912	6393	private MenuItem attachBumpItem;
4913	6394	private MenuItem detachBumpItem;
4914	6395	private MenuItem pigmentBumpItem;
	6396	+ private MenuItem embedTexturesItem;
	6397	+ private MenuItem deEmbedTexturesItem;
4915	6398
4916	6399	private MenuItem particleItem;
4917	6400	private MenuItem ragdollItem;
..	..	@@ -4924,10 +6407,11 @@
4924	6407	private MenuItem coneItem;
4925	6408	private MenuItem torusItem;
4926	6409	private MenuItem superItem;
	6410	+ private MenuItem kleinItem;
4927	6411	private MenuItem blobItem;
4928	6412	private MenuItem latheItem;
4929	6413	private MenuItem bezierItem;
4930		- private MenuItem checkerItem;
	6414	+ private MenuItem overlayItem;
4931	6415	private MenuItem meshItem;
4932	6416	// private MenuItem meshGroupItem;
4933	6417	private MenuItem springItem;
..	..	@@ -4936,6 +6420,7 @@
4936	6420	private MenuItem csgItem;
4937	6421	private MenuItem templateItem;
4938	6422	private MenuItem textureItem;
	6423	+ private MenuItem billboardItem;
4939	6424	private MenuItem shadowXItem;
4940	6425	private MenuItem shadowYItem;
4941	6426	private MenuItem shadowZItem;
..	..	@@ -4948,11 +6433,6 @@
4948	6433	private MenuItem doubleItem;
4949	6434	private MenuItem tripleItem;
4950	6435
4951		- private MenuItem importGFDItem;
4952		- private MenuItem importVRMLX3DItem;
4953		- private MenuItem import3DSItem;
4954		- private MenuItem importOBJItem;
4955		-
4956	6436	private MenuItem computeAOItem;
4957	6437	private MenuItem recompileItem;
4958	6438	private MenuItem editScriptItem;
..	..	@@ -4962,4 +6442,8 @@
4962	6442	private MenuItem analyzeItem;
4963	6443	private MenuItem dumpItem;
4964	6444	//boolean freezemodel = false;
	6445	+
	6446	+ Menu cameraMenu;
	6447	+ MenuItem editCameraItem;
	6448	+ MenuItem restoreCameraItem;
4965	6449	}