~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -74,7 +74,7 @@
74	74	this.copy = this.group = copy;
75	75	//selectees = this.group.selectees;
76	76
77		- SetupMenu2(objEditor);
	77	+ SetupMenu2(this); //objEditor);
78	78	SetupUI2(objEditor);
79	79	objEditor.SetupUI(true);
80	80	SetupViews(objEditor);
..	..	@@ -98,14 +98,14 @@
98	98
99	99	void CloneClipboard(boolean supports)
100	100	{
101		- assert(GrafreeD.clipboard.parent == null);
102		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
103		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
104		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
105		- makeSomething(CloneObject(GrafreeD.clipboard.get(0), false));
	101	+ assert(Grafreed.clipboard.parent == null);
	102	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	103	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	104	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	105	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
106	106	else
107		- makeSomething(CloneObject(GrafreeD.clipboard, false));
108		- GrafreeD.clipboard.get(0).parent = keepparent;
	107	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	108	+ Grafreed.clipboard.get(0).parent = keepparent;
109	109	}
110	110
111	111	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -119,7 +119,7 @@
119	119	// obj.support = null;
120	120	if (!supports)
121	121	obj.SaveSupports();
122		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	122	+ Object3D clone = (Object3D)Grafreed.clone(obj);
123	123	obj.parent = parent;
124	124	// obj.support = support;
125	125	// clone.support = support; // aout 2013
..	..	@@ -148,30 +148,29 @@
148	148
149	149	//JTextField nameField;
150	150
151		- void SetupMenu2(ObjEditor oe)
	151	+ void SetupMenu2(GroupEditor oe)
