~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,130 @@
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 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	949	+ {
	950	+ currenttab = new cGridBag();
	951	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	952	+ currenttab.setName(tabname);
	953	+ //added = false;
	954	+ resourcecontainer.add(currenttab);
	955	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	956	+ rowcount = 1;
	957	+ colcount = 0;
	958	+ texturecount = 0;
	959	+ }
	960	+
	961	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	962	+ {
	963	+ //if (!added)
	964	+ {
	965	+ //added = true;
	966	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	967	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	968	+ }
	969	+
	970	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	971	+
	972	+ if (++colcount >= columns)
	973	+ {
	974	+ colcount = 0;
	975	+ currenttab.Return();
	976	+
	977	+ if (rowcount++ >= rows)
	978	+ {
	979	+ rowcount = 0;
	980	+ }
	981	+ }
	982	+ }
	983	+ else
	984	+ {
	985	+// if (!path[path.length-1].equals("icons"))
	986	+// resourcecontainer.Return();
	987	+ }
	988	+ }
	989	+
	990	+ void CreateTexturePanel(cGridBag container)
	991	+ {
	992	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	993	+ container.add(resourcecontainer);
	994	+
	995	+ Grafreed.ParseResources("textures", this);
	996	+ }
	997	+
406	998	void SetupUI2(ObjEditor oe)
407	999	{
	1000	+ // June 2019
	1001	+ if (oe == null)
	1002	+ {
	1003	+ //super.SetupUI2(this);
	1004	+ //return;
	1005	+ }
	1006	+
	1007	+ if (copy != group)
	1008	+ {
	1009	+ //super.SetupUI2(this);
	1010	+ }
	1011	+
408	1012	//new Exception().printStackTrace();
409	1013
410	1014	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	1015	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
417	1016
418	1017	oe.buttonGroup = new ButtonGroup();
..	..	@@ -433,110 +1032,263 @@
433	1032	oe.radioPanel.add(dummyButton);
434	1033	oe.buttonGroup.add(dummyButton);
435	1034	*/
436		- aConstraints.gridy += 1;
	1035	+ cGridBag copyOptionsPanel = new cGridBag();
	1036	+
	1037	+ copyOptionsPanel.preferredHeight = 2;
437	1038
438	1039	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
439	1040
440		- oe.aConstraints.gridwidth = 1;
441		- oe.aConstraints.gridx = 0;
	1041	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1042	+ //minButton.setToolTipText("Minimize window");
	1043	+ //minButton.addActionListener(this);
442	1044
443		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
444		- liveCB.setToolTipText("Enabled animation");
445		- liveCB.addItemListener(this);
446		-
447		- oe.aConstraints.gridx += 1;
448		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK), oe.aConstraints);
449		- trackCB.setToolTipText("Enable tracking");
450		- trackCB.addItemListener(this);
451		-
452		- oe.aConstraints.gridx += 1;
453		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	1045	+ if (Globals.ADVANCED)
	1046	+ {
	1047	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1048	+// maxButton.setToolTipText("Maximize window");
	1049	+// maxButton.addActionListener(this);
	1050	+ }
	1051	+
	1052	+ cButton gcButton;
	1053	+
	1054	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1055	+// gcButton.setToolTipText("Garbage collect");
	1056	+// gcButton.addActionListener(new ActionListener()
	1057	+// {
	1058	+// public void actionPerformed(ActionEvent e)
	1059	+// {
	1060	+// System.gc();
	1061	+// }
	1062	+// });
	1063	+
	1064	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1065	+ collapseButton.setToolTipText("Collapse toolbar");
	1066	+ collapseButton.addActionListener(this);
	1067	+
	1068	+ oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1069	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1070	+ maximize3DButton.addActionListener(this);
	1071	+
	1072	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1073	+ twoButton.setToolTipText("Show 3D view only");
	1074	+ twoButton.addActionListener(this);
	1075	+ this.fullscreenLayout = twoButton;
	1076	+
	1077	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1078	+ threeButton.setToolTipText("Show controls and 3D view");
	1079	+ threeButton.addActionListener(this);
	1080	+ if (Globals.ADVANCED)
	1081	+ {
	1082	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1083	+ sixButton.setToolTipText("Show 3D view and controls");
	1084	+ sixButton.addActionListener(this);
	1085	+ }
	1086	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1087	+// sevenButton.setToolTipText("3-column layout");
	1088	+// sevenButton.addActionListener(this);
	1089	+ //
	1090	+
	1091	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1092	+ fullButton.setToolTipText("Full-screen window");
	1093	+ fullButton.addActionListener(this);
	1094	+
	1095	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
454	1096	screenfitButton.setToolTipText("Screen fit");
455	1097	screenfitButton.addActionListener(this);
456		- oe.aConstraints.gridx += 1;
	1098	+
	1099	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1100	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1101	+ restoreCameraButton.addActionListener(this);
	1102	+
	1103	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1104	+ saveVersionButton.setToolTipText("Duplicate current version");
	1105	+ saveVersionButton.addActionListener(this);
	1106	+
	1107	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1108	+ deleteVersionButton.setToolTipText("Delete current version");
	1109	+ deleteVersionButton.addActionListener(this);
	1110	+
	1111	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1112	+ previousVersionButton.setToolTipText("Previous version");
	1113	+ previousVersionButton.addActionListener(this);
	1114	+ previousVersionButton.setEnabled(false);
	1115	+
	1116	+ cGridBag updown = new cGridBag().setVertical(true);
	1117	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1118	+ restoreButton.setToolTipText("Undo (restore current version)");
	1119	+ restoreButton.addActionListener(this);
	1120	+ //restoreButton.setEnabled(false);
	1121	+
	1122	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1123	+ replaceButton.setToolTipText("Save (replace current version)");
	1124	+ replaceButton.addActionListener(this);
	1125	+ //replaceButton.setEnabled(false);
	1126	+
	1127	+ copyOptionsPanel.add(updown);
	1128	+
	1129	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1130	+ nextVersionButton.setToolTipText("Next version");
	1131	+ nextVersionButton.addActionListener(this);
	1132	+ nextVersionButton.setEnabled(false);
	1133	+
	1134	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1135	+ oneStepButton.setToolTipText("Animate one step forward");
	1136	+ oneStepButton.addActionListener(this);
	1137	+
	1138	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1139	+ liveCB.setToolTipText("Enable animation");
	1140	+ liveCB.addItemListener(this);
	1141	+
	1142	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	1143	+ fastCB.setToolTipText("Fast mode");
	1144	+ fastCB.addItemListener(this);
	1145	+
	1146	+ //oe.toolboxPanel.Return();
	1147	+
	1148	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1149	+// trackCB.setToolTipText("Enable tracking");
	1150	+// trackCB.addItemListener(this);
	1151	+
457	1152	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
458	1153	// screenfitpointButton.addActionListener(this);
459		-// oe.aConstraints.gridx += 1;
460		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
461		- snapobjectButton.addActionListener(this);
462		- snapobjectButton.setToolTipText("Snap Object");
463		- oe.aConstraints.gridx += 1;
464	1154
465		- //aConstraints.gridx = 0;
466		- //aConstraints.gridy += 1;
467		- oe.aConstraints.weighty = 0;
468		- oe.aConstraints.gridwidth = 1;
469		-
470		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
471		- flashSelectionButton.setToolTipText("Show selection");
472		- flashSelectionButton.addActionListener(this);
473		-
474		- oe.toolbarPanel.add(new cButton(" ", false));
475		-
476		- oe.aConstraints.gridx += 1;
477		- oe.aConstraints.weighty = 0;
478		- oe.aConstraints.gridwidth = 1;
479		-
480		- //
481		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
482		- twoButton.setToolTipText("Show center view only");
483		- twoButton.addActionListener(this);
484		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	1155	+ if (Globals.ADVANCED)
	1156	+ {
	1157	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1158	+ snapobjectButton.addActionListener(this);
	1159	+ snapobjectButton.setToolTipText("Snap Object");
	1160	+
	1161	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
485	1162	fourButton.addActionListener(this);
486		- fourButton.setToolTipText("Show left panel only");
487		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
488		- sixButton.setToolTipText("2-column layout left");
489		- sixButton.addActionListener(this);
490		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
491		- threeButton.setToolTipText("2-column layout right");
492		- threeButton.addActionListener(this);
493		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
494		- sevenButton.setToolTipText("3-column layout");
495		- sevenButton.addActionListener(this);
496		- //
	1163	+ fourButton.setToolTipText("Show control panel only");
	1164	+ }
497	1165
498		- oe.toolbarPanel.add(rootButton = new cButton(" o o o ")); //, oe.aConstraints);
499		- rootButton.setToolTipText("Edit object in new tab");
	1166	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	1167	+
	1168	+
	1169	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1170	+ rootButton.setToolTipText("Open selection in new tab");
500	1171	rootButton.addActionListener(this);
501		- oe.aConstraints.gridx += 1;
502		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	1172	+
	1173	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
503	1174	closeButton.setToolTipText("Close tab");
504	1175	closeButton.addActionListener(this);
505	1176	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
506	1177	//clearButton.addActionListener(this);
507		- oe.aConstraints.gridx += 1;
508		-
509		- oe.aConstraints.gridx = 1; //
510		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
511		- editButton.addActionListener(this);
512		- oe.aConstraints.gridx += 1;
513		- oe.aConstraints.weighty = 0;
514		- oe.aConstraints.gridwidth = 1;
515	1178
516		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	1179	+ cGridBag row1 = new cGridBag();
	1180	+
	1181	+ // INSERT
	1182	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1183	+ gridButton.setToolTipText("Create ground");
	1184	+ gridButton.addActionListener(this);
	1185	+
	1186	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1187	+ boxButton.setToolTipText("Create box");
	1188	+ boxButton.addActionListener(this);
	1189	+
	1190	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1191	+ sphereButton.setToolTipText("Create sphere");
	1192	+ sphereButton.addActionListener(this);
	1193	+
	1194	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1195	+ coneButton.setToolTipText("Create cone");
	1196	+ coneButton.addActionListener(this);
	1197	+
	1198	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1199	+ torusButton.setToolTipText("Create torus");
	1200	+ torusButton.addActionListener(this);
	1201	+
	1202	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1203	+ superButton.setToolTipText("Create superellipsoid");
	1204	+ superButton.addActionListener(this);
	1205	+
	1206	+ if (Globals.ADVANCED)
	1207	+ {
	1208	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1209	+ kleinButton.setToolTipText("Create Klein bottle");
	1210	+ kleinButton.addActionListener(this);
	1211	+ }
	1212	+
	1213	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1214	+ particlesButton.setToolTipText("Create particle system");
	1215	+ particlesButton.addActionListener(this);
	1216	+
	1217	+ oe.toolboxPanel.add(row1);
	1218	+
	1219	+ cGridBag row2 = new cGridBag();
	1220	+
	1221	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1222	+ groupButton.setToolTipText("Create group");
	1223	+ groupButton.addActionListener(this);
	1224	+
	1225	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1226	+ compositeButton.setToolTipText("Create composite");
	1227	+ compositeButton.addActionListener(this);
	1228	+
	1229	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1230	+ switchButton.setToolTipText("Create item switcher");
	1231	+ switchButton.addActionListener(this);
	1232	+
	1233	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1234	+ loopButton.setToolTipText("Create loop");
	1235	+ loopButton.addActionListener(this);
	1236	+
	1237	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1238	+ textureButton.setToolTipText("Create texture");
	1239	+ textureButton.addActionListener(this);
	1240	+
	1241	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1242	+ overlayButton.setToolTipText("Create overlay");
	1243	+ overlayButton.addActionListener(this);
	1244	+
	1245	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1246	+ lightButton.setToolTipText("Create light");
	1247	+ lightButton.addActionListener(this);
	1248	+
	1249	+ oe.toolboxPanel.add(row2);
	1250	+
	1251	+ cGridBag textures = new cGridBag();
	1252	+
	1253	+ CreateTexturePanel(textures);
	1254	+
	1255	+ oe.toolboxPanel.add(textures);
	1256	+
	1257	+ textures.preferredHeight = 100;
	1258	+
	1259	+ CreateSkyboxPanel(oe.skyboxPanel);
	1260	+
	1261	+ // EDIT panel
	1262	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1263	+ editButton.setToolTipText("Pin selection controls");
	1264	+ editButton.addActionListener(this);
	1265	+
	1266	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1267	+ uneditButton.setToolTipText("Unpin and remove selection controls");
517	1268	uneditButton.addActionListener(this);
518	1269
519		- oe.aConstraints.gridx += 1;
520		- oe.aConstraints.weighty = 0;
521		- oe.aConstraints.gridwidth = 1;
522		-
523		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
524		- clearPanelButton.addActionListener(this);
525		-
526		- oe.aConstraints.gridx += 1;
527		- oe.aConstraints.weighty = 0;
528		- oe.aConstraints.gridwidth = 1;
529		-
530		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	1270	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1271	+ allParamsButton.setToolTipText("Show all controls");
531	1272	allParamsButton.addActionListener(this);
532	1273
533		- oe.aConstraints.gridx += 1;
534		- oe.aConstraints.weighty = 0;
535		- oe.aConstraints.gridwidth = 1;
536		-
537		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
538		- unselectButton.addActionListener(this);
	1274	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1275	+ clearPanelButton.setToolTipText("Clear all controls");
	1276	+ clearPanelButton.addActionListener(this);
539	1277
	1278	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1279	+ //unselectButton.setToolTipText("Unselect");
	1280	+ //unselectButton.addActionListener(this);
	1281	+
	1282	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1283	+ flashSelectionButton.setToolTipText("Highlight selection");
	1284	+ flashSelectionButton.addActionListener(this);
	1285	+
	1286	+ editCommandsPanel.preferredHeight = 1;
	1287	+
	1288	+ SetPinStates(false);
	1289	+// oe.treePanel.add(commandsPanel);
	1290	+// oe.treePanel.Return();
	1291	+
540	1292	// oe.aConstraints.gridx += 1;
541	1293	// oe.aConstraints.weighty = 0;
542	1294	// oe.aConstraints.gridwidth = 1;
..	..	@@ -548,47 +1300,32 @@
548	1300	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
549	1301	// gcButton.addActionListener(this);
550	1302
551		- oe.aConstraints.gridx = 0;
552		- oe.aConstraints.gridy += 1;
553		-
554		- //ctrlPanel.add(objList = new List(5, true));
555		- oe.aConstraints.gridwidth = 100;
556		- // oe.aConstraints.gridheight = 100;
557		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
558		- oe.aConstraints.gridheight = 1;
559		- oe.aConstraints.weighty = 0.5;
560		- oe.aConstraints.gridx = 0;
561		- JScrollPane jSP;
	1303	+ cGridBag jSPPanel = new cGridBag();
	1304	+
	1305	+ JScrollPane jSP;
562	1306	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
563		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	1307	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
564	1308	ResetModel();
565		- oe.aConstraints.weighty = 0.5;
566		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
567		- oe.aConstraints.gridy += 1;
568		- oe.aConstraints.gridwidth = 1;
569		-
570		- oe.aConstraints.weighty = 0;
571		- oe.aConstraints.gridwidth = 2;
572		-
573		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
574		- colorCB.addItemListener(this);
575		- oe.aConstraints.gridx += 2;
576		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
577		- materialCB.addItemListener(this);
578		- oe.aConstraints.gridx += 2;
579		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
580		- textureCB.addItemListener(this);
581		-
582		- oe.aConstraints.gridx = 0;
583		- oe.aConstraints.gridy += 1;
584	1309
	1310	+ oe.treePanel.add(jSPPanel);
	1311	+ oe.treePanel.Return();
	1312	+
	1313	+ oe.treePanel.add(copyOptionsPanel);
	1314	+ oe.treePanel.Return();
	1315	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1316	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1317	+ sliderPane.preferredHeight = 1;
	1318	+
	1319	+// mainPanel.setDividerLocation(0.1); //1.0);
	1320	+ mainPanel.setResizeWeight(0.4);
	1321	+
585	1322	//jList.addListSelectionListener(this);
586	1323	oe.jTree.addTreeSelectionListener(this);
587	1324	//jTree.setRootVisible(false);
588	1325	//jTree.setEditable(true);
589	1326	oe.jTree.setDragEnabled(true);
590	1327	//jTree.setPreferredSize(new Dimension(10,10));
591		- jSP.setPreferredSize(new Dimension(100,200));
	1328	+ //jSP.setPreferredSize(new Dimension(100,200));
592	1329
593	1330	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
594	1331
..	..	@@ -600,97 +1337,171 @@
600	1337	dgr.addDragGestureListener(this);
601	1338	}catch(Exception e) {}
602	1339	*/
603		- radio.layout = sevenButton;
	1340	+ radio.layout = threeButton; // sixButton;
