~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -12,6 +12,7 @@
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,
..	..	@@ -22,6 +23,240 @@
22	23	DragGestureListener, DragSourceListener, DropTargetListener,
23	24	ItemListener // ListSelectionListener
24	25	{
	26	+
	27	+ public void AddSkyboxButton(String f, String s, cGridBag row)
	28	+ {
	29	+ cButton skyboxButton;
	30	+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
	31	+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
	32	+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
	33	+ skyboxButton.setToolTipText(s);
	34	+ skyboxButton.addActionListener(new ActionListener()
	35	+ {
	36	+ @Override
	37	+ public void actionPerformed(ActionEvent e)
	38	+ {
	39	+ ChangeSkybox(path);
	40	+ }
	41	+ });
	42	+ }
	43	+
	44	+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
	45	+ {
	46	+ cGridBag tab0 = new cGridBag().setVertical(true);
	47	+
	48	+ tab0.setName("Urban");
	49	+ skyboxpanel.add(tab0);
	50	+
	51	+ cGridBag row0 = new cGridBag();
	52	+ cGridBag row1 = new cGridBag();
	53	+ cGridBag row2 = new cGridBag();
	54	+ cGridBag row3 = new cGridBag();
	55	+ cGridBag row4 = new cGridBag();
	56	+ cGridBag row5 = new cGridBag();
	57	+ cGridBag row6 = new cGridBag();
	58	+
	59	+ AddSkyboxButton("default", "rgb", row0);
	60	+ //AddSkyboxButton("default", "cornell", row0);
	61	+ AddSkyboxButton("penguins", "dust", row0);
	62	+ AddSkyboxButton("penguins", "tropic", row0);
	63	+ AddSkyboxButton("default", "skycube", row0);
	64	+
	65	+ AddSkyboxButton("default", "uffizi", row1);
	66	+ AddSkyboxButton("bridge", "Bridge", row1);
	67	+ AddSkyboxButton("bridge", "Bridge2", row1);
	68	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	69	+
	70	+ AddSkyboxButton("urban", "Parliament", row2);
	71	+ AddSkyboxButton("urban", "Roundabout", row2);
	72	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	73	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	74	+
	75	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	76	+ AddSkyboxButton("urban", "UnionSquare", row3);
	77	+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
	78	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	79	+
	80	+ AddSkyboxButton("park", "Buddha", row4);
	81	+ AddSkyboxButton("park", "CNTower2", row4);
	82	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	83	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	84	+
	85	+ AddSkyboxButton("park", "Park", row5);
	86	+ AddSkyboxButton("park", "Pond", row5);
	87	+ AddSkyboxButton("park", "Skansen", row5);
	88	+ AddSkyboxButton("park", "Skansen2", row5);
	89	+
	90	+ AddSkyboxButton("park", "Skansen3", row6);
	91	+ AddSkyboxButton("park", "Skansen4", row6);
	92	+ AddSkyboxButton("park", "Skansen5", row6);
	93	+ AddSkyboxButton("park", "Stairs", row6);
	94	+
	95	+ tab0.add(row0);
	96	+ tab0.add(row1);
	97	+ tab0.add(row2);
	98	+ tab0.add(row3);
	99	+ tab0.add(row4);
	100	+ tab0.add(row5);
	101	+ tab0.add(row6);
	102	+
	103	+ for (int i=5; --i>=0;)
	104	+ {
	105	+ //oe.toolboxPanel.Return();
	106	+ //tab0.add(new cGridBag());
	107	+ }
	108	+ }
	109	+
	110	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	111	+ {
	112	+ cGridBag tab0 = new cGridBag().setVertical(true);
	113	+
	114	+ tab0.setName("Nature");
	115	+ skyboxpanel.add(tab0);
	116	+
	117	+ cGridBag row0 = new cGridBag();
	118	+ cGridBag row1 = new cGridBag();
	119	+ cGridBag row2 = new cGridBag();
	120	+ cGridBag row3 = new cGridBag();
	121	+ cGridBag row4 = new cGridBag();
	122	+ cGridBag row5 = new cGridBag();
	123	+ cGridBag row6 = new cGridBag();
	124	+
	125	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	126	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	127	+ AddSkyboxButton("beach", "PalmTrees", row0);
	128	+ AddSkyboxButton("beach", "Tenerife", row0);
	129	+
	130	+ AddSkyboxButton("beach", "Tenerife2", row1);
	131	+ AddSkyboxButton("beach", "Tenerife3", row1);
	132	+ AddSkyboxButton("field", "FishPond", row1);
	133	+ AddSkyboxButton("field", "Footballfield", row1);
	134	+
	135	+ AddSkyboxButton("field", "Meadow", row2);
	136	+ AddSkyboxButton("field", "Sorsele", row2);
	137	+ AddSkyboxButton("field", "Sorsele2", row2);
	138	+ AddSkyboxButton("field", "Sorsele3", row2);
	139	+
	140	+ AddSkyboxButton("forest", "Brudslojan", row3);
	141	+ AddSkyboxButton("forest", "Langholmen2", row3);
	142	+ AddSkyboxButton("forest", "Plants", row3);
	143	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	144	+
	145	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	146	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	147	+ AddSkyboxButton("mountain", "Ryfjallet", row4);
	148	+ AddSkyboxButton("mountain", "Teide", row4);
	149	+ AddSkyboxButton("park", "Tantolunden4", row4);
	150	+
	151	+ AddSkyboxButton("penguins", "wrath", row5);
	152	+ AddSkyboxButton("penguins", "yonder", row5);
	153	+ AddSkyboxButton("rocky", "Langholmen", row5);
	154	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	155	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	156	+
	157	+ AddSkyboxButton("default", "CloudyHills", row6);
	158	+ AddSkyboxButton("daz", "Autumn", row6);
	159	+ AddSkyboxButton("daz", "Greenlands", row6);
	160	+ AddSkyboxButton("daz", "MountainTrail", row6);
	161	+ AddSkyboxButton("daz", "Oasis", row6);
	162	+ /*
	163	+Autumn
	164	+Greenlands
	165	+MountainTrail
	166	+Oasis
	167	+TheRock
	168	+TopOfTheWorld
	169	+Winter
	170	+ */
	171	+
	172	+ tab0.add(row0);
	173	+ tab0.add(row1);
	174	+ tab0.add(row2);
	175	+ tab0.add(row3);
	176	+ tab0.add(row4);
	177	+ tab0.add(row5);
	178	+ tab0.add(row6);
	179	+
	180	+ for (int i=5; --i>=0;)
	181	+ {
	182	+ //oe.toolboxPanel.Return();
	183	+ //tab0.add(new cGridBag());
	184	+ }
	185	+ }
	186	+
	187	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	188	+ {
	189	+ cGridBag tab0 = new cGridBag().setVertical(true);
	190	+
	191	+ tab0.setName("Night");
	192	+ skyboxpanel.add(tab0);
	193	+
	194	+ cGridBag row0 = new cGridBag();
	195	+ cGridBag row1 = new cGridBag();
	196	+ cGridBag row2 = new cGridBag();
	197	+ cGridBag row3 = new cGridBag();
	198	+ cGridBag row4 = new cGridBag();
	199	+ cGridBag row5 = new cGridBag();
	200	+ cGridBag row6 = new cGridBag();
	201	+
	202	+ AddSkyboxButton("night", "NightPath", row0);
	203	+ AddSkyboxButton("night", "PondNight", row0);
	204	+ AddSkyboxButton("night", "Powerlines", row0);
	205	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	206	+
	207	+ AddSkyboxButton("urban", "CNTower", row1);
	208	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	209	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	210	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
	211	+
	212	+ AddSkyboxButton("penguins", "kenon_star", row2);
	213	+ AddSkyboxButton("indoors", "DallasW", row2);
	214	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row2);
	215	+ AddSkyboxButton("indoors", "Vasa", row2);
	216	+
	217	+ AddSkyboxButton("winter", "Backyard", row3);
	218	+ AddSkyboxButton("winter", "Creek", row3);
	219	+ AddSkyboxButton("winter", "FootballField3", row3);
	220	+ AddSkyboxButton("winter", "Forest", row3);
	221	+
	222	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	223	+ AddSkyboxButton("winter", "House", row4);
	224	+ AddSkyboxButton("winter", "IceLake", row4);
	225	+ AddSkyboxButton("winter", "IceRiver", row4);
	226	+
	227	+ AddSkyboxButton("winter", "Park3", row5);
	228	+ AddSkyboxButton("winter", "PondWinter", row5);
	229	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	230	+ AddSkyboxButton("winter", "Vindelalven", row5);
	231	+
	232	+ AddSkyboxButton("daz", "TheRock", row6);
	233	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	234	+ AddSkyboxButton("daz", "Winter", row6);
	235	+ AddSkyboxButton("penguins", "desertdawn", row6);
	236	+
	237	+ tab0.add(row0);
	238	+ tab0.add(row1);
	239	+ tab0.add(row2);
	240	+ tab0.add(row3);
	241	+ tab0.add(row4);
	242	+ tab0.add(row5);
	243	+ tab0.add(row6);
	244	+
	245	+ for (int i=5; --i>=0;)
	246	+ {
	247	+ //oe.toolboxPanel.Return();
	248	+ //tab0.add(new cGridBag());
	249	+ }
	250	+ }
	251	+
	252	+ public void ChangeSkybox(String name)
	253	+ {
	254	+ //cameraView.envyoff = false;
	255	+ group.skyboxname = name;
	256	+ group.skyboxext = "jpg";
	257	+ cameraView.repaint();
	258	+ }
	259	+
25	260	//ObjEditor objEditor;
26	261	public void closeUI2()
27	262	{
..	..	@@ -59,6 +294,12 @@
59	294	this.copy = this.group = group;
60	295	//selectees = this.group.selectees;
61	296
	297	+ if (copy.versions == null)
	298	+ {
	299	+ copy.versions = new byte[100][];
	300	+ copy.versionindex = -1;
	301	+ }
	302	+
62	303	if(ui)
63	304	SetupUI(objEditor);
64	305	}
..	..	@@ -73,17 +314,29 @@
73	314	this.copy = this.group = copy;
74	315	//selectees = this.group.selectees;
75	316
76		- SetupMenu2(objEditor);
	317	+ SetupMenu2(this); //objEditor);
77	318	SetupUI2(objEditor);
78	319	objEditor.SetupUI(true);
79	320	SetupViews(objEditor);
80	321
81	322	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	323	+
	324	+ if (copy.versions == null)
	325	+ {
	326	+ copy.versions = new byte[100][];
	327	+ copy.versionindex = -1;
	328	+
	329	+ Save(true);
	330	+ }
82	331	}
83	332
84	333	void CloneSelection(boolean supports)
85	334	{
86		- // Object3D keep = GraphreeD.clipboard;
	335	+ if (Globals.REPLACEONMAKE)
	336	+ Save();
	337	+ boolean keep = Globals.REPLACEONMAKE;
	338	+ Globals.REPLACEONMAKE = false;
	339	+ // Object3D keep = GrafreeD.clipboard;
87	340	//Object3D obj;
88	341	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
89	342	{
..	..	@@ -93,18 +346,19 @@
93	346
94	347	makeSomething(clone, i==group.selection.size()-1);
95	348	}
	349	+ Globals.REPLACEONMAKE = keep;
96	350	}
97	351
98	352	void CloneClipboard(boolean supports)
99	353	{
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));
	354	+ assert(Grafreed.clipboard.parent == null);
	355	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	356	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	357	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	358	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
105	359	else
106		- makeSomething(CloneObject(GraphreeD.clipboard, false));
107		- GraphreeD.clipboard.get(0).parent = keepparent;
	360	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	361	+ Grafreed.clipboard.get(0).parent = keepparent;
108	362	}
109	363
110	364	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -118,7 +372,7 @@
118	372	// obj.support = null;
119	373	if (!supports)
120	374	obj.SaveSupports();
121		- Object3D clone = (Object3D)GraphreeD.clone(obj);
	375	+ Object3D clone = (Object3D)Grafreed.clone(obj);
122	376	obj.parent = parent;
123	377	// obj.support = support;
124	378	// clone.support = support; // aout 2013
..	..	@@ -147,30 +401,29 @@
147	401
148	402	//JTextField nameField;
149	403
150		- void SetupMenu2(ObjEditor oe)
	404	+ void SetupMenu2(GroupEditor oe)
151	405	{
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);
	406	+ oe.jTree = new cTree();
	407	+
163	408	Menu menu;
164	409	oe.menuBar.add(menu = new Menu("Edit"));
165	410	//editItem = menu.add(new MenuItem("Edit"));
166	411	//editItem.addActionListener(this);
167		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	412	+
	413	+// undoItem = menu.add(new MenuItem("Undo"));
	414	+// undoItem.addActionListener(this);
	415	+// redoItem = menu.add(new MenuItem("Redo"));
	416	+// redoItem.addActionListener(this);
	417	+// menu.add("-");
	418	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
168	419	duplicateItem.addActionListener(this);
169		- menu.add("-");
170	420	cloneItem = menu.add(new MenuItem("Clone"));
171	421	cloneItem.addActionListener(this);
	422	+ if (Globals.ADVANCED)
	423	+ {
172	424	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
173	425	cloneSupportItem.addActionListener(this);
	426	+ }
174	427	menu.add("-");
175	428	cutItem = menu.add(new MenuItem("Cut"));
176	429	cutItem.addActionListener(this);
..	..	@@ -178,27 +431,123 @@
178	431	copyItem.addActionListener(this);
179	432	pasteItem = menu.add(new MenuItem("Paste"));
180	433	pasteItem.addActionListener(this);
	434	+
	435	+ menu.add("-");
	436	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	437	+ pasteIntoItem.addActionListener(this);
181	438	pasteLinkItem = menu.add(new MenuItem("Paste link"));
182	439	pasteLinkItem.addActionListener(this);
183	440	pasteCloneItem = menu.add(new MenuItem("Paste clone"));
184	441	pasteCloneItem.addActionListener(this);
185	442	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
186	443	// pasteExpandItem.addActionListener(this);
187		- clearItem = menu.add(new MenuItem("Clear"));
188		- clearItem.addActionListener(this);
	444	+ menu.add("-");
	445	+ deleteItem = menu.add(new MenuItem("Delete"));
	446	+ deleteItem.addActionListener(this);
	447	+
	448	+ if (Globals.ADVANCED)
	449	+ {
	450	+ // Deletes the cameras...
189	451	clearAllItem = menu.add(new MenuItem("Clear All"));
190	452	clearAllItem.addActionListener(this);
	453	+ }
	454	+
	455	+ menuBar.add(cameraMenu = new Menu("View"));
	456	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	457	+ //zBufferItem.addActionListener(this);
	458	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	459	+ //normalLensItem.addActionListener(this);
	460	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	461	+ restoreCameraItem.addActionListener(this);
	462	+
	463	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	464	+// toggleFullScreenItem.addItemListener(this);
	465	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	466	+// cameraMenu.add("-");
	467	+//
	468	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	469	+// toggleTextureItem.addItemListener(this);
	470	+// toggleTextureItem.setState(CameraPane.textureon);
	471	+//
	472	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	473	+// toggleSwitchItem.addItemListener(this);
	474	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	475	+
	476	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	477	+ toggleHandleItem.addItemListener(this);
	478	+ toggleHandleItem.setState(CameraPane.HANDLES);
	479	+
	480	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	481	+ togglePaintItem.addItemListener(this);
	482	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	483	+
	484	+ if (Globals.ADVANCED)
	485	+ {
	486	+ cameraMenu.add("-");
	487	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	488	+ toggleLiveItem.addItemListener(this);
	489	+ toggleLiveItem.setState(Globals.isLIVE());
191	490
	491	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	492	+ stepItem.addActionListener(this);
	493	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	494	+ // toggleDLItem.addItemListener(this);
	495	+ // toggleDLItem.setState(false);
	496	+
	497	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	498	+ toggleRenderItem.addItemListener(this);
	499	+ toggleRenderItem.setState(!CameraPane.frozen);
	500	+
	501	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	502	+ toggleDebugItem.addItemListener(this);
	503	+ toggleDebugItem.setState(Globals.DEBUG);
	504	+
	505	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	506	+ toggleFrustumItem.addItemListener(this);
	507	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	508	+
	509	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	510	+ toggleFootContactItem.addItemListener(this);
	511	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	512	+
	513	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	514	+ toggleTimelineItem.addItemListener(this);
	515	+ }
	516	+
	517	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	518	+// toggleRootItem.addItemListener(this);
	519	+// toggleRootItem.setState(false);
	520	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	521	+// animationItem.addItemListener(this);
	522	+// animationItem.setState(CameraPane.ANIMATION);
	523	+ cameraMenu.add("-");
	524	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	525	+ editCameraItem.addActionListener(this);
	526	+
	527	+ if (Globals.ADVANCED)
	528	+ {
	529	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	530	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	531	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	532	+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	533	+ oe.cameraMenu.add("-");
	534	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	535	+ openWindowItem.addActionListener(this);
	536	+ editLeafItem.addActionListener(this);
	537	+ lookAtItem.addActionListener(this);
	538	+ //lookFromItem.addActinoListener(this);
	539	+ //switchViewItem.addActionListener(this);
	540	+ }
	541	+
192	542	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);
	543	+ if (Globals.ADVANCED)
	544	+ {
197	545	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
198	546	revertMeshItem.addActionListener(this);
199	547	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
200	548	resetreferencesItem.addActionListener(this);
201	549	menu.add("-");
	550	+ }
202	551	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
203	552	overwriteGeoItem.addActionListener(this);
204	553	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -210,73 +559,104 @@
210	559	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211	560	overwriteUVItem.addActionListener(this);
212	561	menu.add("-");
	562	+ if (Globals.ADVANCED)
	563	+ {
213	564	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214	565	generateMeshItem.addActionListener(this);
215	566	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216	567	poseMeshItem.addActionListener(this);
217	568	menu.add("-");
	569	+ }
218	570	resetsupportItem = menu.add(new MenuItem("Reset support"));
219	571	resetsupportItem.addActionListener(this);
220	572	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	573	linkverticesItem.addActionListener(this);
	574	+ relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
	575	+ relinkverticesItem.addActionListener(this);
	576	+
	577	+ if (Globals.ADVANCED)
	578	+ {
222	579	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
223	580	setMasterItem.addActionListener(this);
	581	+ }
224	582
225	583	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);
	584	+// grabItem = menu.add(new MenuItem("Grab"));
	585	+// grabItem.addActionListener(this);
