~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,150 +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		- oe.aConstraints.gridx += 1;
524		- oe.aConstraints.weighty = 0;
525		- oe.aConstraints.gridwidth = 1;
526		-
527		- //
528		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
529		- twoButton.addActionListener(this);
530		- 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);
531	924	fourButton.addActionListener(this);
532		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
533		- sixButton.addActionListener(this);
534		- 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");
535	937	threeButton.addActionListener(this);
536		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
537		- 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);
538	944	//
539	945
540		- 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");
541	948	rootButton.addActionListener(this);
542		- oe.aConstraints.gridx += 1;
543		- 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");
544	952	closeButton.addActionListener(this);
545	953	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
546	954	//clearButton.addActionListener(this);
547		- oe.aConstraints.gridx += 1;
548		-
549		- oe.aConstraints.gridx = 1; //
550		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
551		- editButton.addActionListener(this);
552		- oe.aConstraints.gridx += 1;
553		- oe.aConstraints.weighty = 0;
554		- oe.aConstraints.gridwidth = 1;
555	955
556		- 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");
557	1048	uneditButton.addActionListener(this);
558	1049
559		- oe.aConstraints.gridx += 1;
560		- oe.aConstraints.weighty = 0;
561		- oe.aConstraints.gridwidth = 1;
562		-
563		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
564		- clearPanelButton.addActionListener(this);
565		-
566		- oe.aConstraints.gridx += 1;
567		- oe.aConstraints.weighty = 0;
568		- oe.aConstraints.gridwidth = 1;
569		-
570		- 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");
571	1052	allParamsButton.addActionListener(this);
572	1053
573		- oe.aConstraints.gridx += 1;
574		- oe.aConstraints.weighty = 0;
575		- oe.aConstraints.gridwidth = 1;
576		-
577		- 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");
578	1060	unselectButton.addActionListener(this);
579	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	+
580	1072	// oe.aConstraints.gridx += 1;
581	1073	// oe.aConstraints.weighty = 0;
582	1074	// oe.aConstraints.gridwidth = 1;
..	..	@@ -588,47 +1080,32 @@
588	1080	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
589	1081	// gcButton.addActionListener(this);
590	1082
591		- oe.aConstraints.gridx = 0;
592		- oe.aConstraints.gridy += 1;
593		-
594		- //ctrlPanel.add(objList = new List(5, true));
595		- oe.aConstraints.gridwidth = 100;
596		- // oe.aConstraints.gridheight = 100;
597		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
598		- oe.aConstraints.gridheight = 1;
599		- oe.aConstraints.weighty = 0.5;
600		- oe.aConstraints.gridx = 0;
601		- JScrollPane jSP;
	1083	+ cGridBag jSPPanel = new cGridBag();
	1084	+
	1085	+ JScrollPane jSP;
602	1086	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
603		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	1087	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
604	1088	ResetModel();
605		- oe.aConstraints.weighty = 0.5;
606		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
607		- oe.aConstraints.gridy += 1;
608		- oe.aConstraints.gridwidth = 1;
609		-
610		- oe.aConstraints.weighty = 0;
611		- oe.aConstraints.gridwidth = 2;
612		-
613		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
614		- colorCB.addItemListener(this);
615		- oe.aConstraints.gridx += 2;
616		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
617		- materialCB.addItemListener(this);
618		- oe.aConstraints.gridx += 2;
619		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
620		- textureCB.addItemListener(this);
621		-
622		- oe.aConstraints.gridx = 0;
623		- oe.aConstraints.gridy += 1;
624	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	+
625	1102	//jList.addListSelectionListener(this);
626	1103	oe.jTree.addTreeSelectionListener(this);
627	1104	//jTree.setRootVisible(false);
628	1105	//jTree.setEditable(true);
629	1106	oe.jTree.setDragEnabled(true);
630	1107	//jTree.setPreferredSize(new Dimension(10,10));
631		- jSP.setPreferredSize(new Dimension(100,200));
	1108	+ //jSP.setPreferredSize(new Dimension(100,200));
632	1109
633	1110	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
634	1111
..	..	@@ -640,23 +1117,160 @@
640	1117	dgr.addDragGestureListener(this);
641	1118	}catch(Exception e) {}
642	1119	*/
643		- radio.layout = sevenButton;
	1120	+ radio.layout = sixButton; // sevenButton;
644	1121	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
645	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	+ }
646	1249
647	1250	void EditObject(Object3D obj)
648	1251	{
649		- cRadio dummyButton = new cRadio(obj.name);
650		- dummyButton.SetObject(obj);
651		- dummyButton.layout = sevenButton;
652		- dummyButton.SetCamera(cameraView.renderCamera, false);
653		- dummyButton.addActionListener(this);
654		- radioPanel.add(dummyButton);
655		- buttonGroup.add(dummyButton);
656		- dummyButton.doClick();
	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	+
	1261	+ radioButton.SetObject(obj);
	1262	+ radioButton.layout = sixButton; // sevenButton;
	1263	+ radioButton.SetCamera(cameraView.renderCamera, false);
	1264	+ radioButton.addActionListener(this);
	1265	+ radioPanel.add(radioButton);
	1266	+ buttonGroup.add(radioButton);
	1267	+ radioButton.doClick();
657	1268	}
	1269	+
658	1270	void SetupViews(ObjEditor oe)
659	1271	{
	1272	+ theFrame = this;
	1273	+
660	1274	oe.SetupViews();
661	1275
662	1276	System.out.println("SetupViews");
..	..	@@ -665,22 +1279,28 @@
665	1279	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
666	1280	}
667	1281
668		- JCheckBox liveCB;
669		- JCheckBox supportCB;
670		- JCheckBox localCB;
671		- JCheckBox crowdCB;
672		- JCheckBox smoothCB;
673		- JCheckBox fastCB;
674		- JCheckBox slowCB;
675		- JCheckBox boxCB;
676		- JCheckBox trackCB;
677		- 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;
678	1295	// JCheckBox speakerMocapCB;
679		- JCheckBox speakerCameraCB;
680		- JCheckBox speakerFocusCB;
681		- JCheckBox debugCB;
682		- JCheckBox oeilCB;
683		- JCheckBox lookAtCB;
	1296	+ cCheckBox speakerCameraCB;
	1297	+ cCheckBox speakerFocusCB;
	1298	+ cCheckBox debugCB;
	1299	+
	1300	+ cCheckBox oeilCB;
	1301	+ cCheckBox shadowCB;
	1302	+ cCheckBox autokeepCB;
	1303	+ cCheckBox lookAtCB;
684	1304
685	1305	// static int COLOR = 1;
686	1306	// static int MATERIAL = 2;
..	..	@@ -688,9 +1308,9 @@
688	1308
689	1309	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
690	1310
691		- JCheckBox colorCB;
692		- JCheckBox materialCB;
693		- JCheckBox textureCB;
	1311	+ cCheckBox colorCB;
	1312	+ cCheckBox materialCB;
	1313	+ cCheckBox textureCB;
694	1314
695	1315	public void itemStateChanged(ItemEvent e)
696	1316	{
..	..	@@ -715,10 +1335,10 @@
715	1335	dropAttributes \|= Object3D.TEXTURE;
716	1336	else
717	1337	dropAttributes &= ~Object3D.TEXTURE;
718		- }
719		- else if(e.getSource() == liveCB)
	1338	+ } else if(e.getSource() == liveCB)
720	1339	{
721	1340	cameraView.ToggleLive();
	1341	+ refreshContents(false);
722	1342	}
723	1343	else if(e.getSource() == supportCB)
724	1344	{
..	..	@@ -754,6 +1374,10 @@
754	1374	cameraView.repaint();
755	1375	// refreshContents();
756	1376	}
	1377	+ else if(e.getSource() == zoomBoxCB)
	1378	+ {
	1379	+ cameraView.ToggleZoomBoxMode();
	1380	+ }
757	1381	else if(e.getSource() == smoothfocusCB)
758	1382	{
759	1383	cameraView.ToggleSmoothFocus();
..	..	@@ -779,6 +1403,18 @@
779	1403	{
780	1404	cameraView.ToggleOeil();
781	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	+ }
782	1418	else if(e.getSource() == lookAtCB)
783	1419	{
784	1420	cameraView.ToggleLookAt();
..	..	@@ -795,7 +1431,8 @@
795	1431
796	1432	/**/
797	1433	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
798		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1434	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1435	+ TreePath path = objEditor.jTree.getSelectionPath();
799	1436	if ((path == null) \|\| (path.getPathCount() <= 1)) {
800	1437	// We can't move the root node or an empty selection
801	1438	return;
..	..	@@ -858,8 +1495,6 @@
858	1495	}
859	1496	}
860	1497
861		- String string = (String) object;
862		-
863	1498	System.out.println("Transfer = " + object + "; drop : " + target);
864	1499	// if( object instanceof java.io.File[])
865	1500	// {
..	..	@@ -867,7 +1502,11 @@
867	1502	// objEditor.DropFile((java.io.File[]) object, true);
868	1503	// return;
869	1504	// }
870		- 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) == ':')
871	1510	{
872	1511	// file(s)
873	1512	String[] names = string.split("\n");
..	..	@@ -894,7 +1533,7 @@
894	1533
895	1534	flashIt = false;
896	1535	CameraPane pane = (CameraPane) target;
897		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1536	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
898	1537	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
899	1538
900	1539	if (group.selection.size() == 1)
..	..	@@ -910,23 +1549,33 @@
910	1549
911	1550	assert target == objEditor.jTree;
912	1551	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1552	+ Object3D destinationLeaf;
913	1553	try {
914		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1554	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
915	1555	} catch (Exception e) {
916	1556	System.out.println("destinationPath : " + destinationPath);
917	1557	return;
918	1558	}
919	1559
920		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1560	+ for (int i=group.selection.size(); --i>=0;)
921	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	+// {
922	1571	loadClipboard(true);
923	1572	objEditor.jTree.setSelectionPath(destinationPath);
924		- pasteInto(false);
925		- } else {
926		- loadClipboard(false);
927		- objEditor.jTree.setSelectionPath(destinationPath);
928		- pasteInto(false); // true); // ???
929		- }
	1573	+ pasteInto(false, false);
	1574	+// } else {
	1575	+// loadClipboard(false);
	1576	+// objEditor.jTree.setSelectionPath(destinationPath);
	1577	+// pasteInto(false, false); // true); // ???
	1578	+// }