604	1341	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
605	1342	}
606	1343
607		- void AddOptions(JPanel panel, GridBagConstraints constraints)
	1344	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
608	1345	{
609		- constraints.gridx = 0;
610		- constraints.gridy = 0;
611		- panel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), constraints);
612		- fastCB.setToolTipText("Fast mode");
613		- fastCB.addItemListener(this);
614		- constraints.gridy += 1;
615		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), constraints);
616		- supportCB.setToolTipText("Enabled rigging");
617		- supportCB.addItemListener(this);
	1346	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1347	+ colorCB.setToolTipText("Copy color when dropped");
	1348	+ colorCB.addItemListener(this);
618	1349
619		- // constraints.gridy += 1;
	1350	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1351	+ materialCB.setToolTipText("Copy material when dropped");
	1352	+ materialCB.addItemListener(this);
	1353	+
	1354	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1355	+ textureCB.setToolTipText("Copy texture when dropped");
	1356	+ textureCB.addItemListener(this);
	1357	+
	1358	+ panel.Return();
	1359	+
	1360	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	1361	+ boxCB.setToolTipText("Display bounding boxes");
	1362	+ boxCB.addItemListener(this);
	1363	+
	1364	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	1365	+ zoomBoxCB.setToolTipText("Display only for wheel");
	1366	+ zoomBoxCB.addItemListener(this);
	1367	+
	1368	+ if (true) // Globals.ADVANCED)
	1369	+ {
	1370	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1371	+// supportCB.setToolTipText("Enable rigging");
	1372	+// supportCB.addItemListener(this);
	1373	+
	1374	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1375	+ freezeCB.setToolTipText("Fast moving camera");
	1376	+ freezeCB.addItemListener(this);
	1377	+
620	1378	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
621	1379	// localCB.addItemListener(this);
622	1380
623		- constraints.gridy += 1;
624		- panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD), constraints);
	1381	+ panel.Return();
	1382	+
	1383	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
625	1384	crowdCB.setToolTipText("Used for crowds");
626	1385	crowdCB.addItemListener(this);
627	1386
628		- constraints.gridy += 1;
629		- panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), constraints);
	1387	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
630	1388	smoothCB.setToolTipText("Snapping delay");
631	1389	smoothCB.addItemListener(this);
632	1390
633		- constraints.gridy += 1;
634		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), constraints);
635		- slowCB.setToolTipText("Smooth interpolation");
636		- slowCB.addItemListener(this);
637		- constraints.gridy += 1;
638		- panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE), constraints);
639		- boxCB.setToolTipText("Display bounding boxes");
640		- boxCB.addItemListener(this);
641		- constraints.gridy += 1;
642		- panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE), constraints);
643		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
644		- zoomBoxCB.addItemListener(this);
645		-
	1391	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1392	+// slowCB.setToolTipText("Smooth interpolation");
	1393	+// slowCB.addItemListener(this);
	1394	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1395	+ minshaderCB.setToolTipText("Minimal fast shader");
	1396	+ minshaderCB.addItemListener(this);
	1397	+
646	1398	// constraints.gridy += 1;
647	1399	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
648	1400	// speakerMocapCB.addItemListener(this);
649	1401
	1402	+ panel.Return();
	1403	+
650	1404	if (false)
651	1405	{
652	1406	// handled in scripts
653		- constraints.gridy += 1;
654		- panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), constraints);
	1407	+ //constraints.gridy += 1;
	1408	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
655	1409	speakerCameraCB.addItemListener(this);
656	1410
657		- constraints.gridy += 1;
658		- panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), constraints);
	1411	+ //constraints.gridy += 1;
	1412	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
659	1413	speakerFocusCB.addItemListener(this);
660	1414
661		- constraints.gridy += 1;
662		- panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), constraints);
	1415	+ //constraints.gridy += 1;
	1416	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
663	1417	smoothfocusCB.addItemListener(this);
	1418	+ panel.Return();
664	1419	}
665	1420
666	1421	//constraints.gridx += 1;
667	1422	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
668	1423	// debugCB.addItemListener(this);
669	1424
670		- constraints.gridy += 1;
671		- panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL), constraints);
	1425	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1426	+ trackCB.setToolTipText("Enable tracking target");
	1427	+ trackCB.addItemListener(this);
	1428	+
	1429	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1430	+ oeilCB.setToolTipText("Move camera when tracking");
672	1431	oeilCB.addItemListener(this);
673	1432
674		- constraints.gridy += 1;
675		- panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT), constraints);
	1433	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1434	+ shadowCB.setToolTipText("When live compute shadows");
	1435	+ shadowCB.addItemListener(this);
	1436	+
	1437	+ panel.Return();
	1438	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1439	+ toggleTextureCB.setToolTipText("Load textures");
	1440	+ toggleTextureCB.addItemListener(this);
	1441	+
	1442	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1443	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1444	+ toggleSwitchCB.addItemListener(this);
	1445	+
	1446	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1447	+ autokeepCB.setToolTipText("On structure change");
	1448	+ autokeepCB.addItemListener(this);
	1449	+
	1450	+ panel.Return();
	1451	+ if (Globals.ADVANCED)
	1452	+ {
	1453	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
676	1454	lookAtCB.setToolTipText("Look-at target");
677	1455	lookAtCB.addItemListener(this);
	1456	+ }
	1457	+
	1458	+ }
	1459	+
	1460	+ cGridBag fill = new cGridBag();
	1461	+ fill.preferredHeight = 200;
	1462	+ cGridBag fill2 = new cGridBag();
	1463	+ fill2.preferredHeight = 200;
	1464	+ cGridBag fill3 = new cGridBag();
	1465	+ fill3.preferredHeight = 200;
	1466	+
	1467	+ panel.add(fill);
	1468	+ panel.add(fill2);
	1469	+ panel.add(fill3);
678	1470
679	1471	}
680	1472
681	1473	void EditObject(Object3D obj)
682	1474	{
	1475	+ assert(obj instanceof Composite);
	1476	+
	1477	+// if (obj.versionlist == null)
	1478	+// {
	1479	+// obj.versionlist = new Object3D[100];
	1480	+// obj.versionindex = -1;
	1481	+// }
	1482	+
683	1483	cRadio radioButton = new cRadio(obj.name);
	1484	+
	1485	+ // June 2019. Patch to avoid bug with transparency.
	1486	+ radioButton.hadMaterial = obj.material != null;
	1487	+ if (!radioButton.hadMaterial)
	1488	+ {
	1489	+ obj.material = new cMaterial();
	1490	+ }
	1491	+
684	1492	radioButton.SetObject(obj);
685		- radioButton.layout = sevenButton;
	1493	+ radioButton.layout = threeButton; // sixButton;
686	1494	radioButton.SetCamera(cameraView.renderCamera, false);
687	1495	radioButton.addActionListener(this);
688	1496	radioPanel.add(radioButton);
689	1497	buttonGroup.add(radioButton);
690	1498	radioButton.doClick();
691	1499	}
	1500	+
692	1501	void SetupViews(ObjEditor oe)
693	1502	{
	1503	+ theFrame = this;
	1504	+
694	1505	oe.SetupViews();
695	1506
696	1507	System.out.println("SetupViews");
..	..	@@ -699,23 +1510,30 @@
699	1510	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
700	1511	}
701	1512
702		- JCheckBox liveCB;
703		- JCheckBox supportCB;
704		- JCheckBox localCB;
705		- JCheckBox crowdCB;
706		- JCheckBox smoothCB;
707		- JCheckBox fastCB;
708		- JCheckBox slowCB;
709		- JCheckBox boxCB;
710		- JCheckBox zoomBoxCB;
711		- JCheckBox trackCB;
712		- JCheckBox smoothfocusCB;
	1513	+ cToggleButton liveCB;
	1514	+ cCheckBox supportCB;
	1515	+ cCheckBox localCB;
	1516	+ cCheckBox crowdCB;
	1517	+ cCheckBox smoothCB;
	1518	+ cCheckBox minshaderCB;
	1519	+
	1520	+ cToggleButton fastCB;
	1521	+ cCheckBox slowCB;
	1522	+ cCheckBox boxCB;
	1523	+ cCheckBox zoomBoxCB;
	1524	+ cCheckBox freezeCB;
	1525	+ //cToggleButton trackCB;
	1526	+ cCheckBox trackCB;
	1527	+ cCheckBox smoothfocusCB;
713	1528	// JCheckBox speakerMocapCB;
714		- JCheckBox speakerCameraCB;
715		- JCheckBox speakerFocusCB;
716		- JCheckBox debugCB;
717		- JCheckBox oeilCB;
718		- JCheckBox lookAtCB;
	1529	+ cCheckBox speakerCameraCB;
	1530	+ cCheckBox speakerFocusCB;
	1531	+ cCheckBox debugCB;
	1532	+
	1533	+ cCheckBox oeilCB;
	1534	+ cCheckBox shadowCB;
	1535	+ cCheckBox autokeepCB;
	1536	+ cCheckBox lookAtCB;
719	1537
720	1538	// static int COLOR = 1;
721	1539	// static int MATERIAL = 2;
..	..	@@ -723,9 +1541,9 @@
723	1541
724	1542	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
725	1543
726		- JCheckBox colorCB;
727		- JCheckBox materialCB;
728		- JCheckBox textureCB;
	1544	+ cCheckBox colorCB;
	1545	+ cCheckBox materialCB;
	1546	+ cCheckBox textureCB;
729	1547
730	1548	public void itemStateChanged(ItemEvent e)
731	1549	{
..	..	@@ -753,6 +1571,7 @@
753	1571	} else if(e.getSource() == liveCB)
754	1572	{
755	1573	cameraView.ToggleLive();
	1574	+ refreshContents(false);
756	1575	}
757	1576	else if(e.getSource() == supportCB)
758	1577	{
..	..	@@ -768,6 +1587,12 @@
768	1587	{
769	1588	cameraView.ToggleInertia();
770	1589	cameraView.repaint();
	1590	+ }
	1591	+ else if(e.getSource() == minshaderCB)
	1592	+ {
	1593	+ Globals.MINSHADER ^= true;
	1594	+ cameraView.programInitialized = false;
	1595	+ cameraView.repaint();
771	1596	}
772	1597	else if(e.getSource() == localCB)
773	1598	{
..	..	@@ -817,6 +1642,18 @@
817	1642	{
818	1643	cameraView.ToggleOeil();
819	1644	}
	1645	+ else if(e.getSource() == shadowCB)
	1646	+ {
	1647	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1648	+ }
	1649	+ else if(e.getSource() == freezeCB)
	1650	+ {
	1651	+ Globals.FREEZEONMOVE ^= true;
	1652	+ }
	1653	+ else if(e.getSource() == autokeepCB)
	1654	+ {
	1655	+ Globals.REPLACEONMAKE ^= true;
	1656	+ }
820	1657	else if(e.getSource() == lookAtCB)
821	1658	{
822	1659	cameraView.ToggleLookAt();
..	..	@@ -833,7 +1670,8 @@
833	1670
834	1671	/**/
835	1672	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
836		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1673	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1674	+ TreePath path = objEditor.jTree.getSelectionPath();
837	1675	if ((path == null) \|\| (path.getPathCount() <= 1)) {
838	1676	// We can't move the root node or an empty selection
839	1677	return;
..	..	@@ -896,8 +1734,6 @@
896	1734	}
897	1735	}
898	1736
899		- String string = (String) object;
900		-
901	1737	System.out.println("Transfer = " + object + "; drop : " + target);
902	1738	// if( object instanceof java.io.File[])
903	1739	// {
..	..	@@ -905,7 +1741,11 @@
905	1741	// objEditor.DropFile((java.io.File[]) object, true);
906	1742	// return;
907	1743	// }
908		- if (string.charAt(0) == '/')
	1744	+
	1745	+ String string = object.toString();
	1746	+
	1747	+ // File path for Mac and Windows
	1748	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
909	1749	{
910	1750	// file(s)
911	1751	String[] names = string.split("\n");
..	..	@@ -932,7 +1772,7 @@
932	1772
933	1773	flashIt = false;
934	1774	CameraPane pane = (CameraPane) target;
935		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1775	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
936	1776	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
937	1777
938	1778	if (group.selection.size() == 1)
..	..	@@ -948,23 +1788,33 @@
948	1788
949	1789	assert target == objEditor.jTree;
950	1790	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1791	+ Object3D destinationLeaf;
951	1792	try {
952		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1793	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
953	1794	} catch (Exception e) {
954	1795	System.out.println("destinationPath : " + destinationPath);
955	1796	return;
956	1797	}
957	1798
958		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1799	+ for (int i=group.selection.size(); --i>=0;)
959	1800	{
	1801	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1802	+
	1803	+ // Cannot move into itself
	1804	+ if (child == destinationLeaf)
	1805	+ return;
	1806	+ }
	1807	+
	1808	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1809	+// {
960	1810	loadClipboard(true);
961	1811	objEditor.jTree.setSelectionPath(destinationPath);
962		- pasteInto(false);
963		- } else {
964		- loadClipboard(false);
965		- objEditor.jTree.setSelectionPath(destinationPath);
966		- pasteInto(false); // true); // ???
967		- }
	1812	+ pasteInto(false, false);
	1813	+// } else {
	1814	+// loadClipboard(false);
	1815	+// objEditor.jTree.setSelectionPath(destinationPath);
	1816	+// pasteInto(false, false); // true); // ???
	1817	+// }
968	1818	}
969	1819	public void dropActionChanged(DropTargetDragEvent dtde)
970	1820	// Called if the user has modified the current drop gesture
..	..	@@ -1020,7 +1870,12 @@
1020	1870	TreePath path;
1021	1871
1022	1872	public TransferableTreePath(TreePath tp) {
1023		- path = tp;
	1873	+ Object[] objs = new Object[tp.getPathCount()];
	1874	+ for (int i=0; i<objs.length; i++)
	1875	+ {
	1876	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1877	+ }
	1878	+ path = new TreePath(objs);
1024	1879	}
1025	1880
1026	1881	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1069,85 +1924,107 @@
1069	1924	{
1070	1925	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1071	1926	//heightFieldItem.addActionListener(this);
1072		- gridItem = menu.add(new MenuItem("Grid"));
1073		- gridItem.addActionListener(this);
1074		- rectoidItem = menu.add(new MenuItem("Box"));
1075		- rectoidItem.addActionListener(this);
1076		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1077		- ellipsoidItem.addActionListener(this);
1078		- coneItem = menu.add(new MenuItem("Cone"));
1079		- coneItem.addActionListener(this);
1080		- torusItem = menu.add(new MenuItem("Torus"));
1081		- torusItem.addActionListener(this);
1082		- superItem = menu.add(new MenuItem("Superellipsoid"));
1083		- superItem.addActionListener(this);
	1927	+// gridItem = menu.add(new MenuItem("Grid"));
	1928	+// gridItem.addActionListener(this);
	1929	+// rectoidItem = menu.add(new MenuItem("Box"));
	1930	+// rectoidItem.addActionListener(this);
	1931	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1932	+// ellipsoidItem.addActionListener(this);
	1933	+// coneItem = menu.add(new MenuItem("Cone"));
	1934	+// coneItem.addActionListener(this);
	1935	+// torusItem = menu.add(new MenuItem("Torus"));
	1936	+// torusItem.addActionListener(this);
	1937	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1938	+// superItem.addActionListener(this);
	1939	+
	1940	+ cameraItem = menu.add(new MenuItem("Camera"));
	1941	+ cameraItem.addActionListener(this);
	1942	+
	1943	+ if (!Globals.ADVANCED)
	1944	+ {
1084	1945	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1085	1946	kleinItem.addActionListener(this);
1086		- particleItem = menu.add(new MenuItem("Particle system"));
1087		- particleItem.addActionListener(this);
	1947	+ }
	1948	+
	1949	+// particleItem = menu.add(new MenuItem("Particle system"));
	1950	+// particleItem.addActionListener(this);
	1951	+ if (Globals.ADVANCED)
	1952	+ {
1088	1953	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1089	1954	ragdollItem.addActionListener(this);
1090	1955	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1091	1956	ragdoll2Item.addActionListener(this);
	1957	+ }
1092	1958	menu.add("-");
1093		- meshItem = menu.add(new MenuItem("Mesh"));
	1959	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1094	1960	meshItem.addActionListener(this);
1095	1961	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1096	1962	// meshGroupItem.addActionListener(this);
	1963	+ if (Globals.ADVANCED)
	1964	+ {
1097	1965	springItem = menu.add(new MenuItem("Spring"));
1098	1966	springItem.addActionListener(this);
1099	1967	flagItem = menu.add(new MenuItem("Flag"));
1100	1968	flagItem.addActionListener(this);
1101		- bezierItem = menu.add(new MenuItem("Patch"));
1102		- bezierItem.addActionListener(this);
1103		- checkerItem = menu.add(new MenuItem("Checker"));
1104		- checkerItem.addActionListener(this);
1105	1969	blobItem = menu.add(new MenuItem("Blob"));
1106	1970	blobItem.addActionListener(this);
1107	1971	latheItem = menu.add(new MenuItem("Lathe"));
1108	1972	latheItem.addActionListener(this);
1109		- lightItem = menu.add(new MenuItem("Light"));
1110		- lightItem.addActionListener(this);
	1973	+ }
	1974	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1975	+ bezierItem.addActionListener(this);
	1976	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1977	+// overlayItem.addActionListener(this);
	1978	+// lightItem = menu.add(new MenuItem("Light"));
	1979	+// lightItem.addActionListener(this);
1111	1980	menu.add("-");
1112	1981	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1113	1982	//superLoopItem.addActionListener(this);
1114		- loopItem = menu.add(new MenuItem("Loop"));
1115		- loopItem.addActionListener(this);
	1983	+// loopItem = menu.add(new MenuItem("Loop"));
	1984	+// loopItem.addActionListener(this);
1116	1985	doubleItem = menu.add(new MenuItem("Fork"));
1117	1986	doubleItem.addActionListener(this);
	1987	+ if (Globals.ADVANCED)
	1988	+ {
1118	1989	tripleItem = menu.add(new MenuItem("Trident"));
1119	1990	tripleItem.addActionListener(this);
	1991	+ }
1120	1992	}
1121	1993
1122	1994	void buildToolsMenu(Menu menu)
1123	1995	{
1124	1996	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1125	1997	animationItem.addItemListener(this);
1126		- animationItem.setState(CameraPane.ANIMATION);
	1998	+ animationItem.setState(Globals.ANIMATION);
	1999	+
	2000	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	2001	+ archiveItem.addActionListener(this);
1127	2002
1128	2003	menu.add("-");
1129	2004	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1130	2005	parseverticesItem.addActionListener(this);
1131	2006	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1132	2007	textureFieldItem.addActionListener(this);
1133		- alignItem = menu.add(new MenuItem("Align"));
	2008	+ alignItem = menu.add(new MenuItem("Align Objects"));
1134	2009	alignItem.addActionListener(this);
1135		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1136		- mirrorItem.addActionListener(this);
1137	2010	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1138	2011	reduceMorphItem.addActionListener(this);
1139	2012	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1140	2013	reduce34MorphItem.addActionListener(this);
1141		-
1142		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1143		- computeAOItem.addActionListener(this);
1144	2014	menu.add("-");
1145		-
1146	2015	menu.add(memoryItem = new MenuItem("Memory Usage"));
1147	2016	memoryItem.addActionListener(this);
	2017	+ menu.add(computeAOItem = new MenuItem("Compute AO"));
	2018	+ computeAOItem.addActionListener(this);
	2019	+
	2020	+ if (Globals.ADVANCED)
	2021	+ {
	2022	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	2023	+ mirrorItem.addActionListener(this);
	2024	+ menu.add("-");
1148	2025	menu.add(analyzeItem = new MenuItem("Analyze"));
1149	2026	analyzeItem.addActionListener(this);
1150		- menu.add(dumpItem = new MenuItem("Dump"));
	2027	+ menu.add(dumpItem = new MenuItem("Print"));
1151	2028	dumpItem.addActionListener(this);
1152	2029	// menu.add(pathItem = new MenuItem("From-to path"));
1153	2030	// pathItem.addActionListener(this);
..	..	@@ -1165,6 +2042,7 @@
1165	2042	menu.add("-");
1166	2043	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1167	2044	editScriptItem.addActionListener(this);
	2045	+ }
1168	2046	}
1169	2047
1170	2048	void ScreenFit()
..	..	@@ -1287,9 +2165,34 @@
1287	2165	shadow.material = new cMaterial(obj.material);
1288	2166	shadow.material.diffuse = 0.0001f;
1289	2167	shadow.material.specular = 0.0001f;
	2168	+ //shadow.projectedVertices[1].x = 300;
1290	2169
1291	2170	makeSomething(shadow);
1292	2171	}
	2172	+
	2173	+ private void ClearUnpinned()
	2174	+ {
	2175	+ //for (Object3D obj : listUI)
	2176	+ for (int i=listUI.size(); --i>=0;)
	2177	+ {
	2178	+ Object3D obj = listUI.elementAt(i);
	2179	+ if (!obj.pinned)
	2180	+ {
	2181	+ obj.CloseUI();
	2182	+ listUI.remove(i);
	2183	+ }
	2184	+ }
	2185	+ }
	2186	+
	2187	+ private void EditElement(Object3D elem, boolean newWindow)
	2188	+ {
	2189	+ // if (!(elem instanceof Composite))
	2190	+ // newWindow = false;
	2191	+ listUI.add(elem);
	2192	+ elem.openEditWindow(this, newWindow); //, false);
	2193	+ System.out.println("edit : " + elem);
	2194	+ elem.editWindow.refreshContents(true); // ? new
	2195	+ }
