~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -74,7 +74,7 @@
74	74	this.copy = this.group = copy;
75	75	//selectees = this.group.selectees;
76	76
77		- SetupMenu2(objEditor);
	77	+ SetupMenu2(this); //objEditor);
78	78	SetupUI2(objEditor);
79	79	objEditor.SetupUI(true);
80	80	SetupViews(objEditor);
..	..	@@ -98,14 +98,14 @@
98	98
99	99	void CloneClipboard(boolean supports)
100	100	{
101		- assert(GrafreeD.clipboard.parent == null);
102		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
103		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
104		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
105		- makeSomething(CloneObject(GrafreeD.clipboard.get(0), false));
	101	+ assert(Grafreed.clipboard.parent == null);
	102	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	103	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	104	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	105	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
106	106	else
107		- makeSomething(CloneObject(GrafreeD.clipboard, false));
108		- GrafreeD.clipboard.get(0).parent = keepparent;
	107	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	108	+ Grafreed.clipboard.get(0).parent = keepparent;
109	109	}
110	110
111	111	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -119,7 +119,7 @@
119	119	// obj.support = null;
120	120	if (!supports)
121	121	obj.SaveSupports();
122		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	122	+ Object3D clone = (Object3D)Grafreed.clone(obj);
123	123	obj.parent = parent;
124	124	// obj.support = support;
125	125	// clone.support = support; // aout 2013
..	..	@@ -148,30 +148,29 @@
148	148
149	149	//JTextField nameField;
150	150
151		- void SetupMenu2(ObjEditor oe)
	151	+ void SetupMenu2(GroupEditor oe)
152	152	{
153		- oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
154		- //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
155		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
156		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
157		- oe.cameraMenu.add("-");
158		- openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
159		- openWindowItem.addActionListener(this);
160		- editLeafItem.addActionListener(this);
161		- lookAtItem.addActionListener(this);
162		- //lookFromItem.addActinoListener(this);
163		- //switchItem.addActionListener(this);
	153	+ oe.jTree = new cTree();
	154	+
164	155	Menu menu;
165	156	oe.menuBar.add(menu = new Menu("Edit"));
166	157	//editItem = menu.add(new MenuItem("Edit"));
167	158	//editItem.addActionListener(this);
168		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	159	+
	160	+// undoItem = menu.add(new MenuItem("Undo"));
	161	+// undoItem.addActionListener(this);
	162	+// redoItem = menu.add(new MenuItem("Redo"));
	163	+// redoItem.addActionListener(this);
	164	+// menu.add("-");
	165	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
169	166	duplicateItem.addActionListener(this);
170		- menu.add("-");
171	167	cloneItem = menu.add(new MenuItem("Clone"));
172	168	cloneItem.addActionListener(this);
	169	+ if (Globals.ADVANCED)
	170	+ {
173	171	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
174	172	cloneSupportItem.addActionListener(this);
	173	+ }
175	174	menu.add("-");
176	175	cutItem = menu.add(new MenuItem("Cut"));
177	176	cutItem.addActionListener(this);
..	..	@@ -179,27 +178,123 @@
179	178	copyItem.addActionListener(this);
180	179	pasteItem = menu.add(new MenuItem("Paste"));
181	180	pasteItem.addActionListener(this);
	181	+
	182	+ menu.add("-");
	183	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	184	+ pasteIntoItem.addActionListener(this);
182	185	pasteLinkItem = menu.add(new MenuItem("Paste link"));
183	186	pasteLinkItem.addActionListener(this);
184	187	pasteCloneItem = menu.add(new MenuItem("Paste clone"));
185	188	pasteCloneItem.addActionListener(this);
186	189	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
187	190	// pasteExpandItem.addActionListener(this);
	191	+ menu.add("-");
188	192	clearItem = menu.add(new MenuItem("Clear"));
189	193	clearItem.addActionListener(this);
	194	+
	195	+ if (Globals.ADVANCED)
	196	+ {
	197	+ // Deletes the cameras...
190	198	clearAllItem = menu.add(new MenuItem("Clear All"));
191	199	clearAllItem.addActionListener(this);
	200	+ }
	201	+
	202	+ menuBar.add(cameraMenu = new Menu("View"));
	203	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	204	+ //zBufferItem.addActionListener(this);
	205	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	206	+ //normalLensItem.addActionListener(this);
	207	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	208	+ restoreCameraItem.addActionListener(this);
	209	+
	210	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	211	+// toggleFullScreenItem.addItemListener(this);
	212	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	213	+// cameraMenu.add("-");
	214	+//
	215	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	216	+// toggleTextureItem.addItemListener(this);
	217	+// toggleTextureItem.setState(CameraPane.textureon);
	218	+//
	219	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	220	+// toggleSwitchItem.addItemListener(this);
	221	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	222	+
	223	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	224	+ toggleHandleItem.addItemListener(this);
	225	+ toggleHandleItem.setState(CameraPane.HANDLES);
	226	+
	227	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	228	+ togglePaintItem.addItemListener(this);
	229	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	230	+
	231	+ if (Globals.ADVANCED)
	232	+ {
	233	+ cameraMenu.add("-");
	234	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	235	+ toggleLiveItem.addItemListener(this);
	236	+ toggleLiveItem.setState(Globals.isLIVE());
192	237
	238	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	239	+ stepItem.addActionListener(this);
	240	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	241	+ // toggleDLItem.addItemListener(this);
	242	+ // toggleDLItem.setState(false);
	243	+
	244	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	245	+ toggleRenderItem.addItemListener(this);
	246	+ toggleRenderItem.setState(!CameraPane.frozen);
	247	+
	248	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	249	+ toggleDebugItem.addItemListener(this);
	250	+ toggleDebugItem.setState(Globals.DEBUG);
	251	+
	252	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	253	+ toggleFrustumItem.addItemListener(this);
	254	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	255	+
	256	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	257	+ toggleFootContactItem.addItemListener(this);
	258	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	259	+
	260	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	261	+ toggleTimelineItem.addItemListener(this);
	262	+ }
	263	+
	264	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	265	+// toggleRootItem.addItemListener(this);
	266	+// toggleRootItem.setState(false);
	267	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	268	+// animationItem.addItemListener(this);
	269	+// animationItem.setState(CameraPane.ANIMATION);
	270	+ cameraMenu.add("-");
	271	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	272	+ editCameraItem.addActionListener(this);
	273	+
	274	+ if (Globals.ADVANCED)
	275	+ {
	276	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	277	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	278	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	279	+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	280	+ oe.cameraMenu.add("-");
	281	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	282	+ openWindowItem.addActionListener(this);
	283	+ editLeafItem.addActionListener(this);
	284	+ lookAtItem.addActionListener(this);
	285	+ //lookFromItem.addActinoListener(this);
	286	+ //switchViewItem.addActionListener(this);
	287	+ }
	288	+
193	289	oe.menuBar.add(menu = new Menu("Setting"));
194		- resetMeshItem = menu.add(new MenuItem("Reset All"));
195		- resetMeshItem.addActionListener(this);
196		- stepAllItem = menu.add(new MenuItem("Step All"));
197		- stepAllItem.addActionListener(this);
	290	+ if (Globals.ADVANCED)
	291	+ {
198	292	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
199	293	revertMeshItem.addActionListener(this);
200	294	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
201	295	resetreferencesItem.addActionListener(this);
202	296	menu.add("-");
	297	+ }
203	298	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
204	299	overwriteGeoItem.addActionListener(this);
205	300	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -211,79 +306,103 @@
211	306	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
212	307	overwriteUVItem.addActionListener(this);
213	308	menu.add("-");
	309	+ if (Globals.ADVANCED)
	310	+ {
214	311	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
215	312	generateMeshItem.addActionListener(this);
216	313	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
217	314	poseMeshItem.addActionListener(this);
218	315	menu.add("-");
	316	+ }
219	317	resetsupportItem = menu.add(new MenuItem("Reset support"));
220	318	resetsupportItem.addActionListener(this);
221	319	linkverticesItem = menu.add(new MenuItem("Link to Support"));
222	320	linkverticesItem.addActionListener(this);
223	321	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
224	322	relinkverticesItem.addActionListener(this);
	323	+
	324	+ if (Globals.ADVANCED)
	325	+ {
225	326	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
226	327	setMasterItem.addActionListener(this);
	328	+ }
227	329
228	330	oe.menuBar.add(menu = new Menu("Group"));
229		- grabItem = menu.add(new MenuItem("Grab"));
230		- grabItem.addActionListener(this);
	331	+// grabItem = menu.add(new MenuItem("Grab"));
	332	+// grabItem.addActionListener(this);
231	333	backItem = menu.add(new MenuItem("Back"));
232	334	backItem.addActionListener(this);
233	335	frontItem = menu.add(new MenuItem("Front"));
234	336	frontItem.addActionListener(this);
235		- compositeItem = menu.add(new MenuItem("Composite"));
236		- compositeItem.addActionListener(this);
237		- hideItem = menu.add(new MenuItem("Hide"));
	337	+// compositeItem = menu.add(new MenuItem("Composite"));
	338	+// compositeItem.addActionListener(this);
	339	+
	340	+ if (Globals.ADVANCED)
	341	+ {
	342	+ hideItem = menu.add(new MenuItem("Hidden Group"));
238	343	hideItem.addActionListener(this);
	344	+ }
239	345	ungroupItem = menu.add(new MenuItem("Ungroup"));
240	346	ungroupItem.addActionListener(this);
241		- menu.add("-");
242		- randomItem = menu.add(new MenuItem("Random"));
243		- randomItem.addActionListener(this);
244		- physicsItem = menu.add(new MenuItem("Physics"));
245		- physicsItem.addActionListener(this);
246		- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
247		- frameselectorItem.addActionListener(this);
	347	+
	348	+// menu.add("-");
	349	+//
	350	+// switchItem = menu.add(new MenuItem("Switch node"));
	351	+// switchItem.addActionListener(this);
	352	+ if (Globals.ADVANCED)
	353	+ {
248	354	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
249	355	switchGeoItem.addActionListener(this);
250	356	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
251	357	switchTransfoItem.addActionListener(this);
252		- morphItem = menu.add(new MenuItem("Morph"));
	358	+ morphItem = menu.add(new MenuItem("Morph Group"));
253	359	morphItem.addActionListener(this);
	360	+
	361	+ menu.add("-");
	362	+ physicsItem = menu.add(new MenuItem("Physics"));
	363	+ physicsItem.addActionListener(this);
	364	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	365	+ frameselectorItem.addActionListener(this);
254	366	scriptNodeItem = menu.add(new MenuItem("Script Node"));
255	367	scriptNodeItem.addActionListener(this);
256		- cameraItem = menu.add(new MenuItem("Camera"));
257		- cameraItem.addActionListener(this);
	368	+ }
258	369
259	370	oe.menuBar.add(menu = new Menu("Object"));
260		- textureItem = menu.add(new MenuItem("Texture"));
261		- textureItem.addActionListener(this);
	371	+// textureItem = menu.add(new MenuItem("Texture"));
	372	+// textureItem.addActionListener(this);
262	373	billboardItem = menu.add(new MenuItem("Billboard"));
263	374	billboardItem.addActionListener(this);
264	375	csgItem = menu.add(new MenuItem("CSG"));
265	376	csgItem.addActionListener(this);
266		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	377	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
267	378	shadowXItem.addActionListener(this);
268		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	379	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
269	380	shadowYItem.addActionListener(this);
270		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	381	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
271	382	shadowZItem.addActionListener(this);
	383	+ if (Globals.ADVANCED)
	384	+ {
	385	+ menu.add("-");
272	386	linkerItem = menu.add(new MenuItem("Linker"));
273	387	linkerItem.addActionListener(this);
274		- templateItem = menu.add(new MenuItem("Template"));
275		- templateItem.addActionListener(this);
276	388	attributeItem = menu.add(new MenuItem("Attribute"));
277	389	attributeItem.addActionListener(this);
	390	+ templateItem = menu.add(new MenuItem("Template"));
	391	+ templateItem.addActionListener(this);
278	392	pointflowItem = menu.add(new MenuItem("Point Flow"));
279	393	pointflowItem.addActionListener(this);
	394	+ }
280	395	menu.add("-");
281	396	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
282	397	resetTransformItem.addActionListener(this);
283	398	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
284	399	resetCentroidItem.addActionListener(this);
285		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
286		- transformgeometryItem.addActionListener(this);
	400	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	401	+ resetCentroidXZItem.addActionListener(this);
	402	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	403	+ transformGeometryItem.addActionListener(this);
	404	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	405	+ transformChildrenItem.addActionListener(this);
287	406
288	407	oe.menuBar.add(menu = new Menu("Geometry"));
289	408	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -294,8 +413,11 @@
294	413	genNormalsCADItem.addActionListener(this);
295	414	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
296	415	genNormalsMESHItem.addActionListener(this);
	416	+ if (Globals.ADVANCED)
	417	+ {
297	418	genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
298	419	genNormalsMINEItem.addActionListener(this);
	420	+ }
299	421	stripifyItem = menu.add(new MenuItem("Stripify"));
300	422	stripifyItem.addActionListener(this);
301	423	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -317,23 +439,34 @@
317	439	reduce34MeshItem.addActionListener(this);
318	440	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
319	441	increaseMeshItem.addActionListener(this);
320		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
321		- smoothMeshItem.addActionListener(this);
322	442	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
323	443	clipMeshItem.addActionListener(this);
	444	+
	445	+ if (Globals.ADVANCED)
	446	+ {
	447	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	448	+ smoothMeshItem.addActionListener(this);
	449	+ }
324	450
325	451	oe.menuBar.add(menu = new Menu("Attributes"));
326	452	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
327	453	clearMaterialsItem.addActionListener(this);
	454	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	455	+ resetAllItem.addActionListener(this);
	456	+ stepAllItem = menu.add(new MenuItem("Step All"));
	457	+ stepAllItem.addActionListener(this);
328	458	menu.add("-");
329	459	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
330	460	liveleavesItem.addActionListener(this);
331	461	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
332	462	unliveleavesItem.addActionListener(this);
	463	+ if (Globals.ADVANCED)
	464	+ {
333	465	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
334	466	supportleavesItem.addActionListener(this);
335	467	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
336	468	unsupportleavesItem.addActionListener(this);
	469	+ }
337	470	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
338	471	hideleavesItem.addActionListener(this);
339	472	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -342,6 +475,14 @@
342	475	markleavesItem.addActionListener(this);
343	476	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
344	477	unmarkleavesItem.addActionListener(this);
	478	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	479	+ rewindleavesItem.addActionListener(this);
	480	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	481	+ unrewindleavesItem.addActionListener(this);
	482	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	483	+ randomleavesItem.addActionListener(this);
	484	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	485	+ unrandomleavesItem.addActionListener(this);
345	486	menu.add("-");
346	487	flipVItem = menu.add(new MenuItem("Flip V"));
347	488	flipVItem.addActionListener(this);
..	..	@@ -377,35 +518,40 @@
377	518	sortbynameItem = menu.add(new MenuItem("Sort by name"));
378	519	sortbynameItem.addActionListener(this);
379	520	menu.add("-");
	521	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	522	+ shareGeometriesItem.addActionListener(this);
	523	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	524	+ mergeGeometriesItem.addActionListener(this);
	525	+ if (Globals.ADVANCED)
	526	+ {
	527	+ // Pretty much the same as duplicate and clone.
380	528	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
381	529	extractGeometriesItem.addActionListener(this);
382	530	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
383	531	cloneGeometriesItem.addActionListener(this);
384		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
385		- shareGeometriesItem.addActionListener(this);
386		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
387		- mergeGeometriesItem.addActionListener(this);
	532	+ }
388	533
389	534	oe.menuBar.add(menu = new Menu("Insert"));
390	535	buildCreateMenu(menu);
391	536
392		-
393		- oe.menuBar.add(menu = new Menu("Include"));
394		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
395		- importGFDItem.addActionListener(this);
396		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
397		- importVRMLX3DItem.addActionListener(this);
398		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
399		- importOBJItem.addActionListener(this);
400		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
401		- import3DSItem.addActionListener(this);
402		-
403	537	oe.menuBar.add(menu = new Menu("Tools"));
404	538	buildToolsMenu(menu);
405	539	}
406	540
407	541	void SetupUI2(ObjEditor oe)
408	542	{
	543	+ // June 2019
	544	+ if (oe == null)
	545	+ {
	546	+ //super.SetupUI2(this);
	547	+ //return;
	548	+ }
	549	+
	550	+ if (copy != group)
	551	+ {
	552	+ //super.SetupUI2(this);
	553	+ }
	554	+
409	555	//new Exception().printStackTrace();
410	556
411	557	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -434,96 +580,212 @@
434	580	oe.radioPanel.add(dummyButton);
435	581	oe.buttonGroup.add(dummyButton);
436	582	*/
	583	+ cGridBag copyOptionsPanel = new cGridBag();
	584	+
	585	+ copyOptionsPanel.preferredHeight = 2;
	586	+
437	587	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
438	588
439		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
440		- liveCB.setToolTipText("Enabled animation");
	589	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	590	+ //minButton.setToolTipText("Minimize window");
	591	+ //minButton.addActionListener(this);
	592	+
	593	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	594	+ maxButton.setToolTipText("Maximize window");
	595	+ maxButton.addActionListener(this);
	596	+
	597	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	598	+ fullButton.setToolTipText("Full-screen window");
	599	+ fullButton.addActionListener(this);
	600	+
	601	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	602	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	603	+ restoreCameraButton.addActionListener(this);
	604	+
	605	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	606	+ undoButton.setToolTipText("Undo changes");
	607	+ undoButton.addActionListener(this);
	608	+ undoButton.setEnabled(false);
	609	+
	610	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	611	+ redoButton.setToolTipText("Redo changes");
	612	+ redoButton.addActionListener(this);
	613	+ redoButton.setEnabled(false);
	614	+
	615	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	616	+ saveButton.setToolTipText("Save changes");
	617	+ saveButton.addActionListener(this);
	618	+
	619	+ copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	620	+ liveCB.setToolTipText("Enable animation");
441	621	liveCB.addItemListener(this);
442	622
443		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	623	+ copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	624	+ oneStepButton.setToolTipText("Animate one step forward");
	625	+ oneStepButton.addActionListener(this);
	626	+
	627	+ copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
444	628	fastCB.setToolTipText("Fast mode");
445	629	fastCB.addItemListener(this);
446	630
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);
	631	+ //oe.toolboxPanel.Return();
	632	+
	633	+ copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