930	1579	}
931	1580	public void dropActionChanged(DropTargetDragEvent dtde)
932	1581	// Called if the user has modified the current drop gesture
..	..	@@ -1031,85 +1680,107 @@
1031	1680	{
1032	1681	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1033	1682	//heightFieldItem.addActionListener(this);
1034		- gridItem = menu.add(new MenuItem("Grid"));
1035		- gridItem.addActionListener(this);
1036		- rectoidItem = menu.add(new MenuItem("Box"));
1037		- rectoidItem.addActionListener(this);
1038		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1039		- ellipsoidItem.addActionListener(this);
1040		- coneItem = menu.add(new MenuItem("Cone"));
1041		- coneItem.addActionListener(this);
1042		- torusItem = menu.add(new MenuItem("Torus"));
1043		- torusItem.addActionListener(this);
1044		- superItem = menu.add(new MenuItem("Superellipsoid"));
1045		- 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	+ {
1046	1701	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1047	1702	kleinItem.addActionListener(this);
1048		- particleItem = menu.add(new MenuItem("Particle system"));
1049		- particleItem.addActionListener(this);
	1703	+ }
	1704	+
	1705	+// particleItem = menu.add(new MenuItem("Particle system"));
	1706	+// particleItem.addActionListener(this);
	1707	+ if (Globals.ADVANCED)
	1708	+ {
1050	1709	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1051	1710	ragdollItem.addActionListener(this);
1052	1711	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1053	1712	ragdoll2Item.addActionListener(this);
	1713	+ }
1054	1714	menu.add("-");
1055		- meshItem = menu.add(new MenuItem("Mesh"));
	1715	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1056	1716	meshItem.addActionListener(this);
1057	1717	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1058	1718	// meshGroupItem.addActionListener(this);
	1719	+ if (Globals.ADVANCED)
	1720	+ {
1059	1721	springItem = menu.add(new MenuItem("Spring"));
1060	1722	springItem.addActionListener(this);
1061	1723	flagItem = menu.add(new MenuItem("Flag"));
1062	1724	flagItem.addActionListener(this);
1063		- bezierItem = menu.add(new MenuItem("Patch"));
1064		- bezierItem.addActionListener(this);
1065		- checkerItem = menu.add(new MenuItem("Checker"));
1066		- checkerItem.addActionListener(this);
1067	1725	blobItem = menu.add(new MenuItem("Blob"));
1068	1726	blobItem.addActionListener(this);
1069	1727	latheItem = menu.add(new MenuItem("Lathe"));
1070	1728	latheItem.addActionListener(this);
1071		- lightItem = menu.add(new MenuItem("Light"));
1072		- 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);
1073	1736	menu.add("-");
1074	1737	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1075	1738	//superLoopItem.addActionListener(this);
1076		- loopItem = menu.add(new MenuItem("Loop"));
1077		- loopItem.addActionListener(this);
	1739	+// loopItem = menu.add(new MenuItem("Loop"));
	1740	+// loopItem.addActionListener(this);
1078	1741	doubleItem = menu.add(new MenuItem("Fork"));
1079	1742	doubleItem.addActionListener(this);
	1743	+ if (Globals.ADVANCED)
	1744	+ {
1080	1745	tripleItem = menu.add(new MenuItem("Trident"));
1081	1746	tripleItem.addActionListener(this);
	1747	+ }
1082	1748	}
1083	1749
1084	1750	void buildToolsMenu(Menu menu)
1085	1751	{
1086	1752	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1087	1753	animationItem.addItemListener(this);
1088		- animationItem.setState(CameraPane.ANIMATION);
	1754	+ animationItem.setState(Globals.ANIMATION);
	1755	+
	1756	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1757	+ archiveItem.addActionListener(this);
1089	1758
1090	1759	menu.add("-");
1091	1760	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1092	1761	parseverticesItem.addActionListener(this);
1093	1762	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1094	1763	textureFieldItem.addActionListener(this);
1095		- alignItem = menu.add(new MenuItem("Align"));
	1764	+ alignItem = menu.add(new MenuItem("Align Objects"));
1096	1765	alignItem.addActionListener(this);
1097		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1098		- mirrorItem.addActionListener(this);
1099	1766	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1100	1767	reduceMorphItem.addActionListener(this);
1101	1768	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1102	1769	reduce34MorphItem.addActionListener(this);
1103		-
1104		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1105		- computeAOItem.addActionListener(this);
1106	1770	menu.add("-");
1107		-
1108	1771	menu.add(memoryItem = new MenuItem("Memory Usage"));
1109	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("-");
1110	1781	menu.add(analyzeItem = new MenuItem("Analyze"));
1111	1782	analyzeItem.addActionListener(this);
1112		- menu.add(dumpItem = new MenuItem("Dump"));
	1783	+ menu.add(dumpItem = new MenuItem("Print"));
1113	1784	dumpItem.addActionListener(this);
1114	1785	// menu.add(pathItem = new MenuItem("From-to path"));
1115	1786	// pathItem.addActionListener(this);
..	..	@@ -1118,6 +1789,8 @@
1118	1789	resetParentItem.addActionListener(this);
1119	1790	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1120	1791	repairParentItem.addActionListener(this);
	1792	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1793	+ repairShadowItem.addActionListener(this);
1121	1794	menu.add(invariantsItem = new MenuItem("Invariants"));
1122	1795	invariantsItem.addActionListener(this);
1123	1796	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1125,6 +1798,7 @@
1125	1798	menu.add("-");
1126	1799	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1127	1800	editScriptItem.addActionListener(this);
	1801	+ }
1128	1802	}
1129	1803
1130	1804	void ScreenFit()
..	..	@@ -1247,9 +1921,34 @@
1247	1921	shadow.material = new cMaterial(obj.material);
1248	1922	shadow.material.diffuse = 0.0001f;
1249	1923	shadow.material.specular = 0.0001f;
	1924	+ //shadow.projectedVertices[1].x = 300;
1250	1925
1251	1926	makeSomething(shadow);
1252	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	+ }
1253	1952
1254	1953	/**
1255	1954	* applyExample
..	..	@@ -1453,9 +2152,9 @@
1453	2152
1454	2153	void Overwrite(int mask)
1455	2154	{
1456		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2155	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1457	2156	{
1458		- Object3D content = GrafreeD.clipboard.get(0);
	2157	+ Object3D content = Grafreed.clipboard.get(0);
1459	2158
1460	2159	if (content instanceof cGroup && ((cGroup)content).transientlink )
1461	2160	content = ((cGroup)content).get(0);
..	..	@@ -1478,6 +2177,7 @@
1478	2177	//
1479	2178	public void actionPerformed(ActionEvent event) // , Object arg)
1480	2179	{
	2180	+ Object source = event.getSource();
1481	2181	/*
1482	2182	if (event.getSource() == nameField)
1483	2183	{
..	..	@@ -1489,11 +2189,11 @@
1489	2189	}
1490	2190	else
1491	2191	*/
1492		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	2192	+ if (source == lookAtItem \|\| source == lookFromItem)
1493	2193	{
1494	2194	ScreenFit();
1495	2195	} else
1496		- if (event.getSource() == switchItem)
	2196	+ if (source == switchViewItem)
1497	2197	{
1498	2198	cVector v1 = new cVector();
1499	2199	cVector v2 = new cVector();
..	..	@@ -1502,11 +2202,11 @@
1502	2202	objEditor.cameraView.renderCamera.setAim(v2, v1);
1503	2203	objEditor.cameraView.repaint();
1504	2204	} else
1505		- if (event.getSource() == rectoidItem)
	2205	+ if (source == rectoidItem \|\| source == boxButton)
1506	2206	{
1507	2207	makeSomething(new Box());
1508	2208	} else
1509		- if (event.getSource() == particleItem)
	2209	+ if (source == particleItem \|\| source == particlesButton)
1510	2210	{
1511	2211	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1512	2212	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1527,9 +2227,9 @@
1527	2227	applyExample(particleGeom, "SMOKE");
1528	2228	makeSomething(particleGeom);
1529	2229	} else
1530		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	2230	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1531	2231	{
1532		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	2232	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1533	2233
1534	2234	ragdoll.toParent = LA.newMatrix();
1535	2235	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1547,7 +2247,7 @@
1547	2247	} else
1548	2248	/*
1549	2249	*/
1550		- if (event.getSource() == heightFieldItem)
	2250	+ if (source == heightFieldItem)
1551	2251	{
1552	2252	Object3D obj = new Object3D();
1553	2253
..	..	@@ -1585,31 +2285,31 @@
1585	2285
1586	2286	makeSomething(obj);
1587	2287	} else
1588		- if (event.getSource() == gridItem)
	2288	+ if (source == gridItem \|\| source == gridButton)
1589	2289	{
1590	2290	makeSomething(new Grid());
1591	2291	} else
1592		- if (event.getSource() == ellipsoidItem)
	2292	+ if (source == ellipsoidItem \|\| source == sphereButton)
1593	2293	{
1594	2294	makeSomething(new Sphere());
1595	2295	} else
1596		- if (event.getSource() == coneItem)
	2296	+ if (source == coneItem \|\| source == coneButton)
1597	2297	{
1598	2298	makeSomething(new Cone());
1599	2299	} else
1600		- if (event.getSource() == torusItem)
	2300	+ if (source == torusItem \|\| source == torusButton)
1601	2301	{
1602	2302	makeSomething(new Torus());
1603	2303	} else
1604		- if (event.getSource() == superItem)
	2304	+ if (source == superItem \|\| source == superButton)
1605	2305	{
1606	2306	makeSomething(new Superellipsoid());
1607	2307	} else
1608		- if (event.getSource() == kleinItem)
	2308	+ if (source == kleinItem \|\| source == kleinButton)
1609	2309	{
1610	2310	makeSomething(new Klein());
1611	2311	} else
1612		- if (event.getSource() == blobItem)
	2312	+ if (source == blobItem)
1613	2313	{
1614	2314	Blob blob = new Blob();
1615	2315	BlobComponent comp = new BlobComponent();
..	..	@@ -1617,15 +2317,15 @@
1617	2317	//blob.retile();
1618	2318	makeSomething(blob);
1619	2319	} else
1620		- if (event.getSource() == latheItem)
	2320	+ if (source == latheItem)
1621	2321	{
1622	2322	makeSomething(new Lathe());
1623	2323	} else
1624		- if (event.getSource() == bezierItem)
	2324	+ if (source == bezierItem)
1625	2325	{
1626	2326	makeSomething(new BezierSurface());
1627	2327	} else
1628		- if (event.getSource() == checkerItem)
	2328	+ if (source == overlayItem \|\| source == overlayButton)
1629	2329	{
1630	2330	/*
1631	2331	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1640,7 +2340,7 @@
1640	2340	*/
1641	2341	makeSomething(new Checker());
1642	2342	} else
1643		- if (event.getSource() == meshItem)
	2343	+ if (source == meshItem)
1644	2344	{
1645	2345	Object3D itemtomake = new Object3D();
1646	2346	Object3D child;
..	..	@@ -1661,35 +2361,52 @@
1661	2361	makeSomething(child);
1662	2362	}
1663	2363	} else
1664		- if (event.getSource() == springItem)
	2364	+ if (source == springItem)
1665	2365	{
1666	2366	cSpring s = new cSpring();
1667	2367	s.setup();
1668	2368	makeSomething(s);
1669	2369	} else
1670		- if (event.getSource() == flagItem)
	2370	+ if (source == flagItem)
1671	2371	{
1672	2372	cSpring s = new cFlag();
1673	2373	s.setup();
1674	2374	makeSomething(s);
1675	2375	} else
1676		- if (event.getSource() == lightItem)
	2376	+ if (source == lightItem \|\| source == lightButton)
1677	2377	{
1678	2378	makeSomething(new Light());
1679	2379	} else
1680		- 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)
1681	2398	{
1682	2399	group(new CSG());
1683	2400	} else
1684		- if (event.getSource() == templateItem)
	2401	+ if (source == templateItem)
1685	2402	{
1686	2403	group(new cTemplate());
1687	2404	} else
1688		- if (event.getSource() == attributeItem)
	2405	+ if (source == attributeItem)
1689	2406	{
1690	2407	makeSomething(new Attribute());
1691	2408	} else
1692		- if (event.getSource() == pointflowItem)
	2409	+ if (source == pointflowItem)
1693	2410	{
1694	2411	makeSomething(new PointFlow());
1695	2412	} else
..	..	@@ -1701,7 +2418,7 @@
1701	2418	} else
1702	2419	*/
1703	2420
1704		- if (event.getSource() == superLoopItem)
	2421	+ if (source == superLoopItem)
1705	2422	{
1706	2423	Composite g = new cGroup();
1707	2424	for (int i=0; i<15; i++)
..	..	@@ -1723,30 +2440,30 @@
1723	2440
1724	2441	group(g);
1725	2442	} else
1726		- if (event.getSource() == loopItem)
	2443	+ if (source == loopItem \|\| source == loopButton)
