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