~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("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,103 @@
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("Random"));
243		- randomItem.addActionListener(this);
244		- physicsItem = menu.add(new MenuItem("Physics"));
245		- physicsItem.addActionListener(this);
246		- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
247		- frameselectorItem.addActionListener(this);
	347	+
	348	+// menu.add("-");
	349	+//
	350	+// switchItem = menu.add(new MenuItem("Switch node"));
	351	+// switchItem.addActionListener(this);
	352	+ if (Globals.ADVANCED)
	353	+ {
248	354	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
249	355	switchGeoItem.addActionListener(this);
250	356	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
251	357	switchTransfoItem.addActionListener(this);
252		- morphItem = menu.add(new MenuItem("Morph"));
	358	+ morphItem = menu.add(new MenuItem("Morph Group"));
253	359	morphItem.addActionListener(this);
	360	+
	361	+ menu.add("-");
	362	+ physicsItem = menu.add(new MenuItem("Physics"));
	363	+ physicsItem.addActionListener(this);
	364	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	365	+ frameselectorItem.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	+ if (Globals.ADVANCED)
	384	+ {
	385	+ menu.add("-");
272	386	linkerItem = menu.add(new MenuItem("Linker"));
273	387	linkerItem.addActionListener(this);
274		- templateItem = menu.add(new MenuItem("Template"));
275		- templateItem.addActionListener(this);
276	388	attributeItem = menu.add(new MenuItem("Attribute"));
277	389	attributeItem.addActionListener(this);
	390	+ templateItem = menu.add(new MenuItem("Template"));
	391	+ templateItem.addActionListener(this);
278	392	pointflowItem = menu.add(new MenuItem("Point Flow"));
279	393	pointflowItem.addActionListener(this);
	394	+ }
280	395	menu.add("-");
281	396	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
282	397	resetTransformItem.addActionListener(this);
283	398	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
284	399	resetCentroidItem.addActionListener(this);
285		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
286		- transformgeometryItem.addActionListener(this);
	400	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	401	+ resetCentroidXZItem.addActionListener(this);
	402	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	403	+ transformGeometryItem.addActionListener(this);
	404	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	405	+ transformChildrenItem.addActionListener(this);
287	406
288	407	oe.menuBar.add(menu = new Menu("Geometry"));
289	408	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -294,8 +413,11 @@
294	413	genNormalsCADItem.addActionListener(this);
295	414	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
296	415	genNormalsMESHItem.addActionListener(this);
	416	+ if (Globals.ADVANCED)
	417	+ {
297	418	genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
298	419	genNormalsMINEItem.addActionListener(this);
	420	+ }
299	421	stripifyItem = menu.add(new MenuItem("Stripify"));
300	422	stripifyItem.addActionListener(this);
301	423	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -317,23 +439,34 @@
317	439	reduce34MeshItem.addActionListener(this);
318	440	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
319	441	increaseMeshItem.addActionListener(this);
320		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
321		- smoothMeshItem.addActionListener(this);
322	442	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
323	443	clipMeshItem.addActionListener(this);
	444	+
	445	+ if (Globals.ADVANCED)
	446	+ {
	447	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	448	+ smoothMeshItem.addActionListener(this);
	449	+ }
324	450
325	451	oe.menuBar.add(menu = new Menu("Attributes"));
326	452	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
327	453	clearMaterialsItem.addActionListener(this);
	454	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	455	+ resetAllItem.addActionListener(this);
	456	+ stepAllItem = menu.add(new MenuItem("Step All"));
	457	+ stepAllItem.addActionListener(this);
328	458	menu.add("-");
329	459	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
330	460	liveleavesItem.addActionListener(this);
331	461	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
332	462	unliveleavesItem.addActionListener(this);
	463	+ if (Globals.ADVANCED)
	464	+ {
333	465	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
334	466	supportleavesItem.addActionListener(this);
335	467	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
336	468	unsupportleavesItem.addActionListener(this);
	469	+ }
337	470	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
338	471	hideleavesItem.addActionListener(this);
339	472	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -342,6 +475,14 @@
342	475	markleavesItem.addActionListener(this);
343	476	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
344	477	unmarkleavesItem.addActionListener(this);
	478	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	479	+ rewindleavesItem.addActionListener(this);
	480	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	481	+ unrewindleavesItem.addActionListener(this);
	482	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	483	+ randomleavesItem.addActionListener(this);
	484	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	485	+ unrandomleavesItem.addActionListener(this);
345	486	menu.add("-");
346	487	flipVItem = menu.add(new MenuItem("Flip V"));
347	488	flipVItem.addActionListener(this);
..	..	@@ -377,35 +518,40 @@
377	518	sortbynameItem = menu.add(new MenuItem("Sort by name"));
378	519	sortbynameItem.addActionListener(this);
379	520	menu.add("-");
	521	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	522	+ shareGeometriesItem.addActionListener(this);
	523	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	524	+ mergeGeometriesItem.addActionListener(this);
	525	+ if (Globals.ADVANCED)
	526	+ {
	527	+ // Pretty much the same as duplicate and clone.
380	528	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
381	529	extractGeometriesItem.addActionListener(this);
382	530	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
383	531	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);
	532	+ }
388	533
389	534	oe.menuBar.add(menu = new Menu("Insert"));
390	535	buildCreateMenu(menu);
391	536
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	537	oe.menuBar.add(menu = new Menu("Tools"));
404	538	buildToolsMenu(menu);
405	539	}
406	540
407	541	void SetupUI2(ObjEditor oe)
408	542	{
	543	+ // June 2019
	544	+ if (oe == null)
	545	+ {
	546	+ //super.SetupUI2(this);
	547	+ //return;
	548	+ }
	549	+
	550	+ if (copy != group)
	551	+ {
	552	+ //super.SetupUI2(this);
	553	+ }
	554	+
409	555	//new Exception().printStackTrace();
410	556
411	557	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -434,98 +580,214 @@
434	580	oe.radioPanel.add(dummyButton);
435	581	oe.buttonGroup.add(dummyButton);
436	582	*/
	583	+ cGridBag copyOptionsPanel = new cGridBag();
	584	+
	585	+ copyOptionsPanel.preferredHeight = 2;
	586	+
437	587	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
438	588
439		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
440		- liveCB.setToolTipText("Enabled animation");
	589	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	590	+ //minButton.setToolTipText("Minimize window");
	591	+ //minButton.addActionListener(this);
	592	+
	593	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	594	+ maxButton.setToolTipText("Maximize window");
	595	+ maxButton.addActionListener(this);
	596	+
	597	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	598	+ fullButton.setToolTipText("Full-screen window");
	599	+ fullButton.addActionListener(this);
	600	+
	601	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	602	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	603	+ restoreCameraButton.addActionListener(this);
	604	+
	605	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	606	+ undoButton.setToolTipText("Undo changes");
	607	+ undoButton.addActionListener(this);
	608	+ undoButton.setEnabled(false);
	609	+
	610	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	611	+ redoButton.setToolTipText("Redo changes");
	612	+ redoButton.addActionListener(this);
	613	+ redoButton.setEnabled(false);
	614	+
	615	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	616	+ saveButton.setToolTipText("Save changes");
	617	+ saveButton.addActionListener(this);
	618	+
	619	+ copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	620	+ liveCB.setToolTipText("Enable animation");
441	621	liveCB.addItemListener(this);
442	622
443		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK), oe.aConstraints);
444		- trackCB.setToolTipText("Enable tracking");
445		- trackCB.addItemListener(this);
446		-
447		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	623	+ copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	624	+ oneStepButton.setToolTipText("Animate one step forward");
	625	+ oneStepButton.addActionListener(this);
	626	+
	627	+ copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	628	+ fastCB.setToolTipText("Fast mode");
	629	+ fastCB.addItemListener(this);
	630	+
	631	+ //oe.toolboxPanel.Return();
	632	+
	633	+ copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
448	634	screenfitButton.setToolTipText("Screen fit");
449	635	screenfitButton.addActionListener(this);
450	636
	637	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	638	+// trackCB.setToolTipText("Enable tracking");
	639	+// trackCB.addItemListener(this);
	640	+
451	641	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
452	642	// screenfitpointButton.addActionListener(this);
453		-// oe.aConstraints.gridx += 1;
454		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
455		- snapobjectButton.addActionListener(this);
456		- snapobjectButton.setToolTipText("Snap Object");
457		- oe.aConstraints.gridx += 1;
458	643
459		- //aConstraints.gridx = 0;
460		- //aConstraints.gridy += 1;
461		- oe.aConstraints.weighty = 0;
462		- oe.aConstraints.gridwidth = 1;
463		-
464		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
465		- flashSelectionButton.setToolTipText("Show selection");
466		- flashSelectionButton.addActionListener(this);
	644	+ if (Globals.ADVANCED)
	645	+ {
	646	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	647	+ snapobjectButton.addActionListener(this);
	648	+ snapobjectButton.setToolTipText("Snap Object");
	649	+ }
	650	+
	651	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
467	652
468		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
469		-
470		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	653	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
471	654	twoButton.setToolTipText("Show center view only");
472	655	twoButton.addActionListener(this);
473		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	656	+ this.fullscreenLayout = twoButton;
	657	+
	658	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
474	659	fourButton.addActionListener(this);
475	660	fourButton.setToolTipText("Show left panel only");
476		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	661	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
477	662	sixButton.setToolTipText("2-column layout left");
478	663	sixButton.addActionListener(this);
479		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	664	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
480	665	threeButton.setToolTipText("2-column layout right");
481	666	threeButton.addActionListener(this);
482		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	667	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
483	668	sevenButton.setToolTipText("3-column layout");
484	669	sevenButton.addActionListener(this);
485	670	//
486	671
487		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
488		- rootButton.setToolTipText("Edit object in new tab");
	672	+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	673	+ rootButton.setToolTipText("Edit selection in new tab");
489	674	rootButton.addActionListener(this);
490		- oe.aConstraints.gridx += 1;
491		- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	675	+
	676	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