152	152	{
153		- oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
154		- //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
155		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
156		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
157		- oe.cameraMenu.add("-");
158		- openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
159		- openWindowItem.addActionListener(this);
160		- editLeafItem.addActionListener(this);
161		- lookAtItem.addActionListener(this);
162		- //lookFromItem.addActinoListener(this);
163		- //switchItem.addActionListener(this);
	153	+ oe.jTree = new cTree();
	154	+
164	155	Menu menu;
165	156	oe.menuBar.add(menu = new Menu("Edit"));
166	157	//editItem = menu.add(new MenuItem("Edit"));
167	158	//editItem.addActionListener(this);
168		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	159	+
	160	+// undoItem = menu.add(new MenuItem("Undo"));
	161	+// undoItem.addActionListener(this);
	162	+// redoItem = menu.add(new MenuItem("Redo"));
	163	+// redoItem.addActionListener(this);
	164	+// menu.add("-");
	165	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
169	166	duplicateItem.addActionListener(this);
170		- menu.add("-");
171	167	cloneItem = menu.add(new MenuItem("Clone"));
172	168	cloneItem.addActionListener(this);
	169	+ if (Globals.ADVANCED)
	170	+ {
173	171	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
174	172	cloneSupportItem.addActionListener(this);
	173	+ }
175	174	menu.add("-");
176	175	cutItem = menu.add(new MenuItem("Cut"));
177	176	cutItem.addActionListener(this);
..	..	@@ -179,27 +178,123 @@
179	178	copyItem.addActionListener(this);
180	179	pasteItem = menu.add(new MenuItem("Paste"));
181	180	pasteItem.addActionListener(this);
	181	+
	182	+ menu.add("-");
	183	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	184	+ pasteIntoItem.addActionListener(this);
182	185	pasteLinkItem = menu.add(new MenuItem("Paste link"));
183	186	pasteLinkItem.addActionListener(this);
184	187	pasteCloneItem = menu.add(new MenuItem("Paste clone"));
185	188	pasteCloneItem.addActionListener(this);
186	189	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
187	190	// pasteExpandItem.addActionListener(this);
	191	+ menu.add("-");
188	192	clearItem = menu.add(new MenuItem("Clear"));
189	193	clearItem.addActionListener(this);
	194	+
	195	+ if (Globals.ADVANCED)
	196	+ {
	197	+ // Deletes the cameras...
190	198	clearAllItem = menu.add(new MenuItem("Clear All"));
191	199	clearAllItem.addActionListener(this);
	200	+ }
	201	+
	202	+ menuBar.add(cameraMenu = new Menu("View"));
	203	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	204	+ //zBufferItem.addActionListener(this);
	205	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	206	+ //normalLensItem.addActionListener(this);
	207	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	208	+ restoreCameraItem.addActionListener(this);
	209	+
	210	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	211	+// toggleFullScreenItem.addItemListener(this);
	212	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	213	+// cameraMenu.add("-");
	214	+//
	215	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	216	+// toggleTextureItem.addItemListener(this);
	217	+// toggleTextureItem.setState(CameraPane.textureon);
	218	+//
	219	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	220	+// toggleSwitchItem.addItemListener(this);
	221	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	222	+
	223	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	224	+ toggleHandleItem.addItemListener(this);
	225	+ toggleHandleItem.setState(CameraPane.HANDLES);
	226	+
	227	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	228	+ togglePaintItem.addItemListener(this);
	229	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	230	+
	231	+ if (Globals.ADVANCED)
	232	+ {
	233	+ cameraMenu.add("-");
	234	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	235	+ toggleLiveItem.addItemListener(this);
	236	+ toggleLiveItem.setState(Globals.isLIVE());
192	237
	238	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	239	+ stepItem.addActionListener(this);
	240	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	241	+ // toggleDLItem.addItemListener(this);
	242	+ // toggleDLItem.setState(false);
	243	+
	244	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	245	+ toggleRenderItem.addItemListener(this);
	246	+ toggleRenderItem.setState(!CameraPane.frozen);
	247	+
	248	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	249	+ toggleDebugItem.addItemListener(this);
	250	+ toggleDebugItem.setState(Globals.DEBUG);
	251	+
	252	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	253	+ toggleFrustumItem.addItemListener(this);
	254	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	255	+
	256	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	257	+ toggleFootContactItem.addItemListener(this);
	258	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	259	+
	260	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	261	+ toggleTimelineItem.addItemListener(this);
	262	+ }
	263	+
	264	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	265	+// toggleRootItem.addItemListener(this);
	266	+// toggleRootItem.setState(false);
	267	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	268	+// animationItem.addItemListener(this);
	269	+// animationItem.setState(CameraPane.ANIMATION);
	270	+ cameraMenu.add("-");
	271	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	272	+ editCameraItem.addActionListener(this);
	273	+
	274	+ if (Globals.ADVANCED)
	275	+ {
	276	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	277	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	278	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	279	+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	280	+ oe.cameraMenu.add("-");
	281	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	282	+ openWindowItem.addActionListener(this);
	283	+ editLeafItem.addActionListener(this);
	284	+ lookAtItem.addActionListener(this);
	285	+ //lookFromItem.addActinoListener(this);
	286	+ //switchViewItem.addActionListener(this);
	287	+ }
	288	+
193	289	oe.menuBar.add(menu = new Menu("Setting"));
194		- resetMeshItem = menu.add(new MenuItem("Reset All"));
195		- resetMeshItem.addActionListener(this);
196		- stepAllItem = menu.add(new MenuItem("Step All"));
197		- stepAllItem.addActionListener(this);
	290	+ if (Globals.ADVANCED)
	291	+ {
198	292	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
199	293	revertMeshItem.addActionListener(this);
200	294	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
201	295	resetreferencesItem.addActionListener(this);
202	296	menu.add("-");
	297	+ }
203	298	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
204	299	overwriteGeoItem.addActionListener(this);
205	300	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -211,79 +306,104 @@
211	306	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
212	307	overwriteUVItem.addActionListener(this);
213	308	menu.add("-");
	309	+ if (Globals.ADVANCED)
	310	+ {
214	311	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
215	312	generateMeshItem.addActionListener(this);
216	313	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
217	314	poseMeshItem.addActionListener(this);
218	315	menu.add("-");
	316	+ }
219	317	resetsupportItem = menu.add(new MenuItem("Reset support"));
220	318	resetsupportItem.addActionListener(this);
221	319	linkverticesItem = menu.add(new MenuItem("Link to Support"));
222	320	linkverticesItem.addActionListener(this);
223	321	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
224	322	relinkverticesItem.addActionListener(this);
	323	+
	324	+ if (Globals.ADVANCED)
	325	+ {
225	326	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
226	327	setMasterItem.addActionListener(this);
	328	+ }
227	329
228	330	oe.menuBar.add(menu = new Menu("Group"));
229		- grabItem = menu.add(new MenuItem("Grab"));
230		- grabItem.addActionListener(this);
	331	+// grabItem = menu.add(new MenuItem("Grab"));
	332	+// grabItem.addActionListener(this);
231	333	backItem = menu.add(new MenuItem("Back"));
232	334	backItem.addActionListener(this);
233	335	frontItem = menu.add(new MenuItem("Front"));
234	336	frontItem.addActionListener(this);
235		- compositeItem = menu.add(new MenuItem("Composite"));
236		- compositeItem.addActionListener(this);
237		- hideItem = menu.add(new MenuItem("Hide"));
	337	+// compositeItem = menu.add(new MenuItem("Composite"));
	338	+// compositeItem.addActionListener(this);
	339	+
	340	+ if (Globals.ADVANCED)
	341	+ {
	342	+ hideItem = menu.add(new MenuItem("Hidden Group"));
238	343	hideItem.addActionListener(this);
	344	+ }
239	345	ungroupItem = menu.add(new MenuItem("Ungroup"));
240	346	ungroupItem.addActionListener(this);
241		- menu.add("-");
242		- randomItem = menu.add(new MenuItem("Switch node"));
243		- randomItem.addActionListener(this);
	347	+
	348	+// menu.add("-");
	349	+//
	350	+// switchItem = menu.add(new MenuItem("Switch node"));
	351	+// switchItem.addActionListener(this);
	352	+ if (Globals.ADVANCED)
	353	+ {
244	354	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
245	355	switchGeoItem.addActionListener(this);
246	356	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
247	357	switchTransfoItem.addActionListener(this);
	358	+ morphItem = menu.add(new MenuItem("Morph Group"));
	359	+ morphItem.addActionListener(this);
	360	+
	361	+ menu.add("-");
248	362	physicsItem = menu.add(new MenuItem("Physics"));
249	363	physicsItem.addActionListener(this);
250	364	frameselectorItem = menu.add(new MenuItem("Frame Selector"));
251	365	frameselectorItem.addActionListener(this);
252		- morphItem = menu.add(new MenuItem("Morph"));
253		- morphItem.addActionListener(this);
254	366	scriptNodeItem = menu.add(new MenuItem("Script Node"));
255	367	scriptNodeItem.addActionListener(this);
256		- cameraItem = menu.add(new MenuItem("Camera"));
257		- cameraItem.addActionListener(this);
	368	+ }
258	369
259	370	oe.menuBar.add(menu = new Menu("Object"));
260		- textureItem = menu.add(new MenuItem("Texture"));
261		- textureItem.addActionListener(this);
	371	+// textureItem = menu.add(new MenuItem("Texture"));
	372	+// textureItem.addActionListener(this);
262	373	billboardItem = menu.add(new MenuItem("Billboard"));
263	374	billboardItem.addActionListener(this);
264	375	csgItem = menu.add(new MenuItem("CSG"));
265	376	csgItem.addActionListener(this);
266		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	377	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
267	378	shadowXItem.addActionListener(this);
268		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	379	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
269	380	shadowYItem.addActionListener(this);
270		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	381	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
271	382	shadowZItem.addActionListener(this);
	383	+
	384	+ if (Globals.ADVANCED)
	385	+ {
	386	+ menu.add("-");
272	387	linkerItem = menu.add(new MenuItem("Linker"));
273	388	linkerItem.addActionListener(this);
274		- templateItem = menu.add(new MenuItem("Template"));
275		- templateItem.addActionListener(this);
276	389	attributeItem = menu.add(new MenuItem("Attribute"));
277	390	attributeItem.addActionListener(this);
	391	+ templateItem = menu.add(new MenuItem("Template"));
	392	+ templateItem.addActionListener(this);
278	393	pointflowItem = menu.add(new MenuItem("Point Flow"));
279	394	pointflowItem.addActionListener(this);
	395	+ }
280	396	menu.add("-");
281	397	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
282	398	resetTransformItem.addActionListener(this);
283	399	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
284	400	resetCentroidItem.addActionListener(this);
285		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
286		- transformgeometryItem.addActionListener(this);
	401	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	402	+ resetCentroidXZItem.addActionListener(this);
	403	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	404	+ transformGeometryItem.addActionListener(this);
	405	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	406	+ transformChildrenItem.addActionListener(this);
287	407
288	408	oe.menuBar.add(menu = new Menu("Geometry"));
289	409	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -294,8 +414,11 @@
294	414	genNormalsCADItem.addActionListener(this);
295	415	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
296	416	genNormalsMESHItem.addActionListener(this);
	417	+ if (Globals.ADVANCED)
	418	+ {
297	419	genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
298	420	genNormalsMINEItem.addActionListener(this);
	421	+ }
299	422	stripifyItem = menu.add(new MenuItem("Stripify"));
300	423	stripifyItem.addActionListener(this);
301	424	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -317,23 +440,34 @@
317	440	reduce34MeshItem.addActionListener(this);
318	441	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
319	442	increaseMeshItem.addActionListener(this);
320		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
321		- smoothMeshItem.addActionListener(this);
322	443	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
323	444	clipMeshItem.addActionListener(this);
	445	+
	446	+ if (Globals.ADVANCED)
	447	+ {
	448	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	449	+ smoothMeshItem.addActionListener(this);
	450	+ }
324	451
325	452	oe.menuBar.add(menu = new Menu("Attributes"));
326	453	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
327	454	clearMaterialsItem.addActionListener(this);
	455	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	456	+ resetAllItem.addActionListener(this);
	457	+ stepAllItem = menu.add(new MenuItem("Step All"));
	458	+ stepAllItem.addActionListener(this);
328	459	menu.add("-");
329	460	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
330	461	liveleavesItem.addActionListener(this);
331	462	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
332	463	unliveleavesItem.addActionListener(this);
	464	+ if (Globals.ADVANCED)
	465	+ {
333	466	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
334	467	supportleavesItem.addActionListener(this);
335	468	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
336	469	unsupportleavesItem.addActionListener(this);
	470	+ }
337	471	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
338	472	hideleavesItem.addActionListener(this);
339	473	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -342,6 +476,14 @@
342	476	markleavesItem.addActionListener(this);
343	477	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
344	478	unmarkleavesItem.addActionListener(this);
	479	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	480	+ rewindleavesItem.addActionListener(this);
	481	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	482	+ unrewindleavesItem.addActionListener(this);
	483	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	484	+ randomleavesItem.addActionListener(this);
	485	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	486	+ unrandomleavesItem.addActionListener(this);
345	487	menu.add("-");
346	488	flipVItem = menu.add(new MenuItem("Flip V"));
347	489	flipVItem.addActionListener(this);
..	..	@@ -377,35 +519,40 @@
377	519	sortbynameItem = menu.add(new MenuItem("Sort by name"));
378	520	sortbynameItem.addActionListener(this);
379	521	menu.add("-");
	522	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	523	+ shareGeometriesItem.addActionListener(this);
	524	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	525	+ mergeGeometriesItem.addActionListener(this);
	526	+ if (Globals.ADVANCED)
	527	+ {
	528	+ // Pretty much the same as duplicate and clone.
380	529	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
381	530	extractGeometriesItem.addActionListener(this);
382	531	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
383	532	cloneGeometriesItem.addActionListener(this);
384		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
385		- shareGeometriesItem.addActionListener(this);
386		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
387		- mergeGeometriesItem.addActionListener(this);
	533	+ }
388	534
389	535	oe.menuBar.add(menu = new Menu("Insert"));
390	536	buildCreateMenu(menu);
391	537
392		-
393		- oe.menuBar.add(menu = new Menu("Include"));
394		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
395		- importGFDItem.addActionListener(this);
396		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
397		- importVRMLX3DItem.addActionListener(this);
398		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
399		- importOBJItem.addActionListener(this);
400		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
401		- import3DSItem.addActionListener(this);
402		-
403	538	oe.menuBar.add(menu = new Menu("Tools"));
404	539	buildToolsMenu(menu);
405	540	}
406	541
407	542	void SetupUI2(ObjEditor oe)
408	543	{
	544	+ // June 2019
	545	+ if (oe == null)
	546	+ {
	547	+ //super.SetupUI2(this);
	548	+ //return;
	549	+ }
	550	+
	551	+ if (copy != group)
	552	+ {
	553	+ //super.SetupUI2(this);
	554	+ }
	555	+
409	556	//new Exception().printStackTrace();
410	557
411	558	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -434,93 +581,216 @@
434	581	oe.radioPanel.add(dummyButton);
435	582	oe.buttonGroup.add(dummyButton);
436	583	*/
	584	+ cGridBag copyOptionsPanel = new cGridBag();
	585	+
	586	+ copyOptionsPanel.preferredHeight = 1;
	587	+
437	588	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
438	589
439		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
440		- liveCB.setToolTipText("Enabled animation");
	590	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	591	+ //minButton.setToolTipText("Minimize window");
	592	+ //minButton.addActionListener(this);
	593	+
	594	+ if (Globals.ADVANCED)
	595	+ {
	596	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	597	+ maxButton.setToolTipText("Maximize window");
	598	+ maxButton.addActionListener(this);
	599	+ }
	600	+
	601	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	602	+ fullButton.setToolTipText("Full-screen window");
	603	+ fullButton.addActionListener(this);
	604	+
	605	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	606	+ screenfitButton.setToolTipText("Screen fit");
	607	+ screenfitButton.addActionListener(this);
	608	+
	609	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	610	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	611	+ restoreCameraButton.addActionListener(this);
	612	+
	613	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	614	+ undoButton.setToolTipText("Undo changes");
	615	+ undoButton.addActionListener(this);
	616	+ undoButton.setEnabled(false);
	617	+
	618	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	619	+ redoButton.setToolTipText("Redo changes");
	620	+ redoButton.addActionListener(this);
	621	+ redoButton.setEnabled(false);
	622	+
	623	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	624	+ saveButton.setToolTipText("Save changes");
	625	+ saveButton.addActionListener(this);
	626	+
	627	+ copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	628	+ liveCB.setToolTipText("Enable animation");
441	629	liveCB.addItemListener(this);
442	630
443		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	631	+ copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	632	+ oneStepButton.setToolTipText("Animate one step forward");
	633	+ oneStepButton.addActionListener(this);
	634	+
	635	+ copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
444	636	fastCB.setToolTipText("Fast mode");
445	637	fastCB.addItemListener(this);
446	638
447		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
448		- trackCB.setToolTipText("Enable tracking");
449		- trackCB.addItemListener(this);
450		-
451		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
452		- screenfitButton.setToolTipText("Screen fit");
453		- screenfitButton.addActionListener(this);
	639	+ //oe.toolboxPanel.Return();
	640	+
	641	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	642	+// trackCB.setToolTipText("Enable tracking");
	643	+// trackCB.addItemListener(this);
454	644
455	645	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
456	646	// screenfitpointButton.addActionListener(this);
457	647
458	648	if (Globals.ADVANCED)
459	649	{
460		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	650	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
461	651	snapobjectButton.addActionListener(this);
462	652	snapobjectButton.setToolTipText("Snap Object");
463	653	}
464	654
465		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
466		- flashSelectionButton.setToolTipText("Show selection");
467		- flashSelectionButton.addActionListener(this);
	655	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
468	656
469		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
470		-
471		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	657	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
472	658	twoButton.setToolTipText("Show center view only");
473	659	twoButton.addActionListener(this);
474		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	660	+ this.fullscreenLayout = twoButton;
	661	+
	662	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
475	663	fourButton.addActionListener(this);
476	664	fourButton.setToolTipText("Show left panel only");
477		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	665	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
478	666	sixButton.setToolTipText("2-column layout left");
479	667	sixButton.addActionListener(this);
480		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	668	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
481	669	threeButton.setToolTipText("2-column layout right");
482	670	threeButton.addActionListener(this);
483		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	671	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
484	672	sevenButton.setToolTipText("3-column layout");
485	673	sevenButton.addActionListener(this);
486	674	//
487	675
488		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	676	+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
489	677	rootButton.setToolTipText("Edit selection in new tab");
490	678	rootButton.addActionListener(this);
491	679
492		- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	680	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
493	681	closeButton.setToolTipText("Close tab");
494	682	closeButton.addActionListener(this);
495	683	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
496	684	//clearButton.addActionListener(this);
497		-
498		- cGridBag commandsPanel = new cGridBag();
	685	+
	686	+ // INSERT
	687	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	688	+ gridButton.setToolTipText("Create grid");
	689	+ gridButton.addActionListener(this);
	690	+
	691	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	692	+ boxButton.setToolTipText("Create box");
	693	+ boxButton.addActionListener(this);
	694	+
	695	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	696	+ sphereButton.setToolTipText("Create sphere");
	697	+ sphereButton.addActionListener(this);
	698	+
	699	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	700	+ coneButton.setToolTipText("Create cone");
	701	+ coneButton.addActionListener(this);
	702	+
	703	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	704	+ torusButton.setToolTipText("Create torus");
	705	+ torusButton.addActionListener(this);
	706	+
	707	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	708	+ superButton.setToolTipText("Create superellipsoid");
	709	+ superButton.addActionListener(this);
	710	+
	711	+ if (Globals.ADVANCED)
	712	+ {
	713	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	714	+ kleinButton.setToolTipText("Create Klein bottle");
	715	+ kleinButton.addActionListener(this);
	716	+ }
499	717
500		- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
501		- editButton.setToolTipText("Edit selection");
	718	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	719	+ particlesButton.setToolTipText("Create particle system");
	720	+ particlesButton.addActionListener(this);
	721	+
	722	+ oe.toolboxPanel.Return();
	723	+
	724	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	725	+ groupButton.setToolTipText("Create group");
	726	+ groupButton.addActionListener(this);
	727	+
	728	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	729	+ compositeButton.setToolTipText("Create composite");
	730	+ compositeButton.addActionListener(this);
	731	+
	732	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	733	+ switchButton.setToolTipText("Create item switcher");
	734	+ switchButton.addActionListener(this);
	735	+
	736	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	737	+ loopButton.setToolTipText("Create loop");
	738	+ loopButton.addActionListener(this);
	739	+
	740	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	741	+ textureButton.setToolTipText("Create texture");
	742	+ textureButton.addActionListener(this);
	743	+
	744	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	745	+ overlayButton.setToolTipText("Create overlay");
	746	+ overlayButton.addActionListener(this);
	747	+
	748	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	749	+ lightButton.setToolTipText("Create light");
	750	+ lightButton.addActionListener(this);
	751	+
	752	+ for (int i=6; --i>=0;)
	753	+ {
	754	+ oe.toolboxPanel.Return();
	755	+ oe.toolboxPanel.add(new cGridBag());
	756	+ oe.toolboxPanel.add(new cGridBag());
	757	+ oe.toolboxPanel.add(new cGridBag());
	758	+ oe.toolboxPanel.add(new cGridBag());
	759	+ oe.toolboxPanel.add(new cGridBag());
	760	+ oe.toolboxPanel.add(new cGridBag());
	761	+ oe.toolboxPanel.add(new cGridBag());
	762	+ }
	763	+
	764	+ // EDIT panel
	765	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	766	+ editButton.setToolTipText("Pin selection controls");
502	767	editButton.addActionListener(this);
503	768
504		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
505		- uneditButton.setToolTipText("Unedit selection");
	769	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	770	+ uneditButton.setToolTipText("Remove selection controls");
506	771	uneditButton.addActionListener(this);
507	772
508		- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	773	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	774	+ allParamsButton.setToolTipText("Show all controle");
	775	+ allParamsButton.addActionListener(this);
	776	+
	777	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
509	778	clearPanelButton.setToolTipText("Clear edit panel");
510	779	clearPanelButton.addActionListener(this);
511	780
512		- commandsPanel.add(allParamsButton = new cButton("A", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
513		- allParamsButton.setToolTipText("All params??");
514		- allParamsButton.addActionListener(this);
515		-
516		- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	781	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
517	782	unselectButton.setToolTipText("Unselect");
518	783	unselectButton.addActionListener(this);
519	784
520		- commandsPanel.preferredHeight = 1;
	785	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	786	+ flashSelectionButton.setToolTipText("Highlight selection");
	787	+ flashSelectionButton.addActionListener(this);
521	788
522		- oe.treePanel.add(commandsPanel);
523		- oe.treePanel.Return();
	789	+ editCommandsPanel.preferredHeight = 1;
	790	+
	791	+ SetPinStates(false);
	792	+// oe.treePanel.add(commandsPanel);
	793	+// oe.treePanel.Return();
524	794
525	795	// oe.aConstraints.gridx += 1;
526	796	// oe.aConstraints.weighty = 0;
..	..	@@ -537,27 +807,12 @@
537	807
538	808	JScrollPane jSP;
539	809	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
540		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	810	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
541	811	ResetModel();
542	812
543	813	oe.treePanel.add(jSPPanel);
544	814	oe.treePanel.Return();
545	815
546		- cGridBag copyOptionsPanel = new cGridBag();
547		-
548		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
549		- colorCB.setToolTipText("Copy color when dropped");
550		- colorCB.addItemListener(this);
551		-
552		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
553		- materialCB.setToolTipText("Copy material when dropped");
554		- materialCB.addItemListener(this);
555		-
556		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
557		- textureCB.setToolTipText("Copy texture when dropped");
558		- textureCB.addItemListener(this);
559		-
560		- copyOptionsPanel.preferredHeight = 1;
561	816	oe.treePanel.add(copyOptionsPanel);
562	817	oe.treePanel.Return();
563	818
..	..	@@ -588,13 +843,43 @@
588	843
589	844	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
590	845	{
591		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
592		- supportCB.setToolTipText("Enabled rigging");
593		- supportCB.addItemListener(this);
	846	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	847	+ colorCB.setToolTipText("Copy color when dropped");
	848	+ colorCB.addItemListener(this);
	849	+
	850	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	851	+ materialCB.setToolTipText("Copy material when dropped");
	852	+ materialCB.addItemListener(this);
	853	+
	854	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	855	+ textureCB.setToolTipText("Copy texture when dropped");
	856	+ textureCB.addItemListener(this);
	857	+
	858	+ panel.Return();
	859	+
	860	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	861	+ boxCB.setToolTipText("Display bounding boxes");
	862	+ boxCB.addItemListener(this);
	863	+
	864	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	865	+ zoomBoxCB.setToolTipText("Display only for wheel");
	866	+ zoomBoxCB.addItemListener(this);
	867	+
	868	+ if (true) // Globals.ADVANCED)
	869	+ {
	870	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	871	+// supportCB.setToolTipText("Enable rigging");
	872	+// supportCB.addItemListener(this);
	873	+
	874	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	875	+ freezeCB.setToolTipText("Fast moving camera");
	876	+ freezeCB.addItemListener(this);
594	877
595	878	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
596	879	// localCB.addItemListener(this);
597	880
	881	+ panel.Return();
	882	+
598	883	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
599	884	crowdCB.setToolTipText("Used for crowds");
600	885	crowdCB.addItemListener(this);
..	..	@@ -607,18 +892,12 @@
607	892	slowCB.setToolTipText("Smooth interpolation");
608	893	slowCB.addItemListener(this);
609	894
610		- panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
611		- boxCB.setToolTipText("Display bounding boxes");
612		- boxCB.addItemListener(this);
613		-
614		- panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
615		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
616		- zoomBoxCB.addItemListener(this);
617		-
618	895	// constraints.gridy += 1;
619	896	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
620	897	// speakerMocapCB.addItemListener(this);
621	898
	899	+ panel.Return();
	900	+
622	901	if (false)
623	902	{
624	903	// handled in scripts
..	..	@@ -633,30 +912,72 @@
633	912	//constraints.gridy += 1;
634	913	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
635	914	smoothfocusCB.addItemListener(this);
	915	+ panel.Return();
636	916	}
637	917
638	918	//constraints.gridx += 1;
639	919	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
640	920	// debugCB.addItemListener(this);
641	921
	922	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	923	+ trackCB.setToolTipText("Enable tracking target");
	924	+ trackCB.addItemListener(this);
	925	+
642	926	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	927	+ oeilCB.setToolTipText("Move camera when tracking");
643	928	oeilCB.addItemListener(this);
644	929
	930	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	931	+ shadowCB.setToolTipText("When live compute shadows");
	932	+ shadowCB.addItemListener(this);
	933	+
	934	+ panel.Return();
	935	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	936	+ toggleTextureCB.setToolTipText("Load textures");
	937	+ toggleTextureCB.addItemListener(this);
	938	+
	939	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	940	+ toggleSwitchCB.setToolTipText("Choose a single item");
	941	+ toggleSwitchCB.addItemListener(this);
	942	+
	943	+ panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
	944	+ autosaveCB.setToolTipText("On structure change");
	945	+ autosaveCB.addItemListener(this);
	946	+
	947	+ panel.Return();
	948	+ if (Globals.ADVANCED)
	949	+ {
645	950	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
646	951	lookAtCB.setToolTipText("Look-at target");
647	952	lookAtCB.addItemListener(this);
	953	+ }
	954	+
	955	+ }
648	956
649	957	cGridBag fill = new cGridBag();
650		-
651	958	fill.preferredHeight = 200;
	959	+ cGridBag fill2 = new cGridBag();
	960	+ fill2.preferredHeight = 200;
	961	+ cGridBag fill3 = new cGridBag();
	962	+ fill3.preferredHeight = 200;
652	963
653	964	panel.add(fill);
	965	+ panel.add(fill2);
	966	+ panel.add(fill3);
654	967
655	968	}
656	969
657	970	void EditObject(Object3D obj)
658	971	{
659	972	cRadio radioButton = new cRadio(obj.name);
	973	+
	974	+ // Patch to avoid bug with transparency.
	975	+ radioButton.hadMaterial = obj.material != null;
	976	+ if (!radioButton.hadMaterial)
	977	+ {
	978	+ obj.material = new cMaterial();
	979	+ }
	980	+
660	981	radioButton.SetObject(obj);
661	982	radioButton.layout = sevenButton;
662	983	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -665,8 +986,11 @@
665	986	buttonGroup.add(radioButton);
666	987	radioButton.doClick();
667	988	}
	989	+
668	990	void SetupViews(ObjEditor oe)
669	991	{
	992	+ theFrame = this;
	993	+
670	994	oe.SetupViews();
671	995
672	996	System.out.println("SetupViews");
..	..	@@ -675,23 +999,28 @@
675	999	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
676	1000	}
677	1001
678		- JCheckBox liveCB;
679		- JCheckBox supportCB;
680		- JCheckBox localCB;
681		- JCheckBox crowdCB;
682		- JCheckBox smoothCB;
683		- JCheckBox fastCB;
684		- JCheckBox slowCB;
685		- JCheckBox boxCB;
686		- JCheckBox zoomBoxCB;
687		- JCheckBox trackCB;
688		- JCheckBox smoothfocusCB;
	1002	+ cToggleButton liveCB;
	1003	+ cCheckBox supportCB;
	1004	+ cCheckBox localCB;
	1005	+ cCheckBox crowdCB;
	1006	+ cCheckBox smoothCB;
	1007	+ cToggleButton fastCB;
	1008	+ cCheckBox slowCB;
	1009	+ cCheckBox boxCB;
	1010	+ cCheckBox zoomBoxCB;
	1011	+ cCheckBox freezeCB;
	1012	+ //cToggleButton trackCB;
	1013	+ cCheckBox trackCB;
	1014	+ cCheckBox smoothfocusCB;
689	1015	// JCheckBox speakerMocapCB;
690		- JCheckBox speakerCameraCB;
691		- JCheckBox speakerFocusCB;
692		- JCheckBox debugCB;
693		- JCheckBox oeilCB;
694		- JCheckBox lookAtCB;
	1016	+ cCheckBox speakerCameraCB;
	1017	+ cCheckBox speakerFocusCB;
	1018	+ cCheckBox debugCB;
	1019	+
	1020	+ cCheckBox oeilCB;
	1021	+ cCheckBox shadowCB;
	1022	+ cCheckBox autosaveCB;
	1023	+ cCheckBox lookAtCB;
695	1024
696	1025	// static int COLOR = 1;
697	1026	// static int MATERIAL = 2;
..	..	@@ -699,9 +1028,9 @@
699	1028
700	1029	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
701	1030
702		- JCheckBox colorCB;
703		- JCheckBox materialCB;
704		- JCheckBox textureCB;
	1031	+ cCheckBox colorCB;
	1032	+ cCheckBox materialCB;
	1033	+ cCheckBox textureCB;
705	1034
706	1035	public void itemStateChanged(ItemEvent e)
707	1036	{
..	..	@@ -729,6 +1058,7 @@
729	1058	} else if(e.getSource() == liveCB)
730	1059	{
731	1060	cameraView.ToggleLive();
	1061	+ refreshContents(false);
732	1062	}
733	1063	else if(e.getSource() == supportCB)
734	1064	{
..	..	@@ -793,6 +1123,18 @@
793	1123	{
794	1124	cameraView.ToggleOeil();
795	1125	}
	1126	+ else if(e.getSource() == shadowCB)
	1127	+ {
	1128	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1129	+ }
	1130	+ else if(e.getSource() == freezeCB)
	1131	+ {
	1132	+ Globals.FREEZEONMOVE ^= true;
	1133	+ }
	1134	+ else if(e.getSource() == autosaveCB)
	1135	+ {
	1136	+ Globals.SAVEONMAKE ^= true;
	1137	+ }
796	1138	else if(e.getSource() == lookAtCB)
797	1139	{
798	1140	cameraView.ToggleLookAt();
..	..	@@ -809,7 +1151,8 @@
809	1151
810	1152	/**/
811	1153	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
812		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1154	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1155	+ TreePath path = objEditor.jTree.getSelectionPath();
813	1156	if ((path == null) \|\| (path.getPathCount() <= 1)) {
814	1157	// We can't move the root node or an empty selection
815	1158	return;
..	..	@@ -872,8 +1215,6 @@
872	1215	}
873	1216	}
874	1217
875		- String string = (String) object;
876		-
877	1218	System.out.println("Transfer = " + object + "; drop : " + target);
878	1219	// if( object instanceof java.io.File[])
879	1220	// {
..	..	@@ -881,7 +1222,11 @@
881	1222	// objEditor.DropFile((java.io.File[]) object, true);
882	1223	// return;
883	1224	// }
884		- if (string.charAt(0) == '/')
	1225	+
	1226	+ String string = (String) object;
	1227	+
	1228	+ // File path for Mac and Windows
	1229	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
885	1230	{
886	1231	// file(s)
887	1232	String[] names = string.split("\n");
..	..	@@ -908,7 +1253,7 @@
908	1253
909	1254	flashIt = false;
910	1255	CameraPane pane = (CameraPane) target;
911		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1256	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
912	1257	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
913	1258
914	1259	if (group.selection.size() == 1)
..	..	@@ -924,23 +1269,33 @@
924	1269
925	1270	assert target == objEditor.jTree;
926	1271	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1272	+ Object3D destinationLeaf;
927	1273	try {
928		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1274	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
929	1275	} catch (Exception e) {
930	1276	System.out.println("destinationPath : " + destinationPath);
931	1277	return;
932	1278	}
933	1279
934		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1280	+ for (int i=group.selection.size(); --i>=0;)
935	1281	{
	1282	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1283	+
	1284	+ // Cannot move into itself
	1285	+ if (child == destinationLeaf)
	1286	+ return;
	1287	+ }
	1288	+
	1289	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1290	+// {
936	1291	loadClipboard(true);
937	1292	objEditor.jTree.setSelectionPath(destinationPath);
938		- pasteInto(false);
939		- } else {
940		- loadClipboard(false);
941		- objEditor.jTree.setSelectionPath(destinationPath);
942		- pasteInto(false); // true); // ???
943		- }
	1293	+ pasteInto(false, false);
	1294	+// } else {
	1295	+// loadClipboard(false);
	1296	+// objEditor.jTree.setSelectionPath(destinationPath);
	1297	+// pasteInto(false, false); // true); // ???
	1298	+// }
944	1299	}
945	1300	public void dropActionChanged(DropTargetDragEvent dtde)
946	1301	// Called if the user has modified the current drop gesture
..	..	@@ -1045,54 +1400,71 @@
1045	1400	{
1046	1401	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1047	1402	//heightFieldItem.addActionListener(this);
1048		- gridItem = menu.add(new MenuItem("Grid"));
1049		- gridItem.addActionListener(this);
1050		- rectoidItem = menu.add(new MenuItem("Box"));
1051		- rectoidItem.addActionListener(this);
1052		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1053		- ellipsoidItem.addActionListener(this);
1054		- coneItem = menu.add(new MenuItem("Cone"));
1055		- coneItem.addActionListener(this);
1056		- torusItem = menu.add(new MenuItem("Torus"));
1057		- torusItem.addActionListener(this);
1058		- superItem = menu.add(new MenuItem("Superellipsoid"));
1059		- superItem.addActionListener(this);
	1403	+// gridItem = menu.add(new MenuItem("Grid"));
	1404	+// gridItem.addActionListener(this);
	1405	+// rectoidItem = menu.add(new MenuItem("Box"));
	1406	+// rectoidItem.addActionListener(this);
	1407	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1408	+// ellipsoidItem.addActionListener(this);
	1409	+// coneItem = menu.add(new MenuItem("Cone"));
	1410	+// coneItem.addActionListener(this);
	1411	+// torusItem = menu.add(new MenuItem("Torus"));
	1412	+// torusItem.addActionListener(this);
	1413	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1414	+// superItem.addActionListener(this);
	1415	+
	1416	+ cameraItem = menu.add(new MenuItem("Camera"));
	1417	+ cameraItem.addActionListener(this);
	1418	+
	1419	+ if (!Globals.ADVANCED)
	1420	+ {
1060	1421	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1061	1422	kleinItem.addActionListener(this);
1062		- particleItem = menu.add(new MenuItem("Particle system"));
1063		- particleItem.addActionListener(this);
	1423	+ }
	1424	+
	1425	+// particleItem = menu.add(new MenuItem("Particle system"));
	1426	+// particleItem.addActionListener(this);
	1427	+ if (Globals.ADVANCED)
	1428	+ {
1064	1429	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1065	1430	ragdollItem.addActionListener(this);
1066	1431	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1067	1432	ragdoll2Item.addActionListener(this);
	1433	+ }
1068	1434	menu.add("-");
1069		- meshItem = menu.add(new MenuItem("Mesh"));
	1435	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1070	1436	meshItem.addActionListener(this);
1071	1437	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1072	1438	// meshGroupItem.addActionListener(this);
	1439	+ if (Globals.ADVANCED)
	1440	+ {
1073	1441	springItem = menu.add(new MenuItem("Spring"));
1074	1442	springItem.addActionListener(this);
1075	1443	flagItem = menu.add(new MenuItem("Flag"));
1076	1444	flagItem.addActionListener(this);
1077		- bezierItem = menu.add(new MenuItem("Patch"));
1078		- bezierItem.addActionListener(this);
1079		- checkerItem = menu.add(new MenuItem("Checker"));
1080		- checkerItem.addActionListener(this);
1081	1445	blobItem = menu.add(new MenuItem("Blob"));
1082	1446	blobItem.addActionListener(this);
1083	1447	latheItem = menu.add(new MenuItem("Lathe"));
1084	1448	latheItem.addActionListener(this);
1085		- lightItem = menu.add(new MenuItem("Light"));
1086		- lightItem.addActionListener(this);
	1449	+ }
	1450	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1451	+ bezierItem.addActionListener(this);
	1452	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1453	+// overlayItem.addActionListener(this);
	1454	+// lightItem = menu.add(new MenuItem("Light"));
	1455	+// lightItem.addActionListener(this);
1087	1456	menu.add("-");
1088	1457	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1089	1458	//superLoopItem.addActionListener(this);
1090		- loopItem = menu.add(new MenuItem("Loop"));
1091		- loopItem.addActionListener(this);
	1459	+// loopItem = menu.add(new MenuItem("Loop"));
	1460	+// loopItem.addActionListener(this);
1092	1461	doubleItem = menu.add(new MenuItem("Fork"));
1093	1462	doubleItem.addActionListener(this);
	1463	+ if (Globals.ADVANCED)
	1464	+ {
1094	1465	tripleItem = menu.add(new MenuItem("Trident"));
1095	1466	tripleItem.addActionListener(this);
	1467	+ }
1096	1468	}
1097	1469
1098	1470	void buildToolsMenu(Menu menu)
..	..	@@ -1101,29 +1473,34 @@
1101	1473	animationItem.addItemListener(this);
1102	1474	animationItem.setState(Globals.ANIMATION);
1103	1475
	1476	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1477	+ archiveItem.addActionListener(this);
	1478	+
1104	1479	menu.add("-");
1105	1480	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1106	1481	parseverticesItem.addActionListener(this);
1107	1482	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1108	1483	textureFieldItem.addActionListener(this);
1109		- alignItem = menu.add(new MenuItem("Align"));
	1484	+ alignItem = menu.add(new MenuItem("Align Objects"));
1110	1485	alignItem.addActionListener(this);
1111		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1112		- mirrorItem.addActionListener(this);
1113	1486	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1114	1487	reduceMorphItem.addActionListener(this);
1115	1488	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1116	1489	reduce34MorphItem.addActionListener(this);
1117		-
	1490	+ menu.add("-");
1118	1491	menu.add(computeAOItem = new MenuItem("Compute AO"));
1119	1492	computeAOItem.addActionListener(this);
1120		- menu.add("-");
1121	1493
	1494	+ if (Globals.ADVANCED)
	1495	+ {
	1496	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1497	+ mirrorItem.addActionListener(this);
	1498	+ menu.add("-");
1122	1499	menu.add(memoryItem = new MenuItem("Memory Usage"));
1123	1500	memoryItem.addActionListener(this);
1124	1501	menu.add(analyzeItem = new MenuItem("Analyze"));
1125	1502	analyzeItem.addActionListener(this);
1126		- menu.add(dumpItem = new MenuItem("Dump"));
	1503	+ menu.add(dumpItem = new MenuItem("Print"));
1127	1504	dumpItem.addActionListener(this);
1128	1505	// menu.add(pathItem = new MenuItem("From-to path"));
1129	1506	// pathItem.addActionListener(this);
..	..	@@ -1141,6 +1518,7 @@
1141	1518	menu.add("-");
1142	1519	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1143	1520	editScriptItem.addActionListener(this);
	1521	+ }
1144	1522	}
1145	1523
1146	1524	void ScreenFit()
..	..	@@ -1263,9 +1641,24 @@
1263	1641	shadow.material = new cMaterial(obj.material);
1264	1642	shadow.material.diffuse = 0.0001f;
1265	1643	shadow.material.specular = 0.0001f;
	1644	+ //shadow.projectedVertices[1].x = 300;
1266	1645
1267	1646	makeSomething(shadow);
1268	1647	}
	1648	+
	1649	+ private void ClearUnpinned()
	1650	+ {
	1651	+ //for (Object3D obj : listUI)
	1652	+ for (int i=listUI.size(); --i>=0;)
	1653	+ {
	1654	+ Object3D obj = listUI.elementAt(i);
	1655	+ if (!obj.pinned)
	1656	+ {
	1657	+ obj.CloseUI();
	1658	+ listUI.remove(i);
	1659	+ }
	1660	+ }
	1661	+ }
1269	1662
1270	1663	/**
1271	1664	* applyExample
..	..	@@ -1469,9 +1862,9 @@
1469	1862
1470	1863	void Overwrite(int mask)
1471	1864	{
1472		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1865	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1473	1866	{
1474		- Object3D content = GrafreeD.clipboard.get(0);
	1867	+ Object3D content = Grafreed.clipboard.get(0);
1475	1868
1476	1869	if (content instanceof cGroup && ((cGroup)content).transientlink )
1477	1870	content = ((cGroup)content).get(0);
..	..	@@ -1510,7 +1903,7 @@
1510	1903	{
1511	1904	ScreenFit();
1512	1905	} else
1513		- if (source == switchItem)
	1906	+ if (source == switchViewItem)
1514	1907	{
1515	1908	cVector v1 = new cVector();
1516	1909	cVector v2 = new cVector();
..	..	@@ -1519,11 +1912,11 @@
1519	1912	objEditor.cameraView.renderCamera.setAim(v2, v1);
1520	1913	objEditor.cameraView.repaint();
1521	1914	} else
1522		- if (source == rectoidItem)
	1915	+ if (source == rectoidItem \|\| source == boxButton)
1523	1916	{
1524	1917	makeSomething(new Box());
1525	1918	} else
1526		- if (source == particleItem)
	1919	+ if (source == particleItem \|\| source == particlesButton)
1527	1920	{
1528	1921	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1529	1922	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1602,27 +1995,27 @@
1602	1995
1603	1996	makeSomething(obj);
1604	1997	} else
1605		- if (source == gridItem)
	1998	+ if (source == gridItem \|\| source == gridButton)
1606	1999	{
1607	2000	makeSomething(new Grid());
1608	2001	} else
1609		- if (source == ellipsoidItem)
	2002	+ if (source == ellipsoidItem \|\| source == sphereButton)
1610	2003	{
1611	2004	makeSomething(new Sphere());
1612	2005	} else
1613		- if (source == coneItem)
	2006	+ if (source == coneItem \|\| source == coneButton)
1614	2007	{
1615	2008	makeSomething(new Cone());
1616	2009	} else
1617		- if (source == torusItem)
	2010	+ if (source == torusItem \|\| source == torusButton)
1618	2011	{
1619	2012	makeSomething(new Torus());
1620	2013	} else
1621		- if (source == superItem)
	2014	+ if (source == superItem \|\| source == superButton)
1622	2015	{
1623	2016	makeSomething(new Superellipsoid());
1624	2017	} else
1625		- if (source == kleinItem)
	2018	+ if (source == kleinItem \|\| source == kleinButton)
1626	2019	{
1627	2020	makeSomething(new Klein());
1628	2021	} else
..	..	@@ -1642,7 +2035,7 @@
1642	2035	{
1643	2036	makeSomething(new BezierSurface());
1644	2037	} else
1645		- if (source == checkerItem)
	2038	+ if (source == overlayItem \|\| source == overlayButton)
1646	2039	{
1647	2040	/*
1648	2041	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1690,7 +2083,7 @@
1690	2083	s.setup();
1691	2084	makeSomething(s);
1692	2085	} else
1693		- if (source == lightItem)
	2086	+ if (source == lightItem \|\| source == lightButton)
1694	2087	{
1695	2088	makeSomething(new Light());
1696	2089	} else
..	..	@@ -1740,30 +2133,30 @@
1740	2133
1741	2134	group(g);
1742	2135	} else
1743		- if (source == loopItem)
	2136	+ if (source == loopItem \|\| source == loopButton)
1744	2137	{
1745	2138	Composite csg = new GroupLeaf();
1746	2139	csg.count = 5;
1747	2140	group(csg);
1748		- Composite child = new cGroup();
	2141	+ Composite child = new cGroup("Branch");
1749	2142	csg.addChild(child);
1750	2143	child.addChild(csg);
1751	2144	} else
1752	2145	if (source == doubleItem)
1753	2146	{
1754		- Composite csg = new GroupLeaf();
	2147	+ Composite csg = new GroupLeaf("Fork");
1755	2148	csg.count = 5;
1756	2149	group(csg);
1757		- Composite child = new cGroup();
	2150	+ Composite child = new cGroup("Branch A");
1758	2151	csg.addChild(child);
1759	2152	child.addChild(csg);
1760		- child = new cGroup();
	2153	+ child = new cGroup("Branch B");
1761	2154	csg.addChild(child);
1762	2155	child.addChild(csg);
1763	2156	} else
1764	2157	if (source == tripleItem)
1765	2158	{
1766		- Composite csg = new GroupLeaf();
	2159	+ Composite csg = new GroupLeaf("Trident");
1767	2160	csg.count = 4;
1768	2161	group(csg);
1769	2162	Composite child = new cGroup();
..	..	@@ -1775,23 +2168,6 @@
1775	2168	child = new cGroup();
1776	2169	csg.addChild(child);
1777	2170	child.addChild(csg);
1778		- } else
1779		-
1780		- if (source == importGFDItem)
1781		- {
1782		- ImportGFD();
1783		- } else
1784		- if (source == importVRMLX3DItem)
1785		- {
1786		- ImportVRMLX3D();
1787		- } else
1788		- if (source == import3DSItem)
1789		- {
1790		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1791		- } else
1792		- if (source == importOBJItem)
1793		- {
1794		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1795	2171	} else
1796	2172	if (source == computeAOItem)
1797	2173	{
..	..	@@ -1811,7 +2187,7 @@
1811	2187	if (source == invariantsItem)
1812	2188	{
1813	2189	System.out.println("Invariants:");
1814		- GrafreeD.grafreeD.universe.invariants();
	2190	+ Grafreed.grafreeD.universe.invariants();
1815	2191	} else
1816	2192	if (source == memoryItem)
1817	2193	{
..	..	@@ -1830,19 +2206,47 @@
1830	2206	{
1831	2207	DumpObject();
1832	2208	} else
	2209	+ if (source == minButton)
	2210	+ {
	2211	+ Minimize();
	2212	+ } else
	2213	+ if (source == maxButton)
	2214	+ {
	2215	+ Maximize();
	2216	+ } else
	2217	+ if (source == fullButton)
	2218	+ {
	2219	+ ToggleFullScreen();
	2220	+ } else
	2221	+ if (source == undoButton)
	2222	+ {
	2223	+ if (!Undo())
	2224	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2225	+ } else
	2226	+ if (source == redoButton)
	2227	+ {
	2228	+ Redo();
	2229	+ } else
	2230	+ if (source == saveButton)
	2231	+ {
	2232	+ if (!Save(true))
	2233	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2234	+ } else
	2235	+ if (source == oneStepButton)
	2236	+ {
	2237	+ Globals.ONESTEP = true;
	2238	+ cameraView.repaint();
	2239	+ } else
1833	2240	if (source == screenfitButton)
1834	2241	{
1835		- //Reload(lastConverter, lastFilename, true);
1836	2242	ScreenFit();
1837	2243	} else
1838	2244	if (source == screenfitpointButton)
1839	2245	{
1840		- //Reload(lastConverter, lastFilename, true);
1841	2246	ScreenFitPoint();
1842	2247	} else
1843	2248	if (source == snapobjectButton)
1844	2249	{
1845		- //Reload(lastConverter, lastFilename, true);
1846	2250	SnapObject();
1847	2251	} else
1848	2252	// if (event.getSource() == recompileButton)
..	..	@@ -1879,12 +2283,20 @@
1879	2283	{
1880	2284	loadClipboard(true);
1881	2285	} else
	2286	+ if (source == undoItem)
	2287	+ {
	2288	+ Undo();
	2289	+ } else
	2290	+ if (source == redoItem)
	2291	+ {
	2292	+ Redo();
	2293	+ } else
1882	2294	if (source == duplicateItem)
1883	2295	{
1884		- Object3D keep = GrafreeD.clipboard;
	2296	+ Object3D keep = Grafreed.clipboard;
1885	2297	loadClipboard(false);
1886	2298	paste(false);
1887		- GrafreeD.clipboard = keep;
	2299	+ Grafreed.clipboard = keep;
1888	2300	} else
1889	2301	if (source == cloneItem)
1890	2302	{
..	..	@@ -1902,13 +2314,17 @@
1902	2314	{
1903	2315	paste(false);
1904	2316	} else
	2317	+ if (source == pasteIntoItem)
	2318	+ {
	2319	+ pasteInto(true, false);
	2320	+ } else
1905	2321	if (source == pasteLinkItem)
1906	2322	{
1907		- pasteInto(false);
	2323	+ pasteInto(false, false);
1908	2324	} else
1909	2325	if (source == pasteCloneItem)
1910	2326	{
1911		- pasteInto(true);
	2327	+ pasteInto(true, true);
1912	2328	} else
1913	2329	if (source == pasteExpandItem)
1914	2330	{
..	..	@@ -2100,9 +2516,9 @@
2100	2516	// group.selection.get(0).setMasterThis(content); // should be identity
2101	2517	// refreshContents();
2102	2518	// }
2103		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2519	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2104	2520	{
2105		- Object3D content = GrafreeD.clipboard.get(0);
	2521	+ Object3D content = Grafreed.clipboard.get(0);
2106	2522
2107	2523	if (content instanceof cGroup && ((cGroup)content).transientlink )
2108	2524	content = ((cGroup)content).get(0);
..	..	@@ -2110,11 +2526,11 @@
2110	2526	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2111	2527	for (int i=0; i<group.selection.size(); i++)
2112	2528	{
2113		- boolean random = CameraPane.RANDOM;
2114		- CameraPane.RANDOM = false; // parse all random nodes
	2529	+ boolean random = CameraPane.SWITCH;
	2530	+ CameraPane.SWITCH = false; // parse all random nodes
2115	2531	group.selection.get(i).linkVerticesThis(content);
2116	2532	// group.selection.get(i).setMasterThis(content); // should be identity
2117		- CameraPane.RANDOM = random;
	2533	+ CameraPane.SWITCH = random;
2118	2534	}
2119	2535	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2120	2536	refreshContents();
..	..	@@ -2124,20 +2540,20 @@
2124	2540	{
2125	2541	for (int i=0; i<group.selection.size(); i++)
2126	2542	{
2127		- boolean random = CameraPane.RANDOM;
2128		- CameraPane.RANDOM = false; // parse all random nodes
	2543	+ boolean random = CameraPane.SWITCH;
	2544	+ CameraPane.SWITCH = false; // parse all random nodes
2129	2545	group.selection.get(i).linkVerticesThis(null);
2130		- CameraPane.RANDOM = random;
	2546	+ CameraPane.SWITCH = random;
2131	2547	}
2132	2548
2133	2549	refreshContents();
2134	2550	} else
2135	2551	if (source == relinkverticesItem)
2136	2552	{
2137		- boolean random = CameraPane.RANDOM;
2138		- CameraPane.RANDOM = false; // parse all random nodes
	2553	+ boolean random = CameraPane.SWITCH;
	2554	+ CameraPane.SWITCH = false; // parse all random nodes
2139	2555	group.selection.RelinkToSupport();
2140		- CameraPane.RANDOM = random;
	2556	+ CameraPane.SWITCH = random;
2141	2557
2142	2558	refreshContents();
2143	2559	} else
..	..	@@ -2152,9 +2568,9 @@
2152	2568	} else
2153	2569	if (source == setMasterItem)
2154	2570	{
2155		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2571	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2156	2572	{
2157		- Object3D content = GrafreeD.clipboard.get(0);
	2573	+ Object3D content = Grafreed.clipboard.get(0);
2158	2574
2159	2575	if (content instanceof cGroup && ((cGroup)content).transientlink )
2160	2576	content = ((cGroup)content).get(0);
..	..	@@ -2167,9 +2583,9 @@
2167	2583	{
2168	2584	if (group.selection.size() == 1)
2169	2585	{
2170		- if (GrafreeD.clipboard.size() == 1)
	2586	+ if (Grafreed.clipboard.size() == 1)
2171	2587	{
2172		- Object3D content = GrafreeD.clipboard.get(0);
	2588	+ Object3D content = Grafreed.clipboard.get(0);
2173	2589
2174	2590	if (content instanceof cGroup && ((cGroup)content).transientlink )
2175	2591	content = ((cGroup)content).get(0);
..	..	@@ -2186,7 +2602,7 @@
2186	2602	{
2187	2603	RevertMeshes();
2188	2604	} else
2189		- if (source == resetMeshItem)
	2605	+ if (source == resetAllItem)
2190	2606	{
2191	2607	ResetAll();
2192	2608	} else
..	..	@@ -2206,9 +2622,9 @@
2206	2622	{
2207	2623	ClearSelection(true);
2208	2624	} else
2209		- if (source == grabItem)
	2625	+ if (source == grabItem \|\| source == groupButton)
2210	2626	{
2211		- group(new cGroup(), true);
	2627	+ group(new cGroup(), false); // true);
2212	2628	} else
2213	2629	if (source == hideItem)
2214	2630	{
..	..	@@ -2226,11 +2642,11 @@
2226	2642	{
2227	2643	makeSomething(new Camera());
2228	2644	} else
2229		- if (source == compositeItem)
	2645	+ if (source == compositeItem \|\| source == compositeButton)
2230	2646	{
2231	2647	group(new Composite());
2232	2648	} else
2233		- if (source == randomItem)
	2649	+ if (source == switchItem \|\| source == switchButton)
2234	2650	{
2235	2651	RandomNode random = new RandomNode();
2236	2652	group(random);
..	..	@@ -2332,7 +2748,7 @@
2332	2748	{
2333	2749	group(new cLinker());
2334	2750	} else
2335		- if (source == textureItem)
	2751	+ if (source == textureItem \|\| source == textureButton)
2336	2752	{
2337	2753	group(new TextureNode());
2338	2754	} else
..	..	@@ -2352,17 +2768,30 @@
2352	2768	{
2353	2769	CastShadow(2);
2354	2770	} else
2355		- if (source == ungroupItem)
	2771	+ if (source == ungroupItem \|\| source == ungroupButton)
2356	2772	{
2357		- //ungroup();
	2773	+ boolean hasRoot = false;
	2774	+
2358	2775	for (int i=0; i<group.selection.size(); i++)
2359	2776	{
2360		- Ungroup(group.selection.get(i));
	2777	+ if (group.selection.get(i) == group)
	2778	+ {
	2779	+ hasRoot = true;
	2780	+ break;
	2781	+ }
2361	2782	}
2362	2783
2363		- ClearSelection(false);
2364		-
2365		- refreshContents();
	2784	+ if (!hasRoot)
	2785	+ {
	2786	+ for (int i=0; i<group.selection.size(); i++)
	2787	+ {
	2788	+ Ungroup(group.selection.get(i));
	2789	+ }
	2790	+
	2791	+ ClearSelection(false);
	2792	+
	2793	+ refreshContents();
	2794	+ }
2366	2795	} else
2367	2796	if (source == genUVItem)
2368	2797	{
..	..	@@ -2374,7 +2803,7 @@
2374	2803	} else
2375	2804	if (source == genNormalsMESHItem)
2376	2805	{
2377		- GenNormals(true); // TODO
	2806	+ GenNormalsMESH();
2378	2807	} else
2379	2808	if (source == genNormalsORGANItem)
2380	2809	{
..	..	@@ -2439,6 +2868,22 @@
2439	2868	if (source == unmarkleavesItem)
2440	2869	{
2441	2870	MarkLeaves(false);
	2871	+ } else
	2872	+ if (source == rewindleavesItem)
	2873	+ {
	2874	+ RewindLeaves(true);
	2875	+ } else
	2876	+ if (source == unrewindleavesItem)
	2877	+ {
	2878	+ RewindLeaves(false);
	2879	+ } else
	2880	+ if (source == randomleavesItem)
	2881	+ {
	2882	+ RandomLeaves(true);
	2883	+ } else
	2884	+ if (source == unrandomleavesItem)
	2885	+ {
	2886	+ RandomLeaves(false);
2442	2887	} else
2443	2888	if (source == flipVItem)
2444	2889	{
..	..	@@ -2524,9 +2969,13 @@
2524	2969	{
2525	2970	SmoothMesh();
2526	2971	} else
2527		- if (source == transformgeometryItem)
	2972	+ if (source == transformGeometryItem)
2528	2973	{
2529	2974	TransformGeometry();
	2975	+ } else
	2976	+ if (source == transformChildrenItem)
	2977	+ {
	2978	+ TransformChildren();
2530	2979	} else
2531	2980	if (source == resetTransformItem)
2532	2981	{
..	..	@@ -2534,7 +2983,11 @@
2534	2983	} else
2535	2984	if (source == resetCentroidItem)
2536	2985	{
2537		- ResetCentroid();
	2986	+ ResetCentroid(true);
	2987	+ } else
	2988	+ if (source == resetCentroidXZItem)
	2989	+ {
	2990	+ ResetCentroid(false);
2538	2991	} else
2539	2992	if (source == resetParentItem)
2540	2993	{
..	..	@@ -2666,6 +3119,10 @@
2666	3119	if (source == twoButton)
2667	3120	{
2668	3121	radio.layout = twoButton;
	3122	+
	3123	+ if (CameraPane.FULLSCREEN)
	3124	+ fullscreenLayout = radio.layout;
	3125	+
2669	3126	// bug
2670	3127	//gridPanel.setDividerLocation(1.0);
2671	3128	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2698,10 +3155,31 @@
2698	3155	bigThree.ClearUI();
2699	3156	bigThree.add(centralPanel);
2700	3157	bigThree.FlushUI();
	3158	+
	3159	+ cameraView.requestFocusInWindow();
	3160	+
	3161	+// refreshContents(true);
	3162	+//
	3163	+// try
	3164	+// {
	3165	+// java.awt.Robot bot = new java.awt.Robot();
	3166	+// int mask = InputEvent.BUTTON1_MASK;
	3167	+// bot.mouseMove(100, 100);
	3168	+// bot.mousePress(mask);
	3169	+// bot.mouseRelease(mask);
	3170	+// }
	3171	+// catch (Exception e)
	3172	+// {
	3173	+//
	3174	+// }
	3175	+
2701	3176	} else
2702	3177	if (source == threeButton)
2703	3178	{
2704	3179	radio.layout = threeButton;
	3180	+
	3181	+ if (CameraPane.FULLSCREEN)
	3182	+ fullscreenLayout = radio.layout;
2705	3183
2706	3184	// bigThree.remove(scenePanel);
2707	3185	// bigThree.remove(centralPanel);
..	..	@@ -2734,10 +3212,15 @@
2734	3212	bigThree.add(centralPanel);
2735	3213	bigThree.add(XYZPanel);
2736	3214	bigThree.FlushUI();
	3215	+
	3216	+ cameraView.requestFocusInWindow();
2737	3217	} else
2738	3218	if (source == fourButton)
2739	3219	{
2740	3220	radio.layout = fourButton;
	3221	+
	3222	+ if (CameraPane.FULLSCREEN)
	3223	+ fullscreenLayout = radio.layout;
2741	3224
2742	3225	// bigThree.remove(scenePanel);
2743	3226	// bigThree.remove(centralPanel);
..	..	@@ -2769,10 +3252,15 @@
2769	3252	bigThree.ClearUI();
2770	3253	bigThree.add(scenePanel);
2771	3254	bigThree.FlushUI();
	3255	+
	3256	+ cameraView.requestFocusInWindow();
2772	3257	} else
2773	3258	if (source == sixButton)
2774	3259	{
2775	3260	radio.layout = sixButton;
	3261	+
	3262	+ if (CameraPane.FULLSCREEN)
	3263	+ fullscreenLayout = radio.layout;
2776	3264
2777	3265	// bigThree.remove(scenePanel);
2778	3266	// bigThree.remove(centralPanel);
..	..	@@ -2805,10 +3293,15 @@
2805	3293	bigThree.add(scenePanel);
2806	3294	bigThree.add(centralPanel);
2807	3295	bigThree.FlushUI();
	3296	+
	3297	+ cameraView.requestFocusInWindow();
2808	3298	} else
2809	3299	if (source == sevenButton)
2810	3300	{
2811	3301	radio.layout = sevenButton;
	3302	+
	3303	+ if (CameraPane.FULLSCREEN)
	3304	+ fullscreenLayout = radio.layout;
2812	3305
2813	3306	// bigThree.remove(scenePanel);
2814	3307	// bigThree.remove(centralPanel);
..	..	@@ -2842,6 +3335,8 @@
2842	3335	bigThree.add(centralPanel);
2843	3336	bigThree.add(XYZPanel);
2844	3337	bigThree.FlushUI();
	3338	+
	3339	+ cameraView.requestFocusInWindow();
2845	3340	} else
2846	3341	if (source == rootButton)
2847	3342	{
..	..	@@ -2853,6 +3348,7 @@
2853	3348	EditObject(obj);
2854	3349	}
2855	3350
	3351	+ cameraView.requestFocusInWindow();
2856	3352	refreshContents(true);
2857	3353	} else
2858	3354	if (source == closeButton)
..	..	@@ -2862,22 +3358,37 @@
2862	3358	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2863	3359	{
2864	3360	ab = (cRadio)e.nextElement();
2865		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3361	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2866	3362	{
	3363	+ // Patch to avoid bug with transparency.
	3364	+ if (!ab.hadMaterial)
	3365	+ {
	3366	+ ab.object.material = null;
	3367	+ }
	3368	+
2867	3369	buttonGroup.remove(ab);
2868	3370	radioPanel.remove(ab);
2869	3371
2870		- ab.GetObject().editWindow = null;
	3372	+ //ab.GetObject().editWindow = null;
	3373	+ ab.GetObject().manipWindow = null;
2871	3374	// ab.GetObject().objectUI = null; // ?????????
2872	3375
2873	3376	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2874	3377	break;
2875	3378	}
2876	3379	}
	3380	+
	3381	+ cameraView.requestFocusInWindow();
2877	3382	refreshContents(true);
2878	3383	} else
2879	3384	if (source == editItem \|\| source == editButton)
2880	3385	{
	3386	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3387	+ {
	3388	+ Object3D child = (Object3D)e.nextElement();
	3389	+ child.pinned = true;
	3390	+ }
	3391	+
2881	3392	EditSelection(false);
2882	3393	} else
2883	3394	if (source == uneditButton)
..	..	@@ -2887,12 +3398,13 @@
2887	3398	Object3D child = (Object3D)e.nextElement();
2888	3399	if(child.editWindow != null)
2889	3400	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3401	+ child.pinned = false;
2890	3402	child.CloseUI();
2891	3403	listUI.remove(child);
2892	3404
2893		- child.editWindow = null; // ???????????
	3405	+ //child.editWindow = null; // ???????????
2894	3406	}
2895		- objEditor.ctrlPanel.validate();
	3407	+ objEditor.ctrlPanel.FlushUI();
2896	3408	//objEditor.jTree.clearSelection();
2897	3409	//objEditor.ResetSliders();
2898	3410	refreshContents(true);
..	..	@@ -2903,6 +3415,7 @@
2903	3415	//copy.ClearUI();
2904	3416	for (Object3D obj : listUI)
2905	3417	{
	3418	+ obj.pinned = false;
2906	3419	obj.CloseUI();
2907	3420	}
2908	3421	listUI.clear();
..	..	@@ -2912,7 +3425,7 @@
2912	3425	{
2913	3426	assert(copy == group);
2914	3427
2915		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3428	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2916	3429
2917	3430	for (Object3D obj : listUI)
2918	3431	{
..	..	@@ -2976,20 +3489,44 @@
2976	3489	frontView.object = group;
2977	3490	sideView.object = group;
2978	3491	}
2979		- group.editWindow = this;
	3492	+
	3493	+// fix "+" issue
	3494	+ //group.editWindow = this;
	3495	+ group.manipWindow = this;
	3496	+
2980	3497	/*
2981	3498	currentLayout = radio.layout;
2982	3499	if (currentLayout == null)
2983	3500	currentLayout = sevenButton;
2984	3501	*/
2985	3502	radio.layout.doClick();
	3503	+
	3504	+ ClearUnpinned();
	3505	+ SetPinStates(group.selection.size() > 0);
	3506	+ if (group.selection.size() == 1)
	3507	+ EditSelection(false);
2986	3508	keepparent = group.parent;
2987	3509	// PARENT = NULL or not???
2988	3510	//group.parent = null; // ROOT
2989	3511	//group.attributes = -1;
2990	3512	ResetModel();
	3513	+
	3514	+ cameraView.requestFocusInWindow();
2991	3515	refreshContents(true);
2992		- }
	3516	+ } else if (event.getSource() == editCameraItem)
	3517	+ {
	3518	+ cameraView.ProtectCamera();
	3519	+ cameraView.repaint();
	3520	+ return;
	3521	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3522	+ {
	3523	+ cameraView.RevertCamera();
	3524	+ cameraView.repaint();
	3525	+ return;
	3526	+ // } else if (event.getSource() == textureButton)
	3527	+ // {
	3528	+ // return; // true;
	3529	+ }
2993	3530	else
2994	3531	{
2995	3532	//return super.action(event, arg);
..	..	@@ -2998,7 +3535,6 @@
2998	3535	}
2999	3536
3000	3537	boolean useclient = false;
3001		- cRadio radio;
3002	3538
3003	3539	void ToggleRoot()
3004	3540	{
..	..	@@ -3050,6 +3586,28 @@
3050	3586	refreshContents();
3051	3587	}
3052	3588
	3589	+ void TransformChildren()
	3590	+ {
	3591	+ Object3D obj;
	3592	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3593	+ {
	3594	+ obj = (Object3D)e.nextElement();
	3595	+ obj.KeepTextureMatrices();
	3596	+ obj.TransformChildren();
	3597	+ obj.RestoreTextureMatrices();
	3598	+
	3599	+// if (obj.parent == null)
	3600	+// {
	3601	+// System.out.println("NULL PARENT!");
	3602	+// new Exception().printStackTrace();
	3603	+// }
	3604	+// else
	3605	+// TouchTransform(obj);
	3606	+// //obj.parent.Touch();
	3607	+ }
	3608	+
	3609	+ refreshContents();
	3610	+ }
3053	3611
3054	3612	void ResetTransform()
3055	3613	{
..	..	@@ -3162,7 +3720,7 @@
3162	3720	refreshContents();
3163	3721	}
3164	3722
3165		- void ResetCentroid()
	3723	+ void ResetCentroid(boolean full)
3166	3724	{
3167	3725	Object3D obj;
3168	3726	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3177,12 +3735,16 @@
3177	3735	LA.matIdentity(Object3D.mat);
3178	3736	obj.getBounds(minima, maxima, false);
3179	3737	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3180		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3738	+ if (full)
	3739	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3181	3740	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3182	3741	obj.TransformMesh(Object3D.mat);
	3742	+
3183	3743	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3184		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3744	+ if (full)
	3745	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3185	3746	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3747	+
3186	3748	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3187	3749	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3188	3750	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3211,7 +3773,8 @@
3211	3773
3212	3774	int size = obj.MemorySize();
3213	3775
3214		- System.err.println((size/1024) + " KB is the size of " + obj);
	3776	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3777	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3215	3778	}
3216	3779	}
3217	3780	catch (Exception e)
..	..	@@ -3248,9 +3811,9 @@
3248	3811	obj = (Object3D)e.nextElement();
3249	3812
3250	3813	System.out.println("Object is: " + obj);
3251		- GrafreeD.AnalyzeObject(obj);
	3814	+ Grafreed.AnalyzeObject(obj);
