~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -16,6 +16,7 @@
16	16	//import buoy.widget.BFileChooser;
17	17
18	18	class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
	19	+ Grafreed.iResourceCallBack,
19	20	ObjectUI,
20	21	Runnable,
21	22	ActionListener,
..	..	@@ -23,6 +24,351 @@
23	24	DragGestureListener, DragSourceListener, DropTargetListener,
24	25	ItemListener // ListSelectionListener
25	26	{
	27	+
	28	+ public void AddSkyboxButton(String f, String s, cGridBag row)
	29	+ {
	30	+ cButton skyboxButton;
	31	+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
	32	+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
	33	+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
	34	+ skyboxButton.setToolTipText(s);
	35	+ skyboxButton.addActionListener(new ActionListener()
	36	+ {
	37	+ @Override
	38	+ public void actionPerformed(ActionEvent e)
	39	+ {
	40	+ ChangeSkybox(path);
	41	+ }
	42	+ });
	43	+ }
	44	+
	45	+ public void AddTextureButton(String f, String c, final String t, int count, cGridBag row)
	46	+ {
	47	+ cButton textureButton;
	48	+ final String path = "textures/" + f + "/" + c + "/"; // + t;
	49	+ row.add(textureButton = GetButton(path + "icons/" + t, !Grafreed.NIMBUSLAF));
	50	+ textureButton.setToolTipText(c + count);
	51	+ textureButton.addActionListener(new ActionListener()
	52	+ {
	53	+ @Override
	54	+ public void actionPerformed(ActionEvent e)
	55	+ {
	56	+ ChangeTexture(path + t);
	57	+ }
	58	+ });
	59	+ }
	60	+
	61	+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
	62	+ {
	63	+ cGridBag tab0 = new cGridBag().setVertical(true);
	64	+
	65	+ tab0.setName("Urban");
	66	+ skyboxpanel.add(tab0);
	67	+
	68	+ cGridBag row0 = new cGridBag();
	69	+ cGridBag row1 = new cGridBag();
	70	+ cGridBag row2 = new cGridBag();
	71	+ cGridBag row3 = new cGridBag();
	72	+ cGridBag row4 = new cGridBag();
	73	+ cGridBag row5 = new cGridBag();
	74	+ cGridBag row6 = new cGridBag();
	75	+
	76	+ AddSkyboxButton("default", "rgb", row0);
	77	+ //AddSkyboxButton("default", "cornell", row0);
	78	+ AddSkyboxButton("penguins", "dust", row0);
	79	+ AddSkyboxButton("penguins", "tropic", row0);
	80	+ AddSkyboxButton("penguins", "yonder", row0);
	81	+
	82	+ AddSkyboxButton("default", "uffizi", row1);
	83	+ AddSkyboxButton("bridge", "Bridge", row1);
	84	+ AddSkyboxButton("bridge", "Bridge2", row1);
	85	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	86	+
	87	+ AddSkyboxButton("urban", "Parliament", row2);
	88	+ AddSkyboxButton("urban", "Roundabout", row2);
	89	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	90	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	91	+
	92	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	93	+ AddSkyboxButton("urban", "UnionSquare", row3);
	94	+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
	95	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	96	+
	97	+ AddSkyboxButton("park", "Buddha", row4);
	98	+ AddSkyboxButton("park", "CNTower2", row4);
	99	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	100	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	101	+
	102	+ AddSkyboxButton("park", "Park", row5);
	103	+ AddSkyboxButton("park", "Pond", row5);
	104	+ AddSkyboxButton("park", "Skansen", row5);
	105	+ AddSkyboxButton("park", "Skansen2", row5);
	106	+
	107	+ AddSkyboxButton("park", "Skansen3", row6);
	108	+ AddSkyboxButton("park", "Skansen4", row6);
	109	+ AddSkyboxButton("park", "Skansen5", row6);
	110	+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
	111	+
	112	+ tab0.add(row0);
	113	+ tab0.add(row1);
	114	+ tab0.add(row2);
	115	+ tab0.add(row3);
	116	+ tab0.add(row4);
	117	+ tab0.add(row5);
	118	+ tab0.add(row6);
	119	+
	120	+ for (int i=5; --i>=0;)
	121	+ {
	122	+ //oe.toolboxPanel.Return();
	123	+ //tab0.add(new cGridBag());
	124	+ }
	125	+ }
	126	+
	127	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	128	+ {
	129	+ cGridBag tab0 = new cGridBag().setVertical(true);
	130	+
	131	+ tab0.setName("Nature");
	132	+ skyboxpanel.add(tab0);
	133	+
	134	+ cGridBag row0 = new cGridBag();
	135	+ cGridBag row1 = new cGridBag();
	136	+ cGridBag row2 = new cGridBag();
	137	+ cGridBag row3 = new cGridBag();
	138	+ cGridBag row4 = new cGridBag();
	139	+ cGridBag row5 = new cGridBag();
	140	+ cGridBag row6 = new cGridBag();
	141	+
	142	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	143	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	144	+ AddSkyboxButton("beach", "PalmTrees", row0);
	145	+ AddSkyboxButton("beach", "Tenerife", row0);
	146	+
	147	+ AddSkyboxButton("beach", "Tenerife2", row1);
	148	+ AddSkyboxButton("beach", "Tenerife3", row1);
	149	+ AddSkyboxButton("field", "FishPond", row1);
	150	+ AddSkyboxButton("field", "Footballfield", row1);
	151	+
	152	+ AddSkyboxButton("field", "Meadow", row2);
	153	+ AddSkyboxButton("field", "Sorsele", row2);
	154	+ AddSkyboxButton("field", "Sorsele2", row2);
	155	+ AddSkyboxButton("field", "Sorsele3", row2);
	156	+
	157	+ AddSkyboxButton("forest", "Brudslojan", row3);
	158	+ AddSkyboxButton("forest", "Langholmen2", row3);
	159	+ AddSkyboxButton("forest", "Plants", row3);
	160	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	161	+
	162	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	163	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	164	+ AddSkyboxButton("mountain", "Teide", row4);
	165	+ AddSkyboxButton("park", "Tantolunden4", row4);
	166	+
	167	+ AddSkyboxButton("park", "Stairs", row5);
	168	+ AddSkyboxButton("default", "skycube", row6);
	169	+ AddSkyboxButton("rocky", "Langholmen", row5);
	170	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	171	+
	172	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	173	+ AddSkyboxButton("default", "CloudyHills", row6);
	174	+ AddSkyboxButton("daz", "Autumn", row6);
	175	+ AddSkyboxButton("daz", "MountainTrail", row6);
	176	+ /*
	177	+Autumn
	178	+Greenlands
	179	+MountainTrail
	180	+Oasis
	181	+TheRock
	182	+TopOfTheWorld
	183	+Winter
	184	+ */
	185	+
	186	+ tab0.add(row0);
	187	+ tab0.add(row1);
	188	+ tab0.add(row2);
	189	+ tab0.add(row3);
	190	+ tab0.add(row4);
	191	+ tab0.add(row5);
	192	+ tab0.add(row6);
	193	+
	194	+ for (int i=5; --i>=0;)
	195	+ {
	196	+ //oe.toolboxPanel.Return();
	197	+ //tab0.add(new cGridBag());
	198	+ }
	199	+ }
	200	+
	201	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	202	+ {
	203	+ cGridBag tab0 = new cGridBag().setVertical(true);
	204	+
	205	+ tab0.setName("Night");
	206	+ skyboxpanel.add(tab0);
	207	+
	208	+ cGridBag row0 = new cGridBag();
	209	+ cGridBag row1 = new cGridBag();
	210	+ cGridBag row2 = new cGridBag();
	211	+ cGridBag row3 = new cGridBag();
	212	+ cGridBag row4 = new cGridBag();
	213	+ cGridBag row5 = new cGridBag();
	214	+ cGridBag row6 = new cGridBag();
	215	+
	216	+ AddSkyboxButton("night", "NightPath", row0);
	217	+ AddSkyboxButton("night", "PondNight", row0);
	218	+ AddSkyboxButton("night", "Powerlines", row0);
	219	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	220	+
	221	+ AddSkyboxButton("urban", "CNTower", row1);
	222	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	223	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	224	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
	225	+
	226	+ AddSkyboxButton("penguins", "kenon_star", row2);
	227	+ AddSkyboxButton("persson", "corona", row2);
	228	+ AddSkyboxButton("persson", "spaceskybox", row2);
	229	+ AddSkyboxButton("indoors", "Vasa", row2);
	230	+
	231	+ AddSkyboxButton("winter", "Backyard", row3);
	232	+ AddSkyboxButton("winter", "Creek", row3);
	233	+ AddSkyboxButton("winter", "FootballField3", row3);
	234	+ AddSkyboxButton("winter", "Forest", row3);
	235	+
	236	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	237	+ AddSkyboxButton("winter", "House", row4);
	238	+ AddSkyboxButton("winter", "IceLake", row4);
	239	+ AddSkyboxButton("winter", "IceRiver", row4);
	240	+
	241	+ AddSkyboxButton("winter", "Park3", row5);
	242	+ AddSkyboxButton("winter", "PondWinter", row5);
	243	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	244	+ AddSkyboxButton("winter", "Vindelalven", row5);
	245	+
	246	+ AddSkyboxButton("daz", "TheRock", row6);
	247	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	248	+ AddSkyboxButton("daz", "Winter", row6);
	249	+ AddSkyboxButton("mountain", "Ryfjallet", row6);
	250	+
	251	+ tab0.add(row0);
	252	+ tab0.add(row1);
	253	+ tab0.add(row2);
	254	+ tab0.add(row3);
	255	+ tab0.add(row4);
	256	+ tab0.add(row5);
	257	+ tab0.add(row6);
	258	+
	259	+ for (int i=5; --i>=0;)
	260	+ {
	261	+ //oe.toolboxPanel.Return();
	262	+ //tab0.add(new cGridBag());
	263	+ }
	264	+ }
	265	+
	266	+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
	267	+ {
	268	+ cGridBag tab0 = new cGridBag().setVertical(true);
	269	+
	270	+ tab0.setName("Others");
	271	+ skyboxpanel.add(tab0);
	272	+
	273	+ cGridBag row0 = new cGridBag();
	274	+ cGridBag row1 = new cGridBag();
	275	+ cGridBag row2 = new cGridBag();
	276	+ cGridBag row3 = new cGridBag();
	277	+ cGridBag row4 = new cGridBag();
	278	+ cGridBag row5 = new cGridBag();
	279	+ cGridBag row6 = new cGridBag();
	280	+
	281	+ AddSkyboxButton("mayhem", "afterrain", row0);
	282	+ AddSkyboxButton("mayhem", "aqua4", row0);
	283	+ AddSkyboxButton("mayhem", "aqua9", row0);
	284	+ AddSkyboxButton("mayhem", "flame", row0);
	285	+
	286	+ AddSkyboxButton("mayhem", "h2s", row1);
	287	+ AddSkyboxButton("mayhem", "prehistoric", row1);
	288	+ AddSkyboxButton("mayhem", "scorched", row1);
	289	+ AddSkyboxButton("penguins", "desertdawn", row1);
	290	+
	291	+ AddSkyboxButton("persson", "Citadella", row2);
	292	+ AddSkyboxButton("persson", "Citadella2", row2);
	293	+ AddSkyboxButton("persson", "clouds1", row2);
	294	+ AddSkyboxButton("penguins", "wrath", row2);
	295	+
	296	+ AddSkyboxButton("persson", "FishermansBastion", row3);
	297	+ AddSkyboxButton("persson", "HeroesSquare", row3);
	298	+ AddSkyboxButton("indoors", "DallasW", row3);
	299	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
	300	+
	301	+ AddSkyboxButton("persson", "LancellottiChapel", row4);
	302	+ AddSkyboxButton("persson", "PereaBeach1", row4);
	303	+ AddSkyboxButton("persson", "PereaBeach2", row4);
	304	+ AddSkyboxButton("persson", "redeclipse", row4);
	305	+
	306	+ AddSkyboxButton("daz", "Greenlands", row5);
	307	+ AddSkyboxButton("daz", "Oasis", row5);
	308	+ AddSkyboxButton("elyvisions", "arch3", row5);
	309	+ AddSkyboxButton("elyvisions", "calm_sea", row5);
	310	+
	311	+ AddSkyboxButton("elyvisions", "rainbow", row6);
	312	+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
	313	+ AddSkyboxButton("elyvisions", "heaven", row6);
	314	+ AddSkyboxButton("elyvisions", "hot", row6);
	315	+
	316	+ tab0.add(row0);
	317	+ tab0.add(row1);
	318	+ tab0.add(row2);
	319	+ tab0.add(row3);
	320	+ tab0.add(row4);
	321	+ tab0.add(row5);
	322	+ tab0.add(row6);
	323	+
	324	+ for (int i=5; --i>=0;)
	325	+ {
	326	+ //oe.toolboxPanel.Return();
	327	+ //tab0.add(new cGridBag());
	328	+ }
	329	+ }
	330	+
	331	+ public void ChangeSkybox(String skybox)
	332	+ {
	333	+ //cameraView.envyoff = false;
	334	+ group.skyboxname = skybox;
	335	+ group.skyboxext = "jpg";
	336	+ cameraView.repaint();
	337	+ }
	338	+
	339	+ public void CreateSkyboxPanel(cGridBag skyboxPanel)
	340	+ {
	341	+ JTabbedPane skyboxpane = new JTabbedPane();
	342	+
	343	+ AddSkyboxTab0(skyboxpane);
	344	+ AddSkyboxTab1(skyboxpane);
	345	+ AddSkyboxTab2(skyboxpane);
	346	+ AddSkyboxTab3(skyboxpane);
	347	+
	348	+ skyboxPanel.add(skyboxpane);
	349	+ }
	350	+
	351	+ public void ChangeTexture(String texture)
	352	+ {
	353	+ for (int i=0; i<group.selection.size(); i++)
	354	+ {
	355	+ Object3D obj = group.selection.get(i);
	356	+ obj.SetPigmentTexture("@" + texture);
	357	+ }
	358	+
	359	+ refreshContents();
	360	+ }
	361	+
	362	+ public void Show3DView()
	363	+ {
	364	+ // bug
	365	+ //gridPanel.setDividerLocation(1.0);
	366	+ //bigPanel.setDividerLocation(0.0);
	367	+ bigThree.ClearUI();
	368	+ bigThree.add(centralPanel);
	369	+ bigThree.FlushUI();
	370	+ }
	371	+
26	372	//ObjEditor objEditor;
27	373	public void closeUI2()
28	374	{
..	..	@@ -60,6 +406,14 @@
60	406	this.copy = this.group = group;
61	407	//selectees = this.group.selectees;
62	408
	409	+ if (copy.versionlist == null)
	410	+ {
	411	+ copy.versionlist = new Object3D[100];
	412	+ copy.versionindex = -1;
	413	+
	414	+ Save(true);
	415	+ }
	416	+
63	417	if(ui)
64	418	SetupUI(objEditor);
65	419	}
..	..	@@ -74,16 +428,28 @@
74	428	this.copy = this.group = copy;
75	429	//selectees = this.group.selectees;
76	430
77		- SetupMenu2(objEditor);
	431	+ SetupMenu2(this); //objEditor);
78	432	SetupUI2(objEditor);
79	433	objEditor.SetupUI(true);
80	434	SetupViews(objEditor);
81	435
82	436	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	437	+
	438	+ if (copy.versionlist == null)
	439	+ {
	440	+ copy.versionlist = new Object3D[100];
	441	+ copy.versionindex = -1;
	442	+
	443	+ Save(true);
	444	+ }
83	445	}
84	446
85	447	void CloneSelection(boolean supports)
86	448	{
	449	+ if (Globals.REPLACEONMAKE)
	450	+ Save();
	451	+ boolean keep = Globals.REPLACEONMAKE;
	452	+ Globals.REPLACEONMAKE = false;
87	453	// Object3D keep = GrafreeD.clipboard;
88	454	//Object3D obj;
89	455	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,6 +460,7 @@
94	460
95	461	makeSomething(clone, i==group.selection.size()-1);
96	462	}
	463	+ Globals.REPLACEONMAKE = keep;
