~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,40 +148,35 @@
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);
	165	+ cloneItem = menu.add(new MenuItem("Clone"));
	166	+ cloneItem.addActionListener(this);
	167	+ if (Globals.ADVANCED)
	168	+ {
	169	+ cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
	170	+ cloneSupportItem.addActionListener(this);
	171	+ }
	172	+ menu.add("-");
174	173	cutItem = menu.add(new MenuItem("Cut"));
175	174	cutItem.addActionListener(this);
176	175	copyItem = menu.add(new MenuItem("Copy"));
177	176	copyItem.addActionListener(this);
178	177	pasteItem = menu.add(new MenuItem("Paste"));
179	178	pasteItem.addActionListener(this);
180		- menu.add("-");
181		- cloneItem = menu.add(new MenuItem("Clone"));
182		- cloneItem.addActionListener(this);
183		- cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
184		- cloneSupportItem.addActionListener(this);
	179	+
185	180	menu.add("-");
186	181	pasteIntoItem = menu.add(new MenuItem("Paste into"));
187	182	pasteIntoItem.addActionListener(this);
..	..	@@ -201,14 +196,97 @@
201	196	clearAllItem = menu.add(new MenuItem("Clear All"));
202	197	clearAllItem.addActionListener(this);
203	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());
204	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	+
205	287	oe.menuBar.add(menu = new Menu("Setting"));
206	288	if (Globals.ADVANCED)
207	289	{
208		- resetMeshItem = menu.add(new MenuItem("Reset All"));
209		- resetMeshItem.addActionListener(this);
210		- stepAllItem = menu.add(new MenuItem("Step All"));
211		- stepAllItem.addActionListener(this);
212	290	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
213	291	revertMeshItem.addActionListener(this);
214	292	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
..	..	@@ -272,6 +350,7 @@
272	350
273	351	if (Globals.ADVANCED)
274	352	{
	353	+ menu.add("-");
275	354	physicsItem = menu.add(new MenuItem("Physics"));
276	355	physicsItem.addActionListener(this);
277	356	frameselectorItem = menu.add(new MenuItem("Frame Selector"));
..	..	@@ -289,14 +368,15 @@
289	368	billboardItem.addActionListener(this);
290	369	csgItem = menu.add(new MenuItem("CSG"));
291	370	csgItem.addActionListener(this);
292		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	371	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
293	372	shadowXItem.addActionListener(this);
294		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	373	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
295	374	shadowYItem.addActionListener(this);
296		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	375	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
297	376	shadowZItem.addActionListener(this);
298	377	if (Globals.ADVANCED)
299	378	{
	379	+ menu.add("-");
300	380	linkerItem = menu.add(new MenuItem("Linker"));
301	381	linkerItem.addActionListener(this);
302	382	attributeItem = menu.add(new MenuItem("Attribute"));
..	..	@@ -305,14 +385,18 @@
305	385	templateItem.addActionListener(this);
306	386	pointflowItem = menu.add(new MenuItem("Point Flow"));
307	387	pointflowItem.addActionListener(this);
308		- menu.add("-");
309	388	}
	389	+ menu.add("-");
310	390	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
311	391	resetTransformItem.addActionListener(this);
312	392	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
313	393	resetCentroidItem.addActionListener(this);
314		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
315		- 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);
316	400
317	401	oe.menuBar.add(menu = new Menu("Geometry"));
318	402	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -361,6 +445,10 @@
361	445	oe.menuBar.add(menu = new Menu("Attributes"));
362	446	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
363	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);
364	452	menu.add("-");
365	453	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
366	454	liveleavesItem.addActionListener(this);
..	..	@@ -381,6 +469,14 @@
381	469	markleavesItem.addActionListener(this);
382	470	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
383	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);
384	480	menu.add("-");
385	481	flipVItem = menu.add(new MenuItem("Flip V"));
386	482	flipVItem.addActionListener(this);
..	..	@@ -415,38 +511,41 @@
415	511	sortbysizeItem.addActionListener(this);
416	512	sortbynameItem = menu.add(new MenuItem("Sort by name"));
417	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);
418	519	if (Globals.ADVANCED)
419	520	{
420		- menu.add("-");
	521	+ // Pretty much the same as duplicate and clone.
421	522	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
422	523	extractGeometriesItem.addActionListener(this);
423	524	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
424	525	cloneGeometriesItem.addActionListener(this);
425		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
426		- shareGeometriesItem.addActionListener(this);
427		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
428		- mergeGeometriesItem.addActionListener(this);
429	526	}
430	527
431	528	oe.menuBar.add(menu = new Menu("Insert"));
432	529	buildCreateMenu(menu);
433	530
434		- oe.menuBar.add(menu = new Menu("Include"));
435		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
436		- importGFDItem.addActionListener(this);
437		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
438		- importVRMLX3DItem.addActionListener(this);
439		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
440		- importOBJItem.addActionListener(this);
441		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
442		- import3DSItem.addActionListener(this);
443		-
444	531	oe.menuBar.add(menu = new Menu("Tools"));
445	532	buildToolsMenu(menu);
446	533	}
447	534
448	535	void SetupUI2(ObjEditor oe)
449	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	+
450	549	//new Exception().printStackTrace();
451	550
452	551	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -477,23 +576,47 @@
477	576	*/
478	577	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
479	578
480		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
481		- liveCB.setToolTipText("Enabled animation");
	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 = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	584	+ maxButton.setToolTipText("Maximize window");
	585	+ maxButton.addActionListener(this);
	586	+
	587	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	588	+ fullButton.setToolTipText("Full-screen window");
	589	+ fullButton.addActionListener(this);
	590	+
	591	+ oe.toolbarPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	592	+ undoButton.setToolTipText("Undo changes");
	593	+ undoButton.addActionListener(this);
	594	+
	595	+ oe.toolbarPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	596	+ redoButton.setToolTipText("Redo changes");
	597	+ redoButton.addActionListener(this);
	598	+
	599	+ oe.toolbarPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	600	+ saveButton.setToolTipText("Save changes");
	601	+ saveButton.addActionListener(this);
	602	+
	603	+ oe.toolbarPanel.add(liveCB = GetCheckBox("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	604	+ liveCB.setToolTipText("Enable animation");
482	605	liveCB.addItemListener(this);
483	606
484		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
485		- oneStepButton.setToolTipText("Animate one step forward");
486		- oneStepButton.addActionListener(this);
487		-
488		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	607	+ oe.toolbarPanel.add(fastCB = GetCheckBox("icons/runfast.png", CameraPane.FAST)); //, constraints);
489	608	fastCB.setToolTipText("Fast mode");
490	609	fastCB.addItemListener(this);
491	610
492		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	611	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	612	+ oneStepButton.setToolTipText("Animate one step forward");
	613	+ oneStepButton.addActionListener(this);
	614	+
	615	+ oe.toolbarPanel.add(trackCB = GetCheckBox("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
493	616	trackCB.setToolTipText("Enable tracking");
494	617	trackCB.addItemListener(this);
495	618
496		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	619	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
497	620	screenfitButton.setToolTipText("Screen fit");
498	621	screenfitButton.addActionListener(this);
499	622
..	..	@@ -502,70 +625,68 @@
502	625
503	626	if (Globals.ADVANCED)
504	627	{
505		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	628	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
506	629	snapobjectButton.addActionListener(this);
507	630	snapobjectButton.setToolTipText("Snap Object");
508	631	}
509	632
510		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
511		- flashSelectionButton.setToolTipText("Show selection");
	633	+ oe.toolbarPanel.add(flashSelectionButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	634	+ flashSelectionButton.setToolTipText("Highlight selection");
512	635	flashSelectionButton.addActionListener(this);
513	636
514	637	oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
515	638
516		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	639	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
517	640	twoButton.setToolTipText("Show center view only");
518	641	twoButton.addActionListener(this);
519		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	642	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
520	643	fourButton.addActionListener(this);
521	644	fourButton.setToolTipText("Show left panel only");
522		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	645	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
523	646	sixButton.setToolTipText("2-column layout left");
524	647	sixButton.addActionListener(this);
525		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	648	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
526	649	threeButton.setToolTipText("2-column layout right");
527	650	threeButton.addActionListener(this);
528		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	651	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
529	652	sevenButton.setToolTipText("3-column layout");
530	653	sevenButton.addActionListener(this);
531	654	//
532	655
533		- 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);
534	657	rootButton.setToolTipText("Edit selection in new tab");
535	658	rootButton.addActionListener(this);
536	659
537		- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	660	+ oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
538	661	closeButton.setToolTipText("Close tab");
539	662	closeButton.addActionListener(this);
540	663	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
541	664	//clearButton.addActionListener(this);
542	665
543		- cGridBag commandsPanel = new cGridBag();
544		-
545		- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	666	+ editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
546	667	editButton.setToolTipText("Edit selection");
547	668	editButton.addActionListener(this);
548	669
549		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	670	+ editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
550	671	uneditButton.setToolTipText("Unedit selection");
551	672	uneditButton.addActionListener(this);
552	673
553		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	674	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
554	675	allParamsButton.setToolTipText("Edit all params");
555	676	allParamsButton.addActionListener(this);
556	677
557		- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	678	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
558	679	clearPanelButton.setToolTipText("Clear edit panel");
559	680	clearPanelButton.addActionListener(this);
560	681
561		- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	682	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
562	683	unselectButton.setToolTipText("Unselect");
563	684	unselectButton.addActionListener(this);
564	685
565		- commandsPanel.preferredHeight = 1;
	686	+ editCommandsPanel.preferredHeight = 1;
566	687
567		- oe.treePanel.add(commandsPanel);
568		- oe.treePanel.Return();
	688	+// oe.treePanel.add(commandsPanel);
	689	+// oe.treePanel.Return();
569	690
570	691	// oe.aConstraints.gridx += 1;
571	692	// oe.aConstraints.weighty = 0;
..	..	@@ -641,7 +762,7 @@
641	762	zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
642	763	zoomBoxCB.addItemListener(this);
643	764
644		- if (Globals.ADVANCED)
	765	+ if (true) // Globals.ADVANCED)
645	766	{
646	767	panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
647	768	supportCB.setToolTipText("Enable rigging");
..	..	@@ -687,11 +808,23 @@
687	808	// debugCB.addItemListener(this);
688	809
689	810	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	811	+ oeilCB.setToolTipText("Move camera when tracking target");
690	812	oeilCB.addItemListener(this);
691	813
	814	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	815	+ shadowCB.setToolTipText("Compute shadows when live");
	816	+ shadowCB.addItemListener(this);
	817	+
	818	+ panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
	819	+ autosaveCB.setToolTipText("Auto-save on structure change");
	820	+ autosaveCB.addItemListener(this);
	821	+
	822	+ if (Globals.ADVANCED)
	823	+ {
692	824	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
693	825	lookAtCB.setToolTipText("Look-at target");
694	826	lookAtCB.addItemListener(this);
	827	+ }
695	828
696	829	}
697	830
..	..	@@ -706,6 +839,14 @@
706	839	void EditObject(Object3D obj)
707	840	{
708	841	cRadio radioButton = new cRadio(obj.name);
	842	+
	843	+ // Patch to avoid bug with transparency.
	844	+ radioButton.hadMaterial = obj.material != null;
	845	+ if (!radioButton.hadMaterial)
	846	+ {
	847	+ obj.material = new cMaterial();
	848	+ }
	849	+
709	850	radioButton.SetObject(obj);
710	851	radioButton.layout = sevenButton;
711	852	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -714,8 +855,11 @@
714	855	buttonGroup.add(radioButton);
715	856	radioButton.doClick();
716	857	}
	858	+
717	859	void SetupViews(ObjEditor oe)
718	860	{
	861	+ theFrame = this;
	862	+
719	863	oe.SetupViews();
720	864
721	865	System.out.println("SetupViews");
..	..	@@ -724,23 +868,26 @@
724	868	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
725	869	}
726	870
727		- JCheckBox liveCB;
728		- JCheckBox supportCB;
729		- JCheckBox localCB;
730		- JCheckBox crowdCB;
731		- JCheckBox smoothCB;
732		- JCheckBox fastCB;
733		- JCheckBox slowCB;
734		- JCheckBox boxCB;
735		- JCheckBox zoomBoxCB;
736		- JCheckBox trackCB;
737		- JCheckBox smoothfocusCB;
	871	+ cCheckBox liveCB;
	872	+ cCheckBox supportCB;
	873	+ cCheckBox localCB;
	874	+ cCheckBox crowdCB;
	875	+ cCheckBox smoothCB;
	876	+ cCheckBox fastCB;
	877	+ cCheckBox slowCB;
	878	+ cCheckBox boxCB;
	879	+ cCheckBox zoomBoxCB;
	880	+ cCheckBox trackCB;
	881	+ cCheckBox smoothfocusCB;
738	882	// JCheckBox speakerMocapCB;
739		- JCheckBox speakerCameraCB;
740		- JCheckBox speakerFocusCB;
741		- JCheckBox debugCB;
742		- JCheckBox oeilCB;
743		- JCheckBox lookAtCB;
	883	+ cCheckBox speakerCameraCB;
	884	+ cCheckBox speakerFocusCB;
	885	+ cCheckBox debugCB;
	886	+
	887	+ cCheckBox oeilCB;
	888	+ cCheckBox shadowCB;
	889	+ cCheckBox autosaveCB;
	890	+ cCheckBox lookAtCB;
744	891
745	892	// static int COLOR = 1;
746	893	// static int MATERIAL = 2;
..	..	@@ -748,9 +895,9 @@
748	895
749	896	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
750	897
751		- JCheckBox colorCB;
752		- JCheckBox materialCB;
753		- JCheckBox textureCB;
	898	+ cCheckBox colorCB;
	899	+ cCheckBox materialCB;
	900	+ cCheckBox textureCB;
754	901
755	902	public void itemStateChanged(ItemEvent e)
756	903	{
..	..	@@ -778,6 +925,7 @@
778	925	} else if(e.getSource() == liveCB)
779	926	{
780	927	cameraView.ToggleLive();
	928	+ refreshContents(false);
781	929	}
782	930	else if(e.getSource() == supportCB)
783	931	{
..	..	@@ -841,6 +989,14 @@
841	989	else if(e.getSource() == oeilCB)
842	990	{
843	991	cameraView.ToggleOeil();
	992	+ }
	993	+ else if(e.getSource() == shadowCB)
	994	+ {
	995	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	996	+ }
	997	+ else if(e.getSource() == autosaveCB)
	998	+ {
	999	+ Globals.SAVEONMAKE ^= true;
844	1000	}
845	1001	else if(e.getSource() == lookAtCB)
846	1002	{
..	..	@@ -930,7 +1086,9 @@
930	1086	// objEditor.DropFile((java.io.File[]) object, true);
931	1087	// return;
932	1088	// }
933		- if (string.charAt(0) == '/')
	1089	+
	1090	+ // File path for Mac and Windows
	1091	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
934	1092	{
935	1093	// file(s)
936	1094	String[] names = string.split("\n");
..	..	@@ -957,7 +1115,7 @@
957	1115
958	1116	flashIt = false;
959	1117	CameraPane pane = (CameraPane) target;
960		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1118	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
961	1119	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
962	1120
963	1121	if (group.selection.size() == 1)
..	..	@@ -1164,13 +1322,13 @@
1164	1322	parseverticesItem.addActionListener(this);
1165	1323	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1166	1324	textureFieldItem.addActionListener(this);
1167		- alignItem = menu.add(new MenuItem("Align Object"));
	1325	+ alignItem = menu.add(new MenuItem("Align Objects"));
1168	1326	alignItem.addActionListener(this);
1169	1327	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1170	1328	reduceMorphItem.addActionListener(this);
1171	1329	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1172	1330	reduce34MorphItem.addActionListener(this);
1173		-
	1331	+ menu.add("-");
1174	1332	menu.add(computeAOItem = new MenuItem("Compute AO"));
1175	1333	computeAOItem.addActionListener(this);
1176	1334
..	..	@@ -1183,7 +1341,7 @@
1183	1341	memoryItem.addActionListener(this);
1184	1342	menu.add(analyzeItem = new MenuItem("Analyze"));
1185	1343	analyzeItem.addActionListener(this);
1186		- menu.add(dumpItem = new MenuItem("Dump"));
	1344	+ menu.add(dumpItem = new MenuItem("Print"));
1187	1345	dumpItem.addActionListener(this);
1188	1346	// menu.add(pathItem = new MenuItem("From-to path"));
1189	1347	// pathItem.addActionListener(this);
..	..	@@ -1324,6 +1482,7 @@
1324	1482	shadow.material = new cMaterial(obj.material);
1325	1483	shadow.material.diffuse = 0.0001f;
1326	1484	shadow.material.specular = 0.0001f;
	1485	+ //shadow.projectedVertices[1].x = 300;
1327	1486
1328	1487	makeSomething(shadow);
1329	1488	}
..	..	@@ -1530,9 +1689,9 @@
1530	1689
1531	1690	void Overwrite(int mask)
1532	1691	{
1533		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1692	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1534	1693	{
1535		- Object3D content = GrafreeD.clipboard.get(0);
	1694	+ Object3D content = Grafreed.clipboard.get(0);
1536	1695
1537	1696	if (content instanceof cGroup && ((cGroup)content).transientlink )
1538	1697	content = ((cGroup)content).get(0);
..	..	@@ -1837,23 +1996,6 @@
1837	1996	csg.addChild(child);
1838	1997	child.addChild(csg);
1839	1998	} else
1840		-
1841		- if (source == importGFDItem)
1842		- {
1843		- ImportGFD();
1844		- } else
1845		- if (source == importVRMLX3DItem)
1846		- {
1847		- ImportVRMLX3D();
1848		- } else
1849		- if (source == import3DSItem)
1850		- {
1851		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1852		- } else
1853		- if (source == importOBJItem)
1854		- {
1855		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1856		- } else
1857	1999	if (source == computeAOItem)
1858	2000	{
1859	2001	Globals.drawMode = CameraPane.OCCLUSION;
..	..	@@ -1872,7 +2014,7 @@
1872	2014	if (source == invariantsItem)
1873	2015	{
1874	2016	System.out.println("Invariants:");
1875		- GrafreeD.grafreeD.universe.invariants();
	2017	+ Grafreed.grafreeD.universe.invariants();
1876	2018	} else
1877	2019	if (source == memoryItem)
1878	2020	{
..	..	@@ -1890,6 +2032,30 @@
1890	2032	if (source == dumpItem)
1891	2033	{
1892	2034	DumpObject();
	2035	+ } else
	2036	+ if (source == minButton)
	2037	+ {
	2038	+ Minimize();
	2039	+ } else
	2040	+ if (source == maxButton)
	2041	+ {
	2042	+ Maximize();
	2043	+ } else
	2044	+ if (source == fullButton)
	2045	+ {
	2046	+ ToggleFullScreen();
	2047	+ } else
	2048	+ if (source == undoButton)
	2049	+ {
	2050	+ Undo();
	2051	+ } else
	2052	+ if (source == redoButton)
	2053	+ {
	2054	+ Redo();
	2055	+ } else
	2056	+ if (source == saveButton)
	2057	+ {
	2058	+ Save();
1893	2059	} else
1894	2060	if (source == oneStepButton)
1895	2061	{
..	..	@@ -1945,12 +2111,20 @@
1945	2111	{
1946	2112	loadClipboard(true);
1947	2113	} else
	2114	+ if (source == undoItem)
	2115	+ {
	2116	+ Undo();
	2117	+ } else
	2118	+ if (source == redoItem)
	2119	+ {
	2120	+ Redo();
	2121	+ } else
1948	2122	if (source == duplicateItem)
1949	2123	{
1950		- Object3D keep = GrafreeD.clipboard;
	2124	+ Object3D keep = Grafreed.clipboard;
1951	2125	loadClipboard(false);
1952	2126	paste(false);
1953		- GrafreeD.clipboard = keep;
	2127	+ Grafreed.clipboard = keep;
1954	2128	} else
1955	2129	if (source == cloneItem)
1956	2130	{
..	..	@@ -2170,9 +2344,9 @@
2170	2344	// group.selection.get(0).setMasterThis(content); // should be identity
2171	2345	// refreshContents();
2172	2346	// }
2173		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2347	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2174	2348	{
2175		- Object3D content = GrafreeD.clipboard.get(0);
	2349	+ Object3D content = Grafreed.clipboard.get(0);
2176	2350
2177	2351	if (content instanceof cGroup && ((cGroup)content).transientlink )
2178	2352	content = ((cGroup)content).get(0);
..	..	@@ -2222,9 +2396,9 @@
2222	2396	} else
2223	2397	if (source == setMasterItem)
2224	2398	{
2225		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2399	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2226	2400	{
2227		- Object3D content = GrafreeD.clipboard.get(0);
	2401	+ Object3D content = Grafreed.clipboard.get(0);
2228	2402
2229	2403	if (content instanceof cGroup && ((cGroup)content).transientlink )
2230	2404	content = ((cGroup)content).get(0);
..	..	@@ -2237,9 +2411,9 @@
2237	2411	{
2238	2412	if (group.selection.size() == 1)
2239	2413	{
2240		- if (GrafreeD.clipboard.size() == 1)
	2414	+ if (Grafreed.clipboard.size() == 1)
2241	2415	{
2242		- Object3D content = GrafreeD.clipboard.get(0);
	2416	+ Object3D content = Grafreed.clipboard.get(0);
2243	2417
2244	2418	if (content instanceof cGroup && ((cGroup)content).transientlink )
2245	2419	content = ((cGroup)content).get(0);
..	..	@@ -2256,7 +2430,7 @@
2256	2430	{
2257	2431	RevertMeshes();
2258	2432	} else
2259		- if (source == resetMeshItem)
	2433	+ if (source == resetAllItem)
2260	2434	{
2261	2435	ResetAll();
2262	2436	} else
..	..	@@ -2444,7 +2618,7 @@
2444	2618	} else
2445	2619	if (source == genNormalsMESHItem)
2446	2620	{
2447		- GenNormals(true); // TODO
	2621	+ GenNormalsMESH();
2448	2622	} else
2449	2623	if (source == genNormalsORGANItem)
2450	2624	{
..	..	@@ -2509,6 +2683,22 @@
2509	2683	if (source == unmarkleavesItem)
2510	2684	{
2511	2685	MarkLeaves(false);
	2686	+ } else
	2687	+ if (source == rewindleavesItem)
	2688	+ {
	2689	+ RewindLeaves(true);
	2690	+ } else
	2691	+ if (source == unrewindleavesItem)
	2692	+ {
	2693	+ RewindLeaves(false);
	2694	+ } else
	2695	+ if (source == randomleavesItem)
	2696	+ {
	2697	+ RandomLeaves(true);
	2698	+ } else
	2699	+ if (source == unrandomleavesItem)
	2700	+ {
	2701	+ RandomLeaves(false);
2512	2702	} else
2513	2703	if (source == flipVItem)
2514	2704	{
..	..	@@ -2594,9 +2784,13 @@
2594	2784	{
2595	2785	SmoothMesh();
2596	2786	} else
2597		- if (source == transformgeometryItem)
	2787	+ if (source == transformGeometryItem)
2598	2788	{
2599	2789	TransformGeometry();
	2790	+ } else
	2791	+ if (source == transformChildrenItem)
	2792	+ {
	2793	+ TransformChildren();
2600	2794	} else
2601	2795	if (source == resetTransformItem)
2602	2796	{
..	..	@@ -2604,7 +2798,11 @@
2604	2798	} else
2605	2799	if (source == resetCentroidItem)
2606	2800	{
2607		- ResetCentroid();
	2801	+ ResetCentroid(true);
	2802	+ } else
	2803	+ if (source == resetCentroidXZItem)
	2804	+ {
	2805	+ ResetCentroid(false);
2608	2806	} else
2609	2807	if (source == resetParentItem)
2610	2808	{
..	..	@@ -2768,6 +2966,24 @@
2768	2966	bigThree.ClearUI();
2769	2967	bigThree.add(centralPanel);
2770	2968	bigThree.FlushUI();
	2969	+
	2970	+ cameraView.requestFocusInWindow();
	2971	+
	2972	+// refreshContents(true);
	2973	+//
	2974	+// try
	2975	+// {
	2976	+// java.awt.Robot bot = new java.awt.Robot();
	2977	+// int mask = InputEvent.BUTTON1_MASK;
	2978	+// bot.mouseMove(100, 100);
	2979	+// bot.mousePress(mask);
	2980	+// bot.mouseRelease(mask);
	2981	+// }
	2982	+// catch (Exception e)
	2983	+// {
	2984	+//
	2985	+// }
	2986	+
2771	2987	} else
2772	2988	if (source == threeButton)
2773	2989	{
..	..	@@ -2804,6 +3020,8 @@
2804	3020	bigThree.add(centralPanel);
2805	3021	bigThree.add(XYZPanel);
2806	3022	bigThree.FlushUI();
	3023	+
	3024	+ cameraView.requestFocusInWindow();
2807	3025	} else
2808	3026	if (source == fourButton)
2809	3027	{
..	..	@@ -2839,6 +3057,8 @@
2839	3057	bigThree.ClearUI();
2840	3058	bigThree.add(scenePanel);
2841	3059	bigThree.FlushUI();
	3060	+
	3061	+ cameraView.requestFocusInWindow();
2842	3062	} else
2843	3063	if (source == sixButton)
2844	3064	{
..	..	@@ -2875,6 +3095,8 @@
2875	3095	bigThree.add(scenePanel);
2876	3096	bigThree.add(centralPanel);
2877	3097	bigThree.FlushUI();
	3098	+
	3099	+ cameraView.requestFocusInWindow();
2878	3100	} else
2879	3101	if (source == sevenButton)
2880	3102	{
..	..	@@ -2912,6 +3134,8 @@
2912	3134	bigThree.add(centralPanel);
2913	3135	bigThree.add(XYZPanel);
2914	3136	bigThree.FlushUI();
	3137	+
	3138	+ cameraView.requestFocusInWindow();
2915	3139	} else
2916	3140	if (source == rootButton)
2917	3141	{
..	..	@@ -2923,6 +3147,7 @@
2923	3147	EditObject(obj);
2924	3148	}
2925	3149
	3150	+ cameraView.requestFocusInWindow();
2926	3151	refreshContents(true);
2927	3152	} else
2928	3153	if (source == closeButton)
..	..	@@ -2932,18 +3157,27 @@
2932	3157	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2933	3158	{
2934	3159	ab = (cRadio)e.nextElement();
2935		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3160	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2936	3161	{
	3162	+ // Patch to avoid bug with transparency.
	3163	+ if (!ab.hadMaterial)
	3164	+ {
	3165	+ ab.object.material = null;
	3166	+ }
	3167	+
2937	3168	buttonGroup.remove(ab);
2938	3169	radioPanel.remove(ab);
2939	3170
2940		- ab.GetObject().editWindow = null;
	3171	+ //ab.GetObject().editWindow = null;
	3172	+ ab.GetObject().manipWindow = null;
2941	3173	// ab.GetObject().objectUI = null; // ?????????
2942	3174
2943	3175	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2944	3176	break;
2945	3177	}
2946	3178	}
	3179	+
	3180	+ cameraView.requestFocusInWindow();
2947	3181	refreshContents(true);
2948	3182	} else
2949	3183	if (source == editItem \|\| source == editButton)
..	..	@@ -2960,7 +3194,7 @@
2960	3194	child.CloseUI();
2961	3195	listUI.remove(child);
2962	3196
2963		- child.editWindow = null; // ???????????
	3197	+ //child.editWindow = null; // ???????????
2964	3198	}
2965	3199	objEditor.ctrlPanel.FlushUI();
2966	3200	//objEditor.jTree.clearSelection();
..	..	@@ -3046,7 +3280,11 @@
3046	3280	frontView.object = group;
3047	3281	sideView.object = group;
3048	3282	}
3049		- group.editWindow = this;
	3283	+
	3284	+// fix "+" issue
	3285	+ //group.editWindow = this;
	3286	+ group.manipWindow = this;
	3287	+
3050	3288	/*
3051	3289	currentLayout = radio.layout;
3052	3290	if (currentLayout == null)
..	..	@@ -3058,8 +3296,23 @@
3058	3296	//group.parent = null; // ROOT
3059	3297	//group.attributes = -1;
3060	3298	ResetModel();
	3299	+
	3300	+ cameraView.requestFocusInWindow();
3061	3301	refreshContents(true);
3062		- }
	3302	+ } else if (event.getSource() == editCameraItem)
	3303	+ {
	3304	+ cameraView.ProtectCamera();
	3305	+ cameraView.repaint();
	3306	+ return;
	3307	+ } else if (event.getSource() == revertCameraItem)
	3308	+ {
	3309	+ cameraView.RevertCamera();
	3310	+ cameraView.repaint();
	3311	+ return;
	3312	+ // } else if (event.getSource() == textureButton)
	3313	+ // {
	3314	+ // return; // true;
	3315	+ }
3063	3316	else
3064	3317	{
3065	3318	//return super.action(event, arg);
..	..	@@ -3068,7 +3321,6 @@
3068	3321	}
3069	3322
3070	3323	boolean useclient = false;
3071		- cRadio radio;
3072	3324
3073	3325	void ToggleRoot()
3074	3326	{
..	..	@@ -3120,6 +3372,28 @@
3120	3372	refreshContents();
3121	3373	}
3122	3374
	3375	+ void TransformChildren()
	3376	+ {
	3377	+ Object3D obj;
	3378	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3379	+ {
	3380	+ obj = (Object3D)e.nextElement();
	3381	+ obj.KeepTextureMatrices();
	3382	+ obj.TransformChildren();
	3383	+ obj.RestoreTextureMatrices();
	3384	+
	3385	+// if (obj.parent == null)
	3386	+// {
	3387	+// System.out.println("NULL PARENT!");
	3388	+// new Exception().printStackTrace();
	3389	+// }
	3390	+// else
	3391	+// TouchTransform(obj);
	3392	+// //obj.parent.Touch();
	3393	+ }
	3394	+
	3395	+ refreshContents();
	3396	+ }
3123	3397
3124	3398	void ResetTransform()
3125	3399	{
..	..	@@ -3232,7 +3506,7 @@
3232	3506	refreshContents();
3233	3507	}
3234	3508
3235		- void ResetCentroid()
	3509	+ void ResetCentroid(boolean full)
3236	3510	{
3237	3511	Object3D obj;
3238	3512	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3247,12 +3521,16 @@
3247	3521	LA.matIdentity(Object3D.mat);
3248	3522	obj.getBounds(minima, maxima, false);
3249	3523	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3250		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3524	+ if (full)
	3525	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3251	3526	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3252	3527	obj.TransformMesh(Object3D.mat);
	3528	+
3253	3529	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3254		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3530	+ if (full)
	3531	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3255	3532	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3533	+
3256	3534	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3257	3535	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3258	3536	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3281,7 +3559,8 @@
3281	3559
3282	3560	int size = obj.MemorySize();
3283	3561
3284		- System.err.println((size/1024) + " KB is the size of " + obj);
	3562	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3563	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3285	3564	}
3286	3565	}
3287	3566	catch (Exception e)
..	..	@@ -3318,9 +3597,9 @@
3318	3597	obj = (Object3D)e.nextElement();
3319	3598
3320	3599	System.out.println("Object is: " + obj);
3321		- GrafreeD.AnalyzeObject(obj);
	3600	+ Grafreed.AnalyzeObject(obj);
3322	3601	System.out.println("Boundary rep: " + obj.bRep);
3323		- GrafreeD.AnalyzeObject(obj.bRep);
	3602	+ Grafreed.AnalyzeObject(obj.bRep);
3324	3603
3325	3604	// System.err.println((size/1024) + " KB is the size of " + obj);
3326	3605	}
..	..	@@ -3362,6 +3641,13 @@
3362	3641	void GenNormals(boolean crease)
3363	3642	{
3364	3643	group.GenNormalsS(crease);
	3644	+
	3645	+ refreshContents();
	3646	+ }
	3647	+
	3648	+ void GenNormalsMESH()
	3649	+ {
	3650	+ group.GenNormalsMeshS();
3365	3651
3366	3652	refreshContents();
3367	3653	}
..	..	@@ -3534,8 +3820,8 @@
3534	3820
3535	3821	void ParseVertices()
3536	3822	{
3537		- boolean epsequal = GrafreeD.epsequal;
3538		- GrafreeD.epsequal = true;
	3823	+ boolean epsequal = Grafreed.epsequal;
	3824	+ Grafreed.epsequal = true;
3539	3825
3540	3826	for (int i=0; i<group.selection.size(); i++)
3541	3827	{
..	..	@@ -3560,7 +3846,7 @@
3560	3846	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3561	3847	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3562	3848
3563		- g.add(GrafreeD.clipboard);
	3849	+ g.add(Grafreed.clipboard);
3564	3850
3565	3851	buffer.add(g);
3566	3852	}
..	..	@@ -3575,7 +3861,7 @@
3575	3861	makeSomething(buffer, i==group.selection.size()-1);
3576	3862	}
3577	3863
3578		- GrafreeD.epsequal = epsequal;
	3864	+ Grafreed.epsequal = epsequal;
3579	3865
3580	3866	refreshContents();
3581	3867	}
..	..	@@ -3593,7 +3879,16 @@
3593	3879	String pigment = Object3D.GetPigment(tex);
3594	3880	//String bump = Object3D.GetBump(tex);
3595	3881
3596		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3882	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	3883	+
	3884	+ try
	3885	+ {
	3886	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3887	+ }
	3888	+ catch (Exception e)
	3889	+ {
	3890	+ System.err.println("FAIL: " + node);
	3891	+ }
3597	3892
3598	3893	double s = v.s;
3599	3894
..	..	@@ -3725,7 +4020,7 @@
3725	4020	return;
3726	4021
3727	4022	Object3D poses = group.selection.get(0);
3728		- Object3D ref = GrafreeD.clipboard.get(0);
	4023	+ Object3D ref = Grafreed.clipboard.get(0);
3729	4024
3730	4025	Object3D newgroup = new Object3D("Po:" + poses.name);
3731	4026
..	..	@@ -3919,9 +4214,9 @@
3919	4214
3920	4215	void ClipMesh()
3921	4216	{
3922		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4217	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3923	4218	{
3924		- Object3D content = GrafreeD.clipboard.get(0);
	4219	+ Object3D content = Grafreed.clipboard.get(0);
3925	4220
3926	4221	if (content instanceof cGroup && ((cGroup)content).transientlink )
3927	4222	content = ((cGroup)content).get(0);
..	..	@@ -3930,7 +4225,7 @@
3930	4225	// {
3931	4226	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3932	4227	// }
3933		- group.selection.ClipMesh(GrafreeD.clipboard);
	4228	+ group.selection.ClipMesh(Grafreed.clipboard);
3934	4229	}
3935	4230	// group.selection.ClipMesh(GrafreeD.clipboard);
3936	4231	System.out.println("DONE.");
..	..	@@ -3977,6 +4272,18 @@
3977	4272	void MarkLeaves(boolean hide)
3978	4273	{
3979	4274	group.selection.MarkLeaves(hide);
	4275	+ refreshContents();
	4276	+ }
	4277	+
	4278	+ void RewindLeaves(boolean hide)
	4279	+ {
	4280	+ group.selection.RewindLeaves(hide);
	4281	+ refreshContents();
	4282	+ }
	4283	+
	4284	+ void RandomLeaves(boolean hide)
	4285	+ {
	4286	+ group.selection.RandomLeaves(hide);
3980	4287	refreshContents();
3981	4288	}
3982	4289
..	..	@@ -4065,7 +4372,7 @@
4065	4372	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4066	4373
4067	4374	Object3D elem = (Object3D)group.selection.elementAt(i);
4068		- if(elem != group)
	4375	+ if(elem != group \|\| !newWindow)
4069	4376	{
4070	4377	// if (!(elem instanceof Composite))
4071	4378	// newWindow = false;
..	..	@@ -4155,7 +4462,6 @@
4155	4462	//case 702: // Event.LIST_DESELECT
4156	4463	group.deselectAll();
4157	4464	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4158		- objEditor.ClearInfo(); // .GetMaterial());
4159	4465	if (tps != null)
4160	4466	{
4161	4467	for (int i=0; i < tps.length; i++)
..	..	@@ -4164,10 +4470,8 @@
4164	4470
4165	4471	//if (child.parent != null)
4166	4472	//child.parent.addSelectee(child);
	4473	+ objEditor.SetMaterial(child);
4167	4474	group.addSelectee(child);
4168		- objEditor.SetMaterial(child); // .GetMaterial());
4169		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4170		- System.err.println("info : " + child.GetPath());
4171	4475	}
4172	4476	}
4173	4477	// else
..	..	@@ -4177,16 +4481,17 @@
4177	4481	// System.err.println("info : " + group.GetPath());
4178	4482	// }
4179	4483
4180		- objEditor.SetText(); // jan 2014
4181		-
4182		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4484	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4183	4485	CameraPane.flash = true;
4184	4486
4185		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4487	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4186	4488	// a camera
4187	4489	{
4188		- CameraPane.camerachangeframe = 0; // don't refuse it
4189		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4490	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4491	+ {
	4492	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4493	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4494	+ }
4190	4495	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4191	4496	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4192	4497	}
..	..	@@ -4199,6 +4504,26 @@
4199	4504
4200	4505	freezemodel = false;
4201	4506	}
	4507	+
	4508	+ void refreshContents(boolean cp)
	4509	+ {
	4510	+ if (!Globals.MOUSEDRAGGED)
	4511	+ {
	4512	+ objEditor.ClearInfo(); // .GetMaterial());
	4513	+
	4514	+ for (int i=0; i < group.selection.Size(); i++)
	4515	+ {
	4516	+ Object3D child = (Object3D) group.selection.get(i);
	4517	+
	4518	+ objEditor.AddInfo(child, this, true);
	4519	+ System.err.println("info : " + child.GetPath());
	4520	+ }
	4521	+
	4522	+ objEditor.SetText(); // jan 2014
	4523	+ }
	4524	+
	4525	+ super.refreshContents(cp);
	4526	+ }
4202	4527
4203	4528	void linkSomething(Object3D thing)
4204	4529	{
..	..	@@ -4270,16 +4595,19 @@
4270	4595	{
4271	4596	if (group.selection.isEmpty())
4272	4597	return;
4273		- GrafreeD.clipboardIsTempGroup = false;
	4598	+
	4599	+ Grafreed.clipboardIsTempGroup = false;
4274	4600	Composite tGroup = null;
4275	4601	if (group.selection.size() > 0) // 1)
4276	4602	{
4277	4603	tGroup = new cGroup();
4278		- GrafreeD.clipboardIsTempGroup = true;
	4604	+ Grafreed.clipboardIsTempGroup = true;
4279	4605	}
4280	4606
4281	4607	if (cut)
4282	4608	{
	4609	+ if (Globals.SAVEONMAKE)
	4610	+ Save();
4283	4611	//int indices[] = jList.getSelectedIndices();
4284	4612	//for (int i = indices.length - 1; i >= 0; i--)
4285	4613	//jList.remove(indices[i]);
..	..	@@ -4315,16 +4643,16 @@
4315	4643	//System.out.println("cut " + child);
4316	4644	//System.out.println("parent = " + child.parent);
4317	4645	// tmp.addChild(child);
4318		- if (GrafreeD.clipboardIsTempGroup)
	4646	+ if (Grafreed.clipboardIsTempGroup)
4319	4647	tGroup.add/Child/(tmp);
4320	4648	else
4321		- GrafreeD.clipboard = tmp;
	4649	+ Grafreed.clipboard = tmp;
4322	4650	}
4323	4651	else
4324		- if (GrafreeD.clipboardIsTempGroup)
	4652	+ if (Grafreed.clipboardIsTempGroup)
4325	4653	tGroup.add/Child/(child);
4326	4654	else
4327		- GrafreeD.clipboard = child;
	4655	+ Grafreed.clipboard = child;
4328	4656	}
4329	4657
4330	4658	//ResetModel();
..	..	@@ -4356,21 +4684,23 @@
4356	4684	//System.out.println("cut " + elem);
4357	4685	//System.out.println("parent = " + elem.parent);
4358	4686	// tmp.addChild(elem);
4359		- if (GrafreeD.clipboardIsTempGroup)
	4687	+ if (Grafreed.clipboardIsTempGroup)
4360	4688	tGroup.add/Child/(tmp);
4361	4689	else
4362		- GrafreeD.clipboard = tmp;
	4690	+ Grafreed.clipboard = tmp;
4363	4691	}
4364	4692	else
4365		- if (GrafreeD.clipboardIsTempGroup)
	4693	+ if (Grafreed.clipboardIsTempGroup)
4366	4694	tGroup.add/Child/(child);
4367	4695	else
4368		- GrafreeD.clipboard = child;
	4696	+ Grafreed.clipboard = child;
4369	4697	}
4370	4698
4371	4699	}
4372		- if (GrafreeD.clipboardIsTempGroup)
4373		- GrafreeD.clipboard = tGroup;
	4700	+
	4701	+ if (Grafreed.clipboardIsTempGroup)
	4702	+ Grafreed.clipboard = tGroup;
	4703	+
4374	4704	if (cut)
4375	4705	{
4376	4706	ResetModel();
..	..	@@ -4384,7 +4714,7 @@
4384	4714	// return;
4385	4715	boolean first = true;
4386	4716
4387		- if (GrafreeD.clipboardIsTempGroup)
	4717	+ if (Grafreed.clipboardIsTempGroup)
4388	4718	{
4389	4719	Composite temp;
4390	4720
..	..	@@ -4395,7 +4725,7 @@
4395	4725	temp = (Composite)Applet3D.clipboard.deepCopy();
4396	4726	*/
4397	4727	Object3D elem;
4398		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4728	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4399	4729	{
4400	4730	Object3D child = (Object3D)e.nextElement();
4401	4731
..	..	@@ -4429,14 +4759,14 @@
4429	4759	//Object3D cb = Applet3D.clipboard;
4430	4760	//temp.addChild(cb);
4431	4761	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4432		- assert(GrafreeD.clipboard.parent == null);
4433		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4434		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4435		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4436		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	4762	+ assert(Grafreed.clipboard.parent == null);
	4763	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4764	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4765	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4766	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4437	4767	else
4438		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4439		- GrafreeD.clipboard.get(0).parent = keepparent;
	4768	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4769	+ Grafreed.clipboard.get(0).parent = keepparent;
4440	4770	}
4441	4771
4442	4772	ResetModel();
..	..	@@ -4485,9 +4815,9 @@
4485	4815	{
4486	4816	boolean first = true;
4487	4817
4488		- if (GrafreeD.clipboardIsTempGroup)
	4818	+ if (Grafreed.clipboardIsTempGroup)
4489	4819	{
4490		- Composite temp = (Composite)GrafreeD.clipboard;
	4820	+ Composite temp = (Composite)Grafreed.clipboard;
4491	4821	Object3D copy;
4492	4822	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4493	4823	{
..	..	@@ -4497,7 +4827,7 @@
4497	4827	}
4498	4828	} else
4499	4829	{
4500		- linkSomething(GrafreeD.clipboard); //.get(0));
	4830	+ linkSomething(Grafreed.clipboard); //.get(0));
4501	4831	}
4502	4832	}
4503	4833	}
..	..	@@ -4902,21 +5232,6 @@
4902	5232	}
4903	5233	*/
4904	5234
4905		- void ImportGFD()
4906		- {
4907		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4908		- browser.show();
4909		- String filename = browser.getFile();
4910		- if (filename != null && filename.length() > 0)
4911		- {
4912		- String fullname = browser.getDirectory() + filename;
4913		-
4914		- //Object3D readobj =
4915		- objEditor.ReadGFD(fullname, objEditor);
4916		- //makeSomething(readobj);
4917		- }
4918		- }
4919		-
4920	5235	/*
4921	5236	public void Callback(Object obj)
4922	5237	{
..	..	@@ -4940,26 +5255,9 @@
4940	5255	}
4941	5256	*/
4942	5257
4943		- void ImportVRMLX3D()
4944		- {
4945		- if (GrafreeD.standAlone)
4946		- {
4947		- /**/
4948		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4949		- browser.show();
4950		- String filename = browser.getFile();
4951		- if (filename != null && filename.length() > 0)
4952		- {
4953		- String fullname = browser.getDirectory() + filename;
4954		- LoadVRMLX3D(fullname);
4955		- }
4956		- /**/
4957		- }
4958		- }
4959		-
4960	5258	String GetFile(String dialogName)
4961	5259	{
4962		- if (GrafreeD.standAlone)
	5260	+ if (Grafreed.standAlone)
4963	5261	{
4964	5262	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4965	5263	browser.show();
..	..	@@ -5027,6 +5325,12 @@
5027	5325	cButton clearpanelButton;
5028	5326	cButton unselectButton;
5029	5327
	5328	+ cButton minButton;
	5329	+ cButton maxButton;
	5330	+ cButton fullButton;
	5331	+ cButton undoButton;
	5332	+ cButton redoButton;
	5333	+ cButton saveButton;
5030	5334	cButton oneStepButton;
5031	5335
5032	5336	cButton screenfitButton;
..	..	@@ -5040,14 +5344,6 @@
5040	5344
5041	5345	cButton setsupportButton;
5042	5346
5043		- cButton twoButton;
5044		- cButton sixButton;
5045		- cButton threeButton;
5046		- cButton sevenButton;
5047		- cButton fourButton; // full panel
5048		- cButton oneButton; // full XYZ
5049		- //cButton currentLayout;
5050		-
5051	5347	//
5052	5348	//Composite
5053	5349	Object3D // to do !!
..	..	@@ -5059,6 +5355,8 @@
5059	5355	private MenuItem lookFromItem;
5060	5356	private MenuItem switchItem;
5061	5357	private MenuItem cutItem;
	5358	+ private MenuItem undoItem;
	5359	+ private MenuItem redoItem;
5062	5360	private MenuItem duplicateItem;
5063	5361	private MenuItem cloneItem;
5064	5362	private MenuItem cloneSupportItem;
..	..	@@ -5072,7 +5370,7 @@
5072	5370	private MenuItem linkverticesItem;
5073	5371	private MenuItem relinkverticesItem;
5074	5372	private MenuItem setMasterItem;
5075		- private MenuItem resetMeshItem;
	5373	+ private MenuItem resetAllItem;
5076	5374	private MenuItem stepAllItem;
5077	5375	private MenuItem revertMeshItem;
5078	5376	private MenuItem poseMeshItem;
..	..	@@ -5122,6 +5420,10 @@
5122	5420	private MenuItem showleavesItem;
5123	5421	private MenuItem markleavesItem;
5124	5422	private MenuItem unmarkleavesItem;
	5423	+ private MenuItem rewindleavesItem;
	5424	+ private MenuItem unrewindleavesItem;
	5425	+ private MenuItem randomleavesItem;
	5426	+ private MenuItem unrandomleavesItem;
5125	5427
5126	5428	private MenuItem flipVItem;
5127	5429	private MenuItem unflipVItem;
..	..	@@ -5133,8 +5435,10 @@
5133	5435	private MenuItem panoTexturesItem;
5134	5436
5135	5437	private MenuItem resetCentroidItem;
5136		- private MenuItem transformgeometryItem;
	5438	+ private MenuItem resetCentroidXZItem;
5137	5439	private MenuItem resetTransformItem;
	5440	+ private MenuItem transformGeometryItem;
	5441	+ private MenuItem transformChildrenItem;
5138	5442	private MenuItem hideItem;
5139	5443	private MenuItem grabItem;
5140	5444	private MenuItem backItem;
..	..	@@ -5203,11 +5507,6 @@
5203	5507	private MenuItem doubleItem;
5204	5508	private MenuItem tripleItem;
5205	5509
5206		- private MenuItem importGFDItem;
5207		- private MenuItem importVRMLX3DItem;
5208		- private MenuItem import3DSItem;
5209		- private MenuItem importOBJItem;
5210		-
5211	5510	private MenuItem computeAOItem;
5212	5511	private MenuItem recompileItem;
5213	5512	private MenuItem editScriptItem;
..	..	@@ -5217,4 +5516,8 @@
5217	5516	private MenuItem analyzeItem;
5218	5517	private MenuItem dumpItem;
5219	5518	//boolean freezemodel = false;
	5519	+
	5520	+ Menu cameraMenu;
	5521	+ MenuItem editCameraItem;
	5522	+ MenuItem revertCameraItem;
5220	5523	}