230	586	backItem = menu.add(new MenuItem("Back"));
231	587	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);
	588	+ frontItem = menu.add(new MenuItem("Front"));
	589	+ frontItem.addActionListener(this);
	590	+// compositeItem = menu.add(new MenuItem("Composite"));
	591	+// compositeItem.addActionListener(this);
	592	+
	593	+ if (Globals.ADVANCED)
	594	+ {
	595	+ hideItem = menu.add(new MenuItem("Hidden Group"));
	596	+ hideItem.addActionListener(this);
	597	+ }
	598	+ ungroupItem = menu.add(new MenuItem("Ungroup"));
	599	+ ungroupItem.addActionListener(this);
	600	+
	601	+// menu.add("-");
	602	+//
	603	+// switchItem = menu.add(new MenuItem("Switch node"));
	604	+// switchItem.addActionListener(this);
	605	+ if (Globals.ADVANCED)
	606	+ {
241	607	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
242	608	switchGeoItem.addActionListener(this);
243	609	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
244	610	switchTransfoItem.addActionListener(this);
245		- morphItem = menu.add(new MenuItem("Morph"));
	611	+ morphItem = menu.add(new MenuItem("Morph Group"));
246	612	morphItem.addActionListener(this);
	613	+
	614	+ menu.add("-");
	615	+ physicsItem = menu.add(new MenuItem("Physics"));
	616	+ physicsItem.addActionListener(this);
	617	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	618	+ frameselectorItem.addActionListener(this);
247	619	scriptNodeItem = menu.add(new MenuItem("Script Node"));
248	620	scriptNodeItem.addActionListener(this);
249		- cameraItem = menu.add(new MenuItem("Camera"));
250		- cameraItem.addActionListener(this);
	621	+ }
251	622
252	623	oe.menuBar.add(menu = new Menu("Object"));
253		- textureItem = menu.add(new MenuItem("Texture"));
254		- textureItem.addActionListener(this);
	624	+// textureItem = menu.add(new MenuItem("Texture"));
	625	+// textureItem.addActionListener(this);
	626	+ billboardItem = menu.add(new MenuItem("Billboard"));
	627	+ billboardItem.addActionListener(this);
255	628	csgItem = menu.add(new MenuItem("CSG"));
256	629	csgItem.addActionListener(this);
257		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	630	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
258	631	shadowXItem.addActionListener(this);
259		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	632	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
260	633	shadowYItem.addActionListener(this);
261		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	634	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
262	635	shadowZItem.addActionListener(this);
	636	+ attributeItem = menu.add(new MenuItem("Attribute"));
	637	+ attributeItem.addActionListener(this);
	638	+
	639	+ if (Globals.ADVANCED)
	640	+ {
	641	+ menu.add("-");
263	642	linkerItem = menu.add(new MenuItem("Linker"));
264	643	linkerItem.addActionListener(this);
265	644	templateItem = menu.add(new MenuItem("Template"));
266	645	templateItem.addActionListener(this);
267		- attributeItem = menu.add(new MenuItem("Attribute"));
268		- attributeItem.addActionListener(this);
269	646	pointflowItem = menu.add(new MenuItem("Point Flow"));
270	647	pointflowItem.addActionListener(this);
	648	+ }
271	649	menu.add("-");
272		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
273		- transformgeometryItem.addActionListener(this);
274	650	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
275	651	resetTransformItem.addActionListener(this);
276	652	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
277	653	resetCentroidItem.addActionListener(this);
278		- ungroupItem = menu.add(new MenuItem("Ungroup"));
279		- ungroupItem.addActionListener(this);
	654	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	655	+ resetCentroidXZItem.addActionListener(this);
	656	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	657	+ transformGeometryItem.addActionListener(this);
	658	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	659	+ transformChildrenItem.addActionListener(this);
280	660
281	661	oe.menuBar.add(menu = new Menu("Geometry"));
282	662	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -285,6 +665,13 @@
285	665	genNormalsORGANItem.addActionListener(this);
286	666	genNormalsCADItem = menu.add(new MenuItem("CAD Normals"));
287	667	genNormalsCADItem.addActionListener(this);
	668	+ genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
	669	+ genNormalsMESHItem.addActionListener(this);
	670	+ if (Globals.ADVANCED)
	671	+ {
	672	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
	673	+ genNormalsMINEItem.addActionListener(this);
	674	+ }
288	675	stripifyItem = menu.add(new MenuItem("Stripify"));
289	676	stripifyItem.addActionListener(this);
290	677	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -306,23 +693,34 @@
306	693	reduce34MeshItem.addActionListener(this);
307	694	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
308	695	increaseMeshItem.addActionListener(this);
309		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
310		- smoothMeshItem.addActionListener(this);
311	696	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
312	697	clipMeshItem.addActionListener(this);
	698	+
	699	+ if (Globals.ADVANCED)
	700	+ {
	701	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	702	+ smoothMeshItem.addActionListener(this);
	703	+ }
313	704
314	705	oe.menuBar.add(menu = new Menu("Attributes"));
315	706	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
316	707	clearMaterialsItem.addActionListener(this);
	708	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	709	+ resetAllItem.addActionListener(this);
	710	+ stepAllItem = menu.add(new MenuItem("Step All"));
	711	+ stepAllItem.addActionListener(this);
317	712	menu.add("-");
318	713	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
319	714	liveleavesItem.addActionListener(this);
320	715	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
321	716	unliveleavesItem.addActionListener(this);
	717	+ if (Globals.ADVANCED)
	718	+ {
322	719	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
323	720	supportleavesItem.addActionListener(this);
324	721	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
325	722	unsupportleavesItem.addActionListener(this);
	723	+ }
326	724	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
327	725	hideleavesItem.addActionListener(this);
328	726	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -331,6 +729,14 @@
331	729	markleavesItem.addActionListener(this);
332	730	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
333	731	unmarkleavesItem.addActionListener(this);
	732	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	733	+ rewindleavesItem.addActionListener(this);
	734	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	735	+ unrewindleavesItem.addActionListener(this);
	736	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	737	+ randomleavesItem.addActionListener(this);
	738	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	739	+ unrandomleavesItem.addActionListener(this);
334	740	menu.add("-");
335	741	flipVItem = menu.add(new MenuItem("Flip V"));
336	742	flipVItem.addActionListener(this);
..	..	@@ -356,45 +762,56 @@
356	762	attachBumpItem.addActionListener(this);
357	763	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
358	764	pigmentBumpItem.addActionListener(this);
	765	+ //embedTexturesItem
359	766	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
360	767	detachPigmentItem.addActionListener(this);
361	768	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
362	769	detachBumpItem.addActionListener(this);
	770	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	771	+ embedTexturesItem.addActionListener(this);
	772	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	773	+ deEmbedTexturesItem.addActionListener(this);
363	774	menu.add("-");
364	775	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
365	776	sortbysizeItem.addActionListener(this);
366	777	sortbynameItem = menu.add(new MenuItem("Sort by name"));
367	778	sortbynameItem.addActionListener(this);
368	779	menu.add("-");
	780	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	781	+ shareGeometriesItem.addActionListener(this);
	782	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	783	+ mergeGeometriesItem.addActionListener(this);
	784	+ if (Globals.ADVANCED)
	785	+ {
	786	+ // Pretty much the same as duplicate and clone.
369	787	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
370	788	extractGeometriesItem.addActionListener(this);
371	789	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
372	790	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);
	791	+ }
377	792
378	793	oe.menuBar.add(menu = new Menu("Insert"));
379	794	buildCreateMenu(menu);
380	795
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	796	oe.menuBar.add(menu = new Menu("Tools"));
393	797	buildToolsMenu(menu);
394	798	}
395	799
	800	+
396	801	void SetupUI2(ObjEditor oe)
397	802	{
	803	+ // June 2019
	804	+ if (oe == null)
	805	+ {
	806	+ //super.SetupUI2(this);
	807	+ //return;
	808	+ }
	809	+
	810	+ if (copy != group)
	811	+ {
	812	+ //super.SetupUI2(this);
	813	+ }
	814	+
398	815	//new Exception().printStackTrace();
399	816
400	817	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -423,150 +840,238 @@
423	840	oe.radioPanel.add(dummyButton);
424	841	oe.buttonGroup.add(dummyButton);
425	842	*/
426		- aConstraints.gridy += 1;
427		- oe.aConstraints.gridwidth = 1;
428		- oe.aConstraints.gridx = 0;
	843	+ cGridBag copyOptionsPanel = new cGridBag();
	844	+
	845	+ copyOptionsPanel.preferredHeight = 2;
429	846
430		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
	847	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
	848	+
	849	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	850	+ //minButton.setToolTipText("Minimize window");
	851	+ //minButton.addActionListener(this);
	852	+
	853	+ if (Globals.ADVANCED)
	854	+ {
	855	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	856	+ maxButton.setToolTipText("Maximize window");
	857	+ maxButton.addActionListener(this);
	858	+ }
	859	+
	860	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	861	+ fullButton.setToolTipText("Full-screen window");
	862	+ fullButton.addActionListener(this);
	863	+
	864	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	865	+ screenfitButton.setToolTipText("Screen fit");
	866	+ screenfitButton.addActionListener(this);
	867	+
	868	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	869	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	870	+ restoreCameraButton.addActionListener(this);
	871	+
	872	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	873	+ saveButton.setToolTipText("New version");
	874	+ saveButton.addActionListener(this);
	875	+
	876	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	877	+ undoButton.setToolTipText("Previous version");
	878	+ undoButton.addActionListener(this);
	879	+ undoButton.setEnabled(false);
	880	+
	881	+ cGridBag updown = new cGridBag().setVertical(true);
	882	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	883	+ restoreButton.setToolTipText("Restore current");
	884	+ restoreButton.addActionListener(this);
	885	+ restoreButton.setEnabled(false);
	886	+
	887	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	888	+ replaceButton.setToolTipText("Replace current");
	889	+ replaceButton.addActionListener(this);
	890	+ replaceButton.setEnabled(false);
	891	+
	892	+ copyOptionsPanel.add(updown);
	893	+
	894	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	895	+ redoButton.setToolTipText("Next version");
	896	+ redoButton.addActionListener(this);
	897	+ redoButton.setEnabled(false);
	898	+
	899	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	900	+ liveCB.setToolTipText("Enable animation");
431	901	liveCB.addItemListener(this);
432	902
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);
	903	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	904	+ oneStepButton.setToolTipText("Animate one step forward");
	905	+ oneStepButton.addActionListener(this);
	906	+
	907	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	908	+ fastCB.setToolTipText("Fast mode");
451	909	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);
	910	+
	911	+ //oe.toolboxPanel.Return();
	912	+
	913	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	914	+// trackCB.setToolTipText("Enable tracking");
	915	+// trackCB.addItemListener(this);
458	916
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	917	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
500	918	// 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	919
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);
	920	+ if (Globals.ADVANCED)
	921	+ {
	922	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	923	+ snapobjectButton.addActionListener(this);
	924	+ snapobjectButton.setToolTipText("Snap Object");
	925	+
	926	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
521	927	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);
	928	+ fourButton.setToolTipText("Show control panel only");
	929	+ }
	930	+
	931	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	932	+
	933	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	934	+ twoButton.setToolTipText("Show 3D view only");
	935	+ twoButton.addActionListener(this);
	936	+ this.fullscreenLayout = twoButton;
	937	+
	938	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	939	+ threeButton.setToolTipText("Show controls and 3D view");
525	940	threeButton.addActionListener(this);
526		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
527		- sevenButton.addActionListener(this);
	941	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	942	+ sixButton.setToolTipText("Show 3D view and controls");
	943	+ sixButton.addActionListener(this);
	944	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	945	+// sevenButton.setToolTipText("3-column layout");
	946	+// sevenButton.addActionListener(this);
528	947	//
529	948
530		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	949	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	950	+ rootButton.setToolTipText("Open selection in new tab");
531	951	rootButton.addActionListener(this);
532		- oe.aConstraints.gridx += 1;
533		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	952	+
	953	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	954	+ closeButton.setToolTipText("Close tab");
534	955	closeButton.addActionListener(this);
535	956	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
536	957	//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	958
546		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	959	+ cGridBag row1 = new cGridBag();
	960	+
	961	+ // INSERT
	962	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	963	+ gridButton.setToolTipText("Create grid");
	964	+ gridButton.addActionListener(this);
	965	+
	966	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	967	+ boxButton.setToolTipText("Create box");
	968	+ boxButton.addActionListener(this);
	969	+
	970	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	971	+ sphereButton.setToolTipText("Create sphere");
	972	+ sphereButton.addActionListener(this);
	973	+
	974	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	975	+ coneButton.setToolTipText("Create cone");
	976	+ coneButton.addActionListener(this);
	977	+
	978	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	979	+ torusButton.setToolTipText("Create torus");
	980	+ torusButton.addActionListener(this);
	981	+
	982	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	983	+ superButton.setToolTipText("Create superellipsoid");
	984	+ superButton.addActionListener(this);
	985	+
	986	+ if (Globals.ADVANCED)
	987	+ {
	988	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	989	+ kleinButton.setToolTipText("Create Klein bottle");
	990	+ kleinButton.addActionListener(this);
	991	+ }
	992	+
	993	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	994	+ particlesButton.setToolTipText("Create particle system");
	995	+ particlesButton.addActionListener(this);
	996	+
	997	+ oe.toolboxPanel.add(row1);
	998	+
	999	+ cGridBag row2 = new cGridBag();
	1000	+
	1001	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1002	+ groupButton.setToolTipText("Create group");
	1003	+ groupButton.addActionListener(this);
	1004	+
	1005	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1006	+ compositeButton.setToolTipText("Create composite");
	1007	+ compositeButton.addActionListener(this);
	1008	+
	1009	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1010	+ switchButton.setToolTipText("Create item switcher");
	1011	+ switchButton.addActionListener(this);
	1012	+
	1013	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1014	+ loopButton.setToolTipText("Create loop");
	1015	+ loopButton.addActionListener(this);
	1016	+
	1017	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1018	+ textureButton.setToolTipText("Create texture");
	1019	+ textureButton.addActionListener(this);
	1020	+
	1021	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1022	+ overlayButton.setToolTipText("Create overlay");
	1023	+ overlayButton.addActionListener(this);
	1024	+
	1025	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1026	+ lightButton.setToolTipText("Create light");
	1027	+ lightButton.addActionListener(this);
	1028	+
	1029	+ oe.toolboxPanel.add(row2);
	1030	+
	1031	+ // ENVYMAPS
	1032	+ cGridBag skyboxpane = new cGridBag();
	1033	+ skyboxpane.preferredHeight = 100;
	1034	+
	1035	+ oe.toolboxPanel.add(skyboxpane);
	1036	+
	1037	+ JTabbedPane skyboxpanel = new JTabbedPane();
	1038	+ skyboxpane.add(skyboxpanel);
	1039	+
	1040	+ AddSkyboxTab0(skyboxpanel);
	1041	+ AddSkyboxTab1(skyboxpanel);
	1042	+ AddSkyboxTab2(skyboxpanel);
	1043	+
	1044	+ // EDIT panel
	1045	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1046	+ editButton.setToolTipText("Pin selection controls");
	1047	+ editButton.addActionListener(this);
	1048	+
	1049	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1050	+ uneditButton.setToolTipText("Remove selection controls");
547	1051	uneditButton.addActionListener(this);
548	1052
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);
	1053	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1054	+ allParamsButton.setToolTipText("Show all controle");
561	1055	allParamsButton.addActionListener(this);
562	1056
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);
	1057	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1058	+ clearPanelButton.setToolTipText("Clear edit panel");
	1059	+ clearPanelButton.addActionListener(this);
	1060	+
	1061	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1062	+ unselectButton.setToolTipText("Unselect");
568	1063	unselectButton.addActionListener(this);
569	1064
	1065	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1066	+ flashSelectionButton.setToolTipText("Highlight selection");
	1067	+ flashSelectionButton.addActionListener(this);
	1068	+
	1069	+ editCommandsPanel.preferredHeight = 1;
	1070	+
	1071	+ SetPinStates(false);
	1072	+// oe.treePanel.add(commandsPanel);
	1073	+// oe.treePanel.Return();
	1074	+
570	1075	// oe.aConstraints.gridx += 1;
571	1076	// oe.aConstraints.weighty = 0;
572	1077	// oe.aConstraints.gridwidth = 1;
..	..	@@ -578,47 +1083,32 @@
578	1083	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
579	1084	// gcButton.addActionListener(this);
580	1085
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;
	1086	+ cGridBag jSPPanel = new cGridBag();
	1087	+
	1088	+ JScrollPane jSP;
592	1089	//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);
	1090	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
594	1091	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	1092
	1093	+ oe.treePanel.add(jSPPanel);
	1094	+ oe.treePanel.Return();
	1095	+
	1096	+ oe.treePanel.add(copyOptionsPanel);
	1097	+ oe.treePanel.Return();
	1098	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1099	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1100	+ sliderPane.preferredHeight = 1;
	1101	+
	1102	+// mainPanel.setDividerLocation(0.1); //1.0);
	1103	+ mainPanel.setResizeWeight(0.4);
	1104	+
615	1105	//jList.addListSelectionListener(this);
616	1106	oe.jTree.addTreeSelectionListener(this);
617	1107	//jTree.setRootVisible(false);
618	1108	//jTree.setEditable(true);
619	1109	oe.jTree.setDragEnabled(true);
620	1110	//jTree.setPreferredSize(new Dimension(10,10));
621		- jSP.setPreferredSize(new Dimension(100,200));
	1111	+ //jSP.setPreferredSize(new Dimension(100,200));
622	1112
623	1113	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
624	1114
..	..	@@ -630,23 +1120,160 @@
630	1120	dgr.addDragGestureListener(this);
631	1121	}catch(Exception e) {}
632	1122	*/
633		- radio.layout = sevenButton;
	1123	+ radio.layout = sixButton; // sevenButton;