97	464	}
98	465
99	466	void CloneClipboard(boolean supports)
..	..	@@ -148,28 +515,21 @@
148	515
149	516	//JTextField nameField;
150	517
151		- void SetupMenu2(ObjEditor oe)
	518	+ void SetupMenu2(GroupEditor oe)
152	519	{
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		-
	520	+ oe.jTree = new cTree();
	521	+
168	522	Menu menu;
169	523	oe.menuBar.add(menu = new Menu("Edit"));
170	524	//editItem = menu.add(new MenuItem("Edit"));
171	525	//editItem.addActionListener(this);
172		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	526	+
	527	+// undoItem = menu.add(new MenuItem("Undo"));
	528	+// undoItem.addActionListener(this);
	529	+// redoItem = menu.add(new MenuItem("Redo"));
	530	+// redoItem.addActionListener(this);
	531	+// menu.add("-");
	532	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
173	533	duplicateItem.addActionListener(this);
174	534	cloneItem = menu.add(new MenuItem("Clone"));
175	535	cloneItem.addActionListener(this);
..	..	@@ -185,7 +545,6 @@
185	545	copyItem.addActionListener(this);
186	546	pasteItem = menu.add(new MenuItem("Paste"));
187	547	pasteItem.addActionListener(this);
188		- menu.add("-");
189	548
190	549	menu.add("-");
191	550	pasteIntoItem = menu.add(new MenuItem("Paste into"));
..	..	@@ -197,8 +556,8 @@
197	556	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
198	557	// pasteExpandItem.addActionListener(this);
199	558	menu.add("-");
200		- clearItem = menu.add(new MenuItem("Clear"));
201		- clearItem.addActionListener(this);
	559	+ deleteItem = menu.add(new MenuItem("Delete"));
	560	+ deleteItem.addActionListener(this);
202	561
203	562	if (Globals.ADVANCED)
204	563	{
..	..	@@ -206,7 +565,92 @@
206	565	clearAllItem = menu.add(new MenuItem("Clear All"));
207	566	clearAllItem.addActionListener(this);
208	567	}
	568	+
	569	+ menuBar.add(cameraMenu = new Menu("View"));
	570	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	571	+ //zBufferItem.addActionListener(this);
	572	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	573	+ //normalLensItem.addActionListener(this);
	574	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	575	+ restoreCameraItem.addActionListener(this);
	576	+
	577	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	578	+// toggleFullScreenItem.addItemListener(this);
	579	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	580	+// cameraMenu.add("-");
	581	+//
	582	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	583	+// toggleTextureItem.addItemListener(this);
	584	+// toggleTextureItem.setState(CameraPane.textureon);
	585	+//
	586	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	587	+// toggleSwitchItem.addItemListener(this);
	588	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	589	+
	590	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	591	+ toggleHandleItem.addItemListener(this);
	592	+ toggleHandleItem.setState(CameraPane.HANDLES);
	593	+
	594	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	595	+ togglePaintItem.addItemListener(this);
	596	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	597	+
	598	+ if (Globals.ADVANCED)
	599	+ {
	600	+ cameraMenu.add("-");
	601	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	602	+ toggleLiveItem.addItemListener(this);
	603	+ toggleLiveItem.setState(Globals.isLIVE());
209	604
	605	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	606	+ stepItem.addActionListener(this);
	607	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	608	+ // toggleDLItem.addItemListener(this);
	609	+ // toggleDLItem.setState(false);
	610	+
	611	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	612	+ toggleRenderItem.addItemListener(this);
	613	+ toggleRenderItem.setState(!CameraPane.frozen);
	614	+
	615	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	616	+ toggleDebugItem.addItemListener(this);
	617	+ toggleDebugItem.setState(Globals.DEBUG);
	618	+
	619	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	620	+ toggleFrustumItem.addItemListener(this);
	621	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	622	+
	623	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	624	+ toggleFootContactItem.addItemListener(this);
	625	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	626	+
	627	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	628	+ toggleTimelineItem.addItemListener(this);
	629	+ }
	630	+
	631	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	632	+// toggleRootItem.addItemListener(this);
	633	+// toggleRootItem.setState(false);
	634	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	635	+// animationItem.addItemListener(this);
	636	+// animationItem.setState(CameraPane.ANIMATION);
	637	+ cameraMenu.add("-");
	638	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	639	+ editCameraItem.addActionListener(this);
	640	+
	641	+ if (Globals.ADVANCED)
	642	+ {
	643	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	644	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	645	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	646	+ oe.cameraMenu.add("-");
	647	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	648	+ openWindowItem.addActionListener(this);
	649	+ lookAtItem.addActionListener(this);
	650	+ //lookFromItem.addActinoListener(this);
	651	+ //switchViewItem.addActionListener(this);
	652	+ }
	653	+
210	654	oe.menuBar.add(menu = new Menu("Setting"));
211	655	if (Globals.ADVANCED)
212	656	{
..	..	@@ -249,21 +693,29 @@
249	693	}
250	694
251	695	oe.menuBar.add(menu = new Menu("Group"));
252		- grabItem = menu.add(new MenuItem("Grab"));
253		- grabItem.addActionListener(this);
	696	+// grabItem = menu.add(new MenuItem("Grab"));
	697	+// grabItem.addActionListener(this);
254	698	backItem = menu.add(new MenuItem("Back"));
255	699	backItem.addActionListener(this);
256	700	frontItem = menu.add(new MenuItem("Front"));
257	701	frontItem.addActionListener(this);
258		- compositeItem = menu.add(new MenuItem("Composite"));
259		- compositeItem.addActionListener(this);
	702	+// compositeItem = menu.add(new MenuItem("Composite"));
	703	+// compositeItem.addActionListener(this);
	704	+
	705	+ if (Globals.ADVANCED)
	706	+ {
260	707	hideItem = menu.add(new MenuItem("Hidden Group"));
261	708	hideItem.addActionListener(this);
	709	+ }
262	710	ungroupItem = menu.add(new MenuItem("Ungroup"));
263	711	ungroupItem.addActionListener(this);
264		- menu.add("-");
265		- randomItem = menu.add(new MenuItem("Switch node"));
266		- randomItem.addActionListener(this);
	712	+
	713	+// menu.add("-");
	714	+//
	715	+// switchItem = menu.add(new MenuItem("Switch node"));
	716	+// switchItem.addActionListener(this);
	717	+ if (Globals.ADVANCED)
	718	+ {
267	719	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
268	720	switchGeoItem.addActionListener(this);
269	721	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -271,8 +723,6 @@
271	723	morphItem = menu.add(new MenuItem("Morph Group"));
272	724	morphItem.addActionListener(this);
273	725
274		- if (Globals.ADVANCED)
275		- {
276	726	menu.add("-");
277	727	physicsItem = menu.add(new MenuItem("Physics"));
278	728	physicsItem.addActionListener(this);
..	..	@@ -280,30 +730,29 @@
280	730	frameselectorItem.addActionListener(this);
281	731	scriptNodeItem = menu.add(new MenuItem("Script Node"));
282	732	scriptNodeItem.addActionListener(this);
283		- cameraItem = menu.add(new MenuItem("Camera"));
284		- cameraItem.addActionListener(this);
285	733	}
286	734
287	735	oe.menuBar.add(menu = new Menu("Object"));
288		- textureItem = menu.add(new MenuItem("Texture"));
289		- textureItem.addActionListener(this);
	736	+// textureItem = menu.add(new MenuItem("Texture"));
	737	+// textureItem.addActionListener(this);
290	738	billboardItem = menu.add(new MenuItem("Billboard"));
291	739	billboardItem.addActionListener(this);
292	740	csgItem = menu.add(new MenuItem("CSG"));
293	741	csgItem.addActionListener(this);
294		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	742	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
295	743	shadowXItem.addActionListener(this);
296		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	744	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
297	745	shadowYItem.addActionListener(this);
298		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	746	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
299	747	shadowZItem.addActionListener(this);
	748	+ attributeItem = menu.add(new MenuItem("Attribute"));
	749	+ attributeItem.addActionListener(this);
	750	+
300	751	if (Globals.ADVANCED)
301	752	{
302	753	menu.add("-");
303	754	linkerItem = menu.add(new MenuItem("Linker"));
304	755	linkerItem.addActionListener(this);
305		- attributeItem = menu.add(new MenuItem("Attribute"));
306		- attributeItem.addActionListener(this);
307	756	templateItem = menu.add(new MenuItem("Template"));
308	757	templateItem.addActionListener(this);
309	758	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -332,7 +781,7 @@
332	781	genNormalsMESHItem.addActionListener(this);
333	782	if (Globals.ADVANCED)
334	783	{
335		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	784	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
336	785	genNormalsMINEItem.addActionListener(this);
337	786	}
338	787	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -392,6 +841,14 @@
392	841	markleavesItem.addActionListener(this);
393	842	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
394	843	unmarkleavesItem.addActionListener(this);
	844	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	845	+ rewindleavesItem.addActionListener(this);
	846	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	847	+ unrewindleavesItem.addActionListener(this);
	848	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	849	+ randomleavesItem.addActionListener(this);
	850	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	851	+ unrandomleavesItem.addActionListener(this);
395	852	menu.add("-");
396	853	flipVItem = menu.add(new MenuItem("Flip V"));
397	854	flipVItem.addActionListener(this);
..	..	@@ -417,10 +874,15 @@
417	874	attachBumpItem.addActionListener(this);
418	875	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
419	876	pigmentBumpItem.addActionListener(this);
	877	+ //embedTexturesItem
420	878	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
421	879	detachPigmentItem.addActionListener(this);
422	880	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
423	881	detachBumpItem.addActionListener(this);
	882	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	883	+ embedTexturesItem.addActionListener(this);
	884	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	885	+ deEmbedTexturesItem.addActionListener(this);
424	886	menu.add("-");
425	887	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
426	888	sortbysizeItem.addActionListener(this);
..	..	@@ -431,6 +893,9 @@
431	893	shareGeometriesItem.addActionListener(this);
432	894	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
433	895	mergeGeometriesItem.addActionListener(this);
	896	+ menu.add("-");
	897	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	898	+ editLeafItem.addActionListener(this);
434	899	if (Globals.ADVANCED)
435	900	{
436	901	// Pretty much the same as duplicate and clone.
..	..	@@ -443,33 +908,95 @@
443	908	oe.menuBar.add(menu = new Menu("Insert"));
444	909	buildCreateMenu(menu);
445	910
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	911	oe.menuBar.add(menu = new Menu("Tools"));
460	912	buildToolsMenu(menu);
461	913	}
462	914
	915	+ JTabbedPane resourcecontainer;
	916	+ cGridBag currenttab;
	917	+ boolean added; // patch for jar
	918	+
	919	+ int tabcount = 0;
	920	+ int colcount = 0;
	921	+ int rowcount = 0;
	922	+ int texturecount = 0;
	923	+
	924	+ int columns = 5;
	925	+ int rows = 7;
	926	+
	927	+ public void ResourceCallBack(String[] path)
	928	+ {
	929	+// for (int i = 0; i < path.length; i++)
	930	+// System.out.print(path[i] + "/");
	931	+// System.out.println();
	932	+
	933	+ if (//rowcount == 0 \|\|
	934	+ path.length == 1)
	935	+ {
	936	+ currenttab = new cGridBag();
	937	+ added = false;
	938	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	939	+ currenttab.setName(tabname);
	940	+ rowcount = 1;
	941	+ colcount = 0;
	942	+ texturecount = 0;
	943	+ }
	944	+
	945	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	946	+ {
	947	+ if (!added)
	948	+ {
	949	+ added = true;
	950	+ resourcecontainer.add(currenttab);
	951	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	952	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	953	+ }
	954	+
	955	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	956	+
	957	+ if (++colcount >= columns)
	958	+ {
	959	+ colcount = 0;
	960	+ currenttab.Return();
	961	+
	962	+ if (rowcount++ >= rows)
	963	+ {
	964	+ rowcount = 0;
	965	+ }
	966	+ }
	967	+ }
	968	+ else
	969	+ {
	970	+// if (!path[path.length-1].equals("icons"))
	971	+// resourcecontainer.Return();
	972	+ }
	973	+ }
	974	+
	975	+ void CreateTexturePanel(cGridBag container)
	976	+ {
	977	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	978	+ container.add(resourcecontainer);
	979	+
	980	+ Grafreed.ParseResources("textures", this);
	981	+ }
	982	+
463	983	void SetupUI2(ObjEditor oe)
464	984	{
	985	+ // June 2019
	986	+ if (oe == null)
	987	+ {
	988	+ //super.SetupUI2(this);
	989	+ //return;
	990	+ }
	991	+
	992	+ if (copy != group)
	993	+ {
	994	+ //super.SetupUI2(this);
	995	+ }
	996	+
465	997	//new Exception().printStackTrace();
466	998
467	999	oe.radioPanel = new JPanel(new GridBagLayout());
468		- oe.aConstraints.weightx = 1;
469		- oe.aConstraints.weighty = 0;
470		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
471		- oe.aConstraints.gridwidth = 100;
472		- oe.aConstraints.gridheight = 1;
473	1000	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
474	1001
475	1002	oe.buttonGroup = new ButtonGroup();
..	..	@@ -490,27 +1017,122 @@
490	1017	oe.radioPanel.add(dummyButton);
491	1018	oe.buttonGroup.add(dummyButton);
492	1019	*/
	1020	+ cGridBag copyOptionsPanel = new cGridBag();
	1021	+
	1022	+ copyOptionsPanel.preferredHeight = 2;
	1023	+
493	1024	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
494	1025
495		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
496		- liveCB.setToolTipText("Enable animation");
497		- liveCB.addItemListener(this);
	1026	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1027	+ //minButton.setToolTipText("Minimize window");
	1028	+ //minButton.addActionListener(this);
	1029	+
	1030	+ if (Globals.ADVANCED)
	1031	+ {
	1032	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1033	+// maxButton.setToolTipText("Maximize window");
	1034	+// maxButton.addActionListener(this);
	1035	+ }
	1036	+
	1037	+// cButton gcButton;
	1038	+//
	1039	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1040	+// gcButton.setToolTipText("Garbage collect");
	1041	+// gcButton.addActionListener(new ActionListener()
	1042	+// {
	1043	+// public void actionPerformed(ActionEvent e)
	1044	+// {
	1045	+// System.gc();
	1046	+// }
	1047	+// });
	1048	+
	1049	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1050	+ collapseButton.setToolTipText("Collapse toolbar");
	1051	+ collapseButton.addActionListener(this);
	1052	+
	1053	+ oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1054	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1055	+ maximize3DButton.addActionListener(this);
	1056	+
	1057	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1058	+ twoButton.setToolTipText("Show 3D view only");
	1059	+ twoButton.addActionListener(this);
	1060	+ this.fullscreenLayout = twoButton;
	1061	+
	1062	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1063	+ threeButton.setToolTipText("Show controls and 3D view");
	1064	+ threeButton.addActionListener(this);
	1065	+ if (Globals.ADVANCED)
	1066	+ {
	1067	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1068	+ sixButton.setToolTipText("Show 3D view and controls");
	1069	+ sixButton.addActionListener(this);
	1070	+ }
	1071	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1072	+// sevenButton.setToolTipText("3-column layout");
	1073	+// sevenButton.addActionListener(this);
	1074	+ //
	1075	+
	1076	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1077	+ fullButton.setToolTipText("Full-screen window");
	1078	+ fullButton.addActionListener(this);
	1079	+
	1080	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1081	+ screenfitButton.setToolTipText("Screen fit");
	1082	+ screenfitButton.addActionListener(this);
498	1083
499		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1084	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1085	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1086	+ restoreCameraButton.addActionListener(this);
	1087	+
	1088	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1089	+ saveVersionButton.setToolTipText("Duplicate current version");
	1090	+ saveVersionButton.addActionListener(this);
	1091	+
	1092	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1093	+ deleteVersionButton.setToolTipText("Delete current version");
	1094	+ deleteVersionButton.addActionListener(this);
	1095	+
	1096	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1097	+ previousVersionButton.setToolTipText("Previous version");
	1098	+ previousVersionButton.addActionListener(this);
	1099	+ previousVersionButton.setEnabled(false);
	1100	+
	1101	+ cGridBag updown = new cGridBag().setVertical(true);
	1102	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1103	+ restoreButton.setToolTipText("Undo (restore current version)");
	1104	+ restoreButton.addActionListener(this);
	1105	+ //restoreButton.setEnabled(false);
	1106	+
	1107	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1108	+ replaceButton.setToolTipText("Save (replace current version)");
	1109	+ replaceButton.addActionListener(this);
	1110	+ //replaceButton.setEnabled(false);
	1111	+
	1112	+ copyOptionsPanel.add(updown);
	1113	+
	1114	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1115	+ nextVersionButton.setToolTipText("Next version");
	1116	+ nextVersionButton.addActionListener(this);
	1117	+ nextVersionButton.setEnabled(false);
	1118	+
	1119	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
500	1120	oneStepButton.setToolTipText("Animate one step forward");
501	1121	oneStepButton.addActionListener(this);
502	1122
503		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	1123	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1124	+ liveCB.setToolTipText("Enable animation");
	1125	+ liveCB.addItemListener(this);
	1126	+
	1127	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
504	1128	fastCB.setToolTipText("Fast mode");
505	1129	fastCB.addItemListener(this);
506	1130
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);
	1131	+ //oe.toolboxPanel.Return();
	1132	+
	1133	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1134	+// trackCB.setToolTipText("Enable tracking");
	1135	+// trackCB.addItemListener(this);
514	1136
515	1137	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
516	1138	// screenfitpointButton.addActionListener(this);
..	..	@@ -520,67 +1142,137 @@
520	1142	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
521	1143	snapobjectButton.addActionListener(this);
522	1144	snapobjectButton.setToolTipText("Snap Object");
	1145	+
	1146	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1147	+ fourButton.addActionListener(this);
	1148	+ fourButton.setToolTipText("Show control panel only");
523	1149	}
524	1150
525		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
526		- flashSelectionButton.setToolTipText("Show selection");
527		- flashSelectionButton.addActionListener(this);
	1151	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
528	1152
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);
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");
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);
546		- //
547	1153
548		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
549		- rootButton.setToolTipText("Edit selection in new tab");
	1154	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1155	+ rootButton.setToolTipText("Open selection in new tab");
