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