~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -23,6 +23,31 @@
23	23	DragGestureListener, DragSourceListener, DropTargetListener,
24	24	ItemListener // ListSelectionListener
25	25	{
	26	+
	27	+ public void AddSkyboxButton(String f, String s, cGridBag row3)
	28	+ {
	29	+ cButton skyboxButton;
	30	+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
	31	+ row3.add(skyboxButton = GetButton(path + "/" + s + ".jpg", !Grafreed.NIMBUSLAF));
	32	+ skyboxButton.setToolTipText(s);
	33	+ skyboxButton.addActionListener(new ActionListener()
	34	+ {
	35	+ @Override
	36	+ public void actionPerformed(ActionEvent e)
	37	+ {
	38	+ ChangeSkybox(path);
	39	+ }
	40	+ });
	41	+ }
	42	+
	43	+ public void ChangeSkybox(String name)
	44	+ {
	45	+ cameraView.envyoff = false;
	46	+ cameraView.skyboxname = name;
	47	+ cameraView.skyboxext = "jpg";
	48	+ cameraView.repaint();
	49	+ }
	50	+
26	51	//ObjEditor objEditor;
27	52	public void closeUI2()
28	53	{
..	..	@@ -60,6 +85,12 @@
60	85	this.copy = this.group = group;
61	86	//selectees = this.group.selectees;
62	87
	88	+ if (copy.versions == null)
	89	+ {
	90	+ copy.versions = new byte[100][];
	91	+ copy.versionindex = -1;
	92	+ }
	93	+
63	94	if(ui)
64	95	SetupUI(objEditor);
65	96	}
..	..	@@ -74,16 +105,28 @@
74	105	this.copy = this.group = copy;
75	106	//selectees = this.group.selectees;
76	107
77		- SetupMenu2(objEditor);
	108	+ SetupMenu2(this); //objEditor);
78	109	SetupUI2(objEditor);
79	110	objEditor.SetupUI(true);
80	111	SetupViews(objEditor);
81	112
82	113	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	114	+
	115	+ if (copy.versions == null)
	116	+ {
	117	+ copy.versions = new byte[100][];
	118	+ copy.versionindex = -1;
	119	+
	120	+ Save(true);
	121	+ }
83	122	}
84	123
85	124	void CloneSelection(boolean supports)
86	125	{
	126	+ if (Globals.REPLACEONMAKE)
	127	+ Save();
	128	+ boolean keep = Globals.REPLACEONMAKE;
	129	+ Globals.REPLACEONMAKE = false;
87	130	// Object3D keep = GrafreeD.clipboard;
88	131	//Object3D obj;
89	132	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,6 +137,7 @@
94	137
95	138	makeSomething(clone, i==group.selection.size()-1);
96	139	}
	140	+ Globals.REPLACEONMAKE = keep;
97	141	}
98	142
99	143	void CloneClipboard(boolean supports)
..	..	@@ -148,28 +192,21 @@
148	192
149	193	//JTextField nameField;
150	194
151		- void SetupMenu2(ObjEditor oe)
	195	+ void SetupMenu2(GroupEditor oe)
