~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -12,9 +12,11 @@
12	12	import com.jme.math.Vector3f;
13	13	import com.jme.renderer.ColorRGBA;
14	14
	15	+import grafeme.ui.*;
15	16	//import buoy.widget.BFileChooser;
16	17
17	18	class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
	19	+ Grafreed.iResourceCallBack,
18	20	ObjectUI,
19	21	Runnable,
20	22	ActionListener,
..	..	@@ -22,6 +24,360 @@
22	24	DragGestureListener, DragSourceListener, DropTargetListener,
23	25	ItemListener // ListSelectionListener
24	26	{
	27	+
	28	+ public void AddSkyboxButton(String f, String s, cGridBag row)
	29	+ {
	30	+ cButton skyboxButton;
	31	+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
	32	+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
	33	+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
	34	+ skyboxButton.setToolTipText(s.equals("") ? "No background" : s);
	35	+ skyboxButton.addActionListener(new ActionListener()
	36	+ {
	37	+ @Override
	38	+ public void actionPerformed(ActionEvent e)
	39	+ {
	40	+ ChangeSkybox(path);
	41	+ }
	42	+ });
	43	+ }
	44	+
	45	+ public void AddTextureButton(String f, String c, final String t, int count, cGridBag row)
	46	+ {
	47	+ cButton textureButton;
	48	+ final String path = "textures/" + f + "/" + c + "/"; // + t;
	49	+ row.add(textureButton = GetButton(path + "icons/" + t, !Grafreed.NIMBUSLAF));
	50	+ textureButton.setToolTipText(c + count);
	51	+ textureButton.addActionListener(new ActionListener()
	52	+ {
	53	+ @Override
	54	+ public void actionPerformed(ActionEvent e)
	55	+ {
	56	+ ChangeTexture(path + t);
	57	+ }
	58	+ });
	59	+ }
	60	+
	61	+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
	62	+ {
	63	+ cGridBag tab0 = new cGridBag().setVertical(true);
	64	+
	65	+ tab0.setName("Urban");
	66	+ skyboxpanel.add(tab0);
	67	+
	68	+ cGridBag row0 = new cGridBag();
	69	+ cGridBag row1 = new cGridBag();
	70	+ cGridBag row2 = new cGridBag();
	71	+ cGridBag row3 = new cGridBag();
	72	+ cGridBag row4 = new cGridBag();
	73	+ cGridBag row5 = new cGridBag();
	74	+ cGridBag row6 = new cGridBag();
	75	+
	76	+ AddSkyboxButton("default", "", row0);
	77	+ //AddSkyboxButton("default", "cornell", row0);
	78	+ AddSkyboxButton("penguins", "dust", row0);
	79	+ AddSkyboxButton("penguins", "tropic", row0);
	80	+ AddSkyboxButton("penguins", "yonder", row0);
	81	+
	82	+ AddSkyboxButton("default", "uffizi", row1);
	83	+ AddSkyboxButton("bridge", "Bridge", row1);
	84	+ AddSkyboxButton("bridge", "Bridge2", row1);
	85	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	86	+
	87	+ AddSkyboxButton("urban", "Parliament", row2);
	88	+ AddSkyboxButton("urban", "Roundabout", row2);
	89	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	90	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	91	+
	92	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	93	+ AddSkyboxButton("urban", "UnionSquare", row3);
	94	+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
	95	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	96	+
	97	+ AddSkyboxButton("park", "Buddha", row4);
	98	+ AddSkyboxButton("park", "CNTower2", row4);
	99	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	100	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	101	+
	102	+ AddSkyboxButton("park", "Park", row5);
	103	+ AddSkyboxButton("park", "Pond", row5);
	104	+ AddSkyboxButton("park", "Skansen", row5);
	105	+ AddSkyboxButton("park", "Skansen2", row5);
	106	+
	107	+ AddSkyboxButton("park", "Skansen3", row6);
	108	+ AddSkyboxButton("park", "Skansen4", row6);
	109	+ AddSkyboxButton("park", "Skansen5", row6);
	110	+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
	111	+
	112	+ tab0.add(row0);
	113	+ tab0.add(row1);
	114	+ tab0.add(row2);
	115	+ tab0.add(row3);
	116	+ tab0.add(row4);
	117	+ tab0.add(row5);
	118	+ tab0.add(row6);
	119	+
	120	+ for (int i=5; --i>=0;)
	121	+ {
	122	+ //oe.toolboxPanel.Return();
	123	+ //tab0.add(new cGridBag());
	124	+ }
	125	+ }
	126	+
	127	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	128	+ {
	129	+ cGridBag tab0 = new cGridBag().setVertical(true);
	130	+
	131	+ tab0.setName("Nature");
	132	+ skyboxpanel.add(tab0);
	133	+
	134	+ cGridBag row0 = new cGridBag();
	135	+ cGridBag row1 = new cGridBag();
	136	+ cGridBag row2 = new cGridBag();
	137	+ cGridBag row3 = new cGridBag();
	138	+ cGridBag row4 = new cGridBag();
	139	+ cGridBag row5 = new cGridBag();
	140	+ cGridBag row6 = new cGridBag();
	141	+
	142	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	143	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	144	+ AddSkyboxButton("beach", "PalmTrees", row0);
	145	+ AddSkyboxButton("beach", "Tenerife", row0);
	146	+
	147	+ AddSkyboxButton("beach", "Tenerife2", row1);
	148	+ AddSkyboxButton("beach", "Tenerife3", row1);
	149	+ AddSkyboxButton("field", "FishPond", row1);
	150	+ AddSkyboxButton("field", "Footballfield", row1);
	151	+
	152	+ AddSkyboxButton("field", "Meadow", row2);
	153	+ AddSkyboxButton("field", "Sorsele", row2);
	154	+ AddSkyboxButton("field", "Sorsele2", row2);
	155	+ AddSkyboxButton("field", "Sorsele3", row2);
	156	+
	157	+ AddSkyboxButton("forest", "Brudslojan", row3);
	158	+ AddSkyboxButton("forest", "Langholmen2", row3);
	159	+ AddSkyboxButton("forest", "Plants", row3);
	160	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	161	+
	162	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	163	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	164	+ AddSkyboxButton("mountain", "Teide", row4);
	165	+ AddSkyboxButton("park", "Tantolunden4", row4);
	166	+
	167	+ AddSkyboxButton("park", "Stairs", row5);
	168	+ AddSkyboxButton("default", "skycube", row6);
	169	+ AddSkyboxButton("rocky", "Langholmen", row5);
	170	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	171	+
	172	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	173	+ AddSkyboxButton("default", "CloudyHills", row6);
	174	+ AddSkyboxButton("daz", "Autumn", row6);
	175	+ AddSkyboxButton("daz", "MountainTrail", row6);
	176	+ /*
	177	+Autumn
	178	+Greenlands
	179	+MountainTrail
	180	+Oasis
	181	+TheRock
	182	+TopOfTheWorld
	183	+Winter
	184	+ */
	185	+
	186	+ tab0.add(row0);
	187	+ tab0.add(row1);
	188	+ tab0.add(row2);
	189	+ tab0.add(row3);
	190	+ tab0.add(row4);
	191	+ tab0.add(row5);
	192	+ tab0.add(row6);
	193	+
	194	+ for (int i=5; --i>=0;)
	195	+ {
	196	+ //oe.toolboxPanel.Return();
	197	+ //tab0.add(new cGridBag());
	198	+ }
	199	+ }
	200	+
	201	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	202	+ {
	203	+ cGridBag tab0 = new cGridBag().setVertical(true);
	204	+
	205	+ tab0.setName("Night");
	206	+ skyboxpanel.add(tab0);
	207	+
	208	+ cGridBag row0 = new cGridBag();
	209	+ cGridBag row1 = new cGridBag();
	210	+ cGridBag row2 = new cGridBag();
	211	+ cGridBag row3 = new cGridBag();
	212	+ cGridBag row4 = new cGridBag();
	213	+ cGridBag row5 = new cGridBag();
	214	+ cGridBag row6 = new cGridBag();
	215	+
	216	+ AddSkyboxButton("night", "NightPath", row0);
	217	+ AddSkyboxButton("night", "PondNight", row0);
	218	+ AddSkyboxButton("night", "Powerlines", row0);
	219	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	220	+
	221	+ AddSkyboxButton("urban", "CNTower", row1);
	222	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	223	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	224	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
	225	+
	226	+ AddSkyboxButton("penguins", "kenon_star", row2);
	227	+ AddSkyboxButton("persson", "corona", row2);
	228	+ AddSkyboxButton("persson", "spaceskybox", row2);
	229	+ AddSkyboxButton("indoors", "Vasa", row2);
	230	+
	231	+ AddSkyboxButton("winter", "Backyard", row3);
	232	+ AddSkyboxButton("winter", "Creek", row3);
	233	+ AddSkyboxButton("winter", "FootballField3", row3);
	234	+ AddSkyboxButton("winter", "Forest", row3);
	235	+
	236	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	237	+ AddSkyboxButton("winter", "House", row4);
	238	+ AddSkyboxButton("winter", "IceLake", row4);
	239	+ AddSkyboxButton("winter", "IceRiver", row4);
	240	+
	241	+ AddSkyboxButton("winter", "Park3", row5);
	242	+ AddSkyboxButton("winter", "PondWinter", row5);
	243	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	244	+ AddSkyboxButton("winter", "Vindelalven", row5);
	245	+
	246	+ AddSkyboxButton("daz", "TheRock", row6);
	247	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	248	+ AddSkyboxButton("daz", "Winter", row6);
	249	+ AddSkyboxButton("mountain", "Ryfjallet", row6);
	250	+
	251	+ tab0.add(row0);
	252	+ tab0.add(row1);
	253	+ tab0.add(row2);
	254	+ tab0.add(row3);
	255	+ tab0.add(row4);
	256	+ tab0.add(row5);
	257	+ tab0.add(row6);
	258	+
	259	+ for (int i=5; --i>=0;)
	260	+ {
	261	+ //oe.toolboxPanel.Return();
	262	+ //tab0.add(new cGridBag());
	263	+ }
	264	+ }
	265	+
	266	+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
	267	+ {
	268	+ cGridBag tab0 = new cGridBag().setVertical(true);
	269	+
	270	+ tab0.setName("Others");
	271	+ skyboxpanel.add(tab0);
	272	+
	273	+ cGridBag row0 = new cGridBag();
	274	+ cGridBag row1 = new cGridBag();
	275	+ cGridBag row2 = new cGridBag();
	276	+ cGridBag row3 = new cGridBag();
	277	+ cGridBag row4 = new cGridBag();
	278	+ cGridBag row5 = new cGridBag();
	279	+ cGridBag row6 = new cGridBag();
	280	+
	281	+ AddSkyboxButton("mayhem", "afterrain", row0);
	282	+ AddSkyboxButton("mayhem", "aqua4", row0);
	283	+ AddSkyboxButton("mayhem", "aqua9", row0);
	284	+ AddSkyboxButton("mayhem", "flame", row0);
	285	+
	286	+ AddSkyboxButton("mayhem", "h2s", row1);
	287	+ AddSkyboxButton("mayhem", "prehistoric", row1);
	288	+ AddSkyboxButton("mayhem", "scorched", row1);
	289	+ AddSkyboxButton("penguins", "desertdawn", row1);
	290	+
	291	+ AddSkyboxButton("persson", "Citadella", row2);
	292	+ AddSkyboxButton("persson", "Citadella2", row2);
	293	+ AddSkyboxButton("persson", "clouds1", row2);
	294	+ AddSkyboxButton("penguins", "wrath", row2);
	295	+
	296	+ AddSkyboxButton("persson", "FishermansBastion", row3);
	297	+ AddSkyboxButton("persson", "HeroesSquare", row3);
	298	+ AddSkyboxButton("indoors", "DallasW", row3);
	299	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
	300	+
	301	+ AddSkyboxButton("persson", "LancellottiChapel", row4);
	302	+ AddSkyboxButton("persson", "PereaBeach1", row4);
	303	+ AddSkyboxButton("persson", "PereaBeach2", row4);
	304	+ AddSkyboxButton("persson", "redeclipse", row4);
	305	+
	306	+ AddSkyboxButton("daz", "Greenlands", row5);
	307	+ AddSkyboxButton("daz", "Oasis", row5);
	308	+ AddSkyboxButton("elyvisions", "arch3", row5);
	309	+ AddSkyboxButton("elyvisions", "calm_sea", row5);
	310	+
	311	+ AddSkyboxButton("elyvisions", "rainbow", row6);
	312	+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
	313	+ AddSkyboxButton("elyvisions", "heaven", row6);
	314	+ AddSkyboxButton("elyvisions", "hot", row6);
	315	+
	316	+ tab0.add(row0);
	317	+ tab0.add(row1);
	318	+ tab0.add(row2);
	319	+ tab0.add(row3);
	320	+ tab0.add(row4);
	321	+ tab0.add(row5);
	322	+ tab0.add(row6);
	323	+
	324	+ for (int i=5; --i>=0;)
	325	+ {
	326	+ //oe.toolboxPanel.Return();
	327	+ //tab0.add(new cGridBag());
	328	+ }
	329	+ }
	330	+
	331	+ public void ChangeSkybox(String skybox)
	332	+ {
	333	+ if (skybox.endsWith("/"))
	334	+ {
	335	+ group.skyboxname = null;
	336	+ group.skyboxext = null;
	337	+ cameraView.repaint();
	338	+ }
	339	+ else
	340	+ {
	341	+ //cameraView.envyoff = false;
	342	+ group.skyboxname = skybox;
	343	+ group.skyboxext = "jpg";
	344	+ cameraView.repaint();
	345	+ }
	346	+ }
	347	+
	348	+ public void CreateSkyboxPanel(cGridBag skyboxPanel)
	349	+ {
	350	+ JTabbedPane skyboxpane = new JTabbedPane();
	351	+
	352	+ AddSkyboxTab0(skyboxpane);
	353	+ AddSkyboxTab1(skyboxpane);
	354	+ AddSkyboxTab2(skyboxpane);
	355	+ AddSkyboxTab3(skyboxpane);
	356	+
	357	+ skyboxPanel.add(skyboxpane);
	358	+ }
	359	+
	360	+ public void ChangeTexture(String texture)
	361	+ {
	362	+ for (int i=0; i<group.selection.size(); i++)
	363	+ {
	364	+ Object3D obj = group.selection.get(i);
	365	+ obj.SetPigmentTexture("@" + texture);
	366	+ }
	367	+
	368	+ refreshContents();
	369	+ }
	370	+
	371	+ public void Show3DView()
	372	+ {
	373	+ // bug
	374	+ //gridPanel.setDividerLocation(1.0);
	375	+ //bigPanel.setDividerLocation(0.0);
	376	+ bigThree.ClearUI();
	377	+ bigThree.add(centralPanel);
	378	+ bigThree.FlushUI();
	379	+ }
	380	+
25	381	//ObjEditor objEditor;
26	382	public void closeUI2()
27	383	{
..	..	@@ -59,6 +415,14 @@
59	415	this.copy = this.group = group;
60	416	//selectees = this.group.selectees;
61	417
	418	+ if (copy.versionlist == null)
	419	+ {
	420	+ copy.versionlist = new Object3D[100];
	421	+ copy.versionindex = -1;
	422	+
	423	+ Save(true);
	424	+ }
	425	+
62	426	if(ui)
63	427	SetupUI(objEditor);
64	428	}
..	..	@@ -73,16 +437,28 @@
73	437	this.copy = this.group = copy;
74	438	//selectees = this.group.selectees;
75	439
76		- SetupMenu2(objEditor);
	440	+ SetupMenu2(this); //objEditor);
77	441	SetupUI2(objEditor);
78	442	objEditor.SetupUI(true);
79	443	SetupViews(objEditor);
80	444
81	445	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	446	+
	447	+ if (copy.versionlist == null)
	448	+ {
	449	+ copy.versionlist = new Object3D[100];
	450	+ copy.versionindex = -1;
	451	+
	452	+ Save(true);
	453	+ }
82	454	}
83	455
84	456	void CloneSelection(boolean supports)
85	457	{
	458	+ if (Globals.REPLACEONMAKE)
	459	+ Save();
	460	+ boolean keep = Globals.REPLACEONMAKE;
	461	+ Globals.REPLACEONMAKE = false;
86	462	// Object3D keep = GrafreeD.clipboard;
87	463	//Object3D obj;
88	464	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -93,18 +469,19 @@
93	469
94	470	makeSomething(clone, i==group.selection.size()-1);
95	471	}
	472	+ Globals.REPLACEONMAKE = keep;
96	473	}
97	474
98	475	void CloneClipboard(boolean supports)
99	476	{
100		- assert(GrafreeD.clipboard.parent == null);
101		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
102		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
103		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
104		- makeSomething(CloneObject(GrafreeD.clipboard.get(0), false));
	477	+ assert(Grafreed.clipboard.parent == null);
	478	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	479	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	480	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	481	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
105	482	else
106		- makeSomething(CloneObject(GrafreeD.clipboard, false));
107		- GrafreeD.clipboard.get(0).parent = keepparent;
	483	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	484	+ Grafreed.clipboard.get(0).parent = keepparent;
108	485	}
109	486
110	487	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -118,7 +495,7 @@
118	495	// obj.support = null;
119	496	if (!supports)
120	497	obj.SaveSupports();
121		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	498	+ Object3D clone = (Object3D)Grafreed.clone(obj);
122	499	obj.parent = parent;
123	500	// obj.support = support;
124	501	// clone.support = support; // aout 2013
..	..	@@ -147,58 +524,153 @@
147	524
148	525	//JTextField nameField;
149	526
150		- void SetupMenu2(ObjEditor oe)
	527	+ void SetupMenu2(GroupEditor oe)
151	528	{
152		- oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
153		- //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
154		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
155		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
156		- oe.cameraMenu.add("-");
157		- openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
158		- openWindowItem.addActionListener(this);
159		- editLeafItem.addActionListener(this);
160		- lookAtItem.addActionListener(this);
161		- //lookFromItem.addActinoListener(this);
162		- //switchItem.addActionListener(this);
	529	+ oe.jTree = new cTree();
	530	+
163	531	Menu menu;
164	532	oe.menuBar.add(menu = new Menu("Edit"));
165	533	//editItem = menu.add(new MenuItem("Edit"));
166	534	//editItem.addActionListener(this);
167		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	535	+
	536	+// undoItem = menu.add(new MenuItem("Undo"));
	537	+// undoItem.addActionListener(this);
	538	+// redoItem = menu.add(new MenuItem("Redo"));
	539	+// redoItem.addActionListener(this);
	540	+// menu.add("-");
	541	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
168	542	duplicateItem.addActionListener(this);
169		- menu.add("-");
170		- cloneItem = menu.add(new MenuItem("Clone"));
	543	+
	544	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
171	545	cloneItem.addActionListener(this);
	546	+ //if (Globals.ADVANCED)
	547	+ {
172	548	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
173	549	cloneSupportItem.addActionListener(this);
	550	+ }
	551	+ oe.jTree.popup.addSeparator();
174	552	menu.add("-");
175		- cutItem = menu.add(new MenuItem("Cut"));
	553	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
176	554	cutItem.addActionListener(this);
177		- copyItem = menu.add(new MenuItem("Copy"));
	555	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
178	556	copyItem.addActionListener(this);
179	557	pasteItem = menu.add(new MenuItem("Paste"));
180	558	pasteItem.addActionListener(this);
181		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	559	+
	560	+ oe.jTree.popup.addSeparator();
	561	+ //menu.add("-");
	562	+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
	563	+ pasteIntoItem.addActionListener(this);
	564	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
182	565	pasteLinkItem.addActionListener(this);
183		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	566	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
184	567	pasteCloneItem.addActionListener(this);
185		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	568	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
186	569	// pasteExpandItem.addActionListener(this);
187		- clearItem = menu.add(new MenuItem("Clear"));
188		- clearItem.addActionListener(this);
	570	+ //menu.add("-");
	571	+ oe.jTree.popup.addSeparator();
	572	+
	573	+ if (Globals.ADVANCED)
	574	+ {
	575	+ // Deletes the cameras...
189	576	clearAllItem = menu.add(new MenuItem("Clear All"));
190	577	clearAllItem.addActionListener(this);
	578	+ }
	579	+
	580	+ menuBar.add(cameraMenu = new Menu("View"));
	581	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	582	+ //zBufferItem.addActionListener(this);
	583	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	584	+ //normalLensItem.addActionListener(this);
	585	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	586	+ restoreCameraItem.addActionListener(this);
	587	+
	588	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	589	+// toggleFullScreenItem.addItemListener(this);
	590	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	591	+// cameraMenu.add("-");
	592	+//
	593	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	594	+// toggleTextureItem.addItemListener(this);
	595	+// toggleTextureItem.setState(CameraPane.textureon);
	596	+//
	597	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	598	+// toggleSwitchItem.addItemListener(this);
	599	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	600	+
	601	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	602	+ toggleHandleItem.addItemListener(this);
	603	+ toggleHandleItem.setState(CameraPane.HANDLES);
	604	+
	605	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	606	+ togglePaintItem.addItemListener(this);
	607	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	608	+
	609	+ if (Globals.ADVANCED)
	610	+ {
	611	+ cameraMenu.add("-");
	612	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	613	+ toggleLiveItem.addItemListener(this);
	614	+ toggleLiveItem.setState(Globals.isLIVE());
191	615
	616	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	617	+ stepItem.addActionListener(this);
	618	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	619	+ // toggleDLItem.addItemListener(this);
	620	+ // toggleDLItem.setState(false);
	621	+
	622	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	623	+ toggleRenderItem.addItemListener(this);
	624	+ toggleRenderItem.setState(!CameraPane.frozen);
	625	+
	626	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	627	+ toggleDebugItem.addItemListener(this);
	628	+ toggleDebugItem.setState(Globals.DEBUG);
	629	+
	630	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	631	+ toggleFrustumItem.addItemListener(this);
	632	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	633	+
	634	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	635	+ toggleFootContactItem.addItemListener(this);
	636	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	637	+
	638	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	639	+ toggleTimelineItem.addItemListener(this);
	640	+ }
	641	+
	642	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	643	+// toggleRootItem.addItemListener(this);
	644	+// toggleRootItem.setState(false);
	645	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	646	+// animationItem.addItemListener(this);
	647	+// animationItem.setState(CameraPane.ANIMATION);
	648	+ cameraMenu.add("-");
	649	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	650	+ editCameraItem.addActionListener(this);
	651	+
	652	+ if (Globals.ADVANCED)
	653	+ {
	654	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	655	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	656	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	657	+ oe.cameraMenu.add("-");
	658	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	659	+ openWindowItem.addActionListener(this);
	660	+ lookAtItem.addActionListener(this);
	661	+ //lookFromItem.addActinoListener(this);
	662	+ //switchViewItem.addActionListener(this);
	663	+ }
	664	+
192	665	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);
	666	+ if (Globals.ADVANCED)
	667	+ {
197	668	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
198	669	revertMeshItem.addActionListener(this);
199	670	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
200	671	resetreferencesItem.addActionListener(this);
201	672	menu.add("-");
	673	+ }