492	677	closeButton.setToolTipText("Close tab");
493	678	closeButton.addActionListener(this);
494	679	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
495	680	//clearButton.addActionListener(this);
496		- oe.aConstraints.gridx += 1;
497		-
498		- oe.aConstraints.gridx = 1; //
499		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
500		- editButton.addActionListener(this);
501		- oe.aConstraints.gridx += 1;
502		- oe.aConstraints.weighty = 0;
503		- oe.aConstraints.gridwidth = 1;
504	681
505		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	682	+ // INSERT
	683	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	684	+ gridButton.setToolTipText("Create grid");
	685	+ gridButton.addActionListener(this);
	686	+
	687	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	688	+ boxButton.setToolTipText("Create box");
	689	+ boxButton.addActionListener(this);
	690	+
	691	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	692	+ sphereButton.setToolTipText("Create sphere");
	693	+ sphereButton.addActionListener(this);
	694	+
	695	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	696	+ coneButton.setToolTipText("Create cone");
	697	+ coneButton.addActionListener(this);
	698	+
	699	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	700	+ torusButton.setToolTipText("Create torus");
	701	+ torusButton.addActionListener(this);
	702	+
	703	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	704	+ superButton.setToolTipText("Create superellipsoid");
	705	+ superButton.addActionListener(this);
	706	+
	707	+ if (Globals.ADVANCED)
	708	+ {
	709	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	710	+ kleinButton.setToolTipText("Create Klein bottle");
	711	+ kleinButton.addActionListener(this);
	712	+ }
	713	+
	714	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	715	+ particlesButton.setToolTipText("Create particle system");
	716	+ particlesButton.addActionListener(this);
	717	+
	718	+ oe.toolboxPanel.Return();
	719	+
	720	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	721	+ groupButton.setToolTipText("Create group");
	722	+ groupButton.addActionListener(this);
	723	+
	724	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	725	+ compositeButton.setToolTipText("Create composite");
	726	+ compositeButton.addActionListener(this);
	727	+
	728	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	729	+ switchButton.setToolTipText("Create switch");
	730	+ switchButton.addActionListener(this);
	731	+
	732	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	733	+ loopButton.setToolTipText("Create loop");
	734	+ loopButton.addActionListener(this);
	735	+
	736	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	737	+ textureButton.setToolTipText("Create texture");
	738	+ textureButton.addActionListener(this);
	739	+
	740	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	741	+ overlayButton.setToolTipText("Create overlay");
	742	+ overlayButton.addActionListener(this);
	743	+
	744	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	745	+ lightButton.setToolTipText("Create light");
	746	+ lightButton.addActionListener(this);
	747	+
	748	+ for (int i=6; --i>=0;)
	749	+ {
	750	+ oe.toolboxPanel.Return();
	751	+ oe.toolboxPanel.add(new cGridBag());
	752	+ oe.toolboxPanel.add(new cGridBag());
	753	+ oe.toolboxPanel.add(new cGridBag());
	754	+ oe.toolboxPanel.add(new cGridBag());
	755	+ oe.toolboxPanel.add(new cGridBag());
	756	+ oe.toolboxPanel.add(new cGridBag());
	757	+ oe.toolboxPanel.add(new cGridBag());
	758	+ }
	759	+
	760	+ // EDIT panel
	761	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	762	+ editButton.setToolTipText("Pin selection controls");
	763	+ editButton.addActionListener(this);
	764	+
	765	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	766	+ uneditButton.setToolTipText("Remove selection controls");
506	767	uneditButton.addActionListener(this);
507	768
508		- oe.aConstraints.gridx += 1;
509		- oe.aConstraints.weighty = 0;
510		- oe.aConstraints.gridwidth = 1;
511		-
512		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
513		- clearPanelButton.addActionListener(this);
514		-
515		- oe.aConstraints.gridx += 1;
516		- oe.aConstraints.weighty = 0;
517		- oe.aConstraints.gridwidth = 1;
518		-
519		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	769	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	770	+ allParamsButton.setToolTipText("Show all controle");
520	771	allParamsButton.addActionListener(this);
521	772
522		- oe.aConstraints.gridx += 1;
523		- oe.aConstraints.weighty = 0;
524		- oe.aConstraints.gridwidth = 1;
525		-
526		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
	773	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	774	+ clearPanelButton.setToolTipText("Clear edit panel");
	775	+ clearPanelButton.addActionListener(this);
	776	+
	777	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	778	+ unselectButton.setToolTipText("Unselect");
527	779	unselectButton.addActionListener(this);
528	780
	781	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	782	+ flashSelectionButton.setToolTipText("Highlight selection");
	783	+ flashSelectionButton.addActionListener(this);
	784	+
	785	+ editCommandsPanel.preferredHeight = 1;
	786	+
	787	+ SetPinStates(false);
	788	+// oe.treePanel.add(commandsPanel);
	789	+// oe.treePanel.Return();
	790	+
529	791	// oe.aConstraints.gridx += 1;
530	792	// oe.aConstraints.weighty = 0;
531	793	// oe.aConstraints.gridwidth = 1;
..	..	@@ -537,40 +799,22 @@
537	799	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
538	800	// gcButton.addActionListener(this);
539	801
540		- oe.aConstraints.gridx = 0;
541		- oe.aConstraints.gridy += 1;
542		-
543		- //ctrlPanel.add(objList = new List(5, true));
544		- oe.aConstraints.gridwidth = 100;
545		- // oe.aConstraints.gridheight = 100;
546		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
547		- oe.aConstraints.gridheight = 1;
548		- oe.aConstraints.weighty = 0.5;
549		- oe.aConstraints.gridx = 0;
550		- JScrollPane jSP;
	802	+ cGridBag jSPPanel = new cGridBag();
	803	+
	804	+ JScrollPane jSP;
551	805	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
552		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	806	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
553	807	ResetModel();
554		- oe.aConstraints.weighty = 0.5;
555		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
556		- oe.aConstraints.gridy += 1;
557		- oe.aConstraints.gridwidth = 1;
558		-
559		- oe.aConstraints.weighty = 0;
560		- oe.aConstraints.gridwidth = 2;
561		-
562		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
563		- colorCB.addItemListener(this);
564		- oe.aConstraints.gridx += 2;
565		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
566		- materialCB.addItemListener(this);
567		- oe.aConstraints.gridx += 2;
568		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
569		- textureCB.addItemListener(this);
570		-
571		- oe.aConstraints.gridx = 0;
572		- oe.aConstraints.gridy += 1;
573	808
	809	+ oe.treePanel.add(jSPPanel);
	810	+ oe.treePanel.Return();
	811	+
	812	+ oe.treePanel.add(copyOptionsPanel);
	813	+ oe.treePanel.Return();
	814	+
	815	+// mainPanel.setDividerLocation(0.5); //1.0);
	816	+// mainPanel.setResizeWeight(0.5);
	817	+
574	818	//jList.addListSelectionListener(this);
575	819	oe.jTree.addTreeSelectionListener(this);
576	820	//jTree.setRootVisible(false);
..	..	@@ -595,47 +839,57 @@
595	839
596	840	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
597	841	{
598		- //constraints.gridx = 0;
599		- //constraints.gridy = 0;
600		- panel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
601		- fastCB.setToolTipText("Fast mode");
602		- fastCB.addItemListener(this);
603		- //constraints.gridy += 1;
	842	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	843	+ colorCB.setToolTipText("Copy color when dropped");
	844	+ colorCB.addItemListener(this);
	845	+
	846	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	847	+ materialCB.setToolTipText("Copy material when dropped");
	848	+ materialCB.addItemListener(this);
	849	+
	850	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	851	+ textureCB.setToolTipText("Copy texture when dropped");
	852	+ textureCB.addItemListener(this);
	853	+
	854	+ panel.Return();
	855	+
	856	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	857	+ boxCB.setToolTipText("Display bounding boxes");
	858	+ boxCB.addItemListener(this);
	859	+
	860	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	861	+ zoomBoxCB.setToolTipText("Display only for wheel");
	862	+ zoomBoxCB.addItemListener(this);
	863	+
	864	+ if (true) // Globals.ADVANCED)
	865	+ {
604	866	panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
605		- supportCB.setToolTipText("Enabled rigging");
	867	+ supportCB.setToolTipText("Enable rigging");
606	868	supportCB.addItemListener(this);
607	869
608		- // constraints.gridy += 1;
609	870	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
610	871	// localCB.addItemListener(this);
611	872
612		- //constraints.gridy += 1;
	873	+ panel.Return();
	874	+
613	875	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
614	876	crowdCB.setToolTipText("Used for crowds");
615	877	crowdCB.addItemListener(this);
616	878
617		- //constraints.gridy += 1;
618	879	panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
619	880	smoothCB.setToolTipText("Snapping delay");
620	881	smoothCB.addItemListener(this);
621	882
622		- //constraints.gridy += 1;
623	883	panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
624	884	slowCB.setToolTipText("Smooth interpolation");
625	885	slowCB.addItemListener(this);
626		- //constraints.gridy += 1;
627		- panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
628		- boxCB.setToolTipText("Display bounding boxes");
629		- boxCB.addItemListener(this);
630		- //constraints.gridy += 1;
631		- panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
632		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
633		- zoomBoxCB.addItemListener(this);
634		-
	886	+
635	887	// constraints.gridy += 1;
636	888	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
637	889	// speakerMocapCB.addItemListener(this);
638	890
	891	+ panel.Return();
	892	+
639	893	if (false)
640	894	{
641	895	// handled in scripts
..	..	@@ -650,26 +904,72 @@
650	904	//constraints.gridy += 1;
651	905	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
652	906	smoothfocusCB.addItemListener(this);
	907	+ panel.Return();
653	908	}
654	909
655	910	//constraints.gridx += 1;
656	911	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
657	912	// debugCB.addItemListener(this);
658	913
659		- //constraints.gridy += 1;
	914	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	915	+ trackCB.setToolTipText("Enable tracking target");
	916	+ trackCB.addItemListener(this);
	917	+
660	918	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	919	+ oeilCB.setToolTipText("Move camera when tracking");
661	920	oeilCB.addItemListener(this);
662	921
663		- //constraints.gridy += 1;
	922	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	923	+ shadowCB.setToolTipText("When live compute shadows");
	924	+ shadowCB.addItemListener(this);
	925	+
	926	+ panel.Return();
	927	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	928	+ toggleTextureCB.setToolTipText("Load textures");
	929	+ toggleTextureCB.addItemListener(this);
	930	+
	931	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	932	+ toggleSwitchCB.setToolTipText("Use switch");
	933	+ toggleSwitchCB.addItemListener(this);
	934	+
	935	+ panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
	936	+ autosaveCB.setToolTipText("On structure change");
	937	+ autosaveCB.addItemListener(this);
	938	+
	939	+ panel.Return();
	940	+ if (Globals.ADVANCED)
	941	+ {
664	942	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
665	943	lookAtCB.setToolTipText("Look-at target");
666	944	lookAtCB.addItemListener(this);
	945	+ }
	946	+
	947	+ }
	948	+
	949	+ cGridBag fill = new cGridBag();
	950	+ fill.preferredHeight = 200;
	951	+ cGridBag fill2 = new cGridBag();
	952	+ fill2.preferredHeight = 200;
	953	+ cGridBag fill3 = new cGridBag();
	954	+ fill3.preferredHeight = 200;
	955	+
	956	+ panel.add(fill);
	957	+ panel.add(fill2);
	958	+ panel.add(fill3);
667	959
668	960	}
669	961
670	962	void EditObject(Object3D obj)
671	963	{
672	964	cRadio radioButton = new cRadio(obj.name);
	965	+
	966	+ // Patch to avoid bug with transparency.
	967	+ radioButton.hadMaterial = obj.material != null;
	968	+ if (!radioButton.hadMaterial)
	969	+ {
	970	+ obj.material = new cMaterial();
	971	+ }
	972	+
673	973	radioButton.SetObject(obj);
674	974	radioButton.layout = sevenButton;
675	975	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -678,8 +978,11 @@
678	978	buttonGroup.add(radioButton);
679	979	radioButton.doClick();
680	980	}
	981	+
