~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -60,6 +60,12 @@
60	60	this.copy = this.group = group;
61	61	//selectees = this.group.selectees;
62	62
	63	+ if (copy.versions == null)
	64	+ {
	65	+ copy.versions = new byte[100][];
	66	+ copy.versionindex = -1;
	67	+ }
	68	+
63	69	if(ui)
64	70	SetupUI(objEditor);
65	71	}
..	..	@@ -74,7 +80,13 @@
74	80	this.copy = this.group = copy;
75	81	//selectees = this.group.selectees;
76	82
77		- SetupMenu2(objEditor);
	83	+ if (copy.versions == null)
	84	+ {
	85	+ copy.versions = new byte[100][];
	86	+ copy.versionindex = -1;
	87	+ }
	88	+
	89	+ SetupMenu2(this); //objEditor);
78	90	SetupUI2(objEditor);
79	91	objEditor.SetupUI(true);
80	92	SetupViews(objEditor);
..	..	@@ -84,6 +96,10 @@
84	96
85	97	void CloneSelection(boolean supports)
86	98	{
	99	+ if (Globals.REPLACEONMAKE)
	100	+ Save();
	101	+ boolean keep = Globals.REPLACEONMAKE;
	102	+ Globals.REPLACEONMAKE = false;
87	103	// Object3D keep = GrafreeD.clipboard;
88	104	//Object3D obj;
89	105	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,6 +110,7 @@
94	110
95	111	makeSomething(clone, i==group.selection.size()-1);
96	112	}
	113	+ Globals.REPLACEONMAKE = keep;
97	114	}
98	115
99	116	void CloneClipboard(boolean supports)
..	..	@@ -148,28 +165,21 @@
148	165
149	166	//JTextField nameField;
150	167
151		- void SetupMenu2(ObjEditor oe)
	168	+ void SetupMenu2(GroupEditor oe)