152	196	{
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		-
	197	+ oe.jTree = new cTree();
	198	+
168	199	Menu menu;
169	200	oe.menuBar.add(menu = new Menu("Edit"));
170	201	//editItem = menu.add(new MenuItem("Edit"));
171	202	//editItem.addActionListener(this);
172		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	203	+
	204	+// undoItem = menu.add(new MenuItem("Undo"));
	205	+// undoItem.addActionListener(this);
	206	+// redoItem = menu.add(new MenuItem("Redo"));
	207	+// redoItem.addActionListener(this);
	208	+// menu.add("-");
	209	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
173	210	duplicateItem.addActionListener(this);
174	211	cloneItem = menu.add(new MenuItem("Clone"));
175	212	cloneItem.addActionListener(this);
..	..	@@ -185,7 +222,6 @@
185	222	copyItem.addActionListener(this);
186	223	pasteItem = menu.add(new MenuItem("Paste"));
187	224	pasteItem.addActionListener(this);
188		- menu.add("-");
189	225
190	226	menu.add("-");
191	227	pasteIntoItem = menu.add(new MenuItem("Paste into"));
..	..	@@ -197,8 +233,8 @@
197	233	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
198	234	// pasteExpandItem.addActionListener(this);
199	235	menu.add("-");
200		- clearItem = menu.add(new MenuItem("Clear"));
201		- clearItem.addActionListener(this);
	236	+ deleteItem = menu.add(new MenuItem("Delete"));
	237	+ deleteItem.addActionListener(this);
202	238
203	239	if (Globals.ADVANCED)
204	240	{
..	..	@@ -206,7 +242,94 @@
206	242	clearAllItem = menu.add(new MenuItem("Clear All"));
207	243	clearAllItem.addActionListener(this);
208	244	}
	245	+
	246	+ menuBar.add(cameraMenu = new Menu("View"));
	247	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	248	+ //zBufferItem.addActionListener(this);
	249	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	250	+ //normalLensItem.addActionListener(this);
	251	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	252	+ restoreCameraItem.addActionListener(this);
	253	+
	254	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	255	+// toggleFullScreenItem.addItemListener(this);
	256	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	257	+// cameraMenu.add("-");
	258	+//
	259	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	260	+// toggleTextureItem.addItemListener(this);
	261	+// toggleTextureItem.setState(CameraPane.textureon);
	262	+//
	263	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	264	+// toggleSwitchItem.addItemListener(this);
	265	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	266	+
	267	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	268	+ toggleHandleItem.addItemListener(this);
	269	+ toggleHandleItem.setState(CameraPane.HANDLES);
	270	+
	271	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	272	+ togglePaintItem.addItemListener(this);
	273	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	274	+
	275	+ if (Globals.ADVANCED)
	276	+ {
	277	+ cameraMenu.add("-");
	278	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	279	+ toggleLiveItem.addItemListener(this);
	280	+ toggleLiveItem.setState(Globals.isLIVE());
209	281
	282	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	283	+ stepItem.addActionListener(this);
	284	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	285	+ // toggleDLItem.addItemListener(this);
	286	+ // toggleDLItem.setState(false);
	287	+
	288	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	289	+ toggleRenderItem.addItemListener(this);
	290	+ toggleRenderItem.setState(!CameraPane.frozen);
	291	+
	292	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	293	+ toggleDebugItem.addItemListener(this);
	294	+ toggleDebugItem.setState(Globals.DEBUG);
	295	+
	296	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	297	+ toggleFrustumItem.addItemListener(this);
	298	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	299	+
	300	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	301	+ toggleFootContactItem.addItemListener(this);
	302	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	303	+
	304	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	305	+ toggleTimelineItem.addItemListener(this);
	306	+ }
	307	+
	308	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	309	+// toggleRootItem.addItemListener(this);
	310	+// toggleRootItem.setState(false);
	311	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	312	+// animationItem.addItemListener(this);
	313	+// animationItem.setState(CameraPane.ANIMATION);
	314	+ cameraMenu.add("-");
	315	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	316	+ editCameraItem.addActionListener(this);
	317	+
	318	+ if (Globals.ADVANCED)
	319	+ {
	320	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	321	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	322	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	323	+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	324	+ oe.cameraMenu.add("-");
	325	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	326	+ openWindowItem.addActionListener(this);
	327	+ editLeafItem.addActionListener(this);
	328	+ lookAtItem.addActionListener(this);
	329	+ //lookFromItem.addActinoListener(this);
	330	+ //switchViewItem.addActionListener(this);
	331	+ }
	332	+
210	333	oe.menuBar.add(menu = new Menu("Setting"));
211	334	if (Globals.ADVANCED)
212	335	{
..	..	@@ -249,21 +372,29 @@
249	372	}
250	373
251	374	oe.menuBar.add(menu = new Menu("Group"));
252		- grabItem = menu.add(new MenuItem("Grab"));
253		- grabItem.addActionListener(this);
	375	+// grabItem = menu.add(new MenuItem("Grab"));
	376	+// grabItem.addActionListener(this);
254	377	backItem = menu.add(new MenuItem("Back"));
255	378	backItem.addActionListener(this);
256	379	frontItem = menu.add(new MenuItem("Front"));
257	380	frontItem.addActionListener(this);
258		- compositeItem = menu.add(new MenuItem("Composite"));
259		- compositeItem.addActionListener(this);
	381	+// compositeItem = menu.add(new MenuItem("Composite"));
	382	+// compositeItem.addActionListener(this);
	383	+
	384	+ if (Globals.ADVANCED)
	385	+ {
260	386	hideItem = menu.add(new MenuItem("Hidden Group"));
261	387	hideItem.addActionListener(this);
	388	+ }
262	389	ungroupItem = menu.add(new MenuItem("Ungroup"));
263	390	ungroupItem.addActionListener(this);
264		- menu.add("-");
265		- randomItem = menu.add(new MenuItem("Switch node"));
266		- randomItem.addActionListener(this);
	391	+
	392	+// menu.add("-");
	393	+//
	394	+// switchItem = menu.add(new MenuItem("Switch node"));
	395	+// switchItem.addActionListener(this);
	396	+ if (Globals.ADVANCED)
	397	+ {
267	398	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
268	399	switchGeoItem.addActionListener(this);
269	400	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -271,8 +402,6 @@
271	402	morphItem = menu.add(new MenuItem("Morph Group"));
272	403	morphItem.addActionListener(this);
273	404
274		- if (Globals.ADVANCED)
275		- {
276	405	menu.add("-");
277	406	physicsItem = menu.add(new MenuItem("Physics"));
278	407	physicsItem.addActionListener(this);
..	..	@@ -280,30 +409,29 @@
280	409	frameselectorItem.addActionListener(this);
281	410	scriptNodeItem = menu.add(new MenuItem("Script Node"));
282	411	scriptNodeItem.addActionListener(this);
283		- cameraItem = menu.add(new MenuItem("Camera"));
284		- cameraItem.addActionListener(this);
285	412	}
286	413
287	414	oe.menuBar.add(menu = new Menu("Object"));
288		- textureItem = menu.add(new MenuItem("Texture"));
289		- textureItem.addActionListener(this);
	415	+// textureItem = menu.add(new MenuItem("Texture"));
	416	+// textureItem.addActionListener(this);
290	417	billboardItem = menu.add(new MenuItem("Billboard"));
291	418	billboardItem.addActionListener(this);
292	419	csgItem = menu.add(new MenuItem("CSG"));
293	420	csgItem.addActionListener(this);
294		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	421	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
295	422	shadowXItem.addActionListener(this);
296		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	423	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
297	424	shadowYItem.addActionListener(this);
298		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	425	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
299	426	shadowZItem.addActionListener(this);
	427	+ attributeItem = menu.add(new MenuItem("Attribute"));
	428	+ attributeItem.addActionListener(this);
	429	+
300	430	if (Globals.ADVANCED)
301	431	{
302	432	menu.add("-");
303	433	linkerItem = menu.add(new MenuItem("Linker"));
304	434	linkerItem.addActionListener(this);
305		- attributeItem = menu.add(new MenuItem("Attribute"));
306		- attributeItem.addActionListener(this);
307	435	templateItem = menu.add(new MenuItem("Template"));
308	436	templateItem.addActionListener(this);
309	437	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -332,7 +460,7 @@
332	460	genNormalsMESHItem.addActionListener(this);
333	461	if (Globals.ADVANCED)
334	462	{
335		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	463	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
336	464	genNormalsMINEItem.addActionListener(this);
337	465	}
338	466	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -392,6 +520,14 @@
392	520	markleavesItem.addActionListener(this);
393	521	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
394	522	unmarkleavesItem.addActionListener(this);
	523	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	524	+ rewindleavesItem.addActionListener(this);
	525	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	526	+ unrewindleavesItem.addActionListener(this);
	527	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	528	+ randomleavesItem.addActionListener(this);
	529	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	530	+ unrandomleavesItem.addActionListener(this);
395	531	menu.add("-");
396	532	flipVItem = menu.add(new MenuItem("Flip V"));
397	533	flipVItem.addActionListener(this);
..	..	@@ -417,10 +553,15 @@
417	553	attachBumpItem.addActionListener(this);
418	554	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
419	555	pigmentBumpItem.addActionListener(this);
	556	+ //embedTexturesItem
420	557	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
421	558	detachPigmentItem.addActionListener(this);
422	559	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
423	560	detachBumpItem.addActionListener(this);
	561	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	562	+ embedTexturesItem.addActionListener(this);
	563	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	564	+ deEmbedTexturesItem.addActionListener(this);
424	565	menu.add("-");
425	566	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
426	567	sortbysizeItem.addActionListener(this);
..	..	@@ -443,25 +584,25 @@
443	584	oe.menuBar.add(menu = new Menu("Insert"));
444	585	buildCreateMenu(menu);
445	586
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	587	oe.menuBar.add(menu = new Menu("Tools"));
460	588	buildToolsMenu(menu);
461	589	}
462	590
	591	+
463	592	void SetupUI2(ObjEditor oe)
464	593	{
	594	+ // June 2019
	595	+ if (oe == null)
	596	+ {
	597	+ //super.SetupUI2(this);
	598	+ //return;
	599	+ }
	600	+
	601	+ if (copy != group)
	602	+ {
	603	+ //super.SetupUI2(this);
	604	+ }
	605	+
465	606	//new Exception().printStackTrace();
466	607
467	608	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -490,27 +631,79 @@
490	631	oe.radioPanel.add(dummyButton);
491	632	oe.buttonGroup.add(dummyButton);
492	633	*/
	634	+ cGridBag copyOptionsPanel = new cGridBag();
	635	+
	636	+ copyOptionsPanel.preferredHeight = 2;
	637	+
493	638	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
494	639
495		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	640	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	641	+ //minButton.setToolTipText("Minimize window");
	642	+ //minButton.addActionListener(this);
	643	+
	644	+ if (Globals.ADVANCED)
	645	+ {
	646	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	647	+ maxButton.setToolTipText("Maximize window");
	648	+ maxButton.addActionListener(this);
	649	+ }
	650	+
	651	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	652	+ fullButton.setToolTipText("Full-screen window");
	653	+ fullButton.addActionListener(this);
	654	+
	655	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	656	+ screenfitButton.setToolTipText("Screen fit");
	657	+ screenfitButton.addActionListener(this);
	658	+
	659	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	660	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	661	+ restoreCameraButton.addActionListener(this);
	662	+
	663	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	664	+ saveButton.setToolTipText("New version");
	665	+ saveButton.addActionListener(this);
	666	+
	667	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	668	+ undoButton.setToolTipText("Previous version");
	669	+ undoButton.addActionListener(this);
	670	+ undoButton.setEnabled(false);
	671	+
	672	+ cGridBag updown = new cGridBag().setVertical(true);
	673	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	674	+ restoreButton.setToolTipText("Restore current");
	675	+ restoreButton.addActionListener(this);
	676	+ restoreButton.setEnabled(false);
	677	+
	678	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	679	+ replaceButton.setToolTipText("Replace current");
	680	+ replaceButton.addActionListener(this);
	681	+ replaceButton.setEnabled(false);
	682	+
	683	+ copyOptionsPanel.add(updown);
	684	+
	685	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	686	+ redoButton.setToolTipText("Next version");
	687	+ redoButton.addActionListener(this);
	688	+ redoButton.setEnabled(false);
	689	+
	690	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
496	691	liveCB.setToolTipText("Enable animation");
497	692	liveCB.addItemListener(this);
498	693
499		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	694	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
500	695	oneStepButton.setToolTipText("Animate one step forward");
501	696	oneStepButton.addActionListener(this);
502	697
503		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	698	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
504	699	fastCB.setToolTipText("Fast mode");
505	700	fastCB.addItemListener(this);
506	701
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);
	702	+ //oe.toolboxPanel.Return();
	703	+
	704	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	705	+// trackCB.setToolTipText("Enable tracking");
	706	+// trackCB.addItemListener(this);
514	707
515	708	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
516	709	// screenfitpointButton.addActionListener(this);
..	..	@@ -520,67 +713,244 @@
520	713	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
521	714	snapobjectButton.addActionListener(this);
522	715	snapobjectButton.setToolTipText("Snap Object");
	716	+
	717	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	718	+ fourButton.addActionListener(this);
	719	+ fourButton.setToolTipText("Show control panel only");
523	720	}
524	721
525		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
526		- flashSelectionButton.setToolTipText("Show selection");
527		- flashSelectionButton.addActionListener(this);
	722	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
528	723
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");
	724	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	725	+ twoButton.setToolTipText("Show 3D view only");
533	726	twoButton.addActionListener(this);
534		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
535		- fourButton.addActionListener(this);
536		- fourButton.setToolTipText("Show left panel only");
537		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
538		- sixButton.setToolTipText("2-column layout left");
539		- sixButton.addActionListener(this);
540		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
541		- threeButton.setToolTipText("2-column layout right");
	727	+ this.fullscreenLayout = twoButton;
	728	+
	729	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	730	+ threeButton.setToolTipText("Show controls and 3D view");
542	731	threeButton.addActionListener(this);
543		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
544		- sevenButton.setToolTipText("3-column layout");
545		- sevenButton.addActionListener(this);
	732	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	733	+ sixButton.setToolTipText("Show 3D view and controls");
	734	+ sixButton.addActionListener(this);
	735	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	736	+// sevenButton.setToolTipText("3-column layout");
	737	+// sevenButton.addActionListener(this);
546	738	//
547	739
548		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
549		- rootButton.setToolTipText("Edit selection in new tab");
	740	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	741	+ rootButton.setToolTipText("Open selection in new tab");
550	742	rootButton.addActionListener(this);
551	743
552		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	744	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
553	745	closeButton.setToolTipText("Close tab");
554	746	closeButton.addActionListener(this);
555	747	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
556	748	//clearButton.addActionListener(this);
557		-
558		- cGridBag commandsPanel = new cGridBag();
	749	+
	750	+ cGridBag row1 = new cGridBag();
559	751
560		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
561		- editButton.setToolTipText("Edit selection");
	752	+ // INSERT
	753	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	754	+ gridButton.setToolTipText("Create grid");
	755	+ gridButton.addActionListener(this);
	756	+
	757	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	758	+ boxButton.setToolTipText("Create box");
	759	+ boxButton.addActionListener(this);
	760	+
	761	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	762	+ sphereButton.setToolTipText("Create sphere");
	763	+ sphereButton.addActionListener(this);
	764	+
	765	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	766	+ coneButton.setToolTipText("Create cone");
	767	+ coneButton.addActionListener(this);
	768	+
	769	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	770	+ torusButton.setToolTipText("Create torus");
	771	+ torusButton.addActionListener(this);
	772	+
	773	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	774	+ superButton.setToolTipText("Create superellipsoid");
	775	+ superButton.addActionListener(this);
	776	+
	777	+ if (Globals.ADVANCED)
	778	+ {
	779	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	780	+ kleinButton.setToolTipText("Create Klein bottle");
	781	+ kleinButton.addActionListener(this);
	782	+ }
	783	+
	784	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	785	+ particlesButton.setToolTipText("Create particle system");
	786	+ particlesButton.addActionListener(this);
	787	+
	788	+ oe.toolboxPanel.add(row1);
	789	+
	790	+ cGridBag row2 = new cGridBag();
	791	+
	792	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	793	+ groupButton.setToolTipText("Create group");
	794	+ groupButton.addActionListener(this);
	795	+
	796	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	797	+ compositeButton.setToolTipText("Create composite");
	798	+ compositeButton.addActionListener(this);
	799	+
	800	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	801	+ switchButton.setToolTipText("Create item switcher");
	802	+ switchButton.addActionListener(this);
	803	+
	804	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	805	+ loopButton.setToolTipText("Create loop");
	806	+ loopButton.addActionListener(this);
	807	+
	808	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	809	+ textureButton.setToolTipText("Create texture");
	810	+ textureButton.addActionListener(this);
	811	+
	812	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	813	+ overlayButton.setToolTipText("Create overlay");
	814	+ overlayButton.addActionListener(this);
	815	+
	816	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	817	+ lightButton.setToolTipText("Create light");
	818	+ lightButton.addActionListener(this);
	819	+
	820	+ oe.toolboxPanel.add(row2);
	821	+
	822	+ // ENVYMAPS
	823	+ cGridBag row3 = new cGridBag();
	824	+ row3.preferredHeight = 20;
	825	+
	826	+ AddSkyboxButton("default", "rgb", row3);
	827	+ AddSkyboxButton("default", "cornell", row3);
	828	+ AddSkyboxButton("default", "uffizi", row3);
	829	+ AddSkyboxButton("default", "CloudyHills", row3);
	830	+ AddSkyboxButton("default", "skycube", row3);
	831	+
	832	+ oe.toolboxPanel.add(row3);
	833	+
	834	+ cGridBag row4 = new cGridBag();
	835	+ row4.preferredHeight = 20;
	836	+
	837	+ AddSkyboxButton("bridge", "Bridge2", row4);
	838	+ AddSkyboxButton("urban", "GamlaStan2", row4);
	839	+ AddSkyboxButton("urban", "Parliament", row4);
	840	+ AddSkyboxButton("urban", "Roundabout", row4);
	841	+
	842	+ oe.toolboxPanel.add(row4);
	843	+
	844	+ cGridBag row5 = new cGridBag();
	845	+ row5.preferredHeight = 20;
	846	+
	847	+ AddSkyboxButton("urban", "SaintLazarusChurch", row5);
	848	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row5);
	849	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row5);
	850	+ AddSkyboxButton("urban", "UnionSquare", row5);
	851	+
	852	+ oe.toolboxPanel.add(row5);
	853	+
	854	+ cGridBag row6 = new cGridBag();
	855	+ row6.preferredHeight = 20;
	856	+
	857	+ AddSkyboxButton("park", "BerzeliiPark", row6);
	858	+ AddSkyboxButton("park", "Buddha", row6);
	859	+ AddSkyboxButton("park", "CNTower2", row6);
	860	+ //AddSkyboxButton("park", "Fatbursparken", row6);
	861	+ AddSkyboxButton("park", "NiagaraFalls1", row6);
	862	+
	863	+ oe.toolboxPanel.add(row6);
	864	+
	865	+ cGridBag row7 = new cGridBag();
	866	+ row7.preferredHeight = 20;
	867	+
	868	+ AddSkyboxButton("park", "NiagaraFalls3", row7);
	869	+ AddSkyboxButton("park", "Park", row7);
	870	+ //AddSkyboxButton("park", "Park2", row6);
	871	+ //AddSkyboxButton("park", "Path", row6);
	872	+ AddSkyboxButton("park", "Pond", row7);
	873	+ AddSkyboxButton("park", "Skansen", row7);
	874	+
	875	+ oe.toolboxPanel.add(row7);
	876	+
	877	+ cGridBag row8 = new cGridBag();
	878	+ row8.preferredHeight = 20;
	879	+
	880	+ AddSkyboxButton("park", "Skansen2", row8);
	881	+ AddSkyboxButton("park", "Skansen3", row8);
	882	+ AddSkyboxButton("park", "Skansen4", row8);
	883	+ AddSkyboxButton("park", "Skansen5", row8);
	884	+
	885	+ oe.toolboxPanel.add(row8);
	886	+
	887	+ cGridBag row9 = new cGridBag();
	888	+ row9.preferredHeight = 20;
	889	+
	890	+ AddSkyboxButton("park", "Stairs", row9);
	891	+ //AddSkyboxButton("park", "Tantolunden", row6);
	892	+ //AddSkyboxButton("park", "Tantolunden3", row6);
	893	+ AddSkyboxButton("park", "Tantolunden4", row9);
	894	+
	895	+ oe.toolboxPanel.add(row9);
	896	+/*
	897	+BerzeliiPark
	898	+Buddha
	899	+CNTower2
	900	+Fatbursparken
	901	+NiagaraFalls1
	902	+NiagaraFalls3
	903	+Park
	904	+Park2
	905	+Path
	906	+Pond
	907	+Skansen
	908	+Skansen2
	909	+Skansen3
	910	+Skansen4
	911	+Skansen5
	912	+Stairs
	913	+Tantolunden
	914	+Tantolunden3
	915	+Tantolunden4
	916	+ */
	917	+
	918	+ for (int i=1; --i>=0;)
	919	+ {
	920	+ //oe.toolboxPanel.Return();
	921	+ oe.toolboxPanel.add(new cGridBag());
	922	+ }
	923	+
	924	+ // EDIT panel
	925	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	926	+ editButton.setToolTipText("Pin selection controls");
