~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,7 +80,13 @@
74	80	this.copy = this.group = copy;
75	81	//selectees = this.group.selectees;
76	82
77		- SetupMenu2(objEditor);
	83	+ if (copy.versions == null)
	84	+ {
	85	+ copy.versions = new byte[100][];
	86	+ copy.versionindex = -1;
	87	+ }
	88	+
	89	+ SetupMenu2(this); //objEditor);
78	90	SetupUI2(objEditor);
79	91	objEditor.SetupUI(true);
80	92	SetupViews(objEditor);
..	..	@@ -84,6 +96,10 @@
84	96
85	97	void CloneSelection(boolean supports)
86	98	{
	99	+ if (Globals.REPLACEONMAKE)
	100	+ Save();
	101	+ boolean keep = Globals.REPLACEONMAKE;
	102	+ Globals.REPLACEONMAKE = false;
87	103	// Object3D keep = GrafreeD.clipboard;
88	104	//Object3D obj;
89	105	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,18 +110,19 @@
94	110
95	111	makeSomething(clone, i==group.selection.size()-1);
96	112	}
	113	+ Globals.REPLACEONMAKE = keep;
97	114	}
98	115
99	116	void CloneClipboard(boolean supports)
100	117	{
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));
	118	+ assert(Grafreed.clipboard.parent == null);
	119	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	120	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	121	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	122	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
106	123	else
107		- makeSomething(CloneObject(GrafreeD.clipboard, false));
108		- GrafreeD.clipboard.get(0).parent = keepparent;
	124	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	125	+ Grafreed.clipboard.get(0).parent = keepparent;
109	126	}
110	127
111	128	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -119,7 +136,7 @@
119	136	// obj.support = null;
120	137	if (!supports)
121	138	obj.SaveSupports();
122		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	139	+ Object3D clone = (Object3D)Grafreed.clone(obj);
123	140	obj.parent = parent;
124	141	// obj.support = support;
125	142	// clone.support = support; // aout 2013
..	..	@@ -148,40 +165,37 @@
148	165
149	166	//JTextField nameField;
150	167
151		- void SetupMenu2(ObjEditor oe)
	168	+ void SetupMenu2(GroupEditor oe)