152	169	{
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		-
	170	+ oe.jTree = new cTree();
	171	+
168	172	Menu menu;
169	173	oe.menuBar.add(menu = new Menu("Edit"));
170	174	//editItem = menu.add(new MenuItem("Edit"));
171	175	//editItem.addActionListener(this);
172		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	176	+
	177	+// undoItem = menu.add(new MenuItem("Undo"));
	178	+// undoItem.addActionListener(this);
	179	+// redoItem = menu.add(new MenuItem("Redo"));
	180	+// redoItem.addActionListener(this);
	181	+// menu.add("-");
	182	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
173	183	duplicateItem.addActionListener(this);
174	184	cloneItem = menu.add(new MenuItem("Clone"));
175	185	cloneItem.addActionListener(this);
..	..	@@ -185,7 +195,6 @@
185	195	copyItem.addActionListener(this);
186	196	pasteItem = menu.add(new MenuItem("Paste"));
187	197	pasteItem.addActionListener(this);
188		- menu.add("-");
189	198
190	199	menu.add("-");
191	200	pasteIntoItem = menu.add(new MenuItem("Paste into"));
..	..	@@ -197,8 +206,8 @@
197	206	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
198	207	// pasteExpandItem.addActionListener(this);
199	208	menu.add("-");
200		- clearItem = menu.add(new MenuItem("Clear"));
201		- clearItem.addActionListener(this);
	209	+ deleteItem = menu.add(new MenuItem("Delete"));
	210	+ deleteItem.addActionListener(this);
202	211
203	212	if (Globals.ADVANCED)
204	213	{
..	..	@@ -206,7 +215,94 @@
206	215	clearAllItem = menu.add(new MenuItem("Clear All"));
207	216	clearAllItem.addActionListener(this);
208	217	}
	218	+
	219	+ menuBar.add(cameraMenu = new Menu("View"));
	220	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	221	+ //zBufferItem.addActionListener(this);
	222	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	223	+ //normalLensItem.addActionListener(this);
	224	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	225	+ restoreCameraItem.addActionListener(this);
	226	+
	227	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	228	+// toggleFullScreenItem.addItemListener(this);
	229	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	230	+// cameraMenu.add("-");
	231	+//
	232	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	233	+// toggleTextureItem.addItemListener(this);
	234	+// toggleTextureItem.setState(CameraPane.textureon);
	235	+//
	236	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	237	+// toggleSwitchItem.addItemListener(this);
	238	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	239	+
	240	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	241	+ toggleHandleItem.addItemListener(this);
	242	+ toggleHandleItem.setState(CameraPane.HANDLES);
	243	+
	244	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	245	+ togglePaintItem.addItemListener(this);
	246	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	247	+
	248	+ if (Globals.ADVANCED)
	249	+ {
	250	+ cameraMenu.add("-");
	251	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	252	+ toggleLiveItem.addItemListener(this);
	253	+ toggleLiveItem.setState(Globals.isLIVE());
209	254
	255	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	256	+ stepItem.addActionListener(this);
	257	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	258	+ // toggleDLItem.addItemListener(this);
	259	+ // toggleDLItem.setState(false);
	260	+
	261	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	262	+ toggleRenderItem.addItemListener(this);
	263	+ toggleRenderItem.setState(!CameraPane.frozen);
	264	+
	265	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	266	+ toggleDebugItem.addItemListener(this);
	267	+ toggleDebugItem.setState(Globals.DEBUG);
	268	+
	269	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	270	+ toggleFrustumItem.addItemListener(this);
	271	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	272	+
	273	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	274	+ toggleFootContactItem.addItemListener(this);
	275	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	276	+
	277	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	278	+ toggleTimelineItem.addItemListener(this);
	279	+ }
	280	+
	281	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	282	+// toggleRootItem.addItemListener(this);
	283	+// toggleRootItem.setState(false);
	284	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	285	+// animationItem.addItemListener(this);
	286	+// animationItem.setState(CameraPane.ANIMATION);
	287	+ cameraMenu.add("-");
	288	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	289	+ editCameraItem.addActionListener(this);
	290	+
	291	+ if (Globals.ADVANCED)
	292	+ {
	293	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	294	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	295	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	296	+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	297	+ oe.cameraMenu.add("-");
	298	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	299	+ openWindowItem.addActionListener(this);
	300	+ editLeafItem.addActionListener(this);
	301	+ lookAtItem.addActionListener(this);
	302	+ //lookFromItem.addActinoListener(this);
	303	+ //switchViewItem.addActionListener(this);
	304	+ }
	305	+
210	306	oe.menuBar.add(menu = new Menu("Setting"));
211	307	if (Globals.ADVANCED)
212	308	{
..	..	@@ -249,21 +345,29 @@
249	345	}
250	346
251	347	oe.menuBar.add(menu = new Menu("Group"));
252		- grabItem = menu.add(new MenuItem("Grab"));
253		- grabItem.addActionListener(this);
	348	+// grabItem = menu.add(new MenuItem("Grab"));
	349	+// grabItem.addActionListener(this);
254	350	backItem = menu.add(new MenuItem("Back"));
255	351	backItem.addActionListener(this);
256	352	frontItem = menu.add(new MenuItem("Front"));
257	353	frontItem.addActionListener(this);
258		- compositeItem = menu.add(new MenuItem("Composite"));
259		- compositeItem.addActionListener(this);
	354	+// compositeItem = menu.add(new MenuItem("Composite"));
	355	+// compositeItem.addActionListener(this);
	356	+
	357	+ if (Globals.ADVANCED)
	358	+ {
260	359	hideItem = menu.add(new MenuItem("Hidden Group"));
261	360	hideItem.addActionListener(this);
	361	+ }
262	362	ungroupItem = menu.add(new MenuItem("Ungroup"));
263	363	ungroupItem.addActionListener(this);
264		- menu.add("-");
265		- randomItem = menu.add(new MenuItem("Switch node"));
266		- randomItem.addActionListener(this);
	364	+
	365	+// menu.add("-");
	366	+//
	367	+// switchItem = menu.add(new MenuItem("Switch node"));
	368	+// switchItem.addActionListener(this);
	369	+ if (Globals.ADVANCED)
	370	+ {
267	371	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
268	372	switchGeoItem.addActionListener(this);
269	373	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -271,8 +375,6 @@
271	375	morphItem = menu.add(new MenuItem("Morph Group"));
272	376	morphItem.addActionListener(this);
273	377
274		- if (Globals.ADVANCED)
275		- {
276	378	menu.add("-");
277	379	physicsItem = menu.add(new MenuItem("Physics"));
278	380	physicsItem.addActionListener(this);
..	..	@@ -280,30 +382,29 @@
280	382	frameselectorItem.addActionListener(this);
281	383	scriptNodeItem = menu.add(new MenuItem("Script Node"));
282	384	scriptNodeItem.addActionListener(this);
283		- cameraItem = menu.add(new MenuItem("Camera"));
284		- cameraItem.addActionListener(this);
285	385	}
286	386
287	387	oe.menuBar.add(menu = new Menu("Object"));
288		- textureItem = menu.add(new MenuItem("Texture"));
289		- textureItem.addActionListener(this);
	388	+// textureItem = menu.add(new MenuItem("Texture"));
	389	+// textureItem.addActionListener(this);
290	390	billboardItem = menu.add(new MenuItem("Billboard"));
291	391	billboardItem.addActionListener(this);
292	392	csgItem = menu.add(new MenuItem("CSG"));
293	393	csgItem.addActionListener(this);
294		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	394	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
295	395	shadowXItem.addActionListener(this);
296		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	396	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
297	397	shadowYItem.addActionListener(this);
298		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	398	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
299	399	shadowZItem.addActionListener(this);
	400	+ attributeItem = menu.add(new MenuItem("Attribute"));
	401	+ attributeItem.addActionListener(this);
	402	+
300	403	if (Globals.ADVANCED)
301	404	{
302	405	menu.add("-");
303	406	linkerItem = menu.add(new MenuItem("Linker"));
304	407	linkerItem.addActionListener(this);
305		- attributeItem = menu.add(new MenuItem("Attribute"));
306		- attributeItem.addActionListener(this);
307	408	templateItem = menu.add(new MenuItem("Template"));
308	409	templateItem.addActionListener(this);
309	410	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -332,7 +433,7 @@
332	433	genNormalsMESHItem.addActionListener(this);
333	434	if (Globals.ADVANCED)
334	435	{
335		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	436	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
336	437	genNormalsMINEItem.addActionListener(this);
337	438	}
338	439	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -392,6 +493,14 @@
392	493	markleavesItem.addActionListener(this);
393	494	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
394	495	unmarkleavesItem.addActionListener(this);
	496	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	497	+ rewindleavesItem.addActionListener(this);
	498	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	499	+ unrewindleavesItem.addActionListener(this);
	500	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	501	+ randomleavesItem.addActionListener(this);
	502	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	503	+ unrandomleavesItem.addActionListener(this);
395	504	menu.add("-");
396	505	flipVItem = menu.add(new MenuItem("Flip V"));
397	506	flipVItem.addActionListener(this);
..	..	@@ -443,25 +552,25 @@
443	552	oe.menuBar.add(menu = new Menu("Insert"));
444	553	buildCreateMenu(menu);
445	554
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	555	oe.menuBar.add(menu = new Menu("Tools"));
460	556	buildToolsMenu(menu);
461	557	}
462	558
	559	+
463	560	void SetupUI2(ObjEditor oe)
464	561	{
	562	+ // June 2019
	563	+ if (oe == null)
	564	+ {
	565	+ //super.SetupUI2(this);
	566	+ //return;
	567	+ }
	568	+
	569	+ if (copy != group)
	570	+ {
	571	+ //super.SetupUI2(this);
	572	+ }
	573	+
465	574	//new Exception().printStackTrace();
466	575
467	576	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -490,27 +599,79 @@
490	599	oe.radioPanel.add(dummyButton);
491	600	oe.buttonGroup.add(dummyButton);
492	601	*/
	602	+ cGridBag copyOptionsPanel = new cGridBag();
	603	+
	604	+ copyOptionsPanel.preferredHeight = 1;
	605	+
493	606	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
494	607
495		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	608	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	609	+ //minButton.setToolTipText("Minimize window");
	610	+ //minButton.addActionListener(this);
	611	+
	612	+ if (Globals.ADVANCED)
	613	+ {
	614	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	615	+ maxButton.setToolTipText("Maximize window");
	616	+ maxButton.addActionListener(this);
	617	+ }
	618	+
	619	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	620	+ fullButton.setToolTipText("Full-screen window");
	621	+ fullButton.addActionListener(this);
	622	+
	623	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	624	+ screenfitButton.setToolTipText("Screen fit");
	625	+ screenfitButton.addActionListener(this);
	626	+
	627	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	628	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	629	+ restoreCameraButton.addActionListener(this);
	630	+
	631	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	632	+ saveButton.setToolTipText("New version");
	633	+ saveButton.addActionListener(this);
	634	+
	635	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	636	+ undoButton.setToolTipText("Previous version");
	637	+ undoButton.addActionListener(this);
	638	+ undoButton.setEnabled(false);
	639	+
	640	+ cGridBag updown = new cGridBag().setVertical(true);
	641	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	642	+ restoreButton.setToolTipText("Restore current");
	643	+ restoreButton.addActionListener(this);
	644	+ restoreButton.setEnabled(false);
	645	+
	646	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	647	+ replaceButton.setToolTipText("Replace current");
	648	+ replaceButton.addActionListener(this);
	649	+ replaceButton.setEnabled(false);
	650	+
	651	+ copyOptionsPanel.add(updown);
	652	+
	653	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	654	+ redoButton.setToolTipText("Next version");
	655	+ redoButton.addActionListener(this);
	656	+ redoButton.setEnabled(false);
	657	+
	658	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
496	659	liveCB.setToolTipText("Enable animation");
497	660	liveCB.addItemListener(this);
498	661
499		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	662	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
500	663	oneStepButton.setToolTipText("Animate one step forward");
501	664	oneStepButton.addActionListener(this);
502	665
503		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	666	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
504	667	fastCB.setToolTipText("Fast mode");
505	668	fastCB.addItemListener(this);
506	669
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);
	670	+ //oe.toolboxPanel.Return();
	671	+
	672	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	673	+// trackCB.setToolTipText("Enable tracking");
	674	+// trackCB.addItemListener(this);
514	675
515	676	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
516	677	// screenfitpointButton.addActionListener(this);
..	..	@@ -522,65 +683,146 @@
522	683	snapobjectButton.setToolTipText("Snap Object");
523	684	}
524	685
525		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
526		- flashSelectionButton.setToolTipText("Show selection");
527		- flashSelectionButton.addActionListener(this);
	686	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
528	687
529		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
530		-
531		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
532		- twoButton.setToolTipText("Show center view only");
533		- twoButton.addActionListener(this);
534		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	688	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
535	689	fourButton.addActionListener(this);
536	690	fourButton.setToolTipText("Show left panel only");
537		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
538		- sixButton.setToolTipText("2-column layout left");
	691	+
	692	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	693	+ twoButton.setToolTipText("Show right view only");
	694	+ twoButton.addActionListener(this);
	695	+ this.fullscreenLayout = twoButton;
	696	+
	697	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	698	+ sixButton.setToolTipText("Show left and right");
539	699	sixButton.addActionListener(this);
540		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
541		- threeButton.setToolTipText("2-column layout right");
542		- threeButton.addActionListener(this);
543		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
544		- sevenButton.setToolTipText("3-column layout");
545		- sevenButton.addActionListener(this);
	700	+// oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	701	+// threeButton.setToolTipText("2-column layout right");
	702	+// threeButton.addActionListener(this);
	703	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	704	+// sevenButton.setToolTipText("3-column layout");
	705	+// sevenButton.addActionListener(this);
546	706	//
547	707
548		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
549		- rootButton.setToolTipText("Edit selection in new tab");
	708	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	709	+ rootButton.setToolTipText("Open selection in new tab");
550	710	rootButton.addActionListener(this);
551	711
552		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	712	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
553	713	closeButton.setToolTipText("Close tab");
554	714	closeButton.addActionListener(this);
555	715	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
556	716	//clearButton.addActionListener(this);
557		-
558		- cGridBag commandsPanel = new cGridBag();
	717	+
	718	+ // INSERT
	719	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	720	+ gridButton.setToolTipText("Create grid");
	721	+ gridButton.addActionListener(this);
	722	+
	723	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	724	+ boxButton.setToolTipText("Create box");
	725	+ boxButton.addActionListener(this);
	726	+
	727	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	728	+ sphereButton.setToolTipText("Create sphere");
	729	+ sphereButton.addActionListener(this);
	730	+
	731	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	732	+ coneButton.setToolTipText("Create cone");
	733	+ coneButton.addActionListener(this);
	734	+
	735	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	736	+ torusButton.setToolTipText("Create torus");
	737	+ torusButton.addActionListener(this);
	738	+
	739	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	740	+ superButton.setToolTipText("Create superellipsoid");
	741	+ superButton.addActionListener(this);
	742	+
	743	+ if (Globals.ADVANCED)
	744	+ {
	745	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	746	+ kleinButton.setToolTipText("Create Klein bottle");
	747	+ kleinButton.addActionListener(this);
	748	+ }
559	749
560		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
561		- editButton.setToolTipText("Edit selection");
	750	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	751	+ particlesButton.setToolTipText("Create particle system");
	752	+ particlesButton.addActionListener(this);
	753	+
	754	+ oe.toolboxPanel.Return();
	755	+
	756	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	757	+ groupButton.setToolTipText("Create group");
	758	+ groupButton.addActionListener(this);
	759	+
	760	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	761	+ compositeButton.setToolTipText("Create composite");
	762	+ compositeButton.addActionListener(this);
	763	+
	764	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	765	+ switchButton.setToolTipText("Create item switcher");
	766	+ switchButton.addActionListener(this);
	767	+
	768	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	769	+ loopButton.setToolTipText("Create loop");
	770	+ loopButton.addActionListener(this);
	771	+
	772	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	773	+ textureButton.setToolTipText("Create texture");
	774	+ textureButton.addActionListener(this);
	775	+
	776	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	777	+ overlayButton.setToolTipText("Create overlay");
	778	+ overlayButton.addActionListener(this);
	779	+
	780	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	781	+ lightButton.setToolTipText("Create light");
	782	+ lightButton.addActionListener(this);
	783	+
	784	+ for (int i=6; --i>=0;)
	785	+ {
	786	+ oe.toolboxPanel.Return();
	787	+ oe.toolboxPanel.add(new cGridBag());
	788	+ oe.toolboxPanel.add(new cGridBag());
	789	+ oe.toolboxPanel.add(new cGridBag());
	790	+ oe.toolboxPanel.add(new cGridBag());
	791	+ oe.toolboxPanel.add(new cGridBag());
	792	+ oe.toolboxPanel.add(new cGridBag());
	793	+ oe.toolboxPanel.add(new cGridBag());
	794	+ }
	795	+
	796	+ // EDIT panel
	797	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	798	+ editButton.setToolTipText("Pin selection controls");
562	799	editButton.addActionListener(this);
563	800
564		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
565		- uneditButton.setToolTipText("Unedit selection");
	801	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	802	+ uneditButton.setToolTipText("Remove selection controls");
566	803	uneditButton.addActionListener(this);
567	804
568		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
569		- allParamsButton.setToolTipText("Edit all params");
	805	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	806	+ allParamsButton.setToolTipText("Show all controle");
570	807	allParamsButton.addActionListener(this);
571	808
572		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	809	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
573	810	clearPanelButton.setToolTipText("Clear edit panel");
574	811	clearPanelButton.addActionListener(this);
575	812
576		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	813	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
577	814	unselectButton.setToolTipText("Unselect");
578	815	unselectButton.addActionListener(this);
579	816
580		- commandsPanel.preferredHeight = 1;
	817	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	818	+ flashSelectionButton.setToolTipText("Highlight selection");
	819	+ flashSelectionButton.addActionListener(this);
581	820
582		- oe.treePanel.add(commandsPanel);
583		- oe.treePanel.Return();
	821	+ editCommandsPanel.preferredHeight = 1;
	822	+
	823	+ SetPinStates(false);
	824	+// oe.treePanel.add(commandsPanel);
	825	+// oe.treePanel.Return();
584	826
585	827	// oe.aConstraints.gridx += 1;
586	828	// oe.aConstraints.weighty = 0;
..	..	@@ -597,29 +839,17 @@
597	839
598	840	JScrollPane jSP;
599	841	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
600		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	842	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
601	843	ResetModel();
602	844
603	845	oe.treePanel.add(jSPPanel);
604	846	oe.treePanel.Return();
605	847
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	848	oe.treePanel.add(copyOptionsPanel);
622	849	oe.treePanel.Return();
	850	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	851	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	852	+ sliderPane.preferredHeight = 1;
623	853
624	854	// mainPanel.setDividerLocation(0.5); //1.0);
625	855	// mainPanel.setResizeWeight(0.5);
..	..	@@ -642,29 +872,49 @@
642	872	dgr.addDragGestureListener(this);
643	873	}catch(Exception e) {}
644	874	*/
645		- radio.layout = sevenButton;
	875	+ radio.layout = sixButton; // sevenButton;