452	634	screenfitButton.setToolTipText("Screen fit");
453	635	screenfitButton.addActionListener(this);
454	636
	637	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	638	+// trackCB.setToolTipText("Enable tracking");
	639	+// trackCB.addItemListener(this);
	640	+
455	641	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
456	642	// screenfitpointButton.addActionListener(this);
457		-// oe.aConstraints.gridx += 1;
458		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
459		- snapobjectButton.addActionListener(this);
460		- snapobjectButton.setToolTipText("Snap Object");
461		- oe.aConstraints.gridx += 1;
462	643
463		- //aConstraints.gridx = 0;
464		- //aConstraints.gridy += 1;
465		- oe.aConstraints.weighty = 0;
466		- oe.aConstraints.gridwidth = 1;
467		-
468		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
469		- flashSelectionButton.setToolTipText("Show selection");
470		- flashSelectionButton.addActionListener(this);
	644	+ if (Globals.ADVANCED)
	645	+ {
	646	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	647	+ snapobjectButton.addActionListener(this);
	648	+ snapobjectButton.setToolTipText("Snap Object");
	649	+ }
	650	+
	651	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
471	652
472		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
473		-
474		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	653	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
475	654	twoButton.setToolTipText("Show center view only");
476	655	twoButton.addActionListener(this);
477		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	656	+ this.fullscreenLayout = twoButton;
	657	+
	658	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
478	659	fourButton.addActionListener(this);
479	660	fourButton.setToolTipText("Show left panel only");
480		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	661	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
481	662	sixButton.setToolTipText("2-column layout left");
482	663	sixButton.addActionListener(this);
483		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	664	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
484	665	threeButton.setToolTipText("2-column layout right");
485	666	threeButton.addActionListener(this);
486		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	667	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
487	668	sevenButton.setToolTipText("3-column layout");
488	669	sevenButton.addActionListener(this);
489	670	//
490	671
491		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	672	+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
492	673	rootButton.setToolTipText("Edit selection in new tab");
493	674	rootButton.addActionListener(this);
494	675
495		- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	676	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
496	677	closeButton.setToolTipText("Close tab");
497	678	closeButton.addActionListener(this);
498	679	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
499	680	//clearButton.addActionListener(this);
500		-
501		- cGridBag commandsPanel = new cGridBag();
	681	+
	682	+ // INSERT
	683	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	684	+ gridButton.setToolTipText("Create grid");
	685	+ gridButton.addActionListener(this);
	686	+
	687	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	688	+ boxButton.setToolTipText("Create box");
	689	+ boxButton.addActionListener(this);
	690	+
	691	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	692	+ sphereButton.setToolTipText("Create sphere");
	693	+ sphereButton.addActionListener(this);
	694	+
	695	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	696	+ coneButton.setToolTipText("Create cone");
	697	+ coneButton.addActionListener(this);
	698	+
	699	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	700	+ torusButton.setToolTipText("Create torus");
	701	+ torusButton.addActionListener(this);
	702	+
	703	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	704	+ superButton.setToolTipText("Create superellipsoid");
	705	+ superButton.addActionListener(this);
	706	+
	707	+ if (Globals.ADVANCED)
	708	+ {
	709	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	710	+ kleinButton.setToolTipText("Create Klein bottle");
	711	+ kleinButton.addActionListener(this);
	712	+ }