202	674	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
203	675	overwriteGeoItem.addActionListener(this);
204	676	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -210,79 +682,111 @@
210	682	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211	683	overwriteUVItem.addActionListener(this);
212	684	menu.add("-");
	685	+ if (Globals.ADVANCED)
	686	+ {
213	687	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214	688	generateMeshItem.addActionListener(this);
215	689	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216	690	poseMeshItem.addActionListener(this);
217	691	menu.add("-");
	692	+ }
218	693	resetsupportItem = menu.add(new MenuItem("Reset support"));
219	694	resetsupportItem.addActionListener(this);
220	695	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	696	linkverticesItem.addActionListener(this);
222	697	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
223	698	relinkverticesItem.addActionListener(this);
	699	+
	700	+ if (Globals.ADVANCED)
	701	+ {
224	702	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
225	703	setMasterItem.addActionListener(this);
	704	+ }
226	705
227		- oe.menuBar.add(menu = new Menu("Group"));
228		- grabItem = menu.add(new MenuItem("Grab"));
229		- grabItem.addActionListener(this);
	706	+ oe.menuBar.add(menu = new Menu("Order"));
	707	+
230	708	backItem = menu.add(new MenuItem("Back"));
231	709	backItem.addActionListener(this);
232	710	frontItem = menu.add(new MenuItem("Front"));
233	711	frontItem.addActionListener(this);
234		- compositeItem = menu.add(new MenuItem("Composite"));
235		- compositeItem.addActionListener(this);
236		- hideItem = menu.add(new MenuItem("Hide"));
	712	+// compositeItem = menu.add(new MenuItem("Composite"));
	713	+// compositeItem.addActionListener(this);
	714	+
	715	+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
	716	+ grabItem.addActionListener(this);
	717	+
	718	+ if (Globals.ADVANCED)
	719	+ {
	720	+ hideItem = menu.add(new MenuItem("Hidden Group"));
237	721	hideItem.addActionListener(this);
238		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	722	+ }
	723	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
239	724	ungroupItem.addActionListener(this);
240		- menu.add("-");
241		- randomItem = menu.add(new MenuItem("Random"));
242		- randomItem.addActionListener(this);
243		- physicsItem = menu.add(new MenuItem("Physics"));
244		- physicsItem.addActionListener(this);
245		- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
246		- frameselectorItem.addActionListener(this);
	725	+
	726	+ oe.jTree.popup.addSeparator();
	727	+
	728	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	729	+ deleteItem.addActionListener(this);
	730	+
	731	+// menu.add("-");
	732	+//
	733	+// switchItem = menu.add(new MenuItem("Switch node"));
	734	+// switchItem.addActionListener(this);
	735	+ if (Globals.ADVANCED)
	736	+ {
247	737	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
248	738	switchGeoItem.addActionListener(this);
249	739	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
250	740	switchTransfoItem.addActionListener(this);
251		- morphItem = menu.add(new MenuItem("Morph"));
	741	+ morphItem = menu.add(new MenuItem("Morph Group"));
252	742	morphItem.addActionListener(this);
	743	+
	744	+ menu.add("-");
	745	+ physicsItem = menu.add(new MenuItem("Physics"));
	746	+ physicsItem.addActionListener(this);
	747	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	748	+ frameselectorItem.addActionListener(this);
253	749	scriptNodeItem = menu.add(new MenuItem("Script Node"));
254	750	scriptNodeItem.addActionListener(this);
255		- cameraItem = menu.add(new MenuItem("Camera"));
256		- cameraItem.addActionListener(this);
	751	+ }
257	752
258	753	oe.menuBar.add(menu = new Menu("Object"));
259		- textureItem = menu.add(new MenuItem("Texture"));
260		- textureItem.addActionListener(this);
	754	+// textureItem = menu.add(new MenuItem("Texture"));
	755	+// textureItem.addActionListener(this);
261	756	billboardItem = menu.add(new MenuItem("Billboard"));
262	757	billboardItem.addActionListener(this);
263	758	csgItem = menu.add(new MenuItem("CSG"));
264	759	csgItem.addActionListener(this);
265		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	760	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
266	761	shadowXItem.addActionListener(this);
267		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	762	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
268	763	shadowYItem.addActionListener(this);
269		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	764	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
270	765	shadowZItem.addActionListener(this);
	766	+ attributeItem = menu.add(new MenuItem("Attribute"));
	767	+ attributeItem.addActionListener(this);
	768	+
	769	+ if (Globals.ADVANCED)
	770	+ {
	771	+ menu.add("-");
271	772	linkerItem = menu.add(new MenuItem("Linker"));
272	773	linkerItem.addActionListener(this);
273	774	templateItem = menu.add(new MenuItem("Template"));
274	775	templateItem.addActionListener(this);
275		- attributeItem = menu.add(new MenuItem("Attribute"));
276		- attributeItem.addActionListener(this);
277	776	pointflowItem = menu.add(new MenuItem("Point Flow"));
278	777	pointflowItem.addActionListener(this);
	778	+ }
279	779	menu.add("-");
280	780	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
281	781	resetTransformItem.addActionListener(this);
282	782	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
283	783	resetCentroidItem.addActionListener(this);
284		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
285		- transformgeometryItem.addActionListener(this);
	784	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	785	+ resetCentroidXZItem.addActionListener(this);
	786	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	787	+ transformGeometryItem.addActionListener(this);
	788	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	789	+ transformChildrenItem.addActionListener(this);
286	790
287	791	oe.menuBar.add(menu = new Menu("Geometry"));
288	792	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -293,8 +797,11 @@
293	797	genNormalsCADItem.addActionListener(this);
294	798	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
295	799	genNormalsMESHItem.addActionListener(this);
296		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	800	+ if (Globals.ADVANCED)
	801	+ {
	802	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
297	803	genNormalsMINEItem.addActionListener(this);
	804	+ }
298	805	stripifyItem = menu.add(new MenuItem("Stripify"));
299	806	stripifyItem.addActionListener(this);
300	807	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -316,23 +823,34 @@
316	823	reduce34MeshItem.addActionListener(this);
317	824	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
318	825	increaseMeshItem.addActionListener(this);
319		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
320		- smoothMeshItem.addActionListener(this);
321	826	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
322	827	clipMeshItem.addActionListener(this);
	828	+
	829	+ if (Globals.ADVANCED)
	830	+ {
	831	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	832	+ smoothMeshItem.addActionListener(this);
	833	+ }
323	834
324	835	oe.menuBar.add(menu = new Menu("Attributes"));
325	836	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
326	837	clearMaterialsItem.addActionListener(this);
	838	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	839	+ resetAllItem.addActionListener(this);
	840	+ stepAllItem = menu.add(new MenuItem("Step All"));
	841	+ stepAllItem.addActionListener(this);
327	842	menu.add("-");
328	843	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
329	844	liveleavesItem.addActionListener(this);
330	845	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
331	846	unliveleavesItem.addActionListener(this);
	847	+ if (Globals.ADVANCED)
	848	+ {
332	849	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
333	850	supportleavesItem.addActionListener(this);
334	851	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
335	852	unsupportleavesItem.addActionListener(this);
	853	+ }
336	854	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
337	855	hideleavesItem.addActionListener(this);
338	856	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -341,6 +859,14 @@
341	859	markleavesItem.addActionListener(this);
342	860	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
343	861	unmarkleavesItem.addActionListener(this);
	862	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	863	+ rewindleavesItem.addActionListener(this);
	864	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	865	+ unrewindleavesItem.addActionListener(this);
	866	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	867	+ randomleavesItem.addActionListener(this);
	868	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	869	+ unrandomleavesItem.addActionListener(this);
344	870	menu.add("-");
345	871	flipVItem = menu.add(new MenuItem("Flip V"));
346	872	flipVItem.addActionListener(this);
..	..	@@ -366,53 +892,130 @@
366	892	attachBumpItem.addActionListener(this);
367	893	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
368	894	pigmentBumpItem.addActionListener(this);
	895	+ //embedTexturesItem
369	896	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
370	897	detachPigmentItem.addActionListener(this);
371	898	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
372	899	detachBumpItem.addActionListener(this);
	900	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	901	+ embedTexturesItem.addActionListener(this);
	902	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	903	+ deEmbedTexturesItem.addActionListener(this);
373	904	menu.add("-");
374	905	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
375	906	sortbysizeItem.addActionListener(this);
376	907	sortbynameItem = menu.add(new MenuItem("Sort by name"));
377	908	sortbynameItem.addActionListener(this);
378	909	menu.add("-");
	910	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	911	+ shareGeometriesItem.addActionListener(this);
	912	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	913	+ mergeGeometriesItem.addActionListener(this);
	914	+ menu.add("-");
	915	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	916	+ editLeafItem.addActionListener(this);
	917	+ if (Globals.ADVANCED)
	918	+ {
	919	+ // Pretty much the same as duplicate and clone.
379	920	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
380	921	extractGeometriesItem.addActionListener(this);
381	922	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
382	923	cloneGeometriesItem.addActionListener(this);
383		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
384		- shareGeometriesItem.addActionListener(this);
385		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
386		- mergeGeometriesItem.addActionListener(this);
	924	+ }
387	925
388	926	oe.menuBar.add(menu = new Menu("Insert"));
389	927	buildCreateMenu(menu);
390	928
391		-
392		- oe.menuBar.add(menu = new Menu("Include"));
393		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
394		- importGFDItem.addActionListener(this);
395		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
396		- importVRMLX3DItem.addActionListener(this);
397		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
398		- importOBJItem.addActionListener(this);
399		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
400		- import3DSItem.addActionListener(this);
401		-
402	929	oe.menuBar.add(menu = new Menu("Tools"));
403	930	buildToolsMenu(menu);
404	931	}
405	932
	933	+ JTabbedPane resourcecontainer;
	934	+ cGridBag currenttab;
	935	+ //boolean added; // patch for jar
	936	+
	937	+ int tabcount = 0;
	938	+ int colcount = 0;
	939	+ int rowcount = 0;
	940	+ int texturecount = 0;
	941	+
	942	+ int columns = 5;
	943	+ int rows = 7;
	944	+
	945	+ public void ResourceCallBack(String[] path)
	946	+ {
	947	+// for (int i = 0; i < path.length; i++)
	948	+// System.out.print(path[i] + "/");
	949	+// System.out.println();
	950	+
	951	+ if (//rowcount == 0 \|\|
	952	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	953	+ {
	954	+ currenttab = new cGridBag();
	955	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	956	+ currenttab.setName(tabname);
	957	+ //added = false;
	958	+ resourcecontainer.add(currenttab);
	959	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	960	+ rowcount = 1;
	961	+ colcount = 0;
	962	+ texturecount = 0;
	963	+ }
	964	+
	965	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	966	+ {
	967	+ //if (!added)
	968	+ {
	969	+ //added = true;
	970	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	971	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	972	+ }
	973	+
	974	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	975	+
	976	+ if (++colcount >= columns)
	977	+ {
	978	+ colcount = 0;
	979	+ currenttab.Return();
	980	+
	981	+ if (rowcount++ >= rows)
	982	+ {
	983	+ rowcount = 0;
	984	+ }
	985	+ }
	986	+ }
	987	+ else
	988	+ {
	989	+// if (!path[path.length-1].equals("icons"))
	990	+// resourcecontainer.Return();
	991	+ }
	992	+ }
	993	+
	994	+ void CreateTexturePanel(cGridBag container)
	995	+ {
	996	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	997	+ container.add(resourcecontainer);
	998	+
	999	+ Grafreed.ParseResources("textures", this);
	1000	+ }
	1001	+
406	1002	void SetupUI2(ObjEditor oe)
407	1003	{
	1004	+ // June 2019
	1005	+ if (oe == null)
	1006	+ {
	1007	+ //super.SetupUI2(this);
	1008	+ //return;
	1009	+ }
	1010	+
	1011	+ if (copy != group)
	1012	+ {
	1013	+ //super.SetupUI2(this);
	1014	+ }
	1015	+
408	1016	//new Exception().printStackTrace();
409	1017
410	1018	oe.radioPanel = new JPanel(new GridBagLayout());
411		- oe.aConstraints.weightx = 1;
412		- oe.aConstraints.weighty = 0;
413		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
414		- oe.aConstraints.gridwidth = 100;
415		- oe.aConstraints.gridheight = 1;
416	1019	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
417	1020
418	1021	oe.buttonGroup = new ButtonGroup();
..	..	@@ -433,150 +1036,263 @@
433	1036	oe.radioPanel.add(dummyButton);
434	1037	oe.buttonGroup.add(dummyButton);
435	1038	*/
436		- aConstraints.gridy += 1;
437		- oe.aConstraints.gridwidth = 1;
438		- oe.aConstraints.gridx = 0;
	1039	+ cGridBag copyOptionsPanel = new cGridBag();
	1040	+
	1041	+ copyOptionsPanel.preferredHeight = 2;
439	1042
440		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
	1043	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
	1044	+
	1045	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1046	+ //minButton.setToolTipText("Minimize window");
	1047	+ //minButton.addActionListener(this);
	1048	+
	1049	+ if (Globals.ADVANCED)
	1050	+ {
	1051	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1052	+// maxButton.setToolTipText("Maximize window");
	1053	+// maxButton.addActionListener(this);
	1054	+ }
	1055	+
	1056	+ cButton gcButton;
	1057	+
	1058	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1059	+// gcButton.setToolTipText("Garbage collect");
	1060	+// gcButton.addActionListener(new ActionListener()
	1061	+// {
	1062	+// public void actionPerformed(ActionEvent e)
	1063	+// {
	1064	+// System.gc();
	1065	+// }
	1066	+// });
	1067	+
	1068	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1069	+ collapseButton.setToolTipText("Collapse toolbar");
	1070	+ collapseButton.addActionListener(this);
	1071	+
	1072	+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/empty.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1073	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1074	+ maximize3DButton.addActionListener(this);
	1075	+
	1076	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1077	+ twoButton.setToolTipText("Show 3D view only");
	1078	+ twoButton.addActionListener(this);
	1079	+ this.fullscreenLayout = twoButton;
	1080	+
	1081	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1082	+ threeButton.setToolTipText("Show controls and 3D view");
	1083	+ threeButton.addActionListener(this);
	1084	+ if (Globals.ADVANCED)
	1085	+ {
	1086	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1087	+ sixButton.setToolTipText("Show 3D view and controls");
	1088	+ sixButton.addActionListener(this);
	1089	+ }
	1090	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1091	+// sevenButton.setToolTipText("3-column layout");
	1092	+// sevenButton.addActionListener(this);
	1093	+ //
	1094	+
	1095	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1096	+ fullButton.setToolTipText("Full-screen window");
	1097	+ fullButton.addActionListener(this);
	1098	+
	1099	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1100	+ screenfitButton.setToolTipText("Screen fit");
	1101	+ screenfitButton.addActionListener(this);
	1102	+
	1103	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1104	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1105	+ restoreCameraButton.addActionListener(this);
	1106	+
	1107	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1108	+ saveVersionButton.setToolTipText("Duplicate current version");
	1109	+ saveVersionButton.addActionListener(this);
	1110	+
	1111	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1112	+ deleteVersionButton.setToolTipText("Delete current version");
	1113	+ deleteVersionButton.addActionListener(this);
	1114	+
	1115	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1116	+ previousVersionButton.setToolTipText("Previous version");
	1117	+ previousVersionButton.addActionListener(this);
	1118	+ previousVersionButton.setEnabled(false);
	1119	+
	1120	+ cGridBag updown = new cGridBag().setVertical(true);
	1121	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1122	+ restoreButton.setToolTipText("Undo (restore current version)");
	1123	+ restoreButton.addActionListener(this);
	1124	+ //restoreButton.setEnabled(false);
	1125	+
	1126	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1127	+ replaceButton.setToolTipText("Save (replace current version)");
	1128	+ replaceButton.addActionListener(this);
	1129	+ //replaceButton.setEnabled(false);
	1130	+
	1131	+ copyOptionsPanel.add(updown);
	1132	+
	1133	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1134	+ nextVersionButton.setToolTipText("Next version");
	1135	+ nextVersionButton.addActionListener(this);
	1136	+ nextVersionButton.setEnabled(false);
	1137	+
	1138	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1139	+ oneStepButton.setToolTipText("Animate one step forward");
	1140	+ oneStepButton.addActionListener(this);
	1141	+
	1142	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1143	+ liveCB.setToolTipText("Enable animation");
441	1144	liveCB.addItemListener(this);
442	1145
443		- oe.aConstraints.gridx += 1;
444		- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
445		- supportCB.addItemListener(this);
446		-
447		- // oe.aConstraints.gridx += 1;
448		- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
449		- // localCB.addItemListener(this);
450		-
451		- oe.aConstraints.gridx += 1;
452		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", CameraPane.CROWD), oe.aConstraints);
453		- crowdCB.addItemListener(this);
454		-
455		- oe.aConstraints.gridx += 1;
456		- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
457		- smoothCB.addItemListener(this);
458		-
459		- oe.aConstraints.gridx += 1;
460		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
	1146	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	1147	+ fastCB.setToolTipText("Fast mode");
461	1148	fastCB.addItemListener(this);
462		- oe.aConstraints.gridx += 1;
463		- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
464		- slowCB.addItemListener(this);
465		- oe.aConstraints.gridx += 1;
466		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.FAST), oe.aConstraints);
467		- boxCB.addItemListener(this);
	1149	+
	1150	+ //oe.toolboxPanel.Return();
	1151	+
	1152	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1153	+// trackCB.setToolTipText("Enable tracking");
	1154	+// trackCB.addItemListener(this);
468	1155
469		-// oe.aConstraints.gridx += 1;
470		-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
471		-// speakerMocapCB.addItemListener(this);
472		-
473		- if (false)
474		- {
475		- // handled in scripts
476		- oe.aConstraints.gridx += 1;
477		- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
478		- speakerCameraCB.addItemListener(this);
479		-
480		- oe.aConstraints.gridx += 1;
481		- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
482		- speakerFocusCB.addItemListener(this);
483		-
484		- oe.aConstraints.gridx += 1;
485		- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
486		- smoothfocusCB.addItemListener(this);
487		- }
488		-
489		-//oe.aConstraints.gridx += 1;
490		-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
491		-// debugCB.addItemListener(this);
492		-
493		- oe.aConstraints.gridx += 1;
494		- oe.toolbarPanel.add(oeilCB = new cCheckBox("O", CameraPane.OEIL), oe.aConstraints);
495		- oeilCB.addItemListener(this);
496		-
497		- oe.aConstraints.gridx += 1;
498		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("T", CameraPane.LOOKAT), oe.aConstraints);
499		- lookAtCB.addItemListener(this);
500		-
501		- oe.aConstraints.gridx += 1;
502		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
503		- trackCB.addItemListener(this);
504		-
505		- oe.aConstraints.gridx += 1;
506		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
507		- screenfitButton.addActionListener(this);
508		- oe.aConstraints.gridx += 1;
509	1156	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
510	1157	// screenfitpointButton.addActionListener(this);
511		-// oe.aConstraints.gridx += 1;
512		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
513		- snapobjectButton.addActionListener(this);
514		- oe.aConstraints.gridx += 1;
515	1158
516		- //aConstraints.gridx = 0;
517		- //aConstraints.gridy += 1;
518		- oe.aConstraints.weighty = 0;
519		- oe.aConstraints.gridwidth = 1;
520		-
521		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
522		- flashSelectionButton.addActionListener(this);
523		- oe.aConstraints.gridx += 1;
524		- oe.aConstraints.weighty = 0;
525		- oe.aConstraints.gridwidth = 1;
526		-
527		- //
528		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
529		- twoButton.addActionListener(this);
530		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	1159	+ if (Globals.ADVANCED)
	1160	+ {
	1161	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1162	+ snapobjectButton.addActionListener(this);
	1163	+ snapobjectButton.setToolTipText("Snap Object");
	1164	+
	1165	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
531	1166	fourButton.addActionListener(this);
532		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
533		- sixButton.addActionListener(this);
534		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
535		- threeButton.addActionListener(this);
536		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
537		- sevenButton.addActionListener(this);
538		- //
	1167	+ fourButton.setToolTipText("Show control panel only");
	1168	+ }