1293	2196
1294	2197	/**
1295	2198	* applyExample
..	..	@@ -1493,9 +2396,9 @@
1493	2396
1494	2397	void Overwrite(int mask)
1495	2398	{
1496		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2399	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1497	2400	{
1498		- Object3D content = GrafreeD.clipboard.get(0);
	2401	+ Object3D content = Grafreed.clipboard.get(0);
1499	2402
1500	2403	if (content instanceof cGroup && ((cGroup)content).transientlink )
1501	2404	content = ((cGroup)content).get(0);
..	..	@@ -1518,6 +2421,7 @@
1518	2421	//
1519	2422	public void actionPerformed(ActionEvent event) // , Object arg)
1520	2423	{
	2424	+ Object source = event.getSource();
1521	2425	/*
1522	2426	if (event.getSource() == nameField)
1523	2427	{
..	..	@@ -1529,11 +2433,11 @@
1529	2433	}
1530	2434	else
1531	2435	*/
1532		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	2436	+ if (source == lookAtItem \|\| source == lookFromItem)
1533	2437	{
1534	2438	ScreenFit();
1535	2439	} else
1536		- if (event.getSource() == switchItem)
	2440	+ if (source == switchViewItem)
1537	2441	{
1538	2442	cVector v1 = new cVector();
1539	2443	cVector v2 = new cVector();
..	..	@@ -1542,11 +2446,11 @@
1542	2446	objEditor.cameraView.renderCamera.setAim(v2, v1);
1543	2447	objEditor.cameraView.repaint();
1544	2448	} else
1545		- if (event.getSource() == rectoidItem)
	2449	+ if (source == rectoidItem \|\| source == boxButton)
1546	2450	{
1547	2451	makeSomething(new Box());
1548	2452	} else
1549		- if (event.getSource() == particleItem)
	2453	+ if (source == particleItem \|\| source == particlesButton)
1550	2454	{
1551	2455	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1552	2456	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1567,9 +2471,9 @@
1567	2471	applyExample(particleGeom, "SMOKE");
1568	2472	makeSomething(particleGeom);
1569	2473	} else
1570		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	2474	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1571	2475	{
1572		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	2476	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1573	2477
1574	2478	ragdoll.toParent = LA.newMatrix();
1575	2479	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1587,7 +2491,7 @@
1587	2491	} else
1588	2492	/*
1589	2493	*/
1590		- if (event.getSource() == heightFieldItem)
	2494	+ if (source == heightFieldItem)
1591	2495	{
1592	2496	Object3D obj = new Object3D();
1593	2497
..	..	@@ -1625,31 +2529,31 @@
1625	2529
1626	2530	makeSomething(obj);
1627	2531	} else
1628		- if (event.getSource() == gridItem)
	2532	+ if (source == gridItem \|\| source == gridButton)
1629	2533	{
1630	2534	makeSomething(new Grid());
1631	2535	} else
1632		- if (event.getSource() == ellipsoidItem)
	2536	+ if (source == ellipsoidItem \|\| source == sphereButton)
1633	2537	{
1634	2538	makeSomething(new Sphere());
1635	2539	} else
1636		- if (event.getSource() == coneItem)
	2540	+ if (source == coneItem \|\| source == coneButton)
1637	2541	{
1638	2542	makeSomething(new Cone());
1639	2543	} else
1640		- if (event.getSource() == torusItem)
	2544	+ if (source == torusItem \|\| source == torusButton)
1641	2545	{
1642	2546	makeSomething(new Torus());
1643	2547	} else
1644		- if (event.getSource() == superItem)
	2548	+ if (source == superItem \|\| source == superButton)
1645	2549	{
1646	2550	makeSomething(new Superellipsoid());
1647	2551	} else
1648		- if (event.getSource() == kleinItem)
	2552	+ if (source == kleinItem \|\| source == kleinButton)
1649	2553	{
1650	2554	makeSomething(new Klein());
1651	2555	} else
1652		- if (event.getSource() == blobItem)
	2556	+ if (source == blobItem)
1653	2557	{
1654	2558	Blob blob = new Blob();
1655	2559	BlobComponent comp = new BlobComponent();
..	..	@@ -1657,15 +2561,15 @@
1657	2561	//blob.retile();
1658	2562	makeSomething(blob);
1659	2563	} else
1660		- if (event.getSource() == latheItem)
	2564	+ if (source == latheItem)
1661	2565	{
1662	2566	makeSomething(new Lathe());
1663	2567	} else
1664		- if (event.getSource() == bezierItem)
	2568	+ if (source == bezierItem)
1665	2569	{
1666	2570	makeSomething(new BezierSurface());
1667	2571	} else
1668		- if (event.getSource() == checkerItem)
	2572	+ if (source == overlayItem \|\| source == overlayButton)
1669	2573	{
1670	2574	/*
1671	2575	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1680,7 +2584,7 @@
1680	2584	*/
1681	2585	makeSomething(new Checker());
1682	2586	} else
1683		- if (event.getSource() == meshItem)
	2587	+ if (source == meshItem)
1684	2588	{
1685	2589	Object3D itemtomake = new Object3D();
1686	2590	Object3D child;
..	..	@@ -1701,35 +2605,52 @@
1701	2605	makeSomething(child);
1702	2606	}
1703	2607	} else
1704		- if (event.getSource() == springItem)
	2608	+ if (source == springItem)
1705	2609	{
1706	2610	cSpring s = new cSpring();
1707	2611	s.setup();
1708	2612	makeSomething(s);
1709	2613	} else
1710		- if (event.getSource() == flagItem)
	2614	+ if (source == flagItem)
1711	2615	{
1712	2616	cSpring s = new cFlag();
1713	2617	s.setup();
1714	2618	makeSomething(s);
1715	2619	} else
1716		- if (event.getSource() == lightItem)
	2620	+ if (source == lightItem \|\| source == lightButton)
1717	2621	{
1718	2622	makeSomething(new Light());
1719	2623	} else
1720		- if (event.getSource() == csgItem)
	2624	+// if (source == skybox1Button \|\|
	2625	+// source == skybox2Button \|\|
	2626	+// source == skybox3Button \|\|
	2627	+// source == skybox4Button \|\|
	2628	+// source == skybox5Button \|\|
	2629	+// source == skybox6Button \|\|
	2630	+// source == skybox7Button \|\|
	2631	+// source == skybox11Button \|\|
	2632	+// source == skybox12Button \|\|
	2633	+// source == skybox13Button \|\|
	2634	+// source == skybox14Button \|\|
	2635	+// source == skybox15Button \|\|
	2636	+// source == skybox16Button \|\|
	2637	+// source == skybox17Button)
	2638	+// {
	2639	+// ChangeSkybox(source);
	2640	+// } else
	2641	+ if (source == csgItem)
1721	2642	{
1722	2643	group(new CSG());
1723	2644	} else
1724		- if (event.getSource() == templateItem)
	2645	+ if (source == templateItem)
1725	2646	{
1726	2647	group(new cTemplate());
1727	2648	} else
1728		- if (event.getSource() == attributeItem)
	2649	+ if (source == attributeItem)
1729	2650	{
1730	2651	makeSomething(new Attribute());
1731	2652	} else
1732		- if (event.getSource() == pointflowItem)
	2653	+ if (source == pointflowItem)
1733	2654	{
1734	2655	makeSomething(new PointFlow());
1735	2656	} else
..	..	@@ -1741,7 +2662,7 @@
1741	2662	} else
1742	2663	*/
1743	2664
1744		- if (event.getSource() == superLoopItem)
	2665	+ if (source == superLoopItem)
1745	2666	{
1746	2667	Composite g = new cGroup();
1747	2668	for (int i=0; i<15; i++)
..	..	@@ -1763,30 +2684,38 @@
1763	2684
1764	2685	group(g);
1765	2686	} else
1766		- if (event.getSource() == loopItem)
	2687	+ if (source == loopItem \|\| source == loopButton)
1767	2688	{
	2689	+ if (!group.selection.isEmpty())
	2690	+ {
1768	2691	Composite csg = new GroupLeaf();
1769	2692	csg.count = 5;
1770		- group(csg);
1771		- Composite child = new cGroup();
	2693	+ Composite child = new cGroup("Branch");
1772	2694	csg.addChild(child);
1773	2695	child.addChild(csg);
	2696	+ group(csg);
	2697	+ }
1774	2698	} else
1775		- if (event.getSource() == doubleItem)
	2699	+ if (source == doubleItem)
1776	2700	{
1777		- Composite csg = new GroupLeaf();
	2701	+ if (!group.selection.isEmpty())
	2702	+ {
	2703	+ Composite csg = new GroupLeaf("Fork");
1778	2704	csg.count = 5;
	2705	+ Composite child = new cGroup("Branch A");
	2706	+ csg.addChild(child);
	2707	+ child.addChild(csg);
	2708	+ child = new cGroup("Branch B");
	2709	+ csg.addChild(child);
	2710	+ child.addChild(csg);
1779	2711	group(csg);
1780		- Composite child = new cGroup();
1781		- csg.addChild(child);
1782		- child.addChild(csg);
1783		- child = new cGroup();
1784		- csg.addChild(child);
1785		- child.addChild(csg);
	2712	+ }
1786	2713	} else
1787		- if (event.getSource() == tripleItem)
	2714	+ if (source == tripleItem)
1788	2715	{
1789		- Composite csg = new GroupLeaf();
	2716	+ if (!group.selection.isEmpty())
	2717	+ {
	2718	+ Composite csg = new GroupLeaf("Trident");
1790	2719	csg.count = 4;
1791	2720	group(csg);
1792	2721	Composite child = new cGroup();
..	..	@@ -1798,74 +2727,119 @@
1798	2727	child = new cGroup();
1799	2728	csg.addChild(child);
1800	2729	child.addChild(csg);
	2730	+ }
1801	2731	} else
1802		-
1803		- if (event.getSource() == importGFDItem)
1804		- {
1805		- ImportGFD();
1806		- } else
1807		- if (event.getSource() == importVRMLX3DItem)
1808		- {
1809		- ImportVRMLX3D();
1810		- } else
1811		- if (event.getSource() == import3DSItem)
1812		- {
1813		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1814		- } else
1815		- if (event.getSource() == importOBJItem)
1816		- {
1817		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1818		- } else
1819		- if (event.getSource() == computeAOItem)
	2732	+ if (source == computeAOItem)
1820	2733	{
1821	2734	Globals.drawMode = CameraPane.OCCLUSION;
1822		- Globals.theRenderer.repaint();
	2735	+ cameraView.repaint();
1823	2736	} else
1824		- if (event.getSource() == recompileItem)
	2737	+ if (source == recompileItem)
1825	2738	{
1826	2739	Recompile();
1827	2740	refreshContents();
1828	2741	} else
1829		- if (event.getSource() == editScriptItem)
	2742	+ if (source == editScriptItem)
1830	2743	{
1831	2744	OpenDialog();
1832	2745	refreshContents();
1833	2746	} else
1834		- if (event.getSource() == invariantsItem)
	2747	+ if (source == invariantsItem)
1835	2748	{
1836	2749	System.out.println("Invariants:");
1837		- GrafreeD.grafreeD.universe.invariants();
	2750	+ Grafreed.grafreed.universe.invariants();
1838	2751	} else
1839		- if (event.getSource() == memoryItem)
	2752	+ if (source == memoryItem)
1840	2753	{
1841	2754	//System.out.println("Invariants:");
1842	2755	PrintMemory();
1843	2756	} else
1844		- if (event.getSource() == pathItem)
	2757	+ if (source == pathItem)
1845	2758	{
1846	2759	PrintPath();
1847	2760	} else
1848		- if (event.getSource() == analyzeItem)
	2761	+ if (source == analyzeItem)
1849	2762	{
1850	2763	AnalyzeObject();
1851	2764	} else
1852		- if (event.getSource() == dumpItem)
	2765	+ if (source == dumpItem)
