~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", !Globals.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, !Globals.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(JTabbedPane.LEFT);
	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,45 +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		- undoItem = menu.add(new MenuItem("Undo"));
158		- undoItem.addActionListener(this);
159		- redoItem = menu.add(new MenuItem("Redo"));
160		- redoItem.addActionListener(this);
161		- menu.add("-");
162		- 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"));
163	544	duplicateItem.addActionListener(this);
164		- cloneItem = menu.add(new MenuItem("Clone"));
	545	+
	546	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
165	547	cloneItem.addActionListener(this);
166		- if (Globals.ADVANCED)
	548	+ //if (Globals.ADVANCED)
167	549	{
168	550	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
169	551	cloneSupportItem.addActionListener(this);
170	552	}
	553	+ oe.jTree.popup.addSeparator();
171	554	menu.add("-");
172		- cutItem = menu.add(new MenuItem("Cut"));
	555	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
173	556	cutItem.addActionListener(this);
174		- copyItem = menu.add(new MenuItem("Copy"));
	557	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
175	558	copyItem.addActionListener(this);
176	559	pasteItem = menu.add(new MenuItem("Paste"));
177	560	pasteItem.addActionListener(this);
178		- menu.add("-");
179	561
180		- menu.add("-");
181		- 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"));
182	565	pasteIntoItem.addActionListener(this);
183		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	566	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
184	567	pasteLinkItem.addActionListener(this);
185		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	568	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
186	569	pasteCloneItem.addActionListener(this);
187		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	570	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
188	571	// pasteExpandItem.addActionListener(this);
189		- menu.add("-");
190		- clearItem = menu.add(new MenuItem("Clear"));
191		- clearItem.addActionListener(this);
	572	+ //menu.add("-");
	573	+ oe.jTree.popup.addSeparator();
192	574
193	575	if (Globals.ADVANCED)
194	576	{
..	..	@@ -202,23 +584,23 @@
202	584	//zBufferItem.addActionListener(this);
203	585	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
204	586	//normalLensItem.addActionListener(this);
205		- cameraMenu.add(revertCameraItem = new MenuItem("Restore Camera"));
206		- revertCameraItem.addActionListener(this);
	587	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	588	+ restoreCameraItem.addActionListener(this);
207	589
208		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
209		- toggleFullScreenItem.addItemListener(this);
210		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
211		- 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);
212	602
213		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
214		- toggleTextureItem.addItemListener(this);
215		- toggleTextureItem.setState(CameraPane.textureon);
216		-
217		- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
218		- toggleSwitchItem.addItemListener(this);
219		- toggleSwitchItem.setState(CameraPane.SWITCH);
220		-
221		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	603	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
222	604	toggleHandleItem.addItemListener(this);
223	605	toggleHandleItem.setState(CameraPane.HANDLES);
224	606
..	..	@@ -245,7 +627,7 @@
245	627
246	628	cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
247	629	toggleDebugItem.addItemListener(this);
248		- toggleDebugItem.setState(CameraPane.DEBUG);
	630	+ toggleDebugItem.setState(Globals.DEBUG);
249	631
250	632	cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
251	633	toggleFrustumItem.addItemListener(this);
..	..	@@ -266,22 +648,20 @@
266	648	// animationItem.addItemListener(this);
267	649	// animationItem.setState(CameraPane.ANIMATION);
268	650	cameraMenu.add("-");
269		- cameraMenu.add(editCameraItem = new MenuItem("Save Camera"));
	651	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
270	652	editCameraItem.addActionListener(this);
271	653
272	654	if (Globals.ADVANCED)
273	655	{
274	656	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
275	657	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
276		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
277		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	658	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
278	659	oe.cameraMenu.add("-");
279	660	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
280	661	openWindowItem.addActionListener(this);
281		- editLeafItem.addActionListener(this);
282	662	lookAtItem.addActionListener(this);
283	663	//lookFromItem.addActinoListener(this);
284		- //switchItem.addActionListener(this);
	664	+ //switchViewItem.addActionListener(this);
285	665	}
286	666
287	667	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -325,22 +705,37 @@
325	705	setMasterItem.addActionListener(this);
326	706	}
327	707
328		- oe.menuBar.add(menu = new Menu("Group"));
329		- grabItem = menu.add(new MenuItem("Grab"));
330		- grabItem.addActionListener(this);
	708	+ oe.menuBar.add(menu = new Menu("Order"));
	709	+
331	710	backItem = menu.add(new MenuItem("Back"));
332	711	backItem.addActionListener(this);
333	712	frontItem = menu.add(new MenuItem("Front"));
334	713	frontItem.addActionListener(this);
335		- compositeItem = menu.add(new MenuItem("Composite"));
336		- 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	+ {
337	722	hideItem = menu.add(new MenuItem("Hidden Group"));
338	723	hideItem.addActionListener(this);
339		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	724	+ }
	725	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
340	726	ungroupItem.addActionListener(this);
341		- menu.add("-");
342		- randomItem = menu.add(new MenuItem("Switch node"));
343		- 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	+ {
344	739	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
345	740	switchGeoItem.addActionListener(this);
346	741	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -348,8 +743,6 @@
348	743	morphItem = menu.add(new MenuItem("Morph Group"));
349	744	morphItem.addActionListener(this);
350	745
351		- if (Globals.ADVANCED)
352		- {
353	746	menu.add("-");
354	747	physicsItem = menu.add(new MenuItem("Physics"));
355	748	physicsItem.addActionListener(this);
..	..	@@ -357,30 +750,29 @@
357	750	frameselectorItem.addActionListener(this);
358	751	scriptNodeItem = menu.add(new MenuItem("Script Node"));
359	752	scriptNodeItem.addActionListener(this);
360		- cameraItem = menu.add(new MenuItem("Camera"));
361		- cameraItem.addActionListener(this);
362	753	}
363	754
364	755	oe.menuBar.add(menu = new Menu("Object"));
365		- textureItem = menu.add(new MenuItem("Texture"));
366		- textureItem.addActionListener(this);
	756	+// textureItem = menu.add(new MenuItem("Texture"));
	757	+// textureItem.addActionListener(this);
367	758	billboardItem = menu.add(new MenuItem("Billboard"));
368	759	billboardItem.addActionListener(this);
369	760	csgItem = menu.add(new MenuItem("CSG"));
370	761	csgItem.addActionListener(this);
371		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	762	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
372	763	shadowXItem.addActionListener(this);
373		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	764	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
374	765	shadowYItem.addActionListener(this);
375		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	766	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
376	767	shadowZItem.addActionListener(this);
	768	+ attributeItem = menu.add(new MenuItem("Attribute"));
	769	+ attributeItem.addActionListener(this);
	770	+
377	771	if (Globals.ADVANCED)
378	772	{
379	773	menu.add("-");
380	774	linkerItem = menu.add(new MenuItem("Linker"));
381	775	linkerItem.addActionListener(this);
382		- attributeItem = menu.add(new MenuItem("Attribute"));
383		- attributeItem.addActionListener(this);
384	776	templateItem = menu.add(new MenuItem("Template"));
385	777	templateItem.addActionListener(this);
386	778	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -409,7 +801,7 @@
409	801	genNormalsMESHItem.addActionListener(this);
410	802	if (Globals.ADVANCED)
411	803	{
412		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	804	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
413	805	genNormalsMINEItem.addActionListener(this);
414	806	}
415	807	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -465,10 +857,18 @@
465	857	hideleavesItem.addActionListener(this);
466	858	showleavesItem = menu.add(new MenuItem("Show Leaves"));
467	859	showleavesItem.addActionListener(this);
468		- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
	860	+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
469	861	markleavesItem.addActionListener(this);
470		- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
	862	+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
471	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);
472	872	menu.add("-");
473	873	flipVItem = menu.add(new MenuItem("Flip V"));
474	874	flipVItem.addActionListener(this);
..	..	@@ -494,10 +894,15 @@
494	894	attachBumpItem.addActionListener(this);
495	895	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
496	896	pigmentBumpItem.addActionListener(this);
	897	+ //embedTexturesItem
497	898	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
498	899	detachPigmentItem.addActionListener(this);
499	900	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
500	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);
501	906	menu.add("-");
502	907	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
503	908	sortbysizeItem.addActionListener(this);
..	..	@@ -508,6 +913,9 @@
508	913	shareGeometriesItem.addActionListener(this);
509	914	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
510	915	mergeGeometriesItem.addActionListener(this);
	916	+ menu.add("-");
	917	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	918	+ editLeafItem.addActionListener(this);