1727	2444	{
1728	2445	Composite csg = new GroupLeaf();
1729	2446	csg.count = 5;
1730	2447	group(csg);
1731		- Composite child = new cGroup();
	2448	+ Composite child = new cGroup("Branch");
1732	2449	csg.addChild(child);
1733	2450	child.addChild(csg);
1734	2451	} else
1735		- if (event.getSource() == doubleItem)
	2452	+ if (source == doubleItem)
1736	2453	{
1737		- Composite csg = new GroupLeaf();
	2454	+ Composite csg = new GroupLeaf("Fork");
1738	2455	csg.count = 5;
1739	2456	group(csg);
1740		- Composite child = new cGroup();
	2457	+ Composite child = new cGroup("Branch A");
1741	2458	csg.addChild(child);
1742	2459	child.addChild(csg);
1743		- child = new cGroup();
	2460	+ child = new cGroup("Branch B");
1744	2461	csg.addChild(child);
1745	2462	child.addChild(csg);
1746	2463	} else
1747		- if (event.getSource() == tripleItem)
	2464	+ if (source == tripleItem)
1748	2465	{
1749		- Composite csg = new GroupLeaf();
	2466	+ Composite csg = new GroupLeaf("Trident");
1750	2467	csg.count = 4;
1751	2468	group(csg);
1752	2469	Composite child = new cGroup();
..	..	@@ -1759,73 +2476,98 @@
1759	2476	csg.addChild(child);
1760	2477	child.addChild(csg);
1761	2478	} else
1762		-
1763		- if (event.getSource() == importGFDItem)
	2479	+ if (source == computeAOItem)
1764	2480	{
1765		- ImportGFD();
	2481	+ Globals.drawMode = CameraPane.OCCLUSION;
	2482	+ cameraView.repaint();
1766	2483	} else
1767		- if (event.getSource() == importVRMLX3DItem)
1768		- {
1769		- ImportVRMLX3D();
1770		- } else
1771		- if (event.getSource() == import3DSItem)
1772		- {
1773		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1774		- } else
1775		- if (event.getSource() == importOBJItem)
1776		- {
1777		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1778		- } else
1779		- if (event.getSource() == computeAOItem)
1780		- {
1781		- CameraPane.drawMode = CameraPane.OCCLUSION;
1782		- CameraPane.theRenderer.repaint();
1783		- } else
1784		- if (event.getSource() == recompileItem)
	2484	+ if (source == recompileItem)
1785	2485	{
1786	2486	Recompile();
1787	2487	refreshContents();
1788	2488	} else
1789		- if (event.getSource() == editScriptItem)
	2489	+ if (source == editScriptItem)
1790	2490	{
1791	2491	OpenDialog();
1792	2492	refreshContents();
1793	2493	} else
1794		- if (event.getSource() == invariantsItem)
	2494	+ if (source == invariantsItem)
1795	2495	{
1796	2496	System.out.println("Invariants:");
1797		- GrafreeD.grafreeD.universe.invariants();
	2497	+ Grafreed.grafreeD.universe.invariants();
1798	2498	} else
1799		- if (event.getSource() == memoryItem)
	2499	+ if (source == memoryItem)
1800	2500	{
1801	2501	//System.out.println("Invariants:");
1802	2502	PrintMemory();
1803	2503	} else
1804		- if (event.getSource() == pathItem)
	2504	+ if (source == pathItem)
1805	2505	{
1806	2506	PrintPath();
1807	2507	} else
1808		- if (event.getSource() == analyzeItem)
	2508	+ if (source == analyzeItem)
1809	2509	{
1810	2510	AnalyzeObject();
1811	2511	} else
1812		- if (event.getSource() == dumpItem)
	2512	+ if (source == dumpItem)
1813	2513	{
1814	2514	DumpObject();
1815	2515	} else
1816		- if (event.getSource() == screenfitButton)
	2516	+ if (source == minButton)
1817	2517	{
1818		- //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	+ {
1819	2563	ScreenFit();
1820	2564	} else
1821		- if (event.getSource() == screenfitpointButton)
	2565	+ if (source == screenfitpointButton)
1822	2566	{
1823		- //Reload(lastConverter, lastFilename, true);
1824	2567	ScreenFitPoint();
1825	2568	} else
1826		- if (event.getSource() == snapobjectButton)
	2569	+ if (source == snapobjectButton)
1827	2570	{
1828		- //Reload(lastConverter, lastFilename, true);
1829	2571	SnapObject();
1830	2572	} else
1831	2573	// if (event.getSource() == recompileButton)
..	..	@@ -1834,13 +2576,13 @@
1834	2576	// Recompile();
1835	2577	// refreshContents();
1836	2578	// } else
1837		- if (event.getSource() == gcButton)
	2579	+ if (source == gcButton)
1838	2580	{
1839	2581	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1840	2582	System.gc();
1841	2583	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1842	2584	} else
1843		- if (event.getSource() == editLeafItem)
	2585	+ if (source == editLeafItem)
1844	2586	{
1845	2587	Object3D obj;
1846	2588	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1854,62 +2596,74 @@
1854	2596	}
1855	2597	refreshContents(true);
1856	2598	} else
1857		- if (event.getSource() == openWindowItem)
	2599	+ if (source == openWindowItem)
1858	2600	{
1859	2601	EditSelection(true);
1860	2602	} else
1861		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2603	+ if (source == cutItem \|\| source == clearButton)
1862	2604	{
1863	2605	loadClipboard(true);
1864	2606	} else
1865		- if (event.getSource() == duplicateItem)
	2607	+ if (source == undoItem)
1866	2608	{
1867		- 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;
1868	2618	loadClipboard(false);
1869	2619	paste(false);
1870		- GrafreeD.clipboard = keep;
	2620	+ Grafreed.clipboard = keep;
1871	2621	} else
1872		- if (event.getSource() == cloneItem)
	2622	+ if (source == cloneItem)
1873	2623	{
1874	2624	CloneSelection(false);
1875	2625	} else
1876		- if (event.getSource() == cloneSupportItem)
	2626	+ if (source == cloneSupportItem)
1877	2627	{
1878	2628	CloneSelection(true);
1879	2629	} else
1880		- if (event.getSource() == copyItem)
	2630	+ if (source == copyItem)
1881	2631	{
1882	2632	loadClipboard(false);
1883	2633	} else
1884		- if (event.getSource() == pasteItem)
	2634	+ if (source == pasteItem)
1885	2635	{
1886	2636	paste(false);
1887	2637	} else
1888		- if (event.getSource() == pasteLinkItem)
	2638	+ if (source == pasteIntoItem)
1889	2639	{
1890		- pasteInto(false);
	2640	+ pasteInto(true, false);
1891	2641	} else
1892		- if (event.getSource() == pasteCloneItem)
	2642	+ if (source == pasteLinkItem)
1893	2643	{
1894		- pasteInto(true);
	2644	+ pasteInto(false, false);
1895	2645	} else
1896		- if (event.getSource() == pasteExpandItem)
	2646	+ if (source == pasteCloneItem)
	2647	+ {
	2648	+ pasteInto(true, true);
	2649	+ } else
	2650	+ if (source == pasteExpandItem)
1897	2651	{
1898	2652	paste(true);
1899	2653	} else
1900		- if (event.getSource() == synchronizeItem)
	2654	+ if (source == synchronizeItem)
1901	2655	{
1902	2656	Overwrite(Object3D.TRANSFORM);
1903	2657	} else
1904		- if (event.getSource() == overwriteNameItem)
	2658	+ if (source == overwriteNameItem)
1905	2659	{
1906	2660	Overwrite(Object3D.NAME);
1907	2661	} else
1908		- if (event.getSource() == overwriteUVItem)
	2662	+ if (source == overwriteUVItem)
1909	2663	{
1910	2664	Overwrite(Object3D.UV);
1911	2665	} else
1912		- if (event.getSource() == overwriteMatItem)
	2666	+ if (source == overwriteMatItem)