562	927	editButton.addActionListener(this);
563	928
564		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
565		- uneditButton.setToolTipText("Unedit selection");
	929	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	930	+ uneditButton.setToolTipText("Remove selection controls");
566	931	uneditButton.addActionListener(this);
567	932
568		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
569		- allParamsButton.setToolTipText("Edit all params");
	933	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	934	+ allParamsButton.setToolTipText("Show all controle");
570	935	allParamsButton.addActionListener(this);
571	936
572		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	937	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
573	938	clearPanelButton.setToolTipText("Clear edit panel");
574	939	clearPanelButton.addActionListener(this);
575	940
576		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	941	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
577	942	unselectButton.setToolTipText("Unselect");
578	943	unselectButton.addActionListener(this);
579	944
580		- commandsPanel.preferredHeight = 1;
	945	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	946	+ flashSelectionButton.setToolTipText("Highlight selection");
	947	+ flashSelectionButton.addActionListener(this);
581	948
582		- oe.treePanel.add(commandsPanel);
583		- oe.treePanel.Return();
	949	+ editCommandsPanel.preferredHeight = 1;
	950	+
	951	+ SetPinStates(false);
	952	+// oe.treePanel.add(commandsPanel);
	953	+// oe.treePanel.Return();
584	954
585	955	// oe.aConstraints.gridx += 1;
586	956	// oe.aConstraints.weighty = 0;
..	..	@@ -597,32 +967,20 @@
597	967
598	968	JScrollPane jSP;
599	969	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
600		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	970	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
601	971	ResetModel();
602	972
603	973	oe.treePanel.add(jSPPanel);
604	974	oe.treePanel.Return();
605	975
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	976	oe.treePanel.add(copyOptionsPanel);
622	977	oe.treePanel.Return();
	978	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	979	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	980	+ sliderPane.preferredHeight = 1;
623	981
624		-// mainPanel.setDividerLocation(0.5); //1.0);
625		-// mainPanel.setResizeWeight(0.5);
	982	+// mainPanel.setDividerLocation(0.1); //1.0);
	983	+ mainPanel.setResizeWeight(0.4);
626	984
627	985	//jList.addListSelectionListener(this);
628	986	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -630,7 +988,7 @@
630	988	//jTree.setEditable(true);
631	989	oe.jTree.setDragEnabled(true);
632	990	//jTree.setPreferredSize(new Dimension(10,10));
633		- jSP.setPreferredSize(new Dimension(100,200));
	991	+ //jSP.setPreferredSize(new Dimension(100,200));
634	992
635	993	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
636	994
..	..	@@ -642,29 +1000,49 @@
642	1000	dgr.addDragGestureListener(this);
643	1001	}catch(Exception e) {}
644	1002	*/
645		- radio.layout = sevenButton;
	1003	+ radio.layout = sixButton; // sevenButton;
