~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,16 +314,28 @@
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	{
	335	+ if (Globals.REPLACEONMAKE)
	336	+ Save();
	337	+ boolean keep = Globals.REPLACEONMAKE;
	338	+ Globals.REPLACEONMAKE = false;
86	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();)
..	..	@@ -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(GrafreeD.clipboard.parent == null);
101		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
102		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
103		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
104		- makeSomething(CloneObject(GrafreeD.clipboard.get(0), false));
	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(GrafreeD.clipboard, false));
107		- GrafreeD.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)GrafreeD.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,79 +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);
222	574	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
223	575	relinkverticesItem.addActionListener(this);
	576	+
	577	+ if (Globals.ADVANCED)
	578	+ {
224	579	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
225	580	setMasterItem.addActionListener(this);
	581	+ }
226	582
227	583	oe.menuBar.add(menu = new Menu("Group"));
228		- grabItem = menu.add(new MenuItem("Grab"));
229		- grabItem.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	588	frontItem = menu.add(new MenuItem("Front"));
233	589	frontItem.addActionListener(this);
234		- compositeItem = menu.add(new MenuItem("Composite"));
235		- compositeItem.addActionListener(this);
236		- hideItem = menu.add(new MenuItem("Hide"));
	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"));
237	596	hideItem.addActionListener(this);
	597	+ }
238	598	ungroupItem = menu.add(new MenuItem("Ungroup"));
239	599	ungroupItem.addActionListener(this);
240		- menu.add("-");
241		- randomItem = menu.add(new MenuItem("Random"));
242		- randomItem.addActionListener(this);
243		- physicsItem = menu.add(new MenuItem("Physics"));
244		- physicsItem.addActionListener(this);
245		- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
246		- frameselectorItem.addActionListener(this);
	600	+
	601	+// menu.add("-");
	602	+//
	603	+// switchItem = menu.add(new MenuItem("Switch node"));
	604	+// switchItem.addActionListener(this);
	605	+ if (Globals.ADVANCED)
	606	+ {
247	607	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
248	608	switchGeoItem.addActionListener(this);
249	609	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
250	610	switchTransfoItem.addActionListener(this);
251		- morphItem = menu.add(new MenuItem("Morph"));
	611	+ morphItem = menu.add(new MenuItem("Morph Group"));
252	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);
253	619	scriptNodeItem = menu.add(new MenuItem("Script Node"));
254	620	scriptNodeItem.addActionListener(this);
255		- cameraItem = menu.add(new MenuItem("Camera"));
256		- cameraItem.addActionListener(this);
	621	+ }
257	622
258	623	oe.menuBar.add(menu = new Menu("Object"));
259		- textureItem = menu.add(new MenuItem("Texture"));
260		- textureItem.addActionListener(this);
	624	+// textureItem = menu.add(new MenuItem("Texture"));
	625	+// textureItem.addActionListener(this);
261	626	billboardItem = menu.add(new MenuItem("Billboard"));
262	627	billboardItem.addActionListener(this);
263	628	csgItem = menu.add(new MenuItem("CSG"));
264	629	csgItem.addActionListener(this);
265		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	630	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
266	631	shadowXItem.addActionListener(this);
267		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	632	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
268	633	shadowYItem.addActionListener(this);
269		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	634	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
270	635	shadowZItem.addActionListener(this);
	636	+ attributeItem = menu.add(new MenuItem("Attribute"));
	637	+ attributeItem.addActionListener(this);
	638	+
	639	+ if (Globals.ADVANCED)
	640	+ {
	641	+ menu.add("-");
271	642	linkerItem = menu.add(new MenuItem("Linker"));
272	643	linkerItem.addActionListener(this);
273	644	templateItem = menu.add(new MenuItem("Template"));
274	645	templateItem.addActionListener(this);
275		- attributeItem = menu.add(new MenuItem("Attribute"));
276		- attributeItem.addActionListener(this);
277	646	pointflowItem = menu.add(new MenuItem("Point Flow"));
278	647	pointflowItem.addActionListener(this);
	648	+ }
279	649	menu.add("-");
280	650	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
281	651	resetTransformItem.addActionListener(this);
282	652	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
283	653	resetCentroidItem.addActionListener(this);
284		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
285		- transformgeometryItem.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);
286	660
287	661	oe.menuBar.add(menu = new Menu("Geometry"));
288	662	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -293,8 +667,11 @@
293	667	genNormalsCADItem.addActionListener(this);
294	668	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
295	669	genNormalsMESHItem.addActionListener(this);
296		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	670	+ if (Globals.ADVANCED)
	671	+ {
	672	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
297	673	genNormalsMINEItem.addActionListener(this);
	674	+ }
298	675	stripifyItem = menu.add(new MenuItem("Stripify"));
299	676	stripifyItem.addActionListener(this);
300	677	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -316,23 +693,34 @@
316	693	reduce34MeshItem.addActionListener(this);
317	694	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
318	695	increaseMeshItem.addActionListener(this);
319		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
320		- smoothMeshItem.addActionListener(this);
321	696	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
322	697	clipMeshItem.addActionListener(this);
	698	+
	699	+ if (Globals.ADVANCED)
	700	+ {
	701	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	702	+ smoothMeshItem.addActionListener(this);
	703	+ }
323	704
324	705	oe.menuBar.add(menu = new Menu("Attributes"));
325	706	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
326	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);
327	712	menu.add("-");
328	713	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
329	714	liveleavesItem.addActionListener(this);
330	715	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
331	716	unliveleavesItem.addActionListener(this);
	717	+ if (Globals.ADVANCED)
	718	+ {
332	719	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
333	720	supportleavesItem.addActionListener(this);
334	721	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
335	722	unsupportleavesItem.addActionListener(this);
	723	+ }
336	724	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
337	725	hideleavesItem.addActionListener(this);
338	726	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -341,6 +729,14 @@
341	729	markleavesItem.addActionListener(this);
342	730	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
343	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);
344	740	menu.add("-");
345	741	flipVItem = menu.add(new MenuItem("Flip V"));
346	742	flipVItem.addActionListener(this);
..	..	@@ -366,45 +762,56 @@
366	762	attachBumpItem.addActionListener(this);
367	763	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
368	764	pigmentBumpItem.addActionListener(this);
	765	+ //embedTexturesItem
369	766	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
370	767	detachPigmentItem.addActionListener(this);
371	768	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
372	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);
373	774	menu.add("-");
374	775	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
375	776	sortbysizeItem.addActionListener(this);
376	777	sortbynameItem = menu.add(new MenuItem("Sort by name"));
377	778	sortbynameItem.addActionListener(this);
378	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.
379	787	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
380	788	extractGeometriesItem.addActionListener(this);
381	789	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
382	790	cloneGeometriesItem.addActionListener(this);
383		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
384		- shareGeometriesItem.addActionListener(this);
385		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
386		- mergeGeometriesItem.addActionListener(this);
	791	+ }
387	792
388	793	oe.menuBar.add(menu = new Menu("Insert"));
389	794	buildCreateMenu(menu);
390	795
391		-
392		- oe.menuBar.add(menu = new Menu("Include"));
393		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
394		- importGFDItem.addActionListener(this);
395		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
396		- importVRMLX3DItem.addActionListener(this);
397		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
398		- importOBJItem.addActionListener(this);
399		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
400		- import3DSItem.addActionListener(this);
401		-
402	796	oe.menuBar.add(menu = new Menu("Tools"));
403	797	buildToolsMenu(menu);
404	798	}
405	799
	800	+
406	801	void SetupUI2(ObjEditor oe)
407	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	+
408	815	//new Exception().printStackTrace();
409	816
410	817	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -433,153 +840,238 @@
433	840	oe.radioPanel.add(dummyButton);
434	841	oe.buttonGroup.add(dummyButton);
435	842	*/
436		- aConstraints.gridy += 1;
437		- oe.aConstraints.gridwidth = 1;
438		- oe.aConstraints.gridx = 0;
	843	+ cGridBag copyOptionsPanel = new cGridBag();
	844	+
	845	+ copyOptionsPanel.preferredHeight = 2;
439	846
440		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.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");
441	901	liveCB.addItemListener(this);
442	902
443		- oe.aConstraints.gridx += 1;
444		- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
445		- supportCB.addItemListener(this);
446		-
447		- // oe.aConstraints.gridx += 1;
448		- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
449		- // localCB.addItemListener(this);
450		-
451		- oe.aConstraints.gridx += 1;
452		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD), oe.aConstraints);
453		- crowdCB.addItemListener(this);
454		-
455		- oe.aConstraints.gridx += 1;
456		- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
457		- smoothCB.addItemListener(this);
458		-
459		- oe.aConstraints.gridx += 1;
460		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
	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");
461	909	fastCB.addItemListener(this);
462		- oe.aConstraints.gridx += 1;
463		- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
464		- slowCB.addItemListener(this);
465		- oe.aConstraints.gridx += 1;
466		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.FAST), oe.aConstraints);
467		- boxCB.addItemListener(this);
	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);
468	916
469		-// oe.aConstraints.gridx += 1;
470		-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
471		-// speakerMocapCB.addItemListener(this);
472		-
473		- if (false)
474		- {
475		- // handled in scripts
476		- oe.aConstraints.gridx += 1;
477		- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
478		- speakerCameraCB.addItemListener(this);
479		-
480		- oe.aConstraints.gridx += 1;
481		- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
482		- speakerFocusCB.addItemListener(this);
483		-
484		- oe.aConstraints.gridx += 1;
485		- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
486		- smoothfocusCB.addItemListener(this);
487		- }
488		-
489		-//oe.aConstraints.gridx += 1;
490		-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
491		-// debugCB.addItemListener(this);
492		-
493		- oe.aConstraints.gridx += 1;
494		- oe.toolbarPanel.add(oeilCB = new cCheckBox("O", CameraPane.OEIL), oe.aConstraints);
495		- oeilCB.addItemListener(this);
496		-
497		- oe.aConstraints.gridx += 1;
498		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("T", CameraPane.LOOKAT), oe.aConstraints);
499		- lookAtCB.addItemListener(this);
500		-
501		- oe.aConstraints.gridx += 1;
502		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
503		- trackCB.addItemListener(this);
504		-
505		- oe.aConstraints.gridx += 1;
506		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
507		- screenfitButton.addActionListener(this);
508		- oe.aConstraints.gridx += 1;
509	917	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
510	918	// screenfitpointButton.addActionListener(this);
511		-// oe.aConstraints.gridx += 1;
512		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
513		- snapobjectButton.addActionListener(this);
514		- oe.aConstraints.gridx += 1;
515	919
516		- //aConstraints.gridx = 0;
517		- //aConstraints.gridy += 1;
518		- oe.aConstraints.weighty = 0;
519		- oe.aConstraints.gridwidth = 1;
520		-
521		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
522		- flashSelectionButton.addActionListener(this);
523		-
524		- oe.toolbarPanel.add(new cButton(" ", false));
525		-
526		- oe.aConstraints.gridx += 1;
527		- oe.aConstraints.weighty = 0;
528		- oe.aConstraints.gridwidth = 1;
529		-
530		- //
531		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
532		- twoButton.addActionListener(this);
533		- 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);
534	927	fourButton.addActionListener(this);
535		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
536		- sixButton.addActionListener(this);
537		- 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");
538	940	threeButton.addActionListener(this);
539		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
540		- 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);
541	947	//
542	948
543		- 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");
544	951	rootButton.addActionListener(this);
545		- oe.aConstraints.gridx += 1;
546		- 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");
547	955	closeButton.addActionListener(this);
548	956	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
549	957	//clearButton.addActionListener(this);
550		- oe.aConstraints.gridx += 1;
551		-
552		- oe.aConstraints.gridx = 1; //
553		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
554		- editButton.addActionListener(this);
555		- oe.aConstraints.gridx += 1;
556		- oe.aConstraints.weighty = 0;
557		- oe.aConstraints.gridwidth = 1;
558	958
559		- 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");
560	1051	uneditButton.addActionListener(this);
561	1052
562		- oe.aConstraints.gridx += 1;
563		- oe.aConstraints.weighty = 0;
564		- oe.aConstraints.gridwidth = 1;
565		-
566		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
567		- clearPanelButton.addActionListener(this);
568		-
569		- oe.aConstraints.gridx += 1;
570		- oe.aConstraints.weighty = 0;
571		- oe.aConstraints.gridwidth = 1;
572		-
573		- 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");
574	1055	allParamsButton.addActionListener(this);
575	1056
576		- oe.aConstraints.gridx += 1;
577		- oe.aConstraints.weighty = 0;
578		- oe.aConstraints.gridwidth = 1;
579		-
580		- 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");
581	1063	unselectButton.addActionListener(this);
582	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	+
583	1075	// oe.aConstraints.gridx += 1;
584	1076	// oe.aConstraints.weighty = 0;
585	1077	// oe.aConstraints.gridwidth = 1;
..	..	@@ -591,47 +1083,32 @@
591	1083	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
592	1084	// gcButton.addActionListener(this);
593	1085
594		- oe.aConstraints.gridx = 0;
595		- oe.aConstraints.gridy += 1;
596		-
597		- //ctrlPanel.add(objList = new List(5, true));
598		- oe.aConstraints.gridwidth = 100;
599		- // oe.aConstraints.gridheight = 100;
600		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
601		- oe.aConstraints.gridheight = 1;
602		- oe.aConstraints.weighty = 0.5;
603		- oe.aConstraints.gridx = 0;
604		- JScrollPane jSP;
	1086	+ cGridBag jSPPanel = new cGridBag();
	1087	+
	1088	+ JScrollPane jSP;
