~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -60,6 +60,12 @@
60	60	this.copy = this.group = group;
61	61	//selectees = this.group.selectees;
62	62
	63	+ if (copy.versions == null)
	64	+ {
	65	+ copy.versions = new byte[100][];
	66	+ copy.versionindex = -1;
	67	+ }
	68	+
63	69	if(ui)
64	70	SetupUI(objEditor);
65	71	}
..	..	@@ -74,16 +80,28 @@
74	80	this.copy = this.group = copy;
75	81	//selectees = this.group.selectees;
76	82
77		- SetupMenu2(objEditor);
	83	+ SetupMenu2(this); //objEditor);
78	84	SetupUI2(objEditor);
79	85	objEditor.SetupUI(true);
80	86	SetupViews(objEditor);
81	87
82	88	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	89	+
	90	+ if (copy.versions == null)
	91	+ {
	92	+ copy.versions = new byte[100][];
	93	+ copy.versionindex = -1;
	94	+
	95	+ Save(true);
	96	+ }
83	97	}
84	98
85	99	void CloneSelection(boolean supports)
86	100	{
	101	+ if (Globals.REPLACEONMAKE)
	102	+ Save();
	103	+ boolean keep = Globals.REPLACEONMAKE;
	104	+ Globals.REPLACEONMAKE = false;
87	105	// Object3D keep = GrafreeD.clipboard;
88	106	//Object3D obj;
89	107	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,18 +112,19 @@
94	112
95	113	makeSomething(clone, i==group.selection.size()-1);
96	114	}
	115	+ Globals.REPLACEONMAKE = keep;
97	116	}
98	117
99	118	void CloneClipboard(boolean supports)
100	119	{
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));
	120	+ assert(Grafreed.clipboard.parent == null);
	121	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	122	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	123	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	124	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
106	125	else
107		- makeSomething(CloneObject(GrafreeD.clipboard, false));
108		- GrafreeD.clipboard.get(0).parent = keepparent;
	126	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	127	+ Grafreed.clipboard.get(0).parent = keepparent;
109	128	}
110	129
111	130	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -119,7 +138,7 @@
119	138	// obj.support = null;
120	139	if (!supports)
121	140	obj.SaveSupports();
122		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	141	+ Object3D clone = (Object3D)Grafreed.clone(obj);
123	142	obj.parent = parent;
124	143	// obj.support = support;
125	144	// clone.support = support; // aout 2013
..	..	@@ -148,28 +167,21 @@
148	167
149	168	//JTextField nameField;
150	169
151		- void SetupMenu2(ObjEditor oe)
	170	+ void SetupMenu2(GroupEditor oe)