646	876	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
647	877	}
648	878
649	879	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
650	880	{
	881	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	882	+ colorCB.setToolTipText("Copy color when dropped");
	883	+ colorCB.addItemListener(this);
	884	+
	885	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	886	+ materialCB.setToolTipText("Copy material when dropped");
	887	+ materialCB.addItemListener(this);
	888	+
	889	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	890	+ textureCB.setToolTipText("Copy texture when dropped");
	891	+ textureCB.addItemListener(this);
	892	+
	893	+ panel.Return();
	894	+
651	895	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
652	896	boxCB.setToolTipText("Display bounding boxes");
653	897	boxCB.addItemListener(this);
654	898
655	899	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
656		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	900	+ zoomBoxCB.setToolTipText("Display only for wheel");
657	901	zoomBoxCB.addItemListener(this);
658	902
659	903	if (true) // Globals.ADVANCED)
660	904	{
661		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
662		- supportCB.setToolTipText("Enable rigging");
663		- supportCB.addItemListener(this);
	905	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	906	+// supportCB.setToolTipText("Enable rigging");
	907	+// supportCB.addItemListener(this);
	908	+
	909	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	910	+ freezeCB.setToolTipText("Fast moving camera");
	911	+ freezeCB.addItemListener(this);
664	912
665	913	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
666	914	// localCB.addItemListener(this);
667	915
	916	+ panel.Return();
	917	+
668	918	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
669	919	crowdCB.setToolTipText("Used for crowds");
670	920	crowdCB.addItemListener(this);
..	..	@@ -681,6 +931,8 @@
681	931	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
682	932	// speakerMocapCB.addItemListener(this);
683	933
	934	+ panel.Return();
	935	+
684	936	if (false)
685	937	{
686	938	// handled in scripts
..	..	@@ -695,42 +947,85 @@
695	947	//constraints.gridy += 1;
696	948	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
697	949	smoothfocusCB.addItemListener(this);
	950	+ panel.Return();
698	951	}
699	952
700	953	//constraints.gridx += 1;
701	954	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
702	955	// debugCB.addItemListener(this);
703	956
	957	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	958	+ trackCB.setToolTipText("Enable tracking target");
	959	+ trackCB.addItemListener(this);
	960	+
704	961	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	962	+ oeilCB.setToolTipText("Move camera when tracking");
705	963	oeilCB.addItemListener(this);
706	964
	965	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	966	+ shadowCB.setToolTipText("When live compute shadows");
	967	+ shadowCB.addItemListener(this);
	968	+
	969	+ panel.Return();
	970	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	971	+ toggleTextureCB.setToolTipText("Load textures");
	972	+ toggleTextureCB.addItemListener(this);
	973	+
	974	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	975	+ toggleSwitchCB.setToolTipText("Choose a single item");
	976	+ toggleSwitchCB.addItemListener(this);
	977	+
	978	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	979	+ autokeepCB.setToolTipText("On structure change");
	980	+ autokeepCB.addItemListener(this);
	981	+
	982	+ panel.Return();
	983	+ if (Globals.ADVANCED)
	984	+ {
707	985	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
708	986	lookAtCB.setToolTipText("Look-at target");
709	987	lookAtCB.addItemListener(this);
	988	+ }
710	989
711	990	}
712	991
713	992	cGridBag fill = new cGridBag();
714		-
715	993	fill.preferredHeight = 200;
	994	+ cGridBag fill2 = new cGridBag();
	995	+ fill2.preferredHeight = 200;
	996	+ cGridBag fill3 = new cGridBag();
	997	+ fill3.preferredHeight = 200;
716	998
717	999	panel.add(fill);
	1000	+ panel.add(fill2);
	1001	+ panel.add(fill3);
718	1002
719	1003	}
720	1004
721	1005	void EditObject(Object3D obj)
722	1006	{
723	1007	cRadio radioButton = new cRadio(obj.name);
	1008	+
	1009	+ // June 2019. Patch to avoid bug with transparency.
	1010	+ radioButton.hadMaterial = obj.material != null;
	1011	+ if (!radioButton.hadMaterial)
	1012	+ {
	1013	+ obj.material = new cMaterial();
	1014	+ }
	1015	+
724	1016	radioButton.SetObject(obj);
725		- radioButton.layout = sevenButton;
	1017	+ radioButton.layout = sixButton; // sevenButton;
726	1018	radioButton.SetCamera(cameraView.renderCamera, false);
727	1019	radioButton.addActionListener(this);
728	1020	radioPanel.add(radioButton);
729	1021	buttonGroup.add(radioButton);
730	1022	radioButton.doClick();
731	1023	}
	1024	+
732	1025	void SetupViews(ObjEditor oe)
733	1026	{
	1027	+ theFrame = this;
	1028	+
734	1029	oe.SetupViews();
735	1030
736	1031	System.out.println("SetupViews");
..	..	@@ -739,23 +1034,28 @@
739	1034	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
740	1035	}
741	1036
742		- JCheckBox liveCB;
743		- JCheckBox supportCB;
744		- JCheckBox localCB;
745		- JCheckBox crowdCB;
746		- JCheckBox smoothCB;
747		- JCheckBox fastCB;
748		- JCheckBox slowCB;
749		- JCheckBox boxCB;
750		- JCheckBox zoomBoxCB;
751		- JCheckBox trackCB;
752		- JCheckBox smoothfocusCB;
	1037	+ cToggleButton liveCB;
	1038	+ cCheckBox supportCB;
	1039	+ cCheckBox localCB;
	1040	+ cCheckBox crowdCB;
	1041	+ cCheckBox smoothCB;
	1042	+ cToggleButton fastCB;
	1043	+ cCheckBox slowCB;
	1044	+ cCheckBox boxCB;
	1045	+ cCheckBox zoomBoxCB;
	1046	+ cCheckBox freezeCB;
	1047	+ //cToggleButton trackCB;
	1048	+ cCheckBox trackCB;
	1049	+ cCheckBox smoothfocusCB;