539	1169
540		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	1170	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	1171	+
	1172	+
	1173	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1174	+ rootButton.setToolTipText("Open selection in new tab");
541	1175	rootButton.addActionListener(this);
542		- oe.aConstraints.gridx += 1;
543		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	1176	+
	1177	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1178	+ closeButton.setToolTipText("Close tab");
544	1179	closeButton.addActionListener(this);
545	1180	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
546	1181	//clearButton.addActionListener(this);
547		- oe.aConstraints.gridx += 1;
548		-
549		- oe.aConstraints.gridx = 1; //
550		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
551		- editButton.addActionListener(this);
552		- oe.aConstraints.gridx += 1;
553		- oe.aConstraints.weighty = 0;
554		- oe.aConstraints.gridwidth = 1;
555	1182
556		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	1183	+ cGridBag row1 = new cGridBag();
	1184	+
	1185	+ // INSERT
	1186	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1187	+ gridButton.setToolTipText("Create ground");
	1188	+ gridButton.addActionListener(this);
	1189	+
	1190	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1191	+ boxButton.setToolTipText("Create box");
	1192	+ boxButton.addActionListener(this);
	1193	+
	1194	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1195	+ superButton.setToolTipText("Create superellipsoid");
	1196	+ superButton.addActionListener(this);
	1197	+
	1198	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1199	+ sphereButton.setToolTipText("Create sphere");
	1200	+ sphereButton.addActionListener(this);
	1201	+
	1202	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1203	+ coneButton.setToolTipText("Create cone");
	1204	+ coneButton.addActionListener(this);
	1205	+
	1206	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1207	+ torusButton.setToolTipText("Create torus");
	1208	+ torusButton.addActionListener(this);
	1209	+
	1210	+ if (Globals.ADVANCED)
	1211	+ {
	1212	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1213	+ kleinButton.setToolTipText("Create Klein bottle");
	1214	+ kleinButton.addActionListener(this);
	1215	+ }
	1216	+
	1217	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1218	+ particlesButton.setToolTipText("Create particle system");
	1219	+ particlesButton.addActionListener(this);
	1220	+
	1221	+ oe.toolboxPanel.add(row1);
	1222	+
	1223	+ cGridBag row2 = new cGridBag();
	1224	+
	1225	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1226	+ groupButton.setToolTipText("Create group");
	1227	+ groupButton.addActionListener(this);
	1228	+
	1229	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1230	+ compositeButton.setToolTipText("Create composite");
	1231	+ compositeButton.addActionListener(this);
	1232	+
	1233	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1234	+ switchButton.setToolTipText("Create item switcher");
	1235	+ switchButton.addActionListener(this);
	1236	+
	1237	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1238	+ loopButton.setToolTipText("Create loop");
	1239	+ loopButton.addActionListener(this);
	1240	+
	1241	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1242	+ textureButton.setToolTipText("Create texture");
	1243	+ textureButton.addActionListener(this);
	1244	+
	1245	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1246	+ overlayButton.setToolTipText("Create overlay");
	1247	+ overlayButton.addActionListener(this);
	1248	+
	1249	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1250	+ lightButton.setToolTipText("Create light");
	1251	+ lightButton.addActionListener(this);
	1252	+
	1253	+ oe.toolboxPanel.add(row2);
	1254	+
	1255	+ cGridBag textures = new cGridBag();
	1256	+
	1257	+ CreateTexturePanel(textures);
	1258	+
	1259	+ oe.toolboxPanel.add(textures);
	1260	+
	1261	+ textures.preferredHeight = 100;
	1262	+
	1263	+ CreateSkyboxPanel(oe.skyboxPanel);
	1264	+
	1265	+ // EDIT panel
	1266	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1267	+ editButton.setToolTipText("Pin selection controls");
	1268	+ editButton.addActionListener(this);
	1269	+
	1270	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1271	+ uneditButton.setToolTipText("Unpin and remove selection controls");
557	1272	uneditButton.addActionListener(this);
558	1273
559		- oe.aConstraints.gridx += 1;
560		- oe.aConstraints.weighty = 0;
561		- oe.aConstraints.gridwidth = 1;
562		-
563		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
564		- clearPanelButton.addActionListener(this);
565		-
566		- oe.aConstraints.gridx += 1;
567		- oe.aConstraints.weighty = 0;
568		- oe.aConstraints.gridwidth = 1;
569		-
570		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	1274	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1275	+ allParamsButton.setToolTipText("Show all controls");
571	1276	allParamsButton.addActionListener(this);
572	1277
573		- oe.aConstraints.gridx += 1;
574		- oe.aConstraints.weighty = 0;
575		- oe.aConstraints.gridwidth = 1;
576		-
577		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
578		- unselectButton.addActionListener(this);
	1278	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1279	+ clearPanelButton.setToolTipText("Clear all controls");
	1280	+ clearPanelButton.addActionListener(this);
579	1281
	1282	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1283	+ //unselectButton.setToolTipText("Unselect");
	1284	+ //unselectButton.addActionListener(this);
	1285	+
	1286	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1287	+ flashSelectionButton.setToolTipText("Highlight selection");
	1288	+ flashSelectionButton.addActionListener(this);
	1289	+
	1290	+ editCommandsPanel.preferredHeight = 1;
	1291	+
	1292	+ SetPinStates(false);
	1293	+// oe.treePanel.add(commandsPanel);
	1294	+// oe.treePanel.Return();
	1295	+
580	1296	// oe.aConstraints.gridx += 1;
581	1297	// oe.aConstraints.weighty = 0;
582	1298	// oe.aConstraints.gridwidth = 1;
..	..	@@ -588,47 +1304,32 @@
588	1304	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
589	1305	// gcButton.addActionListener(this);
590	1306
591		- oe.aConstraints.gridx = 0;
592		- oe.aConstraints.gridy += 1;
593		-
594		- //ctrlPanel.add(objList = new List(5, true));
595		- oe.aConstraints.gridwidth = 100;
596		- // oe.aConstraints.gridheight = 100;
597		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
598		- oe.aConstraints.gridheight = 1;
599		- oe.aConstraints.weighty = 0.5;
600		- oe.aConstraints.gridx = 0;
601		- JScrollPane jSP;
	1307	+ cGridBag jSPPanel = new cGridBag();
	1308	+
	1309	+ JScrollPane jSP;
602	1310	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
603		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	1311	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
604	1312	ResetModel();
605		- oe.aConstraints.weighty = 0.5;
606		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
607		- oe.aConstraints.gridy += 1;
608		- oe.aConstraints.gridwidth = 1;
609		-
610		- oe.aConstraints.weighty = 0;
611		- oe.aConstraints.gridwidth = 2;
612		-
613		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
614		- colorCB.addItemListener(this);
615		- oe.aConstraints.gridx += 2;
616		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
617		- materialCB.addItemListener(this);
618		- oe.aConstraints.gridx += 2;
619		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
620		- textureCB.addItemListener(this);
621		-
622		- oe.aConstraints.gridx = 0;
623		- oe.aConstraints.gridy += 1;
624	1313
	1314	+ oe.treePanel.add(jSPPanel);
	1315	+ oe.treePanel.Return();
	1316	+
	1317	+ oe.treePanel.add(copyOptionsPanel);
	1318	+ oe.treePanel.Return();
	1319	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1320	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1321	+ sliderPane.preferredHeight = 1;
	1322	+
	1323	+// mainPanel.setDividerLocation(0.1); //1.0);
	1324	+ mainPanel.setResizeWeight(0.4);
	1325	+
625	1326	//jList.addListSelectionListener(this);
626	1327	oe.jTree.addTreeSelectionListener(this);
627	1328	//jTree.setRootVisible(false);
628	1329	//jTree.setEditable(true);
629	1330	oe.jTree.setDragEnabled(true);
630	1331	//jTree.setPreferredSize(new Dimension(10,10));
631		- jSP.setPreferredSize(new Dimension(100,200));
	1332	+ //jSP.setPreferredSize(new Dimension(100,200));
632	1333
633	1334	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
634	1335
..	..	@@ -640,47 +1341,204 @@
640	1341	dgr.addDragGestureListener(this);
641	1342	}catch(Exception e) {}
642	1343	*/
643		- radio.layout = sevenButton;
	1344	+ radio.layout = threeButton; // sixButton;
644	1345	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
645	1346	}
	1347	+
	1348	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	1349	+ {
	1350	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1351	+ colorCB.setToolTipText("Copy color when dropped");
	1352	+ colorCB.addItemListener(this);
	1353	+
	1354	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1355	+ materialCB.setToolTipText("Copy material when dropped");
	1356	+ materialCB.addItemListener(this);
	1357	+
	1358	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1359	+ textureCB.setToolTipText("Copy texture when dropped");
	1360	+ textureCB.addItemListener(this);
	1361	+
	1362	+ panel.Return();
	1363	+
	1364	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	1365	+ boxCB.setToolTipText("Display bounding boxes");
	1366	+ boxCB.addItemListener(this);
	1367	+
	1368	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	1369	+ zoomBoxCB.setToolTipText("Display only for wheel");
	1370	+ zoomBoxCB.addItemListener(this);
	1371	+
	1372	+ if (true) // Globals.ADVANCED)
	1373	+ {
	1374	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1375	+// supportCB.setToolTipText("Enable rigging");
	1376	+// supportCB.addItemListener(this);
	1377	+
	1378	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1379	+ freezeCB.setToolTipText("Fast moving camera");
	1380	+ freezeCB.addItemListener(this);
	1381	+
	1382	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	1383	+ // localCB.addItemListener(this);
	1384	+
	1385	+ panel.Return();
	1386	+
	1387	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	1388	+ crowdCB.setToolTipText("Used for crowds");
	1389	+ crowdCB.addItemListener(this);
	1390	+
	1391	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	1392	+ smoothCB.setToolTipText("Snapping delay");
	1393	+ smoothCB.addItemListener(this);
	1394	+
	1395	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1396	+// slowCB.setToolTipText("Smooth interpolation");
	1397	+// slowCB.addItemListener(this);
	1398	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1399	+ minshaderCB.setToolTipText("Minimal fast shader");
	1400	+ minshaderCB.addItemListener(this);
	1401	+
	1402	+// constraints.gridy += 1;
	1403	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	1404	+// speakerMocapCB.addItemListener(this);
	1405	+
	1406	+ panel.Return();
	1407	+
	1408	+ if (false)
	1409	+ {
	1410	+ // handled in scripts
	1411	+ //constraints.gridy += 1;
	1412	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	1413	+ speakerCameraCB.addItemListener(this);
	1414	+
	1415	+ //constraints.gridy += 1;
	1416	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	1417	+ speakerFocusCB.addItemListener(this);
	1418	+
	1419	+ //constraints.gridy += 1;
	1420	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	1421	+ smoothfocusCB.addItemListener(this);
	1422	+ panel.Return();
	1423	+ }
	1424	+
	1425	+//constraints.gridx += 1;
	1426	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	1427	+// debugCB.addItemListener(this);
	1428	+
	1429	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1430	+ trackCB.setToolTipText("Enable tracking target");
	1431	+ trackCB.addItemListener(this);
	1432	+
	1433	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1434	+ oeilCB.setToolTipText("Move camera when tracking");
	1435	+ oeilCB.addItemListener(this);
	1436	+
	1437	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1438	+ shadowCB.setToolTipText("When live compute shadows");
	1439	+ shadowCB.addItemListener(this);
	1440	+
	1441	+ panel.Return();
	1442	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1443	+ toggleTextureCB.setToolTipText("Load textures");
	1444	+ toggleTextureCB.addItemListener(this);
	1445	+
	1446	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1447	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1448	+ toggleSwitchCB.addItemListener(this);
	1449	+
	1450	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1451	+ autokeepCB.setToolTipText("On structure change");
	1452	+ autokeepCB.addItemListener(this);
	1453	+
	1454	+ panel.Return();
	1455	+ if (Globals.ADVANCED)
	1456	+ {
	1457	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	1458	+ lookAtCB.setToolTipText("Look-at target");
	1459	+ lookAtCB.addItemListener(this);
	1460	+ }
	1461	+
	1462	+ }
	1463	+
	1464	+ cGridBag fill = new cGridBag();
	1465	+ fill.preferredHeight = 200;
	1466	+ cGridBag fill2 = new cGridBag();
	1467	+ fill2.preferredHeight = 200;
	1468	+ cGridBag fill3 = new cGridBag();
	1469	+ fill3.preferredHeight = 200;
	1470	+
	1471	+ panel.add(fill);
	1472	+ panel.add(fill2);
	1473	+ panel.add(fill3);
	1474	+
	1475	+ }
646	1476
647	1477	void EditObject(Object3D obj)
648	1478	{
649		- cRadio dummyButton = new cRadio(obj.name);
650		- dummyButton.SetObject(obj);
651		- dummyButton.layout = sevenButton;
652		- dummyButton.SetCamera(cameraView.renderCamera, false);
653		- dummyButton.addActionListener(this);
654		- radioPanel.add(dummyButton);
655		- buttonGroup.add(dummyButton);
656		- dummyButton.doClick();
	1479	+ assert(obj instanceof Composite);
	1480	+
	1481	+// if (obj.versionlist == null)
	1482	+// {
	1483	+// obj.versionlist = new Object3D[100];
	1484	+// obj.versionindex = -1;
	1485	+// }
	1486	+
	1487	+ cRadio radioButton = new cRadio(obj.name);
	1488	+
	1489	+ // June 2019. Patch to avoid bug with transparency.
	1490	+ radioButton.hadMaterial = obj.material != null;
	1491	+ if (!radioButton.hadMaterial)
	1492	+ {
	1493	+ obj.material = new cMaterial();
	1494	+ }
	1495	+
	1496	+ radioButton.SetObject(obj);
	1497	+ radioButton.layout = threeButton; // sixButton;
	1498	+ radioButton.SetCamera(cameraView.renderCamera, false);
	1499	+ radioButton.addActionListener(this);
	1500	+ radioPanel.add(radioButton);
	1501	+ buttonGroup.add(radioButton);
	1502	+ radioButton.doClick();
657	1503	}
	1504	+
658	1505	void SetupViews(ObjEditor oe)
659	1506	{
	1507	+ theFrame = this;
	1508	+
660	1509	oe.SetupViews();
661	1510
	1511	+ if (Globals.DEBUG)
662	1512	System.out.println("SetupViews");
663	1513	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
664	1514	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
665	1515	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
666	1516	}
667	1517
668		- JCheckBox liveCB;
669		- JCheckBox supportCB;
670		- JCheckBox localCB;
671		- JCheckBox crowdCB;
672		- JCheckBox smoothCB;
673		- JCheckBox fastCB;
674		- JCheckBox slowCB;
675		- JCheckBox boxCB;
676		- JCheckBox trackCB;
677		- JCheckBox smoothfocusCB;
	1518	+ cToggleButton liveCB;
	1519	+ cCheckBox supportCB;
	1520	+ cCheckBox localCB;
	1521	+ cCheckBox crowdCB;
	1522	+ cCheckBox smoothCB;
	1523	+ cCheckBox minshaderCB;
	1524	+
	1525	+ cToggleButton fastCB;
	1526	+ cCheckBox slowCB;
	1527	+ cCheckBox boxCB;
	1528	+ cCheckBox zoomBoxCB;
	1529	+ cCheckBox freezeCB;
	1530	+ //cToggleButton trackCB;
	1531	+ cCheckBox trackCB;
	1532	+ cCheckBox smoothfocusCB;
678	1533	// JCheckBox speakerMocapCB;
679		- JCheckBox speakerCameraCB;
680		- JCheckBox speakerFocusCB;
681		- JCheckBox debugCB;
682		- JCheckBox oeilCB;
683		- JCheckBox lookAtCB;
	1534	+ cCheckBox speakerCameraCB;
	1535	+ cCheckBox speakerFocusCB;
	1536	+ cCheckBox debugCB;
	1537	+
	1538	+ cCheckBox oeilCB;
	1539	+ cCheckBox shadowCB;
	1540	+ cCheckBox autokeepCB;
	1541	+ cCheckBox lookAtCB;
684	1542
685	1543	// static int COLOR = 1;
686	1544	// static int MATERIAL = 2;
..	..	@@ -688,9 +1546,9 @@
688	1546
689	1547	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
690	1548
691		- JCheckBox colorCB;
692		- JCheckBox materialCB;
693		- JCheckBox textureCB;
	1549	+ cCheckBox colorCB;
	1550	+ cCheckBox materialCB;
	1551	+ cCheckBox textureCB;
694	1552
695	1553	public void itemStateChanged(ItemEvent e)
696	1554	{
..	..	@@ -715,10 +1573,10 @@
715	1573	dropAttributes \|= Object3D.TEXTURE;
716	1574	else
717	1575	dropAttributes &= ~Object3D.TEXTURE;
718		- }
719		- else if(e.getSource() == liveCB)
	1576	+ } else if(e.getSource() == liveCB)