152	171	{
153		- if (Globals.ADVANCED)
154		- {
155		- oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
156		- //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
157		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
158		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
159		- oe.cameraMenu.add("-");
160		- openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
161		- openWindowItem.addActionListener(this);
162		- editLeafItem.addActionListener(this);
163		- lookAtItem.addActionListener(this);
164		- //lookFromItem.addActinoListener(this);
165		- //switchItem.addActionListener(this);
166		- }
167		-
	172	+ oe.jTree = new cTree();
	173	+
168	174	Menu menu;
169	175	oe.menuBar.add(menu = new Menu("Edit"));
170	176	//editItem = menu.add(new MenuItem("Edit"));
171	177	//editItem.addActionListener(this);
172		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	178	+
	179	+// undoItem = menu.add(new MenuItem("Undo"));
	180	+// undoItem.addActionListener(this);
	181	+// redoItem = menu.add(new MenuItem("Redo"));
	182	+// redoItem.addActionListener(this);
	183	+// menu.add("-");
	184	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
173	185	duplicateItem.addActionListener(this);
174	186	cloneItem = menu.add(new MenuItem("Clone"));
175	187	cloneItem.addActionListener(this);
..	..	@@ -185,7 +197,6 @@
185	197	copyItem.addActionListener(this);
186	198	pasteItem = menu.add(new MenuItem("Paste"));
187	199	pasteItem.addActionListener(this);
188		- menu.add("-");
189	200
190	201	menu.add("-");
191	202	pasteIntoItem = menu.add(new MenuItem("Paste into"));
..	..	@@ -197,8 +208,8 @@
197	208	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
198	209	// pasteExpandItem.addActionListener(this);
199	210	menu.add("-");
200		- clearItem = menu.add(new MenuItem("Clear"));
201		- clearItem.addActionListener(this);
	211	+ deleteItem = menu.add(new MenuItem("Delete"));
	212	+ deleteItem.addActionListener(this);
202	213
203	214	if (Globals.ADVANCED)
204	215	{
..	..	@@ -206,14 +217,97 @@
206	217	clearAllItem = menu.add(new MenuItem("Clear All"));
207	218	clearAllItem.addActionListener(this);
208	219	}
	220	+
	221	+ menuBar.add(cameraMenu = new Menu("View"));
	222	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	223	+ //zBufferItem.addActionListener(this);
	224	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	225	+ //normalLensItem.addActionListener(this);
	226	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	227	+ restoreCameraItem.addActionListener(this);
	228	+
	229	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	230	+// toggleFullScreenItem.addItemListener(this);
	231	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	232	+// cameraMenu.add("-");
	233	+//
	234	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	235	+// toggleTextureItem.addItemListener(this);
	236	+// toggleTextureItem.setState(CameraPane.textureon);
	237	+//
	238	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	239	+// toggleSwitchItem.addItemListener(this);
	240	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	241	+
	242	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	243	+ toggleHandleItem.addItemListener(this);
	244	+ toggleHandleItem.setState(CameraPane.HANDLES);
	245	+
	246	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	247	+ togglePaintItem.addItemListener(this);
	248	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	249	+
	250	+ if (Globals.ADVANCED)
	251	+ {
	252	+ cameraMenu.add("-");
	253	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	254	+ toggleLiveItem.addItemListener(this);
	255	+ toggleLiveItem.setState(Globals.isLIVE());
209	256
	257	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	258	+ stepItem.addActionListener(this);
	259	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	260	+ // toggleDLItem.addItemListener(this);
	261	+ // toggleDLItem.setState(false);
	262	+
	263	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	264	+ toggleRenderItem.addItemListener(this);
	265	+ toggleRenderItem.setState(!CameraPane.frozen);
	266	+
	267	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	268	+ toggleDebugItem.addItemListener(this);
	269	+ toggleDebugItem.setState(Globals.DEBUG);
	270	+
	271	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	272	+ toggleFrustumItem.addItemListener(this);
	273	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	274	+
	275	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	276	+ toggleFootContactItem.addItemListener(this);
	277	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	278	+
	279	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	280	+ toggleTimelineItem.addItemListener(this);
	281	+ }
	282	+
	283	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	284	+// toggleRootItem.addItemListener(this);
	285	+// toggleRootItem.setState(false);
	286	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	287	+// animationItem.addItemListener(this);
	288	+// animationItem.setState(CameraPane.ANIMATION);
	289	+ cameraMenu.add("-");
	290	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	291	+ editCameraItem.addActionListener(this);
	292	+
	293	+ if (Globals.ADVANCED)
	294	+ {
	295	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	296	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	297	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	298	+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	299	+ oe.cameraMenu.add("-");
	300	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	301	+ openWindowItem.addActionListener(this);
	302	+ editLeafItem.addActionListener(this);
	303	+ lookAtItem.addActionListener(this);
	304	+ //lookFromItem.addActinoListener(this);
	305	+ //switchViewItem.addActionListener(this);
	306	+ }
	307	+
210	308	oe.menuBar.add(menu = new Menu("Setting"));
211	309	if (Globals.ADVANCED)
212	310	{
213		- resetMeshItem = menu.add(new MenuItem("Reset All"));
214		- resetMeshItem.addActionListener(this);
215		- stepAllItem = menu.add(new MenuItem("Step All"));
216		- stepAllItem.addActionListener(this);
217	311	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
218	312	revertMeshItem.addActionListener(this);
219	313	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
..	..	@@ -253,21 +347,29 @@
253	347	}
254	348
255	349	oe.menuBar.add(menu = new Menu("Group"));
256		- grabItem = menu.add(new MenuItem("Grab"));
257		- grabItem.addActionListener(this);
	350	+// grabItem = menu.add(new MenuItem("Grab"));
	351	+// grabItem.addActionListener(this);
258	352	backItem = menu.add(new MenuItem("Back"));
259	353	backItem.addActionListener(this);
260	354	frontItem = menu.add(new MenuItem("Front"));
261	355	frontItem.addActionListener(this);
262		- compositeItem = menu.add(new MenuItem("Composite"));
263		- compositeItem.addActionListener(this);
	356	+// compositeItem = menu.add(new MenuItem("Composite"));
	357	+// compositeItem.addActionListener(this);
	358	+
	359	+ if (Globals.ADVANCED)
	360	+ {
264	361	hideItem = menu.add(new MenuItem("Hidden Group"));
265	362	hideItem.addActionListener(this);
	363	+ }
266	364	ungroupItem = menu.add(new MenuItem("Ungroup"));
267	365	ungroupItem.addActionListener(this);
268		- menu.add("-");
269		- randomItem = menu.add(new MenuItem("Switch node"));
270		- randomItem.addActionListener(this);
	366	+
	367	+// menu.add("-");
	368	+//
	369	+// switchItem = menu.add(new MenuItem("Switch node"));
	370	+// switchItem.addActionListener(this);
	371	+ if (Globals.ADVANCED)
	372	+ {
271	373	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
272	374	switchGeoItem.addActionListener(this);
273	375	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -275,8 +377,6 @@
275	377	morphItem = menu.add(new MenuItem("Morph Group"));
276	378	morphItem.addActionListener(this);
277	379
278		- if (Globals.ADVANCED)
279		- {
280	380	menu.add("-");
281	381	physicsItem = menu.add(new MenuItem("Physics"));
282	382	physicsItem.addActionListener(this);
..	..	@@ -284,30 +384,29 @@
284	384	frameselectorItem.addActionListener(this);
285	385	scriptNodeItem = menu.add(new MenuItem("Script Node"));
286	386	scriptNodeItem.addActionListener(this);
287		- cameraItem = menu.add(new MenuItem("Camera"));
288		- cameraItem.addActionListener(this);
289	387	}
290	388
291	389	oe.menuBar.add(menu = new Menu("Object"));
292		- textureItem = menu.add(new MenuItem("Texture"));
293		- textureItem.addActionListener(this);
	390	+// textureItem = menu.add(new MenuItem("Texture"));
	391	+// textureItem.addActionListener(this);
294	392	billboardItem = menu.add(new MenuItem("Billboard"));
295	393	billboardItem.addActionListener(this);
296	394	csgItem = menu.add(new MenuItem("CSG"));
297	395	csgItem.addActionListener(this);
298		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	396	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
299	397	shadowXItem.addActionListener(this);
300		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	398	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
301	399	shadowYItem.addActionListener(this);
302		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	400	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
303	401	shadowZItem.addActionListener(this);
	402	+ attributeItem = menu.add(new MenuItem("Attribute"));
	403	+ attributeItem.addActionListener(this);
	404	+
304	405	if (Globals.ADVANCED)
305	406	{
306	407	menu.add("-");
307	408	linkerItem = menu.add(new MenuItem("Linker"));
308	409	linkerItem.addActionListener(this);
309		- attributeItem = menu.add(new MenuItem("Attribute"));
310		- attributeItem.addActionListener(this);
311	410	templateItem = menu.add(new MenuItem("Template"));
312	411	templateItem.addActionListener(this);
313	412	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -318,8 +417,12 @@
318	417	resetTransformItem.addActionListener(this);
319	418	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
320	419	resetCentroidItem.addActionListener(this);
321		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
322		- transformgeometryItem.addActionListener(this);
	420	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	421	+ resetCentroidXZItem.addActionListener(this);
	422	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	423	+ transformGeometryItem.addActionListener(this);
	424	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	425	+ transformChildrenItem.addActionListener(this);
323	426
324	427	oe.menuBar.add(menu = new Menu("Geometry"));
325	428	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -332,7 +435,7 @@
332	435	genNormalsMESHItem.addActionListener(this);
333	436	if (Globals.ADVANCED)
334	437	{
335		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	438	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
336	439	genNormalsMINEItem.addActionListener(this);
337	440	}
338	441	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -368,6 +471,10 @@
368	471	oe.menuBar.add(menu = new Menu("Attributes"));
369	472	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
370	473	clearMaterialsItem.addActionListener(this);
	474	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	475	+ resetAllItem.addActionListener(this);
	476	+ stepAllItem = menu.add(new MenuItem("Step All"));
	477	+ stepAllItem.addActionListener(this);
371	478	menu.add("-");
372	479	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
373	480	liveleavesItem.addActionListener(this);
..	..	@@ -388,6 +495,14 @@
388	495	markleavesItem.addActionListener(this);
389	496	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
390	497	unmarkleavesItem.addActionListener(this);
	498	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	499	+ rewindleavesItem.addActionListener(this);
	500	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	501	+ unrewindleavesItem.addActionListener(this);
	502	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	503	+ randomleavesItem.addActionListener(this);
	504	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	505	+ unrandomleavesItem.addActionListener(this);
391	506	menu.add("-");
392	507	flipVItem = menu.add(new MenuItem("Flip V"));
393	508	flipVItem.addActionListener(this);
..	..	@@ -413,50 +528,56 @@
413	528	attachBumpItem.addActionListener(this);
414	529	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
415	530	pigmentBumpItem.addActionListener(this);
	531	+ //embedTexturesItem
416	532	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
417	533	detachPigmentItem.addActionListener(this);
418	534	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
419	535	detachBumpItem.addActionListener(this);
	536	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	537	+ embedTexturesItem.addActionListener(this);
	538	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	539	+ deEmbedTexturesItem.addActionListener(this);
420	540	menu.add("-");
421	541	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
422	542	sortbysizeItem.addActionListener(this);
423	543	sortbynameItem = menu.add(new MenuItem("Sort by name"));
424	544	sortbynameItem.addActionListener(this);
	545	+ menu.add("-");
	546	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	547	+ shareGeometriesItem.addActionListener(this);
	548	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	549	+ mergeGeometriesItem.addActionListener(this);
425	550	if (Globals.ADVANCED)
426	551	{
427		- menu.add("-");
	552	+ // Pretty much the same as duplicate and clone.
428	553	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
429	554	extractGeometriesItem.addActionListener(this);
430	555	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
431	556	cloneGeometriesItem.addActionListener(this);
432		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
433		- shareGeometriesItem.addActionListener(this);
434		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
435		- mergeGeometriesItem.addActionListener(this);
436	557	}
437	558
438	559	oe.menuBar.add(menu = new Menu("Insert"));
439	560	buildCreateMenu(menu);
440	561
441		- oe.menuBar.add(menu = new Menu("Include"));
442		- importOBJItem = menu.add(new MenuItem("OBJ file..."));
443		- importOBJItem.addActionListener(this);
444		- menu.add("-");
445		- import3DSItem = menu.add(new MenuItem("3DS file..."));
446		- import3DSItem.addActionListener(this);
447		- menu.add("-");
448		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
449		- importVRMLX3DItem.addActionListener(this);
450		- menu.add("-");
451		- importGFDItem = menu.add(new MenuItem("GrafreeD file..."));
452		- importGFDItem.addActionListener(this);
453		-
454	562	oe.menuBar.add(menu = new Menu("Tools"));
455	563	buildToolsMenu(menu);
456	564	}
457	565
	566	+
458	567	void SetupUI2(ObjEditor oe)
459	568	{
	569	+ // June 2019
	570	+ if (oe == null)
	571	+ {
	572	+ //super.SetupUI2(this);
	573	+ //return;
	574	+ }
	575	+
	576	+ if (copy != group)
	577	+ {
	578	+ //super.SetupUI2(this);
	579	+ }
	580	+
460	581	//new Exception().printStackTrace();
461	582
462	583	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -485,97 +606,230 @@
485	606	oe.radioPanel.add(dummyButton);
486	607	oe.buttonGroup.add(dummyButton);
487	608	*/
	609	+ cGridBag copyOptionsPanel = new cGridBag();
	610	+
	611	+ copyOptionsPanel.preferredHeight = 1;
	612	+
488	613	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
489	614
490		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
491		- liveCB.setToolTipText("Enabled animation");
	615	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	616	+ //minButton.setToolTipText("Minimize window");
	617	+ //minButton.addActionListener(this);
	618	+
	619	+ if (Globals.ADVANCED)
	620	+ {
	621	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	622	+ maxButton.setToolTipText("Maximize window");
	623	+ maxButton.addActionListener(this);
	624	+ }
	625	+
	626	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	627	+ fullButton.setToolTipText("Full-screen window");
	628	+ fullButton.addActionListener(this);
	629	+
	630	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	631	+ screenfitButton.setToolTipText("Screen fit");
	632	+ screenfitButton.addActionListener(this);
	633	+
	634	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	635	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	636	+ restoreCameraButton.addActionListener(this);
	637	+
	638	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	639	+ saveButton.setToolTipText("New version");
	640	+ saveButton.addActionListener(this);
	641	+
	642	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	643	+ undoButton.setToolTipText("Previous version");
	644	+ undoButton.addActionListener(this);
	645	+ undoButton.setEnabled(false);
	646	+
	647	+ cGridBag updown = new cGridBag().setVertical(true);
	648	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	649	+ restoreButton.setToolTipText("Restore current");
	650	+ restoreButton.addActionListener(this);
	651	+ restoreButton.setEnabled(false);
	652	+
	653	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	654	+ replaceButton.setToolTipText("Replace current");
	655	+ replaceButton.addActionListener(this);
	656	+ replaceButton.setEnabled(false);
	657	+
	658	+ copyOptionsPanel.add(updown);
	659	+
	660	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	661	+ redoButton.setToolTipText("Next version");
	662	+ redoButton.addActionListener(this);
	663	+ redoButton.setEnabled(false);
	664	+
	665	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	666	+ liveCB.setToolTipText("Enable animation");
492	667	liveCB.addItemListener(this);
493	668
494		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	669	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
495	670	oneStepButton.setToolTipText("Animate one step forward");
496	671	oneStepButton.addActionListener(this);
497	672
498		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	673	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
499	674	fastCB.setToolTipText("Fast mode");
500	675	fastCB.addItemListener(this);
501	676
502		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
503		- trackCB.setToolTipText("Enable tracking");
504		- trackCB.addItemListener(this);
505		-
506		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
507		- screenfitButton.setToolTipText("Screen fit");
508		- screenfitButton.addActionListener(this);
	677	+ //oe.toolboxPanel.Return();
	678	+
	679	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	680	+// trackCB.setToolTipText("Enable tracking");
	681	+// trackCB.addItemListener(this);
509	682
510	683	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
511	684	// screenfitpointButton.addActionListener(this);
512	685
513	686	if (Globals.ADVANCED)
514	687	{
515		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	688	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
516	689	snapobjectButton.addActionListener(this);
517	690	snapobjectButton.setToolTipText("Snap Object");
	691	+
	692	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	693	+ fourButton.addActionListener(this);
	694	+ fourButton.setToolTipText("Show control panel only");
518	695	}
519	696
520		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
521		- flashSelectionButton.setToolTipText("Show selection");
522		- flashSelectionButton.addActionListener(this);
	697	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
523	698
524		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
525		-
526		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
527		- twoButton.setToolTipText("Show center view only");
	699	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	700	+ twoButton.setToolTipText("Show 3D view only");
528	701	twoButton.addActionListener(this);
529		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
530		- fourButton.addActionListener(this);
531		- fourButton.setToolTipText("Show left panel only");
532		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
533		- sixButton.setToolTipText("2-column layout left");
534		- sixButton.addActionListener(this);
535		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
536		- threeButton.setToolTipText("2-column layout right");
	702	+ this.fullscreenLayout = twoButton;
	703	+
	704	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	705	+ threeButton.setToolTipText("Show controls and 3D view");
537	706	threeButton.addActionListener(this);
538		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
539		- sevenButton.setToolTipText("3-column layout");
540		- sevenButton.addActionListener(this);
	707	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	708	+ sixButton.setToolTipText("Show 3D view and controls");
	709	+ sixButton.addActionListener(this);
	710	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	711	+// sevenButton.setToolTipText("3-column layout");
	712	+// sevenButton.addActionListener(this);
541	713	//
542	714
543		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
544		- rootButton.setToolTipText("Edit selection in new tab");
	715	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	716	+ rootButton.setToolTipText("Open selection in new tab");
545	717	rootButton.addActionListener(this);
546	718
547		- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	719	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
548	720	closeButton.setToolTipText("Close tab");
549	721	closeButton.addActionListener(this);
550	722	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
551	723	//clearButton.addActionListener(this);
552		-
553		- cGridBag commandsPanel = new cGridBag();
	724	+
	725	+ // INSERT
	726	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	727	+ gridButton.setToolTipText("Create grid");
	728	+ gridButton.addActionListener(this);
	729	+
	730	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	731	+ boxButton.setToolTipText("Create box");
	732	+ boxButton.addActionListener(this);
	733	+
	734	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	735	+ sphereButton.setToolTipText("Create sphere");
	736	+ sphereButton.addActionListener(this);
	737	+
	738	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	739	+ coneButton.setToolTipText("Create cone");
	740	+ coneButton.addActionListener(this);
	741	+
	742	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	743	+ torusButton.setToolTipText("Create torus");
	744	+ torusButton.addActionListener(this);
	745	+
	746	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	747	+ superButton.setToolTipText("Create superellipsoid");
	748	+ superButton.addActionListener(this);
	749	+
	750	+ if (Globals.ADVANCED)
	751	+ {
	752	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	753	+ kleinButton.setToolTipText("Create Klein bottle");
	754	+ kleinButton.addActionListener(this);
	755	+ }
554	756
555		- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
556		- editButton.setToolTipText("Edit selection");
	757	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	758	+ particlesButton.setToolTipText("Create particle system");
	759	+ particlesButton.addActionListener(this);
	760	+
	761	+ oe.toolboxPanel.Return();
	762	+
	763	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	764	+ groupButton.setToolTipText("Create group");
	765	+ groupButton.addActionListener(this);
	766	+
	767	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	768	+ compositeButton.setToolTipText("Create composite");
	769	+ compositeButton.addActionListener(this);
	770	+
	771	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	772	+ switchButton.setToolTipText("Create item switcher");
	773	+ switchButton.addActionListener(this);
	774	+
	775	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	776	+ loopButton.setToolTipText("Create loop");
	777	+ loopButton.addActionListener(this);
	778	+
	779	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	780	+ textureButton.setToolTipText("Create texture");
	781	+ textureButton.addActionListener(this);
	782	+
	783	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	784	+ overlayButton.setToolTipText("Create overlay");
	785	+ overlayButton.addActionListener(this);
	786	+
	787	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	788	+ lightButton.setToolTipText("Create light");
	789	+ lightButton.addActionListener(this);
	790	+
	791	+ for (int i=6; --i>=0;)
	792	+ {
	793	+ oe.toolboxPanel.Return();
	794	+ oe.toolboxPanel.add(new cGridBag());
	795	+ oe.toolboxPanel.add(new cGridBag());
	796	+ oe.toolboxPanel.add(new cGridBag());
	797	+ oe.toolboxPanel.add(new cGridBag());
	798	+ oe.toolboxPanel.add(new cGridBag());
	799	+ oe.toolboxPanel.add(new cGridBag());
	800	+ oe.toolboxPanel.add(new cGridBag());
	801	+ }
	802	+
	803	+ // EDIT panel
	804	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	805	+ editButton.setToolTipText("Pin selection controls");
557	806	editButton.addActionListener(this);
558	807
559		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
560		- uneditButton.setToolTipText("Unedit selection");
	808	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	809	+ uneditButton.setToolTipText("Remove selection controls");
561	810	uneditButton.addActionListener(this);
562	811
563		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
564		- allParamsButton.setToolTipText("Edit all params");
	812	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	813	+ allParamsButton.setToolTipText("Show all controle");
565	814	allParamsButton.addActionListener(this);
566	815
567		- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	816	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
568	817	clearPanelButton.setToolTipText("Clear edit panel");
569	818	clearPanelButton.addActionListener(this);
570	819
571		- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	820	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
572	821	unselectButton.setToolTipText("Unselect");
573	822	unselectButton.addActionListener(this);
574	823
575		- commandsPanel.preferredHeight = 1;
	824	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	825	+ flashSelectionButton.setToolTipText("Highlight selection");
	826	+ flashSelectionButton.addActionListener(this);
576	827
577		- oe.treePanel.add(commandsPanel);
578		- oe.treePanel.Return();
	828	+ editCommandsPanel.preferredHeight = 1;
	829	+
	830	+ SetPinStates(false);
	831	+// oe.treePanel.add(commandsPanel);
	832	+// oe.treePanel.Return();
579	833
580	834	// oe.aConstraints.gridx += 1;
581	835	// oe.aConstraints.weighty = 0;
..	..	@@ -592,29 +846,17 @@
592	846
593	847	JScrollPane jSP;
594	848	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
595		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	849	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
596	850	ResetModel();
597	851
598	852	oe.treePanel.add(jSPPanel);
599	853	oe.treePanel.Return();
600	854
601		- cGridBag copyOptionsPanel = new cGridBag();
602		-
603		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
604		- colorCB.setToolTipText("Copy color when dropped");
605		- colorCB.addItemListener(this);
606		-
607		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
608		- materialCB.setToolTipText("Copy material when dropped");
609		- materialCB.addItemListener(this);
610		-
611		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
612		- textureCB.setToolTipText("Copy texture when dropped");
613		- textureCB.addItemListener(this);
614		-
615		- copyOptionsPanel.preferredHeight = 1;
616	855	oe.treePanel.add(copyOptionsPanel);
617	856	oe.treePanel.Return();
	857	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	858	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	859	+ sliderPane.preferredHeight = 1;
618	860
619	861	// mainPanel.setDividerLocation(0.5); //1.0);
620	862	// mainPanel.setResizeWeight(0.5);
..	..	@@ -637,29 +879,49 @@
637	879	dgr.addDragGestureListener(this);
638	880	}catch(Exception e) {}
639	881	*/
640		- radio.layout = sevenButton;
	882	+ radio.layout = sixButton; // sevenButton;
641	883	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
642	884	}
643	885
644	886	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
645	887	{
	888	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	889	+ colorCB.setToolTipText("Copy color when dropped");
	890	+ colorCB.addItemListener(this);
	891	+
	892	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	893	+ materialCB.setToolTipText("Copy material when dropped");
	894	+ materialCB.addItemListener(this);
	895	+
	896	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	897	+ textureCB.setToolTipText("Copy texture when dropped");
	898	+ textureCB.addItemListener(this);
	899	+
	900	+ panel.Return();
	901	+
646	902	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
647	903	boxCB.setToolTipText("Display bounding boxes");
648	904	boxCB.addItemListener(this);
649	905
650	906	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
651		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	907	+ zoomBoxCB.setToolTipText("Display only for wheel");
652	908	zoomBoxCB.addItemListener(this);
653	909
654		- if (Globals.ADVANCED)
	910	+ if (true) // Globals.ADVANCED)
655	911	{
656		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
657		- supportCB.setToolTipText("Enable rigging");
658		- supportCB.addItemListener(this);
	912	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	913	+// supportCB.setToolTipText("Enable rigging");
	914	+// supportCB.addItemListener(this);
	915	+
	916	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	917	+ freezeCB.setToolTipText("Fast moving camera");
	918	+ freezeCB.addItemListener(this);
659	919
660	920	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
661	921	// localCB.addItemListener(this);
662	922
	923	+ panel.Return();
	924	+
663	925	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
664	926	crowdCB.setToolTipText("Used for crowds");
665	927	crowdCB.addItemListener(this);
..	..	@@ -676,6 +938,8 @@
676	938	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
677	939	// speakerMocapCB.addItemListener(this);
678	940
	941	+ panel.Return();
	942	+
679	943	if (false)
680	944	{
681	945	// handled in scripts
..	..	@@ -690,42 +954,85 @@
690	954	//constraints.gridy += 1;
691	955	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
692	956	smoothfocusCB.addItemListener(this);
	957	+ panel.Return();
693	958	}
694	959
695	960	//constraints.gridx += 1;
696	961	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
697	962	// debugCB.addItemListener(this);
698	963
	964	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	965	+ trackCB.setToolTipText("Enable tracking target");
	966	+ trackCB.addItemListener(this);
	967	+
699	968	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	969	+ oeilCB.setToolTipText("Move camera when tracking");
700	970	oeilCB.addItemListener(this);
701	971
	972	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	973	+ shadowCB.setToolTipText("When live compute shadows");
	974	+ shadowCB.addItemListener(this);
	975	+
	976	+ panel.Return();
	977	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	978	+ toggleTextureCB.setToolTipText("Load textures");
	979	+ toggleTextureCB.addItemListener(this);
	980	+
	981	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	982	+ toggleSwitchCB.setToolTipText("Choose a single item");
	983	+ toggleSwitchCB.addItemListener(this);
	984	+
	985	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	986	+ autokeepCB.setToolTipText("On structure change");
	987	+ autokeepCB.addItemListener(this);
	988	+
	989	+ panel.Return();
	990	+ if (Globals.ADVANCED)
	991	+ {
702	992	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
703	993	lookAtCB.setToolTipText("Look-at target");
704	994	lookAtCB.addItemListener(this);
	995	+ }
705	996
706	997	}
707	998
708	999	cGridBag fill = new cGridBag();
709		-
710	1000	fill.preferredHeight = 200;
	1001	+ cGridBag fill2 = new cGridBag();
	1002	+ fill2.preferredHeight = 200;
	1003	+ cGridBag fill3 = new cGridBag();
	1004	+ fill3.preferredHeight = 200;
711	1005
712	1006	panel.add(fill);
	1007	+ panel.add(fill2);
	1008	+ panel.add(fill3);
713	1009
714	1010	}
715	1011
716	1012	void EditObject(Object3D obj)
717	1013	{
718	1014	cRadio radioButton = new cRadio(obj.name);
	1015	+
	1016	+ // June 2019. Patch to avoid bug with transparency.
	1017	+ radioButton.hadMaterial = obj.material != null;
	1018	+ if (!radioButton.hadMaterial)
	1019	+ {
	1020	+ obj.material = new cMaterial();
	1021	+ }
	1022	+
719	1023	radioButton.SetObject(obj);
720		- radioButton.layout = sevenButton;
	1024	+ radioButton.layout = sixButton; // sevenButton;
721	1025	radioButton.SetCamera(cameraView.renderCamera, false);
722	1026	radioButton.addActionListener(this);
723	1027	radioPanel.add(radioButton);
724	1028	buttonGroup.add(radioButton);
725	1029	radioButton.doClick();
726	1030	}
	1031	+
727	1032	void SetupViews(ObjEditor oe)
728	1033	{
	1034	+ theFrame = this;
	1035	+
729	1036	oe.SetupViews();
730	1037
731	1038	System.out.println("SetupViews");
..	..	@@ -734,23 +1041,28 @@
734	1041	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
735	1042	}
736	1043
737		- JCheckBox liveCB;
738		- JCheckBox supportCB;
739		- JCheckBox localCB;
740		- JCheckBox crowdCB;
741		- JCheckBox smoothCB;
742		- JCheckBox fastCB;
743		- JCheckBox slowCB;
744		- JCheckBox boxCB;
745		- JCheckBox zoomBoxCB;
746		- JCheckBox trackCB;
747		- JCheckBox smoothfocusCB;
	1044	+ cToggleButton liveCB;
	1045	+ cCheckBox supportCB;
	1046	+ cCheckBox localCB;
	1047	+ cCheckBox crowdCB;
	1048	+ cCheckBox smoothCB;
	1049	+ cToggleButton fastCB;
	1050	+ cCheckBox slowCB;
	1051	+ cCheckBox boxCB;
	1052	+ cCheckBox zoomBoxCB;
	1053	+ cCheckBox freezeCB;
	1054	+ //cToggleButton trackCB;
	1055	+ cCheckBox trackCB;
	1056	+ cCheckBox smoothfocusCB;
748	1057	// JCheckBox speakerMocapCB;
749		- JCheckBox speakerCameraCB;
750		- JCheckBox speakerFocusCB;
751		- JCheckBox debugCB;
752		- JCheckBox oeilCB;
753		- JCheckBox lookAtCB;
	1058	+ cCheckBox speakerCameraCB;
	1059	+ cCheckBox speakerFocusCB;
	1060	+ cCheckBox debugCB;
	1061	+
	1062	+ cCheckBox oeilCB;
	1063	+ cCheckBox shadowCB;
	1064	+ cCheckBox autokeepCB;
	1065	+ cCheckBox lookAtCB;
754	1066
755	1067	// static int COLOR = 1;
756	1068	// static int MATERIAL = 2;
..	..	@@ -758,9 +1070,9 @@
758	1070
759	1071	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
760	1072
761		- JCheckBox colorCB;
762		- JCheckBox materialCB;
763		- JCheckBox textureCB;
	1073	+ cCheckBox colorCB;
	1074	+ cCheckBox materialCB;
	1075	+ cCheckBox textureCB;
764	1076
765	1077	public void itemStateChanged(ItemEvent e)
766	1078	{
..	..	@@ -788,6 +1100,7 @@
788	1100	} else if(e.getSource() == liveCB)
789	1101	{
790	1102	cameraView.ToggleLive();
	1103	+ refreshContents(false);
791	1104	}
792	1105	else if(e.getSource() == supportCB)
793	1106	{
..	..	@@ -852,6 +1165,18 @@
852	1165	{
853	1166	cameraView.ToggleOeil();
854	1167	}
	1168	+ else if(e.getSource() == shadowCB)
	1169	+ {
	1170	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1171	+ }
	1172	+ else if(e.getSource() == freezeCB)
	1173	+ {
	1174	+ Globals.FREEZEONMOVE ^= true;
	1175	+ }
	1176	+ else if(e.getSource() == autokeepCB)
	1177	+ {
	1178	+ Globals.REPLACEONMAKE ^= true;
	1179	+ }
855	1180	else if(e.getSource() == lookAtCB)
856	1181	{
857	1182	cameraView.ToggleLookAt();
..	..	@@ -868,7 +1193,8 @@
868	1193
869	1194	/**/
870	1195	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
871		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1196	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1197	+ TreePath path = objEditor.jTree.getSelectionPath();
872	1198	if ((path == null) \|\| (path.getPathCount() <= 1)) {
873	1199	// We can't move the root node or an empty selection
874	1200	return;
..	..	@@ -931,8 +1257,6 @@
931	1257	}
932	1258	}
933	1259
934		- String string = (String) object;
935		-
936	1260	System.out.println("Transfer = " + object + "; drop : " + target);
937	1261	// if( object instanceof java.io.File[])
938	1262	// {
..	..	@@ -940,6 +1264,8 @@
940	1264	// objEditor.DropFile((java.io.File[]) object, true);
941	1265	// return;
942	1266	// }
	1267	+
	1268	+ String string = object.toString();
943	1269
944	1270	// File path for Mac and Windows
945	1271	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -969,7 +1295,7 @@
969	1295
970	1296	flashIt = false;
971	1297	CameraPane pane = (CameraPane) target;
972		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1298	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
973	1299	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
974	1300
975	1301	if (group.selection.size() == 1)
..	..	@@ -985,23 +1311,33 @@
985	1311
986	1312	assert target == objEditor.jTree;
987	1313	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1314	+ Object3D destinationLeaf;
988	1315	try {
989		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1316	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
990	1317	} catch (Exception e) {
991	1318	System.out.println("destinationPath : " + destinationPath);
992	1319	return;
993	1320	}
994	1321
995		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1322	+ for (int i=group.selection.size(); --i>=0;)
996	1323	{
	1324	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1325	+
	1326	+ // Cannot move into itself
	1327	+ if (child == destinationLeaf)
	1328	+ return;
	1329	+ }
	1330	+
	1331	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1332	+// {
997	1333	loadClipboard(true);
998	1334	objEditor.jTree.setSelectionPath(destinationPath);
999	1335	pasteInto(false, false);
1000		- } else {
1001		- loadClipboard(false);
1002		- objEditor.jTree.setSelectionPath(destinationPath);
1003		- pasteInto(false, false); // true); // ???
1004		- }
	1336	+// } else {
	1337	+// loadClipboard(false);
	1338	+// objEditor.jTree.setSelectionPath(destinationPath);
	1339	+// pasteInto(false, false); // true); // ???
	1340	+// }
1005	1341	}
1006	1342	public void dropActionChanged(DropTargetDragEvent dtde)
1007	1343	// Called if the user has modified the current drop gesture
..	..	@@ -1106,22 +1442,30 @@
1106	1442	{
1107	1443	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1108	1444	//heightFieldItem.addActionListener(this);
1109		- gridItem = menu.add(new MenuItem("Grid"));
1110		- gridItem.addActionListener(this);
1111		- rectoidItem = menu.add(new MenuItem("Box"));
1112		- rectoidItem.addActionListener(this);
1113		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1114		- ellipsoidItem.addActionListener(this);
1115		- coneItem = menu.add(new MenuItem("Cone"));
1116		- coneItem.addActionListener(this);
1117		- torusItem = menu.add(new MenuItem("Torus"));
1118		- torusItem.addActionListener(this);
1119		- superItem = menu.add(new MenuItem("Superellipsoid"));
1120		- superItem.addActionListener(this);
	1445	+// gridItem = menu.add(new MenuItem("Grid"));
	1446	+// gridItem.addActionListener(this);
	1447	+// rectoidItem = menu.add(new MenuItem("Box"));
	1448	+// rectoidItem.addActionListener(this);
	1449	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1450	+// ellipsoidItem.addActionListener(this);
	1451	+// coneItem = menu.add(new MenuItem("Cone"));
	1452	+// coneItem.addActionListener(this);
	1453	+// torusItem = menu.add(new MenuItem("Torus"));
	1454	+// torusItem.addActionListener(this);
	1455	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1456	+// superItem.addActionListener(this);
	1457	+
	1458	+ cameraItem = menu.add(new MenuItem("Camera"));
	1459	+ cameraItem.addActionListener(this);
	1460	+
	1461	+ if (!Globals.ADVANCED)
	1462	+ {
1121	1463	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1122	1464	kleinItem.addActionListener(this);
1123		- particleItem = menu.add(new MenuItem("Particle system"));
1124		- particleItem.addActionListener(this);
	1465	+ }
	1466	+
	1467	+// particleItem = menu.add(new MenuItem("Particle system"));
	1468	+// particleItem.addActionListener(this);
1125	1469	if (Globals.ADVANCED)
1126	1470	{
1127	1471	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1147,15 +1491,15 @@
1147	1491	}
1148	1492	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1149	1493	bezierItem.addActionListener(this);
1150		- overlayItem = menu.add(new MenuItem("Overlay"));
1151		- overlayItem.addActionListener(this);
1152		- lightItem = menu.add(new MenuItem("Light"));
1153		- lightItem.addActionListener(this);
	1494	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1495	+// overlayItem.addActionListener(this);
	1496	+// lightItem = menu.add(new MenuItem("Light"));
	1497	+// lightItem.addActionListener(this);
1154	1498	menu.add("-");
1155	1499	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1156	1500	//superLoopItem.addActionListener(this);
1157		- loopItem = menu.add(new MenuItem("Loop"));
1158		- loopItem.addActionListener(this);
	1501	+// loopItem = menu.add(new MenuItem("Loop"));
	1502	+// loopItem.addActionListener(this);
1159	1503	doubleItem = menu.add(new MenuItem("Fork"));
1160	1504	doubleItem.addActionListener(this);
1161	1505	if (Globals.ADVANCED)
..	..	@@ -1171,6 +1515,9 @@
1171	1515	animationItem.addItemListener(this);
1172	1516	animationItem.setState(Globals.ANIMATION);
1173	1517
	1518	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1519	+ archiveItem.addActionListener(this);
	1520	+
1174	1521	menu.add("-");
1175	1522	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1176	1523	parseverticesItem.addActionListener(this);
..	..	@@ -1183,6 +1530,8 @@
1183	1530	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1184	1531	reduce34MorphItem.addActionListener(this);
1185	1532	menu.add("-");
	1533	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1534	+ memoryItem.addActionListener(this);
1186	1535	menu.add(computeAOItem = new MenuItem("Compute AO"));
1187	1536	computeAOItem.addActionListener(this);
1188	1537
..	..	@@ -1191,11 +1540,9 @@
1191	1540	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1192	1541	mirrorItem.addActionListener(this);
1193	1542	menu.add("-");
1194		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1195		- memoryItem.addActionListener(this);
1196	1543	menu.add(analyzeItem = new MenuItem("Analyze"));
1197	1544	analyzeItem.addActionListener(this);
1198		- menu.add(dumpItem = new MenuItem("Dump"));
	1545	+ menu.add(dumpItem = new MenuItem("Print"));
1199	1546	dumpItem.addActionListener(this);
1200	1547	// menu.add(pathItem = new MenuItem("From-to path"));
1201	1548	// pathItem.addActionListener(this);
..	..	@@ -1336,9 +1683,34 @@
1336	1683	shadow.material = new cMaterial(obj.material);
1337	1684	shadow.material.diffuse = 0.0001f;
1338	1685	shadow.material.specular = 0.0001f;
	1686	+ //shadow.projectedVertices[1].x = 300;
1339	1687
1340	1688	makeSomething(shadow);
1341	1689	}
	1690	+
	1691	+ private void ClearUnpinned()
	1692	+ {
	1693	+ //for (Object3D obj : listUI)
	1694	+ for (int i=listUI.size(); --i>=0;)
	1695	+ {
	1696	+ Object3D obj = listUI.elementAt(i);
	1697	+ if (!obj.pinned)
	1698	+ {
	1699	+ obj.CloseUI();
	1700	+ listUI.remove(i);
	1701	+ }
	1702	+ }
	1703	+ }
	1704	+
	1705	+ private void EditElement(Object3D elem, boolean newWindow)
	1706	+ {
	1707	+ // if (!(elem instanceof Composite))
	1708	+ // newWindow = false;
	1709	+ listUI.add(elem);
	1710	+ elem.openEditWindow(this, newWindow); //, false);
	1711	+ System.out.println("edit : " + elem);
	1712	+ elem.editWindow.refreshContents(true); // ? new
	1713	+ }