646	1004	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
647	1005	}
648	1006
649	1007	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
650	1008	{
	1009	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1010	+ colorCB.setToolTipText("Copy color when dropped");
	1011	+ colorCB.addItemListener(this);
	1012	+
	1013	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1014	+ materialCB.setToolTipText("Copy material when dropped");
	1015	+ materialCB.addItemListener(this);
	1016	+
	1017	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1018	+ textureCB.setToolTipText("Copy texture when dropped");
	1019	+ textureCB.addItemListener(this);
	1020	+
	1021	+ panel.Return();
	1022	+
651	1023	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
652	1024	boxCB.setToolTipText("Display bounding boxes");
653	1025	boxCB.addItemListener(this);
654	1026
655	1027	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
656		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1028	+ zoomBoxCB.setToolTipText("Display only for wheel");
657	1029	zoomBoxCB.addItemListener(this);
658	1030
659	1031	if (true) // Globals.ADVANCED)
660	1032	{
661		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
662		- supportCB.setToolTipText("Enable rigging");
663		- supportCB.addItemListener(this);
	1033	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1034	+// supportCB.setToolTipText("Enable rigging");
	1035	+// supportCB.addItemListener(this);
	1036	+
	1037	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1038	+ freezeCB.setToolTipText("Fast moving camera");
	1039	+ freezeCB.addItemListener(this);
664	1040
665	1041	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
666	1042	// localCB.addItemListener(this);
667	1043
	1044	+ panel.Return();
	1045	+
668	1046	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
669	1047	crowdCB.setToolTipText("Used for crowds");
670	1048	crowdCB.addItemListener(this);
..	..	@@ -681,6 +1059,8 @@
681	1059	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
682	1060	// speakerMocapCB.addItemListener(this);
683	1061
	1062	+ panel.Return();
	1063	+
684	1064	if (false)
685	1065	{
686	1066	// handled in scripts
..	..	@@ -695,42 +1075,85 @@
695	1075	//constraints.gridy += 1;
696	1076	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
697	1077	smoothfocusCB.addItemListener(this);
	1078	+ panel.Return();
698	1079	}
699	1080
700	1081	//constraints.gridx += 1;
701	1082	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
702	1083	// debugCB.addItemListener(this);
703	1084
	1085	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1086	+ trackCB.setToolTipText("Enable tracking target");
	1087	+ trackCB.addItemListener(this);
	1088	+
704	1089	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1090	+ oeilCB.setToolTipText("Move camera when tracking");
705	1091	oeilCB.addItemListener(this);
706	1092
	1093	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1094	+ shadowCB.setToolTipText("When live compute shadows");
	1095	+ shadowCB.addItemListener(this);
	1096	+
	1097	+ panel.Return();
	1098	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1099	+ toggleTextureCB.setToolTipText("Load textures");
	1100	+ toggleTextureCB.addItemListener(this);
	1101	+
	1102	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1103	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1104	+ toggleSwitchCB.addItemListener(this);
	1105	+
	1106	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1107	+ autokeepCB.setToolTipText("On structure change");
	1108	+ autokeepCB.addItemListener(this);
	1109	+
	1110	+ panel.Return();
	1111	+ if (Globals.ADVANCED)
	1112	+ {
707	1113	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
708	1114	lookAtCB.setToolTipText("Look-at target");
709	1115	lookAtCB.addItemListener(this);
	1116	+ }
710	1117
711	1118	}
712	1119
713	1120	cGridBag fill = new cGridBag();
714		-
715	1121	fill.preferredHeight = 200;
	1122	+ cGridBag fill2 = new cGridBag();
	1123	+ fill2.preferredHeight = 200;
	1124	+ cGridBag fill3 = new cGridBag();
	1125	+ fill3.preferredHeight = 200;
716	1126
717	1127	panel.add(fill);
	1128	+ panel.add(fill2);
	1129	+ panel.add(fill3);
718	1130
719	1131	}
720	1132
721	1133	void EditObject(Object3D obj)
722	1134	{
723	1135	cRadio radioButton = new cRadio(obj.name);
	1136	+
	1137	+ // June 2019. Patch to avoid bug with transparency.
	1138	+ radioButton.hadMaterial = obj.material != null;
	1139	+ if (!radioButton.hadMaterial)
	1140	+ {
	1141	+ obj.material = new cMaterial();
	1142	+ }
	1143	+
724	1144	radioButton.SetObject(obj);
725		- radioButton.layout = sevenButton;
	1145	+ radioButton.layout = sixButton; // sevenButton;
726	1146	radioButton.SetCamera(cameraView.renderCamera, false);
727	1147	radioButton.addActionListener(this);
728	1148	radioPanel.add(radioButton);
729	1149	buttonGroup.add(radioButton);
730	1150	radioButton.doClick();
731	1151	}
	1152	+
732	1153	void SetupViews(ObjEditor oe)
733	1154	{
	1155	+ theFrame = this;
	1156	+
734	1157	oe.SetupViews();
735	1158
736	1159	System.out.println("SetupViews");
..	..	@@ -739,23 +1162,28 @@
739	1162	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
740	1163	}
741	1164
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;
	1165	+ cToggleButton liveCB;
	1166	+ cCheckBox supportCB;
	1167	+ cCheckBox localCB;
	1168	+ cCheckBox crowdCB;
	1169	+ cCheckBox smoothCB;
	1170	+ cToggleButton fastCB;
	1171	+ cCheckBox slowCB;
	1172	+ cCheckBox boxCB;
	1173	+ cCheckBox zoomBoxCB;
	1174	+ cCheckBox freezeCB;
	1175	+ //cToggleButton trackCB;
	1176	+ cCheckBox trackCB;
	1177	+ cCheckBox smoothfocusCB;
753	1178	// JCheckBox speakerMocapCB;
754		- JCheckBox speakerCameraCB;
755		- JCheckBox speakerFocusCB;
756		- JCheckBox debugCB;
757		- JCheckBox oeilCB;
758		- JCheckBox lookAtCB;
	1179	+ cCheckBox speakerCameraCB;
	1180	+ cCheckBox speakerFocusCB;
	1181	+ cCheckBox debugCB;
	1182	+
	1183	+ cCheckBox oeilCB;
	1184	+ cCheckBox shadowCB;
	1185	+ cCheckBox autokeepCB;
	1186	+ cCheckBox lookAtCB;
759	1187
760	1188	// static int COLOR = 1;
761	1189	// static int MATERIAL = 2;
..	..	@@ -763,9 +1191,9 @@
763	1191
764	1192	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
765	1193
766		- JCheckBox colorCB;
767		- JCheckBox materialCB;
768		- JCheckBox textureCB;
	1194	+ cCheckBox colorCB;
	1195	+ cCheckBox materialCB;
	1196	+ cCheckBox textureCB;
769	1197
770	1198	public void itemStateChanged(ItemEvent e)
771	1199	{
..	..	@@ -793,6 +1221,7 @@
793	1221	} else if(e.getSource() == liveCB)
794	1222	{
795	1223	cameraView.ToggleLive();
	1224	+ refreshContents(false);
796	1225	}
797	1226	else if(e.getSource() == supportCB)
798	1227	{
..	..	@@ -857,6 +1286,18 @@
857	1286	{
858	1287	cameraView.ToggleOeil();
859	1288	}
	1289	+ else if(e.getSource() == shadowCB)
	1290	+ {
	1291	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1292	+ }
	1293	+ else if(e.getSource() == freezeCB)
	1294	+ {
	1295	+ Globals.FREEZEONMOVE ^= true;
	1296	+ }
	1297	+ else if(e.getSource() == autokeepCB)
	1298	+ {
	1299	+ Globals.REPLACEONMAKE ^= true;
	1300	+ }
860	1301	else if(e.getSource() == lookAtCB)
861	1302	{
862	1303	cameraView.ToggleLookAt();
..	..	@@ -873,7 +1314,8 @@
873	1314
874	1315	/**/
875	1316	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
876		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1317	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1318	+ TreePath path = objEditor.jTree.getSelectionPath();
877	1319	if ((path == null) \|\| (path.getPathCount() <= 1)) {
878	1320	// We can't move the root node or an empty selection
879	1321	return;
..	..	@@ -936,8 +1378,6 @@
936	1378	}
937	1379	}
938	1380
939		- String string = (String) object;
940		-
941	1381	System.out.println("Transfer = " + object + "; drop : " + target);
942	1382	// if( object instanceof java.io.File[])
943	1383	// {
..	..	@@ -945,6 +1385,8 @@
945	1385	// objEditor.DropFile((java.io.File[]) object, true);
946	1386	// return;
947	1387	// }
	1388	+
	1389	+ String string = object.toString();
948	1390
949	1391	// File path for Mac and Windows
950	1392	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -990,23 +1432,33 @@
990	1432
991	1433	assert target == objEditor.jTree;
992	1434	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1435	+ Object3D destinationLeaf;
993	1436	try {
994		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1437	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
995	1438	} catch (Exception e) {
996	1439	System.out.println("destinationPath : " + destinationPath);
997	1440	return;
998	1441	}
999	1442
1000		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1443	+ for (int i=group.selection.size(); --i>=0;)
1001	1444	{
	1445	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1446	+
	1447	+ // Cannot move into itself
	1448	+ if (child == destinationLeaf)
	1449	+ return;
	1450	+ }
	1451	+
	1452	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1453	+// {
1002	1454	loadClipboard(true);
1003	1455	objEditor.jTree.setSelectionPath(destinationPath);
1004	1456	pasteInto(false, false);
1005		- } else {
1006		- loadClipboard(false);
1007		- objEditor.jTree.setSelectionPath(destinationPath);
1008		- pasteInto(false, false); // true); // ???
1009		- }
	1457	+// } else {
	1458	+// loadClipboard(false);
	1459	+// objEditor.jTree.setSelectionPath(destinationPath);
	1460	+// pasteInto(false, false); // true); // ???
	1461	+// }
1010	1462	}
1011	1463	public void dropActionChanged(DropTargetDragEvent dtde)
1012	1464	// Called if the user has modified the current drop gesture
..	..	@@ -1111,22 +1563,30 @@
1111	1563	{
1112	1564	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1113	1565	//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);
	1566	+// gridItem = menu.add(new MenuItem("Grid"));
	1567	+// gridItem.addActionListener(this);
	1568	+// rectoidItem = menu.add(new MenuItem("Box"));
	1569	+// rectoidItem.addActionListener(this);
	1570	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1571	+// ellipsoidItem.addActionListener(this);
	1572	+// coneItem = menu.add(new MenuItem("Cone"));
	1573	+// coneItem.addActionListener(this);
	1574	+// torusItem = menu.add(new MenuItem("Torus"));
	1575	+// torusItem.addActionListener(this);
	1576	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1577	+// superItem.addActionListener(this);
	1578	+
	1579	+ cameraItem = menu.add(new MenuItem("Camera"));
	1580	+ cameraItem.addActionListener(this);
	1581	+
	1582	+ if (!Globals.ADVANCED)
	1583	+ {
1126	1584	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1127	1585	kleinItem.addActionListener(this);
1128		- particleItem = menu.add(new MenuItem("Particle system"));
1129		- particleItem.addActionListener(this);
	1586	+ }
	1587	+
	1588	+// particleItem = menu.add(new MenuItem("Particle system"));
	1589	+// particleItem.addActionListener(this);
1130	1590	if (Globals.ADVANCED)
1131	1591	{
1132	1592	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1152,15 +1612,15 @@
1152	1612	}
1153	1613	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1154	1614	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);
	1615	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1616	+// overlayItem.addActionListener(this);
	1617	+// lightItem = menu.add(new MenuItem("Light"));
	1618	+// lightItem.addActionListener(this);
1159	1619	menu.add("-");
1160	1620	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1161	1621	//superLoopItem.addActionListener(this);
1162		- loopItem = menu.add(new MenuItem("Loop"));
1163		- loopItem.addActionListener(this);
	1622	+// loopItem = menu.add(new MenuItem("Loop"));
	1623	+// loopItem.addActionListener(this);