634	1124	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
635	1125	}
	1126	+
	1127	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	1128	+ {
	1129	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1130	+ colorCB.setToolTipText("Copy color when dropped");
	1131	+ colorCB.addItemListener(this);
	1132	+
	1133	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1134	+ materialCB.setToolTipText("Copy material when dropped");
	1135	+ materialCB.addItemListener(this);
	1136	+
	1137	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1138	+ textureCB.setToolTipText("Copy texture when dropped");
	1139	+ textureCB.addItemListener(this);
	1140	+
	1141	+ panel.Return();
	1142	+
	1143	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	1144	+ boxCB.setToolTipText("Display bounding boxes");
	1145	+ boxCB.addItemListener(this);
	1146	+
	1147	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	1148	+ zoomBoxCB.setToolTipText("Display only for wheel");
	1149	+ zoomBoxCB.addItemListener(this);
	1150	+
	1151	+ if (true) // Globals.ADVANCED)
	1152	+ {
	1153	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1154	+// supportCB.setToolTipText("Enable rigging");
	1155	+// supportCB.addItemListener(this);
	1156	+
	1157	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1158	+ freezeCB.setToolTipText("Fast moving camera");
	1159	+ freezeCB.addItemListener(this);
	1160	+
	1161	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	1162	+ // localCB.addItemListener(this);
	1163	+
	1164	+ panel.Return();
	1165	+
	1166	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	1167	+ crowdCB.setToolTipText("Used for crowds");
	1168	+ crowdCB.addItemListener(this);
	1169	+
	1170	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	1171	+ smoothCB.setToolTipText("Snapping delay");
	1172	+ smoothCB.addItemListener(this);
	1173	+
	1174	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1175	+ slowCB.setToolTipText("Smooth interpolation");
	1176	+ slowCB.addItemListener(this);
	1177	+
	1178	+// constraints.gridy += 1;
	1179	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	1180	+// speakerMocapCB.addItemListener(this);
	1181	+
	1182	+ panel.Return();
	1183	+
	1184	+ if (false)
	1185	+ {
	1186	+ // handled in scripts
	1187	+ //constraints.gridy += 1;
	1188	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	1189	+ speakerCameraCB.addItemListener(this);
	1190	+
	1191	+ //constraints.gridy += 1;
	1192	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	1193	+ speakerFocusCB.addItemListener(this);
	1194	+
	1195	+ //constraints.gridy += 1;
	1196	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	1197	+ smoothfocusCB.addItemListener(this);
	1198	+ panel.Return();
	1199	+ }
	1200	+
	1201	+//constraints.gridx += 1;
	1202	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	1203	+// debugCB.addItemListener(this);
	1204	+
	1205	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1206	+ trackCB.setToolTipText("Enable tracking target");
	1207	+ trackCB.addItemListener(this);
	1208	+
	1209	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1210	+ oeilCB.setToolTipText("Move camera when tracking");
	1211	+ oeilCB.addItemListener(this);
	1212	+
	1213	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1214	+ shadowCB.setToolTipText("When live compute shadows");
	1215	+ shadowCB.addItemListener(this);
	1216	+
	1217	+ panel.Return();
	1218	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1219	+ toggleTextureCB.setToolTipText("Load textures");
	1220	+ toggleTextureCB.addItemListener(this);
	1221	+
	1222	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1223	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1224	+ toggleSwitchCB.addItemListener(this);
	1225	+
	1226	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1227	+ autokeepCB.setToolTipText("On structure change");
	1228	+ autokeepCB.addItemListener(this);
	1229	+
	1230	+ panel.Return();
	1231	+ if (Globals.ADVANCED)
	1232	+ {
	1233	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	1234	+ lookAtCB.setToolTipText("Look-at target");
	1235	+ lookAtCB.addItemListener(this);
	1236	+ }
	1237	+
	1238	+ }
	1239	+
	1240	+ cGridBag fill = new cGridBag();
	1241	+ fill.preferredHeight = 200;
	1242	+ cGridBag fill2 = new cGridBag();
	1243	+ fill2.preferredHeight = 200;
	1244	+ cGridBag fill3 = new cGridBag();
	1245	+ fill3.preferredHeight = 200;
	1246	+
	1247	+ panel.add(fill);
	1248	+ panel.add(fill2);
	1249	+ panel.add(fill3);
	1250	+
	1251	+ }
636	1252
637	1253	void EditObject(Object3D obj)
638	1254	{
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();
	1255	+ cRadio radioButton = new cRadio(obj.name);
	1256	+
	1257	+ // June 2019. Patch to avoid bug with transparency.
	1258	+ radioButton.hadMaterial = obj.material != null;
	1259	+ if (!radioButton.hadMaterial)
	1260	+ {
	1261	+ obj.material = new cMaterial();
	1262	+ }
	1263	+
	1264	+ radioButton.SetObject(obj);
	1265	+ radioButton.layout = sixButton; // sevenButton;
	1266	+ radioButton.SetCamera(cameraView.renderCamera, false);
	1267	+ radioButton.addActionListener(this);
	1268	+ radioPanel.add(radioButton);
	1269	+ buttonGroup.add(radioButton);
	1270	+ radioButton.doClick();
647	1271	}
	1272	+
648	1273	void SetupViews(ObjEditor oe)
649	1274	{
	1275	+ theFrame = this;
	1276	+
650	1277	oe.SetupViews();
651	1278
652	1279	System.out.println("SetupViews");
..	..	@@ -655,22 +1282,28 @@
655	1282	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
656	1283	}
657	1284
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;
	1285	+ cToggleButton liveCB;
	1286	+ cCheckBox supportCB;
	1287	+ cCheckBox localCB;
	1288	+ cCheckBox crowdCB;
	1289	+ cCheckBox smoothCB;
	1290	+ cToggleButton fastCB;
	1291	+ cCheckBox slowCB;
	1292	+ cCheckBox boxCB;
	1293	+ cCheckBox zoomBoxCB;
	1294	+ cCheckBox freezeCB;
	1295	+ //cToggleButton trackCB;
	1296	+ cCheckBox trackCB;
	1297	+ cCheckBox smoothfocusCB;
668	1298	// JCheckBox speakerMocapCB;
669		- JCheckBox speakerCameraCB;
670		- JCheckBox speakerFocusCB;
671		- JCheckBox debugCB;
672		- JCheckBox oeilCB;
673		- JCheckBox lookAtCB;
	1299	+ cCheckBox speakerCameraCB;
	1300	+ cCheckBox speakerFocusCB;
	1301	+ cCheckBox debugCB;
	1302	+
	1303	+ cCheckBox oeilCB;
	1304	+ cCheckBox shadowCB;
	1305	+ cCheckBox autokeepCB;
	1306	+ cCheckBox lookAtCB;
674	1307
675	1308	// static int COLOR = 1;
676	1309	// static int MATERIAL = 2;
..	..	@@ -678,9 +1311,9 @@
678	1311
679	1312	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
680	1313
681		- JCheckBox colorCB;
682		- JCheckBox materialCB;
683		- JCheckBox textureCB;
	1314	+ cCheckBox colorCB;
	1315	+ cCheckBox materialCB;
	1316	+ cCheckBox textureCB;
684	1317
685	1318	public void itemStateChanged(ItemEvent e)
686	1319	{
..	..	@@ -705,10 +1338,10 @@
705	1338	dropAttributes \|= Object3D.TEXTURE;
706	1339	else
707	1340	dropAttributes &= ~Object3D.TEXTURE;
708		- }
709		- else if(e.getSource() == liveCB)
	1341	+ } else if(e.getSource() == liveCB)
710	1342	{
711	1343	cameraView.ToggleLive();
	1344	+ refreshContents(false);
712	1345	}
713	1346	else if(e.getSource() == supportCB)
714	1347	{
..	..	@@ -744,6 +1377,10 @@
744	1377	cameraView.repaint();
745	1378	// refreshContents();
746	1379	}
	1380	+ else if(e.getSource() == zoomBoxCB)
	1381	+ {
	1382	+ cameraView.ToggleZoomBoxMode();
	1383	+ }
747	1384	else if(e.getSource() == smoothfocusCB)
748	1385	{
749	1386	cameraView.ToggleSmoothFocus();
..	..	@@ -769,6 +1406,18 @@
769	1406	{
770	1407	cameraView.ToggleOeil();
771	1408	}
	1409	+ else if(e.getSource() == shadowCB)
	1410	+ {
	1411	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1412	+ }
	1413	+ else if(e.getSource() == freezeCB)
	1414	+ {
	1415	+ Globals.FREEZEONMOVE ^= true;
	1416	+ }
	1417	+ else if(e.getSource() == autokeepCB)
	1418	+ {
	1419	+ Globals.REPLACEONMAKE ^= true;
	1420	+ }
772	1421	else if(e.getSource() == lookAtCB)
773	1422	{
774	1423	cameraView.ToggleLookAt();
..	..	@@ -785,7 +1434,8 @@
785	1434
786	1435	/**/
787	1436	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
788		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1437	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1438	+ TreePath path = objEditor.jTree.getSelectionPath();
789	1439	if ((path == null) \|\| (path.getPathCount() <= 1)) {
790	1440	// We can't move the root node or an empty selection
791	1441	return;
..	..	@@ -848,8 +1498,6 @@
848	1498	}
849	1499	}
850	1500
851		- String string = (String) object;
852		-
853	1501	System.out.println("Transfer = " + object + "; drop : " + target);
854	1502	// if( object instanceof java.io.File[])
855	1503	// {
..	..	@@ -857,7 +1505,11 @@
857	1505	// objEditor.DropFile((java.io.File[]) object, true);
858	1506	// return;
859	1507	// }
860		- if (string.charAt(0) == '/')
	1508	+
	1509	+ String string = object.toString();
	1510	+
	1511	+ // File path for Mac and Windows
	1512	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
861	1513	{
862	1514	// file(s)
863	1515	String[] names = string.split("\n");
..	..	@@ -884,7 +1536,7 @@
884	1536
885	1537	flashIt = false;
886	1538	CameraPane pane = (CameraPane) target;
887		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1539	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
888	1540	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
889	1541
890	1542	if (group.selection.size() == 1)
..	..	@@ -900,23 +1552,33 @@
900	1552
901	1553	assert target == objEditor.jTree;
902	1554	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1555	+ Object3D destinationLeaf;
903	1556	try {
904		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1557	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
905	1558	} catch (Exception e) {
906	1559	System.out.println("destinationPath : " + destinationPath);
907	1560	return;
908	1561	}
909	1562
910		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1563	+ for (int i=group.selection.size(); --i>=0;)
911	1564	{
	1565	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1566	+
	1567	+ // Cannot move into itself
	1568	+ if (child == destinationLeaf)
	1569	+ return;
	1570	+ }
	1571	+
	1572	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1573	+// {
912	1574	loadClipboard(true);
913	1575	objEditor.jTree.setSelectionPath(destinationPath);
914		- pasteInto(false);
915		- } else {
916		- loadClipboard(false);
917		- objEditor.jTree.setSelectionPath(destinationPath);
918		- pasteInto(false); // true); // ???
919		- }
	1576	+ pasteInto(false, false);
	1577	+// } else {
	1578	+// loadClipboard(false);
	1579	+// objEditor.jTree.setSelectionPath(destinationPath);
	1580	+// pasteInto(false, false); // true); // ???
	1581	+// }
920	1582	}
921	1583	public void dropActionChanged(DropTargetDragEvent dtde)
922	1584	// Called if the user has modified the current drop gesture
..	..	@@ -1021,83 +1683,107 @@
1021	1683	{
1022	1684	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1023	1685	//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);
	1686	+// gridItem = menu.add(new MenuItem("Grid"));
	1687	+// gridItem.addActionListener(this);
	1688	+// rectoidItem = menu.add(new MenuItem("Box"));
	1689	+// rectoidItem.addActionListener(this);
	1690	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1691	+// ellipsoidItem.addActionListener(this);
	1692	+// coneItem = menu.add(new MenuItem("Cone"));
	1693	+// coneItem.addActionListener(this);
	1694	+// torusItem = menu.add(new MenuItem("Torus"));
	1695	+// torusItem.addActionListener(this);
	1696	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1697	+// superItem.addActionListener(this);
	1698	+
	1699	+ cameraItem = menu.add(new MenuItem("Camera"));
	1700	+ cameraItem.addActionListener(this);
	1701	+
	1702	+ if (!Globals.ADVANCED)
	1703	+ {
	1704	+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
	1705	+ kleinItem.addActionListener(this);
	1706	+ }
	1707	+
	1708	+// particleItem = menu.add(new MenuItem("Particle system"));
	1709	+// particleItem.addActionListener(this);
	1710	+ if (Globals.ADVANCED)
	1711	+ {
1038	1712	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1039	1713	ragdollItem.addActionListener(this);
1040	1714	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1041	1715	ragdoll2Item.addActionListener(this);
	1716	+ }
1042	1717	menu.add("-");
1043		- meshItem = menu.add(new MenuItem("Mesh"));
	1718	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1044	1719	meshItem.addActionListener(this);
1045	1720	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1046	1721	// meshGroupItem.addActionListener(this);
	1722	+ if (Globals.ADVANCED)
	1723	+ {
1047	1724	springItem = menu.add(new MenuItem("Spring"));
1048	1725	springItem.addActionListener(this);
1049	1726	flagItem = menu.add(new MenuItem("Flag"));
1050	1727	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	1728	blobItem = menu.add(new MenuItem("Blob"));
1056	1729	blobItem.addActionListener(this);
1057	1730	latheItem = menu.add(new MenuItem("Lathe"));
1058	1731	latheItem.addActionListener(this);
1059		- lightItem = menu.add(new MenuItem("Light"));
1060		- lightItem.addActionListener(this);
	1732	+ }
	1733	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1734	+ bezierItem.addActionListener(this);
	1735	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1736	+// overlayItem.addActionListener(this);
	1737	+// lightItem = menu.add(new MenuItem("Light"));
	1738	+// lightItem.addActionListener(this);
1061	1739	menu.add("-");
1062	1740	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1063	1741	//superLoopItem.addActionListener(this);
1064		- loopItem = menu.add(new MenuItem("Loop"));
1065		- loopItem.addActionListener(this);
	1742	+// loopItem = menu.add(new MenuItem("Loop"));
	1743	+// loopItem.addActionListener(this);
1066	1744	doubleItem = menu.add(new MenuItem("Fork"));
1067	1745	doubleItem.addActionListener(this);
	1746	+ if (Globals.ADVANCED)
	1747	+ {
1068	1748	tripleItem = menu.add(new MenuItem("Trident"));
1069	1749	tripleItem.addActionListener(this);
	1750	+ }
1070	1751	}
1071	1752
1072	1753	void buildToolsMenu(Menu menu)
1073	1754	{
1074	1755	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1075	1756	animationItem.addItemListener(this);
1076		- animationItem.setState(CameraPane.ANIMATION);
	1757	+ animationItem.setState(Globals.ANIMATION);
	1758	+
	1759	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1760	+ archiveItem.addActionListener(this);
1077	1761
1078	1762	menu.add("-");
1079	1763	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1080	1764	parseverticesItem.addActionListener(this);
1081	1765	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1082	1766	textureFieldItem.addActionListener(this);
1083		- alignItem = menu.add(new MenuItem("Align"));
	1767	+ alignItem = menu.add(new MenuItem("Align Objects"));
1084	1768	alignItem.addActionListener(this);
1085		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1086		- mirrorItem.addActionListener(this);
1087	1769	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1088	1770	reduceMorphItem.addActionListener(this);
1089	1771	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1090	1772	reduce34MorphItem.addActionListener(this);
1091		-
1092		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1093		- computeAOItem.addActionListener(this);
1094	1773	menu.add("-");
1095		-
1096	1774	menu.add(memoryItem = new MenuItem("Memory Usage"));
1097	1775	memoryItem.addActionListener(this);
	1776	+ menu.add(computeAOItem = new MenuItem("Compute AO"));
	1777	+ computeAOItem.addActionListener(this);
	1778	+
	1779	+ if (Globals.ADVANCED)
	1780	+ {
	1781	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1782	+ mirrorItem.addActionListener(this);
	1783	+ menu.add("-");
1098	1784	menu.add(analyzeItem = new MenuItem("Analyze"));
1099	1785	analyzeItem.addActionListener(this);
1100		- menu.add(dumpItem = new MenuItem("Dump"));
	1786	+ menu.add(dumpItem = new MenuItem("Print"));
1101	1787	dumpItem.addActionListener(this);
1102	1788	// menu.add(pathItem = new MenuItem("From-to path"));
1103	1789	// pathItem.addActionListener(this);
..	..	@@ -1106,6 +1792,8 @@
1106	1792	resetParentItem.addActionListener(this);
1107	1793	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1108	1794	repairParentItem.addActionListener(this);
	1795	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1796	+ repairShadowItem.addActionListener(this);
1109	1797	menu.add(invariantsItem = new MenuItem("Invariants"));
1110	1798	invariantsItem.addActionListener(this);
1111	1799	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1113,6 +1801,7 @@
1113	1801	menu.add("-");
1114	1802	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1115	1803	editScriptItem.addActionListener(this);
	1804	+ }
1116	1805	}
1117	1806
1118	1807	void ScreenFit()
..	..	@@ -1235,9 +1924,34 @@
1235	1924	shadow.material = new cMaterial(obj.material);
1236	1925	shadow.material.diffuse = 0.0001f;
1237	1926	shadow.material.specular = 0.0001f;
	1927	+ //shadow.projectedVertices[1].x = 300;
1238	1928
1239	1929	makeSomething(shadow);
1240	1930	}
	1931	+
	1932	+ private void ClearUnpinned()
	1933	+ {
	1934	+ //for (Object3D obj : listUI)
	1935	+ for (int i=listUI.size(); --i>=0;)
	1936	+ {
	1937	+ Object3D obj = listUI.elementAt(i);
	1938	+ if (!obj.pinned)
	1939	+ {
	1940	+ obj.CloseUI();
	1941	+ listUI.remove(i);
	1942	+ }
	1943	+ }
	1944	+ }
	1945	+
	1946	+ private void EditElement(Object3D elem, boolean newWindow)
	1947	+ {
	1948	+ // if (!(elem instanceof Composite))
	1949	+ // newWindow = false;
	1950	+ listUI.add(elem);
	1951	+ elem.openEditWindow(this, newWindow); //, false);
	1952	+ System.out.println("edit : " + elem);
	1953	+ elem.editWindow.refreshContents(true); // ? new
	1954	+ }
1241	1955
1242	1956	/**
1243	1957	* applyExample
..	..	@@ -1441,9 +2155,9 @@
1441	2155
1442	2156	void Overwrite(int mask)
1443	2157	{
1444		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2158	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1445	2159	{
1446		- Object3D content = GraphreeD.clipboard.get(0);
	2160	+ Object3D content = Grafreed.clipboard.get(0);
1447	2161
1448	2162	if (content instanceof cGroup && ((cGroup)content).transientlink )
1449	2163	content = ((cGroup)content).get(0);
..	..	@@ -1466,6 +2180,7 @@
1466	2180	//
1467	2181	public void actionPerformed(ActionEvent event) // , Object arg)
1468	2182	{
	2183	+ Object source = event.getSource();
1469	2184	/*
1470	2185	if (event.getSource() == nameField)
1471	2186	{
..	..	@@ -1477,11 +2192,11 @@
1477	2192	}
1478	2193	else
1479	2194	*/
1480		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	2195	+ if (source == lookAtItem \|\| source == lookFromItem)
1481	2196	{
1482	2197	ScreenFit();
1483	2198	} else
1484		- if (event.getSource() == switchItem)
	2199	+ if (source == switchViewItem)
1485	2200	{
1486	2201	cVector v1 = new cVector();
1487	2202	cVector v2 = new cVector();
..	..	@@ -1490,11 +2205,11 @@
1490	2205	objEditor.cameraView.renderCamera.setAim(v2, v1);
1491	2206	objEditor.cameraView.repaint();
1492	2207	} else
1493		- if (event.getSource() == rectoidItem)
	2208	+ if (source == rectoidItem \|\| source == boxButton)
