~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,38 +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		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
443		- importGFDItem.addActionListener(this);
444		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
445		- importVRMLX3DItem.addActionListener(this);
446		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
447		- importOBJItem.addActionListener(this);
448		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
449		- import3DSItem.addActionListener(this);
450		-
451	531	oe.menuBar.add(menu = new Menu("Tools"));
452	532	buildToolsMenu(menu);
453	533	}
454	534
455	535	void SetupUI2(ObjEditor oe)
456	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	+
457	549	//new Exception().printStackTrace();
458	550
459	551	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -484,11 +576,35 @@
484	576	*/
485	577	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
486	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	+
487	603	oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
488		- liveCB.setToolTipText("Enabled animation");
	604	+ liveCB.setToolTipText("Enable animation");
489	605	liveCB.addItemListener(this);
490	606
491		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	607	+ oe.toolbarPanel.add(oneStepButton = new cButton("\u29f4", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
492	608	oneStepButton.setToolTipText("Animate one step forward");
493	609	oneStepButton.addActionListener(this);
494	610
..	..	@@ -496,11 +612,11 @@
496	612	fastCB.setToolTipText("Fast mode");
497	613	fastCB.addItemListener(this);
498	614
499		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	615	+ oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK)); //, oe.aConstraints);
500	616	trackCB.setToolTipText("Enable tracking");
501	617	trackCB.addItemListener(this);
502	618
503		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	619	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
504	620	screenfitButton.setToolTipText("Screen fit");
505	621	screenfitButton.addActionListener(this);
506	622
..	..	@@ -509,70 +625,68 @@
509	625
510	626	if (Globals.ADVANCED)
511	627	{
512		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	628	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
513	629	snapobjectButton.addActionListener(this);
514	630	snapobjectButton.setToolTipText("Snap Object");
515	631	}
516	632
517		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	633	+ oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
518	634	flashSelectionButton.setToolTipText("Show selection");
519	635	flashSelectionButton.addActionListener(this);
520	636
521	637	oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
522	638
523		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	639	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
524	640	twoButton.setToolTipText("Show center view only");
525	641	twoButton.addActionListener(this);
526		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	642	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
527	643	fourButton.addActionListener(this);
528	644	fourButton.setToolTipText("Show left panel only");
529		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	645	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
530	646	sixButton.setToolTipText("2-column layout left");
531	647	sixButton.addActionListener(this);
532		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	648	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
533	649	threeButton.setToolTipText("2-column layout right");
534	650	threeButton.addActionListener(this);
535		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	651	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
536	652	sevenButton.setToolTipText("3-column layout");
537	653	sevenButton.addActionListener(this);
538	654	//
539	655
540		- 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);
541	657	rootButton.setToolTipText("Edit selection in new tab");
542	658	rootButton.addActionListener(this);
543	659
544		- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	660	+ oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
545	661	closeButton.setToolTipText("Close tab");
546	662	closeButton.addActionListener(this);
547	663	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
548	664	//clearButton.addActionListener(this);
549	665
550		- cGridBag commandsPanel = new cGridBag();
551		-
552		- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	666	+ editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
553	667	editButton.setToolTipText("Edit selection");
554	668	editButton.addActionListener(this);
555	669
556		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	670	+ editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
557	671	uneditButton.setToolTipText("Unedit selection");
558	672	uneditButton.addActionListener(this);
559	673
560		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	674	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
561	675	allParamsButton.setToolTipText("Edit all params");
562	676	allParamsButton.addActionListener(this);
563	677
564		- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	678	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
565	679	clearPanelButton.setToolTipText("Clear edit panel");
566	680	clearPanelButton.addActionListener(this);
567	681
568		- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	682	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
569	683	unselectButton.setToolTipText("Unselect");
570	684	unselectButton.addActionListener(this);
571	685
572		- commandsPanel.preferredHeight = 1;
	686	+ editCommandsPanel.preferredHeight = 1;
573	687
574		- oe.treePanel.add(commandsPanel);
575		- oe.treePanel.Return();
	688	+// oe.treePanel.add(commandsPanel);
	689	+// oe.treePanel.Return();
576	690
577	691	// oe.aConstraints.gridx += 1;
578	692	// oe.aConstraints.weighty = 0;
..	..	@@ -648,7 +762,7 @@
648	762	zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
649	763	zoomBoxCB.addItemListener(this);
650	764
651		- if (Globals.ADVANCED)
	765	+ if (true) // Globals.ADVANCED)