502	713
503		- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	714	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	715	+ particlesButton.setToolTipText("Create particle system");
	716	+ particlesButton.addActionListener(this);
	717	+
	718	+ oe.toolboxPanel.Return();
	719	+
	720	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	721	+ groupButton.setToolTipText("Create group");
	722	+ groupButton.addActionListener(this);
	723	+
	724	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	725	+ compositeButton.setToolTipText("Create composite");
	726	+ compositeButton.addActionListener(this);
	727	+
	728	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	729	+ switchButton.setToolTipText("Create switch");
	730	+ switchButton.addActionListener(this);
	731	+
	732	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	733	+ loopButton.setToolTipText("Create loop");
	734	+ loopButton.addActionListener(this);
	735	+
	736	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	737	+ textureButton.setToolTipText("Create texture");
	738	+ textureButton.addActionListener(this);
	739	+
	740	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	741	+ overlayButton.setToolTipText("Create overlay");
	742	+ overlayButton.addActionListener(this);
	743	+
	744	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	745	+ lightButton.setToolTipText("Create light");
	746	+ lightButton.addActionListener(this);
	747	+
	748	+ for (int i=6; --i>=0;)
	749	+ {
	750	+ oe.toolboxPanel.Return();
	751	+ oe.toolboxPanel.add(new cGridBag());
	752	+ oe.toolboxPanel.add(new cGridBag());
	753	+ oe.toolboxPanel.add(new cGridBag());
	754	+ oe.toolboxPanel.add(new cGridBag());
	755	+ oe.toolboxPanel.add(new cGridBag());
	756	+ oe.toolboxPanel.add(new cGridBag());
	757	+ oe.toolboxPanel.add(new cGridBag());
	758	+ }
	759	+
	760	+ // EDIT panel
	761	+ editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
504	762	editButton.setToolTipText("Edit selection");
505	763	editButton.addActionListener(this);
506	764
507		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	765	+ editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
508	766	uneditButton.setToolTipText("Unedit selection");
509	767	uneditButton.addActionListener(this);
510	768
511		- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	769	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	770	+ allParamsButton.setToolTipText("Edit all params");
	771	+ allParamsButton.addActionListener(this);
	772	+
	773	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