152	169	{
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		-
	170	+ oe.jTree = new cTree();
	171	+
168	172	Menu menu;
169	173	oe.menuBar.add(menu = new Menu("Edit"));
170	174	//editItem = menu.add(new MenuItem("Edit"));
171	175	//editItem.addActionListener(this);
172		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	176	+
	177	+// undoItem = menu.add(new MenuItem("Undo"));
	178	+// undoItem.addActionListener(this);
	179	+// redoItem = menu.add(new MenuItem("Redo"));
	180	+// redoItem.addActionListener(this);
	181	+// menu.add("-");
	182	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
173	183	duplicateItem.addActionListener(this);
	184	+ cloneItem = menu.add(new MenuItem("Clone"));
	185	+ cloneItem.addActionListener(this);
	186	+ if (Globals.ADVANCED)
	187	+ {
	188	+ cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
	189	+ cloneSupportItem.addActionListener(this);
	190	+ }
	191	+ menu.add("-");
174	192	cutItem = menu.add(new MenuItem("Cut"));
175	193	cutItem.addActionListener(this);
176	194	copyItem = menu.add(new MenuItem("Copy"));
177	195	copyItem.addActionListener(this);
178	196	pasteItem = menu.add(new MenuItem("Paste"));
179	197	pasteItem.addActionListener(this);
180		- menu.add("-");
181		- cloneItem = menu.add(new MenuItem("Clone"));
182		- cloneItem.addActionListener(this);
183		- cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
184		- cloneSupportItem.addActionListener(this);
	198	+
185	199	menu.add("-");
186	200	pasteIntoItem = menu.add(new MenuItem("Paste into"));
187	201	pasteIntoItem.addActionListener(this);
..	..	@@ -192,8 +206,8 @@
192	206	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
193	207	// pasteExpandItem.addActionListener(this);
194	208	menu.add("-");
195		- clearItem = menu.add(new MenuItem("Clear"));
196		- clearItem.addActionListener(this);
	209	+ deleteItem = menu.add(new MenuItem("Delete"));
	210	+ deleteItem.addActionListener(this);
197	211
198	212	if (Globals.ADVANCED)
199	213	{
..	..	@@ -201,14 +215,97 @@
201	215	clearAllItem = menu.add(new MenuItem("Clear All"));
202	216	clearAllItem.addActionListener(this);
203	217	}
	218	+
	219	+ menuBar.add(cameraMenu = new Menu("View"));
	220	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	221	+ //zBufferItem.addActionListener(this);
	222	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	223	+ //normalLensItem.addActionListener(this);
	224	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	225	+ restoreCameraItem.addActionListener(this);
	226	+
	227	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	228	+// toggleFullScreenItem.addItemListener(this);
	229	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	230	+// cameraMenu.add("-");
	231	+//
	232	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	233	+// toggleTextureItem.addItemListener(this);
	234	+// toggleTextureItem.setState(CameraPane.textureon);
	235	+//
	236	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	237	+// toggleSwitchItem.addItemListener(this);
	238	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	239	+
	240	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	241	+ toggleHandleItem.addItemListener(this);
	242	+ toggleHandleItem.setState(CameraPane.HANDLES);
	243	+
	244	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	245	+ togglePaintItem.addItemListener(this);
	246	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	247	+
	248	+ if (Globals.ADVANCED)
	249	+ {
	250	+ cameraMenu.add("-");
	251	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	252	+ toggleLiveItem.addItemListener(this);
	253	+ toggleLiveItem.setState(Globals.isLIVE());
204	254
	255	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	256	+ stepItem.addActionListener(this);
	257	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	258	+ // toggleDLItem.addItemListener(this);
	259	+ // toggleDLItem.setState(false);
	260	+
	261	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	262	+ toggleRenderItem.addItemListener(this);
	263	+ toggleRenderItem.setState(!CameraPane.frozen);
	264	+
	265	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	266	+ toggleDebugItem.addItemListener(this);
	267	+ toggleDebugItem.setState(Globals.DEBUG);
	268	+
	269	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	270	+ toggleFrustumItem.addItemListener(this);
	271	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	272	+
	273	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	274	+ toggleFootContactItem.addItemListener(this);
	275	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	276	+
	277	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	278	+ toggleTimelineItem.addItemListener(this);
	279	+ }
	280	+
	281	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	282	+// toggleRootItem.addItemListener(this);
	283	+// toggleRootItem.setState(false);
	284	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	285	+// animationItem.addItemListener(this);
	286	+// animationItem.setState(CameraPane.ANIMATION);
	287	+ cameraMenu.add("-");
	288	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	289	+ editCameraItem.addActionListener(this);
	290	+
	291	+ if (Globals.ADVANCED)
	292	+ {
	293	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	294	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	295	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	296	+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	297	+ oe.cameraMenu.add("-");
	298	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	299	+ openWindowItem.addActionListener(this);
	300	+ editLeafItem.addActionListener(this);
	301	+ lookAtItem.addActionListener(this);
	302	+ //lookFromItem.addActinoListener(this);
	303	+ //switchViewItem.addActionListener(this);
	304	+ }
	305	+
205	306	oe.menuBar.add(menu = new Menu("Setting"));
206	307	if (Globals.ADVANCED)
207	308	{
208		- resetMeshItem = menu.add(new MenuItem("Reset All"));
209		- resetMeshItem.addActionListener(this);
210		- stepAllItem = menu.add(new MenuItem("Step All"));
211		- stepAllItem.addActionListener(this);
212	309	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
213	310	revertMeshItem.addActionListener(this);
214	311	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
..	..	@@ -248,21 +345,29 @@
248	345	}
249	346
250	347	oe.menuBar.add(menu = new Menu("Group"));
251		- grabItem = menu.add(new MenuItem("Grab"));
252		- grabItem.addActionListener(this);
	348	+// grabItem = menu.add(new MenuItem("Grab"));
	349	+// grabItem.addActionListener(this);
253	350	backItem = menu.add(new MenuItem("Back"));
254	351	backItem.addActionListener(this);
255	352	frontItem = menu.add(new MenuItem("Front"));
256	353	frontItem.addActionListener(this);
257		- compositeItem = menu.add(new MenuItem("Composite"));
258		- compositeItem.addActionListener(this);
	354	+// compositeItem = menu.add(new MenuItem("Composite"));
	355	+// compositeItem.addActionListener(this);
	356	+
	357	+ if (Globals.ADVANCED)
	358	+ {
259	359	hideItem = menu.add(new MenuItem("Hidden Group"));
260	360	hideItem.addActionListener(this);
	361	+ }
261	362	ungroupItem = menu.add(new MenuItem("Ungroup"));
262	363	ungroupItem.addActionListener(this);
263		- menu.add("-");
264		- randomItem = menu.add(new MenuItem("Switch node"));
265		- randomItem.addActionListener(this);
	364	+
	365	+// menu.add("-");
	366	+//
	367	+// switchItem = menu.add(new MenuItem("Switch node"));
	368	+// switchItem.addActionListener(this);
	369	+ if (Globals.ADVANCED)
	370	+ {
266	371	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
267	372	switchGeoItem.addActionListener(this);
268	373	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -270,49 +375,52 @@
270	375	morphItem = menu.add(new MenuItem("Morph Group"));
271	376	morphItem.addActionListener(this);
272	377
273		- if (Globals.ADVANCED)
274		- {
	378	+ menu.add("-");
275	379	physicsItem = menu.add(new MenuItem("Physics"));
276	380	physicsItem.addActionListener(this);
277	381	frameselectorItem = menu.add(new MenuItem("Frame Selector"));
278	382	frameselectorItem.addActionListener(this);
279	383	scriptNodeItem = menu.add(new MenuItem("Script Node"));
280	384	scriptNodeItem.addActionListener(this);
281		- cameraItem = menu.add(new MenuItem("Camera"));
282		- cameraItem.addActionListener(this);
283	385	}
284	386
285	387	oe.menuBar.add(menu = new Menu("Object"));
286		- textureItem = menu.add(new MenuItem("Texture"));
287		- textureItem.addActionListener(this);
	388	+// textureItem = menu.add(new MenuItem("Texture"));
	389	+// textureItem.addActionListener(this);
288	390	billboardItem = menu.add(new MenuItem("Billboard"));
289	391	billboardItem.addActionListener(this);
290	392	csgItem = menu.add(new MenuItem("CSG"));
291	393	csgItem.addActionListener(this);
292		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	394	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
293	395	shadowXItem.addActionListener(this);
294		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	396	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
295	397	shadowYItem.addActionListener(this);
296		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	398	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
297	399	shadowZItem.addActionListener(this);
298		- if (Globals.ADVANCED)
299		- {
300		- linkerItem = menu.add(new MenuItem("Linker"));
301		- linkerItem.addActionListener(this);
302	400	attributeItem = menu.add(new MenuItem("Attribute"));
303	401	attributeItem.addActionListener(this);
	402	+
	403	+ if (Globals.ADVANCED)
	404	+ {
	405	+ menu.add("-");
	406	+ linkerItem = menu.add(new MenuItem("Linker"));
	407	+ linkerItem.addActionListener(this);
304	408	templateItem = menu.add(new MenuItem("Template"));
305	409	templateItem.addActionListener(this);
306	410	pointflowItem = menu.add(new MenuItem("Point Flow"));
307	411	pointflowItem.addActionListener(this);
308		- menu.add("-");
309	412	}
	413	+ menu.add("-");
310	414	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
311	415	resetTransformItem.addActionListener(this);
312	416	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
313	417	resetCentroidItem.addActionListener(this);
314		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
315		- transformgeometryItem.addActionListener(this);
	418	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	419	+ resetCentroidXZItem.addActionListener(this);
	420	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	421	+ transformGeometryItem.addActionListener(this);
	422	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	423	+ transformChildrenItem.addActionListener(this);
316	424
317	425	oe.menuBar.add(menu = new Menu("Geometry"));
318	426	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -325,7 +433,7 @@
325	433	genNormalsMESHItem.addActionListener(this);
326	434	if (Globals.ADVANCED)
327	435	{
328		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	436	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
329	437	genNormalsMINEItem.addActionListener(this);
330	438	}
331	439	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -361,6 +469,10 @@
361	469	oe.menuBar.add(menu = new Menu("Attributes"));
362	470	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
363	471	clearMaterialsItem.addActionListener(this);
	472	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	473	+ resetAllItem.addActionListener(this);
	474	+ stepAllItem = menu.add(new MenuItem("Step All"));
	475	+ stepAllItem.addActionListener(this);
364	476	menu.add("-");
365	477	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
366	478	liveleavesItem.addActionListener(this);
..	..	@@ -381,6 +493,14 @@
381	493	markleavesItem.addActionListener(this);
382	494	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
383	495	unmarkleavesItem.addActionListener(this);
	496	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	497	+ rewindleavesItem.addActionListener(this);
	498	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	499	+ unrewindleavesItem.addActionListener(this);
	500	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	501	+ randomleavesItem.addActionListener(this);
	502	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	503	+ unrandomleavesItem.addActionListener(this);
384	504	menu.add("-");
385	505	flipVItem = menu.add(new MenuItem("Flip V"));
386	506	flipVItem.addActionListener(this);
..	..	@@ -415,38 +535,42 @@
415	535	sortbysizeItem.addActionListener(this);
416	536	sortbynameItem = menu.add(new MenuItem("Sort by name"));
417	537	sortbynameItem.addActionListener(this);
	538	+ menu.add("-");
	539	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	540	+ shareGeometriesItem.addActionListener(this);
	541	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	542	+ mergeGeometriesItem.addActionListener(this);
418	543	if (Globals.ADVANCED)
419	544	{
420		- menu.add("-");
	545	+ // Pretty much the same as duplicate and clone.
421	546	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
422	547	extractGeometriesItem.addActionListener(this);
423	548	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
424	549	cloneGeometriesItem.addActionListener(this);
425		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
426		- shareGeometriesItem.addActionListener(this);
427		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
428		- mergeGeometriesItem.addActionListener(this);
429	550	}
430	551
431	552	oe.menuBar.add(menu = new Menu("Insert"));
432	553	buildCreateMenu(menu);
433	554
434		- oe.menuBar.add(menu = new Menu("Include"));
435		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
436		- importGFDItem.addActionListener(this);
437		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
438		- importVRMLX3DItem.addActionListener(this);
439		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
440		- importOBJItem.addActionListener(this);
441		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
442		- import3DSItem.addActionListener(this);
443		-
444	555	oe.menuBar.add(menu = new Menu("Tools"));
445	556	buildToolsMenu(menu);
446	557	}
447	558
	559	+
448	560	void SetupUI2(ObjEditor oe)
449	561	{
	562	+ // June 2019
	563	+ if (oe == null)
	564	+ {
	565	+ //super.SetupUI2(this);
	566	+ //return;
	567	+ }
	568	+
	569	+ if (copy != group)
	570	+ {
	571	+ //super.SetupUI2(this);
	572	+ }
	573	+
450	574	//new Exception().printStackTrace();
451	575
452	576	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -475,97 +599,230 @@
475	599	oe.radioPanel.add(dummyButton);
476	600	oe.buttonGroup.add(dummyButton);
477	601	*/
	602	+ cGridBag copyOptionsPanel = new cGridBag();
	603	+
	604	+ copyOptionsPanel.preferredHeight = 1;
	605	+
478	606	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
479	607
480		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
481		- liveCB.setToolTipText("Enabled animation");
	608	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	609	+ //minButton.setToolTipText("Minimize window");
	610	+ //minButton.addActionListener(this);
	611	+
	612	+ if (Globals.ADVANCED)
	613	+ {
	614	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	615	+ maxButton.setToolTipText("Maximize window");
	616	+ maxButton.addActionListener(this);
	617	+ }
	618	+
	619	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	620	+ fullButton.setToolTipText("Full-screen window");
	621	+ fullButton.addActionListener(this);
	622	+
	623	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	624	+ screenfitButton.setToolTipText("Screen fit");
	625	+ screenfitButton.addActionListener(this);
	626	+
	627	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	628	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	629	+ restoreCameraButton.addActionListener(this);
	630	+
	631	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	632	+ saveButton.setToolTipText("New version");
	633	+ saveButton.addActionListener(this);
	634	+
	635	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	636	+ undoButton.setToolTipText("Previous version");
	637	+ undoButton.addActionListener(this);
	638	+ undoButton.setEnabled(false);
	639	+
	640	+ cGridBag updown = new cGridBag().setVertical(true);
	641	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	642	+ restoreButton.setToolTipText("Restore current");
	643	+ restoreButton.addActionListener(this);
	644	+ restoreButton.setEnabled(false);
	645	+
	646	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	647	+ replaceButton.setToolTipText("Replace current");
	648	+ replaceButton.addActionListener(this);
	649	+ replaceButton.setEnabled(false);
	650	+
	651	+ copyOptionsPanel.add(updown);
	652	+
	653	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	654	+ redoButton.setToolTipText("Next version");
	655	+ redoButton.addActionListener(this);
	656	+ redoButton.setEnabled(false);
	657	+
	658	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	659	+ liveCB.setToolTipText("Enable animation");
482	660	liveCB.addItemListener(this);
483	661
484		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	662	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
485	663	oneStepButton.setToolTipText("Animate one step forward");
486	664	oneStepButton.addActionListener(this);
487	665
488		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	666	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
489	667	fastCB.setToolTipText("Fast mode");
490	668	fastCB.addItemListener(this);
491	669
492		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
493		- trackCB.setToolTipText("Enable tracking");
494		- trackCB.addItemListener(this);
495		-
496		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
497		- screenfitButton.setToolTipText("Screen fit");
498		- screenfitButton.addActionListener(this);
	670	+ //oe.toolboxPanel.Return();
	671	+
	672	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	673	+// trackCB.setToolTipText("Enable tracking");
	674	+// trackCB.addItemListener(this);
499	675
500	676	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
501	677	// screenfitpointButton.addActionListener(this);
502	678
503	679	if (Globals.ADVANCED)
504	680	{
505		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	681	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
506	682	snapobjectButton.addActionListener(this);
507	683	snapobjectButton.setToolTipText("Snap Object");
508	684	}
509	685
510		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
511		- flashSelectionButton.setToolTipText("Show selection");
512		- flashSelectionButton.addActionListener(this);
	686	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
513	687
514		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
515		-
516		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
517		- twoButton.setToolTipText("Show center view only");
518		- twoButton.addActionListener(this);
519		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	688	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
520	689	fourButton.addActionListener(this);
521	690	fourButton.setToolTipText("Show left panel only");
522		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
523		- sixButton.setToolTipText("2-column layout left");
	691	+
	692	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	693	+ twoButton.setToolTipText("Show right view only");
	694	+ twoButton.addActionListener(this);
	695	+ this.fullscreenLayout = twoButton;
	696	+
	697	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	698	+ sixButton.setToolTipText("Show left and right");
524	699	sixButton.addActionListener(this);
525		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
526		- threeButton.setToolTipText("2-column layout right");
527		- threeButton.addActionListener(this);
528		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
529		- sevenButton.setToolTipText("3-column layout");
530		- sevenButton.addActionListener(this);
	700	+// oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	701	+// threeButton.setToolTipText("2-column layout right");
	702	+// threeButton.addActionListener(this);
	703	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	704	+// sevenButton.setToolTipText("3-column layout");
	705	+// sevenButton.addActionListener(this);
531	706	//
532	707
533		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
534		- rootButton.setToolTipText("Edit selection in new tab");
	708	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	709	+ rootButton.setToolTipText("Open selection in new tab");
535	710	rootButton.addActionListener(this);
536	711
537		- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	712	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
538	713	closeButton.setToolTipText("Close tab");
539	714	closeButton.addActionListener(this);
540	715	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
541	716	//clearButton.addActionListener(this);
542		-
543		- cGridBag commandsPanel = new cGridBag();
	717	+
	718	+ // INSERT
	719	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	720	+ gridButton.setToolTipText("Create grid");
	721	+ gridButton.addActionListener(this);
	722	+
	723	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	724	+ boxButton.setToolTipText("Create box");
	725	+ boxButton.addActionListener(this);
	726	+
	727	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	728	+ sphereButton.setToolTipText("Create sphere");
	729	+ sphereButton.addActionListener(this);
	730	+
	731	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	732	+ coneButton.setToolTipText("Create cone");
	733	+ coneButton.addActionListener(this);
	734	+
	735	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	736	+ torusButton.setToolTipText("Create torus");
	737	+ torusButton.addActionListener(this);
	738	+
	739	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	740	+ superButton.setToolTipText("Create superellipsoid");
	741	+ superButton.addActionListener(this);
	742	+
	743	+ if (Globals.ADVANCED)
	744	+ {
	745	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	746	+ kleinButton.setToolTipText("Create Klein bottle");
	747	+ kleinButton.addActionListener(this);
	748	+ }
544	749
545		- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
546		- editButton.setToolTipText("Edit selection");
	750	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	751	+ particlesButton.setToolTipText("Create particle system");
	752	+ particlesButton.addActionListener(this);
	753	+
	754	+ oe.toolboxPanel.Return();
	755	+
	756	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	757	+ groupButton.setToolTipText("Create group");
	758	+ groupButton.addActionListener(this);
	759	+
	760	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	761	+ compositeButton.setToolTipText("Create composite");
	762	+ compositeButton.addActionListener(this);
	763	+
	764	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	765	+ switchButton.setToolTipText("Create item switcher");
	766	+ switchButton.addActionListener(this);
	767	+
	768	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	769	+ loopButton.setToolTipText("Create loop");
	770	+ loopButton.addActionListener(this);
	771	+
	772	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	773	+ textureButton.setToolTipText("Create texture");
	774	+ textureButton.addActionListener(this);
	775	+
	776	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	777	+ overlayButton.setToolTipText("Create overlay");
	778	+ overlayButton.addActionListener(this);
	779	+
	780	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	781	+ lightButton.setToolTipText("Create light");
	782	+ lightButton.addActionListener(this);
	783	+
	784	+ for (int i=6; --i>=0;)
	785	+ {
	786	+ oe.toolboxPanel.Return();
	787	+ oe.toolboxPanel.add(new cGridBag());
	788	+ oe.toolboxPanel.add(new cGridBag());
	789	+ oe.toolboxPanel.add(new cGridBag());
	790	+ oe.toolboxPanel.add(new cGridBag());
	791	+ oe.toolboxPanel.add(new cGridBag());
	792	+ oe.toolboxPanel.add(new cGridBag());
	793	+ oe.toolboxPanel.add(new cGridBag());
	794	+ }
	795	+
	796	+ // EDIT panel
	797	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	798	+ editButton.setToolTipText("Pin selection controls");
547	799	editButton.addActionListener(this);
548	800
549		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
550		- uneditButton.setToolTipText("Unedit selection");
	801	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	802	+ uneditButton.setToolTipText("Remove selection controls");
551	803	uneditButton.addActionListener(this);
552	804
553		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
554		- allParamsButton.setToolTipText("Edit all params");
	805	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	806	+ allParamsButton.setToolTipText("Show all controle");
555	807	allParamsButton.addActionListener(this);
556	808
557		- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	809	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
558	810	clearPanelButton.setToolTipText("Clear edit panel");
559	811	clearPanelButton.addActionListener(this);
560	812
561		- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	813	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
562	814	unselectButton.setToolTipText("Unselect");
563	815	unselectButton.addActionListener(this);
564	816
565		- commandsPanel.preferredHeight = 1;
	817	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	818	+ flashSelectionButton.setToolTipText("Highlight selection");
	819	+ flashSelectionButton.addActionListener(this);
566	820
567		- oe.treePanel.add(commandsPanel);
568		- oe.treePanel.Return();
	821	+ editCommandsPanel.preferredHeight = 1;
	822	+
	823	+ SetPinStates(false);
	824	+// oe.treePanel.add(commandsPanel);
	825	+// oe.treePanel.Return();
569	826
570	827	// oe.aConstraints.gridx += 1;
571	828	// oe.aConstraints.weighty = 0;
..	..	@@ -582,29 +839,17 @@
582	839
583	840	JScrollPane jSP;
584	841	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
585		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	842	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
586	843	ResetModel();
587	844
588	845	oe.treePanel.add(jSPPanel);
589	846	oe.treePanel.Return();
590	847
591		- cGridBag copyOptionsPanel = new cGridBag();
592		-
593		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
594		- colorCB.setToolTipText("Copy color when dropped");
595		- colorCB.addItemListener(this);
596		-
597		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
598		- materialCB.setToolTipText("Copy material when dropped");
599		- materialCB.addItemListener(this);
600		-
601		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
602		- textureCB.setToolTipText("Copy texture when dropped");
603		- textureCB.addItemListener(this);
604		-
605		- copyOptionsPanel.preferredHeight = 1;
606	848	oe.treePanel.add(copyOptionsPanel);
607	849	oe.treePanel.Return();
	850	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	851	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	852	+ sliderPane.preferredHeight = 1;
608	853
609	854	// mainPanel.setDividerLocation(0.5); //1.0);
610	855	// mainPanel.setResizeWeight(0.5);
..	..	@@ -627,29 +872,49 @@
627	872	dgr.addDragGestureListener(this);
628	873	}catch(Exception e) {}
629	874	*/
630		- radio.layout = sevenButton;
	875	+ radio.layout = sixButton; // sevenButton;
631	876	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
632	877	}
633	878
634	879	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
635	880	{
	881	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	882	+ colorCB.setToolTipText("Copy color when dropped");
	883	+ colorCB.addItemListener(this);
	884	+
	885	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	886	+ materialCB.setToolTipText("Copy material when dropped");
	887	+ materialCB.addItemListener(this);
	888	+
	889	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	890	+ textureCB.setToolTipText("Copy texture when dropped");
	891	+ textureCB.addItemListener(this);
	892	+
	893	+ panel.Return();
	894	+
636	895	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
637	896	boxCB.setToolTipText("Display bounding boxes");
638	897	boxCB.addItemListener(this);
639	898
640	899	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
641		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	900	+ zoomBoxCB.setToolTipText("Display only for wheel");
642	901	zoomBoxCB.addItemListener(this);
643	902
644		- if (Globals.ADVANCED)
	903	+ if (true) // Globals.ADVANCED)
645	904	{
646		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
647		- supportCB.setToolTipText("Enable rigging");
648		- supportCB.addItemListener(this);
	905	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	906	+// supportCB.setToolTipText("Enable rigging");
	907	+// supportCB.addItemListener(this);
	908	+
	909	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	910	+ freezeCB.setToolTipText("Fast moving camera");
	911	+ freezeCB.addItemListener(this);
649	912
650	913	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
651	914	// localCB.addItemListener(this);
652	915
	916	+ panel.Return();
	917	+
653	918	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
654	919	crowdCB.setToolTipText("Used for crowds");
655	920	crowdCB.addItemListener(this);
..	..	@@ -666,6 +931,8 @@
666	931	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
667	932	// speakerMocapCB.addItemListener(this);
668	933
	934	+ panel.Return();
	935	+
669	936	if (false)
670	937	{
671	938	// handled in scripts
..	..	@@ -680,42 +947,85 @@
680	947	//constraints.gridy += 1;
681	948	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
682	949	smoothfocusCB.addItemListener(this);
	950	+ panel.Return();
683	951	}
684	952
685	953	//constraints.gridx += 1;
686	954	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
687	955	// debugCB.addItemListener(this);
688	956
	957	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	958	+ trackCB.setToolTipText("Enable tracking target");
	959	+ trackCB.addItemListener(this);
	960	+
689	961	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	962	+ oeilCB.setToolTipText("Move camera when tracking");
690	963	oeilCB.addItemListener(this);
691	964
	965	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	966	+ shadowCB.setToolTipText("When live compute shadows");
	967	+ shadowCB.addItemListener(this);
	968	+
	969	+ panel.Return();
	970	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	971	+ toggleTextureCB.setToolTipText("Load textures");
	972	+ toggleTextureCB.addItemListener(this);
	973	+
	974	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	975	+ toggleSwitchCB.setToolTipText("Choose a single item");
	976	+ toggleSwitchCB.addItemListener(this);
	977	+
	978	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	979	+ autokeepCB.setToolTipText("On structure change");
	980	+ autokeepCB.addItemListener(this);
	981	+
	982	+ panel.Return();
	983	+ if (Globals.ADVANCED)
	984	+ {
692	985	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
693	986	lookAtCB.setToolTipText("Look-at target");
694	987	lookAtCB.addItemListener(this);
	988	+ }
695	989
696	990	}
697	991
698	992	cGridBag fill = new cGridBag();
699		-
700	993	fill.preferredHeight = 200;
	994	+ cGridBag fill2 = new cGridBag();
	995	+ fill2.preferredHeight = 200;
	996	+ cGridBag fill3 = new cGridBag();
	997	+ fill3.preferredHeight = 200;
701	998
702	999	panel.add(fill);
	1000	+ panel.add(fill2);
	1001	+ panel.add(fill3);
703	1002
704	1003	}
705	1004
706	1005	void EditObject(Object3D obj)
707	1006	{
708	1007	cRadio radioButton = new cRadio(obj.name);
	1008	+
	1009	+ // June 2019. Patch to avoid bug with transparency.
	1010	+ radioButton.hadMaterial = obj.material != null;
	1011	+ if (!radioButton.hadMaterial)
	1012	+ {
	1013	+ obj.material = new cMaterial();
	1014	+ }
	1015	+
709	1016	radioButton.SetObject(obj);
710		- radioButton.layout = sevenButton;
	1017	+ radioButton.layout = sixButton; // sevenButton;
711	1018	radioButton.SetCamera(cameraView.renderCamera, false);
712	1019	radioButton.addActionListener(this);
713	1020	radioPanel.add(radioButton);
714	1021	buttonGroup.add(radioButton);
715	1022	radioButton.doClick();
716	1023	}
	1024	+
717	1025	void SetupViews(ObjEditor oe)
718	1026	{
	1027	+ theFrame = this;
	1028	+
719	1029	oe.SetupViews();
720	1030
721	1031	System.out.println("SetupViews");
..	..	@@ -724,23 +1034,28 @@
724	1034	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
725	1035	}
726	1036
727		- JCheckBox liveCB;
728		- JCheckBox supportCB;
729		- JCheckBox localCB;
730		- JCheckBox crowdCB;
731		- JCheckBox smoothCB;
732		- JCheckBox fastCB;
733		- JCheckBox slowCB;
734		- JCheckBox boxCB;
735		- JCheckBox zoomBoxCB;
736		- JCheckBox trackCB;
737		- JCheckBox smoothfocusCB;
	1037	+ cToggleButton liveCB;
	1038	+ cCheckBox supportCB;
	1039	+ cCheckBox localCB;
	1040	+ cCheckBox crowdCB;
	1041	+ cCheckBox smoothCB;
	1042	+ cToggleButton fastCB;
	1043	+ cCheckBox slowCB;
	1044	+ cCheckBox boxCB;
	1045	+ cCheckBox zoomBoxCB;
	1046	+ cCheckBox freezeCB;
	1047	+ //cToggleButton trackCB;
	1048	+ cCheckBox trackCB;
	1049	+ cCheckBox smoothfocusCB;
738	1050	// JCheckBox speakerMocapCB;
739		- JCheckBox speakerCameraCB;
740		- JCheckBox speakerFocusCB;
741		- JCheckBox debugCB;
742		- JCheckBox oeilCB;
743		- JCheckBox lookAtCB;
	1051	+ cCheckBox speakerCameraCB;
	1052	+ cCheckBox speakerFocusCB;
	1053	+ cCheckBox debugCB;
	1054	+
	1055	+ cCheckBox oeilCB;
	1056	+ cCheckBox shadowCB;
	1057	+ cCheckBox autokeepCB;
	1058	+ cCheckBox lookAtCB;
744	1059
745	1060	// static int COLOR = 1;
746	1061	// static int MATERIAL = 2;
..	..	@@ -748,9 +1063,9 @@
748	1063
749	1064	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
750	1065
751		- JCheckBox colorCB;
752		- JCheckBox materialCB;
753		- JCheckBox textureCB;
	1066	+ cCheckBox colorCB;
	1067	+ cCheckBox materialCB;
	1068	+ cCheckBox textureCB;
754	1069
755	1070	public void itemStateChanged(ItemEvent e)
756	1071	{
..	..	@@ -778,6 +1093,7 @@
778	1093	} else if(e.getSource() == liveCB)
779	1094	{
780	1095	cameraView.ToggleLive();
	1096	+ refreshContents(false);
781	1097	}
782	1098	else if(e.getSource() == supportCB)
783	1099	{
..	..	@@ -842,6 +1158,18 @@
842	1158	{
843	1159	cameraView.ToggleOeil();
844	1160	}
	1161	+ else if(e.getSource() == shadowCB)
	1162	+ {
	1163	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1164	+ }
	1165	+ else if(e.getSource() == freezeCB)
	1166	+ {
	1167	+ Globals.FREEZEONMOVE ^= true;
	1168	+ }
	1169	+ else if(e.getSource() == autokeepCB)
	1170	+ {
	1171	+ Globals.REPLACEONMAKE ^= true;
	1172	+ }
845	1173	else if(e.getSource() == lookAtCB)
846	1174	{
847	1175	cameraView.ToggleLookAt();
..	..	@@ -858,7 +1186,8 @@
858	1186
859	1187	/**/
860	1188	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
861		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1189	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1190	+ TreePath path = objEditor.jTree.getSelectionPath();
862	1191	if ((path == null) \|\| (path.getPathCount() <= 1)) {
863	1192	// We can't move the root node or an empty selection
864	1193	return;
..	..	@@ -921,8 +1250,6 @@
921	1250	}
922	1251	}
923	1252
924		- String string = (String) object;
925		-
926	1253	System.out.println("Transfer = " + object + "; drop : " + target);
927	1254	// if( object instanceof java.io.File[])
928	1255	// {
..	..	@@ -930,7 +1257,11 @@
930	1257	// objEditor.DropFile((java.io.File[]) object, true);
931	1258	// return;
932	1259	// }
933		- if (string.charAt(0) == '/')
	1260	+
	1261	+ String string = object.toString();
	1262	+
	1263	+ // File path for Mac and Windows
	1264	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
934	1265	{
935	1266	// file(s)
936	1267	String[] names = string.split("\n");
..	..	@@ -957,7 +1288,7 @@
957	1288
958	1289	flashIt = false;
959	1290	CameraPane pane = (CameraPane) target;
960		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1291	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
961	1292	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
962	1293
963	1294	if (group.selection.size() == 1)
..	..	@@ -973,23 +1304,33 @@
973	1304
974	1305	assert target == objEditor.jTree;
975	1306	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1307	+ Object3D destinationLeaf;
976	1308	try {
977		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1309	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
978	1310	} catch (Exception e) {
979	1311	System.out.println("destinationPath : " + destinationPath);
980	1312	return;
981	1313	}
982	1314
983		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1315	+ for (int i=group.selection.size(); --i>=0;)
984	1316	{
	1317	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1318	+
	1319	+ // Cannot move into itself
	1320	+ if (child == destinationLeaf)
	1321	+ return;
	1322	+ }
	1323	+
	1324	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1325	+// {
985	1326	loadClipboard(true);
986	1327	objEditor.jTree.setSelectionPath(destinationPath);
987	1328	pasteInto(false, false);
988		- } else {
989		- loadClipboard(false);
990		- objEditor.jTree.setSelectionPath(destinationPath);
991		- pasteInto(false, false); // true); // ???
992		- }
	1329	+// } else {
	1330	+// loadClipboard(false);
	1331	+// objEditor.jTree.setSelectionPath(destinationPath);
	1332	+// pasteInto(false, false); // true); // ???
	1333	+// }
993	1334	}
994	1335	public void dropActionChanged(DropTargetDragEvent dtde)
995	1336	// Called if the user has modified the current drop gesture
..	..	@@ -1094,22 +1435,30 @@
1094	1435	{
1095	1436	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1096	1437	//heightFieldItem.addActionListener(this);
1097		- gridItem = menu.add(new MenuItem("Grid"));
1098		- gridItem.addActionListener(this);
1099		- rectoidItem = menu.add(new MenuItem("Box"));
1100		- rectoidItem.addActionListener(this);
1101		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1102		- ellipsoidItem.addActionListener(this);
1103		- coneItem = menu.add(new MenuItem("Cone"));
1104		- coneItem.addActionListener(this);
1105		- torusItem = menu.add(new MenuItem("Torus"));
1106		- torusItem.addActionListener(this);
1107		- superItem = menu.add(new MenuItem("Superellipsoid"));
1108		- superItem.addActionListener(this);
	1438	+// gridItem = menu.add(new MenuItem("Grid"));
	1439	+// gridItem.addActionListener(this);
	1440	+// rectoidItem = menu.add(new MenuItem("Box"));
	1441	+// rectoidItem.addActionListener(this);
	1442	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1443	+// ellipsoidItem.addActionListener(this);
	1444	+// coneItem = menu.add(new MenuItem("Cone"));
	1445	+// coneItem.addActionListener(this);
	1446	+// torusItem = menu.add(new MenuItem("Torus"));
	1447	+// torusItem.addActionListener(this);
	1448	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1449	+// superItem.addActionListener(this);
	1450	+
	1451	+ cameraItem = menu.add(new MenuItem("Camera"));
	1452	+ cameraItem.addActionListener(this);
	1453	+
	1454	+ if (!Globals.ADVANCED)
	1455	+ {
1109	1456	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1110	1457	kleinItem.addActionListener(this);
1111		- particleItem = menu.add(new MenuItem("Particle system"));
1112		- particleItem.addActionListener(this);
	1458	+ }
	1459	+
	1460	+// particleItem = menu.add(new MenuItem("Particle system"));
	1461	+// particleItem.addActionListener(this);
1113	1462	if (Globals.ADVANCED)
1114	1463	{
1115	1464	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1135,15 +1484,15 @@
1135	1484	}
1136	1485	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1137	1486	bezierItem.addActionListener(this);
1138		- overlayItem = menu.add(new MenuItem("Overlay"));
1139		- overlayItem.addActionListener(this);
1140		- lightItem = menu.add(new MenuItem("Light"));
1141		- lightItem.addActionListener(this);
	1487	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1488	+// overlayItem.addActionListener(this);
	1489	+// lightItem = menu.add(new MenuItem("Light"));
	1490	+// lightItem.addActionListener(this);
1142	1491	menu.add("-");
1143	1492	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1144	1493	//superLoopItem.addActionListener(this);
1145		- loopItem = menu.add(new MenuItem("Loop"));
1146		- loopItem.addActionListener(this);
	1494	+// loopItem = menu.add(new MenuItem("Loop"));
	1495	+// loopItem.addActionListener(this);
1147	1496	doubleItem = menu.add(new MenuItem("Fork"));
1148	1497	doubleItem.addActionListener(this);
1149	1498	if (Globals.ADVANCED)
..	..	@@ -1159,18 +1508,23 @@
1159	1508	animationItem.addItemListener(this);
1160	1509	animationItem.setState(Globals.ANIMATION);
1161	1510
	1511	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1512	+ archiveItem.addActionListener(this);
	1513	+
1162	1514	menu.add("-");
1163	1515	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1164	1516	parseverticesItem.addActionListener(this);
1165	1517	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1166	1518	textureFieldItem.addActionListener(this);
1167		- alignItem = menu.add(new MenuItem("Align Object"));
	1519	+ alignItem = menu.add(new MenuItem("Align Objects"));
1168	1520	alignItem.addActionListener(this);
1169	1521	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1170	1522	reduceMorphItem.addActionListener(this);
1171	1523	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1172	1524	reduce34MorphItem.addActionListener(this);
1173		-
	1525	+ menu.add("-");
	1526	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1527	+ memoryItem.addActionListener(this);
1174	1528	menu.add(computeAOItem = new MenuItem("Compute AO"));
1175	1529	computeAOItem.addActionListener(this);
1176	1530
..	..	@@ -1179,11 +1533,9 @@
1179	1533	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1180	1534	mirrorItem.addActionListener(this);
1181	1535	menu.add("-");
1182		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1183		- memoryItem.addActionListener(this);
1184	1536	menu.add(analyzeItem = new MenuItem("Analyze"));
1185	1537	analyzeItem.addActionListener(this);
1186		- menu.add(dumpItem = new MenuItem("Dump"));
	1538	+ menu.add(dumpItem = new MenuItem("Print"));
1187	1539	dumpItem.addActionListener(this);
1188	1540	// menu.add(pathItem = new MenuItem("From-to path"));
1189	1541	// pathItem.addActionListener(this);
..	..	@@ -1324,9 +1676,34 @@
1324	1676	shadow.material = new cMaterial(obj.material);
1325	1677	shadow.material.diffuse = 0.0001f;
1326	1678	shadow.material.specular = 0.0001f;
	1679	+ //shadow.projectedVertices[1].x = 300;
1327	1680
1328	1681	makeSomething(shadow);
1329	1682	}
	1683	+
	1684	+ private void ClearUnpinned()
	1685	+ {
	1686	+ //for (Object3D obj : listUI)
	1687	+ for (int i=listUI.size(); --i>=0;)
	1688	+ {
	1689	+ Object3D obj = listUI.elementAt(i);
	1690	+ if (!obj.pinned)
	1691	+ {
	1692	+ obj.CloseUI();
	1693	+ listUI.remove(i);
	1694	+ }
	1695	+ }
	1696	+ }
	1697	+
	1698	+ private void EditElement(Object3D elem, boolean newWindow)
	1699	+ {
	1700	+ // if (!(elem instanceof Composite))
	1701	+ // newWindow = false;
	1702	+ listUI.add(elem);
	1703	+ elem.openEditWindow(this, newWindow); //, false);
	1704	+ System.out.println("edit : " + elem);
	1705	+ elem.editWindow.refreshContents(true); // ? new
	1706	+ }
1330	1707
1331	1708	/**
1332	1709	* applyExample
..	..	@@ -1530,9 +1907,9 @@
1530	1907
1531	1908	void Overwrite(int mask)
1532	1909	{
1533		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1910	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1534	1911	{
1535		- Object3D content = GrafreeD.clipboard.get(0);
	1912	+ Object3D content = Grafreed.clipboard.get(0);
1536	1913
1537	1914	if (content instanceof cGroup && ((cGroup)content).transientlink )
1538	1915	content = ((cGroup)content).get(0);
..	..	@@ -1571,7 +1948,7 @@
1571	1948	{
1572	1949	ScreenFit();
1573	1950	} else
1574		- if (source == switchItem)
	1951	+ if (source == switchViewItem)
1575	1952	{
1576	1953	cVector v1 = new cVector();
1577	1954	cVector v2 = new cVector();
..	..	@@ -1580,11 +1957,11 @@
1580	1957	objEditor.cameraView.renderCamera.setAim(v2, v1);
1581	1958	objEditor.cameraView.repaint();
1582	1959	} else
1583		- if (source == rectoidItem)
	1960	+ if (source == rectoidItem \|\| source == boxButton)
1584	1961	{
1585	1962	makeSomething(new Box());
1586	1963	} else
1587		- if (source == particleItem)
	1964	+ if (source == particleItem \|\| source == particlesButton)
1588	1965	{
1589	1966	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1590	1967	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1663,27 +2040,27 @@
1663	2040
1664	2041	makeSomething(obj);
1665	2042	} else
1666		- if (source == gridItem)
	2043	+ if (source == gridItem \|\| source == gridButton)
1667	2044	{
1668	2045	makeSomething(new Grid());
1669	2046	} else
1670		- if (source == ellipsoidItem)
	2047	+ if (source == ellipsoidItem \|\| source == sphereButton)
1671	2048	{
1672	2049	makeSomething(new Sphere());
1673	2050	} else
1674		- if (source == coneItem)
	2051	+ if (source == coneItem \|\| source == coneButton)
1675	2052	{
1676	2053	makeSomething(new Cone());
1677	2054	} else
1678		- if (source == torusItem)
	2055	+ if (source == torusItem \|\| source == torusButton)
1679	2056	{
1680	2057	makeSomething(new Torus());
1681	2058	} else
1682		- if (source == superItem)
	2059	+ if (source == superItem \|\| source == superButton)
1683	2060	{
1684	2061	makeSomething(new Superellipsoid());
1685	2062	} else
1686		- if (source == kleinItem)
	2063	+ if (source == kleinItem \|\| source == kleinButton)
1687	2064	{
1688	2065	makeSomething(new Klein());
1689	2066	} else
..	..	@@ -1703,7 +2080,7 @@
1703	2080	{
1704	2081	makeSomething(new BezierSurface());
1705	2082	} else
1706		- if (source == overlayItem)
	2083	+ if (source == overlayItem \|\| source == overlayButton)
1707	2084	{
1708	2085	/*
1709	2086	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1751,7 +2128,7 @@
1751	2128	s.setup();
1752	2129	makeSomething(s);
1753	2130	} else
1754		- if (source == lightItem)
	2131	+ if (source == lightItem \|\| source == lightButton)
1755	2132	{
1756	2133	makeSomething(new Light());
1757	2134	} else
..	..	@@ -1801,30 +2178,30 @@
1801	2178
1802	2179	group(g);
1803	2180	} else
1804		- if (source == loopItem)
	2181	+ if (source == loopItem \|\| source == loopButton)
1805	2182	{
1806	2183	Composite csg = new GroupLeaf();
1807	2184	csg.count = 5;
1808	2185	group(csg);
1809		- Composite child = new cGroup();
	2186	+ Composite child = new cGroup("Branch");
1810	2187	csg.addChild(child);
1811	2188	child.addChild(csg);
1812	2189	} else
1813	2190	if (source == doubleItem)
1814	2191	{
1815		- Composite csg = new GroupLeaf();
	2192	+ Composite csg = new GroupLeaf("Fork");
1816	2193	csg.count = 5;
1817	2194	group(csg);
1818		- Composite child = new cGroup();
	2195	+ Composite child = new cGroup("Branch A");
1819	2196	csg.addChild(child);
1820	2197	child.addChild(csg);
1821		- child = new cGroup();
	2198	+ child = new cGroup("Branch B");
1822	2199	csg.addChild(child);
1823	2200	child.addChild(csg);
1824	2201	} else
1825	2202	if (source == tripleItem)
1826	2203	{
1827		- Composite csg = new GroupLeaf();
	2204	+ Composite csg = new GroupLeaf("Trident");
1828	2205	csg.count = 4;
1829	2206	group(csg);
1830	2207	Composite child = new cGroup();
..	..	@@ -1836,23 +2213,6 @@
1836	2213	child = new cGroup();
1837	2214	csg.addChild(child);
1838	2215	child.addChild(csg);
1839		- } else
1840		-
1841		- if (source == importGFDItem)
1842		- {
1843		- ImportGFD();
1844		- } else
1845		- if (source == importVRMLX3DItem)
1846		- {
1847		- ImportVRMLX3D();
1848		- } else
1849		- if (source == import3DSItem)
1850		- {
1851		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1852		- } else
1853		- if (source == importOBJItem)
1854		- {
1855		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1856	2216	} else
1857	2217	if (source == computeAOItem)
1858	2218	{
..	..	@@ -1872,7 +2232,7 @@
1872	2232	if (source == invariantsItem)
1873	2233	{
1874	2234	System.out.println("Invariants:");
1875		- GrafreeD.grafreeD.universe.invariants();
	2235	+ Grafreed.grafreeD.universe.invariants();
1876	2236	} else
1877	2237	if (source == memoryItem)
1878	2238	{
..	..	@@ -1891,6 +2251,46 @@
1891	2251	{
1892	2252	DumpObject();
1893	2253	} else
	2254	+ if (source == minButton)
	2255	+ {
	2256	+ Minimize();
	2257	+ } else
	2258	+ if (source == maxButton)
	2259	+ {
	2260	+ Maximize();
	2261	+ } else
	2262	+ if (source == fullButton)
	2263	+ {
	2264	+ ToggleFullScreen();
	2265	+ } else
	2266	+ if (source == undoButton)
	2267	+ {
	2268	+ // Go to previous version
	2269	+ //if (!Undo())
	2270	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2271	+ Undo();
	2272	+ } else
	2273	+ if (source == restoreButton)
	2274	+ {
	2275	+ // Restore current version
	2276	+ Restore();
	2277	+ } else
	2278	+ if (source == replaceButton)
	2279	+ {
	2280	+ // Overwrite current version
	2281	+ Replace();
	2282	+ } else
	2283	+ if (source == redoButton)
	2284	+ {
	2285	+ // Go to next version
	2286	+ Redo();
	2287	+ } else
	2288	+ if (source == saveButton)
	2289	+ {
	2290	+ // Save a new version
	2291	+ if (!Save(true))
	2292	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2293	+ } else
1894	2294	if (source == oneStepButton)
1895	2295	{
1896	2296	Globals.ONESTEP = true;
..	..	@@ -1898,17 +2298,14 @@
1898	2298	} else
1899	2299	if (source == screenfitButton)
1900	2300	{
1901		- //Reload(lastConverter, lastFilename, true);
1902	2301	ScreenFit();
1903	2302	} else
1904	2303	if (source == screenfitpointButton)
1905	2304	{
1906		- //Reload(lastConverter, lastFilename, true);
1907	2305	ScreenFitPoint();
1908	2306	} else
1909	2307	if (source == snapobjectButton)
1910	2308	{
1911		- //Reload(lastConverter, lastFilename, true);
1912	2309	SnapObject();
1913	2310	} else
1914	2311	// if (event.getSource() == recompileButton)
..	..	@@ -1945,12 +2342,20 @@
1945	2342	{
1946	2343	loadClipboard(true);
1947	2344	} else
	2345	+ if (source == undoItem)
	2346	+ {
	2347	+ Undo();
	2348	+ } else
	2349	+ if (source == redoItem)
	2350	+ {
	2351	+ Redo();
	2352	+ } else
1948	2353	if (source == duplicateItem)
1949	2354	{
1950		- Object3D keep = GrafreeD.clipboard;
	2355	+ Object3D keep = Grafreed.clipboard;
1951	2356	loadClipboard(false);
1952	2357	paste(false);
1953		- GrafreeD.clipboard = keep;
	2358	+ Grafreed.clipboard = keep;
1954	2359	} else
1955	2360	if (source == cloneItem)
1956	2361	{
..	..	@@ -2170,9 +2575,9 @@
2170	2575	// group.selection.get(0).setMasterThis(content); // should be identity
2171	2576	// refreshContents();
2172	2577	// }
2173		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2578	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2174	2579	{
2175		- Object3D content = GrafreeD.clipboard.get(0);
	2580	+ Object3D content = Grafreed.clipboard.get(0);
2176	2581
2177	2582	if (content instanceof cGroup && ((cGroup)content).transientlink )
2178	2583	content = ((cGroup)content).get(0);
..	..	@@ -2222,9 +2627,9 @@
2222	2627	} else
2223	2628	if (source == setMasterItem)
2224	2629	{
2225		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2630	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2226	2631	{
2227		- Object3D content = GrafreeD.clipboard.get(0);
	2632	+ Object3D content = Grafreed.clipboard.get(0);
2228	2633
2229	2634	if (content instanceof cGroup && ((cGroup)content).transientlink )
2230	2635	content = ((cGroup)content).get(0);
..	..	@@ -2237,9 +2642,9 @@
2237	2642	{
2238	2643	if (group.selection.size() == 1)
2239	2644	{
2240		- if (GrafreeD.clipboard.size() == 1)
	2645	+ if (Grafreed.clipboard.size() == 1)
2241	2646	{
2242		- Object3D content = GrafreeD.clipboard.get(0);
	2647	+ Object3D content = Grafreed.clipboard.get(0);
2243	2648
2244	2649	if (content instanceof cGroup && ((cGroup)content).transientlink )
2245	2650	content = ((cGroup)content).get(0);
..	..	@@ -2256,7 +2661,7 @@
2256	2661	{
2257	2662	RevertMeshes();
2258	2663	} else
2259		- if (source == resetMeshItem)
	2664	+ if (source == resetAllItem)
2260	2665	{
2261	2666	ResetAll();
2262	2667	} else
..	..	@@ -2264,7 +2669,7 @@
2264	2669	{
2265	2670	StepAll();
2266	2671	} else
2267		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	2672	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2268	2673	{
2269	2674	//int indices[] = jList.getSelectedIndices();
2270	2675	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2276,9 +2681,9 @@
2276	2681	{
2277	2682	ClearSelection(true);
2278	2683	} else
2279		- if (source == grabItem)
	2684	+ if (source == grabItem \|\| source == groupButton)
2280	2685	{
2281		- group(new cGroup(), true);
	2686	+ group(new cGroup(), false); // true);
2282	2687	} else
2283	2688	if (source == hideItem)
2284	2689	{
..	..	@@ -2296,11 +2701,11 @@
2296	2701	{
2297	2702	makeSomething(new Camera());
2298	2703	} else
2299		- if (source == compositeItem)
	2704	+ if (source == compositeItem \|\| source == compositeButton)
2300	2705	{
2301	2706	group(new Composite());
2302	2707	} else
2303		- if (source == randomItem)
	2708	+ if (source == switchItem \|\| source == switchButton)
2304	2709	{
2305	2710	RandomNode random = new RandomNode();
2306	2711	group(random);
..	..	@@ -2402,7 +2807,7 @@
2402	2807	{
2403	2808	group(new cLinker());
2404	2809	} else
2405		- if (source == textureItem)
	2810	+ if (source == textureItem \|\| source == textureButton)
2406	2811	{
2407	2812	group(new TextureNode());
2408	2813	} else
..	..	@@ -2422,17 +2827,30 @@
2422	2827	{
2423	2828	CastShadow(2);
2424	2829	} else
2425		- if (source == ungroupItem)
	2830	+ if (source == ungroupItem \|\| source == ungroupButton)
2426	2831	{
2427		- //ungroup();
	2832	+ boolean hasRoot = false;
	2833	+
2428	2834	for (int i=0; i<group.selection.size(); i++)
2429	2835	{
2430		- Ungroup(group.selection.get(i));
	2836	+ if (group.selection.get(i) == group)
	2837	+ {
	2838	+ hasRoot = true;
	2839	+ break;
	2840	+ }
2431	2841	}
2432	2842
2433		- ClearSelection(false);
2434		-
2435		- refreshContents();
	2843	+ if (!hasRoot)
	2844	+ {
	2845	+ for (int i=0; i<group.selection.size(); i++)
	2846	+ {
	2847	+ Ungroup(group.selection.get(i));
	2848	+ }
	2849	+
	2850	+ ClearSelection(false);
	2851	+
	2852	+ refreshContents();
	2853	+ }
2436	2854	} else
2437	2855	if (source == genUVItem)
2438	2856	{
..	..	@@ -2444,7 +2862,7 @@
2444	2862	} else
2445	2863	if (source == genNormalsMESHItem)
2446	2864	{
2447		- GenNormals(true); // TODO
	2865	+ GenNormalsMESH();
2448	2866	} else
2449	2867	if (source == genNormalsORGANItem)
2450	2868	{
..	..	@@ -2509,6 +2927,22 @@
2509	2927	if (source == unmarkleavesItem)
2510	2928	{
2511	2929	MarkLeaves(false);
	2930	+ } else
	2931	+ if (source == rewindleavesItem)
	2932	+ {
	2933	+ RewindLeaves(true);
	2934	+ } else
	2935	+ if (source == unrewindleavesItem)
	2936	+ {
	2937	+ RewindLeaves(false);
	2938	+ } else
	2939	+ if (source == randomleavesItem)
	2940	+ {
	2941	+ RandomLeaves(true);
	2942	+ } else
	2943	+ if (source == unrandomleavesItem)
	2944	+ {
	2945	+ RandomLeaves(false);
2512	2946	} else
2513	2947	if (source == flipVItem)
2514	2948	{
..	..	@@ -2594,9 +3028,13 @@
2594	3028	{
2595	3029	SmoothMesh();
2596	3030	} else
2597		- if (source == transformgeometryItem)
	3031	+ if (source == transformGeometryItem)
2598	3032	{
2599	3033	TransformGeometry();
	3034	+ } else
	3035	+ if (source == transformChildrenItem)
	3036	+ {
	3037	+ TransformChildren();
2600	3038	} else
2601	3039	if (source == resetTransformItem)
2602	3040	{
..	..	@@ -2604,7 +3042,11 @@
2604	3042	} else
2605	3043	if (source == resetCentroidItem)
2606	3044	{
2607		- ResetCentroid();
	3045	+ ResetCentroid(true);
	3046	+ } else
	3047	+ if (source == resetCentroidXZItem)
	3048	+ {
	3049	+ ResetCentroid(false);
2608	3050	} else
2609	3051	if (source == resetParentItem)
2610	3052	{
..	..	@@ -2736,6 +3178,10 @@
2736	3178	if (source == twoButton)
2737	3179	{
2738	3180	radio.layout = twoButton;
	3181	+
	3182	+ if (CameraPane.FULLSCREEN)
	3183	+ fullscreenLayout = radio.layout;
	3184	+
2739	3185	// bug
2740	3186	//gridPanel.setDividerLocation(1.0);
2741	3187	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2768,10 +3214,31 @@
2768	3214	bigThree.ClearUI();
2769	3215	bigThree.add(centralPanel);
2770	3216	bigThree.FlushUI();
	3217	+
	3218	+ cameraView.requestFocusInWindow();
	3219	+
	3220	+// refreshContents(true);
	3221	+//
	3222	+// try
	3223	+// {
	3224	+// java.awt.Robot bot = new java.awt.Robot();
	3225	+// int mask = InputEvent.BUTTON1_MASK;
	3226	+// bot.mouseMove(100, 100);
	3227	+// bot.mousePress(mask);
	3228	+// bot.mouseRelease(mask);
	3229	+// }
	3230	+// catch (Exception e)
	3231	+// {
	3232	+//
	3233	+// }
	3234	+
2771	3235	} else
2772	3236	if (source == threeButton)
2773	3237	{
2774	3238	radio.layout = threeButton;
	3239	+
	3240	+ if (CameraPane.FULLSCREEN)
	3241	+ fullscreenLayout = radio.layout;
2775	3242
2776	3243	// bigThree.remove(scenePanel);
2777	3244	// bigThree.remove(centralPanel);
..	..	@@ -2804,10 +3271,15 @@
2804	3271	bigThree.add(centralPanel);
2805	3272	bigThree.add(XYZPanel);
2806	3273	bigThree.FlushUI();
	3274	+
	3275	+ cameraView.requestFocusInWindow();
2807	3276	} else
2808	3277	if (source == fourButton)
2809	3278	{
2810	3279	radio.layout = fourButton;
	3280	+
	3281	+ if (CameraPane.FULLSCREEN)
	3282	+ fullscreenLayout = radio.layout;
2811	3283
2812	3284	// bigThree.remove(scenePanel);
2813	3285	// bigThree.remove(centralPanel);
..	..	@@ -2839,10 +3311,15 @@
2839	3311	bigThree.ClearUI();
2840	3312	bigThree.add(scenePanel);
2841	3313	bigThree.FlushUI();
	3314	+
	3315	+ cameraView.requestFocusInWindow();
2842	3316	} else
2843	3317	if (source == sixButton)
2844	3318	{
2845	3319	radio.layout = sixButton;
	3320	+
	3321	+ if (CameraPane.FULLSCREEN)
	3322	+ fullscreenLayout = radio.layout;
2846	3323
2847	3324	// bigThree.remove(scenePanel);
2848	3325	// bigThree.remove(centralPanel);
..	..	@@ -2875,10 +3352,15 @@
2875	3352	bigThree.add(scenePanel);
2876	3353	bigThree.add(centralPanel);
2877	3354	bigThree.FlushUI();
	3355	+
	3356	+ cameraView.requestFocusInWindow();
2878	3357	} else
2879	3358	if (source == sevenButton)
2880	3359	{
2881	3360	radio.layout = sevenButton;
	3361	+
	3362	+ if (CameraPane.FULLSCREEN)
	3363	+ fullscreenLayout = radio.layout;
2882	3364
2883	3365	// bigThree.remove(scenePanel);
2884	3366	// bigThree.remove(centralPanel);
..	..	@@ -2912,6 +3394,8 @@
2912	3394	bigThree.add(centralPanel);
2913	3395	bigThree.add(XYZPanel);
2914	3396	bigThree.FlushUI();
	3397	+
	3398	+ cameraView.requestFocusInWindow();
2915	3399	} else
2916	3400	if (source == rootButton)
2917	3401	{
..	..	@@ -2923,6 +3407,7 @@
2923	3407	EditObject(obj);
2924	3408	}
2925	3409
	3410	+ cameraView.requestFocusInWindow();
2926	3411	refreshContents(true);
2927	3412	} else
2928	3413	if (source == closeButton)
..	..	@@ -2932,22 +3417,37 @@
2932	3417	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2933	3418	{
2934	3419	ab = (cRadio)e.nextElement();
2935		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3420	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2936	3421	{
	3422	+ // Patch to avoid bug with transparency.
	3423	+ if (!ab.hadMaterial)
	3424	+ {
	3425	+ ab.object.material = null;
	3426	+ }
	3427	+
2937	3428	buttonGroup.remove(ab);
2938	3429	radioPanel.remove(ab);
2939	3430
2940		- ab.GetObject().editWindow = null;
	3431	+ //ab.GetObject().editWindow = null;
	3432	+ ab.GetObject().manipWindow = null;
2941	3433	// ab.GetObject().objectUI = null; // ?????????
2942	3434
2943	3435	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2944	3436	break;
2945	3437	}
2946	3438	}
	3439	+
	3440	+ cameraView.requestFocusInWindow();
2947	3441	refreshContents(true);
2948	3442	} else
2949	3443	if (source == editItem \|\| source == editButton)
2950	3444	{
	3445	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3446	+ {
	3447	+ Object3D child = (Object3D)e.nextElement();
	3448	+ child.pinned = true;
	3449	+ }
	3450	+
2951	3451	EditSelection(false);
2952	3452	} else
2953	3453	if (source == uneditButton)
..	..	@@ -2957,10 +3457,11 @@
2957	3457	Object3D child = (Object3D)e.nextElement();
2958	3458	if(child.editWindow != null)
2959	3459	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3460	+ child.pinned = false;
2960	3461	child.CloseUI();
2961	3462	listUI.remove(child);
2962	3463
2963		- child.editWindow = null; // ???????????
	3464	+ //child.editWindow = null; // ???????????
2964	3465	}
2965	3466	objEditor.ctrlPanel.FlushUI();
2966	3467	//objEditor.jTree.clearSelection();
..	..	@@ -2973,6 +3474,7 @@
2973	3474	//copy.ClearUI();
2974	3475	for (Object3D obj : listUI)
2975	3476	{
	3477	+ obj.pinned = false;
2976	3478	obj.CloseUI();
2977	3479	}
2978	3480	listUI.clear();
..	..	@@ -2982,7 +3484,7 @@
2982	3484	{
2983	3485	assert(copy == group);
2984	3486
2985		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3487	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2986	3488
2987	3489	for (Object3D obj : listUI)
2988	3490	{
..	..	@@ -3031,6 +3533,9 @@
3031	3533	}
3032	3534
3033	3535	copy = group;
	3536	+
	3537	+ SetUndoStates();
	3538	+
3034	3539	//Globals.theRenderer.object = group;
3035	3540	if(!useclient)
3036	3541	{
..	..	@@ -3046,20 +3551,46 @@
3046	3551	frontView.object = group;
3047	3552	sideView.object = group;
3048	3553	}
3049		- group.editWindow = this;
	3554	+
	3555	+// fix "+" issue
	3556	+ //group.editWindow = this;
	3557	+ group.manipWindow = this;
	3558	+
3050	3559	/*
3051	3560	currentLayout = radio.layout;
3052	3561	if (currentLayout == null)
3053	3562	currentLayout = sevenButton;
3054	3563	*/
3055	3564	radio.layout.doClick();
	3565	+
	3566	+ ClearUnpinned();
	3567	+ //Grafreed.Assert(group != null);
	3568	+ //Grafreed.Assert(group.selection != null);
	3569	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	3570	+ if (group.selection == null \|\| group.selection.size() == 1)
	3571	+ EditSelection(false);
3056	3572	keepparent = group.parent;
3057	3573	// PARENT = NULL or not???
3058	3574	//group.parent = null; // ROOT
3059	3575	//group.attributes = -1;
3060	3576	ResetModel();
	3577	+
	3578	+ cameraView.requestFocusInWindow();
3061	3579	refreshContents(true);
3062		- }
	3580	+ } else if (event.getSource() == editCameraItem)
	3581	+ {
	3582	+ cameraView.ProtectCamera();
	3583	+ cameraView.repaint();
	3584	+ return;
	3585	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3586	+ {
	3587	+ cameraView.RevertCamera();
	3588	+ cameraView.repaint();
	3589	+ return;
	3590	+ // } else if (event.getSource() == textureButton)
	3591	+ // {
	3592	+ // return; // true;
	3593	+ }
3063	3594	else
3064	3595	{
3065	3596	//return super.action(event, arg);
..	..	@@ -3068,7 +3599,6 @@
3068	3599	}
3069	3600
3070	3601	boolean useclient = false;
3071		- cRadio radio;
3072	3602
3073	3603	void ToggleRoot()
3074	3604	{
..	..	@@ -3120,6 +3650,28 @@
3120	3650	refreshContents();
3121	3651	}
3122	3652
	3653	+ void TransformChildren()
	3654	+ {
	3655	+ Object3D obj;
	3656	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3657	+ {
	3658	+ obj = (Object3D)e.nextElement();
	3659	+ obj.KeepTextureMatrices();
	3660	+ obj.TransformChildren();
	3661	+ obj.RestoreTextureMatrices();
	3662	+
	3663	+// if (obj.parent == null)
	3664	+// {
	3665	+// System.out.println("NULL PARENT!");
	3666	+// new Exception().printStackTrace();
	3667	+// }
	3668	+// else
	3669	+// TouchTransform(obj);
	3670	+// //obj.parent.Touch();
	3671	+ }
	3672	+
	3673	+ refreshContents();
	3674	+ }
3123	3675
3124	3676	void ResetTransform()
3125	3677	{
..	..	@@ -3232,7 +3784,7 @@
3232	3784	refreshContents();
3233	3785	}
3234	3786
3235		- void ResetCentroid()
	3787	+ void ResetCentroid(boolean full)
3236	3788	{
3237	3789	Object3D obj;
3238	3790	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3247,12 +3799,16 @@
3247	3799	LA.matIdentity(Object3D.mat);
3248	3800	obj.getBounds(minima, maxima, false);
3249	3801	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3250		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3802	+ if (full)
	3803	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3251	3804	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3252	3805	obj.TransformMesh(Object3D.mat);
	3806	+
3253	3807	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3254		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3808	+ if (full)
	3809	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3255	3810	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3811	+
3256	3812	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3257	3813	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3258	3814	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3281,7 +3837,8 @@
3281	3837
3282	3838	int size = obj.MemorySize();
3283	3839
3284		- System.err.println((size/1024) + " KB is the size of " + obj);
	3840	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3841	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3285	3842	}
3286	3843	}
3287	3844	catch (Exception e)
..	..	@@ -3318,9 +3875,9 @@
3318	3875	obj = (Object3D)e.nextElement();
3319	3876
3320	3877	System.out.println("Object is: " + obj);
3321		- GrafreeD.AnalyzeObject(obj);
	3878	+ Grafreed.AnalyzeObject(obj);