753	1050	// JCheckBox speakerMocapCB;
754		- JCheckBox speakerCameraCB;
755		- JCheckBox speakerFocusCB;
756		- JCheckBox debugCB;
757		- JCheckBox oeilCB;
758		- JCheckBox lookAtCB;
	1051	+ cCheckBox speakerCameraCB;
	1052	+ cCheckBox speakerFocusCB;
	1053	+ cCheckBox debugCB;
	1054	+
	1055	+ cCheckBox oeilCB;
	1056	+ cCheckBox shadowCB;
	1057	+ cCheckBox autokeepCB;
	1058	+ cCheckBox lookAtCB;
759	1059
760	1060	// static int COLOR = 1;
761	1061	// static int MATERIAL = 2;
..	..	@@ -763,9 +1063,9 @@
763	1063
764	1064	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
765	1065
766		- JCheckBox colorCB;
767		- JCheckBox materialCB;
768		- JCheckBox textureCB;
	1066	+ cCheckBox colorCB;
	1067	+ cCheckBox materialCB;
	1068	+ cCheckBox textureCB;
769	1069
770	1070	public void itemStateChanged(ItemEvent e)
771	1071	{
..	..	@@ -793,6 +1093,7 @@
793	1093	} else if(e.getSource() == liveCB)
794	1094	{
795	1095	cameraView.ToggleLive();
	1096	+ refreshContents(false);
796	1097	}
797	1098	else if(e.getSource() == supportCB)
798	1099	{
..	..	@@ -857,6 +1158,18 @@
857	1158	{
858	1159	cameraView.ToggleOeil();
859	1160	}
	1161	+ else if(e.getSource() == shadowCB)
	1162	+ {
	1163	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1164	+ }
	1165	+ else if(e.getSource() == freezeCB)
	1166	+ {
	1167	+ Globals.FREEZEONMOVE ^= true;
	1168	+ }
	1169	+ else if(e.getSource() == autokeepCB)
	1170	+ {
	1171	+ Globals.REPLACEONMAKE ^= true;
	1172	+ }
860	1173	else if(e.getSource() == lookAtCB)
861	1174	{
862	1175	cameraView.ToggleLookAt();
..	..	@@ -873,7 +1186,8 @@
873	1186
874	1187	/**/
875	1188	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
876		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1189	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1190	+ TreePath path = objEditor.jTree.getSelectionPath();
877	1191	if ((path == null) \|\| (path.getPathCount() <= 1)) {
878	1192	// We can't move the root node or an empty selection
879	1193	return;
..	..	@@ -936,8 +1250,6 @@
936	1250	}
937	1251	}
938	1252
939		- String string = (String) object;
940		-
941	1253	System.out.println("Transfer = " + object + "; drop : " + target);
942	1254	// if( object instanceof java.io.File[])
943	1255	// {
..	..	@@ -945,6 +1257,8 @@
945	1257	// objEditor.DropFile((java.io.File[]) object, true);
946	1258	// return;
947	1259	// }
	1260	+
	1261	+ String string = object.toString();
948	1262
949	1263	// File path for Mac and Windows
950	1264	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -990,23 +1304,33 @@
990	1304
991	1305	assert target == objEditor.jTree;
992	1306	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1307	+ Object3D destinationLeaf;
993	1308	try {
994		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1309	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
995	1310	} catch (Exception e) {
996	1311	System.out.println("destinationPath : " + destinationPath);
997	1312	return;
998	1313	}
999	1314
1000		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1315	+ for (int i=group.selection.size(); --i>=0;)
1001	1316	{
	1317	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1318	+
	1319	+ // Cannot move into itself
	1320	+ if (child == destinationLeaf)
	1321	+ return;
	1322	+ }
	1323	+
	1324	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1325	+// {
1002	1326	loadClipboard(true);
1003	1327	objEditor.jTree.setSelectionPath(destinationPath);
1004	1328	pasteInto(false, false);
1005		- } else {
1006		- loadClipboard(false);
1007		- objEditor.jTree.setSelectionPath(destinationPath);
1008		- pasteInto(false, false); // true); // ???
1009		- }
	1329	+// } else {
	1330	+// loadClipboard(false);
	1331	+// objEditor.jTree.setSelectionPath(destinationPath);
	1332	+// pasteInto(false, false); // true); // ???
	1333	+// }
1010	1334	}
1011	1335	public void dropActionChanged(DropTargetDragEvent dtde)
1012	1336	// Called if the user has modified the current drop gesture
..	..	@@ -1111,22 +1435,30 @@
1111	1435	{
1112	1436	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1113	1437	//heightFieldItem.addActionListener(this);
1114		- gridItem = menu.add(new MenuItem("Grid"));
1115		- gridItem.addActionListener(this);
1116		- rectoidItem = menu.add(new MenuItem("Box"));
1117		- rectoidItem.addActionListener(this);
1118		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1119		- ellipsoidItem.addActionListener(this);
1120		- coneItem = menu.add(new MenuItem("Cone"));
1121		- coneItem.addActionListener(this);
1122		- torusItem = menu.add(new MenuItem("Torus"));
1123		- torusItem.addActionListener(this);
1124		- superItem = menu.add(new MenuItem("Superellipsoid"));
1125		- superItem.addActionListener(this);
	1438	+// gridItem = menu.add(new MenuItem("Grid"));
	1439	+// gridItem.addActionListener(this);
	1440	+// rectoidItem = menu.add(new MenuItem("Box"));
	1441	+// rectoidItem.addActionListener(this);
	1442	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1443	+// ellipsoidItem.addActionListener(this);
	1444	+// coneItem = menu.add(new MenuItem("Cone"));
	1445	+// coneItem.addActionListener(this);
	1446	+// torusItem = menu.add(new MenuItem("Torus"));
	1447	+// torusItem.addActionListener(this);
	1448	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1449	+// superItem.addActionListener(this);
	1450	+
	1451	+ cameraItem = menu.add(new MenuItem("Camera"));
	1452	+ cameraItem.addActionListener(this);
	1453	+
	1454	+ if (!Globals.ADVANCED)
	1455	+ {
1126	1456	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1127	1457	kleinItem.addActionListener(this);
1128		- particleItem = menu.add(new MenuItem("Particle system"));
1129		- particleItem.addActionListener(this);
	1458	+ }
	1459	+
	1460	+// particleItem = menu.add(new MenuItem("Particle system"));
	1461	+// particleItem.addActionListener(this);
1130	1462	if (Globals.ADVANCED)
1131	1463	{
1132	1464	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1152,15 +1484,15 @@
1152	1484	}
1153	1485	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1154	1486	bezierItem.addActionListener(this);
1155		- overlayItem = menu.add(new MenuItem("Overlay"));
1156		- overlayItem.addActionListener(this);
1157		- lightItem = menu.add(new MenuItem("Light"));
1158		- lightItem.addActionListener(this);
	1487	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1488	+// overlayItem.addActionListener(this);
	1489	+// lightItem = menu.add(new MenuItem("Light"));
	1490	+// lightItem.addActionListener(this);
1159	1491	menu.add("-");
1160	1492	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1161	1493	//superLoopItem.addActionListener(this);
1162		- loopItem = menu.add(new MenuItem("Loop"));
1163		- loopItem.addActionListener(this);
	1494	+// loopItem = menu.add(new MenuItem("Loop"));
	1495	+// loopItem.addActionListener(this);
1164	1496	doubleItem = menu.add(new MenuItem("Fork"));
1165	1497	doubleItem.addActionListener(this);
1166	1498	if (Globals.ADVANCED)
..	..	@@ -1176,6 +1508,9 @@
1176	1508	animationItem.addItemListener(this);
1177	1509	animationItem.setState(Globals.ANIMATION);
1178	1510
	1511	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1512	+ archiveItem.addActionListener(this);
	1513	+
1179	1514	menu.add("-");
1180	1515	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1181	1516	parseverticesItem.addActionListener(this);
..	..	@@ -1188,6 +1523,8 @@
1188	1523	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1189	1524	reduce34MorphItem.addActionListener(this);
1190	1525	menu.add("-");
	1526	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1527	+ memoryItem.addActionListener(this);
1191	1528	menu.add(computeAOItem = new MenuItem("Compute AO"));
1192	1529	computeAOItem.addActionListener(this);
1193	1530
..	..	@@ -1196,11 +1533,9 @@
1196	1533	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1197	1534	mirrorItem.addActionListener(this);
1198	1535	menu.add("-");
1199		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1200		- memoryItem.addActionListener(this);
1201	1536	menu.add(analyzeItem = new MenuItem("Analyze"));
1202	1537	analyzeItem.addActionListener(this);
1203		- menu.add(dumpItem = new MenuItem("Dump"));
	1538	+ menu.add(dumpItem = new MenuItem("Print"));
1204	1539	dumpItem.addActionListener(this);
1205	1540	// menu.add(pathItem = new MenuItem("From-to path"));
1206	1541	// pathItem.addActionListener(this);
..	..	@@ -1341,9 +1676,34 @@
1341	1676	shadow.material = new cMaterial(obj.material);
1342	1677	shadow.material.diffuse = 0.0001f;
1343	1678	shadow.material.specular = 0.0001f;
	1679	+ //shadow.projectedVertices[1].x = 300;
1344	1680
1345	1681	makeSomething(shadow);
1346	1682	}
	1683	+
	1684	+ private void ClearUnpinned()
	1685	+ {
	1686	+ //for (Object3D obj : listUI)
	1687	+ for (int i=listUI.size(); --i>=0;)
	1688	+ {
	1689	+ Object3D obj = listUI.elementAt(i);
	1690	+ if (!obj.pinned)
	1691	+ {
	1692	+ obj.CloseUI();
	1693	+ listUI.remove(i);
	1694	+ }
	1695	+ }
	1696	+ }
	1697	+
	1698	+ private void EditElement(Object3D elem, boolean newWindow)
	1699	+ {
	1700	+ // if (!(elem instanceof Composite))
	1701	+ // newWindow = false;
	1702	+ listUI.add(elem);
	1703	+ elem.openEditWindow(this, newWindow); //, false);
	1704	+ System.out.println("edit : " + elem);
	1705	+ elem.editWindow.refreshContents(true); // ? new
	1706	+ }