550	1156	rootButton.addActionListener(this);
551	1157
552		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1158	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
553	1159	closeButton.setToolTipText("Close tab");
554	1160	closeButton.addActionListener(this);
555	1161	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
556	1162	//clearButton.addActionListener(this);
557		-
558		- cGridBag commandsPanel = new cGridBag();
	1163	+
	1164	+ cGridBag row1 = new cGridBag();
559	1165
560		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
561		- editButton.setToolTipText("Edit selection");
	1166	+ // INSERT
	1167	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1168	+ gridButton.setToolTipText("Create ground");
	1169	+ gridButton.addActionListener(this);
	1170	+
	1171	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1172	+ boxButton.setToolTipText("Create box");
	1173	+ boxButton.addActionListener(this);
	1174	+
	1175	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1176	+ sphereButton.setToolTipText("Create sphere");
	1177	+ sphereButton.addActionListener(this);
	1178	+
	1179	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1180	+ coneButton.setToolTipText("Create cone");
	1181	+ coneButton.addActionListener(this);
	1182	+
	1183	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1184	+ torusButton.setToolTipText("Create torus");
	1185	+ torusButton.addActionListener(this);
	1186	+
	1187	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1188	+ superButton.setToolTipText("Create superellipsoid");
	1189	+ superButton.addActionListener(this);
	1190	+
	1191	+ if (Globals.ADVANCED)
	1192	+ {
	1193	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1194	+ kleinButton.setToolTipText("Create Klein bottle");
	1195	+ kleinButton.addActionListener(this);
	1196	+ }
	1197	+
	1198	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1199	+ particlesButton.setToolTipText("Create particle system");
	1200	+ particlesButton.addActionListener(this);
	1201	+
	1202	+ oe.toolboxPanel.add(row1);
	1203	+
	1204	+ cGridBag row2 = new cGridBag();
	1205	+
	1206	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1207	+ groupButton.setToolTipText("Create group");
	1208	+ groupButton.addActionListener(this);
	1209	+
	1210	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1211	+ compositeButton.setToolTipText("Create composite");
	1212	+ compositeButton.addActionListener(this);
	1213	+
	1214	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1215	+ switchButton.setToolTipText("Create item switcher");
	1216	+ switchButton.addActionListener(this);
	1217	+
	1218	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1219	+ loopButton.setToolTipText("Create loop");
	1220	+ loopButton.addActionListener(this);
	1221	+
	1222	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1223	+ textureButton.setToolTipText("Create texture");
	1224	+ textureButton.addActionListener(this);
	1225	+
	1226	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1227	+ overlayButton.setToolTipText("Create overlay");
	1228	+ overlayButton.addActionListener(this);
	1229	+
	1230	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1231	+ lightButton.setToolTipText("Create light");
	1232	+ lightButton.addActionListener(this);
	1233	+
	1234	+ oe.toolboxPanel.add(row2);
	1235	+
	1236	+ cGridBag textures = new cGridBag();
	1237	+
	1238	+ CreateTexturePanel(textures);
	1239	+
	1240	+ oe.toolboxPanel.add(textures);
	1241	+
	1242	+ textures.preferredHeight = 100;
	1243	+
	1244	+ CreateSkyboxPanel(oe.skyboxPanel);
	1245	+
	1246	+ // EDIT panel
	1247	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1248	+ editButton.setToolTipText("Pin selection controls");
562	1249	editButton.addActionListener(this);
563	1250
564		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
565		- uneditButton.setToolTipText("Unedit selection");
	1251	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1252	+ uneditButton.setToolTipText("Unpin and remove selection controls");