720	1577	{
721	1578	cameraView.ToggleLive();
	1579	+ refreshContents(false);
722	1580	}
723	1581	else if(e.getSource() == supportCB)
724	1582	{
..	..	@@ -734,6 +1592,12 @@
734	1592	{
735	1593	cameraView.ToggleInertia();
736	1594	cameraView.repaint();
	1595	+ }
	1596	+ else if(e.getSource() == minshaderCB)
	1597	+ {
	1598	+ Globals.MINSHADER ^= true;
	1599	+ cameraView.programInitialized = false;
	1600	+ cameraView.repaint();
737	1601	}
738	1602	else if(e.getSource() == localCB)
739	1603	{
..	..	@@ -753,6 +1617,10 @@
753	1617	Recompile();
754	1618	cameraView.repaint();
755	1619	// refreshContents();
	1620	+ }
	1621	+ else if(e.getSource() == zoomBoxCB)
	1622	+ {
	1623	+ cameraView.ToggleZoomBoxMode();
756	1624	}
757	1625	else if(e.getSource() == smoothfocusCB)
758	1626	{
..	..	@@ -779,6 +1647,18 @@
779	1647	{
780	1648	cameraView.ToggleOeil();
781	1649	}
	1650	+ else if(e.getSource() == shadowCB)
	1651	+ {
	1652	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1653	+ }
	1654	+ else if(e.getSource() == freezeCB)
	1655	+ {
	1656	+ Globals.FREEZEONMOVE ^= true;
	1657	+ }
	1658	+ else if(e.getSource() == autokeepCB)
	1659	+ {
	1660	+ Globals.REPLACEONMAKE ^= true;
	1661	+ }
782	1662	else if(e.getSource() == lookAtCB)
783	1663	{
784	1664	cameraView.ToggleLookAt();
..	..	@@ -795,7 +1675,8 @@
795	1675
796	1676	/**/
797	1677	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
798		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1678	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1679	+ TreePath path = objEditor.jTree.getSelectionPath();
799	1680	if ((path == null) \|\| (path.getPathCount() <= 1)) {
800	1681	// We can't move the root node or an empty selection
801	1682	return;
..	..	@@ -858,8 +1739,6 @@
858	1739	}
859	1740	}
860	1741
861		- String string = (String) object;
862		-
863	1742	System.out.println("Transfer = " + object + "; drop : " + target);
864	1743	// if( object instanceof java.io.File[])
865	1744	// {
..	..	@@ -867,7 +1746,11 @@
867	1746	// objEditor.DropFile((java.io.File[]) object, true);
868	1747	// return;
869	1748	// }
870		- if (string.charAt(0) == '/')
	1749	+
	1750	+ String string = object.toString();
	1751	+
	1752	+ // File path for Mac and Windows
	1753	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
871	1754	{
872	1755	// file(s)
873	1756	String[] names = string.split("\n");
..	..	@@ -894,7 +1777,7 @@
894	1777
895	1778	flashIt = false;
896	1779	CameraPane pane = (CameraPane) target;
897		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1780	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
898	1781	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
899	1782
900	1783	if (group.selection.size() == 1)
..	..	@@ -910,23 +1793,33 @@
910	1793
911	1794	assert target == objEditor.jTree;
912	1795	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1796	+ Object3D destinationLeaf;
913	1797	try {
914		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1798	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
915	1799	} catch (Exception e) {
916	1800	System.out.println("destinationPath : " + destinationPath);
917	1801	return;
918	1802	}
919	1803
920		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1804	+ for (int i=group.selection.size(); --i>=0;)
921	1805	{
	1806	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1807	+
	1808	+ // Cannot move into itself
	1809	+ if (child == destinationLeaf)
	1810	+ return;
	1811	+ }
	1812	+
	1813	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1814	+// {
922	1815	loadClipboard(true);
923	1816	objEditor.jTree.setSelectionPath(destinationPath);
924		- pasteInto(false);
925		- } else {
926		- loadClipboard(false);
927		- objEditor.jTree.setSelectionPath(destinationPath);
928		- pasteInto(false); // true); // ???
929		- }
	1817	+ pasteInto(false, false);
	1818	+// } else {
	1819	+// loadClipboard(false);
	1820	+// objEditor.jTree.setSelectionPath(destinationPath);
	1821	+// pasteInto(false, false); // true); // ???
	1822	+// }
930	1823	}
931	1824	public void dropActionChanged(DropTargetDragEvent dtde)
932	1825	// Called if the user has modified the current drop gesture
..	..	@@ -982,7 +1875,12 @@
982	1875	TreePath path;
983	1876
984	1877	public TransferableTreePath(TreePath tp) {
985		- path = tp;
	1878	+ Object[] objs = new Object[tp.getPathCount()];
	1879	+ for (int i=0; i<objs.length; i++)
	1880	+ {
	1881	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1882	+ }
	1883	+ path = new TreePath(objs);
986	1884	}
987	1885
988	1886	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1031,85 +1929,107 @@
1031	1929	{
1032	1930	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1033	1931	//heightFieldItem.addActionListener(this);
1034		- gridItem = menu.add(new MenuItem("Grid"));
1035		- gridItem.addActionListener(this);
1036		- rectoidItem = menu.add(new MenuItem("Box"));
1037		- rectoidItem.addActionListener(this);
1038		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1039		- ellipsoidItem.addActionListener(this);
1040		- coneItem = menu.add(new MenuItem("Cone"));
1041		- coneItem.addActionListener(this);
1042		- torusItem = menu.add(new MenuItem("Torus"));
1043		- torusItem.addActionListener(this);
1044		- superItem = menu.add(new MenuItem("Superellipsoid"));
1045		- superItem.addActionListener(this);
	1932	+// gridItem = menu.add(new MenuItem("Grid"));
	1933	+// gridItem.addActionListener(this);
	1934	+// rectoidItem = menu.add(new MenuItem("Box"));
	1935	+// rectoidItem.addActionListener(this);
	1936	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1937	+// ellipsoidItem.addActionListener(this);
	1938	+// coneItem = menu.add(new MenuItem("Cone"));
	1939	+// coneItem.addActionListener(this);
	1940	+// torusItem = menu.add(new MenuItem("Torus"));
	1941	+// torusItem.addActionListener(this);
	1942	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1943	+// superItem.addActionListener(this);
	1944	+
	1945	+ cameraItem = menu.add(new MenuItem("Camera"));
	1946	+ cameraItem.addActionListener(this);
	1947	+
	1948	+ if (!Globals.ADVANCED)
	1949	+ {
1046	1950	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1047	1951	kleinItem.addActionListener(this);
1048		- particleItem = menu.add(new MenuItem("Particle system"));
1049		- particleItem.addActionListener(this);
	1952	+ }
	1953	+
	1954	+// particleItem = menu.add(new MenuItem("Particle system"));
	1955	+// particleItem.addActionListener(this);
	1956	+ if (Globals.ADVANCED)
	1957	+ {
1050	1958	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1051	1959	ragdollItem.addActionListener(this);
1052	1960	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1053	1961	ragdoll2Item.addActionListener(this);
	1962	+ }
1054	1963	menu.add("-");
1055		- meshItem = menu.add(new MenuItem("Mesh"));
	1964	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1056	1965	meshItem.addActionListener(this);
1057	1966	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1058	1967	// meshGroupItem.addActionListener(this);
	1968	+ if (Globals.ADVANCED)
	1969	+ {
1059	1970	springItem = menu.add(new MenuItem("Spring"));
1060	1971	springItem.addActionListener(this);
1061	1972	flagItem = menu.add(new MenuItem("Flag"));
1062	1973	flagItem.addActionListener(this);
1063		- bezierItem = menu.add(new MenuItem("Patch"));
1064		- bezierItem.addActionListener(this);
1065		- checkerItem = menu.add(new MenuItem("Checker"));
1066		- checkerItem.addActionListener(this);
1067	1974	blobItem = menu.add(new MenuItem("Blob"));
1068	1975	blobItem.addActionListener(this);
1069	1976	latheItem = menu.add(new MenuItem("Lathe"));
1070	1977	latheItem.addActionListener(this);
1071		- lightItem = menu.add(new MenuItem("Light"));
1072		- lightItem.addActionListener(this);
	1978	+ }
	1979	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1980	+ bezierItem.addActionListener(this);
	1981	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1982	+// overlayItem.addActionListener(this);
	1983	+// lightItem = menu.add(new MenuItem("Light"));
	1984	+// lightItem.addActionListener(this);
1073	1985	menu.add("-");
1074	1986	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1075	1987	//superLoopItem.addActionListener(this);
1076		- loopItem = menu.add(new MenuItem("Loop"));
1077		- loopItem.addActionListener(this);
	1988	+// loopItem = menu.add(new MenuItem("Loop"));
	1989	+// loopItem.addActionListener(this);
1078	1990	doubleItem = menu.add(new MenuItem("Fork"));
1079	1991	doubleItem.addActionListener(this);
	1992	+ if (Globals.ADVANCED)
	1993	+ {
1080	1994	tripleItem = menu.add(new MenuItem("Trident"));
1081	1995	tripleItem.addActionListener(this);
	1996	+ }
1082	1997	}
1083	1998
1084	1999	void buildToolsMenu(Menu menu)
1085	2000	{
1086	2001	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1087	2002	animationItem.addItemListener(this);
1088		- animationItem.setState(CameraPane.ANIMATION);
	2003	+ animationItem.setState(Globals.ANIMATION);
	2004	+
	2005	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	2006	+ archiveItem.addActionListener(this);
1089	2007
1090	2008	menu.add("-");
1091	2009	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1092	2010	parseverticesItem.addActionListener(this);
1093	2011	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1094	2012	textureFieldItem.addActionListener(this);
1095		- alignItem = menu.add(new MenuItem("Align"));
	2013	+ alignItem = menu.add(new MenuItem("Align Objects"));
1096	2014	alignItem.addActionListener(this);
1097		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1098		- mirrorItem.addActionListener(this);
1099	2015	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1100	2016	reduceMorphItem.addActionListener(this);
1101	2017	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1102	2018	reduce34MorphItem.addActionListener(this);
1103		-
1104		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1105		- computeAOItem.addActionListener(this);
1106	2019	menu.add("-");
1107		-
1108	2020	menu.add(memoryItem = new MenuItem("Memory Usage"));
1109	2021	memoryItem.addActionListener(this);
	2022	+ menu.add(computeAOItem = new MenuItem("Compute AO"));
	2023	+ computeAOItem.addActionListener(this);
	2024	+
	2025	+ if (Globals.ADVANCED)
	2026	+ {
	2027	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	2028	+ mirrorItem.addActionListener(this);
	2029	+ menu.add("-");
1110	2030	menu.add(analyzeItem = new MenuItem("Analyze"));
1111	2031	analyzeItem.addActionListener(this);
1112		- menu.add(dumpItem = new MenuItem("Dump"));
	2032	+ menu.add(dumpItem = new MenuItem("Print"));
1113	2033	dumpItem.addActionListener(this);
1114	2034	// menu.add(pathItem = new MenuItem("From-to path"));
1115	2035	// pathItem.addActionListener(this);
..	..	@@ -1118,6 +2038,8 @@
1118	2038	resetParentItem.addActionListener(this);
1119	2039	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1120	2040	repairParentItem.addActionListener(this);
	2041	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	2042	+ repairShadowItem.addActionListener(this);
1121	2043	menu.add(invariantsItem = new MenuItem("Invariants"));
1122	2044	invariantsItem.addActionListener(this);
1123	2045	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1125,6 +2047,7 @@
1125	2047	menu.add("-");
1126	2048	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1127	2049	editScriptItem.addActionListener(this);
	2050	+ }
1128	2051	}
1129	2052
1130	2053	void ScreenFit()
..	..	@@ -1247,9 +2170,38 @@
1247	2170	shadow.material = new cMaterial(obj.material);
1248	2171	shadow.material.diffuse = 0.0001f;
1249	2172	shadow.material.specular = 0.0001f;
	2173	+ shadow.material.opacity = 0.75f;
	2174	+
	2175	+ AllocProjectedVertices(shadow);
	2176	+
	2177	+ shadow.projectedVertices[1].x = 300;
1250	2178
1251	2179	makeSomething(shadow);
1252	2180	}
	2181	+
	2182	+ private void ClearUnpinned()
	2183	+ {
	2184	+ //for (Object3D obj : listUI)
	2185	+ for (int i=listUI.size(); --i>=0;)
	2186	+ {
	2187	+ Object3D obj = listUI.elementAt(i);
	2188	+ if (!obj.pinned)
	2189	+ {
	2190	+ obj.CloseUI();
	2191	+ listUI.remove(i);
	2192	+ }
	2193	+ }
	2194	+ }
	2195	+
	2196	+ private void EditElement(Object3D elem, boolean newWindow)
	2197	+ {
	2198	+ // if (!(elem instanceof Composite))
	2199	+ // newWindow = false;
	2200	+ listUI.add(elem);
	2201	+ elem.openEditWindow(this, newWindow); //, false);
	2202	+ System.out.println("edit : " + elem);
	2203	+ elem.editWindow.refreshContents(true); // ? new
	2204	+ }
1253	2205
1254	2206	/**
1255	2207	* applyExample
..	..	@@ -1453,9 +2405,9 @@
1453	2405
1454	2406	void Overwrite(int mask)
1455	2407	{
1456		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2408	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1457	2409	{
1458		- Object3D content = GrafreeD.clipboard.get(0);
	2410	+ Object3D content = Grafreed.clipboard.get(0);
1459	2411
1460	2412	if (content instanceof cGroup && ((cGroup)content).transientlink )
1461	2413	content = ((cGroup)content).get(0);
..	..	@@ -1478,6 +2430,7 @@
1478	2430	//
1479	2431	public void actionPerformed(ActionEvent event) // , Object arg)
1480	2432	{
	2433	+ Object source = event.getSource();
1481	2434	/*
1482	2435	if (event.getSource() == nameField)
1483	2436	{
..	..	@@ -1489,11 +2442,11 @@
1489	2442	}
1490	2443	else
1491	2444	*/
1492		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	2445	+ if (source == lookAtItem \|\| source == lookFromItem)
1493	2446	{
1494	2447	ScreenFit();
1495	2448	} else
1496		- if (event.getSource() == switchItem)
	2449	+ if (source == switchViewItem)
1497	2450	{
1498	2451	cVector v1 = new cVector();
1499	2452	cVector v2 = new cVector();
..	..	@@ -1502,11 +2455,11 @@
1502	2455	objEditor.cameraView.renderCamera.setAim(v2, v1);
1503	2456	objEditor.cameraView.repaint();
1504	2457	} else
1505		- if (event.getSource() == rectoidItem)
	2458	+ if (source == rectoidItem \|\| source == boxButton)
1506	2459	{
1507	2460	makeSomething(new Box());
1508	2461	} else
1509		- if (event.getSource() == particleItem)
	2462	+ if (source == particleItem \|\| source == particlesButton)
1510	2463	{
1511	2464	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1512	2465	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1527,9 +2480,9 @@
1527	2480	applyExample(particleGeom, "SMOKE");
1528	2481	makeSomething(particleGeom);
1529	2482	} else
1530		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	2483	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1531	2484	{
1532		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	2485	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1533	2486
1534	2487	ragdoll.toParent = LA.newMatrix();
1535	2488	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1547,7 +2500,7 @@
1547	2500	} else
1548	2501	/*
1549	2502	*/
1550		- if (event.getSource() == heightFieldItem)
	2503	+ if (source == heightFieldItem)
1551	2504	{
1552	2505	Object3D obj = new Object3D();
1553	2506
..	..	@@ -1585,31 +2538,31 @@
1585	2538
1586	2539	makeSomething(obj);
1587	2540	} else
1588		- if (event.getSource() == gridItem)
	2541	+ if (source == gridItem \|\| source == gridButton)
1589	2542	{
1590	2543	makeSomething(new Grid());
1591	2544	} else
1592		- if (event.getSource() == ellipsoidItem)
	2545	+ if (source == ellipsoidItem \|\| source == sphereButton)
1593	2546	{
1594	2547	makeSomething(new Sphere());
1595	2548	} else
1596		- if (event.getSource() == coneItem)
	2549	+ if (source == coneItem \|\| source == coneButton)
1597	2550	{
1598	2551	makeSomething(new Cone());
1599	2552	} else
1600		- if (event.getSource() == torusItem)
	2553	+ if (source == torusItem \|\| source == torusButton)
1601	2554	{
1602	2555	makeSomething(new Torus());
1603	2556	} else
1604		- if (event.getSource() == superItem)
	2557	+ if (source == superItem \|\| source == superButton)
1605	2558	{
1606	2559	makeSomething(new Superellipsoid());
1607	2560	} else
1608		- if (event.getSource() == kleinItem)
	2561	+ if (source == kleinItem \|\| source == kleinButton)
1609	2562	{
1610	2563	makeSomething(new Klein());
1611	2564	} else
1612		- if (event.getSource() == blobItem)
	2565	+ if (source == blobItem)
1613	2566	{
1614	2567	Blob blob = new Blob();
1615	2568	BlobComponent comp = new BlobComponent();
..	..	@@ -1617,15 +2570,15 @@
1617	2570	//blob.retile();
1618	2571	makeSomething(blob);
1619	2572	} else
1620		- if (event.getSource() == latheItem)
	2573	+ if (source == latheItem)
1621	2574	{
1622	2575	makeSomething(new Lathe());
1623	2576	} else
1624		- if (event.getSource() == bezierItem)
	2577	+ if (source == bezierItem)
1625	2578	{
1626	2579	makeSomething(new BezierSurface());
1627	2580	} else
1628		- if (event.getSource() == checkerItem)
	2581	+ if (source == overlayItem \|\| source == overlayButton)
1629	2582	{
1630	2583	/*
1631	2584	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1640,7 +2593,7 @@
1640	2593	*/
1641	2594	makeSomething(new Checker());
1642	2595	} else
1643		- if (event.getSource() == meshItem)
	2596	+ if (source == meshItem)
1644	2597	{
1645	2598	Object3D itemtomake = new Object3D();
1646	2599	Object3D child;
..	..	@@ -1661,35 +2614,52 @@
1661	2614	makeSomething(child);
1662	2615	}
1663	2616	} else
1664		- if (event.getSource() == springItem)
	2617	+ if (source == springItem)
1665	2618	{
1666	2619	cSpring s = new cSpring();
1667	2620	s.setup();
1668	2621	makeSomething(s);
1669	2622	} else
1670		- if (event.getSource() == flagItem)
	2623	+ if (source == flagItem)
1671	2624	{
1672	2625	cSpring s = new cFlag();
1673	2626	s.setup();
1674	2627	makeSomething(s);
1675	2628	} else
1676		- if (event.getSource() == lightItem)
	2629	+ if (source == lightItem \|\| source == lightButton)
1677	2630	{
1678	2631	makeSomething(new Light());
1679	2632	} else
1680		- if (event.getSource() == csgItem)
	2633	+// if (source == skybox1Button \|\|
	2634	+// source == skybox2Button \|\|
	2635	+// source == skybox3Button \|\|
	2636	+// source == skybox4Button \|\|
	2637	+// source == skybox5Button \|\|
	2638	+// source == skybox6Button \|\|
	2639	+// source == skybox7Button \|\|
	2640	+// source == skybox11Button \|\|
	2641	+// source == skybox12Button \|\|
	2642	+// source == skybox13Button \|\|
	2643	+// source == skybox14Button \|\|
	2644	+// source == skybox15Button \|\|
	2645	+// source == skybox16Button \|\|
	2646	+// source == skybox17Button)
	2647	+// {
	2648	+// ChangeSkybox(source);
	2649	+// } else
	2650	+ if (source == csgItem)
1681	2651	{
1682	2652	group(new CSG());
1683	2653	} else
1684		- if (event.getSource() == templateItem)
	2654	+ if (source == templateItem)
1685	2655	{
1686	2656	group(new cTemplate());
1687	2657	} else
1688		- if (event.getSource() == attributeItem)
	2658	+ if (source == attributeItem)
1689	2659	{
1690	2660	makeSomething(new Attribute());
1691	2661	} else
1692		- if (event.getSource() == pointflowItem)
	2662	+ if (source == pointflowItem)
1693	2663	{
1694	2664	makeSomething(new PointFlow());
1695	2665	} else
..	..	@@ -1701,7 +2671,7 @@
1701	2671	} else
1702	2672	*/
1703	2673
1704		- if (event.getSource() == superLoopItem)
	2674	+ if (source == superLoopItem)
1705	2675	{
1706	2676	Composite g = new cGroup();
1707	2677	for (int i=0; i<15; i++)
..	..	@@ -1723,30 +2693,38 @@
1723	2693
1724	2694	group(g);
1725	2695	} else
1726		- if (event.getSource() == loopItem)
	2696	+ if (source == loopItem \|\| source == loopButton)
1727	2697	{
	2698	+ if (!group.selection.isEmpty())
	2699	+ {
1728	2700	Composite csg = new GroupLeaf();
1729	2701	csg.count = 5;
1730		- group(csg);
1731		- Composite child = new cGroup();
	2702	+ Composite child = new cGroup("Branch");
1732	2703	csg.addChild(child);
1733	2704	child.addChild(csg);
	2705	+ group(csg);
	2706	+ }
1734	2707	} else
1735		- if (event.getSource() == doubleItem)
	2708	+ if (source == doubleItem)
1736	2709	{
1737		- Composite csg = new GroupLeaf();
	2710	+ if (!group.selection.isEmpty())
	2711	+ {
	2712	+ Composite csg = new GroupLeaf("Fork");
1738	2713	csg.count = 5;
	2714	+ Composite child = new cGroup("Branch A");
	2715	+ csg.addChild(child);
	2716	+ child.addChild(csg);
	2717	+ child = new cGroup("Branch B");
	2718	+ csg.addChild(child);
	2719	+ child.addChild(csg);
1739	2720	group(csg);
1740		- Composite child = new cGroup();
1741		- csg.addChild(child);
1742		- child.addChild(csg);
1743		- child = new cGroup();
1744		- csg.addChild(child);
1745		- child.addChild(csg);
	2721	+ }
1746	2722	} else
1747		- if (event.getSource() == tripleItem)
	2723	+ if (source == tripleItem)
1748	2724	{
1749		- Composite csg = new GroupLeaf();
	2725	+ if (!group.selection.isEmpty())
	2726	+ {
	2727	+ Composite csg = new GroupLeaf("Trident");
1750	2728	csg.count = 4;
1751	2729	group(csg);
1752	2730	Composite child = new cGroup();
..	..	@@ -1758,74 +2736,119 @@
1758	2736	child = new cGroup();
1759	2737	csg.addChild(child);
1760	2738	child.addChild(csg);
	2739	+ }
1761	2740	} else
1762		-
1763		- if (event.getSource() == importGFDItem)
	2741	+ if (source == computeAOItem)
1764	2742	{
1765		- ImportGFD();
	2743	+ Globals.drawMode = CameraPane.OCCLUSION;
	2744	+ cameraView.repaint();
1766	2745	} else
1767		- if (event.getSource() == importVRMLX3DItem)
1768		- {
1769		- ImportVRMLX3D();
1770		- } else
1771		- if (event.getSource() == import3DSItem)
1772		- {
1773		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1774		- } else
1775		- if (event.getSource() == importOBJItem)
1776		- {
1777		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1778		- } else
1779		- if (event.getSource() == computeAOItem)
1780		- {
1781		- CameraPane.drawMode = CameraPane.OCCLUSION;
1782		- CameraPane.theRenderer.repaint();
1783		- } else
1784		- if (event.getSource() == recompileItem)
	2746	+ if (source == recompileItem)
1785	2747	{
1786	2748	Recompile();
1787	2749	refreshContents();
1788	2750	} else
1789		- if (event.getSource() == editScriptItem)
	2751	+ if (source == editScriptItem)
1790	2752	{
1791	2753	OpenDialog();
1792	2754	refreshContents();
1793	2755	} else
1794		- if (event.getSource() == invariantsItem)
	2756	+ if (source == invariantsItem)
1795	2757	{
1796	2758	System.out.println("Invariants:");
1797		- GrafreeD.grafreeD.universe.invariants();
	2759	+ Grafreed.grafreed.universe.invariants();
1798	2760	} else
1799		- if (event.getSource() == memoryItem)
	2761	+ if (source == memoryItem)
1800	2762	{
1801	2763	//System.out.println("Invariants:");
1802	2764	PrintMemory();
1803	2765	} else
1804		- if (event.getSource() == pathItem)
	2766	+ if (source == pathItem)
1805	2767	{
1806	2768	PrintPath();
1807	2769	} else
1808		- if (event.getSource() == analyzeItem)
	2770	+ if (source == analyzeItem)
1809	2771	{
1810	2772	AnalyzeObject();
1811	2773	} else
1812		- if (event.getSource() == dumpItem)
	2774	+ if (source == dumpItem)
1813	2775	{
1814	2776	DumpObject();
1815	2777	} else
1816		- if (event.getSource() == screenfitButton)
	2778	+ if (source == minButton)