1347	1707
1348	1708	/**
1349	1709	* applyExample
..	..	@@ -1588,7 +1948,7 @@
1588	1948	{
1589	1949	ScreenFit();
1590	1950	} else
1591		- if (source == switchItem)
	1951	+ if (source == switchViewItem)
1592	1952	{
1593	1953	cVector v1 = new cVector();
1594	1954	cVector v2 = new cVector();
..	..	@@ -1597,11 +1957,11 @@
1597	1957	objEditor.cameraView.renderCamera.setAim(v2, v1);
1598	1958	objEditor.cameraView.repaint();
1599	1959	} else
1600		- if (source == rectoidItem)
	1960	+ if (source == rectoidItem \|\| source == boxButton)
1601	1961	{
1602	1962	makeSomething(new Box());
1603	1963	} else
1604		- if (source == particleItem)
	1964	+ if (source == particleItem \|\| source == particlesButton)
1605	1965	{
1606	1966	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1607	1967	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1680,27 +2040,27 @@
1680	2040
1681	2041	makeSomething(obj);
1682	2042	} else
1683		- if (source == gridItem)
	2043	+ if (source == gridItem \|\| source == gridButton)
1684	2044	{
1685	2045	makeSomething(new Grid());
1686	2046	} else
1687		- if (source == ellipsoidItem)
	2047	+ if (source == ellipsoidItem \|\| source == sphereButton)
1688	2048	{
1689	2049	makeSomething(new Sphere());
1690	2050	} else
1691		- if (source == coneItem)
	2051	+ if (source == coneItem \|\| source == coneButton)
1692	2052	{
1693	2053	makeSomething(new Cone());
1694	2054	} else
1695		- if (source == torusItem)
	2055	+ if (source == torusItem \|\| source == torusButton)
1696	2056	{
1697	2057	makeSomething(new Torus());
1698	2058	} else
1699		- if (source == superItem)
	2059	+ if (source == superItem \|\| source == superButton)
1700	2060	{
1701	2061	makeSomething(new Superellipsoid());
1702	2062	} else
1703		- if (source == kleinItem)
	2063	+ if (source == kleinItem \|\| source == kleinButton)
1704	2064	{
1705	2065	makeSomething(new Klein());
1706	2066	} else
..	..	@@ -1720,7 +2080,7 @@
1720	2080	{
1721	2081	makeSomething(new BezierSurface());
1722	2082	} else
1723		- if (source == overlayItem)
	2083	+ if (source == overlayItem \|\| source == overlayButton)
1724	2084	{
1725	2085	/*
1726	2086	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1768,7 +2128,7 @@
1768	2128	s.setup();
1769	2129	makeSomething(s);
1770	2130	} else
1771		- if (source == lightItem)
	2131	+ if (source == lightItem \|\| source == lightButton)
1772	2132	{
1773	2133	makeSomething(new Light());
1774	2134	} else
..	..	@@ -1818,30 +2178,30 @@
1818	2178
1819	2179	group(g);
1820	2180	} else
1821		- if (source == loopItem)
	2181	+ if (source == loopItem \|\| source == loopButton)
1822	2182	{
1823	2183	Composite csg = new GroupLeaf();
1824	2184	csg.count = 5;
1825	2185	group(csg);
1826		- Composite child = new cGroup();
	2186	+ Composite child = new cGroup("Branch");
1827	2187	csg.addChild(child);
1828	2188	child.addChild(csg);
1829	2189	} else
1830	2190	if (source == doubleItem)
1831	2191	{
1832		- Composite csg = new GroupLeaf();
	2192	+ Composite csg = new GroupLeaf("Fork");
1833	2193	csg.count = 5;
1834	2194	group(csg);
1835		- Composite child = new cGroup();
	2195	+ Composite child = new cGroup("Branch A");
1836	2196	csg.addChild(child);
1837	2197	child.addChild(csg);
1838		- child = new cGroup();
	2198	+ child = new cGroup("Branch B");
1839	2199	csg.addChild(child);
1840	2200	child.addChild(csg);
1841	2201	} else
1842	2202	if (source == tripleItem)
1843	2203	{
1844		- Composite csg = new GroupLeaf();
	2204	+ Composite csg = new GroupLeaf("Trident");
1845	2205	csg.count = 4;
1846	2206	group(csg);
1847	2207	Composite child = new cGroup();
..	..	@@ -1853,31 +2213,6 @@
1853	2213	child = new cGroup();
1854	2214	csg.addChild(child);
1855	2215	child.addChild(csg);
1856		- } else
1857		-
1858		- if (source == importGFDItem)
1859		- {
1860		- ImportGFD();
1861		- } else
1862		- if (source == importVRMLX3DItem)
1863		- {
1864		- ImportVRMLX3D();
1865		- } else
1866		- if (source == import3DSItem)
1867		- {
1868		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1869		- } else
1870		- if (source == importOBJItem)
1871		- {
1872		- //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1873		- FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
1874		- browser.setVisible(true);
1875		- String filename = browser.getFile();
1876		- if (filename != null && filename.length() > 0)
1877		- {
1878		- String fullname = browser.getDirectory() + filename;
1879		- makeSomething(ReadOBJ(fullname), true);
1880		- }
1881	2216	} else
1882	2217	if (source == computeAOItem)
1883	2218	{
..	..	@@ -1916,6 +2251,46 @@
1916	2251	{
1917	2252	DumpObject();
1918	2253	} else
	2254	+ if (source == minButton)
	2255	+ {
	2256	+ Minimize();
	2257	+ } else
	2258	+ if (source == maxButton)
	2259	+ {
	2260	+ Maximize();
	2261	+ } else
	2262	+ if (source == fullButton)
	2263	+ {
	2264	+ ToggleFullScreen();
	2265	+ } else
	2266	+ if (source == undoButton)
	2267	+ {
	2268	+ // Go to previous version
	2269	+ //if (!Undo())
	2270	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2271	+ Undo();
	2272	+ } else
	2273	+ if (source == restoreButton)
	2274	+ {
	2275	+ // Restore current version
	2276	+ Restore();
	2277	+ } else
	2278	+ if (source == replaceButton)
	2279	+ {
	2280	+ // Overwrite current version
	2281	+ Replace();
	2282	+ } else
	2283	+ if (source == redoButton)
	2284	+ {
	2285	+ // Go to next version
	2286	+ Redo();
	2287	+ } else
	2288	+ if (source == saveButton)
	2289	+ {
	2290	+ // Save a new version
	2291	+ if (!Save(true))
	2292	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2293	+ } else
1919	2294	if (source == oneStepButton)
1920	2295	{
1921	2296	Globals.ONESTEP = true;
..	..	@@ -1923,17 +2298,14 @@
1923	2298	} else
1924	2299	if (source == screenfitButton)
1925	2300	{
1926		- //Reload(lastConverter, lastFilename, true);
1927	2301	ScreenFit();
1928	2302	} else
1929	2303	if (source == screenfitpointButton)
1930	2304	{
1931		- //Reload(lastConverter, lastFilename, true);
1932	2305	ScreenFitPoint();
1933	2306	} else
1934	2307	if (source == snapobjectButton)
1935	2308	{
1936		- //Reload(lastConverter, lastFilename, true);
1937	2309	SnapObject();
1938	2310	} else
1939	2311	// if (event.getSource() == recompileButton)
..	..	@@ -1969,6 +2341,14 @@
1969	2341	if (source == cutItem \|\| source == clearButton)
1970	2342	{
1971	2343	loadClipboard(true);
	2344	+ } else
	2345	+ if (source == undoItem)
	2346	+ {
	2347	+ Undo();
	2348	+ } else
	2349	+ if (source == redoItem)
	2350	+ {
	2351	+ Redo();
1972	2352	} else
1973	2353	if (source == duplicateItem)
1974	2354	{
..	..	@@ -2289,7 +2669,7 @@
2289	2669	{
2290	2670	StepAll();
2291	2671	} else
2292		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	2672	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2293	2673	{
2294	2674	//int indices[] = jList.getSelectedIndices();
2295	2675	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2301,9 +2681,9 @@
2301	2681	{
2302	2682	ClearSelection(true);
2303	2683	} else
2304		- if (source == grabItem)
	2684	+ if (source == grabItem \|\| source == groupButton)
2305	2685	{
2306		- group(new cGroup(), true);
	2686	+ group(new cGroup(), false); // true);
2307	2687	} else
2308	2688	if (source == hideItem)
2309	2689	{
..	..	@@ -2321,11 +2701,11 @@
2321	2701	{
2322	2702	makeSomething(new Camera());
2323	2703	} else
2324		- if (source == compositeItem)
	2704	+ if (source == compositeItem \|\| source == compositeButton)
2325	2705	{
2326	2706	group(new Composite());
2327	2707	} else
2328		- if (source == randomItem)
	2708	+ if (source == switchItem \|\| source == switchButton)
2329	2709	{
2330	2710	RandomNode random = new RandomNode();
2331	2711	group(random);
..	..	@@ -2427,7 +2807,7 @@
2427	2807	{
2428	2808	group(new cLinker());
2429	2809	} else
2430		- if (source == textureItem)
	2810	+ if (source == textureItem \|\| source == textureButton)
2431	2811	{
2432	2812	group(new TextureNode());
2433	2813	} else
..	..	@@ -2447,17 +2827,30 @@
2447	2827	{
2448	2828	CastShadow(2);
2449	2829	} else
2450		- if (source == ungroupItem)
	2830	+ if (source == ungroupItem \|\| source == ungroupButton)
2451	2831	{
2452		- //ungroup();
	2832	+ boolean hasRoot = false;
	2833	+
2453	2834	for (int i=0; i<group.selection.size(); i++)
2454	2835	{
2455		- Ungroup(group.selection.get(i));
	2836	+ if (group.selection.get(i) == group)
	2837	+ {
	2838	+ hasRoot = true;
	2839	+ break;
	2840	+ }
2456	2841	}
2457	2842
2458		- ClearSelection(false);
2459		-
2460		- refreshContents();
	2843	+ if (!hasRoot)
	2844	+ {
	2845	+ for (int i=0; i<group.selection.size(); i++)
	2846	+ {
	2847	+ Ungroup(group.selection.get(i));
	2848	+ }
	2849	+
	2850	+ ClearSelection(false);
	2851	+
	2852	+ refreshContents();
	2853	+ }
2461	2854	} else
2462	2855	if (source == genUVItem)
2463	2856	{
..	..	@@ -2469,7 +2862,7 @@
2469	2862	} else
2470	2863	if (source == genNormalsMESHItem)
2471	2864	{
2472		- GenNormals(true); // TODO
	2865	+ GenNormalsMESH();
2473	2866	} else
2474	2867	if (source == genNormalsORGANItem)
2475	2868	{
..	..	@@ -2534,6 +2927,22 @@
2534	2927	if (source == unmarkleavesItem)
2535	2928	{
2536	2929	MarkLeaves(false);
	2930	+ } else
	2931	+ if (source == rewindleavesItem)
	2932	+ {
	2933	+ RewindLeaves(true);
	2934	+ } else
	2935	+ if (source == unrewindleavesItem)
	2936	+ {
	2937	+ RewindLeaves(false);
	2938	+ } else
	2939	+ if (source == randomleavesItem)
	2940	+ {
	2941	+ RandomLeaves(true);
	2942	+ } else
	2943	+ if (source == unrandomleavesItem)
	2944	+ {
	2945	+ RandomLeaves(false);
2537	2946	} else
2538	2947	if (source == flipVItem)
2539	2948	{
..	..	@@ -2769,6 +3178,10 @@
2769	3178	if (source == twoButton)
2770	3179	{
2771	3180	radio.layout = twoButton;
	3181	+
	3182	+ if (CameraPane.FULLSCREEN)
	3183	+ fullscreenLayout = radio.layout;
	3184	+
2772	3185	// bug
2773	3186	//gridPanel.setDividerLocation(1.0);
2774	3187	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2801,10 +3214,31 @@
2801	3214	bigThree.ClearUI();
2802	3215	bigThree.add(centralPanel);
2803	3216	bigThree.FlushUI();
	3217	+
	3218	+ cameraView.requestFocusInWindow();
	3219	+
	3220	+// refreshContents(true);
	3221	+//
	3222	+// try
	3223	+// {
	3224	+// java.awt.Robot bot = new java.awt.Robot();
	3225	+// int mask = InputEvent.BUTTON1_MASK;
	3226	+// bot.mouseMove(100, 100);
	3227	+// bot.mousePress(mask);
	3228	+// bot.mouseRelease(mask);
	3229	+// }
	3230	+// catch (Exception e)
	3231	+// {
	3232	+//
	3233	+// }
	3234	+
2804	3235	} else
2805	3236	if (source == threeButton)
2806	3237	{
2807	3238	radio.layout = threeButton;
	3239	+
	3240	+ if (CameraPane.FULLSCREEN)
	3241	+ fullscreenLayout = radio.layout;
2808	3242
2809	3243	// bigThree.remove(scenePanel);
2810	3244	// bigThree.remove(centralPanel);
..	..	@@ -2837,10 +3271,15 @@
2837	3271	bigThree.add(centralPanel);
2838	3272	bigThree.add(XYZPanel);
2839	3273	bigThree.FlushUI();
	3274	+
	3275	+ cameraView.requestFocusInWindow();
2840	3276	} else
2841	3277	if (source == fourButton)
2842	3278	{
2843	3279	radio.layout = fourButton;
	3280	+
	3281	+ if (CameraPane.FULLSCREEN)
	3282	+ fullscreenLayout = radio.layout;
2844	3283
2845	3284	// bigThree.remove(scenePanel);
2846	3285	// bigThree.remove(centralPanel);
..	..	@@ -2872,10 +3311,15 @@
2872	3311	bigThree.ClearUI();
2873	3312	bigThree.add(scenePanel);
2874	3313	bigThree.FlushUI();
	3314	+
	3315	+ cameraView.requestFocusInWindow();
2875	3316	} else
2876	3317	if (source == sixButton)
2877	3318	{
2878	3319	radio.layout = sixButton;
	3320	+
	3321	+ if (CameraPane.FULLSCREEN)
	3322	+ fullscreenLayout = radio.layout;
2879	3323
2880	3324	// bigThree.remove(scenePanel);
2881	3325	// bigThree.remove(centralPanel);
..	..	@@ -2908,10 +3352,15 @@
2908	3352	bigThree.add(scenePanel);
2909	3353	bigThree.add(centralPanel);
2910	3354	bigThree.FlushUI();
	3355	+
	3356	+ cameraView.requestFocusInWindow();
2911	3357	} else
2912	3358	if (source == sevenButton)
2913	3359	{
2914	3360	radio.layout = sevenButton;
	3361	+
	3362	+ if (CameraPane.FULLSCREEN)
	3363	+ fullscreenLayout = radio.layout;
2915	3364
2916	3365	// bigThree.remove(scenePanel);
2917	3366	// bigThree.remove(centralPanel);
..	..	@@ -2945,6 +3394,8 @@
2945	3394	bigThree.add(centralPanel);
2946	3395	bigThree.add(XYZPanel);
2947	3396	bigThree.FlushUI();
	3397	+
	3398	+ cameraView.requestFocusInWindow();
2948	3399	} else
2949	3400	if (source == rootButton)
2950	3401	{
..	..	@@ -2956,6 +3407,7 @@
2956	3407	EditObject(obj);
2957	3408	}
2958	3409
	3410	+ cameraView.requestFocusInWindow();
2959	3411	refreshContents(true);
2960	3412	} else
2961	3413	if (source == closeButton)
..	..	@@ -2965,22 +3417,37 @@
2965	3417	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2966	3418	{
2967	3419	ab = (cRadio)e.nextElement();
2968		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3420	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2969	3421	{
	3422	+ // Patch to avoid bug with transparency.
	3423	+ if (!ab.hadMaterial)
	3424	+ {
	3425	+ ab.object.material = null;
	3426	+ }
	3427	+
2970	3428	buttonGroup.remove(ab);
2971	3429	radioPanel.remove(ab);
2972	3430
2973		- ab.GetObject().editWindow = null;
	3431	+ //ab.GetObject().editWindow = null;
	3432	+ ab.GetObject().manipWindow = null;
2974	3433	// ab.GetObject().objectUI = null; // ?????????
2975	3434
2976	3435	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2977	3436	break;
2978	3437	}
2979	3438	}
	3439	+
	3440	+ cameraView.requestFocusInWindow();
2980	3441	refreshContents(true);
2981	3442	} else
2982	3443	if (source == editItem \|\| source == editButton)
2983	3444	{
	3445	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3446	+ {
	3447	+ Object3D child = (Object3D)e.nextElement();
	3448	+ child.pinned = true;
	3449	+ }
	3450	+
2984	3451	EditSelection(false);
2985	3452	} else
2986	3453	if (source == uneditButton)
..	..	@@ -2990,10 +3457,11 @@
2990	3457	Object3D child = (Object3D)e.nextElement();
2991	3458	if(child.editWindow != null)
2992	3459	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3460	+ child.pinned = false;
2993	3461	child.CloseUI();
2994	3462	listUI.remove(child);
2995	3463
2996		- child.editWindow = null; // ???????????
	3464	+ //child.editWindow = null; // ???????????
2997	3465	}
2998	3466	objEditor.ctrlPanel.FlushUI();
2999	3467	//objEditor.jTree.clearSelection();
..	..	@@ -3006,6 +3474,7 @@
3006	3474	//copy.ClearUI();
3007	3475	for (Object3D obj : listUI)
3008	3476	{
	3477	+ obj.pinned = false;
3009	3478	obj.CloseUI();
3010	3479	}
3011	3480	listUI.clear();
..	..	@@ -3015,7 +3484,7 @@
3015	3484	{
3016	3485	assert(copy == group);
3017	3486
3018		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3487	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3019	3488
3020	3489	for (Object3D obj : listUI)
3021	3490	{
..	..	@@ -3064,6 +3533,9 @@
3064	3533	}
3065	3534
3066	3535	copy = group;
	3536	+
	3537	+ SetUndoStates();
	3538	+
3067	3539	//Globals.theRenderer.object = group;
3068	3540	if(!useclient)
3069	3541	{
..	..	@@ -3079,20 +3551,46 @@
3079	3551	frontView.object = group;
3080	3552	sideView.object = group;
3081	3553	}
3082		- group.editWindow = this;
	3554	+
	3555	+// fix "+" issue
	3556	+ //group.editWindow = this;
	3557	+ group.manipWindow = this;
	3558	+
3083	3559	/*
3084	3560	currentLayout = radio.layout;
3085	3561	if (currentLayout == null)
3086	3562	currentLayout = sevenButton;
3087	3563	*/
3088	3564	radio.layout.doClick();
	3565	+
	3566	+ ClearUnpinned();
	3567	+ //Grafreed.Assert(group != null);
	3568	+ //Grafreed.Assert(group.selection != null);
	3569	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	3570	+ if (group.selection == null \|\| group.selection.size() == 1)
	3571	+ EditSelection(false);