1342	1714
1343	1715	/**
1344	1716	* applyExample
..	..	@@ -1542,9 +1914,9 @@
1542	1914
1543	1915	void Overwrite(int mask)
1544	1916	{
1545		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1917	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1546	1918	{
1547		- Object3D content = GrafreeD.clipboard.get(0);
	1919	+ Object3D content = Grafreed.clipboard.get(0);
1548	1920
1549	1921	if (content instanceof cGroup && ((cGroup)content).transientlink )
1550	1922	content = ((cGroup)content).get(0);
..	..	@@ -1583,7 +1955,7 @@
1583	1955	{
1584	1956	ScreenFit();
1585	1957	} else
1586		- if (source == switchItem)
	1958	+ if (source == switchViewItem)
1587	1959	{
1588	1960	cVector v1 = new cVector();
1589	1961	cVector v2 = new cVector();
..	..	@@ -1592,11 +1964,11 @@
1592	1964	objEditor.cameraView.renderCamera.setAim(v2, v1);
1593	1965	objEditor.cameraView.repaint();
1594	1966	} else
1595		- if (source == rectoidItem)
	1967	+ if (source == rectoidItem \|\| source == boxButton)
1596	1968	{
1597	1969	makeSomething(new Box());
1598	1970	} else
1599		- if (source == particleItem)
	1971	+ if (source == particleItem \|\| source == particlesButton)
1600	1972	{
1601	1973	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1602	1974	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1675,27 +2047,27 @@
1675	2047
1676	2048	makeSomething(obj);
1677	2049	} else
1678		- if (source == gridItem)
	2050	+ if (source == gridItem \|\| source == gridButton)
1679	2051	{
1680	2052	makeSomething(new Grid());
1681	2053	} else
1682		- if (source == ellipsoidItem)
	2054	+ if (source == ellipsoidItem \|\| source == sphereButton)
1683	2055	{
1684	2056	makeSomething(new Sphere());
1685	2057	} else
1686		- if (source == coneItem)
	2058	+ if (source == coneItem \|\| source == coneButton)
1687	2059	{
1688	2060	makeSomething(new Cone());
1689	2061	} else
1690		- if (source == torusItem)
	2062	+ if (source == torusItem \|\| source == torusButton)
1691	2063	{
1692	2064	makeSomething(new Torus());
1693	2065	} else
1694		- if (source == superItem)
	2066	+ if (source == superItem \|\| source == superButton)
1695	2067	{
1696	2068	makeSomething(new Superellipsoid());
1697	2069	} else
1698		- if (source == kleinItem)
	2070	+ if (source == kleinItem \|\| source == kleinButton)
1699	2071	{
1700	2072	makeSomething(new Klein());
1701	2073	} else
..	..	@@ -1715,7 +2087,7 @@
1715	2087	{
1716	2088	makeSomething(new BezierSurface());
1717	2089	} else
1718		- if (source == overlayItem)
	2090	+ if (source == overlayItem \|\| source == overlayButton)
1719	2091	{
1720	2092	/*
1721	2093	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1763,7 +2135,7 @@
1763	2135	s.setup();
1764	2136	makeSomething(s);
1765	2137	} else
1766		- if (source == lightItem)
	2138	+ if (source == lightItem \|\| source == lightButton)
1767	2139	{
1768	2140	makeSomething(new Light());
1769	2141	} else
..	..	@@ -1813,30 +2185,30 @@
1813	2185
1814	2186	group(g);
1815	2187	} else
1816		- if (source == loopItem)
	2188	+ if (source == loopItem \|\| source == loopButton)
1817	2189	{
1818	2190	Composite csg = new GroupLeaf();
1819	2191	csg.count = 5;
1820	2192	group(csg);
1821		- Composite child = new cGroup();
	2193	+ Composite child = new cGroup("Branch");
1822	2194	csg.addChild(child);
1823	2195	child.addChild(csg);
1824	2196	} else
1825	2197	if (source == doubleItem)
1826	2198	{
1827		- Composite csg = new GroupLeaf();
	2199	+ Composite csg = new GroupLeaf("Fork");
1828	2200	csg.count = 5;
1829	2201	group(csg);
1830		- Composite child = new cGroup();
	2202	+ Composite child = new cGroup("Branch A");
1831	2203	csg.addChild(child);
1832	2204	child.addChild(csg);
1833		- child = new cGroup();
	2205	+ child = new cGroup("Branch B");
1834	2206	csg.addChild(child);
1835	2207	child.addChild(csg);
1836	2208	} else
1837	2209	if (source == tripleItem)
1838	2210	{
1839		- Composite csg = new GroupLeaf();
	2211	+ Composite csg = new GroupLeaf("Trident");
1840	2212	csg.count = 4;
1841	2213	group(csg);
1842	2214	Composite child = new cGroup();
..	..	@@ -1848,31 +2220,6 @@
1848	2220	child = new cGroup();
1849	2221	csg.addChild(child);
1850	2222	child.addChild(csg);
1851		- } else
1852		-
1853		- if (source == importGFDItem)
1854		- {
1855		- ImportGFD();
1856		- } else
1857		- if (source == importVRMLX3DItem)
1858		- {
1859		- ImportVRMLX3D();
1860		- } else
1861		- if (source == import3DSItem)
1862		- {
1863		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1864		- } else
1865		- if (source == importOBJItem)
1866		- {
1867		- //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1868		- FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
1869		- browser.setVisible(true);
1870		- String filename = browser.getFile();
1871		- if (filename != null && filename.length() > 0)
1872		- {
1873		- String fullname = browser.getDirectory() + filename;
1874		- makeSomething(ReadOBJ(fullname), true);
1875		- }
1876	2223	} else
1877	2224	if (source == computeAOItem)
1878	2225	{
..	..	@@ -1892,7 +2239,7 @@
1892	2239	if (source == invariantsItem)
1893	2240	{
1894	2241	System.out.println("Invariants:");
1895		- GrafreeD.grafreeD.universe.invariants();
	2242	+ Grafreed.grafreeD.universe.invariants();
1896	2243	} else
1897	2244	if (source == memoryItem)
1898	2245	{
..	..	@@ -1911,6 +2258,46 @@
1911	2258	{
1912	2259	DumpObject();
1913	2260	} else
	2261	+ if (source == minButton)
	2262	+ {
	2263	+ Minimize();
	2264	+ } else
	2265	+ if (source == maxButton)
	2266	+ {
	2267	+ Maximize();
	2268	+ } else
	2269	+ if (source == fullButton)
	2270	+ {
	2271	+ ToggleFullScreen();
	2272	+ } else
	2273	+ if (source == undoButton)
	2274	+ {
	2275	+ // Go to previous version
	2276	+ //if (!Undo())
	2277	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2278	+ Undo();
	2279	+ } else
	2280	+ if (source == restoreButton)
	2281	+ {
	2282	+ // Restore current version
	2283	+ Restore();
	2284	+ } else
	2285	+ if (source == replaceButton)
	2286	+ {
	2287	+ // Overwrite current version
	2288	+ Replace();
	2289	+ } else
	2290	+ if (source == redoButton)
	2291	+ {
	2292	+ // Go to next version
	2293	+ Redo();
	2294	+ } else
	2295	+ if (source == saveButton)
	2296	+ {
	2297	+ // Save a new version
	2298	+ if (!Save(true))
	2299	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2300	+ } else
1914	2301	if (source == oneStepButton)
1915	2302	{
1916	2303	Globals.ONESTEP = true;
..	..	@@ -1918,17 +2305,14 @@
1918	2305	} else
1919	2306	if (source == screenfitButton)
1920	2307	{
1921		- //Reload(lastConverter, lastFilename, true);
1922	2308	ScreenFit();
1923	2309	} else
1924	2310	if (source == screenfitpointButton)
1925	2311	{
1926		- //Reload(lastConverter, lastFilename, true);
1927	2312	ScreenFitPoint();
1928	2313	} else
1929	2314	if (source == snapobjectButton)
1930	2315	{
1931		- //Reload(lastConverter, lastFilename, true);
1932	2316	SnapObject();
1933	2317	} else
1934	2318	// if (event.getSource() == recompileButton)
..	..	@@ -1965,12 +2349,20 @@
1965	2349	{
1966	2350	loadClipboard(true);
1967	2351	} else
	2352	+ if (source == undoItem)
	2353	+ {
	2354	+ Undo();
	2355	+ } else
	2356	+ if (source == redoItem)
	2357	+ {
	2358	+ Redo();
	2359	+ } else
1968	2360	if (source == duplicateItem)
1969	2361	{
1970		- Object3D keep = GrafreeD.clipboard;
	2362	+ Object3D keep = Grafreed.clipboard;
1971	2363	loadClipboard(false);
1972	2364	paste(false);
1973		- GrafreeD.clipboard = keep;
	2365	+ Grafreed.clipboard = keep;
1974	2366	} else
1975	2367	if (source == cloneItem)
1976	2368	{
..	..	@@ -2190,9 +2582,9 @@
2190	2582	// group.selection.get(0).setMasterThis(content); // should be identity
2191	2583	// refreshContents();
2192	2584	// }
2193		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2585	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2194	2586	{
2195		- Object3D content = GrafreeD.clipboard.get(0);
	2587	+ Object3D content = Grafreed.clipboard.get(0);
2196	2588
2197	2589	if (content instanceof cGroup && ((cGroup)content).transientlink )
2198	2590	content = ((cGroup)content).get(0);
..	..	@@ -2242,9 +2634,9 @@
2242	2634	} else
2243	2635	if (source == setMasterItem)
2244	2636	{
2245		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2637	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2246	2638	{
2247		- Object3D content = GrafreeD.clipboard.get(0);
	2639	+ Object3D content = Grafreed.clipboard.get(0);
2248	2640
2249	2641	if (content instanceof cGroup && ((cGroup)content).transientlink )
2250	2642	content = ((cGroup)content).get(0);
..	..	@@ -2257,9 +2649,9 @@
2257	2649	{
2258	2650	if (group.selection.size() == 1)
2259	2651	{
2260		- if (GrafreeD.clipboard.size() == 1)
	2652	+ if (Grafreed.clipboard.size() == 1)
2261	2653	{
2262		- Object3D content = GrafreeD.clipboard.get(0);
	2654	+ Object3D content = Grafreed.clipboard.get(0);
2263	2655
2264	2656	if (content instanceof cGroup && ((cGroup)content).transientlink )
2265	2657	content = ((cGroup)content).get(0);
..	..	@@ -2276,7 +2668,7 @@
2276	2668	{
2277	2669	RevertMeshes();
2278	2670	} else
2279		- if (source == resetMeshItem)
	2671	+ if (source == resetAllItem)
2280	2672	{
2281	2673	ResetAll();
2282	2674	} else
..	..	@@ -2284,7 +2676,7 @@
2284	2676	{
2285	2677	StepAll();
2286	2678	} else
2287		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	2679	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2288	2680	{
2289	2681	//int indices[] = jList.getSelectedIndices();
2290	2682	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2296,9 +2688,9 @@
2296	2688	{
2297	2689	ClearSelection(true);
2298	2690	} else
2299		- if (source == grabItem)
	2691	+ if (source == grabItem \|\| source == groupButton)
2300	2692	{
2301		- group(new cGroup(), true);
	2693	+ group(new cGroup(), false); // true);
2302	2694	} else
2303	2695	if (source == hideItem)
2304	2696	{
..	..	@@ -2316,11 +2708,11 @@
2316	2708	{
2317	2709	makeSomething(new Camera());
2318	2710	} else
2319		- if (source == compositeItem)
	2711	+ if (source == compositeItem \|\| source == compositeButton)
2320	2712	{
2321	2713	group(new Composite());
2322	2714	} else
2323		- if (source == randomItem)
	2715	+ if (source == switchItem \|\| source == switchButton)
2324	2716	{
2325	2717	RandomNode random = new RandomNode();
2326	2718	group(random);
..	..	@@ -2422,7 +2814,7 @@
2422	2814	{
2423	2815	group(new cLinker());
2424	2816	} else
2425		- if (source == textureItem)
	2817	+ if (source == textureItem \|\| source == textureButton)
2426	2818	{
2427	2819	group(new TextureNode());
2428	2820	} else
..	..	@@ -2442,17 +2834,30 @@
2442	2834	{
2443	2835	CastShadow(2);
2444	2836	} else
2445		- if (source == ungroupItem)
	2837	+ if (source == ungroupItem \|\| source == ungroupButton)
2446	2838	{
2447		- //ungroup();
	2839	+ boolean hasRoot = false;
	2840	+
2448	2841	for (int i=0; i<group.selection.size(); i++)
2449	2842	{
2450		- Ungroup(group.selection.get(i));
	2843	+ if (group.selection.get(i) == group)
	2844	+ {
	2845	+ hasRoot = true;
	2846	+ break;
	2847	+ }
2451	2848	}
2452	2849
2453		- ClearSelection(false);
2454		-
2455		- refreshContents();
	2850	+ if (!hasRoot)
	2851	+ {
	2852	+ for (int i=0; i<group.selection.size(); i++)
	2853	+ {
	2854	+ Ungroup(group.selection.get(i));
	2855	+ }
	2856	+
	2857	+ ClearSelection(false);
	2858	+
	2859	+ refreshContents();
	2860	+ }
2456	2861	} else
2457	2862	if (source == genUVItem)
2458	2863	{
..	..	@@ -2464,7 +2869,7 @@
2464	2869	} else
2465	2870	if (source == genNormalsMESHItem)
2466	2871	{
2467		- GenNormals(true); // TODO
	2872	+ GenNormalsMESH();
2468	2873	} else
2469	2874	if (source == genNormalsORGANItem)
2470	2875	{
..	..	@@ -2529,6 +2934,22 @@
2529	2934	if (source == unmarkleavesItem)
2530	2935	{
2531	2936	MarkLeaves(false);
	2937	+ } else
	2938	+ if (source == rewindleavesItem)
	2939	+ {
	2940	+ RewindLeaves(true);
	2941	+ } else
	2942	+ if (source == unrewindleavesItem)
	2943	+ {
	2944	+ RewindLeaves(false);
	2945	+ } else
	2946	+ if (source == randomleavesItem)
	2947	+ {
	2948	+ RandomLeaves(true);
	2949	+ } else
	2950	+ if (source == unrandomleavesItem)
	2951	+ {
	2952	+ RandomLeaves(false);
2532	2953	} else
2533	2954	if (source == flipVItem)
2534	2955	{
..	..	@@ -2614,9 +3035,13 @@
2614	3035	{
2615	3036	SmoothMesh();
2616	3037	} else
2617		- if (source == transformgeometryItem)
	3038	+ if (source == transformGeometryItem)
2618	3039	{
2619	3040	TransformGeometry();
	3041	+ } else
	3042	+ if (source == transformChildrenItem)
	3043	+ {
	3044	+ TransformChildren();
2620	3045	} else
2621	3046	if (source == resetTransformItem)
2622	3047	{
..	..	@@ -2624,7 +3049,11 @@
2624	3049	} else
2625	3050	if (source == resetCentroidItem)
2626	3051	{
2627		- ResetCentroid();
	3052	+ ResetCentroid(true);
	3053	+ } else
	3054	+ if (source == resetCentroidXZItem)
	3055	+ {
	3056	+ ResetCentroid(false);
2628	3057	} else
2629	3058	if (source == resetParentItem)
2630	3059	{
..	..	@@ -2729,7 +3158,7 @@
2729	3158	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2730	3159	{
2731	3160	obj = (Object3D)e.nextElement();
2732		- obj.SetBumpTexture(null);
	3161	+ obj.ResetBumpTexture();
2733	3162	}
2734	3163
2735	3164	refreshContents();
..	..	@@ -2745,6 +3174,31 @@
2745	3174
2746	3175	refreshContents();
2747	3176	} else
	3177	+ if (source == embedTexturesItem)
	3178	+ {
	3179	+ Object3D obj;
	3180	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3181	+ {
	3182	+ obj = (Object3D)e.nextElement();
	3183	+ obj.EmbedTextures(true);
	3184	+ }
	3185	+
	3186	+ refreshContents();
	3187	+ } else
	3188	+ if (source == deEmbedTexturesItem)
	3189	+ {
	3190	+ Object3D obj;
	3191	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3192	+ {
	3193	+ obj = (Object3D)e.nextElement();
	3194	+ obj.EmbedTextures(false);
	3195	+ }
	3196	+
	3197	+ CameraPane.texturepigment.clear();
	3198	+ CameraPane.texturebump.clear();
	3199	+
	3200	+ refreshContents();
	3201	+ } else
2748	3202	if (source == flashSelectionButton)
2749	3203	{
2750	3204	CameraPane.flash = true;
..	..	@@ -2756,6 +3210,10 @@
2756	3210	if (source == twoButton)
2757	3211	{
2758	3212	radio.layout = twoButton;
	3213	+
	3214	+ if (CameraPane.FULLSCREEN)
	3215	+ fullscreenLayout = radio.layout;
	3216	+
2759	3217	// bug
2760	3218	//gridPanel.setDividerLocation(1.0);
2761	3219	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2788,10 +3246,31 @@
2788	3246	bigThree.ClearUI();
2789	3247	bigThree.add(centralPanel);
2790	3248	bigThree.FlushUI();
	3249	+
	3250	+ cameraView.requestFocusInWindow();
	3251	+
	3252	+// refreshContents(true);
	3253	+//
	3254	+// try
	3255	+// {
	3256	+// java.awt.Robot bot = new java.awt.Robot();
	3257	+// int mask = InputEvent.BUTTON1_MASK;
	3258	+// bot.mouseMove(100, 100);
	3259	+// bot.mousePress(mask);
	3260	+// bot.mouseRelease(mask);
	3261	+// }
	3262	+// catch (Exception e)
	3263	+// {
	3264	+//
	3265	+// }
	3266	+
2791	3267	} else
2792	3268	if (source == threeButton)
2793	3269	{
2794	3270	radio.layout = threeButton;
	3271	+
	3272	+ if (CameraPane.FULLSCREEN)
	3273	+ fullscreenLayout = radio.layout;
2795	3274
2796	3275	// bigThree.remove(scenePanel);
2797	3276	// bigThree.remove(centralPanel);
..	..	@@ -2821,13 +3300,18 @@
2821	3300	// centralPanel.setVisible(true);
2822	3301	// XYZPanel.setVisible(true);
2823	3302	bigThree.ClearUI();
	3303	+ bigThree.add(scenePanel);
2824	3304	bigThree.add(centralPanel);
2825		- bigThree.add(XYZPanel);
2826	3305	bigThree.FlushUI();
	3306	+
	3307	+ cameraView.requestFocusInWindow();
2827	3308	} else
2828	3309	if (source == fourButton)
2829	3310	{
2830	3311	radio.layout = fourButton;
	3312	+
	3313	+ if (CameraPane.FULLSCREEN)
	3314	+ fullscreenLayout = radio.layout;
2831	3315
2832	3316	// bigThree.remove(scenePanel);
2833	3317	// bigThree.remove(centralPanel);
..	..	@@ -2859,10 +3343,15 @@
2859	3343	bigThree.ClearUI();
2860	3344	bigThree.add(scenePanel);
2861	3345	bigThree.FlushUI();
	3346	+
	3347	+ cameraView.requestFocusInWindow();
2862	3348	} else
2863	3349	if (source == sixButton)
2864	3350	{
2865	3351	radio.layout = sixButton;
	3352	+
	3353	+ if (CameraPane.FULLSCREEN)
	3354	+ fullscreenLayout = radio.layout;
2866	3355
2867	3356	// bigThree.remove(scenePanel);
2868	3357	// bigThree.remove(centralPanel);
..	..	@@ -2892,13 +3381,18 @@
2892	3381	// centralPanel.setVisible(true);
2893	3382	// XYZPanel.setVisible(false);
2894	3383	bigThree.ClearUI();
2895		- bigThree.add(scenePanel);
2896	3384	bigThree.add(centralPanel);
	3385	+ bigThree.add(scenePanel);
2897	3386	bigThree.FlushUI();
	3387	+
	3388	+ cameraView.requestFocusInWindow();
2898	3389	} else
2899	3390	if (source == sevenButton)
2900	3391	{
2901	3392	radio.layout = sevenButton;
	3393	+
	3394	+ if (CameraPane.FULLSCREEN)
	3395	+ fullscreenLayout = radio.layout;
2902	3396
2903	3397	// bigThree.remove(scenePanel);
2904	3398	// bigThree.remove(centralPanel);
..	..	@@ -2932,6 +3426,8 @@
2932	3426	bigThree.add(centralPanel);
2933	3427	bigThree.add(XYZPanel);
2934	3428	bigThree.FlushUI();
	3429	+
	3430	+ cameraView.requestFocusInWindow();
2935	3431	} else
2936	3432	if (source == rootButton)
2937	3433	{
..	..	@@ -2943,6 +3439,7 @@
2943	3439	EditObject(obj);
2944	3440	}
2945	3441
	3442	+ cameraView.requestFocusInWindow();
2946	3443	refreshContents(true);
2947	3444	} else
2948	3445	if (source == closeButton)
..	..	@@ -2952,22 +3449,37 @@
2952	3449	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2953	3450	{
2954	3451	ab = (cRadio)e.nextElement();
2955		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3452	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2956	3453	{
	3454	+ // Patch to avoid bug with transparency.
	3455	+ if (!ab.hadMaterial)
	3456	+ {
	3457	+ ab.object.material = null;
	3458	+ }
	3459	+
2957	3460	buttonGroup.remove(ab);
2958	3461	radioPanel.remove(ab);
2959	3462
2960		- ab.GetObject().editWindow = null;
	3463	+ //ab.GetObject().editWindow = null;
	3464	+ ab.GetObject().manipWindow = null;
2961	3465	// ab.GetObject().objectUI = null; // ?????????
2962	3466
2963	3467	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2964	3468	break;
2965	3469	}
2966	3470	}
	3471	+
	3472	+ cameraView.requestFocusInWindow();
2967	3473	refreshContents(true);
2968	3474	} else
2969	3475	if (source == editItem \|\| source == editButton)
2970	3476	{
	3477	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3478	+ {
	3479	+ Object3D child = (Object3D)e.nextElement();
	3480	+ child.pinned = true;
	3481	+ }
	3482	+
2971	3483	EditSelection(false);
2972	3484	} else
2973	3485	if (source == uneditButton)
..	..	@@ -2977,10 +3489,11 @@
2977	3489	Object3D child = (Object3D)e.nextElement();
2978	3490	if(child.editWindow != null)
2979	3491	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3492	+ child.pinned = false;
2980	3493	child.CloseUI();
2981	3494	listUI.remove(child);
2982	3495
2983		- child.editWindow = null; // ???????????
	3496	+ //child.editWindow = null; // ???????????
2984	3497	}
2985	3498	objEditor.ctrlPanel.FlushUI();
2986	3499	//objEditor.jTree.clearSelection();
..	..	@@ -2993,6 +3506,7 @@
2993	3506	//copy.ClearUI();
2994	3507	for (Object3D obj : listUI)
2995	3508	{
	3509	+ obj.pinned = false;
2996	3510	obj.CloseUI();
2997	3511	}
2998	3512	listUI.clear();
..	..	@@ -3002,7 +3516,7 @@
3002	3516	{
3003	3517	assert(copy == group);
3004	3518
3005		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3519	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3006	3520
3007	3521	for (Object3D obj : listUI)
3008	3522	{
..	..	@@ -3051,6 +3565,9 @@
3051	3565	}
3052	3566
3053	3567	copy = group;
	3568	+
	3569	+ SetUndoStates();
	3570	+
3054	3571	//Globals.theRenderer.object = group;
3055	3572	if(!useclient)
3056	3573	{
..	..	@@ -3066,20 +3583,46 @@
3066	3583	frontView.object = group;
3067	3584	sideView.object = group;
3068	3585	}
3069		- group.editWindow = this;
	3586	+
	3587	+// fix "+" issue
	3588	+ //group.editWindow = this;
	3589	+ group.manipWindow = this;
	3590	+
3070	3591	/*
3071	3592	currentLayout = radio.layout;
3072	3593	if (currentLayout == null)
3073	3594	currentLayout = sevenButton;
3074	3595	*/
3075	3596	radio.layout.doClick();
	3597	+
	3598	+ ClearUnpinned();
	3599	+ //Grafreed.Assert(group != null);
	3600	+ //Grafreed.Assert(group.selection != null);
	3601	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	3602	+ if (group.selection == null \|\| group.selection.size() == 1)
	3603	+ EditSelection(false);