1853	2766	{
1854	2767	DumpObject();
1855	2768	} else
1856		- if (event.getSource() == screenfitButton)
	2769	+ if (source == minButton)
1857	2770	{
1858		- //Reload(lastConverter, lastFilename, true);
	2771	+ Minimize();
	2772	+ } else
	2773	+ if (source == maxButton)
	2774	+ {
	2775	+ Maximize();
	2776	+ } else
	2777	+ if (source == fullButton)
	2778	+ {
	2779	+ ToggleFullScreen();
	2780	+ } else
	2781	+ if (source == collapseButton)
	2782	+ {
	2783	+ this.expandedLayout = radio.layout;
	2784	+ CollapseToolbar();
	2785	+ } else
	2786	+ if (source == maximize3DButton)
	2787	+ {
	2788	+ this.expandedLayout = radio.layout;
	2789	+ radio.layout = twoButton;
	2790	+ Show3DView();
	2791	+ CollapseToolbar();
	2792	+ } else
	2793	+ if (source == previousVersionButton)
	2794	+ {
	2795	+ // Go to previous version
	2796	+ //if (!Undo())
	2797	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2798	+ PreviousVersion();
	2799	+ } else
	2800	+ if (source == restoreButton)
	2801	+ {
	2802	+ // Restore current version
	2803	+ Restore();
	2804	+ //restoreButton.setEnabled(false);
	2805	+ } else
	2806	+ if (source == replaceButton)
	2807	+ {
	2808	+ // Overwrite current version
	2809	+ Replace();
	2810	+ //replaceButton.setEnabled(false);
	2811	+ } else
	2812	+ if (source == nextVersionButton)
	2813	+ {
	2814	+ // Go to next version
	2815	+ NextVersion();
	2816	+ } else
	2817	+ if (source == saveVersionButton)
	2818	+ {
	2819	+ // Save a new version
	2820	+ if (!Save(true))
	2821	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2822	+ } else
	2823	+ if (source == deleteVersionButton)
	2824	+ {
	2825	+ // Delete a new version
	2826	+ DeleteVersion();
	2827	+ } else
	2828	+ if (source == oneStepButton)
	2829	+ {
	2830	+ Globals.ONESTEP = true;
	2831	+ cameraView.repaint();
	2832	+ } else
	2833	+ if (source == screenfitButton)
	2834	+ {
1859	2835	ScreenFit();
1860	2836	} else
1861		- if (event.getSource() == screenfitpointButton)
	2837	+ if (source == screenfitpointButton)
1862	2838	{
1863		- //Reload(lastConverter, lastFilename, true);
1864	2839	ScreenFitPoint();
1865	2840	} else
1866		- if (event.getSource() == snapobjectButton)
	2841	+ if (source == snapobjectButton)
1867	2842	{
1868		- //Reload(lastConverter, lastFilename, true);
1869	2843	SnapObject();
1870	2844	} else
1871	2845	// if (event.getSource() == recompileButton)
..	..	@@ -1874,13 +2848,13 @@
1874	2848	// Recompile();
1875	2849	// refreshContents();
1876	2850	// } else
1877		- if (event.getSource() == gcButton)
	2851	+ if (source == gcButton)
1878	2852	{
1879	2853	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1880	2854	System.gc();
1881	2855	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1882	2856	} else
1883		- if (event.getSource() == editLeafItem)
	2857	+ if (source == editLeafItem)
1884	2858	{
1885	2859	Object3D obj;
1886	2860	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1894,62 +2868,74 @@
1894	2868	}
1895	2869	refreshContents(true);
1896	2870	} else
1897		- if (event.getSource() == openWindowItem)
	2871	+ if (source == openWindowItem)
1898	2872	{
1899	2873	EditSelection(true);
1900	2874	} else
1901		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2875	+ if (source == cutItem \|\| source == clearButton)
1902	2876	{
1903	2877	loadClipboard(true);
1904	2878	} else
1905		- if (event.getSource() == duplicateItem)
	2879	+ if (source == undoItem)
1906	2880	{
1907		- Object3D keep = GrafreeD.clipboard;
	2881	+ PreviousVersion();
	2882	+ } else
	2883	+ if (source == redoItem)
	2884	+ {
	2885	+ NextVersion();
	2886	+ } else
	2887	+ if (source == duplicateItem)
	2888	+ {
	2889	+ Object3D keep = Grafreed.clipboard;
1908	2890	loadClipboard(false);
1909	2891	paste(false);
1910		- GrafreeD.clipboard = keep;
	2892	+ Grafreed.clipboard = keep;
1911	2893	} else
1912		- if (event.getSource() == cloneItem)
	2894	+ if (source == cloneItem)
1913	2895	{
1914	2896	CloneSelection(false);
1915	2897	} else
1916		- if (event.getSource() == cloneSupportItem)
	2898	+ if (source == cloneSupportItem)
1917	2899	{
1918	2900	CloneSelection(true);
1919	2901	} else
1920		- if (event.getSource() == copyItem)
	2902	+ if (source == copyItem)
1921	2903	{
1922	2904	loadClipboard(false);
1923	2905	} else
1924		- if (event.getSource() == pasteItem)
	2906	+ if (source == pasteItem)
1925	2907	{
1926	2908	paste(false);
1927	2909	} else
1928		- if (event.getSource() == pasteLinkItem)
	2910	+ if (source == pasteIntoItem)
1929	2911	{
1930		- pasteInto(false);
	2912	+ pasteInto(true, false);
1931	2913	} else
1932		- if (event.getSource() == pasteCloneItem)
	2914	+ if (source == pasteLinkItem)
1933	2915	{
1934		- pasteInto(true);
	2916	+ pasteInto(false, false);
1935	2917	} else
1936		- if (event.getSource() == pasteExpandItem)
	2918	+ if (source == pasteCloneItem)
	2919	+ {
	2920	+ pasteInto(true, true);
	2921	+ } else
	2922	+ if (source == pasteExpandItem)
1937	2923	{
1938	2924	paste(true);
1939	2925	} else
1940		- if (event.getSource() == synchronizeItem)
	2926	+ if (source == synchronizeItem)
1941	2927	{
1942	2928	Overwrite(Object3D.TRANSFORM);
1943	2929	} else
1944		- if (event.getSource() == overwriteNameItem)
	2930	+ if (source == overwriteNameItem)
1945	2931	{
1946	2932	Overwrite(Object3D.NAME);
1947	2933	} else
1948		- if (event.getSource() == overwriteUVItem)
	2934	+ if (source == overwriteUVItem)
1949	2935	{
1950	2936	Overwrite(Object3D.UV);
1951	2937	} else
1952		- if (event.getSource() == overwriteMatItem)
	2938	+ if (source == overwriteMatItem)
