~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,360 @@
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.equals("") ? "No background" : 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", "", 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	+ if (skybox.endsWith("/"))
	334	+ {
	335	+ group.skyboxname = null;
	336	+ group.skyboxext = null;
	337	+ cameraView.repaint();
	338	+ }
	339	+ else
	340	+ {
	341	+ //cameraView.envyoff = false;
	342	+ group.skyboxname = skybox;
	343	+ group.skyboxext = "jpg";
	344	+ cameraView.repaint();
	345	+ }
	346	+ }
	347	+
	348	+ public void CreateSkyboxPanel(cGridBag skyboxPanel)
	349	+ {
	350	+ JTabbedPane skyboxpane = new JTabbedPane();
	351	+
	352	+ AddSkyboxTab0(skyboxpane);
	353	+ AddSkyboxTab1(skyboxpane);
	354	+ AddSkyboxTab2(skyboxpane);
	355	+ AddSkyboxTab3(skyboxpane);
	356	+
	357	+ skyboxPanel.add(skyboxpane);
	358	+ }
	359	+
	360	+ public void ChangeTexture(String texture)
	361	+ {
	362	+ for (int i=0; i<group.selection.size(); i++)
	363	+ {
	364	+ Object3D obj = group.selection.get(i);
	365	+ obj.SetPigmentTexture("@" + texture);
	366	+ }
	367	+
	368	+ refreshContents();
	369	+ }
	370	+
	371	+ public void Show3DView()
	372	+ {
	373	+ // bug
	374	+ //gridPanel.setDividerLocation(1.0);
	375	+ //bigPanel.setDividerLocation(0.0);
	376	+ bigThree.ClearUI();
	377	+ bigThree.add(centralPanel);
	378	+ bigThree.FlushUI();
	379	+ }
	380	+
26	381	//ObjEditor objEditor;
27	382	public void closeUI2()
28	383	{
..	..	@@ -60,6 +415,16 @@
60	415	this.copy = this.group = group;
61	416	//selectees = this.group.selectees;
62	417
	418	+ assert(false);
	419	+
	420	+ if (copy.versionlist == null)
	421	+ {
	422	+ copy.versionlist = new Object3D[100];
	423	+ copy.versionindex = -1;
	424	+
	425	+ //Save(true);
	426	+ }
	427	+
63	428	if(ui)
64	429	SetupUI(objEditor);
65	430	}
..	..	@@ -80,10 +445,22 @@
80	445	SetupViews(objEditor);
81	446
82	447	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	448	+
	449	+ if (copy.versionlist == null)
	450	+ {
	451	+ copy.versionlist = new Object3D[100];
	452	+ copy.versionindex = -1;
	453	+
	454	+ //Save(true);
	455	+ }
83	456	}
84	457
85	458	void CloneSelection(boolean supports)
86	459	{
	460	+ if (Globals.REPLACEONMAKE)
	461	+ Save();
	462	+ boolean keep = Globals.REPLACEONMAKE;
	463	+ Globals.REPLACEONMAKE = false;
87	464	// Object3D keep = GrafreeD.clipboard;
88	465	//Object3D obj;
89	466	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,6 +471,7 @@
94	471
95	472	makeSomething(clone, i==group.selection.size()-1);
96	473	}
	474	+ Globals.REPLACEONMAKE = keep;