605	1089	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
606		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	1090	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
607	1091	ResetModel();
608		- oe.aConstraints.weighty = 0.5;
609		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
610		- oe.aConstraints.gridy += 1;
611		- oe.aConstraints.gridwidth = 1;
612		-
613		- oe.aConstraints.weighty = 0;
614		- oe.aConstraints.gridwidth = 2;
615		-
616		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
617		- colorCB.addItemListener(this);
618		- oe.aConstraints.gridx += 2;
619		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
620		- materialCB.addItemListener(this);
621		- oe.aConstraints.gridx += 2;
622		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
623		- textureCB.addItemListener(this);
624		-
625		- oe.aConstraints.gridx = 0;
626		- oe.aConstraints.gridy += 1;
627	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	+
628	1105	//jList.addListSelectionListener(this);
629	1106	oe.jTree.addTreeSelectionListener(this);
630	1107	//jTree.setRootVisible(false);
631	1108	//jTree.setEditable(true);
632	1109	oe.jTree.setDragEnabled(true);
633	1110	//jTree.setPreferredSize(new Dimension(10,10));
634		- jSP.setPreferredSize(new Dimension(100,200));
	1111	+ //jSP.setPreferredSize(new Dimension(100,200));
635	1112
636	1113	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
637	1114
..	..	@@ -643,23 +1120,160 @@
643	1120	dgr.addDragGestureListener(this);
644	1121	}catch(Exception e) {}
645	1122	*/
646		- radio.layout = sevenButton;
	1123	+ radio.layout = sixButton; // sevenButton;
647	1124	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
648	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	+ }
649	1252
650	1253	void EditObject(Object3D obj)
651	1254	{
652	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	+
653	1264	radioButton.SetObject(obj);
654		- radioButton.layout = sevenButton;
	1265	+ radioButton.layout = sixButton; // sevenButton;
655	1266	radioButton.SetCamera(cameraView.renderCamera, false);
656	1267	radioButton.addActionListener(this);
657	1268	radioPanel.add(radioButton);
658	1269	buttonGroup.add(radioButton);
659	1270	radioButton.doClick();
660	1271	}
	1272	+
661	1273	void SetupViews(ObjEditor oe)
662	1274	{
	1275	+ theFrame = this;
	1276	+
663	1277	oe.SetupViews();
664	1278
665	1279	System.out.println("SetupViews");
..	..	@@ -668,22 +1282,28 @@
668	1282	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
669	1283	}
670	1284
671		- JCheckBox liveCB;
672		- JCheckBox supportCB;
673		- JCheckBox localCB;
674		- JCheckBox crowdCB;
675		- JCheckBox smoothCB;
676		- JCheckBox fastCB;
677		- JCheckBox slowCB;
678		- JCheckBox boxCB;
679		- JCheckBox trackCB;
680		- 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;
681	1298	// JCheckBox speakerMocapCB;
682		- JCheckBox speakerCameraCB;
683		- JCheckBox speakerFocusCB;
684		- JCheckBox debugCB;
685		- JCheckBox oeilCB;
686		- JCheckBox lookAtCB;
	1299	+ cCheckBox speakerCameraCB;
	1300	+ cCheckBox speakerFocusCB;
	1301	+ cCheckBox debugCB;
	1302	+
	1303	+ cCheckBox oeilCB;
	1304	+ cCheckBox shadowCB;
	1305	+ cCheckBox autokeepCB;
	1306	+ cCheckBox lookAtCB;
687	1307
688	1308	// static int COLOR = 1;
689	1309	// static int MATERIAL = 2;
..	..	@@ -691,9 +1311,9 @@
691	1311
692	1312	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
693	1313
694		- JCheckBox colorCB;
695		- JCheckBox materialCB;
696		- JCheckBox textureCB;
	1314	+ cCheckBox colorCB;
	1315	+ cCheckBox materialCB;
	1316	+ cCheckBox textureCB;
697	1317
698	1318	public void itemStateChanged(ItemEvent e)
699	1319	{
..	..	@@ -721,6 +1341,7 @@
721	1341	} else if(e.getSource() == liveCB)
722	1342	{
723	1343	cameraView.ToggleLive();
	1344	+ refreshContents(false);
724	1345	}
725	1346	else if(e.getSource() == supportCB)
726	1347	{
..	..	@@ -756,6 +1377,10 @@
756	1377	cameraView.repaint();
757	1378	// refreshContents();
758	1379	}
	1380	+ else if(e.getSource() == zoomBoxCB)
	1381	+ {
	1382	+ cameraView.ToggleZoomBoxMode();
	1383	+ }
759	1384	else if(e.getSource() == smoothfocusCB)
760	1385	{
761	1386	cameraView.ToggleSmoothFocus();
..	..	@@ -781,6 +1406,18 @@
781	1406	{
782	1407	cameraView.ToggleOeil();
783	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	+ }
784	1421	else if(e.getSource() == lookAtCB)
785	1422	{
786	1423	cameraView.ToggleLookAt();
..	..	@@ -797,7 +1434,8 @@
797	1434
798	1435	/**/
799	1436	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
800		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1437	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1438	+ TreePath path = objEditor.jTree.getSelectionPath();
801	1439	if ((path == null) \|\| (path.getPathCount() <= 1)) {
802	1440	// We can't move the root node or an empty selection
803	1441	return;
..	..	@@ -860,8 +1498,6 @@
860	1498	}
861	1499	}
862	1500
863		- String string = (String) object;
864		-
865	1501	System.out.println("Transfer = " + object + "; drop : " + target);
866	1502	// if( object instanceof java.io.File[])
867	1503	// {
..	..	@@ -869,7 +1505,11 @@
869	1505	// objEditor.DropFile((java.io.File[]) object, true);
870	1506	// return;
871	1507	// }
872		- 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) == ':')
873	1513	{
874	1514	// file(s)
875	1515	String[] names = string.split("\n");
..	..	@@ -896,7 +1536,7 @@
896	1536
897	1537	flashIt = false;
898	1538	CameraPane pane = (CameraPane) target;
899		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1539	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
900	1540	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
901	1541
902	1542	if (group.selection.size() == 1)
..	..	@@ -912,23 +1552,33 @@
912	1552
913	1553	assert target == objEditor.jTree;
914	1554	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1555	+ Object3D destinationLeaf;
915	1556	try {
916		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1557	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
917	1558	} catch (Exception e) {
918	1559	System.out.println("destinationPath : " + destinationPath);
919	1560	return;
920	1561	}
921	1562
922		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1563	+ for (int i=group.selection.size(); --i>=0;)
923	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	+// {
924	1574	loadClipboard(true);
925	1575	objEditor.jTree.setSelectionPath(destinationPath);
926		- pasteInto(false);
927		- } else {
928		- loadClipboard(false);
929		- objEditor.jTree.setSelectionPath(destinationPath);
930		- pasteInto(false); // true); // ???
931		- }
	1576	+ pasteInto(false, false);
	1577	+// } else {
	1578	+// loadClipboard(false);
	1579	+// objEditor.jTree.setSelectionPath(destinationPath);
	1580	+// pasteInto(false, false); // true); // ???
	1581	+// }
932	1582	}
933	1583	public void dropActionChanged(DropTargetDragEvent dtde)
934	1584	// Called if the user has modified the current drop gesture
..	..	@@ -1033,85 +1683,107 @@
1033	1683	{
1034	1684	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1035	1685	//heightFieldItem.addActionListener(this);
1036		- gridItem = menu.add(new MenuItem("Grid"));
1037		- gridItem.addActionListener(this);
1038		- rectoidItem = menu.add(new MenuItem("Box"));
1039		- rectoidItem.addActionListener(this);
1040		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1041		- ellipsoidItem.addActionListener(this);
1042		- coneItem = menu.add(new MenuItem("Cone"));
1043		- coneItem.addActionListener(this);
1044		- torusItem = menu.add(new MenuItem("Torus"));
1045		- torusItem.addActionListener(this);
1046		- superItem = menu.add(new MenuItem("Superellipsoid"));
1047		- superItem.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	+ {
1048	1704	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1049	1705	kleinItem.addActionListener(this);
1050		- particleItem = menu.add(new MenuItem("Particle system"));
1051		- particleItem.addActionListener(this);
	1706	+ }
	1707	+
	1708	+// particleItem = menu.add(new MenuItem("Particle system"));
	1709	+// particleItem.addActionListener(this);
	1710	+ if (Globals.ADVANCED)
	1711	+ {
1052	1712	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1053	1713	ragdollItem.addActionListener(this);
1054	1714	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1055	1715	ragdoll2Item.addActionListener(this);
	1716	+ }
1056	1717	menu.add("-");
1057		- meshItem = menu.add(new MenuItem("Mesh"));
	1718	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1058	1719	meshItem.addActionListener(this);
1059	1720	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1060	1721	// meshGroupItem.addActionListener(this);
	1722	+ if (Globals.ADVANCED)
	1723	+ {
1061	1724	springItem = menu.add(new MenuItem("Spring"));
1062	1725	springItem.addActionListener(this);
1063	1726	flagItem = menu.add(new MenuItem("Flag"));
1064	1727	flagItem.addActionListener(this);
1065		- bezierItem = menu.add(new MenuItem("Patch"));
1066		- bezierItem.addActionListener(this);
1067		- checkerItem = menu.add(new MenuItem("Checker"));
1068		- checkerItem.addActionListener(this);
1069	1728	blobItem = menu.add(new MenuItem("Blob"));
1070	1729	blobItem.addActionListener(this);
1071	1730	latheItem = menu.add(new MenuItem("Lathe"));
1072	1731	latheItem.addActionListener(this);
1073		- lightItem = menu.add(new MenuItem("Light"));
1074		- 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);
1075	1739	menu.add("-");
1076	1740	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1077	1741	//superLoopItem.addActionListener(this);
1078		- loopItem = menu.add(new MenuItem("Loop"));
1079		- loopItem.addActionListener(this);
	1742	+// loopItem = menu.add(new MenuItem("Loop"));
	1743	+// loopItem.addActionListener(this);
1080	1744	doubleItem = menu.add(new MenuItem("Fork"));
1081	1745	doubleItem.addActionListener(this);
	1746	+ if (Globals.ADVANCED)
	1747	+ {
1082	1748	tripleItem = menu.add(new MenuItem("Trident"));
1083	1749	tripleItem.addActionListener(this);
	1750	+ }
1084	1751	}
1085	1752
1086	1753	void buildToolsMenu(Menu menu)
1087	1754	{
1088	1755	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1089	1756	animationItem.addItemListener(this);
1090		- animationItem.setState(CameraPane.ANIMATION);
	1757	+ animationItem.setState(Globals.ANIMATION);
	1758	+
	1759	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1760	+ archiveItem.addActionListener(this);
1091	1761
1092	1762	menu.add("-");
1093	1763	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1094	1764	parseverticesItem.addActionListener(this);
1095	1765	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1096	1766	textureFieldItem.addActionListener(this);
1097		- alignItem = menu.add(new MenuItem("Align"));
	1767	+ alignItem = menu.add(new MenuItem("Align Objects"));
1098	1768	alignItem.addActionListener(this);
1099		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1100		- mirrorItem.addActionListener(this);
1101	1769	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1102	1770	reduceMorphItem.addActionListener(this);
1103	1771	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1104	1772	reduce34MorphItem.addActionListener(this);
1105		-
1106		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1107		- computeAOItem.addActionListener(this);
1108	1773	menu.add("-");
1109		-
1110	1774	menu.add(memoryItem = new MenuItem("Memory Usage"));
1111	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("-");
1112	1784	menu.add(analyzeItem = new MenuItem("Analyze"));
1113	1785	analyzeItem.addActionListener(this);
1114		- menu.add(dumpItem = new MenuItem("Dump"));
	1786	+ menu.add(dumpItem = new MenuItem("Print"));
1115	1787	dumpItem.addActionListener(this);
1116	1788	// menu.add(pathItem = new MenuItem("From-to path"));
1117	1789	// pathItem.addActionListener(this);
..	..	@@ -1129,6 +1801,7 @@
1129	1801	menu.add("-");
1130	1802	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1131	1803	editScriptItem.addActionListener(this);
	1804	+ }