3076	3604	keepparent = group.parent;
3077	3605	// PARENT = NULL or not???
3078	3606	//group.parent = null; // ROOT
3079	3607	//group.attributes = -1;
3080	3608	ResetModel();
	3609	+
	3610	+ cameraView.requestFocusInWindow();
3081	3611	refreshContents(true);
3082		- }
	3612	+ } else if (event.getSource() == editCameraItem)
	3613	+ {
	3614	+ cameraView.ProtectCamera();
	3615	+ cameraView.repaint();
	3616	+ return;
	3617	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3618	+ {
	3619	+ cameraView.RevertCamera();
	3620	+ cameraView.repaint();
	3621	+ return;
	3622	+ // } else if (event.getSource() == textureButton)
	3623	+ // {
	3624	+ // return; // true;
	3625	+ }
3083	3626	else
3084	3627	{
3085	3628	//return super.action(event, arg);
..	..	@@ -3088,7 +3631,6 @@
3088	3631	}
3089	3632
3090	3633	boolean useclient = false;
3091		- cRadio radio;
3092	3634
3093	3635	void ToggleRoot()
3094	3636	{
..	..	@@ -3140,6 +3682,28 @@
3140	3682	refreshContents();
3141	3683	}
3142	3684
	3685	+ void TransformChildren()
	3686	+ {
	3687	+ Object3D obj;
	3688	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3689	+ {
	3690	+ obj = (Object3D)e.nextElement();
	3691	+ obj.KeepTextureMatrices();
	3692	+ obj.TransformChildren();
	3693	+ obj.RestoreTextureMatrices();
	3694	+
	3695	+// if (obj.parent == null)
	3696	+// {
	3697	+// System.out.println("NULL PARENT!");
	3698	+// new Exception().printStackTrace();
	3699	+// }
	3700	+// else
	3701	+// TouchTransform(obj);
	3702	+// //obj.parent.Touch();
	3703	+ }
	3704	+
	3705	+ refreshContents();
	3706	+ }
3143	3707
3144	3708	void ResetTransform()
3145	3709	{
..	..	@@ -3252,7 +3816,7 @@
3252	3816	refreshContents();
3253	3817	}
3254	3818
3255		- void ResetCentroid()
	3819	+ void ResetCentroid(boolean full)
3256	3820	{
3257	3821	Object3D obj;
3258	3822	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3267,12 +3831,16 @@
3267	3831	LA.matIdentity(Object3D.mat);
3268	3832	obj.getBounds(minima, maxima, false);
3269	3833	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3270		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3834	+ if (full)
	3835	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3271	3836	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3272	3837	obj.TransformMesh(Object3D.mat);
	3838	+
3273	3839	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3274		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3840	+ if (full)
	3841	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3275	3842	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3843	+
3276	3844	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3277	3845	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3278	3846	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3301,7 +3869,8 @@
3301	3869
3302	3870	int size = obj.MemorySize();
3303	3871
3304		- System.err.println((size/1024) + " KB is the size of " + obj);
	3872	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3873	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3305	3874	}
3306	3875	}
3307	3876	catch (Exception e)
..	..	@@ -3338,9 +3907,9 @@
3338	3907	obj = (Object3D)e.nextElement();
3339	3908
3340	3909	System.out.println("Object is: " + obj);
3341		- GrafreeD.AnalyzeObject(obj);
	3910	+ Grafreed.AnalyzeObject(obj);