97	475	}
98	476
99	477	void CloneClipboard(boolean supports)
..	..	@@ -150,40 +528,49 @@
150	528
151	529	void SetupMenu2(GroupEditor oe)
152	530	{
	531	+ oe.jTree = new cTree();
	532	+
153	533	Menu menu;
154	534	oe.menuBar.add(menu = new Menu("Edit"));
155	535	//editItem = menu.add(new MenuItem("Edit"));
156	536	//editItem.addActionListener(this);
157		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	537	+
	538	+// undoItem = menu.add(new MenuItem("Undo"));
	539	+// undoItem.addActionListener(this);
	540	+// redoItem = menu.add(new MenuItem("Redo"));
	541	+// redoItem.addActionListener(this);
	542	+// menu.add("-");
	543	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
158	544	duplicateItem.addActionListener(this);
159		- cloneItem = menu.add(new MenuItem("Clone"));
	545	+
	546	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
160	547	cloneItem.addActionListener(this);
161		- if (Globals.ADVANCED)
	548	+ //if (Globals.ADVANCED)
162	549	{
163	550	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
164	551	cloneSupportItem.addActionListener(this);
165	552	}
	553	+ oe.jTree.popup.addSeparator();
166	554	menu.add("-");
167		- cutItem = menu.add(new MenuItem("Cut"));
	555	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
168	556	cutItem.addActionListener(this);
169		- copyItem = menu.add(new MenuItem("Copy"));
	557	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
170	558	copyItem.addActionListener(this);
171	559	pasteItem = menu.add(new MenuItem("Paste"));
172	560	pasteItem.addActionListener(this);
173		- menu.add("-");
174	561
175		- menu.add("-");
176		- pasteIntoItem = menu.add(new MenuItem("Paste into"));
	562	+ oe.jTree.popup.addSeparator();
	563	+ //menu.add("-");
	564	+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
177	565	pasteIntoItem.addActionListener(this);
178		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	566	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
179	567	pasteLinkItem.addActionListener(this);
180		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	568	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
181	569	pasteCloneItem.addActionListener(this);
182		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	570	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
183	571	// pasteExpandItem.addActionListener(this);
184		- menu.add("-");
185		- clearItem = menu.add(new MenuItem("Clear"));
186		- clearItem.addActionListener(this);
	572	+ //menu.add("-");
	573	+ oe.jTree.popup.addSeparator();
187	574
188	575	if (Globals.ADVANCED)
189	576	{
..	..	@@ -197,23 +584,23 @@
197	584	//zBufferItem.addActionListener(this);
198	585	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
199	586	//normalLensItem.addActionListener(this);
200		- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
201		- revertCameraItem.addActionListener(this);
	587	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	588	+ restoreCameraItem.addActionListener(this);
202	589
203		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
204		- toggleFullScreenItem.addItemListener(this);
205		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
206		- cameraMenu.add("-");
	590	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	591	+// toggleFullScreenItem.addItemListener(this);
	592	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	593	+// cameraMenu.add("-");
	594	+//
	595	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	596	+// toggleTextureItem.addItemListener(this);
	597	+// toggleTextureItem.setState(CameraPane.textureon);
	598	+//
	599	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	600	+// toggleSwitchItem.addItemListener(this);
	601	+// toggleSwitchItem.setState(CameraPane.SWITCH);
207	602
208		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
209		- toggleTextureItem.addItemListener(this);
210		- toggleTextureItem.setState(CameraPane.textureon);
211		-
212		- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
213		- toggleSwitchItem.addItemListener(this);
214		- toggleSwitchItem.setState(CameraPane.SWITCH);
215		-
216		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	603	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
217	604	toggleHandleItem.addItemListener(this);
218	605	toggleHandleItem.setState(CameraPane.HANDLES);
219	606
..	..	@@ -240,7 +627,7 @@
240	627
241	628	cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
242	629	toggleDebugItem.addItemListener(this);
243		- toggleDebugItem.setState(CameraPane.DEBUG);
	630	+ toggleDebugItem.setState(Globals.DEBUG);
244	631
245	632	cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
246	633	toggleFrustumItem.addItemListener(this);
..	..	@@ -261,22 +648,20 @@
261	648	// animationItem.addItemListener(this);
262	649	// animationItem.setState(CameraPane.ANIMATION);
263	650	cameraMenu.add("-");
264		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
	651	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
265	652	editCameraItem.addActionListener(this);
266	653
267	654	if (Globals.ADVANCED)
268	655	{
269	656	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
270	657	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
271		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
272		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	658	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
273	659	oe.cameraMenu.add("-");
274	660	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
275	661	openWindowItem.addActionListener(this);
276		- editLeafItem.addActionListener(this);
277	662	lookAtItem.addActionListener(this);
278	663	//lookFromItem.addActinoListener(this);
279		- //switchItem.addActionListener(this);
	664	+ //switchViewItem.addActionListener(this);
280	665	}
281	666
282	667	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -320,22 +705,37 @@
320	705	setMasterItem.addActionListener(this);
321	706	}
322	707
323		- oe.menuBar.add(menu = new Menu("Group"));
324		- grabItem = menu.add(new MenuItem("Grab"));
325		- grabItem.addActionListener(this);
	708	+ oe.menuBar.add(menu = new Menu("Order"));
	709	+
326	710	backItem = menu.add(new MenuItem("Back"));
327	711	backItem.addActionListener(this);
328	712	frontItem = menu.add(new MenuItem("Front"));
329	713	frontItem.addActionListener(this);
330		- compositeItem = menu.add(new MenuItem("Composite"));
331		- compositeItem.addActionListener(this);
	714	+// compositeItem = menu.add(new MenuItem("Composite"));
	715	+// compositeItem.addActionListener(this);
	716	+
	717	+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
	718	+ grabItem.addActionListener(this);
	719	+
	720	+ if (Globals.ADVANCED)
	721	+ {
332	722	hideItem = menu.add(new MenuItem("Hidden Group"));
333	723	hideItem.addActionListener(this);
334		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	724	+ }
	725	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
335	726	ungroupItem.addActionListener(this);
336		- menu.add("-");
337		- randomItem = menu.add(new MenuItem("Switch node"));
338		- randomItem.addActionListener(this);
	727	+
	728	+ oe.jTree.popup.addSeparator();
	729	+
	730	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	731	+ deleteItem.addActionListener(this);
	732	+
	733	+// menu.add("-");
	734	+//
	735	+// switchItem = menu.add(new MenuItem("Switch node"));
	736	+// switchItem.addActionListener(this);
	737	+ if (Globals.ADVANCED)
	738	+ {
339	739	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
340	740	switchGeoItem.addActionListener(this);
341	741	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -343,8 +743,6 @@
343	743	morphItem = menu.add(new MenuItem("Morph Group"));
344	744	morphItem.addActionListener(this);
345	745
346		- if (Globals.ADVANCED)
347		- {
348	746	menu.add("-");
349	747	physicsItem = menu.add(new MenuItem("Physics"));
350	748	physicsItem.addActionListener(this);
..	..	@@ -352,30 +750,29 @@
352	750	frameselectorItem.addActionListener(this);
353	751	scriptNodeItem = menu.add(new MenuItem("Script Node"));
354	752	scriptNodeItem.addActionListener(this);
355		- cameraItem = menu.add(new MenuItem("Camera"));
356		- cameraItem.addActionListener(this);
357	753	}
358	754
359	755	oe.menuBar.add(menu = new Menu("Object"));
360		- textureItem = menu.add(new MenuItem("Texture"));
361		- textureItem.addActionListener(this);
	756	+// textureItem = menu.add(new MenuItem("Texture"));
	757	+// textureItem.addActionListener(this);
362	758	billboardItem = menu.add(new MenuItem("Billboard"));
363	759	billboardItem.addActionListener(this);
364	760	csgItem = menu.add(new MenuItem("CSG"));
365	761	csgItem.addActionListener(this);
366		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	762	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
367	763	shadowXItem.addActionListener(this);
368		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	764	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
369	765	shadowYItem.addActionListener(this);
370		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	766	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
371	767	shadowZItem.addActionListener(this);
	768	+ attributeItem = menu.add(new MenuItem("Attribute"));
	769	+ attributeItem.addActionListener(this);
	770	+
372	771	if (Globals.ADVANCED)
373	772	{
374	773	menu.add("-");
375	774	linkerItem = menu.add(new MenuItem("Linker"));
376	775	linkerItem.addActionListener(this);
377		- attributeItem = menu.add(new MenuItem("Attribute"));
378		- attributeItem.addActionListener(this);
379	776	templateItem = menu.add(new MenuItem("Template"));
380	777	templateItem.addActionListener(this);
381	778	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -404,7 +801,7 @@
404	801	genNormalsMESHItem.addActionListener(this);
405	802	if (Globals.ADVANCED)
406	803	{
407		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	804	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
408	805	genNormalsMINEItem.addActionListener(this);
409	806	}
410	807	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -464,6 +861,14 @@
464	861	markleavesItem.addActionListener(this);
465	862	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
466	863	unmarkleavesItem.addActionListener(this);
	864	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	865	+ rewindleavesItem.addActionListener(this);
	866	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	867	+ unrewindleavesItem.addActionListener(this);
	868	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	869	+ randomleavesItem.addActionListener(this);
	870	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	871	+ unrandomleavesItem.addActionListener(this);
467	872	menu.add("-");
468	873	flipVItem = menu.add(new MenuItem("Flip V"));
469	874	flipVItem.addActionListener(this);
..	..	@@ -489,10 +894,15 @@
489	894	attachBumpItem.addActionListener(this);
490	895	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
491	896	pigmentBumpItem.addActionListener(this);
	897	+ //embedTexturesItem
492	898	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
493	899	detachPigmentItem.addActionListener(this);
494	900	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
495	901	detachBumpItem.addActionListener(this);
	902	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	903	+ embedTexturesItem.addActionListener(this);
	904	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	905	+ deEmbedTexturesItem.addActionListener(this);
496	906	menu.add("-");
497	907	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
498	908	sortbysizeItem.addActionListener(this);
..	..	@@ -503,6 +913,9 @@
503	913	shareGeometriesItem.addActionListener(this);
504	914	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
505	915	mergeGeometriesItem.addActionListener(this);
	916	+ menu.add("-");
	917	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	918	+ editLeafItem.addActionListener(this);
506	919	if (Globals.ADVANCED)
507	920	{
508	921	// Pretty much the same as duplicate and clone.
..	..	@@ -519,16 +932,92 @@
519	932	buildToolsMenu(menu);
520	933	}
521	934
	935	+ JTabbedPane resourcecontainer;
	936	+ cGridBag currenttab;
	937	+ //boolean added; // patch for jar
	938	+
	939	+ int tabcount = 0;
	940	+ int colcount = 0;
	941	+ int rowcount = 0;
	942	+ int texturecount = 0;
	943	+
	944	+ int columns = 5;
	945	+ int rows = 7;
	946	+
	947	+ public void ResourceCallBack(String[] path)
	948	+ {
	949	+// for (int i = 0; i < path.length; i++)
	950	+// System.out.print(path[i] + "/");
	951	+// System.out.println();
	952	+
	953	+ if (//rowcount == 0 \|\|
	954	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	955	+ {
	956	+ currenttab = new cGridBag();
	957	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	958	+ currenttab.setName(tabname);
	959	+ //added = false;
	960	+ resourcecontainer.add(currenttab);
	961	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	962	+ rowcount = 1;
	963	+ colcount = 0;
	964	+ texturecount = 0;
	965	+ }
	966	+
	967	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	968	+ {
	969	+ //if (!added)
	970	+ {
	971	+ //added = true;
	972	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	973	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	974	+ }
	975	+
	976	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	977	+
	978	+ if (++colcount >= columns)
	979	+ {
	980	+ colcount = 0;
	981	+ currenttab.Return();
	982	+
	983	+ if (rowcount++ >= rows)
	984	+ {
	985	+ rowcount = 0;
	986	+ }
	987	+ }
	988	+ }
	989	+ else
	990	+ {
	991	+// if (!path[path.length-1].equals("icons"))
	992	+// resourcecontainer.Return();
	993	+ }
	994	+ }
	995	+
	996	+ void CreateTexturePanel(cGridBag container)
	997	+ {
	998	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	999	+ container.add(resourcecontainer);
	1000	+
	1001	+ Grafreed.ParseResources("textures", this);
	1002	+ }
	1003	+
522	1004	void SetupUI2(ObjEditor oe)
523	1005	{
	1006	+ // June 2019
	1007	+ if (oe == null)
	1008	+ {
	1009	+ //super.SetupUI2(this);
	1010	+ //return;
	1011	+ }
	1012	+
	1013	+ if (copy != group)
	1014	+ {
	1015	+ //super.SetupUI2(this);
	1016	+ }
	1017	+
524	1018	//new Exception().printStackTrace();
525	1019
526	1020	oe.radioPanel = new JPanel(new GridBagLayout());
527		- oe.aConstraints.weightx = 1;
528		- oe.aConstraints.weighty = 0;
529		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
530		- oe.aConstraints.gridwidth = 100;
531		- oe.aConstraints.gridheight = 1;
532	1021	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
533	1022
534	1023	oe.buttonGroup = new ButtonGroup();
..	..	@@ -549,27 +1038,123 @@
549	1038	oe.radioPanel.add(dummyButton);
550	1039	oe.buttonGroup.add(dummyButton);
551	1040	*/
	1041	+ cGridBag copyOptionsPanel = new cGridBag();
	1042	+
	1043	+ copyOptionsPanel.preferredHeight = 2;
	1044	+
552	1045	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
553	1046
554		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
555		- liveCB.setToolTipText("Enable animation");
556		- liveCB.addItemListener(this);
	1047	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1048	+ //minButton.setToolTipText("Minimize window");
	1049	+ //minButton.addActionListener(this);
	1050	+
	1051	+ if (Globals.ADVANCED)
	1052	+ {
	1053	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1054	+// maxButton.setToolTipText("Maximize window");
	1055	+// maxButton.addActionListener(this);
	1056	+ }
	1057	+
	1058	+ cButton gcButton;
	1059	+
	1060	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1061	+// gcButton.setToolTipText("Garbage collect");
	1062	+// gcButton.addActionListener(new ActionListener()
	1063	+// {
	1064	+// public void actionPerformed(ActionEvent e)
	1065	+// {
	1066	+// System.gc();
	1067	+// }
	1068	+// });
	1069	+
	1070	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1071	+ collapseButton.setToolTipText("Collapse toolbar");
	1072	+ collapseButton.addActionListener(this);
	1073	+
	1074	+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/empty.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1075	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1076	+ maximize3DButton.addActionListener(this);
	1077	+
	1078	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1079	+ twoButton.setToolTipText("Show 3D view only");
	1080	+ twoButton.addActionListener(this);
	1081	+ this.fullscreenLayout = twoButton;
	1082	+
	1083	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1084	+ threeButton.setToolTipText("Show controls and 3D view");
	1085	+ threeButton.addActionListener(this);
	1086	+ if (Globals.ADVANCED)
	1087	+ {
	1088	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1089	+ sixButton.setToolTipText("Show 3D view and controls");
	1090	+ sixButton.addActionListener(this);
	1091	+ }
	1092	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1093	+// sevenButton.setToolTipText("3-column layout");
	1094	+// sevenButton.addActionListener(this);
	1095	+ //
	1096	+
	1097	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1098	+ fullButton.setToolTipText("Full-screen window");
	1099	+ fullButton.addActionListener(this);
	1100	+
	1101	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1102	+ screenfitButton.setToolTipText("Screen fit");
	1103	+ screenfitButton.addActionListener(this);
557	1104
558		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1105	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1106	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1107	+ restoreCameraButton.addActionListener(this);
	1108	+
	1109	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1110	+ saveVersionButton.setToolTipText("Duplicate current version");
	1111	+ saveVersionButton.addActionListener(this);
	1112	+
	1113	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1114	+ deleteVersionButton.setToolTipText("Delete current version");
	1115	+ deleteVersionButton.addActionListener(this);
	1116	+ deleteVersionButton.setEnabled(false);
	1117	+
	1118	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1119	+ previousVersionButton.setToolTipText("Previous version");
	1120	+ previousVersionButton.addActionListener(this);
	1121	+ previousVersionButton.setEnabled(false);
	1122	+
	1123	+ cGridBag updown = new cGridBag().setVertical(true);
	1124	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1125	+ restoreButton.setToolTipText("Undo (restore current version)");
	1126	+ restoreButton.addActionListener(this);
	1127	+ restoreButton.setEnabled(false);
	1128	+
	1129	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1130	+ replaceButton.setToolTipText("Save (replace current version)");
	1131	+ replaceButton.addActionListener(this);
	1132	+ replaceButton.setEnabled(false);
	1133	+
	1134	+ copyOptionsPanel.add(updown);
	1135	+
	1136	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1137	+ nextVersionButton.setToolTipText("Next version");
	1138	+ nextVersionButton.addActionListener(this);
	1139	+ nextVersionButton.setEnabled(false);
	1140	+
	1141	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
559	1142	oneStepButton.setToolTipText("Animate one step forward");
560	1143	oneStepButton.addActionListener(this);
561	1144
562		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	1145	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1146	+ liveCB.setToolTipText("Enable animation");
	1147	+ liveCB.addItemListener(this);
	1148	+
	1149	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
563	1150	fastCB.setToolTipText("Fast mode");
564	1151	fastCB.addItemListener(this);
565	1152
566		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
567		- trackCB.setToolTipText("Enable tracking");
568		- trackCB.addItemListener(this);
569		-
570		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
571		- screenfitButton.setToolTipText("Screen fit");
572		- screenfitButton.addActionListener(this);
	1153	+ //oe.toolboxPanel.Return();
	1154	+
	1155	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1156	+// trackCB.setToolTipText("Enable tracking");
	1157	+// trackCB.addItemListener(this);
573	1158
574	1159	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
575	1160	// screenfitpointButton.addActionListener(this);
..	..	@@ -579,67 +1164,137 @@
579	1164	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
580	1165	snapobjectButton.addActionListener(this);
581	1166	snapobjectButton.setToolTipText("Snap Object");
	1167	+
	1168	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1169	+ fourButton.addActionListener(this);
	1170	+ fourButton.setToolTipText("Show control panel only");
582	1171	}
583	1172
584		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
585		- flashSelectionButton.setToolTipText("Show selection");
586		- flashSelectionButton.addActionListener(this);
	1173	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
587	1174
588		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
589		-
590		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
591		- twoButton.setToolTipText("Show center view only");
592		- twoButton.addActionListener(this);
593		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
594		- fourButton.addActionListener(this);
595		- fourButton.setToolTipText("Show left panel only");
596		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
597		- sixButton.setToolTipText("2-column layout left");
598		- sixButton.addActionListener(this);
599		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
600		- threeButton.setToolTipText("2-column layout right");
601		- threeButton.addActionListener(this);
602		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
603		- sevenButton.setToolTipText("3-column layout");
604		- sevenButton.addActionListener(this);
605		- //
606	1175
607		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
608		- rootButton.setToolTipText("Edit selection in new tab");
	1176	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1177	+ rootButton.setToolTipText("Open selection in new tab");
609	1178	rootButton.addActionListener(this);
610	1179
611		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1180	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
612	1181	closeButton.setToolTipText("Close tab");
613	1182	closeButton.addActionListener(this);
614	1183	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
615	1184	//clearButton.addActionListener(this);
616		-
617		- cGridBag commandsPanel = new cGridBag();
	1185	+
	1186	+ cGridBag row1 = new cGridBag();
618	1187
619		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
620		- editButton.setToolTipText("Edit selection");
	1188	+ // INSERT
	1189	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1190	+ gridButton.setToolTipText("Create ground");
	1191	+ gridButton.addActionListener(this);
	1192	+
	1193	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1194	+ boxButton.setToolTipText("Create box");
	1195	+ boxButton.addActionListener(this);
	1196	+
	1197	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1198	+ superButton.setToolTipText("Create superellipsoid");
	1199	+ superButton.addActionListener(this);
	1200	+
	1201	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1202	+ sphereButton.setToolTipText("Create sphere");
	1203	+ sphereButton.addActionListener(this);
	1204	+
	1205	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1206	+ coneButton.setToolTipText("Create cone");
	1207	+ coneButton.addActionListener(this);
	1208	+
	1209	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1210	+ torusButton.setToolTipText("Create torus");
	1211	+ torusButton.addActionListener(this);
	1212	+
	1213	+ if (Globals.ADVANCED)
	1214	+ {
	1215	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1216	+ kleinButton.setToolTipText("Create Klein bottle");
	1217	+ kleinButton.addActionListener(this);
	1218	+ }
	1219	+
	1220	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1221	+ particlesButton.setToolTipText("Create particle system");
	1222	+ particlesButton.addActionListener(this);
	1223	+
	1224	+ oe.toolboxPanel.add(row1);
	1225	+
	1226	+ cGridBag row2 = new cGridBag();
	1227	+
	1228	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1229	+ groupButton.setToolTipText("Create group");
	1230	+ groupButton.addActionListener(this);
	1231	+
	1232	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1233	+ compositeButton.setToolTipText("Create composite");
	1234	+ compositeButton.addActionListener(this);
	1235	+
	1236	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1237	+ switchButton.setToolTipText("Create item switcher");
	1238	+ switchButton.addActionListener(this);
	1239	+
	1240	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1241	+ loopButton.setToolTipText("Create loop");
	1242	+ loopButton.addActionListener(this);
	1243	+
	1244	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1245	+ textureButton.setToolTipText("Create texture");
	1246	+ textureButton.addActionListener(this);
	1247	+
	1248	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1249	+ overlayButton.setToolTipText("Create overlay");
	1250	+ overlayButton.addActionListener(this);
	1251	+
	1252	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1253	+ lightButton.setToolTipText("Create light");
	1254	+ lightButton.addActionListener(this);
	1255	+
	1256	+ oe.toolboxPanel.add(row2);
	1257	+
	1258	+ cGridBag textures = new cGridBag();
	1259	+
	1260	+ CreateTexturePanel(textures);
	1261	+
	1262	+ oe.toolboxPanel.add(textures);
	1263	+
	1264	+ textures.preferredHeight = 100;
	1265	+
	1266	+ CreateSkyboxPanel(oe.skyboxPanel);
	1267	+
	1268	+ // EDIT panel
	1269	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1270	+ editButton.setToolTipText("Pin selection controls");
621	1271	editButton.addActionListener(this);
622	1272
623		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
624		- uneditButton.setToolTipText("Unedit selection");
	1273	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1274	+ uneditButton.setToolTipText("Unpin and remove selection controls");
625	1275	uneditButton.addActionListener(this);
626	1276
627		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
628		- allParamsButton.setToolTipText("Edit all params");
	1277	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1278	+ allParamsButton.setToolTipText("Show all controls");
629	1279	allParamsButton.addActionListener(this);
630	1280
631		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
632		- clearPanelButton.setToolTipText("Clear edit panel");
	1281	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1282	+ clearPanelButton.setToolTipText("Clear all controls");
633	1283	clearPanelButton.addActionListener(this);
634	1284
635		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
636		- unselectButton.setToolTipText("Unselect");
637		- unselectButton.addActionListener(this);
	1285	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1286	+ //unselectButton.setToolTipText("Unselect");
	1287	+ //unselectButton.addActionListener(this);
638	1288
639		- commandsPanel.preferredHeight = 1;
	1289	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1290	+ flashSelectionButton.setToolTipText("Highlight selection");
	1291	+ flashSelectionButton.addActionListener(this);
640	1292
641		- oe.treePanel.add(commandsPanel);
642		- oe.treePanel.Return();
	1293	+ editCommandsPanel.preferredHeight = 1;
	1294	+
	1295	+ SetPinStates(false);
	1296	+// oe.treePanel.add(commandsPanel);
	1297	+// oe.treePanel.Return();
643	1298
644	1299	// oe.aConstraints.gridx += 1;
645	1300	// oe.aConstraints.weighty = 0;
..	..	@@ -656,32 +1311,20 @@
656	1311
657	1312	JScrollPane jSP;
658	1313	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
659		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1314	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
660	1315	ResetModel();
661	1316
662	1317	oe.treePanel.add(jSPPanel);
663	1318	oe.treePanel.Return();
664	1319
665		- cGridBag copyOptionsPanel = new cGridBag();
666		-
667		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
668		- colorCB.setToolTipText("Copy color when dropped");
669		- colorCB.addItemListener(this);
670		-
671		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
672		- materialCB.setToolTipText("Copy material when dropped");
673		- materialCB.addItemListener(this);
674		-
675		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
676		- textureCB.setToolTipText("Copy texture when dropped");
677		- textureCB.addItemListener(this);
678		-
679		- copyOptionsPanel.preferredHeight = 1;
680	1320	oe.treePanel.add(copyOptionsPanel);
681	1321	oe.treePanel.Return();
	1322	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1323	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1324	+ sliderPane.preferredHeight = 1;
682	1325
683		-// mainPanel.setDividerLocation(0.5); //1.0);
684		-// mainPanel.setResizeWeight(0.5);
	1326	+// mainPanel.setDividerLocation(0.1); //1.0);
	1327	+ mainPanel.setResizeWeight(0.4);
685	1328
686	1329	//jList.addListSelectionListener(this);
687	1330	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -689,7 +1332,7 @@
689	1332	//jTree.setEditable(true);
690	1333	oe.jTree.setDragEnabled(true);
691	1334	//jTree.setPreferredSize(new Dimension(10,10));
692		- jSP.setPreferredSize(new Dimension(100,200));
	1335	+ //jSP.setPreferredSize(new Dimension(100,200));
693	1336
694	1337	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
695	1338
..	..	@@ -701,29 +1344,49 @@
701	1344	dgr.addDragGestureListener(this);
702	1345	}catch(Exception e) {}
703	1346	*/
704		- radio.layout = sevenButton;
	1347	+ radio.layout = threeButton; // sixButton;
705	1348	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
706	1349	}
707	1350
708	1351	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
709	1352	{
	1353	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1354	+ colorCB.setToolTipText("Copy color when dropped");
	1355	+ colorCB.addItemListener(this);
	1356	+
	1357	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1358	+ materialCB.setToolTipText("Copy material when dropped");
	1359	+ materialCB.addItemListener(this);
	1360	+
	1361	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1362	+ textureCB.setToolTipText("Copy texture when dropped");
	1363	+ textureCB.addItemListener(this);
	1364	+
	1365	+ panel.Return();
	1366	+
710	1367	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
711	1368	boxCB.setToolTipText("Display bounding boxes");
712	1369	boxCB.addItemListener(this);
713	1370
714	1371	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
715		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1372	+ zoomBoxCB.setToolTipText("Display only for wheel");
716	1373	zoomBoxCB.addItemListener(this);
717	1374
718	1375	if (true) // Globals.ADVANCED)
719	1376	{
720		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
721		- supportCB.setToolTipText("Enable rigging");
722		- supportCB.addItemListener(this);
	1377	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1378	+// supportCB.setToolTipText("Enable rigging");
	1379	+// supportCB.addItemListener(this);
	1380	+
	1381	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1382	+ freezeCB.setToolTipText("Fast moving camera");
	1383	+ freezeCB.addItemListener(this);
723	1384
724	1385	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
725	1386	// localCB.addItemListener(this);
726	1387
	1388	+ panel.Return();
	1389	+
727	1390	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
728	1391	crowdCB.setToolTipText("Used for crowds");
729	1392	crowdCB.addItemListener(this);
..	..	@@ -732,14 +1395,19 @@
732	1395	smoothCB.setToolTipText("Snapping delay");
733	1396	smoothCB.addItemListener(this);
734	1397
735		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
736		- slowCB.setToolTipText("Smooth interpolation");
737		- slowCB.addItemListener(this);
	1398	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1399	+// slowCB.setToolTipText("Smooth interpolation");
	1400	+// slowCB.addItemListener(this);
	1401	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1402	+ minshaderCB.setToolTipText("Minimal fast shader");
	1403	+ minshaderCB.addItemListener(this);
738	1404
739	1405	// constraints.gridy += 1;
740	1406	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
741	1407	// speakerMocapCB.addItemListener(this);
742	1408
	1409	+ panel.Return();
	1410	+
743	1411	if (false)
744	1412	{
745	1413	// handled in scripts
..	..	@@ -754,34 +1422,82 @@
754	1422	//constraints.gridy += 1;
755	1423	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
756	1424	smoothfocusCB.addItemListener(this);
	1425	+ panel.Return();
757	1426	}
758	1427
759	1428	//constraints.gridx += 1;
760	1429	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
761	1430	// debugCB.addItemListener(this);
762	1431
	1432	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1433	+ trackCB.setToolTipText("Enable tracking target");
	1434	+ trackCB.addItemListener(this);
	1435	+
763	1436	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1437	+ oeilCB.setToolTipText("Move camera when tracking");
764	1438	oeilCB.addItemListener(this);
765	1439
	1440	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1441	+ shadowCB.setToolTipText("When live compute shadows");
	1442	+ shadowCB.addItemListener(this);
	1443	+
	1444	+ panel.Return();
	1445	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1446	+ toggleTextureCB.setToolTipText("Load textures");
	1447	+ toggleTextureCB.addItemListener(this);
	1448	+
	1449	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1450	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1451	+ toggleSwitchCB.addItemListener(this);
	1452	+
	1453	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1454	+ autokeepCB.setToolTipText("On structure change");
	1455	+ autokeepCB.addItemListener(this);
	1456	+
	1457	+ panel.Return();
	1458	+ if (Globals.ADVANCED)
	1459	+ {
766	1460	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
767	1461	lookAtCB.setToolTipText("Look-at target");
768	1462	lookAtCB.addItemListener(this);
	1463	+ }
769	1464
770	1465	}
771	1466
772	1467	cGridBag fill = new cGridBag();
773		-
774	1468	fill.preferredHeight = 200;
	1469	+ cGridBag fill2 = new cGridBag();
	1470	+ fill2.preferredHeight = 200;
	1471	+ cGridBag fill3 = new cGridBag();
	1472	+ fill3.preferredHeight = 200;
775	1473
776	1474	panel.add(fill);
	1475	+ panel.add(fill2);
	1476	+ panel.add(fill3);
777	1477
778	1478	}
779	1479
780	1480	void EditObject(Object3D obj)
781	1481	{
	1482	+ assert(obj instanceof Composite);
	1483	+
	1484	+// if (obj.versionlist == null)
	1485	+// {
	1486	+// obj.versionlist = new Object3D[100];
	1487	+// obj.versionindex = -1;
	1488	+// }
	1489	+
782	1490	cRadio radioButton = new cRadio(obj.name);
	1491	+
	1492	+ // June 2019. Patch to avoid bug with transparency.
	1493	+ radioButton.hadMaterial = obj.material != null;
	1494	+ if (!radioButton.hadMaterial)
	1495	+ {
	1496	+ obj.material = new cMaterial();
	1497	+ }
	1498	+
783	1499	radioButton.SetObject(obj);
784		- radioButton.layout = sevenButton;
	1500	+ radioButton.layout = threeButton; // sixButton;
785	1501	radioButton.SetCamera(cameraView.renderCamera, false);
786	1502	radioButton.addActionListener(this);
787	1503	radioPanel.add(radioButton);
..	..	@@ -791,31 +1507,41 @@
791	1507
792	1508	void SetupViews(ObjEditor oe)
793	1509	{
	1510	+ theFrame = this;
	1511	+
794	1512	oe.SetupViews();
795	1513
	1514	+ if (Globals.DEBUG)
796	1515	System.out.println("SetupViews");
797	1516	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
798	1517	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
799	1518	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
800	1519	}
801	1520
802		- JCheckBox liveCB;
803		- JCheckBox supportCB;
804		- JCheckBox localCB;
805		- JCheckBox crowdCB;
806		- JCheckBox smoothCB;
807		- JCheckBox fastCB;
808		- JCheckBox slowCB;
809		- JCheckBox boxCB;
810		- JCheckBox zoomBoxCB;
811		- JCheckBox trackCB;
812		- JCheckBox smoothfocusCB;
	1521	+ cToggleButton liveCB;
	1522	+ cCheckBox supportCB;
	1523	+ cCheckBox localCB;
	1524	+ cCheckBox crowdCB;
	1525	+ cCheckBox smoothCB;
	1526	+ cCheckBox minshaderCB;
	1527	+
	1528	+ cToggleButton fastCB;
	1529	+ cCheckBox slowCB;
	1530	+ cCheckBox boxCB;
	1531	+ cCheckBox zoomBoxCB;
	1532	+ cCheckBox freezeCB;
	1533	+ //cToggleButton trackCB;
	1534	+ cCheckBox trackCB;
	1535	+ cCheckBox smoothfocusCB;
813	1536	// JCheckBox speakerMocapCB;
814		- JCheckBox speakerCameraCB;
815		- JCheckBox speakerFocusCB;
816		- JCheckBox debugCB;
817		- JCheckBox oeilCB;
818		- JCheckBox lookAtCB;
	1537	+ cCheckBox speakerCameraCB;
	1538	+ cCheckBox speakerFocusCB;
	1539	+ cCheckBox debugCB;
	1540	+
	1541	+ cCheckBox oeilCB;
	1542	+ cCheckBox shadowCB;
	1543	+ cCheckBox autokeepCB;
	1544	+ cCheckBox lookAtCB;
819	1545
820	1546	// static int COLOR = 1;
821	1547	// static int MATERIAL = 2;
..	..	@@ -823,9 +1549,9 @@
823	1549
824	1550	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
825	1551
826		- JCheckBox colorCB;
827		- JCheckBox materialCB;
828		- JCheckBox textureCB;
	1552	+ cCheckBox colorCB;
	1553	+ cCheckBox materialCB;
	1554	+ cCheckBox textureCB;
829	1555
830	1556	public void itemStateChanged(ItemEvent e)
831	1557	{
..	..	@@ -853,6 +1579,7 @@
853	1579	} else if(e.getSource() == liveCB)
854	1580	{
855	1581	cameraView.ToggleLive();
	1582	+ refreshContents(false);
856	1583	}
857	1584	else if(e.getSource() == supportCB)
858	1585	{
..	..	@@ -868,6 +1595,12 @@
868	1595	{
869	1596	cameraView.ToggleInertia();
870	1597	cameraView.repaint();
	1598	+ }
	1599	+ else if(e.getSource() == minshaderCB)
	1600	+ {
	1601	+ Globals.MINSHADER ^= true;
	1602	+ cameraView.programInitialized = false;
	1603	+ cameraView.repaint();
871	1604	}
872	1605	else if(e.getSource() == localCB)
873	1606	{
..	..	@@ -917,6 +1650,18 @@
917	1650	{
918	1651	cameraView.ToggleOeil();
919	1652	}
	1653	+ else if(e.getSource() == shadowCB)
	1654	+ {
	1655	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1656	+ }
	1657	+ else if(e.getSource() == freezeCB)
	1658	+ {
	1659	+ Globals.FREEZEONMOVE ^= true;
	1660	+ }
	1661	+ else if(e.getSource() == autokeepCB)
	1662	+ {
	1663	+ Globals.REPLACEONMAKE ^= true;
	1664	+ }
920	1665	else if(e.getSource() == lookAtCB)
921	1666	{
922	1667	cameraView.ToggleLookAt();
..	..	@@ -933,7 +1678,8 @@
933	1678
934	1679	/**/
935	1680	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
936		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1681	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1682	+ TreePath path = objEditor.jTree.getSelectionPath();
937	1683	if ((path == null) \|\| (path.getPathCount() <= 1)) {
938	1684	// We can't move the root node or an empty selection
939	1685	return;
..	..	@@ -996,8 +1742,6 @@
996	1742	}
997	1743	}
998	1744
999		- String string = (String) object;
1000		-
1001	1745	System.out.println("Transfer = " + object + "; drop : " + target);
1002	1746	// if( object instanceof java.io.File[])
1003	1747	// {
..	..	@@ -1005,6 +1749,8 @@
1005	1749	// objEditor.DropFile((java.io.File[]) object, true);
1006	1750	// return;
1007	1751	// }
	1752	+
	1753	+ String string = object.toString();
1008	1754
1009	1755	// File path for Mac and Windows
1010	1756	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1050,23 +1796,33 @@
1050	1796
1051	1797	assert target == objEditor.jTree;
1052	1798	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1799	+ Object3D destinationLeaf;
1053	1800	try {
1054		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1801	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1055	1802	} catch (Exception e) {
1056	1803	System.out.println("destinationPath : " + destinationPath);
1057	1804	return;
1058	1805	}
1059	1806
1060		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1807	+ for (int i=group.selection.size(); --i>=0;)
1061	1808	{
	1809	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1810	+
	1811	+ // Cannot move into itself
	1812	+ if (child == destinationLeaf)
	1813	+ return;
	1814	+ }
	1815	+
	1816	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1817	+// {
1062	1818	loadClipboard(true);
1063	1819	objEditor.jTree.setSelectionPath(destinationPath);
1064	1820	pasteInto(false, false);
1065		- } else {
1066		- loadClipboard(false);
1067		- objEditor.jTree.setSelectionPath(destinationPath);
1068		- pasteInto(false, false); // true); // ???
1069		- }
	1821	+// } else {
	1822	+// loadClipboard(false);
	1823	+// objEditor.jTree.setSelectionPath(destinationPath);
	1824	+// pasteInto(false, false); // true); // ???
	1825	+// }
1070	1826	}
1071	1827	public void dropActionChanged(DropTargetDragEvent dtde)
1072	1828	// Called if the user has modified the current drop gesture
..	..	@@ -1122,7 +1878,12 @@
1122	1878	TreePath path;
1123	1879
1124	1880	public TransferableTreePath(TreePath tp) {
1125		- path = tp;
	1881	+ Object[] objs = new Object[tp.getPathCount()];
	1882	+ for (int i=0; i<objs.length; i++)
	1883	+ {
	1884	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1885	+ }
	1886	+ path = new TreePath(objs);
1126	1887	}
1127	1888
1128	1889	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1171,22 +1932,30 @@
1171	1932	{
1172	1933	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1173	1934	//heightFieldItem.addActionListener(this);
1174		- gridItem = menu.add(new MenuItem("Grid"));
1175		- gridItem.addActionListener(this);
1176		- rectoidItem = menu.add(new MenuItem("Box"));
1177		- rectoidItem.addActionListener(this);
1178		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1179		- ellipsoidItem.addActionListener(this);
1180		- coneItem = menu.add(new MenuItem("Cone"));
1181		- coneItem.addActionListener(this);
1182		- torusItem = menu.add(new MenuItem("Torus"));
1183		- torusItem.addActionListener(this);
1184		- superItem = menu.add(new MenuItem("Superellipsoid"));
1185		- superItem.addActionListener(this);
	1935	+// gridItem = menu.add(new MenuItem("Grid"));
	1936	+// gridItem.addActionListener(this);
	1937	+// rectoidItem = menu.add(new MenuItem("Box"));
	1938	+// rectoidItem.addActionListener(this);
	1939	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1940	+// ellipsoidItem.addActionListener(this);
	1941	+// coneItem = menu.add(new MenuItem("Cone"));
	1942	+// coneItem.addActionListener(this);
	1943	+// torusItem = menu.add(new MenuItem("Torus"));
	1944	+// torusItem.addActionListener(this);
	1945	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1946	+// superItem.addActionListener(this);
	1947	+
	1948	+ cameraItem = menu.add(new MenuItem("Camera"));
	1949	+ cameraItem.addActionListener(this);
	1950	+
	1951	+ if (!Globals.ADVANCED)
	1952	+ {
1186	1953	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1187	1954	kleinItem.addActionListener(this);
1188		- particleItem = menu.add(new MenuItem("Particle system"));
1189		- particleItem.addActionListener(this);
	1955	+ }
	1956	+
	1957	+// particleItem = menu.add(new MenuItem("Particle system"));
	1958	+// particleItem.addActionListener(this);
1190	1959	if (Globals.ADVANCED)
1191	1960	{
1192	1961	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1212,15 +1981,15 @@
1212	1981	}
1213	1982	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1214	1983	bezierItem.addActionListener(this);
1215		- overlayItem = menu.add(new MenuItem("Overlay"));
1216		- overlayItem.addActionListener(this);
1217		- lightItem = menu.add(new MenuItem("Light"));
1218		- lightItem.addActionListener(this);
	1984	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1985	+// overlayItem.addActionListener(this);
	1986	+// lightItem = menu.add(new MenuItem("Light"));
	1987	+// lightItem.addActionListener(this);
1219	1988	menu.add("-");
1220	1989	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1221	1990	//superLoopItem.addActionListener(this);
1222		- loopItem = menu.add(new MenuItem("Loop"));
1223		- loopItem.addActionListener(this);
	1991	+// loopItem = menu.add(new MenuItem("Loop"));
	1992	+// loopItem.addActionListener(this);
1224	1993	doubleItem = menu.add(new MenuItem("Fork"));
1225	1994	doubleItem.addActionListener(this);
1226	1995	if (Globals.ADVANCED)
..	..	@@ -1236,6 +2005,9 @@
1236	2005	animationItem.addItemListener(this);
1237	2006	animationItem.setState(Globals.ANIMATION);
1238	2007
	2008	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	2009	+ archiveItem.addActionListener(this);
	2010	+
1239	2011	menu.add("-");
1240	2012	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1241	2013	parseverticesItem.addActionListener(this);
..	..	@@ -1248,6 +2020,8 @@
1248	2020	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1249	2021	reduce34MorphItem.addActionListener(this);
1250	2022	menu.add("-");
	2023	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	2024	+ memoryItem.addActionListener(this);
1251	2025	menu.add(computeAOItem = new MenuItem("Compute AO"));
1252	2026	computeAOItem.addActionListener(this);
1253	2027
..	..	@@ -1256,11 +2030,9 @@
1256	2030	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1257	2031	mirrorItem.addActionListener(this);
1258	2032	menu.add("-");
1259		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1260		- memoryItem.addActionListener(this);
1261	2033	menu.add(analyzeItem = new MenuItem("Analyze"));
1262	2034	analyzeItem.addActionListener(this);
1263		- menu.add(dumpItem = new MenuItem("Dump"));
	2035	+ menu.add(dumpItem = new MenuItem("Print"));
1264	2036	dumpItem.addActionListener(this);
1265	2037	// menu.add(pathItem = new MenuItem("From-to path"));
1266	2038	// pathItem.addActionListener(this);
..	..	@@ -1401,9 +2173,38 @@
1401	2173	shadow.material = new cMaterial(obj.material);
1402	2174	shadow.material.diffuse = 0.0001f;
1403	2175	shadow.material.specular = 0.0001f;
	2176	+ shadow.material.opacity = 0.75f;
	2177	+
	2178	+ AllocProjectedVertices(shadow);
	2179	+
	2180	+ shadow.projectedVertices[1].x = 300;
1404	2181
1405	2182	makeSomething(shadow);
1406	2183	}
	2184	+
	2185	+ private void ClearUnpinned()
	2186	+ {
	2187	+ //for (Object3D obj : listUI)
	2188	+ for (int i=listUI.size(); --i>=0;)
	2189	+ {
	2190	+ Object3D obj = listUI.elementAt(i);
	2191	+ if (!obj.pinned)
	2192	+ {
	2193	+ obj.CloseUI();
	2194	+ listUI.remove(i);
	2195	+ }
	2196	+ }
	2197	+ }
	2198	+
	2199	+ private void EditElement(Object3D elem, boolean newWindow)
	2200	+ {
	2201	+ // if (!(elem instanceof Composite))
	2202	+ // newWindow = false;
	2203	+ listUI.add(elem);
	2204	+ elem.openEditWindow(this, newWindow); //, false);
	2205	+ System.out.println("edit : " + elem);
	2206	+ elem.editWindow.refreshContents(true); // ? new
	2207	+ }
1407	2208
1408	2209	/**
1409	2210	* applyExample
..	..	@@ -1648,7 +2449,7 @@
1648	2449	{
1649	2450	ScreenFit();
1650	2451	} else
1651		- if (source == switchItem)
	2452	+ if (source == switchViewItem)
1652	2453	{
1653	2454	cVector v1 = new cVector();
1654	2455	cVector v2 = new cVector();
..	..	@@ -1657,11 +2458,11 @@
1657	2458	objEditor.cameraView.renderCamera.setAim(v2, v1);
1658	2459	objEditor.cameraView.repaint();
1659	2460	} else
1660		- if (source == rectoidItem)
	2461	+ if (source == rectoidItem \|\| source == boxButton)
1661	2462	{
1662	2463	makeSomething(new Box());
1663	2464	} else
1664		- if (source == particleItem)
	2465	+ if (source == particleItem \|\| source == particlesButton)
1665	2466	{
1666	2467	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1667	2468	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1740,27 +2541,27 @@
1740	2541
1741	2542	makeSomething(obj);
1742	2543	} else
1743		- if (source == gridItem)
	2544	+ if (source == gridItem \|\| source == gridButton)
1744	2545	{
1745	2546	makeSomething(new Grid());
1746	2547	} else
1747		- if (source == ellipsoidItem)
	2548	+ if (source == ellipsoidItem \|\| source == sphereButton)
1748	2549	{
1749	2550	makeSomething(new Sphere());
1750	2551	} else
1751		- if (source == coneItem)
	2552	+ if (source == coneItem \|\| source == coneButton)
1752	2553	{
1753	2554	makeSomething(new Cone());
1754	2555	} else
1755		- if (source == torusItem)
	2556	+ if (source == torusItem \|\| source == torusButton)
1756	2557	{
1757	2558	makeSomething(new Torus());
1758	2559	} else
1759		- if (source == superItem)
	2560	+ if (source == superItem \|\| source == superButton)
1760	2561	{
1761	2562	makeSomething(new Superellipsoid());
1762	2563	} else
1763		- if (source == kleinItem)
	2564	+ if (source == kleinItem \|\| source == kleinButton)
1764	2565	{
1765	2566	makeSomething(new Klein());
1766	2567	} else
..	..	@@ -1780,7 +2581,7 @@
1780	2581	{
1781	2582	makeSomething(new BezierSurface());
1782	2583	} else
1783		- if (source == overlayItem)
	2584	+ if (source == overlayItem \|\| source == overlayButton)
1784	2585	{
1785	2586	/*
1786	2587	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1828,10 +2629,27 @@
1828	2629	s.setup();
1829	2630	makeSomething(s);
1830	2631	} else
1831		- if (source == lightItem)
	2632	+ if (source == lightItem \|\| source == lightButton)
1832	2633	{
1833	2634	makeSomething(new Light());
1834	2635	} else
	2636	+// if (source == skybox1Button \|\|
	2637	+// source == skybox2Button \|\|
	2638	+// source == skybox3Button \|\|
	2639	+// source == skybox4Button \|\|
	2640	+// source == skybox5Button \|\|
	2641	+// source == skybox6Button \|\|
	2642	+// source == skybox7Button \|\|
	2643	+// source == skybox11Button \|\|
	2644	+// source == skybox12Button \|\|
	2645	+// source == skybox13Button \|\|
	2646	+// source == skybox14Button \|\|
	2647	+// source == skybox15Button \|\|
	2648	+// source == skybox16Button \|\|
	2649	+// source == skybox17Button)
	2650	+// {
	2651	+// ChangeSkybox(source);
	2652	+// } else
1835	2653	if (source == csgItem)
1836	2654	{
1837	2655	group(new CSG());
..	..	@@ -1878,30 +2696,38 @@
1878	2696
1879	2697	group(g);
1880	2698	} else
1881		- if (source == loopItem)
	2699	+ if (source == loopItem \|\| source == loopButton)
1882	2700	{
	2701	+ if (!group.selection.isEmpty())
	2702	+ {
1883	2703	Composite csg = new GroupLeaf();
1884	2704	csg.count = 5;
1885		- group(csg);
1886		- Composite child = new cGroup();
	2705	+ Composite child = new cGroup("Branch");
1887	2706	csg.addChild(child);
1888	2707	child.addChild(csg);
	2708	+ group(csg);
	2709	+ }
1889	2710	} else
1890	2711	if (source == doubleItem)
1891	2712	{
1892		- Composite csg = new GroupLeaf();
	2713	+ if (!group.selection.isEmpty())
	2714	+ {
	2715	+ Composite csg = new GroupLeaf("Fork");
1893	2716	csg.count = 5;
	2717	+ Composite child = new cGroup("Branch A");
	2718	+ csg.addChild(child);
	2719	+ child.addChild(csg);
	2720	+ child = new cGroup("Branch B");
	2721	+ csg.addChild(child);
	2722	+ child.addChild(csg);
1894	2723	group(csg);
1895		- Composite child = new cGroup();
1896		- csg.addChild(child);
1897		- child.addChild(csg);
1898		- child = new cGroup();
1899		- csg.addChild(child);
1900		- child.addChild(csg);
	2724	+ }
1901	2725	} else
1902	2726	if (source == tripleItem)
1903	2727	{
1904		- Composite csg = new GroupLeaf();
	2728	+ if (!group.selection.isEmpty())
	2729	+ {
	2730	+ Composite csg = new GroupLeaf("Trident");
1905	2731	csg.count = 4;
1906	2732	group(csg);
1907	2733	Composite child = new cGroup();
..	..	@@ -1913,11 +2739,12 @@
1913	2739	child = new cGroup();
1914	2740	csg.addChild(child);
1915	2741	child.addChild(csg);
	2742	+ }
1916	2743	} else
1917	2744	if (source == computeAOItem)
1918	2745	{
1919	2746	Globals.drawMode = CameraPane.OCCLUSION;
1920		- Globals.theRenderer.repaint();
	2747	+ cameraView.repaint();
1921	2748	} else
1922	2749	if (source == recompileItem)
1923	2750	{
..	..	@@ -1932,7 +2759,7 @@
1932	2759	if (source == invariantsItem)
1933	2760	{
1934	2761	System.out.println("Invariants:");
1935		- Grafreed.grafreeD.universe.invariants();
	2762	+ Grafreed.grafreed.universe.invariants();
1936	2763	} else
1937	2764	if (source == memoryItem)
1938	2765	{
..	..	@@ -1951,6 +2778,65 @@
1951	2778	{
1952	2779	DumpObject();
1953	2780	} else
	2781	+ if (source == minButton)
	2782	+ {
	2783	+ Minimize();
	2784	+ } else
	2785	+ if (source == maxButton)
	2786	+ {
	2787	+ Maximize();
	2788	+ } else
	2789	+ if (source == fullButton)
	2790	+ {
	2791	+ ToggleFullScreen();
	2792	+ } else
	2793	+ if (source == collapseButton)
	2794	+ {
	2795	+ this.expandedLayout = radio.layout;
	2796	+ CollapseToolbar();
	2797	+ } else
	2798	+ if (source == maximize3DButton)
	2799	+ {
	2800	+ this.expandedLayout = radio.layout;
	2801	+ radio.layout = twoButton;
	2802	+ Show3DView();
	2803	+ CollapseToolbar();
	2804	+ } else
	2805	+ if (source == previousVersionButton)
	2806	+ {
	2807	+ // Go to previous version
	2808	+ //if (!Undo())
	2809	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2810	+ PreviousVersion();
	2811	+ } else
	2812	+ if (source == restoreButton)
	2813	+ {
	2814	+ // Restore current version
	2815	+ Restore();
	2816	+ //restoreButton.setEnabled(false);
	2817	+ } else
	2818	+ if (source == replaceButton)
	2819	+ {
	2820	+ // Overwrite current version
	2821	+ Replace();
	2822	+ //replaceButton.setEnabled(false);
	2823	+ } else
	2824	+ if (source == nextVersionButton)
	2825	+ {
	2826	+ // Go to next version
	2827	+ NextVersion();
	2828	+ } else
	2829	+ if (source == saveVersionButton)
	2830	+ {
	2831	+ // Save a new version
	2832	+ if (!Save(true))
	2833	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2834	+ } else
	2835	+ if (source == deleteVersionButton)
	2836	+ {
	2837	+ // Delete a new version
	2838	+ DeleteVersion();
	2839	+ } else
1954	2840	if (source == oneStepButton)
1955	2841	{
1956	2842	Globals.ONESTEP = true;
..	..	@@ -1958,17 +2844,14 @@
1958	2844	} else
1959	2845	if (source == screenfitButton)
1960	2846	{
1961		- //Reload(lastConverter, lastFilename, true);
1962	2847	ScreenFit();
1963	2848	} else
1964	2849	if (source == screenfitpointButton)
1965	2850	{
1966		- //Reload(lastConverter, lastFilename, true);
1967	2851	ScreenFitPoint();
1968	2852	} else
1969	2853	if (source == snapobjectButton)
1970	2854	{
1971		- //Reload(lastConverter, lastFilename, true);
1972	2855	SnapObject();
1973	2856	} else
1974	2857	// if (event.getSource() == recompileButton)
..	..	@@ -2004,6 +2887,14 @@
2004	2887	if (source == cutItem \|\| source == clearButton)
2005	2888	{
2006	2889	loadClipboard(true);
	2890	+ } else
	2891	+ if (source == undoItem)
	2892	+ {
	2893	+ PreviousVersion();
	2894	+ } else
	2895	+ if (source == redoItem)
	2896	+ {
	2897	+ NextVersion();
2007	2898	} else
2008	2899	if (source == duplicateItem)
2009	2900	{
..	..	@@ -2324,7 +3215,7 @@
2324	3215	{
2325	3216	StepAll();
2326	3217	} else
2327		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3218	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2328	3219	{
2329	3220	//int indices[] = jList.getSelectedIndices();
2330	3221	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2336,9 +3227,9 @@
2336	3227	{
2337	3228	ClearSelection(true);
2338	3229	} else
2339		- if (source == grabItem)
	3230	+ if (source == grabItem \|\| source == groupButton)
2340	3231	{
2341		- group(new cGroup(), true);
	3232	+ group(new cGroup(), false); // true);
2342	3233	} else
2343	3234	if (source == hideItem)
2344	3235	{
..	..	@@ -2356,11 +3247,11 @@
2356	3247	{
2357	3248	makeSomething(new Camera());
2358	3249	} else
2359		- if (source == compositeItem)
	3250	+ if (source == compositeItem \|\| source == compositeButton)
2360	3251	{
2361	3252	group(new Composite());
2362	3253	} else
2363		- if (source == randomItem)
	3254	+ if (source == switchItem \|\| source == switchButton)
2364	3255	{
2365	3256	RandomNode random = new RandomNode();
2366	3257	group(random);
..	..	@@ -2462,7 +3353,7 @@
2462	3353	{
2463	3354	group(new cLinker());
2464	3355	} else
2465		- if (source == textureItem)
	3356	+ if (source == textureItem \|\| source == textureButton)
2466	3357	{
2467	3358	group(new TextureNode());
2468	3359	} else
..	..	@@ -2482,17 +3373,42 @@
2482	3373	{
2483	3374	CastShadow(2);
2484	3375	} else
2485		- if (source == ungroupItem)
	3376	+ if (source == ungroupItem \|\| source == ungroupButton)
2486	3377	{
2487		- //ungroup();
	3378	+ boolean canUngroup = true;
	3379	+
2488	3380	for (int i=0; i<group.selection.size(); i++)
2489	3381	{
2490		- Ungroup(group.selection.get(i));
	3382	+ Object3D selectedItem = group.selection.get(i);
	3383	+
	3384	+ if (selectedItem.Size() == 0)
	3385	+ {
	3386	+ // Cannot ungroup leaves
	3387	+ canUngroup = false;
	3388	+ break;
	3389	+ }
	3390	+
	3391	+ if (selectedItem == group)
	3392	+ {
	3393	+ // Cannot ungroup root
	3394	+ canUngroup = false;
	3395	+ break;
	3396	+ }
2491	3397	}
2492	3398
2493		- ClearSelection(false);
2494		-
2495		- refreshContents();
	3399	+ if (canUngroup)
	3400	+ {
	3401	+ for (int i=0; i<group.selection.size(); i++)
	3402	+ {
	3403	+ Object3D selectedItem = group.selection.get(i);
	3404	+
	3405	+ Ungroup(selectedItem);
	3406	+ }
	3407	+
	3408	+ ClearSelection(false);
	3409	+
	3410	+ refreshContents();
	3411	+ }
2496	3412	} else
2497	3413	if (source == genUVItem)
2498	3414	{
..	..	@@ -2504,7 +3420,7 @@
2504	3420	} else
2505	3421	if (source == genNormalsMESHItem)
2506	3422	{
2507		- GenNormals(true); // TODO
	3423	+ GenNormalsMESH();
2508	3424	} else
2509	3425	if (source == genNormalsORGANItem)
2510	3426	{
..	..	@@ -2569,6 +3485,22 @@
2569	3485	if (source == unmarkleavesItem)
2570	3486	{
2571	3487	MarkLeaves(false);
	3488	+ } else
	3489	+ if (source == rewindleavesItem)
	3490	+ {
	3491	+ RewindLeaves(true);
	3492	+ } else
	3493	+ if (source == unrewindleavesItem)
	3494	+ {
	3495	+ RewindLeaves(false);
	3496	+ } else
	3497	+ if (source == randomleavesItem)
	3498	+ {
	3499	+ RandomLeaves(true);
	3500	+ } else
	3501	+ if (source == unrandomleavesItem)
	3502	+ {
	3503	+ RandomLeaves(false);
2572	3504	} else
2573	3505	if (source == flipVItem)
2574	3506	{
..	..	@@ -2777,7 +3709,7 @@
2777	3709	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2778	3710	{
2779	3711	obj = (Object3D)e.nextElement();
2780		- obj.SetBumpTexture(null);
	3712	+ obj.ResetBumpTexture();
2781	3713	}
2782	3714
2783	3715	refreshContents();
..	..	@@ -2793,6 +3725,31 @@
2793	3725
2794	3726	refreshContents();
2795	3727	} else
	3728	+ if (source == embedTexturesItem)
	3729	+ {
	3730	+ Object3D obj;
	3731	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3732	+ {
	3733	+ obj = (Object3D)e.nextElement();
	3734	+ obj.EmbedTextures(true);
	3735	+ }
	3736	+
	3737	+ refreshContents();
	3738	+ } else
	3739	+ if (source == deEmbedTexturesItem)
	3740	+ {
	3741	+ Object3D obj;
	3742	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3743	+ {
	3744	+ obj = (Object3D)e.nextElement();
	3745	+ obj.EmbedTextures(false);
	3746	+ }
	3747	+
	3748	+ CameraPane.texturepigment.clear();
	3749	+ CameraPane.texturebump.clear();
	3750	+
	3751	+ refreshContents();
	3752	+ } else
2796	3753	if (source == flashSelectionButton)
2797	3754	{
2798	3755	CameraPane.flash = true;
..	..	@@ -2804,42 +3761,36 @@
2804	3761	if (source == twoButton)
2805	3762	{
2806	3763	radio.layout = twoButton;
2807		- // bug
2808		- //gridPanel.setDividerLocation(1.0);
2809		- //bigPanel.setDividerLocation(0.0);
2810		-// bigThree.remove(scenePanel);
2811		-// bigThree.remove(centralPanel);
2812		-// bigThree.remove(XYZPanel);
2813		-// aWindowConstraints.gridx = 0;
2814		-// aWindowConstraints.gridy = 0;
2815		-// aWindowConstraints.gridwidth = 1;
2816		-// // aConstraints.gridheight = 3;
2817		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2818		-// aWindowConstraints.weightx = 0;
2819		-// aWindowConstraints.weighty = 1;
2820		-// //bigThree.add(jtp, aWindowConstraints);
2821		-// aWindowConstraints.weightx = 1;
2822		-// aWindowConstraints.gridwidth = 3;
2823		-// // aConstraints.gridheight = 3;
2824		-// aWindowConstraints.gridx = 1;
2825		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
2826		-// bigThree.add(centralPanel, aWindowConstraints);
2827		-// aWindowConstraints.weightx = 0;
2828		-// aWindowConstraints.gridx = 4;
2829		-// aWindowConstraints.gridwidth = 1;
2830		-// // aConstraints.gridheight = 3;
2831		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2832		-// //bigThree.add(XYZPanel, aWindowConstraints);
2833		-// scenePanel.setVisible(false);
2834		-// centralPanel.setVisible(true);
2835		-// XYZPanel.setVisible(false);
2836		- bigThree.ClearUI();
2837		- bigThree.add(centralPanel);
2838		- bigThree.FlushUI();
	3764	+
	3765	+ if (CameraPane.FULLSCREEN)
	3766	+ fullscreenLayout = radio.layout;
	3767	+
	3768	+ Show3DView();
	3769	+
	3770	+ cameraView.requestFocusInWindow();
	3771	+
	3772	+// refreshContents(true);
	3773	+//
	3774	+// try
	3775	+// {
	3776	+// java.awt.Robot bot = new java.awt.Robot();
	3777	+// int mask = InputEvent.BUTTON1_MASK;
	3778	+// bot.mouseMove(100, 100);
	3779	+// bot.mousePress(mask);
	3780	+// bot.mouseRelease(mask);
	3781	+// }
	3782	+// catch (Exception e)
	3783	+// {
	3784	+//
	3785	+// }
	3786	+
2839	3787	} else
2840	3788	if (source == threeButton)
2841	3789	{
2842	3790	radio.layout = threeButton;
	3791	+
	3792	+ if (CameraPane.FULLSCREEN)
	3793	+ fullscreenLayout = radio.layout;
2843	3794
2844	3795	// bigThree.remove(scenePanel);
2845	3796	// bigThree.remove(centralPanel);
..	..	@@ -2869,13 +3820,18 @@
2869	3820	// centralPanel.setVisible(true);
2870	3821	// XYZPanel.setVisible(true);
2871	3822	bigThree.ClearUI();
	3823	+ bigThree.add(scenePanel);
2872	3824	bigThree.add(centralPanel);
2873		- bigThree.add(XYZPanel);
2874	3825	bigThree.FlushUI();
	3826	+
	3827	+ cameraView.requestFocusInWindow();
2875	3828	} else
2876	3829	if (source == fourButton)
2877	3830	{
2878	3831	radio.layout = fourButton;
	3832	+
	3833	+ if (CameraPane.FULLSCREEN)
	3834	+ fullscreenLayout = radio.layout;
2879	3835
2880	3836	// bigThree.remove(scenePanel);
2881	3837	// bigThree.remove(centralPanel);
..	..	@@ -2907,10 +3863,15 @@
2907	3863	bigThree.ClearUI();
2908	3864	bigThree.add(scenePanel);
2909	3865	bigThree.FlushUI();
	3866	+
	3867	+ cameraView.requestFocusInWindow();
2910	3868	} else
2911	3869	if (source == sixButton)
2912	3870	{
2913	3871	radio.layout = sixButton;
	3872	+
	3873	+ if (CameraPane.FULLSCREEN)
	3874	+ fullscreenLayout = radio.layout;
2914	3875
2915	3876	// bigThree.remove(scenePanel);
2916	3877	// bigThree.remove(centralPanel);
..	..	@@ -2940,13 +3901,18 @@
2940	3901	// centralPanel.setVisible(true);
2941	3902	// XYZPanel.setVisible(false);
2942	3903	bigThree.ClearUI();
2943		- bigThree.add(scenePanel);
2944	3904	bigThree.add(centralPanel);
	3905	+ bigThree.add(scenePanel);
2945	3906	bigThree.FlushUI();
	3907	+
	3908	+ cameraView.requestFocusInWindow();
2946	3909	} else
2947	3910	if (source == sevenButton)
2948	3911	{
2949	3912	radio.layout = sevenButton;
	3913	+
	3914	+ if (CameraPane.FULLSCREEN)
	3915	+ fullscreenLayout = radio.layout;
2950	3916
2951	3917	// bigThree.remove(scenePanel);
2952	3918	// bigThree.remove(centralPanel);
..	..	@@ -2980,9 +3946,12 @@
2980	3946	bigThree.add(centralPanel);
2981	3947	bigThree.add(XYZPanel);
2982	3948	bigThree.FlushUI();
	3949	+
	3950	+ cameraView.requestFocusInWindow();
2983	3951	} else
2984	3952	if (source == rootButton)
2985	3953	{
	3954	+ Replace();
2986	3955	Object3D obj;
2987	3956	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2988	3957	{
..	..	@@ -2991,6 +3960,7 @@
2991	3960	EditObject(obj);
2992	3961	}
2993	3962
	3963	+ cameraView.requestFocusInWindow();
2994	3964	refreshContents(true);
2995	3965	} else
2996	3966	if (source == closeButton)
..	..	@@ -3000,22 +3970,37 @@
3000	3970	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3001	3971	{
3002	3972	ab = (cRadio)e.nextElement();
3003		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3973	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3004	3974	{
	3975	+ // Patch to avoid bug with transparency.
	3976	+ if (!ab.hadMaterial)
	3977	+ {
	3978	+ ab.object.material = null;
	3979	+ }
	3980	+
3005	3981	buttonGroup.remove(ab);
3006	3982	radioPanel.remove(ab);
3007	3983
3008		- ab.GetObject().editWindow = null;
	3984	+ //ab.GetObject().editWindow = null;
	3985	+ ab.GetObject().manipWindow = null;
3009	3986	// ab.GetObject().objectUI = null; // ?????????
3010	3987
3011	3988	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
3012	3989	break;
3013	3990	}
3014	3991	}
	3992	+
	3993	+ cameraView.requestFocusInWindow();
3015	3994	refreshContents(true);
3016	3995	} else
3017	3996	if (source == editItem \|\| source == editButton)
3018	3997	{
	3998	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3999	+ {
	4000	+ Object3D child = (Object3D)e.nextElement();
	4001	+ child.pinned = true;
	4002	+ }
	4003	+
3019	4004	EditSelection(false);
3020	4005	} else
3021	4006	if (source == uneditButton)
..	..	@@ -3024,11 +4009,12 @@
3024	4009	{
3025	4010	Object3D child = (Object3D)e.nextElement();
3026	4011	if(child.editWindow != null)
3027		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4012	+ child.pinned = false;
3028	4013	child.CloseUI();
3029	4014	listUI.remove(child);
	4015	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3030	4016
3031		- child.editWindow = null; // ???????????
	4017	+ //child.editWindow = null; // ???????????
3032	4018	}
3033	4019	objEditor.ctrlPanel.FlushUI();
3034	4020	//objEditor.jTree.clearSelection();
..	..	@@ -3041,16 +4027,18 @@
3041	4027	//copy.ClearUI();
3042	4028	for (Object3D obj : listUI)
3043	4029	{
	4030	+ obj.pinned = false;
3044	4031	obj.CloseUI();
3045	4032	}
3046	4033	listUI.clear();
	4034	+ SetPinStates(group.selection.size() > 0);
3047	4035	refreshContents(true);
3048	4036	} else
3049	4037	if (source == allParamsButton)
3050	4038	{
3051	4039	assert(copy == group);
3052	4040
3053		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4041	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3054	4042
3055	4043	for (Object3D obj : listUI)
3056	4044	{
..	..	@@ -3099,6 +4087,7 @@
3099	4087	}
3100	4088
3101	4089	copy = group;
	4090	+
3102	4091	//Globals.theRenderer.object = group;
3103	4092	if(!useclient)
3104	4093	{
..	..	@@ -3115,7 +4104,9 @@
3115	4104	sideView.object = group;
3116	4105	}
3117	4106
3118		-// fix "+" issue group.editWindow = this;
	4107	+// fix "+" issue
	4108	+ //group.editWindow = this;
	4109	+ group.manipWindow = this;
3119	4110
3120	4111	/*
3121	4112	currentLayout = radio.layout;
..	..	@@ -3123,20 +4114,47 @@
3123	4114	currentLayout = sevenButton;
3124	4115	*/
3125	4116	radio.layout.doClick();
	4117	+
	4118	+ assert(copy instanceof Composite);
	4119	+
	4120	+ if (copy.versionlist == null)
	4121	+ {
	4122	+ copy.versionlist = new Object3D[100];
	4123	+ copy.versionindex = -1;
	4124	+
	4125	+ // Cannot work with loops
	4126	+ // To fix this issue, first mark all nodes above the root,
	4127	+ // and check if any of these nodes are reachable below the root.
	4128	+ //Save(true);
	4129	+ }
	4130	+
	4131	+ SetVersionStates();
	4132	+
	4133	+ ClearUnpinned();
	4134	+
	4135	+ //Grafreed.Assert(group != null);
	4136	+ //Grafreed.Assert(group.selection != null);
	4137	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4138	+ if (group.selection == null \|\| group.selection.size() == 1)
	4139	+ EditSelection(false);
3126	4140	keepparent = group.parent;
3127	4141	// PARENT = NULL or not???
3128	4142	//group.parent = null; // ROOT
3129	4143	//group.attributes = -1;
3130	4144	ResetModel();
	4145	+
	4146	+ cameraView.requestFocusInWindow();
3131	4147	refreshContents(true);
3132	4148	} else if (event.getSource() == editCameraItem)
3133	4149	{
3134	4150	cameraView.ProtectCamera();
	4151	+ cameraView.requestFocusInWindow();
3135	4152	cameraView.repaint();
3136	4153	return;
3137		- } else if (event.getSource() == revertCameraItem)
	4154	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3138	4155	{
3139	4156	cameraView.RevertCamera();
	4157	+ cameraView.requestFocusInWindow();
3140	4158	cameraView.repaint();
3141	4159	return;
3142	4160	// } else if (event.getSource() == textureButton)
..	..	@@ -3151,7 +4169,6 @@
3151	4169	}
3152	4170
3153	4171	boolean useclient = false;
3154		- cRadio radio;
3155	4172
3156	4173	void ToggleRoot()
3157	4174	{
..	..	@@ -3390,7 +4407,8 @@
3390	4407
3391	4408	int size = obj.MemorySize();
3392	4409
3393		- System.err.println((size/1024) + " KB is the size of " + obj);
	4410	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4411	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3394	4412	}
3395	4413	}
3396	4414	catch (Exception e)
..	..	@@ -3471,6 +4489,13 @@
3471	4489	void GenNormals(boolean crease)
3472	4490	{
3473	4491	group.GenNormalsS(crease);
	4492	+
	4493	+ refreshContents();
	4494	+ }
	4495	+
	4496	+ void GenNormalsMESH()
	4497	+ {
	4498	+ group.GenNormalsMeshS();
3474	4499
3475	4500	refreshContents();
3476	4501	}
..	..	@@ -3706,7 +4731,7 @@
3706	4731
3707	4732	try
3708	4733	{
3709		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4734	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
3710	4735	}
3711	4736	catch (Exception e)
3712	4737	{
..	..	@@ -4098,6 +5123,18 @@
4098	5123	refreshContents();
4099	5124	}
4100	5125
	5126	+ void RewindLeaves(boolean hide)
	5127	+ {
	5128	+ group.selection.RewindLeaves(hide);
	5129	+ refreshContents();
	5130	+ }
	5131	+
	5132	+ void RandomLeaves(boolean hide)
	5133	+ {
	5134	+ group.selection.RandomLeaves(hide);
	5135	+ refreshContents();
	5136	+ }
	5137	+
4101	5138	void SetTexRes(int tr)
4102	5139	{
4103	5140	group.selection.SetTexRes(tr);
..	..	@@ -4169,28 +5206,25 @@
4169	5206	// }
4170	5207	// }
4171	5208
4172		- static boolean allparams = true;
4173		-
4174		- static Vector<Object3D> listUI = new Vector<Object3D>();
4175		-
4176	5209	void EditSelection(boolean newWindow)
4177	5210	{
	5211	+ if (group.selection == null)
	5212	+ {
	5213	+ EditElement(group, newWindow); // ? new
	5214	+ return;
	5215	+ }
	5216	+
4178	5217	// aConstraints.gridy = 0;
4179	5218	for (int i=0; i<group.selection.size(); i++)
4180	5219	{
4181	5220	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4182	5221	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4183		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5222	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4184	5223
4185	5224	Object3D elem = (Object3D)group.selection.elementAt(i);
4186	5225	if(elem != group \|\| !newWindow)
4187	5226	{
4188		- // if (!(elem instanceof Composite))
4189		- // newWindow = false;
4190		- listUI.add(elem);
4191		- elem.openEditWindow(this, newWindow); //, false);
4192		- System.out.println("edit : " + elem);
4193		- elem.editWindow.refreshContents(true); // ? new
	5227	+ EditElement(elem, newWindow); // ? new
4194	5228	}
4195	5229	}
4196	5230	}
..	..	@@ -4253,9 +5287,7 @@
4253	5287
4254	5288	freezemodel = false;
4255	5289	}
4256		-
4257		- boolean flashIt = true;
4258		-
	5290	+
4259	5291	public void valueChanged(TreeSelectionEvent e)
4260	5292	//public boolean handleEvent(Event event)
4261	5293	{
..	..	@@ -4265,7 +5297,8 @@
4265	5297	//new Exception().printStackTrace();
4266	5298
4267	5299	freezemodel = true;
4268		-
	5300	+ ClearUnpinned();
	5301	+
4269	5302	/**/
4270	5303	//switch (event.id)
4271	5304	{
..	..	@@ -4273,7 +5306,6 @@
4273	5306	//case 702: // Event.LIST_DESELECT
4274	5307	group.deselectAll();
4275	5308	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4276		- objEditor.ClearInfo(); // .GetMaterial());
4277	5309	if (tps != null)
4278	5310	{
4279	5311	for (int i=0; i < tps.length; i++)
..	..	@@ -4282,10 +5314,8 @@
4282	5314
4283	5315	//if (child.parent != null)
4284	5316	//child.parent.addSelectee(child);
	5317	+ objEditor.SetMaterial(child);
4285	5318	group.addSelectee(child);
4286		- objEditor.SetMaterial(child); // .GetMaterial());
4287		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4288		- System.err.println("info : " + child.GetPath());
4289	5319	}
4290	5320	}
4291	5321	// else
..	..	@@ -4295,20 +5325,28 @@
4295	5325	// System.err.println("info : " + group.GetPath());
4296	5326	// }
4297	5327
4298		- objEditor.SetText(); // jan 2014
4299		-
4300		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	5328	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4301	5329	CameraPane.flash = true;
4302	5330
4303		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5331	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4304	5332	// a camera
4305	5333	{
4306		- CameraPane.camerachangeframe = 0; // don't refuse it
4307		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5334	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5335	+ {
	5336	+ CameraPane.camerachangeframe = 0; // don't refuse it
	5337	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5338	+ }
4308	5339	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4309	5340	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4310	5341	}
4311	5342
	5343	+ if (tps != null && tps.length == 1)
	5344	+ {
	5345	+ EditSelection(false);
	5346	+ }
	5347	+
	5348	+ SetPinStates(tps != null && tps.length > 0);
	5349	+
4312	5350	refreshContents();
4313	5351	//return true;
4314	5352	}
..	..	@@ -4317,6 +5355,52 @@
4317	5355
4318	5356	freezemodel = false;
4319	5357	}
	5358	+
	5359	+ void SetPinStates(boolean enabled)
	5360	+ {
	5361	+ editButton.setEnabled(enabled);
	5362	+ uneditButton.setEnabled(enabled);
	5363	+ //unselectButton.setEnabled(enabled);
	5364	+ flashSelectionButton.setEnabled(enabled);
	5365	+
	5366	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5367	+
	5368	+ boolean allComposites = true;
	5369	+
	5370	+ if (group.selection != null)
	5371	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5372	+ {
	5373	+ Object next = e.nextElement();
	5374	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5375	+ {
	5376	+ allComposites = false;
	5377	+ break;
	5378	+ }
	5379	+ }
	5380	+
	5381	+ rootButton.setEnabled(allComposites);
	5382	+ }
	5383	+
	5384	+ void refreshContents(boolean cp)
	5385	+ {
	5386	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5387	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5388	+ {
	5389	+ objEditor.ClearInfo(); // .GetMaterial());
	5390	+
	5391	+ for (int i=0; i < group.selection.Size(); i++)
	5392	+ {
	5393	+ Object3D child = (Object3D) group.selection.get(i);
	5394	+
	5395	+ objEditor.AddInfo(child, this, true);
	5396	+// System.err.println("info : " + child.GetPath());
	5397	+ }
	5398	+
	5399	+ objEditor.SetText(); // jan 2014
	5400	+ }
	5401	+
	5402	+ super.refreshContents(cp);
	5403	+ }