566	1253	uneditButton.addActionListener(this);
567	1254
568		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
569		- allParamsButton.setToolTipText("Edit all params");
	1255	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1256	+ allParamsButton.setToolTipText("Show all controls");
570	1257	allParamsButton.addActionListener(this);
571	1258
572		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
573		- clearPanelButton.setToolTipText("Clear edit panel");
	1259	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1260	+ clearPanelButton.setToolTipText("Clear all controls");
574	1261	clearPanelButton.addActionListener(this);
575	1262
576		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
577		- unselectButton.setToolTipText("Unselect");
578		- unselectButton.addActionListener(this);
	1263	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1264	+ //unselectButton.setToolTipText("Unselect");
	1265	+ //unselectButton.addActionListener(this);
579	1266
580		- commandsPanel.preferredHeight = 1;
	1267	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1268	+ flashSelectionButton.setToolTipText("Highlight selection");
	1269	+ flashSelectionButton.addActionListener(this);
581	1270
582		- oe.treePanel.add(commandsPanel);
583		- oe.treePanel.Return();
	1271	+ editCommandsPanel.preferredHeight = 1;
	1272	+
	1273	+ SetPinStates(false);
	1274	+// oe.treePanel.add(commandsPanel);
	1275	+// oe.treePanel.Return();
584	1276
585	1277	// oe.aConstraints.gridx += 1;
586	1278	// oe.aConstraints.weighty = 0;
..	..	@@ -597,32 +1289,20 @@
597	1289
598	1290	JScrollPane jSP;
599	1291	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
600		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1292	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
601	1293	ResetModel();
602	1294
603	1295	oe.treePanel.add(jSPPanel);
604	1296	oe.treePanel.Return();
605	1297
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	1298	oe.treePanel.add(copyOptionsPanel);
622	1299	oe.treePanel.Return();
	1300	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1301	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1302	+ sliderPane.preferredHeight = 1;
623	1303
624		-// mainPanel.setDividerLocation(0.5); //1.0);
625		-// mainPanel.setResizeWeight(0.5);
	1304	+// mainPanel.setDividerLocation(0.1); //1.0);
	1305	+ mainPanel.setResizeWeight(0.4);
626	1306
627	1307	//jList.addListSelectionListener(this);
628	1308	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -630,7 +1310,7 @@
630	1310	//jTree.setEditable(true);
631	1311	oe.jTree.setDragEnabled(true);
632	1312	//jTree.setPreferredSize(new Dimension(10,10));
633		- jSP.setPreferredSize(new Dimension(100,200));
	1313	+ //jSP.setPreferredSize(new Dimension(100,200));
634	1314
635	1315	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
636	1316
..	..	@@ -642,29 +1322,49 @@
642	1322	dgr.addDragGestureListener(this);
643	1323	}catch(Exception e) {}
644	1324	*/
645		- radio.layout = sevenButton;
	1325	+ radio.layout = threeButton; // sixButton;