3252	3815	System.out.println("Boundary rep: " + obj.bRep);
3253		- GrafreeD.AnalyzeObject(obj.bRep);
	3816	+ Grafreed.AnalyzeObject(obj.bRep);
3254	3817
3255	3818	// System.err.println((size/1024) + " KB is the size of " + obj);
3256	3819	}
..	..	@@ -3292,6 +3855,13 @@
3292	3855	void GenNormals(boolean crease)
3293	3856	{
3294	3857	group.GenNormalsS(crease);
	3858	+
	3859	+ refreshContents();
	3860	+ }
	3861	+
	3862	+ void GenNormalsMESH()
	3863	+ {
	3864	+ group.GenNormalsMeshS();
3295	3865
3296	3866	refreshContents();
3297	3867	}
..	..	@@ -3464,8 +4034,8 @@
3464	4034
3465	4035	void ParseVertices()
3466	4036	{
3467		- boolean epsequal = GrafreeD.epsequal;
3468		- GrafreeD.epsequal = true;
	4037	+ boolean epsequal = Grafreed.epsequal;
	4038	+ Grafreed.epsequal = true;
3469	4039
3470	4040	for (int i=0; i<group.selection.size(); i++)
3471	4041	{
..	..	@@ -3490,7 +4060,7 @@
3490	4060	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3491	4061	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3492	4062
3493		- g.add(GrafreeD.clipboard);
	4063	+ g.add(Grafreed.clipboard);
3494	4064
3495	4065	buffer.add(g);
3496	4066	}
..	..	@@ -3505,7 +4075,7 @@
3505	4075	makeSomething(buffer, i==group.selection.size()-1);
3506	4076	}
3507	4077
3508		- GrafreeD.epsequal = epsequal;
	4078	+ Grafreed.epsequal = epsequal;
