~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);
..	..	@@ -84,6 +84,10 @@
84	84
85	85	void CloneSelection(boolean supports)
86	86	{
	87	+ if (Globals.SAVEONMAKE)
	88	+ Save();
	89	+ boolean keep = Globals.SAVEONMAKE;
	90	+ Globals.SAVEONMAKE = false;
87	91	// Object3D keep = GrafreeD.clipboard;
88	92	//Object3D obj;
89	93	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,6 +98,7 @@
94	98
95	99	makeSomething(clone, i==group.selection.size()-1);
96	100	}
	101	+ Globals.SAVEONMAKE = keep;
97	102	}
98	103
99	104	void CloneClipboard(boolean supports)
..	..	@@ -148,28 +153,21 @@
148	153
149	154	//JTextField nameField;
150	155
151		- void SetupMenu2(ObjEditor oe)
	156	+ void SetupMenu2(GroupEditor oe)
152	157	{
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		-
	158	+ oe.jTree = new cTree();
	159	+
168	160	Menu menu;
169	161	oe.menuBar.add(menu = new Menu("Edit"));
170	162	//editItem = menu.add(new MenuItem("Edit"));
171	163	//editItem.addActionListener(this);
172		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	164	+
	165	+// undoItem = menu.add(new MenuItem("Undo"));
	166	+// undoItem.addActionListener(this);
	167	+// redoItem = menu.add(new MenuItem("Redo"));
	168	+// redoItem.addActionListener(this);
	169	+// menu.add("-");
	170	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
173	171	duplicateItem.addActionListener(this);
174	172	cloneItem = menu.add(new MenuItem("Clone"));
175	173	cloneItem.addActionListener(this);
..	..	@@ -185,7 +183,6 @@
185	183	copyItem.addActionListener(this);
186	184	pasteItem = menu.add(new MenuItem("Paste"));
187	185	pasteItem.addActionListener(this);
188		- menu.add("-");
189	186
190	187	menu.add("-");
191	188	pasteIntoItem = menu.add(new MenuItem("Paste into"));
..	..	@@ -206,7 +203,94 @@
206	203	clearAllItem = menu.add(new MenuItem("Clear All"));
207	204	clearAllItem.addActionListener(this);
208	205	}
	206	+
	207	+ menuBar.add(cameraMenu = new Menu("View"));
	208	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	209	+ //zBufferItem.addActionListener(this);
	210	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	211	+ //normalLensItem.addActionListener(this);
	212	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	213	+ restoreCameraItem.addActionListener(this);
	214	+
	215	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	216	+// toggleFullScreenItem.addItemListener(this);
	217	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	218	+// cameraMenu.add("-");
	219	+//
	220	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	221	+// toggleTextureItem.addItemListener(this);
	222	+// toggleTextureItem.setState(CameraPane.textureon);
	223	+//
	224	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	225	+// toggleSwitchItem.addItemListener(this);
	226	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	227	+
	228	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	229	+ toggleHandleItem.addItemListener(this);
	230	+ toggleHandleItem.setState(CameraPane.HANDLES);
	231	+
	232	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	233	+ togglePaintItem.addItemListener(this);
	234	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	235	+
	236	+ if (Globals.ADVANCED)
	237	+ {
	238	+ cameraMenu.add("-");
	239	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	240	+ toggleLiveItem.addItemListener(this);
	241	+ toggleLiveItem.setState(Globals.isLIVE());
209	242
	243	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	244	+ stepItem.addActionListener(this);
	245	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	246	+ // toggleDLItem.addItemListener(this);
	247	+ // toggleDLItem.setState(false);
	248	+
	249	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	250	+ toggleRenderItem.addItemListener(this);
	251	+ toggleRenderItem.setState(!CameraPane.frozen);
	252	+
	253	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	254	+ toggleDebugItem.addItemListener(this);
	255	+ toggleDebugItem.setState(Globals.DEBUG);
	256	+
	257	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	258	+ toggleFrustumItem.addItemListener(this);
	259	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	260	+
	261	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	262	+ toggleFootContactItem.addItemListener(this);
	263	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	264	+
	265	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	266	+ toggleTimelineItem.addItemListener(this);
	267	+ }
	268	+
	269	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	270	+// toggleRootItem.addItemListener(this);
	271	+// toggleRootItem.setState(false);
	272	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	273	+// animationItem.addItemListener(this);
	274	+// animationItem.setState(CameraPane.ANIMATION);
	275	+ cameraMenu.add("-");
	276	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	277	+ editCameraItem.addActionListener(this);
	278	+
	279	+ if (Globals.ADVANCED)
	280	+ {
	281	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	282	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	283	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	284	+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	285	+ oe.cameraMenu.add("-");
	286	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	287	+ openWindowItem.addActionListener(this);
	288	+ editLeafItem.addActionListener(this);
	289	+ lookAtItem.addActionListener(this);
	290	+ //lookFromItem.addActinoListener(this);
	291	+ //switchViewItem.addActionListener(this);
	292	+ }
	293	+
210	294	oe.menuBar.add(menu = new Menu("Setting"));
211	295	if (Globals.ADVANCED)
212	296	{
..	..	@@ -249,21 +333,29 @@
249	333	}
250	334
251	335	oe.menuBar.add(menu = new Menu("Group"));
252		- grabItem = menu.add(new MenuItem("Grab"));
253		- grabItem.addActionListener(this);
	336	+// grabItem = menu.add(new MenuItem("Grab"));
	337	+// grabItem.addActionListener(this);
254	338	backItem = menu.add(new MenuItem("Back"));
255	339	backItem.addActionListener(this);
256	340	frontItem = menu.add(new MenuItem("Front"));
257	341	frontItem.addActionListener(this);
258		- compositeItem = menu.add(new MenuItem("Composite"));
259		- compositeItem.addActionListener(this);
	342	+// compositeItem = menu.add(new MenuItem("Composite"));
	343	+// compositeItem.addActionListener(this);
	344	+
	345	+ if (Globals.ADVANCED)
	346	+ {
260	347	hideItem = menu.add(new MenuItem("Hidden Group"));
261	348	hideItem.addActionListener(this);
	349	+ }