681	982	void SetupViews(ObjEditor oe)
682	983	{
	984	+ theFrame = this;
	985	+
683	986	oe.SetupViews();
684	987
685	988	System.out.println("SetupViews");
..	..	@@ -688,23 +991,27 @@
688	991	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
689	992	}
690	993
691		- JCheckBox liveCB;
692		- JCheckBox supportCB;
693		- JCheckBox localCB;
694		- JCheckBox crowdCB;
695		- JCheckBox smoothCB;
696		- JCheckBox fastCB;
697		- JCheckBox slowCB;
698		- JCheckBox boxCB;
699		- JCheckBox zoomBoxCB;
700		- JCheckBox trackCB;
701		- JCheckBox smoothfocusCB;
	994	+ cToggleButton liveCB;
	995	+ cCheckBox supportCB;
	996	+ cCheckBox localCB;
	997	+ cCheckBox crowdCB;
	998	+ cCheckBox smoothCB;
	999	+ cToggleButton fastCB;
	1000	+ cCheckBox slowCB;
	1001	+ cCheckBox boxCB;
	1002	+ cCheckBox zoomBoxCB;
	1003	+ //cToggleButton trackCB;
	1004	+ cCheckBox trackCB;
	1005	+ cCheckBox smoothfocusCB;
702	1006	// JCheckBox speakerMocapCB;
703		- JCheckBox speakerCameraCB;
704		- JCheckBox speakerFocusCB;
705		- JCheckBox debugCB;
706		- JCheckBox oeilCB;
707		- JCheckBox lookAtCB;
	1007	+ cCheckBox speakerCameraCB;
	1008	+ cCheckBox speakerFocusCB;
	1009	+ cCheckBox debugCB;
	1010	+
	1011	+ cCheckBox oeilCB;
	1012	+ cCheckBox shadowCB;
	1013	+ cCheckBox autosaveCB;
	1014	+ cCheckBox lookAtCB;
708	1015
709	1016	// static int COLOR = 1;
710	1017	// static int MATERIAL = 2;
..	..	@@ -712,9 +1019,9 @@
712	1019
713	1020	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
714	1021
715		- JCheckBox colorCB;
716		- JCheckBox materialCB;
717		- JCheckBox textureCB;
	1022	+ cCheckBox colorCB;
	1023	+ cCheckBox materialCB;
	1024	+ cCheckBox textureCB;