1132	1805	}
1133	1806
1134	1807	void ScreenFit()
..	..	@@ -1251,9 +1924,34 @@
1251	1924	shadow.material = new cMaterial(obj.material);
1252	1925	shadow.material.diffuse = 0.0001f;
1253	1926	shadow.material.specular = 0.0001f;
	1927	+ //shadow.projectedVertices[1].x = 300;
1254	1928
1255	1929	makeSomething(shadow);
1256	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	+ }
1257	1955
1258	1956	/**
1259	1957	* applyExample
..	..	@@ -1457,9 +2155,9 @@
1457	2155
1458	2156	void Overwrite(int mask)
1459	2157	{
1460		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2158	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1461	2159	{
1462		- Object3D content = GrafreeD.clipboard.get(0);
	2160	+ Object3D content = Grafreed.clipboard.get(0);
1463	2161
1464	2162	if (content instanceof cGroup && ((cGroup)content).transientlink )
1465	2163	content = ((cGroup)content).get(0);
..	..	@@ -1482,6 +2180,7 @@
1482	2180	//
1483	2181	public void actionPerformed(ActionEvent event) // , Object arg)
1484	2182	{
	2183	+ Object source = event.getSource();
1485	2184	/*
1486	2185	if (event.getSource() == nameField)
1487	2186	{
..	..	@@ -1493,11 +2192,11 @@
1493	2192	}
1494	2193	else
1495	2194	*/
1496		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	2195	+ if (source == lookAtItem \|\| source == lookFromItem)
1497	2196	{
1498	2197	ScreenFit();
1499	2198	} else
1500		- if (event.getSource() == switchItem)
	2199	+ if (source == switchViewItem)
1501	2200	{
1502	2201	cVector v1 = new cVector();
1503	2202	cVector v2 = new cVector();
..	..	@@ -1506,11 +2205,11 @@
1506	2205	objEditor.cameraView.renderCamera.setAim(v2, v1);
1507	2206	objEditor.cameraView.repaint();
1508	2207	} else
1509		- if (event.getSource() == rectoidItem)
	2208	+ if (source == rectoidItem \|\| source == boxButton)
1510	2209	{
1511	2210	makeSomething(new Box());
1512	2211	} else
1513		- if (event.getSource() == particleItem)
	2212	+ if (source == particleItem \|\| source == particlesButton)
1514	2213	{
1515	2214	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1516	2215	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1531,9 +2230,9 @@
1531	2230	applyExample(particleGeom, "SMOKE");
1532	2231	makeSomething(particleGeom);
1533	2232	} else
1534		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	2233	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1535	2234	{
1536		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	2235	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1537	2236
1538	2237	ragdoll.toParent = LA.newMatrix();
1539	2238	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1551,7 +2250,7 @@
1551	2250	} else
1552	2251	/*
1553	2252	*/
1554		- if (event.getSource() == heightFieldItem)
	2253	+ if (source == heightFieldItem)
1555	2254	{
1556	2255	Object3D obj = new Object3D();
1557	2256
..	..	@@ -1589,31 +2288,31 @@
1589	2288
1590	2289	makeSomething(obj);
1591	2290	} else
1592		- if (event.getSource() == gridItem)
	2291	+ if (source == gridItem \|\| source == gridButton)
1593	2292	{
1594	2293	makeSomething(new Grid());
1595	2294	} else
1596		- if (event.getSource() == ellipsoidItem)
	2295	+ if (source == ellipsoidItem \|\| source == sphereButton)
1597	2296	{
1598	2297	makeSomething(new Sphere());
1599	2298	} else
1600		- if (event.getSource() == coneItem)
	2299	+ if (source == coneItem \|\| source == coneButton)
1601	2300	{
1602	2301	makeSomething(new Cone());
1603	2302	} else
1604		- if (event.getSource() == torusItem)
	2303	+ if (source == torusItem \|\| source == torusButton)
1605	2304	{
1606	2305	makeSomething(new Torus());
1607	2306	} else
1608		- if (event.getSource() == superItem)
	2307	+ if (source == superItem \|\| source == superButton)
1609	2308	{
1610	2309	makeSomething(new Superellipsoid());
1611	2310	} else
1612		- if (event.getSource() == kleinItem)
	2311	+ if (source == kleinItem \|\| source == kleinButton)
1613	2312	{
1614	2313	makeSomething(new Klein());
1615	2314	} else
1616		- if (event.getSource() == blobItem)
	2315	+ if (source == blobItem)
1617	2316	{
1618	2317	Blob blob = new Blob();
1619	2318	BlobComponent comp = new BlobComponent();
..	..	@@ -1621,15 +2320,15 @@
1621	2320	//blob.retile();
1622	2321	makeSomething(blob);
1623	2322	} else
1624		- if (event.getSource() == latheItem)
	2323	+ if (source == latheItem)
1625	2324	{
1626	2325	makeSomething(new Lathe());
1627	2326	} else
1628		- if (event.getSource() == bezierItem)
	2327	+ if (source == bezierItem)
1629	2328	{
1630	2329	makeSomething(new BezierSurface());
1631	2330	} else
1632		- if (event.getSource() == checkerItem)
	2331	+ if (source == overlayItem \|\| source == overlayButton)
1633	2332	{
1634	2333	/*
1635	2334	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1644,7 +2343,7 @@
1644	2343	*/
1645	2344	makeSomething(new Checker());
1646	2345	} else
1647		- if (event.getSource() == meshItem)
	2346	+ if (source == meshItem)
1648	2347	{
1649	2348	Object3D itemtomake = new Object3D();
1650	2349	Object3D child;
..	..	@@ -1665,35 +2364,52 @@
1665	2364	makeSomething(child);
1666	2365	}
1667	2366	} else
1668		- if (event.getSource() == springItem)
	2367	+ if (source == springItem)
1669	2368	{
1670	2369	cSpring s = new cSpring();
1671	2370	s.setup();
1672	2371	makeSomething(s);
1673	2372	} else
1674		- if (event.getSource() == flagItem)
	2373	+ if (source == flagItem)
1675	2374	{
1676	2375	cSpring s = new cFlag();
1677	2376	s.setup();
1678	2377	makeSomething(s);
1679	2378	} else
1680		- if (event.getSource() == lightItem)
	2379	+ if (source == lightItem \|\| source == lightButton)
1681	2380	{
1682	2381	makeSomething(new Light());
1683	2382	} else
1684		- 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)
1685	2401	{
1686	2402	group(new CSG());
1687	2403	} else
1688		- if (event.getSource() == templateItem)
	2404	+ if (source == templateItem)
1689	2405	{
1690	2406	group(new cTemplate());
1691	2407	} else
1692		- if (event.getSource() == attributeItem)
	2408	+ if (source == attributeItem)
1693	2409	{
1694	2410	makeSomething(new Attribute());
1695	2411	} else
1696		- if (event.getSource() == pointflowItem)
	2412	+ if (source == pointflowItem)
1697	2413	{
1698	2414	makeSomething(new PointFlow());
1699	2415	} else
..	..	@@ -1705,7 +2421,7 @@
1705	2421	} else
1706	2422	*/
1707	2423
1708		- if (event.getSource() == superLoopItem)
	2424	+ if (source == superLoopItem)
1709	2425	{
1710	2426	Composite g = new cGroup();
1711	2427	for (int i=0; i<15; i++)
..	..	@@ -1727,30 +2443,30 @@
1727	2443
1728	2444	group(g);
1729	2445	} else
1730		- if (event.getSource() == loopItem)
	2446	+ if (source == loopItem \|\| source == loopButton)
1731	2447	{
1732	2448	Composite csg = new GroupLeaf();
1733	2449	csg.count = 5;
1734	2450	group(csg);
1735		- Composite child = new cGroup();
	2451	+ Composite child = new cGroup("Branch");
1736	2452	csg.addChild(child);
1737	2453	child.addChild(csg);
1738	2454	} else
1739		- if (event.getSource() == doubleItem)
	2455	+ if (source == doubleItem)
1740	2456	{
1741		- Composite csg = new GroupLeaf();
	2457	+ Composite csg = new GroupLeaf("Fork");
1742	2458	csg.count = 5;
1743	2459	group(csg);
1744		- Composite child = new cGroup();
	2460	+ Composite child = new cGroup("Branch A");
1745	2461	csg.addChild(child);
1746	2462	child.addChild(csg);
1747		- child = new cGroup();
	2463	+ child = new cGroup("Branch B");
1748	2464	csg.addChild(child);
1749	2465	child.addChild(csg);
1750	2466	} else
1751		- if (event.getSource() == tripleItem)
	2467	+ if (source == tripleItem)
1752	2468	{
1753		- Composite csg = new GroupLeaf();
	2469	+ Composite csg = new GroupLeaf("Trident");
1754	2470	csg.count = 4;
1755	2471	group(csg);
1756	2472	Composite child = new cGroup();
..	..	@@ -1763,73 +2479,98 @@
1763	2479	csg.addChild(child);
1764	2480	child.addChild(csg);
1765	2481	} else
1766		-
1767		- if (event.getSource() == importGFDItem)
1768		- {
1769		- ImportGFD();
1770		- } else
1771		- if (event.getSource() == importVRMLX3DItem)
1772		- {
1773		- ImportVRMLX3D();
1774		- } else
1775		- if (event.getSource() == import3DSItem)
1776		- {
1777		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1778		- } else
1779		- if (event.getSource() == importOBJItem)
1780		- {
1781		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1782		- } else
1783		- if (event.getSource() == computeAOItem)
	2482	+ if (source == computeAOItem)
1784	2483	{
1785	2484	Globals.drawMode = CameraPane.OCCLUSION;
1786		- Globals.theRenderer.repaint();
	2485	+ cameraView.repaint();
1787	2486	} else
1788		- if (event.getSource() == recompileItem)
	2487	+ if (source == recompileItem)
1789	2488	{
1790	2489	Recompile();
1791	2490	refreshContents();
1792	2491	} else
1793		- if (event.getSource() == editScriptItem)
	2492	+ if (source == editScriptItem)
1794	2493	{
1795	2494	OpenDialog();
1796	2495	refreshContents();
1797	2496	} else
1798		- if (event.getSource() == invariantsItem)
	2497	+ if (source == invariantsItem)
1799	2498	{
1800	2499	System.out.println("Invariants:");
1801		- GrafreeD.grafreeD.universe.invariants();
	2500	+ Grafreed.grafreeD.universe.invariants();
1802	2501	} else
1803		- if (event.getSource() == memoryItem)
	2502	+ if (source == memoryItem)
1804	2503	{
1805	2504	//System.out.println("Invariants:");
1806	2505	PrintMemory();
1807	2506	} else
1808		- if (event.getSource() == pathItem)
	2507	+ if (source == pathItem)
1809	2508	{
1810	2509	PrintPath();
1811	2510	} else
1812		- if (event.getSource() == analyzeItem)
	2511	+ if (source == analyzeItem)
1813	2512	{
1814	2513	AnalyzeObject();
1815	2514	} else
1816		- if (event.getSource() == dumpItem)
	2515	+ if (source == dumpItem)
1817	2516	{
1818	2517	DumpObject();
1819	2518	} else
1820		- if (event.getSource() == screenfitButton)
	2519	+ if (source == minButton)
1821	2520	{
1822		- //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	+ {
1823	2566	ScreenFit();
1824	2567	} else
1825		- if (event.getSource() == screenfitpointButton)
	2568	+ if (source == screenfitpointButton)
1826	2569	{
1827		- //Reload(lastConverter, lastFilename, true);
1828	2570	ScreenFitPoint();
1829	2571	} else
1830		- if (event.getSource() == snapobjectButton)
	2572	+ if (source == snapobjectButton)
1831	2573	{
1832		- //Reload(lastConverter, lastFilename, true);
1833	2574	SnapObject();
1834	2575	} else
1835	2576	// if (event.getSource() == recompileButton)
..	..	@@ -1838,13 +2579,13 @@
1838	2579	// Recompile();
1839	2580	// refreshContents();
1840	2581	// } else
1841		- if (event.getSource() == gcButton)
	2582	+ if (source == gcButton)
1842	2583	{
1843	2584	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1844	2585	System.gc();
1845	2586	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1846	2587	} else
1847		- if (event.getSource() == editLeafItem)
	2588	+ if (source == editLeafItem)
1848	2589	{
1849	2590	Object3D obj;
1850	2591	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1858,62 +2599,74 @@
1858	2599	}
1859	2600	refreshContents(true);
1860	2601	} else
1861		- if (event.getSource() == openWindowItem)
	2602	+ if (source == openWindowItem)