1494	2209	{
1495	2210	makeSomething(new Box());
1496	2211	} else
1497		- if (event.getSource() == particleItem)
	2212	+ if (source == particleItem \|\| source == particlesButton)
1498	2213	{
1499	2214	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1500	2215	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1515,9 +2230,9 @@
1515	2230	applyExample(particleGeom, "SMOKE");
1516	2231	makeSomething(particleGeom);
1517	2232	} else
1518		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	2233	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1519	2234	{
1520		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	2235	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1521	2236
1522	2237	ragdoll.toParent = LA.newMatrix();
1523	2238	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1535,7 +2250,7 @@
1535	2250	} else
1536	2251	/*
1537	2252	*/
1538		- if (event.getSource() == heightFieldItem)
	2253	+ if (source == heightFieldItem)
1539	2254	{
1540	2255	Object3D obj = new Object3D();
1541	2256
..	..	@@ -1573,27 +2288,31 @@
1573	2288
1574	2289	makeSomething(obj);
1575	2290	} else
1576		- if (event.getSource() == gridItem)
	2291	+ if (source == gridItem \|\| source == gridButton)
1577	2292	{
1578	2293	makeSomething(new Grid());
1579	2294	} else
1580		- if (event.getSource() == ellipsoidItem)
	2295	+ if (source == ellipsoidItem \|\| source == sphereButton)
1581	2296	{
1582	2297	makeSomething(new Sphere());
1583	2298	} else
1584		- if (event.getSource() == coneItem)
	2299	+ if (source == coneItem \|\| source == coneButton)
1585	2300	{
1586	2301	makeSomething(new Cone());
1587	2302	} else
1588		- if (event.getSource() == torusItem)
	2303	+ if (source == torusItem \|\| source == torusButton)
1589	2304	{
1590	2305	makeSomething(new Torus());
1591	2306	} else
1592		- if (event.getSource() == superItem)
	2307	+ if (source == superItem \|\| source == superButton)
1593	2308	{
1594	2309	makeSomething(new Superellipsoid());
1595	2310	} else
1596		- if (event.getSource() == blobItem)
	2311	+ if (source == kleinItem \|\| source == kleinButton)
	2312	+ {
	2313	+ makeSomething(new Klein());
	2314	+ } else
	2315	+ if (source == blobItem)
1597	2316	{
1598	2317	Blob blob = new Blob();
1599	2318	BlobComponent comp = new BlobComponent();
..	..	@@ -1601,15 +2320,15 @@
1601	2320	//blob.retile();
1602	2321	makeSomething(blob);
1603	2322	} else
1604		- if (event.getSource() == latheItem)
	2323	+ if (source == latheItem)
1605	2324	{
1606	2325	makeSomething(new Lathe());
1607	2326	} else
1608		- if (event.getSource() == bezierItem)
	2327	+ if (source == bezierItem)
1609	2328	{
1610	2329	makeSomething(new BezierSurface());
1611	2330	} else
1612		- if (event.getSource() == checkerItem)
	2331	+ if (source == overlayItem \|\| source == overlayButton)
1613	2332	{
1614	2333	/*
1615	2334	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1624,7 +2343,7 @@
1624	2343	*/
1625	2344	makeSomething(new Checker());
1626	2345	} else
1627		- if (event.getSource() == meshItem)
	2346	+ if (source == meshItem)
1628	2347	{
1629	2348	Object3D itemtomake = new Object3D();
1630	2349	Object3D child;
..	..	@@ -1645,35 +2364,52 @@
1645	2364	makeSomething(child);
1646	2365	}
1647	2366	} else
1648		- if (event.getSource() == springItem)
	2367	+ if (source == springItem)
1649	2368	{
1650	2369	cSpring s = new cSpring();
1651	2370	s.setup();
1652	2371	makeSomething(s);
1653	2372	} else
1654		- if (event.getSource() == flagItem)
	2373	+ if (source == flagItem)
1655	2374	{
1656	2375	cSpring s = new cFlag();
1657	2376	s.setup();
1658	2377	makeSomething(s);
1659	2378	} else
1660		- if (event.getSource() == lightItem)
	2379	+ if (source == lightItem \|\| source == lightButton)
1661	2380	{
1662	2381	makeSomething(new Light());
1663	2382	} else
1664		- if (event.getSource() == csgItem)
	2383	+// if (source == skybox1Button \|\|
	2384	+// source == skybox2Button \|\|
	2385	+// source == skybox3Button \|\|
	2386	+// source == skybox4Button \|\|
	2387	+// source == skybox5Button \|\|
	2388	+// source == skybox6Button \|\|
	2389	+// source == skybox7Button \|\|
	2390	+// source == skybox11Button \|\|
	2391	+// source == skybox12Button \|\|
	2392	+// source == skybox13Button \|\|
	2393	+// source == skybox14Button \|\|
	2394	+// source == skybox15Button \|\|
	2395	+// source == skybox16Button \|\|
	2396	+// source == skybox17Button)
	2397	+// {
	2398	+// ChangeSkybox(source);
	2399	+// } else
	2400	+ if (source == csgItem)
1665	2401	{
1666	2402	group(new CSG());
1667	2403	} else
1668		- if (event.getSource() == templateItem)
	2404	+ if (source == templateItem)
1669	2405	{
1670	2406	group(new cTemplate());
1671	2407	} else
1672		- if (event.getSource() == attributeItem)
	2408	+ if (source == attributeItem)
1673	2409	{
1674	2410	makeSomething(new Attribute());
1675	2411	} else
1676		- if (event.getSource() == pointflowItem)
	2412	+ if (source == pointflowItem)
1677	2413	{
1678	2414	makeSomething(new PointFlow());
1679	2415	} else
..	..	@@ -1685,7 +2421,7 @@
1685	2421	} else
1686	2422	*/
1687	2423
1688		- if (event.getSource() == superLoopItem)
	2424	+ if (source == superLoopItem)
1689	2425	{
1690	2426	Composite g = new cGroup();
1691	2427	for (int i=0; i<15; i++)
..	..	@@ -1707,30 +2443,30 @@
1707	2443
1708	2444	group(g);
1709	2445	} else
1710		- if (event.getSource() == loopItem)
	2446	+ if (source == loopItem \|\| source == loopButton)
1711	2447	{
1712	2448	Composite csg = new GroupLeaf();
1713	2449	csg.count = 5;
1714	2450	group(csg);
1715		- Composite child = new cGroup();
	2451	+ Composite child = new cGroup("Branch");
1716	2452	csg.addChild(child);
1717	2453	child.addChild(csg);
1718	2454	} else
1719		- if (event.getSource() == doubleItem)
	2455	+ if (source == doubleItem)
1720	2456	{
1721		- Composite csg = new GroupLeaf();
	2457	+ Composite csg = new GroupLeaf("Fork");
1722	2458	csg.count = 5;
1723	2459	group(csg);
1724		- Composite child = new cGroup();
	2460	+ Composite child = new cGroup("Branch A");
1725	2461	csg.addChild(child);
1726	2462	child.addChild(csg);
1727		- child = new cGroup();
	2463	+ child = new cGroup("Branch B");
1728	2464	csg.addChild(child);
1729	2465	child.addChild(csg);
1730	2466	} else
1731		- if (event.getSource() == tripleItem)
	2467	+ if (source == tripleItem)
1732	2468	{
1733		- Composite csg = new GroupLeaf();
	2469	+ Composite csg = new GroupLeaf("Trident");
1734	2470	csg.count = 4;
1735	2471	group(csg);
1736	2472	Composite child = new cGroup();
..	..	@@ -1743,73 +2479,98 @@
1743	2479	csg.addChild(child);
1744	2480	child.addChild(csg);
1745	2481	} else
1746		-
1747		- if (event.getSource() == importGFDItem)
	2482	+ if (source == computeAOItem)
1748	2483	{
1749		- ImportGFD();
	2484	+ Globals.drawMode = CameraPane.OCCLUSION;
	2485	+ cameraView.repaint();
1750	2486	} 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)
	2487	+ if (source == recompileItem)
1769	2488	{
1770	2489	Recompile();
1771	2490	refreshContents();
1772	2491	} else
1773		- if (event.getSource() == editScriptItem)
	2492	+ if (source == editScriptItem)
1774	2493	{
1775	2494	OpenDialog();
1776	2495	refreshContents();
1777	2496	} else
1778		- if (event.getSource() == invariantsItem)
	2497	+ if (source == invariantsItem)
1779	2498	{
1780	2499	System.out.println("Invariants:");
1781		- GraphreeD.theApplet3D.universe.invariants();
	2500	+ Grafreed.grafreeD.universe.invariants();
1782	2501	} else
1783		- if (event.getSource() == memoryItem)
	2502	+ if (source == memoryItem)
1784	2503	{
1785	2504	//System.out.println("Invariants:");
1786	2505	PrintMemory();
1787	2506	} else
1788		- if (event.getSource() == pathItem)
	2507	+ if (source == pathItem)
1789	2508	{
1790	2509	PrintPath();
1791	2510	} else
1792		- if (event.getSource() == analyzeItem)
	2511	+ if (source == analyzeItem)
1793	2512	{
1794	2513	AnalyzeObject();
1795	2514	} else
1796		- if (event.getSource() == dumpItem)
	2515	+ if (source == dumpItem)
1797	2516	{
1798	2517	DumpObject();
1799	2518	} else
1800		- if (event.getSource() == screenfitButton)
	2519	+ if (source == minButton)
1801	2520	{
1802		- //Reload(lastConverter, lastFilename, true);
	2521	+ Minimize();
	2522	+ } else
	2523	+ if (source == maxButton)
	2524	+ {
	2525	+ Maximize();
	2526	+ } else
	2527	+ if (source == fullButton)
	2528	+ {
	2529	+ ToggleFullScreen();
	2530	+ } else
	2531	+ if (source == undoButton)
	2532	+ {
	2533	+ // Go to previous version
	2534	+ //if (!Undo())
	2535	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2536	+ Undo();
	2537	+ } else
	2538	+ if (source == restoreButton)
	2539	+ {
	2540	+ // Restore current version
	2541	+ Restore();
	2542	+ } else
	2543	+ if (source == replaceButton)
	2544	+ {
	2545	+ // Overwrite current version
	2546	+ Replace();
	2547	+ } else
	2548	+ if (source == redoButton)
	2549	+ {
	2550	+ // Go to next version
	2551	+ Redo();
	2552	+ } else
	2553	+ if (source == saveButton)
	2554	+ {
	2555	+ // Save a new version
	2556	+ if (!Save(true))
	2557	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2558	+ } else
	2559	+ if (source == oneStepButton)
	2560	+ {
	2561	+ Globals.ONESTEP = true;
	2562	+ cameraView.repaint();
	2563	+ } else
	2564	+ if (source == screenfitButton)
	2565	+ {
1803	2566	ScreenFit();
1804	2567	} else
1805		- if (event.getSource() == screenfitpointButton)
	2568	+ if (source == screenfitpointButton)
1806	2569	{
1807		- //Reload(lastConverter, lastFilename, true);
1808	2570	ScreenFitPoint();
1809	2571	} else
1810		- if (event.getSource() == snapobjectButton)
	2572	+ if (source == snapobjectButton)
1811	2573	{
1812		- //Reload(lastConverter, lastFilename, true);
1813	2574	SnapObject();
1814	2575	} else
1815	2576	// if (event.getSource() == recompileButton)
..	..	@@ -1818,13 +2579,13 @@
1818	2579	// Recompile();
1819	2580	// refreshContents();
1820	2581	// } else
1821		- if (event.getSource() == gcButton)
	2582	+ if (source == gcButton)
1822	2583	{
1823	2584	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1824	2585	System.gc();
1825	2586	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1826	2587	} else
1827		- if (event.getSource() == editLeafItem)
	2588	+ if (source == editLeafItem)
1828	2589	{
1829	2590	Object3D obj;
1830	2591	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1838,65 +2599,78 @@
1838	2599	}
1839	2600	refreshContents(true);
1840	2601	} else
1841		- if (event.getSource() == openWindowItem)
	2602	+ if (source == openWindowItem)
1842	2603	{
1843	2604	EditSelection(true);
1844	2605	} else
1845		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2606	+ if (source == cutItem \|\| source == clearButton)
1846	2607	{
1847	2608	loadClipboard(true);
1848	2609	} else
1849		- if (event.getSource() == duplicateItem)
	2610	+ if (source == undoItem)
1850	2611	{
1851		- Object3D keep = GraphreeD.clipboard;
	2612	+ Undo();
	2613	+ } else
	2614	+ if (source == redoItem)
	2615	+ {
	2616	+ Redo();
	2617	+ } else
	2618	+ if (source == duplicateItem)
	2619	+ {
	2620	+ Object3D keep = Grafreed.clipboard;
1852	2621	loadClipboard(false);
1853	2622	paste(false);
1854		- GraphreeD.clipboard = keep;
	2623	+ Grafreed.clipboard = keep;
1855	2624	} else
1856		- if (event.getSource() == cloneItem)
	2625	+ if (source == cloneItem)
1857	2626	{
1858	2627	CloneSelection(false);
1859	2628	} else
1860		- if (event.getSource() == cloneSupportItem)
	2629	+ if (source == cloneSupportItem)
1861	2630	{
1862	2631	CloneSelection(true);
1863	2632	} else
1864		- if (event.getSource() == copyItem)
	2633	+ if (source == copyItem)
1865	2634	{
1866	2635	loadClipboard(false);
1867	2636	} else
1868		- if (event.getSource() == pasteItem)
	2637	+ if (source == pasteItem)
1869	2638	{
1870	2639	paste(false);
1871	2640	} else
1872		- if (event.getSource() == pasteLinkItem)
	2641	+ if (source == pasteIntoItem)
1873	2642	{
1874		- pasteInto(false);
	2643	+ pasteInto(true, false);
1875	2644	} else
1876		- if (event.getSource() == pasteCloneItem)
	2645	+ if (source == pasteLinkItem)
1877	2646	{
1878		- pasteInto(true);
	2647	+ pasteInto(false, false);
1879	2648	} else
1880		- if (event.getSource() == pasteExpandItem)
	2649	+ if (source == pasteCloneItem)
	2650	+ {
	2651	+ pasteInto(true, true);
	2652	+ } else
	2653	+ if (source == pasteExpandItem)
1881	2654	{
1882	2655	paste(true);
1883	2656	} else
1884		- if (event.getSource() == synchronizeItem)
	2657	+ if (source == synchronizeItem)
1885	2658	{
1886	2659	Overwrite(Object3D.TRANSFORM);
1887	2660	} else
1888		- if (event.getSource() == overwriteNameItem)
	2661	+ if (source == overwriteNameItem)
1889	2662	{
1890	2663	Overwrite(Object3D.NAME);
1891	2664	} else
1892		- if (event.getSource() == overwriteUVItem)
	2665	+ if (source == overwriteUVItem)
1893	2666	{
1894	2667	Overwrite(Object3D.UV);
1895	2668	} else
1896		- if (event.getSource() == overwriteMatItem)
	2669	+ if (source == overwriteMatItem)
1897	2670	{
	2671	+ /* july 2015
1898	2672	if ((dropAttributes & Object3D.TEXTURE) == 0)
1899		- Overwrite(Object3D.MATERIAL);
	2673	+ Overwrite(Object3D.MATERIAL \| Object3D.COLOR);
1900	2674	else
1901	2675	{
1902	2676	if ((dropAttributes & Object3D.COLOR) == 0 && (dropAttributes & Object3D.MATERIAL) == 0)
..	..	@@ -1908,13 +2682,16 @@
1908	2682	Overwrite(Object3D.MATERIAL \| Object3D.TEXTURE);
1909	2683	}
1910	2684	}
	2685	+ */
	2686	+
	2687	+ Overwrite(dropAttributes);
1911	2688	}
1912		- if (event.getSource() == overwriteGeoItem)
	2689	+ if (source == overwriteGeoItem)
1913	2690	{
1914	2691	Overwrite(Object3D.GEOMETRY);
1915		-// if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2692	+// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
1916	2693	// {
1917		-// Object3D content = GraphreeD.clipboard.get(0);
	2694	+// Object3D content = GrafreeD.clipboard.get(0);
1918	2695	//
1919	2696	// if (content instanceof cGroup && ((cGroup)content).transientlink )
1920	2697	// content = ((cGroup)content).get(0);
..	..	@@ -1926,7 +2703,7 @@
1926	2703	// refreshContents();
1927	2704	// }
1928	2705	} else
1929		- if (event.getSource() == generateMeshItem)
	2706	+ if (source == generateMeshItem)
1930	2707	{
1931	2708	//if (group.selection.size() == 1)
1932	2709	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1937,7 +2714,7 @@
1937	2714	ResetModel();
1938	2715	refreshContents();
1939	2716	} else
1940		- if (event.getSource() == extractGeometriesItem)
	2717	+ if (source == extractGeometriesItem)
1941	2718	{
1942	2719	boolean one = false;
1943	2720
..	..	@@ -1964,7 +2741,7 @@
1964	2741	ResetModel();
1965	2742	refreshContents();
1966	2743	} else
1967		- if (event.getSource() == cloneGeometriesItem)
	2744	+ if (source == cloneGeometriesItem)
1968	2745	{
1969	2746	boolean one = false;
1970	2747
..	..	@@ -1990,32 +2767,37 @@
1990	2767	ResetModel();
1991	2768	refreshContents();
1992	2769	} else
1993		- if (event.getSource() == shareGeometriesItem)
	2770	+ if (source == shareGeometriesItem)
1994	2771	{
1995	2772	boolean one = false;
1996	2773
1997	2774	if (group.selection.size() == 1)
1998	2775	one = true;
1999	2776
	2777	+ Object3D merge = null;
	2778	+
2000	2779	Object3D content = new cGroup();
2001	2780
2002	2781	for (int i=0; i<group.selection.size(); i++)
2003	2782	{
2004		- Object3D sel = new Merge(group.selection.get(i));
	2783	+ merge = new Merge(group.selection.get(i));
2005	2784
2006	2785	if (one)
2007		- makeSomething(sel, false);
	2786	+ makeSomething(merge, false);
2008	2787	else
2009		- content.addChild(sel);
	2788	+ content.addChild(merge);
2010	2789	}
2011	2790
2012	2791	if (!one)
2013		- makeSomething(content, false);
2014		-
2015		- ResetModel();
2016		- refreshContents();
	2792	+ makeSomething(content, true);
	2793	+ else
	2794	+ {
	2795	+ ResetModel();
	2796	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	2797	+ refreshContents();
	2798	+ }
2017	2799	} else
2018		- if (event.getSource() == mergeGeometriesItem)
	2800	+ if (source == mergeGeometriesItem)