718	1025
719	1026	public void itemStateChanged(ItemEvent e)
720	1027	{
..	..	@@ -742,6 +1049,7 @@
742	1049	} else if(e.getSource() == liveCB)
743	1050	{
744	1051	cameraView.ToggleLive();
	1052	+ refreshContents(false);
745	1053	}
746	1054	else if(e.getSource() == supportCB)
747	1055	{
..	..	@@ -806,6 +1114,14 @@
806	1114	{
807	1115	cameraView.ToggleOeil();
808	1116	}
	1117	+ else if(e.getSource() == shadowCB)
	1118	+ {
	1119	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1120	+ }
	1121	+ else if(e.getSource() == autosaveCB)
	1122	+ {
	1123	+ Globals.SAVEONMAKE ^= true;
	1124	+ }
809	1125	else if(e.getSource() == lookAtCB)
810	1126	{
811	1127	cameraView.ToggleLookAt();
..	..	@@ -822,7 +1138,8 @@
822	1138
823	1139	/**/
824	1140	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
825		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1141	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1142	+ TreePath path = objEditor.jTree.getSelectionPath();
826	1143	if ((path == null) \|\| (path.getPathCount() <= 1)) {
827	1144	// We can't move the root node or an empty selection
828	1145	return;
..	..	@@ -894,7 +1211,9 @@
894	1211	// objEditor.DropFile((java.io.File[]) object, true);
895	1212	// return;
896	1213	// }
897		- if (string.charAt(0) == '/')
	1214	+
	1215	+ // File path for Mac and Windows
	1216	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
898	1217	{
899	1218	// file(s)
900	1219	String[] names = string.split("\n");
..	..	@@ -921,7 +1240,7 @@
921	1240
922	1241	flashIt = false;
923	1242	CameraPane pane = (CameraPane) target;
924		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1243	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
925	1244	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
926	1245
927	1246	if (group.selection.size() == 1)
..	..	@@ -937,23 +1256,33 @@
937	1256
938	1257	assert target == objEditor.jTree;
939	1258	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1259	+ Object3D destinationLeaf;
940	1260	try {
941		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1261	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
942	1262	} catch (Exception e) {
943	1263	System.out.println("destinationPath : " + destinationPath);
944	1264	return;
945	1265	}
946	1266
947		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1267	+ for (int i=group.selection.size(); --i>=0;)
948	1268	{
	1269	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1270	+
	1271	+ // Cannot move into itself
	1272	+ if (child == destinationLeaf)
	1273	+ return;
	1274	+ }
	1275	+
	1276	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1277	+// {
949	1278	loadClipboard(true);
950	1279	objEditor.jTree.setSelectionPath(destinationPath);
951		- pasteInto(false);
952		- } else {
953		- loadClipboard(false);
954		- objEditor.jTree.setSelectionPath(destinationPath);
955		- pasteInto(false); // true); // ???
956		- }
	1280	+ pasteInto(false, false);
	1281	+// } else {
	1282	+// loadClipboard(false);
	1283	+// objEditor.jTree.setSelectionPath(destinationPath);
	1284	+// pasteInto(false, false); // true); // ???
	1285	+// }
957	1286	}
958	1287	public void dropActionChanged(DropTargetDragEvent dtde)
959	1288	// Called if the user has modified the current drop gesture
..	..	@@ -1058,85 +1387,104 @@
1058	1387	{
1059	1388	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1060	1389	//heightFieldItem.addActionListener(this);
1061		- gridItem = menu.add(new MenuItem("Grid"));
1062		- gridItem.addActionListener(this);
1063		- rectoidItem = menu.add(new MenuItem("Box"));
1064		- rectoidItem.addActionListener(this);
1065		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1066		- ellipsoidItem.addActionListener(this);
1067		- coneItem = menu.add(new MenuItem("Cone"));
1068		- coneItem.addActionListener(this);
1069		- torusItem = menu.add(new MenuItem("Torus"));
1070		- torusItem.addActionListener(this);
1071		- superItem = menu.add(new MenuItem("Superellipsoid"));
1072		- superItem.addActionListener(this);
	1390	+// gridItem = menu.add(new MenuItem("Grid"));
	1391	+// gridItem.addActionListener(this);
	1392	+// rectoidItem = menu.add(new MenuItem("Box"));
	1393	+// rectoidItem.addActionListener(this);
	1394	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1395	+// ellipsoidItem.addActionListener(this);
	1396	+// coneItem = menu.add(new MenuItem("Cone"));
	1397	+// coneItem.addActionListener(this);
	1398	+// torusItem = menu.add(new MenuItem("Torus"));
	1399	+// torusItem.addActionListener(this);
	1400	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1401	+// superItem.addActionListener(this);
	1402	+
	1403	+ cameraItem = menu.add(new MenuItem("Camera"));
	1404	+ cameraItem.addActionListener(this);
	1405	+
	1406	+ if (!Globals.ADVANCED)
	1407	+ {
1073	1408	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1074	1409	kleinItem.addActionListener(this);
1075		- particleItem = menu.add(new MenuItem("Particle system"));
1076		- particleItem.addActionListener(this);
	1410	+ }
	1411	+
	1412	+// particleItem = menu.add(new MenuItem("Particle system"));
	1413	+// particleItem.addActionListener(this);
	1414	+ if (Globals.ADVANCED)
	1415	+ {
1077	1416	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1078	1417	ragdollItem.addActionListener(this);
1079	1418	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1080	1419	ragdoll2Item.addActionListener(this);
	1420	+ }
1081	1421	menu.add("-");
1082		- meshItem = menu.add(new MenuItem("Mesh"));
	1422	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1083	1423	meshItem.addActionListener(this);
1084	1424	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1085	1425	// meshGroupItem.addActionListener(this);
	1426	+ if (Globals.ADVANCED)
	1427	+ {
1086	1428	springItem = menu.add(new MenuItem("Spring"));
1087	1429	springItem.addActionListener(this);
1088	1430	flagItem = menu.add(new MenuItem("Flag"));
1089	1431	flagItem.addActionListener(this);
1090		- bezierItem = menu.add(new MenuItem("Patch"));
1091		- bezierItem.addActionListener(this);
1092		- checkerItem = menu.add(new MenuItem("Checker"));
1093		- checkerItem.addActionListener(this);
1094	1432	blobItem = menu.add(new MenuItem("Blob"));
1095	1433	blobItem.addActionListener(this);
1096	1434	latheItem = menu.add(new MenuItem("Lathe"));
1097	1435	latheItem.addActionListener(this);
1098		- lightItem = menu.add(new MenuItem("Light"));
1099		- lightItem.addActionListener(this);
	1436	+ }
	1437	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1438	+ bezierItem.addActionListener(this);
	1439	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1440	+// overlayItem.addActionListener(this);
	1441	+// lightItem = menu.add(new MenuItem("Light"));
	1442	+// lightItem.addActionListener(this);
1100	1443	menu.add("-");
1101	1444	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1102	1445	//superLoopItem.addActionListener(this);
1103		- loopItem = menu.add(new MenuItem("Loop"));
1104		- loopItem.addActionListener(this);
	1446	+// loopItem = menu.add(new MenuItem("Loop"));
	1447	+// loopItem.addActionListener(this);
1105	1448	doubleItem = menu.add(new MenuItem("Fork"));
1106	1449	doubleItem.addActionListener(this);
	1450	+ if (Globals.ADVANCED)
	1451	+ {
1107	1452	tripleItem = menu.add(new MenuItem("Trident"));
1108	1453	tripleItem.addActionListener(this);
	1454	+ }
1109	1455	}
1110	1456
1111	1457	void buildToolsMenu(Menu menu)
1112	1458	{
1113	1459	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1114	1460	animationItem.addItemListener(this);
1115		- animationItem.setState(CameraPane.ANIMATION);
	1461	+ animationItem.setState(Globals.ANIMATION);
1116	1462
1117	1463	menu.add("-");
1118	1464	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1119	1465	parseverticesItem.addActionListener(this);
1120	1466	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1121	1467	textureFieldItem.addActionListener(this);
1122		- alignItem = menu.add(new MenuItem("Align"));
	1468	+ alignItem = menu.add(new MenuItem("Align Objects"));
1123	1469	alignItem.addActionListener(this);
1124		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1125		- mirrorItem.addActionListener(this);
1126	1470	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1127	1471	reduceMorphItem.addActionListener(this);
1128	1472	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1129	1473	reduce34MorphItem.addActionListener(this);
1130		-
	1474	+ menu.add("-");
1131	1475	menu.add(computeAOItem = new MenuItem("Compute AO"));
1132	1476	computeAOItem.addActionListener(this);
1133		- menu.add("-");
1134	1477
	1478	+ if (Globals.ADVANCED)
	1479	+ {
	1480	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1481	+ mirrorItem.addActionListener(this);
	1482	+ menu.add("-");
1135	1483	menu.add(memoryItem = new MenuItem("Memory Usage"));
1136	1484	memoryItem.addActionListener(this);
1137	1485	menu.add(analyzeItem = new MenuItem("Analyze"));
1138	1486	analyzeItem.addActionListener(this);
1139		- menu.add(dumpItem = new MenuItem("Dump"));
	1487	+ menu.add(dumpItem = new MenuItem("Print"));
1140	1488	dumpItem.addActionListener(this);
1141	1489	// menu.add(pathItem = new MenuItem("From-to path"));
1142	1490	// pathItem.addActionListener(this);
..	..	@@ -1154,6 +1502,7 @@
1154	1502	menu.add("-");
1155	1503	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1156	1504	editScriptItem.addActionListener(this);
	1505	+ }
1157	1506	}
1158	1507
1159	1508	void ScreenFit()
..	..	@@ -1276,9 +1625,24 @@
1276	1625	shadow.material = new cMaterial(obj.material);
1277	1626	shadow.material.diffuse = 0.0001f;
1278	1627	shadow.material.specular = 0.0001f;
	1628	+ //shadow.projectedVertices[1].x = 300;
1279	1629
1280	1630	makeSomething(shadow);
1281	1631	}
	1632	+
	1633	+ private void ClearUnpinned()
	1634	+ {
	1635	+ //for (Object3D obj : listUI)
	1636	+ for (int i=listUI.size(); --i>=0;)
	1637	+ {
	1638	+ Object3D obj = listUI.elementAt(i);
	1639	+ if (!obj.pinned)
	1640	+ {
	1641	+ obj.CloseUI();
	1642	+ listUI.remove(i);
	1643	+ }
	1644	+ }
	1645	+ }
1282	1646
1283	1647	/**
1284	1648	* applyExample
..	..	@@ -1482,9 +1846,9 @@
1482	1846
1483	1847	void Overwrite(int mask)
1484	1848	{
1485		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1849	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1486	1850	{
1487		- Object3D content = GrafreeD.clipboard.get(0);
	1851	+ Object3D content = Grafreed.clipboard.get(0);
1488	1852
1489	1853	if (content instanceof cGroup && ((cGroup)content).transientlink )
1490	1854	content = ((cGroup)content).get(0);
..	..	@@ -1523,7 +1887,7 @@
1523	1887	{
1524	1888	ScreenFit();
1525	1889	} else
1526		- if (source == switchItem)
	1890	+ if (source == switchViewItem)
1527	1891	{
1528	1892	cVector v1 = new cVector();
1529	1893	cVector v2 = new cVector();
..	..	@@ -1532,11 +1896,11 @@
1532	1896	objEditor.cameraView.renderCamera.setAim(v2, v1);
1533	1897	objEditor.cameraView.repaint();
1534	1898	} else
1535		- if (source == rectoidItem)
	1899	+ if (source == rectoidItem \|\| source == boxButton)
1536	1900	{
1537	1901	makeSomething(new Box());
1538	1902	} else
1539		- if (source == particleItem)
	1903	+ if (source == particleItem \|\| source == particlesButton)
1540	1904	{
1541	1905	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1542	1906	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1615,27 +1979,27 @@
1615	1979
1616	1980	makeSomething(obj);
1617	1981	} else
1618		- if (source == gridItem)
	1982	+ if (source == gridItem \|\| source == gridButton)
1619	1983	{
1620	1984	makeSomething(new Grid());
1621	1985	} else
1622		- if (source == ellipsoidItem)
	1986	+ if (source == ellipsoidItem \|\| source == sphereButton)
1623	1987	{
1624	1988	makeSomething(new Sphere());
1625	1989	} else
1626		- if (source == coneItem)
	1990	+ if (source == coneItem \|\| source == coneButton)
1627	1991	{
1628	1992	makeSomething(new Cone());
1629	1993	} else
1630		- if (source == torusItem)
	1994	+ if (source == torusItem \|\| source == torusButton)
1631	1995	{
1632	1996	makeSomething(new Torus());
1633	1997	} else
1634		- if (source == superItem)
	1998	+ if (source == superItem \|\| source == superButton)
1635	1999	{
1636	2000	makeSomething(new Superellipsoid());
1637	2001	} else
1638		- if (source == kleinItem)
	2002	+ if (source == kleinItem \|\| source == kleinButton)
1639	2003	{
1640	2004	makeSomething(new Klein());
1641	2005	} else
..	..	@@ -1655,7 +2019,7 @@
1655	2019	{
1656	2020	makeSomething(new BezierSurface());
1657	2021	} else
1658		- if (source == checkerItem)
	2022	+ if (source == overlayItem \|\| source == overlayButton)
1659	2023	{
1660	2024	/*
1661	2025	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1703,7 +2067,7 @@
1703	2067	s.setup();
1704	2068	makeSomething(s);
1705	2069	} else
1706		- if (source == lightItem)
	2070	+ if (source == lightItem \|\| source == lightButton)
1707	2071	{
1708	2072	makeSomething(new Light());
1709	2073	} else
..	..	@@ -1753,7 +2117,7 @@
1753	2117
1754	2118	group(g);
1755	2119	} else
1756		- if (source == loopItem)
	2120	+ if (source == loopItem \|\| source == loopButton)
1757	2121	{
1758	2122	Composite csg = new GroupLeaf();
1759	2123	csg.count = 5;
..	..	@@ -1789,23 +2153,6 @@
1789	2153	csg.addChild(child);
1790	2154	child.addChild(csg);
1791	2155	} else
1792		-
1793		- if (source == importGFDItem)
1794		- {
1795		- ImportGFD();
1796		- } else
1797		- if (source == importVRMLX3DItem)
1798		- {
1799		- ImportVRMLX3D();
1800		- } else
1801		- if (source == import3DSItem)
1802		- {
1803		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1804		- } else
1805		- if (source == importOBJItem)
1806		- {
1807		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1808		- } else
1809	2156	if (source == computeAOItem)
1810	2157	{
1811	2158	Globals.drawMode = CameraPane.OCCLUSION;
..	..	@@ -1824,7 +2171,7 @@
1824	2171	if (source == invariantsItem)
1825	2172	{
1826	2173	System.out.println("Invariants:");
1827		- GrafreeD.grafreeD.universe.invariants();
	2174	+ Grafreed.grafreeD.universe.invariants();
1828	2175	} else
1829	2176	if (source == memoryItem)
1830	2177	{
..	..	@@ -1842,6 +2189,35 @@
1842	2189	if (source == dumpItem)
1843	2190	{
1844	2191	DumpObject();
	2192	+ } else
	2193	+ if (source == minButton)
	2194	+ {
	2195	+ Minimize();
	2196	+ } else
	2197	+ if (source == maxButton)
	2198	+ {
	2199	+ Maximize();
	2200	+ } else
	2201	+ if (source == fullButton)
	2202	+ {
	2203	+ ToggleFullScreen();
	2204	+ } else
	2205	+ if (source == undoButton)
	2206	+ {
	2207	+ Undo();
	2208	+ } else
	2209	+ if (source == redoButton)
	2210	+ {
	2211	+ Redo();
	2212	+ } else
	2213	+ if (source == saveButton)
	2214	+ {
	2215	+ Save();
	2216	+ } else
	2217	+ if (source == oneStepButton)
	2218	+ {
	2219	+ Globals.ONESTEP = true;
	2220	+ cameraView.repaint();
1845	2221	} else
1846	2222	if (source == screenfitButton)
1847	2223	{
..	..	@@ -1892,12 +2268,20 @@
1892	2268	{
1893	2269	loadClipboard(true);
1894	2270	} else
	2271	+ if (source == undoItem)
	2272	+ {
	2273	+ Undo();
	2274	+ } else
	2275	+ if (source == redoItem)
	2276	+ {
	2277	+ Redo();
	2278	+ } else
1895	2279	if (source == duplicateItem)
1896	2280	{
1897		- Object3D keep = GrafreeD.clipboard;
	2281	+ Object3D keep = Grafreed.clipboard;
1898	2282	loadClipboard(false);
1899	2283	paste(false);
1900		- GrafreeD.clipboard = keep;
	2284	+ Grafreed.clipboard = keep;
1901	2285	} else
1902	2286	if (source == cloneItem)
1903	2287	{
..	..	@@ -1915,13 +2299,17 @@
1915	2299	{
1916	2300	paste(false);
1917	2301	} else
	2302	+ if (source == pasteIntoItem)
	2303	+ {
	2304	+ pasteInto(true, false);
	2305	+ } else
1918	2306	if (source == pasteLinkItem)
1919	2307	{
1920		- pasteInto(false);
	2308	+ pasteInto(false, false);
1921	2309	} else
1922	2310	if (source == pasteCloneItem)
1923	2311	{
1924		- pasteInto(true);
	2312	+ pasteInto(true, true);
1925	2313	} else
1926	2314	if (source == pasteExpandItem)
1927	2315	{
..	..	@@ -2113,9 +2501,9 @@
2113	2501	// group.selection.get(0).setMasterThis(content); // should be identity
2114	2502	// refreshContents();
2115	2503	// }
2116		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2504	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2117	2505	{
2118		- Object3D content = GrafreeD.clipboard.get(0);
	2506	+ Object3D content = Grafreed.clipboard.get(0);
2119	2507
2120	2508	if (content instanceof cGroup && ((cGroup)content).transientlink )
2121	2509	content = ((cGroup)content).get(0);
..	..	@@ -2123,11 +2511,11 @@
2123	2511	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2124	2512	for (int i=0; i<group.selection.size(); i++)
2125	2513	{
2126		- boolean random = CameraPane.RANDOM;
2127		- CameraPane.RANDOM = false; // parse all random nodes
	2514	+ boolean random = CameraPane.SWITCH;
	2515	+ CameraPane.SWITCH = false; // parse all random nodes
2128	2516	group.selection.get(i).linkVerticesThis(content);
2129	2517	// group.selection.get(i).setMasterThis(content); // should be identity
2130		- CameraPane.RANDOM = random;
	2518	+ CameraPane.SWITCH = random;
2131	2519	}
2132	2520	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2133	2521	refreshContents();
..	..	@@ -2137,20 +2525,20 @@
2137	2525	{
2138	2526	for (int i=0; i<group.selection.size(); i++)
2139	2527	{
2140		- boolean random = CameraPane.RANDOM;
2141		- CameraPane.RANDOM = false; // parse all random nodes
	2528	+ boolean random = CameraPane.SWITCH;
	2529	+ CameraPane.SWITCH = false; // parse all random nodes
2142	2530	group.selection.get(i).linkVerticesThis(null);
2143		- CameraPane.RANDOM = random;
	2531	+ CameraPane.SWITCH = random;
2144	2532	}
2145	2533
2146	2534	refreshContents();
2147	2535	} else
2148	2536	if (source == relinkverticesItem)
2149	2537	{
2150		- boolean random = CameraPane.RANDOM;
2151		- CameraPane.RANDOM = false; // parse all random nodes
	2538	+ boolean random = CameraPane.SWITCH;
	2539	+ CameraPane.SWITCH = false; // parse all random nodes
2152	2540	group.selection.RelinkToSupport();
2153		- CameraPane.RANDOM = random;
	2541	+ CameraPane.SWITCH = random;
2154	2542
2155	2543	refreshContents();
2156	2544	} else
..	..	@@ -2165,9 +2553,9 @@
2165	2553	} else
2166	2554	if (source == setMasterItem)
2167	2555	{
2168		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2556	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2169	2557	{
2170		- Object3D content = GrafreeD.clipboard.get(0);
	2558	+ Object3D content = Grafreed.clipboard.get(0);
2171	2559
2172	2560	if (content instanceof cGroup && ((cGroup)content).transientlink )
2173	2561	content = ((cGroup)content).get(0);
..	..	@@ -2180,9 +2568,9 @@
2180	2568	{
2181	2569	if (group.selection.size() == 1)
2182	2570	{
2183		- if (GrafreeD.clipboard.size() == 1)
	2571	+ if (Grafreed.clipboard.size() == 1)
2184	2572	{
2185		- Object3D content = GrafreeD.clipboard.get(0);
	2573	+ Object3D content = Grafreed.clipboard.get(0);
2186	2574
2187	2575	if (content instanceof cGroup && ((cGroup)content).transientlink )
2188	2576	content = ((cGroup)content).get(0);
..	..	@@ -2199,7 +2587,7 @@
2199	2587	{
2200	2588	RevertMeshes();
2201	2589	} else
2202		- if (source == resetMeshItem)
	2590	+ if (source == resetAllItem)
2203	2591	{
2204	2592	ResetAll();
2205	2593	} else
..	..	@@ -2219,9 +2607,9 @@
2219	2607	{
2220	2608	ClearSelection(true);
2221	2609	} else
2222		- if (source == grabItem)
	2610	+ if (source == grabItem \|\| source == groupButton)
2223	2611	{
2224		- group(new cGroup(), true);
	2612	+ group(new cGroup(), false); // true);
2225	2613	} else
2226	2614	if (source == hideItem)
2227	2615	{
..	..	@@ -2239,16 +2627,16 @@
2239	2627	{
2240	2628	makeSomething(new Camera());
2241	2629	} else
2242		- if (source == compositeItem)
	2630	+ if (source == compositeItem \|\| source == compositeButton)
2243	2631	{
2244	2632	group(new Composite());
2245	2633	} else
2246		- if (source == randomItem)
	2634	+ if (source == switchItem \|\| source == switchButton)
2247	2635	{
2248	2636	RandomNode random = new RandomNode();
2249	2637	group(random);
2250	2638	if (random.size() > 0)
2251		- random.name = random.get(0).name + "Rnd";
	2639	+ random.name = random.get(0).name + "Switch";
2252	2640	} else
2253	2641	if (source == physicsItem)
2254	2642	{
..	..	@@ -2345,7 +2733,7 @@
2345	2733	{
2346	2734	group(new cLinker());
2347	2735	} else
2348		- if (source == textureItem)
	2736	+ if (source == textureItem \|\| source == textureButton)
2349	2737	{
2350	2738	group(new TextureNode());
2351	2739	} else
..	..	@@ -2365,7 +2753,7 @@
2365	2753	{
2366	2754	CastShadow(2);
2367	2755	} else
2368		- if (source == ungroupItem)
	2756	+ if (source == ungroupItem \|\| source == ungroupButton)
2369	2757	{
2370	2758	//ungroup();
2371	2759	for (int i=0; i<group.selection.size(); i++)
..	..	@@ -2387,7 +2775,7 @@
2387	2775	} else
2388	2776	if (source == genNormalsMESHItem)
2389	2777	{
2390		- GenNormals(true); // TODO
	2778	+ GenNormalsMESH();
2391	2779	} else
2392	2780	if (source == genNormalsORGANItem)
2393	2781	{
..	..	@@ -2452,6 +2840,22 @@
2452	2840	if (source == unmarkleavesItem)
2453	2841	{
2454	2842	MarkLeaves(false);
	2843	+ } else
	2844	+ if (source == rewindleavesItem)
	2845	+ {
	2846	+ RewindLeaves(true);
	2847	+ } else
	2848	+ if (source == unrewindleavesItem)
	2849	+ {
	2850	+ RewindLeaves(false);
	2851	+ } else
	2852	+ if (source == randomleavesItem)
	2853	+ {
	2854	+ RandomLeaves(true);
	2855	+ } else
	2856	+ if (source == unrandomleavesItem)
	2857	+ {
	2858	+ RandomLeaves(false);
2455	2859	} else
2456	2860	if (source == flipVItem)
2457	2861	{
..	..	@@ -2537,9 +2941,13 @@
2537	2941	{
2538	2942	SmoothMesh();
2539	2943	} else
2540		- if (source == transformgeometryItem)
	2944	+ if (source == transformGeometryItem)
2541	2945	{
2542	2946	TransformGeometry();
	2947	+ } else
	2948	+ if (source == transformChildrenItem)
	2949	+ {
	2950	+ TransformChildren();
2543	2951	} else
2544	2952	if (source == resetTransformItem)
2545	2953	{
..	..	@@ -2547,7 +2955,11 @@
2547	2955	} else
2548	2956	if (source == resetCentroidItem)
2549	2957	{
2550		- ResetCentroid();
	2958	+ ResetCentroid(true);
	2959	+ } else
	2960	+ if (source == resetCentroidXZItem)
	2961	+ {
	2962	+ ResetCentroid(false);
2551	2963	} else
2552	2964	if (source == resetParentItem)
2553	2965	{
..	..	@@ -2679,6 +3091,10 @@
2679	3091	if (source == twoButton)
2680	3092	{
2681	3093	radio.layout = twoButton;
	3094	+
	3095	+ if (CameraPane.FULLSCREEN)
	3096	+ fullscreenLayout = radio.layout;
	3097	+
2682	3098	// bug
2683	3099	//gridPanel.setDividerLocation(1.0);
2684	3100	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2711,10 +3127,31 @@
2711	3127	bigThree.ClearUI();
2712	3128	bigThree.add(centralPanel);
2713	3129	bigThree.FlushUI();
	3130	+
	3131	+ cameraView.requestFocusInWindow();
	3132	+
	3133	+// refreshContents(true);
	3134	+//
	3135	+// try
	3136	+// {
	3137	+// java.awt.Robot bot = new java.awt.Robot();
	3138	+// int mask = InputEvent.BUTTON1_MASK;
	3139	+// bot.mouseMove(100, 100);
	3140	+// bot.mousePress(mask);
	3141	+// bot.mouseRelease(mask);
	3142	+// }
	3143	+// catch (Exception e)
	3144	+// {
	3145	+//
	3146	+// }
	3147	+
2714	3148	} else
2715	3149	if (source == threeButton)
2716	3150	{
2717	3151	radio.layout = threeButton;
	3152	+
	3153	+ if (CameraPane.FULLSCREEN)
	3154	+ fullscreenLayout = radio.layout;
2718	3155
2719	3156	// bigThree.remove(scenePanel);
2720	3157	// bigThree.remove(centralPanel);
..	..	@@ -2747,10 +3184,15 @@
2747	3184	bigThree.add(centralPanel);
2748	3185	bigThree.add(XYZPanel);
2749	3186	bigThree.FlushUI();
	3187	+
	3188	+ cameraView.requestFocusInWindow();
2750	3189	} else
2751	3190	if (source == fourButton)
2752	3191	{
2753	3192	radio.layout = fourButton;
	3193	+
	3194	+ if (CameraPane.FULLSCREEN)
	3195	+ fullscreenLayout = radio.layout;
2754	3196
2755	3197	// bigThree.remove(scenePanel);
2756	3198	// bigThree.remove(centralPanel);
..	..	@@ -2782,10 +3224,15 @@
2782	3224	bigThree.ClearUI();
2783	3225	bigThree.add(scenePanel);
2784	3226	bigThree.FlushUI();
	3227	+
	3228	+ cameraView.requestFocusInWindow();
2785	3229	} else
2786	3230	if (source == sixButton)
2787	3231	{
2788	3232	radio.layout = sixButton;
	3233	+
	3234	+ if (CameraPane.FULLSCREEN)
	3235	+ fullscreenLayout = radio.layout;
2789	3236
2790	3237	// bigThree.remove(scenePanel);
2791	3238	// bigThree.remove(centralPanel);
..	..	@@ -2818,10 +3265,15 @@
2818	3265	bigThree.add(scenePanel);
2819	3266	bigThree.add(centralPanel);
2820	3267	bigThree.FlushUI();
	3268	+
	3269	+ cameraView.requestFocusInWindow();
2821	3270	} else
2822	3271	if (source == sevenButton)
2823	3272	{
2824	3273	radio.layout = sevenButton;
	3274	+
	3275	+ if (CameraPane.FULLSCREEN)
	3276	+ fullscreenLayout = radio.layout;
2825	3277
2826	3278	// bigThree.remove(scenePanel);
2827	3279	// bigThree.remove(centralPanel);
..	..	@@ -2855,6 +3307,8 @@
2855	3307	bigThree.add(centralPanel);
2856	3308	bigThree.add(XYZPanel);
2857	3309	bigThree.FlushUI();
	3310	+
	3311	+ cameraView.requestFocusInWindow();
2858	3312	} else
2859	3313	if (source == rootButton)
2860	3314	{
..	..	@@ -2866,6 +3320,7 @@
2866	3320	EditObject(obj);
2867	3321	}
2868	3322
	3323	+ cameraView.requestFocusInWindow();
2869	3324	refreshContents(true);
2870	3325	} else
2871	3326	if (source == closeButton)
..	..	@@ -2875,22 +3330,37 @@
2875	3330	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2876	3331	{
2877	3332	ab = (cRadio)e.nextElement();
2878		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3333	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2879	3334	{
	3335	+ // Patch to avoid bug with transparency.
	3336	+ if (!ab.hadMaterial)
	3337	+ {
	3338	+ ab.object.material = null;
	3339	+ }
	3340	+
2880	3341	buttonGroup.remove(ab);
2881	3342	radioPanel.remove(ab);
2882	3343
2883		- ab.GetObject().editWindow = null;
	3344	+ //ab.GetObject().editWindow = null;
	3345	+ ab.GetObject().manipWindow = null;
2884	3346	// ab.GetObject().objectUI = null; // ?????????
2885	3347
2886	3348	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2887	3349	break;
2888	3350	}
2889	3351	}
	3352	+
	3353	+ cameraView.requestFocusInWindow();
2890	3354	refreshContents(true);
2891	3355	} else
2892	3356	if (source == editItem \|\| source == editButton)
2893	3357	{
	3358	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3359	+ {
	3360	+ Object3D child = (Object3D)e.nextElement();
	3361	+ child.pinned = true;
	3362	+ }
	3363	+
2894	3364	EditSelection(false);
2895	3365	} else
2896	3366	if (source == uneditButton)
..	..	@@ -2900,12 +3370,13 @@
2900	3370	Object3D child = (Object3D)e.nextElement();
2901	3371	if(child.editWindow != null)
2902	3372	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3373	+ child.pinned = false;
2903	3374	child.CloseUI();
2904	3375	listUI.remove(child);
2905	3376
2906		- child.editWindow = null; // ???????????
	3377	+ //child.editWindow = null; // ???????????
2907	3378	}
2908		- objEditor.ctrlPanel.validate();
	3379	+ objEditor.ctrlPanel.FlushUI();
2909	3380	//objEditor.jTree.clearSelection();
2910	3381	//objEditor.ResetSliders();
2911	3382	refreshContents(true);
..	..	@@ -2916,6 +3387,7 @@
2916	3387	//copy.ClearUI();
2917	3388	for (Object3D obj : listUI)
2918	3389	{
	3390	+ obj.pinned = false;
2919	3391	obj.CloseUI();
2920	3392	}
2921	3393	listUI.clear();
..	..	@@ -2925,7 +3397,7 @@
2925	3397	{
2926	3398	assert(copy == group);
2927	3399
2928		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3400	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2929	3401
2930	3402	for (Object3D obj : listUI)
2931	3403	{
..	..	@@ -2989,20 +3461,44 @@
2989	3461	frontView.object = group;
2990	3462	sideView.object = group;
2991	3463	}
2992		- group.editWindow = this;
	3464	+
	3465	+// fix "+" issue
	3466	+ //group.editWindow = this;
	3467	+ group.manipWindow = this;
	3468	+
2993	3469	/*
2994	3470	currentLayout = radio.layout;
2995	3471	if (currentLayout == null)
2996	3472	currentLayout = sevenButton;
2997	3473	*/
2998	3474	radio.layout.doClick();
	3475	+
	3476	+ ClearUnpinned();
	3477	+ SetPinStates(group.selection.size() > 0);
	3478	+ if (group.selection.size() == 1)
	3479	+ EditSelection(false);
2999	3480	keepparent = group.parent;
3000	3481	// PARENT = NULL or not???
3001	3482	//group.parent = null; // ROOT
3002	3483	//group.attributes = -1;
3003	3484	ResetModel();
	3485	+
	3486	+ cameraView.requestFocusInWindow();
3004	3487	refreshContents(true);
3005		- }
	3488	+ } else if (event.getSource() == editCameraItem)
	3489	+ {
	3490	+ cameraView.ProtectCamera();
	3491	+ cameraView.repaint();
	3492	+ return;
	3493	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3494	+ {
	3495	+ cameraView.RevertCamera();
	3496	+ cameraView.repaint();
	3497	+ return;
	3498	+ // } else if (event.getSource() == textureButton)
	3499	+ // {
	3500	+ // return; // true;
	3501	+ }
3006	3502	else
3007	3503	{
3008	3504	//return super.action(event, arg);
..	..	@@ -3011,7 +3507,6 @@
3011	3507	}
3012	3508
3013	3509	boolean useclient = false;
3014		- cRadio radio;
3015	3510
3016	3511	void ToggleRoot()
3017	3512	{
..	..	@@ -3063,6 +3558,28 @@
3063	3558	refreshContents();
3064	3559	}
3065	3560
	3561	+ void TransformChildren()
	3562	+ {
	3563	+ Object3D obj;
	3564	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3565	+ {
	3566	+ obj = (Object3D)e.nextElement();
	3567	+ obj.KeepTextureMatrices();
	3568	+ obj.TransformChildren();
	3569	+ obj.RestoreTextureMatrices();
	3570	+
	3571	+// if (obj.parent == null)
	3572	+// {
	3573	+// System.out.println("NULL PARENT!");
	3574	+// new Exception().printStackTrace();
	3575	+// }
	3576	+// else
	3577	+// TouchTransform(obj);
	3578	+// //obj.parent.Touch();
	3579	+ }
	3580	+
	3581	+ refreshContents();
	3582	+ }
3066	3583
3067	3584	void ResetTransform()
3068	3585	{
..	..	@@ -3175,7 +3692,7 @@
3175	3692	refreshContents();
3176	3693	}
3177	3694
3178		- void ResetCentroid()
	3695	+ void ResetCentroid(boolean full)
3179	3696	{
3180	3697	Object3D obj;
3181	3698	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3190,12 +3707,16 @@
3190	3707	LA.matIdentity(Object3D.mat);
3191	3708	obj.getBounds(minima, maxima, false);
3192	3709	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3193		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3710	+ if (full)
	3711	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3194	3712	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3195	3713	obj.TransformMesh(Object3D.mat);
	3714	+
3196	3715	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3197		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3716	+ if (full)
	3717	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3198	3718	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3719	+
3199	3720	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3200	3721	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3201	3722	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3224,7 +3745,8 @@
3224	3745
3225	3746	int size = obj.MemorySize();
3226	3747
3227		- System.err.println((size/1024) + " KB is the size of " + obj);
	3748	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3749	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3228	3750	}
3229	3751	}
3230	3752	catch (Exception e)
..	..	@@ -3261,9 +3783,9 @@
3261	3783	obj = (Object3D)e.nextElement();
3262	3784
3263	3785	System.out.println("Object is: " + obj);
3264		- GrafreeD.AnalyzeObject(obj);
	3786	+ Grafreed.AnalyzeObject(obj);