3089	3572	keepparent = group.parent;
3090	3573	// PARENT = NULL or not???
3091	3574	//group.parent = null; // ROOT
3092	3575	//group.attributes = -1;
3093	3576	ResetModel();
	3577	+
	3578	+ cameraView.requestFocusInWindow();
3094	3579	refreshContents(true);
3095		- }
	3580	+ } else if (event.getSource() == editCameraItem)
	3581	+ {
	3582	+ cameraView.ProtectCamera();
	3583	+ cameraView.repaint();
	3584	+ return;
	3585	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3586	+ {
	3587	+ cameraView.RevertCamera();
	3588	+ cameraView.repaint();
	3589	+ return;
	3590	+ // } else if (event.getSource() == textureButton)
	3591	+ // {
	3592	+ // return; // true;
	3593	+ }
3096	3594	else
3097	3595	{
3098	3596	//return super.action(event, arg);
..	..	@@ -3101,7 +3599,6 @@
3101	3599	}
3102	3600
3103	3601	boolean useclient = false;
3104		- cRadio radio;
3105	3602
3106	3603	void ToggleRoot()
3107	3604	{
..	..	@@ -3340,7 +3837,8 @@
3340	3837
3341	3838	int size = obj.MemorySize();
3342	3839
3343		- System.err.println((size/1024) + " KB is the size of " + obj);
	3840	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3841	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3344	3842	}
3345	3843	}
3346	3844	catch (Exception e)
..	..	@@ -3421,6 +3919,13 @@
3421	3919	void GenNormals(boolean crease)
3422	3920	{
3423	3921	group.GenNormalsS(crease);
	3922	+
	3923	+ refreshContents();
	3924	+ }
	3925	+
	3926	+ void GenNormalsMESH()
	3927	+ {
	3928	+ group.GenNormalsMeshS();
3424	3929
3425	3930	refreshContents();
3426	3931	}
..	..	@@ -4048,6 +4553,18 @@
4048	4553	refreshContents();
4049	4554	}
4050	4555
	4556	+ void RewindLeaves(boolean hide)
	4557	+ {
	4558	+ group.selection.RewindLeaves(hide);
	4559	+ refreshContents();
	4560	+ }
	4561	+
	4562	+ void RandomLeaves(boolean hide)
	4563	+ {
	4564	+ group.selection.RandomLeaves(hide);
	4565	+ refreshContents();
	4566	+ }
	4567	+