652	766	{
653	767	panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
654	768	supportCB.setToolTipText("Enable rigging");
..	..	@@ -694,11 +808,19 @@
694	808	// debugCB.addItemListener(this);
695	809
696	810	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	811	+ oeilCB.setToolTipText("Move camera when tracking target");
697	812	oeilCB.addItemListener(this);
698	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	+ {
699	820	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
700	821	lookAtCB.setToolTipText("Look-at target");
701	822	lookAtCB.addItemListener(this);
	823	+ }
702	824
703	825	}
704	826
..	..	@@ -713,6 +835,14 @@
713	835	void EditObject(Object3D obj)
714	836	{
715	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	+
716	846	radioButton.SetObject(obj);
717	847	radioButton.layout = sevenButton;
718	848	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -721,8 +851,11 @@
721	851	buttonGroup.add(radioButton);
722	852	radioButton.doClick();
723	853	}
	854	+
724	855	void SetupViews(ObjEditor oe)
725	856	{
	857	+ theFrame = this;
	858	+
726	859	oe.SetupViews();
727	860
728	861	System.out.println("SetupViews");
..	..	@@ -746,7 +879,9 @@
746	879	JCheckBox speakerCameraCB;
747	880	JCheckBox speakerFocusCB;
748	881	JCheckBox debugCB;
	882	+
749	883	JCheckBox oeilCB;
	884	+ JCheckBox shadowCB;
750	885	JCheckBox lookAtCB;
751	886
752	887	// static int COLOR = 1;
..	..	@@ -785,6 +920,7 @@
785	920	} else if(e.getSource() == liveCB)
786	921	{
787	922	cameraView.ToggleLive();
	923	+ refreshContents(false);
788	924	}
789	925	else if(e.getSource() == supportCB)
790	926	{
..	..	@@ -848,6 +984,10 @@
848	984	else if(e.getSource() == oeilCB)
849	985	{
850	986	cameraView.ToggleOeil();
	987	+ }
	988	+ else if(e.getSource() == shadowCB)
	989	+ {
	990	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
851	991	}
852	992	else if(e.getSource() == lookAtCB)
853	993	{
..	..	@@ -937,7 +1077,9 @@
937	1077	// objEditor.DropFile((java.io.File[]) object, true);
938	1078	// return;
939	1079	// }
940		- if (string.charAt(0) == '/')
	1080	+
	1081	+ // File path for Mac and Windows
	1082	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
941	1083	{
942	1084	// file(s)
943	1085	String[] names = string.split("\n");
..	..	@@ -964,7 +1106,7 @@
964	1106
965	1107	flashIt = false;
966	1108	CameraPane pane = (CameraPane) target;
967		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1109	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
968	1110	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
969	1111
970	1112	if (group.selection.size() == 1)
..	..	@@ -1190,7 +1332,7 @@
1190	1332	memoryItem.addActionListener(this);
1191	1333	menu.add(analyzeItem = new MenuItem("Analyze"));
1192	1334	analyzeItem.addActionListener(this);
1193		- menu.add(dumpItem = new MenuItem("Dump"));
	1335	+ menu.add(dumpItem = new MenuItem("Print"));
1194	1336	dumpItem.addActionListener(this);
1195	1337	// menu.add(pathItem = new MenuItem("From-to path"));
1196	1338	// pathItem.addActionListener(this);
..	..	@@ -1331,6 +1473,7 @@
1331	1473	shadow.material = new cMaterial(obj.material);
1332	1474	shadow.material.diffuse = 0.0001f;
1333	1475	shadow.material.specular = 0.0001f;
	1476	+ //shadow.projectedVertices[1].x = 300;
1334	1477
1335	1478	makeSomething(shadow);
1336	1479	}
..	..	@@ -1537,9 +1680,9 @@
1537	1680
1538	1681	void Overwrite(int mask)
1539	1682	{
1540		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1683	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1541	1684	{
1542		- Object3D content = GrafreeD.clipboard.get(0);
	1685	+ Object3D content = Grafreed.clipboard.get(0);
1543	1686
1544	1687	if (content instanceof cGroup && ((cGroup)content).transientlink )
1545	1688	content = ((cGroup)content).get(0);
..	..	@@ -1844,23 +1987,6 @@
1844	1987	csg.addChild(child);
1845	1988	child.addChild(csg);
1846	1989	} else
1847		-
1848		- if (source == importGFDItem)
1849		- {
1850		- ImportGFD();
1851		- } else
1852		- if (source == importVRMLX3DItem)
1853		- {
1854		- ImportVRMLX3D();
1855		- } else
1856		- if (source == import3DSItem)
1857		- {
1858		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1859		- } else
1860		- if (source == importOBJItem)
1861		- {
1862		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1863		- } else
1864	1990	if (source == computeAOItem)
1865	1991	{
1866	1992	Globals.drawMode = CameraPane.OCCLUSION;
..	..	@@ -1879,7 +2005,7 @@
1879	2005	if (source == invariantsItem)
1880	2006	{
1881	2007	System.out.println("Invariants:");
1882		- GrafreeD.grafreeD.universe.invariants();
	2008	+ Grafreed.grafreeD.universe.invariants();
1883	2009	} else
1884	2010	if (source == memoryItem)
1885	2011	{
..	..	@@ -1897,6 +2023,30 @@
1897	2023	if (source == dumpItem)
1898	2024	{
1899	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();
1900	2050	} else
1901	2051	if (source == oneStepButton)
1902	2052	{
..	..	@@ -1952,12 +2102,20 @@
1952	2102	{
1953	2103	loadClipboard(true);
1954	2104	} else
	2105	+ if (source == undoItem)
	2106	+ {
	2107	+ Undo();
	2108	+ } else
	2109	+ if (source == redoItem)
	2110	+ {
	2111	+ Redo();
	2112	+ } else
1955	2113	if (source == duplicateItem)
1956	2114	{
1957		- Object3D keep = GrafreeD.clipboard;
	2115	+ Object3D keep = Grafreed.clipboard;
1958	2116	loadClipboard(false);
1959	2117	paste(false);
1960		- GrafreeD.clipboard = keep;
	2118	+ Grafreed.clipboard = keep;
1961	2119	} else
1962	2120	if (source == cloneItem)
1963	2121	{
..	..	@@ -2177,9 +2335,9 @@
2177	2335	// group.selection.get(0).setMasterThis(content); // should be identity
2178	2336	// refreshContents();
2179	2337	// }
2180		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2338	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2181	2339	{
2182		- Object3D content = GrafreeD.clipboard.get(0);
	2340	+ Object3D content = Grafreed.clipboard.get(0);
2183	2341
2184	2342	if (content instanceof cGroup && ((cGroup)content).transientlink )
2185	2343	content = ((cGroup)content).get(0);
..	..	@@ -2229,9 +2387,9 @@
2229	2387	} else
2230	2388	if (source == setMasterItem)
2231	2389	{
2232		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2390	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2233	2391	{
2234		- Object3D content = GrafreeD.clipboard.get(0);
	2392	+ Object3D content = Grafreed.clipboard.get(0);
2235	2393
2236	2394	if (content instanceof cGroup && ((cGroup)content).transientlink )
2237	2395	content = ((cGroup)content).get(0);
..	..	@@ -2244,9 +2402,9 @@
2244	2402	{
2245	2403	if (group.selection.size() == 1)
2246	2404	{
2247		- if (GrafreeD.clipboard.size() == 1)
	2405	+ if (Grafreed.clipboard.size() == 1)
2248	2406	{
2249		- Object3D content = GrafreeD.clipboard.get(0);
	2407	+ Object3D content = Grafreed.clipboard.get(0);
2250	2408
2251	2409	if (content instanceof cGroup && ((cGroup)content).transientlink )
2252	2410	content = ((cGroup)content).get(0);
..	..	@@ -2263,7 +2421,7 @@
2263	2421	{
2264	2422	RevertMeshes();
2265	2423	} else
2266		- if (source == resetMeshItem)
	2424	+ if (source == resetAllItem)
2267	2425	{
2268	2426	ResetAll();
2269	2427	} else
..	..	@@ -2451,7 +2609,7 @@
2451	2609	} else
2452	2610	if (source == genNormalsMESHItem)
2453	2611	{
2454		- GenNormals(true); // TODO
	2612	+ GenNormalsMESH();
2455	2613	} else
2456	2614	if (source == genNormalsORGANItem)
2457	2615	{
..	..	@@ -2516,6 +2674,22 @@
2516	2674	if (source == unmarkleavesItem)
2517	2675	{
2518	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);
2519	2693	} else
2520	2694	if (source == flipVItem)
2521	2695	{
..	..	@@ -2601,9 +2775,13 @@
2601	2775	{
2602	2776	SmoothMesh();
2603	2777	} else
2604		- if (source == transformgeometryItem)
	2778	+ if (source == transformGeometryItem)
2605	2779	{
2606	2780	TransformGeometry();
	2781	+ } else
	2782	+ if (source == transformChildrenItem)
	2783	+ {
	2784	+ TransformChildren();
2607	2785	} else
2608	2786	if (source == resetTransformItem)
2609	2787	{
..	..	@@ -2611,7 +2789,11 @@
2611	2789	} else
2612	2790	if (source == resetCentroidItem)
2613	2791	{
2614		- ResetCentroid();
	2792	+ ResetCentroid(true);
	2793	+ } else
	2794	+ if (source == resetCentroidXZItem)
	2795	+ {
	2796	+ ResetCentroid(false);
2615	2797	} else
2616	2798	if (source == resetParentItem)
2617	2799	{
..	..	@@ -2775,6 +2957,24 @@
2775	2957	bigThree.ClearUI();
2776	2958	bigThree.add(centralPanel);
2777	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	+
2778	2978	} else
2779	2979	if (source == threeButton)
2780	2980	{
..	..	@@ -2811,6 +3011,8 @@
2811	3011	bigThree.add(centralPanel);
2812	3012	bigThree.add(XYZPanel);
2813	3013	bigThree.FlushUI();
	3014	+
	3015	+ cameraView.requestFocusInWindow();
2814	3016	} else
2815	3017	if (source == fourButton)
2816	3018	{
..	..	@@ -2846,6 +3048,8 @@
2846	3048	bigThree.ClearUI();
2847	3049	bigThree.add(scenePanel);
2848	3050	bigThree.FlushUI();
	3051	+
	3052	+ cameraView.requestFocusInWindow();
2849	3053	} else
2850	3054	if (source == sixButton)
2851	3055	{
..	..	@@ -2882,6 +3086,8 @@
2882	3086	bigThree.add(scenePanel);
2883	3087	bigThree.add(centralPanel);
2884	3088	bigThree.FlushUI();
	3089	+
	3090	+ cameraView.requestFocusInWindow();
2885	3091	} else
2886	3092	if (source == sevenButton)
2887	3093	{
..	..	@@ -2919,6 +3125,8 @@
2919	3125	bigThree.add(centralPanel);
2920	3126	bigThree.add(XYZPanel);
2921	3127	bigThree.FlushUI();
	3128	+
	3129	+ cameraView.requestFocusInWindow();
2922	3130	} else
2923	3131	if (source == rootButton)
2924	3132	{
..	..	@@ -2930,6 +3138,7 @@
2930	3138	EditObject(obj);
2931	3139	}
2932	3140
	3141	+ cameraView.requestFocusInWindow();
2933	3142	refreshContents(true);
2934	3143	} else
2935	3144	if (source == closeButton)
..	..	@@ -2939,8 +3148,14 @@
2939	3148	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2940	3149	{
2941	3150	ab = (cRadio)e.nextElement();
2942		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3151	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2943	3152	{
	3153	+ // Patch to avoid bug with transparency.
	3154	+ if (!ab.hadMaterial)
	3155	+ {
	3156	+ ab.object.material = null;
	3157	+ }
	3158	+
2944	3159	buttonGroup.remove(ab);
2945	3160	radioPanel.remove(ab);
2946	3161
..	..	@@ -2951,6 +3166,8 @@
2951	3166	break;
2952	3167	}
2953	3168	}
	3169	+
	3170	+ cameraView.requestFocusInWindow();
2954	3171	refreshContents(true);
2955	3172	} else
2956	3173	if (source == editItem \|\| source == editButton)
..	..	@@ -2967,7 +3184,7 @@
2967	3184	child.CloseUI();
2968	3185	listUI.remove(child);
2969	3186
2970		- child.editWindow = null; // ???????????
	3187	+ //child.editWindow = null; // ???????????
2971	3188	}
2972	3189	objEditor.ctrlPanel.FlushUI();
2973	3190	//objEditor.jTree.clearSelection();
..	..	@@ -3053,7 +3270,10 @@
3053	3270	frontView.object = group;
3054	3271	sideView.object = group;
3055	3272	}
3056		- group.editWindow = this;
	3273	+
	3274	+// fix "+" issue
	3275	+ //group.editWindow = this;
	3276	+
3057	3277	/*
3058	3278	currentLayout = radio.layout;
3059	3279	if (currentLayout == null)
..	..	@@ -3065,8 +3285,23 @@
3065	3285	//group.parent = null; // ROOT
3066	3286	//group.attributes = -1;
3067	3287	ResetModel();
	3288	+
	3289	+ cameraView.requestFocusInWindow();
3068	3290	refreshContents(true);
3069		- }
	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	+ }
3070	3305	else
3071	3306	{
3072	3307	//return super.action(event, arg);
..	..	@@ -3075,7 +3310,6 @@
3075	3310	}
3076	3311
3077	3312	boolean useclient = false;
3078		- cRadio radio;
3079	3313
3080	3314	void ToggleRoot()
3081	3315	{
..	..	@@ -3127,6 +3361,28 @@
3127	3361	refreshContents();
3128	3362	}
3129	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	+ }
3130	3386
3131	3387	void ResetTransform()
3132	3388	{
..	..	@@ -3239,7 +3495,7 @@
3239	3495	refreshContents();
3240	3496	}
3241	3497
3242		- void ResetCentroid()
	3498	+ void ResetCentroid(boolean full)
3243	3499	{
3244	3500	Object3D obj;
3245	3501	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3254,12 +3510,16 @@
3254	3510	LA.matIdentity(Object3D.mat);
3255	3511	obj.getBounds(minima, maxima, false);
3256	3512	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3257		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3513	+ if (full)
	3514	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3258	3515	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3259	3516	obj.TransformMesh(Object3D.mat);
	3517	+
3260	3518	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3261		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3519	+ if (full)
	3520	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3262	3521	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3522	+
3263	3523	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3264	3524	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3265	3525	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3288,7 +3548,8 @@
3288	3548
3289	3549	int size = obj.MemorySize();
3290	3550
3291		- 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)");
3292	3553	}
3293	3554	}
3294	3555	catch (Exception e)
..	..	@@ -3325,9 +3586,9 @@
3325	3586	obj = (Object3D)e.nextElement();
3326	3587
3327	3588	System.out.println("Object is: " + obj);
3328		- GrafreeD.AnalyzeObject(obj);
	3589	+ Grafreed.AnalyzeObject(obj);
3329	3590	System.out.println("Boundary rep: " + obj.bRep);
3330		- GrafreeD.AnalyzeObject(obj.bRep);
	3591	+ Grafreed.AnalyzeObject(obj.bRep);
3331	3592
3332	3593	// System.err.println((size/1024) + " KB is the size of " + obj);
3333	3594	}
..	..	@@ -3369,6 +3630,13 @@
3369	3630	void GenNormals(boolean crease)
3370	3631	{
3371	3632	group.GenNormalsS(crease);
	3633	+
	3634	+ refreshContents();
	3635	+ }
	3636	+
	3637	+ void GenNormalsMESH()
	3638	+ {
	3639	+ group.GenNormalsMeshS();
3372	3640
3373	3641	refreshContents();
3374	3642	}
..	..	@@ -3541,8 +3809,8 @@
3541	3809
3542	3810	void ParseVertices()
3543	3811	{
3544		- boolean epsequal = GrafreeD.epsequal;
3545		- GrafreeD.epsequal = true;
	3812	+ boolean epsequal = Grafreed.epsequal;
	3813	+ Grafreed.epsequal = true;
3546	3814
3547	3815	for (int i=0; i<group.selection.size(); i++)
3548	3816	{
..	..	@@ -3567,7 +3835,7 @@
3567	3835	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3568	3836	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3569	3837
3570		- g.add(GrafreeD.clipboard);
	3838	+ g.add(Grafreed.clipboard);
3571	3839
3572	3840	buffer.add(g);
3573	3841	}
..	..	@@ -3582,7 +3850,7 @@
3582	3850	makeSomething(buffer, i==group.selection.size()-1);
3583	3851	}
3584	3852
3585		- GrafreeD.epsequal = epsequal;
	3853	+ Grafreed.epsequal = epsequal;
3586	3854
3587	3855	refreshContents();
3588	3856	}
..	..	@@ -3600,7 +3868,16 @@
3600	3868	String pigment = Object3D.GetPigment(tex);
3601	3869	//String bump = Object3D.GetBump(tex);
3602	3870
3603		- 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	+ }
3604	3881
3605	3882	double s = v.s;
3606	3883
..	..	@@ -3732,7 +4009,7 @@
3732	4009	return;
3733	4010
3734	4011	Object3D poses = group.selection.get(0);
3735		- Object3D ref = GrafreeD.clipboard.get(0);
	4012	+ Object3D ref = Grafreed.clipboard.get(0);
3736	4013
3737	4014	Object3D newgroup = new Object3D("Po:" + poses.name);
3738	4015
..	..	@@ -3926,9 +4203,9 @@
3926	4203
3927	4204	void ClipMesh()
3928	4205	{
3929		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4206	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3930	4207	{
3931		- Object3D content = GrafreeD.clipboard.get(0);
	4208	+ Object3D content = Grafreed.clipboard.get(0);
3932	4209
3933	4210	if (content instanceof cGroup && ((cGroup)content).transientlink )
3934	4211	content = ((cGroup)content).get(0);
..	..	@@ -3937,7 +4214,7 @@
3937	4214	// {
3938	4215	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3939	4216	// }
3940		- group.selection.ClipMesh(GrafreeD.clipboard);
	4217	+ group.selection.ClipMesh(Grafreed.clipboard);
3941	4218	}
3942	4219	// group.selection.ClipMesh(GrafreeD.clipboard);
3943	4220	System.out.println("DONE.");
..	..	@@ -3984,6 +4261,18 @@
3984	4261	void MarkLeaves(boolean hide)
3985	4262	{
3986	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);
3987	4276	refreshContents();
3988	4277	}
3989	4278
..	..	@@ -4072,7 +4361,7 @@
4072	4361	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4073	4362
4074	4363	Object3D elem = (Object3D)group.selection.elementAt(i);
4075		- if(elem != group)
	4364	+ if(elem != group \|\| !newWindow)
4076	4365	{
4077	4366	// if (!(elem instanceof Composite))
4078	4367	// newWindow = false;
..	..	@@ -4162,7 +4451,6 @@
4162	4451	//case 702: // Event.LIST_DESELECT
4163	4452	group.deselectAll();
4164	4453	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4165		- objEditor.ClearInfo(); // .GetMaterial());
4166	4454	if (tps != null)
4167	4455	{
4168	4456	for (int i=0; i < tps.length; i++)
..	..	@@ -4171,10 +4459,8 @@
4171	4459
4172	4460	//if (child.parent != null)
4173	4461	//child.parent.addSelectee(child);
	4462	+ objEditor.SetMaterial(child);
4174	4463	group.addSelectee(child);
4175		- objEditor.SetMaterial(child); // .GetMaterial());
4176		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4177		- System.err.println("info : " + child.GetPath());
4178	4464	}
4179	4465	}
4180	4466	// else
..	..	@@ -4184,16 +4470,17 @@
4184	4470	// System.err.println("info : " + group.GetPath());
4185	4471	// }
4186	4472
4187		- objEditor.SetText(); // jan 2014
4188		-
4189		- 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))
4190	4474	CameraPane.flash = true;
4191	4475
4192		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4476	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4193	4477	// a camera
4194	4478	{
4195		- CameraPane.camerachangeframe = 0; // don't refuse it
4196		- 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	+ }
4197	4484	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4198	4485	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4199	4486	}
..	..	@@ -4206,6 +4493,26 @@
4206	4493
4207	4494	freezemodel = false;
4208	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	+ }
4209	4516
4210	4517	void linkSomething(Object3D thing)
4211	4518	{
..	..	@@ -4277,16 +4584,18 @@
4277	4584	{
4278	4585	if (group.selection.isEmpty())
4279	4586	return;
4280		- GrafreeD.clipboardIsTempGroup = false;
	4587	+
	4588	+ Grafreed.clipboardIsTempGroup = false;
4281	4589	Composite tGroup = null;
4282	4590	if (group.selection.size() > 0) // 1)
4283	4591	{
4284	4592	tGroup = new cGroup();
4285		- GrafreeD.clipboardIsTempGroup = true;
	4593	+ Grafreed.clipboardIsTempGroup = true;
4286	4594	}
4287	4595
4288	4596	if (cut)
4289	4597	{
	4598	+ Save();
4290	4599	//int indices[] = jList.getSelectedIndices();
4291	4600	//for (int i = indices.length - 1; i >= 0; i--)
4292	4601	//jList.remove(indices[i]);
..	..	@@ -4322,16 +4631,16 @@
4322	4631	//System.out.println("cut " + child);
4323	4632	//System.out.println("parent = " + child.parent);
4324	4633	// tmp.addChild(child);
4325		- if (GrafreeD.clipboardIsTempGroup)
	4634	+ if (Grafreed.clipboardIsTempGroup)
4326	4635	tGroup.add/Child/(tmp);
4327	4636	else
4328		- GrafreeD.clipboard = tmp;
	4637	+ Grafreed.clipboard = tmp;
4329	4638	}
4330	4639	else
4331		- if (GrafreeD.clipboardIsTempGroup)
	4640	+ if (Grafreed.clipboardIsTempGroup)
4332	4641	tGroup.add/Child/(child);
4333	4642	else
4334		- GrafreeD.clipboard = child;
	4643	+ Grafreed.clipboard = child;
4335	4644	}
4336	4645
4337	4646	//ResetModel();
..	..	@@ -4363,21 +4672,23 @@
4363	4672	//System.out.println("cut " + elem);
4364	4673	//System.out.println("parent = " + elem.parent);
4365	4674	// tmp.addChild(elem);
4366		- if (GrafreeD.clipboardIsTempGroup)
	4675	+ if (Grafreed.clipboardIsTempGroup)
4367	4676	tGroup.add/Child/(tmp);
4368	4677	else
4369		- GrafreeD.clipboard = tmp;
	4678	+ Grafreed.clipboard = tmp;
4370	4679	}
4371	4680	else
4372		- if (GrafreeD.clipboardIsTempGroup)
	4681	+ if (Grafreed.clipboardIsTempGroup)
4373	4682	tGroup.add/Child/(child);
4374	4683	else
4375		- GrafreeD.clipboard = child;
	4684	+ Grafreed.clipboard = child;
4376	4685	}
4377	4686
4378	4687	}
4379		- if (GrafreeD.clipboardIsTempGroup)
4380		- GrafreeD.clipboard = tGroup;
	4688	+
	4689	+ if (Grafreed.clipboardIsTempGroup)
	4690	+ Grafreed.clipboard = tGroup;
	4691	+
4381	4692	if (cut)
4382	4693	{
4383	4694	ResetModel();
..	..	@@ -4391,7 +4702,7 @@
4391	4702	// return;
4392	4703	boolean first = true;
4393	4704
4394		- if (GrafreeD.clipboardIsTempGroup)
	4705	+ if (Grafreed.clipboardIsTempGroup)
4395	4706	{
4396	4707	Composite temp;
4397	4708
..	..	@@ -4402,7 +4713,7 @@
4402	4713	temp = (Composite)Applet3D.clipboard.deepCopy();
4403	4714	*/
4404	4715	Object3D elem;
4405		- 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))
4406	4717	{
4407	4718	Object3D child = (Object3D)e.nextElement();
4408	4719
..	..	@@ -4436,14 +4747,14 @@
4436	4747	//Object3D cb = Applet3D.clipboard;
4437	4748	//temp.addChild(cb);
4438	4749	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4439		- assert(GrafreeD.clipboard.parent == null);
4440		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4441		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4442		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4443		- 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());
4444	4755	else
4445		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4446		- GrafreeD.clipboard.get(0).parent = keepparent;
	4756	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4757	+ Grafreed.clipboard.get(0).parent = keepparent;
4447	4758	}
4448	4759
4449	4760	ResetModel();
..	..	@@ -4492,9 +4803,9 @@
4492	4803	{
4493	4804	boolean first = true;
4494	4805
4495		- if (GrafreeD.clipboardIsTempGroup)
	4806	+ if (Grafreed.clipboardIsTempGroup)
4496	4807	{
4497		- Composite temp = (Composite)GrafreeD.clipboard;
	4808	+ Composite temp = (Composite)Grafreed.clipboard;
4498	4809	Object3D copy;
4499	4810	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4500	4811	{
..	..	@@ -4504,7 +4815,7 @@
4504	4815	}
4505	4816	} else
4506	4817	{
4507		- linkSomething(GrafreeD.clipboard); //.get(0));
	4818	+ linkSomething(Grafreed.clipboard); //.get(0));
4508	4819	}
4509	4820	}
4510	4821	}
..	..	@@ -4909,21 +5220,6 @@
4909	5220	}
4910	5221	*/
4911	5222
4912		- void ImportGFD()
4913		- {
4914		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4915		- browser.show();
4916		- String filename = browser.getFile();
4917		- if (filename != null && filename.length() > 0)
4918		- {
4919		- String fullname = browser.getDirectory() + filename;
4920		-
4921		- //Object3D readobj =
4922		- objEditor.ReadGFD(fullname, objEditor);
4923		- //makeSomething(readobj);
4924		- }
4925		- }
4926		-
4927	5223	/*
4928	5224	public void Callback(Object obj)
4929	5225	{
..	..	@@ -4947,26 +5243,9 @@
4947	5243	}
4948	5244	*/
4949	5245
4950		- void ImportVRMLX3D()
4951		- {
4952		- if (GrafreeD.standAlone)
4953		- {
4954		- /**/
4955		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4956		- browser.show();
4957		- String filename = browser.getFile();
4958		- if (filename != null && filename.length() > 0)
4959		- {
4960		- String fullname = browser.getDirectory() + filename;
4961		- LoadVRMLX3D(fullname);
4962		- }
4963		- /**/
4964		- }
4965		- }
4966		-
4967	5246	String GetFile(String dialogName)
4968	5247	{
4969		- if (GrafreeD.standAlone)
	5248	+ if (Grafreed.standAlone)
4970	5249	{
4971	5250	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4972	5251	browser.show();
..	..	@@ -5034,6 +5313,12 @@
5034	5313	cButton clearpanelButton;
5035	5314	cButton unselectButton;
5036	5315
	5316	+ cButton minButton;
	5317	+ cButton maxButton;
	5318	+ cButton fullButton;
	5319	+ cButton undoButton;
	5320	+ cButton redoButton;
	5321	+ cButton saveButton;
5037	5322	cButton oneStepButton;
5038	5323
5039	5324	cButton screenfitButton;
..	..	@@ -5047,14 +5332,6 @@
5047	5332
5048	5333	cButton setsupportButton;
5049	5334
5050		- cButton twoButton;
5051		- cButton sixButton;
5052		- cButton threeButton;
5053		- cButton sevenButton;
5054		- cButton fourButton; // full panel
5055		- cButton oneButton; // full XYZ
5056		- //cButton currentLayout;
5057		-
5058	5335	//
5059	5336	//Composite
5060	5337	Object3D // to do !!
..	..	@@ -5066,6 +5343,8 @@
5066	5343	private MenuItem lookFromItem;
5067	5344	private MenuItem switchItem;
5068	5345	private MenuItem cutItem;
	5346	+ private MenuItem undoItem;
	5347	+ private MenuItem redoItem;
5069	5348	private MenuItem duplicateItem;
5070	5349	private MenuItem cloneItem;
5071	5350	private MenuItem cloneSupportItem;
..	..	@@ -5079,7 +5358,7 @@
5079	5358	private MenuItem linkverticesItem;
5080	5359	private MenuItem relinkverticesItem;
5081	5360	private MenuItem setMasterItem;
5082		- private MenuItem resetMeshItem;
	5361	+ private MenuItem resetAllItem;
5083	5362	private MenuItem stepAllItem;
5084	5363	private MenuItem revertMeshItem;
5085	5364	private MenuItem poseMeshItem;
..	..	@@ -5129,6 +5408,10 @@
5129	5408	private MenuItem showleavesItem;
5130	5409	private MenuItem markleavesItem;
5131	5410	private MenuItem unmarkleavesItem;
	5411	+ private MenuItem rewindleavesItem;
	5412	+ private MenuItem unrewindleavesItem;
	5413	+ private MenuItem randomleavesItem;
	5414	+ private MenuItem unrandomleavesItem;
5132	5415
5133	5416	private MenuItem flipVItem;
5134	5417	private MenuItem unflipVItem;
..	..	@@ -5140,8 +5423,10 @@
5140	5423	private MenuItem panoTexturesItem;
5141	5424
5142	5425	private MenuItem resetCentroidItem;
5143		- private MenuItem transformgeometryItem;
	5426	+ private MenuItem resetCentroidXZItem;
5144	5427	private MenuItem resetTransformItem;
	5428	+ private MenuItem transformGeometryItem;
	5429	+ private MenuItem transformChildrenItem;
5145	5430	private MenuItem hideItem;
5146	5431	private MenuItem grabItem;
5147	5432	private MenuItem backItem;
..	..	@@ -5210,11 +5495,6 @@
5210	5495	private MenuItem doubleItem;
5211	5496	private MenuItem tripleItem;
5212	5497
5213		- private MenuItem importGFDItem;
5214		- private MenuItem importVRMLX3DItem;
5215		- private MenuItem import3DSItem;
5216		- private MenuItem importOBJItem;
5217		-
5218	5498	private MenuItem computeAOItem;
5219	5499	private MenuItem recompileItem;
5220	5500	private MenuItem editScriptItem;
..	..	@@ -5224,4 +5504,8 @@
5224	5504	private MenuItem analyzeItem;
5225	5505	private MenuItem dumpItem;
5226	5506	//boolean freezemodel = false;
	5507	+
	5508	+ Menu cameraMenu;
	5509	+ MenuItem editCameraItem;
	5510	+ MenuItem revertCameraItem;
5227	5511	}