1817	2779	{
1818		- //Reload(lastConverter, lastFilename, true);
	2780	+ Minimize();
	2781	+ } else
	2782	+ if (source == maxButton)
	2783	+ {
	2784	+ Maximize();
	2785	+ } else
	2786	+ if (source == fullButton)
	2787	+ {
	2788	+ ToggleFullScreen();
	2789	+ } else
	2790	+ if (source == collapseButton)
	2791	+ {
	2792	+ this.expandedLayout = radio.layout;
	2793	+ CollapseToolbar();
	2794	+ } else
	2795	+ if (source == maximize3DButton)
	2796	+ {
	2797	+ this.expandedLayout = radio.layout;
	2798	+ radio.layout = twoButton;
	2799	+ Show3DView();
	2800	+ CollapseToolbar();
	2801	+ } else
	2802	+ if (source == previousVersionButton)
	2803	+ {
	2804	+ // Go to previous version
	2805	+ //if (!Undo())
	2806	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2807	+ PreviousVersion();
	2808	+ } else
	2809	+ if (source == restoreButton)
	2810	+ {
	2811	+ // Restore current version
	2812	+ Restore();
	2813	+ //restoreButton.setEnabled(false);
	2814	+ } else
	2815	+ if (source == replaceButton)
	2816	+ {
	2817	+ // Overwrite current version
	2818	+ Replace();
	2819	+ //replaceButton.setEnabled(false);
	2820	+ } else
	2821	+ if (source == nextVersionButton)
	2822	+ {
	2823	+ // Go to next version
	2824	+ NextVersion();
	2825	+ } else
	2826	+ if (source == saveVersionButton)
	2827	+ {
	2828	+ // Save a new version
	2829	+ if (!Save(true))
	2830	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2831	+ } else
	2832	+ if (source == deleteVersionButton)
	2833	+ {
	2834	+ // Delete a new version
	2835	+ DeleteVersion();
	2836	+ } else
	2837	+ if (source == oneStepButton)
	2838	+ {
	2839	+ Globals.ONESTEP = true;
	2840	+ cameraView.repaint();
	2841	+ } else
	2842	+ if (source == screenfitButton)
	2843	+ {
1819	2844	ScreenFit();
1820	2845	} else
1821		- if (event.getSource() == screenfitpointButton)
	2846	+ if (source == screenfitpointButton)
1822	2847	{
1823		- //Reload(lastConverter, lastFilename, true);
1824	2848	ScreenFitPoint();
1825	2849	} else
1826		- if (event.getSource() == snapobjectButton)
	2850	+ if (source == snapobjectButton)
1827	2851	{
1828		- //Reload(lastConverter, lastFilename, true);
1829	2852	SnapObject();
1830	2853	} else
1831	2854	// if (event.getSource() == recompileButton)
..	..	@@ -1834,13 +2857,13 @@
1834	2857	// Recompile();
1835	2858	// refreshContents();
1836	2859	// } else
1837		- if (event.getSource() == gcButton)
	2860	+ if (source == gcButton)
1838	2861	{
1839	2862	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1840	2863	System.gc();
1841	2864	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1842	2865	} else
1843		- if (event.getSource() == editLeafItem)
	2866	+ if (source == editLeafItem)
1844	2867	{
1845	2868	Object3D obj;
1846	2869	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1854,62 +2877,74 @@
1854	2877	}
1855	2878	refreshContents(true);
1856	2879	} else
1857		- if (event.getSource() == openWindowItem)
	2880	+ if (source == openWindowItem)
1858	2881	{
1859	2882	EditSelection(true);
1860	2883	} else
1861		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2884	+ if (source == cutItem \|\| source == clearButton)
1862	2885	{
1863	2886	loadClipboard(true);
1864	2887	} else
1865		- if (event.getSource() == duplicateItem)
	2888	+ if (source == undoItem)
1866	2889	{
1867		- Object3D keep = GrafreeD.clipboard;
	2890	+ PreviousVersion();
	2891	+ } else
	2892	+ if (source == redoItem)
	2893	+ {
	2894	+ NextVersion();
	2895	+ } else
	2896	+ if (source == duplicateItem)
	2897	+ {
	2898	+ Object3D keep = Grafreed.clipboard;
1868	2899	loadClipboard(false);
1869	2900	paste(false);
1870		- GrafreeD.clipboard = keep;
	2901	+ Grafreed.clipboard = keep;
1871	2902	} else
1872		- if (event.getSource() == cloneItem)
	2903	+ if (source == cloneItem)
1873	2904	{
1874	2905	CloneSelection(false);
1875	2906	} else
1876		- if (event.getSource() == cloneSupportItem)
	2907	+ if (source == cloneSupportItem)
1877	2908	{
1878	2909	CloneSelection(true);
1879	2910	} else
1880		- if (event.getSource() == copyItem)
	2911	+ if (source == copyItem)
1881	2912	{
1882	2913	loadClipboard(false);
1883	2914	} else
1884		- if (event.getSource() == pasteItem)
	2915	+ if (source == pasteItem)
1885	2916	{
1886	2917	paste(false);
1887	2918	} else
1888		- if (event.getSource() == pasteLinkItem)
	2919	+ if (source == pasteIntoItem)
1889	2920	{
1890		- pasteInto(false);
	2921	+ pasteInto(true, false);
1891	2922	} else
1892		- if (event.getSource() == pasteCloneItem)
	2923	+ if (source == pasteLinkItem)
1893	2924	{
1894		- pasteInto(true);
	2925	+ pasteInto(false, false);
1895	2926	} else
1896		- if (event.getSource() == pasteExpandItem)
	2927	+ if (source == pasteCloneItem)
	2928	+ {
	2929	+ pasteInto(true, true);
	2930	+ } else
	2931	+ if (source == pasteExpandItem)
1897	2932	{
1898	2933	paste(true);
1899	2934	} else
1900		- if (event.getSource() == synchronizeItem)
	2935	+ if (source == synchronizeItem)
1901	2936	{
1902	2937	Overwrite(Object3D.TRANSFORM);
1903	2938	} else
1904		- if (event.getSource() == overwriteNameItem)
	2939	+ if (source == overwriteNameItem)
1905	2940	{
1906	2941	Overwrite(Object3D.NAME);
1907	2942	} else
1908		- if (event.getSource() == overwriteUVItem)
	2943	+ if (source == overwriteUVItem)
1909	2944	{
1910	2945	Overwrite(Object3D.UV);
1911	2946	} else
1912		- if (event.getSource() == overwriteMatItem)
	2947	+ if (source == overwriteMatItem)