3509	4079
3510	4080	refreshContents();
3511	4081	}
..	..	@@ -3523,7 +4093,16 @@
3523	4093	String pigment = Object3D.GetPigment(tex);
3524	4094	//String bump = Object3D.GetBump(tex);
3525	4095
3526		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4096	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4097	+
	4098	+ try
	4099	+ {
	4100	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4101	+ }
	4102	+ catch (Exception e)
	4103	+ {
	4104	+ System.err.println("FAIL: " + node);
	4105	+ }
3527	4106
3528	4107	double s = v.s;
3529	4108
..	..	@@ -3611,11 +4190,11 @@
3611	4190
3612	4191	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3613	4192
3614		- boolean random = CameraPane.RANDOM;
3615		- CameraPane.RANDOM = false; // parse all random nodes
	4193	+ boolean random = CameraPane.SWITCH;
	4194	+ CameraPane.SWITCH = false; // parse all random nodes
3616	4195	lowres.linkVerticesThis(null);
3617	4196	lowres.linkVerticesThis(sn);
3618		- CameraPane.RANDOM = random;
	4197	+ CameraPane.SWITCH = random;
3619	4198
3620	4199	System.err.flush();
3621	4200
..	..	@@ -3655,7 +4234,7 @@
3655	4234	return;
3656	4235
3657	4236	Object3D poses = group.selection.get(0);
3658		- Object3D ref = GrafreeD.clipboard.get(0);
	4237	+ Object3D ref = Grafreed.clipboard.get(0);