1913	2667	{
1914	2668	/* july 2015
1915	2669	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1929,7 +2683,7 @@
1929	2683
1930	2684	Overwrite(dropAttributes);
1931	2685	}
1932		- if (event.getSource() == overwriteGeoItem)
	2686	+ if (source == overwriteGeoItem)
1933	2687	{
1934	2688	Overwrite(Object3D.GEOMETRY);
1935	2689	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1946,7 +2700,7 @@
1946	2700	// refreshContents();
1947	2701	// }
1948	2702	} else
1949		- if (event.getSource() == generateMeshItem)
	2703	+ if (source == generateMeshItem)
1950	2704	{
1951	2705	//if (group.selection.size() == 1)
1952	2706	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1957,7 +2711,7 @@
1957	2711	ResetModel();
1958	2712	refreshContents();
1959	2713	} else
1960		- if (event.getSource() == extractGeometriesItem)
	2714	+ if (source == extractGeometriesItem)
1961	2715	{
1962	2716	boolean one = false;
1963	2717
..	..	@@ -1984,7 +2738,7 @@
1984	2738	ResetModel();
1985	2739	refreshContents();
1986	2740	} else
1987		- if (event.getSource() == cloneGeometriesItem)
	2741	+ if (source == cloneGeometriesItem)
1988	2742	{
1989	2743	boolean one = false;
1990	2744
..	..	@@ -2010,7 +2764,7 @@
2010	2764	ResetModel();
2011	2765	refreshContents();
2012	2766	} else
2013		- if (event.getSource() == shareGeometriesItem)
	2767	+ if (source == shareGeometriesItem)
2014	2768	{
2015	2769	boolean one = false;
2016	2770
..	..	@@ -2040,7 +2794,7 @@
2040	2794	refreshContents();
2041	2795	}
2042	2796	} else
2043		- if (event.getSource() == mergeGeometriesItem)
	2797	+ if (source == mergeGeometriesItem)
2044	2798	{
2045	2799	boolean one = false;
2046	2800
..	..	@@ -2070,7 +2824,7 @@
2070	2824	ResetModel();
2071	2825	refreshContents();
2072	2826	} else
2073		- if (event.getSource() == linkverticesItem)
	2827	+ if (source == linkverticesItem)
2074	2828	{
2075	2829	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2076	2830	// {
..	..	@@ -2083,48 +2837,48 @@
2083	2837	// group.selection.get(0).setMasterThis(content); // should be identity
2084	2838	// refreshContents();
2085	2839	// }
2086		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2840	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2087	2841	{
2088		- Object3D content = GrafreeD.clipboard.get(0);
	2842	+ Object3D content = Grafreed.clipboard.get(0);
2089	2843
2090	2844	if (content instanceof cGroup && ((cGroup)content).transientlink )
2091	2845	content = ((cGroup)content).get(0);
2092	2846
2093		- 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));
2094	2848	for (int i=0; i<group.selection.size(); i++)
2095	2849	{
2096		- boolean random = CameraPane.RANDOM;
2097		- CameraPane.RANDOM = false; // parse all random nodes
	2850	+ boolean random = CameraPane.SWITCH;
	2851	+ CameraPane.SWITCH = false; // parse all random nodes
2098	2852	group.selection.get(i).linkVerticesThis(content);
2099	2853	// group.selection.get(i).setMasterThis(content); // should be identity
2100		- CameraPane.RANDOM = random;
	2854	+ CameraPane.SWITCH = random;
2101	2855	}
2102		- 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));
2103	2857	refreshContents();
2104	2858	}
2105	2859	} else
2106		- if (event.getSource() == resetsupportItem)
	2860	+ if (source == resetsupportItem)
2107	2861	{
2108	2862	for (int i=0; i<group.selection.size(); i++)
2109	2863	{
2110		- boolean random = CameraPane.RANDOM;
2111		- CameraPane.RANDOM = false; // parse all random nodes
	2864	+ boolean random = CameraPane.SWITCH;
	2865	+ CameraPane.SWITCH = false; // parse all random nodes
2112	2866	group.selection.get(i).linkVerticesThis(null);
2113		- CameraPane.RANDOM = random;
	2867	+ CameraPane.SWITCH = random;
2114	2868	}
2115	2869
2116	2870	refreshContents();
2117	2871	} else
2118		- if (event.getSource() == relinkverticesItem)
	2872	+ if (source == relinkverticesItem)
2119	2873	{
2120		- boolean random = CameraPane.RANDOM;
2121		- CameraPane.RANDOM = false; // parse all random nodes
	2874	+ boolean random = CameraPane.SWITCH;
	2875	+ CameraPane.SWITCH = false; // parse all random nodes
2122	2876	group.selection.RelinkToSupport();
2123		- CameraPane.RANDOM = random;
	2877	+ CameraPane.SWITCH = random;
2124	2878
2125	2879	refreshContents();
2126	2880	} else
2127		- if (event.getSource() == resetreferencesItem)
	2881	+ if (source == resetreferencesItem)
2128	2882	{
2129	2883	for (int i=0; i<group.selection.size(); i++)
2130	2884	{
..	..	@@ -2133,11 +2887,11 @@
2133	2887
2134	2888	refreshContents();
2135	2889	} else
2136		- if (event.getSource() == setMasterItem)
	2890	+ if (source == setMasterItem)
2137	2891	{
2138		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2892	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2139	2893	{
2140		- Object3D content = GrafreeD.clipboard.get(0);
	2894	+ Object3D content = Grafreed.clipboard.get(0);
2141	2895
2142	2896	if (content instanceof cGroup && ((cGroup)content).transientlink )
2143	2897	content = ((cGroup)content).get(0);
..	..	@@ -2146,13 +2900,13 @@
2146	2900	refreshContents();
2147	2901	}
2148	2902	} else
2149		- if (event.getSource() == poseMeshItem)
	2903	+ if (source == poseMeshItem)
2150	2904	{
2151	2905	if (group.selection.size() == 1)
2152	2906	{
2153		- if (GrafreeD.clipboard.size() == 1)
	2907	+ if (Grafreed.clipboard.size() == 1)
2154	2908	{
2155		- Object3D content = GrafreeD.clipboard.get(0);
	2909	+ Object3D content = Grafreed.clipboard.get(0);
2156	2910
2157	2911	if (content instanceof cGroup && ((cGroup)content).transientlink )
2158	2912	content = ((cGroup)content).get(0);
..	..	@@ -2165,19 +2919,19 @@
2165	2919	}
2166	2920
2167	2921	} else
2168		- if (event.getSource() == revertMeshItem)
	2922	+ if (source == revertMeshItem)
2169	2923	{
2170	2924	RevertMeshes();
2171	2925	} else
2172		- if (event.getSource() == resetMeshItem)
	2926	+ if (source == resetAllItem)
2173	2927	{
2174	2928	ResetAll();
2175	2929	} else
2176		- if (event.getSource() == stepAllItem)
	2930	+ if (source == stepAllItem)
2177	2931	{
2178	2932	StepAll();
2179	2933	} else
2180		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2934	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2181	2935	{
2182	2936	//int indices[] = jList.getSelectedIndices();
2183	2937	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2185,46 +2939,46 @@
2185	2939
2186	2940	ClearSelection(false);
2187	2941	} else
2188		- if (event.getSource() == clearAllItem)
	2942	+ if (source == clearAllItem)
2189	2943	{
2190	2944	ClearSelection(true);
2191	2945	} else
2192		- if (event.getSource() == grabItem)
	2946	+ if (source == grabItem \|\| source == groupButton)
2193	2947	{
2194		- group(new cGroup(), true);
	2948	+ group(new cGroup(), false); // true);
2195	2949	} else
2196		- if (event.getSource() == hideItem)
	2950	+ if (source == hideItem)
2197	2951	{
2198	2952	group(new HiddenObject());
2199	2953	} else
2200		- if (event.getSource() == frontItem)
	2954	+ if (source == frontItem)
2201	2955	{
2202	2956	front();
2203	2957	} else
2204		- if (event.getSource() == backItem)
	2958	+ if (source == backItem)
2205	2959	{
2206	2960	back();
2207	2961	} else
2208		- if (event.getSource() == cameraItem)
	2962	+ if (source == cameraItem)
2209	2963	{
2210	2964	makeSomething(new Camera());
2211	2965	} else
2212		- if (event.getSource() == compositeItem)
	2966	+ if (source == compositeItem \|\| source == compositeButton)
2213	2967	{
2214	2968	group(new Composite());
2215	2969	} else
2216		- if (event.getSource() == randomItem)
	2970	+ if (source == switchItem \|\| source == switchButton)
2217	2971	{
2218	2972	RandomNode random = new RandomNode();
2219	2973	group(random);
2220	2974	if (random.size() > 0)
2221		- random.name = random.get(0).name + "Rnd";
	2975	+ random.name = random.get(0).name + "Switch";
2222	2976	} else
2223		- if (event.getSource() == physicsItem)
	2977	+ if (source == physicsItem)
2224	2978	{
2225	2979	group(new PhysicsNode());
2226	2980	} else
2227		- if (event.getSource() == frameselectorItem)
	2981	+ if (source == frameselectorItem)
2228	2982	{
2229	2983	for (int i=0; i<group.selection.size(); i++)
2230	2984	{
..	..	@@ -2236,7 +2990,7 @@
2236	2990	ResetModel();
2237	2991	refreshContents();
2238	2992	} else
2239		- if (event.getSource() == switchGeoItem)
	2993	+ if (source == switchGeoItem)
2240	2994	{
2241	2995	for (int i=0; i<group.selection.size(); i++)
2242	2996	{
..	..	@@ -2248,7 +3002,7 @@
2248	3002	ResetModel();
2249	3003	refreshContents();
2250	3004	} else
2251		- if (event.getSource() == switchTransfoItem)
	3005	+ if (source == switchTransfoItem)
2252	3006	{
2253	3007	for (int i=0; i<group.selection.size(); i++)
2254	3008	{
..	..	@@ -2260,7 +3014,7 @@
2260	3014	ResetModel();
2261	3015	refreshContents();
2262	3016	} else
2263		- if (event.getSource() == morphItem)
	3017	+ if (source == morphItem)
2264	3018	{
2265	3019	for (int i=0; i<group.selection.size(); i++)
2266	3020	{
..	..	@@ -2272,7 +3026,7 @@
2272	3026	ResetModel();
2273	3027	refreshContents();
2274	3028	} else
2275		- if (event.getSource() == scriptNodeItem)
	3029	+ if (source == scriptNodeItem)
2276	3030	{
2277	3031	boolean atleastone = false;
2278	3032
..	..	@@ -2311,215 +3065,252 @@
2311	3065	}
2312	3066	}
2313	3067	} else
2314		- if (event.getSource() == linkerItem)
	3068	+ if (source == linkerItem)
2315	3069	{
2316	3070	group(new cLinker());
2317	3071	} else
2318		- if (event.getSource() == textureItem)
	3072	+ if (source == textureItem \|\| source == textureButton)
2319	3073	{
2320	3074	group(new TextureNode());
2321	3075	} else
2322		- if (event.getSource() == billboardItem)
	3076	+ if (source == billboardItem)
2323	3077	{
2324	3078	group(new BillboardNode());
2325	3079	} else
2326		- if (event.getSource() == shadowXItem)
	3080	+ if (source == shadowXItem)
2327	3081	{
2328	3082	CastShadow(0);
2329	3083	} else
2330		- if (event.getSource() == shadowYItem)
	3084	+ if (source == shadowYItem)
2331	3085	{
2332	3086	CastShadow(1);
2333	3087	} else
2334		- if (event.getSource() == shadowZItem)
	3088	+ if (source == shadowZItem)
2335	3089	{
2336	3090	CastShadow(2);
2337	3091	} else
2338		- if (event.getSource() == ungroupItem)
	3092	+ if (source == ungroupItem \|\| source == ungroupButton)
2339	3093	{
2340		- //ungroup();
	3094	+ boolean hasRoot = false;
	3095	+
2341	3096	for (int i=0; i<group.selection.size(); i++)
2342	3097	{
2343		- Ungroup(group.selection.get(i));
	3098	+ if (group.selection.get(i) == group)
	3099	+ {
	3100	+ hasRoot = true;
	3101	+ break;
	3102	+ }
2344	3103	}
2345	3104
2346		- ClearSelection(false);
2347		-
2348		- 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	+ }
2349	3116	} else
2350		- if (event.getSource() == genUVItem)
	3117	+ if (source == genUVItem)
2351	3118	{
2352	3119	GenUV();
2353	3120	} else
2354		- if (event.getSource() == genNormalsCADItem)
	3121	+ if (source == genNormalsCADItem)
2355	3122	{
2356	3123	GenNormals(true);
2357	3124	} else
2358		- if (event.getSource() == genNormalsMESHItem)
	3125	+ if (source == genNormalsMESHItem)
2359	3126	{
2360		- GenNormals(true); // TODO
	3127	+ GenNormalsMESH();
2361	3128	} else
2362		- if (event.getSource() == genNormalsORGANItem)
	3129	+ if (source == genNormalsORGANItem)
2363	3130	{
2364	3131	GenNormals(false);
2365	3132	} else
2366		- if (event.getSource() == genNormalsMINEItem)
	3133	+ if (source == genNormalsMINEItem)
2367	3134	{
2368	3135	GenNormalsMINE();
2369	3136	} else
2370		- if (event.getSource() == stripifyItem)
	3137	+ if (source == stripifyItem)
2371	3138	{
2372	3139	Stripify();
2373	3140	} else
2374		- if (event.getSource() == unstripifyItem)
	3141	+ if (source == unstripifyItem)
2375	3142	{
2376	3143	Unstripify();
2377	3144	} else
2378		- if (event.getSource() == trimItem)
	3145	+ if (source == trimItem)
2379	3146	{
2380	3147	Trim();
2381	3148	} else
2382		- if (event.getSource() == untrimItem)
	3149	+ if (source == untrimItem)
2383	3150	{
2384	3151	Untrim();
2385	3152	} else
2386		- if (event.getSource() == clearColorsItem)
	3153	+ if (source == clearColorsItem)
2387	3154	{
2388	3155	ClearColors();
2389	3156	} else
2390		- if (event.getSource() == clearMaterialsItem)
	3157	+ if (source == clearMaterialsItem)
2391	3158	{
2392	3159	ClearMaterials();
2393	3160	} else
2394		- if (event.getSource() == liveleavesItem)
	3161	+ if (source == liveleavesItem)
2395	3162	{
2396	3163	LiveLeaves(true);
2397	3164	} else
2398		- if (event.getSource() == unliveleavesItem)
	3165	+ if (source == unliveleavesItem)
2399	3166	{
2400	3167	LiveLeaves(false);
2401	3168	} else
2402		- if (event.getSource() == supportleavesItem)
	3169	+ if (source == supportleavesItem)
2403	3170	{
2404	3171	SupportLeaves(true);
2405	3172	} else
2406		- if (event.getSource() == unsupportleavesItem)
	3173	+ if (source == unsupportleavesItem)
2407	3174	{
2408	3175	SupportLeaves(false);
2409	3176	} else
2410		- if (event.getSource() == hideleavesItem)
	3177	+ if (source == hideleavesItem)
2411	3178	{
2412	3179	HideLeaves(true);
2413	3180	} else
2414		- if (event.getSource() == showleavesItem)
	3181	+ if (source == showleavesItem)
2415	3182	{
2416	3183	HideLeaves(false);
2417	3184	} else
2418		- if (event.getSource() == markleavesItem)
	3185	+ if (source == markleavesItem)
2419	3186	{
2420	3187	MarkLeaves(true);
2421	3188	} else
2422		- if (event.getSource() == unmarkleavesItem)
	3189	+ if (source == unmarkleavesItem)
2423	3190	{
2424	3191	MarkLeaves(false);
2425	3192	} else
2426		- 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)
2427	3210	{
2428	3211	FlipV(true);
2429	3212	} else
2430		- if (event.getSource() == unflipVItem)
	3213	+ if (source == unflipVItem)
2431	3214	{
2432	3215	FlipV(false);
2433	3216	} else
2434		- if (event.getSource() == lowTexturesItem)
	3217	+ if (source == lowTexturesItem)
2435	3218	{
2436	3219	SetTexRes(0);
2437	3220	} else
2438		- if (event.getSource() == normalTexturesItem)
	3221	+ if (source == normalTexturesItem)
2439	3222	{
2440	3223	SetTexRes(1);
2441	3224	} else
2442		- if (event.getSource() == highTexturesItem)
	3225	+ if (source == highTexturesItem)
2443	3226	{
2444	3227	SetTexRes(2);
2445	3228	} else
2446		- if (event.getSource() == veryhighTexturesItem)
	3229	+ if (source == veryhighTexturesItem)
2447	3230	{
2448	3231	SetTexRes(3);
2449	3232	} else
2450		- if (event.getSource() == maxTexturesItem)
	3233	+ if (source == maxTexturesItem)
2451	3234	{
2452	3235	SetTexRes(4);
2453	3236	} else
2454		- if (event.getSource() == panoTexturesItem)
	3237	+ if (source == panoTexturesItem)
2455	3238	{
2456	3239	SetTexRes(5);
2457	3240	} else
2458		- if (event.getSource() == reverseNormalsItem)
	3241	+ if (source == reverseNormalsItem)
2459	3242	{
2460	3243	ReverseNormals();
2461	3244	} else
2462		- if (event.getSource() == parseverticesItem)
	3245	+ if (source == parseverticesItem)
2463	3246	{
2464	3247	ParseVertices();
2465	3248	} else
2466		- if (event.getSource() == textureFieldItem)
	3249	+ if (source == textureFieldItem)
2467	3250	{
2468	3251	TextureVertices();
2469	3252	} else
2470		- if (event.getSource() == alignItem)
	3253	+ if (source == alignItem)
2471	3254	{
2472	3255	Align();
2473	3256	} else
2474		- if (event.getSource() == mirrorItem)
	3257	+ if (source == mirrorItem)
2475	3258	{
2476	3259	MirrorPoses();
2477	3260	} else
2478		- if (event.getSource() == reduceMorphItem)
	3261	+ if (source == reduceMorphItem)
2479	3262	{
2480	3263	MeshReduction(false);
2481	3264	} else
2482		- if (event.getSource() == reduce34MorphItem)
	3265	+ if (source == reduce34MorphItem)
2483	3266	{
2484	3267	MeshReduction(true);
2485	3268	} else
2486		- if (event.getSource() == reverseTrianglesItem)
	3269	+ if (source == reverseTrianglesItem)
2487	3270	{
2488	3271	ReverseTriangles();
2489	3272	} else
2490		- if (event.getSource() == reduceMeshItem)
	3273	+ if (source == reduceMeshItem)
2491	3274	{
2492	3275	ReduceMesh(false);
2493	3276	} else
2494		- if (event.getSource() == reduce34MeshItem)
	3277	+ if (source == reduce34MeshItem)
2495	3278	{
2496	3279	ReduceMesh(true);
2497	3280	} else
2498		- if (event.getSource() == increaseMeshItem)
	3281	+ if (source == increaseMeshItem)
2499	3282	{
2500	3283	IncreaseMesh();
2501	3284	} else
2502		- if (event.getSource() == clipMeshItem)
	3285	+ if (source == clipMeshItem)
2503	3286	{
2504	3287	ClipMesh();
2505	3288	} else
2506		- if (event.getSource() == smoothMeshItem)
	3289	+ if (source == smoothMeshItem)
2507	3290	{
2508	3291	SmoothMesh();
2509	3292	} else
2510		- if (event.getSource() == transformgeometryItem)
	3293	+ if (source == transformGeometryItem)
2511	3294	{
2512	3295	TransformGeometry();
2513	3296	} else
2514		- if (event.getSource() == resetTransformItem)
	3297	+ if (source == transformChildrenItem)
	3298	+ {
	3299	+ TransformChildren();
	3300	+ } else
	3301	+ if (source == resetTransformItem)
2515	3302	{
2516	3303	ResetTransform();
2517	3304	} else
2518		- if (event.getSource() == resetCentroidItem)
	3305	+ if (source == resetCentroidItem)
2519	3306	{
2520		- ResetCentroid();
	3307	+ ResetCentroid(true);
2521	3308	} else
2522		- if (event.getSource() == resetParentItem)
	3309	+ if (source == resetCentroidXZItem)
	3310	+ {
	3311	+ ResetCentroid(false);
	3312	+ } else
	3313	+ if (source == resetParentItem)
2523	3314	{
2524	3315	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2525	3316	{
..	..	@@ -2529,7 +3320,7 @@
2529	3320
2530	3321	refreshContents();
2531	3322	} else
2532		- if (event.getSource() == repairParentItem)
	3323	+ if (source == repairParentItem)
2533	3324	{
2534	3325	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2535	3326	{
..	..	@@ -2543,7 +3334,21 @@
2543	3334
2544	3335	refreshContents();
2545	3336	} else
2546		- 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)
2547	3352	{
2548	3353	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2549	3354	{
..	..	@@ -2555,7 +3360,7 @@
2555	3360	ResetModel();
2556	3361	refreshContents();
2557	3362	} else
2558		- if (event.getSource() == sortbynameItem)
	3363	+ if (source == sortbynameItem)
2559	3364	{
2560	3365	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2561	3366	{
..	..	@@ -2567,7 +3372,7 @@
2567	3372	ResetModel();
2568	3373	refreshContents();
2569	3374	} else
2570		- if (event.getSource() == attachPigmentItem)
	3375	+ if (source == attachPigmentItem)
2571	3376	{
2572	3377	String texture = GetFile("Attach pigment");
2573	3378	Object3D obj;
..	..	@@ -2579,7 +3384,7 @@
2579	3384
2580	3385	refreshContents();
2581	3386	} else
2582		- if (event.getSource() == detachPigmentItem)
	3387	+ if (source == detachPigmentItem)
2583	3388	{
2584	3389	Object3D obj;
2585	3390	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2590,7 +3395,7 @@
2590	3395
2591	3396	refreshContents();
2592	3397	} else
2593		- if (event.getSource() == attachBumpItem)
	3398	+ if (source == attachBumpItem)
2594	3399	{
2595	3400	String texture = GetFile("Attach bump");
2596	3401	Object3D obj;
..	..	@@ -2602,18 +3407,18 @@
2602	3407
2603	3408	refreshContents();
2604	3409	} else
2605		- if (event.getSource() == detachBumpItem)
	3410	+ if (source == detachBumpItem)
2606	3411	{
2607	3412	Object3D obj;
2608	3413	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2609	3414	{
2610	3415	obj = (Object3D)e.nextElement();
2611		- obj.SetBumpTexture(null);
	3416	+ obj.ResetBumpTexture();
2612	3417	}
2613	3418
2614	3419	refreshContents();
2615	3420	} else
2616		- if (event.getSource() == pigmentBumpItem)
	3421	+ if (source == pigmentBumpItem)
2617	3422	{
2618	3423	Object3D obj;
2619	3424	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2624,158 +3429,262 @@
2624	3429
2625	3430	refreshContents();
2626	3431	} else
2627		- 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)
2628	3458	{
2629	3459	CameraPane.flash = true;
2630	3460	refreshContents();
2631	3461	} else
2632		- if (event.getSource() == oneButton)
	3462	+ if (source == oneButton)
2633	3463	{
2634	3464	} else
2635		- if (event.getSource() == twoButton)
	3465	+ if (source == twoButton)
2636	3466	{
2637	3467	radio.layout = twoButton;
	3468	+
	3469	+ if (CameraPane.FULLSCREEN)
	3470	+ fullscreenLayout = radio.layout;
	3471	+
2638	3472	// bug
2639	3473	//gridPanel.setDividerLocation(1.0);
2640	3474	//bigPanel.setDividerLocation(0.0);
2641		- bigThree.remove(scenePanel);
2642		- bigThree.remove(cameraPanel);
2643		- bigThree.remove(XYZPanel);
2644		- aWindowConstraints.gridx = 0;
2645		- aWindowConstraints.gridy = 0;
2646		- aWindowConstraints.gridwidth = 1;
2647		- // aConstraints.gridheight = 3;
2648		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2649		- aWindowConstraints.weightx = 0;
2650		- aWindowConstraints.weighty = 1;
2651		- //bigThree.add(jtp, aWindowConstraints);
2652		- aWindowConstraints.weightx = 1;
2653		- aWindowConstraints.gridwidth = 3;
2654		- // aConstraints.gridheight = 3;
2655		- aWindowConstraints.gridx = 1;
2656		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2657		- bigThree.add(cameraPanel, aWindowConstraints);
2658		- aWindowConstraints.weightx = 0;
2659		- aWindowConstraints.gridx = 4;
2660		- aWindowConstraints.gridwidth = 1;
2661		- // aConstraints.gridheight = 3;
2662		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2663		- //bigThree.add(XYZPanel, aWindowConstraints);
2664		- 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	+
2665	3522	} else
2666		- if (event.getSource() == threeButton)
	3523	+ if (source == threeButton)
2667	3524	{
2668	3525	radio.layout = threeButton;
2669		- bigThree.remove(scenePanel);
2670		- bigThree.remove(cameraPanel);
2671		- bigThree.remove(XYZPanel);
2672		- aWindowConstraints.gridx = 0;
2673		- aWindowConstraints.gridy = 0;
2674		- aWindowConstraints.gridwidth = 1;
2675		- // aConstraints.gridheight = 3;
2676		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2677		- aWindowConstraints.weightx = 0;
2678		- aWindowConstraints.weighty = 1;
2679		- //bigThree.add(jtp, aWindowConstraints);
2680		- aWindowConstraints.weightx = 1;
2681		- aWindowConstraints.gridwidth = 3;
2682		- // aConstraints.gridheight = 3;
2683		- aWindowConstraints.gridx = 1;
2684		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2685		- bigThree.add(cameraPanel, aWindowConstraints);
2686		- aWindowConstraints.weightx = 0;
2687		- aWindowConstraints.gridx = 4;
2688		- aWindowConstraints.gridwidth = 1;
2689		- // aConstraints.gridheight = 3;
2690		- aConstraints.fill = GridBagConstraints.VERTICAL;
2691		- bigThree.add(XYZPanel, aWindowConstraints);
2692		- 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();
2693	3563	} else
2694		- if (event.getSource() == fourButton)
	3564	+ if (source == fourButton)
2695	3565	{
2696	3566	radio.layout = fourButton;
2697		- bigThree.remove(scenePanel);
2698		- bigThree.remove(cameraPanel);
2699		- bigThree.remove(XYZPanel);
2700		- aWindowConstraints.gridx = 0;
2701		- aWindowConstraints.gridy = 0;
2702		- aWindowConstraints.gridwidth = 1;
2703		- // aWindowConstraints.gridheight = 3;
2704		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2705		- aWindowConstraints.weightx = 1;
2706		- aWindowConstraints.weighty = 1;
2707		- bigThree.add(scenePanel, aWindowConstraints);
2708		- aWindowConstraints.weightx = 1;
2709		- aWindowConstraints.gridwidth = 3;
2710		- // aConstraints.gridheight = 3;
2711		- aWindowConstraints.gridx = 1;
2712		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2713		- //bigThree.add(cameraPanel, aWindowConstraints);
2714		- aWindowConstraints.weightx = 0;
2715		- aWindowConstraints.gridx = 4;
2716		- aWindowConstraints.gridwidth = 1;
2717		- // aWindowConstraints.gridheight = 3;
2718		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2719		- //bigThree.add(XYZPanel, aWindowConstraints);
2720		- 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();
2721	3603	} else
2722		- if (event.getSource() == sixButton)
	3604	+ if (source == sixButton)
2723	3605	{
2724	3606	radio.layout = sixButton;
2725		- bigThree.remove(scenePanel);
2726		- bigThree.remove(cameraPanel);
2727		- bigThree.remove(XYZPanel);
2728		- aWindowConstraints.gridx = 0;
2729		- aWindowConstraints.gridy = 0;
2730		- aWindowConstraints.gridwidth = 1;
2731		- // aConstraints.gridheight = 3;
2732		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2733		- aWindowConstraints.weightx = 0;
2734		- aWindowConstraints.weighty = 1;
2735		- bigThree.add(scenePanel, aWindowConstraints);
2736		- aWindowConstraints.weightx = 1;
2737		- aWindowConstraints.gridwidth = 3;
2738		- // aWindowConstraints.gridheight = 3;
2739		- aWindowConstraints.gridx = 1;
2740		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2741		- bigThree.add(cameraPanel, aWindowConstraints);
2742		- aWindowConstraints.weightx = 0;
2743		- aWindowConstraints.gridx = 4;
2744		- aWindowConstraints.gridwidth = 1;
2745		- // aWindowConstraints.gridheight = 3;
2746		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2747		- //bigThree.add(XYZPanel, aConstraints);
2748		- 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();
2749	3644	} else
2750		- if (event.getSource() == sevenButton)
	3645	+ if (source == sevenButton)
2751	3646	{
2752	3647	radio.layout = sevenButton;
2753		- bigThree.remove(scenePanel);
2754		- bigThree.remove(cameraPanel);
2755		- bigThree.remove(XYZPanel);
2756		- aWindowConstraints.gridx = 0;
2757		- aWindowConstraints.gridy = 0;
2758		- aWindowConstraints.gridwidth = 1;
2759		- // aWindowConstraints.gridheight = 3;
2760		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2761		- aWindowConstraints.weightx = 0;
2762		- aWindowConstraints.weighty = 1;
2763		- bigThree.add(scenePanel, aWindowConstraints);
2764		- aWindowConstraints.weightx = 1;
2765		- aWindowConstraints.gridwidth = 3;
2766		- // aWindowConstraints.gridheight = 3;
2767		- aWindowConstraints.gridx = 1;
2768		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2769		- bigThree.add(cameraPanel, aWindowConstraints);
2770		- aWindowConstraints.weightx = 0;
2771		- aWindowConstraints.gridx = 4;
2772		- aWindowConstraints.gridwidth = 1;
2773		- // aConstraints.gridheight = 3;
2774		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2775		- bigThree.add(XYZPanel, aWindowConstraints);
2776		- 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();
2777	3686	} else
2778		- if (event.getSource() == rootButton)
	3687	+ if (source == rootButton)
2779	3688	{
2780	3689	Object3D obj;
2781	3690	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2785,66 +3694,84 @@
2785	3694	EditObject(obj);
2786	3695	}
2787	3696
	3697	+ cameraView.requestFocusInWindow();
2788	3698	refreshContents(true);
2789	3699	} else
2790		- if (event.getSource() == closeButton)
	3700	+ if (source == closeButton)
2791	3701	{
2792	3702	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2793	3703	cRadio ab;
2794	3704	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2795	3705	{
2796	3706	ab = (cRadio)e.nextElement();
2797		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3707	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2798	3708	{
	3709	+ // Patch to avoid bug with transparency.
	3710	+ if (!ab.hadMaterial)
	3711	+ {
	3712	+ ab.object.material = null;
	3713	+ }
	3714	+
2799	3715	buttonGroup.remove(ab);
2800	3716	radioPanel.remove(ab);
2801	3717
2802		- ab.GetObject().editWindow = null;
	3718	+ //ab.GetObject().editWindow = null;
	3719	+ ab.GetObject().manipWindow = null;
2803	3720	// ab.GetObject().objectUI = null; // ?????????
2804	3721
2805	3722	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2806	3723	break;
2807	3724	}
2808	3725	}
	3726	+
	3727	+ cameraView.requestFocusInWindow();
2809	3728	refreshContents(true);
2810	3729	} else
2811		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3730	+ if (source == editItem \|\| source == editButton)
2812	3731	{
	3732	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3733	+ {
	3734	+ Object3D child = (Object3D)e.nextElement();
	3735	+ child.pinned = true;
	3736	+ }
	3737	+
2813	3738	EditSelection(false);
2814	3739	} else
2815		- if (event.getSource() == uneditButton)
	3740	+ if (source == uneditButton)
2816	3741	{
2817	3742	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2818	3743	{
2819	3744	Object3D child = (Object3D)e.nextElement();
2820	3745	if(child.editWindow != null)
2821	3746	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3747	+ child.pinned = false;
2822	3748	child.CloseUI();
2823	3749	listUI.remove(child);
2824	3750
2825		- child.editWindow = null; // ???????????
	3751	+ //child.editWindow = null; // ???????????
2826	3752	}
2827		- objEditor.ctrlPanel.revalidate();
	3753	+ objEditor.ctrlPanel.FlushUI();
2828	3754	//objEditor.jTree.clearSelection();
2829	3755	//objEditor.ResetSliders();
2830	3756	refreshContents(true);
2831	3757	} else
2832		- if (event.getSource() == clearPanelButton)
	3758	+ if (source == clearPanelButton)
2833	3759	{
2834	3760	assert(copy == group);
2835	3761	//copy.ClearUI();
2836	3762	for (Object3D obj : listUI)
2837	3763	{
	3764	+ obj.pinned = false;
2838	3765	obj.CloseUI();
2839	3766	}
2840	3767	listUI.clear();
2841	3768	refreshContents(true);
2842	3769	} else
2843		- if (event.getSource() == allParamsButton)
	3770	+ if (source == allParamsButton)
2844	3771	{
2845	3772	assert(copy == group);
2846	3773
2847		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3774	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2848	3775
2849	3776	for (Object3D obj : listUI)
2850	3777	{
..	..	@@ -2861,19 +3788,19 @@
2861	3788
2862	3789	refreshContents(true);
2863	3790	} else
2864		- if (event.getSource() == unselectButton)
	3791	+ if (source == unselectButton)
2865	3792	{
2866	3793	objEditor.jTree.clearSelection();
2867	3794	// ?? oct 2012 GrafreeD.clipboard.clear();
2868	3795	objEditor.ResetSliders();
2869	3796	refreshContents(true);
2870	3797	} else
2871		- if(event.getSource() instanceof cRadio)
	3798	+ if(source instanceof cRadio)
2872	3799	{
2873	3800	group.parent = keepparent;
2874	3801	group.attributes = 0;
2875	3802	//group.editWindow = null;
2876		- /cRadio/ radio = (cRadio)event.getSource();
	3803	+ /cRadio/ radio = (cRadio)source;
2877	3804	Object3D obj = radio.GetObject();
2878	3805	System.out.println("Edit " + obj);
2879	3806	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2893,7 +3820,10 @@
2893	3820	}
2894	3821
2895	3822	copy = group;
2896		- //CameraPane.theRenderer.object = group;
	3823	+
	3824	+ SetUndoStates();
	3825	+
	3826	+ //Globals.theRenderer.object = group;
2897	3827	if(!useclient)
2898	3828	{
2899	3829	cameraView.renderCamera = radio.camera;
..	..	@@ -2902,25 +3832,52 @@
2902	3832	cameraView.cameras[cameraView.cameracount] = radio.camera;
2903	3833	cameraView.targetLookAt.set(radio.camera.lookAt);
2904	3834	cameraView.object = group;
2905		- cameraView.lighttouched = true;
	3835	+ //cameraView.lighttouched = true;
	3836	+ Globals.lighttouched = true;
2906	3837	topView.object = group;
2907	3838	frontView.object = group;
2908	3839	sideView.object = group;
2909	3840	}
2910		- group.editWindow = this;
	3841	+
	3842	+// fix "+" issue
	3843	+ //group.editWindow = this;
	3844	+ group.manipWindow = this;
	3845	+
2911	3846	/*
2912	3847	currentLayout = radio.layout;
2913	3848	if (currentLayout == null)
2914	3849	currentLayout = sevenButton;
2915	3850	*/
2916	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);
2917	3859	keepparent = group.parent;
2918	3860	// PARENT = NULL or not???
2919	3861	//group.parent = null; // ROOT
2920	3862	//group.attributes = -1;
2921	3863	ResetModel();
	3864	+
	3865	+ cameraView.requestFocusInWindow();