511	919	if (Globals.ADVANCED)
512	920	{
513	921	// Pretty much the same as duplicate and clone.
..	..	@@ -524,16 +932,97 @@
524	932	buildToolsMenu(menu);
525	933	}
526	934
	935	+ JTabbedPane resourcecontainer;
	936	+ cGridBag currenttab;
	937	+ //boolean added; // patch for jar
	938	+
	939	+ int totalcount = 0;
	940	+
	941	+ int tabcount = 0;
	942	+ int colcount = 0;
	943	+ int rowcount = 0;
	944	+ int texturecount = 0;
	945	+
	946	+ int columns = 5;
	947	+ int rows = 7;
	948	+
	949	+ public void ResourceCallBack(String[] path)
	950	+ {
	951	+// for (int i = 0; i < path.length; i++)
	952	+// System.out.print(path[i] + "/");
	953	+// System.out.println();
	954	+
	955	+ if (//rowcount == 0 \|\|
	956	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	957	+ {
	958	+ currenttab = new cGridBag();
	959	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	960	+ currenttab.setName(tabname);
	961	+ //added = false;
	962	+ resourcecontainer.add(currenttab);
	963	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	964	+ rowcount = 1;
	965	+ colcount = 0;
	966	+ texturecount = 0;
	967	+ }
	968	+
	969	+ if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") \|\| path[2].toLowerCase().endsWith(".png")))
	970	+ {
	971	+ //if (!added)
	972	+ {
	973	+ //added = true;
	974	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	975	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	976	+ }
	977	+
	978	+ AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
	979	+ totalcount++;
	980	+
	981	+ if (++colcount >= columns)
	982	+ {
	983	+ colcount = 0;
	984	+ currenttab.Return();
	985	+
	986	+ if (rowcount++ >= rows)
	987	+ {
	988	+ rowcount = 0;
	989	+ }
	990	+ }
	991	+ }
	992	+ else
	993	+ {
	994	+// if (!path[path.length-1].equals("icons"))
	995	+// resourcecontainer.Return();
	996	+ }
	997	+ }
	998	+
	999	+ void CreateTexturePanel(cGridBag container)
	1000	+ {
	1001	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	1002	+ container.add(resourcecontainer);
	1003	+
	1004	+ Grafreed.ParseResources("textures", this);
	1005	+
	1006	+ // 935. System.out.println("Total = " + totalcount);
	1007	+ }
	1008	+
527	1009	void SetupUI2(ObjEditor oe)
528	1010	{
	1011	+ // June 2019
	1012	+ if (oe == null)
	1013	+ {
	1014	+ //super.SetupUI2(this);
	1015	+ //return;
	1016	+ }
	1017	+
	1018	+ if (copy != group)
	1019	+ {
	1020	+ //super.SetupUI2(this);
	1021	+ }
	1022	+
529	1023	//new Exception().printStackTrace();
530	1024
531	1025	oe.radioPanel = new JPanel(new GridBagLayout());
532		- oe.aConstraints.weightx = 1;
533		- oe.aConstraints.weighty = 0;
534		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
535		- oe.aConstraints.gridwidth = 100;
536		- oe.aConstraints.gridheight = 1;
537	1026	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
538	1027
539	1028	oe.buttonGroup = new ButtonGroup();
..	..	@@ -554,97 +1043,268 @@
554	1043	oe.radioPanel.add(dummyButton);
555	1044	oe.buttonGroup.add(dummyButton);
556	1045	*/
	1046	+ cGridBag versionManagerPanel = new cGridBag();
	1047	+
	1048	+ versionManagerPanel.preferredHeight = 4;
	1049	+
557	1050	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
558	1051
559		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
560		- liveCB.setToolTipText("Enable animation");
561		- liveCB.addItemListener(this);
	1052	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1053	+ //minButton.setToolTipText("Minimize window");
	1054	+ //minButton.addActionListener(this);
	1055	+
	1056	+ if (Globals.ADVANCED)
	1057	+ {
	1058	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1059	+// maxButton.setToolTipText("Maximize window");
	1060	+// maxButton.addActionListener(this);
	1061	+ }
	1062	+
	1063	+ cButton gcButton;
	1064	+
	1065	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1066	+// gcButton.setToolTipText("Garbage collect");
	1067	+// gcButton.addActionListener(new ActionListener()
	1068	+// {
	1069	+// public void actionPerformed(ActionEvent e)
	1070	+// {
	1071	+// System.gc();
	1072	+// }
	1073	+// });
	1074	+
	1075	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1076	+ collapseButton.setToolTipText("Collapse toolbar");
	1077	+ collapseButton.addActionListener(this);
	1078	+
	1079	+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1080	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1081	+ maximize3DButton.addActionListener(this);
	1082	+
	1083	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1084	+ twoButton.setToolTipText("Show 3D view only");
	1085	+ twoButton.addActionListener(this);
	1086	+ this.fullscreenLayout = twoButton;
	1087	+
	1088	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1089	+ threeButton.setToolTipText("Show controls and 3D view");
	1090	+ threeButton.addActionListener(this);
	1091	+ if (Globals.ADVANCED)
	1092	+ {
	1093	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1094	+ sixButton.setToolTipText("Show 3D view and controls");
	1095	+ sixButton.addActionListener(this);
	1096	+ }
	1097	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1098	+// sevenButton.setToolTipText("3-column layout");
	1099	+// sevenButton.addActionListener(this);
	1100	+ //
	1101	+
	1102	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1103	+ fullButton.setToolTipText("Full-screen window");
	1104	+ fullButton.addActionListener(this);
	1105	+
	1106	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1107	+ screenfitButton.setToolTipText("Screen fit");
	1108	+ screenfitButton.addActionListener(this);
562	1109
563		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1110	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1111	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1112	+ restoreCameraButton.addActionListener(this);
	1113	+
	1114	+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1115	+ saveVersionButton.setToolTipText("Duplicate current version");
	1116	+ saveVersionButton.addActionListener(this);
	1117	+
	1118	+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1119	+ deleteVersionButton.setToolTipText("Delete current version");
	1120	+ deleteVersionButton.addActionListener(this);
	1121	+ deleteVersionButton.setEnabled(false);
	1122	+
	1123	+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1124	+ previousVersionButton.setToolTipText("Previous version");
	1125	+ previousVersionButton.addActionListener(this);
	1126	+ previousVersionButton.setEnabled(false);
	1127	+
	1128	+ cGridBag updown = new cGridBag().setVertical(true);
	1129	+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1130	+ restoreButton.setToolTipText("Undo (restore current version)");
	1131	+ restoreButton.addActionListener(this);
	1132	+ restoreButton.setEnabled(false);
	1133	+
	1134	+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1135	+ replaceButton.setToolTipText("Save (replace current version)");
	1136	+ replaceButton.addActionListener(this);
	1137	+ replaceButton.setEnabled(false);
	1138	+
	1139	+ versionManagerPanel.add(updown);
	1140	+
	1141	+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1142	+ nextVersionButton.setToolTipText("Next version");
	1143	+ nextVersionButton.addActionListener(this);
	1144	+ nextVersionButton.setEnabled(false);
	1145	+
	1146	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
564	1147	oneStepButton.setToolTipText("Animate one step forward");
565	1148	oneStepButton.addActionListener(this);
566	1149
567		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	1150	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1151	+ liveCB.setToolTipText("Enable animation");
	1152	+ liveCB.addItemListener(this);
	1153	+
	1154	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
568	1155	fastCB.setToolTipText("Fast mode");
569	1156	fastCB.addItemListener(this);
570	1157
571		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
572		- trackCB.setToolTipText("Enable tracking");
573		- trackCB.addItemListener(this);
574		-
575		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
576		- screenfitButton.setToolTipText("Screen fit");
577		- screenfitButton.addActionListener(this);
	1158	+ //oe.toolboxPanel.Return();
	1159	+
	1160	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1161	+// trackCB.setToolTipText("Enable tracking");
	1162	+// trackCB.addItemListener(this);
578	1163
579	1164	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
580	1165	// screenfitpointButton.addActionListener(this);
581	1166
582	1167	if (Globals.ADVANCED)
583	1168	{
584		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1169	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
585	1170	snapobjectButton.addActionListener(this);
586	1171	snapobjectButton.setToolTipText("Snap Object");
	1172	+
	1173	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1174	+ fourButton.addActionListener(this);
	1175	+ fourButton.setToolTipText("Show control panel only");
587	1176	}
588	1177
589		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
590		- flashSelectionButton.setToolTipText("Show selection");
591		- flashSelectionButton.addActionListener(this);
	1178	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
592	1179
593		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
594		-
595		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
596		- twoButton.setToolTipText("Show center view only");
597		- twoButton.addActionListener(this);
598		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
599		- fourButton.addActionListener(this);
600		- fourButton.setToolTipText("Show left panel only");
601		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
602		- sixButton.setToolTipText("2-column layout left");
603		- sixButton.addActionListener(this);
604		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
605		- threeButton.setToolTipText("2-column layout right");
606		- threeButton.addActionListener(this);
607		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
608		- sevenButton.setToolTipText("3-column layout");
609		- sevenButton.addActionListener(this);
610		- //
611	1180
612		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
613		- rootButton.setToolTipText("Edit selection in new tab");
	1181	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1182	+ rootButton.setToolTipText("Open selection in new tab");
614	1183	rootButton.addActionListener(this);
615	1184
616		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1185	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
617	1186	closeButton.setToolTipText("Close tab");
618	1187	closeButton.addActionListener(this);
619	1188	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
620	1189	//clearButton.addActionListener(this);
621		-
622		- cGridBag commandsPanel = new cGridBag();
	1190	+
	1191	+ cGridBag row1 = new cGridBag();
623	1192
624		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
625		- editButton.setToolTipText("Edit selection");
	1193	+ // INSERT
	1194	+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1195	+ gridButton.setToolTipText("Create ground");
	1196	+ gridButton.addActionListener(this);
	1197	+
	1198	+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1199	+ boxButton.setToolTipText("Create box");
	1200	+ boxButton.addActionListener(this);
	1201	+
	1202	+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1203	+ superButton.setToolTipText("Create superellipsoid");
	1204	+ superButton.addActionListener(this);
	1205	+
	1206	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1207	+ sphereButton.setToolTipText("Create sphere");
	1208	+ sphereButton.addActionListener(this);
	1209	+
	1210	+ row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1211	+ coneButton.setToolTipText("Create cone");
	1212	+ coneButton.addActionListener(this);
	1213	+
	1214	+ row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1215	+ torusButton.setToolTipText("Create torus");
	1216	+ torusButton.addActionListener(this);
	1217	+
	1218	+ if (Globals.ADVANCED)
	1219	+ {
	1220	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1221	+ kleinButton.setToolTipText("Create Klein bottle");
	1222	+ kleinButton.addActionListener(this);
	1223	+ }
	1224	+
	1225	+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1226	+ particlesButton.setToolTipText("Create particle system");
	1227	+ particlesButton.addActionListener(this);
	1228	+
	1229	+ oe.toolboxPanel.add(row1);
	1230	+
	1231	+ cGridBag row2 = new cGridBag();
	1232	+
	1233	+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1234	+ groupButton.setToolTipText("Create group");
	1235	+ groupButton.addActionListener(this);
	1236	+
	1237	+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1238	+ compositeButton.setToolTipText("Create composite");
	1239	+ compositeButton.addActionListener(this);
	1240	+
	1241	+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1242	+ switchButton.setToolTipText("Create item switcher");
	1243	+ switchButton.addActionListener(this);
	1244	+
	1245	+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1246	+ loopButton.setToolTipText("Create loop");
	1247	+ loopButton.addActionListener(this);
	1248	+
	1249	+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1250	+ textureButton.setToolTipText("Create texture");
	1251	+ textureButton.addActionListener(this);
	1252	+
	1253	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1254	+ overlayButton.setToolTipText("Create overlay");
	1255	+ overlayButton.addActionListener(this);
	1256	+
	1257	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1258	+ lightButton.setToolTipText("Create light");
	1259	+ lightButton.addActionListener(this);
	1260	+
	1261	+ oe.toolboxPanel.add(row2);
	1262	+
	1263	+ cGridBag textures = new cGridBag();
	1264	+
	1265	+ CreateTexturePanel(textures);
	1266	+
	1267	+ int tabCount = resourcecontainer.getTabCount();
	1268	+
	1269	+ if (tabCount > 0)
	1270	+ resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
	1271	+
	1272	+ oe.toolboxPanel.add(textures);
	1273	+
	1274	+ textures.preferredHeight = 100;
	1275	+
	1276	+ CreateSkyboxPanel(oe.skyboxPanel);
	1277	+
	1278	+ // EDIT panel
	1279	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1280	+ editButton.setToolTipText("Pin selection controls");
626	1281	editButton.addActionListener(this);
627	1282
628		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
629		- uneditButton.setToolTipText("Unedit selection");
	1283	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1284	+ uneditButton.setToolTipText("Unpin and remove selection controls");
630	1285	uneditButton.addActionListener(this);
631	1286
632		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
633		- allParamsButton.setToolTipText("Edit all params");
	1287	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1288	+ allParamsButton.setToolTipText("Show all controls");
634	1289	allParamsButton.addActionListener(this);
635	1290
636		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
637		- clearPanelButton.setToolTipText("Clear edit panel");
	1291	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1292	+ clearPanelButton.setToolTipText("Clear all controls");
638	1293	clearPanelButton.addActionListener(this);
639	1294
640		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
641		- unselectButton.setToolTipText("Unselect");
642		- unselectButton.addActionListener(this);
	1295	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1296	+ //unselectButton.setToolTipText("Unselect");
	1297	+ //unselectButton.addActionListener(this);
643	1298
644		- commandsPanel.preferredHeight = 1;
	1299	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1300	+ flashSelectionButton.setToolTipText("Highlight selection");
	1301	+ flashSelectionButton.addActionListener(this);
645	1302
646		- oe.treePanel.add(commandsPanel);
647		- oe.treePanel.Return();
	1303	+ editCommandsPanel.preferredHeight = 1;
	1304	+
	1305	+ SetPinStates(false);
	1306	+// oe.treePanel.add(commandsPanel);
	1307	+// oe.treePanel.Return();
648	1308
649	1309	// oe.aConstraints.gridx += 1;
650	1310	// oe.aConstraints.weighty = 0;
..	..	@@ -659,34 +1319,24 @@
659	1319
660	1320	cGridBag jSPPanel = new cGridBag();
661	1321
	1322	+ jSPPanel.preferredHeight = 20;
	1323	+
662	1324	JScrollPane jSP;
663	1325	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
664		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1326	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
665	1327	ResetModel();
666	1328
667	1329	oe.treePanel.add(jSPPanel);
668	1330	oe.treePanel.Return();
669	1331
670		- cGridBag copyOptionsPanel = new cGridBag();
671		-
672		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
673		- colorCB.setToolTipText("Copy color when dropped");
674		- colorCB.addItemListener(this);
675		-
676		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
677		- materialCB.setToolTipText("Copy material when dropped");
678		- materialCB.addItemListener(this);
679		-
680		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
681		- textureCB.setToolTipText("Copy texture when dropped");
682		- textureCB.addItemListener(this);
683		-
684		- copyOptionsPanel.preferredHeight = 1;
685		- oe.treePanel.add(copyOptionsPanel);
	1332	+ oe.treePanel.add(versionManagerPanel);
686	1333	oe.treePanel.Return();
	1334	+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1335	+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
	1336	+ versionSliderPane.preferredHeight = 3;
687	1337
688		-// mainPanel.setDividerLocation(0.5); //1.0);
689		-// mainPanel.setResizeWeight(0.5);
	1338	+// mainPanel.setDividerLocation(0.1); //1.0);
	1339	+ mainPanel.setResizeWeight(0.4);
690	1340
691	1341	//jList.addListSelectionListener(this);
692	1342	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -694,7 +1344,7 @@
694	1344	//jTree.setEditable(true);
695	1345	oe.jTree.setDragEnabled(true);
696	1346	//jTree.setPreferredSize(new Dimension(10,10));
697		- jSP.setPreferredSize(new Dimension(100,200));
	1347	+ //jSP.setPreferredSize(new Dimension(100,200));
698	1348
699	1349	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
700	1350
..	..	@@ -706,29 +1356,49 @@
706	1356	dgr.addDragGestureListener(this);
707	1357	}catch(Exception e) {}
708	1358	*/
709		- radio.layout = sevenButton;
	1359	+ radio.layout = threeButton; // sixButton;
710	1360	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
711	1361	}
712	1362
713	1363	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
714	1364	{
	1365	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1366	+ colorCB.setToolTipText("Copy color when dropped");
	1367	+ colorCB.addItemListener(this);
	1368	+
	1369	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1370	+ materialCB.setToolTipText("Copy material when dropped");
	1371	+ materialCB.addItemListener(this);
	1372	+
	1373	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1374	+ textureCB.setToolTipText("Copy texture when dropped");
	1375	+ textureCB.addItemListener(this);
	1376	+
	1377	+ panel.Return();
	1378	+
715	1379	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
716	1380	boxCB.setToolTipText("Display bounding boxes");
717	1381	boxCB.addItemListener(this);
718	1382
719	1383	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
720		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1384	+ zoomBoxCB.setToolTipText("Display only for wheel");
721	1385	zoomBoxCB.addItemListener(this);
722	1386
723	1387	if (true) // Globals.ADVANCED)
724	1388	{
725		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
726		- supportCB.setToolTipText("Enable rigging");
727		- supportCB.addItemListener(this);
	1389	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1390	+// supportCB.setToolTipText("Enable rigging");
	1391	+// supportCB.addItemListener(this);
	1392	+
	1393	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1394	+ freezeCB.setToolTipText("Fast moving camera");
	1395	+ freezeCB.addItemListener(this);
728	1396
729	1397	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
730	1398	// localCB.addItemListener(this);
731	1399
	1400	+ panel.Return();
	1401	+
732	1402	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
733	1403	crowdCB.setToolTipText("Used for crowds");
734	1404	crowdCB.addItemListener(this);
..	..	@@ -737,14 +1407,19 @@
737	1407	smoothCB.setToolTipText("Snapping delay");
738	1408	smoothCB.addItemListener(this);
739	1409
740		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
741		- slowCB.setToolTipText("Smooth interpolation");
742		- slowCB.addItemListener(this);
	1410	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1411	+// slowCB.setToolTipText("Smooth interpolation");
	1412	+// slowCB.addItemListener(this);
	1413	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1414	+ minshaderCB.setToolTipText("Minimal fast shader");
	1415	+ minshaderCB.addItemListener(this);
743	1416
744	1417	// constraints.gridy += 1;
745	1418	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
746	1419	// speakerMocapCB.addItemListener(this);
747	1420
	1421	+ panel.Return();
	1422	+
748	1423	if (false)
749	1424	{
750	1425	// handled in scripts
..	..	@@ -759,34 +1434,82 @@
759	1434	//constraints.gridy += 1;
760	1435	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
761	1436	smoothfocusCB.addItemListener(this);
	1437	+ panel.Return();
762	1438	}
763	1439
764	1440	//constraints.gridx += 1;
765	1441	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
766	1442	// debugCB.addItemListener(this);
767	1443
	1444	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1445	+ trackCB.setToolTipText("Enable tracking target");
	1446	+ trackCB.addItemListener(this);
	1447	+
768	1448	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1449	+ oeilCB.setToolTipText("Move camera when tracking");
769	1450	oeilCB.addItemListener(this);
770	1451
	1452	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1453	+ shadowCB.setToolTipText("When live compute shadows");
	1454	+ shadowCB.addItemListener(this);
	1455	+
	1456	+ panel.Return();
	1457	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1458	+ toggleTextureCB.setToolTipText("Load textures");
	1459	+ toggleTextureCB.addItemListener(this);
	1460	+
	1461	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1462	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1463	+ toggleSwitchCB.addItemListener(this);
	1464	+
	1465	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1466	+ autokeepCB.setToolTipText("On structure change");
	1467	+ autokeepCB.addItemListener(this);
	1468	+
	1469	+ panel.Return();
	1470	+ if (Globals.ADVANCED)
	1471	+ {
771	1472	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
772	1473	lookAtCB.setToolTipText("Look-at target");
773	1474	lookAtCB.addItemListener(this);
	1475	+ }
774	1476
775	1477	}
776	1478
777	1479	cGridBag fill = new cGridBag();
778		-
779	1480	fill.preferredHeight = 200;
	1481	+ cGridBag fill2 = new cGridBag();
	1482	+ fill2.preferredHeight = 200;
	1483	+ cGridBag fill3 = new cGridBag();
	1484	+ fill3.preferredHeight = 200;
780	1485
781	1486	panel.add(fill);
	1487	+ panel.add(fill2);
	1488	+ panel.add(fill3);
782	1489
783	1490	}
784	1491
785	1492	void EditObject(Object3D obj)
786	1493	{
	1494	+ assert(obj instanceof Composite);
	1495	+
	1496	+// if (obj.versionlist == null)
	1497	+// {
	1498	+// obj.versionlist = new Object3D[100];
	1499	+// obj.versionindex = -1;
	1500	+// }
	1501	+
787	1502	cRadio radioButton = new cRadio(obj.name);
	1503	+
	1504	+ // June 2019. Patch to avoid bug with transparency.
	1505	+ radioButton.hadMaterial = obj.material != null;
	1506	+ if (!radioButton.hadMaterial)
	1507	+ {
	1508	+ obj.material = new cMaterial();
	1509	+ }
	1510	+
788	1511	radioButton.SetObject(obj);
789		- radioButton.layout = sevenButton;
	1512	+ radioButton.layout = threeButton; // sixButton;
790	1513	radioButton.SetCamera(cameraView.renderCamera, false);
791	1514	radioButton.addActionListener(this);
792	1515	radioPanel.add(radioButton);
..	..	@@ -796,31 +1519,41 @@
796	1519
797	1520	void SetupViews(ObjEditor oe)
798	1521	{
	1522	+ theFrame = this;
	1523	+
799	1524	oe.SetupViews();
800	1525
	1526	+ if (Globals.DEBUG)
801	1527	System.out.println("SetupViews");
802	1528	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
803	1529	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
804	1530	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
805	1531	}
806	1532
807		- JCheckBox liveCB;
808		- JCheckBox supportCB;
809		- JCheckBox localCB;
810		- JCheckBox crowdCB;
811		- JCheckBox smoothCB;
812		- JCheckBox fastCB;
813		- JCheckBox slowCB;
814		- JCheckBox boxCB;
815		- JCheckBox zoomBoxCB;
816		- JCheckBox trackCB;
817		- JCheckBox smoothfocusCB;
	1533	+ cToggleButton liveCB;
	1534	+ cCheckBox supportCB;
	1535	+ cCheckBox localCB;
	1536	+ cCheckBox crowdCB;
	1537	+ cCheckBox smoothCB;
	1538	+ cCheckBox minshaderCB;
	1539	+
	1540	+ cToggleButton fastCB;
	1541	+ cCheckBox slowCB;
	1542	+ cCheckBox boxCB;
	1543	+ cCheckBox zoomBoxCB;
	1544	+ cCheckBox freezeCB;
	1545	+ //cToggleButton trackCB;
	1546	+ cCheckBox trackCB;
	1547	+ cCheckBox smoothfocusCB;
818	1548	// JCheckBox speakerMocapCB;
819		- JCheckBox speakerCameraCB;
820		- JCheckBox speakerFocusCB;
821		- JCheckBox debugCB;
822		- JCheckBox oeilCB;
823		- JCheckBox lookAtCB;
	1549	+ cCheckBox speakerCameraCB;
	1550	+ cCheckBox speakerFocusCB;
	1551	+ cCheckBox debugCB;
	1552	+
	1553	+ cCheckBox oeilCB;
	1554	+ cCheckBox shadowCB;
	1555	+ cCheckBox autokeepCB;
	1556	+ cCheckBox lookAtCB;
824	1557
825	1558	// static int COLOR = 1;
826	1559	// static int MATERIAL = 2;
..	..	@@ -828,9 +1561,9 @@
828	1561
829	1562	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
830	1563
831		- JCheckBox colorCB;
832		- JCheckBox materialCB;
833		- JCheckBox textureCB;
	1564	+ cCheckBox colorCB;
	1565	+ cCheckBox materialCB;
	1566	+ cCheckBox textureCB;
834	1567
835	1568	public void itemStateChanged(ItemEvent e)
836	1569	{
..	..	@@ -858,6 +1591,7 @@
858	1591	} else if(e.getSource() == liveCB)
859	1592	{
860	1593	cameraView.ToggleLive();
	1594	+ refreshContents(false);
861	1595	}
862	1596	else if(e.getSource() == supportCB)
863	1597	{
..	..	@@ -873,6 +1607,12 @@
873	1607	{
874	1608	cameraView.ToggleInertia();
875	1609	cameraView.repaint();
	1610	+ }
	1611	+ else if(e.getSource() == minshaderCB)
	1612	+ {
	1613	+ Globals.MINSHADER ^= true;
	1614	+ cameraView.programInitialized = false;
	1615	+ cameraView.repaint();
876	1616	}
877	1617	else if(e.getSource() == localCB)
878	1618	{
..	..	@@ -922,6 +1662,18 @@
922	1662	{
923	1663	cameraView.ToggleOeil();
924	1664	}
	1665	+ else if(e.getSource() == shadowCB)
	1666	+ {
	1667	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1668	+ }
	1669	+ else if(e.getSource() == freezeCB)
	1670	+ {
	1671	+ Globals.FREEZEONMOVE ^= true;
	1672	+ }
	1673	+ else if(e.getSource() == autokeepCB)
	1674	+ {
	1675	+ Globals.REPLACEONMAKE ^= true;
	1676	+ }
925	1677	else if(e.getSource() == lookAtCB)
926	1678	{
927	1679	cameraView.ToggleLookAt();
..	..	@@ -938,7 +1690,8 @@
938	1690
939	1691	/**/
940	1692	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
941		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1693	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1694	+ TreePath path = objEditor.jTree.getSelectionPath();
942	1695	if ((path == null) \|\| (path.getPathCount() <= 1)) {
943	1696	// We can't move the root node or an empty selection
944	1697	return;
..	..	@@ -1001,8 +1754,6 @@
1001	1754	}
1002	1755	}
1003	1756
1004		- String string = (String) object;
1005		-
1006	1757	System.out.println("Transfer = " + object + "; drop : " + target);
1007	1758	// if( object instanceof java.io.File[])
1008	1759	// {
..	..	@@ -1010,6 +1761,8 @@
1010	1761	// objEditor.DropFile((java.io.File[]) object, true);
1011	1762	// return;
1012	1763	// }
	1764	+
	1765	+ String string = object.toString();
1013	1766
1014	1767	// File path for Mac and Windows
1015	1768	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1055,23 +1808,33 @@
1055	1808
1056	1809	assert target == objEditor.jTree;
1057	1810	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1811	+ Object3D destinationLeaf;
1058	1812	try {
1059		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1813	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1060	1814	} catch (Exception e) {
1061	1815	System.out.println("destinationPath : " + destinationPath);
1062	1816	return;
1063	1817	}
1064	1818
1065		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1819	+ for (int i=group.selection.size(); --i>=0;)
1066	1820	{
	1821	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1822	+
	1823	+ // Cannot move into itself
	1824	+ if (child == destinationLeaf)
	1825	+ return;
	1826	+ }
	1827	+
	1828	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1829	+// {
1067	1830	loadClipboard(true);
1068	1831	objEditor.jTree.setSelectionPath(destinationPath);
1069	1832	pasteInto(false, false);
1070		- } else {
1071		- loadClipboard(false);
1072		- objEditor.jTree.setSelectionPath(destinationPath);
1073		- pasteInto(false, false); // true); // ???
1074		- }
	1833	+// } else {
	1834	+// loadClipboard(false);
	1835	+// objEditor.jTree.setSelectionPath(destinationPath);
	1836	+// pasteInto(false, false); // true); // ???
	1837	+// }
1075	1838	}
1076	1839	public void dropActionChanged(DropTargetDragEvent dtde)
1077	1840	// Called if the user has modified the current drop gesture
..	..	@@ -1127,7 +1890,12 @@
1127	1890	TreePath path;
1128	1891
1129	1892	public TransferableTreePath(TreePath tp) {
1130		- path = tp;
	1893	+ Object[] objs = new Object[tp.getPathCount()];
	1894	+ for (int i=0; i<objs.length; i++)
	1895	+ {
	1896	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1897	+ }
	1898	+ path = new TreePath(objs);
1131	1899	}
1132	1900
1133	1901	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1176,22 +1944,30 @@
1176	1944	{
1177	1945	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1178	1946	//heightFieldItem.addActionListener(this);
1179		- gridItem = menu.add(new MenuItem("Grid"));
1180		- gridItem.addActionListener(this);
1181		- rectoidItem = menu.add(new MenuItem("Box"));
1182		- rectoidItem.addActionListener(this);
1183		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1184		- ellipsoidItem.addActionListener(this);
1185		- coneItem = menu.add(new MenuItem("Cone"));
1186		- coneItem.addActionListener(this);
1187		- torusItem = menu.add(new MenuItem("Torus"));
1188		- torusItem.addActionListener(this);
1189		- superItem = menu.add(new MenuItem("Superellipsoid"));
1190		- superItem.addActionListener(this);
	1947	+// gridItem = menu.add(new MenuItem("Grid"));
	1948	+// gridItem.addActionListener(this);
	1949	+// rectoidItem = menu.add(new MenuItem("Box"));
	1950	+// rectoidItem.addActionListener(this);
	1951	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1952	+// ellipsoidItem.addActionListener(this);
	1953	+// coneItem = menu.add(new MenuItem("Cone"));
	1954	+// coneItem.addActionListener(this);
	1955	+// torusItem = menu.add(new MenuItem("Torus"));
	1956	+// torusItem.addActionListener(this);
	1957	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1958	+// superItem.addActionListener(this);
	1959	+
	1960	+ cameraItem = menu.add(new MenuItem("Camera"));
	1961	+ cameraItem.addActionListener(this);
	1962	+
	1963	+ if (!Globals.ADVANCED)
	1964	+ {
1191	1965	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1192	1966	kleinItem.addActionListener(this);
1193		- particleItem = menu.add(new MenuItem("Particle system"));
1194		- particleItem.addActionListener(this);
	1967	+ }
	1968	+
	1969	+// particleItem = menu.add(new MenuItem("Particle system"));
	1970	+// particleItem.addActionListener(this);
1195	1971	if (Globals.ADVANCED)
1196	1972	{
1197	1973	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1217,15 +1993,15 @@
1217	1993	}
1218	1994	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1219	1995	bezierItem.addActionListener(this);
1220		- overlayItem = menu.add(new MenuItem("Overlay"));
1221		- overlayItem.addActionListener(this);
1222		- lightItem = menu.add(new MenuItem("Light"));
1223		- lightItem.addActionListener(this);
	1996	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1997	+// overlayItem.addActionListener(this);
	1998	+// lightItem = menu.add(new MenuItem("Light"));
	1999	+// lightItem.addActionListener(this);
1224	2000	menu.add("-");
1225	2001	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1226	2002	//superLoopItem.addActionListener(this);
1227		- loopItem = menu.add(new MenuItem("Loop"));
1228		- loopItem.addActionListener(this);
	2003	+// loopItem = menu.add(new MenuItem("Loop"));
	2004	+// loopItem.addActionListener(this);
1229	2005	doubleItem = menu.add(new MenuItem("Fork"));
1230	2006	doubleItem.addActionListener(this);
1231	2007	if (Globals.ADVANCED)
..	..	@@ -1241,6 +2017,9 @@
1241	2017	animationItem.addItemListener(this);
1242	2018	animationItem.setState(Globals.ANIMATION);
1243	2019
	2020	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	2021	+ archiveItem.addActionListener(this);
	2022	+
1244	2023	menu.add("-");
1245	2024	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1246	2025	parseverticesItem.addActionListener(this);
..	..	@@ -1253,6 +2032,8 @@
1253	2032	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1254	2033	reduce34MorphItem.addActionListener(this);
1255	2034	menu.add("-");
	2035	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	2036	+ memoryItem.addActionListener(this);
1256	2037	menu.add(computeAOItem = new MenuItem("Compute AO"));
1257	2038	computeAOItem.addActionListener(this);
1258	2039
..	..	@@ -1261,11 +2042,9 @@
1261	2042	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1262	2043	mirrorItem.addActionListener(this);
1263	2044	menu.add("-");
1264		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1265		- memoryItem.addActionListener(this);
1266	2045	menu.add(analyzeItem = new MenuItem("Analyze"));
1267	2046	analyzeItem.addActionListener(this);
1268		- menu.add(dumpItem = new MenuItem("Dump"));
	2047	+ menu.add(dumpItem = new MenuItem("Print"));
1269	2048	dumpItem.addActionListener(this);
1270	2049	// menu.add(pathItem = new MenuItem("From-to path"));
1271	2050	// pathItem.addActionListener(this);
..	..	@@ -1406,9 +2185,38 @@
1406	2185	shadow.material = new cMaterial(obj.material);
1407	2186	shadow.material.diffuse = 0.0001f;
1408	2187	shadow.material.specular = 0.0001f;
	2188	+ shadow.material.opacity = 0.75f;
	2189	+
	2190	+ AllocProjectedVertices(shadow);
	2191	+
	2192	+ shadow.projectedVertices[1].x = 300;
1409	2193
1410	2194	makeSomething(shadow);
1411	2195	}
	2196	+
	2197	+ private void ClearUnpinned()
	2198	+ {
	2199	+ //for (Object3D obj : listUI)
	2200	+ for (int i=listUI.size(); --i>=0;)
	2201	+ {
	2202	+ Object3D obj = listUI.elementAt(i);
	2203	+ if (!obj.pinned)
	2204	+ {
	2205	+ obj.CloseUI();
	2206	+ listUI.remove(i);
	2207	+ }
	2208	+ }
	2209	+ }
	2210	+
	2211	+ private void EditElement(Object3D elem, boolean newWindow)
	2212	+ {
	2213	+ // if (!(elem instanceof Composite))
	2214	+ // newWindow = false;
	2215	+ listUI.add(elem);
	2216	+ elem.openEditWindow(this, newWindow); //, false);
	2217	+ System.out.println("edit : " + elem);
	2218	+ elem.editWindow.refreshContents(true); // ? new
	2219	+ }
1412	2220
1413	2221	/**
1414	2222	* applyExample
..	..	@@ -1653,7 +2461,7 @@
1653	2461	{
1654	2462	ScreenFit();
1655	2463	} else
1656		- if (source == switchItem)
	2464	+ if (source == switchViewItem)
1657	2465	{
1658	2466	cVector v1 = new cVector();
1659	2467	cVector v2 = new cVector();
..	..	@@ -1662,11 +2470,11 @@
1662	2470	objEditor.cameraView.renderCamera.setAim(v2, v1);
1663	2471	objEditor.cameraView.repaint();
1664	2472	} else
1665		- if (source == rectoidItem)
	2473	+ if (source == rectoidItem \|\| source == boxButton)
1666	2474	{
1667	2475	makeSomething(new Box());
1668	2476	} else
1669		- if (source == particleItem)
	2477	+ if (source == particleItem \|\| source == particlesButton)
1670	2478	{
1671	2479	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1672	2480	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1745,27 +2553,27 @@
1745	2553
1746	2554	makeSomething(obj);
1747	2555	} else
1748		- if (source == gridItem)
	2556	+ if (source == gridItem \|\| source == gridButton)
1749	2557	{
1750	2558	makeSomething(new Grid());
1751	2559	} else
1752		- if (source == ellipsoidItem)
	2560	+ if (source == ellipsoidItem \|\| source == sphereButton)
1753	2561	{
1754	2562	makeSomething(new Sphere());
1755	2563	} else
1756		- if (source == coneItem)
	2564	+ if (source == coneItem \|\| source == coneButton)
1757	2565	{
1758	2566	makeSomething(new Cone());
1759	2567	} else
1760		- if (source == torusItem)
	2568	+ if (source == torusItem \|\| source == torusButton)
1761	2569	{
1762	2570	makeSomething(new Torus());
1763	2571	} else
1764		- if (source == superItem)
	2572	+ if (source == superItem \|\| source == superButton)
1765	2573	{
1766	2574	makeSomething(new Superellipsoid());
1767	2575	} else
1768		- if (source == kleinItem)
	2576	+ if (source == kleinItem \|\| source == kleinButton)
1769	2577	{
1770	2578	makeSomething(new Klein());
1771	2579	} else
..	..	@@ -1785,7 +2593,7 @@
1785	2593	{
1786	2594	makeSomething(new BezierSurface());
1787	2595	} else
1788		- if (source == overlayItem)
	2596	+ if (source == overlayItem \|\| source == overlayButton)
1789	2597	{
1790	2598	/*
1791	2599	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1833,10 +2641,27 @@
1833	2641	s.setup();
1834	2642	makeSomething(s);
1835	2643	} else
1836		- if (source == lightItem)
	2644	+ if (source == lightItem \|\| source == lightButton)
1837	2645	{
1838	2646	makeSomething(new Light());
1839	2647	} else
	2648	+// if (source == skybox1Button \|\|
	2649	+// source == skybox2Button \|\|
	2650	+// source == skybox3Button \|\|
	2651	+// source == skybox4Button \|\|
	2652	+// source == skybox5Button \|\|
	2653	+// source == skybox6Button \|\|
	2654	+// source == skybox7Button \|\|
	2655	+// source == skybox11Button \|\|
	2656	+// source == skybox12Button \|\|
	2657	+// source == skybox13Button \|\|
	2658	+// source == skybox14Button \|\|
	2659	+// source == skybox15Button \|\|
	2660	+// source == skybox16Button \|\|
	2661	+// source == skybox17Button)
	2662	+// {
	2663	+// ChangeSkybox(source);
	2664	+// } else
1840	2665	if (source == csgItem)
1841	2666	{
1842	2667	group(new CSG());
..	..	@@ -1883,30 +2708,38 @@
1883	2708
1884	2709	group(g);
1885	2710	} else
1886		- if (source == loopItem)
	2711	+ if (source == loopItem \|\| source == loopButton)
1887	2712	{
	2713	+ if (!group.selection.isEmpty())
	2714	+ {
1888	2715	Composite csg = new GroupLeaf();
1889	2716	csg.count = 5;
1890		- group(csg);
1891		- Composite child = new cGroup();
	2717	+ Composite child = new cGroup("Branch");
1892	2718	csg.addChild(child);
1893	2719	child.addChild(csg);
	2720	+ group(csg);
	2721	+ }
1894	2722	} else
1895	2723	if (source == doubleItem)
1896	2724	{
1897		- Composite csg = new GroupLeaf();
	2725	+ if (!group.selection.isEmpty())
	2726	+ {
	2727	+ Composite csg = new GroupLeaf("Fork");
1898	2728	csg.count = 5;
	2729	+ Composite child = new cGroup("Branch A");
	2730	+ csg.addChild(child);
	2731	+ child.addChild(csg);
	2732	+ child = new cGroup("Branch B");
	2733	+ csg.addChild(child);
	2734	+ child.addChild(csg);
1899	2735	group(csg);
1900		- Composite child = new cGroup();
1901		- csg.addChild(child);
1902		- child.addChild(csg);
1903		- child = new cGroup();
1904		- csg.addChild(child);
1905		- child.addChild(csg);
	2736	+ }
1906	2737	} else
1907	2738	if (source == tripleItem)
1908	2739	{
1909		- Composite csg = new GroupLeaf();
	2740	+ if (!group.selection.isEmpty())
	2741	+ {
	2742	+ Composite csg = new GroupLeaf("Trident");
1910	2743	csg.count = 4;
1911	2744	group(csg);
1912	2745	Composite child = new cGroup();
..	..	@@ -1918,11 +2751,12 @@
1918	2751	child = new cGroup();
1919	2752	csg.addChild(child);
1920	2753	child.addChild(csg);
	2754	+ }
1921	2755	} else
1922	2756	if (source == computeAOItem)
1923	2757	{
1924	2758	Globals.drawMode = CameraPane.OCCLUSION;
1925		- Globals.theRenderer.repaint();
	2759	+ cameraView.repaint();
1926	2760	} else
1927	2761	if (source == recompileItem)
1928	2762	{
..	..	@@ -1937,7 +2771,7 @@
1937	2771	if (source == invariantsItem)
1938	2772	{
1939	2773	System.out.println("Invariants:");
1940		- Grafreed.grafreeD.universe.invariants();
	2774	+ Grafreed.grafreed.universe.invariants();
1941	2775	} else
1942	2776	if (source == memoryItem)
1943	2777	{
..	..	@@ -1956,6 +2790,65 @@
1956	2790	{
1957	2791	DumpObject();
1958	2792	} else
	2793	+ if (source == minButton)
	2794	+ {
	2795	+ Minimize();
	2796	+ } else
	2797	+ if (source == maxButton)
	2798	+ {
	2799	+ Maximize();
	2800	+ } else
	2801	+ if (source == fullButton)
	2802	+ {
	2803	+ ToggleFullScreen();
	2804	+ } else
	2805	+ if (source == collapseButton)
	2806	+ {
	2807	+ this.expandedLayout = radio.layout;
	2808	+ CollapseToolbar();
	2809	+ } else
	2810	+ if (source == maximize3DButton)
	2811	+ {
	2812	+ this.expandedLayout = radio.layout;
	2813	+ radio.layout = twoButton;
	2814	+ Show3DView();
	2815	+ CollapseToolbar();
	2816	+ } else
	2817	+ if (source == previousVersionButton)
	2818	+ {
	2819	+ // Go to previous version
	2820	+ //if (!Undo())
	2821	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2822	+ PreviousVersion();
	2823	+ } else
	2824	+ if (source == restoreButton)
	2825	+ {
	2826	+ // Restore current version
	2827	+ Restore();
	2828	+ //restoreButton.setEnabled(false);
	2829	+ } else
	2830	+ if (source == replaceButton)
	2831	+ {
	2832	+ // Overwrite current version
	2833	+ Replace();
	2834	+ //replaceButton.setEnabled(false);
	2835	+ } else
	2836	+ if (source == nextVersionButton)
	2837	+ {
	2838	+ // Go to next version
	2839	+ NextVersion();
	2840	+ } else
	2841	+ if (source == saveVersionButton)
	2842	+ {
	2843	+ // Save a new version
	2844	+ if (!Save(true))
	2845	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2846	+ } else
	2847	+ if (source == deleteVersionButton)
	2848	+ {
	2849	+ // Delete a new version
	2850	+ DeleteVersion();
	2851	+ } else
1959	2852	if (source == oneStepButton)
1960	2853	{
1961	2854	Globals.ONESTEP = true;
..	..	@@ -1963,17 +2856,14 @@
1963	2856	} else
1964	2857	if (source == screenfitButton)
1965	2858	{
1966		- //Reload(lastConverter, lastFilename, true);
1967	2859	ScreenFit();
1968	2860	} else
1969	2861	if (source == screenfitpointButton)
1970	2862	{
1971		- //Reload(lastConverter, lastFilename, true);
1972	2863	ScreenFitPoint();
1973	2864	} else
1974	2865	if (source == snapobjectButton)
1975	2866	{
1976		- //Reload(lastConverter, lastFilename, true);
1977	2867	SnapObject();
1978	2868	} else
1979	2869	// if (event.getSource() == recompileButton)
..	..	@@ -2012,11 +2902,11 @@
2012	2902	} else
2013	2903	if (source == undoItem)
2014	2904	{
2015		- Undo();
	2905	+ PreviousVersion();
2016	2906	} else
2017	2907	if (source == redoItem)
2018	2908	{
2019		- Redo();
	2909	+ NextVersion();
2020	2910	} else
2021	2911	if (source == duplicateItem)
2022	2912	{
..	..	@@ -2337,7 +3227,7 @@
2337	3227	{
2338	3228	StepAll();
2339	3229	} else
2340		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3230	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2341	3231	{
2342	3232	//int indices[] = jList.getSelectedIndices();
2343	3233	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2349,9 +3239,9 @@
2349	3239	{
2350	3240	ClearSelection(true);
2351	3241	} else
2352		- if (source == grabItem)
	3242	+ if (source == grabItem \|\| source == groupButton)
2353	3243	{
2354		- group(new cGroup(), true);
	3244	+ group(new cGroup(), false); // true);
2355	3245	} else
2356	3246	if (source == hideItem)
2357	3247	{
..	..	@@ -2369,11 +3259,11 @@
2369	3259	{
2370	3260	makeSomething(new Camera());
2371	3261	} else
2372		- if (source == compositeItem)
	3262	+ if (source == compositeItem \|\| source == compositeButton)
2373	3263	{
2374	3264	group(new Composite());
2375	3265	} else
2376		- if (source == randomItem)
	3266	+ if (source == switchItem \|\| source == switchButton)
2377	3267	{
2378	3268	RandomNode random = new RandomNode();
2379	3269	group(random);
..	..	@@ -2475,7 +3365,7 @@
2475	3365	{
2476	3366	group(new cLinker());
2477	3367	} else
2478		- if (source == textureItem)
	3368	+ if (source == textureItem \|\| source == textureButton)
2479	3369	{
2480	3370	group(new TextureNode());
2481	3371	} else
..	..	@@ -2495,17 +3385,42 @@
2495	3385	{
2496	3386	CastShadow(2);
2497	3387	} else
2498		- if (source == ungroupItem)
	3388	+ if (source == ungroupItem \|\| source == ungroupButton)
2499	3389	{
2500		- //ungroup();
	3390	+ boolean canUngroup = true;
	3391	+
2501	3392	for (int i=0; i<group.selection.size(); i++)
2502	3393	{
2503		- Ungroup(group.selection.get(i));
	3394	+ Object3D selectedItem = group.selection.get(i);
	3395	+
	3396	+ if (selectedItem.Size() == 0)
	3397	+ {
	3398	+ // Cannot ungroup leaves
	3399	+ canUngroup = false;
	3400	+ break;
	3401	+ }
	3402	+
	3403	+ if (selectedItem == group)
	3404	+ {
	3405	+ // Cannot ungroup root
	3406	+ canUngroup = false;
	3407	+ break;
	3408	+ }
2504	3409	}
2505	3410
2506		- ClearSelection(false);
2507		-
2508		- refreshContents();
	3411	+ if (canUngroup)
	3412	+ {
	3413	+ for (int i=0; i<group.selection.size(); i++)
	3414	+ {
	3415	+ Object3D selectedItem = group.selection.get(i);
	3416	+
	3417	+ Ungroup(selectedItem);
	3418	+ }
	3419	+
	3420	+ ClearSelection(false);
	3421	+
	3422	+ refreshContents();
	3423	+ }
2509	3424	} else
2510	3425	if (source == genUVItem)
2511	3426	{
..	..	@@ -2517,7 +3432,7 @@
2517	3432	} else
2518	3433	if (source == genNormalsMESHItem)
2519	3434	{
2520		- GenNormals(true); // TODO
	3435	+ GenNormalsMESH();
2521	3436	} else
2522	3437	if (source == genNormalsORGANItem)
2523	3438	{
..	..	@@ -2582,6 +3497,22 @@
2582	3497	if (source == unmarkleavesItem)
2583	3498	{
2584	3499	MarkLeaves(false);
	3500	+ } else
	3501	+ if (source == rewindleavesItem)
	3502	+ {
	3503	+ RewindLeaves(true);
	3504	+ } else
	3505	+ if (source == unrewindleavesItem)
	3506	+ {
	3507	+ RewindLeaves(false);
	3508	+ } else
	3509	+ if (source == randomleavesItem)
	3510	+ {
	3511	+ RandomLeaves(true);
	3512	+ } else
	3513	+ if (source == unrandomleavesItem)
	3514	+ {
	3515	+ RandomLeaves(false);
2585	3516	} else
2586	3517	if (source == flipVItem)
2587	3518	{
..	..	@@ -2790,7 +3721,7 @@
2790	3721	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2791	3722	{
2792	3723	obj = (Object3D)e.nextElement();
2793		- obj.SetBumpTexture(null);
	3724	+ obj.ResetBumpTexture();
2794	3725	}
2795	3726
2796	3727	refreshContents();
..	..	@@ -2806,6 +3737,31 @@
2806	3737
2807	3738	refreshContents();
2808	3739	} else
	3740	+ if (source == embedTexturesItem)
	3741	+ {
	3742	+ Object3D obj;
	3743	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3744	+ {
	3745	+ obj = (Object3D)e.nextElement();
	3746	+ obj.EmbedTextures(true);
	3747	+ }
	3748	+
	3749	+ refreshContents();
	3750	+ } else
	3751	+ if (source == deEmbedTexturesItem)
	3752	+ {
	3753	+ Object3D obj;
	3754	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3755	+ {
	3756	+ obj = (Object3D)e.nextElement();
	3757	+ obj.EmbedTextures(false);
	3758	+ }
	3759	+
	3760	+ CameraPane.texturepigment.clear();
	3761	+ CameraPane.texturebump.clear();
	3762	+
	3763	+ refreshContents();
	3764	+ } else
2809	3765	if (source == flashSelectionButton)
2810	3766	{
2811	3767	CameraPane.flash = true;
..	..	@@ -2817,42 +3773,36 @@
2817	3773	if (source == twoButton)
2818	3774	{
2819	3775	radio.layout = twoButton;
2820		- // bug
2821		- //gridPanel.setDividerLocation(1.0);
2822		- //bigPanel.setDividerLocation(0.0);
2823		-// bigThree.remove(scenePanel);
2824		-// bigThree.remove(centralPanel);
2825		-// bigThree.remove(XYZPanel);
2826		-// aWindowConstraints.gridx = 0;
2827		-// aWindowConstraints.gridy = 0;
2828		-// aWindowConstraints.gridwidth = 1;
2829		-// // aConstraints.gridheight = 3;
2830		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2831		-// aWindowConstraints.weightx = 0;
2832		-// aWindowConstraints.weighty = 1;
2833		-// //bigThree.add(jtp, aWindowConstraints);
2834		-// aWindowConstraints.weightx = 1;
2835		-// aWindowConstraints.gridwidth = 3;
2836		-// // aConstraints.gridheight = 3;
2837		-// aWindowConstraints.gridx = 1;
2838		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
2839		-// bigThree.add(centralPanel, aWindowConstraints);
2840		-// aWindowConstraints.weightx = 0;
2841		-// aWindowConstraints.gridx = 4;
2842		-// aWindowConstraints.gridwidth = 1;
2843		-// // aConstraints.gridheight = 3;
2844		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2845		-// //bigThree.add(XYZPanel, aWindowConstraints);
2846		-// scenePanel.setVisible(false);
2847		-// centralPanel.setVisible(true);
2848		-// XYZPanel.setVisible(false);
2849		- bigThree.ClearUI();
2850		- bigThree.add(centralPanel);
2851		- bigThree.FlushUI();
	3776	+
	3777	+ if (CameraPane.FULLSCREEN)
	3778	+ fullscreenLayout = radio.layout;
	3779	+
	3780	+ Show3DView();
	3781	+
	3782	+ cameraView.requestFocusInWindow();
	3783	+
	3784	+// refreshContents(true);
	3785	+//
	3786	+// try
	3787	+// {
	3788	+// java.awt.Robot bot = new java.awt.Robot();
	3789	+// int mask = InputEvent.BUTTON1_MASK;
	3790	+// bot.mouseMove(100, 100);
	3791	+// bot.mousePress(mask);
	3792	+// bot.mouseRelease(mask);
	3793	+// }
	3794	+// catch (Exception e)
	3795	+// {
	3796	+//
	3797	+// }
	3798	+
2852	3799	} else
2853	3800	if (source == threeButton)
2854	3801	{
2855	3802	radio.layout = threeButton;
	3803	+
	3804	+ if (CameraPane.FULLSCREEN)
	3805	+ fullscreenLayout = radio.layout;
2856	3806
2857	3807	// bigThree.remove(scenePanel);
2858	3808	// bigThree.remove(centralPanel);
..	..	@@ -2882,13 +3832,18 @@
2882	3832	// centralPanel.setVisible(true);
2883	3833	// XYZPanel.setVisible(true);
2884	3834	bigThree.ClearUI();
	3835	+ bigThree.add(scenePanel);
2885	3836	bigThree.add(centralPanel);
2886		- bigThree.add(XYZPanel);
2887	3837	bigThree.FlushUI();
	3838	+
	3839	+ cameraView.requestFocusInWindow();
2888	3840	} else
2889	3841	if (source == fourButton)
2890	3842	{
2891	3843	radio.layout = fourButton;
	3844	+
	3845	+ if (CameraPane.FULLSCREEN)
	3846	+ fullscreenLayout = radio.layout;
2892	3847
2893	3848	// bigThree.remove(scenePanel);
2894	3849	// bigThree.remove(centralPanel);
..	..	@@ -2920,10 +3875,15 @@
2920	3875	bigThree.ClearUI();
2921	3876	bigThree.add(scenePanel);
2922	3877	bigThree.FlushUI();
	3878	+
	3879	+ cameraView.requestFocusInWindow();
2923	3880	} else
2924	3881	if (source == sixButton)
2925	3882	{
2926	3883	radio.layout = sixButton;
	3884	+
	3885	+ if (CameraPane.FULLSCREEN)
	3886	+ fullscreenLayout = radio.layout;
2927	3887
2928	3888	// bigThree.remove(scenePanel);
2929	3889	// bigThree.remove(centralPanel);
..	..	@@ -2953,13 +3913,18 @@
2953	3913	// centralPanel.setVisible(true);
2954	3914	// XYZPanel.setVisible(false);
2955	3915	bigThree.ClearUI();
2956		- bigThree.add(scenePanel);
2957	3916	bigThree.add(centralPanel);
	3917	+ bigThree.add(scenePanel);
2958	3918	bigThree.FlushUI();
	3919	+
	3920	+ cameraView.requestFocusInWindow();
2959	3921	} else
2960	3922	if (source == sevenButton)
2961	3923	{
2962	3924	radio.layout = sevenButton;
	3925	+
	3926	+ if (CameraPane.FULLSCREEN)
	3927	+ fullscreenLayout = radio.layout;
2963	3928
2964	3929	// bigThree.remove(scenePanel);
2965	3930	// bigThree.remove(centralPanel);
..	..	@@ -2993,9 +3958,12 @@
2993	3958	bigThree.add(centralPanel);
2994	3959	bigThree.add(XYZPanel);
2995	3960	bigThree.FlushUI();
	3961	+
	3962	+ cameraView.requestFocusInWindow();
2996	3963	} else
2997	3964	if (source == rootButton)
2998	3965	{
	3966	+ Replace();
2999	3967	Object3D obj;
3000	3968	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3001	3969	{
..	..	@@ -3004,31 +3972,49 @@
3004	3972	EditObject(obj);
3005	3973	}
3006	3974
	3975	+ cameraView.requestFocusInWindow();
3007	3976	refreshContents(true);
3008	3977	} else
3009	3978	if (source == closeButton)
3010	3979	{
3011	3980	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	3981	+ Replace();
	3982	+
3012	3983	cRadio ab;
3013	3984	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3014	3985	{
3015	3986	ab = (cRadio)e.nextElement();
3016		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3987	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3017	3988	{
	3989	+ // Patch to avoid bug with transparency.
	3990	+ if (!ab.hadMaterial)
	3991	+ {
	3992	+ ab.object.material = null;
	3993	+ }
	3994	+
3018	3995	buttonGroup.remove(ab);
3019	3996	radioPanel.remove(ab);
3020	3997
3021		- ab.GetObject().editWindow = null;
	3998	+ //ab.GetObject().editWindow = null;
	3999	+ ab.GetObject().manipWindow = null;
3022	4000	// ab.GetObject().objectUI = null; // ?????????
3023	4001
3024	4002	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
3025	4003	break;
3026	4004	}
3027	4005	}
	4006	+
	4007	+ cameraView.requestFocusInWindow();
3028	4008	refreshContents(true);
3029	4009	} else
3030	4010	if (source == editItem \|\| source == editButton)
3031	4011	{
	4012	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4013	+ {
	4014	+ Object3D child = (Object3D)e.nextElement();
	4015	+ child.pinned = true;
	4016	+ }
	4017	+
3032	4018	EditSelection(false);
3033	4019	} else
3034	4020	if (source == uneditButton)
..	..	@@ -3037,9 +4023,10 @@
3037	4023	{
3038	4024	Object3D child = (Object3D)e.nextElement();
3039	4025	if(child.editWindow != null)
3040		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4026	+ child.pinned = false;
3041	4027	child.CloseUI();
3042	4028	listUI.remove(child);
	4029	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3043	4030
3044	4031	//child.editWindow = null; // ???????????
3045	4032	}
..	..	@@ -3054,16 +4041,18 @@
3054	4041	//copy.ClearUI();
3055	4042	for (Object3D obj : listUI)
3056	4043	{
	4044	+ obj.pinned = false;
3057	4045	obj.CloseUI();
3058	4046	}
3059	4047	listUI.clear();
	4048	+ SetPinStates(group.selection.size() > 0);
3060	4049	refreshContents(true);
3061	4050	} else
3062	4051	if (source == allParamsButton)
3063	4052	{
3064	4053	assert(copy == group);
3065	4054
3066		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4055	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3067	4056
3068	4057	for (Object3D obj : listUI)
3069	4058	{
..	..	@@ -3089,6 +4078,8 @@
3089	4078	} else
3090	4079	if(source instanceof cRadio)
3091	4080	{
	4081	+ Replace();
	4082	+
3092	4083	group.parent = keepparent;
3093	4084	group.attributes = 0;
3094	4085	//group.editWindow = null;
..	..	@@ -3112,6 +4103,7 @@
3112	4103	}
3113	4104
3114	4105	copy = group;
	4106	+
3115	4107	//Globals.theRenderer.object = group;
3116	4108	if(!useclient)
3117	4109	{
..	..	@@ -3128,7 +4120,9 @@
3128	4120	sideView.object = group;
3129	4121	}
3130	4122
3131		-// fix "+" issue group.editWindow = this;
	4123	+// fix "+" issue
	4124	+ //group.editWindow = this;
	4125	+ group.manipWindow = this;
3132	4126
3133	4127	/*
3134	4128	currentLayout = radio.layout;
..	..	@@ -3136,20 +4130,55 @@
3136	4130	currentLayout = sevenButton;
3137	4131	*/
3138	4132	radio.layout.doClick();
	4133	+
	4134	+ assert(copy instanceof Composite);
	4135	+
	4136	+ if (copy.versionlist == null)
	4137	+ {
	4138	+ copy.versionindex = -1;
	4139	+
	4140	+ // Cannot work with loops
	4141	+ // To fix this issue, we first mark all nodes above the root,
	4142	+ // and check if any of these nodes are reachable below the root.
	4143	+ Grafreed.grafreed.universe.TagObjects(copy, true);
	4144	+
	4145	+ if (!copy.HasTags())
	4146	+ {
	4147	+ copy.versionlist = new Object3D[100];
	4148	+
	4149	+ Save(true);
	4150	+ }
	4151	+
	4152	+ Grafreed.grafreed.universe.TagObjects(copy, false);
	4153	+ }
	4154	+
	4155	+ SetVersionStates();
	4156	+
	4157	+ ClearUnpinned();
	4158	+
	4159	+ //Grafreed.Assert(group != null);
	4160	+ //Grafreed.Assert(group.selection != null);
	4161	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4162	+ if (group.selection == null \|\| group.selection.size() == 1)
	4163	+ EditSelection(false);
3139	4164	keepparent = group.parent;
3140	4165	// PARENT = NULL or not???
3141	4166	//group.parent = null; // ROOT
3142	4167	//group.attributes = -1;
3143	4168	ResetModel();
	4169	+
	4170	+ cameraView.requestFocusInWindow();
3144	4171	refreshContents(true);
3145	4172	} else if (event.getSource() == editCameraItem)
3146	4173	{
3147	4174	cameraView.ProtectCamera();
	4175	+ cameraView.requestFocusInWindow();
3148	4176	cameraView.repaint();
3149	4177	return;
3150		- } else if (event.getSource() == revertCameraItem)
	4178	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3151	4179	{
3152	4180	cameraView.RevertCamera();
	4181	+ cameraView.requestFocusInWindow();
3153	4182	cameraView.repaint();
3154	4183	return;
3155	4184	// } else if (event.getSource() == textureButton)
..	..	@@ -3164,7 +4193,6 @@
3164	4193	}
3165	4194
3166	4195	boolean useclient = false;
3167		- cRadio radio;
3168	4196
3169	4197	void ToggleRoot()
3170	4198	{
..	..	@@ -3269,7 +4297,7 @@
3269	4297	TouchTransform(obj);
3270	4298	continue;
3271	4299	}
3272		- if ((mask&2) != 0) // Scale
	4300	+ if ((mask&2) != 0) // Scale/rotation