1862	2603	{
1863	2604	EditSelection(true);
1864	2605	} else
1865		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2606	+ if (source == cutItem \|\| source == clearButton)
1866	2607	{
1867	2608	loadClipboard(true);
1868	2609	} else
1869		- if (event.getSource() == duplicateItem)
	2610	+ if (source == undoItem)
1870	2611	{
1871		- Object3D keep = GrafreeD.clipboard;
	2612	+ Undo();
	2613	+ } else
	2614	+ if (source == redoItem)
	2615	+ {
	2616	+ Redo();
	2617	+ } else
	2618	+ if (source == duplicateItem)
	2619	+ {
	2620	+ Object3D keep = Grafreed.clipboard;
1872	2621	loadClipboard(false);
1873	2622	paste(false);
1874		- GrafreeD.clipboard = keep;
	2623	+ Grafreed.clipboard = keep;
1875	2624	} else
1876		- if (event.getSource() == cloneItem)
	2625	+ if (source == cloneItem)
1877	2626	{
1878	2627	CloneSelection(false);
1879	2628	} else
1880		- if (event.getSource() == cloneSupportItem)
	2629	+ if (source == cloneSupportItem)
1881	2630	{
1882	2631	CloneSelection(true);
1883	2632	} else
1884		- if (event.getSource() == copyItem)
	2633	+ if (source == copyItem)
1885	2634	{
1886	2635	loadClipboard(false);
1887	2636	} else
1888		- if (event.getSource() == pasteItem)
	2637	+ if (source == pasteItem)
1889	2638	{
1890	2639	paste(false);
1891	2640	} else
1892		- if (event.getSource() == pasteLinkItem)
	2641	+ if (source == pasteIntoItem)
1893	2642	{
1894		- pasteInto(false);
	2643	+ pasteInto(true, false);
1895	2644	} else
1896		- if (event.getSource() == pasteCloneItem)
	2645	+ if (source == pasteLinkItem)
1897	2646	{
1898		- pasteInto(true);
	2647	+ pasteInto(false, false);
1899	2648	} else
1900		- if (event.getSource() == pasteExpandItem)
	2649	+ if (source == pasteCloneItem)
	2650	+ {
	2651	+ pasteInto(true, true);
	2652	+ } else
	2653	+ if (source == pasteExpandItem)
1901	2654	{
1902	2655	paste(true);
1903	2656	} else
1904		- if (event.getSource() == synchronizeItem)
	2657	+ if (source == synchronizeItem)
1905	2658	{
1906	2659	Overwrite(Object3D.TRANSFORM);
1907	2660	} else
1908		- if (event.getSource() == overwriteNameItem)
	2661	+ if (source == overwriteNameItem)
1909	2662	{
1910	2663	Overwrite(Object3D.NAME);
1911	2664	} else
1912		- if (event.getSource() == overwriteUVItem)
	2665	+ if (source == overwriteUVItem)
1913	2666	{
1914	2667	Overwrite(Object3D.UV);
1915	2668	} else
1916		- if (event.getSource() == overwriteMatItem)
	2669	+ if (source == overwriteMatItem)
