~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,6 +528,8 @@
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"));
..	..	@@ -160,36 +540,37 @@
160	540	// redoItem = menu.add(new MenuItem("Redo"));
161	541	// redoItem.addActionListener(this);
162	542	// menu.add("-");
163		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	543	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
164	544	duplicateItem.addActionListener(this);
165		- cloneItem = menu.add(new MenuItem("Clone"));
	545	+
	546	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
166	547	cloneItem.addActionListener(this);
167		- if (Globals.ADVANCED)
	548	+ //if (Globals.ADVANCED)
168	549	{
169	550	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
170	551	cloneSupportItem.addActionListener(this);
171	552	}
	553	+ oe.jTree.popup.addSeparator();
172	554	menu.add("-");
173		- cutItem = menu.add(new MenuItem("Cut"));
	555	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
174	556	cutItem.addActionListener(this);
175		- copyItem = menu.add(new MenuItem("Copy"));
	557	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
176	558	copyItem.addActionListener(this);
177	559	pasteItem = menu.add(new MenuItem("Paste"));
178	560	pasteItem.addActionListener(this);
179		- menu.add("-");
180	561
181		- menu.add("-");
182		- 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"));
183	565	pasteIntoItem.addActionListener(this);
184		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	566	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
185	567	pasteLinkItem.addActionListener(this);
186		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	568	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
187	569	pasteCloneItem.addActionListener(this);
188		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	570	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
189	571	// pasteExpandItem.addActionListener(this);
190		- menu.add("-");
191		- clearItem = menu.add(new MenuItem("Clear"));
192		- clearItem.addActionListener(this);
	572	+ //menu.add("-");
	573	+ oe.jTree.popup.addSeparator();
193	574
194	575	if (Globals.ADVANCED)
195	576	{
..	..	@@ -203,23 +584,23 @@
203	584	//zBufferItem.addActionListener(this);
204	585	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
205	586	//normalLensItem.addActionListener(this);
206		- cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
207		- revertCameraItem.addActionListener(this);
	587	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	588	+ restoreCameraItem.addActionListener(this);
208	589
209		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
210		- toggleFullScreenItem.addItemListener(this);
211		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
212		- 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);
213	602
214		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
215		- toggleTextureItem.addItemListener(this);
216		- toggleTextureItem.setState(CameraPane.textureon);
217		-
218		- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
219		- toggleSwitchItem.addItemListener(this);
220		- toggleSwitchItem.setState(CameraPane.SWITCH);
221		-
222		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	603	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
223	604	toggleHandleItem.addItemListener(this);
224	605	toggleHandleItem.setState(CameraPane.HANDLES);
225	606
..	..	@@ -246,7 +627,7 @@
246	627
247	628	cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
248	629	toggleDebugItem.addItemListener(this);
249		- toggleDebugItem.setState(CameraPane.DEBUG);
	630	+ toggleDebugItem.setState(Globals.DEBUG);
250	631
251	632	cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
252	633	toggleFrustumItem.addItemListener(this);
..	..	@@ -274,15 +655,13 @@
274	655	{
275	656	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
276	657	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
277		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
278		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	658	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
279	659	oe.cameraMenu.add("-");
280	660	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
281	661	openWindowItem.addActionListener(this);
282		- editLeafItem.addActionListener(this);
283	662	lookAtItem.addActionListener(this);
284	663	//lookFromItem.addActinoListener(this);
285		- //switchItem.addActionListener(this);
	664	+ //switchViewItem.addActionListener(this);
286	665	}
287	666
288	667	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -326,22 +705,37 @@
326	705	setMasterItem.addActionListener(this);
327	706	}
328	707
329		- oe.menuBar.add(menu = new Menu("Group"));
330		- grabItem = menu.add(new MenuItem("Grab"));
331		- grabItem.addActionListener(this);
	708	+ oe.menuBar.add(menu = new Menu("Order"));
	709	+
332	710	backItem = menu.add(new MenuItem("Back"));
333	711	backItem.addActionListener(this);
334	712	frontItem = menu.add(new MenuItem("Front"));
335	713	frontItem.addActionListener(this);
336		- compositeItem = menu.add(new MenuItem("Composite"));
337		- 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	+ {
338	722	hideItem = menu.add(new MenuItem("Hidden Group"));
339	723	hideItem.addActionListener(this);
340		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	724	+ }
	725	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
341	726	ungroupItem.addActionListener(this);
342		- menu.add("-");
343		- randomItem = menu.add(new MenuItem("Switch node"));
344		- 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	+ {
345	739	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
346	740	switchGeoItem.addActionListener(this);
347	741	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -349,8 +743,6 @@
349	743	morphItem = menu.add(new MenuItem("Morph Group"));
350	744	morphItem.addActionListener(this);
351	745
352		- if (Globals.ADVANCED)
353		- {
354	746	menu.add("-");
355	747	physicsItem = menu.add(new MenuItem("Physics"));
356	748	physicsItem.addActionListener(this);
..	..	@@ -358,41 +750,47 @@
358	750	frameselectorItem.addActionListener(this);
359	751	scriptNodeItem = menu.add(new MenuItem("Script Node"));
360	752	scriptNodeItem.addActionListener(this);
361		- cameraItem = menu.add(new MenuItem("Camera"));
362		- cameraItem.addActionListener(this);
363	753	}
364	754
365	755	oe.menuBar.add(menu = new Menu("Object"));
366		- textureItem = menu.add(new MenuItem("Texture"));
367		- textureItem.addActionListener(this);
	756	+// textureItem = menu.add(new MenuItem("Texture"));
	757	+// textureItem.addActionListener(this);
368	758	billboardItem = menu.add(new MenuItem("Billboard"));
369	759	billboardItem.addActionListener(this);
370	760	csgItem = menu.add(new MenuItem("CSG"));
371	761	csgItem.addActionListener(this);
372		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	762	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
373	763	shadowXItem.addActionListener(this);
374		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	764	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
375	765	shadowYItem.addActionListener(this);
376		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	766	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
377	767	shadowZItem.addActionListener(this);
	768	+
378	769	if (Globals.ADVANCED)
379	770	{
	771	+ attributeItem = menu.add(new MenuItem("Attribute"));
	772	+ attributeItem.addActionListener(this);
380	773	menu.add("-");
381	774	linkerItem = menu.add(new MenuItem("Linker"));
382	775	linkerItem.addActionListener(this);
383		- attributeItem = menu.add(new MenuItem("Attribute"));
384		- attributeItem.addActionListener(this);
385	776	templateItem = menu.add(new MenuItem("Template"));
386	777	templateItem.addActionListener(this);
387	778	pointflowItem = menu.add(new MenuItem("Point Flow"));
388	779	pointflowItem.addActionListener(this);
389	780	}
390	781	menu.add("-");
	782	+ textureRatioRItem = menu.add(new MenuItem("Texture Ratio Red"));
	783	+ textureRatioRItem.addActionListener(this);
	784	+ textureRatioGItem = menu.add(new MenuItem("Texture Ratio Green"));
	785	+ textureRatioGItem.addActionListener(this);
	786	+ textureRatioBItem = menu.add(new MenuItem("Texture Ratio Blue"));
	787	+ textureRatioBItem.addActionListener(this);
	788	+ menu.add("-");
391	789	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
392	790	resetTransformItem.addActionListener(this);
393	791	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
394	792	resetCentroidItem.addActionListener(this);
395		- resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	793	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XZ"));
396	794	resetCentroidXZItem.addActionListener(this);
397	795	transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
398	796	transformGeometryItem.addActionListener(this);
..	..	@@ -410,7 +808,7 @@
410	808	genNormalsMESHItem.addActionListener(this);
411	809	if (Globals.ADVANCED)
412	810	{
413		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	811	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
414	812	genNormalsMINEItem.addActionListener(this);
415	813	}
416	814	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -444,6 +842,8 @@
444	842	}
445	843
446	844	oe.menuBar.add(menu = new Menu("Attributes"));
	845	+ clearVersionsItem = menu.add(new MenuItem("Clear Versions"));
	846	+ clearVersionsItem.addActionListener(this);
447	847	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
448	848	clearMaterialsItem.addActionListener(this);
449	849	resetAllItem = menu.add(new MenuItem("Reset All"));
..	..	@@ -466,10 +866,18 @@
466	866	hideleavesItem.addActionListener(this);
467	867	showleavesItem = menu.add(new MenuItem("Show Leaves"));
468	868	showleavesItem.addActionListener(this);
469		- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
	869	+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
470	870	markleavesItem.addActionListener(this);
471		- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
	871	+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
472	872	unmarkleavesItem.addActionListener(this);
	873	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	874	+ rewindleavesItem.addActionListener(this);
	875	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	876	+ unrewindleavesItem.addActionListener(this);
	877	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	878	+ randomleavesItem.addActionListener(this);
	879	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	880	+ unrandomleavesItem.addActionListener(this);
473	881	menu.add("-");
474	882	flipVItem = menu.add(new MenuItem("Flip V"));
475	883	flipVItem.addActionListener(this);
..	..	@@ -495,10 +903,15 @@
495	903	attachBumpItem.addActionListener(this);
496	904	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
497	905	pigmentBumpItem.addActionListener(this);
	906	+ //embedTexturesItem
498	907	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
499	908	detachPigmentItem.addActionListener(this);
500	909	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
501	910	detachBumpItem.addActionListener(this);
	911	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	912	+ embedTexturesItem.addActionListener(this);
	913	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	914	+ deEmbedTexturesItem.addActionListener(this);
502	915	menu.add("-");
503	916	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
504	917	sortbysizeItem.addActionListener(this);
..	..	@@ -509,6 +922,9 @@
509	922	shareGeometriesItem.addActionListener(this);
510	923	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
511	924	mergeGeometriesItem.addActionListener(this);
	925	+ menu.add("-");
	926	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	927	+ editLeafItem.addActionListener(this);