3342	3911	System.out.println("Boundary rep: " + obj.bRep);
3343		- GrafreeD.AnalyzeObject(obj.bRep);
	3912	+ Grafreed.AnalyzeObject(obj.bRep);
3344	3913
3345	3914	// System.err.println((size/1024) + " KB is the size of " + obj);
3346	3915	}
..	..	@@ -3382,6 +3951,13 @@
3382	3951	void GenNormals(boolean crease)
3383	3952	{
3384	3953	group.GenNormalsS(crease);
	3954	+
	3955	+ refreshContents();
	3956	+ }
	3957	+
	3958	+ void GenNormalsMESH()
	3959	+ {
	3960	+ group.GenNormalsMeshS();
3385	3961
3386	3962	refreshContents();
3387	3963	}
..	..	@@ -3554,8 +4130,8 @@
3554	4130
3555	4131	void ParseVertices()
3556	4132	{
3557		- boolean epsequal = GrafreeD.epsequal;
3558		- GrafreeD.epsequal = true;
	4133	+ boolean epsequal = Grafreed.epsequal;
	4134	+ Grafreed.epsequal = true;
3559	4135
3560	4136	for (int i=0; i<group.selection.size(); i++)
3561	4137	{
..	..	@@ -3580,7 +4156,7 @@
3580	4156	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3581	4157	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3582	4158
3583		- g.add(GrafreeD.clipboard);
	4159	+ g.add(Grafreed.clipboard);
3584	4160
3585	4161	buffer.add(g);
3586	4162	}
..	..	@@ -3595,7 +4171,7 @@
3595	4171	makeSomething(buffer, i==group.selection.size()-1);
3596	4172	}
3597	4173
3598		- GrafreeD.epsequal = epsequal;
	4174	+ Grafreed.epsequal = epsequal;