2922	3866	refreshContents(true);
2923		- }
	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	+ }
2924	3881	else
2925	3882	{
2926	3883	//return super.action(event, arg);
..	..	@@ -2929,7 +3886,6 @@
2929	3886	}
2930	3887
2931	3888	boolean useclient = false;
2932		- cRadio radio;
2933	3889
2934	3890	void ToggleRoot()
2935	3891	{
..	..	@@ -2938,7 +3894,7 @@
2938	3894	if (useclient)
2939	3895	{
2940	3896	cameraView.object = client;
2941		- cameraView.lighttouched = true;
	3897	+ Globals.lighttouched = true;
2942	3898	//topView.object = client;
2943	3899	//frontView.object = client;
2944	3900	//sideView.object = client;
..	..	@@ -2946,7 +3902,7 @@
2946	3902	else
2947	3903	{
2948	3904	cameraView.object = group;
2949		- cameraView.lighttouched = true;
	3905	+ Globals.lighttouched = true;
2950	3906	//topView.object = group;
2951	3907	//frontView.object = group;
2952	3908	//sideView.object = group;
..	..	@@ -2981,6 +3937,28 @@
2981	3937	refreshContents();
2982	3938	}
2983	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	+ }
2984	3962
2985	3963	void ResetTransform()
2986	3964	{
..	..	@@ -3093,7 +4071,7 @@
3093	4071	refreshContents();
3094	4072	}
3095	4073
3096		- void ResetCentroid()
	4074	+ void ResetCentroid(boolean full)
3097	4075	{
3098	4076	Object3D obj;
3099	4077	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3108,12 +4086,16 @@
3108	4086	LA.matIdentity(Object3D.mat);
3109	4087	obj.getBounds(minima, maxima, false);
3110	4088	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3111		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	4089	+ if (full)
	4090	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3112	4091	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3113	4092	obj.TransformMesh(Object3D.mat);
	4093	+
3114	4094	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3115		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	4095	+ if (full)
	4096	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3116	4097	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	4098	+
3117	4099	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3118	4100	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3119	4101	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3142,7 +4124,8 @@
3142	4124
3143	4125	int size = obj.MemorySize();
3144	4126
3145		- 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)");
3146	4129	}
3147	4130	}
3148	4131	catch (Exception e)
..	..	@@ -3179,9 +4162,9 @@
3179	4162	obj = (Object3D)e.nextElement();
3180	4163
3181	4164	System.out.println("Object is: " + obj);
3182		- GrafreeD.AnalyzeObject(obj);
	4165	+ Grafreed.AnalyzeObject(obj);