646	1326	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
647	1327	}
648	1328
649	1329	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
650	1330	{
	1331	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1332	+ colorCB.setToolTipText("Copy color when dropped");
	1333	+ colorCB.addItemListener(this);
	1334	+
	1335	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1336	+ materialCB.setToolTipText("Copy material when dropped");
	1337	+ materialCB.addItemListener(this);
	1338	+
	1339	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1340	+ textureCB.setToolTipText("Copy texture when dropped");
	1341	+ textureCB.addItemListener(this);
	1342	+
	1343	+ panel.Return();
	1344	+
651	1345	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
652	1346	boxCB.setToolTipText("Display bounding boxes");
653	1347	boxCB.addItemListener(this);
654	1348
655	1349	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
656		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1350	+ zoomBoxCB.setToolTipText("Display only for wheel");
657	1351	zoomBoxCB.addItemListener(this);
658	1352
659	1353	if (true) // Globals.ADVANCED)
660	1354	{
661		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
662		- supportCB.setToolTipText("Enable rigging");
663		- supportCB.addItemListener(this);
	1355	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1356	+// supportCB.setToolTipText("Enable rigging");
	1357	+// supportCB.addItemListener(this);
	1358	+
	1359	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1360	+ freezeCB.setToolTipText("Fast moving camera");
	1361	+ freezeCB.addItemListener(this);
664	1362
665	1363	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
666	1364	// localCB.addItemListener(this);
667	1365
	1366	+ panel.Return();
	1367	+
668	1368	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
669	1369	crowdCB.setToolTipText("Used for crowds");
670	1370	crowdCB.addItemListener(this);
..	..	@@ -673,14 +1373,19 @@
673	1373	smoothCB.setToolTipText("Snapping delay");
674	1374	smoothCB.addItemListener(this);
675	1375
676		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
677		- slowCB.setToolTipText("Smooth interpolation");
678		- slowCB.addItemListener(this);
	1376	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1377	+// slowCB.setToolTipText("Smooth interpolation");
	1378	+// slowCB.addItemListener(this);
	1379	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1380	+ minshaderCB.setToolTipText("Minimal fast shader");
	1381	+ minshaderCB.addItemListener(this);
679	1382
680	1383	// constraints.gridy += 1;
681	1384	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
682	1385	// speakerMocapCB.addItemListener(this);
683	1386
	1387	+ panel.Return();
	1388	+
684	1389	if (false)
685	1390	{
686	1391	// handled in scripts
..	..	@@ -695,34 +1400,82 @@
695	1400	//constraints.gridy += 1;
696	1401	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
697	1402	smoothfocusCB.addItemListener(this);
	1403	+ panel.Return();
698	1404	}
699	1405
700	1406	//constraints.gridx += 1;
701	1407	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
702	1408	// debugCB.addItemListener(this);
703	1409
	1410	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1411	+ trackCB.setToolTipText("Enable tracking target");
	1412	+ trackCB.addItemListener(this);
	1413	+
704	1414	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1415	+ oeilCB.setToolTipText("Move camera when tracking");
705	1416	oeilCB.addItemListener(this);
706	1417
	1418	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1419	+ shadowCB.setToolTipText("When live compute shadows");
	1420	+ shadowCB.addItemListener(this);
	1421	+
	1422	+ panel.Return();
	1423	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1424	+ toggleTextureCB.setToolTipText("Load textures");
	1425	+ toggleTextureCB.addItemListener(this);
	1426	+
	1427	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1428	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1429	+ toggleSwitchCB.addItemListener(this);
	1430	+
	1431	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1432	+ autokeepCB.setToolTipText("On structure change");
	1433	+ autokeepCB.addItemListener(this);
	1434	+
	1435	+ panel.Return();
	1436	+ if (Globals.ADVANCED)
	1437	+ {
707	1438	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
708	1439	lookAtCB.setToolTipText("Look-at target");
709	1440	lookAtCB.addItemListener(this);
	1441	+ }
710	1442
711	1443	}
712	1444
713	1445	cGridBag fill = new cGridBag();
714		-
715	1446	fill.preferredHeight = 200;
	1447	+ cGridBag fill2 = new cGridBag();
	1448	+ fill2.preferredHeight = 200;
	1449	+ cGridBag fill3 = new cGridBag();
	1450	+ fill3.preferredHeight = 200;
716	1451
717	1452	panel.add(fill);
	1453	+ panel.add(fill2);
	1454	+ panel.add(fill3);
718	1455
719	1456	}
720	1457
721	1458	void EditObject(Object3D obj)
722	1459	{
	1460	+ assert(obj instanceof Composite);
	1461	+
	1462	+ if (obj.versionlist == null)
	1463	+ {
	1464	+ obj.versionlist = new Object3D[100];
	1465	+ obj.versionindex = -1;
	1466	+ }
	1467	+
723	1468	cRadio radioButton = new cRadio(obj.name);
	1469	+
	1470	+ // June 2019. Patch to avoid bug with transparency.
	1471	+ radioButton.hadMaterial = obj.material != null;
	1472	+ if (!radioButton.hadMaterial)
	1473	+ {
	1474	+ obj.material = new cMaterial();
	1475	+ }
	1476	+
724	1477	radioButton.SetObject(obj);
725		- radioButton.layout = sevenButton;
	1478	+ radioButton.layout = threeButton; // sixButton;
726	1479	radioButton.SetCamera(cameraView.renderCamera, false);
727	1480	radioButton.addActionListener(this);
728	1481	radioPanel.add(radioButton);
..	..	@@ -732,6 +1485,8 @@
732	1485
733	1486	void SetupViews(ObjEditor oe)
734	1487	{
	1488	+ theFrame = this;
	1489	+
735	1490	oe.SetupViews();
736	1491
737	1492	System.out.println("SetupViews");
..	..	@@ -740,23 +1495,30 @@
740	1495	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
741	1496	}
742	1497
743		- JCheckBox liveCB;
744		- JCheckBox supportCB;
745		- JCheckBox localCB;
746		- JCheckBox crowdCB;
747		- JCheckBox smoothCB;
748		- JCheckBox fastCB;
749		- JCheckBox slowCB;
750		- JCheckBox boxCB;
751		- JCheckBox zoomBoxCB;
752		- JCheckBox trackCB;
753		- JCheckBox smoothfocusCB;
	1498	+ cToggleButton liveCB;
	1499	+ cCheckBox supportCB;
	1500	+ cCheckBox localCB;
	1501	+ cCheckBox crowdCB;
	1502	+ cCheckBox smoothCB;
	1503	+ cCheckBox minshaderCB;
	1504	+
	1505	+ cToggleButton fastCB;
	1506	+ cCheckBox slowCB;
	1507	+ cCheckBox boxCB;
	1508	+ cCheckBox zoomBoxCB;
	1509	+ cCheckBox freezeCB;
	1510	+ //cToggleButton trackCB;
	1511	+ cCheckBox trackCB;
	1512	+ cCheckBox smoothfocusCB;
754	1513	// JCheckBox speakerMocapCB;
755		- JCheckBox speakerCameraCB;
756		- JCheckBox speakerFocusCB;
757		- JCheckBox debugCB;
758		- JCheckBox oeilCB;
759		- JCheckBox lookAtCB;
	1514	+ cCheckBox speakerCameraCB;
	1515	+ cCheckBox speakerFocusCB;
	1516	+ cCheckBox debugCB;
	1517	+
	1518	+ cCheckBox oeilCB;
	1519	+ cCheckBox shadowCB;
	1520	+ cCheckBox autokeepCB;
	1521	+ cCheckBox lookAtCB;
760	1522
761	1523	// static int COLOR = 1;
762	1524	// static int MATERIAL = 2;
..	..	@@ -764,9 +1526,9 @@
764	1526
765	1527	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
766	1528
767		- JCheckBox colorCB;
768		- JCheckBox materialCB;
769		- JCheckBox textureCB;
	1529	+ cCheckBox colorCB;
	1530	+ cCheckBox materialCB;
	1531	+ cCheckBox textureCB;
770	1532
771	1533	public void itemStateChanged(ItemEvent e)
772	1534	{
..	..	@@ -794,6 +1556,7 @@
794	1556	} else if(e.getSource() == liveCB)
795	1557	{
796	1558	cameraView.ToggleLive();
	1559	+ refreshContents(false);
797	1560	}
798	1561	else if(e.getSource() == supportCB)
799	1562	{
..	..	@@ -809,6 +1572,12 @@
809	1572	{
810	1573	cameraView.ToggleInertia();
811	1574	cameraView.repaint();
	1575	+ }
	1576	+ else if(e.getSource() == minshaderCB)
	1577	+ {
	1578	+ Globals.MINSHADER ^= true;
	1579	+ cameraView.programInitialized = false;
	1580	+ cameraView.repaint();
812	1581	}
813	1582	else if(e.getSource() == localCB)
814	1583	{
..	..	@@ -858,6 +1627,18 @@
858	1627	{
859	1628	cameraView.ToggleOeil();
860	1629	}
	1630	+ else if(e.getSource() == shadowCB)
	1631	+ {
	1632	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1633	+ }
	1634	+ else if(e.getSource() == freezeCB)
	1635	+ {
	1636	+ Globals.FREEZEONMOVE ^= true;
	1637	+ }
	1638	+ else if(e.getSource() == autokeepCB)
	1639	+ {
	1640	+ Globals.REPLACEONMAKE ^= true;
	1641	+ }
861	1642	else if(e.getSource() == lookAtCB)
862	1643	{
863	1644	cameraView.ToggleLookAt();
..	..	@@ -874,7 +1655,8 @@
874	1655
875	1656	/**/
876	1657	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
877		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1658	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1659	+ TreePath path = objEditor.jTree.getSelectionPath();
878	1660	if ((path == null) \|\| (path.getPathCount() <= 1)) {
879	1661	// We can't move the root node or an empty selection
880	1662	return;
..	..	@@ -937,8 +1719,6 @@
937	1719	}
938	1720	}
939	1721
940		- String string = (String) object;
941		-
942	1722	System.out.println("Transfer = " + object + "; drop : " + target);
943	1723	// if( object instanceof java.io.File[])
944	1724	// {
..	..	@@ -946,6 +1726,8 @@
946	1726	// objEditor.DropFile((java.io.File[]) object, true);
947	1727	// return;
948	1728	// }
	1729	+
	1730	+ String string = object.toString();
949	1731
950	1732	// File path for Mac and Windows
951	1733	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -991,23 +1773,33 @@
991	1773
992	1774	assert target == objEditor.jTree;
993	1775	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1776	+ Object3D destinationLeaf;
994	1777	try {
995		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1778	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
996	1779	} catch (Exception e) {
997	1780	System.out.println("destinationPath : " + destinationPath);
998	1781	return;
999	1782	}
1000	1783
1001		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1784	+ for (int i=group.selection.size(); --i>=0;)
1002	1785	{
	1786	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1787	+
	1788	+ // Cannot move into itself
	1789	+ if (child == destinationLeaf)
	1790	+ return;
	1791	+ }
	1792	+
	1793	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1794	+// {
1003	1795	loadClipboard(true);
1004	1796	objEditor.jTree.setSelectionPath(destinationPath);
1005	1797	pasteInto(false, false);
1006		- } else {
1007		- loadClipboard(false);
1008		- objEditor.jTree.setSelectionPath(destinationPath);
1009		- pasteInto(false, false); // true); // ???
1010		- }
	1798	+// } else {
	1799	+// loadClipboard(false);
	1800	+// objEditor.jTree.setSelectionPath(destinationPath);
	1801	+// pasteInto(false, false); // true); // ???
	1802	+// }
1011	1803	}
1012	1804	public void dropActionChanged(DropTargetDragEvent dtde)
1013	1805	// Called if the user has modified the current drop gesture
..	..	@@ -1063,7 +1855,12 @@
1063	1855	TreePath path;
1064	1856
1065	1857	public TransferableTreePath(TreePath tp) {
1066		- path = tp;
	1858	+ Object[] objs = new Object[tp.getPathCount()];
	1859	+ for (int i=0; i<objs.length; i++)
	1860	+ {
	1861	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1862	+ }
	1863	+ path = new TreePath(objs);
1067	1864	}
1068	1865
1069	1866	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1112,22 +1909,30 @@
1112	1909	{
1113	1910	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1114	1911	//heightFieldItem.addActionListener(this);
1115		- gridItem = menu.add(new MenuItem("Grid"));
1116		- gridItem.addActionListener(this);
1117		- rectoidItem = menu.add(new MenuItem("Box"));
1118		- rectoidItem.addActionListener(this);
1119		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1120		- ellipsoidItem.addActionListener(this);
1121		- coneItem = menu.add(new MenuItem("Cone"));
1122		- coneItem.addActionListener(this);
1123		- torusItem = menu.add(new MenuItem("Torus"));
1124		- torusItem.addActionListener(this);
1125		- superItem = menu.add(new MenuItem("Superellipsoid"));
1126		- superItem.addActionListener(this);
	1912	+// gridItem = menu.add(new MenuItem("Grid"));
	1913	+// gridItem.addActionListener(this);
	1914	+// rectoidItem = menu.add(new MenuItem("Box"));
	1915	+// rectoidItem.addActionListener(this);
	1916	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1917	+// ellipsoidItem.addActionListener(this);
	1918	+// coneItem = menu.add(new MenuItem("Cone"));
	1919	+// coneItem.addActionListener(this);
	1920	+// torusItem = menu.add(new MenuItem("Torus"));
	1921	+// torusItem.addActionListener(this);
	1922	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1923	+// superItem.addActionListener(this);
	1924	+
	1925	+ cameraItem = menu.add(new MenuItem("Camera"));
	1926	+ cameraItem.addActionListener(this);
	1927	+
	1928	+ if (!Globals.ADVANCED)
	1929	+ {
1127	1930	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1128	1931	kleinItem.addActionListener(this);
1129		- particleItem = menu.add(new MenuItem("Particle system"));
1130		- particleItem.addActionListener(this);
	1932	+ }
	1933	+
	1934	+// particleItem = menu.add(new MenuItem("Particle system"));
	1935	+// particleItem.addActionListener(this);
1131	1936	if (Globals.ADVANCED)
1132	1937	{
1133	1938	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1153,15 +1958,15 @@
1153	1958	}
1154	1959	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1155	1960	bezierItem.addActionListener(this);
1156		- overlayItem = menu.add(new MenuItem("Overlay"));
1157		- overlayItem.addActionListener(this);
1158		- lightItem = menu.add(new MenuItem("Light"));
1159		- lightItem.addActionListener(this);
	1961	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1962	+// overlayItem.addActionListener(this);
	1963	+// lightItem = menu.add(new MenuItem("Light"));
	1964	+// lightItem.addActionListener(this);
1160	1965	menu.add("-");
1161	1966	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1162	1967	//superLoopItem.addActionListener(this);
1163		- loopItem = menu.add(new MenuItem("Loop"));
1164		- loopItem.addActionListener(this);
	1968	+// loopItem = menu.add(new MenuItem("Loop"));
	1969	+// loopItem.addActionListener(this);
1165	1970	doubleItem = menu.add(new MenuItem("Fork"));
1166	1971	doubleItem.addActionListener(this);
1167	1972	if (Globals.ADVANCED)
..	..	@@ -1177,6 +1982,9 @@
1177	1982	animationItem.addItemListener(this);
1178	1983	animationItem.setState(Globals.ANIMATION);
1179	1984
	1985	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1986	+ archiveItem.addActionListener(this);
	1987	+
1180	1988	menu.add("-");
1181	1989	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1182	1990	parseverticesItem.addActionListener(this);
..	..	@@ -1189,6 +1997,8 @@
1189	1997	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1190	1998	reduce34MorphItem.addActionListener(this);
1191	1999	menu.add("-");
	2000	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	2001	+ memoryItem.addActionListener(this);
1192	2002	menu.add(computeAOItem = new MenuItem("Compute AO"));
1193	2003	computeAOItem.addActionListener(this);
1194	2004
..	..	@@ -1197,11 +2007,9 @@
1197	2007	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1198	2008	mirrorItem.addActionListener(this);
1199	2009	menu.add("-");
1200		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1201		- memoryItem.addActionListener(this);
1202	2010	menu.add(analyzeItem = new MenuItem("Analyze"));
1203	2011	analyzeItem.addActionListener(this);
1204		- menu.add(dumpItem = new MenuItem("Dump"));
	2012	+ menu.add(dumpItem = new MenuItem("Print"));
1205	2013	dumpItem.addActionListener(this);
1206	2014	// menu.add(pathItem = new MenuItem("From-to path"));
1207	2015	// pathItem.addActionListener(this);
..	..	@@ -1342,9 +2150,34 @@
1342	2150	shadow.material = new cMaterial(obj.material);
1343	2151	shadow.material.diffuse = 0.0001f;
1344	2152	shadow.material.specular = 0.0001f;
	2153	+ //shadow.projectedVertices[1].x = 300;
1345	2154
1346	2155	makeSomething(shadow);
1347	2156	}
	2157	+
	2158	+ private void ClearUnpinned()
	2159	+ {
	2160	+ //for (Object3D obj : listUI)
	2161	+ for (int i=listUI.size(); --i>=0;)
	2162	+ {
	2163	+ Object3D obj = listUI.elementAt(i);
	2164	+ if (!obj.pinned)
	2165	+ {
	2166	+ obj.CloseUI();
	2167	+ listUI.remove(i);
	2168	+ }
	2169	+ }
	2170	+ }
	2171	+
	2172	+ private void EditElement(Object3D elem, boolean newWindow)
	2173	+ {
	2174	+ // if (!(elem instanceof Composite))
	2175	+ // newWindow = false;
	2176	+ listUI.add(elem);
	2177	+ elem.openEditWindow(this, newWindow); //, false);
	2178	+ System.out.println("edit : " + elem);
	2179	+ elem.editWindow.refreshContents(true); // ? new
	2180	+ }
1348	2181
1349	2182	/**
1350	2183	* applyExample
..	..	@@ -1589,7 +2422,7 @@
1589	2422	{
1590	2423	ScreenFit();
1591	2424	} else
1592		- if (source == switchItem)
	2425	+ if (source == switchViewItem)
1593	2426	{
1594	2427	cVector v1 = new cVector();
1595	2428	cVector v2 = new cVector();
..	..	@@ -1598,11 +2431,11 @@
1598	2431	objEditor.cameraView.renderCamera.setAim(v2, v1);
1599	2432	objEditor.cameraView.repaint();
1600	2433	} else
1601		- if (source == rectoidItem)
	2434	+ if (source == rectoidItem \|\| source == boxButton)
1602	2435	{
1603	2436	makeSomething(new Box());
1604	2437	} else
1605		- if (source == particleItem)
	2438	+ if (source == particleItem \|\| source == particlesButton)
1606	2439	{
1607	2440	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1608	2441	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1681,27 +2514,27 @@
1681	2514
1682	2515	makeSomething(obj);
1683	2516	} else
1684		- if (source == gridItem)
	2517	+ if (source == gridItem \|\| source == gridButton)
1685	2518	{
1686	2519	makeSomething(new Grid());
1687	2520	} else
1688		- if (source == ellipsoidItem)
	2521	+ if (source == ellipsoidItem \|\| source == sphereButton)
1689	2522	{
1690	2523	makeSomething(new Sphere());
1691	2524	} else
1692		- if (source == coneItem)
	2525	+ if (source == coneItem \|\| source == coneButton)
1693	2526	{
1694	2527	makeSomething(new Cone());
1695	2528	} else
1696		- if (source == torusItem)
	2529	+ if (source == torusItem \|\| source == torusButton)
1697	2530	{
1698	2531	makeSomething(new Torus());
1699	2532	} else
1700		- if (source == superItem)
	2533	+ if (source == superItem \|\| source == superButton)
1701	2534	{
1702	2535	makeSomething(new Superellipsoid());
1703	2536	} else
1704		- if (source == kleinItem)
	2537	+ if (source == kleinItem \|\| source == kleinButton)
1705	2538	{
1706	2539	makeSomething(new Klein());
1707	2540	} else
..	..	@@ -1721,7 +2554,7 @@
1721	2554	{
1722	2555	makeSomething(new BezierSurface());
1723	2556	} else
1724		- if (source == overlayItem)
	2557	+ if (source == overlayItem \|\| source == overlayButton)
1725	2558	{
1726	2559	/*
1727	2560	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1769,10 +2602,27 @@
1769	2602	s.setup();
1770	2603	makeSomething(s);
1771	2604	} else
1772		- if (source == lightItem)
	2605	+ if (source == lightItem \|\| source == lightButton)
1773	2606	{
1774	2607	makeSomething(new Light());
1775	2608	} else
	2609	+// if (source == skybox1Button \|\|
	2610	+// source == skybox2Button \|\|
	2611	+// source == skybox3Button \|\|
	2612	+// source == skybox4Button \|\|
	2613	+// source == skybox5Button \|\|
	2614	+// source == skybox6Button \|\|
	2615	+// source == skybox7Button \|\|
	2616	+// source == skybox11Button \|\|
	2617	+// source == skybox12Button \|\|
	2618	+// source == skybox13Button \|\|
	2619	+// source == skybox14Button \|\|
	2620	+// source == skybox15Button \|\|
	2621	+// source == skybox16Button \|\|
	2622	+// source == skybox17Button)
	2623	+// {
	2624	+// ChangeSkybox(source);
	2625	+// } else
1776	2626	if (source == csgItem)
1777	2627	{
1778	2628	group(new CSG());
..	..	@@ -1819,30 +2669,30 @@
1819	2669
1820	2670	group(g);
1821	2671	} else
1822		- if (source == loopItem)
	2672	+ if (source == loopItem \|\| source == loopButton)
1823	2673	{
1824	2674	Composite csg = new GroupLeaf();
1825	2675	csg.count = 5;
1826	2676	group(csg);
1827		- Composite child = new cGroup();
	2677	+ Composite child = new cGroup("Branch");
1828	2678	csg.addChild(child);
1829	2679	child.addChild(csg);
1830	2680	} else
1831	2681	if (source == doubleItem)
1832	2682	{
1833		- Composite csg = new GroupLeaf();
	2683	+ Composite csg = new GroupLeaf("Fork");
1834	2684	csg.count = 5;
1835	2685	group(csg);
1836		- Composite child = new cGroup();
	2686	+ Composite child = new cGroup("Branch A");
1837	2687	csg.addChild(child);
1838	2688	child.addChild(csg);
1839		- child = new cGroup();
	2689	+ child = new cGroup("Branch B");
1840	2690	csg.addChild(child);
1841	2691	child.addChild(csg);
1842	2692	} else
1843	2693	if (source == tripleItem)
1844	2694	{
1845		- Composite csg = new GroupLeaf();
	2695	+ Composite csg = new GroupLeaf("Trident");
1846	2696	csg.count = 4;
1847	2697	group(csg);
1848	2698	Composite child = new cGroup();
..	..	@@ -1855,35 +2705,10 @@
1855	2705	csg.addChild(child);
1856	2706	child.addChild(csg);
1857	2707	} else
1858		-
1859		- if (source == importGFDItem)
1860		- {
1861		- ImportGFD();
1862		- } else
1863		- if (source == importVRMLX3DItem)
1864		- {
1865		- ImportVRMLX3D();
1866		- } else
1867		- if (source == import3DSItem)
1868		- {
1869		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1870		- } else
1871		- if (source == importOBJItem)
1872		- {
1873		- //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1874		- FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
1875		- browser.setVisible(true);
1876		- String filename = browser.getFile();
1877		- if (filename != null && filename.length() > 0)
1878		- {
1879		- String fullname = browser.getDirectory() + filename;
1880		- makeSomething(ReadOBJ(fullname), true);
1881		- }
1882		- } else
1883	2708	if (source == computeAOItem)
1884	2709	{
1885	2710	Globals.drawMode = CameraPane.OCCLUSION;
1886		- Globals.theRenderer.repaint();
	2711	+ cameraView.repaint();
1887	2712	} else
1888	2713	if (source == recompileItem)
1889	2714	{
..	..	@@ -1898,7 +2723,7 @@
1898	2723	if (source == invariantsItem)
1899	2724	{
1900	2725	System.out.println("Invariants:");
1901		- Grafreed.grafreeD.universe.invariants();
	2726	+ Grafreed.grafreed.universe.invariants();
1902	2727	} else
1903	2728	if (source == memoryItem)
1904	2729	{
..	..	@@ -1917,6 +2742,65 @@
1917	2742	{
1918	2743	DumpObject();
1919	2744	} else
	2745	+ if (source == minButton)
	2746	+ {
	2747	+ Minimize();
	2748	+ } else
	2749	+ if (source == maxButton)
	2750	+ {
	2751	+ Maximize();
	2752	+ } else
	2753	+ if (source == fullButton)
	2754	+ {
	2755	+ ToggleFullScreen();
	2756	+ } else
	2757	+ if (source == collapseButton)
	2758	+ {
	2759	+ this.expandedLayout = radio.layout;
	2760	+ CollapseToolbar();
	2761	+ } else
	2762	+ if (source == maximize3DButton)
	2763	+ {
	2764	+ this.expandedLayout = radio.layout;
	2765	+ radio.layout = twoButton;
	2766	+ Show3DView();
	2767	+ CollapseToolbar();
	2768	+ } else
	2769	+ if (source == previousVersionButton)
	2770	+ {
	2771	+ // Go to previous version
	2772	+ //if (!Undo())
	2773	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2774	+ PreviousVersion();
	2775	+ } else
	2776	+ if (source == restoreButton)
	2777	+ {
	2778	+ // Restore current version
	2779	+ Restore();
	2780	+ //restoreButton.setEnabled(false);
	2781	+ } else
	2782	+ if (source == replaceButton)
	2783	+ {
	2784	+ // Overwrite current version
	2785	+ Replace();
	2786	+ //replaceButton.setEnabled(false);
	2787	+ } else
	2788	+ if (source == nextVersionButton)
	2789	+ {
	2790	+ // Go to next version
	2791	+ NextVersion();
	2792	+ } else
	2793	+ if (source == saveVersionButton)
	2794	+ {
	2795	+ // Save a new version
	2796	+ if (!Save(true))
	2797	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2798	+ } else
	2799	+ if (source == deleteVersionButton)
	2800	+ {
	2801	+ // Delete a new version
	2802	+ DeleteVersion();
	2803	+ } else
1920	2804	if (source == oneStepButton)
1921	2805	{
1922	2806	Globals.ONESTEP = true;
..	..	@@ -1924,17 +2808,14 @@
1924	2808	} else
1925	2809	if (source == screenfitButton)
1926	2810	{
1927		- //Reload(lastConverter, lastFilename, true);
1928	2811	ScreenFit();
1929	2812	} else
1930	2813	if (source == screenfitpointButton)
1931	2814	{
1932		- //Reload(lastConverter, lastFilename, true);
1933	2815	ScreenFitPoint();
1934	2816	} else
1935	2817	if (source == snapobjectButton)
1936	2818	{
1937		- //Reload(lastConverter, lastFilename, true);
1938	2819	SnapObject();
1939	2820	} else
1940	2821	// if (event.getSource() == recompileButton)
..	..	@@ -1970,6 +2851,14 @@
1970	2851	if (source == cutItem \|\| source == clearButton)
1971	2852	{
1972	2853	loadClipboard(true);
	2854	+ } else
	2855	+ if (source == undoItem)
	2856	+ {
	2857	+ PreviousVersion();
	2858	+ } else
	2859	+ if (source == redoItem)
	2860	+ {
	2861	+ NextVersion();
1973	2862	} else
1974	2863	if (source == duplicateItem)
1975	2864	{
..	..	@@ -2290,7 +3179,7 @@
2290	3179	{
2291	3180	StepAll();
2292	3181	} else
2293		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3182	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2294	3183	{
2295	3184	//int indices[] = jList.getSelectedIndices();
2296	3185	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2302,9 +3191,9 @@
2302	3191	{
2303	3192	ClearSelection(true);
2304	3193	} else
2305		- if (source == grabItem)
	3194	+ if (source == grabItem \|\| source == groupButton)
2306	3195	{
2307		- group(new cGroup(), true);
	3196	+ group(new cGroup(), false); // true);
2308	3197	} else
2309	3198	if (source == hideItem)
2310	3199	{
..	..	@@ -2322,11 +3211,11 @@
2322	3211	{
2323	3212	makeSomething(new Camera());
2324	3213	} else
2325		- if (source == compositeItem)
	3214	+ if (source == compositeItem \|\| source == compositeButton)
2326	3215	{
2327	3216	group(new Composite());
2328	3217	} else
2329		- if (source == randomItem)
	3218	+ if (source == switchItem \|\| source == switchButton)
2330	3219	{
2331	3220	RandomNode random = new RandomNode();
2332	3221	group(random);
..	..	@@ -2428,7 +3317,7 @@
2428	3317	{
2429	3318	group(new cLinker());
2430	3319	} else
2431		- if (source == textureItem)
	3320	+ if (source == textureItem \|\| source == textureButton)
2432	3321	{
2433	3322	group(new TextureNode());
2434	3323	} else
..	..	@@ -2448,17 +3337,30 @@
2448	3337	{
2449	3338	CastShadow(2);
2450	3339	} else
2451		- if (source == ungroupItem)
	3340	+ if (source == ungroupItem \|\| source == ungroupButton)
2452	3341	{
2453		- //ungroup();
	3342	+ boolean hasRoot = false;
	3343	+
2454	3344	for (int i=0; i<group.selection.size(); i++)
2455	3345	{
2456		- Ungroup(group.selection.get(i));
	3346	+ if (group.selection.get(i) == group)
	3347	+ {
	3348	+ hasRoot = true;
	3349	+ break;
	3350	+ }
2457	3351	}
2458	3352
2459		- ClearSelection(false);
2460		-
2461		- refreshContents();
	3353	+ if (!hasRoot)
	3354	+ {
	3355	+ for (int i=0; i<group.selection.size(); i++)
	3356	+ {
	3357	+ Ungroup(group.selection.get(i));
	3358	+ }
	3359	+
	3360	+ ClearSelection(false);
	3361	+
	3362	+ refreshContents();
	3363	+ }
2462	3364	} else
2463	3365	if (source == genUVItem)
2464	3366	{
..	..	@@ -2470,7 +3372,7 @@
2470	3372	} else
2471	3373	if (source == genNormalsMESHItem)
2472	3374	{
2473		- GenNormals(true); // TODO
	3375	+ GenNormalsMESH();
2474	3376	} else
2475	3377	if (source == genNormalsORGANItem)
2476	3378	{
..	..	@@ -2535,6 +3437,22 @@
2535	3437	if (source == unmarkleavesItem)
2536	3438	{
2537	3439	MarkLeaves(false);
	3440	+ } else
	3441	+ if (source == rewindleavesItem)
	3442	+ {
	3443	+ RewindLeaves(true);
	3444	+ } else
	3445	+ if (source == unrewindleavesItem)
	3446	+ {
	3447	+ RewindLeaves(false);
	3448	+ } else
	3449	+ if (source == randomleavesItem)
	3450	+ {
	3451	+ RandomLeaves(true);
	3452	+ } else
	3453	+ if (source == unrandomleavesItem)
	3454	+ {
	3455	+ RandomLeaves(false);
2538	3456	} else
2539	3457	if (source == flipVItem)
2540	3458	{
..	..	@@ -2743,7 +3661,7 @@
2743	3661	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2744	3662	{
2745	3663	obj = (Object3D)e.nextElement();
2746		- obj.SetBumpTexture(null);
	3664	+ obj.ResetBumpTexture();
2747	3665	}
2748	3666
2749	3667	refreshContents();
..	..	@@ -2759,6 +3677,31 @@
2759	3677
2760	3678	refreshContents();
2761	3679	} else
	3680	+ if (source == embedTexturesItem)
	3681	+ {
	3682	+ Object3D obj;
	3683	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3684	+ {
	3685	+ obj = (Object3D)e.nextElement();
	3686	+ obj.EmbedTextures(true);
	3687	+ }
	3688	+
	3689	+ refreshContents();
	3690	+ } else
	3691	+ if (source == deEmbedTexturesItem)
	3692	+ {
	3693	+ Object3D obj;
	3694	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3695	+ {
	3696	+ obj = (Object3D)e.nextElement();
	3697	+ obj.EmbedTextures(false);
	3698	+ }
	3699	+
	3700	+ CameraPane.texturepigment.clear();
	3701	+ CameraPane.texturebump.clear();
	3702	+
	3703	+ refreshContents();
	3704	+ } else
2762	3705	if (source == flashSelectionButton)
2763	3706	{
2764	3707	CameraPane.flash = true;
..	..	@@ -2770,42 +3713,36 @@
2770	3713	if (source == twoButton)
2771	3714	{
2772	3715	radio.layout = twoButton;
2773		- // bug
2774		- //gridPanel.setDividerLocation(1.0);
2775		- //bigPanel.setDividerLocation(0.0);
2776		-// bigThree.remove(scenePanel);
2777		-// bigThree.remove(centralPanel);
2778		-// bigThree.remove(XYZPanel);
2779		-// aWindowConstraints.gridx = 0;
2780		-// aWindowConstraints.gridy = 0;
2781		-// aWindowConstraints.gridwidth = 1;
2782		-// // aConstraints.gridheight = 3;
2783		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2784		-// aWindowConstraints.weightx = 0;
2785		-// aWindowConstraints.weighty = 1;
2786		-// //bigThree.add(jtp, aWindowConstraints);
2787		-// aWindowConstraints.weightx = 1;
2788		-// aWindowConstraints.gridwidth = 3;
2789		-// // aConstraints.gridheight = 3;
2790		-// aWindowConstraints.gridx = 1;
2791		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
2792		-// bigThree.add(centralPanel, aWindowConstraints);
2793		-// aWindowConstraints.weightx = 0;
2794		-// aWindowConstraints.gridx = 4;
2795		-// aWindowConstraints.gridwidth = 1;
2796		-// // aConstraints.gridheight = 3;
2797		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2798		-// //bigThree.add(XYZPanel, aWindowConstraints);
2799		-// scenePanel.setVisible(false);
2800		-// centralPanel.setVisible(true);
2801		-// XYZPanel.setVisible(false);
2802		- bigThree.ClearUI();
2803		- bigThree.add(centralPanel);
2804		- bigThree.FlushUI();
	3716	+
	3717	+ if (CameraPane.FULLSCREEN)
	3718	+ fullscreenLayout = radio.layout;
	3719	+
	3720	+ Show3DView();
	3721	+
	3722	+ cameraView.requestFocusInWindow();
	3723	+
	3724	+// refreshContents(true);
	3725	+//
	3726	+// try
	3727	+// {
	3728	+// java.awt.Robot bot = new java.awt.Robot();
	3729	+// int mask = InputEvent.BUTTON1_MASK;
	3730	+// bot.mouseMove(100, 100);
	3731	+// bot.mousePress(mask);
	3732	+// bot.mouseRelease(mask);
	3733	+// }
	3734	+// catch (Exception e)
	3735	+// {
	3736	+//
	3737	+// }
	3738	+
2805	3739	} else
2806	3740	if (source == threeButton)
2807	3741	{
2808	3742	radio.layout = threeButton;
	3743	+
	3744	+ if (CameraPane.FULLSCREEN)
	3745	+ fullscreenLayout = radio.layout;
2809	3746
2810	3747	// bigThree.remove(scenePanel);
2811	3748	// bigThree.remove(centralPanel);
..	..	@@ -2835,13 +3772,18 @@
2835	3772	// centralPanel.setVisible(true);
2836	3773	// XYZPanel.setVisible(true);
2837	3774	bigThree.ClearUI();
	3775	+ bigThree.add(scenePanel);
2838	3776	bigThree.add(centralPanel);
2839		- bigThree.add(XYZPanel);
2840	3777	bigThree.FlushUI();
	3778	+
	3779	+ cameraView.requestFocusInWindow();
2841	3780	} else
2842	3781	if (source == fourButton)
2843	3782	{
2844	3783	radio.layout = fourButton;
	3784	+
	3785	+ if (CameraPane.FULLSCREEN)
	3786	+ fullscreenLayout = radio.layout;
2845	3787
2846	3788	// bigThree.remove(scenePanel);
2847	3789	// bigThree.remove(centralPanel);
..	..	@@ -2873,10 +3815,15 @@
2873	3815	bigThree.ClearUI();
2874	3816	bigThree.add(scenePanel);
2875	3817	bigThree.FlushUI();
	3818	+
	3819	+ cameraView.requestFocusInWindow();
2876	3820	} else
2877	3821	if (source == sixButton)
2878	3822	{
2879	3823	radio.layout = sixButton;
	3824	+
	3825	+ if (CameraPane.FULLSCREEN)
	3826	+ fullscreenLayout = radio.layout;
2880	3827
2881	3828	// bigThree.remove(scenePanel);
2882	3829	// bigThree.remove(centralPanel);
..	..	@@ -2906,13 +3853,18 @@
2906	3853	// centralPanel.setVisible(true);
2907	3854	// XYZPanel.setVisible(false);
2908	3855	bigThree.ClearUI();
2909		- bigThree.add(scenePanel);
2910	3856	bigThree.add(centralPanel);
	3857	+ bigThree.add(scenePanel);
2911	3858	bigThree.FlushUI();
	3859	+
	3860	+ cameraView.requestFocusInWindow();
2912	3861	} else
2913	3862	if (source == sevenButton)
2914	3863	{
2915	3864	radio.layout = sevenButton;
	3865	+
	3866	+ if (CameraPane.FULLSCREEN)
	3867	+ fullscreenLayout = radio.layout;
2916	3868
2917	3869	// bigThree.remove(scenePanel);
2918	3870	// bigThree.remove(centralPanel);
..	..	@@ -2946,9 +3898,12 @@
2946	3898	bigThree.add(centralPanel);
2947	3899	bigThree.add(XYZPanel);
2948	3900	bigThree.FlushUI();
	3901	+
	3902	+ cameraView.requestFocusInWindow();
2949	3903	} else
2950	3904	if (source == rootButton)
2951	3905	{
	3906	+ Replace();
2952	3907	Object3D obj;
2953	3908	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2954	3909	{
..	..	@@ -2957,6 +3912,7 @@
2957	3912	EditObject(obj);
2958	3913	}
2959	3914
	3915	+ cameraView.requestFocusInWindow();
2960	3916	refreshContents(true);
2961	3917	} else
2962	3918	if (source == closeButton)
..	..	@@ -2966,22 +3922,37 @@
2966	3922	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2967	3923	{
2968	3924	ab = (cRadio)e.nextElement();
2969		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3925	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2970	3926	{
	3927	+ // Patch to avoid bug with transparency.
	3928	+ if (!ab.hadMaterial)
	3929	+ {
	3930	+ ab.object.material = null;
	3931	+ }
	3932	+
2971	3933	buttonGroup.remove(ab);
2972	3934	radioPanel.remove(ab);
2973	3935
2974		- ab.GetObject().editWindow = null;
	3936	+ //ab.GetObject().editWindow = null;
	3937	+ ab.GetObject().manipWindow = null;
2975	3938	// ab.GetObject().objectUI = null; // ?????????
2976	3939
2977	3940	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2978	3941	break;
2979	3942	}
2980	3943	}
	3944	+
	3945	+ cameraView.requestFocusInWindow();
2981	3946	refreshContents(true);
2982	3947	} else
2983	3948	if (source == editItem \|\| source == editButton)
2984	3949	{
	3950	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3951	+ {
	3952	+ Object3D child = (Object3D)e.nextElement();
	3953	+ child.pinned = true;
	3954	+ }
	3955	+
2985	3956	EditSelection(false);
2986	3957	} else
2987	3958	if (source == uneditButton)
..	..	@@ -2990,11 +3961,12 @@
2990	3961	{
2991	3962	Object3D child = (Object3D)e.nextElement();
2992	3963	if(child.editWindow != null)
2993		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3964	+ child.pinned = false;
2994	3965	child.CloseUI();
2995	3966	listUI.remove(child);
	3967	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2996	3968
2997		- child.editWindow = null; // ???????????
	3969	+ //child.editWindow = null; // ???????????
2998	3970	}
2999	3971	objEditor.ctrlPanel.FlushUI();
3000	3972	//objEditor.jTree.clearSelection();
..	..	@@ -3007,16 +3979,18 @@
3007	3979	//copy.ClearUI();
3008	3980	for (Object3D obj : listUI)
3009	3981	{
	3982	+ obj.pinned = false;
3010	3983	obj.CloseUI();
3011	3984	}
3012	3985	listUI.clear();
	3986	+ SetPinStates(group.selection.size() > 0);
3013	3987	refreshContents(true);
3014	3988	} else
3015	3989	if (source == allParamsButton)
3016	3990	{
3017	3991	assert(copy == group);
3018	3992
3019		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3993	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3020	3994
3021	3995	for (Object3D obj : listUI)
3022	3996	{
..	..	@@ -3065,6 +4039,7 @@
3065	4039	}
3066	4040
3067	4041	copy = group;
	4042	+
3068	4043	//Globals.theRenderer.object = group;
3069	4044	if(!useclient)
3070	4045	{
..	..	@@ -3081,7 +4056,9 @@
3081	4056	sideView.object = group;
3082	4057	}
3083	4058
3084		-// fix "+" issue group.editWindow = this;
	4059	+// fix "+" issue
	4060	+ //group.editWindow = this;
	4061	+ group.manipWindow = this;
3085	4062
3086	4063	/*
3087	4064	currentLayout = radio.layout;
..	..	@@ -3089,13 +4066,40 @@
3089	4066	currentLayout = sevenButton;
3090	4067	*/
3091	4068	radio.layout.doClick();
	4069	+
	4070	+ SetUndoStates();
	4071	+
	4072	+ ClearUnpinned();
	4073	+
	4074	+ //Grafreed.Assert(group != null);
	4075	+ //Grafreed.Assert(group.selection != null);
	4076	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4077	+ if (group.selection == null \|\| group.selection.size() == 1)
	4078	+ EditSelection(false);
3092	4079	keepparent = group.parent;
3093	4080	// PARENT = NULL or not???
3094	4081	//group.parent = null; // ROOT
3095	4082	//group.attributes = -1;
3096	4083	ResetModel();
	4084	+
	4085	+ cameraView.requestFocusInWindow();
3097	4086	refreshContents(true);
3098		- }
	4087	+ } else if (event.getSource() == editCameraItem)
	4088	+ {
	4089	+ cameraView.ProtectCamera();
	4090	+ cameraView.requestFocusInWindow();
	4091	+ cameraView.repaint();
	4092	+ return;
	4093	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	4094	+ {
	4095	+ cameraView.RevertCamera();
	4096	+ cameraView.requestFocusInWindow();
	4097	+ cameraView.repaint();
	4098	+ return;
	4099	+ // } else if (event.getSource() == textureButton)
	4100	+ // {
	4101	+ // return; // true;
	4102	+ }
3099	4103	else
3100	4104	{
3101	4105	//return super.action(event, arg);
..	..	@@ -3104,7 +4108,6 @@
3104	4108	}
3105	4109
3106	4110	boolean useclient = false;
3107		- cRadio radio;
3108	4111
3109	4112	void ToggleRoot()
3110	4113	{
..	..	@@ -3343,7 +4346,8 @@
3343	4346
3344	4347	int size = obj.MemorySize();
3345	4348
3346		- System.err.println((size/1024) + " KB is the size of " + obj);
	4349	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4350	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3347	4351	}
3348	4352	}
3349	4353	catch (Exception e)
..	..	@@ -3424,6 +4428,13 @@
3424	4428	void GenNormals(boolean crease)
3425	4429	{
3426	4430	group.GenNormalsS(crease);
	4431	+
	4432	+ refreshContents();
	4433	+ }
	4434	+
	4435	+ void GenNormalsMESH()
	4436	+ {
	4437	+ group.GenNormalsMeshS();
3427	4438
3428	4439	refreshContents();
3429	4440	}
..	..	@@ -3659,7 +4670,7 @@
3659	4670
3660	4671	try
3661	4672	{
3662		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4673	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
3663	4674	}
3664	4675	catch (Exception e)
3665	4676	{
..	..	@@ -4051,6 +5062,18 @@
4051	5062	refreshContents();
4052	5063	}
4053	5064
	5065	+ void RewindLeaves(boolean hide)
	5066	+ {
	5067	+ group.selection.RewindLeaves(hide);
	5068	+ refreshContents();
	5069	+ }
	5070	+
	5071	+ void RandomLeaves(boolean hide)
	5072	+ {
	5073	+ group.selection.RandomLeaves(hide);
	5074	+ refreshContents();
	5075	+ }
	5076	+