1953	2939	{
1954	2940	/* july 2015
1955	2941	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1969,7 +2955,7 @@
1969	2955
1970	2956	Overwrite(dropAttributes);
1971	2957	}
1972		- if (event.getSource() == overwriteGeoItem)
	2958	+ if (source == overwriteGeoItem)
1973	2959	{
1974	2960	Overwrite(Object3D.GEOMETRY);
1975	2961	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1986,7 +2972,7 @@
1986	2972	// refreshContents();
1987	2973	// }
1988	2974	} else
1989		- if (event.getSource() == generateMeshItem)
	2975	+ if (source == generateMeshItem)
1990	2976	{
1991	2977	//if (group.selection.size() == 1)
1992	2978	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1997,7 +2983,7 @@
1997	2983	ResetModel();
1998	2984	refreshContents();
1999	2985	} else
2000		- if (event.getSource() == extractGeometriesItem)
	2986	+ if (source == extractGeometriesItem)
2001	2987	{
2002	2988	boolean one = false;
2003	2989
..	..	@@ -2024,7 +3010,7 @@
2024	3010	ResetModel();
2025	3011	refreshContents();
2026	3012	} else
2027		- if (event.getSource() == cloneGeometriesItem)
	3013	+ if (source == cloneGeometriesItem)
2028	3014	{
2029	3015	boolean one = false;
2030	3016
..	..	@@ -2050,7 +3036,7 @@
2050	3036	ResetModel();
2051	3037	refreshContents();
2052	3038	} else
2053		- if (event.getSource() == shareGeometriesItem)
	3039	+ if (source == shareGeometriesItem)
2054	3040	{
2055	3041	boolean one = false;
2056	3042
..	..	@@ -2080,7 +3066,7 @@
2080	3066	refreshContents();
2081	3067	}
2082	3068	} else
2083		- if (event.getSource() == mergeGeometriesItem)
	3069	+ if (source == mergeGeometriesItem)
2084	3070	{
2085	3071	boolean one = false;
2086	3072
..	..	@@ -2110,7 +3096,7 @@
2110	3096	ResetModel();
2111	3097	refreshContents();
2112	3098	} else
2113		- if (event.getSource() == linkverticesItem)
	3099	+ if (source == linkverticesItem)
2114	3100	{
2115	3101	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2116	3102	// {
..	..	@@ -2123,9 +3109,9 @@
2123	3109	// group.selection.get(0).setMasterThis(content); // should be identity
2124	3110	// refreshContents();
2125	3111	// }
2126		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	3112	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2127	3113	{
2128		- Object3D content = GrafreeD.clipboard.get(0);
	3114	+ Object3D content = Grafreed.clipboard.get(0);
2129	3115
2130	3116	if (content instanceof cGroup && ((cGroup)content).transientlink )
2131	3117	content = ((cGroup)content).get(0);
..	..	@@ -2133,38 +3119,38 @@
2133	3119	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2134	3120	for (int i=0; i<group.selection.size(); i++)
2135	3121	{
2136		- boolean random = CameraPane.RANDOM;
2137		- CameraPane.RANDOM = false; // parse all random nodes
	3122	+ boolean random = CameraPane.SWITCH;
	3123	+ CameraPane.SWITCH = false; // parse all random nodes
2138	3124	group.selection.get(i).linkVerticesThis(content);
2139	3125	// group.selection.get(i).setMasterThis(content); // should be identity
2140		- CameraPane.RANDOM = random;
	3126	+ CameraPane.SWITCH = random;
2141	3127	}
2142	3128	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2143	3129	refreshContents();
2144	3130	}
2145	3131	} else
2146		- if (event.getSource() == resetsupportItem)
	3132	+ if (source == resetsupportItem)
2147	3133	{
2148	3134	for (int i=0; i<group.selection.size(); i++)
2149	3135	{
2150		- boolean random = CameraPane.RANDOM;
2151		- CameraPane.RANDOM = false; // parse all random nodes
	3136	+ boolean random = CameraPane.SWITCH;
	3137	+ CameraPane.SWITCH = false; // parse all random nodes
2152	3138	group.selection.get(i).linkVerticesThis(null);
2153		- CameraPane.RANDOM = random;
	3139	+ CameraPane.SWITCH = random;
2154	3140	}
2155	3141
2156	3142	refreshContents();
2157	3143	} else
2158		- if (event.getSource() == relinkverticesItem)
	3144	+ if (source == relinkverticesItem)
2159	3145	{
2160		- boolean random = CameraPane.RANDOM;
2161		- CameraPane.RANDOM = false; // parse all random nodes
	3146	+ boolean random = CameraPane.SWITCH;
	3147	+ CameraPane.SWITCH = false; // parse all random nodes
2162	3148	group.selection.RelinkToSupport();
2163		- CameraPane.RANDOM = random;
	3149	+ CameraPane.SWITCH = random;
2164	3150
2165	3151	refreshContents();
2166	3152	} else
2167		- if (event.getSource() == resetreferencesItem)
	3153	+ if (source == resetreferencesItem)
2168	3154	{
2169	3155	for (int i=0; i<group.selection.size(); i++)
2170	3156	{
..	..	@@ -2173,11 +3159,11 @@
2173	3159
2174	3160	refreshContents();
2175	3161	} else
2176		- if (event.getSource() == setMasterItem)
	3162	+ if (source == setMasterItem)
2177	3163	{
2178		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	3164	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2179	3165	{
2180		- Object3D content = GrafreeD.clipboard.get(0);
	3166	+ Object3D content = Grafreed.clipboard.get(0);
2181	3167
2182	3168	if (content instanceof cGroup && ((cGroup)content).transientlink )
2183	3169	content = ((cGroup)content).get(0);
..	..	@@ -2186,13 +3172,13 @@
2186	3172	refreshContents();
2187	3173	}
2188	3174	} else
2189		- if (event.getSource() == poseMeshItem)
	3175	+ if (source == poseMeshItem)
2190	3176	{
2191	3177	if (group.selection.size() == 1)
2192	3178	{
2193		- if (GrafreeD.clipboard.size() == 1)
	3179	+ if (Grafreed.clipboard.size() == 1)
2194	3180	{
2195		- Object3D content = GrafreeD.clipboard.get(0);
	3181	+ Object3D content = Grafreed.clipboard.get(0);
2196	3182
2197	3183	if (content instanceof cGroup && ((cGroup)content).transientlink )
2198	3184	content = ((cGroup)content).get(0);
..	..	@@ -2205,19 +3191,19 @@
2205	3191	}
2206	3192
2207	3193	} else
2208		- if (event.getSource() == revertMeshItem)
	3194	+ if (source == revertMeshItem)
2209	3195	{
2210	3196	RevertMeshes();
2211	3197	} else
2212		- if (event.getSource() == resetMeshItem)
	3198	+ if (source == resetAllItem)
2213	3199	{
2214	3200	ResetAll();
2215	3201	} else
2216		- if (event.getSource() == stepAllItem)
	3202	+ if (source == stepAllItem)
2217	3203	{
2218	3204	StepAll();
2219	3205	} else
2220		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	3206	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2221	3207	{
2222	3208	//int indices[] = jList.getSelectedIndices();
2223	3209	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2225,46 +3211,46 @@
2225	3211
2226	3212	ClearSelection(false);
2227	3213	} else
2228		- if (event.getSource() == clearAllItem)
	3214	+ if (source == clearAllItem)
2229	3215	{
2230	3216	ClearSelection(true);
2231	3217	} else
2232		- if (event.getSource() == grabItem)
	3218	+ if (source == grabItem \|\| source == groupButton)
2233	3219	{
2234		- group(new cGroup(), true);
	3220	+ group(new cGroup(), false); // true);
2235	3221	} else
2236		- if (event.getSource() == hideItem)
	3222	+ if (source == hideItem)
2237	3223	{
2238	3224	group(new HiddenObject());
2239	3225	} else
2240		- if (event.getSource() == frontItem)
	3226	+ if (source == frontItem)
2241	3227	{
2242	3228	front();
2243	3229	} else
2244		- if (event.getSource() == backItem)
	3230	+ if (source == backItem)
2245	3231	{
2246	3232	back();
2247	3233	} else
2248		- if (event.getSource() == cameraItem)
	3234	+ if (source == cameraItem)
2249	3235	{
2250	3236	makeSomething(new Camera());
2251	3237	} else
2252		- if (event.getSource() == compositeItem)
	3238	+ if (source == compositeItem \|\| source == compositeButton)
2253	3239	{
2254	3240	group(new Composite());
2255	3241	} else
2256		- if (event.getSource() == randomItem)
	3242	+ if (source == switchItem \|\| source == switchButton)
2257	3243	{
2258	3244	RandomNode random = new RandomNode();
2259	3245	group(random);
2260	3246	if (random.size() > 0)
2261		- random.name = random.get(0).name + "Rnd";
	3247	+ random.name = random.get(0).name + "Switch";
2262	3248	} else
2263		- if (event.getSource() == physicsItem)
	3249	+ if (source == physicsItem)
2264	3250	{
2265	3251	group(new PhysicsNode());
2266	3252	} else
2267		- if (event.getSource() == frameselectorItem)
	3253	+ if (source == frameselectorItem)
2268	3254	{
2269	3255	for (int i=0; i<group.selection.size(); i++)
2270	3256	{
..	..	@@ -2276,7 +3262,7 @@
2276	3262	ResetModel();
2277	3263	refreshContents();
2278	3264	} else
2279		- if (event.getSource() == switchGeoItem)
	3265	+ if (source == switchGeoItem)
2280	3266	{
2281	3267	for (int i=0; i<group.selection.size(); i++)
2282	3268	{
..	..	@@ -2288,7 +3274,7 @@
2288	3274	ResetModel();
2289	3275	refreshContents();
2290	3276	} else
2291		- if (event.getSource() == switchTransfoItem)
	3277	+ if (source == switchTransfoItem)
2292	3278	{
2293	3279	for (int i=0; i<group.selection.size(); i++)
2294	3280	{
..	..	@@ -2300,7 +3286,7 @@
2300	3286	ResetModel();
2301	3287	refreshContents();
2302	3288	} else
2303		- if (event.getSource() == morphItem)
	3289	+ if (source == morphItem)
2304	3290	{
2305	3291	for (int i=0; i<group.selection.size(); i++)
2306	3292	{
..	..	@@ -2312,7 +3298,7 @@
2312	3298	ResetModel();
2313	3299	refreshContents();
2314	3300	} else
2315		- if (event.getSource() == scriptNodeItem)
	3301	+ if (source == scriptNodeItem)
2316	3302	{
2317	3303	boolean atleastone = false;
2318	3304
..	..	@@ -2351,215 +3337,264 @@
2351	3337	}
2352	3338	}
2353	3339	} else
2354		- if (event.getSource() == linkerItem)
	3340	+ if (source == linkerItem)
2355	3341	{
2356	3342	group(new cLinker());
2357	3343	} else
2358		- if (event.getSource() == textureItem)
	3344	+ if (source == textureItem \|\| source == textureButton)
2359	3345	{
2360	3346	group(new TextureNode());
2361	3347	} else
2362		- if (event.getSource() == billboardItem)
	3348	+ if (source == billboardItem)
2363	3349	{
2364	3350	group(new BillboardNode());
2365	3351	} else
2366		- if (event.getSource() == shadowXItem)
	3352	+ if (source == shadowXItem)
2367	3353	{
2368	3354	CastShadow(0);
2369	3355	} else
2370		- if (event.getSource() == shadowYItem)
	3356	+ if (source == shadowYItem)
2371	3357	{
2372	3358	CastShadow(1);
2373	3359	} else
2374		- if (event.getSource() == shadowZItem)
	3360	+ if (source == shadowZItem)
2375	3361	{
2376	3362	CastShadow(2);
2377	3363	} else
2378		- if (event.getSource() == ungroupItem)
	3364	+ if (source == ungroupItem \|\| source == ungroupButton)
2379	3365	{
2380		- //ungroup();
	3366	+ boolean canUngroup = true;
	3367	+
2381	3368	for (int i=0; i<group.selection.size(); i++)
2382	3369	{
2383		- Ungroup(group.selection.get(i));
	3370	+ Object3D selectedItem = group.selection.get(i);
	3371	+
	3372	+ if (selectedItem.Size() == 0)
	3373	+ {
	3374	+ // Cannot ungroup leaves
	3375	+ canUngroup = false;
	3376	+ break;
	3377	+ }
	3378	+
	3379	+ if (selectedItem == group)
	3380	+ {
	3381	+ // Cannot ungroup root
	3382	+ canUngroup = false;
	3383	+ break;
	3384	+ }
2384	3385	}
2385	3386
2386		- ClearSelection(false);
2387		-
2388		- refreshContents();
	3387	+ if (canUngroup)
	3388	+ {
	3389	+ for (int i=0; i<group.selection.size(); i++)
	3390	+ {
	3391	+ Object3D selectedItem = group.selection.get(i);
	3392	+
	3393	+ Ungroup(selectedItem);
	3394	+ }
	3395	+
	3396	+ ClearSelection(false);
	3397	+
	3398	+ refreshContents();
	3399	+ }
2389	3400	} else
2390		- if (event.getSource() == genUVItem)
	3401	+ if (source == genUVItem)
2391	3402	{
2392	3403	GenUV();
2393	3404	} else
2394		- if (event.getSource() == genNormalsCADItem)
	3405	+ if (source == genNormalsCADItem)
2395	3406	{
2396	3407	GenNormals(true);
2397	3408	} else
2398		- if (event.getSource() == genNormalsMESHItem)
	3409	+ if (source == genNormalsMESHItem)
2399	3410	{
2400		- GenNormals(true); // TODO
	3411	+ GenNormalsMESH();
2401	3412	} else
2402		- if (event.getSource() == genNormalsORGANItem)
	3413	+ if (source == genNormalsORGANItem)
2403	3414	{
2404	3415	GenNormals(false);
2405	3416	} else
2406		- if (event.getSource() == genNormalsMINEItem)
	3417	+ if (source == genNormalsMINEItem)
2407	3418	{
2408	3419	GenNormalsMINE();
2409	3420	} else
2410		- if (event.getSource() == stripifyItem)
	3421	+ if (source == stripifyItem)
2411	3422	{
2412	3423	Stripify();
2413	3424	} else
2414		- if (event.getSource() == unstripifyItem)
	3425	+ if (source == unstripifyItem)
2415	3426	{
2416	3427	Unstripify();
2417	3428	} else
2418		- if (event.getSource() == trimItem)
	3429	+ if (source == trimItem)
2419	3430	{
2420	3431	Trim();
2421	3432	} else
2422		- if (event.getSource() == untrimItem)
	3433	+ if (source == untrimItem)
2423	3434	{
2424	3435	Untrim();
2425	3436	} else
2426		- if (event.getSource() == clearColorsItem)
	3437	+ if (source == clearColorsItem)
2427	3438	{
2428	3439	ClearColors();
2429	3440	} else
2430		- if (event.getSource() == clearMaterialsItem)
	3441	+ if (source == clearMaterialsItem)
2431	3442	{
2432	3443	ClearMaterials();
2433	3444	} else
2434		- if (event.getSource() == liveleavesItem)
	3445	+ if (source == liveleavesItem)
2435	3446	{
2436	3447	LiveLeaves(true);
2437	3448	} else
2438		- if (event.getSource() == unliveleavesItem)
	3449	+ if (source == unliveleavesItem)
2439	3450	{
2440	3451	LiveLeaves(false);
2441	3452	} else
2442		- if (event.getSource() == supportleavesItem)
	3453	+ if (source == supportleavesItem)
2443	3454	{
2444	3455	SupportLeaves(true);
2445	3456	} else
2446		- if (event.getSource() == unsupportleavesItem)
	3457	+ if (source == unsupportleavesItem)
2447	3458	{
2448	3459	SupportLeaves(false);
2449	3460	} else
2450		- if (event.getSource() == hideleavesItem)
	3461	+ if (source == hideleavesItem)
2451	3462	{
2452	3463	HideLeaves(true);
2453	3464	} else
2454		- if (event.getSource() == showleavesItem)
	3465	+ if (source == showleavesItem)
2455	3466	{
2456	3467	HideLeaves(false);
2457	3468	} else
2458		- if (event.getSource() == markleavesItem)
	3469	+ if (source == markleavesItem)
2459	3470	{
2460	3471	MarkLeaves(true);
2461	3472	} else
2462		- if (event.getSource() == unmarkleavesItem)
	3473	+ if (source == unmarkleavesItem)
2463	3474	{
2464	3475	MarkLeaves(false);
2465	3476	} else
2466		- if (event.getSource() == flipVItem)
	3477	+ if (source == rewindleavesItem)
	3478	+ {
	3479	+ RewindLeaves(true);
	3480	+ } else
	3481	+ if (source == unrewindleavesItem)
	3482	+ {
	3483	+ RewindLeaves(false);
	3484	+ } else
	3485	+ if (source == randomleavesItem)
	3486	+ {
	3487	+ RandomLeaves(true);
	3488	+ } else
	3489	+ if (source == unrandomleavesItem)
	3490	+ {
	3491	+ RandomLeaves(false);
	3492	+ } else
	3493	+ if (source == flipVItem)
2467	3494	{
2468	3495	FlipV(true);
2469	3496	} else
2470		- if (event.getSource() == unflipVItem)
	3497	+ if (source == unflipVItem)
2471	3498	{
2472	3499	FlipV(false);
2473	3500	} else
2474		- if (event.getSource() == lowTexturesItem)
	3501	+ if (source == lowTexturesItem)
2475	3502	{
2476	3503	SetTexRes(0);
2477	3504	} else
2478		- if (event.getSource() == normalTexturesItem)
	3505	+ if (source == normalTexturesItem)
2479	3506	{
2480	3507	SetTexRes(1);
2481	3508	} else
2482		- if (event.getSource() == highTexturesItem)
	3509	+ if (source == highTexturesItem)
2483	3510	{
2484	3511	SetTexRes(2);
2485	3512	} else
2486		- if (event.getSource() == veryhighTexturesItem)
	3513	+ if (source == veryhighTexturesItem)
2487	3514	{
2488	3515	SetTexRes(3);
2489	3516	} else
2490		- if (event.getSource() == maxTexturesItem)
	3517	+ if (source == maxTexturesItem)
2491	3518	{
2492	3519	SetTexRes(4);
2493	3520	} else
2494		- if (event.getSource() == panoTexturesItem)
	3521	+ if (source == panoTexturesItem)
2495	3522	{
2496	3523	SetTexRes(5);
2497	3524	} else
2498		- if (event.getSource() == reverseNormalsItem)
	3525	+ if (source == reverseNormalsItem)
2499	3526	{
2500	3527	ReverseNormals();
2501	3528	} else
2502		- if (event.getSource() == parseverticesItem)
	3529	+ if (source == parseverticesItem)
2503	3530	{
2504	3531	ParseVertices();
2505	3532	} else
2506		- if (event.getSource() == textureFieldItem)
	3533	+ if (source == textureFieldItem)
2507	3534	{
2508	3535	TextureVertices();
2509	3536	} else
2510		- if (event.getSource() == alignItem)
	3537	+ if (source == alignItem)
2511	3538	{
2512	3539	Align();
2513	3540	} else
2514		- if (event.getSource() == mirrorItem)
	3541	+ if (source == mirrorItem)
2515	3542	{
2516	3543	MirrorPoses();
2517	3544	} else
2518		- if (event.getSource() == reduceMorphItem)
	3545	+ if (source == reduceMorphItem)
2519	3546	{
2520	3547	MeshReduction(false);
2521	3548	} else
2522		- if (event.getSource() == reduce34MorphItem)
	3549	+ if (source == reduce34MorphItem)
2523	3550	{
2524	3551	MeshReduction(true);
2525	3552	} else
2526		- if (event.getSource() == reverseTrianglesItem)
	3553	+ if (source == reverseTrianglesItem)
2527	3554	{
2528	3555	ReverseTriangles();
2529	3556	} else
2530		- if (event.getSource() == reduceMeshItem)
	3557	+ if (source == reduceMeshItem)
2531	3558	{
2532	3559	ReduceMesh(false);
2533	3560	} else
2534		- if (event.getSource() == reduce34MeshItem)
	3561	+ if (source == reduce34MeshItem)
2535	3562	{
2536	3563	ReduceMesh(true);
2537	3564	} else
2538		- if (event.getSource() == increaseMeshItem)
	3565	+ if (source == increaseMeshItem)
2539	3566	{
2540	3567	IncreaseMesh();
2541	3568	} else
2542		- if (event.getSource() == clipMeshItem)
	3569	+ if (source == clipMeshItem)
2543	3570	{
2544	3571	ClipMesh();
2545	3572	} else
2546		- if (event.getSource() == smoothMeshItem)
	3573	+ if (source == smoothMeshItem)
2547	3574	{
2548	3575	SmoothMesh();
2549	3576	} else
2550		- if (event.getSource() == transformgeometryItem)
	3577	+ if (source == transformGeometryItem)
2551	3578	{
2552	3579	TransformGeometry();
2553	3580	} else
2554		- if (event.getSource() == resetTransformItem)
	3581	+ if (source == transformChildrenItem)
	3582	+ {
	3583	+ TransformChildren();
	3584	+ } else
	3585	+ if (source == resetTransformItem)
2555	3586	{
2556	3587	ResetTransform();
2557	3588	} else
2558		- if (event.getSource() == resetCentroidItem)
	3589	+ if (source == resetCentroidItem)
2559	3590	{
2560		- ResetCentroid();
	3591	+ ResetCentroid(true);
2561	3592	} else
2562		- if (event.getSource() == resetParentItem)
	3593	+ if (source == resetCentroidXZItem)
	3594	+ {
	3595	+ ResetCentroid(false);
	3596	+ } else
	3597	+ if (source == resetParentItem)
2563	3598	{
2564	3599	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2565	3600	{
..	..	@@ -2569,7 +3604,7 @@
2569	3604
2570	3605	refreshContents();
2571	3606	} else
2572		- if (event.getSource() == repairParentItem)
	3607	+ if (source == repairParentItem)
2573	3608	{
2574	3609	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2575	3610	{
..	..	@@ -2583,7 +3618,7 @@
2583	3618
2584	3619	refreshContents();
2585	3620	} else
2586		- if (event.getSource() == repairShadowItem)
	3621	+ if (source == repairShadowItem)
2587	3622	{
2588	3623	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2589	3624	{
..	..	@@ -2597,7 +3632,7 @@
2597	3632
2598	3633	refreshContents();
2599	3634	} else
2600		- if (event.getSource() == sortbysizeItem)
	3635	+ if (source == sortbysizeItem)
2601	3636	{
2602	3637	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2603	3638	{
..	..	@@ -2609,7 +3644,7 @@
2609	3644	ResetModel();
2610	3645	refreshContents();
2611	3646	} else
2612		- if (event.getSource() == sortbynameItem)
	3647	+ if (source == sortbynameItem)
2613	3648	{
2614	3649	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2615	3650	{
..	..	@@ -2621,7 +3656,7 @@
2621	3656	ResetModel();
2622	3657	refreshContents();
2623	3658	} else
2624		- if (event.getSource() == attachPigmentItem)
	3659	+ if (source == attachPigmentItem)
2625	3660	{
2626	3661	String texture = GetFile("Attach pigment");
2627	3662	Object3D obj;
..	..	@@ -2633,7 +3668,7 @@
2633	3668
2634	3669	refreshContents();
2635	3670	} else
2636		- if (event.getSource() == detachPigmentItem)
	3671	+ if (source == detachPigmentItem)
2637	3672	{
2638	3673	Object3D obj;
2639	3674	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2644,7 +3679,7 @@
2644	3679
2645	3680	refreshContents();
2646	3681	} else
2647		- if (event.getSource() == attachBumpItem)
	3682	+ if (source == attachBumpItem)
2648	3683	{
2649	3684	String texture = GetFile("Attach bump");
2650	3685	Object3D obj;
..	..	@@ -2656,18 +3691,18 @@
2656	3691
2657	3692	refreshContents();
2658	3693	} else
2659		- if (event.getSource() == detachBumpItem)
	3694	+ if (source == detachBumpItem)
2660	3695	{
2661	3696	Object3D obj;
2662	3697	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2663	3698	{
2664	3699	obj = (Object3D)e.nextElement();
2665		- obj.SetBumpTexture(null);
	3700	+ obj.ResetBumpTexture();
2666	3701	}
2667	3702
2668	3703	refreshContents();
2669	3704	} else
2670		- if (event.getSource() == pigmentBumpItem)
	3705	+ if (source == pigmentBumpItem)
2671	3706	{
2672	3707	Object3D obj;
2673	3708	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2678,159 +3713,233 @@
2678	3713
2679	3714	refreshContents();
2680	3715	} else
2681		- if (event.getSource() == flashSelectionButton)
	3716	+ if (source == embedTexturesItem)
	3717	+ {
	3718	+ Object3D obj;
	3719	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3720	+ {
	3721	+ obj = (Object3D)e.nextElement();
	3722	+ obj.EmbedTextures(true);
	3723	+ }
	3724	+
	3725	+ refreshContents();
	3726	+ } else
	3727	+ if (source == deEmbedTexturesItem)
	3728	+ {
	3729	+ Object3D obj;
	3730	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3731	+ {
	3732	+ obj = (Object3D)e.nextElement();
	3733	+ obj.EmbedTextures(false);
	3734	+ }
	3735	+
	3736	+ CameraPane.texturepigment.clear();
	3737	+ CameraPane.texturebump.clear();
	3738	+
	3739	+ refreshContents();
	3740	+ } else
	3741	+ if (source == flashSelectionButton)
2682	3742	{
2683	3743	CameraPane.flash = true;
2684	3744	refreshContents();
2685	3745	} else
2686		- if (event.getSource() == oneButton)
	3746	+ if (source == oneButton)
2687	3747	{
2688	3748	} else
2689		- if (event.getSource() == twoButton)
	3749	+ if (source == twoButton)
2690	3750	{
2691	3751	radio.layout = twoButton;
2692		- // bug
2693		- //gridPanel.setDividerLocation(1.0);
2694		- //bigPanel.setDividerLocation(0.0);
2695		- bigThree.remove(scenePanel);
2696		- bigThree.remove(centralPanel);
2697		- bigThree.remove(XYZPanel);
2698		- aWindowConstraints.gridx = 0;
2699		- aWindowConstraints.gridy = 0;
2700		- aWindowConstraints.gridwidth = 1;
2701		- // aConstraints.gridheight = 3;
2702		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2703		- aWindowConstraints.weightx = 0;
2704		- aWindowConstraints.weighty = 1;
2705		- //bigThree.add(jtp, aWindowConstraints);
2706		- aWindowConstraints.weightx = 1;
2707		- aWindowConstraints.gridwidth = 3;
2708		- // aConstraints.gridheight = 3;
2709		- aWindowConstraints.gridx = 1;
2710		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2711		- bigThree.add(centralPanel, aWindowConstraints);
2712		- aWindowConstraints.weightx = 0;
2713		- aWindowConstraints.gridx = 4;
2714		- aWindowConstraints.gridwidth = 1;
2715		- // aConstraints.gridheight = 3;
2716		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2717		- //bigThree.add(XYZPanel, aWindowConstraints);
2718		- bigThree.revalidate();
	3752	+
	3753	+ if (CameraPane.FULLSCREEN)
	3754	+ fullscreenLayout = radio.layout;
	3755	+
	3756	+ Show3DView();
	3757	+
	3758	+ cameraView.requestFocusInWindow();
	3759	+
	3760	+// refreshContents(true);
	3761	+//
	3762	+// try
	3763	+// {
	3764	+// java.awt.Robot bot = new java.awt.Robot();
	3765	+// int mask = InputEvent.BUTTON1_MASK;
	3766	+// bot.mouseMove(100, 100);
	3767	+// bot.mousePress(mask);
	3768	+// bot.mouseRelease(mask);
	3769	+// }
	3770	+// catch (Exception e)
	3771	+// {
	3772	+//
	3773	+// }
	3774	+
2719	3775	} else
2720		- if (event.getSource() == threeButton)
	3776	+ if (source == threeButton)
2721	3777	{
2722	3778	radio.layout = threeButton;
2723		- bigThree.remove(scenePanel);
2724		- bigThree.remove(centralPanel);
2725		- bigThree.remove(XYZPanel);
2726		- aWindowConstraints.gridx = 0;
2727		- aWindowConstraints.gridy = 0;
2728		- aWindowConstraints.gridwidth = 1;
2729		- // aConstraints.gridheight = 3;
2730		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2731		- aWindowConstraints.weightx = 0;
2732		- aWindowConstraints.weighty = 1;
2733		- //bigThree.add(jtp, aWindowConstraints);
2734		- aWindowConstraints.weightx = 1;
2735		- aWindowConstraints.gridwidth = 3;
2736		- // aConstraints.gridheight = 3;
2737		- aWindowConstraints.gridx = 1;
2738		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2739		- bigThree.add(centralPanel, aWindowConstraints);
2740		- aWindowConstraints.weightx = 0;
2741		- aWindowConstraints.gridx = 4;
2742		- aWindowConstraints.gridwidth = 1;
2743		- // aConstraints.gridheight = 3;
2744		- aConstraints.fill = GridBagConstraints.VERTICAL;
2745		- bigThree.add(XYZPanel, aWindowConstraints);
2746		- bigThree.revalidate();
	3779	+
	3780	+ if (CameraPane.FULLSCREEN)
	3781	+ fullscreenLayout = radio.layout;
	3782	+
	3783	+// bigThree.remove(scenePanel);
	3784	+// bigThree.remove(centralPanel);
	3785	+// bigThree.remove(XYZPanel);
	3786	+// aWindowConstraints.gridx = 0;
	3787	+// aWindowConstraints.gridy = 0;
	3788	+// aWindowConstraints.gridwidth = 1;
	3789	+// // aConstraints.gridheight = 3;
	3790	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3791	+// aWindowConstraints.weightx = 0;
	3792	+// aWindowConstraints.weighty = 1;
	3793	+// //bigThree.add(jtp, aWindowConstraints);
	3794	+// aWindowConstraints.weightx = 1;
	3795	+// aWindowConstraints.gridwidth = 3;
	3796	+// // aConstraints.gridheight = 3;
	3797	+// aWindowConstraints.gridx = 1;
	3798	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3799	+// bigThree.add(centralPanel, aWindowConstraints);
	3800	+// aWindowConstraints.weightx = 0;
	3801	+// aWindowConstraints.gridx = 4;
	3802	+// aWindowConstraints.gridwidth = 1;
	3803	+// // aConstraints.gridheight = 3;
	3804	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	3805	+// bigThree.add(XYZPanel, aWindowConstraints);
	3806	+// bigThree.validate();
	3807	+// scenePanel.setVisible(false);
	3808	+// centralPanel.setVisible(true);
	3809	+// XYZPanel.setVisible(true);
	3810	+ bigThree.ClearUI();
	3811	+ bigThree.add(scenePanel);
	3812	+ bigThree.add(centralPanel);
	3813	+ bigThree.FlushUI();
	3814	+
	3815	+ cameraView.requestFocusInWindow();
2747	3816	} else
2748		- if (event.getSource() == fourButton)
	3817	+ if (source == fourButton)
2749	3818	{
2750	3819	radio.layout = fourButton;
2751		- bigThree.remove(scenePanel);
2752		- bigThree.remove(centralPanel);
2753		- bigThree.remove(XYZPanel);
2754		- aWindowConstraints.gridx = 0;
2755		- aWindowConstraints.gridy = 0;
2756		- aWindowConstraints.gridwidth = 1;
2757		- // aWindowConstraints.gridheight = 3;
2758		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2759		- aWindowConstraints.weightx = 1;
2760		- aWindowConstraints.weighty = 1;
2761		- bigThree.add(scenePanel, aWindowConstraints);
2762		- aWindowConstraints.weightx = 1;
2763		- aWindowConstraints.gridwidth = 3;
2764		- // aConstraints.gridheight = 3;
2765		- aWindowConstraints.gridx = 1;
2766		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2767		- //bigThree.add(cameraPanel, aWindowConstraints);
2768		- aWindowConstraints.weightx = 0;
2769		- aWindowConstraints.gridx = 4;
2770		- aWindowConstraints.gridwidth = 1;
2771		- // aWindowConstraints.gridheight = 3;
2772		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2773		- //bigThree.add(XYZPanel, aWindowConstraints);
2774		- bigThree.revalidate();
	3820	+
	3821	+ if (CameraPane.FULLSCREEN)
	3822	+ fullscreenLayout = radio.layout;
	3823	+
	3824	+// bigThree.remove(scenePanel);
	3825	+// bigThree.remove(centralPanel);
	3826	+// bigThree.remove(XYZPanel);
	3827	+// aWindowConstraints.gridx = 0;
	3828	+// aWindowConstraints.gridy = 0;
	3829	+// aWindowConstraints.gridwidth = 1;
	3830	+// // aWindowConstraints.gridheight = 3;
	3831	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3832	+// aWindowConstraints.weightx = 1;
	3833	+// aWindowConstraints.weighty = 1;
	3834	+// bigThree.add(scenePanel, aWindowConstraints);
	3835	+// aWindowConstraints.weightx = 1;
	3836	+// aWindowConstraints.gridwidth = 3;
	3837	+// // aConstraints.gridheight = 3;
	3838	+// aWindowConstraints.gridx = 1;
	3839	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3840	+// //bigThree.add(cameraPanel, aWindowConstraints);
	3841	+// aWindowConstraints.weightx = 0;
	3842	+// aWindowConstraints.gridx = 4;
	3843	+// aWindowConstraints.gridwidth = 1;
	3844	+// // aWindowConstraints.gridheight = 3;
	3845	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3846	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3847	+// bigThree.validate();
	3848	+// scenePanel.setVisible(true);
	3849	+// centralPanel.setVisible(false);
	3850	+// XYZPanel.setVisible(false);
	3851	+ bigThree.ClearUI();
	3852	+ bigThree.add(scenePanel);
	3853	+ bigThree.FlushUI();
	3854	+
	3855	+ cameraView.requestFocusInWindow();
2775	3856	} else
2776		- if (event.getSource() == sixButton)
	3857	+ if (source == sixButton)
2777	3858	{
2778	3859	radio.layout = sixButton;
2779		- bigThree.remove(scenePanel);
2780		- bigThree.remove(centralPanel);
2781		- bigThree.remove(XYZPanel);
2782		- aWindowConstraints.gridx = 0;
2783		- aWindowConstraints.gridy = 0;
2784		- aWindowConstraints.gridwidth = 1;
2785		- // aConstraints.gridheight = 3;
2786		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2787		- aWindowConstraints.weightx = 0;
2788		- aWindowConstraints.weighty = 1;
2789		- bigThree.add(scenePanel, aWindowConstraints);
2790		- aWindowConstraints.weightx = 1;
2791		- aWindowConstraints.gridwidth = 3;
2792		- // aWindowConstraints.gridheight = 3;
2793		- aWindowConstraints.gridx = 1;
2794		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2795		- bigThree.add(centralPanel, aWindowConstraints);
2796		- aWindowConstraints.weightx = 0;
2797		- aWindowConstraints.gridx = 4;
2798		- aWindowConstraints.gridwidth = 1;
2799		- // aWindowConstraints.gridheight = 3;
2800		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2801		- //bigThree.add(XYZPanel, aConstraints);
2802		- bigThree.revalidate();
	3860	+
	3861	+ if (CameraPane.FULLSCREEN)
	3862	+ fullscreenLayout = radio.layout;
	3863	+
	3864	+// bigThree.remove(scenePanel);
	3865	+// bigThree.remove(centralPanel);
	3866	+// bigThree.remove(XYZPanel);
	3867	+// aWindowConstraints.gridx = 0;
	3868	+// aWindowConstraints.gridy = 0;
	3869	+// aWindowConstraints.gridwidth = 1;
	3870	+// // aConstraints.gridheight = 3;
	3871	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3872	+// aWindowConstraints.weightx = 0;
	3873	+// aWindowConstraints.weighty = 1;
	3874	+// bigThree.add(scenePanel, aWindowConstraints);
	3875	+// aWindowConstraints.weightx = 1;
	3876	+// aWindowConstraints.gridwidth = 3;
	3877	+// // aWindowConstraints.gridheight = 3;
	3878	+// aWindowConstraints.gridx = 1;
	3879	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3880	+// bigThree.add(centralPanel, aWindowConstraints);
	3881	+// aWindowConstraints.weightx = 0;
	3882	+// aWindowConstraints.gridx = 4;
	3883	+// aWindowConstraints.gridwidth = 1;
	3884	+// // aWindowConstraints.gridheight = 3;
	3885	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3886	+// //bigThree.add(XYZPanel, aConstraints);
	3887	+// bigThree.validate();
	3888	+// scenePanel.setVisible(true);
	3889	+// centralPanel.setVisible(true);
	3890	+// XYZPanel.setVisible(false);
	3891	+ bigThree.ClearUI();
	3892	+ bigThree.add(centralPanel);
	3893	+ bigThree.add(scenePanel);
	3894	+ bigThree.FlushUI();
	3895	+
	3896	+ cameraView.requestFocusInWindow();
2803	3897	} else
2804		- if (event.getSource() == sevenButton)
	3898	+ if (source == sevenButton)
2805	3899	{
2806	3900	radio.layout = sevenButton;
2807		- bigThree.remove(scenePanel);
2808		- bigThree.remove(centralPanel);
2809		- bigThree.remove(XYZPanel);
2810		- aWindowConstraints.gridx = 0;
2811		- aWindowConstraints.gridy = 0;
2812		- aWindowConstraints.gridwidth = 1;
2813		- // aWindowConstraints.gridheight = 3;
2814		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2815		- aWindowConstraints.weightx = 0;
2816		- aWindowConstraints.weighty = 1;
2817		- bigThree.add(scenePanel, aWindowConstraints);
2818		- aWindowConstraints.weightx = 1;
2819		- aWindowConstraints.gridwidth = 3;
2820		- // aWindowConstraints.gridheight = 3;
2821		- aWindowConstraints.gridx = 1;
2822		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2823		- bigThree.add(centralPanel, aWindowConstraints);
2824		- aWindowConstraints.weightx = 0;
2825		- aWindowConstraints.gridx = 4;
2826		- aWindowConstraints.gridwidth = 1;
2827		- // aConstraints.gridheight = 3;
2828		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2829		- bigThree.add(XYZPanel, aWindowConstraints);
2830		- bigThree.revalidate();
	3901	+
	3902	+ if (CameraPane.FULLSCREEN)
	3903	+ fullscreenLayout = radio.layout;
	3904	+
	3905	+// bigThree.remove(scenePanel);
	3906	+// bigThree.remove(centralPanel);
	3907	+// bigThree.remove(XYZPanel);
	3908	+// aWindowConstraints.gridx = 0;
	3909	+// aWindowConstraints.gridy = 0;
	3910	+// aWindowConstraints.gridwidth = 1;
	3911	+// // aWindowConstraints.gridheight = 3;
	3912	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3913	+// aWindowConstraints.weightx = 0;
	3914	+// aWindowConstraints.weighty = 1;
	3915	+// bigThree.add(scenePanel, aWindowConstraints);
	3916	+// aWindowConstraints.weightx = 1;
	3917	+// aWindowConstraints.gridwidth = 3;
	3918	+// // aWindowConstraints.gridheight = 3;
	3919	+// aWindowConstraints.gridx = 1;
	3920	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3921	+// bigThree.add(centralPanel, aWindowConstraints);
	3922	+// aWindowConstraints.weightx = 0;
	3923	+// aWindowConstraints.gridx = 4;
	3924	+// aWindowConstraints.gridwidth = 1;
	3925	+// // aConstraints.gridheight = 3;
	3926	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3927	+// bigThree.add(XYZPanel, aWindowConstraints);
	3928	+// bigThree.validate();
	3929	+// scenePanel.setVisible(true);
	3930	+// centralPanel.setVisible(true);
	3931	+// XYZPanel.setVisible(true);
	3932	+ bigThree.ClearUI();
	3933	+ bigThree.add(scenePanel);
	3934	+ bigThree.add(centralPanel);
	3935	+ bigThree.add(XYZPanel);
	3936	+ bigThree.FlushUI();
	3937	+
	3938	+ cameraView.requestFocusInWindow();
2831	3939	} else
2832		- if (event.getSource() == rootButton)
	3940	+ if (source == rootButton)
2833	3941	{
	3942	+ Replace();
2834	3943	Object3D obj;
2835	3944	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2836	3945	{
..	..	@@ -2839,66 +3948,85 @@
2839	3948	EditObject(obj);
2840	3949	}
2841	3950
	3951	+ cameraView.requestFocusInWindow();
2842	3952	refreshContents(true);
2843	3953	} else
2844		- if (event.getSource() == closeButton)
	3954	+ if (source == closeButton)
2845	3955	{
2846	3956	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2847	3957	cRadio ab;
2848	3958	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2849	3959	{
2850	3960	ab = (cRadio)e.nextElement();
2851		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3961	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2852	3962	{
	3963	+ // Patch to avoid bug with transparency.
	3964	+ if (!ab.hadMaterial)
	3965	+ {
	3966	+ ab.object.material = null;
	3967	+ }
	3968	+
2853	3969	buttonGroup.remove(ab);
2854	3970	radioPanel.remove(ab);
2855	3971
2856		- ab.GetObject().editWindow = null;
	3972	+ //ab.GetObject().editWindow = null;
	3973	+ ab.GetObject().manipWindow = null;
2857	3974	// ab.GetObject().objectUI = null; // ?????????
2858	3975
2859	3976	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2860	3977	break;
2861	3978	}
2862	3979	}
	3980	+
	3981	+ cameraView.requestFocusInWindow();
2863	3982	refreshContents(true);
2864	3983	} else
2865		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3984	+ if (source == editItem \|\| source == editButton)
2866	3985	{
	3986	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3987	+ {
	3988	+ Object3D child = (Object3D)e.nextElement();
	3989	+ child.pinned = true;
	3990	+ }
	3991	+
2867	3992	EditSelection(false);
2868	3993	} else
2869		- if (event.getSource() == uneditButton)
	3994	+ if (source == uneditButton)
2870	3995	{
2871	3996	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2872	3997	{
2873	3998	Object3D child = (Object3D)e.nextElement();
2874	3999	if(child.editWindow != null)
2875		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4000	+ child.pinned = false;
2876	4001	child.CloseUI();
2877	4002	listUI.remove(child);
	4003	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2878	4004
2879		- child.editWindow = null; // ???????????
	4005	+ //child.editWindow = null; // ???????????
2880	4006	}
2881		- objEditor.ctrlPanel.revalidate();
	4007	+ objEditor.ctrlPanel.FlushUI();
2882	4008	//objEditor.jTree.clearSelection();
2883	4009	//objEditor.ResetSliders();
2884	4010	refreshContents(true);
2885	4011	} else
2886		- if (event.getSource() == clearPanelButton)
	4012	+ if (source == clearPanelButton)
2887	4013	{
2888	4014	assert(copy == group);
2889	4015	//copy.ClearUI();
2890	4016	for (Object3D obj : listUI)
2891	4017	{
	4018	+ obj.pinned = false;
2892	4019	obj.CloseUI();
2893	4020	}
2894	4021	listUI.clear();
	4022	+ SetPinStates(group.selection.size() > 0);
2895	4023	refreshContents(true);
2896	4024	} else
2897		- if (event.getSource() == allParamsButton)
	4025	+ if (source == allParamsButton)
2898	4026	{
2899	4027	assert(copy == group);
2900	4028
2901		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4029	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2902	4030
2903	4031	for (Object3D obj : listUI)
2904	4032	{
..	..	@@ -2915,19 +4043,19 @@
2915	4043
2916	4044	refreshContents(true);
2917	4045	} else
2918		- if (event.getSource() == unselectButton)
	4046	+ if (source == unselectButton)
2919	4047	{
2920	4048	objEditor.jTree.clearSelection();
2921	4049	// ?? oct 2012 GrafreeD.clipboard.clear();
2922	4050	objEditor.ResetSliders();
2923	4051	refreshContents(true);
2924	4052	} else
2925		- if(event.getSource() instanceof cRadio)
	4053	+ if(source instanceof cRadio)
2926	4054	{
2927	4055	group.parent = keepparent;
2928	4056	group.attributes = 0;
2929	4057	//group.editWindow = null;
2930		- /cRadio/ radio = (cRadio)event.getSource();
	4058	+ /cRadio/ radio = (cRadio)source;
2931	4059	Object3D obj = radio.GetObject();
2932	4060	System.out.println("Edit " + obj);
2933	4061	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2947,6 +4075,7 @@
2947	4075	}
2948	4076
2949	4077	copy = group;
	4078	+
2950	4079	//Globals.theRenderer.object = group;
2951	4080	if(!useclient)
2952	4081	{
..	..	@@ -2962,20 +4091,61 @@
2962	4091	frontView.object = group;
2963	4092	sideView.object = group;
2964	4093	}
2965		- group.editWindow = this;
	4094	+
	4095	+// fix "+" issue
	4096	+ //group.editWindow = this;
	4097	+ group.manipWindow = this;
	4098	+
2966	4099	/*
2967	4100	currentLayout = radio.layout;
2968	4101	if (currentLayout == null)
2969	4102	currentLayout = sevenButton;
2970	4103	*/
2971	4104	radio.layout.doClick();
	4105	+
	4106	+ assert(copy instanceof Composite);
	4107	+
	4108	+ if (copy.versionlist == null)
	4109	+ {
	4110	+ copy.versionlist = new Object3D[100];
	4111	+ copy.versionindex = -1;
	4112	+
	4113	+ Save(true);
	4114	+ }
	4115	+
	4116	+ SetVersionStates();
	4117	+
	4118	+ ClearUnpinned();
	4119	+
	4120	+ //Grafreed.Assert(group != null);
	4121	+ //Grafreed.Assert(group.selection != null);
	4122	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4123	+ if (group.selection == null \|\| group.selection.size() == 1)
	4124	+ EditSelection(false);
2972	4125	keepparent = group.parent;
2973	4126	// PARENT = NULL or not???
2974	4127	//group.parent = null; // ROOT
2975	4128	//group.attributes = -1;
2976	4129	ResetModel();
	4130	+
	4131	+ cameraView.requestFocusInWindow();
2977	4132	refreshContents(true);
2978		- }
	4133	+ } else if (event.getSource() == editCameraItem)
	4134	+ {
	4135	+ cameraView.ProtectCamera();
	4136	+ cameraView.requestFocusInWindow();
	4137	+ cameraView.repaint();
	4138	+ return;
	4139	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	4140	+ {
	4141	+ cameraView.RevertCamera();
	4142	+ cameraView.requestFocusInWindow();
	4143	+ cameraView.repaint();
	4144	+ return;
	4145	+ // } else if (event.getSource() == textureButton)
	4146	+ // {
	4147	+ // return; // true;
	4148	+ }
2979	4149	else
2980	4150	{
2981	4151	//return super.action(event, arg);
..	..	@@ -2984,7 +4154,6 @@
2984	4154	}
2985	4155
2986	4156	boolean useclient = false;
2987		- cRadio radio;
2988	4157
2989	4158	void ToggleRoot()
2990	4159	{
..	..	@@ -3036,6 +4205,28 @@
3036	4205	refreshContents();
3037	4206	}
3038	4207
	4208	+ void TransformChildren()
	4209	+ {
	4210	+ Object3D obj;
	4211	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4212	+ {
	4213	+ obj = (Object3D)e.nextElement();
	4214	+ obj.KeepTextureMatrices();
	4215	+ obj.TransformChildren();
	4216	+ obj.RestoreTextureMatrices();
	4217	+
	4218	+// if (obj.parent == null)
	4219	+// {
	4220	+// System.out.println("NULL PARENT!");
	4221	+// new Exception().printStackTrace();
	4222	+// }
	4223	+// else
	4224	+// TouchTransform(obj);
	4225	+// //obj.parent.Touch();
	4226	+ }
	4227	+
	4228	+ refreshContents();
	4229	+ }
3039	4230
3040	4231	void ResetTransform()
3041	4232	{
..	..	@@ -3148,7 +4339,7 @@
3148	4339	refreshContents();
3149	4340	}
3150	4341
3151		- void ResetCentroid()
	4342	+ void ResetCentroid(boolean full)
3152	4343	{
3153	4344	Object3D obj;
3154	4345	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3163,12 +4354,16 @@
3163	4354	LA.matIdentity(Object3D.mat);
3164	4355	obj.getBounds(minima, maxima, false);
3165	4356	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3166		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	4357	+ if (full)
	4358	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3167	4359	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3168	4360	obj.TransformMesh(Object3D.mat);
	4361	+
3169	4362	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3170		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	4363	+ if (full)
	4364	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3171	4365	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	4366	+
3172	4367	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3173	4368	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3174	4369	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3197,7 +4392,8 @@
3197	4392
3198	4393	int size = obj.MemorySize();
3199	4394
3200		- System.err.println((size/1024) + " KB is the size of " + obj);
	4395	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4396	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3201	4397	}
3202	4398	}
3203	4399	catch (Exception e)
..	..	@@ -3234,9 +4430,9 @@
3234	4430	obj = (Object3D)e.nextElement();
3235	4431
3236	4432	System.out.println("Object is: " + obj);
3237		- GrafreeD.AnalyzeObject(obj);
	4433	+ Grafreed.AnalyzeObject(obj);