3273	4301	{
3274	4302	obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
3275	4303	obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
..	..	@@ -3277,10 +4305,6 @@
3277	4305	obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
3278	4306	obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
3279	4307	obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
3280		- }
3281		- if ((mask&4) != 0) // Rotation
3282		- {
3283		- // ?
3284	4308	}
3285	4309	if ((mask&1) != 0) // Translation
3286	4310	{
..	..	@@ -3403,7 +4427,8 @@
3403	4427
3404	4428	int size = obj.MemorySize();
3405	4429
3406		- System.err.println((size/1024) + " KB is the size of " + obj);
	4430	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4431	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3407	4432	}
3408	4433	}
3409	4434	catch (Exception e)
..	..	@@ -3484,6 +4509,13 @@
3484	4509	void GenNormals(boolean crease)
3485	4510	{
3486	4511	group.GenNormalsS(crease);
	4512	+
	4513	+ refreshContents();
	4514	+ }
	4515	+
	4516	+ void GenNormalsMESH()
	4517	+ {
	4518	+ group.GenNormalsMeshS();
3487	4519
3488	4520	refreshContents();
3489	4521	}
..	..	@@ -3719,7 +4751,7 @@
3719	4751
3720	4752	try
3721	4753	{
3722		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4754	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
3723	4755	}
3724	4756	catch (Exception e)
3725	4757	{
..	..	@@ -4111,6 +5143,18 @@
4111	5143	refreshContents();
4112	5144	}
4113	5145
	5146	+ void RewindLeaves(boolean hide)
	5147	+ {
	5148	+ group.selection.RewindLeaves(hide);
	5149	+ refreshContents();
	5150	+ }
	5151	+
	5152	+ void RandomLeaves(boolean hide)
	5153	+ {
	5154	+ group.selection.RandomLeaves(hide);
	5155	+ refreshContents();
	5156	+ }
	5157	+