4054	5077	void SetTexRes(int tr)
4055	5078	{
4056	5079	group.selection.SetTexRes(tr);
..	..	@@ -4122,28 +5145,25 @@
4122	5145	// }
4123	5146	// }
4124	5147
4125		- static boolean allparams = true;
4126		-
4127		- static Vector<Object3D> listUI = new Vector<Object3D>();
4128		-
4129	5148	void EditSelection(boolean newWindow)
4130	5149	{
	5150	+ if (group.selection == null)
	5151	+ {
	5152	+ EditElement(group, newWindow); // ? new
	5153	+ return;
	5154	+ }
	5155	+
4131	5156	// aConstraints.gridy = 0;
4132	5157	for (int i=0; i<group.selection.size(); i++)
4133	5158	{
4134	5159	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4135	5160	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4136		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5161	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4137	5162
4138	5163	Object3D elem = (Object3D)group.selection.elementAt(i);
4139	5164	if(elem != group \|\| !newWindow)
4140	5165	{
4141		- // if (!(elem instanceof Composite))
4142		- // newWindow = false;
4143		- listUI.add(elem);
4144		- elem.openEditWindow(this, newWindow); //, false);
4145		- System.out.println("edit : " + elem);
4146		- elem.editWindow.refreshContents(true); // ? new
	5166	+ EditElement(elem, newWindow); // ? new
4147	5167	}
4148	5168	}
4149	5169	}
..	..	@@ -4206,9 +5226,7 @@
4206	5226
4207	5227	freezemodel = false;
4208	5228	}
4209		-
4210		- boolean flashIt = true;
4211		-
	5229	+