512	774	clearPanelButton.setToolTipText("Clear edit panel");
513	775	clearPanelButton.addActionListener(this);
514	776
515		- commandsPanel.add(allParamsButton = new cButton("A", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
516		- allParamsButton.setToolTipText("All params??");
517		- allParamsButton.addActionListener(this);
518		-
519		- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	777	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
520	778	unselectButton.setToolTipText("Unselect");
521	779	unselectButton.addActionListener(this);
522	780
523		- commandsPanel.preferredHeight = 1;
	781	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	782	+ flashSelectionButton.setToolTipText("Highlight selection");
	783	+ flashSelectionButton.addActionListener(this);
524	784
525		- oe.treePanel.add(commandsPanel);
526		- oe.treePanel.Return();
	785	+ editCommandsPanel.preferredHeight = 1;
	786	+
	787	+// oe.treePanel.add(commandsPanel);
	788	+// oe.treePanel.Return();
527	789
528	790	// oe.aConstraints.gridx += 1;
529	791	// oe.aConstraints.weighty = 0;
..	..	@@ -540,27 +802,12 @@
540	802
541	803	JScrollPane jSP;
542	804	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
543		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	805	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
544	806	ResetModel();
545	807
546	808	oe.treePanel.add(jSPPanel);
547	809	oe.treePanel.Return();
548	810
549		- cGridBag copyOptionsPanel = new cGridBag();
550		-
551		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
552		- colorCB.setToolTipText("Copy color when dropped");
553		- colorCB.addItemListener(this);
554		-
555		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
556		- materialCB.setToolTipText("Copy material when dropped");
557		- materialCB.addItemListener(this);
558		-
559		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
560		- textureCB.setToolTipText("Copy texture when dropped");
561		- textureCB.addItemListener(this);
562		-
563		- copyOptionsPanel.preferredHeight = 1;
564	811	oe.treePanel.add(copyOptionsPanel);
565	812	oe.treePanel.Return();
566	813
..	..	@@ -591,13 +838,39 @@
591	838
592	839	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
593	840	{
	841	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	842	+ colorCB.setToolTipText("Copy color when dropped");
	843	+ colorCB.addItemListener(this);
	844	+
	845	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	846	+ materialCB.setToolTipText("Copy material when dropped");
	847	+ materialCB.addItemListener(this);
	848	+
	849	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	850	+ textureCB.setToolTipText("Copy texture when dropped");
	851	+ textureCB.addItemListener(this);
	852	+
	853	+ panel.Return();
	854	+
	855	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	856	+ boxCB.setToolTipText("Display bounding boxes");
	857	+ boxCB.addItemListener(this);
	858	+
	859	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	860	+ zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	861	+ zoomBoxCB.addItemListener(this);
	862	+
	863	+ if (true) // Globals.ADVANCED)
	864	+ {
594	865	panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
595		- supportCB.setToolTipText("Enabled rigging");
	866	+ supportCB.setToolTipText("Enable rigging");
596	867	supportCB.addItemListener(this);
597	868
598	869	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
599	870	// localCB.addItemListener(this);
600	871
	872	+ panel.Return();
	873	+
601	874	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
602	875	crowdCB.setToolTipText("Used for crowds");
603	876	crowdCB.addItemListener(this);
..	..	@@ -610,18 +883,12 @@
610	883	slowCB.setToolTipText("Smooth interpolation");
611	884	slowCB.addItemListener(this);
612	885
613		- panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
614		- boxCB.setToolTipText("Display bounding boxes");
615		- boxCB.addItemListener(this);
616		-
617		- panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
618		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
619		- zoomBoxCB.addItemListener(this);
620		-
621	886	// constraints.gridy += 1;
622	887	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
623	888	// speakerMocapCB.addItemListener(this);
624	889
	890	+ panel.Return();
	891	+
625	892	if (false)
626	893	{
627	894	// handled in scripts
..	..	@@ -636,30 +903,72 @@
636	903	//constraints.gridy += 1;
637	904	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
638	905	smoothfocusCB.addItemListener(this);
	906	+ panel.Return();
639	907	}
640	908
641	909	//constraints.gridx += 1;
642	910	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
643	911	// debugCB.addItemListener(this);
644	912
	913	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	914	+ trackCB.setToolTipText("Enable tracking target");
	915	+ trackCB.addItemListener(this);
	916	+
645	917	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	918	+ oeilCB.setToolTipText("Move camera when tracking");
646	919	oeilCB.addItemListener(this);
647	920
	921	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	922	+ shadowCB.setToolTipText("Compute shadows when live");
	923	+ shadowCB.addItemListener(this);
	924	+
	925	+ panel.Return();
	926	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	927	+ toggleTextureCB.setToolTipText("Load textures");
	928	+ toggleTextureCB.addItemListener(this);
	929	+
	930	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	931	+ toggleSwitchCB.setToolTipText("Use switch");
	932	+ toggleSwitchCB.addItemListener(this);
	933	+
	934	+ panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
	935	+ autosaveCB.setToolTipText("Auto-save on structure change");
	936	+ autosaveCB.addItemListener(this);
	937	+
	938	+ panel.Return();
	939	+ if (Globals.ADVANCED)
	940	+ {
648	941	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
649	942	lookAtCB.setToolTipText("Look-at target");
650	943	lookAtCB.addItemListener(this);
	944	+ }
	945	+
	946	+ }
651	947
652	948	cGridBag fill = new cGridBag();
653		-
654	949	fill.preferredHeight = 200;
	950	+ cGridBag fill2 = new cGridBag();
	951	+ fill2.preferredHeight = 200;
	952	+ cGridBag fill3 = new cGridBag();
	953	+ fill3.preferredHeight = 200;
655	954
656	955	panel.add(fill);
	956	+ panel.add(fill2);
	957	+ panel.add(fill3);
657	958
658	959	}
659	960
660	961	void EditObject(Object3D obj)
661	962	{
662	963	cRadio radioButton = new cRadio(obj.name);
	964	+
	965	+ // Patch to avoid bug with transparency.
	966	+ radioButton.hadMaterial = obj.material != null;
	967	+ if (!radioButton.hadMaterial)
	968	+ {
	969	+ obj.material = new cMaterial();
	970	+ }
	971	+
663	972	radioButton.SetObject(obj);
664	973	radioButton.layout = sevenButton;
665	974	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -668,8 +977,11 @@
668	977	buttonGroup.add(radioButton);
669	978	radioButton.doClick();
670	979	}
	980	+
671	981	void SetupViews(ObjEditor oe)
672	982	{
	983	+ theFrame = this;
	984	+
673	985	oe.SetupViews();
674	986
675	987	System.out.println("SetupViews");
..	..	@@ -678,23 +990,27 @@
678	990	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
679	991	}
680	992
681		- JCheckBox liveCB;
682		- JCheckBox supportCB;
683		- JCheckBox localCB;
684		- JCheckBox crowdCB;
685		- JCheckBox smoothCB;
686		- JCheckBox fastCB;
687		- JCheckBox slowCB;
688		- JCheckBox boxCB;
689		- JCheckBox zoomBoxCB;
690		- JCheckBox trackCB;
691		- JCheckBox smoothfocusCB;
	993	+ cToggleButton liveCB;
	994	+ cCheckBox supportCB;
	995	+ cCheckBox localCB;
	996	+ cCheckBox crowdCB;
	997	+ cCheckBox smoothCB;
	998	+ cToggleButton fastCB;
	999	+ cCheckBox slowCB;
	1000	+ cCheckBox boxCB;
	1001	+ cCheckBox zoomBoxCB;
	1002	+ //cToggleButton trackCB;
	1003	+ cCheckBox trackCB;
	1004	+ cCheckBox smoothfocusCB;
692	1005	// JCheckBox speakerMocapCB;
693		- JCheckBox speakerCameraCB;
694		- JCheckBox speakerFocusCB;
695		- JCheckBox debugCB;
696		- JCheckBox oeilCB;
697		- JCheckBox lookAtCB;
	1006	+ cCheckBox speakerCameraCB;
	1007	+ cCheckBox speakerFocusCB;
	1008	+ cCheckBox debugCB;
	1009	+
	1010	+ cCheckBox oeilCB;
	1011	+ cCheckBox shadowCB;
	1012	+ cCheckBox autosaveCB;
	1013	+ cCheckBox lookAtCB;
698	1014
699	1015	// static int COLOR = 1;
700	1016	// static int MATERIAL = 2;
..	..	@@ -702,9 +1018,9 @@
702	1018
703	1019	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
704	1020
705		- JCheckBox colorCB;
706		- JCheckBox materialCB;
707		- JCheckBox textureCB;
	1021	+ cCheckBox colorCB;
	1022	+ cCheckBox materialCB;
	1023	+ cCheckBox textureCB;
708	1024
709	1025	public void itemStateChanged(ItemEvent e)
710	1026	{
..	..	@@ -732,6 +1048,7 @@
732	1048	} else if(e.getSource() == liveCB)
733	1049	{
734	1050	cameraView.ToggleLive();
	1051	+ refreshContents(false);
735	1052	}
736	1053	else if(e.getSource() == supportCB)
737	1054	{
..	..	@@ -796,6 +1113,14 @@
796	1113	{
797	1114	cameraView.ToggleOeil();
798	1115	}
	1116	+ else if(e.getSource() == shadowCB)
	1117	+ {
	1118	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1119	+ }
	1120	+ else if(e.getSource() == autosaveCB)
	1121	+ {
	1122	+ Globals.SAVEONMAKE ^= true;
	1123	+ }
799	1124	else if(e.getSource() == lookAtCB)
800	1125	{
801	1126	cameraView.ToggleLookAt();
..	..	@@ -812,7 +1137,8 @@
812	1137
813	1138	/**/
814	1139	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
815		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1140	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1141	+ TreePath path = objEditor.jTree.getSelectionPath();
816	1142	if ((path == null) \|\| (path.getPathCount() <= 1)) {
817	1143	// We can't move the root node or an empty selection
818	1144	return;
..	..	@@ -884,7 +1210,9 @@
884	1210	// objEditor.DropFile((java.io.File[]) object, true);
885	1211	// return;
886	1212	// }
887		- if (string.charAt(0) == '/')
	1213	+
	1214	+ // File path for Mac and Windows
	1215	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
888	1216	{
889	1217	// file(s)
890	1218	String[] names = string.split("\n");
..	..	@@ -911,7 +1239,7 @@
911	1239
912	1240	flashIt = false;
913	1241	CameraPane pane = (CameraPane) target;
914		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1242	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
915	1243	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
916	1244
917	1245	if (group.selection.size() == 1)
..	..	@@ -927,23 +1255,33 @@
927	1255
928	1256	assert target == objEditor.jTree;
929	1257	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1258	+ Object3D destinationLeaf;
930	1259	try {
931		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1260	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
932	1261	} catch (Exception e) {
933	1262	System.out.println("destinationPath : " + destinationPath);
934	1263	return;
935	1264	}
936	1265
937		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1266	+ for (int i=group.selection.size(); --i>=0;)
938	1267	{
	1268	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1269	+
	1270	+ // Cannot move into itself
	1271	+ if (child == destinationLeaf)
	1272	+ return;
	1273	+ }
	1274	+
	1275	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1276	+// {
939	1277	loadClipboard(true);
940	1278	objEditor.jTree.setSelectionPath(destinationPath);
941		- pasteInto(false);
942		- } else {
943		- loadClipboard(false);
944		- objEditor.jTree.setSelectionPath(destinationPath);
945		- pasteInto(false); // true); // ???
946		- }
	1279	+ pasteInto(false, false);
	1280	+// } else {
	1281	+// loadClipboard(false);
	1282	+// objEditor.jTree.setSelectionPath(destinationPath);
	1283	+// pasteInto(false, false); // true); // ???
	1284	+// }
947	1285	}
948	1286	public void dropActionChanged(DropTargetDragEvent dtde)
949	1287	// Called if the user has modified the current drop gesture
..	..	@@ -1048,54 +1386,71 @@
1048	1386	{
1049	1387	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1050	1388	//heightFieldItem.addActionListener(this);
1051		- gridItem = menu.add(new MenuItem("Grid"));
1052		- gridItem.addActionListener(this);
1053		- rectoidItem = menu.add(new MenuItem("Box"));
1054		- rectoidItem.addActionListener(this);
1055		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1056		- ellipsoidItem.addActionListener(this);
1057		- coneItem = menu.add(new MenuItem("Cone"));
1058		- coneItem.addActionListener(this);
1059		- torusItem = menu.add(new MenuItem("Torus"));
1060		- torusItem.addActionListener(this);
1061		- superItem = menu.add(new MenuItem("Superellipsoid"));
1062		- superItem.addActionListener(this);
	1389	+// gridItem = menu.add(new MenuItem("Grid"));
	1390	+// gridItem.addActionListener(this);
	1391	+// rectoidItem = menu.add(new MenuItem("Box"));
	1392	+// rectoidItem.addActionListener(this);
	1393	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1394	+// ellipsoidItem.addActionListener(this);
	1395	+// coneItem = menu.add(new MenuItem("Cone"));
	1396	+// coneItem.addActionListener(this);
	1397	+// torusItem = menu.add(new MenuItem("Torus"));
	1398	+// torusItem.addActionListener(this);
	1399	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1400	+// superItem.addActionListener(this);
	1401	+
	1402	+ cameraItem = menu.add(new MenuItem("Camera"));
	1403	+ cameraItem.addActionListener(this);
	1404	+
	1405	+ if (!Globals.ADVANCED)
	1406	+ {
1063	1407	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1064	1408	kleinItem.addActionListener(this);
1065		- particleItem = menu.add(new MenuItem("Particle system"));
1066		- particleItem.addActionListener(this);
	1409	+ }
	1410	+
	1411	+// particleItem = menu.add(new MenuItem("Particle system"));
	1412	+// particleItem.addActionListener(this);
	1413	+ if (Globals.ADVANCED)
	1414	+ {
1067	1415	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1068	1416	ragdollItem.addActionListener(this);
1069	1417	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1070	1418	ragdoll2Item.addActionListener(this);
	1419	+ }
1071	1420	menu.add("-");
1072		- meshItem = menu.add(new MenuItem("Mesh"));
	1421	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1073	1422	meshItem.addActionListener(this);
1074	1423	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1075	1424	// meshGroupItem.addActionListener(this);
	1425	+ if (Globals.ADVANCED)
	1426	+ {
1076	1427	springItem = menu.add(new MenuItem("Spring"));
1077	1428	springItem.addActionListener(this);
1078	1429	flagItem = menu.add(new MenuItem("Flag"));
1079	1430	flagItem.addActionListener(this);
1080		- bezierItem = menu.add(new MenuItem("Patch"));
1081		- bezierItem.addActionListener(this);
1082		- checkerItem = menu.add(new MenuItem("Checker"));
1083		- checkerItem.addActionListener(this);
1084	1431	blobItem = menu.add(new MenuItem("Blob"));
1085	1432	blobItem.addActionListener(this);
1086	1433	latheItem = menu.add(new MenuItem("Lathe"));
1087	1434	latheItem.addActionListener(this);
1088		- lightItem = menu.add(new MenuItem("Light"));
1089		- lightItem.addActionListener(this);
	1435	+ }
	1436	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1437	+ bezierItem.addActionListener(this);
	1438	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1439	+// overlayItem.addActionListener(this);
	1440	+// lightItem = menu.add(new MenuItem("Light"));
	1441	+// lightItem.addActionListener(this);
1090	1442	menu.add("-");
1091	1443	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1092	1444	//superLoopItem.addActionListener(this);
1093		- loopItem = menu.add(new MenuItem("Loop"));
1094		- loopItem.addActionListener(this);
	1445	+// loopItem = menu.add(new MenuItem("Loop"));
	1446	+// loopItem.addActionListener(this);
1095	1447	doubleItem = menu.add(new MenuItem("Fork"));
1096	1448	doubleItem.addActionListener(this);
	1449	+ if (Globals.ADVANCED)
	1450	+ {
1097	1451	tripleItem = menu.add(new MenuItem("Trident"));
1098	1452	tripleItem.addActionListener(this);
	1453	+ }
1099	1454	}
1100	1455
1101	1456	void buildToolsMenu(Menu menu)
..	..	@@ -1109,24 +1464,26 @@
1109	1464	parseverticesItem.addActionListener(this);
1110	1465	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1111	1466	textureFieldItem.addActionListener(this);
1112		- alignItem = menu.add(new MenuItem("Align"));
	1467	+ alignItem = menu.add(new MenuItem("Align Objects"));
1113	1468	alignItem.addActionListener(this);
1114		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1115		- mirrorItem.addActionListener(this);
1116	1469	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1117	1470	reduceMorphItem.addActionListener(this);
1118	1471	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1119	1472	reduce34MorphItem.addActionListener(this);
1120		-
	1473	+ menu.add("-");
1121	1474	menu.add(computeAOItem = new MenuItem("Compute AO"));
1122	1475	computeAOItem.addActionListener(this);
1123		- menu.add("-");
1124	1476
	1477	+ if (Globals.ADVANCED)
	1478	+ {
	1479	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1480	+ mirrorItem.addActionListener(this);
	1481	+ menu.add("-");
1125	1482	menu.add(memoryItem = new MenuItem("Memory Usage"));
1126	1483	memoryItem.addActionListener(this);
1127	1484	menu.add(analyzeItem = new MenuItem("Analyze"));
1128	1485	analyzeItem.addActionListener(this);
1129		- menu.add(dumpItem = new MenuItem("Dump"));
	1486	+ menu.add(dumpItem = new MenuItem("Print"));
1130	1487	dumpItem.addActionListener(this);
1131	1488	// menu.add(pathItem = new MenuItem("From-to path"));
1132	1489	// pathItem.addActionListener(this);
..	..	@@ -1144,6 +1501,7 @@
1144	1501	menu.add("-");
1145	1502	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1146	1503	editScriptItem.addActionListener(this);
	1504	+ }
1147	1505	}
1148	1506
1149	1507	void ScreenFit()
..	..	@@ -1266,6 +1624,7 @@
1266	1624	shadow.material = new cMaterial(obj.material);
1267	1625	shadow.material.diffuse = 0.0001f;
1268	1626	shadow.material.specular = 0.0001f;
	1627	+ //shadow.projectedVertices[1].x = 300;
1269	1628
1270	1629	makeSomething(shadow);
1271	1630	}
..	..	@@ -1472,9 +1831,9 @@
1472	1831
1473	1832	void Overwrite(int mask)
1474	1833	{
1475		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1834	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1476	1835	{
1477		- Object3D content = GrafreeD.clipboard.get(0);
	1836	+ Object3D content = Grafreed.clipboard.get(0);
1478	1837
1479	1838	if (content instanceof cGroup && ((cGroup)content).transientlink )
1480	1839	content = ((cGroup)content).get(0);
..	..	@@ -1513,7 +1872,7 @@
1513	1872	{
1514	1873	ScreenFit();
1515	1874	} else
1516		- if (source == switchItem)
	1875	+ if (source == switchViewItem)
1517	1876	{
1518	1877	cVector v1 = new cVector();
1519	1878	cVector v2 = new cVector();
..	..	@@ -1522,11 +1881,11 @@
1522	1881	objEditor.cameraView.renderCamera.setAim(v2, v1);
1523	1882	objEditor.cameraView.repaint();
1524	1883	} else
1525		- if (source == rectoidItem)
	1884	+ if (source == rectoidItem \|\| source == boxButton)
1526	1885	{
1527	1886	makeSomething(new Box());
1528	1887	} else
1529		- if (source == particleItem)
	1888	+ if (source == particleItem \|\| source == particlesButton)
1530	1889	{
1531	1890	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1532	1891	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1605,27 +1964,27 @@
1605	1964
1606	1965	makeSomething(obj);
1607	1966	} else
1608		- if (source == gridItem)
	1967	+ if (source == gridItem \|\| source == gridButton)
1609	1968	{
1610	1969	makeSomething(new Grid());
1611	1970	} else
1612		- if (source == ellipsoidItem)
	1971	+ if (source == ellipsoidItem \|\| source == sphereButton)
1613	1972	{
1614	1973	makeSomething(new Sphere());
1615	1974	} else
1616		- if (source == coneItem)
	1975	+ if (source == coneItem \|\| source == coneButton)
1617	1976	{
1618	1977	makeSomething(new Cone());
1619	1978	} else
1620		- if (source == torusItem)
	1979	+ if (source == torusItem \|\| source == torusButton)
1621	1980	{
1622	1981	makeSomething(new Torus());
1623	1982	} else
1624		- if (source == superItem)
	1983	+ if (source == superItem \|\| source == superButton)
1625	1984	{
1626	1985	makeSomething(new Superellipsoid());
1627	1986	} else
1628		- if (source == kleinItem)
	1987	+ if (source == kleinItem \|\| source == kleinButton)
1629	1988	{
1630	1989	makeSomething(new Klein());
1631	1990	} else
..	..	@@ -1645,7 +2004,7 @@
1645	2004	{
1646	2005	makeSomething(new BezierSurface());
1647	2006	} else
1648		- if (source == checkerItem)
	2007	+ if (source == overlayItem \|\| source == overlayButton)
1649	2008	{
1650	2009	/*
1651	2010	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1693,7 +2052,7 @@
1693	2052	s.setup();
1694	2053	makeSomething(s);
1695	2054	} else
1696		- if (source == lightItem)
	2055	+ if (source == lightItem \|\| source == lightButton)
1697	2056	{
1698	2057	makeSomething(new Light());
1699	2058	} else
..	..	@@ -1743,7 +2102,7 @@
1743	2102
1744	2103	group(g);
1745	2104	} else
1746		- if (source == loopItem)
	2105	+ if (source == loopItem \|\| source == loopButton)
1747	2106	{
1748	2107	Composite csg = new GroupLeaf();
1749	2108	csg.count = 5;
..	..	@@ -1779,23 +2138,6 @@
1779	2138	csg.addChild(child);
1780	2139	child.addChild(csg);
1781	2140	} else
1782		-
1783		- if (source == importGFDItem)
1784		- {
1785		- ImportGFD();
1786		- } else
1787		- if (source == importVRMLX3DItem)
1788		- {
1789		- ImportVRMLX3D();
1790		- } else
1791		- if (source == import3DSItem)
1792		- {
1793		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1794		- } else
1795		- if (source == importOBJItem)
1796		- {
1797		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1798		- } else
1799	2141	if (source == computeAOItem)
1800	2142	{
1801	2143	Globals.drawMode = CameraPane.OCCLUSION;
..	..	@@ -1814,7 +2156,7 @@
1814	2156	if (source == invariantsItem)
1815	2157	{
1816	2158	System.out.println("Invariants:");
1817		- GrafreeD.grafreeD.universe.invariants();
	2159	+ Grafreed.grafreeD.universe.invariants();
1818	2160	} else
1819	2161	if (source == memoryItem)
1820	2162	{
..	..	@@ -1832,6 +2174,35 @@
1832	2174	if (source == dumpItem)
1833	2175	{
1834	2176	DumpObject();
	2177	+ } else
	2178	+ if (source == minButton)
	2179	+ {
	2180	+ Minimize();
	2181	+ } else
	2182	+ if (source == maxButton)
	2183	+ {
	2184	+ Maximize();
	2185	+ } else
	2186	+ if (source == fullButton)
	2187	+ {
	2188	+ ToggleFullScreen();
	2189	+ } else
	2190	+ if (source == undoButton)
	2191	+ {
	2192	+ Undo();
	2193	+ } else
	2194	+ if (source == redoButton)
	2195	+ {
	2196	+ Redo();
	2197	+ } else
	2198	+ if (source == saveButton)
	2199	+ {
	2200	+ Save();
	2201	+ } else
	2202	+ if (source == oneStepButton)
	2203	+ {
	2204	+ Globals.ONESTEP = true;
	2205	+ cameraView.repaint();
1835	2206	} else
1836	2207	if (source == screenfitButton)
1837	2208	{
..	..	@@ -1882,12 +2253,20 @@
1882	2253	{
1883	2254	loadClipboard(true);
1884	2255	} else
	2256	+ if (source == undoItem)
	2257	+ {
	2258	+ Undo();
	2259	+ } else
	2260	+ if (source == redoItem)
	2261	+ {
	2262	+ Redo();
	2263	+ } else
1885	2264	if (source == duplicateItem)
1886	2265	{
1887		- Object3D keep = GrafreeD.clipboard;
	2266	+ Object3D keep = Grafreed.clipboard;
1888	2267	loadClipboard(false);
1889	2268	paste(false);
1890		- GrafreeD.clipboard = keep;
	2269	+ Grafreed.clipboard = keep;
1891	2270	} else
1892	2271	if (source == cloneItem)
1893	2272	{
..	..	@@ -1905,13 +2284,17 @@
1905	2284	{
1906	2285	paste(false);
1907	2286	} else
	2287	+ if (source == pasteIntoItem)
	2288	+ {
	2289	+ pasteInto(true, false);
	2290	+ } else
1908	2291	if (source == pasteLinkItem)
1909	2292	{
1910		- pasteInto(false);
	2293	+ pasteInto(false, false);
1911	2294	} else
1912	2295	if (source == pasteCloneItem)
1913	2296	{
1914		- pasteInto(true);
	2297	+ pasteInto(true, true);
1915	2298	} else
1916	2299	if (source == pasteExpandItem)
1917	2300	{
..	..	@@ -2103,9 +2486,9 @@
2103	2486	// group.selection.get(0).setMasterThis(content); // should be identity
2104	2487	// refreshContents();
2105	2488	// }
2106		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2489	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2107	2490	{
2108		- Object3D content = GrafreeD.clipboard.get(0);
	2491	+ Object3D content = Grafreed.clipboard.get(0);
2109	2492
2110	2493	if (content instanceof cGroup && ((cGroup)content).transientlink )
2111	2494	content = ((cGroup)content).get(0);
..	..	@@ -2113,11 +2496,11 @@
2113	2496	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2114	2497	for (int i=0; i<group.selection.size(); i++)
2115	2498	{
2116		- boolean random = CameraPane.RANDOM;
2117		- CameraPane.RANDOM = false; // parse all random nodes
	2499	+ boolean random = CameraPane.SWITCH;
	2500	+ CameraPane.SWITCH = false; // parse all random nodes
2118	2501	group.selection.get(i).linkVerticesThis(content);
2119	2502	// group.selection.get(i).setMasterThis(content); // should be identity
2120		- CameraPane.RANDOM = random;
	2503	+ CameraPane.SWITCH = random;
2121	2504	}
2122	2505	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2123	2506	refreshContents();
..	..	@@ -2127,20 +2510,20 @@
2127	2510	{
2128	2511	for (int i=0; i<group.selection.size(); i++)
2129	2512	{
2130		- boolean random = CameraPane.RANDOM;
2131		- CameraPane.RANDOM = false; // parse all random nodes
	2513	+ boolean random = CameraPane.SWITCH;
	2514	+ CameraPane.SWITCH = false; // parse all random nodes
2132	2515	group.selection.get(i).linkVerticesThis(null);
2133		- CameraPane.RANDOM = random;
	2516	+ CameraPane.SWITCH = random;
2134	2517	}
2135	2518
2136	2519	refreshContents();
2137	2520	} else
2138	2521	if (source == relinkverticesItem)
2139	2522	{
2140		- boolean random = CameraPane.RANDOM;
2141		- CameraPane.RANDOM = false; // parse all random nodes
	2523	+ boolean random = CameraPane.SWITCH;
	2524	+ CameraPane.SWITCH = false; // parse all random nodes
2142	2525	group.selection.RelinkToSupport();
2143		- CameraPane.RANDOM = random;
	2526	+ CameraPane.SWITCH = random;
2144	2527
2145	2528	refreshContents();
2146	2529	} else
..	..	@@ -2155,9 +2538,9 @@
2155	2538	} else
2156	2539	if (source == setMasterItem)
2157	2540	{
2158		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2541	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2159	2542	{
2160		- Object3D content = GrafreeD.clipboard.get(0);
	2543	+ Object3D content = Grafreed.clipboard.get(0);
2161	2544
2162	2545	if (content instanceof cGroup && ((cGroup)content).transientlink )
2163	2546	content = ((cGroup)content).get(0);
..	..	@@ -2170,9 +2553,9 @@
2170	2553	{
2171	2554	if (group.selection.size() == 1)
2172	2555	{
2173		- if (GrafreeD.clipboard.size() == 1)
	2556	+ if (Grafreed.clipboard.size() == 1)
2174	2557	{
2175		- Object3D content = GrafreeD.clipboard.get(0);
	2558	+ Object3D content = Grafreed.clipboard.get(0);
2176	2559
2177	2560	if (content instanceof cGroup && ((cGroup)content).transientlink )
2178	2561	content = ((cGroup)content).get(0);
..	..	@@ -2189,7 +2572,7 @@
2189	2572	{
2190	2573	RevertMeshes();
2191	2574	} else
2192		- if (source == resetMeshItem)
	2575	+ if (source == resetAllItem)
2193	2576	{
2194	2577	ResetAll();
2195	2578	} else
..	..	@@ -2209,9 +2592,9 @@
2209	2592	{
2210	2593	ClearSelection(true);
2211	2594	} else
2212		- if (source == grabItem)
	2595	+ if (source == grabItem \|\| source == groupButton)
2213	2596	{
2214		- group(new cGroup(), true);
	2597	+ group(new cGroup(), false); // true);
2215	2598	} else
2216	2599	if (source == hideItem)
2217	2600	{
..	..	@@ -2229,16 +2612,16 @@
2229	2612	{
2230	2613	makeSomething(new Camera());
2231	2614	} else
2232		- if (source == compositeItem)
	2615	+ if (source == compositeItem \|\| source == compositeButton)
2233	2616	{
2234	2617	group(new Composite());
2235	2618	} else
2236		- if (source == randomItem)
	2619	+ if (source == switchItem \|\| source == switchButton)
2237	2620	{
2238	2621	RandomNode random = new RandomNode();
2239	2622	group(random);
2240	2623	if (random.size() > 0)
2241		- random.name = random.get(0).name + "Rnd";
	2624	+ random.name = random.get(0).name + "Switch";
2242	2625	} else
2243	2626	if (source == physicsItem)
2244	2627	{
..	..	@@ -2335,7 +2718,7 @@
2335	2718	{
2336	2719	group(new cLinker());
2337	2720	} else
2338		- if (source == textureItem)
	2721	+ if (source == textureItem \|\| source == textureButton)
2339	2722	{
2340	2723	group(new TextureNode());
2341	2724	} else
..	..	@@ -2355,7 +2738,7 @@
2355	2738	{
2356	2739	CastShadow(2);
2357	2740	} else
2358		- if (source == ungroupItem)
	2741	+ if (source == ungroupItem \|\| source == ungroupButton)
2359	2742	{
2360	2743	//ungroup();
2361	2744	for (int i=0; i<group.selection.size(); i++)
..	..	@@ -2377,7 +2760,7 @@
2377	2760	} else
2378	2761	if (source == genNormalsMESHItem)
2379	2762	{
2380		- GenNormals(true); // TODO
	2763	+ GenNormalsMESH();
2381	2764	} else
2382	2765	if (source == genNormalsORGANItem)
2383	2766	{
..	..	@@ -2442,6 +2825,22 @@
2442	2825	if (source == unmarkleavesItem)
2443	2826	{
2444	2827	MarkLeaves(false);
	2828	+ } else
	2829	+ if (source == rewindleavesItem)
	2830	+ {
	2831	+ RewindLeaves(true);
	2832	+ } else
	2833	+ if (source == unrewindleavesItem)
	2834	+ {
	2835	+ RewindLeaves(false);
	2836	+ } else
	2837	+ if (source == randomleavesItem)
	2838	+ {
	2839	+ RandomLeaves(true);
	2840	+ } else
	2841	+ if (source == unrandomleavesItem)
	2842	+ {
	2843	+ RandomLeaves(false);
2445	2844	} else
2446	2845	if (source == flipVItem)
2447	2846	{
..	..	@@ -2527,9 +2926,13 @@
2527	2926	{
2528	2927	SmoothMesh();
2529	2928	} else
2530		- if (source == transformgeometryItem)
	2929	+ if (source == transformGeometryItem)
2531	2930	{
2532	2931	TransformGeometry();
	2932	+ } else
	2933	+ if (source == transformChildrenItem)
	2934	+ {
	2935	+ TransformChildren();
2533	2936	} else
2534	2937	if (source == resetTransformItem)
2535	2938	{
..	..	@@ -2537,7 +2940,11 @@
2537	2940	} else
2538	2941	if (source == resetCentroidItem)
2539	2942	{
2540		- ResetCentroid();
	2943	+ ResetCentroid(true);
	2944	+ } else
	2945	+ if (source == resetCentroidXZItem)
	2946	+ {
	2947	+ ResetCentroid(false);
2541	2948	} else
2542	2949	if (source == resetParentItem)
2543	2950	{
..	..	@@ -2669,6 +3076,10 @@
2669	3076	if (source == twoButton)
2670	3077	{
2671	3078	radio.layout = twoButton;
	3079	+
	3080	+ if (CameraPane.FULLSCREEN)
	3081	+ fullscreenLayout = radio.layout;
	3082	+
2672	3083	// bug
2673	3084	//gridPanel.setDividerLocation(1.0);
2674	3085	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2701,10 +3112,31 @@
2701	3112	bigThree.ClearUI();
2702	3113	bigThree.add(centralPanel);
2703	3114	bigThree.FlushUI();
	3115	+
	3116	+ cameraView.requestFocusInWindow();
	3117	+
	3118	+// refreshContents(true);
	3119	+//
	3120	+// try
	3121	+// {
	3122	+// java.awt.Robot bot = new java.awt.Robot();
	3123	+// int mask = InputEvent.BUTTON1_MASK;
	3124	+// bot.mouseMove(100, 100);
	3125	+// bot.mousePress(mask);
	3126	+// bot.mouseRelease(mask);
	3127	+// }
	3128	+// catch (Exception e)
	3129	+// {
	3130	+//
	3131	+// }
	3132	+
2704	3133	} else
2705	3134	if (source == threeButton)
2706	3135	{
2707	3136	radio.layout = threeButton;
	3137	+
	3138	+ if (CameraPane.FULLSCREEN)
	3139	+ fullscreenLayout = radio.layout;
2708	3140
2709	3141	// bigThree.remove(scenePanel);
2710	3142	// bigThree.remove(centralPanel);
..	..	@@ -2737,10 +3169,15 @@
2737	3169	bigThree.add(centralPanel);
2738	3170	bigThree.add(XYZPanel);
2739	3171	bigThree.FlushUI();
	3172	+
	3173	+ cameraView.requestFocusInWindow();
2740	3174	} else
2741	3175	if (source == fourButton)
2742	3176	{
2743	3177	radio.layout = fourButton;
	3178	+
	3179	+ if (CameraPane.FULLSCREEN)
	3180	+ fullscreenLayout = radio.layout;
2744	3181
2745	3182	// bigThree.remove(scenePanel);
2746	3183	// bigThree.remove(centralPanel);
..	..	@@ -2772,10 +3209,15 @@
2772	3209	bigThree.ClearUI();
2773	3210	bigThree.add(scenePanel);
2774	3211	bigThree.FlushUI();
	3212	+
	3213	+ cameraView.requestFocusInWindow();
2775	3214	} else
2776	3215	if (source == sixButton)
2777	3216	{
2778	3217	radio.layout = sixButton;
	3218	+
	3219	+ if (CameraPane.FULLSCREEN)
	3220	+ fullscreenLayout = radio.layout;
2779	3221
2780	3222	// bigThree.remove(scenePanel);
2781	3223	// bigThree.remove(centralPanel);
..	..	@@ -2808,10 +3250,15 @@
2808	3250	bigThree.add(scenePanel);
2809	3251	bigThree.add(centralPanel);
2810	3252	bigThree.FlushUI();
	3253	+
	3254	+ cameraView.requestFocusInWindow();
2811	3255	} else
2812	3256	if (source == sevenButton)
2813	3257	{
2814	3258	radio.layout = sevenButton;
	3259	+
	3260	+ if (CameraPane.FULLSCREEN)
	3261	+ fullscreenLayout = radio.layout;
2815	3262
2816	3263	// bigThree.remove(scenePanel);
2817	3264	// bigThree.remove(centralPanel);
..	..	@@ -2845,6 +3292,8 @@
2845	3292	bigThree.add(centralPanel);
2846	3293	bigThree.add(XYZPanel);
2847	3294	bigThree.FlushUI();
	3295	+
	3296	+ cameraView.requestFocusInWindow();
2848	3297	} else
2849	3298	if (source == rootButton)
2850	3299	{
..	..	@@ -2856,6 +3305,7 @@
2856	3305	EditObject(obj);
2857	3306	}
2858	3307
	3308	+ cameraView.requestFocusInWindow();
2859	3309	refreshContents(true);
2860	3310	} else
2861	3311	if (source == closeButton)
..	..	@@ -2865,22 +3315,37 @@
2865	3315	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2866	3316	{
2867	3317	ab = (cRadio)e.nextElement();
2868		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3318	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2869	3319	{
	3320	+ // Patch to avoid bug with transparency.
	3321	+ if (!ab.hadMaterial)
	3322	+ {
	3323	+ ab.object.material = null;
	3324	+ }
	3325	+
2870	3326	buttonGroup.remove(ab);
2871	3327	radioPanel.remove(ab);
2872	3328
2873		- ab.GetObject().editWindow = null;
	3329	+ //ab.GetObject().editWindow = null;
	3330	+ ab.GetObject().manipWindow = null;
2874	3331	// ab.GetObject().objectUI = null; // ?????????
2875	3332
2876	3333	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2877	3334	break;
2878	3335	}
2879	3336	}
	3337	+
	3338	+ cameraView.requestFocusInWindow();
2880	3339	refreshContents(true);
2881	3340	} else
2882	3341	if (source == editItem \|\| source == editButton)
2883	3342	{
	3343	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3344	+ {
	3345	+ Object3D child = (Object3D)e.nextElement();
	3346	+ child.pinned = true;
	3347	+ }
	3348	+
2884	3349	EditSelection(false);
2885	3350	} else
2886	3351	if (source == uneditButton)
..	..	@@ -2890,12 +3355,13 @@
2890	3355	Object3D child = (Object3D)e.nextElement();
2891	3356	if(child.editWindow != null)
2892	3357	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3358	+ child.pinned = false;
2893	3359	child.CloseUI();
2894	3360	listUI.remove(child);
2895	3361
2896		- child.editWindow = null; // ???????????
	3362	+ //child.editWindow = null; // ???????????
2897	3363	}
2898		- objEditor.ctrlPanel.validate();
	3364	+ objEditor.ctrlPanel.FlushUI();
2899	3365	//objEditor.jTree.clearSelection();
2900	3366	//objEditor.ResetSliders();
2901	3367	refreshContents(true);
..	..	@@ -2906,6 +3372,7 @@
2906	3372	//copy.ClearUI();
2907	3373	for (Object3D obj : listUI)
2908	3374	{
	3375	+ obj.pinned = true;
2909	3376	obj.CloseUI();
2910	3377	}
2911	3378	listUI.clear();
..	..	@@ -2915,7 +3382,7 @@
2915	3382	{
2916	3383	assert(copy == group);
2917	3384
2918		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3385	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2919	3386
2920	3387	for (Object3D obj : listUI)
2921	3388	{
..	..	@@ -2979,7 +3446,11 @@
2979	3446	frontView.object = group;
2980	3447	sideView.object = group;
2981	3448	}
2982		- group.editWindow = this;
	3449	+
	3450	+// fix "+" issue
	3451	+ //group.editWindow = this;
	3452	+ group.manipWindow = this;
	3453	+
2983	3454	/*
2984	3455	currentLayout = radio.layout;
2985	3456	if (currentLayout == null)
..	..	@@ -2991,8 +3462,23 @@
2991	3462	//group.parent = null; // ROOT
2992	3463	//group.attributes = -1;
2993	3464	ResetModel();
	3465	+
	3466	+ cameraView.requestFocusInWindow();
2994	3467	refreshContents(true);
2995		- }
	3468	+ } else if (event.getSource() == editCameraItem)
	3469	+ {
	3470	+ cameraView.ProtectCamera();
	3471	+ cameraView.repaint();
	3472	+ return;
	3473	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3474	+ {
	3475	+ cameraView.RevertCamera();
	3476	+ cameraView.repaint();
	3477	+ return;
	3478	+ // } else if (event.getSource() == textureButton)
	3479	+ // {
	3480	+ // return; // true;
	3481	+ }
2996	3482	else
2997	3483	{
2998	3484	//return super.action(event, arg);
..	..	@@ -3001,7 +3487,6 @@
3001	3487	}
3002	3488
3003	3489	boolean useclient = false;
3004		- cRadio radio;
3005	3490
3006	3491	void ToggleRoot()
3007	3492	{
..	..	@@ -3053,6 +3538,28 @@
3053	3538	refreshContents();
3054	3539	}
3055	3540
	3541	+ void TransformChildren()
	3542	+ {
	3543	+ Object3D obj;
	3544	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3545	+ {
	3546	+ obj = (Object3D)e.nextElement();
	3547	+ obj.KeepTextureMatrices();
	3548	+ obj.TransformChildren();
	3549	+ obj.RestoreTextureMatrices();
	3550	+
	3551	+// if (obj.parent == null)
	3552	+// {
	3553	+// System.out.println("NULL PARENT!");
	3554	+// new Exception().printStackTrace();
	3555	+// }
	3556	+// else
	3557	+// TouchTransform(obj);
	3558	+// //obj.parent.Touch();
	3559	+ }
	3560	+
	3561	+ refreshContents();
	3562	+ }
3056	3563
3057	3564	void ResetTransform()
3058	3565	{
..	..	@@ -3165,7 +3672,7 @@
3165	3672	refreshContents();
3166	3673	}
3167	3674
3168		- void ResetCentroid()
	3675	+ void ResetCentroid(boolean full)
3169	3676	{
3170	3677	Object3D obj;
3171	3678	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3180,12 +3687,16 @@
3180	3687	LA.matIdentity(Object3D.mat);
3181	3688	obj.getBounds(minima, maxima, false);
3182	3689	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3183		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3690	+ if (full)
	3691	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3184	3692	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3185	3693	obj.TransformMesh(Object3D.mat);
	3694	+
3186	3695	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3187		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3696	+ if (full)
	3697	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3188	3698	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3699	+
3189	3700	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3190	3701	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3191	3702	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3214,7 +3725,8 @@
3214	3725
3215	3726	int size = obj.MemorySize();
3216	3727
3217		- System.err.println((size/1024) + " KB is the size of " + obj);
	3728	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3729	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3218	3730	}
3219	3731	}
3220	3732	catch (Exception e)
..	..	@@ -3251,9 +3763,9 @@
3251	3763	obj = (Object3D)e.nextElement();
3252	3764
3253	3765	System.out.println("Object is: " + obj);
3254		- GrafreeD.AnalyzeObject(obj);
	3766	+ Grafreed.AnalyzeObject(obj);
3255	3767	System.out.println("Boundary rep: " + obj.bRep);
3256		- GrafreeD.AnalyzeObject(obj.bRep);
	3768	+ Grafreed.AnalyzeObject(obj.bRep);
3257	3769
3258	3770	// System.err.println((size/1024) + " KB is the size of " + obj);
3259	3771	}
..	..	@@ -3295,6 +3807,13 @@
3295	3807	void GenNormals(boolean crease)
3296	3808	{
3297	3809	group.GenNormalsS(crease);
	3810	+
	3811	+ refreshContents();
	3812	+ }
	3813	+
	3814	+ void GenNormalsMESH()
	3815	+ {
	3816	+ group.GenNormalsMeshS();
3298	3817
3299	3818	refreshContents();
3300	3819	}
..	..	@@ -3467,8 +3986,8 @@
3467	3986
3468	3987	void ParseVertices()
3469	3988	{
3470		- boolean epsequal = GrafreeD.epsequal;
3471		- GrafreeD.epsequal = true;
	3989	+ boolean epsequal = Grafreed.epsequal;
	3990	+ Grafreed.epsequal = true;
3472	3991
3473	3992	for (int i=0; i<group.selection.size(); i++)
3474	3993	{
..	..	@@ -3493,7 +4012,7 @@
3493	4012	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3494	4013	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3495	4014
3496		- g.add(GrafreeD.clipboard);
	4015	+ g.add(Grafreed.clipboard);
3497	4016
3498	4017	buffer.add(g);
3499	4018	}
..	..	@@ -3508,7 +4027,7 @@
3508	4027	makeSomething(buffer, i==group.selection.size()-1);
3509	4028	}
3510	4029
3511		- GrafreeD.epsequal = epsequal;
	4030	+ Grafreed.epsequal = epsequal;
3512	4031
3513	4032	refreshContents();
3514	4033	}
..	..	@@ -3526,7 +4045,16 @@
3526	4045	String pigment = Object3D.GetPigment(tex);
3527	4046	//String bump = Object3D.GetBump(tex);
3528	4047
3529		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4048	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4049	+
	4050	+ try
	4051	+ {
	4052	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4053	+ }
	4054	+ catch (Exception e)
	4055	+ {
	4056	+ System.err.println("FAIL: " + node);
	4057	+ }
3530	4058
3531	4059	double s = v.s;
3532	4060
..	..	@@ -3614,11 +4142,11 @@
3614	4142
3615	4143	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3616	4144
3617		- boolean random = CameraPane.RANDOM;
3618		- CameraPane.RANDOM = false; // parse all random nodes
	4145	+ boolean random = CameraPane.SWITCH;
	4146	+ CameraPane.SWITCH = false; // parse all random nodes
3619	4147	lowres.linkVerticesThis(null);
3620	4148	lowres.linkVerticesThis(sn);
3621		- CameraPane.RANDOM = random;
	4149	+ CameraPane.SWITCH = random;
3622	4150
3623	4151	System.err.flush();
3624	4152
..	..	@@ -3658,7 +4186,7 @@
3658	4186	return;
3659	4187
3660	4188	Object3D poses = group.selection.get(0);
3661		- Object3D ref = GrafreeD.clipboard.get(0);
	4189	+ Object3D ref = Grafreed.clipboard.get(0);
3662	4190
3663	4191	Object3D newgroup = new Object3D("Po:" + poses.name);
3664	4192
..	..	@@ -3852,9 +4380,9 @@
3852	4380
3853	4381	void ClipMesh()
3854	4382	{
3855		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4383	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3856	4384	{
3857		- Object3D content = GrafreeD.clipboard.get(0);
	4385	+ Object3D content = Grafreed.clipboard.get(0);
3858	4386
3859	4387	if (content instanceof cGroup && ((cGroup)content).transientlink )
3860	4388	content = ((cGroup)content).get(0);
..	..	@@ -3863,7 +4391,7 @@
3863	4391	// {
3864	4392	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3865	4393	// }
3866		- group.selection.ClipMesh(GrafreeD.clipboard);
	4394	+ group.selection.ClipMesh(Grafreed.clipboard);
3867	4395	}
3868	4396	// group.selection.ClipMesh(GrafreeD.clipboard);
3869	4397	System.out.println("DONE.");
..	..	@@ -3910,6 +4438,18 @@
3910	4438	void MarkLeaves(boolean hide)
3911	4439	{
3912	4440	group.selection.MarkLeaves(hide);
	4441	+ refreshContents();
	4442	+ }
	4443	+
	4444	+ void RewindLeaves(boolean hide)
	4445	+ {
	4446	+ group.selection.RewindLeaves(hide);
	4447	+ refreshContents();
	4448	+ }
	4449	+
	4450	+ void RandomLeaves(boolean hide)
	4451	+ {
	4452	+ group.selection.RandomLeaves(hide);
3913	4453	refreshContents();
3914	4454	}
3915	4455
..	..	@@ -3984,10 +4524,6 @@
3984	4524	// }
3985	4525	// }
3986	4526
3987		- static boolean allparams = true;
3988		-
3989		- static Vector<Object3D> listUI = new Vector<Object3D>();
3990		-
3991	4527	void EditSelection(boolean newWindow)
3992	4528	{
3993	4529	// aConstraints.gridy = 0;
..	..	@@ -3995,10 +4531,10 @@
3995	4531	{
3996	4532	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
3997	4533	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3998		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4534	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3999	4535
4000	4536	Object3D elem = (Object3D)group.selection.elementAt(i);
4001		- if(elem != group)
	4537	+ if(elem != group \|\| !newWindow)
4002	4538	{
4003	4539	// if (!(elem instanceof Composite))
4004	4540	// newWindow = false;
..	..	@@ -4081,6 +4617,17 @@
4081	4617
4082	4618	freezemodel = true;
4083	4619
	4620	+ //for (Object3D obj : listUI)
	4621	+ for (int i=listUI.size(); --i>=0;)
	4622	+ {
	4623	+ Object3D obj = listUI.elementAt(i);
	4624	+ if (!obj.pinned)
	4625	+ {
	4626	+ obj.CloseUI();
	4627	+ listUI.remove(i);
	4628	+ }
	4629	+ }
	4630	+
4084	4631	/**/
4085	4632	//switch (event.id)
4086	4633	{
..	..	@@ -4088,7 +4635,6 @@
4088	4635	//case 702: // Event.LIST_DESELECT
4089	4636	group.deselectAll();
4090	4637	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4091		- objEditor.ClearInfo(); // .GetMaterial());
4092	4638	if (tps != null)
4093	4639	{
4094	4640	for (int i=0; i < tps.length; i++)
..	..	@@ -4097,10 +4643,8 @@
4097	4643
4098	4644	//if (child.parent != null)
4099	4645	//child.parent.addSelectee(child);
	4646	+ objEditor.SetMaterial(child);
4100	4647	group.addSelectee(child);
4101		- objEditor.SetMaterial(child); // .GetMaterial());
4102		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4103		- System.err.println("info : " + child.GetPath());
4104	4648	}
4105	4649	}
4106	4650	// else
..	..	@@ -4110,20 +4654,28 @@
4110	4654	// System.err.println("info : " + group.GetPath());
4111	4655	// }
4112	4656
4113		- objEditor.SetText(); // jan 2014
4114		-
4115		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4657	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4116	4658	CameraPane.flash = true;
4117	4659
4118		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4660	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4119	4661	// a camera
4120	4662	{
4121		- CameraPane.camerachangeframe = 0; // don't refuse it
4122		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4663	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	4664	+ {
	4665	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4666	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4667	+ }
4123	4668	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4124	4669	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4125	4670	}
4126	4671
	4672	+ if (tps != null && tps.length == 1)
	4673	+ {
	4674	+ EditSelection(false);
	4675	+ }
	4676	+
	4677	+ SetPinStates(tps != null && tps.length > 0);
	4678	+
4127	4679	refreshContents();
4128	4680	//return true;
4129	4681	}
..	..	@@ -4132,6 +4684,33 @@
4132	4684
4133	4685	freezemodel = false;
4134	4686	}
	4687	+
	4688	+ void SetPinStates(boolean enabled)
	4689	+ {
	4690	+ editButton.setEnabled(enabled);
	4691	+ uneditButton.setEnabled(enabled);
	4692	+ }
	4693	+
	4694	+ void refreshContents(boolean cp)
	4695	+ {
	4696	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4697	+ if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
	4698	+ {
	4699	+ objEditor.ClearInfo(); // .GetMaterial());
	4700	+
	4701	+ for (int i=0; i < group.selection.Size(); i++)
	4702	+ {
	4703	+ Object3D child = (Object3D) group.selection.get(i);
	4704	+
	4705	+ objEditor.AddInfo(child, this, true);
	4706	+ System.err.println("info : " + child.GetPath());
	4707	+ }
	4708	+
	4709	+ objEditor.SetText(); // jan 2014
	4710	+ }
	4711	+
	4712	+ super.refreshContents(cp);
	4713	+ }
4135	4714
4136	4715	void linkSomething(Object3D thing)
4137	4716	{
..	..	@@ -4203,16 +4782,19 @@
4203	4782	{
4204	4783	if (group.selection.isEmpty())
4205	4784	return;
4206		- GrafreeD.clipboardIsTempGroup = false;
	4785	+
	4786	+ Grafreed.clipboardIsTempGroup = false;
4207	4787	Composite tGroup = null;
4208	4788	if (group.selection.size() > 0) // 1)
4209	4789	{
4210	4790	tGroup = new cGroup();
4211		- GrafreeD.clipboardIsTempGroup = true;
	4791	+ Grafreed.clipboardIsTempGroup = true;
4212	4792	}
4213	4793
4214	4794	if (cut)
4215	4795	{
	4796	+ if (Globals.SAVEONMAKE)
	4797	+ Save();
4216	4798	//int indices[] = jList.getSelectedIndices();
4217	4799	//for (int i = indices.length - 1; i >= 0; i--)
4218	4800	//jList.remove(indices[i]);
..	..	@@ -4248,16 +4830,16 @@
4248	4830	//System.out.println("cut " + child);
4249	4831	//System.out.println("parent = " + child.parent);
4250	4832	// tmp.addChild(child);
4251		- if (GrafreeD.clipboardIsTempGroup)
	4833	+ if (Grafreed.clipboardIsTempGroup)
4252	4834	tGroup.add/Child/(tmp);
4253	4835	else
4254		- GrafreeD.clipboard = tmp;
	4836	+ Grafreed.clipboard = tmp;
4255	4837	}
4256	4838	else
4257		- if (GrafreeD.clipboardIsTempGroup)
	4839	+ if (Grafreed.clipboardIsTempGroup)
4258	4840	tGroup.add/Child/(child);
4259	4841	else
4260		- GrafreeD.clipboard = child;
	4842	+ Grafreed.clipboard = child;
4261	4843	}
4262	4844
4263	4845	//ResetModel();
..	..	@@ -4289,21 +4871,23 @@
4289	4871	//System.out.println("cut " + elem);
4290	4872	//System.out.println("parent = " + elem.parent);
4291	4873	// tmp.addChild(elem);
4292		- if (GrafreeD.clipboardIsTempGroup)
	4874	+ if (Grafreed.clipboardIsTempGroup)
4293	4875	tGroup.add/Child/(tmp);
4294	4876	else
4295		- GrafreeD.clipboard = tmp;
	4877	+ Grafreed.clipboard = tmp;
4296	4878	}
4297	4879	else
4298		- if (GrafreeD.clipboardIsTempGroup)
	4880	+ if (Grafreed.clipboardIsTempGroup)
4299	4881	tGroup.add/Child/(child);
4300	4882	else
4301		- GrafreeD.clipboard = child;
	4883	+ Grafreed.clipboard = child;
4302	4884	}
4303	4885
4304	4886	}
4305		- if (GrafreeD.clipboardIsTempGroup)
4306		- GrafreeD.clipboard = tGroup;
	4887	+
	4888	+ if (Grafreed.clipboardIsTempGroup)
	4889	+ Grafreed.clipboard = tGroup;
	4890	+
4307	4891	if (cut)
4308	4892	{
4309	4893	ResetModel();
..	..	@@ -4317,7 +4901,7 @@
4317	4901	// return;
4318	4902	boolean first = true;
4319	4903
4320		- if (GrafreeD.clipboardIsTempGroup)
	4904	+ if (Grafreed.clipboardIsTempGroup)
4321	4905	{
4322	4906	Composite temp;
4323	4907
..	..	@@ -4328,7 +4912,7 @@
4328	4912	temp = (Composite)Applet3D.clipboard.deepCopy();
4329	4913	*/
4330	4914	Object3D elem;
4331		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4915	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4332	4916	{
4333	4917	Object3D child = (Object3D)e.nextElement();
4334	4918
..	..	@@ -4362,21 +4946,21 @@
4362	4946	//Object3D cb = Applet3D.clipboard;
4363	4947	//temp.addChild(cb);
4364	4948	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4365		- assert(GrafreeD.clipboard.parent == null);
4366		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4367		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4368		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4369		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	4949	+ assert(Grafreed.clipboard.parent == null);
	4950	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4951	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4952	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4953	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4370	4954	else
4371		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4372		- GrafreeD.clipboard.get(0).parent = keepparent;
	4955	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4956	+ Grafreed.clipboard.get(0).parent = keepparent;
4373	4957	}
4374	4958
4375	4959	ResetModel();
4376	4960	refreshContents();
4377	4961	}
4378	4962
4379		- void pasteInto(boolean copyit)
	4963	+ void pasteInto(boolean copyit, boolean clone)
4380	4964	{
4381	4965	// if (GrafreeD.clipboard == null)
4382	4966	// return;
..	..	@@ -4405,15 +4989,22 @@
4405	4989	if (copyit)
4406	4990	{
4407	4991	// paste(false);
4408		- CloneClipboard(false); // sept 2014
	4992	+ if (clone)
	4993	+ {
	4994	+ CloneClipboard(false); // sept 2014
	4995	+ }
	4996	+ else
	4997	+ {
	4998	+ paste(false);
	4999	+ }
4409	5000	}
4410	5001	else
4411	5002	{
4412	5003	boolean first = true;
4413	5004
4414		- if (GrafreeD.clipboardIsTempGroup)
	5005	+ if (Grafreed.clipboardIsTempGroup)
4415	5006	{
4416		- Composite temp = (Composite)GrafreeD.clipboard;
	5007	+ Composite temp = (Composite)Grafreed.clipboard;
4417	5008	Object3D copy;
4418	5009	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4419	5010	{
..	..	@@ -4423,7 +5014,7 @@
4423	5014	}
4424	5015	} else
4425	5016	{
4426		- linkSomething(GrafreeD.clipboard); //.get(0));
	5017	+ linkSomething(Grafreed.clipboard); //.get(0));
4427	5018	}
4428	5019	}
4429	5020	}
..	..	@@ -4828,21 +5419,6 @@
4828	5419	}
4829	5420	*/
4830	5421
4831		- void ImportGFD()
4832		- {
4833		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4834		- browser.show();
4835		- String filename = browser.getFile();
4836		- if (filename != null && filename.length() > 0)
4837		- {
4838		- String fullname = browser.getDirectory() + filename;
4839		-
4840		- //Object3D readobj =
4841		- objEditor.ReadGFD(fullname, objEditor);
4842		- //makeSomething(readobj);
4843		- }
4844		- }
4845		-
4846	5422	/*
4847	5423	public void Callback(Object obj)
4848	5424	{
..	..	@@ -4866,26 +5442,9 @@
4866	5442	}
4867	5443	*/
4868	5444
4869		- void ImportVRMLX3D()
4870		- {
4871		- if (GrafreeD.standAlone)
4872		- {
4873		- /**/
4874		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4875		- browser.show();
4876		- String filename = browser.getFile();
4877		- if (filename != null && filename.length() > 0)
4878		- {
4879		- String fullname = browser.getDirectory() + filename;
4880		- LoadVRMLX3D(fullname);
4881		- }
4882		- /**/
4883		- }
4884		- }
4885		-
4886	5445	String GetFile(String dialogName)
4887	5446	{
4888		- if (GrafreeD.standAlone)
	5447	+ if (Grafreed.standAlone)
4889	5448	{
4890	5449	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4891	5450	browser.show();
..	..	@@ -4949,10 +5508,36 @@
4949	5508	cButton flashSelectionButton;
4950	5509	cButton editButton;
4951	5510	cButton uneditButton;
	5511	+ JCheckBox allParamsButton;
4952	5512	cButton clearpanelButton;
4953		- cButton allParamsButton;
4954	5513	cButton unselectButton;
4955	5514
	5515	+ cButton restoreCameraButton;
	5516	+
	5517	+ cButton minButton;
	5518	+ cButton maxButton;
	5519	+ cButton fullButton;
	5520	+ cButton saveButton;
	5521	+ cButton oneStepButton;
	5522	+
	5523	+ cButton groupButton;
	5524	+ cButton ungroupButton;
	5525	+ cButton compositeButton;
	5526	+ cButton switchButton;
	5527	+ cButton loopButton;
	5528	+ cButton textureButton;
	5529	+
	5530	+ cButton gridButton;
	5531	+ cButton boxButton;
	5532	+ cButton sphereButton;
	5533	+ cButton coneButton;
	5534	+ cButton torusButton;
	5535	+ cButton superButton;
	5536	+ cButton kleinButton;
	5537	+ cButton particlesButton;
	5538	+ cButton overlayButton;
	5539	+ cButton lightButton;
	5540	+
4956	5541	cButton screenfitButton;
4957	5542	cButton screenfitpointButton;
4958	5543	cButton snapobjectButton;
..	..	@@ -4964,14 +5549,6 @@
4964	5549
4965	5550	cButton setsupportButton;
4966	5551
4967		- cButton twoButton;
4968		- cButton sixButton;
4969		- cButton threeButton;
4970		- cButton sevenButton;
4971		- cButton fourButton; // full panel
4972		- cButton oneButton; // full XYZ
4973		- //cButton currentLayout;
4974		-
4975	5552	//
4976	5553	//Composite
4977	5554	Object3D // to do !!
..	..	@@ -4981,9 +5558,11 @@
4981	5558	//JTree jTree;
4982	5559	private MenuItem lookAtItem;
4983	5560	private MenuItem lookFromItem;
4984		- private MenuItem switchItem;
	5561	+ private MenuItem switchViewItem;
4985	5562	private MenuItem cutItem;
4986		- private MenuItem duplicateItem;
	5563	+ private MenuItem undoItem;
	5564	+ private MenuItem redoItem;
	5565	+ private JMenuItem duplicateItem;
4987	5566	private MenuItem cloneItem;
4988	5567	private MenuItem cloneSupportItem;
4989	5568	private MenuItem overwriteGeoItem;
..	..	@@ -4996,7 +5575,7 @@
4996	5575	private MenuItem linkverticesItem;
4997	5576	private MenuItem relinkverticesItem;
4998	5577	private MenuItem setMasterItem;
4999		- private MenuItem resetMeshItem;
	5578	+ private MenuItem resetAllItem;
5000	5579	private MenuItem stepAllItem;
5001	5580	private MenuItem revertMeshItem;
5002	5581	private MenuItem poseMeshItem;
..	..	@@ -5007,6 +5586,7 @@
5007	5586	private MenuItem mergeGeometriesItem;
5008	5587	private MenuItem copyItem;
5009	5588	private MenuItem pasteItem;
	5589	+ private MenuItem pasteIntoItem;
5010	5590	private MenuItem pasteLinkItem;
5011	5591	private MenuItem pasteCloneItem;
5012	5592	private MenuItem pasteExpandItem;
..	..	@@ -5045,6 +5625,10 @@
5045	5625	private MenuItem showleavesItem;
5046	5626	private MenuItem markleavesItem;
5047	5627	private MenuItem unmarkleavesItem;
	5628	+ private MenuItem rewindleavesItem;
	5629	+ private MenuItem unrewindleavesItem;
	5630	+ private MenuItem randomleavesItem;
	5631	+ private MenuItem unrandomleavesItem;
5048	5632
5049	5633	private MenuItem flipVItem;
5050	5634	private MenuItem unflipVItem;
..	..	@@ -5056,15 +5640,17 @@
5056	5640	private MenuItem panoTexturesItem;
5057	5641
5058	5642	private MenuItem resetCentroidItem;
5059		- private MenuItem transformgeometryItem;
	5643	+ private MenuItem resetCentroidXZItem;
5060	5644	private MenuItem resetTransformItem;
	5645	+ private MenuItem transformGeometryItem;
	5646	+ private MenuItem transformChildrenItem;
5061	5647	private MenuItem hideItem;
5062	5648	private MenuItem grabItem;
5063	5649	private MenuItem backItem;
5064	5650	private MenuItem frontItem;
5065	5651	private MenuItem cameraItem;
5066	5652	private MenuItem compositeItem;
5067		- private MenuItem randomItem;
	5653	+ private MenuItem switchItem;
5068	5654	private MenuItem physicsItem;
5069	5655	private MenuItem frameselectorItem;
5070	5656	private MenuItem scriptNodeItem;
..	..	@@ -5104,7 +5690,7 @@
5104	5690	private MenuItem blobItem;
5105	5691	private MenuItem latheItem;
5106	5692	private MenuItem bezierItem;
5107		- private MenuItem checkerItem;
	5693	+ private MenuItem overlayItem;
5108	5694	private MenuItem meshItem;
5109	5695	// private MenuItem meshGroupItem;
5110	5696	private MenuItem springItem;
..	..	@@ -5126,11 +5712,6 @@
5126	5712	private MenuItem doubleItem;
5127	5713	private MenuItem tripleItem;
5128	5714
5129		- private MenuItem importGFDItem;
5130		- private MenuItem importVRMLX3DItem;
5131		- private MenuItem import3DSItem;
5132		- private MenuItem importOBJItem;
5133		-
5134	5715	private MenuItem computeAOItem;
5135	5716	private MenuItem recompileItem;
5136	5717	private MenuItem editScriptItem;
..	..	@@ -5140,4 +5721,8 @@
5140	5721	private MenuItem analyzeItem;
5141	5722	private MenuItem dumpItem;
5142	5723	//boolean freezemodel = false;
	5724	+
	5725	+ Menu cameraMenu;
	5726	+ MenuItem editCameraItem;
	5727	+ MenuItem restoreCameraItem;
5143	5728	}