1913	2948	{
1914	2949	/* july 2015
1915	2950	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1929,7 +2964,7 @@
1929	2964
1930	2965	Overwrite(dropAttributes);
1931	2966	}
1932		- if (event.getSource() == overwriteGeoItem)
	2967	+ if (source == overwriteGeoItem)
1933	2968	{
1934	2969	Overwrite(Object3D.GEOMETRY);
1935	2970	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1946,7 +2981,7 @@
1946	2981	// refreshContents();
1947	2982	// }
1948	2983	} else
1949		- if (event.getSource() == generateMeshItem)
	2984	+ if (source == generateMeshItem)
1950	2985	{
1951	2986	//if (group.selection.size() == 1)
1952	2987	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1957,7 +2992,7 @@
1957	2992	ResetModel();
1958	2993	refreshContents();
1959	2994	} else
1960		- if (event.getSource() == extractGeometriesItem)
	2995	+ if (source == extractGeometriesItem)
1961	2996	{
1962	2997	boolean one = false;
1963	2998
..	..	@@ -1984,7 +3019,7 @@
1984	3019	ResetModel();
1985	3020	refreshContents();
1986	3021	} else
1987		- if (event.getSource() == cloneGeometriesItem)
	3022	+ if (source == cloneGeometriesItem)
1988	3023	{
1989	3024	boolean one = false;
1990	3025
..	..	@@ -2010,7 +3045,7 @@
2010	3045	ResetModel();
2011	3046	refreshContents();
2012	3047	} else
2013		- if (event.getSource() == shareGeometriesItem)
	3048	+ if (source == shareGeometriesItem)
2014	3049	{
2015	3050	boolean one = false;
2016	3051
..	..	@@ -2040,7 +3075,7 @@
2040	3075	refreshContents();
2041	3076	}
2042	3077	} else
2043		- if (event.getSource() == mergeGeometriesItem)
	3078	+ if (source == mergeGeometriesItem)
2044	3079	{
2045	3080	boolean one = false;
2046	3081
..	..	@@ -2070,7 +3105,7 @@
2070	3105	ResetModel();
2071	3106	refreshContents();
2072	3107	} else
2073		- if (event.getSource() == linkverticesItem)
	3108	+ if (source == linkverticesItem)
2074	3109	{
2075	3110	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2076	3111	// {
..	..	@@ -2083,48 +3118,48 @@
2083	3118	// group.selection.get(0).setMasterThis(content); // should be identity
2084	3119	// refreshContents();
2085	3120	// }
2086		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	3121	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2087	3122	{
2088		- Object3D content = GrafreeD.clipboard.get(0);
	3123	+ Object3D content = Grafreed.clipboard.get(0);
2089	3124
2090	3125	if (content instanceof cGroup && ((cGroup)content).transientlink )
2091	3126	content = ((cGroup)content).get(0);
2092	3127
2093		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	3128	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2094	3129	for (int i=0; i<group.selection.size(); i++)
2095	3130	{
2096		- boolean random = CameraPane.RANDOM;
2097		- CameraPane.RANDOM = false; // parse all random nodes
	3131	+ boolean random = CameraPane.SWITCH;
	3132	+ CameraPane.SWITCH = false; // parse all random nodes
2098	3133	group.selection.get(i).linkVerticesThis(content);
2099	3134	// group.selection.get(i).setMasterThis(content); // should be identity
2100		- CameraPane.RANDOM = random;
	3135	+ CameraPane.SWITCH = random;
2101	3136	}
2102		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	3137	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2103	3138	refreshContents();
2104	3139	}
2105	3140	} else
2106		- if (event.getSource() == resetsupportItem)
	3141	+ if (source == resetsupportItem)
2107	3142	{
2108	3143	for (int i=0; i<group.selection.size(); i++)
2109	3144	{
2110		- boolean random = CameraPane.RANDOM;
2111		- CameraPane.RANDOM = false; // parse all random nodes
	3145	+ boolean random = CameraPane.SWITCH;
	3146	+ CameraPane.SWITCH = false; // parse all random nodes
2112	3147	group.selection.get(i).linkVerticesThis(null);
2113		- CameraPane.RANDOM = random;
	3148	+ CameraPane.SWITCH = random;
2114	3149	}
2115	3150
2116	3151	refreshContents();
2117	3152	} else
2118		- if (event.getSource() == relinkverticesItem)
	3153	+ if (source == relinkverticesItem)
2119	3154	{
2120		- boolean random = CameraPane.RANDOM;
2121		- CameraPane.RANDOM = false; // parse all random nodes
	3155	+ boolean random = CameraPane.SWITCH;
	3156	+ CameraPane.SWITCH = false; // parse all random nodes
2122	3157	group.selection.RelinkToSupport();
2123		- CameraPane.RANDOM = random;
	3158	+ CameraPane.SWITCH = random;
2124	3159
2125	3160	refreshContents();
2126	3161	} else
2127		- if (event.getSource() == resetreferencesItem)
	3162	+ if (source == resetreferencesItem)
2128	3163	{
2129	3164	for (int i=0; i<group.selection.size(); i++)
2130	3165	{
..	..	@@ -2133,11 +3168,11 @@
2133	3168
2134	3169	refreshContents();
2135	3170	} else
2136		- if (event.getSource() == setMasterItem)
	3171	+ if (source == setMasterItem)
2137	3172	{
2138		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	3173	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2139	3174	{
2140		- Object3D content = GrafreeD.clipboard.get(0);
	3175	+ Object3D content = Grafreed.clipboard.get(0);
2141	3176
2142	3177	if (content instanceof cGroup && ((cGroup)content).transientlink )
2143	3178	content = ((cGroup)content).get(0);
..	..	@@ -2146,13 +3181,13 @@
2146	3181	refreshContents();
2147	3182	}
2148	3183	} else
2149		- if (event.getSource() == poseMeshItem)
	3184	+ if (source == poseMeshItem)
2150	3185	{
2151	3186	if (group.selection.size() == 1)
2152	3187	{
2153		- if (GrafreeD.clipboard.size() == 1)
	3188	+ if (Grafreed.clipboard.size() == 1)
2154	3189	{
2155		- Object3D content = GrafreeD.clipboard.get(0);
	3190	+ Object3D content = Grafreed.clipboard.get(0);
2156	3191
2157	3192	if (content instanceof cGroup && ((cGroup)content).transientlink )
2158	3193	content = ((cGroup)content).get(0);
..	..	@@ -2165,19 +3200,19 @@
2165	3200	}
2166	3201
2167	3202	} else
2168		- if (event.getSource() == revertMeshItem)
	3203	+ if (source == revertMeshItem)
2169	3204	{
2170	3205	RevertMeshes();
2171	3206	} else
2172		- if (event.getSource() == resetMeshItem)
	3207	+ if (source == resetAllItem)
2173	3208	{
2174	3209	ResetAll();
2175	3210	} else
2176		- if (event.getSource() == stepAllItem)
	3211	+ if (source == stepAllItem)
2177	3212	{
2178	3213	StepAll();
2179	3214	} else
2180		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	3215	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2181	3216	{
2182	3217	//int indices[] = jList.getSelectedIndices();
2183	3218	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2185,46 +3220,46 @@
2185	3220
2186	3221	ClearSelection(false);
2187	3222	} else
2188		- if (event.getSource() == clearAllItem)
	3223	+ if (source == clearAllItem)
2189	3224	{
2190	3225	ClearSelection(true);
2191	3226	} else
2192		- if (event.getSource() == grabItem)
	3227	+ if (source == grabItem \|\| source == groupButton)
2193	3228	{
2194		- group(new cGroup(), true);
	3229	+ group(new cGroup(), false); // true);
2195	3230	} else
2196		- if (event.getSource() == hideItem)
	3231	+ if (source == hideItem)
2197	3232	{
2198	3233	group(new HiddenObject());
2199	3234	} else
2200		- if (event.getSource() == frontItem)
	3235	+ if (source == frontItem)
2201	3236	{
2202	3237	front();
2203	3238	} else
2204		- if (event.getSource() == backItem)
	3239	+ if (source == backItem)
2205	3240	{
2206	3241	back();
2207	3242	} else
2208		- if (event.getSource() == cameraItem)
	3243	+ if (source == cameraItem)
2209	3244	{
2210	3245	makeSomething(new Camera());
2211	3246	} else
2212		- if (event.getSource() == compositeItem)
	3247	+ if (source == compositeItem \|\| source == compositeButton)
2213	3248	{
2214	3249	group(new Composite());
2215	3250	} else
2216		- if (event.getSource() == randomItem)
	3251	+ if (source == switchItem \|\| source == switchButton)
2217	3252	{
2218	3253	RandomNode random = new RandomNode();
2219	3254	group(random);
2220	3255	if (random.size() > 0)
2221		- random.name = random.get(0).name + "Rnd";
	3256	+ random.name = random.get(0).name + "Switch";
2222	3257	} else
2223		- if (event.getSource() == physicsItem)
	3258	+ if (source == physicsItem)
2224	3259	{
2225	3260	group(new PhysicsNode());
2226	3261	} else
2227		- if (event.getSource() == frameselectorItem)
	3262	+ if (source == frameselectorItem)
2228	3263	{
2229	3264	for (int i=0; i<group.selection.size(); i++)
2230	3265	{
..	..	@@ -2236,7 +3271,7 @@
2236	3271	ResetModel();
2237	3272	refreshContents();
2238	3273	} else
2239		- if (event.getSource() == switchGeoItem)
	3274	+ if (source == switchGeoItem)
2240	3275	{
2241	3276	for (int i=0; i<group.selection.size(); i++)
2242	3277	{
..	..	@@ -2248,7 +3283,7 @@
2248	3283	ResetModel();
2249	3284	refreshContents();
2250	3285	} else
2251		- if (event.getSource() == switchTransfoItem)
	3286	+ if (source == switchTransfoItem)
2252	3287	{
2253	3288	for (int i=0; i<group.selection.size(); i++)
2254	3289	{
..	..	@@ -2260,7 +3295,7 @@
2260	3295	ResetModel();
2261	3296	refreshContents();
2262	3297	} else
2263		- if (event.getSource() == morphItem)
	3298	+ if (source == morphItem)
2264	3299	{
2265	3300	for (int i=0; i<group.selection.size(); i++)
2266	3301	{
..	..	@@ -2272,7 +3307,7 @@
2272	3307	ResetModel();
2273	3308	refreshContents();
2274	3309	} else
2275		- if (event.getSource() == scriptNodeItem)
	3310	+ if (source == scriptNodeItem)
2276	3311	{
2277	3312	boolean atleastone = false;
2278	3313
..	..	@@ -2311,215 +3346,264 @@
2311	3346	}
2312	3347	}
2313	3348	} else
2314		- if (event.getSource() == linkerItem)
	3349	+ if (source == linkerItem)
2315	3350	{
2316	3351	group(new cLinker());
2317	3352	} else
2318		- if (event.getSource() == textureItem)
	3353	+ if (source == textureItem \|\| source == textureButton)
2319	3354	{
2320	3355	group(new TextureNode());
2321	3356	} else
2322		- if (event.getSource() == billboardItem)
	3357	+ if (source == billboardItem)
2323	3358	{
2324	3359	group(new BillboardNode());
2325	3360	} else
2326		- if (event.getSource() == shadowXItem)
	3361	+ if (source == shadowXItem)
2327	3362	{
2328	3363	CastShadow(0);
2329	3364	} else
2330		- if (event.getSource() == shadowYItem)
	3365	+ if (source == shadowYItem)
2331	3366	{
2332	3367	CastShadow(1);
2333	3368	} else
2334		- if (event.getSource() == shadowZItem)
	3369	+ if (source == shadowZItem)
2335	3370	{
2336	3371	CastShadow(2);
2337	3372	} else
2338		- if (event.getSource() == ungroupItem)
	3373	+ if (source == ungroupItem \|\| source == ungroupButton)
2339	3374	{
2340		- //ungroup();
	3375	+ boolean canUngroup = true;
	3376	+
2341	3377	for (int i=0; i<group.selection.size(); i++)
2342	3378	{
2343		- Ungroup(group.selection.get(i));
	3379	+ Object3D selectedItem = group.selection.get(i);
	3380	+
	3381	+ if (selectedItem.Size() == 0)
	3382	+ {
	3383	+ // Cannot ungroup leaves
	3384	+ canUngroup = false;
	3385	+ break;
	3386	+ }
	3387	+
	3388	+ if (selectedItem == group)
	3389	+ {
	3390	+ // Cannot ungroup root
	3391	+ canUngroup = false;
	3392	+ break;
	3393	+ }
2344	3394	}
2345	3395
2346		- ClearSelection(false);
2347		-
2348		- refreshContents();
	3396	+ if (canUngroup)
	3397	+ {
	3398	+ for (int i=0; i<group.selection.size(); i++)
	3399	+ {
	3400	+ Object3D selectedItem = group.selection.get(i);
	3401	+
	3402	+ Ungroup(selectedItem);
	3403	+ }
	3404	+
	3405	+ ClearSelection(false);
	3406	+
	3407	+ refreshContents();
	3408	+ }
2349	3409	} else
2350		- if (event.getSource() == genUVItem)
	3410	+ if (source == genUVItem)
2351	3411	{
2352	3412	GenUV();
2353	3413	} else
2354		- if (event.getSource() == genNormalsCADItem)
	3414	+ if (source == genNormalsCADItem)
2355	3415	{
2356	3416	GenNormals(true);
2357	3417	} else
2358		- if (event.getSource() == genNormalsMESHItem)
	3418	+ if (source == genNormalsMESHItem)
2359	3419	{
2360		- GenNormals(true); // TODO
	3420	+ GenNormalsMESH();
2361	3421	} else
2362		- if (event.getSource() == genNormalsORGANItem)
	3422	+ if (source == genNormalsORGANItem)
2363	3423	{
2364	3424	GenNormals(false);
2365	3425	} else
2366		- if (event.getSource() == genNormalsMINEItem)
	3426	+ if (source == genNormalsMINEItem)
2367	3427	{
2368	3428	GenNormalsMINE();
2369	3429	} else
2370		- if (event.getSource() == stripifyItem)
	3430	+ if (source == stripifyItem)
2371	3431	{
2372	3432	Stripify();
2373	3433	} else
2374		- if (event.getSource() == unstripifyItem)
	3434	+ if (source == unstripifyItem)
2375	3435	{
2376	3436	Unstripify();
2377	3437	} else
2378		- if (event.getSource() == trimItem)
	3438	+ if (source == trimItem)
2379	3439	{
2380	3440	Trim();
2381	3441	} else
2382		- if (event.getSource() == untrimItem)
	3442	+ if (source == untrimItem)
2383	3443	{
2384	3444	Untrim();
2385	3445	} else
2386		- if (event.getSource() == clearColorsItem)
	3446	+ if (source == clearColorsItem)
2387	3447	{
2388	3448	ClearColors();
2389	3449	} else
2390		- if (event.getSource() == clearMaterialsItem)
	3450	+ if (source == clearMaterialsItem)
2391	3451	{
2392	3452	ClearMaterials();
2393	3453	} else
2394		- if (event.getSource() == liveleavesItem)
	3454	+ if (source == liveleavesItem)
2395	3455	{
2396	3456	LiveLeaves(true);
2397	3457	} else
2398		- if (event.getSource() == unliveleavesItem)
	3458	+ if (source == unliveleavesItem)
2399	3459	{
2400	3460	LiveLeaves(false);
2401	3461	} else
2402		- if (event.getSource() == supportleavesItem)
	3462	+ if (source == supportleavesItem)
2403	3463	{
2404	3464	SupportLeaves(true);
2405	3465	} else
2406		- if (event.getSource() == unsupportleavesItem)
	3466	+ if (source == unsupportleavesItem)
2407	3467	{
2408	3468	SupportLeaves(false);
2409	3469	} else
2410		- if (event.getSource() == hideleavesItem)
	3470	+ if (source == hideleavesItem)
2411	3471	{
2412	3472	HideLeaves(true);
2413	3473	} else
2414		- if (event.getSource() == showleavesItem)
	3474	+ if (source == showleavesItem)
2415	3475	{
2416	3476	HideLeaves(false);
2417	3477	} else
2418		- if (event.getSource() == markleavesItem)
	3478	+ if (source == markleavesItem)
2419	3479	{
2420	3480	MarkLeaves(true);
2421	3481	} else
2422		- if (event.getSource() == unmarkleavesItem)
	3482	+ if (source == unmarkleavesItem)
2423	3483	{
2424	3484	MarkLeaves(false);
2425	3485	} else
2426		- if (event.getSource() == flipVItem)
	3486	+ if (source == rewindleavesItem)
	3487	+ {
	3488	+ RewindLeaves(true);
	3489	+ } else
	3490	+ if (source == unrewindleavesItem)
	3491	+ {
	3492	+ RewindLeaves(false);
	3493	+ } else
	3494	+ if (source == randomleavesItem)
	3495	+ {
	3496	+ RandomLeaves(true);
	3497	+ } else
	3498	+ if (source == unrandomleavesItem)
	3499	+ {
	3500	+ RandomLeaves(false);
	3501	+ } else
	3502	+ if (source == flipVItem)
2427	3503	{
2428	3504	FlipV(true);
2429	3505	} else
2430		- if (event.getSource() == unflipVItem)
	3506	+ if (source == unflipVItem)
2431	3507	{
2432	3508	FlipV(false);
2433	3509	} else
2434		- if (event.getSource() == lowTexturesItem)
	3510	+ if (source == lowTexturesItem)
2435	3511	{
2436	3512	SetTexRes(0);
2437	3513	} else
2438		- if (event.getSource() == normalTexturesItem)
	3514	+ if (source == normalTexturesItem)
2439	3515	{
2440	3516	SetTexRes(1);
2441	3517	} else
2442		- if (event.getSource() == highTexturesItem)
	3518	+ if (source == highTexturesItem)
2443	3519	{
2444	3520	SetTexRes(2);
2445	3521	} else
2446		- if (event.getSource() == veryhighTexturesItem)
	3522	+ if (source == veryhighTexturesItem)
2447	3523	{
2448	3524	SetTexRes(3);
2449	3525	} else
2450		- if (event.getSource() == maxTexturesItem)
	3526	+ if (source == maxTexturesItem)
2451	3527	{
2452	3528	SetTexRes(4);
2453	3529	} else
2454		- if (event.getSource() == panoTexturesItem)
	3530	+ if (source == panoTexturesItem)
2455	3531	{
2456	3532	SetTexRes(5);
2457	3533	} else
2458		- if (event.getSource() == reverseNormalsItem)
	3534	+ if (source == reverseNormalsItem)
2459	3535	{
2460	3536	ReverseNormals();
2461	3537	} else
2462		- if (event.getSource() == parseverticesItem)
	3538	+ if (source == parseverticesItem)
2463	3539	{
2464	3540	ParseVertices();
2465	3541	} else
2466		- if (event.getSource() == textureFieldItem)
	3542	+ if (source == textureFieldItem)
2467	3543	{
2468	3544	TextureVertices();
2469	3545	} else
2470		- if (event.getSource() == alignItem)
	3546	+ if (source == alignItem)
2471	3547	{
2472	3548	Align();
2473	3549	} else
2474		- if (event.getSource() == mirrorItem)
	3550	+ if (source == mirrorItem)
2475	3551	{
2476	3552	MirrorPoses();
2477	3553	} else
2478		- if (event.getSource() == reduceMorphItem)
	3554	+ if (source == reduceMorphItem)
2479	3555	{
2480	3556	MeshReduction(false);
2481	3557	} else
2482		- if (event.getSource() == reduce34MorphItem)
	3558	+ if (source == reduce34MorphItem)
2483	3559	{
2484	3560	MeshReduction(true);
2485	3561	} else
2486		- if (event.getSource() == reverseTrianglesItem)
	3562	+ if (source == reverseTrianglesItem)
2487	3563	{
2488	3564	ReverseTriangles();
2489	3565	} else
2490		- if (event.getSource() == reduceMeshItem)
	3566	+ if (source == reduceMeshItem)
2491	3567	{
2492	3568	ReduceMesh(false);
2493	3569	} else
2494		- if (event.getSource() == reduce34MeshItem)
	3570	+ if (source == reduce34MeshItem)
2495	3571	{
2496	3572	ReduceMesh(true);
2497	3573	} else
2498		- if (event.getSource() == increaseMeshItem)
	3574	+ if (source == increaseMeshItem)
2499	3575	{
2500	3576	IncreaseMesh();
2501	3577	} else
2502		- if (event.getSource() == clipMeshItem)
	3578	+ if (source == clipMeshItem)
2503	3579	{
2504	3580	ClipMesh();
2505	3581	} else
2506		- if (event.getSource() == smoothMeshItem)
	3582	+ if (source == smoothMeshItem)
2507	3583	{
2508	3584	SmoothMesh();
2509	3585	} else
2510		- if (event.getSource() == transformgeometryItem)
	3586	+ if (source == transformGeometryItem)
2511	3587	{
2512	3588	TransformGeometry();
2513	3589	} else
2514		- if (event.getSource() == resetTransformItem)
	3590	+ if (source == transformChildrenItem)
	3591	+ {
	3592	+ TransformChildren();
	3593	+ } else
	3594	+ if (source == resetTransformItem)
2515	3595	{
2516	3596	ResetTransform();
2517	3597	} else
2518		- if (event.getSource() == resetCentroidItem)
	3598	+ if (source == resetCentroidItem)
2519	3599	{
2520		- ResetCentroid();
	3600	+ ResetCentroid(true);
2521	3601	} else
2522		- if (event.getSource() == resetParentItem)
	3602	+ if (source == resetCentroidXZItem)
	3603	+ {
	3604	+ ResetCentroid(false);
	3605	+ } else
	3606	+ if (source == resetParentItem)
2523	3607	{
2524	3608	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2525	3609	{
..	..	@@ -2529,7 +3613,7 @@
2529	3613
2530	3614	refreshContents();
2531	3615	} else
2532		- if (event.getSource() == repairParentItem)
	3616	+ if (source == repairParentItem)
2533	3617	{
2534	3618	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2535	3619	{
..	..	@@ -2543,7 +3627,21 @@
2543	3627
2544	3628	refreshContents();
2545	3629	} else
2546		- if (event.getSource() == sortbysizeItem)
	3630	+ if (source == repairShadowItem)
	3631	+ {
	3632	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3633	+ {
	3634	+ Object3D obj = (Object3D)e.nextElement();
	3635	+ obj.RepairShadow();
	3636	+// for (int i=0; i<obj.size(); i++)
	3637	+// {
	3638	+// obj.get(i).parent = obj;
	3639	+// }
	3640	+ }
	3641	+
	3642	+ refreshContents();
	3643	+ } else
	3644	+ if (source == sortbysizeItem)
2547	3645	{
2548	3646	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2549	3647	{
..	..	@@ -2555,7 +3653,7 @@
2555	3653	ResetModel();
2556	3654	refreshContents();
2557	3655	} else
2558		- if (event.getSource() == sortbynameItem)
	3656	+ if (source == sortbynameItem)
2559	3657	{
2560	3658	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2561	3659	{
..	..	@@ -2567,7 +3665,7 @@
2567	3665	ResetModel();
2568	3666	refreshContents();
2569	3667	} else
2570		- if (event.getSource() == attachPigmentItem)
	3668	+ if (source == attachPigmentItem)
2571	3669	{
2572	3670	String texture = GetFile("Attach pigment");
2573	3671	Object3D obj;
..	..	@@ -2579,7 +3677,7 @@
2579	3677
2580	3678	refreshContents();
2581	3679	} else
2582		- if (event.getSource() == detachPigmentItem)
	3680	+ if (source == detachPigmentItem)
2583	3681	{
2584	3682	Object3D obj;
2585	3683	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2590,7 +3688,7 @@
2590	3688
2591	3689	refreshContents();
2592	3690	} else
2593		- if (event.getSource() == attachBumpItem)
	3691	+ if (source == attachBumpItem)
2594	3692	{
2595	3693	String texture = GetFile("Attach bump");
2596	3694	Object3D obj;
..	..	@@ -2602,18 +3700,18 @@
2602	3700
2603	3701	refreshContents();
2604	3702	} else
2605		- if (event.getSource() == detachBumpItem)
	3703	+ if (source == detachBumpItem)
2606	3704	{
2607	3705	Object3D obj;
2608	3706	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2609	3707	{
2610	3708	obj = (Object3D)e.nextElement();
2611		- obj.SetBumpTexture(null);
	3709	+ obj.ResetBumpTexture();
2612	3710	}
2613	3711
2614	3712	refreshContents();
2615	3713	} else
2616		- if (event.getSource() == pigmentBumpItem)
	3714	+ if (source == pigmentBumpItem)
2617	3715	{
2618	3716	Object3D obj;
2619	3717	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2624,159 +3722,233 @@
2624	3722
2625	3723	refreshContents();
2626	3724	} else
2627		- if (event.getSource() == flashSelectionButton)
	3725	+ if (source == embedTexturesItem)
	3726	+ {
	3727	+ Object3D obj;
	3728	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3729	+ {
	3730	+ obj = (Object3D)e.nextElement();
	3731	+ obj.EmbedTextures(true);
	3732	+ }
	3733	+
	3734	+ refreshContents();
	3735	+ } else
	3736	+ if (source == deEmbedTexturesItem)
	3737	+ {
	3738	+ Object3D obj;
	3739	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3740	+ {
	3741	+ obj = (Object3D)e.nextElement();
	3742	+ obj.EmbedTextures(false);
	3743	+ }
	3744	+
	3745	+ CameraPane.texturepigment.clear();
	3746	+ CameraPane.texturebump.clear();
	3747	+
	3748	+ refreshContents();
	3749	+ } else
	3750	+ if (source == flashSelectionButton)
2628	3751	{
2629	3752	CameraPane.flash = true;
2630	3753	refreshContents();
2631	3754	} else
2632		- if (event.getSource() == oneButton)
	3755	+ if (source == oneButton)
2633	3756	{
2634	3757	} else
2635		- if (event.getSource() == twoButton)
	3758	+ if (source == twoButton)
2636	3759	{
2637	3760	radio.layout = twoButton;
2638		- // bug
2639		- //gridPanel.setDividerLocation(1.0);
2640		- //bigPanel.setDividerLocation(0.0);
2641		- bigThree.remove(scenePanel);
2642		- bigThree.remove(cameraPanel);
2643		- bigThree.remove(XYZPanel);
2644		- aWindowConstraints.gridx = 0;
2645		- aWindowConstraints.gridy = 0;
2646		- aWindowConstraints.gridwidth = 1;
2647		- // aConstraints.gridheight = 3;
2648		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2649		- aWindowConstraints.weightx = 0;
2650		- aWindowConstraints.weighty = 1;
2651		- //bigThree.add(jtp, aWindowConstraints);
2652		- aWindowConstraints.weightx = 1;
2653		- aWindowConstraints.gridwidth = 3;
2654		- // aConstraints.gridheight = 3;
2655		- aWindowConstraints.gridx = 1;
2656		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2657		- bigThree.add(cameraPanel, aWindowConstraints);
2658		- aWindowConstraints.weightx = 0;
2659		- aWindowConstraints.gridx = 4;
2660		- aWindowConstraints.gridwidth = 1;
2661		- // aConstraints.gridheight = 3;
2662		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2663		- //bigThree.add(XYZPanel, aWindowConstraints);
2664		- bigThree.revalidate();
	3761	+
	3762	+ if (CameraPane.FULLSCREEN)
	3763	+ fullscreenLayout = radio.layout;
	3764	+
	3765	+ Show3DView();
	3766	+
	3767	+ cameraView.requestFocusInWindow();
	3768	+
	3769	+// refreshContents(true);
	3770	+//
	3771	+// try
	3772	+// {
	3773	+// java.awt.Robot bot = new java.awt.Robot();
	3774	+// int mask = InputEvent.BUTTON1_MASK;
	3775	+// bot.mouseMove(100, 100);
	3776	+// bot.mousePress(mask);
	3777	+// bot.mouseRelease(mask);
	3778	+// }
	3779	+// catch (Exception e)
	3780	+// {
	3781	+//
	3782	+// }
	3783	+
2665	3784	} else
2666		- if (event.getSource() == threeButton)
	3785	+ if (source == threeButton)
2667	3786	{
2668	3787	radio.layout = threeButton;
2669		- bigThree.remove(scenePanel);
2670		- bigThree.remove(cameraPanel);
2671		- bigThree.remove(XYZPanel);
2672		- aWindowConstraints.gridx = 0;
2673		- aWindowConstraints.gridy = 0;
2674		- aWindowConstraints.gridwidth = 1;
2675		- // aConstraints.gridheight = 3;
2676		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2677		- aWindowConstraints.weightx = 0;
2678		- aWindowConstraints.weighty = 1;
2679		- //bigThree.add(jtp, aWindowConstraints);
2680		- aWindowConstraints.weightx = 1;
2681		- aWindowConstraints.gridwidth = 3;
2682		- // aConstraints.gridheight = 3;
2683		- aWindowConstraints.gridx = 1;
2684		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2685		- bigThree.add(cameraPanel, aWindowConstraints);
2686		- aWindowConstraints.weightx = 0;
2687		- aWindowConstraints.gridx = 4;
2688		- aWindowConstraints.gridwidth = 1;
2689		- // aConstraints.gridheight = 3;
2690		- aConstraints.fill = GridBagConstraints.VERTICAL;
2691		- bigThree.add(XYZPanel, aWindowConstraints);
2692		- bigThree.revalidate();
	3788	+
	3789	+ if (CameraPane.FULLSCREEN)
	3790	+ fullscreenLayout = radio.layout;
	3791	+
	3792	+// bigThree.remove(scenePanel);
	3793	+// bigThree.remove(centralPanel);
	3794	+// bigThree.remove(XYZPanel);
	3795	+// aWindowConstraints.gridx = 0;
	3796	+// aWindowConstraints.gridy = 0;
	3797	+// aWindowConstraints.gridwidth = 1;
	3798	+// // aConstraints.gridheight = 3;
	3799	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3800	+// aWindowConstraints.weightx = 0;
	3801	+// aWindowConstraints.weighty = 1;
	3802	+// //bigThree.add(jtp, aWindowConstraints);
	3803	+// aWindowConstraints.weightx = 1;
	3804	+// aWindowConstraints.gridwidth = 3;
	3805	+// // aConstraints.gridheight = 3;
	3806	+// aWindowConstraints.gridx = 1;
	3807	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3808	+// bigThree.add(centralPanel, aWindowConstraints);
	3809	+// aWindowConstraints.weightx = 0;
	3810	+// aWindowConstraints.gridx = 4;
	3811	+// aWindowConstraints.gridwidth = 1;
	3812	+// // aConstraints.gridheight = 3;
	3813	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	3814	+// bigThree.add(XYZPanel, aWindowConstraints);
	3815	+// bigThree.validate();
	3816	+// scenePanel.setVisible(false);
	3817	+// centralPanel.setVisible(true);
	3818	+// XYZPanel.setVisible(true);
	3819	+ bigThree.ClearUI();
	3820	+ bigThree.add(scenePanel);
	3821	+ bigThree.add(centralPanel);
	3822	+ bigThree.FlushUI();
	3823	+
	3824	+ cameraView.requestFocusInWindow();
2693	3825	} else
2694		- if (event.getSource() == fourButton)
	3826	+ if (source == fourButton)
2695	3827	{
2696	3828	radio.layout = fourButton;
2697		- bigThree.remove(scenePanel);
2698		- bigThree.remove(cameraPanel);
2699		- bigThree.remove(XYZPanel);
2700		- aWindowConstraints.gridx = 0;
2701		- aWindowConstraints.gridy = 0;
2702		- aWindowConstraints.gridwidth = 1;
2703		- // aWindowConstraints.gridheight = 3;
2704		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2705		- aWindowConstraints.weightx = 1;
2706		- aWindowConstraints.weighty = 1;
2707		- bigThree.add(scenePanel, aWindowConstraints);
2708		- aWindowConstraints.weightx = 1;
2709		- aWindowConstraints.gridwidth = 3;
2710		- // aConstraints.gridheight = 3;
2711		- aWindowConstraints.gridx = 1;
2712		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2713		- //bigThree.add(cameraPanel, aWindowConstraints);
2714		- aWindowConstraints.weightx = 0;
2715		- aWindowConstraints.gridx = 4;
2716		- aWindowConstraints.gridwidth = 1;
2717		- // aWindowConstraints.gridheight = 3;
2718		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2719		- //bigThree.add(XYZPanel, aWindowConstraints);
2720		- bigThree.revalidate();
	3829	+
	3830	+ if (CameraPane.FULLSCREEN)
	3831	+ fullscreenLayout = radio.layout;
	3832	+
	3833	+// bigThree.remove(scenePanel);
	3834	+// bigThree.remove(centralPanel);
	3835	+// bigThree.remove(XYZPanel);
	3836	+// aWindowConstraints.gridx = 0;
	3837	+// aWindowConstraints.gridy = 0;
	3838	+// aWindowConstraints.gridwidth = 1;
	3839	+// // aWindowConstraints.gridheight = 3;
	3840	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3841	+// aWindowConstraints.weightx = 1;
	3842	+// aWindowConstraints.weighty = 1;
	3843	+// bigThree.add(scenePanel, aWindowConstraints);
	3844	+// aWindowConstraints.weightx = 1;
	3845	+// aWindowConstraints.gridwidth = 3;
	3846	+// // aConstraints.gridheight = 3;
	3847	+// aWindowConstraints.gridx = 1;
	3848	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3849	+// //bigThree.add(cameraPanel, aWindowConstraints);
	3850	+// aWindowConstraints.weightx = 0;
	3851	+// aWindowConstraints.gridx = 4;
	3852	+// aWindowConstraints.gridwidth = 1;
	3853	+// // aWindowConstraints.gridheight = 3;
	3854	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3855	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3856	+// bigThree.validate();
	3857	+// scenePanel.setVisible(true);
	3858	+// centralPanel.setVisible(false);
	3859	+// XYZPanel.setVisible(false);
	3860	+ bigThree.ClearUI();
	3861	+ bigThree.add(scenePanel);
	3862	+ bigThree.FlushUI();
	3863	+
	3864	+ cameraView.requestFocusInWindow();
2721	3865	} else
2722		- if (event.getSource() == sixButton)
	3866	+ if (source == sixButton)
2723	3867	{
2724	3868	radio.layout = sixButton;
2725		- bigThree.remove(scenePanel);
2726		- bigThree.remove(cameraPanel);
2727		- bigThree.remove(XYZPanel);
2728		- aWindowConstraints.gridx = 0;
2729		- aWindowConstraints.gridy = 0;
2730		- aWindowConstraints.gridwidth = 1;
2731		- // aConstraints.gridheight = 3;
2732		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2733		- aWindowConstraints.weightx = 0;
2734		- aWindowConstraints.weighty = 1;
2735		- bigThree.add(scenePanel, aWindowConstraints);
2736		- aWindowConstraints.weightx = 1;
2737		- aWindowConstraints.gridwidth = 3;
2738		- // aWindowConstraints.gridheight = 3;
2739		- aWindowConstraints.gridx = 1;
2740		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2741		- bigThree.add(cameraPanel, aWindowConstraints);
2742		- aWindowConstraints.weightx = 0;
2743		- aWindowConstraints.gridx = 4;
2744		- aWindowConstraints.gridwidth = 1;
2745		- // aWindowConstraints.gridheight = 3;
2746		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2747		- //bigThree.add(XYZPanel, aConstraints);
2748		- bigThree.revalidate();
	3869	+
	3870	+ if (CameraPane.FULLSCREEN)
	3871	+ fullscreenLayout = radio.layout;
	3872	+
	3873	+// bigThree.remove(scenePanel);
	3874	+// bigThree.remove(centralPanel);
	3875	+// bigThree.remove(XYZPanel);
	3876	+// aWindowConstraints.gridx = 0;
	3877	+// aWindowConstraints.gridy = 0;
	3878	+// aWindowConstraints.gridwidth = 1;
	3879	+// // aConstraints.gridheight = 3;
	3880	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3881	+// aWindowConstraints.weightx = 0;
	3882	+// aWindowConstraints.weighty = 1;
	3883	+// bigThree.add(scenePanel, aWindowConstraints);
	3884	+// aWindowConstraints.weightx = 1;
	3885	+// aWindowConstraints.gridwidth = 3;
	3886	+// // aWindowConstraints.gridheight = 3;
	3887	+// aWindowConstraints.gridx = 1;
	3888	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3889	+// bigThree.add(centralPanel, aWindowConstraints);
	3890	+// aWindowConstraints.weightx = 0;
	3891	+// aWindowConstraints.gridx = 4;
	3892	+// aWindowConstraints.gridwidth = 1;
	3893	+// // aWindowConstraints.gridheight = 3;
	3894	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3895	+// //bigThree.add(XYZPanel, aConstraints);
	3896	+// bigThree.validate();
	3897	+// scenePanel.setVisible(true);
	3898	+// centralPanel.setVisible(true);
	3899	+// XYZPanel.setVisible(false);
	3900	+ bigThree.ClearUI();
	3901	+ bigThree.add(centralPanel);
	3902	+ bigThree.add(scenePanel);
	3903	+ bigThree.FlushUI();
	3904	+
	3905	+ cameraView.requestFocusInWindow();
2749	3906	} else
2750		- if (event.getSource() == sevenButton)
	3907	+ if (source == sevenButton)
2751	3908	{
2752	3909	radio.layout = sevenButton;
2753		- bigThree.remove(scenePanel);
2754		- bigThree.remove(cameraPanel);
2755		- bigThree.remove(XYZPanel);
2756		- aWindowConstraints.gridx = 0;
2757		- aWindowConstraints.gridy = 0;
2758		- aWindowConstraints.gridwidth = 1;
2759		- // aWindowConstraints.gridheight = 3;
2760		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2761		- aWindowConstraints.weightx = 0;
2762		- aWindowConstraints.weighty = 1;
2763		- bigThree.add(scenePanel, aWindowConstraints);
2764		- aWindowConstraints.weightx = 1;
2765		- aWindowConstraints.gridwidth = 3;
2766		- // aWindowConstraints.gridheight = 3;
2767		- aWindowConstraints.gridx = 1;
2768		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2769		- bigThree.add(cameraPanel, aWindowConstraints);
2770		- aWindowConstraints.weightx = 0;
2771		- aWindowConstraints.gridx = 4;
2772		- aWindowConstraints.gridwidth = 1;
2773		- // aConstraints.gridheight = 3;
2774		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2775		- bigThree.add(XYZPanel, aWindowConstraints);
2776		- bigThree.revalidate();
	3910	+
	3911	+ if (CameraPane.FULLSCREEN)
	3912	+ fullscreenLayout = radio.layout;
	3913	+
	3914	+// bigThree.remove(scenePanel);
	3915	+// bigThree.remove(centralPanel);
	3916	+// bigThree.remove(XYZPanel);
	3917	+// aWindowConstraints.gridx = 0;
	3918	+// aWindowConstraints.gridy = 0;
	3919	+// aWindowConstraints.gridwidth = 1;
	3920	+// // aWindowConstraints.gridheight = 3;
	3921	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3922	+// aWindowConstraints.weightx = 0;
	3923	+// aWindowConstraints.weighty = 1;
	3924	+// bigThree.add(scenePanel, aWindowConstraints);
	3925	+// aWindowConstraints.weightx = 1;
	3926	+// aWindowConstraints.gridwidth = 3;
	3927	+// // aWindowConstraints.gridheight = 3;
	3928	+// aWindowConstraints.gridx = 1;
	3929	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3930	+// bigThree.add(centralPanel, aWindowConstraints);
	3931	+// aWindowConstraints.weightx = 0;
	3932	+// aWindowConstraints.gridx = 4;
	3933	+// aWindowConstraints.gridwidth = 1;
	3934	+// // aConstraints.gridheight = 3;
	3935	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3936	+// bigThree.add(XYZPanel, aWindowConstraints);
	3937	+// bigThree.validate();
	3938	+// scenePanel.setVisible(true);
	3939	+// centralPanel.setVisible(true);
	3940	+// XYZPanel.setVisible(true);
	3941	+ bigThree.ClearUI();
	3942	+ bigThree.add(scenePanel);
	3943	+ bigThree.add(centralPanel);
	3944	+ bigThree.add(XYZPanel);
	3945	+ bigThree.FlushUI();
	3946	+
	3947	+ cameraView.requestFocusInWindow();
2777	3948	} else
2778		- if (event.getSource() == rootButton)
	3949	+ if (source == rootButton)
2779	3950	{
	3951	+ Replace();
2780	3952	Object3D obj;
2781	3953	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2782	3954	{
..	..	@@ -2785,66 +3957,85 @@
2785	3957	EditObject(obj);
2786	3958	}
2787	3959
	3960	+ cameraView.requestFocusInWindow();
2788	3961	refreshContents(true);
2789	3962	} else
2790		- if (event.getSource() == closeButton)
	3963	+ if (source == closeButton)
2791	3964	{
2792	3965	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2793	3966	cRadio ab;
2794	3967	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2795	3968	{
2796	3969	ab = (cRadio)e.nextElement();
2797		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3970	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2798	3971	{
	3972	+ // Patch to avoid bug with transparency.
	3973	+ if (!ab.hadMaterial)
	3974	+ {
	3975	+ ab.object.material = null;
	3976	+ }
	3977	+
2799	3978	buttonGroup.remove(ab);
2800	3979	radioPanel.remove(ab);
2801	3980
2802		- ab.GetObject().editWindow = null;
	3981	+ //ab.GetObject().editWindow = null;
	3982	+ ab.GetObject().manipWindow = null;
2803	3983	// ab.GetObject().objectUI = null; // ?????????
2804	3984
2805	3985	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2806	3986	break;
2807	3987	}
2808	3988	}
	3989	+
	3990	+ cameraView.requestFocusInWindow();
2809	3991	refreshContents(true);
2810	3992	} else
2811		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3993	+ if (source == editItem \|\| source == editButton)
2812	3994	{
	3995	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3996	+ {
	3997	+ Object3D child = (Object3D)e.nextElement();
	3998	+ child.pinned = true;
	3999	+ }
	4000	+
2813	4001	EditSelection(false);
2814	4002	} else
2815		- if (event.getSource() == uneditButton)
	4003	+ if (source == uneditButton)
2816	4004	{
2817	4005	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2818	4006	{
2819	4007	Object3D child = (Object3D)e.nextElement();
2820	4008	if(child.editWindow != null)
2821		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4009	+ child.pinned = false;
2822	4010	child.CloseUI();
2823	4011	listUI.remove(child);
	4012	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2824	4013
2825		- child.editWindow = null; // ???????????
	4014	+ //child.editWindow = null; // ???????????
2826	4015	}
2827		- objEditor.ctrlPanel.revalidate();
	4016	+ objEditor.ctrlPanel.FlushUI();
2828	4017	//objEditor.jTree.clearSelection();
2829	4018	//objEditor.ResetSliders();
2830	4019	refreshContents(true);
2831	4020	} else
2832		- if (event.getSource() == clearPanelButton)
	4021	+ if (source == clearPanelButton)
2833	4022	{
2834	4023	assert(copy == group);
2835	4024	//copy.ClearUI();
2836	4025	for (Object3D obj : listUI)
2837	4026	{
	4027	+ obj.pinned = false;
2838	4028	obj.CloseUI();
2839	4029	}
2840	4030	listUI.clear();
	4031	+ SetPinStates(group.selection.size() > 0);
2841	4032	refreshContents(true);
2842	4033	} else
2843		- if (event.getSource() == allParamsButton)
	4034	+ if (source == allParamsButton)
2844	4035	{
2845	4036	assert(copy == group);
2846	4037
2847		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4038	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2848	4039
2849	4040	for (Object3D obj : listUI)
2850	4041	{
..	..	@@ -2861,19 +4052,19 @@
2861	4052
2862	4053	refreshContents(true);
2863	4054	} else
2864		- if (event.getSource() == unselectButton)
	4055	+ if (source == unselectButton)
2865	4056	{
2866	4057	objEditor.jTree.clearSelection();
2867	4058	// ?? oct 2012 GrafreeD.clipboard.clear();
2868	4059	objEditor.ResetSliders();
2869	4060	refreshContents(true);
2870	4061	} else
2871		- if(event.getSource() instanceof cRadio)
	4062	+ if(source instanceof cRadio)
2872	4063	{
2873	4064	group.parent = keepparent;
2874	4065	group.attributes = 0;
2875	4066	//group.editWindow = null;
2876		- /cRadio/ radio = (cRadio)event.getSource();
	4067	+ /cRadio/ radio = (cRadio)source;
2877	4068	Object3D obj = radio.GetObject();
2878	4069	System.out.println("Edit " + obj);
2879	4070	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2893,7 +4084,8 @@
2893	4084	}
2894	4085
2895	4086	copy = group;
2896		- //CameraPane.theRenderer.object = group;
	4087	+
	4088	+ //Globals.theRenderer.object = group;
2897	4089	if(!useclient)
2898	4090	{
2899	4091	cameraView.renderCamera = radio.camera;
..	..	@@ -2902,25 +4094,70 @@
2902	4094	cameraView.cameras[cameraView.cameracount] = radio.camera;
2903	4095	cameraView.targetLookAt.set(radio.camera.lookAt);
2904	4096	cameraView.object = group;
2905		- cameraView.lighttouched = true;
	4097	+ //cameraView.lighttouched = true;
	4098	+ Globals.lighttouched = true;
2906	4099	topView.object = group;
2907	4100	frontView.object = group;
2908	4101	sideView.object = group;
2909	4102	}
2910		- group.editWindow = this;
	4103	+
	4104	+// fix "+" issue
	4105	+ //group.editWindow = this;
	4106	+ group.manipWindow = this;
	4107	+
2911	4108	/*
2912	4109	currentLayout = radio.layout;
2913	4110	if (currentLayout == null)
2914	4111	currentLayout = sevenButton;
2915	4112	*/
2916	4113	radio.layout.doClick();
	4114	+
	4115	+ assert(copy instanceof Composite);
	4116	+
	4117	+ if (copy.versionlist == null)
	4118	+ {
	4119	+ copy.versionlist = new Object3D[100];
	4120	+ copy.versionindex = -1;
	4121	+
	4122	+ // Cannot work with loops
	4123	+ // To fix this issue, first mark all nodes above the root,
	4124	+ // and check if any of these nodes are reachable below the root.
	4125	+ //Save(true);
	4126	+ }
	4127	+
	4128	+ SetVersionStates();
	4129	+
	4130	+ ClearUnpinned();
	4131	+
	4132	+ //Grafreed.Assert(group != null);
	4133	+ //Grafreed.Assert(group.selection != null);
	4134	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4135	+ if (group.selection == null \|\| group.selection.size() == 1)
	4136	+ EditSelection(false);
2917	4137	keepparent = group.parent;
2918	4138	// PARENT = NULL or not???
2919	4139	//group.parent = null; // ROOT
2920	4140	//group.attributes = -1;
2921	4141	ResetModel();
	4142	+
	4143	+ cameraView.requestFocusInWindow();
2922	4144	refreshContents(true);
2923		- }
	4145	+ } else if (event.getSource() == editCameraItem)
	4146	+ {
	4147	+ cameraView.ProtectCamera();
	4148	+ cameraView.requestFocusInWindow();
	4149	+ cameraView.repaint();
	4150	+ return;
	4151	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	4152	+ {
	4153	+ cameraView.RevertCamera();
	4154	+ cameraView.requestFocusInWindow();
	4155	+ cameraView.repaint();
	4156	+ return;
	4157	+ // } else if (event.getSource() == textureButton)
	4158	+ // {
	4159	+ // return; // true;
	4160	+ }
2924	4161	else
2925	4162	{
2926	4163	//return super.action(event, arg);
..	..	@@ -2929,7 +4166,6 @@
2929	4166	}
2930	4167
2931	4168	boolean useclient = false;
2932		- cRadio radio;
2933	4169
2934	4170	void ToggleRoot()
2935	4171	{
..	..	@@ -2938,7 +4174,7 @@
2938	4174	if (useclient)
2939	4175	{
2940	4176	cameraView.object = client;
2941		- cameraView.lighttouched = true;
	4177	+ Globals.lighttouched = true;
2942	4178	//topView.object = client;
2943	4179	//frontView.object = client;
2944	4180	//sideView.object = client;
..	..	@@ -2946,7 +4182,7 @@
2946	4182	else
2947	4183	{
2948	4184	cameraView.object = group;
2949		- cameraView.lighttouched = true;
	4185	+ Globals.lighttouched = true;
2950	4186	//topView.object = group;
2951	4187	//frontView.object = group;
2952	4188	//sideView.object = group;
..	..	@@ -2981,6 +4217,28 @@
2981	4217	refreshContents();
2982	4218	}
2983	4219
	4220	+ void TransformChildren()
	4221	+ {
	4222	+ Object3D obj;
	4223	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4224	+ {
	4225	+ obj = (Object3D)e.nextElement();
	4226	+ obj.KeepTextureMatrices();
	4227	+ obj.TransformChildren();
	4228	+ obj.RestoreTextureMatrices();
	4229	+
	4230	+// if (obj.parent == null)
	4231	+// {
	4232	+// System.out.println("NULL PARENT!");
	4233	+// new Exception().printStackTrace();
	4234	+// }
	4235	+// else
	4236	+// TouchTransform(obj);
	4237	+// //obj.parent.Touch();
	4238	+ }
	4239	+
	4240	+ refreshContents();
	4241	+ }
2984	4242
2985	4243	void ResetTransform()
2986	4244	{
..	..	@@ -3093,7 +4351,7 @@
3093	4351	refreshContents();
3094	4352	}
3095	4353
3096		- void ResetCentroid()
	4354	+ void ResetCentroid(boolean full)
3097	4355	{
3098	4356	Object3D obj;
3099	4357	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3108,12 +4366,16 @@
3108	4366	LA.matIdentity(Object3D.mat);
3109	4367	obj.getBounds(minima, maxima, false);
3110	4368	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3111		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	4369	+ if (full)
	4370	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3112	4371	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3113	4372	obj.TransformMesh(Object3D.mat);
	4373	+
3114	4374	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3115		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	4375	+ if (full)
	4376	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3116	4377	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	4378	+
3117	4379	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3118	4380	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3119	4381	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3142,7 +4404,8 @@
3142	4404
3143	4405	int size = obj.MemorySize();
3144	4406
3145		- System.err.println((size/1024) + " KB is the size of " + obj);
	4407	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4408	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3146	4409	}
3147	4410	}
3148	4411	catch (Exception e)
..	..	@@ -3179,9 +4442,9 @@
3179	4442	obj = (Object3D)e.nextElement();
3180	4443
3181	4444	System.out.println("Object is: " + obj);
3182		- GrafreeD.AnalyzeObject(obj);
	4445	+ Grafreed.AnalyzeObject(obj);
3183	4446	System.out.println("Boundary rep: " + obj.bRep);
3184		- GrafreeD.AnalyzeObject(obj.bRep);
	4447	+ Grafreed.AnalyzeObject(obj.bRep);
3185	4448
3186	4449	// System.err.println((size/1024) + " KB is the size of " + obj);
3187	4450	}
..	..	@@ -3223,6 +4486,13 @@
3223	4486	void GenNormals(boolean crease)
3224	4487	{
3225	4488	group.GenNormalsS(crease);
	4489	+
	4490	+ refreshContents();
	4491	+ }
	4492	+
	4493	+ void GenNormalsMESH()
	4494	+ {
	4495	+ group.GenNormalsMeshS();
3226	4496
3227	4497	refreshContents();
3228	4498	}
..	..	@@ -3395,8 +4665,8 @@
3395	4665
3396	4666	void ParseVertices()
3397	4667	{
3398		- boolean epsequal = GrafreeD.epsequal;
3399		- GrafreeD.epsequal = true;
	4668	+ boolean epsequal = Grafreed.epsequal;
	4669	+ Grafreed.epsequal = true;
3400	4670
3401	4671	for (int i=0; i<group.selection.size(); i++)
3402	4672	{
..	..	@@ -3421,7 +4691,7 @@
3421	4691	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3422	4692	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3423	4693
3424		- g.add(GrafreeD.clipboard);
	4694	+ g.add(Grafreed.clipboard);
3425	4695
3426	4696	buffer.add(g);
3427	4697	}
..	..	@@ -3436,7 +4706,7 @@
3436	4706	makeSomething(buffer, i==group.selection.size()-1);
3437	4707	}
3438	4708
3439		- GrafreeD.epsequal = epsequal;
	4709	+ Grafreed.epsequal = epsequal;
3440	4710
3441	4711	refreshContents();
3442	4712	}
..	..	@@ -3454,7 +4724,16 @@
3454	4724	String pigment = Object3D.GetPigment(tex);
3455	4725	//String bump = Object3D.GetBump(tex);
3456	4726
3457		- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
	4727	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4728	+
	4729	+ try
	4730	+ {
	4731	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
	4732	+ }
	4733	+ catch (Exception e)
	4734	+ {
	4735	+ System.err.println("FAIL: " + node);
	4736	+ }