4320	5404
4321	5405	void linkSomething(Object3D thing)
4322	5406	{
..	..	@@ -4388,6 +5472,7 @@
4388	5472	{
4389	5473	if (group.selection.isEmpty())
4390	5474	return;
	5475	+
4391	5476	Grafreed.clipboardIsTempGroup = false;
4392	5477	Composite tGroup = null;
4393	5478	if (group.selection.size() > 0) // 1)
..	..	@@ -4398,6 +5483,8 @@
4398	5483
4399	5484	if (cut)
4400	5485	{
	5486	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5487	+// Save();
4401	5488	//int indices[] = jList.getSelectedIndices();
4402	5489	//for (int i = indices.length - 1; i >= 0; i--)
4403	5490	//jList.remove(indices[i]);
..	..	@@ -4487,8 +5574,10 @@
4487	5574	}
4488	5575
4489	5576	}
	5577	+
4490	5578	if (Grafreed.clipboardIsTempGroup)
4491	5579	Grafreed.clipboard = tGroup;
	5580	+
4492	5581	if (cut)
4493	5582	{
4494	5583	ResetModel();
..	..	@@ -4498,6 +5587,10 @@
4498	5587
4499	5588	void paste(boolean expand)
4500	5589	{
	5590	+ if (Globals.REPLACEONMAKE)
	5591	+ Save();
	5592	+ boolean keep = Globals.REPLACEONMAKE;
	5593	+ Globals.REPLACEONMAKE = false;
4501	5594	// if (GrafreeD.clipboard == null)
4502	5595	// return;
4503	5596	boolean first = true;
..	..	@@ -4557,6 +5650,7 @@
4557	5650	Grafreed.clipboard.get(0).parent = keepparent;
4558	5651	}
4559	5652
	5653	+ Globals.REPLACEONMAKE = keep;
4560	5654	ResetModel();
4561	5655	refreshContents();
4562	5656	}
..	..	@@ -4692,6 +5786,10 @@
4692	5786
4693	5787	void group(Object3D csg, boolean grab)
4694	5788	{
	5789	+ if (Globals.REPLACEONMAKE)
	5790	+ Save();
	5791	+ boolean keep = Globals.REPLACEONMAKE;
	5792	+ Globals.REPLACEONMAKE = false;
4695	5793	if (//false) // why??
4696	5794	!group.selection.isEmpty())
4697	5795	{
..	..	@@ -4805,10 +5903,15 @@
4805	5903	//node.add(csg);
4806	5904	//makeSomething(node);
4807	5905	makeSomething(csg);
	5906	+ Globals.REPLACEONMAKE = keep;
4808	5907	}
4809	5908
4810	5909	void Ungroup(Object3D g)
4811	5910	{
	5911	+ if (Globals.REPLACEONMAKE)
	5912	+ Save();
	5913	+ boolean keep = Globals.REPLACEONMAKE;
	5914	+ Globals.REPLACEONMAKE = false;
4812	5915	if (g instanceof HiddenObject)
4813	5916	{
4814	5917	HiddenObject h = (HiddenObject) g;
..	..	@@ -4825,6 +5928,7 @@
4825	5928	objEditor.makeSomething(g.get(i), false);
4826	5929	}
4827	5930	}
	5931	+ Globals.REPLACEONMAKE = keep;
4828	5932	}
4829	5933
4830	5934	void ungroup()
..	..	@@ -5113,7 +6217,43 @@
5113	6217	cButton clearpanelButton;
5114	6218	cButton unselectButton;
5115	6219
	6220	+ cButton restoreCameraButton;
	6221	+
5116	6222	cButton oneStepButton;
	6223	+
	6224	+ cButton groupButton;
	6225	+ cButton ungroupButton;
	6226	+ cButton compositeButton;
	6227	+ cButton switchButton;
	6228	+ cButton loopButton;
	6229	+ cButton textureButton;
	6230	+
	6231	+ cButton skybox1Button;
	6232	+ cButton skybox2Button;
	6233	+ cButton skybox3Button;
	6234	+ cButton skybox4Button;
	6235	+ cButton skybox5Button;
	6236	+ cButton skybox6Button;
	6237	+ cButton skybox7Button;
	6238	+
	6239	+ cButton skybox11Button;
	6240	+ cButton skybox12Button;
	6241	+ cButton skybox13Button;
	6242	+ cButton skybox14Button;
	6243	+ cButton skybox15Button;
	6244	+ cButton skybox16Button;
	6245	+ cButton skybox17Button;
	6246	+
	6247	+ cButton gridButton;
	6248	+ cButton boxButton;
	6249	+ cButton sphereButton;
	6250	+ cButton coneButton;
	6251	+ cButton torusButton;
	6252	+ cButton superButton;
	6253	+ cButton kleinButton;
	6254	+ cButton particlesButton;
	6255	+ cButton overlayButton;
	6256	+ cButton lightButton;
5117	6257
5118	6258	cButton screenfitButton;
5119	6259	cButton screenfitpointButton;
..	..	@@ -5126,14 +6266,6 @@
5126	6266
5127	6267	cButton setsupportButton;
5128	6268
5129		- cButton twoButton;
5130		- cButton sixButton;
5131		- cButton threeButton;
5132		- cButton sevenButton;
5133		- cButton fourButton; // full panel
5134		- cButton oneButton; // full XYZ
5135		- //cButton currentLayout;
5136		-
5137	6269	//
5138	6270	//Composite
5139	6271	Object3D // to do !!
..	..	@@ -5143,10 +6275,12 @@
5143	6275	//JTree jTree;
5144	6276	private MenuItem lookAtItem;
5145	6277	private MenuItem lookFromItem;
5146		- private MenuItem switchItem;
5147		- private MenuItem cutItem;
5148		- private MenuItem duplicateItem;
5149		- private MenuItem cloneItem;
	6278	+ private MenuItem switchViewItem;
	6279	+ private JMenuItem cutItem;
	6280	+ private MenuItem undoItem;
	6281	+ private MenuItem redoItem;
	6282	+ private JMenuItem duplicateItem;
	6283	+ private JMenuItem cloneItem;
5150	6284	private MenuItem cloneSupportItem;
5151	6285	private MenuItem overwriteGeoItem;
5152	6286	private MenuItem overwriteMatItem;
..	..	@@ -5167,13 +6301,13 @@
5167	6301	private MenuItem cloneGeometriesItem;
5168	6302	private MenuItem shareGeometriesItem;
5169	6303	private MenuItem mergeGeometriesItem;
5170		- private MenuItem copyItem;
	6304	+ private JMenuItem copyItem;
5171	6305	private MenuItem pasteItem;
5172		- private MenuItem pasteIntoItem;
5173		- private MenuItem pasteLinkItem;
5174		- private MenuItem pasteCloneItem;
5175		- private MenuItem pasteExpandItem;
5176		- private MenuItem clearItem;
	6306	+ private JMenuItem pasteIntoItem;
	6307	+ private JMenuItem pasteLinkItem;
	6308	+ private JMenuItem pasteCloneItem;
	6309	+ private JMenuItem pasteExpandItem;
	6310	+ private JMenuItem deleteItem;
5177	6311	private MenuItem clearAllItem;
5178	6312	private MenuItem genUVItem;
5179	6313	private MenuItem genNormalsMESHItem;
..	..	@@ -5208,6 +6342,10 @@
5208	6342	private MenuItem showleavesItem;
5209	6343	private MenuItem markleavesItem;
5210	6344	private MenuItem unmarkleavesItem;
	6345	+ private MenuItem rewindleavesItem;
	6346	+ private MenuItem unrewindleavesItem;
	6347	+ private MenuItem randomleavesItem;
	6348	+ private MenuItem unrandomleavesItem;
5211	6349
5212	6350	private MenuItem flipVItem;
5213	6351	private MenuItem unflipVItem;
..	..	@@ -5224,12 +6362,12 @@
5224	6362	private MenuItem transformGeometryItem;
5225	6363	private MenuItem transformChildrenItem;
5226	6364	private MenuItem hideItem;
5227		- private MenuItem grabItem;
	6365	+ private JMenuItem grabItem;
5228	6366	private MenuItem backItem;
5229	6367	private MenuItem frontItem;
5230	6368	private MenuItem cameraItem;
5231	6369	private MenuItem compositeItem;
5232		- private MenuItem randomItem;
	6370	+ private MenuItem switchItem;
5233	6371	private MenuItem physicsItem;
5234	6372	private MenuItem frameselectorItem;
5235	6373	private MenuItem scriptNodeItem;
..	..	@@ -5237,7 +6375,7 @@
5237	6375	private MenuItem switchTransfoItem;
5238	6376	private MenuItem morphItem;
5239	6377	private MenuItem linkerItem;
5240		- private MenuItem ungroupItem;
	6378	+ private JMenuItem ungroupItem;
5241	6379	private MenuItem editItem;
5242	6380	private MenuItem openWindowItem;
5243	6381	private MenuItem editLeafItem;
..	..	@@ -5253,6 +6391,8 @@
5253	6391	private MenuItem attachBumpItem;
5254	6392	private MenuItem detachBumpItem;
5255	6393	private MenuItem pigmentBumpItem;
	6394	+ private MenuItem embedTexturesItem;
	6395	+ private MenuItem deEmbedTexturesItem;
5256	6396
5257	6397	private MenuItem particleItem;
5258	6398	private MenuItem ragdollItem;
..	..	@@ -5303,5 +6443,5 @@
5303	6443
5304	6444	Menu cameraMenu;
5305	6445	MenuItem editCameraItem;
5306		- MenuItem revertCameraItem;
	6446	+ MenuItem restoreCameraItem;
5307	6447	}