1164	1624	doubleItem = menu.add(new MenuItem("Fork"));
1165	1625	doubleItem.addActionListener(this);
1166	1626	if (Globals.ADVANCED)
..	..	@@ -1176,6 +1636,9 @@
1176	1636	animationItem.addItemListener(this);
1177	1637	animationItem.setState(Globals.ANIMATION);
1178	1638
	1639	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1640	+ archiveItem.addActionListener(this);
	1641	+
1179	1642	menu.add("-");
1180	1643	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1181	1644	parseverticesItem.addActionListener(this);
..	..	@@ -1188,6 +1651,8 @@
1188	1651	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1189	1652	reduce34MorphItem.addActionListener(this);
1190	1653	menu.add("-");
	1654	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1655	+ memoryItem.addActionListener(this);
1191	1656	menu.add(computeAOItem = new MenuItem("Compute AO"));
1192	1657	computeAOItem.addActionListener(this);
1193	1658
..	..	@@ -1196,11 +1661,9 @@
1196	1661	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1197	1662	mirrorItem.addActionListener(this);
1198	1663	menu.add("-");
1199		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1200		- memoryItem.addActionListener(this);
1201	1664	menu.add(analyzeItem = new MenuItem("Analyze"));
1202	1665	analyzeItem.addActionListener(this);
1203		- menu.add(dumpItem = new MenuItem("Dump"));
	1666	+ menu.add(dumpItem = new MenuItem("Print"));
1204	1667	dumpItem.addActionListener(this);
1205	1668	// menu.add(pathItem = new MenuItem("From-to path"));
1206	1669	// pathItem.addActionListener(this);
..	..	@@ -1341,9 +1804,34 @@
1341	1804	shadow.material = new cMaterial(obj.material);
1342	1805	shadow.material.diffuse = 0.0001f;
1343	1806	shadow.material.specular = 0.0001f;
	1807	+ //shadow.projectedVertices[1].x = 300;
1344	1808
1345	1809	makeSomething(shadow);
1346	1810	}
	1811	+
	1812	+ private void ClearUnpinned()
	1813	+ {
	1814	+ //for (Object3D obj : listUI)
	1815	+ for (int i=listUI.size(); --i>=0;)
	1816	+ {
	1817	+ Object3D obj = listUI.elementAt(i);
	1818	+ if (!obj.pinned)
	1819	+ {
	1820	+ obj.CloseUI();
	1821	+ listUI.remove(i);
	1822	+ }
	1823	+ }
	1824	+ }
	1825	+
	1826	+ private void EditElement(Object3D elem, boolean newWindow)
	1827	+ {
	1828	+ // if (!(elem instanceof Composite))
	1829	+ // newWindow = false;
	1830	+ listUI.add(elem);
	1831	+ elem.openEditWindow(this, newWindow); //, false);
	1832	+ System.out.println("edit : " + elem);
	1833	+ elem.editWindow.refreshContents(true); // ? new
	1834	+ }
