~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,17 +437,29 @@
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	{
86		- // Object3D keep = GraphreeD.clipboard;
	458	+ if (Globals.REPLACEONMAKE)
	459	+ Save();
	460	+ boolean keep = Globals.REPLACEONMAKE;
	461	+ Globals.REPLACEONMAKE = false;
	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();)
89	465	{
..	..	@@ -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(GraphreeD.clipboard.parent == null);
101		- Object3D /Composite/ keepparent = GraphreeD.clipboard.get(0).parent;
102		- GraphreeD.clipboard.get(0).parent = null; // Avoid copy?
103		- if (LA.isIdentity(GraphreeD.clipboard.toParent))
104		- makeSomething(CloneObject(GraphreeD.clipboard.get(0), false));
	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(GraphreeD.clipboard, false));
107		- GraphreeD.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)GraphreeD.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,30 +524,29 @@
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	543	cloneItem = menu.add(new MenuItem("Clone"));
171	544	cloneItem.addActionListener(this);
	545	+ if (Globals.ADVANCED)
	546	+ {
172	547	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
173	548	cloneSupportItem.addActionListener(this);
	549	+ }
174	550	menu.add("-");
175	551	cutItem = menu.add(new MenuItem("Cut"));
176	552	cutItem.addActionListener(this);
..	..	@@ -178,27 +554,121 @@
178	554	copyItem.addActionListener(this);
179	555	pasteItem = menu.add(new MenuItem("Paste"));
180	556	pasteItem.addActionListener(this);
	557	+
	558	+ menu.add("-");
	559	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	560	+ pasteIntoItem.addActionListener(this);
181	561	pasteLinkItem = menu.add(new MenuItem("Paste link"));
182	562	pasteLinkItem.addActionListener(this);
183	563	pasteCloneItem = menu.add(new MenuItem("Paste clone"));
184	564	pasteCloneItem.addActionListener(this);
185	565	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
186	566	// pasteExpandItem.addActionListener(this);
187		- clearItem = menu.add(new MenuItem("Clear"));
188		- clearItem.addActionListener(this);
	567	+ menu.add("-");
	568	+ deleteItem = menu.add(new MenuItem("Delete"));
	569	+ deleteItem.addActionListener(this);
	570	+
	571	+ if (Globals.ADVANCED)
	572	+ {
	573	+ // Deletes the cameras...
189	574	clearAllItem = menu.add(new MenuItem("Clear All"));
190	575	clearAllItem.addActionListener(this);
	576	+ }
	577	+
	578	+ menuBar.add(cameraMenu = new Menu("View"));
	579	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	580	+ //zBufferItem.addActionListener(this);
	581	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	582	+ //normalLensItem.addActionListener(this);
	583	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	584	+ restoreCameraItem.addActionListener(this);
	585	+
	586	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	587	+// toggleFullScreenItem.addItemListener(this);
	588	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	589	+// cameraMenu.add("-");
	590	+//
	591	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	592	+// toggleTextureItem.addItemListener(this);
	593	+// toggleTextureItem.setState(CameraPane.textureon);
	594	+//
	595	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	596	+// toggleSwitchItem.addItemListener(this);
	597	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	598	+
	599	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	600	+ toggleHandleItem.addItemListener(this);
	601	+ toggleHandleItem.setState(CameraPane.HANDLES);
	602	+
	603	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	604	+ togglePaintItem.addItemListener(this);
	605	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	606	+
	607	+ if (Globals.ADVANCED)
	608	+ {
	609	+ cameraMenu.add("-");
	610	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	611	+ toggleLiveItem.addItemListener(this);
	612	+ toggleLiveItem.setState(Globals.isLIVE());
191	613
	614	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	615	+ stepItem.addActionListener(this);
	616	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	617	+ // toggleDLItem.addItemListener(this);
	618	+ // toggleDLItem.setState(false);
	619	+
	620	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	621	+ toggleRenderItem.addItemListener(this);
	622	+ toggleRenderItem.setState(!CameraPane.frozen);
	623	+
	624	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	625	+ toggleDebugItem.addItemListener(this);
	626	+ toggleDebugItem.setState(Globals.DEBUG);
	627	+
	628	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	629	+ toggleFrustumItem.addItemListener(this);
	630	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	631	+
	632	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	633	+ toggleFootContactItem.addItemListener(this);
	634	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	635	+
	636	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	637	+ toggleTimelineItem.addItemListener(this);
	638	+ }
	639	+
	640	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	641	+// toggleRootItem.addItemListener(this);
	642	+// toggleRootItem.setState(false);
	643	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	644	+// animationItem.addItemListener(this);
	645	+// animationItem.setState(CameraPane.ANIMATION);
	646	+ cameraMenu.add("-");
	647	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	648	+ editCameraItem.addActionListener(this);
	649	+
	650	+ if (Globals.ADVANCED)
	651	+ {
	652	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	653	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	654	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	655	+ oe.cameraMenu.add("-");
	656	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	657	+ openWindowItem.addActionListener(this);
	658	+ lookAtItem.addActionListener(this);
	659	+ //lookFromItem.addActinoListener(this);
	660	+ //switchViewItem.addActionListener(this);
	661	+ }
	662	+
192	663	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);
	664	+ if (Globals.ADVANCED)
	665	+ {
197	666	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
198	667	revertMeshItem.addActionListener(this);
199	668	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
200	669	resetreferencesItem.addActionListener(this);
201	670	menu.add("-");
	671	+ }
202	672	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
203	673	overwriteGeoItem.addActionListener(this);
204	674	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -210,73 +680,104 @@
210	680	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211	681	overwriteUVItem.addActionListener(this);
212	682	menu.add("-");
	683	+ if (Globals.ADVANCED)
	684	+ {
213	685	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214	686	generateMeshItem.addActionListener(this);
215	687	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216	688	poseMeshItem.addActionListener(this);
217	689	menu.add("-");
	690	+ }
218	691	resetsupportItem = menu.add(new MenuItem("Reset support"));
219	692	resetsupportItem.addActionListener(this);
220	693	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	694	linkverticesItem.addActionListener(this);
	695	+ relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
	696	+ relinkverticesItem.addActionListener(this);
	697	+
	698	+ if (Globals.ADVANCED)
	699	+ {
222	700	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
223	701	setMasterItem.addActionListener(this);
	702	+ }
224	703
225	704	oe.menuBar.add(menu = new Menu("Group"));
226		- grabItem = menu.add(new MenuItem("Grab"));
227		- grabItem.addActionListener(this);
228		- frontItem = menu.add(new MenuItem("Front"));
229		- frontItem.addActionListener(this);
	705	+// grabItem = menu.add(new MenuItem("Grab"));
	706	+// grabItem.addActionListener(this);
230	707	backItem = menu.add(new MenuItem("Back"));
231	708	backItem.addActionListener(this);
232		- compositeItem = menu.add(new MenuItem("Composite"));
233		- compositeItem.addActionListener(this);
234		- menu.add("-");
235		- randomItem = menu.add(new MenuItem("Random"));
236		- randomItem.addActionListener(this);
237		- physicsItem = menu.add(new MenuItem("Physics"));
238		- physicsItem.addActionListener(this);
239		- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
240		- frameselectorItem.addActionListener(this);
	709	+ frontItem = menu.add(new MenuItem("Front"));
	710	+ frontItem.addActionListener(this);
	711	+// compositeItem = menu.add(new MenuItem("Composite"));
	712	+// compositeItem.addActionListener(this);
	713	+
	714	+ if (Globals.ADVANCED)
	715	+ {
	716	+ hideItem = menu.add(new MenuItem("Hidden Group"));
	717	+ hideItem.addActionListener(this);
	718	+ }
	719	+ ungroupItem = menu.add(new MenuItem("Ungroup"));
	720	+ ungroupItem.addActionListener(this);
	721	+
	722	+// menu.add("-");
	723	+//
	724	+// switchItem = menu.add(new MenuItem("Switch node"));
	725	+// switchItem.addActionListener(this);
	726	+ if (Globals.ADVANCED)
	727	+ {
241	728	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
242	729	switchGeoItem.addActionListener(this);
243	730	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
244	731	switchTransfoItem.addActionListener(this);
245		- morphItem = menu.add(new MenuItem("Morph"));
	732	+ morphItem = menu.add(new MenuItem("Morph Group"));
246	733	morphItem.addActionListener(this);
	734	+
	735	+ menu.add("-");
	736	+ physicsItem = menu.add(new MenuItem("Physics"));
	737	+ physicsItem.addActionListener(this);
	738	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	739	+ frameselectorItem.addActionListener(this);
247	740	scriptNodeItem = menu.add(new MenuItem("Script Node"));
248	741	scriptNodeItem.addActionListener(this);
249		- cameraItem = menu.add(new MenuItem("Camera"));
250		- cameraItem.addActionListener(this);
	742	+ }
251	743
252	744	oe.menuBar.add(menu = new Menu("Object"));
253		- textureItem = menu.add(new MenuItem("Texture"));
254		- textureItem.addActionListener(this);
	745	+// textureItem = menu.add(new MenuItem("Texture"));
	746	+// textureItem.addActionListener(this);
	747	+ billboardItem = menu.add(new MenuItem("Billboard"));
	748	+ billboardItem.addActionListener(this);
255	749	csgItem = menu.add(new MenuItem("CSG"));
256	750	csgItem.addActionListener(this);
257		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	751	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
258	752	shadowXItem.addActionListener(this);
259		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	753	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
260	754	shadowYItem.addActionListener(this);
261		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	755	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
262	756	shadowZItem.addActionListener(this);
	757	+ attributeItem = menu.add(new MenuItem("Attribute"));
	758	+ attributeItem.addActionListener(this);
	759	+
	760	+ if (Globals.ADVANCED)
	761	+ {
	762	+ menu.add("-");
263	763	linkerItem = menu.add(new MenuItem("Linker"));
264	764	linkerItem.addActionListener(this);
265	765	templateItem = menu.add(new MenuItem("Template"));
266	766	templateItem.addActionListener(this);
267		- attributeItem = menu.add(new MenuItem("Attribute"));
268		- attributeItem.addActionListener(this);
269	767	pointflowItem = menu.add(new MenuItem("Point Flow"));
270	768	pointflowItem.addActionListener(this);
	769	+ }
271	770	menu.add("-");
272		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
273		- transformgeometryItem.addActionListener(this);
274	771	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
275	772	resetTransformItem.addActionListener(this);
276	773	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
277	774	resetCentroidItem.addActionListener(this);
278		- ungroupItem = menu.add(new MenuItem("Ungroup"));
279		- ungroupItem.addActionListener(this);
	775	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	776	+ resetCentroidXZItem.addActionListener(this);
	777	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	778	+ transformGeometryItem.addActionListener(this);
	779	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	780	+ transformChildrenItem.addActionListener(this);
280	781
281	782	oe.menuBar.add(menu = new Menu("Geometry"));
282	783	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -285,6 +786,13 @@
285	786	genNormalsORGANItem.addActionListener(this);
286	787	genNormalsCADItem = menu.add(new MenuItem("CAD Normals"));
287	788	genNormalsCADItem.addActionListener(this);
	789	+ genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
	790	+ genNormalsMESHItem.addActionListener(this);
	791	+ if (Globals.ADVANCED)
	792	+ {
	793	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
	794	+ genNormalsMINEItem.addActionListener(this);
	795	+ }
288	796	stripifyItem = menu.add(new MenuItem("Stripify"));
289	797	stripifyItem.addActionListener(this);
290	798	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -306,23 +814,34 @@
306	814	reduce34MeshItem.addActionListener(this);
307	815	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
308	816	increaseMeshItem.addActionListener(this);
309		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
310		- smoothMeshItem.addActionListener(this);
311	817	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
312	818	clipMeshItem.addActionListener(this);
	819	+
	820	+ if (Globals.ADVANCED)
	821	+ {
	822	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	823	+ smoothMeshItem.addActionListener(this);
	824	+ }
313	825
314	826	oe.menuBar.add(menu = new Menu("Attributes"));
315	827	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
316	828	clearMaterialsItem.addActionListener(this);
	829	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	830	+ resetAllItem.addActionListener(this);
	831	+ stepAllItem = menu.add(new MenuItem("Step All"));
	832	+ stepAllItem.addActionListener(this);
317	833	menu.add("-");
318	834	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
319	835	liveleavesItem.addActionListener(this);
320	836	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
321	837	unliveleavesItem.addActionListener(this);
	838	+ if (Globals.ADVANCED)
	839	+ {
322	840	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
323	841	supportleavesItem.addActionListener(this);
324	842	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
325	843	unsupportleavesItem.addActionListener(this);
	844	+ }
326	845	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
327	846	hideleavesItem.addActionListener(this);
328	847	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -331,6 +850,14 @@
331	850	markleavesItem.addActionListener(this);
332	851	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
333	852	unmarkleavesItem.addActionListener(this);
	853	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	854	+ rewindleavesItem.addActionListener(this);
	855	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	856	+ unrewindleavesItem.addActionListener(this);
	857	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	858	+ randomleavesItem.addActionListener(this);
	859	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	860	+ unrandomleavesItem.addActionListener(this);
334	861	menu.add("-");
335	862	flipVItem = menu.add(new MenuItem("Flip V"));
336	863	flipVItem.addActionListener(this);
..	..	@@ -356,53 +883,129 @@
356	883	attachBumpItem.addActionListener(this);
357	884	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
358	885	pigmentBumpItem.addActionListener(this);
	886	+ //embedTexturesItem
359	887	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
360	888	detachPigmentItem.addActionListener(this);
361	889	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
362	890	detachBumpItem.addActionListener(this);
	891	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	892	+ embedTexturesItem.addActionListener(this);
	893	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	894	+ deEmbedTexturesItem.addActionListener(this);
363	895	menu.add("-");
364	896	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
365	897	sortbysizeItem.addActionListener(this);
366	898	sortbynameItem = menu.add(new MenuItem("Sort by name"));
367	899	sortbynameItem.addActionListener(this);
368	900	menu.add("-");
	901	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	902	+ shareGeometriesItem.addActionListener(this);
	903	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	904	+ mergeGeometriesItem.addActionListener(this);
	905	+ menu.add("-");
	906	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	907	+ editLeafItem.addActionListener(this);
	908	+ if (Globals.ADVANCED)
	909	+ {
	910	+ // Pretty much the same as duplicate and clone.
369	911	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
370	912	extractGeometriesItem.addActionListener(this);
371	913	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
372	914	cloneGeometriesItem.addActionListener(this);
373		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
374		- shareGeometriesItem.addActionListener(this);
375		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
376		- mergeGeometriesItem.addActionListener(this);
	915	+ }
377	916
378	917	oe.menuBar.add(menu = new Menu("Insert"));
379	918	buildCreateMenu(menu);
380	919
381		-
382		- oe.menuBar.add(menu = new Menu("Include"));
383		- importGFDItem = menu.add(new MenuItem("GraphreeD Object..."));
384		- importGFDItem.addActionListener(this);
385		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
386		- importVRMLX3DItem.addActionListener(this);
387		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
388		- importOBJItem.addActionListener(this);
389		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
390		- import3DSItem.addActionListener(this);
391		-
392	920	oe.menuBar.add(menu = new Menu("Tools"));
393	921	buildToolsMenu(menu);
394	922	}
395	923
	924	+ JTabbedPane resourcecontainer;
	925	+ cGridBag currenttab;
	926	+ boolean added; // patch for jar
	927	+
	928	+ int tabcount = 0;
	929	+ int colcount = 0;
	930	+ int rowcount = 0;
	931	+ int texturecount = 0;
	932	+
	933	+ int columns = 5;
	934	+ int rows = 7;
	935	+
	936	+ public void ResourceCallBack(String[] path)
	937	+ {
	938	+// for (int i = 0; i < path.length; i++)
	939	+// System.out.print(path[i] + "/");
	940	+// System.out.println();
	941	+
	942	+ if (//rowcount == 0 \|\|
	943	+ path.length == 1)
	944	+ {
	945	+ currenttab = new cGridBag();
	946	+ added = false;
	947	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	948	+ currenttab.setName(tabname);
	949	+ rowcount = 1;
	950	+ colcount = 0;
	951	+ texturecount = 0;
	952	+ }
	953	+
	954	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	955	+ {
	956	+ if (!added)
	957	+ {
	958	+ added = true;
	959	+ resourcecontainer.add(currenttab);
	960	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	961	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	962	+ }
	963	+
	964	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	965	+
	966	+ if (++colcount >= columns)
	967	+ {
	968	+ colcount = 0;
	969	+ currenttab.Return();
	970	+
	971	+ if (rowcount++ >= rows)
	972	+ {
	973	+ rowcount = 0;
	974	+ }
	975	+ }
	976	+ }
	977	+ else
	978	+ {
	979	+// if (!path[path.length-1].equals("icons"))
	980	+// resourcecontainer.Return();
	981	+ }
	982	+ }
	983	+
	984	+ void CreateTexturePanel(cGridBag container)
	985	+ {
	986	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	987	+ container.add(resourcecontainer);
	988	+
	989	+ Grafreed.ParseResources("textures", this);
	990	+ }
	991	+