262	350	ungroupItem = menu.add(new MenuItem("Ungroup"));
263	351	ungroupItem.addActionListener(this);
264		- menu.add("-");
265		- randomItem = menu.add(new MenuItem("Switch node"));
266		- randomItem.addActionListener(this);
	352	+
	353	+// menu.add("-");
	354	+//
	355	+// switchItem = menu.add(new MenuItem("Switch node"));
	356	+// switchItem.addActionListener(this);
	357	+ if (Globals.ADVANCED)
	358	+ {
267	359	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
268	360	switchGeoItem.addActionListener(this);
269	361	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -271,8 +363,6 @@
271	363	morphItem = menu.add(new MenuItem("Morph Group"));
272	364	morphItem.addActionListener(this);
273	365
274		- if (Globals.ADVANCED)
275		- {
276	366	menu.add("-");
277	367	physicsItem = menu.add(new MenuItem("Physics"));
278	368	physicsItem.addActionListener(this);
..	..	@@ -280,30 +370,29 @@
280	370	frameselectorItem.addActionListener(this);
281	371	scriptNodeItem = menu.add(new MenuItem("Script Node"));
282	372	scriptNodeItem.addActionListener(this);
283		- cameraItem = menu.add(new MenuItem("Camera"));
284		- cameraItem.addActionListener(this);
285	373	}
286	374
287	375	oe.menuBar.add(menu = new Menu("Object"));
288		- textureItem = menu.add(new MenuItem("Texture"));
289		- textureItem.addActionListener(this);
	376	+// textureItem = menu.add(new MenuItem("Texture"));
	377	+// textureItem.addActionListener(this);
290	378	billboardItem = menu.add(new MenuItem("Billboard"));
291	379	billboardItem.addActionListener(this);
292	380	csgItem = menu.add(new MenuItem("CSG"));
293	381	csgItem.addActionListener(this);
294		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	382	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
295	383	shadowXItem.addActionListener(this);
296		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	384	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
297	385	shadowYItem.addActionListener(this);
298		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	386	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
299	387	shadowZItem.addActionListener(this);
	388	+ attributeItem = menu.add(new MenuItem("Attribute"));
	389	+ attributeItem.addActionListener(this);
	390	+
300	391	if (Globals.ADVANCED)
301	392	{
302	393	menu.add("-");
303	394	linkerItem = menu.add(new MenuItem("Linker"));
304	395	linkerItem.addActionListener(this);
305		- attributeItem = menu.add(new MenuItem("Attribute"));
306		- attributeItem.addActionListener(this);
307	396	templateItem = menu.add(new MenuItem("Template"));
308	397	templateItem.addActionListener(this);
309	398	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -392,6 +481,14 @@
392	481	markleavesItem.addActionListener(this);
393	482	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
394	483	unmarkleavesItem.addActionListener(this);
	484	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	485	+ rewindleavesItem.addActionListener(this);
	486	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	487	+ unrewindleavesItem.addActionListener(this);
	488	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	489	+ randomleavesItem.addActionListener(this);
	490	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	491	+ unrandomleavesItem.addActionListener(this);
395	492	menu.add("-");
396	493	flipVItem = menu.add(new MenuItem("Flip V"));
397	494	flipVItem.addActionListener(this);
..	..	@@ -443,25 +540,24 @@
443	540	oe.menuBar.add(menu = new Menu("Insert"));
444	541	buildCreateMenu(menu);
445	542
446		- oe.menuBar.add(menu = new Menu("Include"));
447		- importOBJItem = menu.add(new MenuItem("OBJ file..."));
448		- importOBJItem.addActionListener(this);
449		- menu.add("-");
450		- import3DSItem = menu.add(new MenuItem("3DS file..."));
451		- import3DSItem.addActionListener(this);
452		- menu.add("-");
453		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
454		- importVRMLX3DItem.addActionListener(this);
455		- menu.add("-");
456		- importGFDItem = menu.add(new MenuItem("GrafreeD file..."));
457		- importGFDItem.addActionListener(this);
458		-
459	543	oe.menuBar.add(menu = new Menu("Tools"));
460	544	buildToolsMenu(menu);
461	545	}
462	546
463	547	void SetupUI2(ObjEditor oe)
464	548	{
	549	+ // June 2019
	550	+ if (oe == null)
	551	+ {
	552	+ //super.SetupUI2(this);
	553	+ //return;
	554	+ }
	555	+
	556	+ if (copy != group)
	557	+ {
	558	+ //super.SetupUI2(this);
	559	+ }
	560	+
465	561	//new Exception().printStackTrace();
466	562
467	563	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -490,27 +586,66 @@
490	586	oe.radioPanel.add(dummyButton);
491	587	oe.buttonGroup.add(dummyButton);
492	588	*/
	589	+ cGridBag copyOptionsPanel = new cGridBag();
	590	+
	591	+ copyOptionsPanel.preferredHeight = 1;
	592	+
493	593	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
494	594
495		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	595	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	596	+ //minButton.setToolTipText("Minimize window");
	597	+ //minButton.addActionListener(this);
	598	+
	599	+ if (Globals.ADVANCED)
	600	+ {
	601	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	602	+ maxButton.setToolTipText("Maximize window");
	603	+ maxButton.addActionListener(this);
	604	+ }
	605	+
	606	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	607	+ fullButton.setToolTipText("Full-screen window");
	608	+ fullButton.addActionListener(this);
	609	+
	610	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	611	+ screenfitButton.setToolTipText("Screen fit");
	612	+ screenfitButton.addActionListener(this);
	613	+
	614	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	615	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	616	+ restoreCameraButton.addActionListener(this);
	617	+
	618	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	619	+ undoButton.setToolTipText("Undo changes");
	620	+ undoButton.addActionListener(this);
	621	+ undoButton.setEnabled(false);
	622	+
	623	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	624	+ redoButton.setToolTipText("Redo changes");
	625	+ redoButton.addActionListener(this);
	626	+ redoButton.setEnabled(false);
	627	+
	628	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	629	+ saveButton.setToolTipText("Save changes");
	630	+ saveButton.addActionListener(this);
	631	+
	632	+ copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
496	633	liveCB.setToolTipText("Enable animation");
497	634	liveCB.addItemListener(this);
498	635
499		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	636	+ copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
500	637	oneStepButton.setToolTipText("Animate one step forward");
501	638	oneStepButton.addActionListener(this);
502	639
503		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	640	+ copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
504	641	fastCB.setToolTipText("Fast mode");
505	642	fastCB.addItemListener(this);
506	643
507		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
508		- trackCB.setToolTipText("Enable tracking");
509		- trackCB.addItemListener(this);
510		-
511		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
512		- screenfitButton.setToolTipText("Screen fit");
513		- screenfitButton.addActionListener(this);
	644	+ //oe.toolboxPanel.Return();
	645	+
	646	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	647	+// trackCB.setToolTipText("Enable tracking");
	648	+// trackCB.addItemListener(this);
514	649
515	650	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
516	651	// screenfitpointButton.addActionListener(this);
..	..	@@ -522,65 +657,145 @@
522	657	snapobjectButton.setToolTipText("Snap Object");
523	658	}
524	659
525		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
526		- flashSelectionButton.setToolTipText("Show selection");
527		- flashSelectionButton.addActionListener(this);
	660	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
528	661
529		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
530		-
531		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	662	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
532	663	twoButton.setToolTipText("Show center view only");
533	664	twoButton.addActionListener(this);
534		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	665	+ this.fullscreenLayout = twoButton;
	666	+
	667	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
535	668	fourButton.addActionListener(this);
536	669	fourButton.setToolTipText("Show left panel only");
537		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	670	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
538	671	sixButton.setToolTipText("2-column layout left");
539	672	sixButton.addActionListener(this);
540		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	673	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
541	674	threeButton.setToolTipText("2-column layout right");
542	675	threeButton.addActionListener(this);
543		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	676	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
544	677	sevenButton.setToolTipText("3-column layout");
545	678	sevenButton.addActionListener(this);
546	679	//
547	680
548		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	681	+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
549	682	rootButton.setToolTipText("Edit selection in new tab");
550	683	rootButton.addActionListener(this);
551	684
552		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	685	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
553	686	closeButton.setToolTipText("Close tab");
554	687	closeButton.addActionListener(this);
555	688	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
556	689	//clearButton.addActionListener(this);
557		-
558		- cGridBag commandsPanel = new cGridBag();
	690	+
	691	+ // INSERT
	692	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	693	+ gridButton.setToolTipText("Create grid");
	694	+ gridButton.addActionListener(this);
	695	+
	696	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	697	+ boxButton.setToolTipText("Create box");
	698	+ boxButton.addActionListener(this);
	699	+
	700	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	701	+ sphereButton.setToolTipText("Create sphere");
	702	+ sphereButton.addActionListener(this);
	703	+
	704	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	705	+ coneButton.setToolTipText("Create cone");
	706	+ coneButton.addActionListener(this);
	707	+
	708	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	709	+ torusButton.setToolTipText("Create torus");
	710	+ torusButton.addActionListener(this);
	711	+
	712	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	713	+ superButton.setToolTipText("Create superellipsoid");
	714	+ superButton.addActionListener(this);
	715	+
	716	+ if (Globals.ADVANCED)
	717	+ {
	718	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	719	+ kleinButton.setToolTipText("Create Klein bottle");
	720	+ kleinButton.addActionListener(this);
	721	+ }
559	722
560		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
561		- editButton.setToolTipText("Edit selection");
	723	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	724	+ particlesButton.setToolTipText("Create particle system");
	725	+ particlesButton.addActionListener(this);
	726	+
	727	+ oe.toolboxPanel.Return();
	728	+
	729	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	730	+ groupButton.setToolTipText("Create group");
	731	+ groupButton.addActionListener(this);
	732	+
	733	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	734	+ compositeButton.setToolTipText("Create composite");
	735	+ compositeButton.addActionListener(this);
	736	+
	737	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	738	+ switchButton.setToolTipText("Create item switcher");
	739	+ switchButton.addActionListener(this);
	740	+
	741	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	742	+ loopButton.setToolTipText("Create loop");
	743	+ loopButton.addActionListener(this);
	744	+
	745	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	746	+ textureButton.setToolTipText("Create texture");
	747	+ textureButton.addActionListener(this);
	748	+
	749	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	750	+ overlayButton.setToolTipText("Create overlay");
	751	+ overlayButton.addActionListener(this);
	752	+
	753	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	754	+ lightButton.setToolTipText("Create light");
	755	+ lightButton.addActionListener(this);
	756	+
	757	+ for (int i=6; --i>=0;)
	758	+ {
	759	+ oe.toolboxPanel.Return();
	760	+ oe.toolboxPanel.add(new cGridBag());
	761	+ oe.toolboxPanel.add(new cGridBag());
	762	+ oe.toolboxPanel.add(new cGridBag());
	763	+ oe.toolboxPanel.add(new cGridBag());
	764	+ oe.toolboxPanel.add(new cGridBag());
	765	+ oe.toolboxPanel.add(new cGridBag());
	766	+ oe.toolboxPanel.add(new cGridBag());
	767	+ }
	768	+
	769	+ // EDIT panel
	770	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	771	+ editButton.setToolTipText("Pin selection controls");
562	772	editButton.addActionListener(this);
563	773
564		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
565		- uneditButton.setToolTipText("Unedit selection");
	774	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	775	+ uneditButton.setToolTipText("Remove selection controls");
566	776	uneditButton.addActionListener(this);
567	777
568		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
569		- allParamsButton.setToolTipText("Edit all params");
	778	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	779	+ allParamsButton.setToolTipText("Show all controle");
570	780	allParamsButton.addActionListener(this);
571	781
572		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	782	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
573	783	clearPanelButton.setToolTipText("Clear edit panel");
574	784	clearPanelButton.addActionListener(this);
575	785
576		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	786	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
577	787	unselectButton.setToolTipText("Unselect");
578	788	unselectButton.addActionListener(this);
579	789
580		- commandsPanel.preferredHeight = 1;
	790	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	791	+ flashSelectionButton.setToolTipText("Highlight selection");
	792	+ flashSelectionButton.addActionListener(this);
581	793
582		- oe.treePanel.add(commandsPanel);
583		- oe.treePanel.Return();
	794	+ editCommandsPanel.preferredHeight = 1;
	795	+
	796	+ SetPinStates(false);
	797	+// oe.treePanel.add(commandsPanel);
	798	+// oe.treePanel.Return();
584	799
585	800	// oe.aConstraints.gridx += 1;
586	801	// oe.aConstraints.weighty = 0;
..	..	@@ -597,27 +812,12 @@
597	812
598	813	JScrollPane jSP;
599	814	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
600		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	815	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
601	816	ResetModel();
602	817
603	818	oe.treePanel.add(jSPPanel);
604	819	oe.treePanel.Return();
605	820
606		- cGridBag copyOptionsPanel = new cGridBag();
607		-
608		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
609		- colorCB.setToolTipText("Copy color when dropped");
610		- colorCB.addItemListener(this);
611		-
612		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
613		- materialCB.setToolTipText("Copy material when dropped");
614		- materialCB.addItemListener(this);
615		-
616		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
617		- textureCB.setToolTipText("Copy texture when dropped");
618		- textureCB.addItemListener(this);
619		-
620		- copyOptionsPanel.preferredHeight = 1;
621	821	oe.treePanel.add(copyOptionsPanel);
622	822	oe.treePanel.Return();
623	823
..	..	@@ -648,23 +848,43 @@
648	848
649	849	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
650	850	{
	851	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	852	+ colorCB.setToolTipText("Copy color when dropped");
	853	+ colorCB.addItemListener(this);
	854	+
	855	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	856	+ materialCB.setToolTipText("Copy material when dropped");
	857	+ materialCB.addItemListener(this);
	858	+
	859	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	860	+ textureCB.setToolTipText("Copy texture when dropped");
	861	+ textureCB.addItemListener(this);
	862	+
	863	+ panel.Return();
	864	+
651	865	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
652	866	boxCB.setToolTipText("Display bounding boxes");
653	867	boxCB.addItemListener(this);
654	868
655	869	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
656		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	870	+ zoomBoxCB.setToolTipText("Display only for wheel");
657	871	zoomBoxCB.addItemListener(this);
658	872
659	873	if (true) // Globals.ADVANCED)
660	874	{
661		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
662		- supportCB.setToolTipText("Enable rigging");
663		- supportCB.addItemListener(this);
	875	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	876	+// supportCB.setToolTipText("Enable rigging");
	877	+// supportCB.addItemListener(this);
	878	+
	879	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	880	+ freezeCB.setToolTipText("Fast moving camera");
	881	+ freezeCB.addItemListener(this);
664	882
665	883	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
666	884	// localCB.addItemListener(this);
667	885
	886	+ panel.Return();
	887	+
668	888	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
669	889	crowdCB.setToolTipText("Used for crowds");
670	890	crowdCB.addItemListener(this);
..	..	@@ -681,6 +901,8 @@
681	901	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
682	902	// speakerMocapCB.addItemListener(this);
683	903
	904	+ panel.Return();
	905	+
684	906	if (false)
685	907	{
686	908	// handled in scripts
..	..	@@ -695,32 +917,72 @@
695	917	//constraints.gridy += 1;
696	918	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
697	919	smoothfocusCB.addItemListener(this);
	920	+ panel.Return();
698	921	}
699	922
700	923	//constraints.gridx += 1;
701	924	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
702	925	// debugCB.addItemListener(this);
703	926
	927	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	928	+ trackCB.setToolTipText("Enable tracking target");
	929	+ trackCB.addItemListener(this);
	930	+
704	931	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	932	+ oeilCB.setToolTipText("Move camera when tracking");
705	933	oeilCB.addItemListener(this);
706	934
	935	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	936	+ shadowCB.setToolTipText("When live compute shadows");
	937	+ shadowCB.addItemListener(this);
	938	+
	939	+ panel.Return();
	940	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	941	+ toggleTextureCB.setToolTipText("Load textures");
	942	+ toggleTextureCB.addItemListener(this);
	943	+
	944	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	945	+ toggleSwitchCB.setToolTipText("Choose a single item");
	946	+ toggleSwitchCB.addItemListener(this);
	947	+
	948	+ panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
	949	+ autosaveCB.setToolTipText("On structure change");
	950	+ autosaveCB.addItemListener(this);
	951	+
	952	+ panel.Return();
	953	+ if (Globals.ADVANCED)
	954	+ {
707	955	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
708	956	lookAtCB.setToolTipText("Look-at target");
709	957	lookAtCB.addItemListener(this);
	958	+ }
710	959
711	960	}
712	961
713	962	cGridBag fill = new cGridBag();
714		-
715	963	fill.preferredHeight = 200;
	964	+ cGridBag fill2 = new cGridBag();
	965	+ fill2.preferredHeight = 200;
	966	+ cGridBag fill3 = new cGridBag();
	967	+ fill3.preferredHeight = 200;
716	968
717	969	panel.add(fill);
	970	+ panel.add(fill2);
	971	+ panel.add(fill3);
718	972
719	973	}
720	974
721	975	void EditObject(Object3D obj)
722	976	{
723	977	cRadio radioButton = new cRadio(obj.name);
	978	+
	979	+ // June 2019. Patch to avoid bug with transparency.
	980	+ radioButton.hadMaterial = obj.material != null;
	981	+ if (!radioButton.hadMaterial)
	982	+ {
	983	+ obj.material = new cMaterial();
	984	+ }
	985	+
724	986	radioButton.SetObject(obj);
725	987	radioButton.layout = sevenButton;
726	988	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -732,6 +994,8 @@
732	994
733	995	void SetupViews(ObjEditor oe)
734	996	{
	997	+ theFrame = this;
	998	+
735	999	oe.SetupViews();
736	1000
737	1001	System.out.println("SetupViews");
..	..	@@ -740,23 +1004,28 @@
740	1004	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
741	1005	}
742	1006
743		- JCheckBox liveCB;
744		- JCheckBox supportCB;
745		- JCheckBox localCB;
746		- JCheckBox crowdCB;
747		- JCheckBox smoothCB;
748		- JCheckBox fastCB;
749		- JCheckBox slowCB;
750		- JCheckBox boxCB;
751		- JCheckBox zoomBoxCB;
752		- JCheckBox trackCB;
753		- JCheckBox smoothfocusCB;
	1007	+ cToggleButton liveCB;
	1008	+ cCheckBox supportCB;
	1009	+ cCheckBox localCB;
	1010	+ cCheckBox crowdCB;
	1011	+ cCheckBox smoothCB;
	1012	+ cToggleButton fastCB;
	1013	+ cCheckBox slowCB;
	1014	+ cCheckBox boxCB;
	1015	+ cCheckBox zoomBoxCB;
	1016	+ cCheckBox freezeCB;
	1017	+ //cToggleButton trackCB;
	1018	+ cCheckBox trackCB;
	1019	+ cCheckBox smoothfocusCB;
754	1020	// JCheckBox speakerMocapCB;
755		- JCheckBox speakerCameraCB;
756		- JCheckBox speakerFocusCB;
757		- JCheckBox debugCB;
758		- JCheckBox oeilCB;
759		- JCheckBox lookAtCB;
	1021	+ cCheckBox speakerCameraCB;
	1022	+ cCheckBox speakerFocusCB;
	1023	+ cCheckBox debugCB;
	1024	+
	1025	+ cCheckBox oeilCB;
	1026	+ cCheckBox shadowCB;
	1027	+ cCheckBox autosaveCB;
	1028	+ cCheckBox lookAtCB;
760	1029
761	1030	// static int COLOR = 1;
762	1031	// static int MATERIAL = 2;
..	..	@@ -764,9 +1033,9 @@
764	1033
765	1034	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
766	1035
767		- JCheckBox colorCB;
768		- JCheckBox materialCB;
769		- JCheckBox textureCB;
	1036	+ cCheckBox colorCB;
	1037	+ cCheckBox materialCB;
	1038	+ cCheckBox textureCB;
770	1039
771	1040	public void itemStateChanged(ItemEvent e)
772	1041	{
..	..	@@ -794,6 +1063,7 @@
794	1063	} else if(e.getSource() == liveCB)
795	1064	{
796	1065	cameraView.ToggleLive();
	1066	+ refreshContents(false);
797	1067	}
798	1068	else if(e.getSource() == supportCB)
799	1069	{
..	..	@@ -858,6 +1128,18 @@
858	1128	{
859	1129	cameraView.ToggleOeil();
860	1130	}
	1131	+ else if(e.getSource() == shadowCB)
	1132	+ {
	1133	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1134	+ }
	1135	+ else if(e.getSource() == freezeCB)
	1136	+ {
	1137	+ Globals.FREEZEONMOVE ^= true;
	1138	+ }
	1139	+ else if(e.getSource() == autosaveCB)
	1140	+ {
	1141	+ Globals.SAVEONMAKE ^= true;
	1142	+ }
861	1143	else if(e.getSource() == lookAtCB)
862	1144	{
863	1145	cameraView.ToggleLookAt();
..	..	@@ -874,7 +1156,8 @@
874	1156
875	1157	/**/
876	1158	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
877		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1159	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1160	+ TreePath path = objEditor.jTree.getSelectionPath();
878	1161	if ((path == null) \|\| (path.getPathCount() <= 1)) {
879	1162	// We can't move the root node or an empty selection
880	1163	return;
..	..	@@ -937,8 +1220,6 @@
937	1220	}
938	1221	}
939	1222
940		- String string = (String) object;
941		-
942	1223	System.out.println("Transfer = " + object + "; drop : " + target);
943	1224	// if( object instanceof java.io.File[])
944	1225	// {
..	..	@@ -946,6 +1227,8 @@
946	1227	// objEditor.DropFile((java.io.File[]) object, true);
947	1228	// return;
948	1229	// }
	1230	+
	1231	+ String string = object.toString();
949	1232
950	1233	// File path for Mac and Windows
951	1234	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -991,23 +1274,33 @@
991	1274
992	1275	assert target == objEditor.jTree;
993	1276	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1277	+ Object3D destinationLeaf;
994	1278	try {
995		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1279	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
996	1280	} catch (Exception e) {
997	1281	System.out.println("destinationPath : " + destinationPath);
998	1282	return;
999	1283	}
1000	1284
1001		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1285	+ for (int i=group.selection.size(); --i>=0;)
1002	1286	{
	1287	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1288	+
	1289	+ // Cannot move into itself
	1290	+ if (child == destinationLeaf)
	1291	+ return;
	1292	+ }
	1293	+
	1294	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1295	+// {
1003	1296	loadClipboard(true);
1004	1297	objEditor.jTree.setSelectionPath(destinationPath);
1005	1298	pasteInto(false, false);
1006		- } else {
1007		- loadClipboard(false);
1008		- objEditor.jTree.setSelectionPath(destinationPath);
1009		- pasteInto(false, false); // true); // ???
1010		- }
	1299	+// } else {
	1300	+// loadClipboard(false);
	1301	+// objEditor.jTree.setSelectionPath(destinationPath);
	1302	+// pasteInto(false, false); // true); // ???
	1303	+// }
1011	1304	}
1012	1305	public void dropActionChanged(DropTargetDragEvent dtde)
1013	1306	// Called if the user has modified the current drop gesture
..	..	@@ -1112,22 +1405,30 @@
1112	1405	{
1113	1406	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1114	1407	//heightFieldItem.addActionListener(this);
1115		- gridItem = menu.add(new MenuItem("Grid"));
1116		- gridItem.addActionListener(this);
1117		- rectoidItem = menu.add(new MenuItem("Box"));
1118		- rectoidItem.addActionListener(this);
1119		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1120		- ellipsoidItem.addActionListener(this);
1121		- coneItem = menu.add(new MenuItem("Cone"));
1122		- coneItem.addActionListener(this);
1123		- torusItem = menu.add(new MenuItem("Torus"));
1124		- torusItem.addActionListener(this);
1125		- superItem = menu.add(new MenuItem("Superellipsoid"));
1126		- superItem.addActionListener(this);
	1408	+// gridItem = menu.add(new MenuItem("Grid"));
	1409	+// gridItem.addActionListener(this);
	1410	+// rectoidItem = menu.add(new MenuItem("Box"));
	1411	+// rectoidItem.addActionListener(this);
	1412	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1413	+// ellipsoidItem.addActionListener(this);
	1414	+// coneItem = menu.add(new MenuItem("Cone"));
	1415	+// coneItem.addActionListener(this);
	1416	+// torusItem = menu.add(new MenuItem("Torus"));
	1417	+// torusItem.addActionListener(this);
	1418	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1419	+// superItem.addActionListener(this);
	1420	+
	1421	+ cameraItem = menu.add(new MenuItem("Camera"));
	1422	+ cameraItem.addActionListener(this);
	1423	+
	1424	+ if (!Globals.ADVANCED)
	1425	+ {
1127	1426	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1128	1427	kleinItem.addActionListener(this);
1129		- particleItem = menu.add(new MenuItem("Particle system"));
1130		- particleItem.addActionListener(this);
	1428	+ }
	1429	+
	1430	+// particleItem = menu.add(new MenuItem("Particle system"));
	1431	+// particleItem.addActionListener(this);
1131	1432	if (Globals.ADVANCED)
1132	1433	{
1133	1434	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1153,15 +1454,15 @@
1153	1454	}
1154	1455	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1155	1456	bezierItem.addActionListener(this);
1156		- overlayItem = menu.add(new MenuItem("Overlay"));
1157		- overlayItem.addActionListener(this);
1158		- lightItem = menu.add(new MenuItem("Light"));
1159		- lightItem.addActionListener(this);
	1457	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1458	+// overlayItem.addActionListener(this);
	1459	+// lightItem = menu.add(new MenuItem("Light"));
	1460	+// lightItem.addActionListener(this);
1160	1461	menu.add("-");
1161	1462	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1162	1463	//superLoopItem.addActionListener(this);
1163		- loopItem = menu.add(new MenuItem("Loop"));
1164		- loopItem.addActionListener(this);
	1464	+// loopItem = menu.add(new MenuItem("Loop"));
	1465	+// loopItem.addActionListener(this);
1165	1466	doubleItem = menu.add(new MenuItem("Fork"));
1166	1467	doubleItem.addActionListener(this);
1167	1468	if (Globals.ADVANCED)
..	..	@@ -1177,6 +1478,9 @@
1177	1478	animationItem.addItemListener(this);
1178	1479	animationItem.setState(Globals.ANIMATION);
1179	1480
	1481	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1482	+ archiveItem.addActionListener(this);
	1483	+
1180	1484	menu.add("-");
1181	1485	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1182	1486	parseverticesItem.addActionListener(this);
..	..	@@ -1189,6 +1493,8 @@
1189	1493	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1190	1494	reduce34MorphItem.addActionListener(this);
1191	1495	menu.add("-");
	1496	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1497	+ memoryItem.addActionListener(this);
1192	1498	menu.add(computeAOItem = new MenuItem("Compute AO"));
1193	1499	computeAOItem.addActionListener(this);
1194	1500
..	..	@@ -1197,11 +1503,9 @@
1197	1503	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1198	1504	mirrorItem.addActionListener(this);
1199	1505	menu.add("-");
1200		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1201		- memoryItem.addActionListener(this);
1202	1506	menu.add(analyzeItem = new MenuItem("Analyze"));
1203	1507	analyzeItem.addActionListener(this);
1204		- menu.add(dumpItem = new MenuItem("Dump"));
	1508	+ menu.add(dumpItem = new MenuItem("Print"));
1205	1509	dumpItem.addActionListener(this);
1206	1510	// menu.add(pathItem = new MenuItem("From-to path"));
1207	1511	// pathItem.addActionListener(this);
..	..	@@ -1342,9 +1646,24 @@
1342	1646	shadow.material = new cMaterial(obj.material);
1343	1647	shadow.material.diffuse = 0.0001f;
1344	1648	shadow.material.specular = 0.0001f;
	1649	+ //shadow.projectedVertices[1].x = 300;
1345	1650
1346	1651	makeSomething(shadow);
1347	1652	}
	1653	+
	1654	+ private void ClearUnpinned()
	1655	+ {
	1656	+ //for (Object3D obj : listUI)
	1657	+ for (int i=listUI.size(); --i>=0;)
	1658	+ {
	1659	+ Object3D obj = listUI.elementAt(i);
	1660	+ if (!obj.pinned)
	1661	+ {
	1662	+ obj.CloseUI();
	1663	+ listUI.remove(i);
	1664	+ }
	1665	+ }
	1666	+ }
1348	1667
1349	1668	/**
1350	1669	* applyExample
..	..	@@ -1589,7 +1908,7 @@
1589	1908	{
1590	1909	ScreenFit();
1591	1910	} else
1592		- if (source == switchItem)
	1911	+ if (source == switchViewItem)
1593	1912	{
1594	1913	cVector v1 = new cVector();
1595	1914	cVector v2 = new cVector();
..	..	@@ -1598,11 +1917,11 @@
1598	1917	objEditor.cameraView.renderCamera.setAim(v2, v1);
1599	1918	objEditor.cameraView.repaint();
1600	1919	} else
1601		- if (source == rectoidItem)
	1920	+ if (source == rectoidItem \|\| source == boxButton)
1602	1921	{
1603	1922	makeSomething(new Box());
1604	1923	} else
1605		- if (source == particleItem)
	1924	+ if (source == particleItem \|\| source == particlesButton)
1606	1925	{
1607	1926	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1608	1927	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1681,27 +2000,27 @@
1681	2000
1682	2001	makeSomething(obj);
1683	2002	} else
1684		- if (source == gridItem)
	2003	+ if (source == gridItem \|\| source == gridButton)
1685	2004	{
1686	2005	makeSomething(new Grid());
1687	2006	} else
1688		- if (source == ellipsoidItem)
	2007	+ if (source == ellipsoidItem \|\| source == sphereButton)
1689	2008	{
1690	2009	makeSomething(new Sphere());
1691	2010	} else
1692		- if (source == coneItem)
	2011	+ if (source == coneItem \|\| source == coneButton)
1693	2012	{
1694	2013	makeSomething(new Cone());
1695	2014	} else
1696		- if (source == torusItem)
	2015	+ if (source == torusItem \|\| source == torusButton)
1697	2016	{
1698	2017	makeSomething(new Torus());
1699	2018	} else
1700		- if (source == superItem)
	2019	+ if (source == superItem \|\| source == superButton)
1701	2020	{
1702	2021	makeSomething(new Superellipsoid());
1703	2022	} else
1704		- if (source == kleinItem)
	2023	+ if (source == kleinItem \|\| source == kleinButton)
1705	2024	{
1706	2025	makeSomething(new Klein());
1707	2026	} else
..	..	@@ -1721,7 +2040,7 @@
1721	2040	{
1722	2041	makeSomething(new BezierSurface());
1723	2042	} else
1724		- if (source == overlayItem)
	2043	+ if (source == overlayItem \|\| source == overlayButton)
1725	2044	{
1726	2045	/*
1727	2046	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1769,7 +2088,7 @@
1769	2088	s.setup();
1770	2089	makeSomething(s);
1771	2090	} else
1772		- if (source == lightItem)
	2091	+ if (source == lightItem \|\| source == lightButton)
1773	2092	{
1774	2093	makeSomething(new Light());
1775	2094	} else
..	..	@@ -1819,30 +2138,30 @@
1819	2138
1820	2139	group(g);
1821	2140	} else
1822		- if (source == loopItem)
	2141	+ if (source == loopItem \|\| source == loopButton)
1823	2142	{
1824	2143	Composite csg = new GroupLeaf();
1825	2144	csg.count = 5;
1826	2145	group(csg);
1827		- Composite child = new cGroup();
	2146	+ Composite child = new cGroup("Branch");
1828	2147	csg.addChild(child);
1829	2148	child.addChild(csg);
1830	2149	} else
1831	2150	if (source == doubleItem)
1832	2151	{
1833		- Composite csg = new GroupLeaf();
	2152	+ Composite csg = new GroupLeaf("Fork");
1834	2153	csg.count = 5;
1835	2154	group(csg);
1836		- Composite child = new cGroup();
	2155	+ Composite child = new cGroup("Branch A");
1837	2156	csg.addChild(child);
1838	2157	child.addChild(csg);
1839		- child = new cGroup();
	2158	+ child = new cGroup("Branch B");
1840	2159	csg.addChild(child);
1841	2160	child.addChild(csg);
1842	2161	} else
1843	2162	if (source == tripleItem)
1844	2163	{
1845		- Composite csg = new GroupLeaf();
	2164	+ Composite csg = new GroupLeaf("Trident");
1846	2165	csg.count = 4;
1847	2166	group(csg);
1848	2167	Composite child = new cGroup();
..	..	@@ -1854,31 +2173,6 @@
1854	2173	child = new cGroup();
1855	2174	csg.addChild(child);
1856	2175	child.addChild(csg);
1857		- } else
1858		-
1859		- if (source == importGFDItem)
1860		- {
1861		- ImportGFD();
1862		- } else
1863		- if (source == importVRMLX3DItem)
1864		- {
1865		- ImportVRMLX3D();
1866		- } else
1867		- if (source == import3DSItem)
1868		- {
1869		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1870		- } else
1871		- if (source == importOBJItem)
1872		- {
1873		- //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1874		- FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
1875		- browser.setVisible(true);
1876		- String filename = browser.getFile();
1877		- if (filename != null && filename.length() > 0)
1878		- {
1879		- String fullname = browser.getDirectory() + filename;
1880		- makeSomething(ReadOBJ(fullname), true);
1881		- }
1882	2176	} else
1883	2177	if (source == computeAOItem)
1884	2178	{
..	..	@@ -1917,6 +2211,32 @@
1917	2211	{
1918	2212	DumpObject();
1919	2213	} else
	2214	+ if (source == minButton)
	2215	+ {
	2216	+ Minimize();
	2217	+ } else
	2218	+ if (source == maxButton)
	2219	+ {
	2220	+ Maximize();
	2221	+ } else
	2222	+ if (source == fullButton)
	2223	+ {
	2224	+ ToggleFullScreen();
	2225	+ } else
	2226	+ if (source == undoButton)
	2227	+ {
	2228	+ if (!Undo())
	2229	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2230	+ } else
	2231	+ if (source == redoButton)
	2232	+ {
	2233	+ Redo();
	2234	+ } else
	2235	+ if (source == saveButton)
	2236	+ {
	2237	+ if (!Save(true))
	2238	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2239	+ } else
1920	2240	if (source == oneStepButton)
1921	2241	{
1922	2242	Globals.ONESTEP = true;
..	..	@@ -1924,17 +2244,14 @@
1924	2244	} else
1925	2245	if (source == screenfitButton)
1926	2246	{
1927		- //Reload(lastConverter, lastFilename, true);
1928	2247	ScreenFit();
1929	2248	} else
1930	2249	if (source == screenfitpointButton)
1931	2250	{
1932		- //Reload(lastConverter, lastFilename, true);
1933	2251	ScreenFitPoint();
1934	2252	} else
1935	2253	if (source == snapobjectButton)
1936	2254	{
1937		- //Reload(lastConverter, lastFilename, true);
1938	2255	SnapObject();
1939	2256	} else
1940	2257	// if (event.getSource() == recompileButton)
..	..	@@ -1970,6 +2287,14 @@
1970	2287	if (source == cutItem \|\| source == clearButton)
1971	2288	{
1972	2289	loadClipboard(true);
	2290	+ } else
	2291	+ if (source == undoItem)
	2292	+ {
	2293	+ Undo();
	2294	+ } else
	2295	+ if (source == redoItem)
	2296	+ {
	2297	+ Redo();
1973	2298	} else
1974	2299	if (source == duplicateItem)
1975	2300	{
..	..	@@ -2302,9 +2627,9 @@
2302	2627	{
2303	2628	ClearSelection(true);
2304	2629	} else
2305		- if (source == grabItem)
	2630	+ if (source == grabItem \|\| source == groupButton)
2306	2631	{
2307		- group(new cGroup(), true);
	2632	+ group(new cGroup(), false); // true);
2308	2633	} else
2309	2634	if (source == hideItem)
2310	2635	{
..	..	@@ -2322,11 +2647,11 @@
2322	2647	{
2323	2648	makeSomething(new Camera());
2324	2649	} else
2325		- if (source == compositeItem)
	2650	+ if (source == compositeItem \|\| source == compositeButton)
2326	2651	{
2327	2652	group(new Composite());
2328	2653	} else
2329		- if (source == randomItem)
	2654	+ if (source == switchItem \|\| source == switchButton)
2330	2655	{
2331	2656	RandomNode random = new RandomNode();
2332	2657	group(random);
..	..	@@ -2428,7 +2753,7 @@
2428	2753	{
2429	2754	group(new cLinker());
2430	2755	} else
2431		- if (source == textureItem)
	2756	+ if (source == textureItem \|\| source == textureButton)
2432	2757	{
2433	2758	group(new TextureNode());
2434	2759	} else
..	..	@@ -2448,17 +2773,30 @@
2448	2773	{
2449	2774	CastShadow(2);
2450	2775	} else
2451		- if (source == ungroupItem)
	2776	+ if (source == ungroupItem \|\| source == ungroupButton)
2452	2777	{
2453		- //ungroup();
	2778	+ boolean hasRoot = false;
	2779	+
2454	2780	for (int i=0; i<group.selection.size(); i++)
2455	2781	{
2456		- Ungroup(group.selection.get(i));
	2782	+ if (group.selection.get(i) == group)
	2783	+ {
	2784	+ hasRoot = true;
	2785	+ break;
	2786	+ }
2457	2787	}
2458	2788
2459		- ClearSelection(false);
2460		-
2461		- refreshContents();
	2789	+ if (!hasRoot)
	2790	+ {
	2791	+ for (int i=0; i<group.selection.size(); i++)
	2792	+ {
	2793	+ Ungroup(group.selection.get(i));
	2794	+ }
	2795	+
	2796	+ ClearSelection(false);
	2797	+
	2798	+ refreshContents();
	2799	+ }
2462	2800	} else
2463	2801	if (source == genUVItem)
2464	2802	{
..	..	@@ -2470,7 +2808,7 @@
2470	2808	} else
2471	2809	if (source == genNormalsMESHItem)
2472	2810	{
2473		- GenNormals(true); // TODO
	2811	+ GenNormalsMESH();
2474	2812	} else
2475	2813	if (source == genNormalsORGANItem)
2476	2814	{
..	..	@@ -2535,6 +2873,22 @@
2535	2873	if (source == unmarkleavesItem)
2536	2874	{
2537	2875	MarkLeaves(false);
	2876	+ } else
	2877	+ if (source == rewindleavesItem)
	2878	+ {
	2879	+ RewindLeaves(true);
	2880	+ } else
	2881	+ if (source == unrewindleavesItem)
	2882	+ {
	2883	+ RewindLeaves(false);
	2884	+ } else
	2885	+ if (source == randomleavesItem)
	2886	+ {
	2887	+ RandomLeaves(true);
	2888	+ } else
	2889	+ if (source == unrandomleavesItem)
	2890	+ {
	2891	+ RandomLeaves(false);
2538	2892	} else
2539	2893	if (source == flipVItem)
2540	2894	{
..	..	@@ -2770,6 +3124,10 @@
2770	3124	if (source == twoButton)
2771	3125	{
2772	3126	radio.layout = twoButton;
	3127	+
	3128	+ if (CameraPane.FULLSCREEN)
	3129	+ fullscreenLayout = radio.layout;
	3130	+
2773	3131	// bug
2774	3132	//gridPanel.setDividerLocation(1.0);
2775	3133	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2802,10 +3160,31 @@
2802	3160	bigThree.ClearUI();
2803	3161	bigThree.add(centralPanel);
2804	3162	bigThree.FlushUI();
	3163	+
	3164	+ cameraView.requestFocusInWindow();
	3165	+
	3166	+// refreshContents(true);
	3167	+//
	3168	+// try
	3169	+// {
	3170	+// java.awt.Robot bot = new java.awt.Robot();
	3171	+// int mask = InputEvent.BUTTON1_MASK;
	3172	+// bot.mouseMove(100, 100);
	3173	+// bot.mousePress(mask);
	3174	+// bot.mouseRelease(mask);
	3175	+// }
	3176	+// catch (Exception e)
	3177	+// {
	3178	+//
	3179	+// }
	3180	+
2805	3181	} else
2806	3182	if (source == threeButton)
2807	3183	{
2808	3184	radio.layout = threeButton;
	3185	+
	3186	+ if (CameraPane.FULLSCREEN)
	3187	+ fullscreenLayout = radio.layout;
2809	3188
2810	3189	// bigThree.remove(scenePanel);
2811	3190	// bigThree.remove(centralPanel);
..	..	@@ -2838,10 +3217,15 @@
2838	3217	bigThree.add(centralPanel);
2839	3218	bigThree.add(XYZPanel);
2840	3219	bigThree.FlushUI();
	3220	+
	3221	+ cameraView.requestFocusInWindow();
2841	3222	} else
2842	3223	if (source == fourButton)
2843	3224	{
2844	3225	radio.layout = fourButton;
	3226	+
	3227	+ if (CameraPane.FULLSCREEN)
	3228	+ fullscreenLayout = radio.layout;
2845	3229
2846	3230	// bigThree.remove(scenePanel);
2847	3231	// bigThree.remove(centralPanel);
..	..	@@ -2873,10 +3257,15 @@
2873	3257	bigThree.ClearUI();
2874	3258	bigThree.add(scenePanel);
2875	3259	bigThree.FlushUI();
	3260	+
	3261	+ cameraView.requestFocusInWindow();
2876	3262	} else
2877	3263	if (source == sixButton)
2878	3264	{
2879	3265	radio.layout = sixButton;
	3266	+
	3267	+ if (CameraPane.FULLSCREEN)
	3268	+ fullscreenLayout = radio.layout;
2880	3269
2881	3270	// bigThree.remove(scenePanel);
2882	3271	// bigThree.remove(centralPanel);
..	..	@@ -2909,10 +3298,15 @@
2909	3298	bigThree.add(scenePanel);
2910	3299	bigThree.add(centralPanel);
2911	3300	bigThree.FlushUI();
	3301	+
	3302	+ cameraView.requestFocusInWindow();
2912	3303	} else
2913	3304	if (source == sevenButton)
2914	3305	{
2915	3306	radio.layout = sevenButton;
	3307	+
	3308	+ if (CameraPane.FULLSCREEN)
	3309	+ fullscreenLayout = radio.layout;
2916	3310
2917	3311	// bigThree.remove(scenePanel);
2918	3312	// bigThree.remove(centralPanel);
..	..	@@ -2946,6 +3340,8 @@
2946	3340	bigThree.add(centralPanel);
2947	3341	bigThree.add(XYZPanel);
2948	3342	bigThree.FlushUI();
	3343	+
	3344	+ cameraView.requestFocusInWindow();
2949	3345	} else
2950	3346	if (source == rootButton)
2951	3347	{
..	..	@@ -2957,6 +3353,7 @@
2957	3353	EditObject(obj);
2958	3354	}
2959	3355
	3356	+ cameraView.requestFocusInWindow();
2960	3357	refreshContents(true);
2961	3358	} else
2962	3359	if (source == closeButton)
..	..	@@ -2966,22 +3363,37 @@
2966	3363	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2967	3364	{
2968	3365	ab = (cRadio)e.nextElement();
2969		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3366	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2970	3367	{
	3368	+ // Patch to avoid bug with transparency.
	3369	+ if (!ab.hadMaterial)
	3370	+ {
	3371	+ ab.object.material = null;
	3372	+ }
	3373	+
2971	3374	buttonGroup.remove(ab);
2972	3375	radioPanel.remove(ab);
2973	3376
2974		- ab.GetObject().editWindow = null;
	3377	+ //ab.GetObject().editWindow = null;
	3378	+ ab.GetObject().manipWindow = null;
2975	3379	// ab.GetObject().objectUI = null; // ?????????
2976	3380
2977	3381	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2978	3382	break;
2979	3383	}
2980	3384	}
	3385	+
	3386	+ cameraView.requestFocusInWindow();
2981	3387	refreshContents(true);
2982	3388	} else
2983	3389	if (source == editItem \|\| source == editButton)
2984	3390	{
	3391	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3392	+ {
	3393	+ Object3D child = (Object3D)e.nextElement();
	3394	+ child.pinned = true;
	3395	+ }
	3396	+
2985	3397	EditSelection(false);
2986	3398	} else
2987	3399	if (source == uneditButton)
..	..	@@ -2991,10 +3403,11 @@
2991	3403	Object3D child = (Object3D)e.nextElement();
2992	3404	if(child.editWindow != null)
2993	3405	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3406	+ child.pinned = false;
2994	3407	child.CloseUI();
2995	3408	listUI.remove(child);
2996	3409
2997		- child.editWindow = null; // ???????????
	3410	+ //child.editWindow = null; // ???????????
2998	3411	}
2999	3412	objEditor.ctrlPanel.FlushUI();
3000	3413	//objEditor.jTree.clearSelection();
..	..	@@ -3007,6 +3420,7 @@
3007	3420	//copy.ClearUI();
3008	3421	for (Object3D obj : listUI)
3009	3422	{
	3423	+ obj.pinned = false;
3010	3424	obj.CloseUI();
3011	3425	}
3012	3426	listUI.clear();
..	..	@@ -3016,7 +3430,7 @@
3016	3430	{
3017	3431	assert(copy == group);
3018	3432
3019		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3433	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3020	3434
3021	3435	for (Object3D obj : listUI)
3022	3436	{
..	..	@@ -3081,7 +3495,9 @@
3081	3495	sideView.object = group;
3082	3496	}
3083	3497
3084		-// fix "+" issue group.editWindow = this;
	3498	+// fix "+" issue
	3499	+ //group.editWindow = this;
	3500	+ group.manipWindow = this;
3085	3501
3086	3502	/*
3087	3503	currentLayout = radio.layout;
..	..	@@ -3089,13 +3505,33 @@
3089	3505	currentLayout = sevenButton;
3090	3506	*/
3091	3507	radio.layout.doClick();
	3508	+
	3509	+ ClearUnpinned();
	3510	+ SetPinStates(group.selection.size() > 0);
	3511	+ if (group.selection.size() == 1)
	3512	+ EditSelection(false);
3092	3513	keepparent = group.parent;
3093	3514	// PARENT = NULL or not???
3094	3515	//group.parent = null; // ROOT
3095	3516	//group.attributes = -1;
3096	3517	ResetModel();
	3518	+
	3519	+ cameraView.requestFocusInWindow();
3097	3520	refreshContents(true);
3098		- }
	3521	+ } else if (event.getSource() == editCameraItem)
	3522	+ {
	3523	+ cameraView.ProtectCamera();
	3524	+ cameraView.repaint();
	3525	+ return;
	3526	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3527	+ {
	3528	+ cameraView.RevertCamera();
	3529	+ cameraView.repaint();
	3530	+ return;
	3531	+ // } else if (event.getSource() == textureButton)
	3532	+ // {
	3533	+ // return; // true;
	3534	+ }
3099	3535	else
3100	3536	{
3101	3537	//return super.action(event, arg);
..	..	@@ -3104,7 +3540,6 @@
3104	3540	}
3105	3541
3106	3542	boolean useclient = false;
3107		- cRadio radio;
3108	3543
3109	3544	void ToggleRoot()
3110	3545	{
..	..	@@ -3343,7 +3778,8 @@
3343	3778
3344	3779	int size = obj.MemorySize();
3345	3780
3346		- System.err.println((size/1024) + " KB is the size of " + obj);
	3781	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3782	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3347	3783	}
3348	3784	}
3349	3785	catch (Exception e)
..	..	@@ -3424,6 +3860,13 @@
3424	3860	void GenNormals(boolean crease)
3425	3861	{
3426	3862	group.GenNormalsS(crease);
	3863	+
	3864	+ refreshContents();
	3865	+ }
	3866	+
	3867	+ void GenNormalsMESH()
	3868	+ {
	3869	+ group.GenNormalsMeshS();
3427	3870
3428	3871	refreshContents();
3429	3872	}
..	..	@@ -4051,6 +4494,18 @@
4051	4494	refreshContents();
4052	4495	}
4053	4496
	4497	+ void RewindLeaves(boolean hide)
	4498	+ {
	4499	+ group.selection.RewindLeaves(hide);
	4500	+ refreshContents();
	4501	+ }
	4502	+
	4503	+ void RandomLeaves(boolean hide)
	4504	+ {
	4505	+ group.selection.RandomLeaves(hide);
	4506	+ refreshContents();
	4507	+ }
	4508	+