1347	1835
1348	1836	/**
1349	1837	* applyExample
..	..	@@ -1588,7 +2076,7 @@
1588	2076	{
1589	2077	ScreenFit();
1590	2078	} else
1591		- if (source == switchItem)
	2079	+ if (source == switchViewItem)
1592	2080	{
1593	2081	cVector v1 = new cVector();
1594	2082	cVector v2 = new cVector();
..	..	@@ -1597,11 +2085,11 @@
1597	2085	objEditor.cameraView.renderCamera.setAim(v2, v1);
1598	2086	objEditor.cameraView.repaint();
1599	2087	} else
1600		- if (source == rectoidItem)
	2088	+ if (source == rectoidItem \|\| source == boxButton)
1601	2089	{
1602	2090	makeSomething(new Box());
1603	2091	} else
1604		- if (source == particleItem)
	2092	+ if (source == particleItem \|\| source == particlesButton)
1605	2093	{
1606	2094	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1607	2095	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1680,27 +2168,27 @@
1680	2168
1681	2169	makeSomething(obj);
1682	2170	} else
1683		- if (source == gridItem)
	2171	+ if (source == gridItem \|\| source == gridButton)
1684	2172	{
1685	2173	makeSomething(new Grid());
1686	2174	} else
1687		- if (source == ellipsoidItem)
	2175	+ if (source == ellipsoidItem \|\| source == sphereButton)
1688	2176	{
1689	2177	makeSomething(new Sphere());
1690	2178	} else
1691		- if (source == coneItem)
	2179	+ if (source == coneItem \|\| source == coneButton)
1692	2180	{
1693	2181	makeSomething(new Cone());
1694	2182	} else
1695		- if (source == torusItem)
	2183	+ if (source == torusItem \|\| source == torusButton)
1696	2184	{
1697	2185	makeSomething(new Torus());
1698	2186	} else
1699		- if (source == superItem)
	2187	+ if (source == superItem \|\| source == superButton)
1700	2188	{
1701	2189	makeSomething(new Superellipsoid());
1702	2190	} else
1703		- if (source == kleinItem)
	2191	+ if (source == kleinItem \|\| source == kleinButton)
1704	2192	{
1705	2193	makeSomething(new Klein());
1706	2194	} else
..	..	@@ -1720,7 +2208,7 @@
1720	2208	{
1721	2209	makeSomething(new BezierSurface());
1722	2210	} else
1723		- if (source == overlayItem)
	2211	+ if (source == overlayItem \|\| source == overlayButton)
1724	2212	{
1725	2213	/*
1726	2214	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1768,10 +2256,27 @@
1768	2256	s.setup();
1769	2257	makeSomething(s);
1770	2258	} else
1771		- if (source == lightItem)
	2259	+ if (source == lightItem \|\| source == lightButton)
1772	2260	{
1773	2261	makeSomething(new Light());
1774	2262	} else
	2263	+// if (source == skybox1Button \|\|
	2264	+// source == skybox2Button \|\|
	2265	+// source == skybox3Button \|\|
	2266	+// source == skybox4Button \|\|
	2267	+// source == skybox5Button \|\|
	2268	+// source == skybox6Button \|\|
	2269	+// source == skybox7Button \|\|
	2270	+// source == skybox11Button \|\|
	2271	+// source == skybox12Button \|\|
	2272	+// source == skybox13Button \|\|
	2273	+// source == skybox14Button \|\|
	2274	+// source == skybox15Button \|\|
	2275	+// source == skybox16Button \|\|
	2276	+// source == skybox17Button)
	2277	+// {
	2278	+// ChangeSkybox(source);
	2279	+// } else
1775	2280	if (source == csgItem)
1776	2281	{
1777	2282	group(new CSG());
..	..	@@ -1818,30 +2323,30 @@
1818	2323
1819	2324	group(g);
1820	2325	} else
1821		- if (source == loopItem)
	2326	+ if (source == loopItem \|\| source == loopButton)
1822	2327	{
1823	2328	Composite csg = new GroupLeaf();
1824	2329	csg.count = 5;
1825	2330	group(csg);
1826		- Composite child = new cGroup();
	2331	+ Composite child = new cGroup("Branch");
1827	2332	csg.addChild(child);
1828	2333	child.addChild(csg);
1829	2334	} else
1830	2335	if (source == doubleItem)
1831	2336	{
1832		- Composite csg = new GroupLeaf();
	2337	+ Composite csg = new GroupLeaf("Fork");
1833	2338	csg.count = 5;
1834	2339	group(csg);
1835		- Composite child = new cGroup();
	2340	+ Composite child = new cGroup("Branch A");
1836	2341	csg.addChild(child);
1837	2342	child.addChild(csg);
1838		- child = new cGroup();
	2343	+ child = new cGroup("Branch B");
1839	2344	csg.addChild(child);
1840	2345	child.addChild(csg);
1841	2346	} else
1842	2347	if (source == tripleItem)
1843	2348	{
1844		- Composite csg = new GroupLeaf();
	2349	+ Composite csg = new GroupLeaf("Trident");
1845	2350	csg.count = 4;
1846	2351	group(csg);
1847	2352	Composite child = new cGroup();
..	..	@@ -1854,35 +2359,10 @@
1854	2359	csg.addChild(child);
1855	2360	child.addChild(csg);
1856	2361	} 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		- } else
1882	2362	if (source == computeAOItem)
1883	2363	{
1884	2364	Globals.drawMode = CameraPane.OCCLUSION;
1885		- Globals.theRenderer.repaint();
	2365	+ cameraView.repaint();
1886	2366	} else
1887	2367	if (source == recompileItem)
1888	2368	{
..	..	@@ -1916,6 +2396,46 @@
1916	2396	{
1917	2397	DumpObject();
1918	2398	} else
	2399	+ if (source == minButton)
	2400	+ {
	2401	+ Minimize();
	2402	+ } else
	2403	+ if (source == maxButton)
	2404	+ {
	2405	+ Maximize();
	2406	+ } else
	2407	+ if (source == fullButton)
	2408	+ {
	2409	+ ToggleFullScreen();
	2410	+ } else
	2411	+ if (source == undoButton)
	2412	+ {
	2413	+ // Go to previous version
	2414	+ //if (!Undo())
	2415	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2416	+ Undo();
	2417	+ } else
	2418	+ if (source == restoreButton)
	2419	+ {
	2420	+ // Restore current version
	2421	+ Restore();
	2422	+ } else
	2423	+ if (source == replaceButton)
	2424	+ {
	2425	+ // Overwrite current version
	2426	+ Replace();
	2427	+ } else
	2428	+ if (source == redoButton)
	2429	+ {
	2430	+ // Go to next version
	2431	+ Redo();
	2432	+ } else
	2433	+ if (source == saveButton)
	2434	+ {
	2435	+ // Save a new version
	2436	+ if (!Save(true))
	2437	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2438	+ } else
1919	2439	if (source == oneStepButton)
1920	2440	{
1921	2441	Globals.ONESTEP = true;
..	..	@@ -1923,17 +2443,14 @@
1923	2443	} else
1924	2444	if (source == screenfitButton)
1925	2445	{
1926		- //Reload(lastConverter, lastFilename, true);
1927	2446	ScreenFit();
1928	2447	} else
1929	2448	if (source == screenfitpointButton)
1930	2449	{
1931		- //Reload(lastConverter, lastFilename, true);
1932	2450	ScreenFitPoint();
1933	2451	} else
1934	2452	if (source == snapobjectButton)
1935	2453	{
1936		- //Reload(lastConverter, lastFilename, true);
1937	2454	SnapObject();
1938	2455	} else
1939	2456	// if (event.getSource() == recompileButton)
..	..	@@ -1969,6 +2486,14 @@
1969	2486	if (source == cutItem \|\| source == clearButton)
1970	2487	{
1971	2488	loadClipboard(true);
	2489	+ } else
	2490	+ if (source == undoItem)
	2491	+ {
	2492	+ Undo();
	2493	+ } else
	2494	+ if (source == redoItem)
	2495	+ {
	2496	+ Redo();
1972	2497	} else
1973	2498	if (source == duplicateItem)
1974	2499	{
..	..	@@ -2289,7 +2814,7 @@
2289	2814	{
2290	2815	StepAll();
2291	2816	} else
2292		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	2817	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2293	2818	{
2294	2819	//int indices[] = jList.getSelectedIndices();
2295	2820	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2301,9 +2826,9 @@
2301	2826	{
2302	2827	ClearSelection(true);
2303	2828	} else
2304		- if (source == grabItem)
	2829	+ if (source == grabItem \|\| source == groupButton)
2305	2830	{
2306		- group(new cGroup(), true);
	2831	+ group(new cGroup(), false); // true);
2307	2832	} else
2308	2833	if (source == hideItem)
2309	2834	{
..	..	@@ -2321,11 +2846,11 @@
2321	2846	{
2322	2847	makeSomething(new Camera());
2323	2848	} else
2324		- if (source == compositeItem)
	2849	+ if (source == compositeItem \|\| source == compositeButton)
2325	2850	{
2326	2851	group(new Composite());
2327	2852	} else
2328		- if (source == randomItem)
	2853	+ if (source == switchItem \|\| source == switchButton)
2329	2854	{
2330	2855	RandomNode random = new RandomNode();
2331	2856	group(random);
..	..	@@ -2427,7 +2952,7 @@
2427	2952	{
2428	2953	group(new cLinker());
2429	2954	} else
2430		- if (source == textureItem)
	2955	+ if (source == textureItem \|\| source == textureButton)
2431	2956	{
2432	2957	group(new TextureNode());
2433	2958	} else
..	..	@@ -2447,17 +2972,30 @@
2447	2972	{
2448	2973	CastShadow(2);
2449	2974	} else
2450		- if (source == ungroupItem)
	2975	+ if (source == ungroupItem \|\| source == ungroupButton)
2451	2976	{
2452		- //ungroup();
	2977	+ boolean hasRoot = false;
	2978	+
2453	2979	for (int i=0; i<group.selection.size(); i++)
2454	2980	{
2455		- Ungroup(group.selection.get(i));
	2981	+ if (group.selection.get(i) == group)
	2982	+ {
	2983	+ hasRoot = true;
	2984	+ break;
	2985	+ }
2456	2986	}
2457	2987
2458		- ClearSelection(false);
2459		-
2460		- refreshContents();
	2988	+ if (!hasRoot)
	2989	+ {
	2990	+ for (int i=0; i<group.selection.size(); i++)
	2991	+ {
	2992	+ Ungroup(group.selection.get(i));
	2993	+ }
	2994	+
	2995	+ ClearSelection(false);
	2996	+
	2997	+ refreshContents();
	2998	+ }
2461	2999	} else
2462	3000	if (source == genUVItem)
2463	3001	{
..	..	@@ -2469,7 +3007,7 @@
2469	3007	} else
2470	3008	if (source == genNormalsMESHItem)
2471	3009	{
2472		- GenNormals(true); // TODO
	3010	+ GenNormalsMESH();
2473	3011	} else
2474	3012	if (source == genNormalsORGANItem)
2475	3013	{
..	..	@@ -2534,6 +3072,22 @@
2534	3072	if (source == unmarkleavesItem)
2535	3073	{
2536	3074	MarkLeaves(false);
	3075	+ } else
	3076	+ if (source == rewindleavesItem)
	3077	+ {
	3078	+ RewindLeaves(true);
	3079	+ } else
	3080	+ if (source == unrewindleavesItem)
	3081	+ {
	3082	+ RewindLeaves(false);
	3083	+ } else
	3084	+ if (source == randomleavesItem)
	3085	+ {
	3086	+ RandomLeaves(true);
	3087	+ } else
	3088	+ if (source == unrandomleavesItem)
	3089	+ {
	3090	+ RandomLeaves(false);
2537	3091	} else
2538	3092	if (source == flipVItem)
2539	3093	{
..	..	@@ -2742,7 +3296,7 @@
2742	3296	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2743	3297	{
2744	3298	obj = (Object3D)e.nextElement();
2745		- obj.SetBumpTexture(null);
	3299	+ obj.ResetBumpTexture();
2746	3300	}
2747	3301
2748	3302	refreshContents();
..	..	@@ -2758,6 +3312,31 @@
2758	3312
2759	3313	refreshContents();
2760	3314	} else
	3315	+ if (source == embedTexturesItem)
	3316	+ {
	3317	+ Object3D obj;
	3318	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3319	+ {
	3320	+ obj = (Object3D)e.nextElement();
	3321	+ obj.EmbedTextures(true);
	3322	+ }
	3323	+
	3324	+ refreshContents();
	3325	+ } else
	3326	+ if (source == deEmbedTexturesItem)
	3327	+ {
	3328	+ Object3D obj;
	3329	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3330	+ {
	3331	+ obj = (Object3D)e.nextElement();
	3332	+ obj.EmbedTextures(false);
	3333	+ }
	3334	+
	3335	+ CameraPane.texturepigment.clear();
	3336	+ CameraPane.texturebump.clear();
	3337	+
	3338	+ refreshContents();
	3339	+ } else
2761	3340	if (source == flashSelectionButton)
2762	3341	{
2763	3342	CameraPane.flash = true;
..	..	@@ -2769,6 +3348,10 @@
2769	3348	if (source == twoButton)
2770	3349	{
2771	3350	radio.layout = twoButton;
	3351	+
	3352	+ if (CameraPane.FULLSCREEN)
	3353	+ fullscreenLayout = radio.layout;
	3354	+
2772	3355	// bug
2773	3356	//gridPanel.setDividerLocation(1.0);
2774	3357	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2801,10 +3384,31 @@
2801	3384	bigThree.ClearUI();
2802	3385	bigThree.add(centralPanel);
2803	3386	bigThree.FlushUI();
	3387	+
	3388	+ cameraView.requestFocusInWindow();
	3389	+
	3390	+// refreshContents(true);
	3391	+//
	3392	+// try
	3393	+// {
	3394	+// java.awt.Robot bot = new java.awt.Robot();
	3395	+// int mask = InputEvent.BUTTON1_MASK;
	3396	+// bot.mouseMove(100, 100);
	3397	+// bot.mousePress(mask);
	3398	+// bot.mouseRelease(mask);
	3399	+// }
	3400	+// catch (Exception e)
	3401	+// {
	3402	+//
	3403	+// }
	3404	+
2804	3405	} else
2805	3406	if (source == threeButton)
2806	3407	{
2807	3408	radio.layout = threeButton;
	3409	+
	3410	+ if (CameraPane.FULLSCREEN)
	3411	+ fullscreenLayout = radio.layout;
2808	3412
2809	3413	// bigThree.remove(scenePanel);
2810	3414	// bigThree.remove(centralPanel);
..	..	@@ -2834,13 +3438,18 @@
2834	3438	// centralPanel.setVisible(true);
2835	3439	// XYZPanel.setVisible(true);
2836	3440	bigThree.ClearUI();
	3441	+ bigThree.add(scenePanel);
2837	3442	bigThree.add(centralPanel);
2838		- bigThree.add(XYZPanel);
2839	3443	bigThree.FlushUI();
	3444	+
	3445	+ cameraView.requestFocusInWindow();
2840	3446	} else
2841	3447	if (source == fourButton)
2842	3448	{
2843	3449	radio.layout = fourButton;
	3450	+
	3451	+ if (CameraPane.FULLSCREEN)
	3452	+ fullscreenLayout = radio.layout;
2844	3453
2845	3454	// bigThree.remove(scenePanel);
2846	3455	// bigThree.remove(centralPanel);
..	..	@@ -2872,10 +3481,15 @@
2872	3481	bigThree.ClearUI();
2873	3482	bigThree.add(scenePanel);
2874	3483	bigThree.FlushUI();
	3484	+
	3485	+ cameraView.requestFocusInWindow();
2875	3486	} else
2876	3487	if (source == sixButton)
2877	3488	{
2878	3489	radio.layout = sixButton;
	3490	+
	3491	+ if (CameraPane.FULLSCREEN)
	3492	+ fullscreenLayout = radio.layout;
2879	3493
2880	3494	// bigThree.remove(scenePanel);
2881	3495	// bigThree.remove(centralPanel);
..	..	@@ -2905,13 +3519,18 @@
2905	3519	// centralPanel.setVisible(true);
2906	3520	// XYZPanel.setVisible(false);
2907	3521	bigThree.ClearUI();
2908		- bigThree.add(scenePanel);
2909	3522	bigThree.add(centralPanel);
	3523	+ bigThree.add(scenePanel);
2910	3524	bigThree.FlushUI();
	3525	+
	3526	+ cameraView.requestFocusInWindow();
2911	3527	} else
2912	3528	if (source == sevenButton)
2913	3529	{
2914	3530	radio.layout = sevenButton;
	3531	+
	3532	+ if (CameraPane.FULLSCREEN)
	3533	+ fullscreenLayout = radio.layout;
2915	3534
2916	3535	// bigThree.remove(scenePanel);
2917	3536	// bigThree.remove(centralPanel);
..	..	@@ -2945,6 +3564,8 @@
2945	3564	bigThree.add(centralPanel);
2946	3565	bigThree.add(XYZPanel);
2947	3566	bigThree.FlushUI();
	3567	+
	3568	+ cameraView.requestFocusInWindow();
2948	3569	} else
2949	3570	if (source == rootButton)
2950	3571	{
..	..	@@ -2956,6 +3577,7 @@
2956	3577	EditObject(obj);
2957	3578	}
2958	3579
	3580	+ cameraView.requestFocusInWindow();
2959	3581	refreshContents(true);
2960	3582	} else
2961	3583	if (source == closeButton)
..	..	@@ -2965,22 +3587,37 @@
2965	3587	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2966	3588	{
2967	3589	ab = (cRadio)e.nextElement();
2968		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3590	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2969	3591	{
	3592	+ // Patch to avoid bug with transparency.
	3593	+ if (!ab.hadMaterial)
	3594	+ {
	3595	+ ab.object.material = null;
	3596	+ }
	3597	+
2970	3598	buttonGroup.remove(ab);
2971	3599	radioPanel.remove(ab);
2972	3600
2973		- ab.GetObject().editWindow = null;
	3601	+ //ab.GetObject().editWindow = null;
	3602	+ ab.GetObject().manipWindow = null;
2974	3603	// ab.GetObject().objectUI = null; // ?????????
2975	3604
2976	3605	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2977	3606	break;
2978	3607	}
2979	3608	}
	3609	+
	3610	+ cameraView.requestFocusInWindow();
2980	3611	refreshContents(true);
2981	3612	} else
2982	3613	if (source == editItem \|\| source == editButton)
2983	3614	{
	3615	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3616	+ {
	3617	+ Object3D child = (Object3D)e.nextElement();
	3618	+ child.pinned = true;
	3619	+ }
	3620	+
2984	3621	EditSelection(false);
2985	3622	} else
2986	3623	if (source == uneditButton)
..	..	@@ -2990,10 +3627,11 @@
2990	3627	Object3D child = (Object3D)e.nextElement();
2991	3628	if(child.editWindow != null)
2992	3629	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3630	+ child.pinned = false;
2993	3631	child.CloseUI();
2994	3632	listUI.remove(child);
2995	3633
2996		- child.editWindow = null; // ???????????
	3634	+ //child.editWindow = null; // ???????????
2997	3635	}
2998	3636	objEditor.ctrlPanel.FlushUI();
2999	3637	//objEditor.jTree.clearSelection();
..	..	@@ -3006,6 +3644,7 @@
3006	3644	//copy.ClearUI();
3007	3645	for (Object3D obj : listUI)
3008	3646	{
	3647	+ obj.pinned = false;
3009	3648	obj.CloseUI();
3010	3649	}
3011	3650	listUI.clear();
..	..	@@ -3015,7 +3654,7 @@
3015	3654	{
3016	3655	assert(copy == group);
3017	3656
3018		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3657	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3019	3658
3020	3659	for (Object3D obj : listUI)
3021	3660	{
..	..	@@ -3064,6 +3703,9 @@
3064	3703	}
3065	3704
3066	3705	copy = group;
	3706	+
	3707	+ SetUndoStates();
	3708	+
3067	3709	//Globals.theRenderer.object = group;
3068	3710	if(!useclient)
3069	3711	{
..	..	@@ -3079,20 +3721,46 @@
3079	3721	frontView.object = group;
3080	3722	sideView.object = group;
3081	3723	}
3082		- group.editWindow = this;
	3724	+
	3725	+// fix "+" issue
	3726	+ //group.editWindow = this;
	3727	+ group.manipWindow = this;
	3728	+
3083	3729	/*
3084	3730	currentLayout = radio.layout;
3085	3731	if (currentLayout == null)
3086	3732	currentLayout = sevenButton;
3087	3733	*/
3088	3734	radio.layout.doClick();
	3735	+
	3736	+ ClearUnpinned();
	3737	+ //Grafreed.Assert(group != null);
	3738	+ //Grafreed.Assert(group.selection != null);
	3739	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	3740	+ if (group.selection == null \|\| group.selection.size() == 1)
	3741	+ EditSelection(false);