396	992	void SetupUI2(ObjEditor oe)
397	993	{
	994	+ // June 2019
	995	+ if (oe == null)
	996	+ {
	997	+ //super.SetupUI2(this);
	998	+ //return;
	999	+ }
	1000	+
	1001	+ if (copy != group)
	1002	+ {
	1003	+ //super.SetupUI2(this);
	1004	+ }
	1005	+
398	1006	//new Exception().printStackTrace();
399	1007
400	1008	oe.radioPanel = new JPanel(new GridBagLayout());
401		- oe.aConstraints.weightx = 1;
402		- oe.aConstraints.weighty = 0;
403		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
404		- oe.aConstraints.gridwidth = 100;
405		- oe.aConstraints.gridheight = 1;
406	1009	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
407	1010
408	1011	oe.buttonGroup = new ButtonGroup();
..	..	@@ -423,150 +1026,263 @@
423	1026	oe.radioPanel.add(dummyButton);
424	1027	oe.buttonGroup.add(dummyButton);
425	1028	*/
426		- aConstraints.gridy += 1;
427		- oe.aConstraints.gridwidth = 1;
428		- oe.aConstraints.gridx = 0;
	1029	+ cGridBag copyOptionsPanel = new cGridBag();
	1030	+
	1031	+ copyOptionsPanel.preferredHeight = 2;
429	1032
430		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
	1033	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
	1034	+
	1035	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1036	+ //minButton.setToolTipText("Minimize window");
	1037	+ //minButton.addActionListener(this);
	1038	+
	1039	+ if (Globals.ADVANCED)
	1040	+ {
	1041	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1042	+// maxButton.setToolTipText("Maximize window");
	1043	+// maxButton.addActionListener(this);
	1044	+ }
	1045	+
	1046	+ cButton gcButton;
	1047	+
	1048	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1049	+// gcButton.setToolTipText("Garbage collect");
	1050	+// gcButton.addActionListener(new ActionListener()
	1051	+// {
	1052	+// public void actionPerformed(ActionEvent e)
	1053	+// {
	1054	+// System.gc();
	1055	+// }
	1056	+// });
	1057	+
	1058	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1059	+ collapseButton.setToolTipText("Collapse toolbar");
	1060	+ collapseButton.addActionListener(this);
	1061	+
	1062	+ oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1063	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1064	+ maximize3DButton.addActionListener(this);
	1065	+
	1066	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1067	+ twoButton.setToolTipText("Show 3D view only");
	1068	+ twoButton.addActionListener(this);
	1069	+ this.fullscreenLayout = twoButton;
	1070	+
	1071	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1072	+ threeButton.setToolTipText("Show controls and 3D view");
	1073	+ threeButton.addActionListener(this);
	1074	+ if (Globals.ADVANCED)
	1075	+ {
	1076	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1077	+ sixButton.setToolTipText("Show 3D view and controls");
	1078	+ sixButton.addActionListener(this);
	1079	+ }
	1080	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1081	+// sevenButton.setToolTipText("3-column layout");
	1082	+// sevenButton.addActionListener(this);
	1083	+ //
	1084	+
	1085	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1086	+ fullButton.setToolTipText("Full-screen window");
	1087	+ fullButton.addActionListener(this);
	1088	+
	1089	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1090	+ screenfitButton.setToolTipText("Screen fit");
	1091	+ screenfitButton.addActionListener(this);
	1092	+
	1093	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1094	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1095	+ restoreCameraButton.addActionListener(this);
	1096	+
	1097	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1098	+ saveVersionButton.setToolTipText("Duplicate current version");
	1099	+ saveVersionButton.addActionListener(this);
	1100	+
	1101	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1102	+ deleteVersionButton.setToolTipText("Delete current version");
	1103	+ deleteVersionButton.addActionListener(this);
	1104	+
	1105	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1106	+ previousVersionButton.setToolTipText("Previous version");
	1107	+ previousVersionButton.addActionListener(this);
	1108	+ previousVersionButton.setEnabled(false);
	1109	+
	1110	+ cGridBag updown = new cGridBag().setVertical(true);
	1111	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1112	+ restoreButton.setToolTipText("Undo (restore current version)");
	1113	+ restoreButton.addActionListener(this);
	1114	+ //restoreButton.setEnabled(false);
	1115	+
	1116	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1117	+ replaceButton.setToolTipText("Save (replace current version)");
	1118	+ replaceButton.addActionListener(this);
	1119	+ //replaceButton.setEnabled(false);
	1120	+
	1121	+ copyOptionsPanel.add(updown);
	1122	+
	1123	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1124	+ nextVersionButton.setToolTipText("Next version");
	1125	+ nextVersionButton.addActionListener(this);
	1126	+ nextVersionButton.setEnabled(false);
	1127	+
	1128	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1129	+ oneStepButton.setToolTipText("Animate one step forward");
	1130	+ oneStepButton.addActionListener(this);
	1131	+
	1132	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1133	+ liveCB.setToolTipText("Enable animation");
431	1134	liveCB.addItemListener(this);
432	1135
433		- oe.aConstraints.gridx += 1;
434		- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
435		- supportCB.addItemListener(this);
436		-
437		- // oe.aConstraints.gridx += 1;
438		- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
439		- // localCB.addItemListener(this);
440		-
441		- oe.aConstraints.gridx += 1;
442		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", CameraPane.CROWD), oe.aConstraints);
443		- crowdCB.addItemListener(this);
444		-
445		- oe.aConstraints.gridx += 1;
446		- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
447		- smoothCB.addItemListener(this);
448		-
449		- oe.aConstraints.gridx += 1;
450		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
	1136	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	1137	+ fastCB.setToolTipText("Fast mode");
451	1138	fastCB.addItemListener(this);
452		- oe.aConstraints.gridx += 1;
453		- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
454		- slowCB.addItemListener(this);
455		- oe.aConstraints.gridx += 1;
456		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.FAST), oe.aConstraints);
457		- boxCB.addItemListener(this);
	1139	+
	1140	+ //oe.toolboxPanel.Return();
	1141	+
	1142	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1143	+// trackCB.setToolTipText("Enable tracking");
	1144	+// trackCB.addItemListener(this);
458	1145
459		-// oe.aConstraints.gridx += 1;
460		-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
461		-// speakerMocapCB.addItemListener(this);
462		-
463		- if (false)
464		- {
465		- // handled in scripts
466		- oe.aConstraints.gridx += 1;
467		- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
468		- speakerCameraCB.addItemListener(this);
469		-
470		- oe.aConstraints.gridx += 1;
471		- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
472		- speakerFocusCB.addItemListener(this);
473		-
474		- oe.aConstraints.gridx += 1;
475		- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
476		- smoothfocusCB.addItemListener(this);
477		- }
478		-
479		-//oe.aConstraints.gridx += 1;
480		-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
481		-// debugCB.addItemListener(this);
482		-
483		- oe.aConstraints.gridx += 1;
484		- oe.toolbarPanel.add(oeilCB = new cCheckBox("O", CameraPane.OEIL), oe.aConstraints);
485		- oeilCB.addItemListener(this);
486		-
487		- oe.aConstraints.gridx += 1;
488		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("T", CameraPane.LOOKAT), oe.aConstraints);
489		- lookAtCB.addItemListener(this);
490		-
491		- oe.aConstraints.gridx += 1;
492		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
493		- trackCB.addItemListener(this);
494		-
495		- oe.aConstraints.gridx += 1;
496		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
497		- screenfitButton.addActionListener(this);
498		- oe.aConstraints.gridx += 1;
499	1146	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
500	1147	// screenfitpointButton.addActionListener(this);
501		-// oe.aConstraints.gridx += 1;
502		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
503		- snapobjectButton.addActionListener(this);
504		- oe.aConstraints.gridx += 1;
505	1148
506		- //aConstraints.gridx = 0;
507		- //aConstraints.gridy += 1;
508		- oe.aConstraints.weighty = 0;
509		- oe.aConstraints.gridwidth = 1;
510		-
511		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
512		- flashSelectionButton.addActionListener(this);
513		- oe.aConstraints.gridx += 1;
514		- oe.aConstraints.weighty = 0;
515		- oe.aConstraints.gridwidth = 1;
516		-
517		- //
518		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
519		- twoButton.addActionListener(this);
520		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	1149	+ if (Globals.ADVANCED)
	1150	+ {
	1151	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1152	+ snapobjectButton.addActionListener(this);
	1153	+ snapobjectButton.setToolTipText("Snap Object");
	1154	+
	1155	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
521	1156	fourButton.addActionListener(this);
522		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
523		- sixButton.addActionListener(this);
524		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
525		- threeButton.addActionListener(this);
526		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
527		- sevenButton.addActionListener(this);
528		- //
	1157	+ fourButton.setToolTipText("Show control panel only");
	1158	+ }
529	1159
530		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	1160	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	1161	+
	1162	+
	1163	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1164	+ rootButton.setToolTipText("Open selection in new tab");
531	1165	rootButton.addActionListener(this);
532		- oe.aConstraints.gridx += 1;
533		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	1166	+
	1167	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1168	+ closeButton.setToolTipText("Close tab");
534	1169	closeButton.addActionListener(this);
535	1170	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
536	1171	//clearButton.addActionListener(this);
537		- oe.aConstraints.gridx += 1;
538		-
539		- oe.aConstraints.gridx = 1; //
540		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
541		- editButton.addActionListener(this);
542		- oe.aConstraints.gridx += 1;
543		- oe.aConstraints.weighty = 0;
544		- oe.aConstraints.gridwidth = 1;
545	1172
546		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	1173	+ cGridBag row1 = new cGridBag();
	1174	+
	1175	+ // INSERT
	1176	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1177	+ gridButton.setToolTipText("Create ground");
	1178	+ gridButton.addActionListener(this);
	1179	+
	1180	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1181	+ boxButton.setToolTipText("Create box");
	1182	+ boxButton.addActionListener(this);
	1183	+
	1184	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1185	+ sphereButton.setToolTipText("Create sphere");
	1186	+ sphereButton.addActionListener(this);
	1187	+
	1188	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1189	+ coneButton.setToolTipText("Create cone");
	1190	+ coneButton.addActionListener(this);
	1191	+
	1192	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1193	+ torusButton.setToolTipText("Create torus");
	1194	+ torusButton.addActionListener(this);
	1195	+
	1196	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1197	+ superButton.setToolTipText("Create superellipsoid");
	1198	+ superButton.addActionListener(this);
	1199	+
	1200	+ if (Globals.ADVANCED)
	1201	+ {
	1202	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1203	+ kleinButton.setToolTipText("Create Klein bottle");
	1204	+ kleinButton.addActionListener(this);
	1205	+ }
	1206	+
	1207	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1208	+ particlesButton.setToolTipText("Create particle system");
	1209	+ particlesButton.addActionListener(this);
	1210	+
	1211	+ oe.toolboxPanel.add(row1);
	1212	+
	1213	+ cGridBag row2 = new cGridBag();
	1214	+
	1215	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1216	+ groupButton.setToolTipText("Create group");
	1217	+ groupButton.addActionListener(this);
	1218	+
	1219	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1220	+ compositeButton.setToolTipText("Create composite");
	1221	+ compositeButton.addActionListener(this);
	1222	+
	1223	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1224	+ switchButton.setToolTipText("Create item switcher");
	1225	+ switchButton.addActionListener(this);
	1226	+
	1227	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1228	+ loopButton.setToolTipText("Create loop");
	1229	+ loopButton.addActionListener(this);
	1230	+
	1231	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1232	+ textureButton.setToolTipText("Create texture");
	1233	+ textureButton.addActionListener(this);
	1234	+
	1235	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1236	+ overlayButton.setToolTipText("Create overlay");
	1237	+ overlayButton.addActionListener(this);
	1238	+
	1239	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1240	+ lightButton.setToolTipText("Create light");
	1241	+ lightButton.addActionListener(this);
	1242	+
	1243	+ oe.toolboxPanel.add(row2);
	1244	+
	1245	+ cGridBag textures = new cGridBag();
	1246	+
	1247	+ CreateTexturePanel(textures);
	1248	+
	1249	+ oe.toolboxPanel.add(textures);
	1250	+
	1251	+ textures.preferredHeight = 100;
	1252	+
	1253	+ CreateSkyboxPanel(oe.skyboxPanel);
	1254	+
	1255	+ // EDIT panel
	1256	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1257	+ editButton.setToolTipText("Pin selection controls");
	1258	+ editButton.addActionListener(this);
	1259	+
	1260	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1261	+ uneditButton.setToolTipText("Unpin and remove selection controls");
547	1262	uneditButton.addActionListener(this);
548	1263
549		- oe.aConstraints.gridx += 1;
550		- oe.aConstraints.weighty = 0;
551		- oe.aConstraints.gridwidth = 1;
552		-
553		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
554		- clearPanelButton.addActionListener(this);
555		-
556		- oe.aConstraints.gridx += 1;
557		- oe.aConstraints.weighty = 0;
558		- oe.aConstraints.gridwidth = 1;
559		-
560		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	1264	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1265	+ allParamsButton.setToolTipText("Show all controls");
561	1266	allParamsButton.addActionListener(this);
562	1267
563		- oe.aConstraints.gridx += 1;
564		- oe.aConstraints.weighty = 0;
565		- oe.aConstraints.gridwidth = 1;
566		-
567		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
568		- unselectButton.addActionListener(this);
	1268	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1269	+ clearPanelButton.setToolTipText("Clear all controls");
	1270	+ clearPanelButton.addActionListener(this);
569	1271
	1272	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1273	+ //unselectButton.setToolTipText("Unselect");
	1274	+ //unselectButton.addActionListener(this);
	1275	+
	1276	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1277	+ flashSelectionButton.setToolTipText("Highlight selection");
	1278	+ flashSelectionButton.addActionListener(this);
	1279	+
	1280	+ editCommandsPanel.preferredHeight = 1;
	1281	+
	1282	+ SetPinStates(false);
	1283	+// oe.treePanel.add(commandsPanel);
	1284	+// oe.treePanel.Return();
	1285	+
570	1286	// oe.aConstraints.gridx += 1;
571	1287	// oe.aConstraints.weighty = 0;
572	1288	// oe.aConstraints.gridwidth = 1;
..	..	@@ -578,47 +1294,32 @@
578	1294	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
579	1295	// gcButton.addActionListener(this);
580	1296
581		- oe.aConstraints.gridx = 0;
582		- oe.aConstraints.gridy += 1;
583		-
584		- //ctrlPanel.add(objList = new List(5, true));
585		- oe.aConstraints.gridwidth = 100;
586		- // oe.aConstraints.gridheight = 100;
587		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
588		- oe.aConstraints.gridheight = 1;
589		- oe.aConstraints.weighty = 0.5;
590		- oe.aConstraints.gridx = 0;
591		- JScrollPane jSP;
	1297	+ cGridBag jSPPanel = new cGridBag();
	1298	+
	1299	+ JScrollPane jSP;
592	1300	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
593		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	1301	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
594	1302	ResetModel();
595		- oe.aConstraints.weighty = 0.5;
596		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
597		- oe.aConstraints.gridy += 1;
598		- oe.aConstraints.gridwidth = 1;
599		-
600		- oe.aConstraints.weighty = 0;
601		- oe.aConstraints.gridwidth = 2;
602		-
603		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
604		- colorCB.addItemListener(this);
605		- oe.aConstraints.gridx += 2;
606		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
607		- materialCB.addItemListener(this);
608		- oe.aConstraints.gridx += 2;
609		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
610		- textureCB.addItemListener(this);
611		-
612		- oe.aConstraints.gridx = 0;
613		- oe.aConstraints.gridy += 1;
614	1303
	1304	+ oe.treePanel.add(jSPPanel);
	1305	+ oe.treePanel.Return();
	1306	+
	1307	+ oe.treePanel.add(copyOptionsPanel);
	1308	+ oe.treePanel.Return();
	1309	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1310	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1311	+ sliderPane.preferredHeight = 1;
	1312	+
	1313	+// mainPanel.setDividerLocation(0.1); //1.0);
	1314	+ mainPanel.setResizeWeight(0.4);
	1315	+
615	1316	//jList.addListSelectionListener(this);
616	1317	oe.jTree.addTreeSelectionListener(this);
617	1318	//jTree.setRootVisible(false);
618	1319	//jTree.setEditable(true);
619	1320	oe.jTree.setDragEnabled(true);
620	1321	//jTree.setPreferredSize(new Dimension(10,10));
621		- jSP.setPreferredSize(new Dimension(100,200));
	1322	+ //jSP.setPreferredSize(new Dimension(100,200));
622	1323
623	1324	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
624	1325
..	..	@@ -630,23 +1331,171 @@
630	1331	dgr.addDragGestureListener(this);
631	1332	}catch(Exception e) {}
632	1333	*/
633		- radio.layout = sevenButton;
	1334	+ radio.layout = threeButton; // sixButton;
634	1335	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
635	1336	}
	1337	+
	1338	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	1339	+ {
	1340	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1341	+ colorCB.setToolTipText("Copy color when dropped");
	1342	+ colorCB.addItemListener(this);
	1343	+
	1344	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1345	+ materialCB.setToolTipText("Copy material when dropped");
	1346	+ materialCB.addItemListener(this);
	1347	+
	1348	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1349	+ textureCB.setToolTipText("Copy texture when dropped");
	1350	+ textureCB.addItemListener(this);
	1351	+
	1352	+ panel.Return();
	1353	+
	1354	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	1355	+ boxCB.setToolTipText("Display bounding boxes");
	1356	+ boxCB.addItemListener(this);
	1357	+
	1358	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	1359	+ zoomBoxCB.setToolTipText("Display only for wheel");
	1360	+ zoomBoxCB.addItemListener(this);
	1361	+
	1362	+ if (true) // Globals.ADVANCED)
	1363	+ {
	1364	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1365	+// supportCB.setToolTipText("Enable rigging");
	1366	+// supportCB.addItemListener(this);
	1367	+
	1368	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1369	+ freezeCB.setToolTipText("Fast moving camera");
	1370	+ freezeCB.addItemListener(this);
	1371	+
	1372	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	1373	+ // localCB.addItemListener(this);
	1374	+
	1375	+ panel.Return();
	1376	+
	1377	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	1378	+ crowdCB.setToolTipText("Used for crowds");
	1379	+ crowdCB.addItemListener(this);
	1380	+
	1381	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	1382	+ smoothCB.setToolTipText("Snapping delay");
	1383	+ smoothCB.addItemListener(this);
	1384	+
	1385	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1386	+// slowCB.setToolTipText("Smooth interpolation");
	1387	+// slowCB.addItemListener(this);
	1388	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1389	+ minshaderCB.setToolTipText("Minimal fast shader");
	1390	+ minshaderCB.addItemListener(this);
	1391	+
	1392	+// constraints.gridy += 1;
	1393	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	1394	+// speakerMocapCB.addItemListener(this);
	1395	+
	1396	+ panel.Return();
	1397	+
	1398	+ if (false)
	1399	+ {
	1400	+ // handled in scripts
	1401	+ //constraints.gridy += 1;
	1402	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	1403	+ speakerCameraCB.addItemListener(this);
	1404	+
	1405	+ //constraints.gridy += 1;
	1406	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	1407	+ speakerFocusCB.addItemListener(this);
	1408	+
	1409	+ //constraints.gridy += 1;
	1410	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	1411	+ smoothfocusCB.addItemListener(this);
	1412	+ panel.Return();
	1413	+ }
	1414	+
	1415	+//constraints.gridx += 1;
	1416	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	1417	+// debugCB.addItemListener(this);
	1418	+
	1419	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1420	+ trackCB.setToolTipText("Enable tracking target");
	1421	+ trackCB.addItemListener(this);
	1422	+
	1423	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1424	+ oeilCB.setToolTipText("Move camera when tracking");
	1425	+ oeilCB.addItemListener(this);
	1426	+
	1427	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1428	+ shadowCB.setToolTipText("When live compute shadows");
	1429	+ shadowCB.addItemListener(this);
	1430	+
	1431	+ panel.Return();
	1432	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1433	+ toggleTextureCB.setToolTipText("Load textures");
	1434	+ toggleTextureCB.addItemListener(this);
	1435	+
	1436	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1437	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1438	+ toggleSwitchCB.addItemListener(this);
	1439	+
	1440	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1441	+ autokeepCB.setToolTipText("On structure change");
	1442	+ autokeepCB.addItemListener(this);
	1443	+
	1444	+ panel.Return();
	1445	+ if (Globals.ADVANCED)
	1446	+ {
	1447	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	1448	+ lookAtCB.setToolTipText("Look-at target");
	1449	+ lookAtCB.addItemListener(this);
	1450	+ }
	1451	+
	1452	+ }
	1453	+
	1454	+ cGridBag fill = new cGridBag();
	1455	+ fill.preferredHeight = 200;
	1456	+ cGridBag fill2 = new cGridBag();
	1457	+ fill2.preferredHeight = 200;
	1458	+ cGridBag fill3 = new cGridBag();
	1459	+ fill3.preferredHeight = 200;
	1460	+
	1461	+ panel.add(fill);
	1462	+ panel.add(fill2);
	1463	+ panel.add(fill3);
	1464	+
	1465	+ }
636	1466
637	1467	void EditObject(Object3D obj)
638	1468	{
639		- cRadio dummyButton = new cRadio(obj.name);
640		- dummyButton.SetObject(obj);
641		- dummyButton.layout = sevenButton;
642		- dummyButton.SetCamera(cameraView.renderCamera, false);
643		- dummyButton.addActionListener(this);
644		- radioPanel.add(dummyButton);
645		- buttonGroup.add(dummyButton);
646		- dummyButton.doClick();
	1469	+ assert(obj instanceof Composite);
	1470	+
	1471	+// if (obj.versionlist == null)
	1472	+// {
	1473	+// obj.versionlist = new Object3D[100];
	1474	+// obj.versionindex = -1;
	1475	+// }
	1476	+
	1477	+ cRadio radioButton = new cRadio(obj.name);
	1478	+
	1479	+ // June 2019. Patch to avoid bug with transparency.
	1480	+ radioButton.hadMaterial = obj.material != null;
	1481	+ if (!radioButton.hadMaterial)
	1482	+ {
	1483	+ obj.material = new cMaterial();
	1484	+ }
	1485	+
	1486	+ radioButton.SetObject(obj);
	1487	+ radioButton.layout = threeButton; // sixButton;
	1488	+ radioButton.SetCamera(cameraView.renderCamera, false);
	1489	+ radioButton.addActionListener(this);
	1490	+ radioPanel.add(radioButton);
	1491	+ buttonGroup.add(radioButton);
	1492	+ radioButton.doClick();
647	1493	}
	1494	+