4212	5230	public void valueChanged(TreeSelectionEvent e)
4213	5231	//public boolean handleEvent(Event event)
4214	5232	{
..	..	@@ -4218,7 +5236,8 @@
4218	5236	//new Exception().printStackTrace();
4219	5237
4220	5238	freezemodel = true;
4221		-
	5239	+ ClearUnpinned();
	5240	+
4222	5241	/**/
4223	5242	//switch (event.id)
4224	5243	{
..	..	@@ -4226,7 +5245,6 @@
4226	5245	//case 702: // Event.LIST_DESELECT
4227	5246	group.deselectAll();
4228	5247	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4229		- objEditor.ClearInfo(); // .GetMaterial());
4230	5248	if (tps != null)
4231	5249	{
4232	5250	for (int i=0; i < tps.length; i++)
..	..	@@ -4235,10 +5253,8 @@
4235	5253
4236	5254	//if (child.parent != null)
4237	5255	//child.parent.addSelectee(child);
	5256	+ objEditor.SetMaterial(child);
4238	5257	group.addSelectee(child);
4239		- objEditor.SetMaterial(child); // .GetMaterial());
4240		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4241		- System.err.println("info : " + child.GetPath());
4242	5258	}
4243	5259	}
4244	5260	// else
..	..	@@ -4248,20 +5264,28 @@
4248	5264	// System.err.println("info : " + group.GetPath());
4249	5265	// }
4250	5266
4251		- objEditor.SetText(); // jan 2014
4252		-
4253		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	5267	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4254	5268	CameraPane.flash = true;
4255	5269
4256		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5270	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4257	5271	// a camera
4258	5272	{
4259		- CameraPane.camerachangeframe = 0; // don't refuse it
4260		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5273	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5274	+ {
	5275	+ CameraPane.camerachangeframe = 0; // don't refuse it
	5276	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5277	+ }
4261	5278	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4262	5279	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4263	5280	}
4264	5281
	5282	+ if (tps != null && tps.length == 1)
	5283	+ {
	5284	+ EditSelection(false);
	5285	+ }
	5286	+
	5287	+ SetPinStates(tps != null && tps.length > 0);
	5288	+
4265	5289	refreshContents();
4266	5290	//return true;
4267	5291	}
..	..	@@ -4270,6 +5294,50 @@
4270	5294
4271	5295	freezemodel = false;
4272	5296	}
	5297	+
	5298	+ void SetPinStates(boolean enabled)
	5299	+ {
	5300	+ editButton.setEnabled(enabled);
	5301	+ uneditButton.setEnabled(enabled);
	5302	+ //unselectButton.setEnabled(enabled);
	5303	+ flashSelectionButton.setEnabled(enabled);
	5304	+
	5305	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5306	+
	5307	+ boolean allComposites = true;
	5308	+
	5309	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5310	+ {
	5311	+ if (!(e.nextElement() instanceof Composite))
	5312	+ {
	5313	+ allComposites = false;
	5314	+ break;
	5315	+ }
	5316	+ }
	5317	+
	5318	+ rootButton.setEnabled(allComposites);
	5319	+ }
	5320	+
	5321	+ void refreshContents(boolean cp)
	5322	+ {
	5323	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5324	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5325	+ {
	5326	+ objEditor.ClearInfo(); // .GetMaterial());
	5327	+
	5328	+ for (int i=0; i < group.selection.Size(); i++)
	5329	+ {
	5330	+ Object3D child = (Object3D) group.selection.get(i);
	5331	+
	5332	+ objEditor.AddInfo(child, this, true);
	5333	+// System.err.println("info : " + child.GetPath());
	5334	+ }
	5335	+
	5336	+ objEditor.SetText(); // jan 2014
	5337	+ }
	5338	+
	5339	+ super.refreshContents(cp);
	5340	+ }