1917	2670	{
1918	2671	/* july 2015
1919	2672	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1933,7 +2686,7 @@
1933	2686
1934	2687	Overwrite(dropAttributes);
1935	2688	}
1936		- if (event.getSource() == overwriteGeoItem)
	2689	+ if (source == overwriteGeoItem)
1937	2690	{
1938	2691	Overwrite(Object3D.GEOMETRY);
1939	2692	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1950,7 +2703,7 @@
1950	2703	// refreshContents();
1951	2704	// }
1952	2705	} else
1953		- if (event.getSource() == generateMeshItem)
	2706	+ if (source == generateMeshItem)
1954	2707	{
1955	2708	//if (group.selection.size() == 1)
1956	2709	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1961,7 +2714,7 @@
1961	2714	ResetModel();
1962	2715	refreshContents();
1963	2716	} else
1964		- if (event.getSource() == extractGeometriesItem)
	2717	+ if (source == extractGeometriesItem)
1965	2718	{
1966	2719	boolean one = false;
1967	2720
..	..	@@ -1988,7 +2741,7 @@
1988	2741	ResetModel();
1989	2742	refreshContents();
1990	2743	} else
1991		- if (event.getSource() == cloneGeometriesItem)
	2744	+ if (source == cloneGeometriesItem)
1992	2745	{
1993	2746	boolean one = false;
1994	2747
..	..	@@ -2014,7 +2767,7 @@
2014	2767	ResetModel();
2015	2768	refreshContents();
2016	2769	} else
2017		- if (event.getSource() == shareGeometriesItem)
	2770	+ if (source == shareGeometriesItem)
2018	2771	{
2019	2772	boolean one = false;
2020	2773
..	..	@@ -2044,7 +2797,7 @@
2044	2797	refreshContents();
2045	2798	}
2046	2799	} else
2047		- if (event.getSource() == mergeGeometriesItem)
	2800	+ if (source == mergeGeometriesItem)
2048	2801	{
2049	2802	boolean one = false;
2050	2803
..	..	@@ -2074,7 +2827,7 @@
2074	2827	ResetModel();
2075	2828	refreshContents();
2076	2829	} else
2077		- if (event.getSource() == linkverticesItem)
	2830	+ if (source == linkverticesItem)
2078	2831	{
2079	2832	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2080	2833	// {
..	..	@@ -2087,9 +2840,9 @@
2087	2840	// group.selection.get(0).setMasterThis(content); // should be identity
2088	2841	// refreshContents();
2089	2842	// }
2090		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2843	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2091	2844	{
2092		- Object3D content = GrafreeD.clipboard.get(0);
	2845	+ Object3D content = Grafreed.clipboard.get(0);
2093	2846
2094	2847	if (content instanceof cGroup && ((cGroup)content).transientlink )
2095	2848	content = ((cGroup)content).get(0);
..	..	@@ -2097,38 +2850,38 @@
2097	2850	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2098	2851	for (int i=0; i<group.selection.size(); i++)
2099	2852	{
2100		- boolean random = CameraPane.RANDOM;
2101		- CameraPane.RANDOM = false; // parse all random nodes
	2853	+ boolean random = CameraPane.SWITCH;
	2854	+ CameraPane.SWITCH = false; // parse all random nodes
2102	2855	group.selection.get(i).linkVerticesThis(content);
2103	2856	// group.selection.get(i).setMasterThis(content); // should be identity
2104		- CameraPane.RANDOM = random;
	2857	+ CameraPane.SWITCH = random;
2105	2858	}
2106	2859	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2107	2860	refreshContents();
2108	2861	}
2109	2862	} else
2110		- if (event.getSource() == resetsupportItem)
	2863	+ if (source == resetsupportItem)
2111	2864	{
2112	2865	for (int i=0; i<group.selection.size(); i++)
2113	2866	{
2114		- boolean random = CameraPane.RANDOM;
2115		- CameraPane.RANDOM = false; // parse all random nodes
	2867	+ boolean random = CameraPane.SWITCH;
	2868	+ CameraPane.SWITCH = false; // parse all random nodes
2116	2869	group.selection.get(i).linkVerticesThis(null);
2117		- CameraPane.RANDOM = random;
	2870	+ CameraPane.SWITCH = random;
2118	2871	}
2119	2872
2120	2873	refreshContents();
2121	2874	} else
2122		- if (event.getSource() == relinkverticesItem)
	2875	+ if (source == relinkverticesItem)
2123	2876	{
2124		- boolean random = CameraPane.RANDOM;
2125		- CameraPane.RANDOM = false; // parse all random nodes
	2877	+ boolean random = CameraPane.SWITCH;
	2878	+ CameraPane.SWITCH = false; // parse all random nodes
2126	2879	group.selection.RelinkToSupport();
2127		- CameraPane.RANDOM = random;
	2880	+ CameraPane.SWITCH = random;
2128	2881
2129	2882	refreshContents();
2130	2883	} else
2131		- if (event.getSource() == resetreferencesItem)
	2884	+ if (source == resetreferencesItem)
2132	2885	{
2133	2886	for (int i=0; i<group.selection.size(); i++)
2134	2887	{
..	..	@@ -2137,11 +2890,11 @@
2137	2890
2138	2891	refreshContents();
2139	2892	} else
2140		- if (event.getSource() == setMasterItem)
	2893	+ if (source == setMasterItem)
2141	2894	{
2142		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2895	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2143	2896	{
2144		- Object3D content = GrafreeD.clipboard.get(0);
	2897	+ Object3D content = Grafreed.clipboard.get(0);
2145	2898
2146	2899	if (content instanceof cGroup && ((cGroup)content).transientlink )
2147	2900	content = ((cGroup)content).get(0);
..	..	@@ -2150,13 +2903,13 @@
2150	2903	refreshContents();
2151	2904	}
2152	2905	} else
2153		- if (event.getSource() == poseMeshItem)
	2906	+ if (source == poseMeshItem)
2154	2907	{
2155	2908	if (group.selection.size() == 1)
2156	2909	{
2157		- if (GrafreeD.clipboard.size() == 1)
	2910	+ if (Grafreed.clipboard.size() == 1)
2158	2911	{
2159		- Object3D content = GrafreeD.clipboard.get(0);
	2912	+ Object3D content = Grafreed.clipboard.get(0);
2160	2913
2161	2914	if (content instanceof cGroup && ((cGroup)content).transientlink )
2162	2915	content = ((cGroup)content).get(0);
..	..	@@ -2169,19 +2922,19 @@
2169	2922	}
2170	2923
2171	2924	} else
2172		- if (event.getSource() == revertMeshItem)
	2925	+ if (source == revertMeshItem)
2173	2926	{
2174	2927	RevertMeshes();
2175	2928	} else
2176		- if (event.getSource() == resetMeshItem)
	2929	+ if (source == resetAllItem)
2177	2930	{
2178	2931	ResetAll();
2179	2932	} else
2180		- if (event.getSource() == stepAllItem)
	2933	+ if (source == stepAllItem)
2181	2934	{
2182	2935	StepAll();
2183	2936	} else
2184		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2937	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2185	2938	{
2186	2939	//int indices[] = jList.getSelectedIndices();
2187	2940	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2189,46 +2942,46 @@
2189	2942
2190	2943	ClearSelection(false);
2191	2944	} else
2192		- if (event.getSource() == clearAllItem)
	2945	+ if (source == clearAllItem)
2193	2946	{
2194	2947	ClearSelection(true);
2195	2948	} else
2196		- if (event.getSource() == grabItem)
	2949	+ if (source == grabItem \|\| source == groupButton)
2197	2950	{
2198		- group(new cGroup(), true);
	2951	+ group(new cGroup(), false); // true);
2199	2952	} else
2200		- if (event.getSource() == hideItem)
	2953	+ if (source == hideItem)
2201	2954	{
2202	2955	group(new HiddenObject());
2203	2956	} else
2204		- if (event.getSource() == frontItem)
	2957	+ if (source == frontItem)
2205	2958	{
2206	2959	front();
2207	2960	} else
2208		- if (event.getSource() == backItem)
	2961	+ if (source == backItem)
2209	2962	{
2210	2963	back();
2211	2964	} else
2212		- if (event.getSource() == cameraItem)
	2965	+ if (source == cameraItem)
2213	2966	{
2214	2967	makeSomething(new Camera());
2215	2968	} else
2216		- if (event.getSource() == compositeItem)
	2969	+ if (source == compositeItem \|\| source == compositeButton)
2217	2970	{
2218	2971	group(new Composite());
2219	2972	} else
2220		- if (event.getSource() == randomItem)
	2973	+ if (source == switchItem \|\| source == switchButton)
2221	2974	{
2222	2975	RandomNode random = new RandomNode();
2223	2976	group(random);
2224	2977	if (random.size() > 0)
2225		- random.name = random.get(0).name + "Rnd";
	2978	+ random.name = random.get(0).name + "Switch";
2226	2979	} else
2227		- if (event.getSource() == physicsItem)
	2980	+ if (source == physicsItem)
2228	2981	{
2229	2982	group(new PhysicsNode());
2230	2983	} else
2231		- if (event.getSource() == frameselectorItem)
	2984	+ if (source == frameselectorItem)
2232	2985	{
2233	2986	for (int i=0; i<group.selection.size(); i++)
2234	2987	{
..	..	@@ -2240,7 +2993,7 @@
2240	2993	ResetModel();
2241	2994	refreshContents();
2242	2995	} else
2243		- if (event.getSource() == switchGeoItem)
	2996	+ if (source == switchGeoItem)
2244	2997	{
2245	2998	for (int i=0; i<group.selection.size(); i++)
2246	2999	{
..	..	@@ -2252,7 +3005,7 @@
2252	3005	ResetModel();
2253	3006	refreshContents();
2254	3007	} else
2255		- if (event.getSource() == switchTransfoItem)
	3008	+ if (source == switchTransfoItem)
2256	3009	{
2257	3010	for (int i=0; i<group.selection.size(); i++)
2258	3011	{
..	..	@@ -2264,7 +3017,7 @@
2264	3017	ResetModel();
2265	3018	refreshContents();
2266	3019	} else
2267		- if (event.getSource() == morphItem)
	3020	+ if (source == morphItem)
2268	3021	{
2269	3022	for (int i=0; i<group.selection.size(); i++)
2270	3023	{
..	..	@@ -2276,7 +3029,7 @@
2276	3029	ResetModel();
2277	3030	refreshContents();
2278	3031	} else
2279		- if (event.getSource() == scriptNodeItem)
	3032	+ if (source == scriptNodeItem)
2280	3033	{
2281	3034	boolean atleastone = false;
2282	3035
..	..	@@ -2315,215 +3068,252 @@
2315	3068	}
2316	3069	}
2317	3070	} else
2318		- if (event.getSource() == linkerItem)
	3071	+ if (source == linkerItem)
2319	3072	{
2320	3073	group(new cLinker());
2321	3074	} else
2322		- if (event.getSource() == textureItem)
	3075	+ if (source == textureItem \|\| source == textureButton)
2323	3076	{
2324	3077	group(new TextureNode());
2325	3078	} else
2326		- if (event.getSource() == billboardItem)
	3079	+ if (source == billboardItem)
2327	3080	{
2328	3081	group(new BillboardNode());
2329	3082	} else
2330		- if (event.getSource() == shadowXItem)
	3083	+ if (source == shadowXItem)
2331	3084	{
2332	3085	CastShadow(0);
2333	3086	} else
2334		- if (event.getSource() == shadowYItem)
	3087	+ if (source == shadowYItem)
2335	3088	{
2336	3089	CastShadow(1);
2337	3090	} else
2338		- if (event.getSource() == shadowZItem)
	3091	+ if (source == shadowZItem)
2339	3092	{
2340	3093	CastShadow(2);
2341	3094	} else
2342		- if (event.getSource() == ungroupItem)
	3095	+ if (source == ungroupItem \|\| source == ungroupButton)
2343	3096	{
2344		- //ungroup();
	3097	+ boolean hasRoot = false;
	3098	+
2345	3099	for (int i=0; i<group.selection.size(); i++)
2346	3100	{
2347		- Ungroup(group.selection.get(i));
	3101	+ if (group.selection.get(i) == group)
	3102	+ {
	3103	+ hasRoot = true;
	3104	+ break;
	3105	+ }
2348	3106	}
2349	3107
2350		- ClearSelection(false);
2351		-
2352		- refreshContents();
	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	+ }
2353	3119	} else
2354		- if (event.getSource() == genUVItem)
	3120	+ if (source == genUVItem)
2355	3121	{
2356	3122	GenUV();
2357	3123	} else
2358		- if (event.getSource() == genNormalsCADItem)
	3124	+ if (source == genNormalsCADItem)
2359	3125	{
2360	3126	GenNormals(true);
2361	3127	} else
2362		- if (event.getSource() == genNormalsMESHItem)
	3128	+ if (source == genNormalsMESHItem)
2363	3129	{
2364		- GenNormals(true); // TODO
	3130	+ GenNormalsMESH();
2365	3131	} else
2366		- if (event.getSource() == genNormalsORGANItem)
	3132	+ if (source == genNormalsORGANItem)
2367	3133	{
2368	3134	GenNormals(false);
2369	3135	} else
2370		- if (event.getSource() == genNormalsMINEItem)
	3136	+ if (source == genNormalsMINEItem)
2371	3137	{
2372	3138	GenNormalsMINE();
2373	3139	} else
2374		- if (event.getSource() == stripifyItem)
	3140	+ if (source == stripifyItem)
2375	3141	{
2376	3142	Stripify();
2377	3143	} else
2378		- if (event.getSource() == unstripifyItem)
	3144	+ if (source == unstripifyItem)
2379	3145	{
2380	3146	Unstripify();
2381	3147	} else
2382		- if (event.getSource() == trimItem)
	3148	+ if (source == trimItem)
2383	3149	{
2384	3150	Trim();
2385	3151	} else
2386		- if (event.getSource() == untrimItem)
	3152	+ if (source == untrimItem)
2387	3153	{
2388	3154	Untrim();
2389	3155	} else
2390		- if (event.getSource() == clearColorsItem)
	3156	+ if (source == clearColorsItem)
2391	3157	{
2392	3158	ClearColors();
2393	3159	} else
2394		- if (event.getSource() == clearMaterialsItem)
	3160	+ if (source == clearMaterialsItem)
2395	3161	{
2396	3162	ClearMaterials();
2397	3163	} else
2398		- if (event.getSource() == liveleavesItem)
	3164	+ if (source == liveleavesItem)
2399	3165	{
2400	3166	LiveLeaves(true);
2401	3167	} else
2402		- if (event.getSource() == unliveleavesItem)
	3168	+ if (source == unliveleavesItem)
2403	3169	{
2404	3170	LiveLeaves(false);
2405	3171	} else
2406		- if (event.getSource() == supportleavesItem)
	3172	+ if (source == supportleavesItem)
2407	3173	{
2408	3174	SupportLeaves(true);
2409	3175	} else
2410		- if (event.getSource() == unsupportleavesItem)
	3176	+ if (source == unsupportleavesItem)
2411	3177	{
2412	3178	SupportLeaves(false);
2413	3179	} else
2414		- if (event.getSource() == hideleavesItem)
	3180	+ if (source == hideleavesItem)
2415	3181	{
2416	3182	HideLeaves(true);
2417	3183	} else
2418		- if (event.getSource() == showleavesItem)
	3184	+ if (source == showleavesItem)
2419	3185	{
2420	3186	HideLeaves(false);
2421	3187	} else
2422		- if (event.getSource() == markleavesItem)
	3188	+ if (source == markleavesItem)
2423	3189	{
2424	3190	MarkLeaves(true);
2425	3191	} else
2426		- if (event.getSource() == unmarkleavesItem)
	3192	+ if (source == unmarkleavesItem)
2427	3193	{
2428	3194	MarkLeaves(false);
2429	3195	} else
2430		- 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)
2431	3213	{
2432	3214	FlipV(true);
2433	3215	} else
2434		- if (event.getSource() == unflipVItem)
	3216	+ if (source == unflipVItem)
2435	3217	{
2436	3218	FlipV(false);
2437	3219	} else
2438		- if (event.getSource() == lowTexturesItem)
	3220	+ if (source == lowTexturesItem)
2439	3221	{
2440	3222	SetTexRes(0);
2441	3223	} else
2442		- if (event.getSource() == normalTexturesItem)
	3224	+ if (source == normalTexturesItem)
2443	3225	{
2444	3226	SetTexRes(1);
2445	3227	} else
2446		- if (event.getSource() == highTexturesItem)
	3228	+ if (source == highTexturesItem)
2447	3229	{
2448	3230	SetTexRes(2);
2449	3231	} else
2450		- if (event.getSource() == veryhighTexturesItem)
	3232	+ if (source == veryhighTexturesItem)
2451	3233	{
2452	3234	SetTexRes(3);
2453	3235	} else
2454		- if (event.getSource() == maxTexturesItem)
	3236	+ if (source == maxTexturesItem)
2455	3237	{
2456	3238	SetTexRes(4);
2457	3239	} else
2458		- if (event.getSource() == panoTexturesItem)
	3240	+ if (source == panoTexturesItem)
2459	3241	{
2460	3242	SetTexRes(5);
2461	3243	} else
2462		- if (event.getSource() == reverseNormalsItem)
	3244	+ if (source == reverseNormalsItem)
2463	3245	{
2464	3246	ReverseNormals();
2465	3247	} else
2466		- if (event.getSource() == parseverticesItem)
	3248	+ if (source == parseverticesItem)
2467	3249	{
2468	3250	ParseVertices();
2469	3251	} else
2470		- if (event.getSource() == textureFieldItem)
	3252	+ if (source == textureFieldItem)
2471	3253	{
2472	3254	TextureVertices();
2473	3255	} else
2474		- if (event.getSource() == alignItem)
	3256	+ if (source == alignItem)
2475	3257	{
2476	3258	Align();
2477	3259	} else
2478		- if (event.getSource() == mirrorItem)
	3260	+ if (source == mirrorItem)
2479	3261	{
2480	3262	MirrorPoses();
2481	3263	} else
2482		- if (event.getSource() == reduceMorphItem)
	3264	+ if (source == reduceMorphItem)
2483	3265	{
2484	3266	MeshReduction(false);
2485	3267	} else
2486		- if (event.getSource() == reduce34MorphItem)
	3268	+ if (source == reduce34MorphItem)
2487	3269	{
2488	3270	MeshReduction(true);
2489	3271	} else
2490		- if (event.getSource() == reverseTrianglesItem)
	3272	+ if (source == reverseTrianglesItem)
2491	3273	{
2492	3274	ReverseTriangles();
2493	3275	} else
2494		- if (event.getSource() == reduceMeshItem)
	3276	+ if (source == reduceMeshItem)
2495	3277	{
2496	3278	ReduceMesh(false);
2497	3279	} else
2498		- if (event.getSource() == reduce34MeshItem)
	3280	+ if (source == reduce34MeshItem)
2499	3281	{
2500	3282	ReduceMesh(true);
2501	3283	} else
2502		- if (event.getSource() == increaseMeshItem)
	3284	+ if (source == increaseMeshItem)
2503	3285	{
2504	3286	IncreaseMesh();
2505	3287	} else
2506		- if (event.getSource() == clipMeshItem)
	3288	+ if (source == clipMeshItem)
2507	3289	{
2508	3290	ClipMesh();
2509	3291	} else
2510		- if (event.getSource() == smoothMeshItem)
	3292	+ if (source == smoothMeshItem)
2511	3293	{
2512	3294	SmoothMesh();
2513	3295	} else
2514		- if (event.getSource() == transformgeometryItem)
	3296	+ if (source == transformGeometryItem)
2515	3297	{
2516	3298	TransformGeometry();
2517	3299	} else
2518		- if (event.getSource() == resetTransformItem)
	3300	+ if (source == transformChildrenItem)
	3301	+ {
	3302	+ TransformChildren();
	3303	+ } else
	3304	+ if (source == resetTransformItem)
2519	3305	{
2520	3306	ResetTransform();
2521	3307	} else
2522		- if (event.getSource() == resetCentroidItem)
	3308	+ if (source == resetCentroidItem)
2523	3309	{
2524		- ResetCentroid();
	3310	+ ResetCentroid(true);
2525	3311	} else
2526		- if (event.getSource() == resetParentItem)
	3312	+ if (source == resetCentroidXZItem)
	3313	+ {
	3314	+ ResetCentroid(false);
	3315	+ } else
	3316	+ if (source == resetParentItem)
2527	3317	{
2528	3318	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2529	3319	{
..	..	@@ -2533,7 +3323,7 @@
2533	3323
2534	3324	refreshContents();
2535	3325	} else
2536		- if (event.getSource() == repairParentItem)
	3326	+ if (source == repairParentItem)
2537	3327	{
2538	3328	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2539	3329	{
..	..	@@ -2547,7 +3337,7 @@
2547	3337
2548	3338	refreshContents();
2549	3339	} else
2550		- if (event.getSource() == repairShadowItem)
	3340	+ if (source == repairShadowItem)
2551	3341	{
2552	3342	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2553	3343	{
..	..	@@ -2561,7 +3351,7 @@
2561	3351
2562	3352	refreshContents();
2563	3353	} else
2564		- if (event.getSource() == sortbysizeItem)
	3354	+ if (source == sortbysizeItem)
2565	3355	{
2566	3356	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2567	3357	{
..	..	@@ -2573,7 +3363,7 @@
2573	3363	ResetModel();
2574	3364	refreshContents();
2575	3365	} else
2576		- if (event.getSource() == sortbynameItem)
	3366	+ if (source == sortbynameItem)
2577	3367	{
2578	3368	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2579	3369	{
..	..	@@ -2585,7 +3375,7 @@
2585	3375	ResetModel();
2586	3376	refreshContents();
2587	3377	} else
2588		- if (event.getSource() == attachPigmentItem)
	3378	+ if (source == attachPigmentItem)
2589	3379	{
2590	3380	String texture = GetFile("Attach pigment");
2591	3381	Object3D obj;
..	..	@@ -2597,7 +3387,7 @@
2597	3387
2598	3388	refreshContents();
2599	3389	} else
2600		- if (event.getSource() == detachPigmentItem)
	3390	+ if (source == detachPigmentItem)
2601	3391	{
2602	3392	Object3D obj;
2603	3393	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2608,7 +3398,7 @@
2608	3398
2609	3399	refreshContents();
2610	3400	} else
2611		- if (event.getSource() == attachBumpItem)
	3401	+ if (source == attachBumpItem)
2612	3402	{
2613	3403	String texture = GetFile("Attach bump");
2614	3404	Object3D obj;
..	..	@@ -2620,18 +3410,18 @@
2620	3410
2621	3411	refreshContents();
2622	3412	} else
2623		- if (event.getSource() == detachBumpItem)
	3413	+ if (source == detachBumpItem)
2624	3414	{
2625	3415	Object3D obj;
2626	3416	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2627	3417	{
2628	3418	obj = (Object3D)e.nextElement();
2629		- obj.SetBumpTexture(null);
	3419	+ obj.ResetBumpTexture();
2630	3420	}
2631	3421
2632	3422	refreshContents();
2633	3423	} else
2634		- if (event.getSource() == pigmentBumpItem)
	3424	+ if (source == pigmentBumpItem)
2635	3425	{
2636	3426	Object3D obj;
2637	3427	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2642,158 +3432,262 @@
2642	3432
2643	3433	refreshContents();
2644	3434	} else
2645		- 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)
2646	3461	{
2647	3462	CameraPane.flash = true;
2648	3463	refreshContents();
2649	3464	} else
2650		- if (event.getSource() == oneButton)
	3465	+ if (source == oneButton)
2651	3466	{
2652	3467	} else
2653		- if (event.getSource() == twoButton)
	3468	+ if (source == twoButton)
2654	3469	{
2655	3470	radio.layout = twoButton;
	3471	+
	3472	+ if (CameraPane.FULLSCREEN)
	3473	+ fullscreenLayout = radio.layout;
	3474	+
2656	3475	// bug
2657	3476	//gridPanel.setDividerLocation(1.0);
2658	3477	//bigPanel.setDividerLocation(0.0);
2659		- bigThree.remove(scenePanel);
2660		- bigThree.remove(centralPanel);
2661		- bigThree.remove(XYZPanel);
2662		- aWindowConstraints.gridx = 0;
2663		- aWindowConstraints.gridy = 0;
2664		- aWindowConstraints.gridwidth = 1;
2665		- // aConstraints.gridheight = 3;
2666		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2667		- aWindowConstraints.weightx = 0;
2668		- aWindowConstraints.weighty = 1;
2669		- //bigThree.add(jtp, aWindowConstraints);
2670		- aWindowConstraints.weightx = 1;
2671		- aWindowConstraints.gridwidth = 3;
2672		- // aConstraints.gridheight = 3;
2673		- aWindowConstraints.gridx = 1;
2674		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2675		- bigThree.add(centralPanel, aWindowConstraints);
2676		- aWindowConstraints.weightx = 0;
2677		- aWindowConstraints.gridx = 4;
2678		- aWindowConstraints.gridwidth = 1;
2679		- // aConstraints.gridheight = 3;
2680		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2681		- //bigThree.add(XYZPanel, aWindowConstraints);
2682		- 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	+
2683	3525	} else
2684		- if (event.getSource() == threeButton)
	3526	+ if (source == threeButton)
2685	3527	{
2686	3528	radio.layout = threeButton;
2687		- bigThree.remove(scenePanel);
2688		- bigThree.remove(centralPanel);
2689		- bigThree.remove(XYZPanel);
2690		- aWindowConstraints.gridx = 0;
2691		- aWindowConstraints.gridy = 0;
2692		- aWindowConstraints.gridwidth = 1;
2693		- // aConstraints.gridheight = 3;
2694		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2695		- aWindowConstraints.weightx = 0;
2696		- aWindowConstraints.weighty = 1;
2697		- //bigThree.add(jtp, aWindowConstraints);
2698		- aWindowConstraints.weightx = 1;
2699		- aWindowConstraints.gridwidth = 3;
2700		- // aConstraints.gridheight = 3;
2701		- aWindowConstraints.gridx = 1;
2702		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2703		- bigThree.add(centralPanel, aWindowConstraints);
2704		- aWindowConstraints.weightx = 0;
2705		- aWindowConstraints.gridx = 4;
2706		- aWindowConstraints.gridwidth = 1;
2707		- // aConstraints.gridheight = 3;
2708		- aConstraints.fill = GridBagConstraints.VERTICAL;
2709		- bigThree.add(XYZPanel, aWindowConstraints);
2710		- 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();
2711	3566	} else
2712		- if (event.getSource() == fourButton)
	3567	+ if (source == fourButton)
2713	3568	{
2714	3569	radio.layout = fourButton;
2715		- bigThree.remove(scenePanel);
2716		- bigThree.remove(centralPanel);
2717		- bigThree.remove(XYZPanel);
2718		- aWindowConstraints.gridx = 0;
2719		- aWindowConstraints.gridy = 0;
2720		- aWindowConstraints.gridwidth = 1;
2721		- // aWindowConstraints.gridheight = 3;
2722		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2723		- aWindowConstraints.weightx = 1;
2724		- aWindowConstraints.weighty = 1;
2725		- bigThree.add(scenePanel, aWindowConstraints);
2726		- aWindowConstraints.weightx = 1;
2727		- aWindowConstraints.gridwidth = 3;
2728		- // aConstraints.gridheight = 3;
2729		- aWindowConstraints.gridx = 1;
2730		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2731		- //bigThree.add(cameraPanel, aWindowConstraints);
2732		- aWindowConstraints.weightx = 0;
2733		- aWindowConstraints.gridx = 4;
2734		- aWindowConstraints.gridwidth = 1;
2735		- // aWindowConstraints.gridheight = 3;
2736		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2737		- //bigThree.add(XYZPanel, aWindowConstraints);
2738		- 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();
2739	3606	} else
2740		- if (event.getSource() == sixButton)
	3607	+ if (source == sixButton)
2741	3608	{
2742	3609	radio.layout = sixButton;
2743		- bigThree.remove(scenePanel);
2744		- bigThree.remove(centralPanel);
2745		- bigThree.remove(XYZPanel);
2746		- aWindowConstraints.gridx = 0;
2747		- aWindowConstraints.gridy = 0;
2748		- aWindowConstraints.gridwidth = 1;
2749		- // aConstraints.gridheight = 3;
2750		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2751		- aWindowConstraints.weightx = 0;
2752		- aWindowConstraints.weighty = 1;
2753		- bigThree.add(scenePanel, aWindowConstraints);
2754		- aWindowConstraints.weightx = 1;
2755		- aWindowConstraints.gridwidth = 3;
2756		- // aWindowConstraints.gridheight = 3;
2757		- aWindowConstraints.gridx = 1;
2758		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2759		- bigThree.add(centralPanel, aWindowConstraints);
2760		- aWindowConstraints.weightx = 0;
2761		- aWindowConstraints.gridx = 4;
2762		- aWindowConstraints.gridwidth = 1;
2763		- // aWindowConstraints.gridheight = 3;
2764		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2765		- //bigThree.add(XYZPanel, aConstraints);
2766		- 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();
2767	3647	} else
2768		- if (event.getSource() == sevenButton)
	3648	+ if (source == sevenButton)
2769	3649	{
2770	3650	radio.layout = sevenButton;
2771		- bigThree.remove(scenePanel);
2772		- bigThree.remove(centralPanel);
2773		- bigThree.remove(XYZPanel);
2774		- aWindowConstraints.gridx = 0;
2775		- aWindowConstraints.gridy = 0;
2776		- aWindowConstraints.gridwidth = 1;
2777		- // aWindowConstraints.gridheight = 3;
2778		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2779		- aWindowConstraints.weightx = 0;
2780		- aWindowConstraints.weighty = 1;
2781		- bigThree.add(scenePanel, aWindowConstraints);
2782		- aWindowConstraints.weightx = 1;
2783		- aWindowConstraints.gridwidth = 3;
2784		- // aWindowConstraints.gridheight = 3;
2785		- aWindowConstraints.gridx = 1;
2786		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2787		- bigThree.add(centralPanel, aWindowConstraints);
2788		- aWindowConstraints.weightx = 0;
2789		- aWindowConstraints.gridx = 4;
2790		- aWindowConstraints.gridwidth = 1;
2791		- // aConstraints.gridheight = 3;
2792		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2793		- bigThree.add(XYZPanel, aWindowConstraints);
2794		- 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();
2795	3689	} else
2796		- if (event.getSource() == rootButton)
	3690	+ if (source == rootButton)
2797	3691	{
2798	3692	Object3D obj;
2799	3693	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2803,66 +3697,84 @@
2803	3697	EditObject(obj);
2804	3698	}
2805	3699
	3700	+ cameraView.requestFocusInWindow();
2806	3701	refreshContents(true);
2807	3702	} else
2808		- if (event.getSource() == closeButton)
	3703	+ if (source == closeButton)
2809	3704	{
2810	3705	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2811	3706	cRadio ab;
2812	3707	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2813	3708	{
2814	3709	ab = (cRadio)e.nextElement();
2815		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3710	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2816	3711	{
	3712	+ // Patch to avoid bug with transparency.
	3713	+ if (!ab.hadMaterial)
	3714	+ {
	3715	+ ab.object.material = null;
	3716	+ }
	3717	+
2817	3718	buttonGroup.remove(ab);
2818	3719	radioPanel.remove(ab);
2819	3720
2820		- ab.GetObject().editWindow = null;
	3721	+ //ab.GetObject().editWindow = null;
	3722	+ ab.GetObject().manipWindow = null;
2821	3723	// ab.GetObject().objectUI = null; // ?????????
2822	3724
2823	3725	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2824	3726	break;
2825	3727	}
2826	3728	}
	3729	+
	3730	+ cameraView.requestFocusInWindow();
2827	3731	refreshContents(true);
2828	3732	} else
2829		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3733	+ if (source == editItem \|\| source == editButton)
2830	3734	{
	3735	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3736	+ {
	3737	+ Object3D child = (Object3D)e.nextElement();
	3738	+ child.pinned = true;
	3739	+ }
	3740	+
2831	3741	EditSelection(false);
2832	3742	} else
2833		- if (event.getSource() == uneditButton)
	3743	+ if (source == uneditButton)
2834	3744	{
2835	3745	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2836	3746	{
2837	3747	Object3D child = (Object3D)e.nextElement();
2838	3748	if(child.editWindow != null)
2839	3749	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3750	+ child.pinned = false;
2840	3751	child.CloseUI();
2841	3752	listUI.remove(child);
2842	3753
2843		- child.editWindow = null; // ???????????
	3754	+ //child.editWindow = null; // ???????????
2844	3755	}
2845		- objEditor.ctrlPanel.revalidate();
	3756	+ objEditor.ctrlPanel.FlushUI();
2846	3757	//objEditor.jTree.clearSelection();
2847	3758	//objEditor.ResetSliders();
2848	3759	refreshContents(true);
2849	3760	} else
2850		- if (event.getSource() == clearPanelButton)
	3761	+ if (source == clearPanelButton)
2851	3762	{
2852	3763	assert(copy == group);
2853	3764	//copy.ClearUI();
2854	3765	for (Object3D obj : listUI)
2855	3766	{
	3767	+ obj.pinned = false;
2856	3768	obj.CloseUI();
2857	3769	}
2858	3770	listUI.clear();
2859	3771	refreshContents(true);
2860	3772	} else
2861		- if (event.getSource() == allParamsButton)
	3773	+ if (source == allParamsButton)
2862	3774	{
2863	3775	assert(copy == group);
2864	3776
2865		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3777	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2866	3778
2867	3779	for (Object3D obj : listUI)
2868	3780	{
..	..	@@ -2879,19 +3791,19 @@
2879	3791
2880	3792	refreshContents(true);
2881	3793	} else
2882		- if (event.getSource() == unselectButton)
	3794	+ if (source == unselectButton)
2883	3795	{
2884	3796	objEditor.jTree.clearSelection();
2885	3797	// ?? oct 2012 GrafreeD.clipboard.clear();
2886	3798	objEditor.ResetSliders();
2887	3799	refreshContents(true);
2888	3800	} else
2889		- if(event.getSource() instanceof cRadio)
	3801	+ if(source instanceof cRadio)
2890	3802	{
2891	3803	group.parent = keepparent;
2892	3804	group.attributes = 0;
2893	3805	//group.editWindow = null;
2894		- /cRadio/ radio = (cRadio)event.getSource();
	3806	+ /cRadio/ radio = (cRadio)source;
2895	3807	Object3D obj = radio.GetObject();
2896	3808	System.out.println("Edit " + obj);
2897	3809	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2911,6 +3823,9 @@
2911	3823	}
2912	3824
2913	3825	copy = group;
	3826	+
	3827	+ SetUndoStates();
	3828	+
2914	3829	//Globals.theRenderer.object = group;
2915	3830	if(!useclient)
2916	3831	{
..	..	@@ -2926,20 +3841,46 @@
2926	3841	frontView.object = group;
2927	3842	sideView.object = group;
2928	3843	}
2929		- group.editWindow = this;
	3844	+
	3845	+// fix "+" issue
	3846	+ //group.editWindow = this;
	3847	+ group.manipWindow = this;
	3848	+
2930	3849	/*
2931	3850	currentLayout = radio.layout;
2932	3851	if (currentLayout == null)
2933	3852	currentLayout = sevenButton;
2934	3853	*/
2935	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);
2936	3862	keepparent = group.parent;
2937	3863	// PARENT = NULL or not???
2938	3864	//group.parent = null; // ROOT
2939	3865	//group.attributes = -1;
2940	3866	ResetModel();
	3867	+
	3868	+ cameraView.requestFocusInWindow();