648	1495	void SetupViews(ObjEditor oe)
649	1496	{
	1497	+ theFrame = this;
	1498	+
650	1499	oe.SetupViews();
651	1500
652	1501	System.out.println("SetupViews");
..	..	@@ -655,22 +1504,30 @@
655	1504	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
656	1505	}
657	1506
658		- JCheckBox liveCB;
659		- JCheckBox supportCB;
660		- JCheckBox localCB;
661		- JCheckBox crowdCB;
662		- JCheckBox smoothCB;
663		- JCheckBox fastCB;
664		- JCheckBox slowCB;
665		- JCheckBox boxCB;
666		- JCheckBox trackCB;
667		- JCheckBox smoothfocusCB;
	1507	+ cToggleButton liveCB;
	1508	+ cCheckBox supportCB;
	1509	+ cCheckBox localCB;
	1510	+ cCheckBox crowdCB;
	1511	+ cCheckBox smoothCB;
	1512	+ cCheckBox minshaderCB;
	1513	+
	1514	+ cToggleButton fastCB;
	1515	+ cCheckBox slowCB;
	1516	+ cCheckBox boxCB;
	1517	+ cCheckBox zoomBoxCB;
	1518	+ cCheckBox freezeCB;
	1519	+ //cToggleButton trackCB;
	1520	+ cCheckBox trackCB;
	1521	+ cCheckBox smoothfocusCB;
668	1522	// JCheckBox speakerMocapCB;
669		- JCheckBox speakerCameraCB;
670		- JCheckBox speakerFocusCB;
671		- JCheckBox debugCB;
672		- JCheckBox oeilCB;
673		- JCheckBox lookAtCB;
	1523	+ cCheckBox speakerCameraCB;
	1524	+ cCheckBox speakerFocusCB;
	1525	+ cCheckBox debugCB;
	1526	+
	1527	+ cCheckBox oeilCB;
	1528	+ cCheckBox shadowCB;
	1529	+ cCheckBox autokeepCB;
	1530	+ cCheckBox lookAtCB;
674	1531
675	1532	// static int COLOR = 1;
676	1533	// static int MATERIAL = 2;
..	..	@@ -678,9 +1535,9 @@
678	1535
679	1536	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
680	1537
681		- JCheckBox colorCB;
682		- JCheckBox materialCB;
683		- JCheckBox textureCB;
	1538	+ cCheckBox colorCB;
	1539	+ cCheckBox materialCB;
	1540	+ cCheckBox textureCB;
684	1541
685	1542	public void itemStateChanged(ItemEvent e)
686	1543	{
..	..	@@ -705,10 +1562,10 @@
705	1562	dropAttributes \|= Object3D.TEXTURE;
706	1563	else
707	1564	dropAttributes &= ~Object3D.TEXTURE;
708		- }
709		- else if(e.getSource() == liveCB)
	1565	+ } else if(e.getSource() == liveCB)
710	1566	{
711	1567	cameraView.ToggleLive();
	1568	+ refreshContents(false);
712	1569	}
713	1570	else if(e.getSource() == supportCB)
714	1571	{
..	..	@@ -724,6 +1581,12 @@
724	1581	{
725	1582	cameraView.ToggleInertia();
726	1583	cameraView.repaint();
	1584	+ }
	1585	+ else if(e.getSource() == minshaderCB)
	1586	+ {
	1587	+ Globals.MINSHADER ^= true;
	1588	+ cameraView.programInitialized = false;
	1589	+ cameraView.repaint();
727	1590	}
728	1591	else if(e.getSource() == localCB)
729	1592	{
..	..	@@ -743,6 +1606,10 @@
743	1606	Recompile();
744	1607	cameraView.repaint();
745	1608	// refreshContents();
	1609	+ }
	1610	+ else if(e.getSource() == zoomBoxCB)
	1611	+ {
	1612	+ cameraView.ToggleZoomBoxMode();
746	1613	}
747	1614	else if(e.getSource() == smoothfocusCB)
748	1615	{
..	..	@@ -769,6 +1636,18 @@
769	1636	{
770	1637	cameraView.ToggleOeil();
771	1638	}
	1639	+ else if(e.getSource() == shadowCB)
	1640	+ {
	1641	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1642	+ }
	1643	+ else if(e.getSource() == freezeCB)
	1644	+ {
	1645	+ Globals.FREEZEONMOVE ^= true;
	1646	+ }
	1647	+ else if(e.getSource() == autokeepCB)
	1648	+ {
	1649	+ Globals.REPLACEONMAKE ^= true;
	1650	+ }
772	1651	else if(e.getSource() == lookAtCB)
773	1652	{
774	1653	cameraView.ToggleLookAt();
..	..	@@ -785,7 +1664,8 @@
785	1664
786	1665	/**/
787	1666	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
788		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1667	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1668	+ TreePath path = objEditor.jTree.getSelectionPath();
789	1669	if ((path == null) \|\| (path.getPathCount() <= 1)) {
790	1670	// We can't move the root node or an empty selection
791	1671	return;
..	..	@@ -848,8 +1728,6 @@
848	1728	}
849	1729	}
850	1730
851		- String string = (String) object;
852		-
853	1731	System.out.println("Transfer = " + object + "; drop : " + target);
854	1732	// if( object instanceof java.io.File[])
855	1733	// {
..	..	@@ -857,7 +1735,11 @@
857	1735	// objEditor.DropFile((java.io.File[]) object, true);
858	1736	// return;
859	1737	// }
860		- if (string.charAt(0) == '/')
	1738	+
	1739	+ String string = object.toString();
	1740	+
	1741	+ // File path for Mac and Windows
	1742	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
861	1743	{
862	1744	// file(s)
863	1745	String[] names = string.split("\n");
..	..	@@ -884,7 +1766,7 @@
884	1766
885	1767	flashIt = false;
886	1768	CameraPane pane = (CameraPane) target;
887		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1769	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
888	1770	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
889	1771
890	1772	if (group.selection.size() == 1)
..	..	@@ -900,23 +1782,33 @@
900	1782
901	1783	assert target == objEditor.jTree;
902	1784	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1785	+ Object3D destinationLeaf;
903	1786	try {
904		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1787	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
905	1788	} catch (Exception e) {
906	1789	System.out.println("destinationPath : " + destinationPath);
907	1790	return;
908	1791	}
909	1792
910		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1793	+ for (int i=group.selection.size(); --i>=0;)
911	1794	{
	1795	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1796	+
	1797	+ // Cannot move into itself
	1798	+ if (child == destinationLeaf)
	1799	+ return;
	1800	+ }
	1801	+
	1802	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1803	+// {
912	1804	loadClipboard(true);
913	1805	objEditor.jTree.setSelectionPath(destinationPath);
914		- pasteInto(false);
915		- } else {
916		- loadClipboard(false);
917		- objEditor.jTree.setSelectionPath(destinationPath);
918		- pasteInto(false); // true); // ???
919		- }
	1806	+ pasteInto(false, false);
	1807	+// } else {
	1808	+// loadClipboard(false);
	1809	+// objEditor.jTree.setSelectionPath(destinationPath);
	1810	+// pasteInto(false, false); // true); // ???
	1811	+// }
920	1812	}
921	1813	public void dropActionChanged(DropTargetDragEvent dtde)
922	1814	// Called if the user has modified the current drop gesture
..	..	@@ -972,7 +1864,12 @@
972	1864	TreePath path;
973	1865
974	1866	public TransferableTreePath(TreePath tp) {
975		- path = tp;
	1867	+ Object[] objs = new Object[tp.getPathCount()];
	1868	+ for (int i=0; i<objs.length; i++)
	1869	+ {
	1870	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1871	+ }
	1872	+ path = new TreePath(objs);
976	1873	}
977	1874
978	1875	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1021,83 +1918,107 @@
1021	1918	{
1022	1919	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1023	1920	//heightFieldItem.addActionListener(this);
1024		- gridItem = menu.add(new MenuItem("Grid"));
1025		- gridItem.addActionListener(this);
1026		- rectoidItem = menu.add(new MenuItem("Box"));
1027		- rectoidItem.addActionListener(this);
1028		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1029		- ellipsoidItem.addActionListener(this);
1030		- coneItem = menu.add(new MenuItem("Cone"));
1031		- coneItem.addActionListener(this);
1032		- torusItem = menu.add(new MenuItem("Torus"));
1033		- torusItem.addActionListener(this);
1034		- superItem = menu.add(new MenuItem("Superellipsoid"));
1035		- superItem.addActionListener(this);
1036		- particleItem = menu.add(new MenuItem("Particle system"));
1037		- particleItem.addActionListener(this);
	1921	+// gridItem = menu.add(new MenuItem("Grid"));
	1922	+// gridItem.addActionListener(this);
	1923	+// rectoidItem = menu.add(new MenuItem("Box"));
	1924	+// rectoidItem.addActionListener(this);
	1925	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1926	+// ellipsoidItem.addActionListener(this);
	1927	+// coneItem = menu.add(new MenuItem("Cone"));
	1928	+// coneItem.addActionListener(this);
	1929	+// torusItem = menu.add(new MenuItem("Torus"));
	1930	+// torusItem.addActionListener(this);
	1931	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1932	+// superItem.addActionListener(this);
	1933	+
	1934	+ cameraItem = menu.add(new MenuItem("Camera"));
	1935	+ cameraItem.addActionListener(this);
	1936	+
	1937	+ if (!Globals.ADVANCED)
	1938	+ {
	1939	+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
	1940	+ kleinItem.addActionListener(this);
	1941	+ }
	1942	+
	1943	+// particleItem = menu.add(new MenuItem("Particle system"));
	1944	+// particleItem.addActionListener(this);
	1945	+ if (Globals.ADVANCED)
	1946	+ {
1038	1947	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1039	1948	ragdollItem.addActionListener(this);
1040	1949	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1041	1950	ragdoll2Item.addActionListener(this);
	1951	+ }
1042	1952	menu.add("-");
1043		- meshItem = menu.add(new MenuItem("Mesh"));
	1953	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1044	1954	meshItem.addActionListener(this);
1045	1955	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1046	1956	// meshGroupItem.addActionListener(this);
	1957	+ if (Globals.ADVANCED)
	1958	+ {
1047	1959	springItem = menu.add(new MenuItem("Spring"));
1048	1960	springItem.addActionListener(this);
1049	1961	flagItem = menu.add(new MenuItem("Flag"));
1050	1962	flagItem.addActionListener(this);
1051		- bezierItem = menu.add(new MenuItem("Patch"));
1052		- bezierItem.addActionListener(this);
1053		- checkerItem = menu.add(new MenuItem("Checker"));
1054		- checkerItem.addActionListener(this);
1055	1963	blobItem = menu.add(new MenuItem("Blob"));
1056	1964	blobItem.addActionListener(this);
1057	1965	latheItem = menu.add(new MenuItem("Lathe"));
1058	1966	latheItem.addActionListener(this);
1059		- lightItem = menu.add(new MenuItem("Light"));
1060		- lightItem.addActionListener(this);
	1967	+ }
	1968	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1969	+ bezierItem.addActionListener(this);
	1970	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1971	+// overlayItem.addActionListener(this);
	1972	+// lightItem = menu.add(new MenuItem("Light"));
	1973	+// lightItem.addActionListener(this);
1061	1974	menu.add("-");
1062	1975	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1063	1976	//superLoopItem.addActionListener(this);
1064		- loopItem = menu.add(new MenuItem("Loop"));
1065		- loopItem.addActionListener(this);
	1977	+// loopItem = menu.add(new MenuItem("Loop"));
	1978	+// loopItem.addActionListener(this);
1066	1979	doubleItem = menu.add(new MenuItem("Fork"));
1067	1980	doubleItem.addActionListener(this);
	1981	+ if (Globals.ADVANCED)
	1982	+ {
1068	1983	tripleItem = menu.add(new MenuItem("Trident"));
1069	1984	tripleItem.addActionListener(this);
	1985	+ }
1070	1986	}
1071	1987
1072	1988	void buildToolsMenu(Menu menu)
1073	1989	{
1074	1990	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1075	1991	animationItem.addItemListener(this);
1076		- animationItem.setState(CameraPane.ANIMATION);
	1992	+ animationItem.setState(Globals.ANIMATION);
	1993	+
	1994	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1995	+ archiveItem.addActionListener(this);
1077	1996
1078	1997	menu.add("-");
1079	1998	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1080	1999	parseverticesItem.addActionListener(this);
1081	2000	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1082	2001	textureFieldItem.addActionListener(this);
1083		- alignItem = menu.add(new MenuItem("Align"));
	2002	+ alignItem = menu.add(new MenuItem("Align Objects"));
1084	2003	alignItem.addActionListener(this);
1085		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1086		- mirrorItem.addActionListener(this);
1087	2004	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1088	2005	reduceMorphItem.addActionListener(this);
1089	2006	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1090	2007	reduce34MorphItem.addActionListener(this);
1091		-
1092		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1093		- computeAOItem.addActionListener(this);
1094	2008	menu.add("-");
1095		-
1096	2009	menu.add(memoryItem = new MenuItem("Memory Usage"));
1097	2010	memoryItem.addActionListener(this);
	2011	+ menu.add(computeAOItem = new MenuItem("Compute AO"));
	2012	+ computeAOItem.addActionListener(this);
	2013	+
	2014	+ if (Globals.ADVANCED)
	2015	+ {
	2016	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	2017	+ mirrorItem.addActionListener(this);
	2018	+ menu.add("-");
1098	2019	menu.add(analyzeItem = new MenuItem("Analyze"));
1099	2020	analyzeItem.addActionListener(this);
1100		- menu.add(dumpItem = new MenuItem("Dump"));
	2021	+ menu.add(dumpItem = new MenuItem("Print"));
1101	2022	dumpItem.addActionListener(this);
1102	2023	// menu.add(pathItem = new MenuItem("From-to path"));
1103	2024	// pathItem.addActionListener(this);
..	..	@@ -1106,6 +2027,8 @@
1106	2027	resetParentItem.addActionListener(this);
1107	2028	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1108	2029	repairParentItem.addActionListener(this);
	2030	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	2031	+ repairShadowItem.addActionListener(this);
1109	2032	menu.add(invariantsItem = new MenuItem("Invariants"));
1110	2033	invariantsItem.addActionListener(this);
1111	2034	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1113,6 +2036,7 @@
1113	2036	menu.add("-");
1114	2037	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1115	2038	editScriptItem.addActionListener(this);
	2039	+ }
1116	2040	}
1117	2041
1118	2042	void ScreenFit()
..	..	@@ -1235,9 +2159,34 @@
1235	2159	shadow.material = new cMaterial(obj.material);
1236	2160	shadow.material.diffuse = 0.0001f;
1237	2161	shadow.material.specular = 0.0001f;
	2162	+ //shadow.projectedVertices[1].x = 300;
1238	2163
1239	2164	makeSomething(shadow);
1240	2165	}
	2166	+
	2167	+ private void ClearUnpinned()
	2168	+ {
	2169	+ //for (Object3D obj : listUI)
	2170	+ for (int i=listUI.size(); --i>=0;)
	2171	+ {
	2172	+ Object3D obj = listUI.elementAt(i);
	2173	+ if (!obj.pinned)
	2174	+ {
	2175	+ obj.CloseUI();
	2176	+ listUI.remove(i);
	2177	+ }
	2178	+ }
	2179	+ }
	2180	+
	2181	+ private void EditElement(Object3D elem, boolean newWindow)
	2182	+ {
	2183	+ // if (!(elem instanceof Composite))
	2184	+ // newWindow = false;
	2185	+ listUI.add(elem);
	2186	+ elem.openEditWindow(this, newWindow); //, false);
	2187	+ System.out.println("edit : " + elem);
	2188	+ elem.editWindow.refreshContents(true); // ? new
	2189	+ }
1241	2190
1242	2191	/**
1243	2192	* applyExample
..	..	@@ -1441,9 +2390,9 @@
1441	2390
1442	2391	void Overwrite(int mask)
1443	2392	{
1444		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2393	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1445	2394	{
1446		- Object3D content = GraphreeD.clipboard.get(0);
	2395	+ Object3D content = Grafreed.clipboard.get(0);
1447	2396
1448	2397	if (content instanceof cGroup && ((cGroup)content).transientlink )
1449	2398	content = ((cGroup)content).get(0);
..	..	@@ -1466,6 +2415,7 @@
1466	2415	//
1467	2416	public void actionPerformed(ActionEvent event) // , Object arg)
1468	2417	{
	2418	+ Object source = event.getSource();
1469	2419	/*
1470	2420	if (event.getSource() == nameField)
1471	2421	{
..	..	@@ -1477,11 +2427,11 @@
1477	2427	}
1478	2428	else
1479	2429	*/
1480		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	2430	+ if (source == lookAtItem \|\| source == lookFromItem)
1481	2431	{
1482	2432	ScreenFit();
1483	2433	} else
1484		- if (event.getSource() == switchItem)
	2434	+ if (source == switchViewItem)
1485	2435	{
1486	2436	cVector v1 = new cVector();
1487	2437	cVector v2 = new cVector();
..	..	@@ -1490,11 +2440,11 @@
1490	2440	objEditor.cameraView.renderCamera.setAim(v2, v1);
1491	2441	objEditor.cameraView.repaint();
1492	2442	} else
1493		- if (event.getSource() == rectoidItem)
	2443	+ if (source == rectoidItem \|\| source == boxButton)
1494	2444	{
1495	2445	makeSomething(new Box());
1496	2446	} else
1497		- if (event.getSource() == particleItem)
	2447	+ if (source == particleItem \|\| source == particlesButton)
1498	2448	{
1499	2449	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1500	2450	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1515,9 +2465,9 @@
1515	2465	applyExample(particleGeom, "SMOKE");
1516	2466	makeSomething(particleGeom);
1517	2467	} else
1518		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	2468	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1519	2469	{
1520		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	2470	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1521	2471
1522	2472	ragdoll.toParent = LA.newMatrix();
1523	2473	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1535,7 +2485,7 @@
1535	2485	} else
1536	2486	/*
1537	2487	*/
1538		- if (event.getSource() == heightFieldItem)
	2488	+ if (source == heightFieldItem)
1539	2489	{
1540	2490	Object3D obj = new Object3D();
1541	2491
..	..	@@ -1573,27 +2523,31 @@
1573	2523
1574	2524	makeSomething(obj);
1575	2525	} else
1576		- if (event.getSource() == gridItem)
	2526	+ if (source == gridItem \|\| source == gridButton)
1577	2527	{
1578	2528	makeSomething(new Grid());
1579	2529	} else
1580		- if (event.getSource() == ellipsoidItem)
	2530	+ if (source == ellipsoidItem \|\| source == sphereButton)
1581	2531	{
1582	2532	makeSomething(new Sphere());
1583	2533	} else
1584		- if (event.getSource() == coneItem)
	2534	+ if (source == coneItem \|\| source == coneButton)
1585	2535	{
1586	2536	makeSomething(new Cone());
1587	2537	} else
1588		- if (event.getSource() == torusItem)
	2538	+ if (source == torusItem \|\| source == torusButton)
1589	2539	{
1590	2540	makeSomething(new Torus());
1591	2541	} else
1592		- if (event.getSource() == superItem)
	2542	+ if (source == superItem \|\| source == superButton)
1593	2543	{
1594	2544	makeSomething(new Superellipsoid());
1595	2545	} else
1596		- if (event.getSource() == blobItem)
	2546	+ if (source == kleinItem \|\| source == kleinButton)
	2547	+ {
	2548	+ makeSomething(new Klein());
	2549	+ } else
	2550	+ if (source == blobItem)
1597	2551	{
1598	2552	Blob blob = new Blob();
1599	2553	BlobComponent comp = new BlobComponent();
..	..	@@ -1601,15 +2555,15 @@
1601	2555	//blob.retile();
1602	2556	makeSomething(blob);
1603	2557	} else
1604		- if (event.getSource() == latheItem)
	2558	+ if (source == latheItem)
1605	2559	{
1606	2560	makeSomething(new Lathe());
1607	2561	} else
1608		- if (event.getSource() == bezierItem)
	2562	+ if (source == bezierItem)