3458	4737
3459	4738	double s = v.s;
3460	4739
..	..	@@ -3542,11 +4821,11 @@
3542	4821
3543	4822	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3544	4823
3545		- boolean random = CameraPane.RANDOM;
3546		- CameraPane.RANDOM = false; // parse all random nodes
	4824	+ boolean random = CameraPane.SWITCH;
	4825	+ CameraPane.SWITCH = false; // parse all random nodes
3547	4826	lowres.linkVerticesThis(null);
3548	4827	lowres.linkVerticesThis(sn);
3549		- CameraPane.RANDOM = random;
	4828	+ CameraPane.SWITCH = random;
3550	4829
3551	4830	System.err.flush();
3552	4831
..	..	@@ -3586,7 +4865,7 @@
3586	4865	return;
3587	4866
3588	4867	Object3D poses = group.selection.get(0);
3589		- Object3D ref = GrafreeD.clipboard.get(0);
	4868	+ Object3D ref = Grafreed.clipboard.get(0);
3590	4869
3591	4870	Object3D newgroup = new Object3D("Po:" + poses.name);
3592	4871
..	..	@@ -3755,7 +5034,7 @@
3755	5034	group.selection.RelinkToSupport(); // july 2014
3756	5035	System.out.println("DONE.");
3757	5036	refreshContents();
3758		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	5037	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3759	5038	}
3760	5039
3761	5040	void ReduceMesh(boolean reduction34)
..	..	@@ -3780,9 +5059,9 @@
3780	5059
3781	5060	void ClipMesh()
3782	5061	{
3783		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	5062	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3784	5063	{
3785		- Object3D content = GrafreeD.clipboard.get(0);
	5064	+ Object3D content = Grafreed.clipboard.get(0);
3786	5065
3787	5066	if (content instanceof cGroup && ((cGroup)content).transientlink )
3788	5067	content = ((cGroup)content).get(0);
..	..	@@ -3791,7 +5070,7 @@
3791	5070	// {
3792	5071	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3793	5072	// }
3794		- group.selection.ClipMesh(GrafreeD.clipboard);
	5073	+ group.selection.ClipMesh(Grafreed.clipboard);
3795	5074	}
3796	5075	// group.selection.ClipMesh(GrafreeD.clipboard);
3797	5076	System.out.println("DONE.");
..	..	@@ -3838,6 +5117,18 @@
3838	5117	void MarkLeaves(boolean hide)
3839	5118	{
3840	5119	group.selection.MarkLeaves(hide);
	5120	+ refreshContents();
	5121	+ }
	5122	+
	5123	+ void RewindLeaves(boolean hide)
	5124	+ {
	5125	+ group.selection.RewindLeaves(hide);
	5126	+ refreshContents();
	5127	+ }
	5128	+
	5129	+ void RandomLeaves(boolean hide)
	5130	+ {
	5131	+ group.selection.RandomLeaves(hide);
3841	5132	refreshContents();
3842	5133	}
3843	5134
..	..	@@ -3912,28 +5203,25 @@
3912	5203	// }
3913	5204	// }
3914	5205
3915		- static boolean allparams = true;
3916		-
3917		- static Vector<Object3D> listUI = new Vector<Object3D>();
3918		-
3919	5206	void EditSelection(boolean newWindow)
3920	5207	{
	5208	+ if (group.selection == null)
	5209	+ {
	5210	+ EditElement(group, newWindow); // ? new
	5211	+ return;
	5212	+ }
	5213	+
3921	5214	// aConstraints.gridy = 0;
3922	5215	for (int i=0; i<group.selection.size(); i++)
3923	5216	{
3924	5217	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
3925	5218	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3926		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5219	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3927	5220
3928	5221	Object3D elem = (Object3D)group.selection.elementAt(i);
3929		- if(elem != group)
	5222	+ if(elem != group \|\| !newWindow)
3930	5223	{
3931		- // if (!(elem instanceof Composite))
3932		- // newWindow = false;
3933		- listUI.add(elem);
3934		- elem.openEditWindow(this, newWindow); //, false);
3935		- System.out.println("edit : " + elem);
3936		- elem.editWindow.refreshContents(true); // ? new
	5224	+ EditElement(elem, newWindow); // ? new
3937	5225	}
3938	5226	}
3939	5227	}
..	..	@@ -3996,9 +5284,7 @@
3996	5284
3997	5285	freezemodel = false;
3998	5286	}
3999		-
4000		- boolean flashIt = true;
4001		-
	5287	+