3183	4166	System.out.println("Boundary rep: " + obj.bRep);
3184		- GrafreeD.AnalyzeObject(obj.bRep);
	4167	+ Grafreed.AnalyzeObject(obj.bRep);
3185	4168
3186	4169	// System.err.println((size/1024) + " KB is the size of " + obj);
3187	4170	}
..	..	@@ -3223,6 +4206,13 @@
3223	4206	void GenNormals(boolean crease)
3224	4207	{
3225	4208	group.GenNormalsS(crease);
	4209	+
	4210	+ refreshContents();
	4211	+ }
	4212	+
	4213	+ void GenNormalsMESH()
	4214	+ {
	4215	+ group.GenNormalsMeshS();
3226	4216
3227	4217	refreshContents();
3228	4218	}
..	..	@@ -3395,8 +4385,8 @@
3395	4385
3396	4386	void ParseVertices()
3397	4387	{
3398		- boolean epsequal = GrafreeD.epsequal;
3399		- GrafreeD.epsequal = true;
	4388	+ boolean epsequal = Grafreed.epsequal;
	4389	+ Grafreed.epsequal = true;
3400	4390
3401	4391	for (int i=0; i<group.selection.size(); i++)
3402	4392	{
..	..	@@ -3421,7 +4411,7 @@
3421	4411	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3422	4412	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3423	4413
3424		- g.add(GrafreeD.clipboard);
	4414	+ g.add(Grafreed.clipboard);
3425	4415
3426	4416	buffer.add(g);
3427	4417	}
..	..	@@ -3436,7 +4426,7 @@
3436	4426	makeSomething(buffer, i==group.selection.size()-1);
3437	4427	}
3438	4428
3439		- GrafreeD.epsequal = epsequal;
	4429	+ Grafreed.epsequal = epsequal;