2941	3869	refreshContents(true);
2942		- }
	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	+ }
2943	3884	else
2944	3885	{
2945	3886	//return super.action(event, arg);
..	..	@@ -2948,7 +3889,6 @@
2948	3889	}
2949	3890
2950	3891	boolean useclient = false;
2951		- cRadio radio;
2952	3892
2953	3893	void ToggleRoot()
2954	3894	{
..	..	@@ -3000,6 +3940,28 @@
3000	3940	refreshContents();
3001	3941	}
3002	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	+ }
3003	3965
3004	3966	void ResetTransform()
3005	3967	{
..	..	@@ -3112,7 +4074,7 @@
3112	4074	refreshContents();
3113	4075	}
3114	4076
3115		- void ResetCentroid()
	4077	+ void ResetCentroid(boolean full)
3116	4078	{
3117	4079	Object3D obj;
3118	4080	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3127,12 +4089,16 @@
3127	4089	LA.matIdentity(Object3D.mat);
3128	4090	obj.getBounds(minima, maxima, false);
3129	4091	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3130		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	4092	+ if (full)
	4093	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3131	4094	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3132	4095	obj.TransformMesh(Object3D.mat);
	4096	+
3133	4097	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3134		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	4098	+ if (full)
	4099	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3135	4100	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	4101	+
3136	4102	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3137	4103	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3138	4104	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3161,7 +4127,8 @@
3161	4127
3162	4128	int size = obj.MemorySize();
3163	4129
3164		- 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)");
3165	4132	}
3166	4133	}
3167	4134	catch (Exception e)
..	..	@@ -3198,9 +4165,9 @@
3198	4165	obj = (Object3D)e.nextElement();
3199	4166
3200	4167	System.out.println("Object is: " + obj);
3201		- GrafreeD.AnalyzeObject(obj);
	4168	+ Grafreed.AnalyzeObject(obj);