4114	5158	void SetTexRes(int tr)
4115	5159	{
4116	5160	group.selection.SetTexRes(tr);
..	..	@@ -4182,28 +5226,25 @@
4182	5226	// }
4183	5227	// }
4184	5228
4185		- static boolean allparams = true;
4186		-
4187		- static Vector<Object3D> listUI = new Vector<Object3D>();
4188		-
4189	5229	void EditSelection(boolean newWindow)
4190	5230	{
	5231	+ if (group.selection == null)
	5232	+ {
	5233	+ EditElement(group, newWindow); // ? new
	5234	+ return;
	5235	+ }
	5236	+
4191	5237	// aConstraints.gridy = 0;
4192	5238	for (int i=0; i<group.selection.size(); i++)
4193	5239	{
4194	5240	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4195	5241	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4196		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5242	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4197	5243
4198	5244	Object3D elem = (Object3D)group.selection.elementAt(i);
4199	5245	if(elem != group \|\| !newWindow)
4200	5246	{
4201		- // if (!(elem instanceof Composite))
4202		- // newWindow = false;
4203		- listUI.add(elem);
4204		- elem.openEditWindow(this, newWindow); //, false);
4205		- System.out.println("edit : " + elem);
4206		- elem.editWindow.refreshContents(true); // ? new
	5247	+ EditElement(elem, newWindow); // ? new
4207	5248	}
4208	5249	}
4209	5250	}
..	..	@@ -4266,9 +5307,7 @@
4266	5307
4267	5308	freezemodel = false;
4268	5309	}
4269		-
4270		- boolean flashIt = true;
4271		-
	5310	+