4051	4568	void SetTexRes(int tr)
4052	4569	{
4053	4570	group.selection.SetTexRes(tr);
..	..	@@ -4119,28 +4636,25 @@
4119	4636	// }
4120	4637	// }
4121	4638
4122		- static boolean allparams = true;
4123		-
4124		- static Vector<Object3D> listUI = new Vector<Object3D>();
4125		-
4126	4639	void EditSelection(boolean newWindow)
4127	4640	{
	4641	+ if (group.selection == null)
	4642	+ {
	4643	+ EditElement(group, newWindow); // ? new
	4644	+ return;
	4645	+ }
	4646	+
4128	4647	// aConstraints.gridy = 0;
4129	4648	for (int i=0; i<group.selection.size(); i++)
4130	4649	{
4131	4650	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4132	4651	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4133		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4652	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4134	4653
4135	4654	Object3D elem = (Object3D)group.selection.elementAt(i);
4136		- if(elem != group)
	4655	+ if(elem != group \|\| !newWindow)
4137	4656	{
4138		- // if (!(elem instanceof Composite))
4139		- // newWindow = false;
4140		- listUI.add(elem);
4141		- elem.openEditWindow(this, newWindow); //, false);
4142		- System.out.println("edit : " + elem);
4143		- elem.editWindow.refreshContents(true); // ? new
	4657	+ EditElement(elem, newWindow); // ? new
4144	4658	}
4145	4659	}
4146	4660	}
..	..	@@ -4215,7 +4729,8 @@
4215	4729	//new Exception().printStackTrace();
4216	4730
4217	4731	freezemodel = true;
4218		-
	4732	+ ClearUnpinned();
	4733	+
4219	4734	/**/
4220	4735	//switch (event.id)
4221	4736	{
..	..	@@ -4223,7 +4738,6 @@
4223	4738	//case 702: // Event.LIST_DESELECT
4224	4739	group.deselectAll();
4225	4740	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4226		- objEditor.ClearInfo(); // .GetMaterial());
4227	4741	if (tps != null)
4228	4742	{
4229	4743	for (int i=0; i < tps.length; i++)
..	..	@@ -4232,10 +4746,8 @@
4232	4746
4233	4747	//if (child.parent != null)
4234	4748	//child.parent.addSelectee(child);
	4749	+ objEditor.SetMaterial(child);
4235	4750	group.addSelectee(child);
4236		- objEditor.SetMaterial(child); // .GetMaterial());
4237		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4238		- System.err.println("info : " + child.GetPath());
4239	4751	}
4240	4752	}
4241	4753	// else
..	..	@@ -4245,20 +4757,28 @@
4245	4757	// System.err.println("info : " + group.GetPath());
4246	4758	// }
4247	4759
4248		- objEditor.SetText(); // jan 2014
4249		-
4250		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4760	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4251	4761	CameraPane.flash = true;
4252	4762
4253		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4763	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4254	4764	// a camera
4255	4765	{
4256		- CameraPane.camerachangeframe = 0; // don't refuse it
4257		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4766	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	4767	+ {
	4768	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4769	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4770	+ }
4258	4771	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4259	4772	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4260	4773	}
4261	4774
	4775	+ if (tps != null && tps.length == 1)
	4776	+ {
	4777	+ EditSelection(false);
	4778	+ }
	4779	+
	4780	+ SetPinStates(tps != null && tps.length > 0);
	4781	+
4262	4782	refreshContents();
4263	4783	//return true;
4264	4784	}
..	..	@@ -4267,6 +4787,35 @@
4267	4787
4268	4788	freezemodel = false;
4269	4789	}
	4790	+
	4791	+ void SetPinStates(boolean enabled)
	4792	+ {
	4793	+ editButton.setEnabled(enabled);
	4794	+ uneditButton.setEnabled(enabled);
	4795	+ unselectButton.setEnabled(enabled);
	4796	+ flashSelectionButton.setEnabled(enabled);
	4797	+ }
	4798	+
	4799	+ void refreshContents(boolean cp)
	4800	+ {
	4801	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4802	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	4803	+ {
	4804	+ objEditor.ClearInfo(); // .GetMaterial());
	4805	+
	4806	+ for (int i=0; i < group.selection.Size(); i++)
	4807	+ {
	4808	+ Object3D child = (Object3D) group.selection.get(i);
	4809	+
	4810	+ objEditor.AddInfo(child, this, true);
	4811	+ System.err.println("info : " + child.GetPath());
	4812	+ }
	4813	+
	4814	+ objEditor.SetText(); // jan 2014
	4815	+ }
	4816	+
	4817	+ super.refreshContents(cp);
	4818	+ }