3265	3787	System.out.println("Boundary rep: " + obj.bRep);
3266		- GrafreeD.AnalyzeObject(obj.bRep);
	3788	+ Grafreed.AnalyzeObject(obj.bRep);
3267	3789
3268	3790	// System.err.println((size/1024) + " KB is the size of " + obj);
3269	3791	}
..	..	@@ -3305,6 +3827,13 @@
3305	3827	void GenNormals(boolean crease)
3306	3828	{
3307	3829	group.GenNormalsS(crease);
	3830	+
	3831	+ refreshContents();
	3832	+ }
	3833	+
	3834	+ void GenNormalsMESH()
	3835	+ {
	3836	+ group.GenNormalsMeshS();
3308	3837
3309	3838	refreshContents();
3310	3839	}
..	..	@@ -3477,8 +4006,8 @@
3477	4006
3478	4007	void ParseVertices()
3479	4008	{
3480		- boolean epsequal = GrafreeD.epsequal;
3481		- GrafreeD.epsequal = true;
	4009	+ boolean epsequal = Grafreed.epsequal;
	4010	+ Grafreed.epsequal = true;
3482	4011
3483	4012	for (int i=0; i<group.selection.size(); i++)
3484	4013	{
..	..	@@ -3503,7 +4032,7 @@
3503	4032	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3504	4033	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3505	4034
3506		- g.add(GrafreeD.clipboard);
	4035	+ g.add(Grafreed.clipboard);
3507	4036
3508	4037	buffer.add(g);
3509	4038	}
..	..	@@ -3518,7 +4047,7 @@
3518	4047	makeSomething(buffer, i==group.selection.size()-1);
3519	4048	}
3520	4049
3521		- GrafreeD.epsequal = epsequal;
	4050	+ Grafreed.epsequal = epsequal;