2019	2801	{
2020	2802	boolean one = false;
2021	2803
..	..	@@ -2045,11 +2827,11 @@
2045	2827	ResetModel();
2046	2828	refreshContents();
2047	2829	} else
2048		- if (event.getSource() == linkverticesItem)
	2830	+ if (source == linkverticesItem)
2049	2831	{
2050		-// if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	2832	+// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2051	2833	// {
2052		-// Object3D content = GraphreeD.clipboard.get(0);
	2834	+// Object3D content = GrafreeD.clipboard.get(0);
2053	2835	//
2054	2836	// if (content instanceof cGroup && ((cGroup)content).transientlink )
2055	2837	// content = ((cGroup)content).get(0);
..	..	@@ -2058,39 +2840,48 @@
2058	2840	// group.selection.get(0).setMasterThis(content); // should be identity
2059	2841	// refreshContents();
2060	2842	// }
2061		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2843	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2062	2844	{
2063		- Object3D content = GraphreeD.clipboard.get(0);
	2845	+ Object3D content = Grafreed.clipboard.get(0);
2064	2846
2065	2847	if (content instanceof cGroup && ((cGroup)content).transientlink )
2066	2848	content = ((cGroup)content).get(0);
2067	2849
2068		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	2850	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2069	2851	for (int i=0; i<group.selection.size(); i++)
2070	2852	{
2071		- boolean random = CameraPane.RANDOM;
2072		- CameraPane.RANDOM = false; // parse all random nodes
	2853	+ boolean random = CameraPane.SWITCH;
	2854	+ CameraPane.SWITCH = false; // parse all random nodes
2073	2855	group.selection.get(i).linkVerticesThis(content);
2074	2856	// group.selection.get(i).setMasterThis(content); // should be identity
2075		- CameraPane.RANDOM = random;
	2857	+ CameraPane.SWITCH = random;
2076	2858	}
2077		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	2859	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2078	2860	refreshContents();
2079	2861	}
2080	2862	} else
2081		- if (event.getSource() == resetsupportItem)
	2863	+ if (source == resetsupportItem)
2082	2864	{
2083	2865	for (int i=0; i<group.selection.size(); i++)
2084	2866	{
2085		- boolean random = CameraPane.RANDOM;
2086		- CameraPane.RANDOM = false; // parse all random nodes
	2867	+ boolean random = CameraPane.SWITCH;
	2868	+ CameraPane.SWITCH = false; // parse all random nodes
2087	2869	group.selection.get(i).linkVerticesThis(null);
2088		- CameraPane.RANDOM = random;
	2870	+ CameraPane.SWITCH = random;
2089	2871	}
2090	2872
2091	2873	refreshContents();
2092	2874	} else
2093		- if (event.getSource() == resetreferencesItem)
	2875	+ if (source == relinkverticesItem)
	2876	+ {
	2877	+ boolean random = CameraPane.SWITCH;
	2878	+ CameraPane.SWITCH = false; // parse all random nodes
	2879	+ group.selection.RelinkToSupport();
	2880	+ CameraPane.SWITCH = random;
	2881	+
	2882	+ refreshContents();
	2883	+ } else
	2884	+ if (source == resetreferencesItem)