3238	4434	System.out.println("Boundary rep: " + obj.bRep);
3239		- GrafreeD.AnalyzeObject(obj.bRep);
	4435	+ Grafreed.AnalyzeObject(obj.bRep);
3240	4436
3241	4437	// System.err.println((size/1024) + " KB is the size of " + obj);
3242	4438	}
..	..	@@ -3278,6 +4474,13 @@
3278	4474	void GenNormals(boolean crease)
3279	4475	{
3280	4476	group.GenNormalsS(crease);
	4477	+
	4478	+ refreshContents();
	4479	+ }
	4480	+
	4481	+ void GenNormalsMESH()
	4482	+ {
	4483	+ group.GenNormalsMeshS();
3281	4484
3282	4485	refreshContents();
3283	4486	}
..	..	@@ -3450,8 +4653,8 @@
3450	4653
3451	4654	void ParseVertices()
3452	4655	{
3453		- boolean epsequal = GrafreeD.epsequal;
3454		- GrafreeD.epsequal = true;
	4656	+ boolean epsequal = Grafreed.epsequal;
	4657	+ Grafreed.epsequal = true;
3455	4658
3456	4659	for (int i=0; i<group.selection.size(); i++)
3457	4660	{
..	..	@@ -3476,7 +4679,7 @@
3476	4679	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3477	4680	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3478	4681
3479		- g.add(GrafreeD.clipboard);
	4682	+ g.add(Grafreed.clipboard);
3480	4683
3481	4684	buffer.add(g);
3482	4685	}
..	..	@@ -3491,7 +4694,7 @@
3491	4694	makeSomething(buffer, i==group.selection.size()-1);
3492	4695	}
3493	4696
3494		- GrafreeD.epsequal = epsequal;
	4697	+ Grafreed.epsequal = epsequal;