4270	4819
4271	4820	void linkSomething(Object3D thing)
4272	4821	{
..	..	@@ -4338,6 +4887,7 @@
4338	4887	{
4339	4888	if (group.selection.isEmpty())
4340	4889	return;
	4890	+
4341	4891	Grafreed.clipboardIsTempGroup = false;
4342	4892	Composite tGroup = null;
4343	4893	if (group.selection.size() > 0) // 1)
..	..	@@ -4348,6 +4898,8 @@
4348	4898
4349	4899	if (cut)
4350	4900	{
	4901	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	4902	+// Save();
4351	4903	//int indices[] = jList.getSelectedIndices();
4352	4904	//for (int i = indices.length - 1; i >= 0; i--)
4353	4905	//jList.remove(indices[i]);
..	..	@@ -4437,8 +4989,10 @@
4437	4989	}
4438	4990
4439	4991	}
	4992	+
4440	4993	if (Grafreed.clipboardIsTempGroup)
4441	4994	Grafreed.clipboard = tGroup;
	4995	+
4442	4996	if (cut)
4443	4997	{
4444	4998	ResetModel();
..	..	@@ -4448,6 +5002,10 @@
4448	5002
4449	5003	void paste(boolean expand)
4450	5004	{
	5005	+ if (Globals.REPLACEONMAKE)
	5006	+ Save();
	5007	+ boolean keep = Globals.REPLACEONMAKE;
	5008	+ Globals.REPLACEONMAKE = false;
4451	5009	// if (GrafreeD.clipboard == null)
4452	5010	// return;
4453	5011	boolean first = true;
..	..	@@ -4507,6 +5065,7 @@
4507	5065	Grafreed.clipboard.get(0).parent = keepparent;
4508	5066	}
4509	5067
	5068	+ Globals.REPLACEONMAKE = keep;
4510	5069	ResetModel();
4511	5070	refreshContents();
4512	5071	}
..	..	@@ -4642,6 +5201,10 @@
4642	5201
4643	5202	void group(Object3D csg, boolean grab)
4644	5203	{
	5204	+ if (Globals.REPLACEONMAKE)
	5205	+ Save();
	5206	+ boolean keep = Globals.REPLACEONMAKE;
	5207	+ Globals.REPLACEONMAKE = false;
4645	5208	if (//false) // why??
4646	5209	!group.selection.isEmpty())
4647	5210	{
..	..	@@ -4755,10 +5318,15 @@
4755	5318	//node.add(csg);
4756	5319	//makeSomething(node);
4757	5320	makeSomething(csg);
	5321	+ Globals.REPLACEONMAKE = keep;
4758	5322	}
4759	5323
4760	5324	void Ungroup(Object3D g)
4761	5325	{
	5326	+ if (Globals.REPLACEONMAKE)
	5327	+ Save();
	5328	+ boolean keep = Globals.REPLACEONMAKE;
	5329	+ Globals.REPLACEONMAKE = false;
4762	5330	if (g instanceof HiddenObject)
4763	5331	{
4764	5332	HiddenObject h = (HiddenObject) g;
..	..	@@ -4775,6 +5343,7 @@
4775	5343	objEditor.makeSomething(g.get(i), false);
4776	5344	}
4777	5345	}
	5346	+ Globals.REPLACEONMAKE = keep;
4778	5347	}
4779	5348
4780	5349	void ungroup()
..	..	@@ -4970,21 +5539,6 @@
4970	5539	}
4971	5540	*/
4972	5541
4973		- void ImportGFD()
4974		- {
4975		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4976		- browser.show();
4977		- String filename = browser.getFile();
4978		- if (filename != null && filename.length() > 0)
4979		- {
4980		- String fullname = browser.getDirectory() + filename;
4981		-
4982		- //Object3D readobj =
4983		- objEditor.ReadGFD(fullname, objEditor);
4984		- //makeSomething(readobj);
4985		- }
4986		- }
4987		-
4988	5542	/*
4989	5543	public void Callback(Object obj)
4990	5544	{
..	..	@@ -5008,23 +5562,6 @@
5008	5562	}
5009	5563	*/
5010	5564
5011		- void ImportVRMLX3D()
5012		- {
5013		- if (Grafreed.standAlone)
5014		- {
5015		- /**/
5016		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
5017		- browser.show();
5018		- String filename = browser.getFile();
5019		- if (filename != null && filename.length() > 0)
5020		- {
5021		- String fullname = browser.getDirectory() + filename;
5022		- LoadVRMLX3D(fullname);
5023		- }
5024		- /**/
5025		- }
5026		- }
5027		-
5028	5565	String GetFile(String dialogName)
5029	5566	{
5030	5567	if (Grafreed.standAlone)
..	..	@@ -5095,7 +5632,28 @@
5095	5632	cButton clearpanelButton;
5096	5633	cButton unselectButton;
5097	5634
	5635	+ cButton restoreCameraButton;
	5636	+
	5637	+ cButton saveButton;
5098	5638	cButton oneStepButton;
	5639	+
	5640	+ cButton groupButton;
	5641	+ cButton ungroupButton;
	5642	+ cButton compositeButton;
	5643	+ cButton switchButton;
	5644	+ cButton loopButton;
	5645	+ cButton textureButton;
	5646	+
	5647	+ cButton gridButton;
	5648	+ cButton boxButton;
	5649	+ cButton sphereButton;
	5650	+ cButton coneButton;
	5651	+ cButton torusButton;
	5652	+ cButton superButton;
	5653	+ cButton kleinButton;
	5654	+ cButton particlesButton;
	5655	+ cButton overlayButton;
	5656	+ cButton lightButton;
5099	5657
5100	5658	cButton screenfitButton;
5101	5659	cButton screenfitpointButton;
..	..	@@ -5108,14 +5666,6 @@
5108	5666
5109	5667	cButton setsupportButton;
5110	5668
5111		- cButton twoButton;
5112		- cButton sixButton;
5113		- cButton threeButton;
5114		- cButton sevenButton;
5115		- cButton fourButton; // full panel
5116		- cButton oneButton; // full XYZ
5117		- //cButton currentLayout;
5118		-
5119	5669	//
5120	5670	//Composite
5121	5671	Object3D // to do !!
..	..	@@ -5125,9 +5675,11 @@
5125	5675	//JTree jTree;
5126	5676	private MenuItem lookAtItem;
5127	5677	private MenuItem lookFromItem;
5128		- private MenuItem switchItem;
	5678	+ private MenuItem switchViewItem;
5129	5679	private MenuItem cutItem;
5130		- private MenuItem duplicateItem;
	5680	+ private MenuItem undoItem;
	5681	+ private MenuItem redoItem;
	5682	+ private JMenuItem duplicateItem;
5131	5683	private MenuItem cloneItem;
5132	5684	private MenuItem cloneSupportItem;
5133	5685	private MenuItem overwriteGeoItem;
..	..	@@ -5155,7 +5707,7 @@
5155	5707	private MenuItem pasteLinkItem;
5156	5708	private MenuItem pasteCloneItem;
5157	5709	private MenuItem pasteExpandItem;
5158		- private MenuItem clearItem;
	5710	+ private MenuItem deleteItem;
5159	5711	private MenuItem clearAllItem;
5160	5712	private MenuItem genUVItem;
5161	5713	private MenuItem genNormalsMESHItem;
..	..	@@ -5190,6 +5742,10 @@
5190	5742	private MenuItem showleavesItem;
5191	5743	private MenuItem markleavesItem;
5192	5744	private MenuItem unmarkleavesItem;
	5745	+ private MenuItem rewindleavesItem;
	5746	+ private MenuItem unrewindleavesItem;
	5747	+ private MenuItem randomleavesItem;
	5748	+ private MenuItem unrandomleavesItem;
5193	5749
5194	5750	private MenuItem flipVItem;
5195	5751	private MenuItem unflipVItem;
..	..	@@ -5211,7 +5767,7 @@
5211	5767	private MenuItem frontItem;
5212	5768	private MenuItem cameraItem;
5213	5769	private MenuItem compositeItem;
5214		- private MenuItem randomItem;
	5770	+ private MenuItem switchItem;
5215	5771	private MenuItem physicsItem;
5216	5772	private MenuItem frameselectorItem;
5217	5773	private MenuItem scriptNodeItem;
..	..	@@ -5273,11 +5829,6 @@
5273	5829	private MenuItem doubleItem;
5274	5830	private MenuItem tripleItem;
5275	5831
5276		- private MenuItem importGFDItem;
5277		- private MenuItem importVRMLX3DItem;
5278		- private MenuItem import3DSItem;
5279		- private MenuItem importOBJItem;
5280		-
5281	5832	private MenuItem computeAOItem;
5282	5833	private MenuItem recompileItem;
5283	5834	private MenuItem editScriptItem;
..	..	@@ -5287,4 +5838,8 @@
5287	5838	private MenuItem analyzeItem;
5288	5839	private MenuItem dumpItem;
5289	5840	//boolean freezemodel = false;
	5841	+
	5842	+ Menu cameraMenu;
	5843	+ MenuItem editCameraItem;
	5844	+ MenuItem restoreCameraItem;
5290	5845	}