1609	2563	{
1610	2564	makeSomething(new BezierSurface());
1611	2565	} else
1612		- if (event.getSource() == checkerItem)
	2566	+ if (source == overlayItem \|\| source == overlayButton)
1613	2567	{
1614	2568	/*
1615	2569	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1624,7 +2578,7 @@
1624	2578	*/
1625	2579	makeSomething(new Checker());
1626	2580	} else
1627		- if (event.getSource() == meshItem)
	2581	+ if (source == meshItem)
1628	2582	{
1629	2583	Object3D itemtomake = new Object3D();
1630	2584	Object3D child;
..	..	@@ -1645,35 +2599,52 @@
1645	2599	makeSomething(child);
1646	2600	}
1647	2601	} else
1648		- if (event.getSource() == springItem)
	2602	+ if (source == springItem)
1649	2603	{
1650	2604	cSpring s = new cSpring();
1651	2605	s.setup();
1652	2606	makeSomething(s);
1653	2607	} else
1654		- if (event.getSource() == flagItem)
	2608	+ if (source == flagItem)
1655	2609	{
1656	2610	cSpring s = new cFlag();
1657	2611	s.setup();
1658	2612	makeSomething(s);
1659	2613	} else
1660		- if (event.getSource() == lightItem)
	2614	+ if (source == lightItem \|\| source == lightButton)
1661	2615	{
1662	2616	makeSomething(new Light());
1663	2617	} else
1664		- if (event.getSource() == csgItem)
	2618	+// if (source == skybox1Button \|\|
	2619	+// source == skybox2Button \|\|
	2620	+// source == skybox3Button \|\|
	2621	+// source == skybox4Button \|\|
	2622	+// source == skybox5Button \|\|
	2623	+// source == skybox6Button \|\|
	2624	+// source == skybox7Button \|\|
	2625	+// source == skybox11Button \|\|
	2626	+// source == skybox12Button \|\|
	2627	+// source == skybox13Button \|\|
	2628	+// source == skybox14Button \|\|
	2629	+// source == skybox15Button \|\|
	2630	+// source == skybox16Button \|\|
	2631	+// source == skybox17Button)
	2632	+// {
	2633	+// ChangeSkybox(source);
	2634	+// } else
	2635	+ if (source == csgItem)
1665	2636	{
1666	2637	group(new CSG());
1667	2638	} else
1668		- if (event.getSource() == templateItem)
	2639	+ if (source == templateItem)
1669	2640	{
1670	2641	group(new cTemplate());
1671	2642	} else
1672		- if (event.getSource() == attributeItem)
	2643	+ if (source == attributeItem)
1673	2644	{
1674	2645	makeSomething(new Attribute());
1675	2646	} else
1676		- if (event.getSource() == pointflowItem)
	2647	+ if (source == pointflowItem)
1677	2648	{
1678	2649	makeSomething(new PointFlow());
1679	2650	} else
..	..	@@ -1685,7 +2656,7 @@
1685	2656	} else
1686	2657	*/
1687	2658
1688		- if (event.getSource() == superLoopItem)
	2659	+ if (source == superLoopItem)
1689	2660	{
1690	2661	Composite g = new cGroup();
1691	2662	for (int i=0; i<15; i++)
..	..	@@ -1707,30 +2678,30 @@
1707	2678
1708	2679	group(g);
1709	2680	} else
1710		- if (event.getSource() == loopItem)
	2681	+ if (source == loopItem \|\| source == loopButton)
1711	2682	{
1712	2683	Composite csg = new GroupLeaf();
1713	2684	csg.count = 5;
1714	2685	group(csg);
1715		- Composite child = new cGroup();
	2686	+ Composite child = new cGroup("Branch");
1716	2687	csg.addChild(child);
1717	2688	child.addChild(csg);
1718	2689	} else
1719		- if (event.getSource() == doubleItem)
	2690	+ if (source == doubleItem)
1720	2691	{
1721		- Composite csg = new GroupLeaf();
	2692	+ Composite csg = new GroupLeaf("Fork");
1722	2693	csg.count = 5;
1723	2694	group(csg);
1724		- Composite child = new cGroup();
	2695	+ Composite child = new cGroup("Branch A");
1725	2696	csg.addChild(child);
1726	2697	child.addChild(csg);
1727		- child = new cGroup();
	2698	+ child = new cGroup("Branch B");
1728	2699	csg.addChild(child);
1729	2700	child.addChild(csg);
1730	2701	} else
1731		- if (event.getSource() == tripleItem)
	2702	+ if (source == tripleItem)
1732	2703	{
1733		- Composite csg = new GroupLeaf();
	2704	+ Composite csg = new GroupLeaf("Trident");
1734	2705	csg.count = 4;
1735	2706	group(csg);
1736	2707	Composite child = new cGroup();
..	..	@@ -1743,73 +2714,117 @@
1743	2714	csg.addChild(child);
1744	2715	child.addChild(csg);
1745	2716	} else
1746		-
1747		- if (event.getSource() == importGFDItem)
	2717	+ if (source == computeAOItem)
1748	2718	{
1749		- ImportGFD();
	2719	+ Globals.drawMode = CameraPane.OCCLUSION;
	2720	+ cameraView.repaint();
1750	2721	} else
1751		- if (event.getSource() == importVRMLX3DItem)
1752		- {
1753		- ImportVRMLX3D();
1754		- } else
1755		- if (event.getSource() == import3DSItem)
1756		- {
1757		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1758		- } else
1759		- if (event.getSource() == importOBJItem)
1760		- {
1761		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1762		- } else
1763		- if (event.getSource() == computeAOItem)
1764		- {
1765		- CameraPane.drawMode = CameraPane.OCCLUSION;
1766		- CameraPane.theRenderer.repaint();
1767		- } else
1768		- if (event.getSource() == recompileItem)
	2722	+ if (source == recompileItem)
1769	2723	{
1770	2724	Recompile();
1771	2725	refreshContents();
1772	2726	} else
1773		- if (event.getSource() == editScriptItem)
	2727	+ if (source == editScriptItem)
1774	2728	{
1775	2729	OpenDialog();
1776	2730	refreshContents();
1777	2731	} else
1778		- if (event.getSource() == invariantsItem)
	2732	+ if (source == invariantsItem)
1779	2733	{
1780	2734	System.out.println("Invariants:");
1781		- GraphreeD.theApplet3D.universe.invariants();
	2735	+ Grafreed.grafreed.universe.invariants();
1782	2736	} else
1783		- if (event.getSource() == memoryItem)
	2737	+ if (source == memoryItem)
1784	2738	{
1785	2739	//System.out.println("Invariants:");
1786	2740	PrintMemory();
1787	2741	} else
1788		- if (event.getSource() == pathItem)
	2742	+ if (source == pathItem)
1789	2743	{
1790	2744	PrintPath();
1791	2745	} else
1792		- if (event.getSource() == analyzeItem)
	2746	+ if (source == analyzeItem)
1793	2747	{
1794	2748	AnalyzeObject();
1795	2749	} else
1796		- if (event.getSource() == dumpItem)
	2750	+ if (source == dumpItem)
1797	2751	{
1798	2752	DumpObject();
1799	2753	} else
1800		- if (event.getSource() == screenfitButton)
	2754	+ if (source == minButton)
1801	2755	{
1802		- //Reload(lastConverter, lastFilename, true);
	2756	+ Minimize();
	2757	+ } else
	2758	+ if (source == maxButton)
	2759	+ {
	2760	+ Maximize();
	2761	+ } else
	2762	+ if (source == fullButton)
	2763	+ {
	2764	+ ToggleFullScreen();
	2765	+ } else
	2766	+ if (source == collapseButton)
	2767	+ {
	2768	+ this.expandedLayout = radio.layout;
	2769	+ CollapseToolbar();
	2770	+ } else
	2771	+ if (source == maximize3DButton)
	2772	+ {
	2773	+ this.expandedLayout = radio.layout;
	2774	+ radio.layout = twoButton;
	2775	+ Show3DView();
	2776	+ CollapseToolbar();
	2777	+ } else
	2778	+ if (source == previousVersionButton)
	2779	+ {
	2780	+ // Go to previous version
	2781	+ //if (!Undo())
	2782	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2783	+ PreviousVersion();
	2784	+ } else
	2785	+ if (source == restoreButton)
	2786	+ {
	2787	+ // Restore current version
	2788	+ Restore();
	2789	+ //restoreButton.setEnabled(false);
	2790	+ } else
	2791	+ if (source == replaceButton)
	2792	+ {
	2793	+ // Overwrite current version
	2794	+ Replace();
	2795	+ //replaceButton.setEnabled(false);
	2796	+ } else
	2797	+ if (source == nextVersionButton)
	2798	+ {
	2799	+ // Go to next version
	2800	+ NextVersion();
	2801	+ } else
	2802	+ if (source == saveVersionButton)
	2803	+ {
	2804	+ // Save a new version
	2805	+ if (!Save(true))
	2806	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2807	+ } else
	2808	+ if (source == deleteVersionButton)
	2809	+ {
	2810	+ // Delete a new version
	2811	+ DeleteVersion();
	2812	+ } else
	2813	+ if (source == oneStepButton)
	2814	+ {
	2815	+ Globals.ONESTEP = true;
	2816	+ cameraView.repaint();
	2817	+ } else
	2818	+ if (source == screenfitButton)
	2819	+ {
1803	2820	ScreenFit();
1804	2821	} else
1805		- if (event.getSource() == screenfitpointButton)
	2822	+ if (source == screenfitpointButton)
1806	2823	{
1807		- //Reload(lastConverter, lastFilename, true);
1808	2824	ScreenFitPoint();
1809	2825	} else
1810		- if (event.getSource() == snapobjectButton)
	2826	+ if (source == snapobjectButton)
1811	2827	{
1812		- //Reload(lastConverter, lastFilename, true);
1813	2828	SnapObject();
1814	2829	} else
1815	2830	// if (event.getSource() == recompileButton)
..	..	@@ -1818,13 +2833,13 @@
1818	2833	// Recompile();
1819	2834	// refreshContents();
1820	2835	// } else
1821		- if (event.getSource() == gcButton)
	2836	+ if (source == gcButton)
1822	2837	{
1823	2838	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1824	2839	System.gc();
1825	2840	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1826	2841	} else
1827		- if (event.getSource() == editLeafItem)
	2842	+ if (source == editLeafItem)
1828	2843	{
1829	2844	Object3D obj;
1830	2845	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1838,65 +2853,78 @@
1838	2853	}
1839	2854	refreshContents(true);
1840	2855	} else
1841		- if (event.getSource() == openWindowItem)
	2856	+ if (source == openWindowItem)
1842	2857	{
1843	2858	EditSelection(true);
1844	2859	} else
1845		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2860	+ if (source == cutItem \|\| source == clearButton)
1846	2861	{
1847	2862	loadClipboard(true);
1848	2863	} else
1849		- if (event.getSource() == duplicateItem)
	2864	+ if (source == undoItem)
1850	2865	{
1851		- Object3D keep = GraphreeD.clipboard;
	2866	+ PreviousVersion();
	2867	+ } else
	2868	+ if (source == redoItem)
	2869	+ {
	2870	+ NextVersion();
	2871	+ } else
	2872	+ if (source == duplicateItem)
	2873	+ {
	2874	+ Object3D keep = Grafreed.clipboard;
1852	2875	loadClipboard(false);
1853	2876	paste(false);
1854		- GraphreeD.clipboard = keep;
	2877	+ Grafreed.clipboard = keep;
1855	2878	} else
1856		- if (event.getSource() == cloneItem)
	2879	+ if (source == cloneItem)
1857	2880	{
1858	2881	CloneSelection(false);
1859	2882	} else
1860		- if (event.getSource() == cloneSupportItem)
	2883	+ if (source == cloneSupportItem)
1861	2884	{
1862	2885	CloneSelection(true);
1863	2886	} else
1864		- if (event.getSource() == copyItem)
	2887	+ if (source == copyItem)
1865	2888	{
1866	2889	loadClipboard(false);
1867	2890	} else
1868		- if (event.getSource() == pasteItem)
	2891	+ if (source == pasteItem)
1869	2892	{
1870	2893	paste(false);
1871	2894	} else
1872		- if (event.getSource() == pasteLinkItem)
	2895	+ if (source == pasteIntoItem)
1873	2896	{
1874		- pasteInto(false);
	2897	+ pasteInto(true, false);
1875	2898	} else
1876		- if (event.getSource() == pasteCloneItem)
	2899	+ if (source == pasteLinkItem)
1877	2900	{
1878		- pasteInto(true);
	2901	+ pasteInto(false, false);
1879	2902	} else
1880		- if (event.getSource() == pasteExpandItem)
	2903	+ if (source == pasteCloneItem)
	2904	+ {
	2905	+ pasteInto(true, true);
	2906	+ } else
	2907	+ if (source == pasteExpandItem)
1881	2908	{
1882	2909	paste(true);
1883	2910	} else
1884		- if (event.getSource() == synchronizeItem)
	2911	+ if (source == synchronizeItem)
1885	2912	{
1886	2913	Overwrite(Object3D.TRANSFORM);
1887	2914	} else
1888		- if (event.getSource() == overwriteNameItem)
	2915	+ if (source == overwriteNameItem)
1889	2916	{
1890	2917	Overwrite(Object3D.NAME);
1891	2918	} else
1892		- if (event.getSource() == overwriteUVItem)
	2919	+ if (source == overwriteUVItem)
1893	2920	{
1894	2921	Overwrite(Object3D.UV);
1895	2922	} else
1896		- if (event.getSource() == overwriteMatItem)
	2923	+ if (source == overwriteMatItem)
1897	2924	{
	2925	+ /* july 2015
1898	2926	if ((dropAttributes & Object3D.TEXTURE) == 0)
1899		- Overwrite(Object3D.MATERIAL);
	2927	+ Overwrite(Object3D.MATERIAL \| Object3D.COLOR);
1900	2928	else
1901	2929	{
1902	2930	if ((dropAttributes & Object3D.COLOR) == 0 && (dropAttributes & Object3D.MATERIAL) == 0)
..	..	@@ -1908,13 +2936,16 @@
1908	2936	Overwrite(Object3D.MATERIAL \| Object3D.TEXTURE);
1909	2937	}
1910	2938	}
	2939	+ */
	2940	+
	2941	+ Overwrite(dropAttributes);
1911	2942	}
1912		- if (event.getSource() == overwriteGeoItem)
	2943	+ if (source == overwriteGeoItem)
1913	2944	{
1914	2945	Overwrite(Object3D.GEOMETRY);
1915		-// if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2946	+// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
1916	2947	// {
1917		-// Object3D content = GraphreeD.clipboard.get(0);
	2948	+// Object3D content = GrafreeD.clipboard.get(0);
1918	2949	//
1919	2950	// if (content instanceof cGroup && ((cGroup)content).transientlink )
1920	2951	// content = ((cGroup)content).get(0);
..	..	@@ -1926,7 +2957,7 @@
1926	2957	// refreshContents();
1927	2958	// }
1928	2959	} else
1929		- if (event.getSource() == generateMeshItem)
	2960	+ if (source == generateMeshItem)
1930	2961	{
1931	2962	//if (group.selection.size() == 1)
1932	2963	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1937,7 +2968,7 @@
1937	2968	ResetModel();
1938	2969	refreshContents();
1939	2970	} else
1940		- if (event.getSource() == extractGeometriesItem)
	2971	+ if (source == extractGeometriesItem)
1941	2972	{
1942	2973	boolean one = false;
1943	2974
..	..	@@ -1964,7 +2995,7 @@
1964	2995	ResetModel();
1965	2996	refreshContents();
1966	2997	} else
1967		- if (event.getSource() == cloneGeometriesItem)
	2998	+ if (source == cloneGeometriesItem)
1968	2999	{
1969	3000	boolean one = false;
1970	3001
..	..	@@ -1990,32 +3021,37 @@
1990	3021	ResetModel();
1991	3022	refreshContents();
1992	3023	} else
1993		- if (event.getSource() == shareGeometriesItem)
	3024	+ if (source == shareGeometriesItem)
1994	3025	{
1995	3026	boolean one = false;
1996	3027
1997	3028	if (group.selection.size() == 1)
1998	3029	one = true;
1999	3030
	3031	+ Object3D merge = null;
	3032	+
2000	3033	Object3D content = new cGroup();
2001	3034
2002	3035	for (int i=0; i<group.selection.size(); i++)
2003	3036	{
2004		- Object3D sel = new Merge(group.selection.get(i));
	3037	+ merge = new Merge(group.selection.get(i));
2005	3038
2006	3039	if (one)
2007		- makeSomething(sel, false);
	3040	+ makeSomething(merge, false);
2008	3041	else
2009		- content.addChild(sel);
	3042	+ content.addChild(merge);
2010	3043	}
2011	3044
2012	3045	if (!one)
2013		- makeSomething(content, false);
2014		-
2015		- ResetModel();
2016		- refreshContents();
	3046	+ makeSomething(content, true);
	3047	+ else
	3048	+ {
	3049	+ ResetModel();
	3050	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	3051	+ refreshContents();
	3052	+ }
2017	3053	} else
2018		- if (event.getSource() == mergeGeometriesItem)
	3054	+ if (source == mergeGeometriesItem)
2019	3055	{
2020	3056	boolean one = false;
2021	3057
..	..	@@ -2045,11 +3081,11 @@
2045	3081	ResetModel();
2046	3082	refreshContents();
2047	3083	} else
2048		- if (event.getSource() == linkverticesItem)
	3084	+ if (source == linkverticesItem)
2049	3085	{
2050		-// if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	3086	+// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2051	3087	// {
2052		-// Object3D content = GraphreeD.clipboard.get(0);
	3088	+// Object3D content = GrafreeD.clipboard.get(0);
2053	3089	//
2054	3090	// if (content instanceof cGroup && ((cGroup)content).transientlink )
2055	3091	// content = ((cGroup)content).get(0);
..	..	@@ -2058,39 +3094,48 @@
2058	3094	// group.selection.get(0).setMasterThis(content); // should be identity
2059	3095	// refreshContents();
2060	3096	// }
2061		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	3097	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2062	3098	{
2063		- Object3D content = GraphreeD.clipboard.get(0);
	3099	+ Object3D content = Grafreed.clipboard.get(0);
2064	3100
2065	3101	if (content instanceof cGroup && ((cGroup)content).transientlink )
2066	3102	content = ((cGroup)content).get(0);
2067	3103
2068		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	3104	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2069	3105	for (int i=0; i<group.selection.size(); i++)
2070	3106	{
2071		- boolean random = CameraPane.RANDOM;
2072		- CameraPane.RANDOM = false; // parse all random nodes
	3107	+ boolean random = CameraPane.SWITCH;
	3108	+ CameraPane.SWITCH = false; // parse all random nodes
2073	3109	group.selection.get(i).linkVerticesThis(content);
2074	3110	// group.selection.get(i).setMasterThis(content); // should be identity
2075		- CameraPane.RANDOM = random;
	3111	+ CameraPane.SWITCH = random;
2076	3112	}
2077		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	3113	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2078	3114	refreshContents();
2079	3115	}
2080	3116	} else
2081		- if (event.getSource() == resetsupportItem)
	3117	+ if (source == resetsupportItem)
2082	3118	{
2083	3119	for (int i=0; i<group.selection.size(); i++)
2084	3120	{
2085		- boolean random = CameraPane.RANDOM;
2086		- CameraPane.RANDOM = false; // parse all random nodes
	3121	+ boolean random = CameraPane.SWITCH;
	3122	+ CameraPane.SWITCH = false; // parse all random nodes
2087	3123	group.selection.get(i).linkVerticesThis(null);
2088		- CameraPane.RANDOM = random;
	3124	+ CameraPane.SWITCH = random;
2089	3125	}
2090	3126
2091	3127	refreshContents();
2092	3128	} else
2093		- if (event.getSource() == resetreferencesItem)
	3129	+ if (source == relinkverticesItem)
	3130	+ {
	3131	+ boolean random = CameraPane.SWITCH;
	3132	+ CameraPane.SWITCH = false; // parse all random nodes
	3133	+ group.selection.RelinkToSupport();
	3134	+ CameraPane.SWITCH = random;
	3135	+
	3136	+ refreshContents();
	3137	+ } else
	3138	+ if (source == resetreferencesItem)