3522	4051
3523	4052	refreshContents();
3524	4053	}
..	..	@@ -3536,7 +4065,16 @@
3536	4065	String pigment = Object3D.GetPigment(tex);
3537	4066	//String bump = Object3D.GetBump(tex);
3538	4067
3539		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4068	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4069	+
	4070	+ try
	4071	+ {
	4072	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4073	+ }
	4074	+ catch (Exception e)
	4075	+ {
	4076	+ System.err.println("FAIL: " + node);
	4077	+ }
3540	4078
3541	4079	double s = v.s;
3542	4080
..	..	@@ -3624,11 +4162,11 @@
3624	4162
3625	4163	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3626	4164
3627		- boolean random = CameraPane.RANDOM;
3628		- CameraPane.RANDOM = false; // parse all random nodes
	4165	+ boolean random = CameraPane.SWITCH;
	4166	+ CameraPane.SWITCH = false; // parse all random nodes
3629	4167	lowres.linkVerticesThis(null);
3630	4168	lowres.linkVerticesThis(sn);
3631		- CameraPane.RANDOM = random;
	4169	+ CameraPane.SWITCH = random;
3632	4170
3633	4171	System.err.flush();
3634	4172
..	..	@@ -3668,7 +4206,7 @@
3668	4206	return;
3669	4207
3670	4208	Object3D poses = group.selection.get(0);
3671		- Object3D ref = GrafreeD.clipboard.get(0);
	4209	+ Object3D ref = Grafreed.clipboard.get(0);