3599	4175
3600	4176	refreshContents();
3601	4177	}
..	..	@@ -3613,7 +4189,16 @@
3613	4189	String pigment = Object3D.GetPigment(tex);
3614	4190	//String bump = Object3D.GetBump(tex);
3615	4191
3616		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4192	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4193	+
	4194	+ try
	4195	+ {
	4196	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
	4197	+ }
	4198	+ catch (Exception e)
	4199	+ {
	4200	+ System.err.println("FAIL: " + node);
	4201	+ }
3617	4202
3618	4203	double s = v.s;
3619	4204
..	..	@@ -3745,7 +4330,7 @@
3745	4330	return;
3746	4331
3747	4332	Object3D poses = group.selection.get(0);
3748		- Object3D ref = GrafreeD.clipboard.get(0);
	4333	+ Object3D ref = Grafreed.clipboard.get(0);
3749	4334
3750	4335	Object3D newgroup = new Object3D("Po:" + poses.name);
3751	4336
..	..	@@ -3939,9 +4524,9 @@
3939	4524
3940	4525	void ClipMesh()
3941	4526	{
3942		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4527	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3943	4528	{
3944		- Object3D content = GrafreeD.clipboard.get(0);
	4529	+ Object3D content = Grafreed.clipboard.get(0);
3945	4530
3946	4531	if (content instanceof cGroup && ((cGroup)content).transientlink )
3947	4532	content = ((cGroup)content).get(0);
..	..	@@ -3950,7 +4535,7 @@
3950	4535	// {
3951	4536	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3952	4537	// }
3953		- group.selection.ClipMesh(GrafreeD.clipboard);
	4538	+ group.selection.ClipMesh(Grafreed.clipboard);
3954	4539	}
3955	4540	// group.selection.ClipMesh(GrafreeD.clipboard);
3956	4541	System.out.println("DONE.");
..	..	@@ -3997,6 +4582,18 @@
3997	4582	void MarkLeaves(boolean hide)
3998	4583	{
3999	4584	group.selection.MarkLeaves(hide);
	4585	+ refreshContents();
	4586	+ }
	4587	+
	4588	+ void RewindLeaves(boolean hide)
	4589	+ {
	4590	+ group.selection.RewindLeaves(hide);
	4591	+ refreshContents();
	4592	+ }
	4593	+
	4594	+ void RandomLeaves(boolean hide)
	4595	+ {
	4596	+ group.selection.RandomLeaves(hide);
4000	4597	refreshContents();
4001	4598	}
4002	4599
..	..	@@ -4071,28 +4668,25 @@
4071	4668	// }
4072	4669	// }
4073	4670
4074		- static boolean allparams = true;
4075		-
4076		- static Vector<Object3D> listUI = new Vector<Object3D>();
4077		-
4078	4671	void EditSelection(boolean newWindow)
4079	4672	{
	4673	+ if (group.selection == null)
	4674	+ {
	4675	+ EditElement(group, newWindow); // ? new
	4676	+ return;
	4677	+ }
	4678	+
4080	4679	// aConstraints.gridy = 0;
4081	4680	for (int i=0; i<group.selection.size(); i++)
4082	4681	{
4083	4682	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4084	4683	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4085		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4684	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4086	4685
4087	4686	Object3D elem = (Object3D)group.selection.elementAt(i);
4088		- if(elem != group)
	4687	+ if(elem != group \|\| !newWindow)
4089	4688	{
4090		- // if (!(elem instanceof Composite))
4091		- // newWindow = false;
4092		- listUI.add(elem);
4093		- elem.openEditWindow(this, newWindow); //, false);
4094		- System.out.println("edit : " + elem);
4095		- elem.editWindow.refreshContents(true); // ? new
	4689	+ EditElement(elem, newWindow); // ? new
4096	4690	}
4097	4691	}
4098	4692	}
..	..	@@ -4167,7 +4761,8 @@
4167	4761	//new Exception().printStackTrace();
4168	4762
4169	4763	freezemodel = true;
4170		-
	4764	+ ClearUnpinned();
	4765	+
4171	4766	/**/
4172	4767	//switch (event.id)
4173	4768	{
..	..	@@ -4175,7 +4770,6 @@
4175	4770	//case 702: // Event.LIST_DESELECT
4176	4771	group.deselectAll();
4177	4772	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4178		- objEditor.ClearInfo(); // .GetMaterial());
4179	4773	if (tps != null)
4180	4774	{
4181	4775	for (int i=0; i < tps.length; i++)
..	..	@@ -4184,10 +4778,8 @@
4184	4778
4185	4779	//if (child.parent != null)
4186	4780	//child.parent.addSelectee(child);
	4781	+ objEditor.SetMaterial(child);
4187	4782	group.addSelectee(child);
4188		- objEditor.SetMaterial(child); // .GetMaterial());
4189		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4190		- System.err.println("info : " + child.GetPath());
4191	4783	}
4192	4784	}
4193	4785	// else
..	..	@@ -4197,20 +4789,28 @@
4197	4789	// System.err.println("info : " + group.GetPath());
4198	4790	// }
4199	4791
4200		- objEditor.SetText(); // jan 2014
4201		-
4202		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4792	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4203	4793	CameraPane.flash = true;
4204	4794
4205		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4795	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4206	4796	// a camera
4207	4797	{
4208		- CameraPane.camerachangeframe = 0; // don't refuse it
4209		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4798	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	4799	+ {
	4800	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4801	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4802	+ }
4210	4803	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4211	4804	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4212	4805	}
4213	4806
	4807	+ if (tps != null && tps.length == 1)
	4808	+ {
	4809	+ EditSelection(false);
	4810	+ }
	4811	+
	4812	+ SetPinStates(tps != null && tps.length > 0);
	4813	+
4214	4814	refreshContents();
4215	4815	//return true;
4216	4816	}
..	..	@@ -4219,6 +4819,35 @@
4219	4819
4220	4820	freezemodel = false;
4221	4821	}
	4822	+
	4823	+ void SetPinStates(boolean enabled)
	4824	+ {
	4825	+ editButton.setEnabled(enabled);
	4826	+ uneditButton.setEnabled(enabled);
	4827	+ unselectButton.setEnabled(enabled);
	4828	+ flashSelectionButton.setEnabled(enabled);
	4829	+ }
	4830	+
	4831	+ void refreshContents(boolean cp)
	4832	+ {
	4833	+ if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	4834	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	4835	+ {
	4836	+ objEditor.ClearInfo(); // .GetMaterial());
	4837	+
	4838	+ for (int i=0; i < group.selection.Size(); i++)
	4839	+ {
	4840	+ Object3D child = (Object3D) group.selection.get(i);
	4841	+
	4842	+ objEditor.AddInfo(child, this, true);
	4843	+ System.err.println("info : " + child.GetPath());
	4844	+ }
	4845	+
	4846	+ objEditor.SetText(); // jan 2014
	4847	+ }
	4848	+
	4849	+ super.refreshContents(cp);
	4850	+ }
