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