3322	3879	System.out.println("Boundary rep: " + obj.bRep);
3323		- GrafreeD.AnalyzeObject(obj.bRep);
	3880	+ Grafreed.AnalyzeObject(obj.bRep);
3324	3881
3325	3882	// System.err.println((size/1024) + " KB is the size of " + obj);
3326	3883	}
..	..	@@ -3362,6 +3919,13 @@
3362	3919	void GenNormals(boolean crease)
3363	3920	{
3364	3921	group.GenNormalsS(crease);
	3922	+
	3923	+ refreshContents();
	3924	+ }
	3925	+
	3926	+ void GenNormalsMESH()
	3927	+ {
	3928	+ group.GenNormalsMeshS();
3365	3929
3366	3930	refreshContents();
3367	3931	}
..	..	@@ -3534,8 +4098,8 @@
3534	4098
3535	4099	void ParseVertices()
3536	4100	{
3537		- boolean epsequal = GrafreeD.epsequal;
3538		- GrafreeD.epsequal = true;
	4101	+ boolean epsequal = Grafreed.epsequal;
	4102	+ Grafreed.epsequal = true;
3539	4103
3540	4104	for (int i=0; i<group.selection.size(); i++)
3541	4105	{
..	..	@@ -3560,7 +4124,7 @@
3560	4124	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3561	4125	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3562	4126
3563		- g.add(GrafreeD.clipboard);
	4127	+ g.add(Grafreed.clipboard);
3564	4128
3565	4129	buffer.add(g);
3566	4130	}
..	..	@@ -3575,7 +4139,7 @@
3575	4139	makeSomething(buffer, i==group.selection.size()-1);
3576	4140	}
3577	4141
3578		- GrafreeD.epsequal = epsequal;
	4142	+ Grafreed.epsequal = epsequal;