512	928	if (Globals.ADVANCED)
513	929	{
514	930	// Pretty much the same as duplicate and clone.
..	..	@@ -525,16 +941,97 @@
525	941	buildToolsMenu(menu);
526	942	}
527	943
	944	+ JTabbedPane resourcecontainer;
	945	+ cGridBag currenttab;
	946	+ //boolean added; // patch for jar
	947	+
	948	+ int totalcount = 0;
	949	+
	950	+ int tabcount = 0;
	951	+ int colcount = 0;
	952	+ int rowcount = 0;
	953	+ int texturecount = 0;
	954	+
	955	+ int columns = 5;
	956	+ int rows = 7;
	957	+
	958	+ public void ResourceCallBack(String[] path)
	959	+ {
	960	+// for (int i = 0; i < path.length; i++)
	961	+// System.out.print(path[i] + "/");
	962	+// System.out.println();
	963	+
	964	+ if (//rowcount == 0 \|\|
	965	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	966	+ {
	967	+ currenttab = new cGridBag();
	968	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	969	+ currenttab.setName(tabname);
	970	+ //added = false;
	971	+ resourcecontainer.add(currenttab);
	972	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	973	+ rowcount = 1;
	974	+ colcount = 0;
	975	+ texturecount = 0;
	976	+ }
	977	+
	978	+ if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") \|\| path[2].toLowerCase().endsWith(".png")))
	979	+ {
	980	+ //if (!added)
	981	+ {
	982	+ //added = true;
	983	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	984	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	985	+ }
	986	+
	987	+ AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
	988	+ totalcount++;
	989	+
	990	+ if (++colcount >= columns)
	991	+ {
	992	+ colcount = 0;
	993	+ currenttab.Return();
	994	+
	995	+ if (rowcount++ >= rows)
	996	+ {
	997	+ rowcount = 0;
	998	+ }
	999	+ }
	1000	+ }
	1001	+ else
	1002	+ {
	1003	+// if (!path[path.length-1].equals("icons"))
	1004	+// resourcecontainer.Return();
	1005	+ }
	1006	+ }
	1007	+
	1008	+ void CreateTexturePanel(cGridBag container)
	1009	+ {
	1010	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	1011	+ container.add(resourcecontainer);
	1012	+
	1013	+ Grafreed.ParseResources("textures", this);
	1014	+
	1015	+ // 935. System.out.println("Total = " + totalcount);
	1016	+ }
	1017	+
528	1018	void SetupUI2(ObjEditor oe)
529	1019	{
	1020	+ // June 2019
	1021	+ if (oe == null)
	1022	+ {
	1023	+ //super.SetupUI2(this);
	1024	+ //return;
	1025	+ }
	1026	+
	1027	+ if (copy != group)
	1028	+ {
	1029	+ //super.SetupUI2(this);
	1030	+ }
	1031	+
530	1032	//new Exception().printStackTrace();
531	1033
532	1034	oe.radioPanel = new JPanel(new GridBagLayout());
533		- oe.aConstraints.weightx = 1;
534		- oe.aConstraints.weighty = 0;
535		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
536		- oe.aConstraints.gridwidth = 100;
537		- oe.aConstraints.gridheight = 1;
538	1035	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
539	1036
540	1037	oe.buttonGroup = new ButtonGroup();
..	..	@@ -555,109 +1052,268 @@
555	1052	oe.radioPanel.add(dummyButton);
556	1053	oe.buttonGroup.add(dummyButton);
557	1054	*/
	1055	+ cGridBag versionManagerPanel = new cGridBag();
	1056	+
	1057	+ versionManagerPanel.preferredHeight = 4;
	1058	+
558	1059	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
559	1060
560		- oe.toolbarPanel.add(undoButton = new cButton("Undo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
561		- undoButton.setToolTipText("Undo changes");
562		- undoButton.addActionListener(this);
	1061	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1062	+ //minButton.setToolTipText("Minimize window");
	1063	+ //minButton.addActionListener(this);
563	1064
564		- oe.toolbarPanel.add(redoButton = new cButton("Redo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
565		- redoButton.setToolTipText("Redo changes");
566		- redoButton.addActionListener(this);
	1065	+ if (Globals.ADVANCED)
	1066	+ {
	1067	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1068	+// maxButton.setToolTipText("Maximize window");
	1069	+// maxButton.addActionListener(this);
	1070	+ }
567	1071
568		- oe.toolbarPanel.add(saveButton = new cButton("Save", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
569		- saveButton.setToolTipText("Save changes");
570		- saveButton.addActionListener(this);
	1072	+ cButton gcButton;
571	1073
572		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
573		- liveCB.setToolTipText("Enable animation");
574		- liveCB.addItemListener(this);
	1074	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1075	+// gcButton.setToolTipText("Garbage collect");
	1076	+// gcButton.addActionListener(new ActionListener()
	1077	+// {
	1078	+// public void actionPerformed(ActionEvent e)
	1079	+// {
	1080	+// System.gc();
	1081	+// }
	1082	+// });
	1083	+
	1084	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1085	+ collapseButton.setToolTipText("Collapse toolbar");
	1086	+ collapseButton.addActionListener(this);
	1087	+
	1088	+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1089	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1090	+ maximize3DButton.addActionListener(this);
	1091	+
	1092	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1093	+ twoButton.setToolTipText("Show 3D view only");
	1094	+ twoButton.addActionListener(this);
	1095	+ this.fullscreenLayout = twoButton;
	1096	+
	1097	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1098	+ threeButton.setToolTipText("Show controls and 3D view");
	1099	+ threeButton.addActionListener(this);
	1100	+ if (Globals.ADVANCED)
	1101	+ {
	1102	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1103	+ sixButton.setToolTipText("Show 3D view and controls");
	1104	+ sixButton.addActionListener(this);
	1105	+ }
	1106	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1107	+// sevenButton.setToolTipText("3-column layout");
	1108	+// sevenButton.addActionListener(this);
	1109	+ //
	1110	+
	1111	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1112	+ fullButton.setToolTipText("Full-screen window");
	1113	+ fullButton.addActionListener(this);
	1114	+
	1115	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1116	+ screenfitButton.setToolTipText("Screen fit");
	1117	+ screenfitButton.addActionListener(this);
575	1118
576		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1119	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1120	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1121	+ restoreCameraButton.addActionListener(this);
	1122	+
	1123	+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1124	+ saveVersionButton.setToolTipText("Duplicate current version");
	1125	+ saveVersionButton.addActionListener(this);
	1126	+
	1127	+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1128	+ deleteVersionButton.setToolTipText("Delete current version");
	1129	+ deleteVersionButton.addActionListener(this);
	1130	+ deleteVersionButton.setEnabled(false);
	1131	+
	1132	+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1133	+ previousVersionButton.setToolTipText("Previous version");
	1134	+ previousVersionButton.addActionListener(this);
	1135	+ previousVersionButton.setEnabled(false);
	1136	+
	1137	+ cGridBag updown = new cGridBag().setVertical(true);
	1138	+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1139	+ restoreButton.setToolTipText("Undo (restore current version)");
	1140	+ restoreButton.addActionListener(this);
	1141	+ restoreButton.setEnabled(false);
	1142	+
	1143	+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1144	+ replaceButton.setToolTipText("Save (replace current version)");
	1145	+ replaceButton.addActionListener(this);
	1146	+ replaceButton.setEnabled(false);
	1147	+
	1148	+ versionManagerPanel.add(updown);
	1149	+
	1150	+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1151	+ nextVersionButton.setToolTipText("Next version");
	1152	+ nextVersionButton.addActionListener(this);
	1153	+ nextVersionButton.setEnabled(false);
	1154	+
	1155	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
577	1156	oneStepButton.setToolTipText("Animate one step forward");
578	1157	oneStepButton.addActionListener(this);
579	1158
580		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	1159	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1160	+ liveCB.setToolTipText("Enable animation");
	1161	+ liveCB.addItemListener(this);
	1162	+
	1163	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
581	1164	fastCB.setToolTipText("Fast mode");
582	1165	fastCB.addItemListener(this);
583	1166
584		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
585		- trackCB.setToolTipText("Enable tracking");
586		- trackCB.addItemListener(this);
587		-
588		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
589		- screenfitButton.setToolTipText("Screen fit");
590		- screenfitButton.addActionListener(this);
	1167	+ //oe.toolboxPanel.Return();
	1168	+
	1169	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1170	+// trackCB.setToolTipText("Enable tracking");
	1171	+// trackCB.addItemListener(this);
591	1172
592	1173	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
593	1174	// screenfitpointButton.addActionListener(this);
594	1175
595	1176	if (Globals.ADVANCED)
596	1177	{
597		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1178	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
598	1179	snapobjectButton.addActionListener(this);
599	1180	snapobjectButton.setToolTipText("Snap Object");
	1181	+
	1182	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1183	+ fourButton.addActionListener(this);
	1184	+ fourButton.setToolTipText("Show control panel only");
600	1185	}
601	1186
602		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
603		- flashSelectionButton.setToolTipText("Show selection");
604		- flashSelectionButton.addActionListener(this);
	1187	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
605	1188
606		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
607		-
608		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
609		- twoButton.setToolTipText("Show center view only");
610		- twoButton.addActionListener(this);
611		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
612		- fourButton.addActionListener(this);
613		- fourButton.setToolTipText("Show left panel only");
614		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
615		- sixButton.setToolTipText("2-column layout left");
616		- sixButton.addActionListener(this);
617		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
618		- threeButton.setToolTipText("2-column layout right");
619		- threeButton.addActionListener(this);
620		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
621		- sevenButton.setToolTipText("3-column layout");
622		- sevenButton.addActionListener(this);
623		- //
624	1189
625		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
626		- rootButton.setToolTipText("Edit selection in new tab");
	1190	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1191	+ rootButton.setToolTipText("Open selection in new tab");
627	1192	rootButton.addActionListener(this);
628	1193
629		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1194	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
630	1195	closeButton.setToolTipText("Close tab");
631	1196	closeButton.addActionListener(this);
632	1197	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
633	1198	//clearButton.addActionListener(this);
634		-
635		- cGridBag commandsPanel = new cGridBag();
	1199	+
	1200	+ cGridBag row1 = new cGridBag();
636	1201
637		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
638		- editButton.setToolTipText("Edit selection");
	1202	+ // INSERT
	1203	+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1204	+ gridButton.setToolTipText("Create ground");
	1205	+ gridButton.addActionListener(this);
	1206	+
	1207	+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1208	+ boxButton.setToolTipText("Create box");
	1209	+ boxButton.addActionListener(this);
	1210	+
	1211	+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1212	+ superButton.setToolTipText("Create superellipsoid");
	1213	+ superButton.addActionListener(this);
	1214	+
	1215	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1216	+ sphereButton.setToolTipText("Create sphere");
	1217	+ sphereButton.addActionListener(this);
	1218	+
	1219	+ row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1220	+ coneButton.setToolTipText("Create cone");
	1221	+ coneButton.addActionListener(this);
	1222	+
	1223	+ row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1224	+ torusButton.setToolTipText("Create torus");
	1225	+ torusButton.addActionListener(this);
	1226	+
	1227	+ if (false) //Globals.ADVANCED)
	1228	+ {
	1229	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1230	+ kleinButton.setToolTipText("Create Klein bottle");
	1231	+ kleinButton.addActionListener(this);
	1232	+ }
	1233	+
	1234	+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1235	+ particlesButton.setToolTipText("Create particle system");
	1236	+ particlesButton.addActionListener(this);
	1237	+
	1238	+ oe.toolboxPanel.add(row1);
	1239	+
	1240	+ cGridBag row2 = new cGridBag();
	1241	+
	1242	+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1243	+ groupButton.setToolTipText("Create group");
	1244	+ groupButton.addActionListener(this);
	1245	+
	1246	+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1247	+ compositeButton.setToolTipText("Create composite");
	1248	+ compositeButton.addActionListener(this);
	1249	+
	1250	+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1251	+ switchButton.setToolTipText("Create item switcher");
	1252	+ switchButton.addActionListener(this);
	1253	+
	1254	+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1255	+ loopButton.setToolTipText("Create loop");
	1256	+ loopButton.addActionListener(this);
	1257	+
	1258	+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1259	+ textureButton.setToolTipText("Create texture");
	1260	+ textureButton.addActionListener(this);
	1261	+
	1262	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1263	+ overlayButton.setToolTipText("Create overlay");
	1264	+ overlayButton.addActionListener(this);
	1265	+
	1266	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1267	+ lightButton.setToolTipText("Create light");
	1268	+ lightButton.addActionListener(this);
	1269	+
	1270	+ oe.toolboxPanel.add(row2);
	1271	+
	1272	+ cGridBag textures = new cGridBag();
	1273	+
	1274	+ CreateTexturePanel(textures);
	1275	+
	1276	+ int tabCount = resourcecontainer.getTabCount();
	1277	+
	1278	+ if (tabCount > 0)
	1279	+ resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
	1280	+
	1281	+ oe.toolboxPanel.add(textures);
	1282	+
	1283	+ textures.preferredHeight = 100;
	1284	+
	1285	+ CreateSkyboxPanel(oe.skyboxPanel);
	1286	+
	1287	+ // EDIT panel
	1288	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1289	+ editButton.setToolTipText("Pin selection controls");
639	1290	editButton.addActionListener(this);
640	1291
641		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
642		- uneditButton.setToolTipText("Unedit selection");
	1292	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1293	+ uneditButton.setToolTipText("Unpin and remove selection controls");
643	1294	uneditButton.addActionListener(this);
644	1295
645		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
646		- allParamsButton.setToolTipText("Edit all params");
	1296	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1297	+ allParamsButton.setToolTipText("Show all controls");
647	1298	allParamsButton.addActionListener(this);
648	1299
649		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
650		- clearPanelButton.setToolTipText("Clear edit panel");
	1300	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1301	+ clearPanelButton.setToolTipText("Clear all controls");
651	1302	clearPanelButton.addActionListener(this);
652	1303
653		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
654		- unselectButton.setToolTipText("Unselect");
655		- unselectButton.addActionListener(this);
	1304	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1305	+ //unselectButton.setToolTipText("Unselect");
	1306	+ //unselectButton.addActionListener(this);
656	1307
657		- commandsPanel.preferredHeight = 1;
	1308	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1309	+ flashSelectionButton.setToolTipText("Highlight selection");
	1310	+ flashSelectionButton.addActionListener(this);
658	1311
659		- oe.treePanel.add(commandsPanel);
660		- oe.treePanel.Return();
	1312	+ editCommandsPanel.preferredHeight = 1;
	1313	+
	1314	+ SetPinStates(false);
	1315	+// oe.treePanel.add(commandsPanel);
	1316	+// oe.treePanel.Return();
661	1317
662	1318	// oe.aConstraints.gridx += 1;
663	1319	// oe.aConstraints.weighty = 0;
..	..	@@ -672,34 +1328,24 @@
672	1328
673	1329	cGridBag jSPPanel = new cGridBag();
674	1330
	1331	+ jSPPanel.preferredHeight = 20;
	1332	+
675	1333	JScrollPane jSP;
676	1334	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
677		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1335	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
678	1336	ResetModel();
679	1337
680	1338	oe.treePanel.add(jSPPanel);
681	1339	oe.treePanel.Return();
682	1340
683		- cGridBag copyOptionsPanel = new cGridBag();
684		-
685		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
686		- colorCB.setToolTipText("Copy color when dropped");
687		- colorCB.addItemListener(this);
688		-
689		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
690		- materialCB.setToolTipText("Copy material when dropped");
691		- materialCB.addItemListener(this);
692		-
693		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
694		- textureCB.setToolTipText("Copy texture when dropped");
695		- textureCB.addItemListener(this);
696		-
697		- copyOptionsPanel.preferredHeight = 1;
698		- oe.treePanel.add(copyOptionsPanel);
	1341	+ oe.treePanel.add(versionManagerPanel);
699	1342	oe.treePanel.Return();
	1343	+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1344	+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
	1345	+ versionSliderPane.preferredHeight = 3;
700	1346
701		-// mainPanel.setDividerLocation(0.5); //1.0);
702		-// mainPanel.setResizeWeight(0.5);
	1347	+// mainPanel.setDividerLocation(0.1); //1.0);
	1348	+ mainPanel.setResizeWeight(0.4);
703	1349
704	1350	//jList.addListSelectionListener(this);
705	1351	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -707,7 +1353,7 @@
707	1353	//jTree.setEditable(true);
708	1354	oe.jTree.setDragEnabled(true);
709	1355	//jTree.setPreferredSize(new Dimension(10,10));
710		- jSP.setPreferredSize(new Dimension(100,200));
	1356	+ //jSP.setPreferredSize(new Dimension(100,200));
711	1357
712	1358	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
713	1359
..	..	@@ -719,29 +1365,49 @@
719	1365	dgr.addDragGestureListener(this);
720	1366	}catch(Exception e) {}
721	1367	*/
722		- radio.layout = sevenButton;
	1368	+ radio.layout = threeButton; // sixButton;
723	1369	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
724	1370	}
725	1371
726	1372	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
727	1373	{
	1374	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1375	+ colorCB.setToolTipText("Copy color when dropped");
	1376	+ colorCB.addItemListener(this);
	1377	+
	1378	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1379	+ materialCB.setToolTipText("Copy material when dropped");
	1380	+ materialCB.addItemListener(this);
	1381	+
	1382	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1383	+ textureCB.setToolTipText("Copy texture when dropped");
	1384	+ textureCB.addItemListener(this);
	1385	+
	1386	+ panel.Return();
	1387	+
728	1388	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
729	1389	boxCB.setToolTipText("Display bounding boxes");
730	1390	boxCB.addItemListener(this);
731	1391
732	1392	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
733		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1393	+ zoomBoxCB.setToolTipText("Display only for wheel");
734	1394	zoomBoxCB.addItemListener(this);
735	1395
736	1396	if (true) // Globals.ADVANCED)
737	1397	{
738		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
739		- supportCB.setToolTipText("Enable rigging");
740		- supportCB.addItemListener(this);
	1398	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1399	+// supportCB.setToolTipText("Enable rigging");
	1400	+// supportCB.addItemListener(this);
	1401	+
	1402	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1403	+ freezeCB.setToolTipText("Fast moving camera");
	1404	+ freezeCB.addItemListener(this);
741	1405
742	1406	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
743	1407	// localCB.addItemListener(this);
744	1408
	1409	+ panel.Return();
	1410	+
745	1411	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
746	1412	crowdCB.setToolTipText("Used for crowds");
747	1413	crowdCB.addItemListener(this);
..	..	@@ -750,14 +1416,19 @@
750	1416	smoothCB.setToolTipText("Snapping delay");
751	1417	smoothCB.addItemListener(this);
752	1418
753		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
754		- slowCB.setToolTipText("Smooth interpolation");
755		- slowCB.addItemListener(this);
	1419	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1420	+// slowCB.setToolTipText("Smooth interpolation");
	1421	+// slowCB.addItemListener(this);
	1422	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1423	+ minshaderCB.setToolTipText("Minimal fast shader");
	1424	+ minshaderCB.addItemListener(this);
756	1425
757	1426	// constraints.gridy += 1;
758	1427	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
759	1428	// speakerMocapCB.addItemListener(this);
760	1429
	1430	+ panel.Return();
	1431	+
761	1432	if (false)
762	1433	{
763	1434	// handled in scripts
..	..	@@ -772,34 +1443,82 @@
772	1443	//constraints.gridy += 1;
773	1444	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
774	1445	smoothfocusCB.addItemListener(this);
	1446	+ panel.Return();
775	1447	}
776	1448
777	1449	//constraints.gridx += 1;
778	1450	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
779	1451	// debugCB.addItemListener(this);
780	1452
	1453	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1454	+ trackCB.setToolTipText("Enable tracking target");
	1455	+ trackCB.addItemListener(this);
	1456	+
781	1457	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1458	+ oeilCB.setToolTipText("Move camera when tracking");
782	1459	oeilCB.addItemListener(this);
783	1460
	1461	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1462	+ shadowCB.setToolTipText("When live compute shadows");
	1463	+ shadowCB.addItemListener(this);
	1464	+
	1465	+ panel.Return();
	1466	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1467	+ toggleTextureCB.setToolTipText("Load textures");
	1468	+ toggleTextureCB.addItemListener(this);
	1469	+
	1470	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1471	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1472	+ toggleSwitchCB.addItemListener(this);
	1473	+
	1474	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1475	+ autokeepCB.setToolTipText("On structure change");
	1476	+ autokeepCB.addItemListener(this);
	1477	+
	1478	+ panel.Return();
	1479	+ if (Globals.ADVANCED)
	1480	+ {
784	1481	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
785	1482	lookAtCB.setToolTipText("Look-at target");
786	1483	lookAtCB.addItemListener(this);
	1484	+ }
787	1485
788	1486	}
789	1487
790	1488	cGridBag fill = new cGridBag();
791		-
792	1489	fill.preferredHeight = 200;
	1490	+ cGridBag fill2 = new cGridBag();
	1491	+ fill2.preferredHeight = 200;
	1492	+ cGridBag fill3 = new cGridBag();
	1493	+ fill3.preferredHeight = 200;
793	1494
794	1495	panel.add(fill);
	1496	+ panel.add(fill2);
	1497	+ panel.add(fill3);
795	1498
796	1499	}
797	1500
798	1501	void EditObject(Object3D obj)
799	1502	{
	1503	+ //assert(obj instanceof Composite);
	1504	+
	1505	+// if (obj.versionlist == null)
	1506	+// {
	1507	+// obj.versionlist = new Object3D[100];
	1508	+// obj.versionindex = -1;
	1509	+// }
	1510	+
800	1511	cRadio radioButton = new cRadio(obj.name);
	1512	+
	1513	+ // June 2019. Patch to avoid bug with transparency.
	1514	+ radioButton.hadMaterial = obj.material != null;
	1515	+ if (!radioButton.hadMaterial)
	1516	+ {
	1517	+ obj.material = new cMaterial();
	1518	+ }
	1519	+
801	1520	radioButton.SetObject(obj);
802		- radioButton.layout = sevenButton;
	1521	+ radioButton.layout = threeButton; // sixButton;
803	1522	radioButton.SetCamera(cameraView.renderCamera, false);
804	1523	radioButton.addActionListener(this);
805	1524	radioPanel.add(radioButton);
..	..	@@ -809,31 +1528,41 @@
809	1528
810	1529	void SetupViews(ObjEditor oe)
811	1530	{
	1531	+ theFrame = this;
	1532	+
812	1533	oe.SetupViews();
813	1534
	1535	+ if (Globals.DEBUG)
814	1536	System.out.println("SetupViews");
815	1537	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
816	1538	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
817	1539	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
818	1540	}
819	1541
820		- JCheckBox liveCB;
821		- JCheckBox supportCB;
822		- JCheckBox localCB;
823		- JCheckBox crowdCB;
824		- JCheckBox smoothCB;
825		- JCheckBox fastCB;
826		- JCheckBox slowCB;
827		- JCheckBox boxCB;
828		- JCheckBox zoomBoxCB;
829		- JCheckBox trackCB;
830		- JCheckBox smoothfocusCB;
	1542	+ cToggleButton liveCB;
	1543	+ cCheckBox supportCB;
	1544	+ cCheckBox localCB;
	1545	+ cCheckBox crowdCB;
	1546	+ cCheckBox smoothCB;
	1547	+ cCheckBox minshaderCB;
	1548	+
	1549	+ cToggleButton fastCB;
	1550	+ cCheckBox slowCB;
	1551	+ cCheckBox boxCB;
	1552	+ cCheckBox zoomBoxCB;
	1553	+ cCheckBox freezeCB;
	1554	+ //cToggleButton trackCB;
	1555	+ cCheckBox trackCB;
	1556	+ cCheckBox smoothfocusCB;
831	1557	// JCheckBox speakerMocapCB;
832		- JCheckBox speakerCameraCB;
833		- JCheckBox speakerFocusCB;
834		- JCheckBox debugCB;
835		- JCheckBox oeilCB;
836		- JCheckBox lookAtCB;
	1558	+ cCheckBox speakerCameraCB;
	1559	+ cCheckBox speakerFocusCB;
	1560	+ cCheckBox debugCB;
	1561	+
	1562	+ cCheckBox oeilCB;
	1563	+ cCheckBox shadowCB;
	1564	+ cCheckBox autokeepCB;
	1565	+ cCheckBox lookAtCB;
837	1566
838	1567	// static int COLOR = 1;
839	1568	// static int MATERIAL = 2;
..	..	@@ -841,9 +1570,9 @@
841	1570
842	1571	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
843	1572
844		- JCheckBox colorCB;
845		- JCheckBox materialCB;
846		- JCheckBox textureCB;
	1573	+ cCheckBox colorCB;
	1574	+ cCheckBox materialCB;
	1575	+ cCheckBox textureCB;
847	1576
848	1577	public void itemStateChanged(ItemEvent e)
849	1578	{
..	..	@@ -871,6 +1600,7 @@
871	1600	} else if(e.getSource() == liveCB)
872	1601	{
873	1602	cameraView.ToggleLive();
	1603	+ refreshContents(false);
874	1604	}
875	1605	else if(e.getSource() == supportCB)
876	1606	{
..	..	@@ -886,6 +1616,12 @@
886	1616	{
887	1617	cameraView.ToggleInertia();
888	1618	cameraView.repaint();
	1619	+ }
	1620	+ else if(e.getSource() == minshaderCB)
	1621	+ {
	1622	+ Globals.MINSHADER ^= true;
	1623	+ cameraView.programInitialized = false;
	1624	+ cameraView.repaint();
889	1625	}
890	1626	else if(e.getSource() == localCB)
891	1627	{
..	..	@@ -935,6 +1671,18 @@
935	1671	{
936	1672	cameraView.ToggleOeil();
937	1673	}
	1674	+ else if(e.getSource() == shadowCB)
	1675	+ {
	1676	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1677	+ }
	1678	+ else if(e.getSource() == freezeCB)
	1679	+ {
	1680	+ Globals.FREEZEONMOVE ^= true;
	1681	+ }
	1682	+ else if(e.getSource() == autokeepCB)
	1683	+ {
	1684	+ Globals.REPLACEONMAKE ^= true;
	1685	+ }
938	1686	else if(e.getSource() == lookAtCB)
939	1687	{
940	1688	cameraView.ToggleLookAt();
..	..	@@ -951,7 +1699,8 @@
951	1699
952	1700	/**/
953	1701	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
954		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1702	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1703	+ TreePath path = objEditor.jTree.getSelectionPath();
955	1704	if ((path == null) \|\| (path.getPathCount() <= 1)) {
956	1705	// We can't move the root node or an empty selection
957	1706	return;
..	..	@@ -1014,8 +1763,6 @@
1014	1763	}
1015	1764	}
1016	1765
1017		- String string = (String) object;
1018		-
1019	1766	System.out.println("Transfer = " + object + "; drop : " + target);
1020	1767	// if( object instanceof java.io.File[])
1021	1768	// {
..	..	@@ -1023,6 +1770,8 @@
1023	1770	// objEditor.DropFile((java.io.File[]) object, true);
1024	1771	// return;
1025	1772	// }
	1773	+
	1774	+ String string = object.toString();
1026	1775
1027	1776	// File path for Mac and Windows
1028	1777	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1068,23 +1817,33 @@
1068	1817
1069	1818	assert target == objEditor.jTree;
1070	1819	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1820	+ Object3D destinationLeaf;
1071	1821	try {
1072		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1822	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1073	1823	} catch (Exception e) {
1074	1824	System.out.println("destinationPath : " + destinationPath);
1075	1825	return;
1076	1826	}
1077	1827
1078		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1828	+ for (int i=group.selection.size(); --i>=0;)
1079	1829	{
	1830	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1831	+
	1832	+ // Cannot move into itself
	1833	+ if (child == destinationLeaf)
	1834	+ return;
	1835	+ }
	1836	+
	1837	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1838	+// {
1080	1839	loadClipboard(true);
1081	1840	objEditor.jTree.setSelectionPath(destinationPath);
1082	1841	pasteInto(false, false);
1083		- } else {
1084		- loadClipboard(false);
1085		- objEditor.jTree.setSelectionPath(destinationPath);
1086		- pasteInto(false, false); // true); // ???
1087		- }
	1842	+// } else {
	1843	+// loadClipboard(false);
	1844	+// objEditor.jTree.setSelectionPath(destinationPath);
	1845	+// pasteInto(false, false); // true); // ???
	1846	+// }
1088	1847	}
1089	1848	public void dropActionChanged(DropTargetDragEvent dtde)
1090	1849	// Called if the user has modified the current drop gesture
..	..	@@ -1140,7 +1899,12 @@
1140	1899	TreePath path;
1141	1900
1142	1901	public TransferableTreePath(TreePath tp) {
1143		- path = tp;
	1902	+ Object[] objs = new Object[tp.getPathCount()];
	1903	+ for (int i=0; i<objs.length; i++)
	1904	+ {
	1905	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1906	+ }
	1907	+ path = new TreePath(objs);
1144	1908	}
1145	1909
1146	1910	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1189,22 +1953,30 @@
1189	1953	{
1190	1954	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1191	1955	//heightFieldItem.addActionListener(this);
1192		- gridItem = menu.add(new MenuItem("Grid"));
1193		- gridItem.addActionListener(this);
1194		- rectoidItem = menu.add(new MenuItem("Box"));
1195		- rectoidItem.addActionListener(this);
1196		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1197		- ellipsoidItem.addActionListener(this);
1198		- coneItem = menu.add(new MenuItem("Cone"));
1199		- coneItem.addActionListener(this);
1200		- torusItem = menu.add(new MenuItem("Torus"));
1201		- torusItem.addActionListener(this);
1202		- superItem = menu.add(new MenuItem("Superellipsoid"));
1203		- superItem.addActionListener(this);
	1956	+// gridItem = menu.add(new MenuItem("Grid"));
	1957	+// gridItem.addActionListener(this);
	1958	+// rectoidItem = menu.add(new MenuItem("Box"));
	1959	+// rectoidItem.addActionListener(this);
	1960	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1961	+// ellipsoidItem.addActionListener(this);
	1962	+// coneItem = menu.add(new MenuItem("Cone"));
	1963	+// coneItem.addActionListener(this);
	1964	+// torusItem = menu.add(new MenuItem("Torus"));
	1965	+// torusItem.addActionListener(this);
	1966	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1967	+// superItem.addActionListener(this);
	1968	+
	1969	+ cameraItem = menu.add(new MenuItem("Camera"));
	1970	+ cameraItem.addActionListener(this);
	1971	+
	1972	+ if (!Globals.ADVANCED)
	1973	+ {
1204	1974	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1205	1975	kleinItem.addActionListener(this);
1206		- particleItem = menu.add(new MenuItem("Particle system"));
1207		- particleItem.addActionListener(this);
	1976	+ }
	1977	+
	1978	+// particleItem = menu.add(new MenuItem("Particle system"));
	1979	+// particleItem.addActionListener(this);
1208	1980	if (Globals.ADVANCED)
1209	1981	{
1210	1982	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1230,15 +2002,15 @@
1230	2002	}
1231	2003	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1232	2004	bezierItem.addActionListener(this);
1233		- overlayItem = menu.add(new MenuItem("Overlay"));
1234		- overlayItem.addActionListener(this);
1235		- lightItem = menu.add(new MenuItem("Light"));
1236		- lightItem.addActionListener(this);
	2005	+// overlayItem = menu.add(new MenuItem("Overlay"));
	2006	+// overlayItem.addActionListener(this);
	2007	+// lightItem = menu.add(new MenuItem("Light"));
	2008	+// lightItem.addActionListener(this);
1237	2009	menu.add("-");
1238	2010	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1239	2011	//superLoopItem.addActionListener(this);
1240		- loopItem = menu.add(new MenuItem("Loop"));
1241		- loopItem.addActionListener(this);
	2012	+// loopItem = menu.add(new MenuItem("Loop"));
	2013	+// loopItem.addActionListener(this);
1242	2014	doubleItem = menu.add(new MenuItem("Fork"));
1243	2015	doubleItem.addActionListener(this);
1244	2016	if (Globals.ADVANCED)
..	..	@@ -1254,6 +2026,9 @@
1254	2026	animationItem.addItemListener(this);
1255	2027	animationItem.setState(Globals.ANIMATION);
1256	2028
	2029	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	2030	+ archiveItem.addActionListener(this);
	2031	+
1257	2032	menu.add("-");
1258	2033	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1259	2034	parseverticesItem.addActionListener(this);
..	..	@@ -1266,6 +2041,8 @@
1266	2041	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1267	2042	reduce34MorphItem.addActionListener(this);
1268	2043	menu.add("-");
	2044	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	2045	+ memoryItem.addActionListener(this);
1269	2046	menu.add(computeAOItem = new MenuItem("Compute AO"));
1270	2047	computeAOItem.addActionListener(this);
1271	2048
..	..	@@ -1274,11 +2051,9 @@
1274	2051	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1275	2052	mirrorItem.addActionListener(this);
1276	2053	menu.add("-");
1277		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1278		- memoryItem.addActionListener(this);
1279	2054	menu.add(analyzeItem = new MenuItem("Analyze"));
1280	2055	analyzeItem.addActionListener(this);
1281		- menu.add(dumpItem = new MenuItem("Dump"));
	2056	+ menu.add(dumpItem = new MenuItem("Print"));
1282	2057	dumpItem.addActionListener(this);
1283	2058	// menu.add(pathItem = new MenuItem("From-to path"));
1284	2059	// pathItem.addActionListener(this);
..	..	@@ -1361,24 +2136,24 @@
1361	2136	switch(axis)
1362	2137	{
1363	2138	case 0 :
1364		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1365		- vert2.x = minima.x; vert2.y = maxima.y; vert2.z = minima.z;
1366		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1367		- vert4.x = minima.x; vert4.y = maxima.y; vert4.z = maxima.z;
	2139	+ vert1.x = minima.x + 0.001f; vert1.y = minima.y; vert1.z = minima.z;
	2140	+ vert2.x = minima.x + 0.001f; vert2.y = maxima.y; vert2.z = minima.z;
	2141	+ vert3.x = minima.x + 0.001f; vert3.y = minima.y; vert3.z = maxima.z;
	2142	+ vert4.x = minima.x + 0.001f; vert4.y = maxima.y; vert4.z = maxima.z;
1368	2143	norm = cVector.X;
1369	2144	break;
1370	2145	case 1 :
1371		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1372		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1373		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1374		- vert4.x = maxima.x; vert4.y = minima.y; vert4.z = maxima.z;
	2146	+ vert1.x = minima.x; vert1.y = minima.y + 0.001f; vert1.z = minima.z;
	2147	+ vert2.x = maxima.x; vert2.y = minima.y + 0.001f; vert2.z = minima.z;
	2148	+ vert3.x = minima.x; vert3.y = minima.y + 0.001f; vert3.z = maxima.z;
	2149	+ vert4.x = maxima.x; vert4.y = minima.y + 0.001f; vert4.z = maxima.z;
1375	2150	norm = cVector.Y;
1376	2151	break;
1377	2152	case 2 :
1378		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1379		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1380		- vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z;
1381		- vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z;
	2153	+ vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z + 0.001f;
	2154	+ vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z + 0.001f;
	2155	+ vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z + 0.001f;
	2156	+ vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z + 0.001f;
1382	2157	norm = cVector.Z;
1383	2158	break;
1384	2159	}
..	..	@@ -1419,9 +2194,38 @@
1419	2194	shadow.material = new cMaterial(obj.material);
1420	2195	shadow.material.diffuse = 0.0001f;
1421	2196	shadow.material.specular = 0.0001f;
	2197	+ shadow.material.opacity = 0.75f;
	2198	+
	2199	+ AllocProjectedVertices(shadow);
	2200	+
	2201	+ shadow.projectedVertices[1].x = 300;
1422	2202
1423	2203	makeSomething(shadow);
1424	2204	}
	2205	+
	2206	+ private void ClearUnpinned()
	2207	+ {
	2208	+ //for (Object3D obj : listUI)
	2209	+ for (int i=listUI.size(); --i>=0;)
	2210	+ {
	2211	+ Object3D obj = listUI.elementAt(i);
	2212	+ if (!obj.pinned)
	2213	+ {
	2214	+ obj.CloseUI();
	2215	+ listUI.remove(i);
	2216	+ }
	2217	+ }
	2218	+ }
	2219	+
	2220	+ private void EditElement(Object3D elem, boolean newWindow)
	2221	+ {
	2222	+ // if (!(elem instanceof Composite))
	2223	+ // newWindow = false;
	2224	+ listUI.add(elem);
	2225	+ elem.openEditWindow(this, newWindow); //, false);
	2226	+ System.out.println("edit : " + elem);
	2227	+ elem.editWindow.refreshContents(true); // ? new
	2228	+ }
1425	2229
1426	2230	/**
1427	2231	* applyExample
..	..	@@ -1666,7 +2470,7 @@
1666	2470	{
1667	2471	ScreenFit();
1668	2472	} else
1669		- if (source == switchItem)
	2473	+ if (source == switchViewItem)
1670	2474	{
1671	2475	cVector v1 = new cVector();
1672	2476	cVector v2 = new cVector();
..	..	@@ -1675,11 +2479,11 @@
1675	2479	objEditor.cameraView.renderCamera.setAim(v2, v1);
1676	2480	objEditor.cameraView.repaint();
1677	2481	} else
1678		- if (source == rectoidItem)
	2482	+ if (source == rectoidItem \|\| source == boxButton)
1679	2483	{
1680	2484	makeSomething(new Box());
1681	2485	} else
1682		- if (source == particleItem)
	2486	+ if (source == particleItem \|\| source == particlesButton)
1683	2487	{
1684	2488	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1685	2489	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1758,27 +2562,27 @@
1758	2562
1759	2563	makeSomething(obj);
1760	2564	} else
1761		- if (source == gridItem)
	2565	+ if (source == gridItem \|\| source == gridButton)
1762	2566	{
1763	2567	makeSomething(new Grid());
1764	2568	} else
1765		- if (source == ellipsoidItem)
	2569	+ if (source == ellipsoidItem \|\| source == sphereButton)
1766	2570	{
1767	2571	makeSomething(new Sphere());
1768	2572	} else
1769		- if (source == coneItem)
	2573	+ if (source == coneItem \|\| source == coneButton)
1770	2574	{
1771	2575	makeSomething(new Cone());
1772	2576	} else
1773		- if (source == torusItem)
	2577	+ if (source == torusItem \|\| source == torusButton)
1774	2578	{
1775	2579	makeSomething(new Torus());
1776	2580	} else
1777		- if (source == superItem)
	2581	+ if (source == superItem \|\| source == superButton)
1778	2582	{
1779	2583	makeSomething(new Superellipsoid());
1780	2584	} else
1781		- if (source == kleinItem)
	2585	+ if (source == kleinItem \|\| source == kleinButton)
1782	2586	{
1783	2587	makeSomething(new Klein());
1784	2588	} else
..	..	@@ -1798,7 +2602,7 @@
1798	2602	{
1799	2603	makeSomething(new BezierSurface());
1800	2604	} else
1801		- if (source == overlayItem)
	2605	+ if (source == overlayItem \|\| source == overlayButton)
1802	2606	{
1803	2607	/*
1804	2608	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1846,10 +2650,27 @@
1846	2650	s.setup();
1847	2651	makeSomething(s);
1848	2652	} else
1849		- if (source == lightItem)
	2653	+ if (source == lightItem \|\| source == lightButton)
1850	2654	{
1851	2655	makeSomething(new Light());
1852	2656	} else
	2657	+// if (source == skybox1Button \|\|
	2658	+// source == skybox2Button \|\|
	2659	+// source == skybox3Button \|\|
	2660	+// source == skybox4Button \|\|
	2661	+// source == skybox5Button \|\|
	2662	+// source == skybox6Button \|\|
	2663	+// source == skybox7Button \|\|
	2664	+// source == skybox11Button \|\|
	2665	+// source == skybox12Button \|\|
	2666	+// source == skybox13Button \|\|
	2667	+// source == skybox14Button \|\|
	2668	+// source == skybox15Button \|\|
	2669	+// source == skybox16Button \|\|
	2670	+// source == skybox17Button)
	2671	+// {
	2672	+// ChangeSkybox(source);
	2673	+// } else
1853	2674	if (source == csgItem)
1854	2675	{
1855	2676	group(new CSG());
..	..	@@ -1896,30 +2717,38 @@
1896	2717
1897	2718	group(g);
1898	2719	} else
1899		- if (source == loopItem)
	2720	+ if (source == loopItem \|\| source == loopButton)
1900	2721	{
	2722	+ if (!group.selection.isEmpty())
	2723	+ {
1901	2724	Composite csg = new GroupLeaf();
1902	2725	csg.count = 5;
1903		- group(csg);
1904		- Composite child = new cGroup();
	2726	+ Composite child = new cGroup("Branch");
1905	2727	csg.addChild(child);
1906	2728	child.addChild(csg);
	2729	+ group(csg);
	2730	+ }
1907	2731	} else
1908	2732	if (source == doubleItem)
1909	2733	{
1910		- Composite csg = new GroupLeaf();
	2734	+ if (!group.selection.isEmpty())
	2735	+ {
	2736	+ Composite csg = new GroupLeaf("Fork");
1911	2737	csg.count = 5;
	2738	+ Composite child = new cGroup("Branch A");
	2739	+ csg.addChild(child);
	2740	+ child.addChild(csg);
	2741	+ child = new cGroup("Branch B");
	2742	+ csg.addChild(child);
	2743	+ child.addChild(csg);
1912	2744	group(csg);
1913		- Composite child = new cGroup();
1914		- csg.addChild(child);
1915		- child.addChild(csg);
1916		- child = new cGroup();
1917		- csg.addChild(child);
1918		- child.addChild(csg);
	2745	+ }
1919	2746	} else
1920	2747	if (source == tripleItem)
1921	2748	{
1922		- Composite csg = new GroupLeaf();
	2749	+ if (!group.selection.isEmpty())
	2750	+ {
	2751	+ Composite csg = new GroupLeaf("Trident");
1923	2752	csg.count = 4;
1924	2753	group(csg);
1925	2754	Composite child = new cGroup();
..	..	@@ -1931,11 +2760,12 @@
1931	2760	child = new cGroup();
1932	2761	csg.addChild(child);
1933	2762	child.addChild(csg);
	2763	+ }
1934	2764	} else
1935	2765	if (source == computeAOItem)
1936	2766	{
1937	2767	Globals.drawMode = CameraPane.OCCLUSION;
1938		- Globals.theRenderer.repaint();
	2768	+ cameraView.repaint();
1939	2769	} else
1940	2770	if (source == recompileItem)
1941	2771	{
..	..	@@ -1950,7 +2780,7 @@
1950	2780	if (source == invariantsItem)
1951	2781	{
1952	2782	System.out.println("Invariants:");
1953		- Grafreed.grafreeD.universe.invariants();
	2783	+ Grafreed.grafreed.universe.invariants();
1954	2784	} else
1955	2785	if (source == memoryItem)
1956	2786	{
..	..	@@ -1969,17 +2799,64 @@
1969	2799	{
1970	2800	DumpObject();
1971	2801	} else
1972		- if (source == undoButton)
	2802	+ if (source == minButton)
1973	2803	{
1974		- Undo();
	2804	+ Minimize();
1975	2805	} else
1976		- if (source == redoButton)
	2806	+ if (source == maxButton)
1977	2807	{
1978		- Redo();
	2808	+ Maximize();
1979	2809	} else
1980		- if (source == saveButton)
	2810	+ if (source == fullButton)
1981	2811	{
1982		- Save();
	2812	+ ToggleFullScreen();
	2813	+ } else
	2814	+ if (source == collapseButton)
	2815	+ {
	2816	+ this.expandedLayout = radio.layout;
	2817	+ CollapseToolbar();
	2818	+ } else
	2819	+ if (source == maximize3DButton)
	2820	+ {
	2821	+ this.expandedLayout = radio.layout;
	2822	+ radio.layout = twoButton;
	2823	+ Show3DView();
	2824	+ CollapseToolbar();
	2825	+ } else
	2826	+ if (source == previousVersionButton)
	2827	+ {
	2828	+ // Go to previous version
	2829	+ //if (!Undo())
	2830	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2831	+ PreviousVersion();
	2832	+ } else
	2833	+ if (source == restoreButton)
	2834	+ {
	2835	+ // Restore current version
	2836	+ Restore();
	2837	+ //restoreButton.setEnabled(false);
	2838	+ } else
	2839	+ if (source == replaceButton)
	2840	+ {
	2841	+ // Overwrite current version
	2842	+ Replace();
	2843	+ //replaceButton.setEnabled(false);
	2844	+ } else
	2845	+ if (source == nextVersionButton)
	2846	+ {
	2847	+ // Go to next version
	2848	+ NextVersion();
	2849	+ } else
	2850	+ if (source == saveVersionButton)
	2851	+ {
	2852	+ // Save a new version
	2853	+ if (!Save(true))
	2854	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2855	+ } else
	2856	+ if (source == deleteVersionButton)
	2857	+ {
	2858	+ // Delete a new version
	2859	+ DeleteVersion();
1983	2860	} else
1984	2861	if (source == oneStepButton)
1985	2862	{
..	..	@@ -1988,17 +2865,14 @@
1988	2865	} else
1989	2866	if (source == screenfitButton)
1990	2867	{
1991		- //Reload(lastConverter, lastFilename, true);
1992	2868	ScreenFit();
1993	2869	} else
1994	2870	if (source == screenfitpointButton)
1995	2871	{
1996		- //Reload(lastConverter, lastFilename, true);
1997	2872	ScreenFitPoint();
1998	2873	} else
1999	2874	if (source == snapobjectButton)
2000	2875	{
2001		- //Reload(lastConverter, lastFilename, true);
2002	2876	SnapObject();
2003	2877	} else
2004	2878	// if (event.getSource() == recompileButton)
..	..	@@ -2037,11 +2911,11 @@
2037	2911	} else
2038	2912	if (source == undoItem)
2039	2913	{
2040		- Undo();
	2914	+ PreviousVersion();
2041	2915	} else
2042	2916	if (source == redoItem)
2043	2917	{
2044		- Redo();
	2918	+ NextVersion();
2045	2919	} else
2046	2920	if (source == duplicateItem)
2047	2921	{
..	..	@@ -2362,7 +3236,7 @@
2362	3236	{
2363	3237	StepAll();
2364	3238	} else
2365		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3239	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2366	3240	{
2367	3241	//int indices[] = jList.getSelectedIndices();
2368	3242	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2374,9 +3248,9 @@
2374	3248	{
2375	3249	ClearSelection(true);
2376	3250	} else
2377		- if (source == grabItem)
	3251	+ if (source == grabItem \|\| source == groupButton)
2378	3252	{
2379		- group(new cGroup(), true);
	3253	+ group(new cGroup(), false); // true);
2380	3254	} else
2381	3255	if (source == hideItem)
2382	3256	{
..	..	@@ -2394,11 +3268,11 @@
2394	3268	{
2395	3269	makeSomething(new Camera());
2396	3270	} else
2397		- if (source == compositeItem)
	3271	+ if (source == compositeItem \|\| source == compositeButton)
2398	3272	{
2399	3273	group(new Composite());
2400	3274	} else
2401		- if (source == randomItem)
	3275	+ if (source == switchItem \|\| source == switchButton)
2402	3276	{
2403	3277	RandomNode random = new RandomNode();
2404	3278	group(random);
..	..	@@ -2500,7 +3374,7 @@
2500	3374	{
2501	3375	group(new cLinker());
2502	3376	} else
2503		- if (source == textureItem)
	3377	+ if (source == textureItem \|\| source == textureButton)
2504	3378	{
2505	3379	group(new TextureNode());
2506	3380	} else
..	..	@@ -2520,17 +3394,42 @@
2520	3394	{
2521	3395	CastShadow(2);
2522	3396	} else
2523		- if (source == ungroupItem)
	3397	+ if (source == ungroupItem \|\| source == ungroupButton)
2524	3398	{
2525		- //ungroup();
	3399	+ boolean canUngroup = true;
	3400	+
2526	3401	for (int i=0; i<group.selection.size(); i++)
2527	3402	{
2528		- Ungroup(group.selection.get(i));
	3403	+ Object3D selectedItem = group.selection.get(i);
	3404	+
	3405	+ if (selectedItem.Size() == 0)
	3406	+ {
	3407	+ // Cannot ungroup leaves
	3408	+ canUngroup = false;
	3409	+ break;
	3410	+ }
	3411	+
	3412	+ if (selectedItem == group)
	3413	+ {
	3414	+ // Cannot ungroup root
	3415	+ canUngroup = false;
	3416	+ break;
	3417	+ }
2529	3418	}
2530	3419
2531		- ClearSelection(false);
2532		-
2533		- refreshContents();
	3420	+ if (canUngroup)
	3421	+ {
	3422	+ for (int i=0; i<group.selection.size(); i++)
	3423	+ {
	3424	+ Object3D selectedItem = group.selection.get(i);
	3425	+
	3426	+ Ungroup(selectedItem);
	3427	+ }
	3428	+
	3429	+ ClearSelection(false);
	3430	+
	3431	+ refreshContents();
	3432	+ }
2534	3433	} else
2535	3434	if (source == genUVItem)
2536	3435	{
..	..	@@ -2542,7 +3441,7 @@
2542	3441	} else
2543	3442	if (source == genNormalsMESHItem)
2544	3443	{
2545		- GenNormals(true); // TODO
	3444	+ GenNormalsMESH();
2546	3445	} else
2547	3446	if (source == genNormalsORGANItem)
2548	3447	{
..	..	@@ -2576,6 +3475,10 @@
2576	3475	{
2577	3476	ClearMaterials();
2578	3477	} else
	3478	+ if (source == clearVersionsItem)
	3479	+ {
	3480	+ ClearVersions();
	3481	+ } else
2579	3482	if (source == liveleavesItem)
2580	3483	{
2581	3484	LiveLeaves(true);
..	..	@@ -2607,6 +3510,22 @@
2607	3510	if (source == unmarkleavesItem)
2608	3511	{
2609	3512	MarkLeaves(false);
	3513	+ } else
	3514	+ if (source == rewindleavesItem)
	3515	+ {
	3516	+ RewindLeaves(true);
	3517	+ } else
	3518	+ if (source == unrewindleavesItem)
	3519	+ {
	3520	+ RewindLeaves(false);
	3521	+ } else
	3522	+ if (source == randomleavesItem)
	3523	+ {
	3524	+ RandomLeaves(true);
	3525	+ } else
	3526	+ if (source == unrandomleavesItem)
	3527	+ {
	3528	+ RandomLeaves(false);
2610	3529	} else
2611	3530	if (source == flipVItem)
2612	3531	{
..	..	@@ -2699,6 +3618,18 @@
2699	3618	if (source == transformChildrenItem)
2700	3619	{
2701	3620	TransformChildren();
	3621	+ } else
	3622	+ if (source == textureRatioRItem)
	3623	+ {
	3624	+ TextureRatio(0);
	3625	+ } else
	3626	+ if (source == textureRatioGItem)
	3627	+ {
	3628	+ TextureRatio(1);
	3629	+ } else
	3630	+ if (source == textureRatioBItem)
	3631	+ {
	3632	+ TextureRatio(2);
2702	3633	} else
2703	3634	if (source == resetTransformItem)
2704	3635	{
..	..	@@ -2815,7 +3746,7 @@
2815	3746	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2816	3747	{
2817	3748	obj = (Object3D)e.nextElement();
2818		- obj.SetBumpTexture(null);
	3749	+ obj.ResetBumpTexture();
2819	3750	}
2820	3751
2821	3752	refreshContents();
..	..	@@ -2831,6 +3762,31 @@
2831	3762
2832	3763	refreshContents();
2833	3764	} else
	3765	+ if (source == embedTexturesItem)
	3766	+ {
	3767	+ Object3D obj;
	3768	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3769	+ {
	3770	+ obj = (Object3D)e.nextElement();
	3771	+ obj.EmbedTextures(true);
	3772	+ }
	3773	+
	3774	+ refreshContents();
	3775	+ } else
	3776	+ if (source == deEmbedTexturesItem)
	3777	+ {
	3778	+ Object3D obj;
	3779	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3780	+ {
	3781	+ obj = (Object3D)e.nextElement();
	3782	+ obj.EmbedTextures(false);
	3783	+ }
	3784	+
	3785	+ CameraPane.texturepigment.clear();
	3786	+ CameraPane.texturebump.clear();
	3787	+
	3788	+ refreshContents();
	3789	+ } else
2834	3790	if (source == flashSelectionButton)
2835	3791	{
2836	3792	CameraPane.flash = true;
..	..	@@ -2842,42 +3798,36 @@
2842	3798	if (source == twoButton)
2843	3799	{
2844	3800	radio.layout = twoButton;
2845		- // bug
2846		- //gridPanel.setDividerLocation(1.0);
2847		- //bigPanel.setDividerLocation(0.0);
2848		-// bigThree.remove(scenePanel);
2849		-// bigThree.remove(centralPanel);
2850		-// bigThree.remove(XYZPanel);
2851		-// aWindowConstraints.gridx = 0;
2852		-// aWindowConstraints.gridy = 0;
2853		-// aWindowConstraints.gridwidth = 1;
2854		-// // aConstraints.gridheight = 3;
2855		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2856		-// aWindowConstraints.weightx = 0;
2857		-// aWindowConstraints.weighty = 1;
2858		-// //bigThree.add(jtp, aWindowConstraints);
2859		-// aWindowConstraints.weightx = 1;
2860		-// aWindowConstraints.gridwidth = 3;
2861		-// // aConstraints.gridheight = 3;
2862		-// aWindowConstraints.gridx = 1;
2863		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
2864		-// bigThree.add(centralPanel, aWindowConstraints);
2865		-// aWindowConstraints.weightx = 0;
2866		-// aWindowConstraints.gridx = 4;
2867		-// aWindowConstraints.gridwidth = 1;
2868		-// // aConstraints.gridheight = 3;
2869		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2870		-// //bigThree.add(XYZPanel, aWindowConstraints);
2871		-// scenePanel.setVisible(false);
2872		-// centralPanel.setVisible(true);
2873		-// XYZPanel.setVisible(false);
2874		- bigThree.ClearUI();
2875		- bigThree.add(centralPanel);
2876		- bigThree.FlushUI();
	3801	+
	3802	+ if (CameraPane.FULLSCREEN)
	3803	+ fullscreenLayout = radio.layout;
	3804	+
	3805	+ Show3DView();
	3806	+
	3807	+ cameraView.requestFocusInWindow();
	3808	+
	3809	+// refreshContents(true);
	3810	+//
	3811	+// try
	3812	+// {
	3813	+// java.awt.Robot bot = new java.awt.Robot();
	3814	+// int mask = InputEvent.BUTTON1_MASK;
	3815	+// bot.mouseMove(100, 100);
	3816	+// bot.mousePress(mask);
	3817	+// bot.mouseRelease(mask);
	3818	+// }
	3819	+// catch (Exception e)
	3820	+// {
	3821	+//
	3822	+// }
	3823	+
2877	3824	} else
2878	3825	if (source == threeButton)
2879	3826	{
2880	3827	radio.layout = threeButton;
	3828	+
	3829	+ if (CameraPane.FULLSCREEN)
	3830	+ fullscreenLayout = radio.layout;
2881	3831
2882	3832	// bigThree.remove(scenePanel);
2883	3833	// bigThree.remove(centralPanel);
..	..	@@ -2907,13 +3857,18 @@
2907	3857	// centralPanel.setVisible(true);
2908	3858	// XYZPanel.setVisible(true);
2909	3859	bigThree.ClearUI();
	3860	+ bigThree.add(scenePanel);
2910	3861	bigThree.add(centralPanel);
2911		- bigThree.add(XYZPanel);
2912	3862	bigThree.FlushUI();
	3863	+
	3864	+ cameraView.requestFocusInWindow();
2913	3865	} else
2914	3866	if (source == fourButton)
2915	3867	{
2916	3868	radio.layout = fourButton;
	3869	+
	3870	+ if (CameraPane.FULLSCREEN)
	3871	+ fullscreenLayout = radio.layout;
2917	3872
2918	3873	// bigThree.remove(scenePanel);
2919	3874	// bigThree.remove(centralPanel);
..	..	@@ -2945,10 +3900,15 @@
2945	3900	bigThree.ClearUI();
2946	3901	bigThree.add(scenePanel);
2947	3902	bigThree.FlushUI();
	3903	+
	3904	+ cameraView.requestFocusInWindow();
2948	3905	} else
2949	3906	if (source == sixButton)
2950	3907	{
2951	3908	radio.layout = sixButton;
	3909	+
	3910	+ if (CameraPane.FULLSCREEN)
	3911	+ fullscreenLayout = radio.layout;
2952	3912
2953	3913	// bigThree.remove(scenePanel);
2954	3914	// bigThree.remove(centralPanel);
..	..	@@ -2978,13 +3938,18 @@
2978	3938	// centralPanel.setVisible(true);
2979	3939	// XYZPanel.setVisible(false);
2980	3940	bigThree.ClearUI();
2981		- bigThree.add(scenePanel);
2982	3941	bigThree.add(centralPanel);
	3942	+ bigThree.add(scenePanel);
2983	3943	bigThree.FlushUI();
	3944	+
	3945	+ cameraView.requestFocusInWindow();
2984	3946	} else
2985	3947	if (source == sevenButton)
2986	3948	{
2987	3949	radio.layout = sevenButton;
	3950	+
	3951	+ if (CameraPane.FULLSCREEN)
	3952	+ fullscreenLayout = radio.layout;
2988	3953
2989	3954	// bigThree.remove(scenePanel);
2990	3955	// bigThree.remove(centralPanel);
..	..	@@ -3018,9 +3983,12 @@
3018	3983	bigThree.add(centralPanel);
3019	3984	bigThree.add(XYZPanel);
3020	3985	bigThree.FlushUI();
	3986	+
	3987	+ cameraView.requestFocusInWindow();
3021	3988	} else
3022	3989	if (source == rootButton)
3023	3990	{
	3991	+ Replace();
3024	3992	Object3D obj;
3025	3993	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3026	3994	{
..	..	@@ -3029,31 +3997,50 @@
3029	3997	EditObject(obj);
3030	3998	}
3031	3999
	4000	+ cameraView.requestFocusInWindow();
3032	4001	refreshContents(true);
3033	4002	} else
3034	4003	if (source == closeButton)
3035	4004	{
3036	4005	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	4006	+ if (copy.versionlist != null)
	4007	+ Replace();
	4008	+
3037	4009	cRadio ab;
3038	4010	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3039	4011	{
3040	4012	ab = (cRadio)e.nextElement();
3041		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	4013	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3042	4014	{
	4015	+ // Patch to avoid bug with transparency.
	4016	+ if (!ab.hadMaterial)
	4017	+ {
	4018	+ ab.object.material = null;
	4019	+ }
	4020	+
3043	4021	buttonGroup.remove(ab);
3044	4022	radioPanel.remove(ab);
3045	4023
3046		- ab.GetObject().editWindow = null;
	4024	+ //ab.GetObject().editWindow = null;
	4025	+ ab.GetObject().manipWindow = null;
3047	4026	// ab.GetObject().objectUI = null; // ?????????
3048	4027
3049	4028	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
3050	4029	break;
3051	4030	}
3052	4031	}
	4032	+
	4033	+ cameraView.requestFocusInWindow();
3053	4034	refreshContents(true);
3054	4035	} else
3055	4036	if (source == editItem \|\| source == editButton)
3056	4037	{
	4038	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4039	+ {
	4040	+ Object3D child = (Object3D)e.nextElement();
	4041	+ child.pinned = true;
	4042	+ }
	4043	+
3057	4044	EditSelection(false);
3058	4045	} else
3059	4046	if (source == uneditButton)
..	..	@@ -3062,9 +4049,10 @@
3062	4049	{
3063	4050	Object3D child = (Object3D)e.nextElement();
3064	4051	if(child.editWindow != null)
3065		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4052	+ child.pinned = false;
3066	4053	child.CloseUI();
3067	4054	listUI.remove(child);
	4055	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3068	4056
3069	4057	//child.editWindow = null; // ???????????
3070	4058	}
..	..	@@ -3079,16 +4067,18 @@
3079	4067	//copy.ClearUI();
3080	4068	for (Object3D obj : listUI)
3081	4069	{
	4070	+ obj.pinned = false;
3082	4071	obj.CloseUI();
3083	4072	}
3084	4073	listUI.clear();
	4074	+ SetPinStates(group.selection.size() > 0);
3085	4075	refreshContents(true);
3086	4076	} else
3087	4077	if (source == allParamsButton)
3088	4078	{
3089	4079	assert(copy == group);
3090	4080
3091		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4081	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3092	4082
3093	4083	for (Object3D obj : listUI)
3094	4084	{
..	..	@@ -3114,6 +4104,9 @@
3114	4104	} else
3115	4105	if(source instanceof cRadio)
3116	4106	{
	4107	+ if (copy.versionlist != null)
	4108	+ Replace();
	4109	+
3117	4110	group.parent = keepparent;
3118	4111	group.attributes = 0;
3119	4112	//group.editWindow = null;
..	..	@@ -3137,6 +4130,7 @@
3137	4130	}
3138	4131
3139	4132	copy = group;
	4133	+
3140	4134	//Globals.theRenderer.object = group;
3141	4135	if(!useclient)
3142	4136	{
..	..	@@ -3154,7 +4148,8 @@
3154	4148	}
3155	4149
3156	4150	// fix "+" issue
3157		- group.editWindow = this;
	4151	+ //group.editWindow = this;
	4152	+ group.manipWindow = this;
3158	4153
3159	4154	/*
3160	4155	currentLayout = radio.layout;
..	..	@@ -3162,20 +4157,57 @@
3162	4157	currentLayout = sevenButton;
3163	4158	*/
3164	4159	radio.layout.doClick();
	4160	+
	4161	+ //assert(copy instanceof Composite);
	4162	+
	4163	+ if (copy.versionlist == null)
	4164	+ {
	4165	+ copy.versionindex = -1;
	4166	+
	4167	+ // Cannot work with loops
	4168	+ // To fix this issue, we first mark all nodes above the root,
	4169	+ // and check if any of these nodes are reachable below the root.
	4170	+ Grafreed.grafreed.universe.TagObjects(copy, true);
	4171	+
	4172	+ if (copy instanceof Composite && copy.versionlist == null && !copy.HasTags())
	4173	+ {
	4174	+ copy.versionlist = new Object3D[100];
	4175	+
	4176	+ //Save(true);
	4177	+ }
	4178	+ else
	4179	+ copy.versionindex = -2;
	4180	+
	4181	+ Grafreed.grafreed.universe.TagObjects(copy, false);
	4182	+ }
	4183	+
	4184	+ SetVersionStates();
	4185	+
	4186	+ ClearUnpinned();
	4187	+
	4188	+ //Grafreed.Assert(group != null);
	4189	+ //Grafreed.Assert(group.selection != null);
	4190	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4191	+ if (group.selection == null \|\| group.selection.size() == 1)
	4192	+ EditSelection(false);
3165	4193	keepparent = group.parent;
3166	4194	// PARENT = NULL or not???
3167	4195	//group.parent = null; // ROOT
3168	4196	//group.attributes = -1;
3169	4197	ResetModel();
	4198	+
	4199	+ cameraView.requestFocusInWindow();
3170	4200	refreshContents(true);
3171	4201	} else if (event.getSource() == editCameraItem)
3172	4202	{
3173	4203	cameraView.ProtectCamera();
	4204	+ cameraView.requestFocusInWindow();
3174	4205	cameraView.repaint();
3175	4206	return;
3176		- } else if (event.getSource() == revertCameraItem)
	4207	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3177	4208	{
3178	4209	cameraView.RevertCamera();
	4210	+ cameraView.requestFocusInWindow();
3179	4211	cameraView.repaint();
3180	4212	return;
3181	4213	// } else if (event.getSource() == textureButton)
..	..	@@ -3190,7 +4222,6 @@
3190	4222	}
3191	4223
3192	4224	boolean useclient = false;
3193		- cRadio radio;
3194	4225
3195	4226	void ToggleRoot()
3196	4227	{
..	..	@@ -3265,6 +4296,18 @@
3265	4296	refreshContents();
3266	4297	}
3267	4298
	4299	+ void TextureRatio(int axis)
	4300	+ {
	4301	+ Object3D obj;
	4302	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4303	+ {
	4304	+ obj = (Object3D)e.nextElement();
	4305	+ obj.TextureRatio(axis);
	4306	+ }
	4307	+
	4308	+ refreshContents();
	4309	+ }
	4310	+
3268	4311	void ResetTransform()
3269	4312	{
3270	4313	ResetTransform(-1);
..	..	@@ -3280,42 +4323,8 @@
3280	4323	if (obj.toParent == null)
3281	4324	continue;
3282	4325
3283		- if (mask == -1)
3284		- {
3285		- if (obj instanceof Camera) // jan 2014
3286		- {
3287		- LA.matIdentity(obj.toParent);
3288		- LA.matIdentity(obj.fromParent);
3289		- }
3290		- else
3291		- {
3292		- obj.toParent = null; // jan 2014 LA.matIdentity(obj.toParent);
3293		- obj.fromParent = null; // LA.matIdentity(obj.fromParent);
3294		- }
3295		- TouchTransform(obj);
3296		- continue;
3297		- }
3298		- if ((mask&2) != 0) // Scale
3299		- {
3300		- obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
3301		- obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
3302		- obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
3303		- obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
3304		- obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
3305		- obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
3306		- }
3307		- if ((mask&4) != 0) // Rotation
3308		- {
3309		- // ?
3310		- }
3311		- if ((mask&1) != 0) // Translation
3312		- {
3313		- if (obj.toParent != null)
3314		- {
3315		- obj.toParent[3][0] = obj.toParent[3][1] = obj.toParent[3][2] = 0;
3316		- obj.fromParent[3][0] = obj.fromParent[3][1] = obj.fromParent[3][2] = 0;
3317		- }
3318		- }
	4326	+ obj.ResetTransform(mask);
	4327	+
3319	4328	if (obj.parent == null)
3320	4329	{
3321	4330	System.out.println("NULL PARENT!");
..	..	@@ -3429,7 +4438,8 @@
3429	4438
3430	4439	int size = obj.MemorySize();
3431	4440
3432		- System.err.println((size/1024) + " KB is the size of " + obj);
	4441	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4442	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3433	4443	}
3434	4444	}
3435	4445	catch (Exception e)
..	..	@@ -3510,6 +4520,13 @@
3510	4520	void GenNormals(boolean crease)
3511	4521	{
3512	4522	group.GenNormalsS(crease);
	4523	+
	4524	+ refreshContents();
	4525	+ }
	4526	+
	4527	+ void GenNormalsMESH()
	4528	+ {
	4529	+ group.GenNormalsMeshS();
3513	4530
3514	4531	refreshContents();
3515	4532	}
..	..	@@ -3745,7 +4762,7 @@
3745	4762
3746	4763	try
3747	4764	{
3748		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4765	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
3749	4766	}
3750	4767	catch (Exception e)
3751	4768	{
..	..	@@ -3815,6 +4832,12 @@
3815	4832	for (int i=0; i<group.selection.size(); i++)
3816	4833	{
3817	4834	Object3D obj = group.selection.get(i);
	4835	+
	4836	+ if (obj.toParent == null)
	4837	+ {
	4838	+ obj.toParent = LA.newMatrix();
	4839	+ obj.fromParent = LA.newMatrix();
	4840	+ }
3818	4841
3819	4842	LA.matTranslate(obj.toParent, i * scale, 0, 0);
3820	4843	LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
..	..	@@ -4107,6 +5130,12 @@
4107	5130	refreshContents();
4108	5131	}
4109	5132
	5133	+ void ClearVersions()
	5134	+ {
	5135	+ group.selection.ClearVersions();
	5136	+ refreshContents();
	5137	+ }
	5138	+
4110	5139	void FlipV(boolean flip)
4111	5140	{
4112	5141	group.selection.FlipV(flip);
..	..	@@ -4134,6 +5163,18 @@
4134	5163	void MarkLeaves(boolean hide)
4135	5164	{
4136	5165	group.selection.MarkLeaves(hide);
	5166	+ refreshContents();
	5167	+ }
	5168	+
	5169	+ void RewindLeaves(boolean hide)
	5170	+ {
	5171	+ group.selection.RewindLeaves(hide);
	5172	+ refreshContents();
	5173	+ }
	5174	+
	5175	+ void RandomLeaves(boolean hide)
	5176	+ {
	5177	+ group.selection.RandomLeaves(hide);
4137	5178	refreshContents();
4138	5179	}
4139	5180
..	..	@@ -4208,28 +5249,25 @@
4208	5249	// }
4209	5250	// }
4210	5251
4211		- static boolean allparams = true;
4212		-
4213		- static Vector<Object3D> listUI = new Vector<Object3D>();
4214		-
4215	5252	void EditSelection(boolean newWindow)
4216	5253	{
	5254	+ if (group.selection == null)
	5255	+ {
	5256	+ EditElement(group, newWindow); // ? new
	5257	+ return;
	5258	+ }
	5259	+
4217	5260	// aConstraints.gridy = 0;
4218	5261	for (int i=0; i<group.selection.size(); i++)
4219	5262	{
4220	5263	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4221	5264	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4222		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5265	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4223	5266
4224	5267	Object3D elem = (Object3D)group.selection.elementAt(i);
4225	5268	if(elem != group \|\| !newWindow)
4226	5269	{
4227		- // if (!(elem instanceof Composite))
4228		- // newWindow = false;
4229		- listUI.add(elem);
4230		- elem.openEditWindow(this, newWindow); //, false);
4231		- System.out.println("edit : " + elem);
4232		- elem.editWindow.refreshContents(true); // ? new
	5270	+ EditElement(elem, newWindow); // ? new
4233	5271	}
4234	5272	}
4235	5273	}
..	..	@@ -4292,9 +5330,7 @@
4292	5330
4293	5331	freezemodel = false;
4294	5332	}
4295		-
4296		- boolean flashIt = true;
4297		-
	5333	+
4298	5334	public void valueChanged(TreeSelectionEvent e)
4299	5335	//public boolean handleEvent(Event event)
4300	5336	{
..	..	@@ -4304,7 +5340,8 @@
4304	5340	//new Exception().printStackTrace();
4305	5341
4306	5342	freezemodel = true;
4307		-
	5343	+ ClearUnpinned();
	5344	+
4308	5345	/**/
4309	5346	//switch (event.id)
4310	5347	{
..	..	@@ -4312,7 +5349,6 @@
4312	5349	//case 702: // Event.LIST_DESELECT
4313	5350	group.deselectAll();
4314	5351	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4315		- objEditor.ClearInfo(); // .GetMaterial());
4316	5352	if (tps != null)
4317	5353	{
4318	5354	for (int i=0; i < tps.length; i++)
..	..	@@ -4321,10 +5357,8 @@
4321	5357
4322	5358	//if (child.parent != null)
4323	5359	//child.parent.addSelectee(child);
	5360	+ objEditor.SetMaterial(child);
4324	5361	group.addSelectee(child);
4325		- objEditor.SetMaterial(child); // .GetMaterial());
4326		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4327		- System.err.println("info : " + child.GetPath());
4328	5362	}
4329	5363	}
4330	5364	// else
..	..	@@ -4334,15 +5368,13 @@
4334	5368	// System.err.println("info : " + group.GetPath());
4335	5369	// }
4336	5370
4337		- objEditor.SetText(); // jan 2014
4338		-
4339	5371	if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4340	5372	CameraPane.flash = true;
4341	5373
4342	5374	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4343	5375	// a camera
4344	5376	{
4345		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	5377	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4346	5378	{
4347	5379	CameraPane.camerachangeframe = 0; // don't refuse it
4348	5380	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4351,6 +5383,13 @@
4351	5383	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4352	5384	}
4353	5385
	5386	+ if (tps != null && tps.length == 1)
	5387	+ {
	5388	+ EditSelection(false);
	5389	+ }
	5390	+
	5391	+ SetPinStates(tps != null && tps.length > 0);
	5392	+
4354	5393	refreshContents();
4355	5394	//return true;
4356	5395	}
..	..	@@ -4359,6 +5398,53 @@
4359	5398
4360	5399	freezemodel = false;
4361	5400	}
	5401	+
	5402	+ void SetPinStates(boolean enabled)
	5403	+ {
	5404	+ editButton.setEnabled(enabled);
	5405	+ uneditButton.setEnabled(enabled);
	5406	+ //unselectButton.setEnabled(enabled);
	5407	+ flashSelectionButton.setEnabled(enabled);
	5408	+
	5409	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5410	+
	5411	+ boolean allComposites = true;
	5412	+
	5413	+ if (group.selection != null)
	5414	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5415	+ {
	5416	+ Object next = e.nextElement();
	5417	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5418	+ {
	5419	+ allComposites = false;
	5420	+ break;
	5421	+ }
	5422	+ }
	5423	+
	5424	+ rootButton.setEnabled(true); // allComposites);
	5425	+ }
	5426	+
	5427	+ void refreshContents(boolean cp)
	5428	+ {
	5429	+ if (Globals.ADVANCED)
	5430	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5431	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5432	+ {
	5433	+ objEditor.ClearInfo(); // .GetMaterial());
	5434	+
	5435	+ for (int i=0; i < group.selection.Size(); i++)
	5436	+ {
	5437	+ Object3D child = (Object3D) group.selection.get(i);
	5438	+
	5439	+ objEditor.AddInfo(child, this, true);
	5440	+// System.err.println("info : " + child.GetPath());
	5441	+ }
	5442	+
	5443	+ objEditor.SetText(); // jan 2014
	5444	+ }
	5445	+
	5446	+ super.refreshContents(cp);
	5447	+ }
4362	5448
4363	5449	void linkSomething(Object3D thing)
4364	5450	{
..	..	@@ -4441,7 +5527,8 @@
4441	5527
4442	5528	if (cut)
4443	5529	{
4444		- Save();
	5530	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5531	+// Save();
4445	5532	//int indices[] = jList.getSelectedIndices();
4446	5533	//for (int i = indices.length - 1; i >= 0; i--)
4447	5534	//jList.remove(indices[i]);
..	..	@@ -4544,6 +5631,10 @@
4544	5631
4545	5632	void paste(boolean expand)
4546	5633	{
	5634	+ if (Globals.REPLACEONMAKE)
	5635	+ Save();
	5636	+ boolean keep = Globals.REPLACEONMAKE;
	5637	+ Globals.REPLACEONMAKE = false;
4547	5638	// if (GrafreeD.clipboard == null)
4548	5639	// return;
4549	5640	boolean first = true;
..	..	@@ -4603,6 +5694,7 @@
4603	5694	Grafreed.clipboard.get(0).parent = keepparent;
4604	5695	}
4605	5696
	5697	+ Globals.REPLACEONMAKE = keep;
4606	5698	ResetModel();
4607	5699	refreshContents();
4608	5700	}
..	..	@@ -4738,6 +5830,10 @@
4738	5830
4739	5831	void group(Object3D csg, boolean grab)
4740	5832	{
	5833	+ if (Globals.REPLACEONMAKE)
	5834	+ Save();
	5835	+ boolean keep = Globals.REPLACEONMAKE;
	5836	+ Globals.REPLACEONMAKE = false;
4741	5837	if (//false) // why??
4742	5838	!group.selection.isEmpty())
4743	5839	{
..	..	@@ -4851,10 +5947,15 @@
4851	5947	//node.add(csg);
4852	5948	//makeSomething(node);
4853	5949	makeSomething(csg);
	5950	+ Globals.REPLACEONMAKE = keep;
4854	5951	}
4855	5952
4856	5953	void Ungroup(Object3D g)
4857	5954	{
	5955	+ if (Globals.REPLACEONMAKE)
	5956	+ Save();
	5957	+ boolean keep = Globals.REPLACEONMAKE;
	5958	+ Globals.REPLACEONMAKE = false;
4858	5959	if (g instanceof HiddenObject)
4859	5960	{
4860	5961	HiddenObject h = (HiddenObject) g;
..	..	@@ -4871,6 +5972,7 @@
4871	5972	objEditor.makeSomething(g.get(i), false);
4872	5973	}
4873	5974	}
	5975	+ Globals.REPLACEONMAKE = keep;
4874	5976	}
4875	5977
4876	5978	void ungroup()
..	..	@@ -5159,10 +6261,43 @@
5159	6261	cButton clearpanelButton;
5160	6262	cButton unselectButton;
5161	6263
5162		- cButton saveButton;
5163		- cButton undoButton;
5164		- cButton redoButton;
	6264	+ cButton restoreCameraButton;
	6265	+
5165	6266	cButton oneStepButton;
	6267	+
	6268	+ cButton groupButton;
	6269	+ cButton ungroupButton;
	6270	+ cButton compositeButton;
	6271	+ cButton switchButton;
	6272	+ cButton loopButton;
	6273	+ cButton textureButton;
	6274	+
	6275	+ cButton skybox1Button;
	6276	+ cButton skybox2Button;
	6277	+ cButton skybox3Button;
	6278	+ cButton skybox4Button;
	6279	+ cButton skybox5Button;
	6280	+ cButton skybox6Button;
	6281	+ cButton skybox7Button;
	6282	+
	6283	+ cButton skybox11Button;
	6284	+ cButton skybox12Button;
	6285	+ cButton skybox13Button;
	6286	+ cButton skybox14Button;
	6287	+ cButton skybox15Button;
	6288	+ cButton skybox16Button;
	6289	+ cButton skybox17Button;
	6290	+
	6291	+ cButton gridButton;
	6292	+ cButton boxButton;
	6293	+ cButton sphereButton;
	6294	+ cButton coneButton;
	6295	+ cButton torusButton;
	6296	+ cButton superButton;
	6297	+ cButton kleinButton;
	6298	+ cButton particlesButton;
	6299	+ cButton overlayButton;
	6300	+ cButton lightButton;
5166	6301
5167	6302	cButton screenfitButton;
5168	6303	cButton screenfitpointButton;
..	..	@@ -5175,14 +6310,6 @@
5175	6310
5176	6311	cButton setsupportButton;
5177	6312
5178		- cButton twoButton;
5179		- cButton sixButton;
5180		- cButton threeButton;
5181		- cButton sevenButton;
5182		- cButton fourButton; // full panel
5183		- cButton oneButton; // full XYZ
5184		- //cButton currentLayout;
5185		-
5186	6313	//
5187	6314	//Composite
5188	6315	Object3D // to do !!
..	..	@@ -5192,12 +6319,12 @@
5192	6319	//JTree jTree;
5193	6320	private MenuItem lookAtItem;
5194	6321	private MenuItem lookFromItem;
5195		- private MenuItem switchItem;
5196		- private MenuItem cutItem;
	6322	+ private MenuItem switchViewItem;
	6323	+ private JMenuItem cutItem;
5197	6324	private MenuItem undoItem;
5198	6325	private MenuItem redoItem;
5199		- private MenuItem duplicateItem;
5200		- private MenuItem cloneItem;
	6326	+ private JMenuItem duplicateItem;
	6327	+ private JMenuItem cloneItem;
5201	6328	private MenuItem cloneSupportItem;
5202	6329	private MenuItem overwriteGeoItem;
5203	6330	private MenuItem overwriteMatItem;
..	..	@@ -5218,13 +6345,13 @@
5218	6345	private MenuItem cloneGeometriesItem;
5219	6346	private MenuItem shareGeometriesItem;
5220	6347	private MenuItem mergeGeometriesItem;
5221		- private MenuItem copyItem;
	6348	+ private JMenuItem copyItem;
5222	6349	private MenuItem pasteItem;
5223		- private MenuItem pasteIntoItem;
5224		- private MenuItem pasteLinkItem;
5225		- private MenuItem pasteCloneItem;
5226		- private MenuItem pasteExpandItem;
5227		- private MenuItem clearItem;
	6350	+ private JMenuItem pasteIntoItem;
	6351	+ private JMenuItem pasteLinkItem;
	6352	+ private JMenuItem pasteCloneItem;
	6353	+ private JMenuItem pasteExpandItem;
	6354	+ private JMenuItem deleteItem;
5228	6355	private MenuItem clearAllItem;
5229	6356	private MenuItem genUVItem;
5230	6357	private MenuItem genNormalsMESHItem;
..	..	@@ -5250,6 +6377,7 @@
5250	6377	private MenuItem clipMeshItem;
5251	6378	private MenuItem smoothMeshItem;
5252	6379	private MenuItem clearMaterialsItem;
	6380	+ private MenuItem clearVersionsItem;
5253	6381
5254	6382	private MenuItem liveleavesItem;
5255	6383	private MenuItem unliveleavesItem;
..	..	@@ -5259,6 +6387,10 @@
5259	6387	private MenuItem showleavesItem;
5260	6388	private MenuItem markleavesItem;
5261	6389	private MenuItem unmarkleavesItem;
	6390	+ private MenuItem rewindleavesItem;
	6391	+ private MenuItem unrewindleavesItem;
	6392	+ private MenuItem randomleavesItem;
	6393	+ private MenuItem unrandomleavesItem;
5262	6394
5263	6395	private MenuItem flipVItem;
5264	6396	private MenuItem unflipVItem;
..	..	@@ -5269,18 +6401,21 @@
5269	6401	private MenuItem maxTexturesItem;
5270	6402	private MenuItem panoTexturesItem;
5271	6403
	6404	+ private MenuItem textureRatioRItem;
	6405	+ private MenuItem textureRatioGItem;
	6406	+ private MenuItem textureRatioBItem;
5272	6407	private MenuItem resetCentroidItem;
5273	6408	private MenuItem resetCentroidXZItem;
5274	6409	private MenuItem resetTransformItem;
5275	6410	private MenuItem transformGeometryItem;
5276	6411	private MenuItem transformChildrenItem;
5277	6412	private MenuItem hideItem;
5278		- private MenuItem grabItem;
	6413	+ private JMenuItem grabItem;
5279	6414	private MenuItem backItem;
5280	6415	private MenuItem frontItem;
5281	6416	private MenuItem cameraItem;
5282	6417	private MenuItem compositeItem;
5283		- private MenuItem randomItem;
	6418	+ private MenuItem switchItem;
5284	6419	private MenuItem physicsItem;
5285	6420	private MenuItem frameselectorItem;
5286	6421	private MenuItem scriptNodeItem;
..	..	@@ -5288,7 +6423,7 @@
5288	6423	private MenuItem switchTransfoItem;
5289	6424	private MenuItem morphItem;
5290	6425	private MenuItem linkerItem;
5291		- private MenuItem ungroupItem;
	6426	+ private JMenuItem ungroupItem;
5292	6427	private MenuItem editItem;
5293	6428	private MenuItem openWindowItem;
5294	6429	private MenuItem editLeafItem;
..	..	@@ -5304,6 +6439,8 @@
5304	6439	private MenuItem attachBumpItem;
5305	6440	private MenuItem detachBumpItem;
5306	6441	private MenuItem pigmentBumpItem;
	6442	+ private MenuItem embedTexturesItem;
	6443	+ private MenuItem deEmbedTexturesItem;
5307	6444
5308	6445	private MenuItem particleItem;
5309	6446	private MenuItem ragdollItem;
..	..	@@ -5354,5 +6491,5 @@
5354	6491
5355	6492	Menu cameraMenu;
5356	6493	MenuItem editCameraItem;
5357		- MenuItem revertCameraItem;
	6494	+ MenuItem restoreCameraItem;
5358	6495	}