3495	4698
3496	4699	refreshContents();
3497	4700	}
..	..	@@ -3509,7 +4712,16 @@
3509	4712	String pigment = Object3D.GetPigment(tex);
3510	4713	//String bump = Object3D.GetBump(tex);
3511	4714
3512		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4715	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4716	+
	4717	+ try
	4718	+ {
	4719	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
	4720	+ }
	4721	+ catch (Exception e)
	4722	+ {
	4723	+ System.err.println("FAIL: " + node);
	4724	+ }
3513	4725
3514	4726	double s = v.s;
3515	4727
..	..	@@ -3597,11 +4809,11 @@
3597	4809
3598	4810	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3599	4811
3600		- boolean random = CameraPane.RANDOM;
3601		- CameraPane.RANDOM = false; // parse all random nodes
	4812	+ boolean random = CameraPane.SWITCH;
	4813	+ CameraPane.SWITCH = false; // parse all random nodes
3602	4814	lowres.linkVerticesThis(null);
3603	4815	lowres.linkVerticesThis(sn);
3604		- CameraPane.RANDOM = random;
	4816	+ CameraPane.SWITCH = random;
3605	4817
3606	4818	System.err.flush();
3607	4819
..	..	@@ -3641,7 +4853,7 @@
3641	4853	return;
3642	4854
3643	4855	Object3D poses = group.selection.get(0);
3644		- Object3D ref = GrafreeD.clipboard.get(0);
	4856	+ Object3D ref = Grafreed.clipboard.get(0);
3645	4857
3646	4858	Object3D newgroup = new Object3D("Po:" + poses.name);
3647	4859
..	..	@@ -3835,9 +5047,9 @@
3835	5047
3836	5048	void ClipMesh()
3837	5049	{
3838		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	5050	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3839	5051	{
3840		- Object3D content = GrafreeD.clipboard.get(0);
	5052	+ Object3D content = Grafreed.clipboard.get(0);
3841	5053
3842	5054	if (content instanceof cGroup && ((cGroup)content).transientlink )
3843	5055	content = ((cGroup)content).get(0);
..	..	@@ -3846,7 +5058,7 @@
3846	5058	// {
3847	5059	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3848	5060	// }
3849		- group.selection.ClipMesh(GrafreeD.clipboard);
	5061	+ group.selection.ClipMesh(Grafreed.clipboard);
3850	5062	}
3851	5063	// group.selection.ClipMesh(GrafreeD.clipboard);
3852	5064	System.out.println("DONE.");
..	..	@@ -3893,6 +5105,18 @@
3893	5105	void MarkLeaves(boolean hide)
3894	5106	{
3895	5107	group.selection.MarkLeaves(hide);
	5108	+ refreshContents();
	5109	+ }
	5110	+
	5111	+ void RewindLeaves(boolean hide)
	5112	+ {
	5113	+ group.selection.RewindLeaves(hide);
	5114	+ refreshContents();
	5115	+ }
	5116	+
	5117	+ void RandomLeaves(boolean hide)
	5118	+ {
	5119	+ group.selection.RandomLeaves(hide);
3896	5120	refreshContents();
3897	5121	}
3898	5122
..	..	@@ -3967,28 +5191,25 @@
3967	5191	// }
3968	5192	// }
3969	5193
3970		- static boolean allparams = true;
3971		-
3972		- static Vector<Object3D> listUI = new Vector<Object3D>();
3973		-
3974	5194	void EditSelection(boolean newWindow)
3975	5195	{
	5196	+ if (group.selection == null)
	5197	+ {
	5198	+ EditElement(group, newWindow); // ? new
	5199	+ return;
	5200	+ }
	5201	+
3976	5202	// aConstraints.gridy = 0;
3977	5203	for (int i=0; i<group.selection.size(); i++)
3978	5204	{
3979	5205	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
3980	5206	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3981		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5207	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3982	5208
3983	5209	Object3D elem = (Object3D)group.selection.elementAt(i);
3984		- if(elem != group)
	5210	+ if(elem != group \|\| !newWindow)
3985	5211	{
3986		- // if (!(elem instanceof Composite))
3987		- // newWindow = false;
3988		- listUI.add(elem);
3989		- elem.openEditWindow(this, newWindow); //, false);
3990		- System.out.println("edit : " + elem);
3991		- elem.editWindow.refreshContents(true); // ? new
	5212	+ EditElement(elem, newWindow); // ? new
3992	5213	}
3993	5214	}
3994	5215	}
..	..	@@ -4051,9 +5272,7 @@
4051	5272
4052	5273	freezemodel = false;
4053	5274	}
4054		-
4055		- boolean flashIt = true;
4056		-
	5275	+
4057	5276	public void valueChanged(TreeSelectionEvent e)
4058	5277	//public boolean handleEvent(Event event)
4059	5278	{
..	..	@@ -4063,7 +5282,8 @@
4063	5282	//new Exception().printStackTrace();
4064	5283
4065	5284	freezemodel = true;
4066		-
	5285	+ ClearUnpinned();
	5286	+
4067	5287	/**/
4068	5288	//switch (event.id)
4069	5289	{
..	..	@@ -4071,7 +5291,6 @@
4071	5291	//case 702: // Event.LIST_DESELECT
4072	5292	group.deselectAll();
4073	5293	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4074		- objEditor.ClearInfo(); // .GetMaterial());
4075	5294	if (tps != null)
4076	5295	{
4077	5296	for (int i=0; i < tps.length; i++)
..	..	@@ -4080,33 +5299,39 @@
4080	5299
4081	5300	//if (child.parent != null)
4082	5301	//child.parent.addSelectee(child);
	5302	+ objEditor.SetMaterial(child);
4083	5303	group.addSelectee(child);
4084		- objEditor.SetMaterial(child); // .GetMaterial());
4085		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4086		- System.err.println("info : " + child.GetPath());
4087	5304	}
4088	5305	}
4089		- else
4090		- {
4091		- objEditor.SetMaterial(group); // .GetMaterial());
4092		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4093		- System.err.println("info : " + group.GetPath());
4094		- }
	5306	+// else
	5307	+// {
	5308	+// objEditor.SetMaterial(group); // .GetMaterial());
	5309	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	5310	+// System.err.println("info : " + group.GetPath());
	5311	+// }
4095	5312
4096		- objEditor.SetText(); // jan 2014
4097		-
4098		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	5313	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4099	5314	CameraPane.flash = true;
4100	5315
4101		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5316	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4102	5317	// a camera
4103	5318	{
4104		- CameraPane.camerachangeframe = 0; // don't refuse it
4105		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5319	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5320	+ {
	5321	+ CameraPane.camerachangeframe = 0; // don't refuse it
	5322	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5323	+ }
4106	5324	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4107	5325	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4108	5326	}
4109	5327
	5328	+ if (tps != null && tps.length == 1)
	5329	+ {
	5330	+ EditSelection(false);
	5331	+ }
	5332	+
	5333	+ SetPinStates(tps != null && tps.length > 0);
	5334	+
4110	5335	refreshContents();
4111	5336	//return true;
4112	5337	}
..	..	@@ -4115,6 +5340,51 @@
4115	5340
4116	5341	freezemodel = false;
4117	5342	}
	5343	+
	5344	+ void SetPinStates(boolean enabled)
	5345	+ {
	5346	+ editButton.setEnabled(enabled);
	5347	+ uneditButton.setEnabled(enabled);
	5348	+ //unselectButton.setEnabled(enabled);
	5349	+ flashSelectionButton.setEnabled(enabled);
	5350	+
	5351	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5352	+
	5353	+ boolean allComposites = true;
	5354	+
	5355	+ if (group.selection != null)
	5356	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5357	+ {
	5358	+ if (!(e.nextElement() instanceof Composite))
	5359	+ {
	5360	+ allComposites = false;
	5361	+ break;
	5362	+ }
	5363	+ }
	5364	+
	5365	+ rootButton.setEnabled(allComposites);
	5366	+ }
	5367	+
	5368	+ void refreshContents(boolean cp)
	5369	+ {
	5370	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5371	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5372	+ {
	5373	+ objEditor.ClearInfo(); // .GetMaterial());
	5374	+
	5375	+ for (int i=0; i < group.selection.Size(); i++)
	5376	+ {
	5377	+ Object3D child = (Object3D) group.selection.get(i);
	5378	+
	5379	+ objEditor.AddInfo(child, this, true);
	5380	+// System.err.println("info : " + child.GetPath());
	5381	+ }
	5382	+
	5383	+ objEditor.SetText(); // jan 2014
	5384	+ }
	5385	+
	5386	+ super.refreshContents(cp);
	5387	+ }