3579	4143
3580	4144	refreshContents();
3581	4145	}
..	..	@@ -3593,7 +4157,16 @@
3593	4157	String pigment = Object3D.GetPigment(tex);
3594	4158	//String bump = Object3D.GetBump(tex);
3595	4159
3596		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4160	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4161	+
	4162	+ try
	4163	+ {
	4164	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4165	+ }
	4166	+ catch (Exception e)
	4167	+ {
	4168	+ System.err.println("FAIL: " + node);
	4169	+ }
3597	4170
3598	4171	double s = v.s;
3599	4172
..	..	@@ -3725,7 +4298,7 @@
3725	4298	return;
3726	4299
3727	4300	Object3D poses = group.selection.get(0);
3728		- Object3D ref = GrafreeD.clipboard.get(0);
	4301	+ Object3D ref = Grafreed.clipboard.get(0);
3729	4302
3730	4303	Object3D newgroup = new Object3D("Po:" + poses.name);
3731	4304
..	..	@@ -3919,9 +4492,9 @@
3919	4492
3920	4493	void ClipMesh()
3921	4494	{
3922		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4495	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3923	4496	{
3924		- Object3D content = GrafreeD.clipboard.get(0);
	4497	+ Object3D content = Grafreed.clipboard.get(0);
3925	4498
3926	4499	if (content instanceof cGroup && ((cGroup)content).transientlink )
3927	4500	content = ((cGroup)content).get(0);
..	..	@@ -3930,7 +4503,7 @@
3930	4503	// {
3931	4504	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3932	4505	// }
3933		- group.selection.ClipMesh(GrafreeD.clipboard);
	4506	+ group.selection.ClipMesh(Grafreed.clipboard);
3934	4507	}
3935	4508	// group.selection.ClipMesh(GrafreeD.clipboard);
3936	4509	System.out.println("DONE.");
..	..	@@ -3977,6 +4550,18 @@
3977	4550	void MarkLeaves(boolean hide)
3978	4551	{
3979	4552	group.selection.MarkLeaves(hide);
	4553	+ refreshContents();
	4554	+ }
	4555	+
	4556	+ void RewindLeaves(boolean hide)
	4557	+ {
	4558	+ group.selection.RewindLeaves(hide);
	4559	+ refreshContents();
	4560	+ }
	4561	+
	4562	+ void RandomLeaves(boolean hide)
	4563	+ {
	4564	+ group.selection.RandomLeaves(hide);
3980	4565	refreshContents();
3981	4566	}
3982	4567
..	..	@@ -4051,28 +4636,25 @@
4051	4636	// }
4052	4637	// }
4053	4638
4054		- static boolean allparams = true;
4055		-
4056		- static Vector<Object3D> listUI = new Vector<Object3D>();
4057		-
4058	4639	void EditSelection(boolean newWindow)
4059	4640	{
	4641	+ if (group.selection == null)
	4642	+ {
	4643	+ EditElement(group, newWindow); // ? new
	4644	+ return;
	4645	+ }
	4646	+
4060	4647	// aConstraints.gridy = 0;
4061	4648	for (int i=0; i<group.selection.size(); i++)
4062	4649	{
4063	4650	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4064	4651	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4065		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4652	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4066	4653
4067	4654	Object3D elem = (Object3D)group.selection.elementAt(i);
4068		- if(elem != group)
	4655	+ if(elem != group \|\| !newWindow)
4069	4656	{
4070		- // if (!(elem instanceof Composite))
4071		- // newWindow = false;
4072		- listUI.add(elem);
4073		- elem.openEditWindow(this, newWindow); //, false);
4074		- System.out.println("edit : " + elem);
4075		- elem.editWindow.refreshContents(true); // ? new
	4657	+ EditElement(elem, newWindow); // ? new
4076	4658	}
4077	4659	}
4078	4660	}
..	..	@@ -4147,7 +4729,8 @@
4147	4729	//new Exception().printStackTrace();
4148	4730
4149	4731	freezemodel = true;
4150		-
	4732	+ ClearUnpinned();
	4733	+
4151	4734	/**/
4152	4735	//switch (event.id)
4153	4736	{
..	..	@@ -4155,7 +4738,6 @@
4155	4738	//case 702: // Event.LIST_DESELECT
4156	4739	group.deselectAll();
4157	4740	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4158		- objEditor.ClearInfo(); // .GetMaterial());
4159	4741	if (tps != null)
4160	4742	{
4161	4743	for (int i=0; i < tps.length; i++)
..	..	@@ -4164,10 +4746,8 @@
4164	4746
4165	4747	//if (child.parent != null)
4166	4748	//child.parent.addSelectee(child);
	4749	+ objEditor.SetMaterial(child);
4167	4750	group.addSelectee(child);
4168		- objEditor.SetMaterial(child); // .GetMaterial());
4169		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4170		- System.err.println("info : " + child.GetPath());
4171	4751	}
4172	4752	}
4173	4753	// else
..	..	@@ -4177,20 +4757,28 @@
4177	4757	// System.err.println("info : " + group.GetPath());
4178	4758	// }
4179	4759
4180		- objEditor.SetText(); // jan 2014
4181		-
4182		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4760	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4183	4761	CameraPane.flash = true;
4184	4762
4185		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4763	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4186	4764	// a camera
4187	4765	{
4188		- CameraPane.camerachangeframe = 0; // don't refuse it
4189		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4766	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	4767	+ {
	4768	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4769	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4770	+ }
4190	4771	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4191	4772	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4192	4773	}
4193	4774
	4775	+ if (tps != null && tps.length == 1)
	4776	+ {
	4777	+ EditSelection(false);
	4778	+ }
	4779	+
	4780	+ SetPinStates(tps != null && tps.length > 0);
	4781	+
4194	4782	refreshContents();
4195	4783	//return true;
4196	4784	}
..	..	@@ -4199,6 +4787,35 @@
4199	4787
4200	4788	freezemodel = false;
4201	4789	}
	4790	+
	4791	+ void SetPinStates(boolean enabled)
	4792	+ {
	4793	+ editButton.setEnabled(enabled);
	4794	+ uneditButton.setEnabled(enabled);
	4795	+ unselectButton.setEnabled(enabled);
	4796	+ flashSelectionButton.setEnabled(enabled);
	4797	+ }
	4798	+
	4799	+ void refreshContents(boolean cp)
	4800	+ {
	4801	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4802	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	4803	+ {
	4804	+ objEditor.ClearInfo(); // .GetMaterial());
	4805	+
	4806	+ for (int i=0; i < group.selection.Size(); i++)
	4807	+ {
	4808	+ Object3D child = (Object3D) group.selection.get(i);
	4809	+
	4810	+ objEditor.AddInfo(child, this, true);
	4811	+ System.err.println("info : " + child.GetPath());
	4812	+ }
	4813	+
	4814	+ objEditor.SetText(); // jan 2014
	4815	+ }
	4816	+
	4817	+ super.refreshContents(cp);
	4818	+ }