4273	5341
4274	5342	void linkSomething(Object3D thing)
4275	5343	{
..	..	@@ -4341,6 +5409,7 @@
4341	5409	{
4342	5410	if (group.selection.isEmpty())
4343	5411	return;
	5412	+
4344	5413	Grafreed.clipboardIsTempGroup = false;
4345	5414	Composite tGroup = null;
4346	5415	if (group.selection.size() > 0) // 1)
..	..	@@ -4351,6 +5420,8 @@
4351	5420
4352	5421	if (cut)
4353	5422	{
	5423	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5424	+// Save();
4354	5425	//int indices[] = jList.getSelectedIndices();
4355	5426	//for (int i = indices.length - 1; i >= 0; i--)
4356	5427	//jList.remove(indices[i]);
..	..	@@ -4440,8 +5511,10 @@
4440	5511	}
4441	5512
4442	5513	}
	5514	+
4443	5515	if (Grafreed.clipboardIsTempGroup)
4444	5516	Grafreed.clipboard = tGroup;
	5517	+
4445	5518	if (cut)
4446	5519	{
4447	5520	ResetModel();
..	..	@@ -4451,6 +5524,10 @@
4451	5524
4452	5525	void paste(boolean expand)
4453	5526	{
	5527	+ if (Globals.REPLACEONMAKE)
	5528	+ Save();
	5529	+ boolean keep = Globals.REPLACEONMAKE;
	5530	+ Globals.REPLACEONMAKE = false;
4454	5531	// if (GrafreeD.clipboard == null)
4455	5532	// return;
4456	5533	boolean first = true;
..	..	@@ -4510,6 +5587,7 @@
4510	5587	Grafreed.clipboard.get(0).parent = keepparent;
4511	5588	}
4512	5589
	5590	+ Globals.REPLACEONMAKE = keep;
4513	5591	ResetModel();
4514	5592	refreshContents();
4515	5593	}
..	..	@@ -4645,6 +5723,10 @@
4645	5723
4646	5724	void group(Object3D csg, boolean grab)
4647	5725	{
	5726	+ if (Globals.REPLACEONMAKE)
	5727	+ Save();
	5728	+ boolean keep = Globals.REPLACEONMAKE;
	5729	+ Globals.REPLACEONMAKE = false;
4648	5730	if (//false) // why??
4649	5731	!group.selection.isEmpty())
4650	5732	{
..	..	@@ -4758,10 +5840,15 @@
4758	5840	//node.add(csg);
4759	5841	//makeSomething(node);
4760	5842	makeSomething(csg);
	5843	+ Globals.REPLACEONMAKE = keep;
4761	5844	}
4762	5845
4763	5846	void Ungroup(Object3D g)
4764	5847	{
	5848	+ if (Globals.REPLACEONMAKE)
	5849	+ Save();
	5850	+ boolean keep = Globals.REPLACEONMAKE;
	5851	+ Globals.REPLACEONMAKE = false;
4765	5852	if (g instanceof HiddenObject)
4766	5853	{
4767	5854	HiddenObject h = (HiddenObject) g;
..	..	@@ -4778,6 +5865,7 @@
4778	5865	objEditor.makeSomething(g.get(i), false);
4779	5866	}
4780	5867	}
	5868	+ Globals.REPLACEONMAKE = keep;
4781	5869	}
4782	5870
4783	5871	void ungroup()
..	..	@@ -4973,21 +6061,6 @@
4973	6061	}
4974	6062	*/
4975	6063
4976		- void ImportGFD()
4977		- {
4978		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4979		- browser.show();
4980		- String filename = browser.getFile();
4981		- if (filename != null && filename.length() > 0)
4982		- {
4983		- String fullname = browser.getDirectory() + filename;
4984		-
4985		- //Object3D readobj =
4986		- objEditor.ReadGFD(fullname, objEditor);
4987		- //makeSomething(readobj);
4988		- }
4989		- }
4990		-
4991	6064	/*
4992	6065	public void Callback(Object obj)
4993	6066	{
..	..	@@ -5011,23 +6084,6 @@
5011	6084	}
5012	6085	*/
5013	6086
5014		- void ImportVRMLX3D()
5015		- {
5016		- if (Grafreed.standAlone)
5017		- {
5018		- /**/
5019		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
5020		- browser.show();
5021		- String filename = browser.getFile();
5022		- if (filename != null && filename.length() > 0)
5023		- {
5024		- String fullname = browser.getDirectory() + filename;
5025		- LoadVRMLX3D(fullname);
5026		- }
5027		- /**/
5028		- }
5029		- }
5030		-
5031	6087	String GetFile(String dialogName)
5032	6088	{
5033	6089	if (Grafreed.standAlone)
..	..	@@ -5098,7 +6154,43 @@
5098	6154	cButton clearpanelButton;
5099	6155	cButton unselectButton;
5100	6156
	6157	+ cButton restoreCameraButton;
	6158	+
5101	6159	cButton oneStepButton;
	6160	+
	6161	+ cButton groupButton;
	6162	+ cButton ungroupButton;
	6163	+ cButton compositeButton;
	6164	+ cButton switchButton;
	6165	+ cButton loopButton;
	6166	+ cButton textureButton;
	6167	+
	6168	+ cButton skybox1Button;
	6169	+ cButton skybox2Button;
	6170	+ cButton skybox3Button;
	6171	+ cButton skybox4Button;
	6172	+ cButton skybox5Button;
	6173	+ cButton skybox6Button;
	6174	+ cButton skybox7Button;
	6175	+
	6176	+ cButton skybox11Button;
	6177	+ cButton skybox12Button;
	6178	+ cButton skybox13Button;
	6179	+ cButton skybox14Button;
	6180	+ cButton skybox15Button;
	6181	+ cButton skybox16Button;
	6182	+ cButton skybox17Button;
	6183	+
	6184	+ cButton gridButton;
	6185	+ cButton boxButton;
	6186	+ cButton sphereButton;
	6187	+ cButton coneButton;
	6188	+ cButton torusButton;
	6189	+ cButton superButton;
	6190	+ cButton kleinButton;
	6191	+ cButton particlesButton;
	6192	+ cButton overlayButton;
	6193	+ cButton lightButton;
5102	6194
5103	6195	cButton screenfitButton;
5104	6196	cButton screenfitpointButton;
..	..	@@ -5111,14 +6203,6 @@
5111	6203
5112	6204	cButton setsupportButton;
5113	6205
5114		- cButton twoButton;
5115		- cButton sixButton;
5116		- cButton threeButton;
5117		- cButton sevenButton;
5118		- cButton fourButton; // full panel
5119		- cButton oneButton; // full XYZ
5120		- //cButton currentLayout;
5121		-
5122	6206	//
5123	6207	//Composite
5124	6208	Object3D // to do !!
..	..	@@ -5128,9 +6212,11 @@
5128	6212	//JTree jTree;
5129	6213	private MenuItem lookAtItem;
5130	6214	private MenuItem lookFromItem;
5131		- private MenuItem switchItem;
	6215	+ private MenuItem switchViewItem;
5132	6216	private MenuItem cutItem;
5133		- private MenuItem duplicateItem;
	6217	+ private MenuItem undoItem;
	6218	+ private MenuItem redoItem;
	6219	+ private JMenuItem duplicateItem;
5134	6220	private MenuItem cloneItem;
5135	6221	private MenuItem cloneSupportItem;
5136	6222	private MenuItem overwriteGeoItem;
..	..	@@ -5158,7 +6244,7 @@
5158	6244	private MenuItem pasteLinkItem;
5159	6245	private MenuItem pasteCloneItem;
5160	6246	private MenuItem pasteExpandItem;
5161		- private MenuItem clearItem;
	6247	+ private MenuItem deleteItem;
5162	6248	private MenuItem clearAllItem;
5163	6249	private MenuItem genUVItem;
5164	6250	private MenuItem genNormalsMESHItem;
..	..	@@ -5193,6 +6279,10 @@
5193	6279	private MenuItem showleavesItem;
5194	6280	private MenuItem markleavesItem;
5195	6281	private MenuItem unmarkleavesItem;
	6282	+ private MenuItem rewindleavesItem;
	6283	+ private MenuItem unrewindleavesItem;
	6284	+ private MenuItem randomleavesItem;
	6285	+ private MenuItem unrandomleavesItem;
5196	6286
5197	6287	private MenuItem flipVItem;
5198	6288	private MenuItem unflipVItem;
..	..	@@ -5214,7 +6304,7 @@
5214	6304	private MenuItem frontItem;
5215	6305	private MenuItem cameraItem;
5216	6306	private MenuItem compositeItem;
5217		- private MenuItem randomItem;
	6307	+ private MenuItem switchItem;
5218	6308	private MenuItem physicsItem;
5219	6309	private MenuItem frameselectorItem;
5220	6310	private MenuItem scriptNodeItem;
..	..	@@ -5238,6 +6328,8 @@
5238	6328	private MenuItem attachBumpItem;
5239	6329	private MenuItem detachBumpItem;
5240	6330	private MenuItem pigmentBumpItem;
	6331	+ private MenuItem embedTexturesItem;
	6332	+ private MenuItem deEmbedTexturesItem;
5241	6333
5242	6334	private MenuItem particleItem;
5243	6335	private MenuItem ragdollItem;
..	..	@@ -5276,11 +6368,6 @@
5276	6368	private MenuItem doubleItem;
5277	6369	private MenuItem tripleItem;
5278	6370
5279		- private MenuItem importGFDItem;
5280		- private MenuItem importVRMLX3DItem;
5281		- private MenuItem import3DSItem;
5282		- private MenuItem importOBJItem;
5283		-
5284	6371	private MenuItem computeAOItem;
5285	6372	private MenuItem recompileItem;
5286	6373	private MenuItem editScriptItem;
..	..	@@ -5290,4 +6377,8 @@
5290	6377	private MenuItem analyzeItem;
5291	6378	private MenuItem dumpItem;
5292	6379	//boolean freezemodel = false;
	6380	+
	6381	+ Menu cameraMenu;
	6382	+ MenuItem editCameraItem;
	6383	+ MenuItem restoreCameraItem;
5293	6384	}