4222	4851
4223	4852	void linkSomething(Object3D thing)
4224	4853	{
..	..	@@ -4290,16 +4919,19 @@
4290	4919	{
4291	4920	if (group.selection.isEmpty())
4292	4921	return;
4293		- GrafreeD.clipboardIsTempGroup = false;
	4922	+
	4923	+ Grafreed.clipboardIsTempGroup = false;
4294	4924	Composite tGroup = null;
4295	4925	if (group.selection.size() > 0) // 1)
4296	4926	{
4297	4927	tGroup = new cGroup();
4298		- GrafreeD.clipboardIsTempGroup = true;
	4928	+ Grafreed.clipboardIsTempGroup = true;
4299	4929	}
4300	4930
4301	4931	if (cut)
4302	4932	{
	4933	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	4934	+// Save();
4303	4935	//int indices[] = jList.getSelectedIndices();
4304	4936	//for (int i = indices.length - 1; i >= 0; i--)
4305	4937	//jList.remove(indices[i]);
..	..	@@ -4335,16 +4967,16 @@
4335	4967	//System.out.println("cut " + child);
4336	4968	//System.out.println("parent = " + child.parent);
4337	4969	// tmp.addChild(child);
4338		- if (GrafreeD.clipboardIsTempGroup)
	4970	+ if (Grafreed.clipboardIsTempGroup)
4339	4971	tGroup.add/Child/(tmp);
4340	4972	else
4341		- GrafreeD.clipboard = tmp;
	4973	+ Grafreed.clipboard = tmp;
4342	4974	}
4343	4975	else
4344		- if (GrafreeD.clipboardIsTempGroup)
	4976	+ if (Grafreed.clipboardIsTempGroup)
4345	4977	tGroup.add/Child/(child);
4346	4978	else
4347		- GrafreeD.clipboard = child;
	4979	+ Grafreed.clipboard = child;
4348	4980	}
4349	4981
4350	4982	//ResetModel();
..	..	@@ -4376,21 +5008,23 @@
4376	5008	//System.out.println("cut " + elem);
4377	5009	//System.out.println("parent = " + elem.parent);
4378	5010	// tmp.addChild(elem);
4379		- if (GrafreeD.clipboardIsTempGroup)
	5011	+ if (Grafreed.clipboardIsTempGroup)
4380	5012	tGroup.add/Child/(tmp);
4381	5013	else
4382		- GrafreeD.clipboard = tmp;
	5014	+ Grafreed.clipboard = tmp;
4383	5015	}
4384	5016	else
4385		- if (GrafreeD.clipboardIsTempGroup)
	5017	+ if (Grafreed.clipboardIsTempGroup)
4386	5018	tGroup.add/Child/(child);
4387	5019	else
4388		- GrafreeD.clipboard = child;
	5020	+ Grafreed.clipboard = child;