4272	5311	public void valueChanged(TreeSelectionEvent e)
4273	5312	//public boolean handleEvent(Event event)
4274	5313	{
..	..	@@ -4278,7 +5317,8 @@
4278	5317	//new Exception().printStackTrace();
4279	5318
4280	5319	freezemodel = true;
4281		-
	5320	+ ClearUnpinned();
	5321	+
4282	5322	/**/
4283	5323	//switch (event.id)
4284	5324	{
..	..	@@ -4286,7 +5326,6 @@
4286	5326	//case 702: // Event.LIST_DESELECT
4287	5327	group.deselectAll();
4288	5328	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4289		- objEditor.ClearInfo(); // .GetMaterial());
4290	5329	if (tps != null)
4291	5330	{
4292	5331	for (int i=0; i < tps.length; i++)
..	..	@@ -4295,10 +5334,8 @@
4295	5334
4296	5335	//if (child.parent != null)
4297	5336	//child.parent.addSelectee(child);
	5337	+ objEditor.SetMaterial(child);
4298	5338	group.addSelectee(child);
4299		- objEditor.SetMaterial(child); // .GetMaterial());
4300		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4301		- System.err.println("info : " + child.GetPath());
4302	5339	}
4303	5340	}
4304	5341	// else
..	..	@@ -4308,15 +5345,13 @@
4308	5345	// System.err.println("info : " + group.GetPath());
4309	5346	// }
4310	5347
4311		- objEditor.SetText(); // jan 2014
4312		-
4313	5348	if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4314	5349	CameraPane.flash = true;
4315	5350
4316	5351	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4317	5352	// a camera
4318	5353	{
4319		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	5354	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4320	5355	{
4321	5356	CameraPane.camerachangeframe = 0; // don't refuse it
4322	5357	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4325,6 +5360,13 @@
4325	5360	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4326	5361	}
4327	5362
	5363	+ if (tps != null && tps.length == 1)
	5364	+ {
	5365	+ EditSelection(false);
	5366	+ }
	5367	+
	5368	+ SetPinStates(tps != null && tps.length > 0);
	5369	+
4328	5370	refreshContents();
4329	5371	//return true;
4330	5372	}
..	..	@@ -4333,6 +5375,53 @@
4333	5375
4334	5376	freezemodel = false;
4335	5377	}
	5378	+
	5379	+ void SetPinStates(boolean enabled)
	5380	+ {
	5381	+ editButton.setEnabled(enabled);
	5382	+ uneditButton.setEnabled(enabled);
	5383	+ //unselectButton.setEnabled(enabled);
	5384	+ flashSelectionButton.setEnabled(enabled);
	5385	+
	5386	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5387	+
	5388	+ boolean allComposites = true;
	5389	+
	5390	+ if (group.selection != null)
	5391	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5392	+ {
	5393	+ Object next = e.nextElement();
	5394	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5395	+ {
	5396	+ allComposites = false;
	5397	+ break;
	5398	+ }
	5399	+ }
	5400	+
	5401	+ rootButton.setEnabled(allComposites);
	5402	+ }
	5403	+
	5404	+ void refreshContents(boolean cp)
	5405	+ {
	5406	+ if (Globals.ADVANCED)
	5407	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5408	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5409	+ {
	5410	+ objEditor.ClearInfo(); // .GetMaterial());
	5411	+
	5412	+ for (int i=0; i < group.selection.Size(); i++)
	5413	+ {
	5414	+ Object3D child = (Object3D) group.selection.get(i);
	5415	+
	5416	+ objEditor.AddInfo(child, this, true);
	5417	+// System.err.println("info : " + child.GetPath());
	5418	+ }
	5419	+
	5420	+ objEditor.SetText(); // jan 2014
	5421	+ }
	5422	+
	5423	+ super.refreshContents(cp);
	5424	+ }