3659	4238
3660	4239	Object3D newgroup = new Object3D("Po:" + poses.name);
3661	4240
..	..	@@ -3849,9 +4428,9 @@
3849	4428
3850	4429	void ClipMesh()
3851	4430	{
3852		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4431	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3853	4432	{
3854		- Object3D content = GrafreeD.clipboard.get(0);
	4433	+ Object3D content = Grafreed.clipboard.get(0);
3855	4434
3856	4435	if (content instanceof cGroup && ((cGroup)content).transientlink )
3857	4436	content = ((cGroup)content).get(0);
..	..	@@ -3860,7 +4439,7 @@
3860	4439	// {
3861	4440	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3862	4441	// }
3863		- group.selection.ClipMesh(GrafreeD.clipboard);
	4442	+ group.selection.ClipMesh(Grafreed.clipboard);
3864	4443	}
3865	4444	// group.selection.ClipMesh(GrafreeD.clipboard);
3866	4445	System.out.println("DONE.");
..	..	@@ -3907,6 +4486,18 @@
3907	4486	void MarkLeaves(boolean hide)
3908	4487	{
3909	4488	group.selection.MarkLeaves(hide);
	4489	+ refreshContents();
	4490	+ }
	4491	+
	4492	+ void RewindLeaves(boolean hide)
	4493	+ {
	4494	+ group.selection.RewindLeaves(hide);
	4495	+ refreshContents();
	4496	+ }
	4497	+
	4498	+ void RandomLeaves(boolean hide)
	4499	+ {
	4500	+ group.selection.RandomLeaves(hide);
3910	4501	refreshContents();
3911	4502	}
3912	4503
..	..	@@ -3981,10 +4572,6 @@
3981	4572	// }
3982	4573	// }
3983	4574
3984		- static boolean allparams = true;
3985		-
3986		- static Vector<Object3D> listUI = new Vector<Object3D>();
3987		-
3988	4575	void EditSelection(boolean newWindow)
3989	4576	{
3990	4577	// aConstraints.gridy = 0;
..	..	@@ -3992,10 +4579,10 @@
3992	4579	{
3993	4580	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
3994	4581	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3995		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4582	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3996	4583
3997	4584	Object3D elem = (Object3D)group.selection.elementAt(i);
3998		- if(elem != group)
	4585	+ if(elem != group \|\| !newWindow)
3999	4586	{
4000	4587	// if (!(elem instanceof Composite))
4001	4588	// newWindow = false;
..	..	@@ -4077,7 +4664,8 @@
4077	4664	//new Exception().printStackTrace();
4078	4665
4079	4666	freezemodel = true;
4080		-
	4667	+ ClearUnpinned();
	4668	+
4081	4669	/**/
4082	4670	//switch (event.id)
4083	4671	{
..	..	@@ -4085,7 +4673,6 @@
4085	4673	//case 702: // Event.LIST_DESELECT
4086	4674	group.deselectAll();
4087	4675	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4088		- objEditor.ClearInfo(); // .GetMaterial());
4089	4676	if (tps != null)
4090	4677	{
4091	4678	for (int i=0; i < tps.length; i++)
..	..	@@ -4094,10 +4681,8 @@
4094	4681
4095	4682	//if (child.parent != null)
4096	4683	//child.parent.addSelectee(child);
	4684	+ objEditor.SetMaterial(child);
4097	4685	group.addSelectee(child);
4098		- objEditor.SetMaterial(child); // .GetMaterial());
4099		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4100		- System.err.println("info : " + child.GetPath());
4101	4686	}
4102	4687	}
4103	4688	// else
..	..	@@ -4107,20 +4692,28 @@
4107	4692	// System.err.println("info : " + group.GetPath());
4108	4693	// }
4109	4694
4110		- objEditor.SetText(); // jan 2014
4111		-
4112		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4695	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4113	4696	CameraPane.flash = true;
4114	4697
4115		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4698	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4116	4699	// a camera
4117	4700	{
4118		- CameraPane.camerachangeframe = 0; // don't refuse it
4119		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4701	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	4702	+ {
	4703	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4704	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4705	+ }
4120	4706	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4121	4707	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4122	4708	}
4123	4709
	4710	+ if (tps != null && tps.length == 1)
	4711	+ {
	4712	+ EditSelection(false);
	4713	+ }
	4714	+
	4715	+ SetPinStates(tps != null && tps.length > 0);
	4716	+
4124	4717	refreshContents();
4125	4718	//return true;
4126	4719	}
..	..	@@ -4129,6 +4722,35 @@
4129	4722
4130	4723	freezemodel = false;
4131	4724	}
	4725	+
	4726	+ void SetPinStates(boolean enabled)
	4727	+ {
	4728	+ editButton.setEnabled(enabled);
	4729	+ uneditButton.setEnabled(enabled);
	4730	+ unselectButton.setEnabled(enabled);
	4731	+ flashSelectionButton.setEnabled(enabled);
	4732	+ }
	4733	+
	4734	+ void refreshContents(boolean cp)
	4735	+ {
	4736	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4737	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	4738	+ {
	4739	+ objEditor.ClearInfo(); // .GetMaterial());
	4740	+
	4741	+ for (int i=0; i < group.selection.Size(); i++)
	4742	+ {
	4743	+ Object3D child = (Object3D) group.selection.get(i);
	4744	+
	4745	+ objEditor.AddInfo(child, this, true);
	4746	+ System.err.println("info : " + child.GetPath());
	4747	+ }
	4748	+
	4749	+ objEditor.SetText(); // jan 2014
	4750	+ }
	4751	+
	4752	+ super.refreshContents(cp);
	4753	+ }
4132	4754
4133	4755	void linkSomething(Object3D thing)
4134	4756	{
..	..	@@ -4200,16 +4822,19 @@
4200	4822	{
4201	4823	if (group.selection.isEmpty())
4202	4824	return;
4203		- GrafreeD.clipboardIsTempGroup = false;
	4825	+
	4826	+ Grafreed.clipboardIsTempGroup = false;
4204	4827	Composite tGroup = null;
4205	4828	if (group.selection.size() > 0) // 1)
4206	4829	{
4207	4830	tGroup = new cGroup();
4208		- GrafreeD.clipboardIsTempGroup = true;
	4831	+ Grafreed.clipboardIsTempGroup = true;
4209	4832	}
4210	4833
4211	4834	if (cut)
4212	4835	{
	4836	+ if (Globals.SAVEONMAKE)
	4837	+ Save();
4213	4838	//int indices[] = jList.getSelectedIndices();
4214	4839	//for (int i = indices.length - 1; i >= 0; i--)
4215	4840	//jList.remove(indices[i]);
..	..	@@ -4245,16 +4870,16 @@
4245	4870	//System.out.println("cut " + child);
4246	4871	//System.out.println("parent = " + child.parent);
4247	4872	// tmp.addChild(child);
4248		- if (GrafreeD.clipboardIsTempGroup)
	4873	+ if (Grafreed.clipboardIsTempGroup)
4249	4874	tGroup.add/Child/(tmp);
4250	4875	else
4251		- GrafreeD.clipboard = tmp;
	4876	+ Grafreed.clipboard = tmp;
4252	4877	}
4253	4878	else
4254		- if (GrafreeD.clipboardIsTempGroup)
	4879	+ if (Grafreed.clipboardIsTempGroup)
4255	4880	tGroup.add/Child/(child);
4256	4881	else
4257		- GrafreeD.clipboard = child;
	4882	+ Grafreed.clipboard = child;
4258	4883	}
4259	4884
4260	4885	//ResetModel();
..	..	@@ -4286,21 +4911,23 @@
4286	4911	//System.out.println("cut " + elem);
4287	4912	//System.out.println("parent = " + elem.parent);
4288	4913	// tmp.addChild(elem);
4289		- if (GrafreeD.clipboardIsTempGroup)
	4914	+ if (Grafreed.clipboardIsTempGroup)
4290	4915	tGroup.add/Child/(tmp);
4291	4916	else
4292		- GrafreeD.clipboard = tmp;
	4917	+ Grafreed.clipboard = tmp;
4293	4918	}
4294	4919	else
4295		- if (GrafreeD.clipboardIsTempGroup)
	4920	+ if (Grafreed.clipboardIsTempGroup)
4296	4921	tGroup.add/Child/(child);
4297	4922	else
4298		- GrafreeD.clipboard = child;
	4923	+ Grafreed.clipboard = child;
4299	4924	}
4300	4925
4301	4926	}
4302		- if (GrafreeD.clipboardIsTempGroup)
4303		- GrafreeD.clipboard = tGroup;
	4927	+
	4928	+ if (Grafreed.clipboardIsTempGroup)
	4929	+ Grafreed.clipboard = tGroup;
	4930	+