4002	5288	public void valueChanged(TreeSelectionEvent e)
4003	5289	//public boolean handleEvent(Event event)
4004	5290	{
..	..	@@ -4008,7 +5294,8 @@
4008	5294	//new Exception().printStackTrace();
4009	5295
4010	5296	freezemodel = true;
4011		-
	5297	+ ClearUnpinned();
	5298	+
4012	5299	/**/
4013	5300	//switch (event.id)
4014	5301	{
..	..	@@ -4016,7 +5303,6 @@
4016	5303	//case 702: // Event.LIST_DESELECT
4017	5304	group.deselectAll();
4018	5305	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4019		- objEditor.ClearInfo(); // .GetMaterial());
4020	5306	if (tps != null)
4021	5307	{
4022	5308	for (int i=0; i < tps.length; i++)
..	..	@@ -4025,33 +5311,39 @@
4025	5311
4026	5312	//if (child.parent != null)
4027	5313	//child.parent.addSelectee(child);
	5314	+ objEditor.SetMaterial(child);
4028	5315	group.addSelectee(child);
4029		- objEditor.SetMaterial(child); // .GetMaterial());
4030		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4031		- System.err.println("info : " + child.GetPath());
4032	5316	}
4033	5317	}
4034		- else
4035		- {
4036		- objEditor.SetMaterial(group); // .GetMaterial());
4037		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4038		- System.err.println("info : " + group.GetPath());
4039		- }
	5318	+// else
	5319	+// {
	5320	+// objEditor.SetMaterial(group); // .GetMaterial());
	5321	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	5322	+// System.err.println("info : " + group.GetPath());
	5323	+// }
4040	5324
4041		- objEditor.SetText(); // jan 2014
4042		-
4043		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	5325	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4044	5326	CameraPane.flash = true;
4045	5327
4046		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5328	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4047	5329	// a camera
4048	5330	{
4049		- CameraPane.camerachangeframe = 0; // don't refuse it
4050		- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
4051		- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
4052		- // CameraPane.theRenderer.eyeCamera = CameraPane.theRenderer.manipCamera;
	5331	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5332	+ {
	5333	+ CameraPane.camerachangeframe = 0; // don't refuse it
	5334	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5335	+ }
	5336	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	5337	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4053	5338	}
4054	5339
	5340	+ if (tps != null && tps.length == 1)
	5341	+ {
	5342	+ EditSelection(false);
	5343	+ }
	5344	+
	5345	+ SetPinStates(tps != null && tps.length > 0);
	5346	+
4055	5347	refreshContents();
4056	5348	//return true;
4057	5349	}
..	..	@@ -4060,6 +5352,52 @@
4060	5352
4061	5353	freezemodel = false;
4062	5354	}
	5355	+
	5356	+ void SetPinStates(boolean enabled)
	5357	+ {
	5358	+ editButton.setEnabled(enabled);
	5359	+ uneditButton.setEnabled(enabled);
	5360	+ //unselectButton.setEnabled(enabled);
	5361	+ flashSelectionButton.setEnabled(enabled);
	5362	+
	5363	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5364	+
	5365	+ boolean allComposites = true;
	5366	+
	5367	+ if (group.selection != null)
	5368	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5369	+ {
	5370	+ Object next = e.nextElement();
	5371	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5372	+ {
	5373	+ allComposites = false;
	5374	+ break;
	5375	+ }
	5376	+ }
	5377	+
	5378	+ rootButton.setEnabled(allComposites);
	5379	+ }
	5380	+
	5381	+ void refreshContents(boolean cp)
	5382	+ {
	5383	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5384	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5385	+ {
	5386	+ objEditor.ClearInfo(); // .GetMaterial());
	5387	+
	5388	+ for (int i=0; i < group.selection.Size(); i++)
	5389	+ {
	5390	+ Object3D child = (Object3D) group.selection.get(i);
	5391	+
	5392	+ objEditor.AddInfo(child, this, true);
	5393	+// System.err.println("info : " + child.GetPath());
	5394	+ }
	5395	+
	5396	+ objEditor.SetText(); // jan 2014
	5397	+ }
	5398	+
	5399	+ super.refreshContents(cp);
	5400	+ }
4063	5401
4064	5402	void linkSomething(Object3D thing)
4065	5403	{
..	..	@@ -4131,16 +5469,19 @@
4131	5469	{
4132	5470	if (group.selection.isEmpty())
4133	5471	return;
4134		- GrafreeD.clipboardIsTempGroup = false;
	5472	+
	5473	+ Grafreed.clipboardIsTempGroup = false;
4135	5474	Composite tGroup = null;
4136	5475	if (group.selection.size() > 0) // 1)
4137	5476	{
4138	5477	tGroup = new cGroup();
4139		- GrafreeD.clipboardIsTempGroup = true;
	5478	+ Grafreed.clipboardIsTempGroup = true;
4140	5479	}
4141	5480
4142	5481	if (cut)
4143	5482	{
	5483	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5484	+// Save();
4144	5485	//int indices[] = jList.getSelectedIndices();
4145	5486	//for (int i = indices.length - 1; i >= 0; i--)
4146	5487	//jList.remove(indices[i]);
..	..	@@ -4176,16 +5517,16 @@
4176	5517	//System.out.println("cut " + child);
4177	5518	//System.out.println("parent = " + child.parent);
4178	5519	// tmp.addChild(child);
4179		- if (GrafreeD.clipboardIsTempGroup)
	5520	+ if (Grafreed.clipboardIsTempGroup)
4180	5521	tGroup.add/Child/(tmp);
4181	5522	else
4182		- GrafreeD.clipboard = tmp;
	5523	+ Grafreed.clipboard = tmp;
4183	5524	}
4184	5525	else
4185		- if (GrafreeD.clipboardIsTempGroup)
	5526	+ if (Grafreed.clipboardIsTempGroup)
4186	5527	tGroup.add/Child/(child);
4187	5528	else
4188		- GrafreeD.clipboard = child;
	5529	+ Grafreed.clipboard = child;
4189	5530	}
4190	5531
4191	5532	//ResetModel();
..	..	@@ -4217,21 +5558,23 @@
4217	5558	//System.out.println("cut " + elem);
4218	5559	//System.out.println("parent = " + elem.parent);
4219	5560	// tmp.addChild(elem);
4220		- if (GrafreeD.clipboardIsTempGroup)
	5561	+ if (Grafreed.clipboardIsTempGroup)
4221	5562	tGroup.add/Child/(tmp);
4222	5563	else
4223		- GrafreeD.clipboard = tmp;
	5564	+ Grafreed.clipboard = tmp;
4224	5565	}
4225	5566	else
4226		- if (GrafreeD.clipboardIsTempGroup)
	5567	+ if (Grafreed.clipboardIsTempGroup)
4227	5568	tGroup.add/Child/(child);
4228	5569	else
4229		- GrafreeD.clipboard = child;
	5570	+ Grafreed.clipboard = child;
4230	5571	}
4231	5572
4232	5573	}
4233		- if (GrafreeD.clipboardIsTempGroup)
4234		- GrafreeD.clipboard = tGroup;
	5574	+
	5575	+ if (Grafreed.clipboardIsTempGroup)
	5576	+ Grafreed.clipboard = tGroup;
	5577	+
4235	5578	if (cut)
4236	5579	{
4237	5580	ResetModel();
..	..	@@ -4241,11 +5584,15 @@
4241	5584
4242	5585	void paste(boolean expand)
4243	5586	{
	5587	+ if (Globals.REPLACEONMAKE)
	5588	+ Save();
	5589	+ boolean keep = Globals.REPLACEONMAKE;
	5590	+ Globals.REPLACEONMAKE = false;
4244	5591	// if (GrafreeD.clipboard == null)
4245	5592	// return;
4246	5593	boolean first = true;
4247	5594
4248		- if (GrafreeD.clipboardIsTempGroup)
	5595	+ if (Grafreed.clipboardIsTempGroup)
4249	5596	{
4250	5597	Composite temp;
4251	5598
..	..	@@ -4256,7 +5603,7 @@
4256	5603	temp = (Composite)Applet3D.clipboard.deepCopy();
4257	5604	*/
4258	5605	Object3D elem;
4259		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5606	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4260	5607	{
4261	5608	Object3D child = (Object3D)e.nextElement();
4262	5609
..	..	@@ -4290,21 +5637,22 @@
4290	5637	//Object3D cb = Applet3D.clipboard;
4291	5638	//temp.addChild(cb);
4292	5639	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4293		- assert(GrafreeD.clipboard.parent == null);
4294		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4295		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4296		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4297		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	5640	+ assert(Grafreed.clipboard.parent == null);
	5641	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5642	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5643	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5644	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4298	5645	else
4299		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4300		- GrafreeD.clipboard.get(0).parent = keepparent;
	5646	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5647	+ Grafreed.clipboard.get(0).parent = keepparent;
4301	5648	}
4302	5649
	5650	+ Globals.REPLACEONMAKE = keep;
4303	5651	ResetModel();
4304	5652	refreshContents();
4305	5653	}
4306	5654
4307		- void pasteInto(boolean copyit)
	5655	+ void pasteInto(boolean copyit, boolean clone)
4308	5656	{
4309	5657	// if (GrafreeD.clipboard == null)
4310	5658	// return;
..	..	@@ -4333,15 +5681,22 @@
4333	5681	if (copyit)
4334	5682	{
4335	5683	// paste(false);
4336		- CloneClipboard(false); // sept 2014
	5684	+ if (clone)
	5685	+ {
	5686	+ CloneClipboard(false); // sept 2014
	5687	+ }
	5688	+ else
	5689	+ {
	5690	+ paste(false);
	5691	+ }
4337	5692	}
4338	5693	else
4339	5694	{
4340	5695	boolean first = true;
4341	5696
4342		- if (GrafreeD.clipboardIsTempGroup)
	5697	+ if (Grafreed.clipboardIsTempGroup)
4343	5698	{
4344		- Composite temp = (Composite)GrafreeD.clipboard;
	5699	+ Composite temp = (Composite)Grafreed.clipboard;
4345	5700	Object3D copy;
4346	5701	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4347	5702	{
..	..	@@ -4351,7 +5706,7 @@
4351	5706	}
4352	5707	} else
4353	5708	{
4354		- linkSomething(GrafreeD.clipboard); //.get(0));
	5709	+ linkSomething(Grafreed.clipboard); //.get(0));
4355	5710	}
4356	5711	}
4357	5712	}
..	..	@@ -4428,6 +5783,10 @@
4428	5783
4429	5784	void group(Object3D csg, boolean grab)
4430	5785	{
	5786	+ if (Globals.REPLACEONMAKE)
	5787	+ Save();
	5788	+ boolean keep = Globals.REPLACEONMAKE;
	5789	+ Globals.REPLACEONMAKE = false;
4431	5790	if (//false) // why??
4432	5791	!group.selection.isEmpty())
4433	5792	{
..	..	@@ -4541,10 +5900,15 @@
4541	5900	//node.add(csg);
4542	5901	//makeSomething(node);
4543	5902	makeSomething(csg);
	5903	+ Globals.REPLACEONMAKE = keep;
4544	5904	}
4545	5905
4546	5906	void Ungroup(Object3D g)
4547	5907	{
	5908	+ if (Globals.REPLACEONMAKE)
	5909	+ Save();
	5910	+ boolean keep = Globals.REPLACEONMAKE;
	5911	+ Globals.REPLACEONMAKE = false;
4548	5912	if (g instanceof HiddenObject)
4549	5913	{
4550	5914	HiddenObject h = (HiddenObject) g;
..	..	@@ -4561,6 +5925,7 @@
4561	5925	objEditor.makeSomething(g.get(i), false);
4562	5926	}
4563	5927	}
	5928	+ Globals.REPLACEONMAKE = keep;
4564	5929	}
4565	5930
4566	5931	void ungroup()
..	..	@@ -4756,21 +6121,6 @@
4756	6121	}
4757	6122	*/
4758	6123
4759		- void ImportGFD()
4760		- {
4761		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4762		- browser.show();
4763		- String filename = browser.getFile();
4764		- if (filename != null && filename.length() > 0)
4765		- {
4766		- String fullname = browser.getDirectory() + filename;
4767		-
4768		- //Object3D readobj =
4769		- objEditor.ReadGFD(fullname, objEditor);
4770		- //makeSomething(readobj);
4771		- }
4772		- }
4773		-
4774	6124	/*
4775	6125	public void Callback(Object obj)
4776	6126	{
..	..	@@ -4794,26 +6144,9 @@
4794	6144	}
4795	6145	*/
4796	6146
4797		- void ImportVRMLX3D()
4798		- {
4799		- if (GrafreeD.standAlone)
4800		- {
4801		- /**/
4802		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4803		- browser.show();
4804		- String filename = browser.getFile();
4805		- if (filename != null && filename.length() > 0)
4806		- {
4807		- String fullname = browser.getDirectory() + filename;
4808		- LoadVRMLX3D(fullname);
4809		- }
4810		- /**/
4811		- }
4812		- }
4813		-
4814	6147	String GetFile(String dialogName)
4815	6148	{
4816		- if (GrafreeD.standAlone)
	6149	+ if (Grafreed.standAlone)
4817	6150	{
4818	6151	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4819	6152	browser.show();
..	..	@@ -4877,10 +6210,48 @@
4877	6210	cButton flashSelectionButton;
4878	6211	cButton editButton;
4879	6212	cButton uneditButton;
	6213	+ JCheckBox allParamsButton;
4880	6214	cButton clearpanelButton;
4881		- cButton allParamsButton;
4882	6215	cButton unselectButton;
4883	6216
	6217	+ cButton restoreCameraButton;
	6218	+
	6219	+ cButton oneStepButton;
	6220	+
	6221	+ cButton groupButton;
	6222	+ cButton ungroupButton;
	6223	+ cButton compositeButton;
	6224	+ cButton switchButton;
	6225	+ cButton loopButton;
	6226	+ cButton textureButton;
	6227	+
	6228	+ cButton skybox1Button;
	6229	+ cButton skybox2Button;
	6230	+ cButton skybox3Button;
	6231	+ cButton skybox4Button;
	6232	+ cButton skybox5Button;
	6233	+ cButton skybox6Button;
	6234	+ cButton skybox7Button;
	6235	+
	6236	+ cButton skybox11Button;
	6237	+ cButton skybox12Button;
	6238	+ cButton skybox13Button;
	6239	+ cButton skybox14Button;
	6240	+ cButton skybox15Button;
	6241	+ cButton skybox16Button;
	6242	+ cButton skybox17Button;
	6243	+
	6244	+ cButton gridButton;
	6245	+ cButton boxButton;
	6246	+ cButton sphereButton;
	6247	+ cButton coneButton;
	6248	+ cButton torusButton;
	6249	+ cButton superButton;
	6250	+ cButton kleinButton;
	6251	+ cButton particlesButton;
	6252	+ cButton overlayButton;
	6253	+ cButton lightButton;
	6254	+
4884	6255	cButton screenfitButton;
4885	6256	cButton screenfitpointButton;
4886	6257	cButton snapobjectButton;
..	..	@@ -4892,14 +6263,6 @@
4892	6263
4893	6264	cButton setsupportButton;
4894	6265
4895		- cButton twoButton;
4896		- cButton sixButton;
4897		- cButton threeButton;
4898		- cButton sevenButton;
4899		- cButton fourButton; // full panel
4900		- cButton oneButton; // full XYZ
4901		- //cButton currentLayout;
4902		-
4903	6266	//
4904	6267	//Composite
4905	6268	Object3D // to do !!
..	..	@@ -4909,10 +6272,12 @@
4909	6272	//JTree jTree;
4910	6273	private MenuItem lookAtItem;
4911	6274	private MenuItem lookFromItem;
4912		- private MenuItem switchItem;
4913		- private MenuItem cutItem;
4914		- private MenuItem duplicateItem;
4915		- private MenuItem cloneItem;
	6275	+ private MenuItem switchViewItem;
	6276	+ private JMenuItem cutItem;
	6277	+ private MenuItem undoItem;
	6278	+ private MenuItem redoItem;
	6279	+ private JMenuItem duplicateItem;
	6280	+ private JMenuItem cloneItem;
4916	6281	private MenuItem cloneSupportItem;
4917	6282	private MenuItem overwriteGeoItem;
4918	6283	private MenuItem overwriteMatItem;
..	..	@@ -4924,7 +6289,7 @@
4924	6289	private MenuItem linkverticesItem;
4925	6290	private MenuItem relinkverticesItem;
4926	6291	private MenuItem setMasterItem;
4927		- private MenuItem resetMeshItem;
	6292	+ private MenuItem resetAllItem;
4928	6293	private MenuItem stepAllItem;
4929	6294	private MenuItem revertMeshItem;
4930	6295	private MenuItem poseMeshItem;
..	..	@@ -4933,12 +6298,13 @@
4933	6298	private MenuItem cloneGeometriesItem;
4934	6299	private MenuItem shareGeometriesItem;
4935	6300	private MenuItem mergeGeometriesItem;
4936		- private MenuItem copyItem;
	6301	+ private JMenuItem copyItem;
4937	6302	private MenuItem pasteItem;
4938		- private MenuItem pasteLinkItem;
4939		- private MenuItem pasteCloneItem;
4940		- private MenuItem pasteExpandItem;
4941		- private MenuItem clearItem;
	6303	+ private JMenuItem pasteIntoItem;
	6304	+ private JMenuItem pasteLinkItem;
	6305	+ private JMenuItem pasteCloneItem;
	6306	+ private JMenuItem pasteExpandItem;
	6307	+ private JMenuItem deleteItem;
4942	6308	private MenuItem clearAllItem;
4943	6309	private MenuItem genUVItem;
4944	6310	private MenuItem genNormalsMESHItem;
..	..	@@ -4973,6 +6339,10 @@
4973	6339	private MenuItem showleavesItem;
4974	6340	private MenuItem markleavesItem;
4975	6341	private MenuItem unmarkleavesItem;
	6342	+ private MenuItem rewindleavesItem;
	6343	+ private MenuItem unrewindleavesItem;
	6344	+ private MenuItem randomleavesItem;
	6345	+ private MenuItem unrandomleavesItem;
4976	6346
4977	6347	private MenuItem flipVItem;
4978	6348	private MenuItem unflipVItem;
..	..	@@ -4984,15 +6354,17 @@
4984	6354	private MenuItem panoTexturesItem;
4985	6355
4986	6356	private MenuItem resetCentroidItem;
4987		- private MenuItem transformgeometryItem;
	6357	+ private MenuItem resetCentroidXZItem;
4988	6358	private MenuItem resetTransformItem;
	6359	+ private MenuItem transformGeometryItem;
	6360	+ private MenuItem transformChildrenItem;
4989	6361	private MenuItem hideItem;
4990		- private MenuItem grabItem;
	6362	+ private JMenuItem grabItem;
4991	6363	private MenuItem backItem;
4992	6364	private MenuItem frontItem;
4993	6365	private MenuItem cameraItem;
4994	6366	private MenuItem compositeItem;
4995		- private MenuItem randomItem;
	6367	+ private MenuItem switchItem;
4996	6368	private MenuItem physicsItem;
4997	6369	private MenuItem frameselectorItem;
4998	6370	private MenuItem scriptNodeItem;
..	..	@@ -5000,13 +6372,14 @@
5000	6372	private MenuItem switchTransfoItem;
5001	6373	private MenuItem morphItem;
5002	6374	private MenuItem linkerItem;
5003		- private MenuItem ungroupItem;
	6375	+ private JMenuItem ungroupItem;
5004	6376	private MenuItem editItem;
5005	6377	private MenuItem openWindowItem;
5006	6378	private MenuItem editLeafItem;
5007	6379
5008	6380	private MenuItem resetParentItem;
5009	6381	private MenuItem repairParentItem;
	6382	+ private MenuItem repairShadowItem;
5010	6383	private MenuItem sortbysizeItem;
5011	6384	private MenuItem sortbynameItem;
5012	6385
..	..	@@ -5015,6 +6388,8 @@
5015	6388	private MenuItem attachBumpItem;
5016	6389	private MenuItem detachBumpItem;
5017	6390	private MenuItem pigmentBumpItem;
	6391	+ private MenuItem embedTexturesItem;
	6392	+ private MenuItem deEmbedTexturesItem;
5018	6393
5019	6394	private MenuItem particleItem;
5020	6395	private MenuItem ragdollItem;
..	..	@@ -5031,7 +6406,7 @@
5031	6406	private MenuItem blobItem;
5032	6407	private MenuItem latheItem;
5033	6408	private MenuItem bezierItem;
5034		- private MenuItem checkerItem;
	6409	+ private MenuItem overlayItem;
5035	6410	private MenuItem meshItem;
5036	6411	// private MenuItem meshGroupItem;
5037	6412	private MenuItem springItem;
..	..	@@ -5053,11 +6428,6 @@
5053	6428	private MenuItem doubleItem;
5054	6429	private MenuItem tripleItem;
5055	6430
5056		- private MenuItem importGFDItem;
5057		- private MenuItem importVRMLX3DItem;
5058		- private MenuItem import3DSItem;
5059		- private MenuItem importOBJItem;
5060		-
5061	6431	private MenuItem computeAOItem;
5062	6432	private MenuItem recompileItem;
5063	6433	private MenuItem editScriptItem;
..	..	@@ -5067,4 +6437,8 @@
5067	6437	private MenuItem analyzeItem;
5068	6438	private MenuItem dumpItem;
5069	6439	//boolean freezemodel = false;
	6440	+
	6441	+ Menu cameraMenu;
	6442	+ MenuItem editCameraItem;
	6443	+ MenuItem restoreCameraItem;
5070	6444	}