3202	4169	System.out.println("Boundary rep: " + obj.bRep);
3203		- GrafreeD.AnalyzeObject(obj.bRep);
	4170	+ Grafreed.AnalyzeObject(obj.bRep);
3204	4171
3205	4172	// System.err.println((size/1024) + " KB is the size of " + obj);
3206	4173	}
..	..	@@ -3242,6 +4209,13 @@
3242	4209	void GenNormals(boolean crease)
3243	4210	{
3244	4211	group.GenNormalsS(crease);
	4212	+
	4213	+ refreshContents();
	4214	+ }
	4215	+
	4216	+ void GenNormalsMESH()
	4217	+ {
	4218	+ group.GenNormalsMeshS();
3245	4219
3246	4220	refreshContents();
3247	4221	}
..	..	@@ -3414,8 +4388,8 @@
3414	4388
3415	4389	void ParseVertices()
3416	4390	{
3417		- boolean epsequal = GrafreeD.epsequal;
3418		- GrafreeD.epsequal = true;
	4391	+ boolean epsequal = Grafreed.epsequal;
	4392	+ Grafreed.epsequal = true;
3419	4393
3420	4394	for (int i=0; i<group.selection.size(); i++)
3421	4395	{
..	..	@@ -3440,7 +4414,7 @@
3440	4414	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3441	4415	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3442	4416
3443		- g.add(GrafreeD.clipboard);
	4417	+ g.add(Grafreed.clipboard);
3444	4418
3445	4419	buffer.add(g);
3446	4420	}
..	..	@@ -3455,7 +4429,7 @@
3455	4429	makeSomething(buffer, i==group.selection.size()-1);
3456	4430	}
3457	4431
3458		- GrafreeD.epsequal = epsequal;
	4432	+ Grafreed.epsequal = epsequal;
3459	4433
3460	4434	refreshContents();
3461	4435	}
..	..	@@ -3473,7 +4447,16 @@
3473	4447	String pigment = Object3D.GetPigment(tex);
3474	4448	//String bump = Object3D.GetBump(tex);
3475	4449
3476		- com.sun.opengl.util.texture.TextureData texturedata = Globals.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	+ }
3477	4460
3478	4461	double s = v.s;
3479	4462
..	..	@@ -3561,11 +4544,11 @@
3561	4544
3562	4545	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3563	4546
3564		- boolean random = CameraPane.RANDOM;
3565		- CameraPane.RANDOM = false; // parse all random nodes
	4547	+ boolean random = CameraPane.SWITCH;
	4548	+ CameraPane.SWITCH = false; // parse all random nodes
3566	4549	lowres.linkVerticesThis(null);
3567	4550	lowres.linkVerticesThis(sn);
3568		- CameraPane.RANDOM = random;
	4551	+ CameraPane.SWITCH = random;
3569	4552
3570	4553	System.err.flush();
3571	4554
..	..	@@ -3605,7 +4588,7 @@
3605	4588	return;
3606	4589
3607	4590	Object3D poses = group.selection.get(0);
3608		- Object3D ref = GrafreeD.clipboard.get(0);
	4591	+ Object3D ref = Grafreed.clipboard.get(0);
3609	4592
3610	4593	Object3D newgroup = new Object3D("Po:" + poses.name);
3611	4594
..	..	@@ -3799,9 +4782,9 @@
3799	4782
3800	4783	void ClipMesh()
3801	4784	{
3802		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4785	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3803	4786	{
3804		- Object3D content = GrafreeD.clipboard.get(0);
	4787	+ Object3D content = Grafreed.clipboard.get(0);
3805	4788
3806	4789	if (content instanceof cGroup && ((cGroup)content).transientlink )
3807	4790	content = ((cGroup)content).get(0);
..	..	@@ -3810,7 +4793,7 @@
3810	4793	// {
3811	4794	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3812	4795	// }
3813		- group.selection.ClipMesh(GrafreeD.clipboard);
	4796	+ group.selection.ClipMesh(Grafreed.clipboard);
3814	4797	}
3815	4798	// group.selection.ClipMesh(GrafreeD.clipboard);
3816	4799	System.out.println("DONE.");
..	..	@@ -3857,6 +4840,18 @@
3857	4840	void MarkLeaves(boolean hide)
3858	4841	{
3859	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);
3860	4855	refreshContents();
3861	4856	}
3862	4857
..	..	@@ -3931,28 +4926,25 @@
3931	4926	// }
3932	4927	// }
3933	4928
3934		- static boolean allparams = true;
3935		-
3936		- static Vector<Object3D> listUI = new Vector<Object3D>();
3937		-
3938	4929	void EditSelection(boolean newWindow)
3939	4930	{
	4931	+ if (group.selection == null)
	4932	+ {
	4933	+ EditElement(group, newWindow); // ? new
	4934	+ return;
	4935	+ }
	4936	+
3940	4937	// aConstraints.gridy = 0;
3941	4938	for (int i=0; i<group.selection.size(); i++)
3942	4939	{
3943	4940	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
3944	4941	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3945		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4942	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3946	4943
3947	4944	Object3D elem = (Object3D)group.selection.elementAt(i);
3948		- if(elem != group)
	4945	+ if(elem != group \|\| !newWindow)
3949	4946	{
3950		- // if (!(elem instanceof Composite))
3951		- // newWindow = false;
3952		- listUI.add(elem);
3953		- elem.openEditWindow(this, newWindow); //, false);
3954		- System.out.println("edit : " + elem);
3955		- elem.editWindow.refreshContents(true); // ? new
	4947	+ EditElement(elem, newWindow); // ? new
3956	4948	}
3957	4949	}
3958	4950	}
..	..	@@ -4027,7 +5019,8 @@
4027	5019	//new Exception().printStackTrace();
4028	5020
4029	5021	freezemodel = true;
4030		-
	5022	+ ClearUnpinned();
	5023	+
4031	5024	/**/
4032	5025	//switch (event.id)
4033	5026	{
..	..	@@ -4035,7 +5028,6 @@
4035	5028	//case 702: // Event.LIST_DESELECT
4036	5029	group.deselectAll();
4037	5030	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4038		- objEditor.ClearInfo(); // .GetMaterial());
4039	5031	if (tps != null)
4040	5032	{
4041	5033	for (int i=0; i < tps.length; i++)
..	..	@@ -4044,33 +5036,39 @@
4044	5036
4045	5037	//if (child.parent != null)
4046	5038	//child.parent.addSelectee(child);
	5039	+ objEditor.SetMaterial(child);
4047	5040	group.addSelectee(child);
4048		- objEditor.SetMaterial(child); // .GetMaterial());
4049		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4050		- System.err.println("info : " + child.GetPath());
4051	5041	}
4052	5042	}
4053		- else
4054		- {
4055		- objEditor.SetMaterial(group); // .GetMaterial());
4056		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4057		- System.err.println("info : " + group.GetPath());
4058		- }
	5043	+// else
	5044	+// {
	5045	+// objEditor.SetMaterial(group); // .GetMaterial());
	5046	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	5047	+// System.err.println("info : " + group.GetPath());
	5048	+// }
4059	5049
4060		- objEditor.SetText(); // jan 2014
4061		-
4062		- if (flashIt && !Globals.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))
4063	5051	CameraPane.flash = true;
4064	5052
4065		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5053	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4066	5054	// a camera
4067	5055	{
4068		- CameraPane.camerachangeframe = 0; // don't refuse it
4069		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	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	+ }
4070	5061	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4071	5062	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4072	5063	}
4073	5064
	5065	+ if (tps != null && tps.length == 1)
	5066	+ {
	5067	+ EditSelection(false);
	5068	+ }
	5069	+
	5070	+ SetPinStates(tps != null && tps.length > 0);
	5071	+
4074	5072	refreshContents();
4075	5073	//return true;
4076	5074	}
..	..	@@ -4079,6 +5077,35 @@
4079	5077
4080	5078	freezemodel = false;
4081	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	+ }
4082	5109
4083	5110	void linkSomething(Object3D thing)
4084	5111	{
..	..	@@ -4150,16 +5177,19 @@
4150	5177	{
4151	5178	if (group.selection.isEmpty())
4152	5179	return;
4153		- GrafreeD.clipboardIsTempGroup = false;
	5180	+
	5181	+ Grafreed.clipboardIsTempGroup = false;
4154	5182	Composite tGroup = null;
4155	5183	if (group.selection.size() > 0) // 1)
4156	5184	{
4157	5185	tGroup = new cGroup();
4158		- GrafreeD.clipboardIsTempGroup = true;
	5186	+ Grafreed.clipboardIsTempGroup = true;
4159	5187	}
4160	5188
4161	5189	if (cut)
4162	5190	{
	5191	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5192	+// Save();
4163	5193	//int indices[] = jList.getSelectedIndices();
4164	5194	//for (int i = indices.length - 1; i >= 0; i--)
4165	5195	//jList.remove(indices[i]);
..	..	@@ -4195,16 +5225,16 @@
4195	5225	//System.out.println("cut " + child);
4196	5226	//System.out.println("parent = " + child.parent);
4197	5227	// tmp.addChild(child);
4198		- if (GrafreeD.clipboardIsTempGroup)
	5228	+ if (Grafreed.clipboardIsTempGroup)
4199	5229	tGroup.add/Child/(tmp);
4200	5230	else
4201		- GrafreeD.clipboard = tmp;
	5231	+ Grafreed.clipboard = tmp;
4202	5232	}
4203	5233	else
4204		- if (GrafreeD.clipboardIsTempGroup)
	5234	+ if (Grafreed.clipboardIsTempGroup)
4205	5235	tGroup.add/Child/(child);
4206	5236	else
4207		- GrafreeD.clipboard = child;
	5237	+ Grafreed.clipboard = child;
4208	5238	}
4209	5239
4210	5240	//ResetModel();
..	..	@@ -4236,21 +5266,23 @@
4236	5266	//System.out.println("cut " + elem);
4237	5267	//System.out.println("parent = " + elem.parent);
4238	5268	// tmp.addChild(elem);
4239		- if (GrafreeD.clipboardIsTempGroup)
	5269	+ if (Grafreed.clipboardIsTempGroup)
4240	5270	tGroup.add/Child/(tmp);
4241	5271	else
4242		- GrafreeD.clipboard = tmp;
	5272	+ Grafreed.clipboard = tmp;
4243	5273	}
4244	5274	else
4245		- if (GrafreeD.clipboardIsTempGroup)
	5275	+ if (Grafreed.clipboardIsTempGroup)
