~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);
..	..	@@ -148,28 +148,21 @@
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		-
	153	+ oe.jTree = new cTree();
	154	+
168	155	Menu menu;
169	156	oe.menuBar.add(menu = new Menu("Edit"));
170	157	//editItem = menu.add(new MenuItem("Edit"));
171	158	//editItem.addActionListener(this);
172		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	159	+
	160	+// undoItem = menu.add(new MenuItem("Undo"));
	161	+// undoItem.addActionListener(this);
	162	+// redoItem = menu.add(new MenuItem("Redo"));
	163	+// redoItem.addActionListener(this);
	164	+// menu.add("-");
	165	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
173	166	duplicateItem.addActionListener(this);
174	167	cloneItem = menu.add(new MenuItem("Clone"));
175	168	cloneItem.addActionListener(this);
..	..	@@ -185,7 +178,6 @@
185	178	copyItem.addActionListener(this);
186	179	pasteItem = menu.add(new MenuItem("Paste"));
187	180	pasteItem.addActionListener(this);
188		- menu.add("-");
189	181
190	182	menu.add("-");
191	183	pasteIntoItem = menu.add(new MenuItem("Paste into"));
..	..	@@ -206,14 +198,97 @@
206	198	clearAllItem = menu.add(new MenuItem("Clear All"));
207	199	clearAllItem.addActionListener(this);
208	200	}
	201	+
	202	+ menuBar.add(cameraMenu = new Menu("View"));
	203	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	204	+ //zBufferItem.addActionListener(this);
	205	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	206	+ //normalLensItem.addActionListener(this);
	207	+ cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
	208	+ revertCameraItem.addActionListener(this);
	209	+
	210	+ cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	211	+ toggleFullScreenItem.addItemListener(this);
	212	+ toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	213	+ cameraMenu.add("-");
	214	+
	215	+ cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	216	+ toggleTextureItem.addItemListener(this);
	217	+ toggleTextureItem.setState(CameraPane.textureon);
	218	+
	219	+ cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	220	+ toggleSwitchItem.addItemListener(this);
	221	+ toggleSwitchItem.setState(CameraPane.SWITCH);
	222	+
	223	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	224	+ toggleHandleItem.addItemListener(this);
	225	+ toggleHandleItem.setState(CameraPane.HANDLES);
	226	+
	227	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	228	+ togglePaintItem.addItemListener(this);
	229	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	230	+
	231	+ if (Globals.ADVANCED)
	232	+ {
	233	+ cameraMenu.add("-");
	234	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	235	+ toggleLiveItem.addItemListener(this);
	236	+ toggleLiveItem.setState(Globals.isLIVE());
209	237
	238	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	239	+ stepItem.addActionListener(this);
	240	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	241	+ // toggleDLItem.addItemListener(this);
	242	+ // toggleDLItem.setState(false);
	243	+
	244	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	245	+ toggleRenderItem.addItemListener(this);
	246	+ toggleRenderItem.setState(!CameraPane.frozen);
	247	+
	248	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	249	+ toggleDebugItem.addItemListener(this);
	250	+ toggleDebugItem.setState(Globals.DEBUG);
	251	+
	252	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	253	+ toggleFrustumItem.addItemListener(this);
	254	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	255	+
	256	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	257	+ toggleFootContactItem.addItemListener(this);
	258	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	259	+
	260	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	261	+ toggleTimelineItem.addItemListener(this);
	262	+ }
	263	+
	264	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	265	+// toggleRootItem.addItemListener(this);
	266	+// toggleRootItem.setState(false);
	267	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	268	+// animationItem.addItemListener(this);
	269	+// animationItem.setState(CameraPane.ANIMATION);
	270	+ cameraMenu.add("-");
	271	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	272	+ editCameraItem.addActionListener(this);
	273	+
	274	+ if (Globals.ADVANCED)
	275	+ {
	276	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	277	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	278	+ //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
	279	+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	280	+ oe.cameraMenu.add("-");
	281	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	282	+ openWindowItem.addActionListener(this);
	283	+ editLeafItem.addActionListener(this);
	284	+ lookAtItem.addActionListener(this);
	285	+ //lookFromItem.addActinoListener(this);
	286	+ //switchItem.addActionListener(this);
	287	+ }
	288	+