4054	4509	void SetTexRes(int tr)
4055	4510	{
4056	4511	group.selection.SetTexRes(tr);
..	..	@@ -4122,10 +4577,6 @@
4122	4577	// }
4123	4578	// }
4124	4579
4125		- static boolean allparams = true;
4126		-
4127		- static Vector<Object3D> listUI = new Vector<Object3D>();
4128		-
4129	4580	void EditSelection(boolean newWindow)
4130	4581	{
4131	4582	// aConstraints.gridy = 0;
..	..	@@ -4133,7 +4584,7 @@
4133	4584	{
4134	4585	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4135	4586	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4136		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4587	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4137	4588
4138	4589	Object3D elem = (Object3D)group.selection.elementAt(i);
4139	4590	if(elem != group \|\| !newWindow)
..	..	@@ -4218,7 +4669,8 @@
4218	4669	//new Exception().printStackTrace();
4219	4670
4220	4671	freezemodel = true;
4221		-
	4672	+ ClearUnpinned();
	4673	+
4222	4674	/**/
4223	4675	//switch (event.id)
4224	4676	{
..	..	@@ -4226,7 +4678,6 @@
4226	4678	//case 702: // Event.LIST_DESELECT
4227	4679	group.deselectAll();
4228	4680	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4229		- objEditor.ClearInfo(); // .GetMaterial());
4230	4681	if (tps != null)
4231	4682	{
4232	4683	for (int i=0; i < tps.length; i++)
..	..	@@ -4235,10 +4686,8 @@
4235	4686
4236	4687	//if (child.parent != null)
4237	4688	//child.parent.addSelectee(child);
	4689	+ objEditor.SetMaterial(child);
4238	4690	group.addSelectee(child);
4239		- objEditor.SetMaterial(child); // .GetMaterial());
4240		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4241		- System.err.println("info : " + child.GetPath());
4242	4691	}
4243	4692	}
4244	4693	// else
..	..	@@ -4248,20 +4697,28 @@
4248	4697	// System.err.println("info : " + group.GetPath());
4249	4698	// }
4250	4699
4251		- objEditor.SetText(); // jan 2014
4252		-
4253		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4700	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4254	4701	CameraPane.flash = true;
4255	4702
4256		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4703	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4257	4704	// a camera
4258	4705	{
4259		- CameraPane.camerachangeframe = 0; // don't refuse it
4260		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4706	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	4707	+ {
	4708	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4709	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4710	+ }
4261	4711	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4262	4712	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4263	4713	}
4264	4714
	4715	+ if (tps != null && tps.length == 1)
	4716	+ {
	4717	+ EditSelection(false);
	4718	+ }
	4719	+
	4720	+ SetPinStates(tps != null && tps.length > 0);
	4721	+
4265	4722	refreshContents();
4266	4723	//return true;
4267	4724	}
..	..	@@ -4270,6 +4727,35 @@
4270	4727
4271	4728	freezemodel = false;
4272	4729	}
	4730	+
	4731	+ void SetPinStates(boolean enabled)
	4732	+ {
	4733	+ editButton.setEnabled(enabled);
	4734	+ uneditButton.setEnabled(enabled);
	4735	+ unselectButton.setEnabled(enabled);
	4736	+ flashSelectionButton.setEnabled(enabled);
	4737	+ }
	4738	+
	4739	+ void refreshContents(boolean cp)
	4740	+ {
	4741	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4742	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	4743	+ {
	4744	+ objEditor.ClearInfo(); // .GetMaterial());
	4745	+
	4746	+ for (int i=0; i < group.selection.Size(); i++)
	4747	+ {
	4748	+ Object3D child = (Object3D) group.selection.get(i);
	4749	+
	4750	+ objEditor.AddInfo(child, this, true);
	4751	+ System.err.println("info : " + child.GetPath());
	4752	+ }
	4753	+
	4754	+ objEditor.SetText(); // jan 2014
	4755	+ }
	4756	+
	4757	+ super.refreshContents(cp);
	4758	+ }
4273	4759
4274	4760	void linkSomething(Object3D thing)
4275	4761	{
..	..	@@ -4341,6 +4827,7 @@
4341	4827	{
4342	4828	if (group.selection.isEmpty())
4343	4829	return;
	4830	+
4344	4831	Grafreed.clipboardIsTempGroup = false;
4345	4832	Composite tGroup = null;
4346	4833	if (group.selection.size() > 0) // 1)
..	..	@@ -4351,6 +4838,8 @@
4351	4838
4352	4839	if (cut)
4353	4840	{
	4841	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	4842	+// Save();
4354	4843	//int indices[] = jList.getSelectedIndices();
4355	4844	//for (int i = indices.length - 1; i >= 0; i--)
4356	4845	//jList.remove(indices[i]);
..	..	@@ -4440,8 +4929,10 @@
4440	4929	}
4441	4930
4442	4931	}
	4932	+
4443	4933	if (Grafreed.clipboardIsTempGroup)
4444	4934	Grafreed.clipboard = tGroup;
	4935	+
4445	4936	if (cut)
4446	4937	{
4447	4938	ResetModel();
..	..	@@ -4451,6 +4942,10 @@
4451	4942
4452	4943	void paste(boolean expand)
4453	4944	{
	4945	+ if (Globals.SAVEONMAKE)
	4946	+ Save();
	4947	+ boolean keep = Globals.SAVEONMAKE;
	4948	+ Globals.SAVEONMAKE = false;
4454	4949	// if (GrafreeD.clipboard == null)
4455	4950	// return;
4456	4951	boolean first = true;
..	..	@@ -4510,6 +5005,7 @@
4510	5005	Grafreed.clipboard.get(0).parent = keepparent;
4511	5006	}
4512	5007
	5008	+ Globals.SAVEONMAKE = keep;
4513	5009	ResetModel();
4514	5010	refreshContents();
4515	5011	}
..	..	@@ -4645,6 +5141,10 @@
4645	5141
4646	5142	void group(Object3D csg, boolean grab)
4647	5143	{
	5144	+ if (Globals.SAVEONMAKE)
	5145	+ Save();
	5146	+ boolean keep = Globals.SAVEONMAKE;
	5147	+ Globals.SAVEONMAKE = false;
4648	5148	if (//false) // why??
4649	5149	!group.selection.isEmpty())
4650	5150	{
..	..	@@ -4758,10 +5258,15 @@
4758	5258	//node.add(csg);
4759	5259	//makeSomething(node);
4760	5260	makeSomething(csg);
	5261	+ Globals.SAVEONMAKE = keep;
4761	5262	}
4762	5263
4763	5264	void Ungroup(Object3D g)
4764	5265	{
	5266	+ if (Globals.SAVEONMAKE)
	5267	+ Save();
	5268	+ boolean keep = Globals.SAVEONMAKE;
	5269	+ Globals.SAVEONMAKE = false;
4765	5270	if (g instanceof HiddenObject)
4766	5271	{
4767	5272	HiddenObject h = (HiddenObject) g;
..	..	@@ -4778,6 +5283,7 @@
4778	5283	objEditor.makeSomething(g.get(i), false);
4779	5284	}
4780	5285	}
	5286	+ Globals.SAVEONMAKE = keep;
4781	5287	}
4782	5288
4783	5289	void ungroup()
..	..	@@ -4973,21 +5479,6 @@
4973	5479	}
4974	5480	*/
4975	5481
4976		- void ImportGFD()
4977		- {
4978		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4979		- browser.show();
4980		- String filename = browser.getFile();
4981		- if (filename != null && filename.length() > 0)
4982		- {
4983		- String fullname = browser.getDirectory() + filename;
4984		-
4985		- //Object3D readobj =
4986		- objEditor.ReadGFD(fullname, objEditor);
4987		- //makeSomething(readobj);
4988		- }
4989		- }
4990		-
4991	5482	/*
4992	5483	public void Callback(Object obj)
4993	5484	{
..	..	@@ -5011,23 +5502,6 @@
5011	5502	}
5012	5503	*/
5013	5504
5014		- void ImportVRMLX3D()
5015		- {
5016		- if (Grafreed.standAlone)
5017		- {
5018		- /**/
5019		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
5020		- browser.show();
5021		- String filename = browser.getFile();
5022		- if (filename != null && filename.length() > 0)
5023		- {
5024		- String fullname = browser.getDirectory() + filename;
5025		- LoadVRMLX3D(fullname);
5026		- }
5027		- /**/
5028		- }
5029		- }
5030		-
5031	5505	String GetFile(String dialogName)
5032	5506	{
5033	5507	if (Grafreed.standAlone)
..	..	@@ -5098,7 +5572,28 @@
5098	5572	cButton clearpanelButton;
5099	5573	cButton unselectButton;
5100	5574
	5575	+ cButton restoreCameraButton;
	5576	+
	5577	+ cButton saveButton;
5101	5578	cButton oneStepButton;
	5579	+
	5580	+ cButton groupButton;
	5581	+ cButton ungroupButton;
	5582	+ cButton compositeButton;
	5583	+ cButton switchButton;
	5584	+ cButton loopButton;
	5585	+ cButton textureButton;
	5586	+
	5587	+ cButton gridButton;
	5588	+ cButton boxButton;
	5589	+ cButton sphereButton;
	5590	+ cButton coneButton;
	5591	+ cButton torusButton;
	5592	+ cButton superButton;
	5593	+ cButton kleinButton;
	5594	+ cButton particlesButton;
	5595	+ cButton overlayButton;
	5596	+ cButton lightButton;
5102	5597
5103	5598	cButton screenfitButton;
5104	5599	cButton screenfitpointButton;
..	..	@@ -5111,14 +5606,6 @@
5111	5606
5112	5607	cButton setsupportButton;
5113	5608
5114		- cButton twoButton;
5115		- cButton sixButton;
5116		- cButton threeButton;
5117		- cButton sevenButton;
5118		- cButton fourButton; // full panel
5119		- cButton oneButton; // full XYZ
5120		- //cButton currentLayout;
5121		-
5122	5609	//
5123	5610	//Composite
5124	5611	Object3D // to do !!
..	..	@@ -5128,9 +5615,11 @@
5128	5615	//JTree jTree;
5129	5616	private MenuItem lookAtItem;
5130	5617	private MenuItem lookFromItem;
5131		- private MenuItem switchItem;
	5618	+ private MenuItem switchViewItem;
5132	5619	private MenuItem cutItem;
5133		- private MenuItem duplicateItem;
	5620	+ private MenuItem undoItem;
	5621	+ private MenuItem redoItem;
	5622	+ private JMenuItem duplicateItem;
5134	5623	private MenuItem cloneItem;
5135	5624	private MenuItem cloneSupportItem;
5136	5625	private MenuItem overwriteGeoItem;
..	..	@@ -5193,6 +5682,10 @@
5193	5682	private MenuItem showleavesItem;
5194	5683	private MenuItem markleavesItem;
5195	5684	private MenuItem unmarkleavesItem;
	5685	+ private MenuItem rewindleavesItem;
	5686	+ private MenuItem unrewindleavesItem;
	5687	+ private MenuItem randomleavesItem;
	5688	+ private MenuItem unrandomleavesItem;
5196	5689
5197	5690	private MenuItem flipVItem;
5198	5691	private MenuItem unflipVItem;
..	..	@@ -5214,7 +5707,7 @@
5214	5707	private MenuItem frontItem;
5215	5708	private MenuItem cameraItem;
5216	5709	private MenuItem compositeItem;
5217		- private MenuItem randomItem;
	5710	+ private MenuItem switchItem;
5218	5711	private MenuItem physicsItem;
5219	5712	private MenuItem frameselectorItem;
5220	5713	private MenuItem scriptNodeItem;
..	..	@@ -5276,11 +5769,6 @@
5276	5769	private MenuItem doubleItem;
5277	5770	private MenuItem tripleItem;
5278	5771
5279		- private MenuItem importGFDItem;
5280		- private MenuItem importVRMLX3DItem;
5281		- private MenuItem import3DSItem;
5282		- private MenuItem importOBJItem;
5283		-
5284	5772	private MenuItem computeAOItem;
5285	5773	private MenuItem recompileItem;
5286	5774	private MenuItem editScriptItem;
..	..	@@ -5290,4 +5778,8 @@
5290	5778	private MenuItem analyzeItem;
5291	5779	private MenuItem dumpItem;
5292	5780	//boolean freezemodel = false;
	5781	+
	5782	+ Menu cameraMenu;
	5783	+ MenuItem editCameraItem;
	5784	+ MenuItem restoreCameraItem;
5293	5785	}