4118	5388
4119	5389	void linkSomething(Object3D thing)
4120	5390	{
..	..	@@ -4186,16 +5456,19 @@
4186	5456	{
4187	5457	if (group.selection.isEmpty())
4188	5458	return;
4189		- GrafreeD.clipboardIsTempGroup = false;
	5459	+
	5460	+ Grafreed.clipboardIsTempGroup = false;
4190	5461	Composite tGroup = null;
4191	5462	if (group.selection.size() > 0) // 1)
4192	5463	{
4193	5464	tGroup = new cGroup();
4194		- GrafreeD.clipboardIsTempGroup = true;
	5465	+ Grafreed.clipboardIsTempGroup = true;
4195	5466	}
4196	5467
4197	5468	if (cut)
4198	5469	{
	5470	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5471	+// Save();
4199	5472	//int indices[] = jList.getSelectedIndices();
4200	5473	//for (int i = indices.length - 1; i >= 0; i--)
4201	5474	//jList.remove(indices[i]);
..	..	@@ -4231,16 +5504,16 @@
4231	5504	//System.out.println("cut " + child);
4232	5505	//System.out.println("parent = " + child.parent);
4233	5506	// tmp.addChild(child);
4234		- if (GrafreeD.clipboardIsTempGroup)
	5507	+ if (Grafreed.clipboardIsTempGroup)
4235	5508	tGroup.add/Child/(tmp);
4236	5509	else
4237		- GrafreeD.clipboard = tmp;
	5510	+ Grafreed.clipboard = tmp;
4238	5511	}
4239	5512	else
4240		- if (GrafreeD.clipboardIsTempGroup)
	5513	+ if (Grafreed.clipboardIsTempGroup)
4241	5514	tGroup.add/Child/(child);
4242	5515	else
4243		- GrafreeD.clipboard = child;
	5516	+ Grafreed.clipboard = child;
4244	5517	}
4245	5518
4246	5519	//ResetModel();
..	..	@@ -4272,21 +5545,23 @@
4272	5545	//System.out.println("cut " + elem);
4273	5546	//System.out.println("parent = " + elem.parent);
4274	5547	// tmp.addChild(elem);
4275		- if (GrafreeD.clipboardIsTempGroup)
	5548	+ if (Grafreed.clipboardIsTempGroup)
4276	5549	tGroup.add/Child/(tmp);
4277	5550	else
4278		- GrafreeD.clipboard = tmp;
	5551	+ Grafreed.clipboard = tmp;
4279	5552	}
4280	5553	else
4281		- if (GrafreeD.clipboardIsTempGroup)
	5554	+ if (Grafreed.clipboardIsTempGroup)
4282	5555	tGroup.add/Child/(child);
4283	5556	else
4284		- GrafreeD.clipboard = child;
	5557	+ Grafreed.clipboard = child;
4285	5558	}
4286	5559
4287	5560	}
4288		- if (GrafreeD.clipboardIsTempGroup)
4289		- GrafreeD.clipboard = tGroup;
	5561	+
	5562	+ if (Grafreed.clipboardIsTempGroup)
	5563	+ Grafreed.clipboard = tGroup;
	5564	+
4290	5565	if (cut)
4291	5566	{
4292	5567	ResetModel();
..	..	@@ -4296,11 +5571,15 @@
4296	5571
4297	5572	void paste(boolean expand)
4298	5573	{
	5574	+ if (Globals.REPLACEONMAKE)
	5575	+ Save();
	5576	+ boolean keep = Globals.REPLACEONMAKE;
	5577	+ Globals.REPLACEONMAKE = false;
4299	5578	// if (GrafreeD.clipboard == null)
4300	5579	// return;
4301	5580	boolean first = true;
4302	5581
4303		- if (GrafreeD.clipboardIsTempGroup)
	5582	+ if (Grafreed.clipboardIsTempGroup)
4304	5583	{
4305	5584	Composite temp;
4306	5585
..	..	@@ -4311,7 +5590,7 @@
4311	5590	temp = (Composite)Applet3D.clipboard.deepCopy();
4312	5591	*/
4313	5592	Object3D elem;
4314		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5593	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4315	5594	{
4316	5595	Object3D child = (Object3D)e.nextElement();
4317	5596
..	..	@@ -4345,21 +5624,22 @@
4345	5624	//Object3D cb = Applet3D.clipboard;
4346	5625	//temp.addChild(cb);
4347	5626	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4348		- assert(GrafreeD.clipboard.parent == null);
4349		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4350		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4351		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4352		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	5627	+ assert(Grafreed.clipboard.parent == null);
	5628	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5629	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5630	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5631	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4353	5632	else
4354		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4355		- GrafreeD.clipboard.get(0).parent = keepparent;
	5633	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5634	+ Grafreed.clipboard.get(0).parent = keepparent;
4356	5635	}
4357	5636
	5637	+ Globals.REPLACEONMAKE = keep;
4358	5638	ResetModel();
4359	5639	refreshContents();
4360	5640	}
4361	5641
4362		- void pasteInto(boolean copyit)
	5642	+ void pasteInto(boolean copyit, boolean clone)
4363	5643	{
4364	5644	// if (GrafreeD.clipboard == null)
4365	5645	// return;
..	..	@@ -4388,15 +5668,22 @@
4388	5668	if (copyit)
4389	5669	{
4390	5670	// paste(false);
4391		- CloneClipboard(false); // sept 2014
	5671	+ if (clone)
	5672	+ {
	5673	+ CloneClipboard(false); // sept 2014
	5674	+ }
	5675	+ else
	5676	+ {
	5677	+ paste(false);
	5678	+ }
4392	5679	}
4393	5680	else
4394	5681	{
4395	5682	boolean first = true;
4396	5683
4397		- if (GrafreeD.clipboardIsTempGroup)
	5684	+ if (Grafreed.clipboardIsTempGroup)
4398	5685	{
4399		- Composite temp = (Composite)GrafreeD.clipboard;
	5686	+ Composite temp = (Composite)Grafreed.clipboard;
4400	5687	Object3D copy;
4401	5688	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4402	5689	{
..	..	@@ -4406,7 +5693,7 @@
4406	5693	}
4407	5694	} else
4408	5695	{
4409		- linkSomething(GrafreeD.clipboard); //.get(0));
	5696	+ linkSomething(Grafreed.clipboard); //.get(0));
4410	5697	}
4411	5698	}
4412	5699	}
..	..	@@ -4483,6 +5770,10 @@
4483	5770
4484	5771	void group(Object3D csg, boolean grab)
4485	5772	{
	5773	+ if (Globals.REPLACEONMAKE)
	5774	+ Save();
	5775	+ boolean keep = Globals.REPLACEONMAKE;
	5776	+ Globals.REPLACEONMAKE = false;
4486	5777	if (//false) // why??
4487	5778	!group.selection.isEmpty())
4488	5779	{
..	..	@@ -4596,10 +5887,15 @@
4596	5887	//node.add(csg);
4597	5888	//makeSomething(node);
4598	5889	makeSomething(csg);
	5890	+ Globals.REPLACEONMAKE = keep;
4599	5891	}
4600	5892
4601	5893	void Ungroup(Object3D g)
4602	5894	{
	5895	+ if (Globals.REPLACEONMAKE)
	5896	+ Save();
	5897	+ boolean keep = Globals.REPLACEONMAKE;
	5898	+ Globals.REPLACEONMAKE = false;
4603	5899	if (g instanceof HiddenObject)
4604	5900	{
4605	5901	HiddenObject h = (HiddenObject) g;
..	..	@@ -4616,6 +5912,7 @@
4616	5912	objEditor.makeSomething(g.get(i), false);
4617	5913	}
4618	5914	}
	5915	+ Globals.REPLACEONMAKE = keep;
4619	5916	}
4620	5917
4621	5918	void ungroup()
..	..	@@ -4811,21 +6108,6 @@
4811	6108	}
4812	6109	*/
4813	6110
4814		- void ImportGFD()
4815		- {
4816		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4817		- browser.show();
4818		- String filename = browser.getFile();
4819		- if (filename != null && filename.length() > 0)
4820		- {
4821		- String fullname = browser.getDirectory() + filename;
4822		-
4823		- //Object3D readobj =
4824		- objEditor.ReadGFD(fullname, objEditor);
4825		- //makeSomething(readobj);
4826		- }
4827		- }
4828		-
4829	6111	/*
4830	6112	public void Callback(Object obj)
4831	6113	{
..	..	@@ -4849,26 +6131,9 @@
4849	6131	}
4850	6132	*/
4851	6133
4852		- void ImportVRMLX3D()
4853		- {
4854		- if (GrafreeD.standAlone)
4855		- {
4856		- /**/
4857		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4858		- browser.show();
4859		- String filename = browser.getFile();
4860		- if (filename != null && filename.length() > 0)
4861		- {
4862		- String fullname = browser.getDirectory() + filename;
4863		- LoadVRMLX3D(fullname);
4864		- }
4865		- /**/
4866		- }
4867		- }
4868		-
4869	6134	String GetFile(String dialogName)
4870	6135	{
4871		- if (GrafreeD.standAlone)
	6136	+ if (Grafreed.standAlone)
4872	6137	{
4873	6138	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4874	6139	browser.show();
..	..	@@ -4932,10 +6197,48 @@
4932	6197	cButton flashSelectionButton;
4933	6198	cButton editButton;
4934	6199	cButton uneditButton;
	6200	+ JCheckBox allParamsButton;
4935	6201	cButton clearpanelButton;
4936		- cButton allParamsButton;
4937	6202	cButton unselectButton;
4938	6203
	6204	+ cButton restoreCameraButton;
	6205	+
	6206	+ cButton oneStepButton;
	6207	+
	6208	+ cButton groupButton;
	6209	+ cButton ungroupButton;
	6210	+ cButton compositeButton;
	6211	+ cButton switchButton;
	6212	+ cButton loopButton;
	6213	+ cButton textureButton;
	6214	+
	6215	+ cButton skybox1Button;
	6216	+ cButton skybox2Button;
	6217	+ cButton skybox3Button;
	6218	+ cButton skybox4Button;
	6219	+ cButton skybox5Button;
	6220	+ cButton skybox6Button;
	6221	+ cButton skybox7Button;
	6222	+
	6223	+ cButton skybox11Button;
	6224	+ cButton skybox12Button;
	6225	+ cButton skybox13Button;
	6226	+ cButton skybox14Button;
	6227	+ cButton skybox15Button;
	6228	+ cButton skybox16Button;
	6229	+ cButton skybox17Button;
	6230	+
	6231	+ cButton gridButton;
	6232	+ cButton boxButton;
	6233	+ cButton sphereButton;
	6234	+ cButton coneButton;
	6235	+ cButton torusButton;
	6236	+ cButton superButton;
	6237	+ cButton kleinButton;
	6238	+ cButton particlesButton;
	6239	+ cButton overlayButton;
	6240	+ cButton lightButton;
	6241	+
4939	6242	cButton screenfitButton;
4940	6243	cButton screenfitpointButton;
4941	6244	cButton snapobjectButton;
..	..	@@ -4947,14 +6250,6 @@
4947	6250
4948	6251	cButton setsupportButton;
4949	6252
4950		- cButton twoButton;
4951		- cButton sixButton;
4952		- cButton threeButton;
4953		- cButton sevenButton;
4954		- cButton fourButton; // full panel
4955		- cButton oneButton; // full XYZ
4956		- //cButton currentLayout;
4957		-
4958	6253	//
4959	6254	//Composite
4960	6255	Object3D // to do !!
..	..	@@ -4964,10 +6259,12 @@
4964	6259	//JTree jTree;
4965	6260	private MenuItem lookAtItem;
4966	6261	private MenuItem lookFromItem;
4967		- private MenuItem switchItem;
4968		- private MenuItem cutItem;
4969		- private MenuItem duplicateItem;
4970		- private MenuItem cloneItem;
	6262	+ private MenuItem switchViewItem;
	6263	+ private JMenuItem cutItem;
	6264	+ private MenuItem undoItem;
	6265	+ private MenuItem redoItem;
	6266	+ private JMenuItem duplicateItem;
	6267	+ private JMenuItem cloneItem;
4971	6268	private MenuItem cloneSupportItem;
4972	6269	private MenuItem overwriteGeoItem;
4973	6270	private MenuItem overwriteMatItem;
..	..	@@ -4979,7 +6276,7 @@
4979	6276	private MenuItem linkverticesItem;
4980	6277	private MenuItem relinkverticesItem;
4981	6278	private MenuItem setMasterItem;
4982		- private MenuItem resetMeshItem;
	6279	+ private MenuItem resetAllItem;
4983	6280	private MenuItem stepAllItem;
4984	6281	private MenuItem revertMeshItem;
4985	6282	private MenuItem poseMeshItem;
..	..	@@ -4988,12 +6285,13 @@
4988	6285	private MenuItem cloneGeometriesItem;
4989	6286	private MenuItem shareGeometriesItem;
4990	6287	private MenuItem mergeGeometriesItem;
4991		- private MenuItem copyItem;
	6288	+ private JMenuItem copyItem;
4992	6289	private MenuItem pasteItem;
4993		- private MenuItem pasteLinkItem;
4994		- private MenuItem pasteCloneItem;
4995		- private MenuItem pasteExpandItem;
4996		- private MenuItem clearItem;
	6290	+ private JMenuItem pasteIntoItem;
	6291	+ private JMenuItem pasteLinkItem;
	6292	+ private JMenuItem pasteCloneItem;
	6293	+ private JMenuItem pasteExpandItem;
	6294	+ private JMenuItem deleteItem;
4997	6295	private MenuItem clearAllItem;
4998	6296	private MenuItem genUVItem;
4999	6297	private MenuItem genNormalsMESHItem;
..	..	@@ -5028,6 +6326,10 @@
5028	6326	private MenuItem showleavesItem;
5029	6327	private MenuItem markleavesItem;
5030	6328	private MenuItem unmarkleavesItem;
	6329	+ private MenuItem rewindleavesItem;
	6330	+ private MenuItem unrewindleavesItem;
	6331	+ private MenuItem randomleavesItem;
	6332	+ private MenuItem unrandomleavesItem;
5031	6333
5032	6334	private MenuItem flipVItem;
5033	6335	private MenuItem unflipVItem;
..	..	@@ -5039,15 +6341,17 @@
5039	6341	private MenuItem panoTexturesItem;
5040	6342
5041	6343	private MenuItem resetCentroidItem;
5042		- private MenuItem transformgeometryItem;
	6344	+ private MenuItem resetCentroidXZItem;
5043	6345	private MenuItem resetTransformItem;
	6346	+ private MenuItem transformGeometryItem;
	6347	+ private MenuItem transformChildrenItem;
5044	6348	private MenuItem hideItem;
5045	6349	private MenuItem grabItem;
5046	6350	private MenuItem backItem;
5047	6351	private MenuItem frontItem;
5048	6352	private MenuItem cameraItem;
5049	6353	private MenuItem compositeItem;
5050		- private MenuItem randomItem;
	6354	+ private MenuItem switchItem;
5051	6355	private MenuItem physicsItem;
5052	6356	private MenuItem frameselectorItem;
5053	6357	private MenuItem scriptNodeItem;
..	..	@@ -5055,7 +6359,7 @@
5055	6359	private MenuItem switchTransfoItem;
5056	6360	private MenuItem morphItem;
5057	6361	private MenuItem linkerItem;
5058		- private MenuItem ungroupItem;
	6362	+ private JMenuItem ungroupItem;
5059	6363	private MenuItem editItem;
5060	6364	private MenuItem openWindowItem;
5061	6365	private MenuItem editLeafItem;
..	..	@@ -5071,6 +6375,8 @@
5071	6375	private MenuItem attachBumpItem;
5072	6376	private MenuItem detachBumpItem;
5073	6377	private MenuItem pigmentBumpItem;
	6378	+ private MenuItem embedTexturesItem;
	6379	+ private MenuItem deEmbedTexturesItem;
5074	6380
5075	6381	private MenuItem particleItem;
5076	6382	private MenuItem ragdollItem;
..	..	@@ -5087,7 +6393,7 @@
5087	6393	private MenuItem blobItem;
5088	6394	private MenuItem latheItem;
5089	6395	private MenuItem bezierItem;
5090		- private MenuItem checkerItem;
	6396	+ private MenuItem overlayItem;
5091	6397	private MenuItem meshItem;
5092	6398	// private MenuItem meshGroupItem;
5093	6399	private MenuItem springItem;
..	..	@@ -5109,11 +6415,6 @@
5109	6415	private MenuItem doubleItem;
5110	6416	private MenuItem tripleItem;
5111	6417
5112		- private MenuItem importGFDItem;
5113		- private MenuItem importVRMLX3DItem;
5114		- private MenuItem import3DSItem;
5115		- private MenuItem importOBJItem;
5116		-
5117	6418	private MenuItem computeAOItem;
5118	6419	private MenuItem recompileItem;
5119	6420	private MenuItem editScriptItem;
..	..	@@ -5123,4 +6424,8 @@
5123	6424	private MenuItem analyzeItem;
5124	6425	private MenuItem dumpItem;
5125	6426	//boolean freezemodel = false;
	6427	+
	6428	+ Menu cameraMenu;
	6429	+ MenuItem editCameraItem;
	6430	+ MenuItem restoreCameraItem;
5126	6431	}