2094	2885	{
2095	2886	for (int i=0; i<group.selection.size(); i++)
2096	2887	{
..	..	@@ -2099,11 +2890,11 @@
2099	2890
2100	2891	refreshContents();
2101	2892	} else
2102		- if (event.getSource() == setMasterItem)
	2893	+ if (source == setMasterItem)
2103	2894	{
2104		- if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	2895	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2105	2896	{
2106		- Object3D content = GraphreeD.clipboard.get(0);
	2897	+ Object3D content = Grafreed.clipboard.get(0);
2107	2898
2108	2899	if (content instanceof cGroup && ((cGroup)content).transientlink )
2109	2900	content = ((cGroup)content).get(0);
..	..	@@ -2112,13 +2903,13 @@
2112	2903	refreshContents();
2113	2904	}
2114	2905	} else
2115		- if (event.getSource() == poseMeshItem)
	2906	+ if (source == poseMeshItem)
2116	2907	{
2117	2908	if (group.selection.size() == 1)
2118	2909	{
2119		- if (GraphreeD.clipboard.size() == 1)
	2910	+ if (Grafreed.clipboard.size() == 1)
2120	2911	{
2121		- Object3D content = GraphreeD.clipboard.get(0);
	2912	+ Object3D content = Grafreed.clipboard.get(0);
2122	2913
2123	2914	if (content instanceof cGroup && ((cGroup)content).transientlink )
2124	2915	content = ((cGroup)content).get(0);
..	..	@@ -2131,19 +2922,19 @@
2131	2922	}
2132	2923
2133	2924	} else
2134		- if (event.getSource() == revertMeshItem)
	2925	+ if (source == revertMeshItem)
2135	2926	{
2136	2927	RevertMeshes();
2137	2928	} else
2138		- if (event.getSource() == resetMeshItem)
	2929	+ if (source == resetAllItem)
2139	2930	{
2140	2931	ResetAll();
2141	2932	} else
2142		- if (event.getSource() == stepAllItem)
	2933	+ if (source == stepAllItem)
2143	2934	{
2144	2935	StepAll();
2145	2936	} else
2146		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2937	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2147	2938	{
2148	2939	//int indices[] = jList.getSelectedIndices();
2149	2940	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2151,42 +2942,46 @@
2151	2942
2152	2943	ClearSelection(false);
2153	2944	} else
2154		- if (event.getSource() == clearAllItem)
	2945	+ if (source == clearAllItem)
2155	2946	{
2156	2947	ClearSelection(true);
2157	2948	} else
2158		- if (event.getSource() == grabItem)
	2949	+ if (source == grabItem \|\| source == groupButton)
2159	2950	{
2160		- group(new cGroup(), true);
	2951	+ group(new cGroup(), false); // true);
2161	2952	} else
2162		- if (event.getSource() == frontItem)
	2953	+ if (source == hideItem)
	2954	+ {
	2955	+ group(new HiddenObject());
	2956	+ } else
	2957	+ if (source == frontItem)
2163	2958	{
2164	2959	front();
2165	2960	} else
2166		- if (event.getSource() == backItem)
	2961	+ if (source == backItem)
2167	2962	{
2168	2963	back();
2169	2964	} else
2170		- if (event.getSource() == cameraItem)
	2965	+ if (source == cameraItem)
2171	2966	{
2172	2967	makeSomething(new Camera());
2173	2968	} else
2174		- if (event.getSource() == compositeItem)
	2969	+ if (source == compositeItem \|\| source == compositeButton)
2175	2970	{
2176	2971	group(new Composite());
2177	2972	} else
2178		- if (event.getSource() == randomItem)
	2973	+ if (source == switchItem \|\| source == switchButton)
2179	2974	{
2180	2975	RandomNode random = new RandomNode();
2181	2976	group(random);
2182	2977	if (random.size() > 0)
2183		- random.name = random.get(0).name + "Rnd";
	2978	+ random.name = random.get(0).name + "Switch";
2184	2979	} else
2185		- if (event.getSource() == physicsItem)
	2980	+ if (source == physicsItem)
2186	2981	{
2187	2982	group(new PhysicsNode());
2188	2983	} else
2189		- if (event.getSource() == frameselectorItem)
	2984	+ if (source == frameselectorItem)
2190	2985	{
2191	2986	for (int i=0; i<group.selection.size(); i++)
2192	2987	{
..	..	@@ -2198,7 +2993,7 @@
2198	2993	ResetModel();
2199	2994	refreshContents();
2200	2995	} else
2201		- if (event.getSource() == switchGeoItem)
	2996	+ if (source == switchGeoItem)
2202	2997	{
2203	2998	for (int i=0; i<group.selection.size(); i++)
2204	2999	{
..	..	@@ -2210,7 +3005,7 @@
2210	3005	ResetModel();
2211	3006	refreshContents();
2212	3007	} else
2213		- if (event.getSource() == switchTransfoItem)
	3008	+ if (source == switchTransfoItem)
2214	3009	{
2215	3010	for (int i=0; i<group.selection.size(); i++)
2216	3011	{
..	..	@@ -2222,7 +3017,7 @@
2222	3017	ResetModel();
2223	3018	refreshContents();
2224	3019	} else
2225		- if (event.getSource() == morphItem)
	3020	+ if (source == morphItem)
2226	3021	{
2227	3022	for (int i=0; i<group.selection.size(); i++)
2228	3023	{
..	..	@@ -2234,7 +3029,7 @@
2234	3029	ResetModel();
2235	3030	refreshContents();
2236	3031	} else
2237		- if (event.getSource() == scriptNodeItem)
	3032	+ if (source == scriptNodeItem)
2238	3033	{
2239	3034	boolean atleastone = false;
2240	3035
..	..	@@ -2273,195 +3068,252 @@
2273	3068	}
2274	3069	}
2275	3070	} else
2276		- if (event.getSource() == linkerItem)
	3071	+ if (source == linkerItem)
2277	3072	{
2278	3073	group(new cLinker());
2279	3074	} else
2280		- if (event.getSource() == textureItem)
	3075	+ if (source == textureItem \|\| source == textureButton)
2281	3076	{
2282	3077	group(new TextureNode());
2283	3078	} else
2284		- if (event.getSource() == shadowXItem)
	3079	+ if (source == billboardItem)
	3080	+ {
	3081	+ group(new BillboardNode());
	3082	+ } else
	3083	+ if (source == shadowXItem)
2285	3084	{
2286	3085	CastShadow(0);
2287	3086	} else
2288		- if (event.getSource() == shadowYItem)
	3087	+ if (source == shadowYItem)
2289	3088	{
2290	3089	CastShadow(1);
2291	3090	} else
2292		- if (event.getSource() == shadowZItem)
	3091	+ if (source == shadowZItem)
2293	3092	{
2294	3093	CastShadow(2);
2295	3094	} else
2296		- if (event.getSource() == ungroupItem)
	3095	+ if (source == ungroupItem \|\| source == ungroupButton)
2297	3096	{
2298		- ungroup();
	3097	+ boolean hasRoot = false;
	3098	+
	3099	+ for (int i=0; i<group.selection.size(); i++)
	3100	+ {
	3101	+ if (group.selection.get(i) == group)
	3102	+ {
	3103	+ hasRoot = true;
	3104	+ break;
	3105	+ }
	3106	+ }
	3107	+
	3108	+ if (!hasRoot)
	3109	+ {
	3110	+ for (int i=0; i<group.selection.size(); i++)
	3111	+ {
	3112	+ Ungroup(group.selection.get(i));
	3113	+ }
	3114	+
	3115	+ ClearSelection(false);
	3116	+
	3117	+ refreshContents();
	3118	+ }
2299	3119	} else
2300		- if (event.getSource() == genUVItem)
	3120	+ if (source == genUVItem)
2301	3121	{
2302	3122	GenUV();
2303	3123	} else
2304		- if (event.getSource() == genNormalsCADItem)
	3124	+ if (source == genNormalsCADItem)
2305	3125	{
2306	3126	GenNormals(true);
2307	3127	} else
2308		- if (event.getSource() == genNormalsORGANItem)
	3128	+ if (source == genNormalsMESHItem)
	3129	+ {
	3130	+ GenNormalsMESH();
	3131	+ } else
	3132	+ if (source == genNormalsORGANItem)
2309	3133	{
2310	3134	GenNormals(false);
2311	3135	} else
2312		- if (event.getSource() == stripifyItem)
	3136	+ if (source == genNormalsMINEItem)
	3137	+ {
	3138	+ GenNormalsMINE();
	3139	+ } else
	3140	+ if (source == stripifyItem)
2313	3141	{
2314	3142	Stripify();
2315	3143	} else
2316		- if (event.getSource() == unstripifyItem)
	3144	+ if (source == unstripifyItem)
2317	3145	{
2318	3146	Unstripify();
2319	3147	} else
2320		- if (event.getSource() == trimItem)
	3148	+ if (source == trimItem)
2321	3149	{
2322	3150	Trim();
2323	3151	} else
2324		- if (event.getSource() == untrimItem)
	3152	+ if (source == untrimItem)
2325	3153	{
2326	3154	Untrim();
2327	3155	} else
2328		- if (event.getSource() == clearColorsItem)
	3156	+ if (source == clearColorsItem)
2329	3157	{
2330	3158	ClearColors();
2331	3159	} else
2332		- if (event.getSource() == clearMaterialsItem)
	3160	+ if (source == clearMaterialsItem)
2333	3161	{
2334	3162	ClearMaterials();
2335	3163	} else
2336		- if (event.getSource() == liveleavesItem)
	3164	+ if (source == liveleavesItem)
2337	3165	{
2338	3166	LiveLeaves(true);
2339	3167	} else
2340		- if (event.getSource() == unliveleavesItem)
	3168	+ if (source == unliveleavesItem)
2341	3169	{
2342	3170	LiveLeaves(false);
2343	3171	} else
2344		- if (event.getSource() == supportleavesItem)
	3172	+ if (source == supportleavesItem)
2345	3173	{
2346	3174	SupportLeaves(true);
2347	3175	} else
2348		- if (event.getSource() == unsupportleavesItem)
	3176	+ if (source == unsupportleavesItem)
2349	3177	{
2350	3178	SupportLeaves(false);
2351	3179	} else
2352		- if (event.getSource() == hideleavesItem)
	3180	+ if (source == hideleavesItem)
2353	3181	{
2354	3182	HideLeaves(true);
2355	3183	} else
2356		- if (event.getSource() == showleavesItem)
	3184	+ if (source == showleavesItem)
2357	3185	{
2358	3186	HideLeaves(false);
2359	3187	} else
2360		- if (event.getSource() == markleavesItem)
	3188	+ if (source == markleavesItem)
2361	3189	{
2362	3190	MarkLeaves(true);
2363	3191	} else
2364		- if (event.getSource() == unmarkleavesItem)
	3192	+ if (source == unmarkleavesItem)
2365	3193	{
2366	3194	MarkLeaves(false);
2367	3195	} else
2368		- if (event.getSource() == flipVItem)
	3196	+ if (source == rewindleavesItem)
	3197	+ {
	3198	+ RewindLeaves(true);
	3199	+ } else
	3200	+ if (source == unrewindleavesItem)
	3201	+ {
	3202	+ RewindLeaves(false);
	3203	+ } else
	3204	+ if (source == randomleavesItem)
	3205	+ {
	3206	+ RandomLeaves(true);
	3207	+ } else
	3208	+ if (source == unrandomleavesItem)
	3209	+ {
	3210	+ RandomLeaves(false);
	3211	+ } else
	3212	+ if (source == flipVItem)
2369	3213	{
2370	3214	FlipV(true);
2371	3215	} else
2372		- if (event.getSource() == unflipVItem)
	3216	+ if (source == unflipVItem)
2373	3217	{
2374	3218	FlipV(false);
2375	3219	} else
2376		- if (event.getSource() == lowTexturesItem)
	3220	+ if (source == lowTexturesItem)
2377	3221	{
2378	3222	SetTexRes(0);
2379	3223	} else
2380		- if (event.getSource() == normalTexturesItem)
	3224	+ if (source == normalTexturesItem)
2381	3225	{
2382	3226	SetTexRes(1);
2383	3227	} else
2384		- if (event.getSource() == highTexturesItem)
	3228	+ if (source == highTexturesItem)
2385	3229	{
2386	3230	SetTexRes(2);
2387	3231	} else
2388		- if (event.getSource() == veryhighTexturesItem)
	3232	+ if (source == veryhighTexturesItem)
2389	3233	{
2390	3234	SetTexRes(3);
2391	3235	} else
2392		- if (event.getSource() == maxTexturesItem)
	3236	+ if (source == maxTexturesItem)
2393	3237	{
2394	3238	SetTexRes(4);
2395	3239	} else
2396		- if (event.getSource() == panoTexturesItem)
	3240	+ if (source == panoTexturesItem)
2397	3241	{
2398	3242	SetTexRes(5);
2399	3243	} else
2400		- if (event.getSource() == reverseNormalsItem)
	3244	+ if (source == reverseNormalsItem)
2401	3245	{
2402	3246	ReverseNormals();
2403	3247	} else
2404		- if (event.getSource() == parseverticesItem)
	3248	+ if (source == parseverticesItem)
2405	3249	{
2406	3250	ParseVertices();
2407	3251	} else
2408		- if (event.getSource() == textureFieldItem)
	3252	+ if (source == textureFieldItem)
2409	3253	{
2410	3254	TextureVertices();
2411	3255	} else
2412		- if (event.getSource() == alignItem)
	3256	+ if (source == alignItem)
2413	3257	{
2414	3258	Align();
2415	3259	} else
2416		- if (event.getSource() == mirrorItem)
	3260	+ if (source == mirrorItem)
2417	3261	{
2418	3262	MirrorPoses();
2419	3263	} else
2420		- if (event.getSource() == reduceMorphItem)
	3264	+ if (source == reduceMorphItem)
2421	3265	{
2422	3266	MeshReduction(false);
2423	3267	} else
2424		- if (event.getSource() == reduce34MorphItem)
	3268	+ if (source == reduce34MorphItem)
2425	3269	{
2426	3270	MeshReduction(true);
2427	3271	} else
2428		- if (event.getSource() == reverseTrianglesItem)
	3272	+ if (source == reverseTrianglesItem)
2429	3273	{
2430	3274	ReverseTriangles();
2431	3275	} else
2432		- if (event.getSource() == reduceMeshItem)
	3276	+ if (source == reduceMeshItem)
2433	3277	{
2434	3278	ReduceMesh(false);
2435	3279	} else
2436		- if (event.getSource() == reduce34MeshItem)
	3280	+ if (source == reduce34MeshItem)
2437	3281	{
2438	3282	ReduceMesh(true);
2439	3283	} else
2440		- if (event.getSource() == increaseMeshItem)
	3284	+ if (source == increaseMeshItem)
2441	3285	{
2442	3286	IncreaseMesh();
2443	3287	} else
2444		- if (event.getSource() == clipMeshItem)
	3288	+ if (source == clipMeshItem)
2445	3289	{
2446	3290	ClipMesh();
2447	3291	} else
2448		- if (event.getSource() == smoothMeshItem)
	3292	+ if (source == smoothMeshItem)
2449	3293	{
2450	3294	SmoothMesh();
2451	3295	} else
2452		- if (event.getSource() == transformgeometryItem)
	3296	+ if (source == transformGeometryItem)
2453	3297	{
2454	3298	TransformGeometry();
2455	3299	} else
2456		- if (event.getSource() == resetTransformItem)
	3300	+ if (source == transformChildrenItem)
	3301	+ {
	3302	+ TransformChildren();
	3303	+ } else
	3304	+ if (source == resetTransformItem)
2457	3305	{
2458	3306	ResetTransform();
2459	3307	} else
2460		- if (event.getSource() == resetCentroidItem)
	3308	+ if (source == resetCentroidItem)
2461	3309	{
2462		- ResetCentroid();
	3310	+ ResetCentroid(true);
2463	3311	} else
2464		- if (event.getSource() == resetParentItem)
	3312	+ if (source == resetCentroidXZItem)
	3313	+ {
	3314	+ ResetCentroid(false);
	3315	+ } else
	3316	+ if (source == resetParentItem)
2465	3317	{
2466	3318	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2467	3319	{
..	..	@@ -2471,7 +3323,7 @@
2471	3323
2472	3324	refreshContents();
2473	3325	} else
2474		- if (event.getSource() == repairParentItem)
	3326	+ if (source == repairParentItem)
2475	3327	{
2476	3328	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2477	3329	{
..	..	@@ -2485,7 +3337,21 @@
2485	3337
2486	3338	refreshContents();
2487	3339	} else
2488		- if (event.getSource() == sortbysizeItem)
	3340	+ if (source == repairShadowItem)
	3341	+ {
	3342	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3343	+ {
	3344	+ Object3D obj = (Object3D)e.nextElement();
	3345	+ obj.RepairShadow();
	3346	+// for (int i=0; i<obj.size(); i++)
	3347	+// {
	3348	+// obj.get(i).parent = obj;
	3349	+// }
	3350	+ }
	3351	+
	3352	+ refreshContents();
	3353	+ } else
	3354	+ if (source == sortbysizeItem)
2489	3355	{
2490	3356	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2491	3357	{
..	..	@@ -2497,7 +3363,7 @@
2497	3363	ResetModel();
2498	3364	refreshContents();
2499	3365	} else
2500		- if (event.getSource() == sortbynameItem)
	3366	+ if (source == sortbynameItem)
2501	3367	{
2502	3368	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2503	3369	{
..	..	@@ -2509,7 +3375,7 @@
2509	3375	ResetModel();
2510	3376	refreshContents();
2511	3377	} else
2512		- if (event.getSource() == attachPigmentItem)
	3378	+ if (source == attachPigmentItem)
2513	3379	{
2514	3380	String texture = GetFile("Attach pigment");
2515	3381	Object3D obj;
..	..	@@ -2521,7 +3387,7 @@
2521	3387
2522	3388	refreshContents();
2523	3389	} else
2524		- if (event.getSource() == detachPigmentItem)
	3390	+ if (source == detachPigmentItem)
2525	3391	{
2526	3392	Object3D obj;
2527	3393	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2532,7 +3398,7 @@
2532	3398
2533	3399	refreshContents();
2534	3400	} else
2535		- if (event.getSource() == attachBumpItem)
	3401	+ if (source == attachBumpItem)
2536	3402	{
2537	3403	String texture = GetFile("Attach bump");
2538	3404	Object3D obj;
..	..	@@ -2544,18 +3410,18 @@
2544	3410
2545	3411	refreshContents();
2546	3412	} else
2547		- if (event.getSource() == detachBumpItem)
	3413	+ if (source == detachBumpItem)
2548	3414	{
2549	3415	Object3D obj;
2550	3416	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2551	3417	{
2552	3418	obj = (Object3D)e.nextElement();
2553		- obj.SetBumpTexture(null);
	3419	+ obj.ResetBumpTexture();
2554	3420	}
2555	3421
2556	3422	refreshContents();
2557	3423	} else
2558		- if (event.getSource() == pigmentBumpItem)
	3424	+ if (source == pigmentBumpItem)
2559	3425	{
2560	3426	Object3D obj;
2561	3427	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2566,158 +3432,262 @@
2566	3432
2567	3433	refreshContents();
2568	3434	} else
2569		- if (event.getSource() == flashSelectionButton)
	3435	+ if (source == embedTexturesItem)
	3436	+ {
	3437	+ Object3D obj;
	3438	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3439	+ {
	3440	+ obj = (Object3D)e.nextElement();
	3441	+ obj.EmbedTextures(true);
	3442	+ }
	3443	+
	3444	+ refreshContents();
	3445	+ } else
	3446	+ if (source == deEmbedTexturesItem)
	3447	+ {
	3448	+ Object3D obj;
	3449	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3450	+ {
	3451	+ obj = (Object3D)e.nextElement();
	3452	+ obj.EmbedTextures(false);
	3453	+ }
	3454	+
	3455	+ CameraPane.texturepigment.clear();
	3456	+ CameraPane.texturebump.clear();
	3457	+
	3458	+ refreshContents();
	3459	+ } else
	3460	+ if (source == flashSelectionButton)
2570	3461	{
2571	3462	CameraPane.flash = true;
2572	3463	refreshContents();
2573	3464	} else
2574		- if (event.getSource() == oneButton)
	3465	+ if (source == oneButton)
2575	3466	{
2576	3467	} else
2577		- if (event.getSource() == twoButton)
	3468	+ if (source == twoButton)
2578	3469	{
2579	3470	radio.layout = twoButton;
	3471	+
	3472	+ if (CameraPane.FULLSCREEN)
	3473	+ fullscreenLayout = radio.layout;
	3474	+
2580	3475	// bug
2581	3476	//gridPanel.setDividerLocation(1.0);
2582	3477	//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();
	3478	+// bigThree.remove(scenePanel);
	3479	+// bigThree.remove(centralPanel);
	3480	+// bigThree.remove(XYZPanel);
	3481	+// aWindowConstraints.gridx = 0;
	3482	+// aWindowConstraints.gridy = 0;
	3483	+// aWindowConstraints.gridwidth = 1;
	3484	+// // aConstraints.gridheight = 3;
	3485	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3486	+// aWindowConstraints.weightx = 0;
	3487	+// aWindowConstraints.weighty = 1;
	3488	+// //bigThree.add(jtp, aWindowConstraints);
	3489	+// aWindowConstraints.weightx = 1;
	3490	+// aWindowConstraints.gridwidth = 3;
	3491	+// // aConstraints.gridheight = 3;
	3492	+// aWindowConstraints.gridx = 1;
	3493	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3494	+// bigThree.add(centralPanel, aWindowConstraints);
	3495	+// aWindowConstraints.weightx = 0;
	3496	+// aWindowConstraints.gridx = 4;
	3497	+// aWindowConstraints.gridwidth = 1;
	3498	+// // aConstraints.gridheight = 3;
	3499	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3500	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3501	+// scenePanel.setVisible(false);
	3502	+// centralPanel.setVisible(true);
	3503	+// XYZPanel.setVisible(false);
	3504	+ bigThree.ClearUI();
	3505	+ bigThree.add(centralPanel);
	3506	+ bigThree.FlushUI();
	3507	+
	3508	+ cameraView.requestFocusInWindow();
	3509	+
	3510	+// refreshContents(true);
	3511	+//
	3512	+// try
	3513	+// {
	3514	+// java.awt.Robot bot = new java.awt.Robot();
	3515	+// int mask = InputEvent.BUTTON1_MASK;
	3516	+// bot.mouseMove(100, 100);
	3517	+// bot.mousePress(mask);
	3518	+// bot.mouseRelease(mask);
	3519	+// }
	3520	+// catch (Exception e)
	3521	+// {
	3522	+//
	3523	+// }
	3524	+
2607	3525	} else
2608		- if (event.getSource() == threeButton)
	3526	+ if (source == threeButton)
2609	3527	{
2610	3528	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();
	3529	+
	3530	+ if (CameraPane.FULLSCREEN)
	3531	+ fullscreenLayout = radio.layout;
	3532	+
	3533	+// bigThree.remove(scenePanel);
	3534	+// bigThree.remove(centralPanel);
	3535	+// bigThree.remove(XYZPanel);
	3536	+// aWindowConstraints.gridx = 0;
	3537	+// aWindowConstraints.gridy = 0;
	3538	+// aWindowConstraints.gridwidth = 1;
	3539	+// // aConstraints.gridheight = 3;
	3540	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3541	+// aWindowConstraints.weightx = 0;
	3542	+// aWindowConstraints.weighty = 1;
	3543	+// //bigThree.add(jtp, aWindowConstraints);
	3544	+// aWindowConstraints.weightx = 1;
	3545	+// aWindowConstraints.gridwidth = 3;
	3546	+// // aConstraints.gridheight = 3;
	3547	+// aWindowConstraints.gridx = 1;
	3548	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3549	+// bigThree.add(centralPanel, aWindowConstraints);
	3550	+// aWindowConstraints.weightx = 0;
	3551	+// aWindowConstraints.gridx = 4;
	3552	+// aWindowConstraints.gridwidth = 1;
	3553	+// // aConstraints.gridheight = 3;
	3554	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	3555	+// bigThree.add(XYZPanel, aWindowConstraints);
	3556	+// bigThree.validate();
	3557	+// scenePanel.setVisible(false);
	3558	+// centralPanel.setVisible(true);
	3559	+// XYZPanel.setVisible(true);
	3560	+ bigThree.ClearUI();
	3561	+ bigThree.add(scenePanel);
	3562	+ bigThree.add(centralPanel);
	3563	+ bigThree.FlushUI();
	3564	+
	3565	+ cameraView.requestFocusInWindow();
2635	3566	} else
2636		- if (event.getSource() == fourButton)
	3567	+ if (source == fourButton)
2637	3568	{
2638	3569	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();
	3570	+
	3571	+ if (CameraPane.FULLSCREEN)
	3572	+ fullscreenLayout = radio.layout;
	3573	+
	3574	+// bigThree.remove(scenePanel);
	3575	+// bigThree.remove(centralPanel);
	3576	+// bigThree.remove(XYZPanel);
	3577	+// aWindowConstraints.gridx = 0;
	3578	+// aWindowConstraints.gridy = 0;
	3579	+// aWindowConstraints.gridwidth = 1;
	3580	+// // aWindowConstraints.gridheight = 3;
	3581	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3582	+// aWindowConstraints.weightx = 1;
	3583	+// aWindowConstraints.weighty = 1;
	3584	+// bigThree.add(scenePanel, aWindowConstraints);
	3585	+// aWindowConstraints.weightx = 1;
	3586	+// aWindowConstraints.gridwidth = 3;
	3587	+// // aConstraints.gridheight = 3;
	3588	+// aWindowConstraints.gridx = 1;
	3589	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3590	+// //bigThree.add(cameraPanel, aWindowConstraints);
	3591	+// aWindowConstraints.weightx = 0;
	3592	+// aWindowConstraints.gridx = 4;
	3593	+// aWindowConstraints.gridwidth = 1;
	3594	+// // aWindowConstraints.gridheight = 3;
	3595	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3596	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3597	+// bigThree.validate();
	3598	+// scenePanel.setVisible(true);
	3599	+// centralPanel.setVisible(false);
	3600	+// XYZPanel.setVisible(false);
	3601	+ bigThree.ClearUI();
	3602	+ bigThree.add(scenePanel);
	3603	+ bigThree.FlushUI();
	3604	+
	3605	+ cameraView.requestFocusInWindow();
2663	3606	} else
2664		- if (event.getSource() == sixButton)
	3607	+ if (source == sixButton)
2665	3608	{
2666	3609	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();
	3610	+
	3611	+ if (CameraPane.FULLSCREEN)
	3612	+ fullscreenLayout = radio.layout;
	3613	+
	3614	+// bigThree.remove(scenePanel);
	3615	+// bigThree.remove(centralPanel);
	3616	+// bigThree.remove(XYZPanel);
	3617	+// aWindowConstraints.gridx = 0;
	3618	+// aWindowConstraints.gridy = 0;
	3619	+// aWindowConstraints.gridwidth = 1;
	3620	+// // aConstraints.gridheight = 3;
	3621	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3622	+// aWindowConstraints.weightx = 0;
	3623	+// aWindowConstraints.weighty = 1;
	3624	+// bigThree.add(scenePanel, aWindowConstraints);
	3625	+// aWindowConstraints.weightx = 1;
	3626	+// aWindowConstraints.gridwidth = 3;
	3627	+// // aWindowConstraints.gridheight = 3;
	3628	+// aWindowConstraints.gridx = 1;
	3629	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3630	+// bigThree.add(centralPanel, aWindowConstraints);
	3631	+// aWindowConstraints.weightx = 0;
	3632	+// aWindowConstraints.gridx = 4;
	3633	+// aWindowConstraints.gridwidth = 1;
	3634	+// // aWindowConstraints.gridheight = 3;
	3635	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3636	+// //bigThree.add(XYZPanel, aConstraints);
	3637	+// bigThree.validate();
	3638	+// scenePanel.setVisible(true);
	3639	+// centralPanel.setVisible(true);
	3640	+// XYZPanel.setVisible(false);
	3641	+ bigThree.ClearUI();
	3642	+ bigThree.add(centralPanel);
	3643	+ bigThree.add(scenePanel);
	3644	+ bigThree.FlushUI();
	3645	+
	3646	+ cameraView.requestFocusInWindow();
2691	3647	} else
2692		- if (event.getSource() == sevenButton)
	3648	+ if (source == sevenButton)
2693	3649	{
2694	3650	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();
	3651	+
	3652	+ if (CameraPane.FULLSCREEN)
	3653	+ fullscreenLayout = radio.layout;
	3654	+
	3655	+// bigThree.remove(scenePanel);
	3656	+// bigThree.remove(centralPanel);
	3657	+// bigThree.remove(XYZPanel);
	3658	+// aWindowConstraints.gridx = 0;
	3659	+// aWindowConstraints.gridy = 0;
	3660	+// aWindowConstraints.gridwidth = 1;
	3661	+// // aWindowConstraints.gridheight = 3;
	3662	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3663	+// aWindowConstraints.weightx = 0;
	3664	+// aWindowConstraints.weighty = 1;
	3665	+// bigThree.add(scenePanel, aWindowConstraints);
	3666	+// aWindowConstraints.weightx = 1;
	3667	+// aWindowConstraints.gridwidth = 3;
	3668	+// // aWindowConstraints.gridheight = 3;
	3669	+// aWindowConstraints.gridx = 1;
	3670	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3671	+// bigThree.add(centralPanel, aWindowConstraints);
	3672	+// aWindowConstraints.weightx = 0;
	3673	+// aWindowConstraints.gridx = 4;
	3674	+// aWindowConstraints.gridwidth = 1;
	3675	+// // aConstraints.gridheight = 3;
	3676	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3677	+// bigThree.add(XYZPanel, aWindowConstraints);
	3678	+// bigThree.validate();
	3679	+// scenePanel.setVisible(true);
	3680	+// centralPanel.setVisible(true);
	3681	+// XYZPanel.setVisible(true);
	3682	+ bigThree.ClearUI();
	3683	+ bigThree.add(scenePanel);
	3684	+ bigThree.add(centralPanel);
	3685	+ bigThree.add(XYZPanel);
	3686	+ bigThree.FlushUI();
	3687	+
	3688	+ cameraView.requestFocusInWindow();
2719	3689	} else
2720		- if (event.getSource() == rootButton)
	3690	+ if (source == rootButton)
2721	3691	{
2722	3692	Object3D obj;
2723	3693	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2727,66 +3697,84 @@
2727	3697	EditObject(obj);
2728	3698	}
2729	3699
	3700	+ cameraView.requestFocusInWindow();
2730	3701	refreshContents(true);
2731	3702	} else
2732		- if (event.getSource() == closeButton)
	3703	+ if (source == closeButton)
2733	3704	{
2734	3705	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2735	3706	cRadio ab;
2736	3707	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2737	3708	{
2738	3709	ab = (cRadio)e.nextElement();
2739		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3710	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2740	3711	{
	3712	+ // Patch to avoid bug with transparency.
	3713	+ if (!ab.hadMaterial)
	3714	+ {
	3715	+ ab.object.material = null;
	3716	+ }
	3717	+
2741	3718	buttonGroup.remove(ab);
2742	3719	radioPanel.remove(ab);
2743	3720
2744		- ab.GetObject().editWindow = null;
	3721	+ //ab.GetObject().editWindow = null;
	3722	+ ab.GetObject().manipWindow = null;
2745	3723	// ab.GetObject().objectUI = null; // ?????????
2746	3724
2747	3725	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2748	3726	break;
2749	3727	}
2750	3728	}
	3729	+
	3730	+ cameraView.requestFocusInWindow();
2751	3731	refreshContents(true);
2752	3732	} else
2753		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3733	+ if (source == editItem \|\| source == editButton)
2754	3734	{
	3735	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3736	+ {
	3737	+ Object3D child = (Object3D)e.nextElement();
	3738	+ child.pinned = true;
	3739	+ }
	3740	+
2755	3741	EditSelection(false);
2756	3742	} else
2757		- if (event.getSource() == uneditButton)
	3743	+ if (source == uneditButton)
2758	3744	{
2759	3745	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2760	3746	{
2761	3747	Object3D child = (Object3D)e.nextElement();
2762	3748	if(child.editWindow != null)
2763	3749	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3750	+ child.pinned = false;
2764	3751	child.CloseUI();
2765	3752	listUI.remove(child);
2766	3753
2767		- child.editWindow = null; // ???????????
	3754	+ //child.editWindow = null; // ???????????
2768	3755	}
2769		- objEditor.ctrlPanel.revalidate();
	3756	+ objEditor.ctrlPanel.FlushUI();
2770	3757	//objEditor.jTree.clearSelection();
2771	3758	//objEditor.ResetSliders();
2772	3759	refreshContents(true);
2773	3760	} else
2774		- if (event.getSource() == clearPanelButton)
	3761	+ if (source == clearPanelButton)
2775	3762	{
2776	3763	assert(copy == group);
2777	3764	//copy.ClearUI();
2778	3765	for (Object3D obj : listUI)
2779	3766	{
	3767	+ obj.pinned = false;
2780	3768	obj.CloseUI();
2781	3769	}
2782	3770	listUI.clear();
2783	3771	refreshContents(true);
2784	3772	} else
2785		- if (event.getSource() == allParamsButton)
	3773	+ if (source == allParamsButton)
2786	3774	{
2787	3775	assert(copy == group);
2788	3776
2789		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3777	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2790	3778
2791	3779	for (Object3D obj : listUI)
2792	3780	{
..	..	@@ -2803,19 +3791,19 @@
2803	3791
2804	3792	refreshContents(true);
2805	3793	} else
2806		- if (event.getSource() == unselectButton)
	3794	+ if (source == unselectButton)
2807	3795	{
2808	3796	objEditor.jTree.clearSelection();
2809		- // ?? oct 2012 GraphreeD.clipboard.clear();
	3797	+ // ?? oct 2012 GrafreeD.clipboard.clear();
2810	3798	objEditor.ResetSliders();
2811	3799	refreshContents(true);
2812	3800	} else
2813		- if(event.getSource() instanceof cRadio)
	3801	+ if(source instanceof cRadio)
2814	3802	{
2815	3803	group.parent = keepparent;
2816	3804	group.attributes = 0;
2817	3805	//group.editWindow = null;
2818		- /cRadio/ radio = (cRadio)event.getSource();
	3806	+ /cRadio/ radio = (cRadio)source;
2819	3807	Object3D obj = radio.GetObject();
2820	3808	System.out.println("Edit " + obj);
2821	3809	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2835,7 +3823,10 @@
2835	3823	}
2836	3824
2837	3825	copy = group;
2838		- //CameraPane.theRenderer.object = group;
	3826	+
	3827	+ SetUndoStates();
	3828	+
	3829	+ //Globals.theRenderer.object = group;
2839	3830	if(!useclient)
2840	3831	{
2841	3832	cameraView.renderCamera = radio.camera;
..	..	@@ -2844,25 +3835,52 @@
2844	3835	cameraView.cameras[cameraView.cameracount] = radio.camera;
2845	3836	cameraView.targetLookAt.set(radio.camera.lookAt);
2846	3837	cameraView.object = group;
2847		- cameraView.lighttouched = true;
	3838	+ //cameraView.lighttouched = true;
	3839	+ Globals.lighttouched = true;
2848	3840	topView.object = group;
2849	3841	frontView.object = group;
2850	3842	sideView.object = group;
2851	3843	}
2852		- group.editWindow = this;
	3844	+
	3845	+// fix "+" issue
	3846	+ //group.editWindow = this;
	3847	+ group.manipWindow = this;
	3848	+
2853	3849	/*
2854	3850	currentLayout = radio.layout;
2855	3851	if (currentLayout == null)
2856	3852	currentLayout = sevenButton;
2857	3853	*/
2858	3854	radio.layout.doClick();
	3855	+
	3856	+ ClearUnpinned();
	3857	+ //Grafreed.Assert(group != null);
	3858	+ //Grafreed.Assert(group.selection != null);
	3859	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	3860	+ if (group.selection == null \|\| group.selection.size() == 1)
	3861	+ EditSelection(false);
2859	3862	keepparent = group.parent;
2860	3863	// PARENT = NULL or not???
2861	3864	//group.parent = null; // ROOT
2862	3865	//group.attributes = -1;
2863	3866	ResetModel();
	3867	+
	3868	+ cameraView.requestFocusInWindow();
2864	3869	refreshContents(true);
2865		- }
	3870	+ } else if (event.getSource() == editCameraItem)
	3871	+ {
	3872	+ cameraView.ProtectCamera();
	3873	+ cameraView.repaint();
	3874	+ return;
	3875	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3876	+ {
	3877	+ cameraView.RevertCamera();
	3878	+ cameraView.repaint();
	3879	+ return;
	3880	+ // } else if (event.getSource() == textureButton)
	3881	+ // {
	3882	+ // return; // true;
	3883	+ }
2866	3884	else
2867	3885	{
2868	3886	//return super.action(event, arg);
..	..	@@ -2871,7 +3889,6 @@
2871	3889	}
2872	3890
2873	3891	boolean useclient = false;
2874		- cRadio radio;
2875	3892
2876	3893	void ToggleRoot()
2877	3894	{
..	..	@@ -2880,7 +3897,7 @@
2880	3897	if (useclient)
2881	3898	{
2882	3899	cameraView.object = client;
2883		- cameraView.lighttouched = true;
	3900	+ Globals.lighttouched = true;
2884	3901	//topView.object = client;
2885	3902	//frontView.object = client;
2886	3903	//sideView.object = client;
..	..	@@ -2888,7 +3905,7 @@
2888	3905	else
2889	3906	{
2890	3907	cameraView.object = group;
2891		- cameraView.lighttouched = true;
	3908	+ Globals.lighttouched = true;
2892	3909	//topView.object = group;
2893	3910	//frontView.object = group;
2894	3911	//sideView.object = group;
..	..	@@ -2923,6 +3940,28 @@
2923	3940	refreshContents();
2924	3941	}
2925	3942
	3943	+ void TransformChildren()
	3944	+ {
	3945	+ Object3D obj;
	3946	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3947	+ {
	3948	+ obj = (Object3D)e.nextElement();
	3949	+ obj.KeepTextureMatrices();
	3950	+ obj.TransformChildren();
	3951	+ obj.RestoreTextureMatrices();
	3952	+
	3953	+// if (obj.parent == null)
	3954	+// {
	3955	+// System.out.println("NULL PARENT!");
	3956	+// new Exception().printStackTrace();
	3957	+// }
	3958	+// else
	3959	+// TouchTransform(obj);
	3960	+// //obj.parent.Touch();
	3961	+ }
	3962	+
	3963	+ refreshContents();
	3964	+ }
2926	3965
2927	3966	void ResetTransform()
2928	3967	{
..	..	@@ -3035,7 +4074,7 @@
3035	4074	refreshContents();
3036	4075	}
3037	4076
3038		- void ResetCentroid()
	4077	+ void ResetCentroid(boolean full)
3039	4078	{
3040	4079	Object3D obj;
3041	4080	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3050,12 +4089,16 @@
3050	4089	LA.matIdentity(Object3D.mat);
3051	4090	obj.getBounds(minima, maxima, false);
3052	4091	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3053		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	4092	+ if (full)
	4093	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3054	4094	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3055	4095	obj.TransformMesh(Object3D.mat);
	4096	+
3056	4097	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3057		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	4098	+ if (full)
	4099	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3058	4100	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	4101	+
3059	4102	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3060	4103	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3061	4104	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3084,7 +4127,8 @@
3084	4127
3085	4128	int size = obj.MemorySize();
3086	4129
3087		- System.err.println((size/1024) + " KB is the size of " + obj);
	4130	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4131	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3088	4132	}
3089	4133	}
3090	4134	catch (Exception e)
..	..	@@ -3121,9 +4165,9 @@
3121	4165	obj = (Object3D)e.nextElement();
3122	4166
3123	4167	System.out.println("Object is: " + obj);
3124		- GraphreeD.AnalyzeObject(obj);
	4168	+ Grafreed.AnalyzeObject(obj);
3125	4169	System.out.println("Boundary rep: " + obj.bRep);
3126		- GraphreeD.AnalyzeObject(obj.bRep);
	4170	+ Grafreed.AnalyzeObject(obj.bRep);
3127	4171
3128	4172	// System.err.println((size/1024) + " KB is the size of " + obj);
3129	4173	}
..	..	@@ -3165,6 +4209,20 @@
3165	4209	void GenNormals(boolean crease)
3166	4210	{
3167	4211	group.GenNormalsS(crease);
	4212	+
	4213	+ refreshContents();
	4214	+ }
	4215	+
	4216	+ void GenNormalsMESH()
	4217	+ {
	4218	+ group.GenNormalsMeshS();
	4219	+
	4220	+ refreshContents();
	4221	+ }
	4222	+
	4223	+ void GenNormalsMINE()
	4224	+ {
	4225	+ group.selection.GenNormalsMINE();
3168	4226
3169	4227	refreshContents();
3170	4228	}
..	..	@@ -3250,7 +4308,7 @@
3250	4308	// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3251	4309	// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3252	4310	//
3253		-// g.add(GraphreeD.clipboard);
	4311	+// g.add(GrafreeD.clipboard);
3254	4312	//
3255	4313	// buffer.add(g);
3256	4314	// }
..	..	@@ -3269,8 +4327,8 @@
3269	4327	// nodes = new Object3D();
3270	4328	// vertices = new Vector<Vertex>();
3271	4329	//
3272		-// boolean epsequal = GraphreeD.epsequal;
3273		-// GraphreeD.epsequal = true;
	4330	+// boolean epsequal = GrafreeD.epsequal;
	4331	+// GrafreeD.epsequal = true;
3274	4332	//
3275	4333	// for (int i=0; i<group.selection.size(); i++)
3276	4334	// {
..	..	@@ -3311,7 +4369,7 @@
3311	4369	// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3312	4370	// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3313	4371	//
3314		-// g.add(GraphreeD.clipboard);
	4372	+// g.add(GrafreeD.clipboard);
3315	4373	//
3316	4374	// buffer.add(g);
3317	4375	// }
..	..	@@ -3319,7 +4377,7 @@
3319	4377	// makeSomething(buffer, i==group.selection.size()-1);
3320	4378	// }
3321	4379	//
3322		-// GraphreeD.epsequal = epsequal;
	4380	+// GrafreeD.epsequal = epsequal;
3323	4381	//
3324	4382	// //buffer = null;
3325	4383	// temprep = null;
..	..	@@ -3330,8 +4388,8 @@
3330	4388
3331	4389	void ParseVertices()
3332	4390	{
3333		- boolean epsequal = GraphreeD.epsequal;
3334		- GraphreeD.epsequal = true;
	4391	+ boolean epsequal = Grafreed.epsequal;
	4392	+ Grafreed.epsequal = true;
3335	4393
3336	4394	for (int i=0; i<group.selection.size(); i++)
3337	4395	{
..	..	@@ -3356,7 +4414,7 @@
3356	4414	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3357	4415	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3358	4416
3359		- g.add(GraphreeD.clipboard);
	4417	+ g.add(Grafreed.clipboard);
3360	4418
3361	4419	buffer.add(g);
3362	4420	}
..	..	@@ -3371,7 +4429,7 @@
3371	4429	makeSomething(buffer, i==group.selection.size()-1);
3372	4430	}
3373	4431
3374		- GraphreeD.epsequal = epsequal;
	4432	+ Grafreed.epsequal = epsequal;
3375	4433
3376	4434	refreshContents();
3377	4435	}
..	..	@@ -3389,7 +4447,16 @@
3389	4447	String pigment = Object3D.GetPigment(tex);
3390	4448	//String bump = Object3D.GetBump(tex);
3391	4449
3392		- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
	4450	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4451	+
	4452	+ try
	4453	+ {
	4454	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
	4455	+ }
	4456	+ catch (Exception e)
	4457	+ {
	4458	+ System.err.println("FAIL: " + node);
	4459	+ }
3393	4460
3394	4461	double s = v.s;
3395	4462
..	..	@@ -3416,7 +4483,7 @@
3416	4483	scale /= 3;
3417	4484
3418	4485	scale /= 0xFF;
3419		- scale /= 4;
	4486	+ // c'est quoi ca? scale /= 4;
3420	4487
3421	4488	//v.AO = scale;
3422	4489
..	..	@@ -3437,12 +4504,26 @@
3437	4504
3438	4505	void Align()
3439	4506	{
	4507	+ if (group.selection.size() == 0)
	4508	+ return;
	4509	+
	4510	+ cVector bbmin = new cVector();
	4511	+ cVector bbmax = new cVector();
	4512	+
	4513	+ group.selection.get(0).getBounds(bbmin, bbmax, true);
	4514	+
	4515	+ double dx = bbmax.x - bbmin.x;
	4516	+ double dy = bbmax.y - bbmin.y;
	4517	+ double dz = bbmax.z - bbmin.z;
	4518	+
	4519	+ double scale = Math.sqrt(dxdx + dydy + dz*dz);
	4520	+
3440	4521	for (int i=0; i<group.selection.size(); i++)
3441	4522	{
3442	4523	Object3D obj = group.selection.get(i);
3443	4524
3444		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3445		- LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
	4525	+ LA.matTranslate(obj.toParent, i * scale, 0, 0);
	4526	+ LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3446	4527	}
3447	4528
3448	4529	refreshContents();
..	..	@@ -3455,7 +4536,7 @@
3455	4536	// ref.SaveSupports();
3456	4537	// Object3D par = ref.parent;
3457	4538	// ref.parent = null;
3458		-// Object3D lowres = (Object3D) GraphreeD.clone(ref);
	4539	+// Object3D lowres = (Object3D) GrafreeD.clone(ref);
3459	4540	// ref.parent = par;
3460	4541	// ref.RestoreSupports();
3461	4542
..	..	@@ -3463,11 +4544,11 @@
3463	4544
3464	4545	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3465	4546
3466		- boolean random = CameraPane.RANDOM;
3467		- CameraPane.RANDOM = false; // parse all random nodes
	4547	+ boolean random = CameraPane.SWITCH;
	4548	+ CameraPane.SWITCH = false; // parse all random nodes
3468	4549	lowres.linkVerticesThis(null);
3469	4550	lowres.linkVerticesThis(sn);
3470		- CameraPane.RANDOM = random;
	4551	+ CameraPane.SWITCH = random;
3471	4552
3472	4553	System.err.flush();
3473	4554
..	..	@@ -3485,7 +4566,7 @@
3485	4566	// lowres.SaveSupports();
3486	4567	// par = lowres.parent;
3487	4568	// lowres.parent = null;
3488		-// Object3D newlow = (Object3D) GraphreeD.clone(lowres);
	4569	+// Object3D newlow = (Object3D) GrafreeD.clone(lowres);
3489	4570	Object3D newlow = CloneObject(lowres, false);
3490	4571	newlow.name = sn.switchobject.get(i).name;
3491	4572	System.out.println(" pose#" + i + " = " + newlow);
..	..	@@ -3507,7 +4588,7 @@
3507	4588	return;
3508	4589
3509	4590	Object3D poses = group.selection.get(0);
3510		- Object3D ref = GraphreeD.clipboard.get(0);
	4591	+ Object3D ref = Grafreed.clipboard.get(0);
3511	4592
3512	4593	Object3D newgroup = new Object3D("Po:" + poses.name);
3513	4594
..	..	@@ -3676,7 +4757,7 @@
3676	4757	group.selection.RelinkToSupport(); // july 2014
3677	4758	System.out.println("DONE.");
3678	4759	refreshContents();
3679		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	4760	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3680	4761	}
3681	4762
3682	4763	void ReduceMesh(boolean reduction34)
..	..	@@ -3701,20 +4782,20 @@
3701	4782
3702	4783	void ClipMesh()
3703	4784	{
3704		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	4785	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3705	4786	{
3706		- Object3D content = GraphreeD.clipboard.get(0);
	4787	+ Object3D content = Grafreed.clipboard.get(0);
3707	4788
3708	4789	if (content instanceof cGroup && ((cGroup)content).transientlink )
3709	4790	content = ((cGroup)content).get(0);
3710	4791
3711	4792	// for (int i=0; i<group.selection.size(); i++)
3712	4793	// {
3713		-// group.selection.get(i).ClipMesh(GraphreeD.clipboard);
	4794	+// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3714	4795	// }
3715		- group.selection.ClipMesh(GraphreeD.clipboard);
	4796	+ group.selection.ClipMesh(Grafreed.clipboard);
3716	4797	}
3717		-// group.selection.ClipMesh(GraphreeD.clipboard);
	4798	+// group.selection.ClipMesh(GrafreeD.clipboard);
3718	4799	System.out.println("DONE.");
3719	4800	refreshContents();
3720	4801	}
..	..	@@ -3759,6 +4840,18 @@
3759	4840	void MarkLeaves(boolean hide)
3760	4841	{
3761	4842	group.selection.MarkLeaves(hide);
	4843	+ refreshContents();
	4844	+ }
	4845	+
	4846	+ void RewindLeaves(boolean hide)
	4847	+ {
	4848	+ group.selection.RewindLeaves(hide);
	4849	+ refreshContents();
	4850	+ }
	4851	+
	4852	+ void RandomLeaves(boolean hide)
	4853	+ {
	4854	+ group.selection.RandomLeaves(hide);
3762	4855	refreshContents();
3763	4856	}
3764	4857
..	..	@@ -3833,28 +4926,25 @@
3833	4926	// }
3834	4927	// }
3835	4928
3836		- static boolean allparams = true;
3837		-
3838		- static Vector<Object3D> listUI = new Vector<Object3D>();
3839		-
3840	4929	void EditSelection(boolean newWindow)
3841	4930	{
	4931	+ if (group.selection == null)
	4932	+ {
	4933	+ EditElement(group, newWindow); // ? new
	4934	+ return;
	4935	+ }
	4936	+
3842	4937	// aConstraints.gridy = 0;
3843	4938	for (int i=0; i<group.selection.size(); i++)
3844	4939	{
3845	4940	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
3846	4941	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3847		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4942	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3848	4943
3849	4944	Object3D elem = (Object3D)group.selection.elementAt(i);
3850		- if(elem != group)
	4945	+ if(elem != group \|\| !newWindow)
3851	4946	{
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
	4947	+ EditElement(elem, newWindow); // ? new
3858	4948	}
3859	4949	}
3860	4950	}
..	..	@@ -3929,7 +5019,8 @@
3929	5019	//new Exception().printStackTrace();
3930	5020
3931	5021	freezemodel = true;
3932		-
	5022	+ ClearUnpinned();
	5023	+
3933	5024	/**/
3934	5025	//switch (event.id)
3935	5026	{
..	..	@@ -3937,7 +5028,6 @@
3937	5028	//case 702: // Event.LIST_DESELECT
3938	5029	group.deselectAll();
3939	5030	TreePath tps[] = objEditor.jTree.getSelectionPaths();
3940		- objEditor.ClearInfo(); // .GetMaterial());
3941	5031	if (tps != null)
3942	5032	{
3943	5033	for (int i=0; i < tps.length; i++)
..	..	@@ -3946,33 +5036,39 @@
3946	5036
3947	5037	//if (child.parent != null)
3948	5038	//child.parent.addSelectee(child);
	5039	+ objEditor.SetMaterial(child);
3949	5040	group.addSelectee(child);
3950		- objEditor.SetMaterial(child); // .GetMaterial());
3951		- objEditor.AddInfo(child, this, true); // .GetMaterial());
3952		- System.err.println("info : " + child.GetPath());
3953	5041	}
3954	5042	}
3955		- else
3956		- {
3957		- objEditor.SetMaterial(group); // .GetMaterial());
3958		- objEditor.AddInfo(group, this, true); // .GetMaterial());
3959		- System.err.println("info : " + group.GetPath());
3960		- }
	5043	+// else
	5044	+// {
	5045	+// objEditor.SetMaterial(group); // .GetMaterial());
	5046	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	5047	+// System.err.println("info : " + group.GetPath());
	5048	+// }
3961	5049
3962		- objEditor.SetText(); // jan 2014
3963		-
3964		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	5050	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
3965	5051	CameraPane.flash = true;
3966	5052
3967		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5053	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
3968	5054	// a camera
3969	5055	{
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;
	5056	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5057	+ {
	5058	+ CameraPane.camerachangeframe = 0; // don't refuse it
	5059	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5060	+ }
	5061	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	5062	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
3974	5063	}
3975	5064
	5065	+ if (tps != null && tps.length == 1)
	5066	+ {
	5067	+ EditSelection(false);
	5068	+ }
	5069	+
	5070	+ SetPinStates(tps != null && tps.length > 0);
	5071	+
3976	5072	refreshContents();
3977	5073	//return true;
3978	5074	}
..	..	@@ -3981,6 +5077,35 @@
3981	5077
3982	5078	freezemodel = false;
3983	5079	}
	5080	+
	5081	+ void SetPinStates(boolean enabled)
	5082	+ {
	5083	+ editButton.setEnabled(enabled);
	5084	+ uneditButton.setEnabled(enabled);
	5085	+ unselectButton.setEnabled(enabled);
	5086	+ flashSelectionButton.setEnabled(enabled);
	5087	+ }
	5088	+
	5089	+ void refreshContents(boolean cp)
	5090	+ {
	5091	+ if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5092	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5093	+ {
	5094	+ objEditor.ClearInfo(); // .GetMaterial());
	5095	+
	5096	+ for (int i=0; i < group.selection.Size(); i++)
	5097	+ {
	5098	+ Object3D child = (Object3D) group.selection.get(i);
	5099	+
	5100	+ objEditor.AddInfo(child, this, true);
	5101	+ System.err.println("info : " + child.GetPath());
	5102	+ }
	5103	+
	5104	+ objEditor.SetText(); // jan 2014
	5105	+ }
	5106	+
	5107	+ super.refreshContents(cp);
	5108	+ }
3984	5109
3985	5110	void linkSomething(Object3D thing)
3986	5111	{
..	..	@@ -4052,16 +5177,19 @@
4052	5177	{
4053	5178	if (group.selection.isEmpty())
4054	5179	return;
4055		- GraphreeD.clipboardIsTempGroup = false;
	5180	+
	5181	+ Grafreed.clipboardIsTempGroup = false;
4056	5182	Composite tGroup = null;
4057	5183	if (group.selection.size() > 0) // 1)
4058	5184	{
4059	5185	tGroup = new cGroup();
4060		- GraphreeD.clipboardIsTempGroup = true;
	5186	+ Grafreed.clipboardIsTempGroup = true;
4061	5187	}
4062	5188
4063	5189	if (cut)
4064	5190	{
	5191	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5192	+// Save();
4065	5193	//int indices[] = jList.getSelectedIndices();
4066	5194	//for (int i = indices.length - 1; i >= 0; i--)
4067	5195	//jList.remove(indices[i]);
..	..	@@ -4097,16 +5225,16 @@
4097	5225	//System.out.println("cut " + child);
4098	5226	//System.out.println("parent = " + child.parent);
4099	5227	// tmp.addChild(child);
4100		- if (GraphreeD.clipboardIsTempGroup)
	5228	+ if (Grafreed.clipboardIsTempGroup)
4101	5229	tGroup.add/Child/(tmp);
4102	5230	else
4103		- GraphreeD.clipboard = tmp;
	5231	+ Grafreed.clipboard = tmp;
4104	5232	}
4105	5233	else
4106		- if (GraphreeD.clipboardIsTempGroup)
	5234	+ if (Grafreed.clipboardIsTempGroup)
4107	5235	tGroup.add/Child/(child);
4108	5236	else
4109		- GraphreeD.clipboard = child;
	5237	+ Grafreed.clipboard = child;
4110	5238	}
4111	5239
4112	5240	//ResetModel();
..	..	@@ -4138,21 +5266,23 @@
4138	5266	//System.out.println("cut " + elem);
4139	5267	//System.out.println("parent = " + elem.parent);
4140	5268	// tmp.addChild(elem);
4141		- if (GraphreeD.clipboardIsTempGroup)
	5269	+ if (Grafreed.clipboardIsTempGroup)
4142	5270	tGroup.add/Child/(tmp);
4143	5271	else
4144		- GraphreeD.clipboard = tmp;
	5272	+ Grafreed.clipboard = tmp;
4145	5273	}
4146	5274	else
4147		- if (GraphreeD.clipboardIsTempGroup)
	5275	+ if (Grafreed.clipboardIsTempGroup)
4148	5276	tGroup.add/Child/(child);
4149	5277	else
4150		- GraphreeD.clipboard = child;
	5278	+ Grafreed.clipboard = child;
4151	5279	}
4152	5280
4153	5281	}
4154		- if (GraphreeD.clipboardIsTempGroup)
4155		- GraphreeD.clipboard = tGroup;
	5282	+
	5283	+ if (Grafreed.clipboardIsTempGroup)
	5284	+ Grafreed.clipboard = tGroup;
	5285	+
4156	5286	if (cut)
4157	5287	{
4158	5288	ResetModel();
..	..	@@ -4162,11 +5292,15 @@
4162	5292
4163	5293	void paste(boolean expand)
4164	5294	{
4165		- // if (GraphreeD.clipboard == null)
	5295	+ if (Globals.REPLACEONMAKE)
	5296	+ Save();
	5297	+ boolean keep = Globals.REPLACEONMAKE;
	5298	+ Globals.REPLACEONMAKE = false;
	5299	+ // if (GrafreeD.clipboard == null)
4166	5300	// return;
4167	5301	boolean first = true;
4168	5302
4169		- if (GraphreeD.clipboardIsTempGroup)
	5303	+ if (Grafreed.clipboardIsTempGroup)
4170	5304	{
4171	5305	Composite temp;
4172	5306
..	..	@@ -4177,7 +5311,7 @@
4177	5311	temp = (Composite)Applet3D.clipboard.deepCopy();
4178	5312	*/
4179	5313	Object3D elem;
4180		- for (Enumeration e = /temp.children/GraphreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5314	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4181	5315	{
4182	5316	Object3D child = (Object3D)e.nextElement();
4183	5317
..	..	@@ -4191,7 +5325,7 @@
4191	5325	else
4192	5326	elem = child.deepCopy(); // ?
4193	5327	child.parent = keepparent;
4194		- //if (GraphreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
	5328	+ //if (GrafreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
4195	5329	// elem = elem.get(0);
4196	5330	makeSomething(elem, true); // ?? first);
4197	5331	//group.addChild(elem);
..	..	@@ -4211,23 +5345,24 @@
4211	5345	//Object3D cb = Applet3D.clipboard;
4212	5346	//temp.addChild(cb);
4213	5347	//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());
	5348	+ assert(Grafreed.clipboard.parent == null);
	5349	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5350	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5351	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5352	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4219	5353	else
4220		- makeSomething(expand?GraphreeD.clipboard.copyExpand():GraphreeD.clipboard.deepCopy());
4221		- GraphreeD.clipboard.get(0).parent = keepparent;
	5354	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5355	+ Grafreed.clipboard.get(0).parent = keepparent;
4222	5356	}
4223	5357
	5358	+ Globals.REPLACEONMAKE = keep;
4224	5359	ResetModel();
4225	5360	refreshContents();
4226	5361	}
4227	5362
4228		- void pasteInto(boolean copyit)
	5363	+ void pasteInto(boolean copyit, boolean clone)
4229	5364	{
4230		-// if (GraphreeD.clipboard == null)
	5365	+// if (GrafreeD.clipboard == null)
4231	5366	// return;
4232	5367
4233	5368	if (group.selection.size() != 1)
..	..	@@ -4254,15 +5389,22 @@
4254	5389	if (copyit)
4255	5390	{
4256	5391	// paste(false);
4257		- CloneClipboard(false); // sept 2014
	5392	+ if (clone)
	5393	+ {
	5394	+ CloneClipboard(false); // sept 2014
	5395	+ }
	5396	+ else
	5397	+ {
	5398	+ paste(false);
	5399	+ }
4258	5400	}
4259	5401	else
4260	5402	{
4261	5403	boolean first = true;
4262	5404
4263		- if (GraphreeD.clipboardIsTempGroup)
	5405	+ if (Grafreed.clipboardIsTempGroup)
4264	5406	{
4265		- Composite temp = (Composite)GraphreeD.clipboard;
	5407	+ Composite temp = (Composite)Grafreed.clipboard;
4266	5408	Object3D copy;
4267	5409	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4268	5410	{
..	..	@@ -4272,7 +5414,7 @@
4272	5414	}
4273	5415	} else
4274	5416	{
4275		- linkSomething(GraphreeD.clipboard); //.get(0));
	5417	+ linkSomething(Grafreed.clipboard); //.get(0));
4276	5418	}
4277	5419	}
4278	5420	}
..	..	@@ -4349,6 +5491,10 @@
4349	5491
4350	5492	void group(Object3D csg, boolean grab)
4351	5493	{
	5494	+ if (Globals.REPLACEONMAKE)
	5495	+ Save();
	5496	+ boolean keep = Globals.REPLACEONMAKE;
	5497	+ Globals.REPLACEONMAKE = false;
4352	5498	if (//false) // why??
4353	5499	!group.selection.isEmpty())
4354	5500	{
..	..	@@ -4462,8 +5608,34 @@
4462	5608	//node.add(csg);
4463	5609	//makeSomething(node);
4464	5610	makeSomething(csg);
	5611	+ Globals.REPLACEONMAKE = keep;
4465	5612	}
4466	5613
	5614	+ void Ungroup(Object3D g)
	5615	+ {
	5616	+ if (Globals.REPLACEONMAKE)
	5617	+ Save();
	5618	+ boolean keep = Globals.REPLACEONMAKE;
	5619	+ Globals.REPLACEONMAKE = false;
	5620	+ if (g instanceof HiddenObject)
	5621	+ {
	5622	+ HiddenObject h = (HiddenObject) g;
	5623	+
	5624	+ for (int i=0; i<h.ActualSize(); i++)
	5625	+ {
	5626	+ objEditor.makeSomething(h.get(i), false);
	5627	+ }
	5628	+ }
	5629	+ else
	5630	+ {
	5631	+ for (int i=0; i<g.Size(); i++)
	5632	+ {
	5633	+ objEditor.makeSomething(g.get(i), false);
	5634	+ }
	5635	+ }
	5636	+ Globals.REPLACEONMAKE = keep;
	5637	+ }
	5638	+
4467	5639	void ungroup()
4468	5640	{
4469	5641	/*
..	..	@@ -4657,21 +5829,6 @@
4657	5829	}
4658	5830	*/
4659	5831
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	5832	/*
4676	5833	public void Callback(Object obj)
4677	5834	{
..	..	@@ -4695,26 +5852,9 @@
4695	5852	}
4696	5853	*/
4697	5854
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	5855	String GetFile(String dialogName)
4716	5856	{
4717		- if (GraphreeD.standAlone)
	5857	+ if (Grafreed.standAlone)
4718	5858	{
4719	5859	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4720	5860	browser.show();
..	..	@@ -4778,10 +5918,49 @@
4778	5918	cButton flashSelectionButton;
4779	5919	cButton editButton;
4780	5920	cButton uneditButton;
	5921	+ JCheckBox allParamsButton;
4781	5922	cButton clearpanelButton;
4782		- cButton allParamsButton;
4783	5923	cButton unselectButton;
4784	5924
	5925	+ cButton restoreCameraButton;
	5926	+
	5927	+ cButton saveButton;
	5928	+ cButton oneStepButton;
	5929	+
	5930	+ cButton groupButton;
	5931	+ cButton ungroupButton;
	5932	+ cButton compositeButton;
	5933	+ cButton switchButton;
	5934	+ cButton loopButton;
	5935	+ cButton textureButton;
	5936	+
	5937	+ cButton skybox1Button;
	5938	+ cButton skybox2Button;
	5939	+ cButton skybox3Button;
	5940	+ cButton skybox4Button;
	5941	+ cButton skybox5Button;
	5942	+ cButton skybox6Button;
	5943	+ cButton skybox7Button;
	5944	+
	5945	+ cButton skybox11Button;
	5946	+ cButton skybox12Button;
	5947	+ cButton skybox13Button;
	5948	+ cButton skybox14Button;
	5949	+ cButton skybox15Button;
	5950	+ cButton skybox16Button;
	5951	+ cButton skybox17Button;
	5952	+
	5953	+ cButton gridButton;
	5954	+ cButton boxButton;
	5955	+ cButton sphereButton;
	5956	+ cButton coneButton;
	5957	+ cButton torusButton;
	5958	+ cButton superButton;
	5959	+ cButton kleinButton;
	5960	+ cButton particlesButton;
	5961	+ cButton overlayButton;
	5962	+ cButton lightButton;
	5963	+
4785	5964	cButton screenfitButton;
4786	5965	cButton screenfitpointButton;
4787	5966	cButton snapobjectButton;
..	..	@@ -4793,14 +5972,6 @@
4793	5972
4794	5973	cButton setsupportButton;
4795	5974
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	5975	//
4805	5976	//Composite
4806	5977	Object3D // to do !!
..	..	@@ -4810,9 +5981,11 @@
4810	5981	//JTree jTree;
4811	5982	private MenuItem lookAtItem;
4812	5983	private MenuItem lookFromItem;
4813		- private MenuItem switchItem;
	5984	+ private MenuItem switchViewItem;
4814	5985	private MenuItem cutItem;
4815		- private MenuItem duplicateItem;
	5986	+ private MenuItem undoItem;
	5987	+ private MenuItem redoItem;
	5988	+ private JMenuItem duplicateItem;
4816	5989	private MenuItem cloneItem;
4817	5990	private MenuItem cloneSupportItem;
4818	5991	private MenuItem overwriteGeoItem;
..	..	@@ -4823,8 +5996,9 @@
4823	5996	private MenuItem resetsupportItem;
4824	5997	private MenuItem resetreferencesItem;
4825	5998	private MenuItem linkverticesItem;
	5999	+ private MenuItem relinkverticesItem;
4826	6000	private MenuItem setMasterItem;
4827		- private MenuItem resetMeshItem;
	6001	+ private MenuItem resetAllItem;
4828	6002	private MenuItem stepAllItem;
4829	6003	private MenuItem revertMeshItem;
4830	6004	private MenuItem poseMeshItem;
..	..	@@ -4835,14 +6009,17 @@
4835	6009	private MenuItem mergeGeometriesItem;
4836	6010	private MenuItem copyItem;
4837	6011	private MenuItem pasteItem;
	6012	+ private MenuItem pasteIntoItem;
4838	6013	private MenuItem pasteLinkItem;
4839	6014	private MenuItem pasteCloneItem;
4840	6015	private MenuItem pasteExpandItem;
4841		- private MenuItem clearItem;
	6016	+ private MenuItem deleteItem;
4842	6017	private MenuItem clearAllItem;
4843	6018	private MenuItem genUVItem;
	6019	+ private MenuItem genNormalsMESHItem;
4844	6020	private MenuItem genNormalsCADItem;
4845	6021	private MenuItem genNormalsORGANItem;
	6022	+ private MenuItem genNormalsMINEItem;
4846	6023	private MenuItem stripifyItem;
4847	6024	private MenuItem unstripifyItem;
4848	6025	private MenuItem trimItem;
..	..	@@ -4871,6 +6048,10 @@
4871	6048	private MenuItem showleavesItem;
4872	6049	private MenuItem markleavesItem;
4873	6050	private MenuItem unmarkleavesItem;
	6051	+ private MenuItem rewindleavesItem;
	6052	+ private MenuItem unrewindleavesItem;
	6053	+ private MenuItem randomleavesItem;
	6054	+ private MenuItem unrandomleavesItem;
4874	6055
4875	6056	private MenuItem flipVItem;
4876	6057	private MenuItem unflipVItem;
..	..	@@ -4882,14 +6063,17 @@
4882	6063	private MenuItem panoTexturesItem;
4883	6064
4884	6065	private MenuItem resetCentroidItem;
4885		- private MenuItem transformgeometryItem;
	6066	+ private MenuItem resetCentroidXZItem;
4886	6067	private MenuItem resetTransformItem;
	6068	+ private MenuItem transformGeometryItem;
	6069	+ private MenuItem transformChildrenItem;
	6070	+ private MenuItem hideItem;
4887	6071	private MenuItem grabItem;
4888	6072	private MenuItem backItem;
4889	6073	private MenuItem frontItem;
4890	6074	private MenuItem cameraItem;
4891	6075	private MenuItem compositeItem;
4892		- private MenuItem randomItem;
	6076	+ private MenuItem switchItem;
4893	6077	private MenuItem physicsItem;
4894	6078	private MenuItem frameselectorItem;
4895	6079	private MenuItem scriptNodeItem;
..	..	@@ -4904,6 +6088,7 @@
4904	6088
4905	6089	private MenuItem resetParentItem;
4906	6090	private MenuItem repairParentItem;
	6091	+ private MenuItem repairShadowItem;
4907	6092	private MenuItem sortbysizeItem;
4908	6093	private MenuItem sortbynameItem;
4909	6094
..	..	@@ -4912,6 +6097,8 @@
4912	6097	private MenuItem attachBumpItem;
4913	6098	private MenuItem detachBumpItem;
4914	6099	private MenuItem pigmentBumpItem;
	6100	+ private MenuItem embedTexturesItem;
	6101	+ private MenuItem deEmbedTexturesItem;
4915	6102
4916	6103	private MenuItem particleItem;
4917	6104	private MenuItem ragdollItem;
..	..	@@ -4924,10 +6111,11 @@
4924	6111	private MenuItem coneItem;
4925	6112	private MenuItem torusItem;
4926	6113	private MenuItem superItem;
	6114	+ private MenuItem kleinItem;
4927	6115	private MenuItem blobItem;
4928	6116	private MenuItem latheItem;
4929	6117	private MenuItem bezierItem;
4930		- private MenuItem checkerItem;
	6118	+ private MenuItem overlayItem;
4931	6119	private MenuItem meshItem;
4932	6120	// private MenuItem meshGroupItem;
4933	6121	private MenuItem springItem;
..	..	@@ -4936,6 +6124,7 @@
4936	6124	private MenuItem csgItem;
4937	6125	private MenuItem templateItem;
4938	6126	private MenuItem textureItem;
	6127	+ private MenuItem billboardItem;
4939	6128	private MenuItem shadowXItem;
4940	6129	private MenuItem shadowYItem;
4941	6130	private MenuItem shadowZItem;
..	..	@@ -4948,11 +6137,6 @@
4948	6137	private MenuItem doubleItem;
4949	6138	private MenuItem tripleItem;
4950	6139
4951		- private MenuItem importGFDItem;
4952		- private MenuItem importVRMLX3DItem;
4953		- private MenuItem import3DSItem;
4954		- private MenuItem importOBJItem;
4955		-
4956	6140	private MenuItem computeAOItem;
4957	6141	private MenuItem recompileItem;
4958	6142	private MenuItem editScriptItem;
..	..	@@ -4962,4 +6146,8 @@
4962	6146	private MenuItem analyzeItem;
4963	6147	private MenuItem dumpItem;
4964	6148	//boolean freezemodel = false;
	6149	+
	6150	+ Menu cameraMenu;
	6151	+ MenuItem editCameraItem;
	6152	+ MenuItem restoreCameraItem;
4965	6153	}