3440	4430
3441	4431	refreshContents();
3442	4432	}
..	..	@@ -3454,7 +4444,16 @@
3454	4444	String pigment = Object3D.GetPigment(tex);
3455	4445	//String bump = Object3D.GetBump(tex);
3456	4446
3457		- 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	+ }
3458	4457
3459	4458	double s = v.s;
3460	4459
..	..	@@ -3542,11 +4541,11 @@
3542	4541
3543	4542	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3544	4543
3545		- boolean random = CameraPane.RANDOM;
3546		- CameraPane.RANDOM = false; // parse all random nodes
	4544	+ boolean random = CameraPane.SWITCH;
	4545	+ CameraPane.SWITCH = false; // parse all random nodes
3547	4546	lowres.linkVerticesThis(null);
3548	4547	lowres.linkVerticesThis(sn);
3549		- CameraPane.RANDOM = random;
	4548	+ CameraPane.SWITCH = random;
3550	4549
3551	4550	System.err.flush();
3552	4551
..	..	@@ -3586,7 +4585,7 @@
3586	4585	return;
3587	4586
3588	4587	Object3D poses = group.selection.get(0);
3589		- Object3D ref = GrafreeD.clipboard.get(0);
	4588	+ Object3D ref = Grafreed.clipboard.get(0);
3590	4589
3591	4590	Object3D newgroup = new Object3D("Po:" + poses.name);
3592	4591
..	..	@@ -3755,7 +4754,7 @@
3755	4754	group.selection.RelinkToSupport(); // july 2014
3756	4755	System.out.println("DONE.");
3757	4756	refreshContents();
3758		- 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));
3759	4758	}
3760	4759
3761	4760	void ReduceMesh(boolean reduction34)
..	..	@@ -3780,9 +4779,9 @@
3780	4779
3781	4780	void ClipMesh()
3782	4781	{
3783		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4782	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3784	4783	{
3785		- Object3D content = GrafreeD.clipboard.get(0);
	4784	+ Object3D content = Grafreed.clipboard.get(0);
3786	4785
3787	4786	if (content instanceof cGroup && ((cGroup)content).transientlink )
3788	4787	content = ((cGroup)content).get(0);
..	..	@@ -3791,7 +4790,7 @@
3791	4790	// {
3792	4791	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3793	4792	// }
3794		- group.selection.ClipMesh(GrafreeD.clipboard);
	4793	+ group.selection.ClipMesh(Grafreed.clipboard);
3795	4794	}
3796	4795	// group.selection.ClipMesh(GrafreeD.clipboard);
3797	4796	System.out.println("DONE.");
..	..	@@ -3838,6 +4837,18 @@
3838	4837	void MarkLeaves(boolean hide)
3839	4838	{
3840	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);
3841	4852	refreshContents();
3842	4853	}
3843	4854
..	..	@@ -3912,28 +4923,25 @@
3912	4923	// }
3913	4924	// }
3914	4925
3915		- static boolean allparams = true;
3916		-
3917		- static Vector<Object3D> listUI = new Vector<Object3D>();
3918		-
3919	4926	void EditSelection(boolean newWindow)
3920	4927	{
	4928	+ if (group.selection == null)
	4929	+ {
	4930	+ EditElement(group, newWindow); // ? new
	4931	+ return;
	4932	+ }
	4933	+
3921	4934	// aConstraints.gridy = 0;
3922	4935	for (int i=0; i<group.selection.size(); i++)
3923	4936	{
3924	4937	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
3925	4938	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3926		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4939	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3927	4940
3928	4941	Object3D elem = (Object3D)group.selection.elementAt(i);
3929		- if(elem != group)
	4942	+ if(elem != group \|\| !newWindow)
3930	4943	{
3931		- // if (!(elem instanceof Composite))
3932		- // newWindow = false;
3933		- listUI.add(elem);
3934		- elem.openEditWindow(this, newWindow); //, false);
3935		- System.out.println("edit : " + elem);
3936		- elem.editWindow.refreshContents(true); // ? new
	4944	+ EditElement(elem, newWindow); // ? new
3937	4945	}
3938	4946	}
3939	4947	}
..	..	@@ -4008,7 +5016,8 @@
4008	5016	//new Exception().printStackTrace();
4009	5017
4010	5018	freezemodel = true;
4011		-
	5019	+ ClearUnpinned();
	5020	+
4012	5021	/**/
4013	5022	//switch (event.id)
4014	5023	{
..	..	@@ -4016,7 +5025,6 @@
4016	5025	//case 702: // Event.LIST_DESELECT
4017	5026	group.deselectAll();
4018	5027	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4019		- objEditor.ClearInfo(); // .GetMaterial());
4020	5028	if (tps != null)
4021	5029	{
4022	5030	for (int i=0; i < tps.length; i++)
..	..	@@ -4025,33 +5033,39 @@
4025	5033
4026	5034	//if (child.parent != null)
4027	5035	//child.parent.addSelectee(child);
	5036	+ objEditor.SetMaterial(child);
4028	5037	group.addSelectee(child);
4029		- objEditor.SetMaterial(child); // .GetMaterial());
4030		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4031		- System.err.println("info : " + child.GetPath());
4032	5038	}
4033	5039	}
4034		- else
4035		- {
4036		- objEditor.SetMaterial(group); // .GetMaterial());
4037		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4038		- System.err.println("info : " + group.GetPath());
4039		- }
	5040	+// else
	5041	+// {
	5042	+// objEditor.SetMaterial(group); // .GetMaterial());
	5043	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	5044	+// System.err.println("info : " + group.GetPath());
	5045	+// }
4040	5046
4041		- objEditor.SetText(); // jan 2014
4042		-
4043		- 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))
4044	5048	CameraPane.flash = true;
4045	5049
4046		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5050	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4047	5051	// a camera
4048	5052	{
4049		- CameraPane.camerachangeframe = 0; // don't refuse it
4050		- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
4051		- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
4052		- // 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;
4053	5060	}
4054	5061
	5062	+ if (tps != null && tps.length == 1)
	5063	+ {
	5064	+ EditSelection(false);
	5065	+ }
	5066	+
	5067	+ SetPinStates(tps != null && tps.length > 0);
	5068	+
4055	5069	refreshContents();
4056	5070	//return true;
4057	5071	}
..	..	@@ -4060,6 +5074,35 @@
4060	5074
4061	5075	freezemodel = false;
4062	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	+ }
4063	5106
4064	5107	void linkSomething(Object3D thing)
4065	5108	{
..	..	@@ -4131,16 +5174,19 @@
4131	5174	{
4132	5175	if (group.selection.isEmpty())
4133	5176	return;
4134		- GrafreeD.clipboardIsTempGroup = false;
	5177	+
	5178	+ Grafreed.clipboardIsTempGroup = false;
4135	5179	Composite tGroup = null;
4136	5180	if (group.selection.size() > 0) // 1)
4137	5181	{
4138	5182	tGroup = new cGroup();
4139		- GrafreeD.clipboardIsTempGroup = true;
	5183	+ Grafreed.clipboardIsTempGroup = true;
4140	5184	}
4141	5185
4142	5186	if (cut)
4143	5187	{
	5188	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5189	+// Save();
4144	5190	//int indices[] = jList.getSelectedIndices();
4145	5191	//for (int i = indices.length - 1; i >= 0; i--)
4146	5192	//jList.remove(indices[i]);
..	..	@@ -4176,16 +5222,16 @@
4176	5222	//System.out.println("cut " + child);
4177	5223	//System.out.println("parent = " + child.parent);
4178	5224	// tmp.addChild(child);
4179		- if (GrafreeD.clipboardIsTempGroup)
	5225	+ if (Grafreed.clipboardIsTempGroup)
4180	5226	tGroup.add/Child/(tmp);
4181	5227	else
4182		- GrafreeD.clipboard = tmp;
	5228	+ Grafreed.clipboard = tmp;
4183	5229	}
4184	5230	else
4185		- if (GrafreeD.clipboardIsTempGroup)
	5231	+ if (Grafreed.clipboardIsTempGroup)
4186	5232	tGroup.add/Child/(child);
4187	5233	else
4188		- GrafreeD.clipboard = child;
	5234	+ Grafreed.clipboard = child;
4189	5235	}
4190	5236
4191	5237	//ResetModel();
..	..	@@ -4217,21 +5263,23 @@
4217	5263	//System.out.println("cut " + elem);
4218	5264	//System.out.println("parent = " + elem.parent);
4219	5265	// tmp.addChild(elem);
4220		- if (GrafreeD.clipboardIsTempGroup)
	5266	+ if (Grafreed.clipboardIsTempGroup)
4221	5267	tGroup.add/Child/(tmp);
4222	5268	else
4223		- GrafreeD.clipboard = tmp;
	5269	+ Grafreed.clipboard = tmp;
4224	5270	}
4225	5271	else
4226		- if (GrafreeD.clipboardIsTempGroup)
	5272	+ if (Grafreed.clipboardIsTempGroup)
4227	5273	tGroup.add/Child/(child);
4228	5274	else
4229		- GrafreeD.clipboard = child;
	5275	+ Grafreed.clipboard = child;
4230	5276	}
4231	5277
4232	5278	}
4233		- if (GrafreeD.clipboardIsTempGroup)
4234		- GrafreeD.clipboard = tGroup;
	5279	+
	5280	+ if (Grafreed.clipboardIsTempGroup)
	5281	+ Grafreed.clipboard = tGroup;
	5282	+