3089	3742	keepparent = group.parent;
3090	3743	// PARENT = NULL or not???
3091	3744	//group.parent = null; // ROOT
3092	3745	//group.attributes = -1;
3093	3746	ResetModel();
	3747	+
	3748	+ cameraView.requestFocusInWindow();
3094	3749	refreshContents(true);
3095		- }
	3750	+ } else if (event.getSource() == editCameraItem)
	3751	+ {
	3752	+ cameraView.ProtectCamera();
	3753	+ cameraView.repaint();
	3754	+ return;
	3755	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3756	+ {
	3757	+ cameraView.RevertCamera();
	3758	+ cameraView.repaint();
	3759	+ return;
	3760	+ // } else if (event.getSource() == textureButton)
	3761	+ // {
	3762	+ // return; // true;
	3763	+ }
3096	3764	else
3097	3765	{
3098	3766	//return super.action(event, arg);
..	..	@@ -3101,7 +3769,6 @@
3101	3769	}
3102	3770
3103	3771	boolean useclient = false;
3104		- cRadio radio;
3105	3772
3106	3773	void ToggleRoot()
3107	3774	{
..	..	@@ -3340,7 +4007,8 @@
3340	4007
3341	4008	int size = obj.MemorySize();
3342	4009
3343		- System.err.println((size/1024) + " KB is the size of " + obj);
	4010	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4011	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3344	4012	}
3345	4013	}
3346	4014	catch (Exception e)
..	..	@@ -3421,6 +4089,13 @@
3421	4089	void GenNormals(boolean crease)
3422	4090	{
3423	4091	group.GenNormalsS(crease);
	4092	+
	4093	+ refreshContents();
	4094	+ }
	4095	+
	4096	+ void GenNormalsMESH()
	4097	+ {
	4098	+ group.GenNormalsMeshS();
3424	4099
3425	4100	refreshContents();
3426	4101	}
..	..	@@ -3656,7 +4331,7 @@
3656	4331
3657	4332	try
3658	4333	{
3659		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4334	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
3660	4335	}
3661	4336	catch (Exception e)
3662	4337	{
..	..	@@ -4048,6 +4723,18 @@
4048	4723	refreshContents();
4049	4724	}
4050	4725
	4726	+ void RewindLeaves(boolean hide)
	4727	+ {
	4728	+ group.selection.RewindLeaves(hide);
	4729	+ refreshContents();
	4730	+ }
	4731	+
	4732	+ void RandomLeaves(boolean hide)
	4733	+ {
	4734	+ group.selection.RandomLeaves(hide);
	4735	+ refreshContents();
	4736	+ }
	4737	+
4051	4738	void SetTexRes(int tr)
4052	4739	{
4053	4740	group.selection.SetTexRes(tr);
..	..	@@ -4119,28 +4806,25 @@
4119	4806	// }
4120	4807	// }
4121	4808
4122		- static boolean allparams = true;
4123		-
4124		- static Vector<Object3D> listUI = new Vector<Object3D>();
4125		-
4126	4809	void EditSelection(boolean newWindow)
4127	4810	{
	4811	+ if (group.selection == null)
	4812	+ {
	4813	+ EditElement(group, newWindow); // ? new
	4814	+ return;
	4815	+ }
	4816	+
4128	4817	// aConstraints.gridy = 0;
4129	4818	for (int i=0; i<group.selection.size(); i++)
4130	4819	{
4131	4820	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4132	4821	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4133		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4822	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4134	4823
4135	4824	Object3D elem = (Object3D)group.selection.elementAt(i);
4136		- if(elem != group)
	4825	+ if(elem != group \|\| !newWindow)
4137	4826	{
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
	4827	+ EditElement(elem, newWindow); // ? new
4144	4828	}
4145	4829	}
4146	4830	}
..	..	@@ -4215,7 +4899,8 @@
4215	4899	//new Exception().printStackTrace();
4216	4900
4217	4901	freezemodel = true;
4218		-
	4902	+ ClearUnpinned();
	4903	+
4219	4904	/**/
4220	4905	//switch (event.id)
4221	4906	{
..	..	@@ -4223,7 +4908,6 @@
4223	4908	//case 702: // Event.LIST_DESELECT
4224	4909	group.deselectAll();
4225	4910	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4226		- objEditor.ClearInfo(); // .GetMaterial());
4227	4911	if (tps != null)
4228	4912	{
4229	4913	for (int i=0; i < tps.length; i++)
..	..	@@ -4232,10 +4916,8 @@
4232	4916
4233	4917	//if (child.parent != null)
4234	4918	//child.parent.addSelectee(child);
	4919	+ objEditor.SetMaterial(child);
4235	4920	group.addSelectee(child);
4236		- objEditor.SetMaterial(child); // .GetMaterial());
4237		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4238		- System.err.println("info : " + child.GetPath());
4239	4921	}
4240	4922	}
4241	4923	// else
..	..	@@ -4245,20 +4927,28 @@
4245	4927	// System.err.println("info : " + group.GetPath());
4246	4928	// }
4247	4929
4248		- objEditor.SetText(); // jan 2014
4249		-
4250		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4930	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4251	4931	CameraPane.flash = true;
4252	4932
4253		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4933	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4254	4934	// a camera
4255	4935	{
4256		- CameraPane.camerachangeframe = 0; // don't refuse it
4257		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4936	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	4937	+ {
	4938	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4939	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4940	+ }
4258	4941	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4259	4942	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4260	4943	}
4261	4944
	4945	+ if (tps != null && tps.length == 1)
	4946	+ {
	4947	+ EditSelection(false);
	4948	+ }
	4949	+
	4950	+ SetPinStates(tps != null && tps.length > 0);
	4951	+
4262	4952	refreshContents();
4263	4953	//return true;
4264	4954	}
..	..	@@ -4267,6 +4957,35 @@
4267	4957
4268	4958	freezemodel = false;
4269	4959	}
	4960	+
	4961	+ void SetPinStates(boolean enabled)
	4962	+ {
	4963	+ editButton.setEnabled(enabled);
	4964	+ uneditButton.setEnabled(enabled);
	4965	+ unselectButton.setEnabled(enabled);
	4966	+ flashSelectionButton.setEnabled(enabled);
	4967	+ }
	4968	+
	4969	+ void refreshContents(boolean cp)
	4970	+ {
	4971	+ if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	4972	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	4973	+ {
	4974	+ objEditor.ClearInfo(); // .GetMaterial());
	4975	+
	4976	+ for (int i=0; i < group.selection.Size(); i++)
	4977	+ {
	4978	+ Object3D child = (Object3D) group.selection.get(i);
	4979	+
	4980	+ objEditor.AddInfo(child, this, true);
	4981	+ System.err.println("info : " + child.GetPath());
	4982	+ }
	4983	+
	4984	+ objEditor.SetText(); // jan 2014
	4985	+ }
	4986	+
	4987	+ super.refreshContents(cp);
	4988	+ }