3672	4210
3673	4211	Object3D newgroup = new Object3D("Po:" + poses.name);
3674	4212
..	..	@@ -3862,9 +4400,9 @@
3862	4400
3863	4401	void ClipMesh()
3864	4402	{
3865		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4403	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3866	4404	{
3867		- Object3D content = GrafreeD.clipboard.get(0);
	4405	+ Object3D content = Grafreed.clipboard.get(0);
3868	4406
3869	4407	if (content instanceof cGroup && ((cGroup)content).transientlink )
3870	4408	content = ((cGroup)content).get(0);
..	..	@@ -3873,7 +4411,7 @@
3873	4411	// {
3874	4412	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3875	4413	// }
3876		- group.selection.ClipMesh(GrafreeD.clipboard);
	4414	+ group.selection.ClipMesh(Grafreed.clipboard);
3877	4415	}
3878	4416	// group.selection.ClipMesh(GrafreeD.clipboard);
3879	4417	System.out.println("DONE.");
..	..	@@ -3920,6 +4458,18 @@
3920	4458	void MarkLeaves(boolean hide)
3921	4459	{
3922	4460	group.selection.MarkLeaves(hide);
	4461	+ refreshContents();
	4462	+ }
	4463	+
	4464	+ void RewindLeaves(boolean hide)
	4465	+ {
	4466	+ group.selection.RewindLeaves(hide);
	4467	+ refreshContents();
	4468	+ }
	4469	+
	4470	+ void RandomLeaves(boolean hide)
	4471	+ {
	4472	+ group.selection.RandomLeaves(hide);
3923	4473	refreshContents();
3924	4474	}
3925	4475
..	..	@@ -3994,10 +4544,6 @@
3994	4544	// }
3995	4545	// }
3996	4546
3997		- static boolean allparams = true;
3998		-
3999		- static Vector<Object3D> listUI = new Vector<Object3D>();
4000		-
4001	4547	void EditSelection(boolean newWindow)
4002	4548	{
4003	4549	// aConstraints.gridy = 0;
..	..	@@ -4005,10 +4551,10 @@
4005	4551	{
4006	4552	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4007	4553	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4008		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4554	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4009	4555
4010	4556	Object3D elem = (Object3D)group.selection.elementAt(i);
4011		- if(elem != group)
	4557	+ if(elem != group \|\| !newWindow)
4012	4558	{
4013	4559	// if (!(elem instanceof Composite))
4014	4560	// newWindow = false;
..	..	@@ -4090,7 +4636,8 @@
4090	4636	//new Exception().printStackTrace();
4091	4637
4092	4638	freezemodel = true;
4093		-
	4639	+ ClearUnpinned();
	4640	+
4094	4641	/**/
4095	4642	//switch (event.id)
4096	4643	{
..	..	@@ -4098,7 +4645,6 @@
4098	4645	//case 702: // Event.LIST_DESELECT
4099	4646	group.deselectAll();
4100	4647	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4101		- objEditor.ClearInfo(); // .GetMaterial());
4102	4648	if (tps != null)
4103	4649	{
4104	4650	for (int i=0; i < tps.length; i++)
..	..	@@ -4107,33 +4653,39 @@
4107	4653
4108	4654	//if (child.parent != null)
4109	4655	//child.parent.addSelectee(child);
	4656	+ objEditor.SetMaterial(child);
4110	4657	group.addSelectee(child);
4111		- objEditor.SetMaterial(child); // .GetMaterial());
4112		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4113		- System.err.println("info : " + child.GetPath());
4114	4658	}
4115	4659	}
4116		- else
4117		- {
4118		- objEditor.SetMaterial(group); // .GetMaterial());
4119		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4120		- System.err.println("info : " + group.GetPath());
4121		- }
	4660	+// else
	4661	+// {
	4662	+// objEditor.SetMaterial(group); // .GetMaterial());
	4663	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4664	+// System.err.println("info : " + group.GetPath());
	4665	+// }
4122	4666
4123		- objEditor.SetText(); // jan 2014
4124		-
4125		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4667	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4126	4668	CameraPane.flash = true;
4127	4669
4128		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4670	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4129	4671	// a camera
4130	4672	{
4131		- CameraPane.camerachangeframe = 0; // don't refuse it
4132		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4673	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	4674	+ {
	4675	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4676	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4677	+ }
4133	4678	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4134	4679	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4135	4680	}
4136	4681
	4682	+ if (tps != null && tps.length == 1)
	4683	+ {
	4684	+ EditSelection(false);
	4685	+ }
	4686	+
	4687	+ SetPinStates(tps != null && tps.length > 0);
	4688	+
4137	4689	refreshContents();
4138	4690	//return true;
4139	4691	}
..	..	@@ -4142,6 +4694,35 @@
4142	4694
4143	4695	freezemodel = false;
4144	4696	}
	4697	+
	4698	+ void SetPinStates(boolean enabled)
	4699	+ {
	4700	+ editButton.setEnabled(enabled);
	4701	+ uneditButton.setEnabled(enabled);
	4702	+ unselectButton.setEnabled(enabled);
	4703	+ flashSelectionButton.setEnabled(enabled);
	4704	+ }
	4705	+
	4706	+ void refreshContents(boolean cp)
	4707	+ {
	4708	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4709	+ if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
	4710	+ {
	4711	+ objEditor.ClearInfo(); // .GetMaterial());
	4712	+
	4713	+ for (int i=0; i < group.selection.Size(); i++)
	4714	+ {
	4715	+ Object3D child = (Object3D) group.selection.get(i);
	4716	+
	4717	+ objEditor.AddInfo(child, this, true);
	4718	+ System.err.println("info : " + child.GetPath());
	4719	+ }
	4720	+
	4721	+ objEditor.SetText(); // jan 2014
	4722	+ }
	4723	+
	4724	+ super.refreshContents(cp);
	4725	+ }
4145	4726
4146	4727	void linkSomething(Object3D thing)
4147	4728	{
..	..	@@ -4213,16 +4794,19 @@
4213	4794	{
4214	4795	if (group.selection.isEmpty())
4215	4796	return;
4216		- GrafreeD.clipboardIsTempGroup = false;
	4797	+
	4798	+ Grafreed.clipboardIsTempGroup = false;
4217	4799	Composite tGroup = null;
4218	4800	if (group.selection.size() > 0) // 1)
4219	4801	{
4220	4802	tGroup = new cGroup();
4221		- GrafreeD.clipboardIsTempGroup = true;
	4803	+ Grafreed.clipboardIsTempGroup = true;
4222	4804	}
4223	4805
4224	4806	if (cut)
4225	4807	{
	4808	+ if (Globals.SAVEONMAKE)
	4809	+ Save();
4226	4810	//int indices[] = jList.getSelectedIndices();
4227	4811	//for (int i = indices.length - 1; i >= 0; i--)
4228	4812	//jList.remove(indices[i]);
..	..	@@ -4258,16 +4842,16 @@
4258	4842	//System.out.println("cut " + child);
4259	4843	//System.out.println("parent = " + child.parent);
4260	4844	// tmp.addChild(child);
4261		- if (GrafreeD.clipboardIsTempGroup)
	4845	+ if (Grafreed.clipboardIsTempGroup)
4262	4846	tGroup.add/Child/(tmp);
4263	4847	else
4264		- GrafreeD.clipboard = tmp;
	4848	+ Grafreed.clipboard = tmp;
4265	4849	}
4266	4850	else
4267		- if (GrafreeD.clipboardIsTempGroup)
	4851	+ if (Grafreed.clipboardIsTempGroup)
4268	4852	tGroup.add/Child/(child);
4269	4853	else
4270		- GrafreeD.clipboard = child;
	4854	+ Grafreed.clipboard = child;
4271	4855	}
4272	4856
4273	4857	//ResetModel();
..	..	@@ -4299,21 +4883,23 @@
4299	4883	//System.out.println("cut " + elem);
4300	4884	//System.out.println("parent = " + elem.parent);
4301	4885	// tmp.addChild(elem);
4302		- if (GrafreeD.clipboardIsTempGroup)
	4886	+ if (Grafreed.clipboardIsTempGroup)
4303	4887	tGroup.add/Child/(tmp);
4304	4888	else
4305		- GrafreeD.clipboard = tmp;
	4889	+ Grafreed.clipboard = tmp;
4306	4890	}
4307	4891	else
4308		- if (GrafreeD.clipboardIsTempGroup)
	4892	+ if (Grafreed.clipboardIsTempGroup)
4309	4893	tGroup.add/Child/(child);
4310	4894	else
4311		- GrafreeD.clipboard = child;
	4895	+ Grafreed.clipboard = child;
4312	4896	}
4313	4897
4314	4898	}
4315		- if (GrafreeD.clipboardIsTempGroup)
4316		- GrafreeD.clipboard = tGroup;
	4899	+
	4900	+ if (Grafreed.clipboardIsTempGroup)
	4901	+ Grafreed.clipboard = tGroup;
	4902	+