4202	4819
4203	4820	void linkSomething(Object3D thing)
4204	4821	{
..	..	@@ -4270,16 +4887,19 @@
4270	4887	{
4271	4888	if (group.selection.isEmpty())
4272	4889	return;
4273		- GrafreeD.clipboardIsTempGroup = false;
	4890	+
	4891	+ Grafreed.clipboardIsTempGroup = false;
4274	4892	Composite tGroup = null;
4275	4893	if (group.selection.size() > 0) // 1)
4276	4894	{
4277	4895	tGroup = new cGroup();
4278		- GrafreeD.clipboardIsTempGroup = true;
	4896	+ Grafreed.clipboardIsTempGroup = true;
4279	4897	}
4280	4898
4281	4899	if (cut)
4282	4900	{
	4901	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	4902	+// Save();
4283	4903	//int indices[] = jList.getSelectedIndices();
4284	4904	//for (int i = indices.length - 1; i >= 0; i--)
4285	4905	//jList.remove(indices[i]);
..	..	@@ -4315,16 +4935,16 @@
4315	4935	//System.out.println("cut " + child);
4316	4936	//System.out.println("parent = " + child.parent);
4317	4937	// tmp.addChild(child);
4318		- if (GrafreeD.clipboardIsTempGroup)
	4938	+ if (Grafreed.clipboardIsTempGroup)
4319	4939	tGroup.add/Child/(tmp);
4320	4940	else
4321		- GrafreeD.clipboard = tmp;
	4941	+ Grafreed.clipboard = tmp;
4322	4942	}
4323	4943	else
4324		- if (GrafreeD.clipboardIsTempGroup)
	4944	+ if (Grafreed.clipboardIsTempGroup)
4325	4945	tGroup.add/Child/(child);
4326	4946	else
4327		- GrafreeD.clipboard = child;
	4947	+ Grafreed.clipboard = child;
4328	4948	}
4329	4949
4330	4950	//ResetModel();
..	..	@@ -4356,21 +4976,23 @@
4356	4976	//System.out.println("cut " + elem);
4357	4977	//System.out.println("parent = " + elem.parent);
4358	4978	// tmp.addChild(elem);
4359		- if (GrafreeD.clipboardIsTempGroup)
	4979	+ if (Grafreed.clipboardIsTempGroup)
4360	4980	tGroup.add/Child/(tmp);
4361	4981	else
4362		- GrafreeD.clipboard = tmp;
	4982	+ Grafreed.clipboard = tmp;
4363	4983	}
4364	4984	else
4365		- if (GrafreeD.clipboardIsTempGroup)
	4985	+ if (Grafreed.clipboardIsTempGroup)