4304	4931	if (cut)
4305	4932	{
4306	4933	ResetModel();
..	..	@@ -4314,7 +4941,7 @@
4314	4941	// return;
4315	4942	boolean first = true;
4316	4943
4317		- if (GrafreeD.clipboardIsTempGroup)
	4944	+ if (Grafreed.clipboardIsTempGroup)
4318	4945	{
4319	4946	Composite temp;
4320	4947
..	..	@@ -4325,7 +4952,7 @@
4325	4952	temp = (Composite)Applet3D.clipboard.deepCopy();
4326	4953	*/
4327	4954	Object3D elem;
4328		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4955	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4329	4956	{
4330	4957	Object3D child = (Object3D)e.nextElement();
4331	4958
..	..	@@ -4359,21 +4986,21 @@
4359	4986	//Object3D cb = Applet3D.clipboard;
4360	4987	//temp.addChild(cb);
4361	4988	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4362		- assert(GrafreeD.clipboard.parent == null);
4363		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4364		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4365		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4366		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	4989	+ assert(Grafreed.clipboard.parent == null);
	4990	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4991	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4992	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4993	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4367	4994	else
4368		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4369		- GrafreeD.clipboard.get(0).parent = keepparent;
	4995	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4996	+ Grafreed.clipboard.get(0).parent = keepparent;
4370	4997	}
4371	4998
4372	4999	ResetModel();
4373	5000	refreshContents();
4374	5001	}
4375	5002
4376		- void pasteInto(boolean copyit)
	5003	+ void pasteInto(boolean copyit, boolean clone)
4377	5004	{
4378	5005	// if (GrafreeD.clipboard == null)
4379	5006	// return;
..	..	@@ -4402,15 +5029,22 @@
4402	5029	if (copyit)
4403	5030	{
4404	5031	// paste(false);
4405		- CloneClipboard(false); // sept 2014
	5032	+ if (clone)
	5033	+ {
	5034	+ CloneClipboard(false); // sept 2014
	5035	+ }
	5036	+ else
	5037	+ {
	5038	+ paste(false);
	5039	+ }
4406	5040	}
4407	5041	else
4408	5042	{
4409	5043	boolean first = true;
4410	5044
4411		- if (GrafreeD.clipboardIsTempGroup)
	5045	+ if (Grafreed.clipboardIsTempGroup)
4412	5046	{
4413		- Composite temp = (Composite)GrafreeD.clipboard;
	5047	+ Composite temp = (Composite)Grafreed.clipboard;
4414	5048	Object3D copy;
4415	5049	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4416	5050	{
..	..	@@ -4420,7 +5054,7 @@
4420	5054	}
4421	5055	} else
4422	5056	{
4423		- linkSomething(GrafreeD.clipboard); //.get(0));
	5057	+ linkSomething(Grafreed.clipboard); //.get(0));
4424	5058	}
4425	5059	}
4426	5060	}
..	..	@@ -4825,21 +5459,6 @@
4825	5459	}
4826	5460	*/
4827	5461
4828		- void ImportGFD()
4829		- {
4830		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4831		- browser.show();
4832		- String filename = browser.getFile();
4833		- if (filename != null && filename.length() > 0)
4834		- {
4835		- String fullname = browser.getDirectory() + filename;
4836		-
4837		- //Object3D readobj =
4838		- objEditor.ReadGFD(fullname, objEditor);
4839		- //makeSomething(readobj);
4840		- }
4841		- }
4842		-
4843	5462	/*
4844	5463	public void Callback(Object obj)
4845	5464	{
..	..	@@ -4863,26 +5482,9 @@
4863	5482	}
4864	5483	*/
4865	5484
4866		- void ImportVRMLX3D()
4867		- {
4868		- if (GrafreeD.standAlone)
4869		- {
4870		- /**/
4871		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4872		- browser.show();
4873		- String filename = browser.getFile();
4874		- if (filename != null && filename.length() > 0)
4875		- {
4876		- String fullname = browser.getDirectory() + filename;
4877		- LoadVRMLX3D(fullname);
4878		- }
4879		- /**/
4880		- }
4881		- }
4882		-
4883	5485	String GetFile(String dialogName)
4884	5486	{
4885		- if (GrafreeD.standAlone)
	5487	+ if (Grafreed.standAlone)
4886	5488	{
4887	5489	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4888	5490	browser.show();
..	..	@@ -4946,10 +5548,33 @@
4946	5548	cButton flashSelectionButton;
4947	5549	cButton editButton;
4948	5550	cButton uneditButton;
	5551	+ JCheckBox allParamsButton;
4949	5552	cButton clearpanelButton;
4950		- cButton allParamsButton;
4951	5553	cButton unselectButton;
4952	5554
	5555	+ cButton restoreCameraButton;
	5556	+
	5557	+ cButton saveButton;
	5558	+ cButton oneStepButton;
	5559	+
	5560	+ cButton groupButton;
	5561	+ cButton ungroupButton;
	5562	+ cButton compositeButton;
	5563	+ cButton switchButton;
	5564	+ cButton loopButton;
	5565	+ cButton textureButton;
	5566	+
	5567	+ cButton gridButton;
	5568	+ cButton boxButton;
	5569	+ cButton sphereButton;
	5570	+ cButton coneButton;
	5571	+ cButton torusButton;
	5572	+ cButton superButton;
	5573	+ cButton kleinButton;
	5574	+ cButton particlesButton;
	5575	+ cButton overlayButton;
	5576	+ cButton lightButton;
	5577	+
4953	5578	cButton screenfitButton;
4954	5579	cButton screenfitpointButton;
4955	5580	cButton snapobjectButton;
..	..	@@ -4961,14 +5586,6 @@
4961	5586
4962	5587	cButton setsupportButton;
4963	5588
4964		- cButton twoButton;
4965		- cButton sixButton;
4966		- cButton threeButton;
4967		- cButton sevenButton;
4968		- cButton fourButton; // full panel
4969		- cButton oneButton; // full XYZ
4970		- //cButton currentLayout;
4971		-
4972	5589	//
4973	5590	//Composite
4974	5591	Object3D // to do !!
..	..	@@ -4978,9 +5595,11 @@
4978	5595	//JTree jTree;
4979	5596	private MenuItem lookAtItem;
4980	5597	private MenuItem lookFromItem;
4981		- private MenuItem switchItem;
	5598	+ private MenuItem switchViewItem;
4982	5599	private MenuItem cutItem;
4983		- private MenuItem duplicateItem;
	5600	+ private MenuItem undoItem;
	5601	+ private MenuItem redoItem;
	5602	+ private JMenuItem duplicateItem;
4984	5603	private MenuItem cloneItem;
4985	5604	private MenuItem cloneSupportItem;
4986	5605	private MenuItem overwriteGeoItem;
..	..	@@ -4993,7 +5612,7 @@
4993	5612	private MenuItem linkverticesItem;
4994	5613	private MenuItem relinkverticesItem;
4995	5614	private MenuItem setMasterItem;
4996		- private MenuItem resetMeshItem;
	5615	+ private MenuItem resetAllItem;
4997	5616	private MenuItem stepAllItem;
4998	5617	private MenuItem revertMeshItem;
4999	5618	private MenuItem poseMeshItem;
..	..	@@ -5004,6 +5623,7 @@
5004	5623	private MenuItem mergeGeometriesItem;
5005	5624	private MenuItem copyItem;
5006	5625	private MenuItem pasteItem;
	5626	+ private MenuItem pasteIntoItem;
5007	5627	private MenuItem pasteLinkItem;
5008	5628	private MenuItem pasteCloneItem;
5009	5629	private MenuItem pasteExpandItem;
..	..	@@ -5042,6 +5662,10 @@
5042	5662	private MenuItem showleavesItem;
5043	5663	private MenuItem markleavesItem;
5044	5664	private MenuItem unmarkleavesItem;
	5665	+ private MenuItem rewindleavesItem;
	5666	+ private MenuItem unrewindleavesItem;
	5667	+ private MenuItem randomleavesItem;
	5668	+ private MenuItem unrandomleavesItem;
5045	5669
5046	5670	private MenuItem flipVItem;
5047	5671	private MenuItem unflipVItem;
..	..	@@ -5053,15 +5677,17 @@
5053	5677	private MenuItem panoTexturesItem;
5054	5678
5055	5679	private MenuItem resetCentroidItem;
5056		- private MenuItem transformgeometryItem;
	5680	+ private MenuItem resetCentroidXZItem;
5057	5681	private MenuItem resetTransformItem;
	5682	+ private MenuItem transformGeometryItem;
	5683	+ private MenuItem transformChildrenItem;
5058	5684	private MenuItem hideItem;
5059	5685	private MenuItem grabItem;
5060	5686	private MenuItem backItem;
5061	5687	private MenuItem frontItem;
5062	5688	private MenuItem cameraItem;
5063	5689	private MenuItem compositeItem;
5064		- private MenuItem randomItem;
	5690	+ private MenuItem switchItem;
5065	5691	private MenuItem physicsItem;
5066	5692	private MenuItem frameselectorItem;
5067	5693	private MenuItem scriptNodeItem;
..	..	@@ -5101,7 +5727,7 @@
5101	5727	private MenuItem blobItem;
5102	5728	private MenuItem latheItem;
5103	5729	private MenuItem bezierItem;
5104		- private MenuItem checkerItem;
	5730	+ private MenuItem overlayItem;
5105	5731	private MenuItem meshItem;
5106	5732	// private MenuItem meshGroupItem;
5107	5733	private MenuItem springItem;
..	..	@@ -5123,11 +5749,6 @@
5123	5749	private MenuItem doubleItem;
5124	5750	private MenuItem tripleItem;
5125	5751
5126		- private MenuItem importGFDItem;
5127		- private MenuItem importVRMLX3DItem;
5128		- private MenuItem import3DSItem;
5129		- private MenuItem importOBJItem;
5130		-
5131	5752	private MenuItem computeAOItem;
5132	5753	private MenuItem recompileItem;
5133	5754	private MenuItem editScriptItem;
..	..	@@ -5137,4 +5758,8 @@
5137	5758	private MenuItem analyzeItem;
5138	5759	private MenuItem dumpItem;
5139	5760	//boolean freezemodel = false;
	5761	+
	5762	+ Menu cameraMenu;
	5763	+ MenuItem editCameraItem;
	5764	+ MenuItem restoreCameraItem;
5140	5765	}