~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -74,7 +74,7 @@
74	74	this.copy = this.group = copy;
75	75	//selectees = this.group.selectees;
76	76
77		- SetupMenu2(objEditor);
	77	+ SetupMenu2(this); //objEditor);
78	78	SetupUI2(objEditor);
79	79	objEditor.SetupUI(true);
80	80	SetupViews(objEditor);
..	..	@@ -98,14 +98,14 @@
98	98
99	99	void CloneClipboard(boolean supports)
100	100	{
101		- assert(GrafreeD.clipboard.parent == null);
102		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
103		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
104		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
105		- makeSomething(CloneObject(GrafreeD.clipboard.get(0), false));
	101	+ assert(Grafreed.clipboard.parent == null);
	102	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	103	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	104	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	105	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
106	106	else
107		- makeSomething(CloneObject(GrafreeD.clipboard, false));
108		- GrafreeD.clipboard.get(0).parent = keepparent;
	107	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	108	+ Grafreed.clipboard.get(0).parent = keepparent;
109	109	}
110	110
111	111	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -119,7 +119,7 @@
119	119	// obj.support = null;
120	120	if (!supports)
121	121	obj.SaveSupports();
122		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	122	+ Object3D clone = (Object3D)Grafreed.clone(obj);
123	123	obj.parent = parent;
124	124	// obj.support = support;
125	125	// clone.support = support; // aout 2013
..	..	@@ -148,27 +148,18 @@
148	148
149	149	//JTextField nameField;
150	150
151		- void SetupMenu2(ObjEditor oe)
	151	+ void SetupMenu2(GroupEditor oe)
152	152	{
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		-
168	153	Menu menu;
169	154	oe.menuBar.add(menu = new Menu("Edit"));
170	155	//editItem = menu.add(new MenuItem("Edit"));
171	156	//editItem.addActionListener(this);
	157	+
	158	+// undoItem = menu.add(new MenuItem("Undo"));
	159	+// undoItem.addActionListener(this);
	160	+// redoItem = menu.add(new MenuItem("Redo"));
	161	+// redoItem.addActionListener(this);
	162	+// menu.add("-");
172	163	duplicateItem = menu.add(new MenuItem("Duplicate"));
173	164	duplicateItem.addActionListener(this);
174	165	cloneItem = menu.add(new MenuItem("Clone"));
..	..	@@ -185,7 +176,6 @@
185	176	copyItem.addActionListener(this);
186	177	pasteItem = menu.add(new MenuItem("Paste"));
187	178	pasteItem.addActionListener(this);
188		- menu.add("-");
189	179
190	180	menu.add("-");
191	181	pasteIntoItem = menu.add(new MenuItem("Paste into"));
..	..	@@ -206,14 +196,97 @@
206	196	clearAllItem = menu.add(new MenuItem("Clear All"));
207	197	clearAllItem.addActionListener(this);
208	198	}
	199	+
	200	+ menuBar.add(cameraMenu = new Menu("View"));
	201	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	202	+ //zBufferItem.addActionListener(this);
	203	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	204	+ //normalLensItem.addActionListener(this);
	205	+ cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
	206	+ revertCameraItem.addActionListener(this);
	207	+
	208	+ cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	209	+ toggleFullScreenItem.addItemListener(this);
	210	+ toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	211	+ cameraMenu.add("-");
	212	+
	213	+ cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	214	+ toggleTextureItem.addItemListener(this);
	215	+ toggleTextureItem.setState(CameraPane.textureon);
	216	+
	217	+ cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	218	+ toggleSwitchItem.addItemListener(this);
	219	+ toggleSwitchItem.setState(CameraPane.SWITCH);
	220	+
	221	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	222	+ toggleHandleItem.addItemListener(this);
	223	+ toggleHandleItem.setState(CameraPane.HANDLES);
	224	+
	225	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	226	+ togglePaintItem.addItemListener(this);
	227	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	228	+
	229	+ if (Globals.ADVANCED)
	230	+ {
	231	+ cameraMenu.add("-");
	232	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	233	+ toggleLiveItem.addItemListener(this);
	234	+ toggleLiveItem.setState(Globals.isLIVE());
209	235
	236	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	237	+ stepItem.addActionListener(this);
	238	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	239	+ // toggleDLItem.addItemListener(this);
	240	+ // toggleDLItem.setState(false);
	241	+
	242	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	243	+ toggleRenderItem.addItemListener(this);
	244	+ toggleRenderItem.setState(!CameraPane.frozen);
	245	+
	246	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	247	+ toggleDebugItem.addItemListener(this);
	248	+ toggleDebugItem.setState(Globals.DEBUG);
	249	+
	250	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	251	+ toggleFrustumItem.addItemListener(this);
	252	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	253	+
	254	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	255	+ toggleFootContactItem.addItemListener(this);
	256	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	257	+
	258	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	259	+ toggleTimelineItem.addItemListener(this);
	260	+ }
	261	+
	262	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	263	+// toggleRootItem.addItemListener(this);
	264	+// toggleRootItem.setState(false);
	265	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	266	+// animationItem.addItemListener(this);
	267	+// animationItem.setState(CameraPane.ANIMATION);
	268	+ cameraMenu.add("-");
	269	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	270	+ editCameraItem.addActionListener(this);
	271	+
	272	+ if (Globals.ADVANCED)
	273	+ {
	274	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	275	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	276	+ //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
	277	+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	278	+ oe.cameraMenu.add("-");
	279	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	280	+ openWindowItem.addActionListener(this);
	281	+ editLeafItem.addActionListener(this);
	282	+ lookAtItem.addActionListener(this);
	283	+ //lookFromItem.addActinoListener(this);
	284	+ //switchItem.addActionListener(this);
	285	+ }
	286	+