4235	5283	if (cut)
4236	5284	{
4237	5285	ResetModel();
..	..	@@ -4241,11 +5289,15 @@
4241	5289
4242	5290	void paste(boolean expand)
4243	5291	{
	5292	+ if (Globals.REPLACEONMAKE)
	5293	+ Save();
	5294	+ boolean keep = Globals.REPLACEONMAKE;
	5295	+ Globals.REPLACEONMAKE = false;
4244	5296	// if (GrafreeD.clipboard == null)
4245	5297	// return;
4246	5298	boolean first = true;
4247	5299
4248		- if (GrafreeD.clipboardIsTempGroup)
	5300	+ if (Grafreed.clipboardIsTempGroup)
4249	5301	{
4250	5302	Composite temp;
4251	5303
..	..	@@ -4256,7 +5308,7 @@
4256	5308	temp = (Composite)Applet3D.clipboard.deepCopy();
4257	5309	*/
4258	5310	Object3D elem;
4259		- 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))
4260	5312	{
4261	5313	Object3D child = (Object3D)e.nextElement();
4262	5314
..	..	@@ -4290,21 +5342,22 @@
4290	5342	//Object3D cb = Applet3D.clipboard;
4291	5343	//temp.addChild(cb);
4292	5344	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4293		- assert(GrafreeD.clipboard.parent == null);
4294		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4295		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4296		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4297		- 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());
4298	5350	else
4299		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4300		- GrafreeD.clipboard.get(0).parent = keepparent;
	5351	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5352	+ Grafreed.clipboard.get(0).parent = keepparent;
4301	5353	}
4302	5354
	5355	+ Globals.REPLACEONMAKE = keep;
4303	5356	ResetModel();
4304	5357	refreshContents();
4305	5358	}
4306	5359
4307		- void pasteInto(boolean copyit)
	5360	+ void pasteInto(boolean copyit, boolean clone)
4308	5361	{
4309	5362	// if (GrafreeD.clipboard == null)
4310	5363	// return;
..	..	@@ -4333,15 +5386,22 @@
4333	5386	if (copyit)
4334	5387	{
4335	5388	// paste(false);
4336		- CloneClipboard(false); // sept 2014
	5389	+ if (clone)
	5390	+ {
	5391	+ CloneClipboard(false); // sept 2014
	5392	+ }
	5393	+ else
	5394	+ {
	5395	+ paste(false);
	5396	+ }
4337	5397	}
4338	5398	else
4339	5399	{
4340	5400	boolean first = true;
4341	5401
4342		- if (GrafreeD.clipboardIsTempGroup)
	5402	+ if (Grafreed.clipboardIsTempGroup)
4343	5403	{
4344		- Composite temp = (Composite)GrafreeD.clipboard;
	5404	+ Composite temp = (Composite)Grafreed.clipboard;
4345	5405	Object3D copy;
4346	5406	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4347	5407	{
..	..	@@ -4351,7 +5411,7 @@
4351	5411	}
4352	5412	} else
4353	5413	{
4354		- linkSomething(GrafreeD.clipboard); //.get(0));
	5414	+ linkSomething(Grafreed.clipboard); //.get(0));
4355	5415	}
4356	5416	}
4357	5417	}
..	..	@@ -4428,6 +5488,10 @@
4428	5488
4429	5489	void group(Object3D csg, boolean grab)
4430	5490	{
	5491	+ if (Globals.REPLACEONMAKE)
	5492	+ Save();
	5493	+ boolean keep = Globals.REPLACEONMAKE;
	5494	+ Globals.REPLACEONMAKE = false;
4431	5495	if (//false) // why??
4432	5496	!group.selection.isEmpty())
4433	5497	{
..	..	@@ -4541,10 +5605,15 @@
4541	5605	//node.add(csg);
4542	5606	//makeSomething(node);
4543	5607	makeSomething(csg);
	5608	+ Globals.REPLACEONMAKE = keep;
4544	5609	}
4545	5610
4546	5611	void Ungroup(Object3D g)
4547	5612	{
	5613	+ if (Globals.REPLACEONMAKE)
	5614	+ Save();
	5615	+ boolean keep = Globals.REPLACEONMAKE;
	5616	+ Globals.REPLACEONMAKE = false;
4548	5617	if (g instanceof HiddenObject)
4549	5618	{
4550	5619	HiddenObject h = (HiddenObject) g;
..	..	@@ -4561,6 +5630,7 @@
4561	5630	objEditor.makeSomething(g.get(i), false);
4562	5631	}
4563	5632	}
	5633	+ Globals.REPLACEONMAKE = keep;
4564	5634	}
4565	5635
4566	5636	void ungroup()
..	..	@@ -4756,21 +5826,6 @@
4756	5826	}
4757	5827	*/
4758	5828
4759		- void ImportGFD()
4760		- {
4761		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4762		- browser.show();
4763		- String filename = browser.getFile();
4764		- if (filename != null && filename.length() > 0)
4765		- {
4766		- String fullname = browser.getDirectory() + filename;
4767		-
4768		- //Object3D readobj =
4769		- objEditor.ReadGFD(fullname, objEditor);
4770		- //makeSomething(readobj);
4771		- }
4772		- }
4773		-
4774	5829	/*
4775	5830	public void Callback(Object obj)
4776	5831	{
..	..	@@ -4794,26 +5849,9 @@
4794	5849	}
4795	5850	*/
4796	5851
4797		- void ImportVRMLX3D()
4798		- {
4799		- if (GrafreeD.standAlone)
4800		- {
4801		- /**/
4802		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4803		- browser.show();
4804		- String filename = browser.getFile();
4805		- if (filename != null && filename.length() > 0)
4806		- {
4807		- String fullname = browser.getDirectory() + filename;
4808		- LoadVRMLX3D(fullname);
4809		- }
4810		- /**/
4811		- }
4812		- }
4813		-
4814	5852	String GetFile(String dialogName)
4815	5853	{
4816		- if (GrafreeD.standAlone)
	5854	+ if (Grafreed.standAlone)
4817	5855	{
4818	5856	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4819	5857	browser.show();
..	..	@@ -4877,10 +5915,49 @@
4877	5915	cButton flashSelectionButton;
4878	5916	cButton editButton;
4879	5917	cButton uneditButton;
	5918	+ JCheckBox allParamsButton;
4880	5919	cButton clearpanelButton;
4881		- cButton allParamsButton;
4882	5920	cButton unselectButton;
4883	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	+
4884	5961	cButton screenfitButton;
4885	5962	cButton screenfitpointButton;
4886	5963	cButton snapobjectButton;
..	..	@@ -4892,14 +5969,6 @@
4892	5969
4893	5970	cButton setsupportButton;
4894	5971
4895		- cButton twoButton;
4896		- cButton sixButton;
4897		- cButton threeButton;
4898		- cButton sevenButton;
4899		- cButton fourButton; // full panel
4900		- cButton oneButton; // full XYZ
4901		- //cButton currentLayout;
4902		-
4903	5972	//
4904	5973	//Composite
4905	5974	Object3D // to do !!
..	..	@@ -4909,9 +5978,11 @@
4909	5978	//JTree jTree;
4910	5979	private MenuItem lookAtItem;
4911	5980	private MenuItem lookFromItem;
4912		- private MenuItem switchItem;
	5981	+ private MenuItem switchViewItem;
4913	5982	private MenuItem cutItem;
4914		- private MenuItem duplicateItem;
	5983	+ private MenuItem undoItem;
	5984	+ private MenuItem redoItem;
	5985	+ private JMenuItem duplicateItem;
4915	5986	private MenuItem cloneItem;
4916	5987	private MenuItem cloneSupportItem;
4917	5988	private MenuItem overwriteGeoItem;
..	..	@@ -4924,7 +5995,7 @@
4924	5995	private MenuItem linkverticesItem;
4925	5996	private MenuItem relinkverticesItem;
4926	5997	private MenuItem setMasterItem;
4927		- private MenuItem resetMeshItem;
	5998	+ private MenuItem resetAllItem;
4928	5999	private MenuItem stepAllItem;
4929	6000	private MenuItem revertMeshItem;
4930	6001	private MenuItem poseMeshItem;
..	..	@@ -4935,10 +6006,11 @@
4935	6006	private MenuItem mergeGeometriesItem;
4936	6007	private MenuItem copyItem;
4937	6008	private MenuItem pasteItem;
	6009	+ private MenuItem pasteIntoItem;
4938	6010	private MenuItem pasteLinkItem;
4939	6011	private MenuItem pasteCloneItem;
4940	6012	private MenuItem pasteExpandItem;
4941		- private MenuItem clearItem;
	6013	+ private MenuItem deleteItem;
4942	6014	private MenuItem clearAllItem;
4943	6015	private MenuItem genUVItem;
4944	6016	private MenuItem genNormalsMESHItem;
..	..	@@ -4973,6 +6045,10 @@
4973	6045	private MenuItem showleavesItem;
4974	6046	private MenuItem markleavesItem;
4975	6047	private MenuItem unmarkleavesItem;
	6048	+ private MenuItem rewindleavesItem;
	6049	+ private MenuItem unrewindleavesItem;
	6050	+ private MenuItem randomleavesItem;
	6051	+ private MenuItem unrandomleavesItem;
4976	6052
4977	6053	private MenuItem flipVItem;
4978	6054	private MenuItem unflipVItem;
..	..	@@ -4984,15 +6060,17 @@
4984	6060	private MenuItem panoTexturesItem;
4985	6061
4986	6062	private MenuItem resetCentroidItem;
4987		- private MenuItem transformgeometryItem;
	6063	+ private MenuItem resetCentroidXZItem;
4988	6064	private MenuItem resetTransformItem;
	6065	+ private MenuItem transformGeometryItem;
	6066	+ private MenuItem transformChildrenItem;
4989	6067	private MenuItem hideItem;
4990	6068	private MenuItem grabItem;
4991	6069	private MenuItem backItem;
4992	6070	private MenuItem frontItem;
4993	6071	private MenuItem cameraItem;
4994	6072	private MenuItem compositeItem;
4995		- private MenuItem randomItem;
	6073	+ private MenuItem switchItem;
4996	6074	private MenuItem physicsItem;
4997	6075	private MenuItem frameselectorItem;
4998	6076	private MenuItem scriptNodeItem;
..	..	@@ -5007,6 +6085,7 @@
5007	6085
5008	6086	private MenuItem resetParentItem;
5009	6087	private MenuItem repairParentItem;
	6088	+ private MenuItem repairShadowItem;
5010	6089	private MenuItem sortbysizeItem;
5011	6090	private MenuItem sortbynameItem;
5012	6091
..	..	@@ -5015,6 +6094,8 @@
5015	6094	private MenuItem attachBumpItem;
5016	6095	private MenuItem detachBumpItem;
5017	6096	private MenuItem pigmentBumpItem;
	6097	+ private MenuItem embedTexturesItem;
	6098	+ private MenuItem deEmbedTexturesItem;
5018	6099
5019	6100	private MenuItem particleItem;
5020	6101	private MenuItem ragdollItem;
..	..	@@ -5031,7 +6112,7 @@
5031	6112	private MenuItem blobItem;
5032	6113	private MenuItem latheItem;
5033	6114	private MenuItem bezierItem;
5034		- private MenuItem checkerItem;
	6115	+ private MenuItem overlayItem;
5035	6116	private MenuItem meshItem;
5036	6117	// private MenuItem meshGroupItem;
5037	6118	private MenuItem springItem;
..	..	@@ -5053,11 +6134,6 @@
5053	6134	private MenuItem doubleItem;
5054	6135	private MenuItem tripleItem;
5055	6136
5056		- private MenuItem importGFDItem;
5057		- private MenuItem importVRMLX3DItem;
5058		- private MenuItem import3DSItem;
5059		- private MenuItem importOBJItem;
5060		-
5061	6137	private MenuItem computeAOItem;
5062	6138	private MenuItem recompileItem;
5063	6139	private MenuItem editScriptItem;
..	..	@@ -5067,4 +6143,8 @@
5067	6143	private MenuItem analyzeItem;
5068	6144	private MenuItem dumpItem;
5069	6145	//boolean freezemodel = false;
	6146	+
	6147	+ Menu cameraMenu;
	6148	+ MenuItem editCameraItem;
	6149	+ MenuItem restoreCameraItem;
5070	6150	}