4270	4989
4271	4990	void linkSomething(Object3D thing)
4272	4991	{
..	..	@@ -4338,6 +5057,7 @@
4338	5057	{
4339	5058	if (group.selection.isEmpty())
4340	5059	return;
	5060	+
4341	5061	Grafreed.clipboardIsTempGroup = false;
4342	5062	Composite tGroup = null;
4343	5063	if (group.selection.size() > 0) // 1)
..	..	@@ -4348,6 +5068,8 @@
4348	5068
4349	5069	if (cut)
4350	5070	{
	5071	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5072	+// Save();
4351	5073	//int indices[] = jList.getSelectedIndices();
4352	5074	//for (int i = indices.length - 1; i >= 0; i--)
4353	5075	//jList.remove(indices[i]);
..	..	@@ -4437,8 +5159,10 @@
4437	5159	}
4438	5160
4439	5161	}
	5162	+
4440	5163	if (Grafreed.clipboardIsTempGroup)
4441	5164	Grafreed.clipboard = tGroup;
	5165	+
4442	5166	if (cut)
4443	5167	{
4444	5168	ResetModel();
..	..	@@ -4448,6 +5172,10 @@
4448	5172
4449	5173	void paste(boolean expand)
4450	5174	{
	5175	+ if (Globals.REPLACEONMAKE)
	5176	+ Save();
	5177	+ boolean keep = Globals.REPLACEONMAKE;
	5178	+ Globals.REPLACEONMAKE = false;
4451	5179	// if (GrafreeD.clipboard == null)
4452	5180	// return;
4453	5181	boolean first = true;
..	..	@@ -4507,6 +5235,7 @@
4507	5235	Grafreed.clipboard.get(0).parent = keepparent;
4508	5236	}
4509	5237
	5238	+ Globals.REPLACEONMAKE = keep;
4510	5239	ResetModel();
4511	5240	refreshContents();
4512	5241	}
..	..	@@ -4642,6 +5371,10 @@
4642	5371
4643	5372	void group(Object3D csg, boolean grab)
4644	5373	{
	5374	+ if (Globals.REPLACEONMAKE)
	5375	+ Save();
	5376	+ boolean keep = Globals.REPLACEONMAKE;
	5377	+ Globals.REPLACEONMAKE = false;
4645	5378	if (//false) // why??
4646	5379	!group.selection.isEmpty())
4647	5380	{
..	..	@@ -4755,10 +5488,15 @@
4755	5488	//node.add(csg);
4756	5489	//makeSomething(node);
4757	5490	makeSomething(csg);
	5491	+ Globals.REPLACEONMAKE = keep;
4758	5492	}
4759	5493
4760	5494	void Ungroup(Object3D g)
4761	5495	{
	5496	+ if (Globals.REPLACEONMAKE)
	5497	+ Save();
	5498	+ boolean keep = Globals.REPLACEONMAKE;
	5499	+ Globals.REPLACEONMAKE = false;
4762	5500	if (g instanceof HiddenObject)
4763	5501	{
4764	5502	HiddenObject h = (HiddenObject) g;
..	..	@@ -4775,6 +5513,7 @@
4775	5513	objEditor.makeSomething(g.get(i), false);
4776	5514	}
4777	5515	}
	5516	+ Globals.REPLACEONMAKE = keep;
4778	5517	}
4779	5518
4780	5519	void ungroup()
..	..	@@ -4970,21 +5709,6 @@
4970	5709	}
4971	5710	*/
4972	5711
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	5712	/*
4989	5713	public void Callback(Object obj)
4990	5714	{
..	..	@@ -5008,23 +5732,6 @@
5008	5732	}
5009	5733	*/
5010	5734
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	5735	String GetFile(String dialogName)
5029	5736	{
5030	5737	if (Grafreed.standAlone)
..	..	@@ -5095,7 +5802,44 @@
5095	5802	cButton clearpanelButton;
5096	5803	cButton unselectButton;
5097	5804
	5805	+ cButton restoreCameraButton;
	5806	+
	5807	+ cButton saveButton;
5098	5808	cButton oneStepButton;
	5809	+
	5810	+ cButton groupButton;
	5811	+ cButton ungroupButton;
	5812	+ cButton compositeButton;
	5813	+ cButton switchButton;
	5814	+ cButton loopButton;
	5815	+ cButton textureButton;
	5816	+
	5817	+ cButton skybox1Button;
	5818	+ cButton skybox2Button;
	5819	+ cButton skybox3Button;
	5820	+ cButton skybox4Button;
	5821	+ cButton skybox5Button;
	5822	+ cButton skybox6Button;
	5823	+ cButton skybox7Button;
	5824	+
	5825	+ cButton skybox11Button;
	5826	+ cButton skybox12Button;
	5827	+ cButton skybox13Button;
	5828	+ cButton skybox14Button;
	5829	+ cButton skybox15Button;
	5830	+ cButton skybox16Button;
	5831	+ cButton skybox17Button;
	5832	+
	5833	+ cButton gridButton;
	5834	+ cButton boxButton;
	5835	+ cButton sphereButton;
	5836	+ cButton coneButton;
	5837	+ cButton torusButton;
	5838	+ cButton superButton;
	5839	+ cButton kleinButton;
	5840	+ cButton particlesButton;
	5841	+ cButton overlayButton;
	5842	+ cButton lightButton;
5099	5843
5100	5844	cButton screenfitButton;
5101	5845	cButton screenfitpointButton;
..	..	@@ -5108,14 +5852,6 @@
5108	5852
5109	5853	cButton setsupportButton;
5110	5854
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	5855	//
5120	5856	//Composite
5121	5857	Object3D // to do !!
..	..	@@ -5125,9 +5861,11 @@
5125	5861	//JTree jTree;
5126	5862	private MenuItem lookAtItem;
5127	5863	private MenuItem lookFromItem;
5128		- private MenuItem switchItem;
	5864	+ private MenuItem switchViewItem;
5129	5865	private MenuItem cutItem;
5130		- private MenuItem duplicateItem;
	5866	+ private MenuItem undoItem;
	5867	+ private MenuItem redoItem;
	5868	+ private JMenuItem duplicateItem;
5131	5869	private MenuItem cloneItem;
5132	5870	private MenuItem cloneSupportItem;
5133	5871	private MenuItem overwriteGeoItem;
..	..	@@ -5155,7 +5893,7 @@
5155	5893	private MenuItem pasteLinkItem;
5156	5894	private MenuItem pasteCloneItem;
5157	5895	private MenuItem pasteExpandItem;
5158		- private MenuItem clearItem;
	5896	+ private MenuItem deleteItem;
5159	5897	private MenuItem clearAllItem;
5160	5898	private MenuItem genUVItem;
5161	5899	private MenuItem genNormalsMESHItem;
..	..	@@ -5190,6 +5928,10 @@
5190	5928	private MenuItem showleavesItem;
5191	5929	private MenuItem markleavesItem;
5192	5930	private MenuItem unmarkleavesItem;
	5931	+ private MenuItem rewindleavesItem;
	5932	+ private MenuItem unrewindleavesItem;
	5933	+ private MenuItem randomleavesItem;
	5934	+ private MenuItem unrandomleavesItem;
5193	5935
5194	5936	private MenuItem flipVItem;
5195	5937	private MenuItem unflipVItem;
..	..	@@ -5211,7 +5953,7 @@
5211	5953	private MenuItem frontItem;
5212	5954	private MenuItem cameraItem;
5213	5955	private MenuItem compositeItem;
5214		- private MenuItem randomItem;
	5956	+ private MenuItem switchItem;
5215	5957	private MenuItem physicsItem;
5216	5958	private MenuItem frameselectorItem;
5217	5959	private MenuItem scriptNodeItem;
..	..	@@ -5235,6 +5977,8 @@
5235	5977	private MenuItem attachBumpItem;
5236	5978	private MenuItem detachBumpItem;
5237	5979	private MenuItem pigmentBumpItem;
	5980	+ private MenuItem embedTexturesItem;
	5981	+ private MenuItem deEmbedTexturesItem;
5238	5982
5239	5983	private MenuItem particleItem;
5240	5984	private MenuItem ragdollItem;
..	..	@@ -5273,11 +6017,6 @@
5273	6017	private MenuItem doubleItem;
5274	6018	private MenuItem tripleItem;
5275	6019
5276		- private MenuItem importGFDItem;
5277		- private MenuItem importVRMLX3DItem;
5278		- private MenuItem import3DSItem;
5279		- private MenuItem importOBJItem;
5280		-
5281	6020	private MenuItem computeAOItem;
5282	6021	private MenuItem recompileItem;
5283	6022	private MenuItem editScriptItem;
..	..	@@ -5287,4 +6026,8 @@
5287	6026	private MenuItem analyzeItem;
5288	6027	private MenuItem dumpItem;
5289	6028	//boolean freezemodel = false;
	6029	+
	6030	+ Menu cameraMenu;
	6031	+ MenuItem editCameraItem;
	6032	+ MenuItem restoreCameraItem;
5290	6033	}