~nbriere/GrafreeD.git - Noware Git Repository

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