4246	5276	tGroup.add/Child/(child);
4247	5277	else
4248		- GrafreeD.clipboard = child;
	5278	+ Grafreed.clipboard = child;
4249	5279	}
4250	5280
4251	5281	}
4252		- if (GrafreeD.clipboardIsTempGroup)
4253		- GrafreeD.clipboard = tGroup;
	5282	+
	5283	+ if (Grafreed.clipboardIsTempGroup)
	5284	+ Grafreed.clipboard = tGroup;
	5285	+
4254	5286	if (cut)
4255	5287	{
4256	5288	ResetModel();
..	..	@@ -4260,11 +5292,15 @@
4260	5292
4261	5293	void paste(boolean expand)
4262	5294	{
	5295	+ if (Globals.REPLACEONMAKE)
	5296	+ Save();
	5297	+ boolean keep = Globals.REPLACEONMAKE;
	5298	+ Globals.REPLACEONMAKE = false;
4263	5299	// if (GrafreeD.clipboard == null)
4264	5300	// return;
4265	5301	boolean first = true;
4266	5302
4267		- if (GrafreeD.clipboardIsTempGroup)
	5303	+ if (Grafreed.clipboardIsTempGroup)
4268	5304	{
4269	5305	Composite temp;
4270	5306
..	..	@@ -4275,7 +5311,7 @@
4275	5311	temp = (Composite)Applet3D.clipboard.deepCopy();
4276	5312	*/
4277	5313	Object3D elem;
4278		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5314	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4279	5315	{
4280	5316	Object3D child = (Object3D)e.nextElement();
4281	5317
..	..	@@ -4309,21 +5345,22 @@
4309	5345	//Object3D cb = Applet3D.clipboard;
4310	5346	//temp.addChild(cb);
4311	5347	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4312		- assert(GrafreeD.clipboard.parent == null);
4313		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4314		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4315		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4316		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.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());
4317	5353	else
4318		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4319		- GrafreeD.clipboard.get(0).parent = keepparent;
	5354	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5355	+ Grafreed.clipboard.get(0).parent = keepparent;
4320	5356	}
4321	5357
	5358	+ Globals.REPLACEONMAKE = keep;
4322	5359	ResetModel();
4323	5360	refreshContents();
4324	5361	}
4325	5362
4326		- void pasteInto(boolean copyit)
	5363	+ void pasteInto(boolean copyit, boolean clone)
4327	5364	{
4328	5365	// if (GrafreeD.clipboard == null)
4329	5366	// return;
..	..	@@ -4352,15 +5389,22 @@
4352	5389	if (copyit)
4353	5390	{
4354	5391	// paste(false);
4355		- CloneClipboard(false); // sept 2014
	5392	+ if (clone)
	5393	+ {
	5394	+ CloneClipboard(false); // sept 2014
	5395	+ }
	5396	+ else
	5397	+ {
	5398	+ paste(false);
	5399	+ }
4356	5400	}
4357	5401	else
4358	5402	{
4359	5403	boolean first = true;
4360	5404
4361		- if (GrafreeD.clipboardIsTempGroup)
	5405	+ if (Grafreed.clipboardIsTempGroup)
4362	5406	{
4363		- Composite temp = (Composite)GrafreeD.clipboard;
	5407	+ Composite temp = (Composite)Grafreed.clipboard;
4364	5408	Object3D copy;
4365	5409	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4366	5410	{
..	..	@@ -4370,7 +5414,7 @@
4370	5414	}
4371	5415	} else
4372	5416	{
4373		- linkSomething(GrafreeD.clipboard); //.get(0));
	5417	+ linkSomething(Grafreed.clipboard); //.get(0));
4374	5418	}
4375	5419	}
4376	5420	}
..	..	@@ -4447,6 +5491,10 @@
4447	5491
4448	5492	void group(Object3D csg, boolean grab)
4449	5493	{
	5494	+ if (Globals.REPLACEONMAKE)
	5495	+ Save();
	5496	+ boolean keep = Globals.REPLACEONMAKE;
	5497	+ Globals.REPLACEONMAKE = false;
4450	5498	if (//false) // why??
4451	5499	!group.selection.isEmpty())
4452	5500	{
..	..	@@ -4560,10 +5608,15 @@
4560	5608	//node.add(csg);
4561	5609	//makeSomething(node);
4562	5610	makeSomething(csg);
	5611	+ Globals.REPLACEONMAKE = keep;
4563	5612	}
4564	5613
4565	5614	void Ungroup(Object3D g)
4566	5615	{
	5616	+ if (Globals.REPLACEONMAKE)
	5617	+ Save();
	5618	+ boolean keep = Globals.REPLACEONMAKE;
	5619	+ Globals.REPLACEONMAKE = false;
4567	5620	if (g instanceof HiddenObject)
4568	5621	{
4569	5622	HiddenObject h = (HiddenObject) g;
..	..	@@ -4580,6 +5633,7 @@
4580	5633	objEditor.makeSomething(g.get(i), false);
4581	5634	}
4582	5635	}
	5636	+ Globals.REPLACEONMAKE = keep;
4583	5637	}
4584	5638
4585	5639	void ungroup()
..	..	@@ -4775,21 +5829,6 @@
4775	5829	}
4776	5830	*/
4777	5831
4778		- void ImportGFD()
4779		- {
4780		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4781		- browser.show();
4782		- String filename = browser.getFile();
4783		- if (filename != null && filename.length() > 0)
4784		- {
4785		- String fullname = browser.getDirectory() + filename;
4786		-
4787		- //Object3D readobj =
4788		- objEditor.ReadGFD(fullname, objEditor);
4789		- //makeSomething(readobj);
4790		- }
4791		- }
4792		-
4793	5832	/*
4794	5833	public void Callback(Object obj)
4795	5834	{
..	..	@@ -4813,26 +5852,9 @@
4813	5852	}
4814	5853	*/
4815	5854
4816		- void ImportVRMLX3D()
4817		- {
4818		- if (GrafreeD.standAlone)
4819		- {
4820		- /**/
4821		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4822		- browser.show();
4823		- String filename = browser.getFile();
4824		- if (filename != null && filename.length() > 0)
4825		- {
4826		- String fullname = browser.getDirectory() + filename;
4827		- LoadVRMLX3D(fullname);
4828		- }
4829		- /**/
4830		- }
4831		- }
4832		-
4833	5855	String GetFile(String dialogName)
4834	5856	{
4835		- if (GrafreeD.standAlone)
	5857	+ if (Grafreed.standAlone)
4836	5858	{
4837	5859	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4838	5860	browser.show();
..	..	@@ -4896,10 +5918,49 @@
4896	5918	cButton flashSelectionButton;
4897	5919	cButton editButton;
4898	5920	cButton uneditButton;
	5921	+ JCheckBox allParamsButton;
4899	5922	cButton clearpanelButton;
4900		- cButton allParamsButton;
4901	5923	cButton unselectButton;
4902	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	+
4903	5964	cButton screenfitButton;
4904	5965	cButton screenfitpointButton;
4905	5966	cButton snapobjectButton;
..	..	@@ -4911,14 +5972,6 @@
4911	5972
4912	5973	cButton setsupportButton;
4913	5974
4914		- cButton twoButton;
4915		- cButton sixButton;
4916		- cButton threeButton;
4917		- cButton sevenButton;
4918		- cButton fourButton; // full panel
4919		- cButton oneButton; // full XYZ
4920		- //cButton currentLayout;
4921		-
4922	5975	//
4923	5976	//Composite
4924	5977	Object3D // to do !!
..	..	@@ -4928,9 +5981,11 @@
4928	5981	//JTree jTree;
4929	5982	private MenuItem lookAtItem;
4930	5983	private MenuItem lookFromItem;
4931		- private MenuItem switchItem;
	5984	+ private MenuItem switchViewItem;
4932	5985	private MenuItem cutItem;
4933		- private MenuItem duplicateItem;
	5986	+ private MenuItem undoItem;
	5987	+ private MenuItem redoItem;
	5988	+ private JMenuItem duplicateItem;
4934	5989	private MenuItem cloneItem;
4935	5990	private MenuItem cloneSupportItem;
4936	5991	private MenuItem overwriteGeoItem;
..	..	@@ -4943,7 +5998,7 @@
4943	5998	private MenuItem linkverticesItem;
4944	5999	private MenuItem relinkverticesItem;
4945	6000	private MenuItem setMasterItem;
4946		- private MenuItem resetMeshItem;
	6001	+ private MenuItem resetAllItem;
4947	6002	private MenuItem stepAllItem;
4948	6003	private MenuItem revertMeshItem;
4949	6004	private MenuItem poseMeshItem;
..	..	@@ -4954,10 +6009,11 @@
4954	6009	private MenuItem mergeGeometriesItem;
4955	6010	private MenuItem copyItem;
4956	6011	private MenuItem pasteItem;
	6012	+ private MenuItem pasteIntoItem;
4957	6013	private MenuItem pasteLinkItem;
4958	6014	private MenuItem pasteCloneItem;
4959	6015	private MenuItem pasteExpandItem;
4960		- private MenuItem clearItem;
	6016	+ private MenuItem deleteItem;
4961	6017	private MenuItem clearAllItem;
4962	6018	private MenuItem genUVItem;
4963	6019	private MenuItem genNormalsMESHItem;
..	..	@@ -4992,6 +6048,10 @@
4992	6048	private MenuItem showleavesItem;
4993	6049	private MenuItem markleavesItem;
4994	6050	private MenuItem unmarkleavesItem;
	6051	+ private MenuItem rewindleavesItem;
	6052	+ private MenuItem unrewindleavesItem;
	6053	+ private MenuItem randomleavesItem;
	6054	+ private MenuItem unrandomleavesItem;
4995	6055
4996	6056	private MenuItem flipVItem;
4997	6057	private MenuItem unflipVItem;
..	..	@@ -5003,15 +6063,17 @@
5003	6063	private MenuItem panoTexturesItem;
5004	6064
5005	6065	private MenuItem resetCentroidItem;
5006		- private MenuItem transformgeometryItem;
	6066	+ private MenuItem resetCentroidXZItem;
5007	6067	private MenuItem resetTransformItem;
	6068	+ private MenuItem transformGeometryItem;
	6069	+ private MenuItem transformChildrenItem;
5008	6070	private MenuItem hideItem;
5009	6071	private MenuItem grabItem;
5010	6072	private MenuItem backItem;
5011	6073	private MenuItem frontItem;
5012	6074	private MenuItem cameraItem;
5013	6075	private MenuItem compositeItem;
5014		- private MenuItem randomItem;
	6076	+ private MenuItem switchItem;
5015	6077	private MenuItem physicsItem;
5016	6078	private MenuItem frameselectorItem;
5017	6079	private MenuItem scriptNodeItem;
..	..	@@ -5035,6 +6097,8 @@
5035	6097	private MenuItem attachBumpItem;
5036	6098	private MenuItem detachBumpItem;
5037	6099	private MenuItem pigmentBumpItem;
	6100	+ private MenuItem embedTexturesItem;
	6101	+ private MenuItem deEmbedTexturesItem;
5038	6102
5039	6103	private MenuItem particleItem;
5040	6104	private MenuItem ragdollItem;
..	..	@@ -5051,7 +6115,7 @@
5051	6115	private MenuItem blobItem;
5052	6116	private MenuItem latheItem;
5053	6117	private MenuItem bezierItem;
5054		- private MenuItem checkerItem;
	6118	+ private MenuItem overlayItem;
5055	6119	private MenuItem meshItem;
5056	6120	// private MenuItem meshGroupItem;
5057	6121	private MenuItem springItem;
..	..	@@ -5073,11 +6137,6 @@
5073	6137	private MenuItem doubleItem;
5074	6138	private MenuItem tripleItem;
5075	6139
5076		- private MenuItem importGFDItem;
5077		- private MenuItem importVRMLX3DItem;
5078		- private MenuItem import3DSItem;
5079		- private MenuItem importOBJItem;
5080		-
5081	6140	private MenuItem computeAOItem;
5082	6141	private MenuItem recompileItem;
5083	6142	private MenuItem editScriptItem;
..	..	@@ -5087,4 +6146,8 @@
5087	6146	private MenuItem analyzeItem;
5088	6147	private MenuItem dumpItem;
5089	6148	//boolean freezemodel = false;
	6149	+
	6150	+ Menu cameraMenu;
	6151	+ MenuItem editCameraItem;
	6152	+ MenuItem restoreCameraItem;
5090	6153	}