4366	4986	tGroup.add/Child/(child);
4367	4987	else
4368		- GrafreeD.clipboard = child;
	4988	+ Grafreed.clipboard = child;
4369	4989	}
4370	4990
4371	4991	}
4372		- if (GrafreeD.clipboardIsTempGroup)
4373		- GrafreeD.clipboard = tGroup;
	4992	+
	4993	+ if (Grafreed.clipboardIsTempGroup)
	4994	+ Grafreed.clipboard = tGroup;
	4995	+
4374	4996	if (cut)
4375	4997	{
4376	4998	ResetModel();
..	..	@@ -4380,11 +5002,15 @@
4380	5002
4381	5003	void paste(boolean expand)
4382	5004	{
	5005	+ if (Globals.REPLACEONMAKE)
	5006	+ Save();
	5007	+ boolean keep = Globals.REPLACEONMAKE;
	5008	+ Globals.REPLACEONMAKE = false;
4383	5009	// if (GrafreeD.clipboard == null)
4384	5010	// return;
4385	5011	boolean first = true;
4386	5012
4387		- if (GrafreeD.clipboardIsTempGroup)
	5013	+ if (Grafreed.clipboardIsTempGroup)
4388	5014	{
4389	5015	Composite temp;
4390	5016
..	..	@@ -4395,7 +5021,7 @@
4395	5021	temp = (Composite)Applet3D.clipboard.deepCopy();
4396	5022	*/
4397	5023	Object3D elem;
4398		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5024	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4399	5025	{
4400	5026	Object3D child = (Object3D)e.nextElement();
4401	5027
..	..	@@ -4429,16 +5055,17 @@
4429	5055	//Object3D cb = Applet3D.clipboard;
4430	5056	//temp.addChild(cb);
4431	5057	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4432		- assert(GrafreeD.clipboard.parent == null);
4433		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4434		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4435		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4436		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	5058	+ assert(Grafreed.clipboard.parent == null);
	5059	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5060	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5061	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5062	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4437	5063	else
4438		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4439		- GrafreeD.clipboard.get(0).parent = keepparent;
	5064	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5065	+ Grafreed.clipboard.get(0).parent = keepparent;
4440	5066	}
4441	5067
	5068	+ Globals.REPLACEONMAKE = keep;
4442	5069	ResetModel();
4443	5070	refreshContents();
4444	5071	}
..	..	@@ -4485,9 +5112,9 @@
4485	5112	{
4486	5113	boolean first = true;
4487	5114
4488		- if (GrafreeD.clipboardIsTempGroup)
	5115	+ if (Grafreed.clipboardIsTempGroup)
4489	5116	{
4490		- Composite temp = (Composite)GrafreeD.clipboard;
	5117	+ Composite temp = (Composite)Grafreed.clipboard;
4491	5118	Object3D copy;
4492	5119	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4493	5120	{
..	..	@@ -4497,7 +5124,7 @@
4497	5124	}
4498	5125	} else
4499	5126	{
4500		- linkSomething(GrafreeD.clipboard); //.get(0));
	5127	+ linkSomething(Grafreed.clipboard); //.get(0));
4501	5128	}
4502	5129	}
4503	5130	}
..	..	@@ -4574,6 +5201,10 @@
4574	5201
4575	5202	void group(Object3D csg, boolean grab)
4576	5203	{
	5204	+ if (Globals.REPLACEONMAKE)
	5205	+ Save();
	5206	+ boolean keep = Globals.REPLACEONMAKE;
	5207	+ Globals.REPLACEONMAKE = false;
4577	5208	if (//false) // why??
4578	5209	!group.selection.isEmpty())
4579	5210	{
..	..	@@ -4687,10 +5318,15 @@
4687	5318	//node.add(csg);
4688	5319	//makeSomething(node);
4689	5320	makeSomething(csg);
	5321	+ Globals.REPLACEONMAKE = keep;
4690	5322	}
4691	5323
4692	5324	void Ungroup(Object3D g)
4693	5325	{
	5326	+ if (Globals.REPLACEONMAKE)
	5327	+ Save();
	5328	+ boolean keep = Globals.REPLACEONMAKE;
	5329	+ Globals.REPLACEONMAKE = false;
4694	5330	if (g instanceof HiddenObject)
4695	5331	{
4696	5332	HiddenObject h = (HiddenObject) g;
..	..	@@ -4707,6 +5343,7 @@
4707	5343	objEditor.makeSomething(g.get(i), false);
4708	5344	}
4709	5345	}
	5346	+ Globals.REPLACEONMAKE = keep;
4710	5347	}
4711	5348
4712	5349	void ungroup()
..	..	@@ -4902,21 +5539,6 @@
4902	5539	}
4903	5540	*/
4904	5541
4905		- void ImportGFD()
4906		- {
4907		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4908		- browser.show();
4909		- String filename = browser.getFile();
4910		- if (filename != null && filename.length() > 0)
4911		- {
4912		- String fullname = browser.getDirectory() + filename;
4913		-
4914		- //Object3D readobj =
4915		- objEditor.ReadGFD(fullname, objEditor);
4916		- //makeSomething(readobj);
4917		- }
4918		- }
4919		-
4920	5542	/*
4921	5543	public void Callback(Object obj)
4922	5544	{
..	..	@@ -4940,26 +5562,9 @@
4940	5562	}
4941	5563	*/
4942	5564
4943		- void ImportVRMLX3D()
4944		- {
4945		- if (GrafreeD.standAlone)
4946		- {
4947		- /**/
4948		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4949		- browser.show();
4950		- String filename = browser.getFile();
4951		- if (filename != null && filename.length() > 0)
4952		- {
4953		- String fullname = browser.getDirectory() + filename;
4954		- LoadVRMLX3D(fullname);
4955		- }
4956		- /**/
4957		- }
4958		- }
4959		-
4960	5565	String GetFile(String dialogName)
4961	5566	{
4962		- if (GrafreeD.standAlone)
	5567	+ if (Grafreed.standAlone)
4963	5568	{
4964	5569	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4965	5570	browser.show();
..	..	@@ -5027,7 +5632,28 @@
5027	5632	cButton clearpanelButton;
5028	5633	cButton unselectButton;
5029	5634
	5635	+ cButton restoreCameraButton;
	5636	+
	5637	+ cButton saveButton;
5030	5638	cButton oneStepButton;
	5639	+
	5640	+ cButton groupButton;
	5641	+ cButton ungroupButton;
	5642	+ cButton compositeButton;
	5643	+ cButton switchButton;
	5644	+ cButton loopButton;
	5645	+ cButton textureButton;
	5646	+
	5647	+ cButton gridButton;
	5648	+ cButton boxButton;
	5649	+ cButton sphereButton;
	5650	+ cButton coneButton;
	5651	+ cButton torusButton;
	5652	+ cButton superButton;
	5653	+ cButton kleinButton;
	5654	+ cButton particlesButton;
	5655	+ cButton overlayButton;
	5656	+ cButton lightButton;
5031	5657
5032	5658	cButton screenfitButton;
5033	5659	cButton screenfitpointButton;
..	..	@@ -5040,14 +5666,6 @@
5040	5666
5041	5667	cButton setsupportButton;
5042	5668
5043		- cButton twoButton;
5044		- cButton sixButton;
5045		- cButton threeButton;
5046		- cButton sevenButton;
5047		- cButton fourButton; // full panel
5048		- cButton oneButton; // full XYZ
5049		- //cButton currentLayout;
5050		-
5051	5669	//
5052	5670	//Composite
5053	5671	Object3D // to do !!
..	..	@@ -5057,9 +5675,11 @@
5057	5675	//JTree jTree;
5058	5676	private MenuItem lookAtItem;
5059	5677	private MenuItem lookFromItem;
5060		- private MenuItem switchItem;
	5678	+ private MenuItem switchViewItem;
5061	5679	private MenuItem cutItem;
5062		- private MenuItem duplicateItem;
	5680	+ private MenuItem undoItem;
	5681	+ private MenuItem redoItem;
	5682	+ private JMenuItem duplicateItem;
5063	5683	private MenuItem cloneItem;
5064	5684	private MenuItem cloneSupportItem;
5065	5685	private MenuItem overwriteGeoItem;
..	..	@@ -5072,7 +5692,7 @@
5072	5692	private MenuItem linkverticesItem;
5073	5693	private MenuItem relinkverticesItem;
5074	5694	private MenuItem setMasterItem;
5075		- private MenuItem resetMeshItem;
	5695	+ private MenuItem resetAllItem;
5076	5696	private MenuItem stepAllItem;
5077	5697	private MenuItem revertMeshItem;
5078	5698	private MenuItem poseMeshItem;
..	..	@@ -5087,7 +5707,7 @@
5087	5707	private MenuItem pasteLinkItem;
5088	5708	private MenuItem pasteCloneItem;
5089	5709	private MenuItem pasteExpandItem;
5090		- private MenuItem clearItem;
	5710	+ private MenuItem deleteItem;
5091	5711	private MenuItem clearAllItem;
5092	5712	private MenuItem genUVItem;
5093	5713	private MenuItem genNormalsMESHItem;
..	..	@@ -5122,6 +5742,10 @@
5122	5742	private MenuItem showleavesItem;
5123	5743	private MenuItem markleavesItem;
5124	5744	private MenuItem unmarkleavesItem;
	5745	+ private MenuItem rewindleavesItem;
	5746	+ private MenuItem unrewindleavesItem;
	5747	+ private MenuItem randomleavesItem;
	5748	+ private MenuItem unrandomleavesItem;
5125	5749
5126	5750	private MenuItem flipVItem;
5127	5751	private MenuItem unflipVItem;
..	..	@@ -5133,15 +5757,17 @@
5133	5757	private MenuItem panoTexturesItem;
5134	5758
5135	5759	private MenuItem resetCentroidItem;
5136		- private MenuItem transformgeometryItem;
	5760	+ private MenuItem resetCentroidXZItem;
5137	5761	private MenuItem resetTransformItem;
	5762	+ private MenuItem transformGeometryItem;
	5763	+ private MenuItem transformChildrenItem;
5138	5764	private MenuItem hideItem;
5139	5765	private MenuItem grabItem;
5140	5766	private MenuItem backItem;
5141	5767	private MenuItem frontItem;
5142	5768	private MenuItem cameraItem;
5143	5769	private MenuItem compositeItem;
5144		- private MenuItem randomItem;
	5770	+ private MenuItem switchItem;
5145	5771	private MenuItem physicsItem;
5146	5772	private MenuItem frameselectorItem;
5147	5773	private MenuItem scriptNodeItem;
..	..	@@ -5203,11 +5829,6 @@
5203	5829	private MenuItem doubleItem;
5204	5830	private MenuItem tripleItem;
5205	5831
5206		- private MenuItem importGFDItem;
5207		- private MenuItem importVRMLX3DItem;
5208		- private MenuItem import3DSItem;
5209		- private MenuItem importOBJItem;
5210		-
5211	5832	private MenuItem computeAOItem;
5212	5833	private MenuItem recompileItem;
5213	5834	private MenuItem editScriptItem;
..	..	@@ -5217,4 +5838,8 @@
5217	5838	private MenuItem analyzeItem;
5218	5839	private MenuItem dumpItem;
5219	5840	//boolean freezemodel = false;
	5841	+
	5842	+ Menu cameraMenu;
	5843	+ MenuItem editCameraItem;
	5844	+ MenuItem restoreCameraItem;
5220	5845	}