210	289	oe.menuBar.add(menu = new Menu("Setting"));
211	290	if (Globals.ADVANCED)
212	291	{
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	292	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
218	293	revertMeshItem.addActionListener(this);
219	294	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
..	..	@@ -261,13 +336,21 @@
261	336	frontItem.addActionListener(this);
262	337	compositeItem = menu.add(new MenuItem("Composite"));
263	338	compositeItem.addActionListener(this);
	339	+
	340	+ if (Globals.ADVANCED)
	341	+ {
264	342	hideItem = menu.add(new MenuItem("Hidden Group"));
265	343	hideItem.addActionListener(this);
	344	+ }
266	345	ungroupItem = menu.add(new MenuItem("Ungroup"));
267	346	ungroupItem.addActionListener(this);
	347	+
268	348	menu.add("-");
	349	+
269	350	randomItem = menu.add(new MenuItem("Switch node"));
270	351	randomItem.addActionListener(this);
	352	+ if (Globals.ADVANCED)
	353	+ {
271	354	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
272	355	switchGeoItem.addActionListener(this);
273	356	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -275,8 +358,6 @@
275	358	morphItem = menu.add(new MenuItem("Morph Group"));
276	359	morphItem.addActionListener(this);
277	360
278		- if (Globals.ADVANCED)
279		- {
280	361	menu.add("-");
281	362	physicsItem = menu.add(new MenuItem("Physics"));
282	363	physicsItem.addActionListener(this);
..	..	@@ -295,11 +376,11 @@
295	376	billboardItem.addActionListener(this);
296	377	csgItem = menu.add(new MenuItem("CSG"));
297	378	csgItem.addActionListener(this);
298		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	379	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
299	380	shadowXItem.addActionListener(this);
300		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	381	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
301	382	shadowYItem.addActionListener(this);
302		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	383	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
303	384	shadowZItem.addActionListener(this);
304	385	if (Globals.ADVANCED)
305	386	{
..	..	@@ -318,8 +399,12 @@
318	399	resetTransformItem.addActionListener(this);
319	400	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
320	401	resetCentroidItem.addActionListener(this);
321		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
322		- transformgeometryItem.addActionListener(this);
	402	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	403	+ resetCentroidXZItem.addActionListener(this);
	404	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	405	+ transformGeometryItem.addActionListener(this);
	406	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	407	+ transformChildrenItem.addActionListener(this);
323	408
324	409	oe.menuBar.add(menu = new Menu("Geometry"));
325	410	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -368,6 +453,10 @@
368	453	oe.menuBar.add(menu = new Menu("Attributes"));
369	454	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
370	455	clearMaterialsItem.addActionListener(this);
	456	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	457	+ resetAllItem.addActionListener(this);
	458	+ stepAllItem = menu.add(new MenuItem("Step All"));
	459	+ stepAllItem.addActionListener(this);
371	460	menu.add("-");
372	461	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
373	462	liveleavesItem.addActionListener(this);
..	..	@@ -388,6 +477,14 @@
388	477	markleavesItem.addActionListener(this);
389	478	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
390	479	unmarkleavesItem.addActionListener(this);
	480	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	481	+ rewindleavesItem.addActionListener(this);
	482	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	483	+ unrewindleavesItem.addActionListener(this);
	484	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	485	+ randomleavesItem.addActionListener(this);
	486	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	487	+ unrandomleavesItem.addActionListener(this);
391	488	menu.add("-");
392	489	flipVItem = menu.add(new MenuItem("Flip V"));
393	490	flipVItem.addActionListener(this);
..	..	@@ -422,41 +519,41 @@
422	519	sortbysizeItem.addActionListener(this);
423	520	sortbynameItem = menu.add(new MenuItem("Sort by name"));
424	521	sortbynameItem.addActionListener(this);
	522	+ menu.add("-");
	523	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	524	+ shareGeometriesItem.addActionListener(this);
	525	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	526	+ mergeGeometriesItem.addActionListener(this);
425	527	if (Globals.ADVANCED)
426	528	{
427		- menu.add("-");
	529	+ // Pretty much the same as duplicate and clone.
428	530	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
429	531	extractGeometriesItem.addActionListener(this);
430	532	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
431	533	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	534	}
437	535
438	536	oe.menuBar.add(menu = new Menu("Insert"));
439	537	buildCreateMenu(menu);
440	538
441		- oe.menuBar.add(menu = new Menu("Include"));
442		- importOBJItem = menu.add(new MenuItem("OBJ file..."));
443		- importOBJItem.addActionListener(this);
444		- menu.add("-");
445		- import3DSItem = menu.add(new MenuItem("3DS file..."));
446		- import3DSItem.addActionListener(this);
447		- menu.add("-");
448		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
449		- importVRMLX3DItem.addActionListener(this);
450		- menu.add("-");
451		- importGFDItem = menu.add(new MenuItem("GrafreeD file..."));
452		- importGFDItem.addActionListener(this);
453		-
454	539	oe.menuBar.add(menu = new Menu("Tools"));
455	540	buildToolsMenu(menu);
456	541	}
457	542
458	543	void SetupUI2(ObjEditor oe)
459	544	{
	545	+ // June 2019
	546	+ if (oe == null)
	547	+ {
	548	+ //super.SetupUI2(this);
	549	+ //return;
	550	+ }
	551	+
	552	+ if (copy != group)
	553	+ {
	554	+ //super.SetupUI2(this);
	555	+ }
	556	+
460	557	//new Exception().printStackTrace();
461	558
462	559	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -487,23 +584,49 @@
487	584	*/
488	585	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
489	586
490		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
491		- liveCB.setToolTipText("Enabled animation");
	587	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	588	+ //minButton.setToolTipText("Minimize window");
	589	+ //minButton.addActionListener(this);
	590	+
	591	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	592	+ maxButton.setToolTipText("Maximize window");
	593	+ maxButton.addActionListener(this);
	594	+
	595	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	596	+ fullButton.setToolTipText("Full-screen window");
	597	+ fullButton.addActionListener(this);
	598	+
	599	+ oe.toolboxPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	600	+ undoButton.setToolTipText("Undo changes");
	601	+ undoButton.addActionListener(this);
	602	+
	603	+ oe.toolboxPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	604	+ redoButton.setToolTipText("Redo changes");
	605	+ redoButton.addActionListener(this);
	606	+
	607	+ oe.toolboxPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	608	+ saveButton.setToolTipText("Save changes");
	609	+ saveButton.addActionListener(this);
	610	+
	611	+ oe.toolboxPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	612	+ liveCB.setToolTipText("Enable animation");
492	613	liveCB.addItemListener(this);
493	614
494		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	615	+ oe.toolboxPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
495	616	oneStepButton.setToolTipText("Animate one step forward");
496	617	oneStepButton.addActionListener(this);
497	618
498		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	619	+ oe.toolboxPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
499	620	fastCB.setToolTipText("Fast mode");
500	621	fastCB.addItemListener(this);
501	622
502		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	623	+ oe.toolboxPanel.Return();
	624	+
	625	+ oe.toolboxPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
503	626	trackCB.setToolTipText("Enable tracking");
504	627	trackCB.addItemListener(this);
505	628
506		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	629	+ oe.toolboxPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
507	630	screenfitButton.setToolTipText("Screen fit");
508	631	screenfitButton.addActionListener(this);
509	632
..	..	@@ -517,65 +640,112 @@
517	640	snapobjectButton.setToolTipText("Snap Object");
518	641	}
519	642
520		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
521		- flashSelectionButton.setToolTipText("Show selection");
	643	+ oe.toolboxPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	644	+ flashSelectionButton.setToolTipText("Highlight selection");
522	645	flashSelectionButton.addActionListener(this);
523	646
524		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	647	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
525	648
526		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	649	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
527	650	twoButton.setToolTipText("Show center view only");
528	651	twoButton.addActionListener(this);
529		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	652	+ this.fullscreenLayout = twoButton;
	653	+
	654	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
530	655	fourButton.addActionListener(this);
531	656	fourButton.setToolTipText("Show left panel only");
532		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	657	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
533	658	sixButton.setToolTipText("2-column layout left");
534	659	sixButton.addActionListener(this);
535		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	660	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
536	661	threeButton.setToolTipText("2-column layout right");
537	662	threeButton.addActionListener(this);
538		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	663	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
539	664	sevenButton.setToolTipText("3-column layout");
540	665	sevenButton.addActionListener(this);
541	666	//
542	667
543		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	668	+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
544	669	rootButton.setToolTipText("Edit selection in new tab");
545	670	rootButton.addActionListener(this);
546	671
547		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	672	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
548	673	closeButton.setToolTipText("Close tab");
549	674	closeButton.addActionListener(this);
550	675	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
551	676	//clearButton.addActionListener(this);
552		-
553		- cGridBag commandsPanel = new cGridBag();
	677	+
	678	+ // INSERT
	679	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	680	+ gridButton.setToolTipText("Create grid");
	681	+ gridButton.addActionListener(this);
	682	+
	683	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	684	+ boxButton.setToolTipText("Create box");
	685	+ boxButton.addActionListener(this);
	686	+
	687	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	688	+ sphereButton.setToolTipText("Create sphere");
	689	+ sphereButton.addActionListener(this);
	690	+
	691	+ oe.toolboxPanel.Return();
554	692
555		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	693	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	694	+ coneButton.setToolTipText("Create cone");
	695	+ coneButton.addActionListener(this);
	696	+
	697	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	698	+ torusButton.setToolTipText("Create torus");
	699	+ torusButton.addActionListener(this);
	700	+
	701	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	702	+ superButton.setToolTipText("Create superellipsoid");
	703	+ superButton.addActionListener(this);
	704	+
	705	+ if (Globals.ADVANCED)
	706	+ {
	707	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	708	+ kleinButton.setToolTipText("Create Klein bottle");
	709	+ kleinButton.addActionListener(this);
	710	+ }
	711	+
	712	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	713	+ particlesButton.setToolTipText("Create particle system");
	714	+ particlesButton.addActionListener(this);
	715	+
	716	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	717	+ overlayButton.setToolTipText("Create overlay");
	718	+ overlayButton.addActionListener(this);
	719	+
	720	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	721	+ lightButton.setToolTipText("Create light");
	722	+ lightButton.addActionListener(this);
	723	+
	724	+ // EDIT panel
	725	+ editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
556	726	editButton.setToolTipText("Edit selection");
557	727	editButton.addActionListener(this);
558	728
559		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	729	+ editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
560	730	uneditButton.setToolTipText("Unedit selection");
561	731	uneditButton.addActionListener(this);
562	732
563		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	733	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
564	734	allParamsButton.setToolTipText("Edit all params");
565	735	allParamsButton.addActionListener(this);
566	736
567		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	737	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
568	738	clearPanelButton.setToolTipText("Clear edit panel");
569	739	clearPanelButton.addActionListener(this);
570	740
571		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	741	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
572	742	unselectButton.setToolTipText("Unselect");
573	743	unselectButton.addActionListener(this);
574	744
575		- commandsPanel.preferredHeight = 1;
	745	+ editCommandsPanel.preferredHeight = 1;
576	746
577		- oe.treePanel.add(commandsPanel);
578		- oe.treePanel.Return();
	747	+// oe.treePanel.add(commandsPanel);
	748	+// oe.treePanel.Return();
579	749
580	750	// oe.aConstraints.gridx += 1;
581	751	// oe.aConstraints.weighty = 0;
..	..	@@ -592,7 +762,7 @@
592	762
593	763	JScrollPane jSP;
594	764	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
595		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	765	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
596	766	ResetModel();
597	767
598	768	oe.treePanel.add(jSPPanel);
..	..	@@ -651,7 +821,7 @@
651	821	zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
652	822	zoomBoxCB.addItemListener(this);
653	823
654		- if (Globals.ADVANCED)
	824	+ if (true) // Globals.ADVANCED)
655	825	{
656	826	panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
657	827	supportCB.setToolTipText("Enable rigging");
..	..	@@ -697,11 +867,23 @@
697	867	// debugCB.addItemListener(this);
698	868
699	869	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	870	+ oeilCB.setToolTipText("Move camera when tracking target");
700	871	oeilCB.addItemListener(this);
701	872
	873	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	874	+ shadowCB.setToolTipText("Compute shadows when live");
	875	+ shadowCB.addItemListener(this);
	876	+
	877	+ panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
	878	+ autosaveCB.setToolTipText("Auto-save on structure change");
	879	+ autosaveCB.addItemListener(this);
	880	+
	881	+ if (Globals.ADVANCED)
	882	+ {
702	883	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
703	884	lookAtCB.setToolTipText("Look-at target");
704	885	lookAtCB.addItemListener(this);
	886	+ }
705	887
706	888	}
707	889
..	..	@@ -716,6 +898,14 @@
716	898	void EditObject(Object3D obj)
717	899	{
718	900	cRadio radioButton = new cRadio(obj.name);
	901	+
	902	+ // Patch to avoid bug with transparency.
	903	+ radioButton.hadMaterial = obj.material != null;
	904	+ if (!radioButton.hadMaterial)
	905	+ {
	906	+ obj.material = new cMaterial();
	907	+ }
	908	+
719	909	radioButton.SetObject(obj);
720	910	radioButton.layout = sevenButton;
721	911	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -724,8 +914,11 @@
724	914	buttonGroup.add(radioButton);
725	915	radioButton.doClick();
726	916	}
	917	+
727	918	void SetupViews(ObjEditor oe)
728	919	{
	920	+ theFrame = this;
	921	+
729	922	oe.SetupViews();
730	923
731	924	System.out.println("SetupViews");
..	..	@@ -734,23 +927,26 @@
734	927	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
735	928	}
736	929
737		- JCheckBox liveCB;
738		- JCheckBox supportCB;
739		- JCheckBox localCB;
740		- JCheckBox crowdCB;
741		- JCheckBox smoothCB;
742		- JCheckBox fastCB;
743		- JCheckBox slowCB;
744		- JCheckBox boxCB;
745		- JCheckBox zoomBoxCB;
746		- JCheckBox trackCB;
747		- JCheckBox smoothfocusCB;
	930	+ cToggleButton liveCB;
	931	+ cCheckBox supportCB;
	932	+ cCheckBox localCB;
	933	+ cCheckBox crowdCB;
	934	+ cCheckBox smoothCB;
	935	+ cToggleButton fastCB;
	936	+ cCheckBox slowCB;
	937	+ cCheckBox boxCB;
	938	+ cCheckBox zoomBoxCB;
	939	+ cToggleButton trackCB;
	940	+ cCheckBox smoothfocusCB;
748	941	// JCheckBox speakerMocapCB;
749		- JCheckBox speakerCameraCB;
750		- JCheckBox speakerFocusCB;
751		- JCheckBox debugCB;
752		- JCheckBox oeilCB;
753		- JCheckBox lookAtCB;
	942	+ cCheckBox speakerCameraCB;
	943	+ cCheckBox speakerFocusCB;
	944	+ cCheckBox debugCB;
	945	+
	946	+ cCheckBox oeilCB;
	947	+ cCheckBox shadowCB;
	948	+ cCheckBox autosaveCB;
	949	+ cCheckBox lookAtCB;
754	950
755	951	// static int COLOR = 1;
756	952	// static int MATERIAL = 2;
..	..	@@ -758,9 +954,9 @@
758	954
759	955	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
760	956
761		- JCheckBox colorCB;
762		- JCheckBox materialCB;
763		- JCheckBox textureCB;
	957	+ cCheckBox colorCB;
	958	+ cCheckBox materialCB;
	959	+ cCheckBox textureCB;
764	960
765	961	public void itemStateChanged(ItemEvent e)
766	962	{
..	..	@@ -788,6 +984,7 @@
788	984	} else if(e.getSource() == liveCB)
789	985	{
790	986	cameraView.ToggleLive();
	987	+ refreshContents(false);
791	988	}
792	989	else if(e.getSource() == supportCB)
793	990	{
..	..	@@ -852,6 +1049,14 @@
852	1049	{
853	1050	cameraView.ToggleOeil();
854	1051	}
	1052	+ else if(e.getSource() == shadowCB)
	1053	+ {
	1054	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1055	+ }
	1056	+ else if(e.getSource() == autosaveCB)
	1057	+ {
	1058	+ Globals.SAVEONMAKE ^= true;
	1059	+ }
855	1060	else if(e.getSource() == lookAtCB)
856	1061	{
857	1062	cameraView.ToggleLookAt();
..	..	@@ -868,7 +1073,8 @@
868	1073
869	1074	/**/
870	1075	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
871		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1076	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1077	+ TreePath path = objEditor.jTree.getSelectionPath();
872	1078	if ((path == null) \|\| (path.getPathCount() <= 1)) {
873	1079	// We can't move the root node or an empty selection
874	1080	return;
..	..	@@ -992,16 +1198,16 @@
992	1198	return;
993	1199	}
994	1200
995		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
996		- {
	1201	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1202	+// {
997	1203	loadClipboard(true);
998	1204	objEditor.jTree.setSelectionPath(destinationPath);
999	1205	pasteInto(false, false);
1000		- } else {
1001		- loadClipboard(false);
1002		- objEditor.jTree.setSelectionPath(destinationPath);
1003		- pasteInto(false, false); // true); // ???
1004		- }
	1206	+// } else {
	1207	+// loadClipboard(false);
	1208	+// objEditor.jTree.setSelectionPath(destinationPath);
	1209	+// pasteInto(false, false); // true); // ???
	1210	+// }
1005	1211	}
1006	1212	public void dropActionChanged(DropTargetDragEvent dtde)
1007	1213	// Called if the user has modified the current drop gesture
..	..	@@ -1195,7 +1401,7 @@
1195	1401	memoryItem.addActionListener(this);
1196	1402	menu.add(analyzeItem = new MenuItem("Analyze"));
1197	1403	analyzeItem.addActionListener(this);
1198		- menu.add(dumpItem = new MenuItem("Dump"));
	1404	+ menu.add(dumpItem = new MenuItem("Print"));
1199	1405	dumpItem.addActionListener(this);
1200	1406	// menu.add(pathItem = new MenuItem("From-to path"));
1201	1407	// pathItem.addActionListener(this);
..	..	@@ -1336,6 +1542,7 @@
1336	1542	shadow.material = new cMaterial(obj.material);
1337	1543	shadow.material.diffuse = 0.0001f;
1338	1544	shadow.material.specular = 0.0001f;
	1545	+ //shadow.projectedVertices[1].x = 300;
1339	1546
1340	1547	makeSomething(shadow);
1341	1548	}
..	..	@@ -1592,11 +1799,11 @@
1592	1799	objEditor.cameraView.renderCamera.setAim(v2, v1);
1593	1800	objEditor.cameraView.repaint();
1594	1801	} else
1595		- if (source == rectoidItem)
	1802	+ if (source == rectoidItem \|\| source == boxButton)
1596	1803	{
1597	1804	makeSomething(new Box());
1598	1805	} else
1599		- if (source == particleItem)
	1806	+ if (source == particleItem \|\| source == particlesButton)
1600	1807	{
1601	1808	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1602	1809	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1675,27 +1882,27 @@
1675	1882
1676	1883	makeSomething(obj);
1677	1884	} else
1678		- if (source == gridItem)
	1885	+ if (source == gridItem \|\| source == gridButton)
1679	1886	{
1680	1887	makeSomething(new Grid());
1681	1888	} else
1682		- if (source == ellipsoidItem)
	1889	+ if (source == ellipsoidItem \|\| source == sphereButton)
1683	1890	{
1684	1891	makeSomething(new Sphere());
1685	1892	} else
1686		- if (source == coneItem)
	1893	+ if (source == coneItem \|\| source == coneButton)
1687	1894	{
1688	1895	makeSomething(new Cone());
1689	1896	} else
1690		- if (source == torusItem)
	1897	+ if (source == torusItem \|\| source == torusButton)
1691	1898	{
1692	1899	makeSomething(new Torus());
1693	1900	} else
1694		- if (source == superItem)
	1901	+ if (source == superItem \|\| source == superButton)
1695	1902	{
1696	1903	makeSomething(new Superellipsoid());
1697	1904	} else
1698		- if (source == kleinItem)
	1905	+ if (source == kleinItem \|\| source == kleinButton)
1699	1906	{
1700	1907	makeSomething(new Klein());
1701	1908	} else
..	..	@@ -1715,7 +1922,7 @@
1715	1922	{
1716	1923	makeSomething(new BezierSurface());
1717	1924	} else
1718		- if (source == overlayItem)
	1925	+ if (source == overlayItem \|\| source == overlayButton)
1719	1926	{
1720	1927	/*
1721	1928	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1763,7 +1970,7 @@
1763	1970	s.setup();
1764	1971	makeSomething(s);
1765	1972	} else
1766		- if (source == lightItem)
	1973	+ if (source == lightItem \|\| source == lightButton)
1767	1974	{
1768	1975	makeSomething(new Light());
1769	1976	} else
..	..	@@ -1849,31 +2056,6 @@
1849	2056	csg.addChild(child);
1850	2057	child.addChild(csg);
1851	2058	} else
1852		-
1853		- if (source == importGFDItem)
1854		- {
1855		- ImportGFD();
1856		- } else
1857		- if (source == importVRMLX3DItem)
1858		- {
1859		- ImportVRMLX3D();
1860		- } else
1861		- if (source == import3DSItem)
1862		- {
1863		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1864		- } else
1865		- if (source == importOBJItem)
1866		- {
1867		- //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1868		- FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
1869		- browser.setVisible(true);
1870		- String filename = browser.getFile();
1871		- if (filename != null && filename.length() > 0)
1872		- {
1873		- String fullname = browser.getDirectory() + filename;
1874		- makeSomething(ReadOBJ(fullname), true);
1875		- }
1876		- } else
1877	2059	if (source == computeAOItem)
1878	2060	{
1879	2061	Globals.drawMode = CameraPane.OCCLUSION;
..	..	@@ -1910,6 +2092,30 @@
1910	2092	if (source == dumpItem)
1911	2093	{
1912	2094	DumpObject();
	2095	+ } else
	2096	+ if (source == minButton)
	2097	+ {
	2098	+ Minimize();
	2099	+ } else
	2100	+ if (source == maxButton)
	2101	+ {
	2102	+ Maximize();
	2103	+ } else
	2104	+ if (source == fullButton)
	2105	+ {
	2106	+ ToggleFullScreen();
	2107	+ } else
	2108	+ if (source == undoButton)
	2109	+ {
	2110	+ Undo();
	2111	+ } else
	2112	+ if (source == redoButton)
	2113	+ {
	2114	+ Redo();
	2115	+ } else
	2116	+ if (source == saveButton)
	2117	+ {
	2118	+ Save();
1913	2119	} else
1914	2120	if (source == oneStepButton)
1915	2121	{
..	..	@@ -1964,6 +2170,14 @@
1964	2170	if (source == cutItem \|\| source == clearButton)
1965	2171	{
1966	2172	loadClipboard(true);
	2173	+ } else
	2174	+ if (source == undoItem)
	2175	+ {
	2176	+ Undo();
	2177	+ } else
	2178	+ if (source == redoItem)
	2179	+ {
	2180	+ Redo();
1967	2181	} else
1968	2182	if (source == duplicateItem)
1969	2183	{
..	..	@@ -2276,7 +2490,7 @@
2276	2490	{
2277	2491	RevertMeshes();
2278	2492	} else
2279		- if (source == resetMeshItem)
	2493	+ if (source == resetAllItem)
2280	2494	{
2281	2495	ResetAll();
2282	2496	} else
..	..	@@ -2442,7 +2656,7 @@
2442	2656	{
2443	2657	CastShadow(2);
2444	2658	} else
2445		- if (source == ungroupItem)
	2659	+ if (source == ungroupItem \|\| source == ungroupButton)
2446	2660	{
2447	2661	//ungroup();
2448	2662	for (int i=0; i<group.selection.size(); i++)
..	..	@@ -2464,7 +2678,7 @@
2464	2678	} else
2465	2679	if (source == genNormalsMESHItem)
2466	2680	{
2467		- GenNormals(true); // TODO
	2681	+ GenNormalsMESH();
2468	2682	} else
2469	2683	if (source == genNormalsORGANItem)
2470	2684	{
..	..	@@ -2529,6 +2743,22 @@
2529	2743	if (source == unmarkleavesItem)
2530	2744	{
2531	2745	MarkLeaves(false);
	2746	+ } else
	2747	+ if (source == rewindleavesItem)
	2748	+ {
	2749	+ RewindLeaves(true);
	2750	+ } else
	2751	+ if (source == unrewindleavesItem)
	2752	+ {
	2753	+ RewindLeaves(false);
	2754	+ } else
	2755	+ if (source == randomleavesItem)
	2756	+ {
	2757	+ RandomLeaves(true);
	2758	+ } else
	2759	+ if (source == unrandomleavesItem)
	2760	+ {
	2761	+ RandomLeaves(false);
2532	2762	} else
2533	2763	if (source == flipVItem)
2534	2764	{
..	..	@@ -2614,9 +2844,13 @@
2614	2844	{
2615	2845	SmoothMesh();
2616	2846	} else
2617		- if (source == transformgeometryItem)
	2847	+ if (source == transformGeometryItem)
2618	2848	{
2619	2849	TransformGeometry();
	2850	+ } else
	2851	+ if (source == transformChildrenItem)
	2852	+ {
	2853	+ TransformChildren();
2620	2854	} else
2621	2855	if (source == resetTransformItem)
2622	2856	{
..	..	@@ -2624,7 +2858,11 @@
2624	2858	} else
2625	2859	if (source == resetCentroidItem)
2626	2860	{
2627		- ResetCentroid();
	2861	+ ResetCentroid(true);
	2862	+ } else
	2863	+ if (source == resetCentroidXZItem)
	2864	+ {
	2865	+ ResetCentroid(false);
2628	2866	} else
2629	2867	if (source == resetParentItem)
2630	2868	{
..	..	@@ -2756,6 +2994,10 @@
2756	2994	if (source == twoButton)
2757	2995	{
2758	2996	radio.layout = twoButton;
	2997	+
	2998	+ if (CameraPane.FULLSCREEN)
	2999	+ fullscreenLayout = radio.layout;
	3000	+
2759	3001	// bug
2760	3002	//gridPanel.setDividerLocation(1.0);
2761	3003	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2788,10 +3030,31 @@
2788	3030	bigThree.ClearUI();
2789	3031	bigThree.add(centralPanel);
2790	3032	bigThree.FlushUI();
	3033	+
	3034	+ cameraView.requestFocusInWindow();
	3035	+
	3036	+// refreshContents(true);
	3037	+//
	3038	+// try
	3039	+// {
	3040	+// java.awt.Robot bot = new java.awt.Robot();
	3041	+// int mask = InputEvent.BUTTON1_MASK;
	3042	+// bot.mouseMove(100, 100);
	3043	+// bot.mousePress(mask);
	3044	+// bot.mouseRelease(mask);
	3045	+// }
	3046	+// catch (Exception e)
	3047	+// {
	3048	+//
	3049	+// }
	3050	+
2791	3051	} else
2792	3052	if (source == threeButton)
2793	3053	{
2794	3054	radio.layout = threeButton;
	3055	+
	3056	+ if (CameraPane.FULLSCREEN)
	3057	+ fullscreenLayout = radio.layout;
2795	3058
2796	3059	// bigThree.remove(scenePanel);
2797	3060	// bigThree.remove(centralPanel);
..	..	@@ -2824,10 +3087,15 @@
2824	3087	bigThree.add(centralPanel);
2825	3088	bigThree.add(XYZPanel);
2826	3089	bigThree.FlushUI();
	3090	+
	3091	+ cameraView.requestFocusInWindow();
2827	3092	} else
2828	3093	if (source == fourButton)
2829	3094	{
2830	3095	radio.layout = fourButton;
	3096	+
	3097	+ if (CameraPane.FULLSCREEN)
	3098	+ fullscreenLayout = radio.layout;
2831	3099
2832	3100	// bigThree.remove(scenePanel);
2833	3101	// bigThree.remove(centralPanel);
..	..	@@ -2859,10 +3127,15 @@
2859	3127	bigThree.ClearUI();
2860	3128	bigThree.add(scenePanel);
2861	3129	bigThree.FlushUI();
	3130	+
	3131	+ cameraView.requestFocusInWindow();
2862	3132	} else
2863	3133	if (source == sixButton)
2864	3134	{
2865	3135	radio.layout = sixButton;
	3136	+
	3137	+ if (CameraPane.FULLSCREEN)
	3138	+ fullscreenLayout = radio.layout;
2866	3139
2867	3140	// bigThree.remove(scenePanel);
2868	3141	// bigThree.remove(centralPanel);
..	..	@@ -2895,10 +3168,15 @@
2895	3168	bigThree.add(scenePanel);
2896	3169	bigThree.add(centralPanel);
2897	3170	bigThree.FlushUI();
	3171	+
	3172	+ cameraView.requestFocusInWindow();
2898	3173	} else
2899	3174	if (source == sevenButton)
2900	3175	{
2901	3176	radio.layout = sevenButton;
	3177	+
	3178	+ if (CameraPane.FULLSCREEN)
	3179	+ fullscreenLayout = radio.layout;
2902	3180
2903	3181	// bigThree.remove(scenePanel);
2904	3182	// bigThree.remove(centralPanel);
..	..	@@ -2932,6 +3210,8 @@
2932	3210	bigThree.add(centralPanel);
2933	3211	bigThree.add(XYZPanel);
2934	3212	bigThree.FlushUI();
	3213	+
	3214	+ cameraView.requestFocusInWindow();
2935	3215	} else
2936	3216	if (source == rootButton)
2937	3217	{
..	..	@@ -2943,6 +3223,7 @@
2943	3223	EditObject(obj);
2944	3224	}
2945	3225
	3226	+ cameraView.requestFocusInWindow();
2946	3227	refreshContents(true);
2947	3228	} else
2948	3229	if (source == closeButton)
..	..	@@ -2952,18 +3233,27 @@
2952	3233	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2953	3234	{
2954	3235	ab = (cRadio)e.nextElement();
2955		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3236	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2956	3237	{
	3238	+ // Patch to avoid bug with transparency.
	3239	+ if (!ab.hadMaterial)
	3240	+ {
	3241	+ ab.object.material = null;
	3242	+ }
	3243	+
2957	3244	buttonGroup.remove(ab);
2958	3245	radioPanel.remove(ab);
2959	3246
2960		- ab.GetObject().editWindow = null;
	3247	+ //ab.GetObject().editWindow = null;
	3248	+ ab.GetObject().manipWindow = null;
2961	3249	// ab.GetObject().objectUI = null; // ?????????
2962	3250
2963	3251	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2964	3252	break;
2965	3253	}
2966	3254	}
	3255	+
	3256	+ cameraView.requestFocusInWindow();
2967	3257	refreshContents(true);
2968	3258	} else
2969	3259	if (source == editItem \|\| source == editButton)
..	..	@@ -2980,7 +3270,7 @@
2980	3270	child.CloseUI();
2981	3271	listUI.remove(child);
2982	3272
2983		- child.editWindow = null; // ???????????
	3273	+ //child.editWindow = null; // ???????????
2984	3274	}
2985	3275	objEditor.ctrlPanel.FlushUI();
2986	3276	//objEditor.jTree.clearSelection();
..	..	@@ -3066,7 +3356,11 @@
3066	3356	frontView.object = group;
3067	3357	sideView.object = group;
3068	3358	}
3069		- group.editWindow = this;
	3359	+
	3360	+// fix "+" issue
	3361	+ //group.editWindow = this;
	3362	+ group.manipWindow = this;
	3363	+
3070	3364	/*
3071	3365	currentLayout = radio.layout;
3072	3366	if (currentLayout == null)
..	..	@@ -3078,8 +3372,23 @@
3078	3372	//group.parent = null; // ROOT
3079	3373	//group.attributes = -1;
3080	3374	ResetModel();
	3375	+
	3376	+ cameraView.requestFocusInWindow();
3081	3377	refreshContents(true);
3082		- }
	3378	+ } else if (event.getSource() == editCameraItem)
	3379	+ {
	3380	+ cameraView.ProtectCamera();
	3381	+ cameraView.repaint();
	3382	+ return;
	3383	+ } else if (event.getSource() == revertCameraItem)
	3384	+ {
	3385	+ cameraView.RevertCamera();
	3386	+ cameraView.repaint();
	3387	+ return;
	3388	+ // } else if (event.getSource() == textureButton)
	3389	+ // {
	3390	+ // return; // true;
	3391	+ }
3083	3392	else
3084	3393	{
3085	3394	//return super.action(event, arg);
..	..	@@ -3088,7 +3397,6 @@
3088	3397	}
3089	3398
3090	3399	boolean useclient = false;
3091		- cRadio radio;
3092	3400
3093	3401	void ToggleRoot()
3094	3402	{
..	..	@@ -3140,6 +3448,28 @@
3140	3448	refreshContents();
3141	3449	}
3142	3450
	3451	+ void TransformChildren()
	3452	+ {
	3453	+ Object3D obj;
	3454	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3455	+ {
	3456	+ obj = (Object3D)e.nextElement();
	3457	+ obj.KeepTextureMatrices();
	3458	+ obj.TransformChildren();
	3459	+ obj.RestoreTextureMatrices();
	3460	+
	3461	+// if (obj.parent == null)
	3462	+// {
	3463	+// System.out.println("NULL PARENT!");
	3464	+// new Exception().printStackTrace();
	3465	+// }
	3466	+// else
	3467	+// TouchTransform(obj);
	3468	+// //obj.parent.Touch();
	3469	+ }
	3470	+
	3471	+ refreshContents();
	3472	+ }
3143	3473
3144	3474	void ResetTransform()
3145	3475	{
..	..	@@ -3252,7 +3582,7 @@
3252	3582	refreshContents();
3253	3583	}
3254	3584
3255		- void ResetCentroid()
	3585	+ void ResetCentroid(boolean full)
3256	3586	{
3257	3587	Object3D obj;
3258	3588	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3267,12 +3597,16 @@
3267	3597	LA.matIdentity(Object3D.mat);
3268	3598	obj.getBounds(minima, maxima, false);
3269	3599	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3270		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3600	+ if (full)
	3601	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3271	3602	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3272	3603	obj.TransformMesh(Object3D.mat);
	3604	+
3273	3605	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3274		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3606	+ if (full)
	3607	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3275	3608	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3609	+
3276	3610	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3277	3611	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3278	3612	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3301,7 +3635,8 @@
3301	3635
3302	3636	int size = obj.MemorySize();
3303	3637
3304		- System.err.println((size/1024) + " KB is the size of " + obj);
	3638	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3639	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3305	3640	}
3306	3641	}
3307	3642	catch (Exception e)
..	..	@@ -3382,6 +3717,13 @@
3382	3717	void GenNormals(boolean crease)
3383	3718	{
3384	3719	group.GenNormalsS(crease);
	3720	+
	3721	+ refreshContents();
	3722	+ }
	3723	+
	3724	+ void GenNormalsMESH()
	3725	+ {
	3726	+ group.GenNormalsMeshS();
3385	3727
3386	3728	refreshContents();
3387	3729	}
..	..	@@ -3613,7 +3955,16 @@
3613	3955	String pigment = Object3D.GetPigment(tex);
3614	3956	//String bump = Object3D.GetBump(tex);
3615	3957
3616		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3958	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	3959	+
	3960	+ try
	3961	+ {
	3962	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3963	+ }
	3964	+ catch (Exception e)
	3965	+ {
	3966	+ System.err.println("FAIL: " + node);
	3967	+ }
3617	3968
3618	3969	double s = v.s;
3619	3970
..	..	@@ -4000,6 +4351,18 @@
4000	4351	refreshContents();
4001	4352	}
4002	4353
	4354	+ void RewindLeaves(boolean hide)
	4355	+ {
	4356	+ group.selection.RewindLeaves(hide);
	4357	+ refreshContents();
	4358	+ }
	4359	+
	4360	+ void RandomLeaves(boolean hide)
	4361	+ {
	4362	+ group.selection.RandomLeaves(hide);
	4363	+ refreshContents();
	4364	+ }
	4365	+
4003	4366	void SetTexRes(int tr)
4004	4367	{
4005	4368	group.selection.SetTexRes(tr);
..	..	@@ -4082,10 +4445,10 @@
4082	4445	{
4083	4446	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4084	4447	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4085		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4448	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4086	4449
4087	4450	Object3D elem = (Object3D)group.selection.elementAt(i);
4088		- if(elem != group)
	4451	+ if(elem != group \|\| !newWindow)
4089	4452	{
4090	4453	// if (!(elem instanceof Composite))
4091	4454	// newWindow = false;
..	..	@@ -4175,7 +4538,6 @@
4175	4538	//case 702: // Event.LIST_DESELECT
4176	4539	group.deselectAll();
4177	4540	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4178		- objEditor.ClearInfo(); // .GetMaterial());
4179	4541	if (tps != null)
4180	4542	{
4181	4543	for (int i=0; i < tps.length; i++)
..	..	@@ -4184,10 +4546,8 @@
4184	4546
4185	4547	//if (child.parent != null)
4186	4548	//child.parent.addSelectee(child);
	4549	+ objEditor.SetMaterial(child);
4187	4550	group.addSelectee(child);
4188		- objEditor.SetMaterial(child); // .GetMaterial());
4189		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4190		- System.err.println("info : " + child.GetPath());
4191	4551	}
4192	4552	}
4193	4553	// else
..	..	@@ -4197,16 +4557,17 @@
4197	4557	// System.err.println("info : " + group.GetPath());
4198	4558	// }
4199	4559
4200		- objEditor.SetText(); // jan 2014
4201		-
4202		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4560	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4203	4561	CameraPane.flash = true;
4204	4562
4205		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4563	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4206	4564	// a camera
4207	4565	{
4208		- CameraPane.camerachangeframe = 0; // don't refuse it
4209		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4566	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4567	+ {
	4568	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4569	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4570	+ }
4210	4571	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4211	4572	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4212	4573	}
..	..	@@ -4219,6 +4580,26 @@
4219	4580
4220	4581	freezemodel = false;
4221	4582	}
	4583	+
	4584	+ void refreshContents(boolean cp)
	4585	+ {
	4586	+ if (!Globals.MOUSEDRAGGED)
	4587	+ {
	4588	+ objEditor.ClearInfo(); // .GetMaterial());
	4589	+
	4590	+ for (int i=0; i < group.selection.Size(); i++)
	4591	+ {
	4592	+ Object3D child = (Object3D) group.selection.get(i);
	4593	+
	4594	+ objEditor.AddInfo(child, this, true);
	4595	+ System.err.println("info : " + child.GetPath());
	4596	+ }
	4597	+
	4598	+ objEditor.SetText(); // jan 2014
	4599	+ }
	4600	+
	4601	+ super.refreshContents(cp);
	4602	+ }
4222	4603
4223	4604	void linkSomething(Object3D thing)
4224	4605	{
..	..	@@ -4290,6 +4671,7 @@
4290	4671	{
4291	4672	if (group.selection.isEmpty())
4292	4673	return;
	4674	+
4293	4675	Grafreed.clipboardIsTempGroup = false;
4294	4676	Composite tGroup = null;
4295	4677	if (group.selection.size() > 0) // 1)
..	..	@@ -4300,6 +4682,8 @@
4300	4682
4301	4683	if (cut)
4302	4684	{
	4685	+ if (Globals.SAVEONMAKE)
	4686	+ Save();
4303	4687	//int indices[] = jList.getSelectedIndices();
4304	4688	//for (int i = indices.length - 1; i >= 0; i--)
4305	4689	//jList.remove(indices[i]);
..	..	@@ -4389,8 +4773,10 @@
4389	4773	}
4390	4774
4391	4775	}
	4776	+
4392	4777	if (Grafreed.clipboardIsTempGroup)
4393	4778	Grafreed.clipboard = tGroup;
	4779	+
4394	4780	if (cut)
4395	4781	{
4396	4782	ResetModel();
..	..	@@ -4922,21 +5308,6 @@
4922	5308	}
4923	5309	*/
4924	5310
4925		- void ImportGFD()
4926		- {
4927		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4928		- browser.show();
4929		- String filename = browser.getFile();
4930		- if (filename != null && filename.length() > 0)
4931		- {
4932		- String fullname = browser.getDirectory() + filename;
4933		-
4934		- //Object3D readobj =
4935		- objEditor.ReadGFD(fullname, objEditor);
4936		- //makeSomething(readobj);
4937		- }
4938		- }
4939		-
4940	5311	/*
4941	5312	public void Callback(Object obj)
4942	5313	{
..	..	@@ -4960,23 +5331,6 @@
4960	5331	}
4961	5332	*/
4962	5333
4963		- void ImportVRMLX3D()
4964		- {
4965		- if (Grafreed.standAlone)
4966		- {
4967		- /**/
4968		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4969		- browser.show();
4970		- String filename = browser.getFile();
4971		- if (filename != null && filename.length() > 0)
4972		- {
4973		- String fullname = browser.getDirectory() + filename;
4974		- LoadVRMLX3D(fullname);
4975		- }
4976		- /**/
4977		- }
4978		- }
4979		-
4980	5334	String GetFile(String dialogName)
4981	5335	{
4982	5336	if (Grafreed.standAlone)
..	..	@@ -5047,7 +5401,28 @@
5047	5401	cButton clearpanelButton;
5048	5402	cButton unselectButton;
5049	5403
	5404	+ cButton minButton;
	5405	+ cButton maxButton;
	5406	+ cButton fullButton;
	5407	+ cButton undoButton;
	5408	+ cButton redoButton;
	5409	+ cButton saveButton;
5050	5410	cButton oneStepButton;
	5411	+
	5412	+ cButton groupButton;
	5413	+ cButton ungroupButton;
	5414	+ cButton compositeButton;
	5415	+
	5416	+ cButton gridButton;
	5417	+ cButton boxButton;
	5418	+ cButton sphereButton;
	5419	+ cButton coneButton;
	5420	+ cButton torusButton;
	5421	+ cButton superButton;
	5422	+ cButton kleinButton;
	5423	+ cButton particlesButton;
	5424	+ cButton overlayButton;
	5425	+ cButton lightButton;
5051	5426
5052	5427	cButton screenfitButton;
5053	5428	cButton screenfitpointButton;
..	..	@@ -5060,14 +5435,6 @@
5060	5435
5061	5436	cButton setsupportButton;
5062	5437
5063		- cButton twoButton;
5064		- cButton sixButton;
5065		- cButton threeButton;
5066		- cButton sevenButton;
5067		- cButton fourButton; // full panel
5068		- cButton oneButton; // full XYZ
5069		- //cButton currentLayout;
5070		-
5071	5438	//
5072	5439	//Composite
5073	5440	Object3D // to do !!
..	..	@@ -5079,7 +5446,9 @@
5079	5446	private MenuItem lookFromItem;
5080	5447	private MenuItem switchItem;
5081	5448	private MenuItem cutItem;
5082		- private MenuItem duplicateItem;
	5449	+ private MenuItem undoItem;
	5450	+ private MenuItem redoItem;
	5451	+ private JMenuItem duplicateItem;
5083	5452	private MenuItem cloneItem;
5084	5453	private MenuItem cloneSupportItem;
5085	5454	private MenuItem overwriteGeoItem;
..	..	@@ -5092,7 +5461,7 @@
5092	5461	private MenuItem linkverticesItem;
5093	5462	private MenuItem relinkverticesItem;
5094	5463	private MenuItem setMasterItem;
5095		- private MenuItem resetMeshItem;
	5464	+ private MenuItem resetAllItem;
5096	5465	private MenuItem stepAllItem;
5097	5466	private MenuItem revertMeshItem;
5098	5467	private MenuItem poseMeshItem;
..	..	@@ -5142,6 +5511,10 @@
5142	5511	private MenuItem showleavesItem;
5143	5512	private MenuItem markleavesItem;
5144	5513	private MenuItem unmarkleavesItem;
	5514	+ private MenuItem rewindleavesItem;
	5515	+ private MenuItem unrewindleavesItem;
	5516	+ private MenuItem randomleavesItem;
	5517	+ private MenuItem unrandomleavesItem;
5145	5518
5146	5519	private MenuItem flipVItem;
5147	5520	private MenuItem unflipVItem;
..	..	@@ -5153,8 +5526,10 @@
5153	5526	private MenuItem panoTexturesItem;
5154	5527
5155	5528	private MenuItem resetCentroidItem;
5156		- private MenuItem transformgeometryItem;
	5529	+ private MenuItem resetCentroidXZItem;
5157	5530	private MenuItem resetTransformItem;
	5531	+ private MenuItem transformGeometryItem;
	5532	+ private MenuItem transformChildrenItem;
5158	5533	private MenuItem hideItem;
5159	5534	private MenuItem grabItem;
5160	5535	private MenuItem backItem;
..	..	@@ -5223,11 +5598,6 @@
5223	5598	private MenuItem doubleItem;
5224	5599	private MenuItem tripleItem;
5225	5600
5226		- private MenuItem importGFDItem;
5227		- private MenuItem importVRMLX3DItem;
5228		- private MenuItem import3DSItem;
5229		- private MenuItem importOBJItem;
5230		-
5231	5601	private MenuItem computeAOItem;
5232	5602	private MenuItem recompileItem;
5233	5603	private MenuItem editScriptItem;
..	..	@@ -5237,4 +5607,8 @@
5237	5607	private MenuItem analyzeItem;
5238	5608	private MenuItem dumpItem;
5239	5609	//boolean freezemodel = false;
	5610	+
	5611	+ Menu cameraMenu;
	5612	+ MenuItem editCameraItem;
	5613	+ MenuItem revertCameraItem;
5240	5614	}