2094	3139	{
2095	3140	for (int i=0; i<group.selection.size(); i++)
2096	3141	{
..	..	@@ -2099,11 +3144,11 @@
2099	3144
2100	3145	refreshContents();
2101	3146	} else
2102		- if (event.getSource() == setMasterItem)
	3147	+ if (source == setMasterItem)
2103	3148	{
2104		- if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	3149	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2105	3150	{
2106		- Object3D content = GraphreeD.clipboard.get(0);
	3151	+ Object3D content = Grafreed.clipboard.get(0);
2107	3152
2108	3153	if (content instanceof cGroup && ((cGroup)content).transientlink )
2109	3154	content = ((cGroup)content).get(0);
..	..	@@ -2112,13 +3157,13 @@
2112	3157	refreshContents();
2113	3158	}
2114	3159	} else
2115		- if (event.getSource() == poseMeshItem)
	3160	+ if (source == poseMeshItem)
2116	3161	{
2117	3162	if (group.selection.size() == 1)
2118	3163	{
2119		- if (GraphreeD.clipboard.size() == 1)
	3164	+ if (Grafreed.clipboard.size() == 1)
2120	3165	{
2121		- Object3D content = GraphreeD.clipboard.get(0);
	3166	+ Object3D content = Grafreed.clipboard.get(0);
2122	3167
2123	3168	if (content instanceof cGroup && ((cGroup)content).transientlink )
2124	3169	content = ((cGroup)content).get(0);
..	..	@@ -2131,19 +3176,19 @@
2131	3176	}
2132	3177
2133	3178	} else
2134		- if (event.getSource() == revertMeshItem)
	3179	+ if (source == revertMeshItem)
2135	3180	{
2136	3181	RevertMeshes();
2137	3182	} else
2138		- if (event.getSource() == resetMeshItem)
	3183	+ if (source == resetAllItem)
2139	3184	{
2140	3185	ResetAll();
2141	3186	} else
2142		- if (event.getSource() == stepAllItem)
	3187	+ if (source == stepAllItem)
2143	3188	{
2144	3189	StepAll();
2145	3190	} else
2146		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	3191	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2147	3192	{
2148	3193	//int indices[] = jList.getSelectedIndices();
2149	3194	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2151,42 +3196,46 @@
2151	3196
2152	3197	ClearSelection(false);
2153	3198	} else
2154		- if (event.getSource() == clearAllItem)
	3199	+ if (source == clearAllItem)
2155	3200	{
2156	3201	ClearSelection(true);
2157	3202	} else
2158		- if (event.getSource() == grabItem)
	3203	+ if (source == grabItem \|\| source == groupButton)
2159	3204	{
2160		- group(new cGroup(), true);
	3205	+ group(new cGroup(), false); // true);
2161	3206	} else
2162		- if (event.getSource() == frontItem)
	3207	+ if (source == hideItem)
	3208	+ {
	3209	+ group(new HiddenObject());
	3210	+ } else
	3211	+ if (source == frontItem)
2163	3212	{
2164	3213	front();
2165	3214	} else
2166		- if (event.getSource() == backItem)
	3215	+ if (source == backItem)
2167	3216	{
2168	3217	back();
2169	3218	} else
2170		- if (event.getSource() == cameraItem)
	3219	+ if (source == cameraItem)
2171	3220	{
2172	3221	makeSomething(new Camera());
2173	3222	} else
2174		- if (event.getSource() == compositeItem)
	3223	+ if (source == compositeItem \|\| source == compositeButton)
2175	3224	{
2176	3225	group(new Composite());
2177	3226	} else
2178		- if (event.getSource() == randomItem)
	3227	+ if (source == switchItem \|\| source == switchButton)
2179	3228	{
2180	3229	RandomNode random = new RandomNode();
2181	3230	group(random);
2182	3231	if (random.size() > 0)
2183		- random.name = random.get(0).name + "Rnd";
	3232	+ random.name = random.get(0).name + "Switch";
2184	3233	} else
2185		- if (event.getSource() == physicsItem)
	3234	+ if (source == physicsItem)
2186	3235	{
2187	3236	group(new PhysicsNode());
2188	3237	} else
2189		- if (event.getSource() == frameselectorItem)
	3238	+ if (source == frameselectorItem)
2190	3239	{
2191	3240	for (int i=0; i<group.selection.size(); i++)
2192	3241	{
..	..	@@ -2198,7 +3247,7 @@
2198	3247	ResetModel();
2199	3248	refreshContents();
2200	3249	} else
2201		- if (event.getSource() == switchGeoItem)
	3250	+ if (source == switchGeoItem)
2202	3251	{
2203	3252	for (int i=0; i<group.selection.size(); i++)
2204	3253	{
..	..	@@ -2210,7 +3259,7 @@
2210	3259	ResetModel();
2211	3260	refreshContents();
2212	3261	} else
2213		- if (event.getSource() == switchTransfoItem)
	3262	+ if (source == switchTransfoItem)
2214	3263	{
2215	3264	for (int i=0; i<group.selection.size(); i++)
2216	3265	{
..	..	@@ -2222,7 +3271,7 @@
2222	3271	ResetModel();
2223	3272	refreshContents();
2224	3273	} else
2225		- if (event.getSource() == morphItem)
	3274	+ if (source == morphItem)
2226	3275	{
2227	3276	for (int i=0; i<group.selection.size(); i++)
2228	3277	{
..	..	@@ -2234,7 +3283,7 @@
2234	3283	ResetModel();
2235	3284	refreshContents();
2236	3285	} else
2237		- if (event.getSource() == scriptNodeItem)
	3286	+ if (source == scriptNodeItem)
2238	3287	{
2239	3288	boolean atleastone = false;
2240	3289
..	..	@@ -2273,195 +3322,252 @@
2273	3322	}
2274	3323	}
2275	3324	} else
2276		- if (event.getSource() == linkerItem)
	3325	+ if (source == linkerItem)
2277	3326	{
2278	3327	group(new cLinker());
2279	3328	} else
2280		- if (event.getSource() == textureItem)
	3329	+ if (source == textureItem \|\| source == textureButton)
2281	3330	{
2282	3331	group(new TextureNode());
2283	3332	} else
2284		- if (event.getSource() == shadowXItem)
	3333	+ if (source == billboardItem)
	3334	+ {
	3335	+ group(new BillboardNode());
	3336	+ } else
	3337	+ if (source == shadowXItem)
2285	3338	{
2286	3339	CastShadow(0);
2287	3340	} else
2288		- if (event.getSource() == shadowYItem)
	3341	+ if (source == shadowYItem)
2289	3342	{
2290	3343	CastShadow(1);
2291	3344	} else
2292		- if (event.getSource() == shadowZItem)
	3345	+ if (source == shadowZItem)
2293	3346	{
2294	3347	CastShadow(2);
2295	3348	} else
2296		- if (event.getSource() == ungroupItem)
	3349	+ if (source == ungroupItem \|\| source == ungroupButton)
2297	3350	{
2298		- ungroup();
	3351	+ boolean hasRoot = false;
	3352	+
	3353	+ for (int i=0; i<group.selection.size(); i++)
	3354	+ {
	3355	+ if (group.selection.get(i) == group)
	3356	+ {
	3357	+ hasRoot = true;
	3358	+ break;
	3359	+ }
	3360	+ }
	3361	+
	3362	+ if (!hasRoot)
	3363	+ {
	3364	+ for (int i=0; i<group.selection.size(); i++)
	3365	+ {
	3366	+ Ungroup(group.selection.get(i));
	3367	+ }
	3368	+
	3369	+ ClearSelection(false);
	3370	+
	3371	+ refreshContents();
	3372	+ }
2299	3373	} else
2300		- if (event.getSource() == genUVItem)
	3374	+ if (source == genUVItem)
2301	3375	{
2302	3376	GenUV();
2303	3377	} else
2304		- if (event.getSource() == genNormalsCADItem)
	3378	+ if (source == genNormalsCADItem)
2305	3379	{
2306	3380	GenNormals(true);
2307	3381	} else
2308		- if (event.getSource() == genNormalsORGANItem)
	3382	+ if (source == genNormalsMESHItem)
	3383	+ {
	3384	+ GenNormalsMESH();
	3385	+ } else
	3386	+ if (source == genNormalsORGANItem)
2309	3387	{
2310	3388	GenNormals(false);
2311	3389	} else
2312		- if (event.getSource() == stripifyItem)
	3390	+ if (source == genNormalsMINEItem)
	3391	+ {
	3392	+ GenNormalsMINE();
	3393	+ } else
	3394	+ if (source == stripifyItem)
2313	3395	{
2314	3396	Stripify();
2315	3397	} else
2316		- if (event.getSource() == unstripifyItem)
	3398	+ if (source == unstripifyItem)
2317	3399	{
2318	3400	Unstripify();
2319	3401	} else
2320		- if (event.getSource() == trimItem)
	3402	+ if (source == trimItem)
2321	3403	{
2322	3404	Trim();
2323	3405	} else
2324		- if (event.getSource() == untrimItem)
	3406	+ if (source == untrimItem)
2325	3407	{
2326	3408	Untrim();
2327	3409	} else
2328		- if (event.getSource() == clearColorsItem)
	3410	+ if (source == clearColorsItem)
2329	3411	{
2330	3412	ClearColors();
2331	3413	} else
2332		- if (event.getSource() == clearMaterialsItem)
	3414	+ if (source == clearMaterialsItem)
2333	3415	{
2334	3416	ClearMaterials();
2335	3417	} else
2336		- if (event.getSource() == liveleavesItem)
	3418	+ if (source == liveleavesItem)
2337	3419	{
2338	3420	LiveLeaves(true);
2339	3421	} else
2340		- if (event.getSource() == unliveleavesItem)
	3422	+ if (source == unliveleavesItem)
2341	3423	{
2342	3424	LiveLeaves(false);
2343	3425	} else
2344		- if (event.getSource() == supportleavesItem)
	3426	+ if (source == supportleavesItem)
2345	3427	{
2346	3428	SupportLeaves(true);
2347	3429	} else
2348		- if (event.getSource() == unsupportleavesItem)
	3430	+ if (source == unsupportleavesItem)
2349	3431	{
2350	3432	SupportLeaves(false);
2351	3433	} else
2352		- if (event.getSource() == hideleavesItem)
	3434	+ if (source == hideleavesItem)
2353	3435	{
2354	3436	HideLeaves(true);
2355	3437	} else
2356		- if (event.getSource() == showleavesItem)
	3438	+ if (source == showleavesItem)
2357	3439	{
2358	3440	HideLeaves(false);
2359	3441	} else
2360		- if (event.getSource() == markleavesItem)
	3442	+ if (source == markleavesItem)
2361	3443	{
2362	3444	MarkLeaves(true);
2363	3445	} else
2364		- if (event.getSource() == unmarkleavesItem)
	3446	+ if (source == unmarkleavesItem)
2365	3447	{
2366	3448	MarkLeaves(false);
2367	3449	} else
2368		- if (event.getSource() == flipVItem)
	3450	+ if (source == rewindleavesItem)
	3451	+ {
	3452	+ RewindLeaves(true);
	3453	+ } else
	3454	+ if (source == unrewindleavesItem)
	3455	+ {
	3456	+ RewindLeaves(false);
	3457	+ } else
	3458	+ if (source == randomleavesItem)
	3459	+ {
	3460	+ RandomLeaves(true);
	3461	+ } else
	3462	+ if (source == unrandomleavesItem)
	3463	+ {
	3464	+ RandomLeaves(false);
	3465	+ } else
	3466	+ if (source == flipVItem)
2369	3467	{
2370	3468	FlipV(true);
2371	3469	} else
2372		- if (event.getSource() == unflipVItem)
	3470	+ if (source == unflipVItem)
2373	3471	{
2374	3472	FlipV(false);
2375	3473	} else
2376		- if (event.getSource() == lowTexturesItem)
	3474	+ if (source == lowTexturesItem)
2377	3475	{
2378	3476	SetTexRes(0);
2379	3477	} else
2380		- if (event.getSource() == normalTexturesItem)
	3478	+ if (source == normalTexturesItem)
2381	3479	{
2382	3480	SetTexRes(1);
2383	3481	} else
2384		- if (event.getSource() == highTexturesItem)
	3482	+ if (source == highTexturesItem)
2385	3483	{
2386	3484	SetTexRes(2);
2387	3485	} else
2388		- if (event.getSource() == veryhighTexturesItem)
	3486	+ if (source == veryhighTexturesItem)
2389	3487	{
2390	3488	SetTexRes(3);
2391	3489	} else
2392		- if (event.getSource() == maxTexturesItem)
	3490	+ if (source == maxTexturesItem)
2393	3491	{
2394	3492	SetTexRes(4);
2395	3493	} else
2396		- if (event.getSource() == panoTexturesItem)
	3494	+ if (source == panoTexturesItem)
2397	3495	{
2398	3496	SetTexRes(5);
2399	3497	} else
2400		- if (event.getSource() == reverseNormalsItem)
	3498	+ if (source == reverseNormalsItem)
2401	3499	{
2402	3500	ReverseNormals();
2403	3501	} else
2404		- if (event.getSource() == parseverticesItem)
	3502	+ if (source == parseverticesItem)
2405	3503	{
2406	3504	ParseVertices();
2407	3505	} else
2408		- if (event.getSource() == textureFieldItem)
	3506	+ if (source == textureFieldItem)
2409	3507	{
2410	3508	TextureVertices();
2411	3509	} else
2412		- if (event.getSource() == alignItem)
	3510	+ if (source == alignItem)
2413	3511	{
2414	3512	Align();
2415	3513	} else
2416		- if (event.getSource() == mirrorItem)
	3514	+ if (source == mirrorItem)
2417	3515	{
2418	3516	MirrorPoses();
2419	3517	} else
2420		- if (event.getSource() == reduceMorphItem)
	3518	+ if (source == reduceMorphItem)
2421	3519	{
2422	3520	MeshReduction(false);
2423	3521	} else
2424		- if (event.getSource() == reduce34MorphItem)
	3522	+ if (source == reduce34MorphItem)
2425	3523	{
2426	3524	MeshReduction(true);
2427	3525	} else
2428		- if (event.getSource() == reverseTrianglesItem)
	3526	+ if (source == reverseTrianglesItem)
2429	3527	{
2430	3528	ReverseTriangles();
2431	3529	} else
2432		- if (event.getSource() == reduceMeshItem)
	3530	+ if (source == reduceMeshItem)
2433	3531	{
2434	3532	ReduceMesh(false);
2435	3533	} else
2436		- if (event.getSource() == reduce34MeshItem)
	3534	+ if (source == reduce34MeshItem)
2437	3535	{
2438	3536	ReduceMesh(true);
2439	3537	} else
2440		- if (event.getSource() == increaseMeshItem)
	3538	+ if (source == increaseMeshItem)
2441	3539	{
2442	3540	IncreaseMesh();
2443	3541	} else
2444		- if (event.getSource() == clipMeshItem)
	3542	+ if (source == clipMeshItem)
2445	3543	{
2446	3544	ClipMesh();
2447	3545	} else
2448		- if (event.getSource() == smoothMeshItem)
	3546	+ if (source == smoothMeshItem)
2449	3547	{
2450	3548	SmoothMesh();
2451	3549	} else
2452		- if (event.getSource() == transformgeometryItem)
	3550	+ if (source == transformGeometryItem)
2453	3551	{
2454	3552	TransformGeometry();
2455	3553	} else
2456		- if (event.getSource() == resetTransformItem)
	3554	+ if (source == transformChildrenItem)
	3555	+ {
	3556	+ TransformChildren();
	3557	+ } else
	3558	+ if (source == resetTransformItem)
2457	3559	{
2458	3560	ResetTransform();
2459	3561	} else
2460		- if (event.getSource() == resetCentroidItem)
	3562	+ if (source == resetCentroidItem)
2461	3563	{
2462		- ResetCentroid();
	3564	+ ResetCentroid(true);
2463	3565	} else
2464		- if (event.getSource() == resetParentItem)
	3566	+ if (source == resetCentroidXZItem)
	3567	+ {
	3568	+ ResetCentroid(false);
	3569	+ } else
	3570	+ if (source == resetParentItem)
2465	3571	{
2466	3572	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2467	3573	{
..	..	@@ -2471,7 +3577,7 @@
2471	3577
2472	3578	refreshContents();
2473	3579	} else
2474		- if (event.getSource() == repairParentItem)
	3580	+ if (source == repairParentItem)
2475	3581	{
2476	3582	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2477	3583	{
..	..	@@ -2485,7 +3591,21 @@
2485	3591
2486	3592	refreshContents();
2487	3593	} else
2488		- if (event.getSource() == sortbysizeItem)
	3594	+ if (source == repairShadowItem)
	3595	+ {
	3596	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3597	+ {
	3598	+ Object3D obj = (Object3D)e.nextElement();
	3599	+ obj.RepairShadow();
	3600	+// for (int i=0; i<obj.size(); i++)
	3601	+// {
	3602	+// obj.get(i).parent = obj;
	3603	+// }
	3604	+ }
	3605	+
	3606	+ refreshContents();
	3607	+ } else
	3608	+ if (source == sortbysizeItem)
2489	3609	{
2490	3610	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2491	3611	{
..	..	@@ -2497,7 +3617,7 @@
2497	3617	ResetModel();
2498	3618	refreshContents();
2499	3619	} else
2500		- if (event.getSource() == sortbynameItem)
	3620	+ if (source == sortbynameItem)
2501	3621	{
2502	3622	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2503	3623	{
..	..	@@ -2509,7 +3629,7 @@
2509	3629	ResetModel();
2510	3630	refreshContents();
2511	3631	} else
2512		- if (event.getSource() == attachPigmentItem)
	3632	+ if (source == attachPigmentItem)
2513	3633	{
2514	3634	String texture = GetFile("Attach pigment");
2515	3635	Object3D obj;
..	..	@@ -2521,7 +3641,7 @@
2521	3641
2522	3642	refreshContents();
2523	3643	} else
2524		- if (event.getSource() == detachPigmentItem)
	3644	+ if (source == detachPigmentItem)
2525	3645	{
2526	3646	Object3D obj;
2527	3647	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2532,7 +3652,7 @@
2532	3652
2533	3653	refreshContents();
2534	3654	} else
2535		- if (event.getSource() == attachBumpItem)
	3655	+ if (source == attachBumpItem)
2536	3656	{
2537	3657	String texture = GetFile("Attach bump");
2538	3658	Object3D obj;
..	..	@@ -2544,18 +3664,18 @@
2544	3664
2545	3665	refreshContents();
2546	3666	} else
2547		- if (event.getSource() == detachBumpItem)
	3667	+ if (source == detachBumpItem)
2548	3668	{
2549	3669	Object3D obj;
2550	3670	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2551	3671	{
2552	3672	obj = (Object3D)e.nextElement();
2553		- obj.SetBumpTexture(null);
	3673	+ obj.ResetBumpTexture();
2554	3674	}
2555	3675
2556	3676	refreshContents();
2557	3677	} else
2558		- if (event.getSource() == pigmentBumpItem)
	3678	+ if (source == pigmentBumpItem)
2559	3679	{
2560	3680	Object3D obj;
2561	3681	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2566,159 +3686,233 @@
2566	3686
2567	3687	refreshContents();
2568	3688	} else
2569		- if (event.getSource() == flashSelectionButton)
	3689	+ if (source == embedTexturesItem)
	3690	+ {
	3691	+ Object3D obj;
	3692	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3693	+ {
	3694	+ obj = (Object3D)e.nextElement();
	3695	+ obj.EmbedTextures(true);
	3696	+ }
	3697	+
	3698	+ refreshContents();
	3699	+ } else
	3700	+ if (source == deEmbedTexturesItem)
	3701	+ {
	3702	+ Object3D obj;
	3703	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3704	+ {
	3705	+ obj = (Object3D)e.nextElement();
	3706	+ obj.EmbedTextures(false);
	3707	+ }
	3708	+
	3709	+ CameraPane.texturepigment.clear();
	3710	+ CameraPane.texturebump.clear();
	3711	+
	3712	+ refreshContents();
	3713	+ } else
	3714	+ if (source == flashSelectionButton)
2570	3715	{
2571	3716	CameraPane.flash = true;
2572	3717	refreshContents();
2573	3718	} else
2574		- if (event.getSource() == oneButton)
	3719	+ if (source == oneButton)
2575	3720	{
2576	3721	} else
2577		- if (event.getSource() == twoButton)
	3722	+ if (source == twoButton)
2578	3723	{
2579	3724	radio.layout = twoButton;
2580		- // bug
2581		- //gridPanel.setDividerLocation(1.0);
2582		- //bigPanel.setDividerLocation(0.0);
2583		- bigThree.remove(jtp);
2584		- bigThree.remove(cameraPanel);
2585		- bigThree.remove(XYZPanel);
2586		- aWindowConstraints.gridx = 0;
2587		- aWindowConstraints.gridy = 0;
2588		- aWindowConstraints.gridwidth = 1;
2589		- // aConstraints.gridheight = 3;
2590		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2591		- aWindowConstraints.weightx = 0;
2592		- aWindowConstraints.weighty = 1;
2593		- //bigThree.add(jtp, aWindowConstraints);
2594		- aWindowConstraints.weightx = 1;
2595		- aWindowConstraints.gridwidth = 3;
2596		- // aConstraints.gridheight = 3;
2597		- aWindowConstraints.gridx = 1;
2598		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2599		- bigThree.add(cameraPanel, aWindowConstraints);
2600		- aWindowConstraints.weightx = 0;
2601		- aWindowConstraints.gridx = 4;
2602		- aWindowConstraints.gridwidth = 1;
2603		- // aConstraints.gridheight = 3;
2604		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2605		- //bigThree.add(XYZPanel, aWindowConstraints);
2606		- bigThree.revalidate();
	3725	+
	3726	+ if (CameraPane.FULLSCREEN)
	3727	+ fullscreenLayout = radio.layout;
	3728	+
	3729	+ Show3DView();
	3730	+
	3731	+ cameraView.requestFocusInWindow();
	3732	+
	3733	+// refreshContents(true);
	3734	+//
	3735	+// try
	3736	+// {
	3737	+// java.awt.Robot bot = new java.awt.Robot();
	3738	+// int mask = InputEvent.BUTTON1_MASK;
	3739	+// bot.mouseMove(100, 100);
	3740	+// bot.mousePress(mask);
	3741	+// bot.mouseRelease(mask);
	3742	+// }
	3743	+// catch (Exception e)
	3744	+// {
	3745	+//
	3746	+// }
	3747	+
2607	3748	} else
2608		- if (event.getSource() == threeButton)
	3749	+ if (source == threeButton)
2609	3750	{
2610	3751	radio.layout = threeButton;
2611		- bigThree.remove(jtp);
2612		- bigThree.remove(cameraPanel);
2613		- bigThree.remove(XYZPanel);
2614		- aWindowConstraints.gridx = 0;
2615		- aWindowConstraints.gridy = 0;
2616		- aWindowConstraints.gridwidth = 1;
2617		- // aConstraints.gridheight = 3;
2618		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2619		- aWindowConstraints.weightx = 0;
2620		- aWindowConstraints.weighty = 1;
2621		- //bigThree.add(jtp, aWindowConstraints);
2622		- aWindowConstraints.weightx = 1;
2623		- aWindowConstraints.gridwidth = 3;
2624		- // aConstraints.gridheight = 3;
2625		- aWindowConstraints.gridx = 1;
2626		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2627		- bigThree.add(cameraPanel, aWindowConstraints);
2628		- aWindowConstraints.weightx = 0;
2629		- aWindowConstraints.gridx = 4;
2630		- aWindowConstraints.gridwidth = 1;
2631		- // aConstraints.gridheight = 3;
2632		- aConstraints.fill = GridBagConstraints.VERTICAL;
2633		- bigThree.add(XYZPanel, aWindowConstraints);
2634		- bigThree.revalidate();
	3752	+
	3753	+ if (CameraPane.FULLSCREEN)
	3754	+ fullscreenLayout = radio.layout;
	3755	+
	3756	+// bigThree.remove(scenePanel);
	3757	+// bigThree.remove(centralPanel);
	3758	+// bigThree.remove(XYZPanel);
	3759	+// aWindowConstraints.gridx = 0;
	3760	+// aWindowConstraints.gridy = 0;
	3761	+// aWindowConstraints.gridwidth = 1;
	3762	+// // aConstraints.gridheight = 3;
	3763	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3764	+// aWindowConstraints.weightx = 0;
	3765	+// aWindowConstraints.weighty = 1;
	3766	+// //bigThree.add(jtp, aWindowConstraints);
	3767	+// aWindowConstraints.weightx = 1;
	3768	+// aWindowConstraints.gridwidth = 3;
	3769	+// // aConstraints.gridheight = 3;
	3770	+// aWindowConstraints.gridx = 1;
	3771	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3772	+// bigThree.add(centralPanel, aWindowConstraints);
	3773	+// aWindowConstraints.weightx = 0;
	3774	+// aWindowConstraints.gridx = 4;
	3775	+// aWindowConstraints.gridwidth = 1;
	3776	+// // aConstraints.gridheight = 3;
	3777	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	3778	+// bigThree.add(XYZPanel, aWindowConstraints);
	3779	+// bigThree.validate();
	3780	+// scenePanel.setVisible(false);
	3781	+// centralPanel.setVisible(true);
	3782	+// XYZPanel.setVisible(true);
	3783	+ bigThree.ClearUI();
	3784	+ bigThree.add(scenePanel);
	3785	+ bigThree.add(centralPanel);
	3786	+ bigThree.FlushUI();
	3787	+
	3788	+ cameraView.requestFocusInWindow();
2635	3789	} else
2636		- if (event.getSource() == fourButton)
	3790	+ if (source == fourButton)
2637	3791	{
2638	3792	radio.layout = fourButton;
2639		- bigThree.remove(jtp);
2640		- bigThree.remove(cameraPanel);
2641		- bigThree.remove(XYZPanel);
2642		- aWindowConstraints.gridx = 0;
2643		- aWindowConstraints.gridy = 0;
2644		- aWindowConstraints.gridwidth = 1;
2645		- // aWindowConstraints.gridheight = 3;
2646		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2647		- aWindowConstraints.weightx = 1;
2648		- aWindowConstraints.weighty = 1;
2649		- bigThree.add(jtp, aWindowConstraints);
2650		- aWindowConstraints.weightx = 1;
2651		- aWindowConstraints.gridwidth = 3;
2652		- // aConstraints.gridheight = 3;
2653		- aWindowConstraints.gridx = 1;
2654		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2655		- //bigThree.add(cameraPanel, aWindowConstraints);
2656		- aWindowConstraints.weightx = 0;
2657		- aWindowConstraints.gridx = 4;
2658		- aWindowConstraints.gridwidth = 1;
2659		- // aWindowConstraints.gridheight = 3;
2660		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2661		- //bigThree.add(XYZPanel, aWindowConstraints);
2662		- bigThree.revalidate();
	3793	+
	3794	+ if (CameraPane.FULLSCREEN)
	3795	+ fullscreenLayout = radio.layout;
	3796	+
	3797	+// bigThree.remove(scenePanel);
	3798	+// bigThree.remove(centralPanel);
	3799	+// bigThree.remove(XYZPanel);
	3800	+// aWindowConstraints.gridx = 0;
	3801	+// aWindowConstraints.gridy = 0;
	3802	+// aWindowConstraints.gridwidth = 1;
	3803	+// // aWindowConstraints.gridheight = 3;
	3804	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3805	+// aWindowConstraints.weightx = 1;
	3806	+// aWindowConstraints.weighty = 1;
	3807	+// bigThree.add(scenePanel, aWindowConstraints);
	3808	+// aWindowConstraints.weightx = 1;
	3809	+// aWindowConstraints.gridwidth = 3;
	3810	+// // aConstraints.gridheight = 3;
	3811	+// aWindowConstraints.gridx = 1;
	3812	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3813	+// //bigThree.add(cameraPanel, aWindowConstraints);
	3814	+// aWindowConstraints.weightx = 0;
	3815	+// aWindowConstraints.gridx = 4;
	3816	+// aWindowConstraints.gridwidth = 1;
	3817	+// // aWindowConstraints.gridheight = 3;
	3818	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3819	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3820	+// bigThree.validate();
	3821	+// scenePanel.setVisible(true);
	3822	+// centralPanel.setVisible(false);
	3823	+// XYZPanel.setVisible(false);
	3824	+ bigThree.ClearUI();
	3825	+ bigThree.add(scenePanel);
	3826	+ bigThree.FlushUI();
	3827	+
	3828	+ cameraView.requestFocusInWindow();
2663	3829	} else
2664		- if (event.getSource() == sixButton)
	3830	+ if (source == sixButton)
2665	3831	{
2666	3832	radio.layout = sixButton;
2667		- bigThree.remove(jtp);
2668		- bigThree.remove(cameraPanel);
2669		- bigThree.remove(XYZPanel);
2670		- aWindowConstraints.gridx = 0;
2671		- aWindowConstraints.gridy = 0;
2672		- aWindowConstraints.gridwidth = 1;
2673		- // aConstraints.gridheight = 3;
2674		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2675		- aWindowConstraints.weightx = 0;
2676		- aWindowConstraints.weighty = 1;
2677		- bigThree.add(jtp, aWindowConstraints);
2678		- aWindowConstraints.weightx = 1;
2679		- aWindowConstraints.gridwidth = 3;
2680		- // aWindowConstraints.gridheight = 3;
2681		- aWindowConstraints.gridx = 1;
2682		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2683		- bigThree.add(cameraPanel, aWindowConstraints);
2684		- aWindowConstraints.weightx = 0;
2685		- aWindowConstraints.gridx = 4;
2686		- aWindowConstraints.gridwidth = 1;
2687		- // aWindowConstraints.gridheight = 3;
2688		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2689		- //bigThree.add(XYZPanel, aConstraints);
2690		- bigThree.revalidate();
	3833	+
	3834	+ if (CameraPane.FULLSCREEN)
	3835	+ fullscreenLayout = radio.layout;
	3836	+
	3837	+// bigThree.remove(scenePanel);
	3838	+// bigThree.remove(centralPanel);
	3839	+// bigThree.remove(XYZPanel);
	3840	+// aWindowConstraints.gridx = 0;
	3841	+// aWindowConstraints.gridy = 0;
	3842	+// aWindowConstraints.gridwidth = 1;
	3843	+// // aConstraints.gridheight = 3;
	3844	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3845	+// aWindowConstraints.weightx = 0;
	3846	+// aWindowConstraints.weighty = 1;
	3847	+// bigThree.add(scenePanel, aWindowConstraints);
	3848	+// aWindowConstraints.weightx = 1;
	3849	+// aWindowConstraints.gridwidth = 3;
	3850	+// // aWindowConstraints.gridheight = 3;
	3851	+// aWindowConstraints.gridx = 1;
	3852	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3853	+// bigThree.add(centralPanel, aWindowConstraints);
	3854	+// aWindowConstraints.weightx = 0;
	3855	+// aWindowConstraints.gridx = 4;
	3856	+// aWindowConstraints.gridwidth = 1;
	3857	+// // aWindowConstraints.gridheight = 3;
	3858	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3859	+// //bigThree.add(XYZPanel, aConstraints);
	3860	+// bigThree.validate();
	3861	+// scenePanel.setVisible(true);
	3862	+// centralPanel.setVisible(true);
	3863	+// XYZPanel.setVisible(false);
	3864	+ bigThree.ClearUI();
	3865	+ bigThree.add(centralPanel);
	3866	+ bigThree.add(scenePanel);
	3867	+ bigThree.FlushUI();
	3868	+
	3869	+ cameraView.requestFocusInWindow();
2691	3870	} else
2692		- if (event.getSource() == sevenButton)
	3871	+ if (source == sevenButton)
2693	3872	{
2694	3873	radio.layout = sevenButton;
2695		- bigThree.remove(jtp);
2696		- bigThree.remove(cameraPanel);
2697		- bigThree.remove(XYZPanel);
2698		- aWindowConstraints.gridx = 0;
2699		- aWindowConstraints.gridy = 0;
2700		- aWindowConstraints.gridwidth = 1;
2701		- // aWindowConstraints.gridheight = 3;
2702		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2703		- aWindowConstraints.weightx = 0;
2704		- aWindowConstraints.weighty = 1;
2705		- bigThree.add(jtp, aWindowConstraints);
2706		- aWindowConstraints.weightx = 1;
2707		- aWindowConstraints.gridwidth = 3;
2708		- // aWindowConstraints.gridheight = 3;
2709		- aWindowConstraints.gridx = 1;
2710		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2711		- bigThree.add(cameraPanel, aWindowConstraints);
2712		- aWindowConstraints.weightx = 0;
2713		- aWindowConstraints.gridx = 4;
2714		- aWindowConstraints.gridwidth = 1;
2715		- // aConstraints.gridheight = 3;
2716		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2717		- bigThree.add(XYZPanel, aWindowConstraints);
2718		- bigThree.revalidate();
	3874	+
	3875	+ if (CameraPane.FULLSCREEN)
	3876	+ fullscreenLayout = radio.layout;
	3877	+
	3878	+// bigThree.remove(scenePanel);
	3879	+// bigThree.remove(centralPanel);
	3880	+// bigThree.remove(XYZPanel);
	3881	+// aWindowConstraints.gridx = 0;
	3882	+// aWindowConstraints.gridy = 0;
	3883	+// aWindowConstraints.gridwidth = 1;
	3884	+// // aWindowConstraints.gridheight = 3;
	3885	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3886	+// aWindowConstraints.weightx = 0;
	3887	+// aWindowConstraints.weighty = 1;
	3888	+// bigThree.add(scenePanel, aWindowConstraints);
	3889	+// aWindowConstraints.weightx = 1;
	3890	+// aWindowConstraints.gridwidth = 3;
	3891	+// // aWindowConstraints.gridheight = 3;
	3892	+// aWindowConstraints.gridx = 1;
	3893	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3894	+// bigThree.add(centralPanel, aWindowConstraints);
	3895	+// aWindowConstraints.weightx = 0;
	3896	+// aWindowConstraints.gridx = 4;
	3897	+// aWindowConstraints.gridwidth = 1;
	3898	+// // aConstraints.gridheight = 3;
	3899	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3900	+// bigThree.add(XYZPanel, aWindowConstraints);
	3901	+// bigThree.validate();
	3902	+// scenePanel.setVisible(true);
	3903	+// centralPanel.setVisible(true);
	3904	+// XYZPanel.setVisible(true);
	3905	+ bigThree.ClearUI();
	3906	+ bigThree.add(scenePanel);
	3907	+ bigThree.add(centralPanel);
	3908	+ bigThree.add(XYZPanel);
	3909	+ bigThree.FlushUI();
	3910	+
	3911	+ cameraView.requestFocusInWindow();
2719	3912	} else
2720		- if (event.getSource() == rootButton)
	3913	+ if (source == rootButton)
2721	3914	{
	3915	+ Replace();
2722	3916	Object3D obj;
2723	3917	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2724	3918	{
..	..	@@ -2727,66 +3921,85 @@
2727	3921	EditObject(obj);
2728	3922	}
2729	3923
	3924	+ cameraView.requestFocusInWindow();
2730	3925	refreshContents(true);
2731	3926	} else
2732		- if (event.getSource() == closeButton)
	3927	+ if (source == closeButton)
2733	3928	{
2734	3929	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2735	3930	cRadio ab;
2736	3931	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2737	3932	{
2738	3933	ab = (cRadio)e.nextElement();
2739		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3934	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2740	3935	{
	3936	+ // Patch to avoid bug with transparency.
	3937	+ if (!ab.hadMaterial)
	3938	+ {
	3939	+ ab.object.material = null;
	3940	+ }
	3941	+
2741	3942	buttonGroup.remove(ab);
2742	3943	radioPanel.remove(ab);
2743	3944
2744		- ab.GetObject().editWindow = null;
	3945	+ //ab.GetObject().editWindow = null;
	3946	+ ab.GetObject().manipWindow = null;
2745	3947	// ab.GetObject().objectUI = null; // ?????????
2746	3948
2747	3949	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2748	3950	break;
2749	3951	}
2750	3952	}
	3953	+
	3954	+ cameraView.requestFocusInWindow();
2751	3955	refreshContents(true);
2752	3956	} else
2753		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3957	+ if (source == editItem \|\| source == editButton)
2754	3958	{
	3959	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3960	+ {
	3961	+ Object3D child = (Object3D)e.nextElement();
	3962	+ child.pinned = true;
	3963	+ }
	3964	+
2755	3965	EditSelection(false);
2756	3966	} else
2757		- if (event.getSource() == uneditButton)
	3967	+ if (source == uneditButton)
2758	3968	{
2759	3969	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2760	3970	{
2761	3971	Object3D child = (Object3D)e.nextElement();
2762	3972	if(child.editWindow != null)
2763		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3973	+ child.pinned = false;
2764	3974	child.CloseUI();
2765	3975	listUI.remove(child);
	3976	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2766	3977
2767		- child.editWindow = null; // ???????????
	3978	+ //child.editWindow = null; // ???????????
2768	3979	}
2769		- objEditor.ctrlPanel.revalidate();
	3980	+ objEditor.ctrlPanel.FlushUI();
2770	3981	//objEditor.jTree.clearSelection();
2771	3982	//objEditor.ResetSliders();
2772	3983	refreshContents(true);
2773	3984	} else
2774		- if (event.getSource() == clearPanelButton)
	3985	+ if (source == clearPanelButton)
2775	3986	{
2776	3987	assert(copy == group);
2777	3988	//copy.ClearUI();
2778	3989	for (Object3D obj : listUI)
2779	3990	{
	3991	+ obj.pinned = false;
2780	3992	obj.CloseUI();
2781	3993	}
2782	3994	listUI.clear();
	3995	+ SetPinStates(group.selection.size() > 0);
2783	3996	refreshContents(true);
2784	3997	} else
2785		- if (event.getSource() == allParamsButton)
	3998	+ if (source == allParamsButton)
2786	3999	{
2787	4000	assert(copy == group);
2788	4001
2789		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4002	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2790	4003
2791	4004	for (Object3D obj : listUI)
2792	4005	{
..	..	@@ -2803,19 +4016,19 @@
2803	4016
2804	4017	refreshContents(true);
2805	4018	} else
2806		- if (event.getSource() == unselectButton)
	4019	+ if (source == unselectButton)
2807	4020	{
2808	4021	objEditor.jTree.clearSelection();
2809		- // ?? oct 2012 GraphreeD.clipboard.clear();
	4022	+ // ?? oct 2012 GrafreeD.clipboard.clear();
2810	4023	objEditor.ResetSliders();
2811	4024	refreshContents(true);
2812	4025	} else
2813		- if(event.getSource() instanceof cRadio)
	4026	+ if(source instanceof cRadio)
2814	4027	{
2815	4028	group.parent = keepparent;
2816	4029	group.attributes = 0;
2817	4030	//group.editWindow = null;
2818		- /cRadio/ radio = (cRadio)event.getSource();
	4031	+ /cRadio/ radio = (cRadio)source;
2819	4032	Object3D obj = radio.GetObject();
2820	4033	System.out.println("Edit " + obj);
2821	4034	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2835,7 +4048,8 @@
2835	4048	}
2836	4049
2837	4050	copy = group;
2838		- //CameraPane.theRenderer.object = group;
	4051	+
	4052	+ //Globals.theRenderer.object = group;
2839	4053	if(!useclient)
2840	4054	{
2841	4055	cameraView.renderCamera = radio.camera;
..	..	@@ -2844,25 +4058,67 @@
2844	4058	cameraView.cameras[cameraView.cameracount] = radio.camera;
2845	4059	cameraView.targetLookAt.set(radio.camera.lookAt);
2846	4060	cameraView.object = group;
2847		- cameraView.lighttouched = true;
	4061	+ //cameraView.lighttouched = true;
	4062	+ Globals.lighttouched = true;
2848	4063	topView.object = group;
2849	4064	frontView.object = group;
2850	4065	sideView.object = group;
2851	4066	}
2852		- group.editWindow = this;
	4067	+
	4068	+// fix "+" issue
	4069	+ //group.editWindow = this;
	4070	+ group.manipWindow = this;
	4071	+
2853	4072	/*
2854	4073	currentLayout = radio.layout;
2855	4074	if (currentLayout == null)
2856	4075	currentLayout = sevenButton;
2857	4076	*/
2858	4077	radio.layout.doClick();
	4078	+
	4079	+ assert(copy instanceof Composite);
	4080	+
	4081	+ if (copy.versionlist == null)
	4082	+ {
	4083	+ copy.versionlist = new Object3D[100];
	4084	+ copy.versionindex = -1;
	4085	+
	4086	+ Save(true);
	4087	+ }
	4088	+
	4089	+ SetVersionStates();
	4090	+
	4091	+ ClearUnpinned();
	4092	+
	4093	+ //Grafreed.Assert(group != null);
	4094	+ //Grafreed.Assert(group.selection != null);
	4095	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4096	+ if (group.selection == null \|\| group.selection.size() == 1)
	4097	+ EditSelection(false);
2859	4098	keepparent = group.parent;
2860	4099	// PARENT = NULL or not???
2861	4100	//group.parent = null; // ROOT
2862	4101	//group.attributes = -1;
2863	4102	ResetModel();
	4103	+
	4104	+ cameraView.requestFocusInWindow();
2864	4105	refreshContents(true);
2865		- }
	4106	+ } else if (event.getSource() == editCameraItem)
	4107	+ {
	4108	+ cameraView.ProtectCamera();
	4109	+ cameraView.requestFocusInWindow();
	4110	+ cameraView.repaint();
	4111	+ return;
	4112	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	4113	+ {
	4114	+ cameraView.RevertCamera();
	4115	+ cameraView.requestFocusInWindow();
	4116	+ cameraView.repaint();
	4117	+ return;
	4118	+ // } else if (event.getSource() == textureButton)
	4119	+ // {
	4120	+ // return; // true;
	4121	+ }
2866	4122	else
2867	4123	{
2868	4124	//return super.action(event, arg);
..	..	@@ -2871,7 +4127,6 @@
2871	4127	}
2872	4128
2873	4129	boolean useclient = false;
2874		- cRadio radio;
2875	4130
2876	4131	void ToggleRoot()
2877	4132	{
..	..	@@ -2880,7 +4135,7 @@
2880	4135	if (useclient)
2881	4136	{
2882	4137	cameraView.object = client;
2883		- cameraView.lighttouched = true;
	4138	+ Globals.lighttouched = true;
2884	4139	//topView.object = client;
2885	4140	//frontView.object = client;
2886	4141	//sideView.object = client;
..	..	@@ -2888,7 +4143,7 @@
2888	4143	else
2889	4144	{
2890	4145	cameraView.object = group;
2891		- cameraView.lighttouched = true;
	4146	+ Globals.lighttouched = true;
2892	4147	//topView.object = group;
2893	4148	//frontView.object = group;
2894	4149	//sideView.object = group;
..	..	@@ -2923,6 +4178,28 @@
2923	4178	refreshContents();
2924	4179	}
2925	4180
	4181	+ void TransformChildren()
	4182	+ {
	4183	+ Object3D obj;
	4184	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4185	+ {
	4186	+ obj = (Object3D)e.nextElement();
	4187	+ obj.KeepTextureMatrices();
	4188	+ obj.TransformChildren();
	4189	+ obj.RestoreTextureMatrices();
	4190	+
	4191	+// if (obj.parent == null)
	4192	+// {
	4193	+// System.out.println("NULL PARENT!");
	4194	+// new Exception().printStackTrace();
	4195	+// }
	4196	+// else
	4197	+// TouchTransform(obj);
	4198	+// //obj.parent.Touch();
	4199	+ }
	4200	+
	4201	+ refreshContents();
	4202	+ }
2926	4203
2927	4204	void ResetTransform()
2928	4205	{
..	..	@@ -3035,7 +4312,7 @@
3035	4312	refreshContents();
3036	4313	}
3037	4314
3038		- void ResetCentroid()
	4315	+ void ResetCentroid(boolean full)
3039	4316	{
3040	4317	Object3D obj;
3041	4318	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3050,12 +4327,16 @@
3050	4327	LA.matIdentity(Object3D.mat);
3051	4328	obj.getBounds(minima, maxima, false);
3052	4329	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3053		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	4330	+ if (full)
	4331	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3054	4332	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3055	4333	obj.TransformMesh(Object3D.mat);
	4334	+
3056	4335	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3057		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	4336	+ if (full)
	4337	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3058	4338	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	4339	+
3059	4340	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3060	4341	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3061	4342	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3084,7 +4365,8 @@
3084	4365
3085	4366	int size = obj.MemorySize();
3086	4367
3087		- System.err.println((size/1024) + " KB is the size of " + obj);
	4368	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4369	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3088	4370	}
3089	4371	}
3090	4372	catch (Exception e)
..	..	@@ -3121,9 +4403,9 @@
3121	4403	obj = (Object3D)e.nextElement();
3122	4404
3123	4405	System.out.println("Object is: " + obj);
3124		- GraphreeD.AnalyzeObject(obj);
	4406	+ Grafreed.AnalyzeObject(obj);
3125	4407	System.out.println("Boundary rep: " + obj.bRep);
3126		- GraphreeD.AnalyzeObject(obj.bRep);
	4408	+ Grafreed.AnalyzeObject(obj.bRep);
3127	4409
3128	4410	// System.err.println((size/1024) + " KB is the size of " + obj);
3129	4411	}
..	..	@@ -3165,6 +4447,20 @@
3165	4447	void GenNormals(boolean crease)
3166	4448	{
3167	4449	group.GenNormalsS(crease);
	4450	+
	4451	+ refreshContents();
	4452	+ }
	4453	+
	4454	+ void GenNormalsMESH()
	4455	+ {
	4456	+ group.GenNormalsMeshS();
	4457	+
	4458	+ refreshContents();
	4459	+ }
	4460	+
	4461	+ void GenNormalsMINE()
	4462	+ {
	4463	+ group.selection.GenNormalsMINE();
3168	4464
3169	4465	refreshContents();
3170	4466	}
..	..	@@ -3250,7 +4546,7 @@
3250	4546	// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3251	4547	// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3252	4548	//
3253		-// g.add(GraphreeD.clipboard);
	4549	+// g.add(GrafreeD.clipboard);
3254	4550	//
3255	4551	// buffer.add(g);
3256	4552	// }
..	..	@@ -3269,8 +4565,8 @@
3269	4565	// nodes = new Object3D();
3270	4566	// vertices = new Vector<Vertex>();
3271	4567	//
3272		-// boolean epsequal = GraphreeD.epsequal;
3273		-// GraphreeD.epsequal = true;
	4568	+// boolean epsequal = GrafreeD.epsequal;
	4569	+// GrafreeD.epsequal = true;
3274	4570	//
3275	4571	// for (int i=0; i<group.selection.size(); i++)
3276	4572	// {
..	..	@@ -3311,7 +4607,7 @@
3311	4607	// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3312	4608	// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3313	4609	//
3314		-// g.add(GraphreeD.clipboard);
	4610	+// g.add(GrafreeD.clipboard);
3315	4611	//
3316	4612	// buffer.add(g);
3317	4613	// }
..	..	@@ -3319,7 +4615,7 @@
3319	4615	// makeSomething(buffer, i==group.selection.size()-1);
3320	4616	// }
3321	4617	//
3322		-// GraphreeD.epsequal = epsequal;
	4618	+// GrafreeD.epsequal = epsequal;
3323	4619	//
3324	4620	// //buffer = null;
3325	4621	// temprep = null;
..	..	@@ -3330,8 +4626,8 @@
3330	4626
3331	4627	void ParseVertices()
3332	4628	{
3333		- boolean epsequal = GraphreeD.epsequal;
3334		- GraphreeD.epsequal = true;
	4629	+ boolean epsequal = Grafreed.epsequal;
	4630	+ Grafreed.epsequal = true;
3335	4631
3336	4632	for (int i=0; i<group.selection.size(); i++)
3337	4633	{
..	..	@@ -3356,7 +4652,7 @@
3356	4652	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3357	4653	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3358	4654
3359		- g.add(GraphreeD.clipboard);
	4655	+ g.add(Grafreed.clipboard);
3360	4656
3361	4657	buffer.add(g);
3362	4658	}
..	..	@@ -3371,7 +4667,7 @@
3371	4667	makeSomething(buffer, i==group.selection.size()-1);
3372	4668	}
3373	4669
3374		- GraphreeD.epsequal = epsequal;
	4670	+ Grafreed.epsequal = epsequal;
3375	4671
3376	4672	refreshContents();
3377	4673	}
..	..	@@ -3389,7 +4685,16 @@
3389	4685	String pigment = Object3D.GetPigment(tex);
3390	4686	//String bump = Object3D.GetBump(tex);
3391	4687
3392		- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
	4688	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4689	+
	4690	+ try
	4691	+ {
	4692	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
	4693	+ }
	4694	+ catch (Exception e)
	4695	+ {
	4696	+ System.err.println("FAIL: " + node);
	4697	+ }
3393	4698
3394	4699	double s = v.s;
3395	4700
..	..	@@ -3416,7 +4721,7 @@
3416	4721	scale /= 3;
3417	4722
3418	4723	scale /= 0xFF;
3419		- scale /= 4;
	4724	+ // c'est quoi ca? scale /= 4;
3420	4725
3421	4726	//v.AO = scale;
3422	4727
..	..	@@ -3437,12 +4742,26 @@
3437	4742
3438	4743	void Align()
3439	4744	{
	4745	+ if (group.selection.size() == 0)
	4746	+ return;
	4747	+
	4748	+ cVector bbmin = new cVector();
	4749	+ cVector bbmax = new cVector();
	4750	+
	4751	+ group.selection.get(0).getBounds(bbmin, bbmax, true);
	4752	+
	4753	+ double dx = bbmax.x - bbmin.x;
	4754	+ double dy = bbmax.y - bbmin.y;
	4755	+ double dz = bbmax.z - bbmin.z;
	4756	+
	4757	+ double scale = Math.sqrt(dxdx + dydy + dz*dz);
	4758	+
3440	4759	for (int i=0; i<group.selection.size(); i++)
3441	4760	{
3442	4761	Object3D obj = group.selection.get(i);
3443	4762
3444		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3445		- LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
	4763	+ LA.matTranslate(obj.toParent, i * scale, 0, 0);
	4764	+ LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3446	4765	}
3447	4766
3448	4767	refreshContents();
..	..	@@ -3455,7 +4774,7 @@
3455	4774	// ref.SaveSupports();
3456	4775	// Object3D par = ref.parent;
3457	4776	// ref.parent = null;
3458		-// Object3D lowres = (Object3D) GraphreeD.clone(ref);
	4777	+// Object3D lowres = (Object3D) GrafreeD.clone(ref);
3459	4778	// ref.parent = par;
3460	4779	// ref.RestoreSupports();
3461	4780
..	..	@@ -3463,11 +4782,11 @@
3463	4782
3464	4783	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3465	4784
3466		- boolean random = CameraPane.RANDOM;
3467		- CameraPane.RANDOM = false; // parse all random nodes
	4785	+ boolean random = CameraPane.SWITCH;
	4786	+ CameraPane.SWITCH = false; // parse all random nodes
3468	4787	lowres.linkVerticesThis(null);
3469	4788	lowres.linkVerticesThis(sn);
3470		- CameraPane.RANDOM = random;
	4789	+ CameraPane.SWITCH = random;
3471	4790
3472	4791	System.err.flush();
3473	4792
..	..	@@ -3485,7 +4804,7 @@
3485	4804	// lowres.SaveSupports();
3486	4805	// par = lowres.parent;
3487	4806	// lowres.parent = null;
3488		-// Object3D newlow = (Object3D) GraphreeD.clone(lowres);
	4807	+// Object3D newlow = (Object3D) GrafreeD.clone(lowres);
3489	4808	Object3D newlow = CloneObject(lowres, false);
3490	4809	newlow.name = sn.switchobject.get(i).name;
3491	4810	System.out.println(" pose#" + i + " = " + newlow);
..	..	@@ -3507,7 +4826,7 @@
3507	4826	return;
3508	4827
3509	4828	Object3D poses = group.selection.get(0);
3510		- Object3D ref = GraphreeD.clipboard.get(0);
	4829	+ Object3D ref = Grafreed.clipboard.get(0);
3511	4830
3512	4831	Object3D newgroup = new Object3D("Po:" + poses.name);
3513	4832
..	..	@@ -3676,7 +4995,7 @@
3676	4995	group.selection.RelinkToSupport(); // july 2014
3677	4996	System.out.println("DONE.");
3678	4997	refreshContents();
3679		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	4998	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3680	4999	}
3681	5000
3682	5001	void ReduceMesh(boolean reduction34)
..	..	@@ -3701,20 +5020,20 @@
3701	5020
3702	5021	void ClipMesh()
3703	5022	{
3704		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	5023	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3705	5024	{
3706		- Object3D content = GraphreeD.clipboard.get(0);
	5025	+ Object3D content = Grafreed.clipboard.get(0);
3707	5026
3708	5027	if (content instanceof cGroup && ((cGroup)content).transientlink )
3709	5028	content = ((cGroup)content).get(0);
3710	5029
3711	5030	// for (int i=0; i<group.selection.size(); i++)
3712	5031	// {
3713		-// group.selection.get(i).ClipMesh(GraphreeD.clipboard);
	5032	+// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3714	5033	// }
3715		- group.selection.ClipMesh(GraphreeD.clipboard);
	5034	+ group.selection.ClipMesh(Grafreed.clipboard);
3716	5035	}
3717		-// group.selection.ClipMesh(GraphreeD.clipboard);
	5036	+// group.selection.ClipMesh(GrafreeD.clipboard);
3718	5037	System.out.println("DONE.");
3719	5038	refreshContents();
3720	5039	}
..	..	@@ -3759,6 +5078,18 @@
3759	5078	void MarkLeaves(boolean hide)
3760	5079	{
3761	5080	group.selection.MarkLeaves(hide);
	5081	+ refreshContents();
	5082	+ }
	5083	+
	5084	+ void RewindLeaves(boolean hide)
	5085	+ {
	5086	+ group.selection.RewindLeaves(hide);
	5087	+ refreshContents();
	5088	+ }
	5089	+
	5090	+ void RandomLeaves(boolean hide)
	5091	+ {
	5092	+ group.selection.RandomLeaves(hide);
3762	5093	refreshContents();
3763	5094	}
3764	5095
..	..	@@ -3833,28 +5164,25 @@
3833	5164	// }
3834	5165	// }
3835	5166
3836		- static boolean allparams = true;
3837		-
3838		- static Vector<Object3D> listUI = new Vector<Object3D>();
3839		-
3840	5167	void EditSelection(boolean newWindow)
3841	5168	{
	5169	+ if (group.selection == null)
	5170	+ {
	5171	+ EditElement(group, newWindow); // ? new
	5172	+ return;
	5173	+ }
	5174	+
3842	5175	// aConstraints.gridy = 0;
3843	5176	for (int i=0; i<group.selection.size(); i++)
3844	5177	{
3845	5178	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
3846	5179	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3847		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5180	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3848	5181
3849	5182	Object3D elem = (Object3D)group.selection.elementAt(i);
3850		- if(elem != group)
	5183	+ if(elem != group \|\| !newWindow)
3851	5184	{
3852		- // if (!(elem instanceof Composite))
3853		- // newWindow = false;
3854		- listUI.add(elem);
3855		- elem.openEditWindow(this, newWindow); //, false);
3856		- System.out.println("edit : " + elem);
3857		- elem.editWindow.refreshContents(true); // ? new
	5185	+ EditElement(elem, newWindow); // ? new
3858	5186	}
3859	5187	}
3860	5188	}
..	..	@@ -3917,9 +5245,7 @@
3917	5245
3918	5246	freezemodel = false;
3919	5247	}
3920		-
3921		- boolean flashIt = true;
3922		-
	5248	+
3923	5249	public void valueChanged(TreeSelectionEvent e)
3924	5250	//public boolean handleEvent(Event event)
3925	5251	{
..	..	@@ -3929,7 +5255,8 @@
3929	5255	//new Exception().printStackTrace();
3930	5256
3931	5257	freezemodel = true;
3932		-
	5258	+ ClearUnpinned();
	5259	+
3933	5260	/**/
3934	5261	//switch (event.id)
3935	5262	{
..	..	@@ -3937,7 +5264,6 @@
3937	5264	//case 702: // Event.LIST_DESELECT
3938	5265	group.deselectAll();
3939	5266	TreePath tps[] = objEditor.jTree.getSelectionPaths();
3940		- objEditor.ClearInfo(); // .GetMaterial());
3941	5267	if (tps != null)
3942	5268	{
3943	5269	for (int i=0; i < tps.length; i++)
..	..	@@ -3946,33 +5272,39 @@
3946	5272
3947	5273	//if (child.parent != null)
3948	5274	//child.parent.addSelectee(child);
	5275	+ objEditor.SetMaterial(child);
3949	5276	group.addSelectee(child);
3950		- objEditor.SetMaterial(child); // .GetMaterial());
3951		- objEditor.AddInfo(child, this, true); // .GetMaterial());
3952		- System.err.println("info : " + child.GetPath());
3953	5277	}
3954	5278	}
3955		- else
3956		- {
3957		- objEditor.SetMaterial(group); // .GetMaterial());
3958		- objEditor.AddInfo(group, this, true); // .GetMaterial());
3959		- System.err.println("info : " + group.GetPath());
3960		- }
	5279	+// else
	5280	+// {
	5281	+// objEditor.SetMaterial(group); // .GetMaterial());
	5282	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	5283	+// System.err.println("info : " + group.GetPath());
	5284	+// }
3961	5285
3962		- objEditor.SetText(); // jan 2014
3963		-
3964		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	5286	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
3965	5287	CameraPane.flash = true;
3966	5288
3967		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5289	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
3968	5290	// a camera
3969	5291	{
3970		- CameraPane.camerachangeframe = 0; // don't refuse it
3971		- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
3972		- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
3973		- // CameraPane.theRenderer.eyeCamera = CameraPane.theRenderer.manipCamera;
	5292	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5293	+ {
	5294	+ CameraPane.camerachangeframe = 0; // don't refuse it
	5295	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5296	+ }
	5297	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	5298	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
3974	5299	}
3975	5300
	5301	+ if (tps != null && tps.length == 1)
	5302	+ {
	5303	+ EditSelection(false);
	5304	+ }
	5305	+
	5306	+ SetPinStates(tps != null && tps.length > 0);
	5307	+
3976	5308	refreshContents();
3977	5309	//return true;
3978	5310	}
..	..	@@ -3981,6 +5313,51 @@
3981	5313
3982	5314	freezemodel = false;
3983	5315	}
	5316	+
	5317	+ void SetPinStates(boolean enabled)
	5318	+ {
	5319	+ editButton.setEnabled(enabled);
	5320	+ uneditButton.setEnabled(enabled);
	5321	+ //unselectButton.setEnabled(enabled);
	5322	+ flashSelectionButton.setEnabled(enabled);
	5323	+
	5324	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5325	+
	5326	+ boolean allComposites = true;
	5327	+
	5328	+ if (group.selection != null)
	5329	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5330	+ {
	5331	+ if (!(e.nextElement() instanceof Composite))
	5332	+ {
	5333	+ allComposites = false;
	5334	+ break;
	5335	+ }
	5336	+ }
	5337	+
	5338	+ rootButton.setEnabled(allComposites);
	5339	+ }
	5340	+
	5341	+ void refreshContents(boolean cp)
	5342	+ {
	5343	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5344	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5345	+ {
	5346	+ objEditor.ClearInfo(); // .GetMaterial());
	5347	+
	5348	+ for (int i=0; i < group.selection.Size(); i++)
	5349	+ {
	5350	+ Object3D child = (Object3D) group.selection.get(i);
	5351	+
	5352	+ objEditor.AddInfo(child, this, true);
	5353	+// System.err.println("info : " + child.GetPath());
	5354	+ }
	5355	+
	5356	+ objEditor.SetText(); // jan 2014
	5357	+ }
	5358	+
	5359	+ super.refreshContents(cp);
	5360	+ }
3984	5361
3985	5362	void linkSomething(Object3D thing)
3986	5363	{
..	..	@@ -4052,16 +5429,19 @@
4052	5429	{
4053	5430	if (group.selection.isEmpty())
4054	5431	return;
4055		- GraphreeD.clipboardIsTempGroup = false;
	5432	+
	5433	+ Grafreed.clipboardIsTempGroup = false;
4056	5434	Composite tGroup = null;
4057	5435	if (group.selection.size() > 0) // 1)
4058	5436	{
4059	5437	tGroup = new cGroup();
4060		- GraphreeD.clipboardIsTempGroup = true;
	5438	+ Grafreed.clipboardIsTempGroup = true;
4061	5439	}
4062	5440
4063	5441	if (cut)
4064	5442	{
	5443	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5444	+// Save();
4065	5445	//int indices[] = jList.getSelectedIndices();
4066	5446	//for (int i = indices.length - 1; i >= 0; i--)
4067	5447	//jList.remove(indices[i]);
..	..	@@ -4097,16 +5477,16 @@
4097	5477	//System.out.println("cut " + child);
4098	5478	//System.out.println("parent = " + child.parent);
4099	5479	// tmp.addChild(child);
4100		- if (GraphreeD.clipboardIsTempGroup)
	5480	+ if (Grafreed.clipboardIsTempGroup)
4101	5481	tGroup.add/Child/(tmp);
4102	5482	else
4103		- GraphreeD.clipboard = tmp;
	5483	+ Grafreed.clipboard = tmp;
4104	5484	}
4105	5485	else
4106		- if (GraphreeD.clipboardIsTempGroup)
	5486	+ if (Grafreed.clipboardIsTempGroup)
4107	5487	tGroup.add/Child/(child);
4108	5488	else
4109		- GraphreeD.clipboard = child;
	5489	+ Grafreed.clipboard = child;
4110	5490	}
4111	5491
4112	5492	//ResetModel();
..	..	@@ -4138,21 +5518,23 @@
4138	5518	//System.out.println("cut " + elem);
4139	5519	//System.out.println("parent = " + elem.parent);
4140	5520	// tmp.addChild(elem);
4141		- if (GraphreeD.clipboardIsTempGroup)
	5521	+ if (Grafreed.clipboardIsTempGroup)
4142	5522	tGroup.add/Child/(tmp);
4143	5523	else
4144		- GraphreeD.clipboard = tmp;
	5524	+ Grafreed.clipboard = tmp;
4145	5525	}
4146	5526	else
4147		- if (GraphreeD.clipboardIsTempGroup)
	5527	+ if (Grafreed.clipboardIsTempGroup)
4148	5528	tGroup.add/Child/(child);
4149	5529	else
4150		- GraphreeD.clipboard = child;
	5530	+ Grafreed.clipboard = child;
4151	5531	}
4152	5532
4153	5533	}
4154		- if (GraphreeD.clipboardIsTempGroup)
4155		- GraphreeD.clipboard = tGroup;
	5534	+
	5535	+ if (Grafreed.clipboardIsTempGroup)
	5536	+ Grafreed.clipboard = tGroup;
	5537	+
4156	5538	if (cut)
4157	5539	{
4158	5540	ResetModel();
..	..	@@ -4162,11 +5544,15 @@
4162	5544
4163	5545	void paste(boolean expand)
4164	5546	{
4165		- // if (GraphreeD.clipboard == null)
	5547	+ if (Globals.REPLACEONMAKE)
	5548	+ Save();
	5549	+ boolean keep = Globals.REPLACEONMAKE;
	5550	+ Globals.REPLACEONMAKE = false;
	5551	+ // if (GrafreeD.clipboard == null)
4166	5552	// return;
4167	5553	boolean first = true;
4168	5554
4169		- if (GraphreeD.clipboardIsTempGroup)
	5555	+ if (Grafreed.clipboardIsTempGroup)
4170	5556	{
4171	5557	Composite temp;
4172	5558
..	..	@@ -4177,7 +5563,7 @@
4177	5563	temp = (Composite)Applet3D.clipboard.deepCopy();
4178	5564	*/
4179	5565	Object3D elem;
4180		- for (Enumeration e = /temp.children/GraphreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5566	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4181	5567	{
4182	5568	Object3D child = (Object3D)e.nextElement();
4183	5569
..	..	@@ -4191,7 +5577,7 @@
4191	5577	else
4192	5578	elem = child.deepCopy(); // ?
4193	5579	child.parent = keepparent;
4194		- //if (GraphreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
	5580	+ //if (GrafreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
4195	5581	// elem = elem.get(0);
4196	5582	makeSomething(elem, true); // ?? first);
4197	5583	//group.addChild(elem);
..	..	@@ -4211,23 +5597,24 @@
4211	5597	//Object3D cb = Applet3D.clipboard;
4212	5598	//temp.addChild(cb);
4213	5599	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4214		- assert(GraphreeD.clipboard.parent == null);
4215		- Object3D /Composite/ keepparent = GraphreeD.clipboard.get(0).parent;
4216		- GraphreeD.clipboard.get(0).parent = null; // Avoid copy?
4217		- if (LA.isIdentity(GraphreeD.clipboard.toParent))
4218		- makeSomething(expand?GraphreeD.clipboard.get(0).copyExpand():GraphreeD.clipboard.get(0).deepCopy());
	5600	+ assert(Grafreed.clipboard.parent == null);
	5601	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5602	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5603	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5604	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4219	5605	else
4220		- makeSomething(expand?GraphreeD.clipboard.copyExpand():GraphreeD.clipboard.deepCopy());
4221		- GraphreeD.clipboard.get(0).parent = keepparent;
	5606	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5607	+ Grafreed.clipboard.get(0).parent = keepparent;
4222	5608	}
4223	5609
	5610	+ Globals.REPLACEONMAKE = keep;
4224	5611	ResetModel();
4225	5612	refreshContents();
4226	5613	}
4227	5614
4228		- void pasteInto(boolean copyit)
	5615	+ void pasteInto(boolean copyit, boolean clone)
4229	5616	{
4230		-// if (GraphreeD.clipboard == null)
	5617	+// if (GrafreeD.clipboard == null)
4231	5618	// return;
4232	5619
4233	5620	if (group.selection.size() != 1)
..	..	@@ -4254,15 +5641,22 @@
4254	5641	if (copyit)
4255	5642	{
4256	5643	// paste(false);
4257		- CloneClipboard(false); // sept 2014
	5644	+ if (clone)
	5645	+ {
	5646	+ CloneClipboard(false); // sept 2014
	5647	+ }
	5648	+ else
	5649	+ {
	5650	+ paste(false);
	5651	+ }
4258	5652	}
4259	5653	else
4260	5654	{
4261	5655	boolean first = true;
4262	5656
4263		- if (GraphreeD.clipboardIsTempGroup)
	5657	+ if (Grafreed.clipboardIsTempGroup)
4264	5658	{
4265		- Composite temp = (Composite)GraphreeD.clipboard;
	5659	+ Composite temp = (Composite)Grafreed.clipboard;
4266	5660	Object3D copy;
4267	5661	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4268	5662	{
..	..	@@ -4272,7 +5666,7 @@
4272	5666	}
4273	5667	} else
4274	5668	{
4275		- linkSomething(GraphreeD.clipboard); //.get(0));
	5669	+ linkSomething(Grafreed.clipboard); //.get(0));
4276	5670	}
4277	5671	}
4278	5672	}
..	..	@@ -4349,6 +5743,10 @@
4349	5743
4350	5744	void group(Object3D csg, boolean grab)
4351	5745	{
	5746	+ if (Globals.REPLACEONMAKE)
	5747	+ Save();
	5748	+ boolean keep = Globals.REPLACEONMAKE;
	5749	+ Globals.REPLACEONMAKE = false;
4352	5750	if (//false) // why??
4353	5751	!group.selection.isEmpty())
4354	5752	{
..	..	@@ -4462,8 +5860,34 @@
4462	5860	//node.add(csg);
4463	5861	//makeSomething(node);
4464	5862	makeSomething(csg);
	5863	+ Globals.REPLACEONMAKE = keep;
4465	5864	}
4466	5865
	5866	+ void Ungroup(Object3D g)
	5867	+ {
	5868	+ if (Globals.REPLACEONMAKE)
	5869	+ Save();
	5870	+ boolean keep = Globals.REPLACEONMAKE;
	5871	+ Globals.REPLACEONMAKE = false;
	5872	+ if (g instanceof HiddenObject)
	5873	+ {
	5874	+ HiddenObject h = (HiddenObject) g;
	5875	+
	5876	+ for (int i=0; i<h.ActualSize(); i++)
	5877	+ {
	5878	+ objEditor.makeSomething(h.get(i), false);
	5879	+ }
	5880	+ }
	5881	+ else
	5882	+ {
	5883	+ for (int i=0; i<g.Size(); i++)
	5884	+ {
	5885	+ objEditor.makeSomething(g.get(i), false);
	5886	+ }
	5887	+ }
	5888	+ Globals.REPLACEONMAKE = keep;
	5889	+ }
	5890	+
4467	5891	void ungroup()
4468	5892	{
4469	5893	/*
..	..	@@ -4657,21 +6081,6 @@
4657	6081	}
4658	6082	*/
4659	6083
4660		- void ImportGFD()
4661		- {
4662		- FileDialog browser = new FileDialog(objEditor.frame, "Import GraphreeD", FileDialog.LOAD);
4663		- browser.show();
4664		- String filename = browser.getFile();
4665		- if (filename != null && filename.length() > 0)
4666		- {
4667		- String fullname = browser.getDirectory() + filename;
4668		-
4669		- //Object3D readobj =
4670		- objEditor.ReadGFD(fullname, objEditor);
4671		- //makeSomething(readobj);
4672		- }
4673		- }
4674		-
4675	6084	/*
4676	6085	public void Callback(Object obj)
4677	6086	{
..	..	@@ -4695,26 +6104,9 @@
4695	6104	}
4696	6105	*/
4697	6106
4698		- void ImportVRMLX3D()
4699		- {
4700		- if (GraphreeD.standAlone)
4701		- {
4702		- /**/
4703		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4704		- browser.show();
4705		- String filename = browser.getFile();
4706		- if (filename != null && filename.length() > 0)
4707		- {
4708		- String fullname = browser.getDirectory() + filename;
4709		- LoadVRMLX3D(fullname);
4710		- }
4711		- /**/
4712		- }
4713		- }
4714		-
4715	6107	String GetFile(String dialogName)
4716	6108	{
4717		- if (GraphreeD.standAlone)
	6109	+ if (Grafreed.standAlone)
4718	6110	{
4719	6111	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4720	6112	browser.show();
..	..	@@ -4778,10 +6170,48 @@
4778	6170	cButton flashSelectionButton;
4779	6171	cButton editButton;
4780	6172	cButton uneditButton;
	6173	+ JCheckBox allParamsButton;
4781	6174	cButton clearpanelButton;
4782		- cButton allParamsButton;
4783	6175	cButton unselectButton;
4784	6176
	6177	+ cButton restoreCameraButton;
	6178	+
	6179	+ cButton oneStepButton;
	6180	+
	6181	+ cButton groupButton;
	6182	+ cButton ungroupButton;
	6183	+ cButton compositeButton;
	6184	+ cButton switchButton;
	6185	+ cButton loopButton;
	6186	+ cButton textureButton;
	6187	+
	6188	+ cButton skybox1Button;
	6189	+ cButton skybox2Button;
	6190	+ cButton skybox3Button;
	6191	+ cButton skybox4Button;
	6192	+ cButton skybox5Button;
	6193	+ cButton skybox6Button;
	6194	+ cButton skybox7Button;
	6195	+
	6196	+ cButton skybox11Button;
	6197	+ cButton skybox12Button;
	6198	+ cButton skybox13Button;
	6199	+ cButton skybox14Button;
	6200	+ cButton skybox15Button;
	6201	+ cButton skybox16Button;
	6202	+ cButton skybox17Button;
	6203	+
	6204	+ cButton gridButton;
	6205	+ cButton boxButton;
	6206	+ cButton sphereButton;
	6207	+ cButton coneButton;
	6208	+ cButton torusButton;
	6209	+ cButton superButton;
	6210	+ cButton kleinButton;
	6211	+ cButton particlesButton;
	6212	+ cButton overlayButton;
	6213	+ cButton lightButton;
	6214	+
4785	6215	cButton screenfitButton;
4786	6216	cButton screenfitpointButton;
4787	6217	cButton snapobjectButton;
..	..	@@ -4793,14 +6223,6 @@
4793	6223
4794	6224	cButton setsupportButton;
4795	6225
4796		- cButton twoButton;
4797		- cButton sixButton;
4798		- cButton threeButton;
4799		- cButton sevenButton;
4800		- cButton fourButton; // full panel
4801		- cButton oneButton; // full XYZ
4802		- //cButton currentLayout;
4803		-
4804	6226	//
4805	6227	//Composite
4806	6228	Object3D // to do !!
..	..	@@ -4810,9 +6232,11 @@
4810	6232	//JTree jTree;
4811	6233	private MenuItem lookAtItem;
4812	6234	private MenuItem lookFromItem;
4813		- private MenuItem switchItem;
	6235	+ private MenuItem switchViewItem;
4814	6236	private MenuItem cutItem;
4815		- private MenuItem duplicateItem;
	6237	+ private MenuItem undoItem;
	6238	+ private MenuItem redoItem;
	6239	+ private JMenuItem duplicateItem;
4816	6240	private MenuItem cloneItem;
4817	6241	private MenuItem cloneSupportItem;
4818	6242	private MenuItem overwriteGeoItem;
..	..	@@ -4823,8 +6247,9 @@
4823	6247	private MenuItem resetsupportItem;
4824	6248	private MenuItem resetreferencesItem;
4825	6249	private MenuItem linkverticesItem;
	6250	+ private MenuItem relinkverticesItem;
4826	6251	private MenuItem setMasterItem;
4827		- private MenuItem resetMeshItem;
	6252	+ private MenuItem resetAllItem;
4828	6253	private MenuItem stepAllItem;
4829	6254	private MenuItem revertMeshItem;
4830	6255	private MenuItem poseMeshItem;
..	..	@@ -4835,14 +6260,17 @@
4835	6260	private MenuItem mergeGeometriesItem;
4836	6261	private MenuItem copyItem;
4837	6262	private MenuItem pasteItem;
	6263	+ private MenuItem pasteIntoItem;
4838	6264	private MenuItem pasteLinkItem;
4839	6265	private MenuItem pasteCloneItem;
4840	6266	private MenuItem pasteExpandItem;
4841		- private MenuItem clearItem;
	6267	+ private MenuItem deleteItem;
4842	6268	private MenuItem clearAllItem;
4843	6269	private MenuItem genUVItem;
	6270	+ private MenuItem genNormalsMESHItem;
4844	6271	private MenuItem genNormalsCADItem;
4845	6272	private MenuItem genNormalsORGANItem;
	6273	+ private MenuItem genNormalsMINEItem;
4846	6274	private MenuItem stripifyItem;
4847	6275	private MenuItem unstripifyItem;
4848	6276	private MenuItem trimItem;
..	..	@@ -4871,6 +6299,10 @@
4871	6299	private MenuItem showleavesItem;
4872	6300	private MenuItem markleavesItem;
4873	6301	private MenuItem unmarkleavesItem;
	6302	+ private MenuItem rewindleavesItem;
	6303	+ private MenuItem unrewindleavesItem;
	6304	+ private MenuItem randomleavesItem;
	6305	+ private MenuItem unrandomleavesItem;
4874	6306
4875	6307	private MenuItem flipVItem;
4876	6308	private MenuItem unflipVItem;
..	..	@@ -4882,14 +6314,17 @@
4882	6314	private MenuItem panoTexturesItem;
4883	6315
4884	6316	private MenuItem resetCentroidItem;
4885		- private MenuItem transformgeometryItem;
	6317	+ private MenuItem resetCentroidXZItem;
4886	6318	private MenuItem resetTransformItem;
	6319	+ private MenuItem transformGeometryItem;
	6320	+ private MenuItem transformChildrenItem;
	6321	+ private MenuItem hideItem;
4887	6322	private MenuItem grabItem;
4888	6323	private MenuItem backItem;
4889	6324	private MenuItem frontItem;
4890	6325	private MenuItem cameraItem;
4891	6326	private MenuItem compositeItem;
4892		- private MenuItem randomItem;
	6327	+ private MenuItem switchItem;
4893	6328	private MenuItem physicsItem;
4894	6329	private MenuItem frameselectorItem;
4895	6330	private MenuItem scriptNodeItem;
..	..	@@ -4904,6 +6339,7 @@
4904	6339
4905	6340	private MenuItem resetParentItem;
4906	6341	private MenuItem repairParentItem;
	6342	+ private MenuItem repairShadowItem;
4907	6343	private MenuItem sortbysizeItem;
4908	6344	private MenuItem sortbynameItem;
4909	6345
..	..	@@ -4912,6 +6348,8 @@
4912	6348	private MenuItem attachBumpItem;
4913	6349	private MenuItem detachBumpItem;
4914	6350	private MenuItem pigmentBumpItem;
	6351	+ private MenuItem embedTexturesItem;
	6352	+ private MenuItem deEmbedTexturesItem;
4915	6353
4916	6354	private MenuItem particleItem;
4917	6355	private MenuItem ragdollItem;
..	..	@@ -4924,10 +6362,11 @@
4924	6362	private MenuItem coneItem;
4925	6363	private MenuItem torusItem;
4926	6364	private MenuItem superItem;
	6365	+ private MenuItem kleinItem;
4927	6366	private MenuItem blobItem;
4928	6367	private MenuItem latheItem;
4929	6368	private MenuItem bezierItem;
4930		- private MenuItem checkerItem;
	6369	+ private MenuItem overlayItem;
4931	6370	private MenuItem meshItem;
4932	6371	// private MenuItem meshGroupItem;
4933	6372	private MenuItem springItem;
..	..	@@ -4936,6 +6375,7 @@
4936	6375	private MenuItem csgItem;
4937	6376	private MenuItem templateItem;
4938	6377	private MenuItem textureItem;
	6378	+ private MenuItem billboardItem;
4939	6379	private MenuItem shadowXItem;
4940	6380	private MenuItem shadowYItem;
4941	6381	private MenuItem shadowZItem;
..	..	@@ -4948,11 +6388,6 @@
4948	6388	private MenuItem doubleItem;
4949	6389	private MenuItem tripleItem;
4950	6390
4951		- private MenuItem importGFDItem;
4952		- private MenuItem importVRMLX3DItem;
4953		- private MenuItem import3DSItem;
4954		- private MenuItem importOBJItem;
4955		-
4956	6391	private MenuItem computeAOItem;
4957	6392	private MenuItem recompileItem;
4958	6393	private MenuItem editScriptItem;
..	..	@@ -4962,4 +6397,8 @@
4962	6397	private MenuItem analyzeItem;
4963	6398	private MenuItem dumpItem;
4964	6399	//boolean freezemodel = false;
	6400	+
	6401	+ Menu cameraMenu;
	6402	+ MenuItem editCameraItem;
	6403	+ MenuItem restoreCameraItem;
4965	6404	}