4336	5425
4337	5426	void linkSomething(Object3D thing)
4338	5427	{
..	..	@@ -4404,6 +5493,7 @@
4404	5493	{
4405	5494	if (group.selection.isEmpty())
4406	5495	return;
	5496	+
4407	5497	Grafreed.clipboardIsTempGroup = false;
4408	5498	Composite tGroup = null;
4409	5499	if (group.selection.size() > 0) // 1)
..	..	@@ -4414,6 +5504,8 @@
4414	5504
4415	5505	if (cut)
4416	5506	{
	5507	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5508	+// Save();
4417	5509	//int indices[] = jList.getSelectedIndices();
4418	5510	//for (int i = indices.length - 1; i >= 0; i--)
4419	5511	//jList.remove(indices[i]);
..	..	@@ -4503,8 +5595,10 @@
4503	5595	}
4504	5596
4505	5597	}
	5598	+
4506	5599	if (Grafreed.clipboardIsTempGroup)
4507	5600	Grafreed.clipboard = tGroup;
	5601	+
4508	5602	if (cut)
4509	5603	{
4510	5604	ResetModel();
..	..	@@ -4514,6 +5608,10 @@
4514	5608
4515	5609	void paste(boolean expand)
4516	5610	{
	5611	+ if (Globals.REPLACEONMAKE)
	5612	+ Save();
	5613	+ boolean keep = Globals.REPLACEONMAKE;
	5614	+ Globals.REPLACEONMAKE = false;
4517	5615	// if (GrafreeD.clipboard == null)
4518	5616	// return;
4519	5617	boolean first = true;
..	..	@@ -4573,6 +5671,7 @@
4573	5671	Grafreed.clipboard.get(0).parent = keepparent;
4574	5672	}
4575	5673
	5674	+ Globals.REPLACEONMAKE = keep;
4576	5675	ResetModel();
4577	5676	refreshContents();
4578	5677	}
..	..	@@ -4708,6 +5807,10 @@
4708	5807
4709	5808	void group(Object3D csg, boolean grab)
4710	5809	{
	5810	+ if (Globals.REPLACEONMAKE)
	5811	+ Save();
	5812	+ boolean keep = Globals.REPLACEONMAKE;
	5813	+ Globals.REPLACEONMAKE = false;
4711	5814	if (//false) // why??
4712	5815	!group.selection.isEmpty())
4713	5816	{
..	..	@@ -4821,10 +5924,15 @@
4821	5924	//node.add(csg);
4822	5925	//makeSomething(node);
4823	5926	makeSomething(csg);
	5927	+ Globals.REPLACEONMAKE = keep;
4824	5928	}
4825	5929
4826	5930	void Ungroup(Object3D g)
4827	5931	{
	5932	+ if (Globals.REPLACEONMAKE)
	5933	+ Save();
	5934	+ boolean keep = Globals.REPLACEONMAKE;
	5935	+ Globals.REPLACEONMAKE = false;
4828	5936	if (g instanceof HiddenObject)
4829	5937	{
4830	5938	HiddenObject h = (HiddenObject) g;
..	..	@@ -4841,6 +5949,7 @@
4841	5949	objEditor.makeSomething(g.get(i), false);
4842	5950	}
4843	5951	}
	5952	+ Globals.REPLACEONMAKE = keep;
4844	5953	}
4845	5954
4846	5955	void ungroup()
..	..	@@ -5129,7 +6238,43 @@
5129	6238	cButton clearpanelButton;
5130	6239	cButton unselectButton;
5131	6240
	6241	+ cButton restoreCameraButton;
	6242	+
5132	6243	cButton oneStepButton;
	6244	+
	6245	+ cButton groupButton;
	6246	+ cButton ungroupButton;
	6247	+ cButton compositeButton;
	6248	+ cButton switchButton;
	6249	+ cButton loopButton;
	6250	+ cButton textureButton;
	6251	+
	6252	+ cButton skybox1Button;
	6253	+ cButton skybox2Button;
	6254	+ cButton skybox3Button;
	6255	+ cButton skybox4Button;
	6256	+ cButton skybox5Button;
	6257	+ cButton skybox6Button;
	6258	+ cButton skybox7Button;
	6259	+
	6260	+ cButton skybox11Button;
	6261	+ cButton skybox12Button;
	6262	+ cButton skybox13Button;
	6263	+ cButton skybox14Button;
	6264	+ cButton skybox15Button;
	6265	+ cButton skybox16Button;
	6266	+ cButton skybox17Button;
	6267	+
	6268	+ cButton gridButton;
	6269	+ cButton boxButton;
	6270	+ cButton sphereButton;
	6271	+ cButton coneButton;
	6272	+ cButton torusButton;
	6273	+ cButton superButton;
	6274	+ cButton kleinButton;
	6275	+ cButton particlesButton;
	6276	+ cButton overlayButton;
	6277	+ cButton lightButton;
5133	6278
5134	6279	cButton screenfitButton;
5135	6280	cButton screenfitpointButton;
..	..	@@ -5142,14 +6287,6 @@
5142	6287
5143	6288	cButton setsupportButton;
5144	6289
5145		- cButton twoButton;
5146		- cButton sixButton;
5147		- cButton threeButton;
5148		- cButton sevenButton;
5149		- cButton fourButton; // full panel
5150		- cButton oneButton; // full XYZ
5151		- //cButton currentLayout;
5152		-
5153	6290	//
5154	6291	//Composite
5155	6292	Object3D // to do !!
..	..	@@ -5159,12 +6296,12 @@
5159	6296	//JTree jTree;
5160	6297	private MenuItem lookAtItem;
5161	6298	private MenuItem lookFromItem;
5162		- private MenuItem switchItem;
5163		- private MenuItem cutItem;
	6299	+ private MenuItem switchViewItem;
	6300	+ private JMenuItem cutItem;
5164	6301	private MenuItem undoItem;
5165	6302	private MenuItem redoItem;
5166		- private MenuItem duplicateItem;
5167		- private MenuItem cloneItem;
	6303	+ private JMenuItem duplicateItem;
	6304	+ private JMenuItem cloneItem;
5168	6305	private MenuItem cloneSupportItem;
5169	6306	private MenuItem overwriteGeoItem;
5170	6307	private MenuItem overwriteMatItem;
..	..	@@ -5185,13 +6322,13 @@
5185	6322	private MenuItem cloneGeometriesItem;
5186	6323	private MenuItem shareGeometriesItem;
5187	6324	private MenuItem mergeGeometriesItem;
5188		- private MenuItem copyItem;
	6325	+ private JMenuItem copyItem;
5189	6326	private MenuItem pasteItem;
5190		- private MenuItem pasteIntoItem;
5191		- private MenuItem pasteLinkItem;
5192		- private MenuItem pasteCloneItem;
5193		- private MenuItem pasteExpandItem;
5194		- private MenuItem clearItem;
	6327	+ private JMenuItem pasteIntoItem;
	6328	+ private JMenuItem pasteLinkItem;
	6329	+ private JMenuItem pasteCloneItem;
	6330	+ private JMenuItem pasteExpandItem;
	6331	+ private JMenuItem deleteItem;
5195	6332	private MenuItem clearAllItem;
5196	6333	private MenuItem genUVItem;
5197	6334	private MenuItem genNormalsMESHItem;
..	..	@@ -5226,6 +6363,10 @@
5226	6363	private MenuItem showleavesItem;
5227	6364	private MenuItem markleavesItem;
5228	6365	private MenuItem unmarkleavesItem;
	6366	+ private MenuItem rewindleavesItem;
	6367	+ private MenuItem unrewindleavesItem;
	6368	+ private MenuItem randomleavesItem;
	6369	+ private MenuItem unrandomleavesItem;
5229	6370
5230	6371	private MenuItem flipVItem;
5231	6372	private MenuItem unflipVItem;
..	..	@@ -5242,12 +6383,12 @@
5242	6383	private MenuItem transformGeometryItem;
5243	6384	private MenuItem transformChildrenItem;
5244	6385	private MenuItem hideItem;
5245		- private MenuItem grabItem;
	6386	+ private JMenuItem grabItem;
5246	6387	private MenuItem backItem;
5247	6388	private MenuItem frontItem;
5248	6389	private MenuItem cameraItem;
5249	6390	private MenuItem compositeItem;
5250		- private MenuItem randomItem;
	6391	+ private MenuItem switchItem;
5251	6392	private MenuItem physicsItem;
5252	6393	private MenuItem frameselectorItem;
5253	6394	private MenuItem scriptNodeItem;
..	..	@@ -5255,7 +6396,7 @@
5255	6396	private MenuItem switchTransfoItem;
5256	6397	private MenuItem morphItem;
5257	6398	private MenuItem linkerItem;
5258		- private MenuItem ungroupItem;
	6399	+ private JMenuItem ungroupItem;
5259	6400	private MenuItem editItem;
5260	6401	private MenuItem openWindowItem;
5261	6402	private MenuItem editLeafItem;
..	..	@@ -5271,6 +6412,8 @@
5271	6412	private MenuItem attachBumpItem;
5272	6413	private MenuItem detachBumpItem;
5273	6414	private MenuItem pigmentBumpItem;
	6415	+ private MenuItem embedTexturesItem;
	6416	+ private MenuItem deEmbedTexturesItem;
5274	6417
5275	6418	private MenuItem particleItem;
5276	6419	private MenuItem ragdollItem;
..	..	@@ -5321,5 +6464,5 @@
5321	6464
5322	6465	Menu cameraMenu;
5323	6466	MenuItem editCameraItem;
5324		- MenuItem revertCameraItem;
	6467	+ MenuItem restoreCameraItem;
5325	6468	}