4389	5021	}
4390	5022
4391	5023	}
4392		- if (GrafreeD.clipboardIsTempGroup)
4393		- GrafreeD.clipboard = tGroup;
	5024	+
	5025	+ if (Grafreed.clipboardIsTempGroup)
	5026	+ Grafreed.clipboard = tGroup;
	5027	+
4394	5028	if (cut)
4395	5029	{
4396	5030	ResetModel();
..	..	@@ -4400,11 +5034,15 @@
4400	5034
4401	5035	void paste(boolean expand)
4402	5036	{
	5037	+ if (Globals.REPLACEONMAKE)
	5038	+ Save();
	5039	+ boolean keep = Globals.REPLACEONMAKE;
	5040	+ Globals.REPLACEONMAKE = false;
4403	5041	// if (GrafreeD.clipboard == null)
4404	5042	// return;
4405	5043	boolean first = true;
4406	5044
4407		- if (GrafreeD.clipboardIsTempGroup)
	5045	+ if (Grafreed.clipboardIsTempGroup)
4408	5046	{
4409	5047	Composite temp;
4410	5048
..	..	@@ -4415,7 +5053,7 @@
4415	5053	temp = (Composite)Applet3D.clipboard.deepCopy();
4416	5054	*/
4417	5055	Object3D elem;
4418		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5056	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4419	5057	{
4420	5058	Object3D child = (Object3D)e.nextElement();
4421	5059
..	..	@@ -4449,16 +5087,17 @@
4449	5087	//Object3D cb = Applet3D.clipboard;
4450	5088	//temp.addChild(cb);
4451	5089	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4452		- assert(GrafreeD.clipboard.parent == null);
4453		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4454		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4455		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4456		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	5090	+ assert(Grafreed.clipboard.parent == null);
	5091	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5092	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5093	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5094	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4457	5095	else
4458		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4459		- GrafreeD.clipboard.get(0).parent = keepparent;
	5096	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5097	+ Grafreed.clipboard.get(0).parent = keepparent;
4460	5098	}
4461	5099
	5100	+ Globals.REPLACEONMAKE = keep;
4462	5101	ResetModel();
4463	5102	refreshContents();
4464	5103	}
..	..	@@ -4505,9 +5144,9 @@
4505	5144	{
4506	5145	boolean first = true;
4507	5146
4508		- if (GrafreeD.clipboardIsTempGroup)
	5147	+ if (Grafreed.clipboardIsTempGroup)
4509	5148	{
4510		- Composite temp = (Composite)GrafreeD.clipboard;
	5149	+ Composite temp = (Composite)Grafreed.clipboard;
4511	5150	Object3D copy;
4512	5151	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4513	5152	{
..	..	@@ -4517,7 +5156,7 @@
4517	5156	}
4518	5157	} else
4519	5158	{
4520		- linkSomething(GrafreeD.clipboard); //.get(0));
	5159	+ linkSomething(Grafreed.clipboard); //.get(0));
4521	5160	}
4522	5161	}
4523	5162	}
..	..	@@ -4594,6 +5233,10 @@
4594	5233
4595	5234	void group(Object3D csg, boolean grab)
4596	5235	{
	5236	+ if (Globals.REPLACEONMAKE)
	5237	+ Save();
	5238	+ boolean keep = Globals.REPLACEONMAKE;
	5239	+ Globals.REPLACEONMAKE = false;
4597	5240	if (//false) // why??
4598	5241	!group.selection.isEmpty())
4599	5242	{
..	..	@@ -4707,10 +5350,15 @@
4707	5350	//node.add(csg);
4708	5351	//makeSomething(node);
4709	5352	makeSomething(csg);
	5353	+ Globals.REPLACEONMAKE = keep;
4710	5354	}
4711	5355
4712	5356	void Ungroup(Object3D g)
4713	5357	{
	5358	+ if (Globals.REPLACEONMAKE)
	5359	+ Save();
	5360	+ boolean keep = Globals.REPLACEONMAKE;
	5361	+ Globals.REPLACEONMAKE = false;
4714	5362	if (g instanceof HiddenObject)
4715	5363	{
4716	5364	HiddenObject h = (HiddenObject) g;
..	..	@@ -4727,6 +5375,7 @@
4727	5375	objEditor.makeSomething(g.get(i), false);
4728	5376	}
4729	5377	}
	5378	+ Globals.REPLACEONMAKE = keep;
4730	5379	}
4731	5380
4732	5381	void ungroup()
..	..	@@ -4922,21 +5571,6 @@
4922	5571	}
4923	5572	*/
4924	5573
4925		- void ImportGFD()
4926		- {
4927		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4928		- browser.show();
4929		- String filename = browser.getFile();
4930		- if (filename != null && filename.length() > 0)
4931		- {
4932		- String fullname = browser.getDirectory() + filename;
4933		-
4934		- //Object3D readobj =
4935		- objEditor.ReadGFD(fullname, objEditor);
4936		- //makeSomething(readobj);
4937		- }
4938		- }
4939		-
4940	5574	/*
4941	5575	public void Callback(Object obj)
4942	5576	{
..	..	@@ -4960,26 +5594,9 @@
4960	5594	}
4961	5595	*/
4962	5596
4963		- void ImportVRMLX3D()
4964		- {
4965		- if (GrafreeD.standAlone)
4966		- {
4967		- /**/
4968		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4969		- browser.show();
4970		- String filename = browser.getFile();
4971		- if (filename != null && filename.length() > 0)
4972		- {
4973		- String fullname = browser.getDirectory() + filename;
4974		- LoadVRMLX3D(fullname);
4975		- }
4976		- /**/
4977		- }
4978		- }
4979		-
4980	5597	String GetFile(String dialogName)
4981	5598	{
4982		- if (GrafreeD.standAlone)
	5599	+ if (Grafreed.standAlone)
4983	5600	{
4984	5601	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4985	5602	browser.show();
..	..	@@ -5047,7 +5664,28 @@
5047	5664	cButton clearpanelButton;
5048	5665	cButton unselectButton;
5049	5666
	5667	+ cButton restoreCameraButton;
	5668	+
	5669	+ cButton saveButton;
5050	5670	cButton oneStepButton;
	5671	+
	5672	+ cButton groupButton;
	5673	+ cButton ungroupButton;
	5674	+ cButton compositeButton;
	5675	+ cButton switchButton;
	5676	+ cButton loopButton;
	5677	+ cButton textureButton;
	5678	+
	5679	+ cButton gridButton;
	5680	+ cButton boxButton;
	5681	+ cButton sphereButton;
	5682	+ cButton coneButton;
	5683	+ cButton torusButton;
	5684	+ cButton superButton;
	5685	+ cButton kleinButton;
	5686	+ cButton particlesButton;
	5687	+ cButton overlayButton;
	5688	+ cButton lightButton;
5051	5689
5052	5690	cButton screenfitButton;
5053	5691	cButton screenfitpointButton;
..	..	@@ -5060,14 +5698,6 @@
5060	5698
5061	5699	cButton setsupportButton;
5062	5700
5063		- cButton twoButton;
5064		- cButton sixButton;
5065		- cButton threeButton;
5066		- cButton sevenButton;
5067		- cButton fourButton; // full panel
5068		- cButton oneButton; // full XYZ
5069		- //cButton currentLayout;
5070		-
5071	5701	//
5072	5702	//Composite
5073	5703	Object3D // to do !!
..	..	@@ -5077,9 +5707,11 @@
5077	5707	//JTree jTree;
5078	5708	private MenuItem lookAtItem;
5079	5709	private MenuItem lookFromItem;
5080		- private MenuItem switchItem;
	5710	+ private MenuItem switchViewItem;
5081	5711	private MenuItem cutItem;
5082		- private MenuItem duplicateItem;
	5712	+ private MenuItem undoItem;
	5713	+ private MenuItem redoItem;
	5714	+ private JMenuItem duplicateItem;
5083	5715	private MenuItem cloneItem;
5084	5716	private MenuItem cloneSupportItem;
5085	5717	private MenuItem overwriteGeoItem;
..	..	@@ -5092,7 +5724,7 @@
5092	5724	private MenuItem linkverticesItem;
5093	5725	private MenuItem relinkverticesItem;
5094	5726	private MenuItem setMasterItem;
5095		- private MenuItem resetMeshItem;
	5727	+ private MenuItem resetAllItem;
5096	5728	private MenuItem stepAllItem;
5097	5729	private MenuItem revertMeshItem;
5098	5730	private MenuItem poseMeshItem;
..	..	@@ -5107,7 +5739,7 @@
5107	5739	private MenuItem pasteLinkItem;
5108	5740	private MenuItem pasteCloneItem;
5109	5741	private MenuItem pasteExpandItem;
5110		- private MenuItem clearItem;
	5742	+ private MenuItem deleteItem;
5111	5743	private MenuItem clearAllItem;
5112	5744	private MenuItem genUVItem;
5113	5745	private MenuItem genNormalsMESHItem;
..	..	@@ -5142,6 +5774,10 @@
5142	5774	private MenuItem showleavesItem;
5143	5775	private MenuItem markleavesItem;
5144	5776	private MenuItem unmarkleavesItem;
	5777	+ private MenuItem rewindleavesItem;
	5778	+ private MenuItem unrewindleavesItem;
	5779	+ private MenuItem randomleavesItem;
	5780	+ private MenuItem unrandomleavesItem;
5145	5781
5146	5782	private MenuItem flipVItem;
5147	5783	private MenuItem unflipVItem;
..	..	@@ -5153,15 +5789,17 @@
5153	5789	private MenuItem panoTexturesItem;
5154	5790
5155	5791	private MenuItem resetCentroidItem;
5156		- private MenuItem transformgeometryItem;
	5792	+ private MenuItem resetCentroidXZItem;
5157	5793	private MenuItem resetTransformItem;
	5794	+ private MenuItem transformGeometryItem;
	5795	+ private MenuItem transformChildrenItem;
5158	5796	private MenuItem hideItem;
5159	5797	private MenuItem grabItem;
5160	5798	private MenuItem backItem;
5161	5799	private MenuItem frontItem;
5162	5800	private MenuItem cameraItem;
5163	5801	private MenuItem compositeItem;
5164		- private MenuItem randomItem;
	5802	+ private MenuItem switchItem;
5165	5803	private MenuItem physicsItem;
5166	5804	private MenuItem frameselectorItem;
5167	5805	private MenuItem scriptNodeItem;
..	..	@@ -5185,6 +5823,8 @@
5185	5823	private MenuItem attachBumpItem;
5186	5824	private MenuItem detachBumpItem;
5187	5825	private MenuItem pigmentBumpItem;
	5826	+ private MenuItem embedTexturesItem;
	5827	+ private MenuItem deEmbedTexturesItem;
5188	5828
5189	5829	private MenuItem particleItem;
5190	5830	private MenuItem ragdollItem;
..	..	@@ -5223,11 +5863,6 @@
5223	5863	private MenuItem doubleItem;
5224	5864	private MenuItem tripleItem;
5225	5865
5226		- private MenuItem importGFDItem;
5227		- private MenuItem importVRMLX3DItem;
5228		- private MenuItem import3DSItem;
5229		- private MenuItem importOBJItem;
5230		-
5231	5866	private MenuItem computeAOItem;
5232	5867	private MenuItem recompileItem;
5233	5868	private MenuItem editScriptItem;
..	..	@@ -5237,4 +5872,8 @@
5237	5872	private MenuItem analyzeItem;
5238	5873	private MenuItem dumpItem;
5239	5874	//boolean freezemodel = false;
	5875	+
	5876	+ Menu cameraMenu;
	5877	+ MenuItem editCameraItem;
	5878	+ MenuItem restoreCameraItem;
5240	5879	}