210	287	oe.menuBar.add(menu = new Menu("Setting"));
211	288	if (Globals.ADVANCED)
212	289	{
213		- resetMeshItem = menu.add(new MenuItem("Reset All"));
214		- resetMeshItem.addActionListener(this);
215		- stepAllItem = menu.add(new MenuItem("Step All"));
216		- stepAllItem.addActionListener(this);
217	290	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
218	291	revertMeshItem.addActionListener(this);
219	292	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
..	..	@@ -295,11 +368,11 @@
295	368	billboardItem.addActionListener(this);
296	369	csgItem = menu.add(new MenuItem("CSG"));
297	370	csgItem.addActionListener(this);
298		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	371	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
299	372	shadowXItem.addActionListener(this);
300		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	373	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
301	374	shadowYItem.addActionListener(this);
302		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	375	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
303	376	shadowZItem.addActionListener(this);
304	377	if (Globals.ADVANCED)
305	378	{
..	..	@@ -318,8 +391,12 @@
318	391	resetTransformItem.addActionListener(this);
319	392	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
320	393	resetCentroidItem.addActionListener(this);
321		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
322		- transformgeometryItem.addActionListener(this);
	394	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	395	+ resetCentroidXZItem.addActionListener(this);
	396	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	397	+ transformGeometryItem.addActionListener(this);
	398	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	399	+ transformChildrenItem.addActionListener(this);
323	400
324	401	oe.menuBar.add(menu = new Menu("Geometry"));
325	402	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -368,6 +445,10 @@
368	445	oe.menuBar.add(menu = new Menu("Attributes"));
369	446	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
370	447	clearMaterialsItem.addActionListener(this);
	448	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	449	+ resetAllItem.addActionListener(this);
	450	+ stepAllItem = menu.add(new MenuItem("Step All"));
	451	+ stepAllItem.addActionListener(this);
371	452	menu.add("-");
372	453	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
373	454	liveleavesItem.addActionListener(this);
..	..	@@ -388,6 +469,14 @@
388	469	markleavesItem.addActionListener(this);
389	470	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
390	471	unmarkleavesItem.addActionListener(this);
	472	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	473	+ rewindleavesItem.addActionListener(this);
	474	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	475	+ unrewindleavesItem.addActionListener(this);
	476	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	477	+ randomleavesItem.addActionListener(this);
	478	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	479	+ unrandomleavesItem.addActionListener(this);
391	480	menu.add("-");
392	481	flipVItem = menu.add(new MenuItem("Flip V"));
393	482	flipVItem.addActionListener(this);
..	..	@@ -422,41 +511,41 @@
422	511	sortbysizeItem.addActionListener(this);
423	512	sortbynameItem = menu.add(new MenuItem("Sort by name"));
424	513	sortbynameItem.addActionListener(this);
	514	+ menu.add("-");
	515	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	516	+ shareGeometriesItem.addActionListener(this);
	517	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	518	+ mergeGeometriesItem.addActionListener(this);
425	519	if (Globals.ADVANCED)
426	520	{
427		- menu.add("-");
	521	+ // Pretty much the same as duplicate and clone.
428	522	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
429	523	extractGeometriesItem.addActionListener(this);
430	524	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
431	525	cloneGeometriesItem.addActionListener(this);
432		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
433		- shareGeometriesItem.addActionListener(this);
434		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
435		- mergeGeometriesItem.addActionListener(this);
436	526	}
437	527
438	528	oe.menuBar.add(menu = new Menu("Insert"));
439	529	buildCreateMenu(menu);
440	530
441		- oe.menuBar.add(menu = new Menu("Include"));
442		- importOBJItem = menu.add(new MenuItem("OBJ file..."));
443		- importOBJItem.addActionListener(this);
444		- menu.add("-");
445		- import3DSItem = menu.add(new MenuItem("3DS file..."));
446		- import3DSItem.addActionListener(this);
447		- menu.add("-");
448		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
449		- importVRMLX3DItem.addActionListener(this);
450		- menu.add("-");
451		- importGFDItem = menu.add(new MenuItem("GrafreeD file..."));
452		- importGFDItem.addActionListener(this);
453		-
454	531	oe.menuBar.add(menu = new Menu("Tools"));
455	532	buildToolsMenu(menu);
456	533	}
457	534
458	535	void SetupUI2(ObjEditor oe)
459	536	{
	537	+ // June 2019
	538	+ if (oe == null)
	539	+ {
	540	+ //super.SetupUI2(this);
	541	+ //return;
	542	+ }
	543	+
	544	+ if (copy != group)
	545	+ {
	546	+ //super.SetupUI2(this);
	547	+ }
	548	+
460	549	//new Exception().printStackTrace();
461	550
462	551	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -487,11 +576,35 @@
487	576	*/
488	577	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
489	578
	579	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	580	+ //minButton.setToolTipText("Minimize window");
	581	+ //minButton.addActionListener(this);
	582	+
	583	+ oe.toolbarPanel.add(maxButton = new cButton("\u271A", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	584	+ maxButton.setToolTipText("Maximize window");
	585	+ maxButton.addActionListener(this);
	586	+
	587	+ oe.toolbarPanel.add(fullButton = new cButton("\u2b1c", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	588	+ fullButton.setToolTipText("Full-screen window");
	589	+ fullButton.addActionListener(this);
	590	+
	591	+ oe.toolbarPanel.add(undoButton = new cButton("\u21a9", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	592	+ undoButton.setToolTipText("Undo changes");
	593	+ undoButton.addActionListener(this);
	594	+
	595	+ oe.toolbarPanel.add(redoButton = new cButton("\u21aa", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	596	+ redoButton.setToolTipText("Redo changes");
	597	+ redoButton.addActionListener(this);
	598	+
	599	+ oe.toolbarPanel.add(saveButton = new cButton("\u21e3", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	600	+ saveButton.setToolTipText("Save changes");
	601	+ saveButton.addActionListener(this);
	602	+
490	603	oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
491		- liveCB.setToolTipText("Enabled animation");
	604	+ liveCB.setToolTipText("Enable animation");
492	605	liveCB.addItemListener(this);
493	606
494		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	607	+ oe.toolbarPanel.add(oneStepButton = new cButton("\u29f4", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
495	608	oneStepButton.setToolTipText("Animate one step forward");
496	609	oneStepButton.addActionListener(this);
497	610
..	..	@@ -499,11 +612,11 @@
499	612	fastCB.setToolTipText("Fast mode");
500	613	fastCB.addItemListener(this);
501	614
502		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	615	+ oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK)); //, oe.aConstraints);
503	616	trackCB.setToolTipText("Enable tracking");
504	617	trackCB.addItemListener(this);
505	618
506		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	619	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
507	620	screenfitButton.setToolTipText("Screen fit");
508	621	screenfitButton.addActionListener(this);
509	622
..	..	@@ -512,70 +625,68 @@
512	625
513	626	if (Globals.ADVANCED)
514	627	{
515		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	628	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
516	629	snapobjectButton.addActionListener(this);
517	630	snapobjectButton.setToolTipText("Snap Object");
518	631	}
519	632
520		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	633	+ oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
521	634	flashSelectionButton.setToolTipText("Show selection");
522	635	flashSelectionButton.addActionListener(this);
523	636
524	637	oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
525	638
526		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	639	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
527	640	twoButton.setToolTipText("Show center view only");
528	641	twoButton.addActionListener(this);
529		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	642	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
530	643	fourButton.addActionListener(this);
531	644	fourButton.setToolTipText("Show left panel only");
532		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	645	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
533	646	sixButton.setToolTipText("2-column layout left");
534	647	sixButton.addActionListener(this);
535		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	648	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
536	649	threeButton.setToolTipText("2-column layout right");
537	650	threeButton.addActionListener(this);
538		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	651	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
539	652	sevenButton.setToolTipText("3-column layout");
540	653	sevenButton.addActionListener(this);
541	654	//
542	655
543		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	656	+ oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
544	657	rootButton.setToolTipText("Edit selection in new tab");
545	658	rootButton.addActionListener(this);
546	659
547		- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	660	+ oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
548	661	closeButton.setToolTipText("Close tab");
549	662	closeButton.addActionListener(this);
550	663	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
551	664	//clearButton.addActionListener(this);
552	665
553		- cGridBag commandsPanel = new cGridBag();
554		-
555		- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	666	+ editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
556	667	editButton.setToolTipText("Edit selection");
557	668	editButton.addActionListener(this);
558	669
559		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	670	+ editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
560	671	uneditButton.setToolTipText("Unedit selection");
561	672	uneditButton.addActionListener(this);
562	673
563		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	674	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
564	675	allParamsButton.setToolTipText("Edit all params");
565	676	allParamsButton.addActionListener(this);
566	677
567		- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	678	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
568	679	clearPanelButton.setToolTipText("Clear edit panel");
569	680	clearPanelButton.addActionListener(this);
570	681
571		- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	682	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
572	683	unselectButton.setToolTipText("Unselect");
573	684	unselectButton.addActionListener(this);
574	685
575		- commandsPanel.preferredHeight = 1;
	686	+ editCommandsPanel.preferredHeight = 1;
576	687
577		- oe.treePanel.add(commandsPanel);
578		- oe.treePanel.Return();
	688	+// oe.treePanel.add(commandsPanel);
	689	+// oe.treePanel.Return();
579	690
580	691	// oe.aConstraints.gridx += 1;
581	692	// oe.aConstraints.weighty = 0;
..	..	@@ -651,7 +762,7 @@
651	762	zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
652	763	zoomBoxCB.addItemListener(this);
653	764
654		- if (Globals.ADVANCED)
	765	+ if (true) // Globals.ADVANCED)
655	766	{
656	767	panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
657	768	supportCB.setToolTipText("Enable rigging");
..	..	@@ -697,11 +808,19 @@
697	808	// debugCB.addItemListener(this);
698	809
699	810	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	811	+ oeilCB.setToolTipText("Move camera when tracking target");
700	812	oeilCB.addItemListener(this);
701	813
	814	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	815	+ shadowCB.setToolTipText("Compute shadows when live");
	816	+ shadowCB.addItemListener(this);
	817	+
	818	+ if (Globals.ADVANCED)
	819	+ {
702	820	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
703	821	lookAtCB.setToolTipText("Look-at target");
704	822	lookAtCB.addItemListener(this);
	823	+ }
705	824
706	825	}
707	826
..	..	@@ -716,6 +835,14 @@
716	835	void EditObject(Object3D obj)
717	836	{
718	837	cRadio radioButton = new cRadio(obj.name);
	838	+
	839	+ // Patch to avoid bug with transparency.
	840	+ radioButton.hadMaterial = obj.material != null;
	841	+ if (!radioButton.hadMaterial)
	842	+ {
	843	+ obj.material = new cMaterial();
	844	+ }
	845	+
719	846	radioButton.SetObject(obj);
720	847	radioButton.layout = sevenButton;
721	848	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -724,8 +851,11 @@
724	851	buttonGroup.add(radioButton);
725	852	radioButton.doClick();
726	853	}
	854	+
727	855	void SetupViews(ObjEditor oe)
728	856	{
	857	+ theFrame = this;
	858	+
729	859	oe.SetupViews();
730	860
731	861	System.out.println("SetupViews");
..	..	@@ -749,7 +879,9 @@
749	879	JCheckBox speakerCameraCB;
750	880	JCheckBox speakerFocusCB;
751	881	JCheckBox debugCB;
	882	+
752	883	JCheckBox oeilCB;
	884	+ JCheckBox shadowCB;
753	885	JCheckBox lookAtCB;
754	886
755	887	// static int COLOR = 1;
..	..	@@ -788,6 +920,7 @@
788	920	} else if(e.getSource() == liveCB)
789	921	{
790	922	cameraView.ToggleLive();
	923	+ refreshContents(false);
791	924	}
792	925	else if(e.getSource() == supportCB)
793	926	{
..	..	@@ -851,6 +984,10 @@
851	984	else if(e.getSource() == oeilCB)
852	985	{
853	986	cameraView.ToggleOeil();
	987	+ }
	988	+ else if(e.getSource() == shadowCB)
	989	+ {
	990	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
854	991	}
855	992	else if(e.getSource() == lookAtCB)
856	993	{
..	..	@@ -940,7 +1077,9 @@
940	1077	// objEditor.DropFile((java.io.File[]) object, true);
941	1078	// return;
942	1079	// }
943		- if (string.charAt(0) == '/')
	1080	+
	1081	+ // File path for Mac and Windows
	1082	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
944	1083	{
945	1084	// file(s)
946	1085	String[] names = string.split("\n");
..	..	@@ -967,7 +1106,7 @@
967	1106
968	1107	flashIt = false;
969	1108	CameraPane pane = (CameraPane) target;
970		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1109	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
971	1110	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
972	1111
973	1112	if (group.selection.size() == 1)
..	..	@@ -1193,7 +1332,7 @@
1193	1332	memoryItem.addActionListener(this);
1194	1333	menu.add(analyzeItem = new MenuItem("Analyze"));
1195	1334	analyzeItem.addActionListener(this);
1196		- menu.add(dumpItem = new MenuItem("Dump"));
	1335	+ menu.add(dumpItem = new MenuItem("Print"));
1197	1336	dumpItem.addActionListener(this);
1198	1337	// menu.add(pathItem = new MenuItem("From-to path"));
1199	1338	// pathItem.addActionListener(this);
..	..	@@ -1334,6 +1473,7 @@
1334	1473	shadow.material = new cMaterial(obj.material);
1335	1474	shadow.material.diffuse = 0.0001f;
1336	1475	shadow.material.specular = 0.0001f;
	1476	+ //shadow.projectedVertices[1].x = 300;
1337	1477
1338	1478	makeSomething(shadow);
1339	1479	}
..	..	@@ -1540,9 +1680,9 @@
1540	1680
1541	1681	void Overwrite(int mask)
1542	1682	{
1543		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1683	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1544	1684	{
1545		- Object3D content = GrafreeD.clipboard.get(0);
	1685	+ Object3D content = Grafreed.clipboard.get(0);
1546	1686
1547	1687	if (content instanceof cGroup && ((cGroup)content).transientlink )
1548	1688	content = ((cGroup)content).get(0);
..	..	@@ -1847,31 +1987,6 @@
1847	1987	csg.addChild(child);
1848	1988	child.addChild(csg);
1849	1989	} else
1850		-
1851		- if (source == importGFDItem)
1852		- {
1853		- ImportGFD();
1854		- } else
1855		- if (source == importVRMLX3DItem)
1856		- {
1857		- ImportVRMLX3D();
1858		- } else
1859		- if (source == import3DSItem)
1860		- {
1861		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1862		- } else
1863		- if (source == importOBJItem)
1864		- {
1865		- //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1866		- FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
1867		- browser.setVisible(true);
1868		- String filename = browser.getFile();
1869		- if (filename != null && filename.length() > 0)
1870		- {
1871		- String fullname = browser.getDirectory() + filename;
1872		- makeSomething(ReadOBJ(fullname), true);
1873		- }
1874		- } else
1875	1990	if (source == computeAOItem)
1876	1991	{
1877	1992	Globals.drawMode = CameraPane.OCCLUSION;
..	..	@@ -1890,7 +2005,7 @@
1890	2005	if (source == invariantsItem)
1891	2006	{
1892	2007	System.out.println("Invariants:");
1893		- GrafreeD.grafreeD.universe.invariants();
	2008	+ Grafreed.grafreeD.universe.invariants();
1894	2009	} else
1895	2010	if (source == memoryItem)
1896	2011	{
..	..	@@ -1908,6 +2023,30 @@
1908	2023	if (source == dumpItem)
1909	2024	{
1910	2025	DumpObject();
	2026	+ } else
	2027	+ if (source == minButton)
	2028	+ {
	2029	+ Minimize();
	2030	+ } else
	2031	+ if (source == maxButton)
	2032	+ {
	2033	+ Maximize();
	2034	+ } else
	2035	+ if (source == fullButton)
	2036	+ {
	2037	+ ToggleFullScreen();
	2038	+ } else
	2039	+ if (source == undoButton)
	2040	+ {
	2041	+ Undo();
	2042	+ } else
	2043	+ if (source == redoButton)
	2044	+ {
	2045	+ Redo();
	2046	+ } else
	2047	+ if (source == saveButton)
	2048	+ {
	2049	+ Save();
1911	2050	} else
1912	2051	if (source == oneStepButton)
1913	2052	{
..	..	@@ -1963,12 +2102,20 @@
1963	2102	{
1964	2103	loadClipboard(true);
1965	2104	} else
	2105	+ if (source == undoItem)
	2106	+ {
	2107	+ Undo();
	2108	+ } else
	2109	+ if (source == redoItem)
	2110	+ {
	2111	+ Redo();
	2112	+ } else
1966	2113	if (source == duplicateItem)
1967	2114	{
1968		- Object3D keep = GrafreeD.clipboard;
	2115	+ Object3D keep = Grafreed.clipboard;
1969	2116	loadClipboard(false);
1970	2117	paste(false);
1971		- GrafreeD.clipboard = keep;
	2118	+ Grafreed.clipboard = keep;
1972	2119	} else
1973	2120	if (source == cloneItem)
1974	2121	{
..	..	@@ -2188,9 +2335,9 @@
2188	2335	// group.selection.get(0).setMasterThis(content); // should be identity
2189	2336	// refreshContents();
2190	2337	// }
2191		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2338	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2192	2339	{
2193		- Object3D content = GrafreeD.clipboard.get(0);
	2340	+ Object3D content = Grafreed.clipboard.get(0);
2194	2341
2195	2342	if (content instanceof cGroup && ((cGroup)content).transientlink )
2196	2343	content = ((cGroup)content).get(0);
..	..	@@ -2240,9 +2387,9 @@
2240	2387	} else
2241	2388	if (source == setMasterItem)
2242	2389	{
2243		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2390	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2244	2391	{
2245		- Object3D content = GrafreeD.clipboard.get(0);
	2392	+ Object3D content = Grafreed.clipboard.get(0);
2246	2393
2247	2394	if (content instanceof cGroup && ((cGroup)content).transientlink )
2248	2395	content = ((cGroup)content).get(0);
..	..	@@ -2255,9 +2402,9 @@
2255	2402	{
2256	2403	if (group.selection.size() == 1)
2257	2404	{
2258		- if (GrafreeD.clipboard.size() == 1)
	2405	+ if (Grafreed.clipboard.size() == 1)
2259	2406	{
2260		- Object3D content = GrafreeD.clipboard.get(0);
	2407	+ Object3D content = Grafreed.clipboard.get(0);
2261	2408
2262	2409	if (content instanceof cGroup && ((cGroup)content).transientlink )
2263	2410	content = ((cGroup)content).get(0);
..	..	@@ -2274,7 +2421,7 @@
2274	2421	{
2275	2422	RevertMeshes();
2276	2423	} else
2277		- if (source == resetMeshItem)
	2424	+ if (source == resetAllItem)
2278	2425	{
2279	2426	ResetAll();
2280	2427	} else
..	..	@@ -2462,7 +2609,7 @@
2462	2609	} else
2463	2610	if (source == genNormalsMESHItem)
2464	2611	{
2465		- GenNormals(true); // TODO
	2612	+ GenNormalsMESH();
2466	2613	} else
2467	2614	if (source == genNormalsORGANItem)
2468	2615	{
..	..	@@ -2527,6 +2674,22 @@
2527	2674	if (source == unmarkleavesItem)
2528	2675	{
2529	2676	MarkLeaves(false);
	2677	+ } else
	2678	+ if (source == rewindleavesItem)
	2679	+ {
	2680	+ RewindLeaves(true);
	2681	+ } else
	2682	+ if (source == unrewindleavesItem)
	2683	+ {
	2684	+ RewindLeaves(false);
	2685	+ } else
	2686	+ if (source == randomleavesItem)
	2687	+ {
	2688	+ RandomLeaves(true);
	2689	+ } else
	2690	+ if (source == unrandomleavesItem)
	2691	+ {
	2692	+ RandomLeaves(false);
2530	2693	} else
2531	2694	if (source == flipVItem)
2532	2695	{
..	..	@@ -2612,9 +2775,13 @@
2612	2775	{
2613	2776	SmoothMesh();
2614	2777	} else
2615		- if (source == transformgeometryItem)
	2778	+ if (source == transformGeometryItem)
2616	2779	{
2617	2780	TransformGeometry();
	2781	+ } else
	2782	+ if (source == transformChildrenItem)
	2783	+ {
	2784	+ TransformChildren();
2618	2785	} else
2619	2786	if (source == resetTransformItem)
2620	2787	{
..	..	@@ -2622,7 +2789,11 @@
2622	2789	} else
2623	2790	if (source == resetCentroidItem)
2624	2791	{
2625		- ResetCentroid();
	2792	+ ResetCentroid(true);
	2793	+ } else
	2794	+ if (source == resetCentroidXZItem)
	2795	+ {
	2796	+ ResetCentroid(false);
2626	2797	} else
2627	2798	if (source == resetParentItem)
2628	2799	{
..	..	@@ -2786,6 +2957,24 @@
2786	2957	bigThree.ClearUI();
2787	2958	bigThree.add(centralPanel);
2788	2959	bigThree.FlushUI();
	2960	+
	2961	+ cameraView.requestFocusInWindow();
	2962	+
	2963	+// refreshContents(true);
	2964	+//
	2965	+// try
	2966	+// {
	2967	+// java.awt.Robot bot = new java.awt.Robot();
	2968	+// int mask = InputEvent.BUTTON1_MASK;
	2969	+// bot.mouseMove(100, 100);
	2970	+// bot.mousePress(mask);
	2971	+// bot.mouseRelease(mask);
	2972	+// }
	2973	+// catch (Exception e)
	2974	+// {
	2975	+//
	2976	+// }
	2977	+
2789	2978	} else
2790	2979	if (source == threeButton)
2791	2980	{
..	..	@@ -2822,6 +3011,8 @@
2822	3011	bigThree.add(centralPanel);
2823	3012	bigThree.add(XYZPanel);
2824	3013	bigThree.FlushUI();
	3014	+
	3015	+ cameraView.requestFocusInWindow();
2825	3016	} else
2826	3017	if (source == fourButton)
2827	3018	{
..	..	@@ -2857,6 +3048,8 @@
2857	3048	bigThree.ClearUI();
2858	3049	bigThree.add(scenePanel);
2859	3050	bigThree.FlushUI();
	3051	+
	3052	+ cameraView.requestFocusInWindow();
2860	3053	} else
2861	3054	if (source == sixButton)
2862	3055	{
..	..	@@ -2893,6 +3086,8 @@
2893	3086	bigThree.add(scenePanel);
2894	3087	bigThree.add(centralPanel);
2895	3088	bigThree.FlushUI();
	3089	+
	3090	+ cameraView.requestFocusInWindow();
2896	3091	} else
2897	3092	if (source == sevenButton)
2898	3093	{
..	..	@@ -2930,6 +3125,8 @@
2930	3125	bigThree.add(centralPanel);
2931	3126	bigThree.add(XYZPanel);
2932	3127	bigThree.FlushUI();
	3128	+
	3129	+ cameraView.requestFocusInWindow();
2933	3130	} else
2934	3131	if (source == rootButton)
2935	3132	{
..	..	@@ -2941,6 +3138,7 @@
2941	3138	EditObject(obj);
2942	3139	}
2943	3140
	3141	+ cameraView.requestFocusInWindow();
2944	3142	refreshContents(true);
2945	3143	} else
2946	3144	if (source == closeButton)
..	..	@@ -2950,8 +3148,14 @@
2950	3148	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2951	3149	{
2952	3150	ab = (cRadio)e.nextElement();
2953		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3151	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2954	3152	{
	3153	+ // Patch to avoid bug with transparency.
	3154	+ if (!ab.hadMaterial)
	3155	+ {
	3156	+ ab.object.material = null;
	3157	+ }
	3158	+
2955	3159	buttonGroup.remove(ab);
2956	3160	radioPanel.remove(ab);
2957	3161
..	..	@@ -2962,6 +3166,8 @@
2962	3166	break;
2963	3167	}
2964	3168	}
	3169	+
	3170	+ cameraView.requestFocusInWindow();
2965	3171	refreshContents(true);
2966	3172	} else
2967	3173	if (source == editItem \|\| source == editButton)
..	..	@@ -2978,7 +3184,7 @@
2978	3184	child.CloseUI();
2979	3185	listUI.remove(child);
2980	3186
2981		- child.editWindow = null; // ???????????
	3187	+ //child.editWindow = null; // ???????????
2982	3188	}
2983	3189	objEditor.ctrlPanel.FlushUI();
2984	3190	//objEditor.jTree.clearSelection();
..	..	@@ -3064,7 +3270,10 @@
3064	3270	frontView.object = group;
3065	3271	sideView.object = group;
3066	3272	}
3067		- group.editWindow = this;
	3273	+
	3274	+// fix "+" issue
	3275	+ //group.editWindow = this;
	3276	+
3068	3277	/*
3069	3278	currentLayout = radio.layout;
3070	3279	if (currentLayout == null)
..	..	@@ -3076,8 +3285,23 @@
3076	3285	//group.parent = null; // ROOT
3077	3286	//group.attributes = -1;
3078	3287	ResetModel();
	3288	+
	3289	+ cameraView.requestFocusInWindow();
3079	3290	refreshContents(true);
3080		- }
	3291	+ } else if (event.getSource() == editCameraItem)
	3292	+ {
	3293	+ cameraView.ProtectCamera();
	3294	+ cameraView.repaint();
	3295	+ return;
	3296	+ } else if (event.getSource() == revertCameraItem)
	3297	+ {
	3298	+ cameraView.RevertCamera();
	3299	+ cameraView.repaint();
	3300	+ return;
	3301	+ // } else if (event.getSource() == textureButton)
	3302	+ // {
	3303	+ // return; // true;
	3304	+ }
3081	3305	else
3082	3306	{
3083	3307	//return super.action(event, arg);
..	..	@@ -3086,7 +3310,6 @@
3086	3310	}
3087	3311
3088	3312	boolean useclient = false;
3089		- cRadio radio;
3090	3313
3091	3314	void ToggleRoot()
3092	3315	{
..	..	@@ -3138,6 +3361,28 @@
3138	3361	refreshContents();
3139	3362	}
3140	3363
	3364	+ void TransformChildren()
	3365	+ {
	3366	+ Object3D obj;
	3367	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3368	+ {
	3369	+ obj = (Object3D)e.nextElement();
	3370	+ obj.KeepTextureMatrices();
	3371	+ obj.TransformChildren();
	3372	+ obj.RestoreTextureMatrices();
	3373	+
	3374	+// if (obj.parent == null)
	3375	+// {
	3376	+// System.out.println("NULL PARENT!");
	3377	+// new Exception().printStackTrace();
	3378	+// }
	3379	+// else
	3380	+// TouchTransform(obj);
	3381	+// //obj.parent.Touch();
	3382	+ }
	3383	+
	3384	+ refreshContents();
	3385	+ }
3141	3386
3142	3387	void ResetTransform()
3143	3388	{
..	..	@@ -3250,7 +3495,7 @@
3250	3495	refreshContents();
3251	3496	}
3252	3497
3253		- void ResetCentroid()
	3498	+ void ResetCentroid(boolean full)
3254	3499	{
3255	3500	Object3D obj;
3256	3501	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3265,12 +3510,16 @@
3265	3510	LA.matIdentity(Object3D.mat);
3266	3511	obj.getBounds(minima, maxima, false);
3267	3512	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3268		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3513	+ if (full)
	3514	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3269	3515	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3270	3516	obj.TransformMesh(Object3D.mat);
	3517	+
3271	3518	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3272		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3519	+ if (full)
	3520	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3273	3521	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3522	+
3274	3523	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3275	3524	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3276	3525	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3299,7 +3548,8 @@
3299	3548
3300	3549	int size = obj.MemorySize();
3301	3550
3302		- System.err.println((size/1024) + " KB is the size of " + obj);
	3551	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3552	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3303	3553	}
3304	3554	}
3305	3555	catch (Exception e)
..	..	@@ -3336,9 +3586,9 @@
3336	3586	obj = (Object3D)e.nextElement();
3337	3587
3338	3588	System.out.println("Object is: " + obj);
3339		- GrafreeD.AnalyzeObject(obj);
	3589	+ Grafreed.AnalyzeObject(obj);
3340	3590	System.out.println("Boundary rep: " + obj.bRep);
3341		- GrafreeD.AnalyzeObject(obj.bRep);
	3591	+ Grafreed.AnalyzeObject(obj.bRep);
3342	3592
3343	3593	// System.err.println((size/1024) + " KB is the size of " + obj);
3344	3594	}
..	..	@@ -3380,6 +3630,13 @@
3380	3630	void GenNormals(boolean crease)
3381	3631	{
3382	3632	group.GenNormalsS(crease);
	3633	+
	3634	+ refreshContents();
	3635	+ }
	3636	+
	3637	+ void GenNormalsMESH()
	3638	+ {
	3639	+ group.GenNormalsMeshS();
3383	3640
3384	3641	refreshContents();
3385	3642	}
..	..	@@ -3552,8 +3809,8 @@
3552	3809
3553	3810	void ParseVertices()
3554	3811	{
3555		- boolean epsequal = GrafreeD.epsequal;
3556		- GrafreeD.epsequal = true;
	3812	+ boolean epsequal = Grafreed.epsequal;
	3813	+ Grafreed.epsequal = true;
3557	3814
3558	3815	for (int i=0; i<group.selection.size(); i++)
3559	3816	{
..	..	@@ -3578,7 +3835,7 @@
3578	3835	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3579	3836	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3580	3837
3581		- g.add(GrafreeD.clipboard);
	3838	+ g.add(Grafreed.clipboard);
3582	3839
3583	3840	buffer.add(g);
3584	3841	}
..	..	@@ -3593,7 +3850,7 @@
3593	3850	makeSomething(buffer, i==group.selection.size()-1);
3594	3851	}
3595	3852
3596		- GrafreeD.epsequal = epsequal;
	3853	+ Grafreed.epsequal = epsequal;
3597	3854
3598	3855	refreshContents();
3599	3856	}
..	..	@@ -3611,7 +3868,16 @@
3611	3868	String pigment = Object3D.GetPigment(tex);
3612	3869	//String bump = Object3D.GetBump(tex);
3613	3870
3614		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3871	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	3872	+
	3873	+ try
	3874	+ {
	3875	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3876	+ }
	3877	+ catch (Exception e)
	3878	+ {
	3879	+ System.err.println("FAIL: " + node);
	3880	+ }
3615	3881
3616	3882	double s = v.s;
3617	3883
..	..	@@ -3743,7 +4009,7 @@
3743	4009	return;
3744	4010
3745	4011	Object3D poses = group.selection.get(0);
3746		- Object3D ref = GrafreeD.clipboard.get(0);
	4012	+ Object3D ref = Grafreed.clipboard.get(0);
3747	4013
3748	4014	Object3D newgroup = new Object3D("Po:" + poses.name);
3749	4015
..	..	@@ -3937,9 +4203,9 @@
3937	4203
3938	4204	void ClipMesh()
3939	4205	{
3940		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4206	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3941	4207	{
3942		- Object3D content = GrafreeD.clipboard.get(0);
	4208	+ Object3D content = Grafreed.clipboard.get(0);
3943	4209
3944	4210	if (content instanceof cGroup && ((cGroup)content).transientlink )
3945	4211	content = ((cGroup)content).get(0);
..	..	@@ -3948,7 +4214,7 @@
3948	4214	// {
3949	4215	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3950	4216	// }
3951		- group.selection.ClipMesh(GrafreeD.clipboard);
	4217	+ group.selection.ClipMesh(Grafreed.clipboard);
3952	4218	}
3953	4219	// group.selection.ClipMesh(GrafreeD.clipboard);
3954	4220	System.out.println("DONE.");
..	..	@@ -3995,6 +4261,18 @@
3995	4261	void MarkLeaves(boolean hide)
3996	4262	{
3997	4263	group.selection.MarkLeaves(hide);
	4264	+ refreshContents();
	4265	+ }
	4266	+
	4267	+ void RewindLeaves(boolean hide)
	4268	+ {
	4269	+ group.selection.RewindLeaves(hide);
	4270	+ refreshContents();
	4271	+ }
	4272	+
	4273	+ void RandomLeaves(boolean hide)
	4274	+ {
	4275	+ group.selection.RandomLeaves(hide);
3998	4276	refreshContents();
3999	4277	}
4000	4278
..	..	@@ -4083,7 +4361,7 @@
4083	4361	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4084	4362
4085	4363	Object3D elem = (Object3D)group.selection.elementAt(i);
4086		- if(elem != group)
	4364	+ if(elem != group \|\| !newWindow)
4087	4365	{
4088	4366	// if (!(elem instanceof Composite))
4089	4367	// newWindow = false;
..	..	@@ -4173,7 +4451,6 @@
4173	4451	//case 702: // Event.LIST_DESELECT
4174	4452	group.deselectAll();
4175	4453	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4176		- objEditor.ClearInfo(); // .GetMaterial());
4177	4454	if (tps != null)
4178	4455	{
4179	4456	for (int i=0; i < tps.length; i++)
..	..	@@ -4182,10 +4459,8 @@
4182	4459
4183	4460	//if (child.parent != null)
4184	4461	//child.parent.addSelectee(child);
	4462	+ objEditor.SetMaterial(child);
4185	4463	group.addSelectee(child);
4186		- objEditor.SetMaterial(child); // .GetMaterial());
4187		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4188		- System.err.println("info : " + child.GetPath());
4189	4464	}
4190	4465	}
4191	4466	// else
..	..	@@ -4195,16 +4470,17 @@
4195	4470	// System.err.println("info : " + group.GetPath());
4196	4471	// }
4197	4472
4198		- objEditor.SetText(); // jan 2014
4199		-
4200		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4473	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4201	4474	CameraPane.flash = true;
4202	4475
4203		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4476	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4204	4477	// a camera
4205	4478	{
4206		- CameraPane.camerachangeframe = 0; // don't refuse it
4207		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4479	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4480	+ {
	4481	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4482	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4483	+ }
4208	4484	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4209	4485	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4210	4486	}
..	..	@@ -4217,6 +4493,26 @@
4217	4493
4218	4494	freezemodel = false;
4219	4495	}
	4496	+
	4497	+ void refreshContents(boolean cp)
	4498	+ {
	4499	+ if (!Globals.MOUSEDRAGGED)
	4500	+ {
	4501	+ objEditor.ClearInfo(); // .GetMaterial());
	4502	+
	4503	+ for (int i=0; i < group.selection.Size(); i++)
	4504	+ {
	4505	+ Object3D child = (Object3D) group.selection.get(i);
	4506	+
	4507	+ objEditor.AddInfo(child, this, true);
	4508	+ System.err.println("info : " + child.GetPath());
	4509	+ }
	4510	+
	4511	+ objEditor.SetText(); // jan 2014
	4512	+ }
	4513	+
	4514	+ super.refreshContents(cp);
	4515	+ }
4220	4516
4221	4517	void linkSomething(Object3D thing)
4222	4518	{
..	..	@@ -4288,16 +4584,18 @@
4288	4584	{
4289	4585	if (group.selection.isEmpty())
4290	4586	return;
4291		- GrafreeD.clipboardIsTempGroup = false;
	4587	+
	4588	+ Grafreed.clipboardIsTempGroup = false;
4292	4589	Composite tGroup = null;
4293	4590	if (group.selection.size() > 0) // 1)
4294	4591	{
4295	4592	tGroup = new cGroup();
4296		- GrafreeD.clipboardIsTempGroup = true;
	4593	+ Grafreed.clipboardIsTempGroup = true;
4297	4594	}
4298	4595
4299	4596	if (cut)
4300	4597	{
	4598	+ Save();
4301	4599	//int indices[] = jList.getSelectedIndices();
4302	4600	//for (int i = indices.length - 1; i >= 0; i--)
4303	4601	//jList.remove(indices[i]);
..	..	@@ -4333,16 +4631,16 @@
4333	4631	//System.out.println("cut " + child);
4334	4632	//System.out.println("parent = " + child.parent);
4335	4633	// tmp.addChild(child);
4336		- if (GrafreeD.clipboardIsTempGroup)
	4634	+ if (Grafreed.clipboardIsTempGroup)
4337	4635	tGroup.add/Child/(tmp);
4338	4636	else
4339		- GrafreeD.clipboard = tmp;
	4637	+ Grafreed.clipboard = tmp;
4340	4638	}
4341	4639	else
4342		- if (GrafreeD.clipboardIsTempGroup)
	4640	+ if (Grafreed.clipboardIsTempGroup)
4343	4641	tGroup.add/Child/(child);
4344	4642	else
4345		- GrafreeD.clipboard = child;
	4643	+ Grafreed.clipboard = child;
4346	4644	}
4347	4645
4348	4646	//ResetModel();
..	..	@@ -4374,21 +4672,23 @@
4374	4672	//System.out.println("cut " + elem);
4375	4673	//System.out.println("parent = " + elem.parent);
4376	4674	// tmp.addChild(elem);
4377		- if (GrafreeD.clipboardIsTempGroup)
	4675	+ if (Grafreed.clipboardIsTempGroup)
4378	4676	tGroup.add/Child/(tmp);
4379	4677	else
4380		- GrafreeD.clipboard = tmp;
	4678	+ Grafreed.clipboard = tmp;
4381	4679	}
4382	4680	else
4383		- if (GrafreeD.clipboardIsTempGroup)
	4681	+ if (Grafreed.clipboardIsTempGroup)
4384	4682	tGroup.add/Child/(child);
4385	4683	else
4386		- GrafreeD.clipboard = child;
	4684	+ Grafreed.clipboard = child;
4387	4685	}
4388	4686
4389	4687	}
4390		- if (GrafreeD.clipboardIsTempGroup)
4391		- GrafreeD.clipboard = tGroup;
	4688	+
	4689	+ if (Grafreed.clipboardIsTempGroup)
	4690	+ Grafreed.clipboard = tGroup;
	4691	+
4392	4692	if (cut)
4393	4693	{
4394	4694	ResetModel();
..	..	@@ -4402,7 +4702,7 @@
4402	4702	// return;
4403	4703	boolean first = true;
4404	4704
4405		- if (GrafreeD.clipboardIsTempGroup)
	4705	+ if (Grafreed.clipboardIsTempGroup)
4406	4706	{
4407	4707	Composite temp;
4408	4708
..	..	@@ -4413,7 +4713,7 @@
4413	4713	temp = (Composite)Applet3D.clipboard.deepCopy();
4414	4714	*/
4415	4715	Object3D elem;
4416		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4716	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4417	4717	{
4418	4718	Object3D child = (Object3D)e.nextElement();
4419	4719
..	..	@@ -4447,14 +4747,14 @@
4447	4747	//Object3D cb = Applet3D.clipboard;
4448	4748	//temp.addChild(cb);
4449	4749	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4450		- assert(GrafreeD.clipboard.parent == null);
4451		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4452		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4453		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4454		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	4750	+ assert(Grafreed.clipboard.parent == null);
	4751	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4752	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4753	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4754	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4455	4755	else
4456		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4457		- GrafreeD.clipboard.get(0).parent = keepparent;
	4756	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4757	+ Grafreed.clipboard.get(0).parent = keepparent;
4458	4758	}
4459	4759
4460	4760	ResetModel();
..	..	@@ -4503,9 +4803,9 @@
4503	4803	{
4504	4804	boolean first = true;
4505	4805
4506		- if (GrafreeD.clipboardIsTempGroup)
	4806	+ if (Grafreed.clipboardIsTempGroup)
4507	4807	{
4508		- Composite temp = (Composite)GrafreeD.clipboard;
	4808	+ Composite temp = (Composite)Grafreed.clipboard;
4509	4809	Object3D copy;
4510	4810	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4511	4811	{
..	..	@@ -4515,7 +4815,7 @@
4515	4815	}
4516	4816	} else
4517	4817	{
4518		- linkSomething(GrafreeD.clipboard); //.get(0));
	4818	+ linkSomething(Grafreed.clipboard); //.get(0));
4519	4819	}
4520	4820	}
4521	4821	}
..	..	@@ -4920,21 +5220,6 @@
4920	5220	}
4921	5221	*/
4922	5222
4923		- void ImportGFD()
4924		- {
4925		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4926		- browser.show();
4927		- String filename = browser.getFile();
4928		- if (filename != null && filename.length() > 0)
4929		- {
4930		- String fullname = browser.getDirectory() + filename;
4931		-
4932		- //Object3D readobj =
4933		- objEditor.ReadGFD(fullname, objEditor);
4934		- //makeSomething(readobj);
4935		- }
4936		- }
4937		-
4938	5223	/*
4939	5224	public void Callback(Object obj)
4940	5225	{
..	..	@@ -4958,26 +5243,9 @@
4958	5243	}
4959	5244	*/
4960	5245
4961		- void ImportVRMLX3D()
4962		- {
4963		- if (GrafreeD.standAlone)
4964		- {
4965		- /**/
4966		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4967		- browser.show();
4968		- String filename = browser.getFile();
4969		- if (filename != null && filename.length() > 0)
4970		- {
4971		- String fullname = browser.getDirectory() + filename;
4972		- LoadVRMLX3D(fullname);
4973		- }
4974		- /**/
4975		- }
4976		- }
4977		-
4978	5246	String GetFile(String dialogName)
4979	5247	{
4980		- if (GrafreeD.standAlone)
	5248	+ if (Grafreed.standAlone)
4981	5249	{
4982	5250	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4983	5251	browser.show();
..	..	@@ -5045,6 +5313,12 @@
5045	5313	cButton clearpanelButton;
5046	5314	cButton unselectButton;
5047	5315
	5316	+ cButton minButton;
	5317	+ cButton maxButton;
	5318	+ cButton fullButton;
	5319	+ cButton undoButton;
	5320	+ cButton redoButton;
	5321	+ cButton saveButton;
5048	5322	cButton oneStepButton;
5049	5323
5050	5324	cButton screenfitButton;
..	..	@@ -5058,14 +5332,6 @@
5058	5332
5059	5333	cButton setsupportButton;
5060	5334
5061		- cButton twoButton;
5062		- cButton sixButton;
5063		- cButton threeButton;
5064		- cButton sevenButton;
5065		- cButton fourButton; // full panel
5066		- cButton oneButton; // full XYZ
5067		- //cButton currentLayout;
5068		-
5069	5335	//
5070	5336	//Composite
5071	5337	Object3D // to do !!
..	..	@@ -5077,6 +5343,8 @@
5077	5343	private MenuItem lookFromItem;
5078	5344	private MenuItem switchItem;
5079	5345	private MenuItem cutItem;
	5346	+ private MenuItem undoItem;
	5347	+ private MenuItem redoItem;
5080	5348	private MenuItem duplicateItem;
5081	5349	private MenuItem cloneItem;
5082	5350	private MenuItem cloneSupportItem;
..	..	@@ -5090,7 +5358,7 @@
5090	5358	private MenuItem linkverticesItem;
5091	5359	private MenuItem relinkverticesItem;
5092	5360	private MenuItem setMasterItem;
5093		- private MenuItem resetMeshItem;
	5361	+ private MenuItem resetAllItem;
5094	5362	private MenuItem stepAllItem;
5095	5363	private MenuItem revertMeshItem;
5096	5364	private MenuItem poseMeshItem;
..	..	@@ -5140,6 +5408,10 @@
5140	5408	private MenuItem showleavesItem;
5141	5409	private MenuItem markleavesItem;
5142	5410	private MenuItem unmarkleavesItem;
	5411	+ private MenuItem rewindleavesItem;
	5412	+ private MenuItem unrewindleavesItem;
	5413	+ private MenuItem randomleavesItem;
	5414	+ private MenuItem unrandomleavesItem;
5143	5415
5144	5416	private MenuItem flipVItem;
5145	5417	private MenuItem unflipVItem;
..	..	@@ -5151,8 +5423,10 @@
5151	5423	private MenuItem panoTexturesItem;
5152	5424
5153	5425	private MenuItem resetCentroidItem;
5154		- private MenuItem transformgeometryItem;
	5426	+ private MenuItem resetCentroidXZItem;
5155	5427	private MenuItem resetTransformItem;
	5428	+ private MenuItem transformGeometryItem;
	5429	+ private MenuItem transformChildrenItem;
5156	5430	private MenuItem hideItem;
5157	5431	private MenuItem grabItem;
5158	5432	private MenuItem backItem;
..	..	@@ -5221,11 +5495,6 @@
5221	5495	private MenuItem doubleItem;
5222	5496	private MenuItem tripleItem;
5223	5497
5224		- private MenuItem importGFDItem;
5225		- private MenuItem importVRMLX3DItem;
5226		- private MenuItem import3DSItem;
5227		- private MenuItem importOBJItem;
5228		-
5229	5498	private MenuItem computeAOItem;
5230	5499	private MenuItem recompileItem;
5231	5500	private MenuItem editScriptItem;
..	..	@@ -5235,4 +5504,8 @@
5235	5504	private MenuItem analyzeItem;
5236	5505	private MenuItem dumpItem;
5237	5506	//boolean freezemodel = false;
	5507	+
	5508	+ Menu cameraMenu;
	5509	+ MenuItem editCameraItem;
	5510	+ MenuItem revertCameraItem;
5238	5511	}