4317	4903	if (cut)
4318	4904	{
4319	4905	ResetModel();
..	..	@@ -4327,7 +4913,7 @@
4327	4913	// return;
4328	4914	boolean first = true;
4329	4915
4330		- if (GrafreeD.clipboardIsTempGroup)
	4916	+ if (Grafreed.clipboardIsTempGroup)
4331	4917	{
4332	4918	Composite temp;
4333	4919
..	..	@@ -4338,7 +4924,7 @@
4338	4924	temp = (Composite)Applet3D.clipboard.deepCopy();
4339	4925	*/
4340	4926	Object3D elem;
4341		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4927	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4342	4928	{
4343	4929	Object3D child = (Object3D)e.nextElement();
4344	4930
..	..	@@ -4372,21 +4958,21 @@
4372	4958	//Object3D cb = Applet3D.clipboard;
4373	4959	//temp.addChild(cb);
4374	4960	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4375		- assert(GrafreeD.clipboard.parent == null);
4376		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4377		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4378		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4379		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	4961	+ assert(Grafreed.clipboard.parent == null);
	4962	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4963	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4964	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4965	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4380	4966	else
4381		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4382		- GrafreeD.clipboard.get(0).parent = keepparent;
	4967	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4968	+ Grafreed.clipboard.get(0).parent = keepparent;
4383	4969	}
4384	4970
4385	4971	ResetModel();
4386	4972	refreshContents();
4387	4973	}
4388	4974
4389		- void pasteInto(boolean copyit)
	4975	+ void pasteInto(boolean copyit, boolean clone)
4390	4976	{
4391	4977	// if (GrafreeD.clipboard == null)
4392	4978	// return;
..	..	@@ -4415,15 +5001,22 @@
4415	5001	if (copyit)
4416	5002	{
4417	5003	// paste(false);
4418		- CloneClipboard(false); // sept 2014
	5004	+ if (clone)
	5005	+ {
	5006	+ CloneClipboard(false); // sept 2014
	5007	+ }
	5008	+ else
	5009	+ {
	5010	+ paste(false);
	5011	+ }
4419	5012	}
4420	5013	else
4421	5014	{
4422	5015	boolean first = true;
4423	5016
4424		- if (GrafreeD.clipboardIsTempGroup)
	5017	+ if (Grafreed.clipboardIsTempGroup)
4425	5018	{
4426		- Composite temp = (Composite)GrafreeD.clipboard;
	5019	+ Composite temp = (Composite)Grafreed.clipboard;
4427	5020	Object3D copy;
4428	5021	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4429	5022	{
..	..	@@ -4433,7 +5026,7 @@
4433	5026	}
4434	5027	} else
4435	5028	{
4436		- linkSomething(GrafreeD.clipboard); //.get(0));
	5029	+ linkSomething(Grafreed.clipboard); //.get(0));
4437	5030	}
4438	5031	}
4439	5032	}
..	..	@@ -4838,21 +5431,6 @@
4838	5431	}
4839	5432	*/
4840	5433
4841		- void ImportGFD()
4842		- {
4843		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4844		- browser.show();
4845		- String filename = browser.getFile();
4846		- if (filename != null && filename.length() > 0)
4847		- {
4848		- String fullname = browser.getDirectory() + filename;
4849		-
4850		- //Object3D readobj =
4851		- objEditor.ReadGFD(fullname, objEditor);
4852		- //makeSomething(readobj);
4853		- }
4854		- }
4855		-
4856	5434	/*
4857	5435	public void Callback(Object obj)
4858	5436	{
..	..	@@ -4876,26 +5454,9 @@
4876	5454	}
4877	5455	*/
4878	5456
4879		- void ImportVRMLX3D()
4880		- {
4881		- if (GrafreeD.standAlone)
4882		- {
4883		- /**/
4884		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4885		- browser.show();
4886		- String filename = browser.getFile();
4887		- if (filename != null && filename.length() > 0)
4888		- {
4889		- String fullname = browser.getDirectory() + filename;
4890		- LoadVRMLX3D(fullname);
4891		- }
4892		- /**/
4893		- }
4894		- }
4895		-
4896	5457	String GetFile(String dialogName)
4897	5458	{
4898		- if (GrafreeD.standAlone)
	5459	+ if (Grafreed.standAlone)
4899	5460	{
4900	5461	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4901	5462	browser.show();
..	..	@@ -4959,10 +5520,36 @@
4959	5520	cButton flashSelectionButton;
4960	5521	cButton editButton;
4961	5522	cButton uneditButton;
	5523	+ JCheckBox allParamsButton;
4962	5524	cButton clearpanelButton;
4963		- cButton allParamsButton;
4964	5525	cButton unselectButton;
4965	5526
	5527	+ cButton restoreCameraButton;
	5528	+
	5529	+ cButton minButton;
	5530	+ cButton maxButton;
	5531	+ cButton fullButton;
	5532	+ cButton saveButton;
	5533	+ cButton oneStepButton;
	5534	+
	5535	+ cButton groupButton;
	5536	+ cButton ungroupButton;
	5537	+ cButton compositeButton;
	5538	+ cButton switchButton;
	5539	+ cButton loopButton;
	5540	+ cButton textureButton;
	5541	+
	5542	+ cButton gridButton;
	5543	+ cButton boxButton;
	5544	+ cButton sphereButton;
	5545	+ cButton coneButton;
	5546	+ cButton torusButton;
	5547	+ cButton superButton;
	5548	+ cButton kleinButton;
	5549	+ cButton particlesButton;
	5550	+ cButton overlayButton;
	5551	+ cButton lightButton;
	5552	+
4966	5553	cButton screenfitButton;
4967	5554	cButton screenfitpointButton;
4968	5555	cButton snapobjectButton;
..	..	@@ -4974,14 +5561,6 @@
4974	5561
4975	5562	cButton setsupportButton;
4976	5563
4977		- cButton twoButton;
4978		- cButton sixButton;
4979		- cButton threeButton;
4980		- cButton sevenButton;
4981		- cButton fourButton; // full panel
4982		- cButton oneButton; // full XYZ
4983		- //cButton currentLayout;
4984		-
4985	5564	//
4986	5565	//Composite
4987	5566	Object3D // to do !!
..	..	@@ -4991,9 +5570,11 @@
4991	5570	//JTree jTree;
4992	5571	private MenuItem lookAtItem;
4993	5572	private MenuItem lookFromItem;
4994		- private MenuItem switchItem;
	5573	+ private MenuItem switchViewItem;
4995	5574	private MenuItem cutItem;
4996		- private MenuItem duplicateItem;
	5575	+ private MenuItem undoItem;
	5576	+ private MenuItem redoItem;
	5577	+ private JMenuItem duplicateItem;
4997	5578	private MenuItem cloneItem;
4998	5579	private MenuItem cloneSupportItem;
4999	5580	private MenuItem overwriteGeoItem;
..	..	@@ -5006,7 +5587,7 @@
5006	5587	private MenuItem linkverticesItem;
5007	5588	private MenuItem relinkverticesItem;
5008	5589	private MenuItem setMasterItem;
5009		- private MenuItem resetMeshItem;
	5590	+ private MenuItem resetAllItem;
5010	5591	private MenuItem stepAllItem;
5011	5592	private MenuItem revertMeshItem;
5012	5593	private MenuItem poseMeshItem;
..	..	@@ -5017,6 +5598,7 @@
5017	5598	private MenuItem mergeGeometriesItem;
5018	5599	private MenuItem copyItem;
5019	5600	private MenuItem pasteItem;
	5601	+ private MenuItem pasteIntoItem;
5020	5602	private MenuItem pasteLinkItem;
5021	5603	private MenuItem pasteCloneItem;
5022	5604	private MenuItem pasteExpandItem;
..	..	@@ -5055,6 +5637,10 @@
5055	5637	private MenuItem showleavesItem;
5056	5638	private MenuItem markleavesItem;
5057	5639	private MenuItem unmarkleavesItem;
	5640	+ private MenuItem rewindleavesItem;
	5641	+ private MenuItem unrewindleavesItem;
	5642	+ private MenuItem randomleavesItem;
	5643	+ private MenuItem unrandomleavesItem;
5058	5644
5059	5645	private MenuItem flipVItem;
5060	5646	private MenuItem unflipVItem;
..	..	@@ -5066,15 +5652,17 @@
5066	5652	private MenuItem panoTexturesItem;
5067	5653
5068	5654	private MenuItem resetCentroidItem;
5069		- private MenuItem transformgeometryItem;
	5655	+ private MenuItem resetCentroidXZItem;
5070	5656	private MenuItem resetTransformItem;
	5657	+ private MenuItem transformGeometryItem;
	5658	+ private MenuItem transformChildrenItem;
5071	5659	private MenuItem hideItem;
5072	5660	private MenuItem grabItem;
5073	5661	private MenuItem backItem;
5074	5662	private MenuItem frontItem;
5075	5663	private MenuItem cameraItem;
5076	5664	private MenuItem compositeItem;
5077		- private MenuItem randomItem;
	5665	+ private MenuItem switchItem;
5078	5666	private MenuItem physicsItem;
5079	5667	private MenuItem frameselectorItem;
5080	5668	private MenuItem scriptNodeItem;
..	..	@@ -5114,7 +5702,7 @@
5114	5702	private MenuItem blobItem;
5115	5703	private MenuItem latheItem;
5116	5704	private MenuItem bezierItem;
5117		- private MenuItem checkerItem;
	5705	+ private MenuItem overlayItem;
5118	5706	private MenuItem meshItem;
5119	5707	// private MenuItem meshGroupItem;
5120	5708	private MenuItem springItem;
..	..	@@ -5136,11 +5724,6 @@
5136	5724	private MenuItem doubleItem;
5137	5725	private MenuItem tripleItem;
5138	5726
5139		- private MenuItem importGFDItem;
5140		- private MenuItem importVRMLX3DItem;
5141		- private MenuItem import3DSItem;
5142		- private MenuItem importOBJItem;
5143		-
5144	5727	private MenuItem computeAOItem;
5145	5728	private MenuItem recompileItem;
5146	5729	private MenuItem editScriptItem;
..	..	@@ -5150,4 +5733,8 @@
5150	5733	private MenuItem analyzeItem;
5151	5734	private MenuItem dumpItem;
5152	5735	//boolean freezemodel = false;
	5736	+
	5737	+ Menu cameraMenu;
	5738	+ MenuItem editCameraItem;
	5739	+ MenuItem restoreCameraItem;
5153	5740	}