~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,350 @@
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	+
26	371	//ObjEditor objEditor;
27	372	public void closeUI2()
28	373	{
..	..	@@ -60,6 +405,16 @@
60	405	this.copy = this.group = group;
61	406	//selectees = this.group.selectees;
62	407
	408	+ assert(false);
	409	+
	410	+// if (copy.versionlist == null)
	411	+// {
	412	+// copy.versionlist = new Object3D[100];
	413	+// copy.versionindex = -1;
	414	+//
	415	+// //Save(true);
	416	+// }
	417	+
63	418	if(ui)
64	419	SetupUI(objEditor);
65	420	}
..	..	@@ -80,10 +435,22 @@
80	435	SetupViews(objEditor);
81	436
82	437	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	438	+
	439	+// if (copy.versionlist == null)
	440	+// {
	441	+// copy.versionlist = new Object3D[100];
	442	+// copy.versionindex = -1;
	443	+//
	444	+// //Save(true);
	445	+// }
83	446	}
84	447
85	448	void CloneSelection(boolean supports)
86	449	{
	450	+ if (Globals.REPLACEONMAKE)
	451	+ Save();
	452	+ boolean keep = Globals.REPLACEONMAKE;
	453	+ Globals.REPLACEONMAKE = false;
87	454	// Object3D keep = GrafreeD.clipboard;
88	455	//Object3D obj;
89	456	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,6 +461,7 @@
94	461
95	462	makeSomething(clone, i==group.selection.size()-1);
96	463	}
	464	+ Globals.REPLACEONMAKE = keep;
97	465	}
98	466
99	467	void CloneClipboard(boolean supports)
..	..	@@ -115,11 +483,16 @@
115	483
116	484	Object3D parent = obj.parent;
117	485	obj.parent = null;
	486	+
118	487	// Object3D support = obj.support;
119	488	// obj.support = null;
120	489	if (!supports)
121	490	obj.SaveSupports();
	491	+
122	492	Object3D clone = (Object3D)Grafreed.clone(obj);
	493	+
	494	+ clone.ResetUUIDs();
	495	+
123	496	obj.parent = parent;
124	497	// obj.support = support;
125	498	// clone.support = support; // aout 2013
..	..	@@ -150,6 +523,8 @@
150	523
151	524	void SetupMenu2(GroupEditor oe)
152	525	{
	526	+ oe.jTree = new cTree();
	527	+
153	528	Menu menu;
154	529	oe.menuBar.add(menu = new Menu("Edit"));
155	530	//editItem = menu.add(new MenuItem("Edit"));
..	..	@@ -160,36 +535,39 @@
160	535	// redoItem = menu.add(new MenuItem("Redo"));
161	536	// redoItem.addActionListener(this);
162	537	// menu.add("-");
163		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	538	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
164	539	duplicateItem.addActionListener(this);
165		- cloneItem = menu.add(new MenuItem("Clone"));
	540	+
	541	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
166	542	cloneItem.addActionListener(this);
167		- if (Globals.ADVANCED)
	543	+ //if (Globals.ADVANCED)
168	544	{
169	545	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
170	546	cloneSupportItem.addActionListener(this);
171	547	}
	548	+ oe.jTree.popup.addSeparator();
172	549	menu.add("-");
173		- cutItem = menu.add(new MenuItem("Cut"));
	550	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
174	551	cutItem.addActionListener(this);
175		- copyItem = menu.add(new MenuItem("Copy"));
	552	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
176	553	copyItem.addActionListener(this);
177	554	pasteItem = menu.add(new MenuItem("Paste"));
178	555	pasteItem.addActionListener(this);
179		- menu.add("-");
180	556
181		- menu.add("-");
182		- pasteIntoItem = menu.add(new MenuItem("Paste into"));
	557	+ oe.jTree.popup.addSeparator();
	558	+ //menu.add("-");
	559	+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
183	560	pasteIntoItem.addActionListener(this);
184		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	561	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
185	562	pasteLinkItem.addActionListener(this);
186		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	563	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
187	564	pasteCloneItem.addActionListener(this);
188		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
189		-// pasteExpandItem.addActionListener(this);
190		- menu.add("-");
191		- clearItem = menu.add(new MenuItem("Clear"));
192		- clearItem.addActionListener(this);
	565	+// CRASH
	566	+ pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
	567	+//
	568	+ pasteExpandItem.addActionListener(this);
	569	+ //menu.add("-");
	570	+ oe.jTree.popup.addSeparator();
193	571
194	572	if (Globals.ADVANCED)
195	573	{
..	..	@@ -203,23 +581,23 @@
203	581	//zBufferItem.addActionListener(this);
204	582	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
205	583	//normalLensItem.addActionListener(this);
206		- cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
207		- revertCameraItem.addActionListener(this);
	584	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	585	+ restoreCameraItem.addActionListener(this);
208	586
209		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
210		- toggleFullScreenItem.addItemListener(this);
211		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
212		- cameraMenu.add("-");
	587	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	588	+// toggleFullScreenItem.addItemListener(this);
	589	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	590	+// cameraMenu.add("-");
	591	+//
	592	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	593	+// toggleTextureItem.addItemListener(this);
	594	+// toggleTextureItem.setState(CameraPane.textureon);
	595	+//
	596	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	597	+// toggleSwitchItem.addItemListener(this);
	598	+// toggleSwitchItem.setState(CameraPane.SWITCH);
213	599
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"));
	600	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
223	601	toggleHandleItem.addItemListener(this);
224	602	toggleHandleItem.setState(CameraPane.HANDLES);
225	603
..	..	@@ -246,7 +624,7 @@
246	624
247	625	cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
248	626	toggleDebugItem.addItemListener(this);
249		- toggleDebugItem.setState(CameraPane.DEBUG);
	627	+ toggleDebugItem.setState(Globals.DEBUG);
250	628
251	629	cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
252	630	toggleFrustumItem.addItemListener(this);
..	..	@@ -274,15 +652,13 @@
274	652	{
275	653	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
276	654	//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"));
	655	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
279	656	oe.cameraMenu.add("-");
280	657	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
281	658	openWindowItem.addActionListener(this);
282		- editLeafItem.addActionListener(this);
283	659	lookAtItem.addActionListener(this);
284	660	//lookFromItem.addActinoListener(this);
285		- //switchItem.addActionListener(this);
	661	+ //switchViewItem.addActionListener(this);
286	662	}
287	663
288	664	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -326,22 +702,37 @@
326	702	setMasterItem.addActionListener(this);
327	703	}
328	704
329		- oe.menuBar.add(menu = new Menu("Group"));
330		- grabItem = menu.add(new MenuItem("Grab"));
331		- grabItem.addActionListener(this);
	705	+ oe.menuBar.add(menu = new Menu("Order"));
	706	+
332	707	backItem = menu.add(new MenuItem("Back"));
333	708	backItem.addActionListener(this);
334	709	frontItem = menu.add(new MenuItem("Front"));
335	710	frontItem.addActionListener(this);
336		- compositeItem = menu.add(new MenuItem("Composite"));
337		- compositeItem.addActionListener(this);
	711	+// compositeItem = menu.add(new MenuItem("Composite"));
	712	+// compositeItem.addActionListener(this);
	713	+
	714	+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
	715	+ grabItem.addActionListener(this);
	716	+
	717	+ if (Globals.ADVANCED)
	718	+ {
338	719	hideItem = menu.add(new MenuItem("Hidden Group"));
339	720	hideItem.addActionListener(this);
340		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	721	+ }
	722	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
341	723	ungroupItem.addActionListener(this);
342		- menu.add("-");
343		- randomItem = menu.add(new MenuItem("Switch node"));
344		- randomItem.addActionListener(this);
	724	+
	725	+ oe.jTree.popup.addSeparator();
	726	+
	727	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	728	+ deleteItem.addActionListener(this);
	729	+
	730	+// menu.add("-");
	731	+//
	732	+// switchItem = menu.add(new MenuItem("Switch node"));
	733	+// switchItem.addActionListener(this);
	734	+ if (Globals.ADVANCED)
	735	+ {
345	736	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
346	737	switchGeoItem.addActionListener(this);
347	738	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -349,8 +740,6 @@
349	740	morphItem = menu.add(new MenuItem("Morph Group"));
350	741	morphItem.addActionListener(this);
351	742
352		- if (Globals.ADVANCED)
353		- {
354	743	menu.add("-");
355	744	physicsItem = menu.add(new MenuItem("Physics"));
356	745	physicsItem.addActionListener(this);
..	..	@@ -358,41 +747,47 @@
358	747	frameselectorItem.addActionListener(this);
359	748	scriptNodeItem = menu.add(new MenuItem("Script Node"));
360	749	scriptNodeItem.addActionListener(this);
361		- cameraItem = menu.add(new MenuItem("Camera"));
362		- cameraItem.addActionListener(this);
363	750	}
364	751
365	752	oe.menuBar.add(menu = new Menu("Object"));
366		- textureItem = menu.add(new MenuItem("Texture"));
367		- textureItem.addActionListener(this);
	753	+// textureItem = menu.add(new MenuItem("Texture"));
	754	+// textureItem.addActionListener(this);
368	755	billboardItem = menu.add(new MenuItem("Billboard"));
369	756	billboardItem.addActionListener(this);
370	757	csgItem = menu.add(new MenuItem("CSG"));
371	758	csgItem.addActionListener(this);
372		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	759	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
373	760	shadowXItem.addActionListener(this);
374		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	761	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
375	762	shadowYItem.addActionListener(this);
376		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	763	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
377	764	shadowZItem.addActionListener(this);
	765	+
	766	+ attributeItem = menu.add(new MenuItem("Attribute"));
	767	+ attributeItem.addActionListener(this);
378	768	if (Globals.ADVANCED)
379	769	{
380	770	menu.add("-");
381	771	linkerItem = menu.add(new MenuItem("Linker"));
382	772	linkerItem.addActionListener(this);
383		- attributeItem = menu.add(new MenuItem("Attribute"));
384		- attributeItem.addActionListener(this);
385	773	templateItem = menu.add(new MenuItem("Template"));
386	774	templateItem.addActionListener(this);
387	775	pointflowItem = menu.add(new MenuItem("Point Flow"));
388	776	pointflowItem.addActionListener(this);
389	777	}
390	778	menu.add("-");
	779	+ textureRatioRItem = menu.add(new MenuItem("Texture Ratio Red"));
	780	+ textureRatioRItem.addActionListener(this);
	781	+ textureRatioGItem = menu.add(new MenuItem("Texture Ratio Green"));
	782	+ textureRatioGItem.addActionListener(this);
	783	+ textureRatioBItem = menu.add(new MenuItem("Texture Ratio Blue"));
	784	+ textureRatioBItem.addActionListener(this);
	785	+ menu.add("-");
391	786	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
392	787	resetTransformItem.addActionListener(this);
393	788	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
394	789	resetCentroidItem.addActionListener(this);
395		- resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	790	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XZ"));
396	791	resetCentroidXZItem.addActionListener(this);
397	792	transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
398	793	transformGeometryItem.addActionListener(this);
..	..	@@ -408,9 +803,9 @@
408	803	genNormalsCADItem.addActionListener(this);
409	804	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
410	805	genNormalsMESHItem.addActionListener(this);
411		- if (Globals.ADVANCED)
	806	+ //if (Globals.ADVANCED)
412	807	{
413		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	808	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
414	809	genNormalsMINEItem.addActionListener(this);
415	810	}
416	811	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -444,6 +839,8 @@
444	839	}
445	840
446	841	oe.menuBar.add(menu = new Menu("Attributes"));
	842	+ clearVersionsItem = menu.add(new MenuItem("Clear Versions"));
	843	+ clearVersionsItem.addActionListener(this);
447	844	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
448	845	clearMaterialsItem.addActionListener(this);
449	846	resetAllItem = menu.add(new MenuItem("Reset All"));
..	..	@@ -466,10 +863,18 @@
466	863	hideleavesItem.addActionListener(this);
467	864	showleavesItem = menu.add(new MenuItem("Show Leaves"));
468	865	showleavesItem.addActionListener(this);
469		- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
	866	+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
470	867	markleavesItem.addActionListener(this);
471		- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
	868	+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
472	869	unmarkleavesItem.addActionListener(this);
	870	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	871	+ rewindleavesItem.addActionListener(this);
	872	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	873	+ unrewindleavesItem.addActionListener(this);
	874	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	875	+ randomleavesItem.addActionListener(this);
	876	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	877	+ unrandomleavesItem.addActionListener(this);
473	878	menu.add("-");
474	879	flipVItem = menu.add(new MenuItem("Flip V"));
475	880	flipVItem.addActionListener(this);
..	..	@@ -495,10 +900,15 @@
495	900	attachBumpItem.addActionListener(this);
496	901	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
497	902	pigmentBumpItem.addActionListener(this);
	903	+ //embedTexturesItem
498	904	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
499	905	detachPigmentItem.addActionListener(this);
500	906	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
501	907	detachBumpItem.addActionListener(this);
	908	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	909	+ embedTexturesItem.addActionListener(this);
	910	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	911	+ deEmbedTexturesItem.addActionListener(this);
502	912	menu.add("-");
503	913	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
504	914	sortbysizeItem.addActionListener(this);
..	..	@@ -509,6 +919,9 @@
509	919	shareGeometriesItem.addActionListener(this);
510	920	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
511	921	mergeGeometriesItem.addActionListener(this);
	922	+ menu.add("-");
	923	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	924	+ editLeafItem.addActionListener(this);
512	925	if (Globals.ADVANCED)
513	926	{
514	927	// Pretty much the same as duplicate and clone.
..	..	@@ -525,16 +938,102 @@
525	938	buildToolsMenu(menu);
526	939	}
527	940
	941	+ JTabbedPane resourcecontainer;
	942	+ cGridBag currenttab;
	943	+ //boolean added; // patch for jar
	944	+
	945	+ int totalcount = 0;
	946	+
	947	+ int tabcount = 0;
	948	+ int colcount = 0;
	949	+ int rowcount = 0;
	950	+ int texturecount = 0;
	951	+
	952	+ int columns = 5;
	953	+ int rows = 7;
	954	+
	955	+ public void ResourceCallBack(String[] path)
	956	+ {
	957	+// for (int i = 0; i < path.length; i++)
	958	+// System.out.print(path[i] + "/");
	959	+// System.out.println();
	960	+
	961	+ if (//rowcount == 0 \|\|
	962	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	963	+ {
	964	+ currenttab = new cGridBag();
	965	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	966	+ currenttab.setName(tabname);
	967	+ //added = false;
	968	+ resourcecontainer.add(currenttab);
	969	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture " + tabname);
	970	+ rowcount = 1;
	971	+ colcount = 0;
	972	+ texturecount = 0;
	973	+ }
	974	+
	975	+ if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") \|\| path[2].toLowerCase().endsWith(".png")))
	976	+ {
	977	+ //if (!added)
	978	+ {
	979	+ //added = true;
	980	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	981	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	982	+ }
	983	+
	984	+ columns = 5;
	985	+
	986	+ if (path[0].contains("D&R") \|\| path[0].contains("Paint"))
	987	+ columns = 4;
	988	+
	989	+ AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
	990	+ totalcount++;
	991	+
	992	+ if (++colcount >= columns)
	993	+ {
	994	+ colcount = 0;
	995	+ currenttab.Return();
	996	+
	997	+ if (rowcount++ >= rows)
	998	+ {
	999	+ rowcount = 0;
	1000	+ }
	1001	+ }
	1002	+ }
	1003	+ else
	1004	+ {
	1005	+// if (!path[path.length-1].equals("icons"))
	1006	+// resourcecontainer.Return();
	1007	+ }
	1008	+ }
	1009	+
	1010	+ void CreateTexturePanel(cGridBag container)
	1011	+ {
	1012	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	1013	+ container.add(resourcecontainer);
	1014	+
	1015	+ Grafreed.ParseResources("textures", this);
	1016	+
	1017	+ // 935. System.out.println("Total = " + totalcount);
	1018	+ }
	1019	+
528	1020	void SetupUI2(ObjEditor oe)
529	1021	{
	1022	+ // June 2019
	1023	+ if (oe == null)
	1024	+ {
	1025	+ //super.SetupUI2(this);
	1026	+ //return;
	1027	+ }
	1028	+
	1029	+ if (copy != group)
	1030	+ {
	1031	+ //super.SetupUI2(this);
	1032	+ }
	1033	+
530	1034	//new Exception().printStackTrace();
531	1035
532	1036	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	1037	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
539	1038
540	1039	oe.buttonGroup = new ButtonGroup();
..	..	@@ -555,109 +1054,270 @@
555	1054	oe.radioPanel.add(dummyButton);
556	1055	oe.buttonGroup.add(dummyButton);
557	1056	*/
	1057	+ cGridBag versionManagerPanel = new cGridBag();
	1058	+
	1059	+ versionManagerPanel.preferredHeight = 4;
	1060	+
558	1061	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
559	1062
560		- oe.toolbarPanel.add(undoButton = new cButton("Undo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
561		- undoButton.setToolTipText("Undo changes");
562		- undoButton.addActionListener(this);
	1063	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1064	+ //minButton.setToolTipText("Minimize window");
	1065	+ //minButton.addActionListener(this);
563	1066
564		- oe.toolbarPanel.add(redoButton = new cButton("Redo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
565		- redoButton.setToolTipText("Redo changes");
566		- redoButton.addActionListener(this);
	1067	+ if (Globals.ADVANCED)
	1068	+ {
	1069	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1070	+// maxButton.setToolTipText("Maximize window");
	1071	+// maxButton.addActionListener(this);
	1072	+ }
567	1073
568		- oe.toolbarPanel.add(saveButton = new cButton("Save", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
569		- saveButton.setToolTipText("Save changes");
570		- saveButton.addActionListener(this);
	1074	+ cButton gcButton;
571	1075
572		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
573		- liveCB.setToolTipText("Enable animation");
574		- liveCB.addItemListener(this);
	1076	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1077	+// gcButton.setToolTipText("Garbage collect");
	1078	+// gcButton.addActionListener(new ActionListener()
	1079	+// {
	1080	+// public void actionPerformed(ActionEvent e)
	1081	+// {
	1082	+// System.gc();
	1083	+// }
	1084	+// });
	1085	+
	1086	+ oe.toolbarPanel.add(fullScreenButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1087	+ fullScreenButton.setToolTipText("Full-screen window");
	1088	+ fullScreenButton.addActionListener(this);
	1089	+
	1090	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1091	+ collapseButton.setToolTipText("Collapse toolbar");
	1092	+ collapseButton.addActionListener(this);
	1093	+
	1094	+// oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1095	+// maximize3DButton.setToolTipText("Maximize 3D view");
	1096	+// maximize3DButton.addActionListener(this);
	1097	+
	1098	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1099	+ twoButton.setToolTipText("Show 3D view only");
	1100	+ twoButton.addActionListener(this);
	1101	+ this.fullscreenLayout = twoButton;
	1102	+
	1103	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1104	+ threeButton.setToolTipText("Show controls and 3D view");
	1105	+ threeButton.addActionListener(this);
	1106	+ if (Globals.ADVANCED)
	1107	+ {
	1108	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1109	+ sixButton.setToolTipText("Show 3D view and controls");
	1110	+ sixButton.addActionListener(this);
	1111	+ }
	1112	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1113	+// sevenButton.setToolTipText("3-column layout");
	1114	+// sevenButton.addActionListener(this);
	1115	+ //
	1116	+
	1117	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1118	+ screenfitButton.setToolTipText("Screen fit");
	1119	+ screenfitButton.addActionListener(this);
575	1120
576		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1121	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1122	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1123	+ restoreCameraButton.addActionListener(this);
	1124	+
	1125	+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1126	+ saveVersionButton.setToolTipText("Duplicate current version");
	1127	+ saveVersionButton.addActionListener(this);
	1128	+
	1129	+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1130	+ deleteVersionButton.setToolTipText("Delete current version");
	1131	+ deleteVersionButton.addActionListener(this);
	1132	+ deleteVersionButton.setEnabled(false);
	1133	+
	1134	+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1135	+ previousVersionButton.setToolTipText("Previous version");
	1136	+ previousVersionButton.addActionListener(this);
	1137	+ previousVersionButton.setEnabled(false);
	1138	+
	1139	+ cGridBag updown = new cGridBag().setVertical(true);
	1140	+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1141	+ restoreButton.setToolTipText("Undo (restore current version)");
	1142	+ restoreButton.addActionListener(this);
	1143	+ restoreButton.setEnabled(false);
	1144	+
	1145	+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1146	+ replaceButton.setToolTipText("Save (replace current version)");
	1147	+ replaceButton.addActionListener(this);
	1148	+ replaceButton.setEnabled(false);
	1149	+
	1150	+ versionManagerPanel.add(updown);
	1151	+
	1152	+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1153	+ nextVersionButton.setToolTipText("Next version");
	1154	+ nextVersionButton.addActionListener(this);
	1155	+ nextVersionButton.setEnabled(false);
	1156	+
	1157	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
577	1158	oneStepButton.setToolTipText("Animate one step forward");
578	1159	oneStepButton.addActionListener(this);
579	1160
580		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	1161	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1162	+ liveCB.setToolTipText("Enable animation");
	1163	+ liveCB.addItemListener(this);
	1164	+
	1165	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
581	1166	fastCB.setToolTipText("Fast mode");
582	1167	fastCB.addItemListener(this);
583	1168
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);
	1169	+ //oe.toolboxPanel.Return();
	1170	+
	1171	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1172	+// trackCB.setToolTipText("Enable tracking");
	1173	+// trackCB.addItemListener(this);
591	1174
592	1175	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
593	1176	// screenfitpointButton.addActionListener(this);
594	1177
595	1178	if (Globals.ADVANCED)
596	1179	{
597		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1180	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
598	1181	snapobjectButton.addActionListener(this);
599	1182	snapobjectButton.setToolTipText("Snap Object");
	1183	+
	1184	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1185	+ fourButton.addActionListener(this);
	1186	+ fourButton.setToolTipText("Show control panel only");
600	1187	}
601	1188
602		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
603		- flashSelectionButton.setToolTipText("Show selection");
604		- flashSelectionButton.addActionListener(this);
	1189	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
605	1190
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	1191
625		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
626		- rootButton.setToolTipText("Edit selection in new tab");
	1192	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1193	+ rootButton.setToolTipText("Open selection in new tab");
627	1194	rootButton.addActionListener(this);
628	1195
629		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1196	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
630	1197	closeButton.setToolTipText("Close tab");
631	1198	closeButton.addActionListener(this);
632	1199	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
633	1200	//clearButton.addActionListener(this);
634		-
635		- cGridBag commandsPanel = new cGridBag();
	1201	+
	1202	+ cGridBag row1 = new cGridBag();
	1203	+ row1.preferredHeight = 8;
636	1204
637		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
638		- editButton.setToolTipText("Edit selection");
	1205	+ // INSERT
	1206	+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1207	+ gridButton.setToolTipText("Create ground");
	1208	+ gridButton.addActionListener(this);
	1209	+
	1210	+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1211	+ boxButton.setToolTipText("Create box");
	1212	+ boxButton.addActionListener(this);
	1213	+
	1214	+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1215	+ superButton.setToolTipText("Create superellipsoid");
	1216	+ superButton.addActionListener(this);
	1217	+
	1218	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1219	+ sphereButton.setToolTipText("Create sphere");
	1220	+ sphereButton.addActionListener(this);
	1221	+
	1222	+ row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1223	+ coneButton.setToolTipText("Create cone");
	1224	+ coneButton.addActionListener(this);
	1225	+
	1226	+ row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1227	+ torusButton.setToolTipText("Create torus");
	1228	+ torusButton.addActionListener(this);
	1229	+
	1230	+ if (false) //Globals.ADVANCED)
	1231	+ {
	1232	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1233	+ kleinButton.setToolTipText("Create Klein bottle");
	1234	+ kleinButton.addActionListener(this);
	1235	+ }
	1236	+
	1237	+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1238	+ particlesButton.setToolTipText("Create particle system");
	1239	+ particlesButton.addActionListener(this);
	1240	+
	1241	+ oe.toolboxPanel.add(row1);
	1242	+
	1243	+ cGridBag row2 = new cGridBag();
	1244	+ row2.preferredHeight = 8;
	1245	+
	1246	+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1247	+ groupButton.setToolTipText("Create group");
	1248	+ groupButton.addActionListener(this);
	1249	+
	1250	+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1251	+ compositeButton.setToolTipText("Create composite");
	1252	+ compositeButton.addActionListener(this);
	1253	+
	1254	+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1255	+ switchButton.setToolTipText("Create item switcher");
	1256	+ switchButton.addActionListener(this);
	1257	+
	1258	+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1259	+ loopButton.setToolTipText("Create loop");
	1260	+ loopButton.addActionListener(this);
	1261	+
	1262	+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1263	+ textureButton.setToolTipText("Create texture");
	1264	+ textureButton.addActionListener(this);
	1265	+
	1266	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1267	+ overlayButton.setToolTipText("Create overlay");
	1268	+ overlayButton.addActionListener(this);
	1269	+
	1270	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1271	+ lightButton.setToolTipText("Create light");
	1272	+ lightButton.addActionListener(this);
	1273	+
	1274	+ oe.toolboxPanel.add(row2);
	1275	+
	1276	+ cGridBag textures = new cGridBag();
	1277	+
	1278	+ CreateTexturePanel(textures);
	1279	+
	1280	+ int tabCount = resourcecontainer.getTabCount();
	1281	+
	1282	+ if (tabCount > 0)
	1283	+ resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
	1284	+
	1285	+ oe.toolboxPanel.add(textures);
	1286	+
	1287	+ textures.preferredHeight = 100;
	1288	+
	1289	+ CreateSkyboxPanel(oe.skyboxPanel);
	1290	+
	1291	+ // EDIT panel
	1292	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1293	+ editButton.setToolTipText("Pin selection controls");
639	1294	editButton.addActionListener(this);
640	1295
641		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
642		- uneditButton.setToolTipText("Unedit selection");
	1296	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1297	+ uneditButton.setToolTipText("Unpin and remove selection controls");
643	1298	uneditButton.addActionListener(this);
644	1299
645		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
646		- allParamsButton.setToolTipText("Edit all params");
	1300	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1301	+ allParamsButton.setToolTipText("Show all controls");
647	1302	allParamsButton.addActionListener(this);
648	1303
649		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
650		- clearPanelButton.setToolTipText("Clear edit panel");
	1304	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1305	+ clearPanelButton.setToolTipText("Clear all controls");
651	1306	clearPanelButton.addActionListener(this);
652	1307
653		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
654		- unselectButton.setToolTipText("Unselect");
655		- unselectButton.addActionListener(this);
	1308	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1309	+ //unselectButton.setToolTipText("Unselect");
	1310	+ //unselectButton.addActionListener(this);
656	1311
657		- commandsPanel.preferredHeight = 1;
	1312	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1313	+ flashSelectionButton.setToolTipText("Highlight selection");
	1314	+ flashSelectionButton.addActionListener(this);
658	1315
659		- oe.treePanel.add(commandsPanel);
660		- oe.treePanel.Return();
	1316	+ editCommandsPanel.preferredHeight = 1;
	1317	+
	1318	+ SetPinStates(false);
	1319	+// oe.treePanel.add(commandsPanel);
	1320	+// oe.treePanel.Return();
661	1321
662	1322	// oe.aConstraints.gridx += 1;
663	1323	// oe.aConstraints.weighty = 0;
..	..	@@ -672,34 +1332,25 @@
672	1332
673	1333	cGridBag jSPPanel = new cGridBag();
674	1334
	1335	+ jSPPanel.preferredHeight = 20;
	1336	+
675	1337	JScrollPane jSP;
676	1338	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
677		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1339	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
678	1340	ResetModel();
679	1341
680	1342	oe.treePanel.add(jSPPanel);
681	1343	oe.treePanel.Return();
682	1344
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);
	1345	+ oe.treePanel.add(versionManagerPanel);
699	1346	oe.treePanel.Return();
700	1347
701		-// mainPanel.setDividerLocation(0.5); //1.0);
702		-// mainPanel.setResizeWeight(0.5);
	1348	+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1349	+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
	1350	+ versionSliderPane.preferredHeight = 3;
	1351	+
	1352	+// mainPanel.setDividerLocation(0.1); //1.0);
	1353	+ mainPanel.setResizeWeight(0.4);
703	1354
704	1355	//jList.addListSelectionListener(this);
705	1356	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -707,7 +1358,7 @@
707	1358	//jTree.setEditable(true);
708	1359	oe.jTree.setDragEnabled(true);
709	1360	//jTree.setPreferredSize(new Dimension(10,10));
710		- jSP.setPreferredSize(new Dimension(100,200));
	1361	+ //jSP.setPreferredSize(new Dimension(100,200));
711	1362
712	1363	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
713	1364
..	..	@@ -719,87 +1370,159 @@
719	1370	dgr.addDragGestureListener(this);
720	1371	}catch(Exception e) {}
721	1372	*/
722		- radio.layout = sevenButton;
	1373	+ radio.layout = threeButton; // sixButton;
723	1374	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
724	1375	}
725	1376
726	1377	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
727	1378	{
	1379	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1380	+ colorCB.setToolTipText("Copy color when dropped");
	1381	+ colorCB.addItemListener(this);
	1382	+
	1383	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1384	+ materialCB.setToolTipText("Copy material when dropped");
	1385	+ materialCB.addItemListener(this);
	1386	+
	1387	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1388	+ textureCB.setToolTipText("Copy texture when dropped");
	1389	+ textureCB.addItemListener(this);
	1390	+
	1391	+ panel.Return();
	1392	+
728	1393	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
729	1394	boxCB.setToolTipText("Display bounding boxes");
730	1395	boxCB.addItemListener(this);
731	1396
732	1397	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
733		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1398	+ zoomBoxCB.setToolTipText("Display only for wheel");
734	1399	zoomBoxCB.addItemListener(this);
735	1400
736	1401	if (true) // Globals.ADVANCED)
737	1402	{
738		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
739		- supportCB.setToolTipText("Enable rigging");
740		- supportCB.addItemListener(this);
	1403	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1404	+// supportCB.setToolTipText("Enable rigging");
	1405	+// supportCB.addItemListener(this);
	1406	+
	1407	+ panel.add(freezeCB = new cCheckBox("Fast cam", Globals.FREEZEONMOVE)); //, constraints);
	1408	+ freezeCB.setToolTipText("Fast moving camera");
	1409	+ freezeCB.addItemListener(this);
741	1410
742	1411	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
743	1412	// localCB.addItemListener(this);
744	1413
	1414	+ panel.Return();
	1415	+
	1416	+ if (Globals.ADVANCED)
	1417	+ {
745	1418	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
746	1419	crowdCB.setToolTipText("Used for crowds");
747	1420	crowdCB.addItemListener(this);
	1421	+ }
748	1422
749	1423	panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
750	1424	smoothCB.setToolTipText("Snapping delay");
751	1425	smoothCB.addItemListener(this);
752	1426
753		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
754		- slowCB.setToolTipText("Smooth interpolation");
755		- slowCB.addItemListener(this);
	1427	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1428	+// slowCB.setToolTipText("Smooth interpolation");
	1429	+// slowCB.addItemListener(this);
	1430	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1431	+ minshaderCB.setToolTipText("Minimal fast shader");
	1432	+ minshaderCB.addItemListener(this);
756	1433
757		-// constraints.gridy += 1;
758	1434	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
759	1435	// speakerMocapCB.addItemListener(this);
760	1436
761	1437	if (false)
762	1438	{
763	1439	// handled in scripts
764		- //constraints.gridy += 1;
765	1440	panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
766	1441	speakerCameraCB.addItemListener(this);
767	1442
768		- //constraints.gridy += 1;
769	1443	panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
770	1444	speakerFocusCB.addItemListener(this);
771	1445
772		- //constraints.gridy += 1;
773		- panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
774		- smoothfocusCB.addItemListener(this);
	1446	+ panel.Return();
775	1447	}
776	1448
777		-//constraints.gridx += 1;
	1449	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	1450	+ smoothfocusCB.addItemListener(this);
	1451	+
	1452	+ panel.Return();
	1453	+
778	1454	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
779	1455	// debugCB.addItemListener(this);
780	1456
	1457	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1458	+ trackCB.setToolTipText("Enable tracking target");
	1459	+ trackCB.addItemListener(this);
	1460	+
781	1461	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1462	+ oeilCB.setToolTipText("Move camera when tracking");
782	1463	oeilCB.addItemListener(this);
783	1464
	1465	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1466	+ shadowCB.setToolTipText("When live compute shadows");
	1467	+ shadowCB.addItemListener(this);
	1468	+
	1469	+ panel.Return();
	1470	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1471	+ toggleTextureCB.setToolTipText("Load textures");
	1472	+ toggleTextureCB.addItemListener(this);
	1473	+
	1474	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1475	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1476	+ toggleSwitchCB.addItemListener(this);
	1477	+
	1478	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1479	+ autokeepCB.setToolTipText("On structure change");
	1480	+ autokeepCB.addItemListener(this);
	1481	+
	1482	+ panel.Return();
	1483	+ if (Globals.ADVANCED)
	1484	+ {
784	1485	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
785	1486	lookAtCB.setToolTipText("Look-at target");
786	1487	lookAtCB.addItemListener(this);
	1488	+ }
787	1489
788	1490	}
789	1491
790	1492	cGridBag fill = new cGridBag();
791		-
792	1493	fill.preferredHeight = 200;
	1494	+ cGridBag fill2 = new cGridBag();
	1495	+ fill2.preferredHeight = 200;
	1496	+ cGridBag fill3 = new cGridBag();
	1497	+ fill3.preferredHeight = 200;
793	1498
794	1499	panel.add(fill);
	1500	+ panel.add(fill2);
	1501	+ panel.add(fill3);
795	1502
796	1503	}
797	1504
798	1505	void EditObject(Object3D obj)
799	1506	{
	1507	+ //assert(obj instanceof Composite);
	1508	+
	1509	+// if (obj.versionlist == null)
	1510	+// {
	1511	+// obj.versionlist = new Object3D[100];
	1512	+// obj.versionindex = -1;
	1513	+// }
	1514	+
800	1515	cRadio radioButton = new cRadio(obj.name);
	1516	+
	1517	+ // June 2019. Patch to avoid bug with transparency.
	1518	+ radioButton.hadMaterial = obj.material != null;
	1519	+ if (!radioButton.hadMaterial)
	1520	+ {
	1521	+ obj.material = new cMaterial();
	1522	+ }
	1523	+
801	1524	radioButton.SetObject(obj);
802		- radioButton.layout = sevenButton;
	1525	+ radioButton.layout = threeButton; // sixButton;
803	1526	radioButton.SetCamera(cameraView.renderCamera, false);
804	1527	radioButton.addActionListener(this);
805	1528	radioPanel.add(radioButton);
..	..	@@ -809,31 +1532,41 @@
809	1532
810	1533	void SetupViews(ObjEditor oe)
811	1534	{
	1535	+ theFrame = this;
	1536	+
812	1537	oe.SetupViews();
813	1538
	1539	+ if (Globals.DEBUG)
814	1540	System.out.println("SetupViews");
815	1541	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
816	1542	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
817	1543	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
818	1544	}
819	1545
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;
	1546	+ cToggleButton liveCB;
	1547	+ cCheckBox supportCB;
	1548	+ cCheckBox localCB;
	1549	+ cCheckBox crowdCB;
	1550	+ cCheckBox smoothCB;
	1551	+ cCheckBox minshaderCB;
	1552	+
	1553	+ cToggleButton fastCB;
	1554	+ cCheckBox slowCB;
	1555	+ cCheckBox boxCB;
	1556	+ cCheckBox zoomBoxCB;
	1557	+ cCheckBox freezeCB;
	1558	+ //cToggleButton trackCB;
	1559	+ cCheckBox trackCB;
	1560	+ cCheckBox smoothfocusCB;
831	1561	// JCheckBox speakerMocapCB;
832		- JCheckBox speakerCameraCB;
833		- JCheckBox speakerFocusCB;
834		- JCheckBox debugCB;
835		- JCheckBox oeilCB;
836		- JCheckBox lookAtCB;
	1562	+ cCheckBox speakerCameraCB;
	1563	+ cCheckBox speakerFocusCB;
	1564	+ cCheckBox debugCB;
	1565	+
	1566	+ cCheckBox oeilCB;
	1567	+ cCheckBox shadowCB;
	1568	+ cCheckBox autokeepCB;
	1569	+ cCheckBox lookAtCB;
837	1570
838	1571	// static int COLOR = 1;
839	1572	// static int MATERIAL = 2;
..	..	@@ -841,9 +1574,9 @@
841	1574
842	1575	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
843	1576
844		- JCheckBox colorCB;
845		- JCheckBox materialCB;
846		- JCheckBox textureCB;
	1577	+ cCheckBox colorCB;
	1578	+ cCheckBox materialCB;
	1579	+ cCheckBox textureCB;
847	1580
848	1581	public void itemStateChanged(ItemEvent e)
849	1582	{
..	..	@@ -871,6 +1604,7 @@
871	1604	} else if(e.getSource() == liveCB)
872	1605	{
873	1606	cameraView.ToggleLive();
	1607	+ refreshContents(false);
874	1608	}
875	1609	else if(e.getSource() == supportCB)
876	1610	{
..	..	@@ -886,6 +1620,12 @@
886	1620	{
887	1621	cameraView.ToggleInertia();
888	1622	cameraView.repaint();
	1623	+ }
	1624	+ else if(e.getSource() == minshaderCB)
	1625	+ {
	1626	+ Globals.MINSHADER ^= true;
	1627	+ cameraView.programInitialized = false;
	1628	+ cameraView.repaint();
889	1629	}
890	1630	else if(e.getSource() == localCB)
891	1631	{
..	..	@@ -935,6 +1675,18 @@
935	1675	{
936	1676	cameraView.ToggleOeil();
937	1677	}
	1678	+ else if(e.getSource() == shadowCB)
	1679	+ {
	1680	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1681	+ }
	1682	+ else if(e.getSource() == freezeCB)
	1683	+ {
	1684	+ Globals.FREEZEONMOVE ^= true;
	1685	+ }
	1686	+ else if(e.getSource() == autokeepCB)
	1687	+ {
	1688	+ Globals.REPLACEONMAKE ^= true;
	1689	+ }
938	1690	else if(e.getSource() == lookAtCB)
939	1691	{
940	1692	cameraView.ToggleLookAt();
..	..	@@ -951,7 +1703,8 @@
951	1703
952	1704	/**/
953	1705	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
954		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1706	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1707	+ TreePath path = objEditor.jTree.getSelectionPath();
955	1708	if ((path == null) \|\| (path.getPathCount() <= 1)) {
956	1709	// We can't move the root node or an empty selection
957	1710	return;
..	..	@@ -1014,8 +1767,6 @@
1014	1767	}
1015	1768	}
1016	1769
1017		- String string = (String) object;
1018		-
1019	1770	System.out.println("Transfer = " + object + "; drop : " + target);
1020	1771	// if( object instanceof java.io.File[])
1021	1772	// {
..	..	@@ -1023,6 +1774,8 @@
1023	1774	// objEditor.DropFile((java.io.File[]) object, true);
1024	1775	// return;
1025	1776	// }
	1777	+
	1778	+ String string = object.toString();
1026	1779
1027	1780	// File path for Mac and Windows
1028	1781	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1068,23 +1821,33 @@
1068	1821
1069	1822	assert target == objEditor.jTree;
1070	1823	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1824	+ Object3D destinationLeaf;
1071	1825	try {
1072		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1826	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1073	1827	} catch (Exception e) {
1074	1828	System.out.println("destinationPath : " + destinationPath);
1075	1829	return;
1076	1830	}
1077	1831
1078		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1832	+ for (int i=group.selection.size(); --i>=0;)
1079	1833	{
	1834	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1835	+
	1836	+ // Cannot move into itself
	1837	+ if (child == destinationLeaf)
	1838	+ return;
	1839	+ }
	1840	+
	1841	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1842	+// {
1080	1843	loadClipboard(true);
1081	1844	objEditor.jTree.setSelectionPath(destinationPath);
1082	1845	pasteInto(false, false);
1083		- } else {
1084		- loadClipboard(false);
1085		- objEditor.jTree.setSelectionPath(destinationPath);
1086		- pasteInto(false, false); // true); // ???
1087		- }
	1846	+// } else {
	1847	+// loadClipboard(false);
	1848	+// objEditor.jTree.setSelectionPath(destinationPath);
	1849	+// pasteInto(false, false); // true); // ???
	1850	+// }
1088	1851	}
1089	1852	public void dropActionChanged(DropTargetDragEvent dtde)
1090	1853	// Called if the user has modified the current drop gesture
..	..	@@ -1140,7 +1903,12 @@
1140	1903	TreePath path;
1141	1904
1142	1905	public TransferableTreePath(TreePath tp) {
1143		- path = tp;
	1906	+ Object[] objs = new Object[tp.getPathCount()];
	1907	+ for (int i=0; i<objs.length; i++)
	1908	+ {
	1909	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1910	+ }
	1911	+ path = new TreePath(objs);
1144	1912	}
1145	1913
1146	1914	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1189,22 +1957,30 @@
1189	1957	{
1190	1958	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1191	1959	//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);
	1960	+// gridItem = menu.add(new MenuItem("Grid"));
	1961	+// gridItem.addActionListener(this);
	1962	+// rectoidItem = menu.add(new MenuItem("Box"));
	1963	+// rectoidItem.addActionListener(this);
	1964	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1965	+// ellipsoidItem.addActionListener(this);
	1966	+// coneItem = menu.add(new MenuItem("Cone"));
	1967	+// coneItem.addActionListener(this);
	1968	+// torusItem = menu.add(new MenuItem("Torus"));
	1969	+// torusItem.addActionListener(this);
	1970	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1971	+// superItem.addActionListener(this);
	1972	+
	1973	+ cameraItem = menu.add(new MenuItem("Camera"));
	1974	+ cameraItem.addActionListener(this);
	1975	+
	1976	+ if (!Globals.ADVANCED)
	1977	+ {
1204	1978	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1205	1979	kleinItem.addActionListener(this);
1206		- particleItem = menu.add(new MenuItem("Particle system"));
1207		- particleItem.addActionListener(this);
	1980	+ }
	1981	+
	1982	+// particleItem = menu.add(new MenuItem("Particle system"));
	1983	+// particleItem.addActionListener(this);
1208	1984	if (Globals.ADVANCED)
1209	1985	{
1210	1986	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1230,15 +2006,15 @@
1230	2006	}
1231	2007	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1232	2008	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);
	2009	+// overlayItem = menu.add(new MenuItem("Overlay"));
	2010	+// overlayItem.addActionListener(this);
	2011	+// lightItem = menu.add(new MenuItem("Light"));
	2012	+// lightItem.addActionListener(this);
1237	2013	menu.add("-");
1238	2014	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1239	2015	//superLoopItem.addActionListener(this);
1240		- loopItem = menu.add(new MenuItem("Loop"));
1241		- loopItem.addActionListener(this);
	2016	+// loopItem = menu.add(new MenuItem("Loop"));
	2017	+// loopItem.addActionListener(this);
1242	2018	doubleItem = menu.add(new MenuItem("Fork"));
1243	2019	doubleItem.addActionListener(this);
1244	2020	if (Globals.ADVANCED)
..	..	@@ -1254,6 +2030,9 @@
1254	2030	animationItem.addItemListener(this);
1255	2031	animationItem.setState(Globals.ANIMATION);
1256	2032
	2033	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	2034	+ archiveItem.addActionListener(this);
	2035	+
1257	2036	menu.add("-");
1258	2037	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1259	2038	parseverticesItem.addActionListener(this);
..	..	@@ -1266,6 +2045,8 @@
1266	2045	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1267	2046	reduce34MorphItem.addActionListener(this);
1268	2047	menu.add("-");
	2048	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	2049	+ memoryItem.addActionListener(this);
1269	2050	menu.add(computeAOItem = new MenuItem("Compute AO"));
1270	2051	computeAOItem.addActionListener(this);
1271	2052
..	..	@@ -1274,11 +2055,9 @@
1274	2055	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1275	2056	mirrorItem.addActionListener(this);
1276	2057	menu.add("-");
1277		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1278		- memoryItem.addActionListener(this);
1279	2058	menu.add(analyzeItem = new MenuItem("Analyze"));
1280	2059	analyzeItem.addActionListener(this);
1281		- menu.add(dumpItem = new MenuItem("Dump"));
	2060	+ menu.add(dumpItem = new MenuItem("Print"));
1282	2061	dumpItem.addActionListener(this);
1283	2062	// menu.add(pathItem = new MenuItem("From-to path"));
1284	2063	// pathItem.addActionListener(this);
..	..	@@ -1310,7 +2089,7 @@
1310	2089	Object3D obj = (Object3D)group.selection.elementAt(0);
1311	2090	objEditor.ScreenFit(obj, false);
1312	2091
1313		- cameraView.pingthread.StepToTarget(true);
	2092	+ cameraView.pingthread.StepToTarget(); //true);
1314	2093	refreshContents();
1315	2094	}
1316	2095
..	..	@@ -1347,7 +2126,7 @@
1347	2126	obj.parent.TransformToWorld(maxima); //, maxima);
1348	2127	}
1349	2128
1350		- Object3D shadow = new Object3D("Shadow " + obj.name);
	2129	+ Object3D shadow = new Object3D("Shadow" + obj.name);
1351	2130
1352	2131	shadow.toParent = LA.newMatrix();
1353	2132	shadow.fromParent = LA.newMatrix();
..	..	@@ -1361,24 +2140,24 @@
1361	2140	switch(axis)
1362	2141	{
1363	2142	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;
	2143	+ vert1.x = minima.x + 0.001f; vert1.y = minima.y; vert1.z = minima.z;
	2144	+ vert2.x = minima.x + 0.001f; vert2.y = maxima.y; vert2.z = minima.z;
	2145	+ vert3.x = minima.x + 0.001f; vert3.y = minima.y; vert3.z = maxima.z;
	2146	+ vert4.x = minima.x + 0.001f; vert4.y = maxima.y; vert4.z = maxima.z;
1368	2147	norm = cVector.X;
1369	2148	break;
1370	2149	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;
	2150	+ vert1.x = minima.x; vert1.y = minima.y + 0.001f; vert1.z = minima.z;
	2151	+ vert2.x = maxima.x; vert2.y = minima.y + 0.001f; vert2.z = minima.z;
	2152	+ vert3.x = minima.x; vert3.y = minima.y + 0.001f; vert3.z = maxima.z;
	2153	+ vert4.x = maxima.x; vert4.y = minima.y + 0.001f; vert4.z = maxima.z;
1375	2154	norm = cVector.Y;
1376	2155	break;
1377	2156	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;
	2157	+ vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z + 0.001f;
	2158	+ vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z + 0.001f;
	2159	+ vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z + 0.001f;
	2160	+ vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z + 0.001f;
1382	2161	norm = cVector.Z;
1383	2162	break;
1384	2163	}
..	..	@@ -1419,9 +2198,38 @@
1419	2198	shadow.material = new cMaterial(obj.material);
1420	2199	shadow.material.diffuse = 0.0001f;
1421	2200	shadow.material.specular = 0.0001f;
	2201	+ shadow.material.opacity = 0.75f;
	2202	+
	2203	+ AllocProjectedVertices(shadow);
	2204	+
	2205	+ shadow.projectedVertices[1].x = 300;
1422	2206
1423	2207	makeSomething(shadow);
1424	2208	}
	2209	+
	2210	+ private void ClearUnpinned()
	2211	+ {
	2212	+ //for (Object3D obj : listUI)
	2213	+ for (int i=listUI.size(); --i>=0;)
	2214	+ {
	2215	+ Object3D obj = listUI.elementAt(i);
	2216	+ if (!obj.pinned)
	2217	+ {
	2218	+ obj.CloseUI();
	2219	+ listUI.remove(i);
	2220	+ }
	2221	+ }
	2222	+ }
	2223	+
	2224	+ private void EditElement(Object3D elem, boolean newWindow)
	2225	+ {
	2226	+ // if (!(elem instanceof Composite))
	2227	+ // newWindow = false;
	2228	+ listUI.add(elem);
	2229	+ elem.openEditWindow(this, newWindow); //, false);
	2230	+ System.out.println("edit : " + elem);
	2231	+ elem.editWindow.refreshContents(true); // ? new
	2232	+ }
1425	2233
1426	2234	/**
1427	2235	* applyExample
..	..	@@ -1666,7 +2474,7 @@
1666	2474	{
1667	2475	ScreenFit();
1668	2476	} else
1669		- if (source == switchItem)
	2477	+ if (source == switchViewItem)
1670	2478	{
1671	2479	cVector v1 = new cVector();
1672	2480	cVector v2 = new cVector();
..	..	@@ -1675,11 +2483,11 @@
1675	2483	objEditor.cameraView.renderCamera.setAim(v2, v1);
1676	2484	objEditor.cameraView.repaint();
1677	2485	} else
1678		- if (source == rectoidItem)
	2486	+ if (source == rectoidItem \|\| source == boxButton)
1679	2487	{
1680	2488	makeSomething(new Box());
1681	2489	} else
1682		- if (source == particleItem)
	2490	+ if (source == particleItem \|\| source == particlesButton)
1683	2491	{
1684	2492	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1685	2493	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1758,27 +2566,27 @@
1758	2566
1759	2567	makeSomething(obj);
1760	2568	} else
1761		- if (source == gridItem)
	2569	+ if (source == gridItem \|\| source == gridButton)
1762	2570	{
1763	2571	makeSomething(new Grid());
1764	2572	} else
1765		- if (source == ellipsoidItem)
	2573	+ if (source == ellipsoidItem \|\| source == sphereButton)
1766	2574	{
1767	2575	makeSomething(new Sphere());
1768	2576	} else
1769		- if (source == coneItem)
	2577	+ if (source == coneItem \|\| source == coneButton)
1770	2578	{
1771	2579	makeSomething(new Cone());
1772	2580	} else
1773		- if (source == torusItem)
	2581	+ if (source == torusItem \|\| source == torusButton)
1774	2582	{
1775	2583	makeSomething(new Torus());
1776	2584	} else
1777		- if (source == superItem)
	2585	+ if (source == superItem \|\| source == superButton)
1778	2586	{
1779	2587	makeSomething(new Superellipsoid());
1780	2588	} else
1781		- if (source == kleinItem)
	2589	+ if (source == kleinItem \|\| source == kleinButton)
1782	2590	{
1783	2591	makeSomething(new Klein());
1784	2592	} else
..	..	@@ -1798,7 +2606,7 @@
1798	2606	{
1799	2607	makeSomething(new BezierSurface());
1800	2608	} else
1801		- if (source == overlayItem)
	2609	+ if (source == overlayItem \|\| source == overlayButton)
1802	2610	{
1803	2611	/*
1804	2612	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1846,10 +2654,27 @@
1846	2654	s.setup();
1847	2655	makeSomething(s);
1848	2656	} else
1849		- if (source == lightItem)
	2657	+ if (source == lightItem \|\| source == lightButton)
1850	2658	{
1851	2659	makeSomething(new Light());
1852	2660	} else
	2661	+// if (source == skybox1Button \|\|
	2662	+// source == skybox2Button \|\|
	2663	+// source == skybox3Button \|\|
	2664	+// source == skybox4Button \|\|
	2665	+// source == skybox5Button \|\|
	2666	+// source == skybox6Button \|\|
	2667	+// source == skybox7Button \|\|
	2668	+// source == skybox11Button \|\|
	2669	+// source == skybox12Button \|\|
	2670	+// source == skybox13Button \|\|
	2671	+// source == skybox14Button \|\|
	2672	+// source == skybox15Button \|\|
	2673	+// source == skybox16Button \|\|
	2674	+// source == skybox17Button)
	2675	+// {
	2676	+// ChangeSkybox(source);
	2677	+// } else
1853	2678	if (source == csgItem)
1854	2679	{
1855	2680	group(new CSG());
..	..	@@ -1896,30 +2721,38 @@
1896	2721
1897	2722	group(g);
1898	2723	} else
1899		- if (source == loopItem)
	2724	+ if (source == loopItem \|\| source == loopButton)
1900	2725	{
	2726	+ if (!group.selection.isEmpty())
	2727	+ {
1901	2728	Composite csg = new GroupLeaf();
1902		- csg.count = 5;
1903	2729	group(csg);
1904		- Composite child = new cGroup();
	2730	+ csg.count = 5;
	2731	+ Composite child = new cGroup("Branch");
1905	2732	csg.addChild(child);
1906	2733	child.addChild(csg);
	2734	+ }
1907	2735	} else
1908	2736	if (source == doubleItem)
1909	2737	{
1910		- Composite csg = new GroupLeaf();
1911		- csg.count = 5;
	2738	+ if (!group.selection.isEmpty())
	2739	+ {
	2740	+ Composite csg = new GroupLeaf("Fork");
1912	2741	group(csg);
1913		- Composite child = new cGroup();
	2742	+ csg.count = 5;
	2743	+ Composite child = new cGroup("Branch A");
1914	2744	csg.addChild(child);
1915	2745	child.addChild(csg);
1916		- child = new cGroup();
	2746	+ child = new cGroup("Branch B");
1917	2747	csg.addChild(child);
1918	2748	child.addChild(csg);
	2749	+ }
1919	2750	} else
1920	2751	if (source == tripleItem)
1921	2752	{
1922		- Composite csg = new GroupLeaf();
	2753	+ if (!group.selection.isEmpty())
	2754	+ {
	2755	+ Composite csg = new GroupLeaf("Trident");
1923	2756	csg.count = 4;
1924	2757	group(csg);
1925	2758	Composite child = new cGroup();
..	..	@@ -1931,11 +2764,12 @@
1931	2764	child = new cGroup();
1932	2765	csg.addChild(child);
1933	2766	child.addChild(csg);
	2767	+ }
1934	2768	} else
1935	2769	if (source == computeAOItem)
1936	2770	{
1937	2771	Globals.drawMode = CameraPane.OCCLUSION;
1938		- Globals.theRenderer.repaint();
	2772	+ cameraView.repaint();
1939	2773	} else
1940	2774	if (source == recompileItem)
1941	2775	{
..	..	@@ -1950,7 +2784,7 @@
1950	2784	if (source == invariantsItem)
1951	2785	{
1952	2786	System.out.println("Invariants:");
1953		- Grafreed.grafreeD.universe.invariants();
	2787	+ Grafreed.grafreed.universe.invariants();
1954	2788	} else
1955	2789	if (source == memoryItem)
1956	2790	{
..	..	@@ -1969,17 +2803,64 @@
1969	2803	{
1970	2804	DumpObject();
1971	2805	} else
1972		- if (source == undoButton)
	2806	+ if (source == minButton)
1973	2807	{
1974		- Undo();
	2808	+ Minimize();
1975	2809	} else
1976		- if (source == redoButton)
	2810	+ if (source == maxButton)
1977	2811	{
1978		- Redo();
	2812	+ Maximize();
1979	2813	} else
1980		- if (source == saveButton)
	2814	+ if (source == fullScreenButton)
1981	2815	{
1982		- Save();
	2816	+ ToggleFullScreen();
	2817	+ } else
	2818	+ if (source == collapseButton)
	2819	+ {
	2820	+ this.expandedLayout = radio.layout;
	2821	+ CollapseToolbar();
	2822	+ } else
	2823	+// if (source == maximize3DButton)
	2824	+// {
	2825	+// this.expandedLayout = radio.layout;
	2826	+// radio.layout = twoButton;
	2827	+// CollapseToolbar();
	2828	+// Show3DView();
	2829	+// } else
	2830	+ if (source == previousVersionButton)
	2831	+ {
	2832	+ // Go to previous version
	2833	+ //if (!Undo())
	2834	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2835	+ PreviousVersion();
	2836	+ } else
	2837	+ if (source == restoreButton)
	2838	+ {
	2839	+ // Restore current version
	2840	+ Restore();
	2841	+ //restoreButton.setEnabled(false);
	2842	+ } else
	2843	+ if (source == replaceButton)
	2844	+ {
	2845	+ // Overwrite current version
	2846	+ Replace();
	2847	+ //replaceButton.setEnabled(false);
	2848	+ } else
	2849	+ if (source == nextVersionButton)
	2850	+ {
	2851	+ // Go to next version
	2852	+ NextVersion();
	2853	+ } else
	2854	+ if (source == saveVersionButton)
	2855	+ {
	2856	+ // Save a new version
	2857	+ if (!DuplicateVersion()) //true))
	2858	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2859	+ } else
	2860	+ if (source == deleteVersionButton)
	2861	+ {
	2862	+ // Delete a new version
	2863	+ DeleteVersion();
1983	2864	} else
1984	2865	if (source == oneStepButton)
1985	2866	{
..	..	@@ -1988,17 +2869,14 @@
1988	2869	} else
1989	2870	if (source == screenfitButton)
1990	2871	{
1991		- //Reload(lastConverter, lastFilename, true);
1992	2872	ScreenFit();
1993	2873	} else
1994	2874	if (source == screenfitpointButton)
1995	2875	{
1996		- //Reload(lastConverter, lastFilename, true);
1997	2876	ScreenFitPoint();
1998	2877	} else
1999	2878	if (source == snapobjectButton)
2000	2879	{
2001		- //Reload(lastConverter, lastFilename, true);
2002	2880	SnapObject();
2003	2881	} else
2004	2882	// if (event.getSource() == recompileButton)
..	..	@@ -2037,11 +2915,11 @@
2037	2915	} else
2038	2916	if (source == undoItem)
2039	2917	{
2040		- Undo();
	2918	+ PreviousVersion();
2041	2919	} else
2042	2920	if (source == redoItem)
2043	2921	{
2044		- Redo();
	2922	+ NextVersion();
2045	2923	} else
2046	2924	if (source == duplicateItem)
2047	2925	{
..	..	@@ -2362,7 +3240,7 @@
2362	3240	{
2363	3241	StepAll();
2364	3242	} else
2365		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3243	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2366	3244	{
2367	3245	//int indices[] = jList.getSelectedIndices();
2368	3246	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2374,9 +3252,9 @@
2374	3252	{
2375	3253	ClearSelection(true);
2376	3254	} else
2377		- if (source == grabItem)
	3255	+ if (source == grabItem \|\| source == groupButton)
2378	3256	{
2379		- group(new cGroup(), true);
	3257	+ group(new cGroup(), false); // true);
2380	3258	} else
2381	3259	if (source == hideItem)
2382	3260	{
..	..	@@ -2394,11 +3272,11 @@
2394	3272	{
2395	3273	makeSomething(new Camera());
2396	3274	} else
2397		- if (source == compositeItem)
	3275	+ if (source == compositeItem \|\| source == compositeButton)
2398	3276	{
2399	3277	group(new Composite());
2400	3278	} else
2401		- if (source == randomItem)
	3279	+ if (source == switchItem \|\| source == switchButton)
2402	3280	{
2403	3281	RandomNode random = new RandomNode();
2404	3282	group(random);
..	..	@@ -2500,7 +3378,7 @@
2500	3378	{
2501	3379	group(new cLinker());
2502	3380	} else
2503		- if (source == textureItem)
	3381	+ if (source == textureItem \|\| source == textureButton)
2504	3382	{
2505	3383	group(new TextureNode());
2506	3384	} else
..	..	@@ -2520,17 +3398,42 @@
2520	3398	{
2521	3399	CastShadow(2);
2522	3400	} else
2523		- if (source == ungroupItem)
	3401	+ if (source == ungroupItem \|\| source == ungroupButton)
2524	3402	{
2525		- //ungroup();
	3403	+ boolean canUngroup = true;
	3404	+
2526	3405	for (int i=0; i<group.selection.size(); i++)
2527	3406	{
2528		- Ungroup(group.selection.get(i));
	3407	+ Object3D selectedItem = group.selection.get(i);
	3408	+
	3409	+ if (selectedItem.Size() == 0)
	3410	+ {
	3411	+ // Cannot ungroup leaves
	3412	+ canUngroup = false;
	3413	+ break;
	3414	+ }
	3415	+
	3416	+ if (selectedItem == group)
	3417	+ {
	3418	+ // Cannot ungroup root
	3419	+ canUngroup = false;
	3420	+ break;
	3421	+ }
2529	3422	}
2530	3423
2531		- ClearSelection(false);
2532		-
2533		- refreshContents();
	3424	+ if (canUngroup)
	3425	+ {
	3426	+ for (int i=0; i<group.selection.size(); i++)
	3427	+ {
	3428	+ Object3D selectedItem = group.selection.get(i);
	3429	+
	3430	+ Ungroup(selectedItem);
	3431	+ }
	3432	+
	3433	+ ClearSelection(false);
	3434	+
	3435	+ refreshContents();
	3436	+ }
2534	3437	} else
2535	3438	if (source == genUVItem)
2536	3439	{
..	..	@@ -2542,7 +3445,7 @@
2542	3445	} else
2543	3446	if (source == genNormalsMESHItem)
2544	3447	{
2545		- GenNormals(true); // TODO
	3448	+ GenNormalsMESH();
2546	3449	} else
2547	3450	if (source == genNormalsORGANItem)
2548	3451	{
..	..	@@ -2576,6 +3479,10 @@
2576	3479	{
2577	3480	ClearMaterials();
2578	3481	} else
	3482	+ if (source == clearVersionsItem)
	3483	+ {
	3484	+ ClearVersions();
	3485	+ } else
2579	3486	if (source == liveleavesItem)
2580	3487	{
2581	3488	LiveLeaves(true);
..	..	@@ -2607,6 +3514,22 @@
2607	3514	if (source == unmarkleavesItem)
2608	3515	{
2609	3516	MarkLeaves(false);
	3517	+ } else
	3518	+ if (source == rewindleavesItem)
	3519	+ {
	3520	+ RewindLeaves(true);
	3521	+ } else
	3522	+ if (source == unrewindleavesItem)
	3523	+ {
	3524	+ RewindLeaves(false);
	3525	+ } else
	3526	+ if (source == randomleavesItem)
	3527	+ {
	3528	+ RandomLeaves(true);
	3529	+ } else
	3530	+ if (source == unrandomleavesItem)
	3531	+ {
	3532	+ RandomLeaves(false);
2610	3533	} else
2611	3534	if (source == flipVItem)
2612	3535	{
..	..	@@ -2699,6 +3622,18 @@
2699	3622	if (source == transformChildrenItem)
2700	3623	{
2701	3624	TransformChildren();
	3625	+ } else
	3626	+ if (source == textureRatioRItem)
	3627	+ {
	3628	+ TextureRatio(0);
	3629	+ } else
	3630	+ if (source == textureRatioGItem)
	3631	+ {
	3632	+ TextureRatio(1);
	3633	+ } else
	3634	+ if (source == textureRatioBItem)
	3635	+ {
	3636	+ TextureRatio(2);
2702	3637	} else
2703	3638	if (source == resetTransformItem)
2704	3639	{
..	..	@@ -2815,7 +3750,7 @@
2815	3750	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2816	3751	{
2817	3752	obj = (Object3D)e.nextElement();
2818		- obj.SetBumpTexture(null);
	3753	+ obj.ResetBumpTexture();
2819	3754	}
2820	3755
2821	3756	refreshContents();
..	..	@@ -2831,6 +3766,31 @@
2831	3766
2832	3767	refreshContents();
2833	3768	} else
	3769	+ if (source == embedTexturesItem)
	3770	+ {
	3771	+ Object3D obj;
	3772	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3773	+ {
	3774	+ obj = (Object3D)e.nextElement();
	3775	+ obj.EmbedTextures(true);
	3776	+ }
	3777	+
	3778	+ refreshContents();
	3779	+ } else
	3780	+ if (source == deEmbedTexturesItem)
	3781	+ {
	3782	+ Object3D obj;
	3783	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3784	+ {
	3785	+ obj = (Object3D)e.nextElement();
	3786	+ obj.EmbedTextures(false);
	3787	+ }
	3788	+
	3789	+ CameraPane.texturepigment.clear();
	3790	+ CameraPane.texturebump.clear();
	3791	+
	3792	+ refreshContents();
	3793	+ } else
2834	3794	if (source == flashSelectionButton)
2835	3795	{
2836	3796	CameraPane.flash = true;
..	..	@@ -2842,42 +3802,36 @@
2842	3802	if (source == twoButton)
2843	3803	{
2844	3804	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();
	3805	+
	3806	+ if (CameraPane.FULLSCREEN)
	3807	+ fullscreenLayout = radio.layout;
	3808	+
	3809	+ Show3DView();
	3810	+
	3811	+ cameraView.requestFocusInWindow();
	3812	+
	3813	+// refreshContents(true);
	3814	+//
	3815	+// try
	3816	+// {
	3817	+// java.awt.Robot bot = new java.awt.Robot();
	3818	+// int mask = InputEvent.BUTTON1_MASK;
	3819	+// bot.mouseMove(100, 100);
	3820	+// bot.mousePress(mask);
	3821	+// bot.mouseRelease(mask);
	3822	+// }
	3823	+// catch (Exception e)
	3824	+// {
	3825	+//
	3826	+// }
	3827	+
2877	3828	} else
2878	3829	if (source == threeButton)
2879	3830	{
2880	3831	radio.layout = threeButton;
	3832	+
	3833	+ if (CameraPane.FULLSCREEN)
	3834	+ fullscreenLayout = radio.layout;
2881	3835
2882	3836	// bigThree.remove(scenePanel);
2883	3837	// bigThree.remove(centralPanel);
..	..	@@ -2907,13 +3861,18 @@
2907	3861	// centralPanel.setVisible(true);
2908	3862	// XYZPanel.setVisible(true);
2909	3863	bigThree.ClearUI();
	3864	+ bigThree.add(scenePanel);
2910	3865	bigThree.add(centralPanel);
2911		- bigThree.add(XYZPanel);
2912	3866	bigThree.FlushUI();
	3867	+
	3868	+ cameraView.requestFocusInWindow();
2913	3869	} else
2914	3870	if (source == fourButton)
2915	3871	{
2916	3872	radio.layout = fourButton;
	3873	+
	3874	+ if (CameraPane.FULLSCREEN)
	3875	+ fullscreenLayout = radio.layout;
2917	3876
2918	3877	// bigThree.remove(scenePanel);
2919	3878	// bigThree.remove(centralPanel);
..	..	@@ -2945,10 +3904,15 @@
2945	3904	bigThree.ClearUI();
2946	3905	bigThree.add(scenePanel);
2947	3906	bigThree.FlushUI();
	3907	+
	3908	+ cameraView.requestFocusInWindow();
2948	3909	} else
2949	3910	if (source == sixButton)
2950	3911	{
2951	3912	radio.layout = sixButton;
	3913	+
	3914	+ if (CameraPane.FULLSCREEN)
	3915	+ fullscreenLayout = radio.layout;
2952	3916
2953	3917	// bigThree.remove(scenePanel);
2954	3918	// bigThree.remove(centralPanel);
..	..	@@ -2978,13 +3942,18 @@
2978	3942	// centralPanel.setVisible(true);
2979	3943	// XYZPanel.setVisible(false);
2980	3944	bigThree.ClearUI();
2981		- bigThree.add(scenePanel);
2982	3945	bigThree.add(centralPanel);
	3946	+ bigThree.add(scenePanel);
2983	3947	bigThree.FlushUI();
	3948	+
	3949	+ cameraView.requestFocusInWindow();
2984	3950	} else
2985	3951	if (source == sevenButton)
2986	3952	{
2987	3953	radio.layout = sevenButton;
	3954	+
	3955	+ if (CameraPane.FULLSCREEN)
	3956	+ fullscreenLayout = radio.layout;
2988	3957
2989	3958	// bigThree.remove(scenePanel);
2990	3959	// bigThree.remove(centralPanel);
..	..	@@ -3018,9 +3987,12 @@
3018	3987	bigThree.add(centralPanel);
3019	3988	bigThree.add(XYZPanel);
3020	3989	bigThree.FlushUI();
	3990	+
	3991	+ cameraView.requestFocusInWindow();
3021	3992	} else
3022	3993	if (source == rootButton)
3023	3994	{
	3995	+ Replace();
3024	3996	Object3D obj;
3025	3997	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3026	3998	{
..	..	@@ -3029,31 +4001,50 @@
3029	4001	EditObject(obj);
3030	4002	}
3031	4003
	4004	+ cameraView.requestFocusInWindow();
3032	4005	refreshContents(true);
3033	4006	} else
3034	4007	if (source == closeButton)
3035	4008	{
3036	4009	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	4010	+ if (copy.versionlist != null)
	4011	+ Replace();
	4012	+
3037	4013	cRadio ab;
3038	4014	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3039	4015	{
3040	4016	ab = (cRadio)e.nextElement();
3041		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	4017	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3042	4018	{
	4019	+ // Patch to avoid bug with transparency.
	4020	+ if (!ab.hadMaterial)
	4021	+ {
	4022	+ ab.object.material = null;
	4023	+ }
	4024	+
3043	4025	buttonGroup.remove(ab);
3044	4026	radioPanel.remove(ab);
3045	4027
3046		- ab.GetObject().editWindow = null;
	4028	+ //ab.GetObject().editWindow = null;
	4029	+ ab.GetObject().manipWindow = null;
3047	4030	// ab.GetObject().objectUI = null; // ?????????
3048	4031
3049	4032	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
3050	4033	break;
3051	4034	}
3052	4035	}
	4036	+
	4037	+ cameraView.requestFocusInWindow();
3053	4038	refreshContents(true);
3054	4039	} else
3055	4040	if (source == editItem \|\| source == editButton)
3056	4041	{
	4042	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4043	+ {
	4044	+ Object3D child = (Object3D)e.nextElement();
	4045	+ child.pinned = true;
	4046	+ }
	4047	+
3057	4048	EditSelection(false);
3058	4049	} else
3059	4050	if (source == uneditButton)
..	..	@@ -3062,9 +4053,10 @@
3062	4053	{
3063	4054	Object3D child = (Object3D)e.nextElement();
3064	4055	if(child.editWindow != null)
3065		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4056	+ child.pinned = false;
3066	4057	child.CloseUI();
3067	4058	listUI.remove(child);
	4059	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3068	4060
3069	4061	//child.editWindow = null; // ???????????
3070	4062	}
..	..	@@ -3079,16 +4071,18 @@
3079	4071	//copy.ClearUI();
3080	4072	for (Object3D obj : listUI)
3081	4073	{
	4074	+ obj.pinned = false;
3082	4075	obj.CloseUI();
3083	4076	}
3084	4077	listUI.clear();
	4078	+ SetPinStates(group.selection.size() > 0);
3085	4079	refreshContents(true);
3086	4080	} else
3087	4081	if (source == allParamsButton)
3088	4082	{
3089	4083	assert(copy == group);
3090	4084
3091		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4085	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3092	4086
3093	4087	for (Object3D obj : listUI)
3094	4088	{
..	..	@@ -3114,6 +4108,9 @@
3114	4108	} else
3115	4109	if(source instanceof cRadio)
3116	4110	{
	4111	+ if (copy.versionlist != null)
	4112	+ Replace();
	4113	+
3117	4114	group.parent = keepparent;
3118	4115	group.attributes = 0;
3119	4116	//group.editWindow = null;
..	..	@@ -3137,6 +4134,7 @@
3137	4134	}
3138	4135
3139	4136	copy = group;
	4137	+
3140	4138	//Globals.theRenderer.object = group;
3141	4139	if(!useclient)
3142	4140	{
..	..	@@ -3154,7 +4152,8 @@
3154	4152	}
3155	4153
3156	4154	// fix "+" issue
3157		- group.editWindow = this;
	4155	+ //group.editWindow = this;
	4156	+ group.manipWindow = this;
3158	4157
3159	4158	/*
3160	4159	currentLayout = radio.layout;
..	..	@@ -3162,20 +4161,58 @@
3162	4161	currentLayout = sevenButton;
3163	4162	*/
3164	4163	radio.layout.doClick();
	4164	+
	4165	+ //assert(copy instanceof Composite);
	4166	+
	4167	+ if (copy.versionlist == null)
	4168	+ {
	4169	+ copy.versionindex = -1;
	4170	+
	4171	+ // Cannot work with loops
	4172	+ // To fix this issue, we first mark all nodes above the root,
	4173	+ // and check if any of these nodes are reachable below the root.
	4174	+ Grafreed.grafreed.universe.TagObjects(copy, true);
	4175	+
	4176	+ if (copy instanceof Composite && !copy.HasTags())
	4177	+ {
	4178	+ if (copy.versionlist == null)
	4179	+ copy.versionlist = new Object3D[100];
	4180	+
	4181	+ //Save(true);
	4182	+ }
	4183	+ else
	4184	+ copy.versionindex = -2;
	4185	+
	4186	+ Grafreed.grafreed.universe.TagObjects(copy, false);
	4187	+ }
	4188	+
	4189	+ SetVersionStates();
	4190	+
	4191	+ ClearUnpinned();
	4192	+
	4193	+ //Grafreed.Assert(group != null);
	4194	+ //Grafreed.Assert(group.selection != null);
	4195	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4196	+ if (group.selection == null \|\| group.selection.size() == 1)
	4197	+ EditSelection(false);
3165	4198	keepparent = group.parent;
3166	4199	// PARENT = NULL or not???
3167	4200	//group.parent = null; // ROOT
3168	4201	//group.attributes = -1;
3169	4202	ResetModel();
	4203	+
	4204	+ cameraView.requestFocusInWindow();
3170	4205	refreshContents(true);
3171	4206	} else if (event.getSource() == editCameraItem)
3172	4207	{
3173	4208	cameraView.ProtectCamera();
	4209	+ cameraView.requestFocusInWindow();
3174	4210	cameraView.repaint();
3175	4211	return;
3176		- } else if (event.getSource() == revertCameraItem)
	4212	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3177	4213	{
3178	4214	cameraView.RevertCamera();
	4215	+ cameraView.requestFocusInWindow();
3179	4216	cameraView.repaint();
3180	4217	return;
3181	4218	// } else if (event.getSource() == textureButton)
..	..	@@ -3190,7 +4227,6 @@
3190	4227	}
3191	4228
3192	4229	boolean useclient = false;
3193		- cRadio radio;
3194	4230
3195	4231	void ToggleRoot()
3196	4232	{
..	..	@@ -3265,9 +4301,46 @@
3265	4301	refreshContents();
3266	4302	}
3267	4303
	4304	+ void TextureRatio(int axis)
	4305	+ {
	4306	+ Object3D obj;
	4307	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4308	+ {
	4309	+ obj = (Object3D)e.nextElement();
	4310	+ obj.TextureRatio(axis);
	4311	+ }
	4312	+
	4313	+ refreshContents();
	4314	+ }
	4315	+
3268	4316	void ResetTransform()
3269	4317	{
3270	4318	ResetTransform(-1);
	4319	+ }
	4320	+
	4321	+ void ScaleSelection(int scale)
	4322	+ {
	4323	+ Object3D obj;
	4324	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4325	+ {
	4326	+ obj = (Object3D)e.nextElement();
	4327	+
	4328	+ if (obj.toParent == null)
	4329	+ continue;
	4330	+
	4331	+ obj.Scale(scale);
	4332	+
	4333	+ if (obj.parent == null)
	4334	+ {
	4335	+ System.out.println("NULL PARENT!");
	4336	+ // new Exception().printStackTrace();
	4337	+ }
	4338	+ else
	4339	+ TouchTransform(obj);
	4340	+ //obj.parent.Touch();
	4341	+ }
	4342	+
	4343	+ refreshContents();
3271	4344	}
3272	4345
3273	4346	void ResetTransform(int mask)
..	..	@@ -3280,42 +4353,8 @@
3280	4353	if (obj.toParent == null)
3281	4354	continue;
3282	4355
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		- }
	4356	+ obj.ResetTransform(mask);
	4357	+
3319	4358	if (obj.parent == null)
3320	4359	{
3321	4360	System.out.println("NULL PARENT!");
..	..	@@ -3511,6 +4550,13 @@
3511	4550	void GenNormals(boolean crease)
3512	4551	{
3513	4552	group.GenNormalsS(crease);
	4553	+
	4554	+ refreshContents();
	4555	+ }
	4556	+
	4557	+ void GenNormalsMESH()
	4558	+ {
	4559	+ group.GenNormalsMeshS();
3514	4560
3515	4561	refreshContents();
3516	4562	}
..	..	@@ -3746,7 +4792,7 @@
3746	4792
3747	4793	try
3748	4794	{
3749		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4795	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
3750	4796	}
3751	4797	catch (Exception e)
3752	4798	{
..	..	@@ -3817,10 +4863,17 @@
3817	4863	{
3818	4864	Object3D obj = group.selection.get(i);
3819	4865
	4866	+ if (obj.toParent == null)
	4867	+ {
	4868	+ obj.toParent = LA.newMatrix();
	4869	+ obj.fromParent = LA.newMatrix();
	4870	+ }
	4871	+
3820	4872	LA.matTranslate(obj.toParent, i * scale, 0, 0);
3821	4873	LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3822	4874	}
3823	4875
	4876	+ Globals.lighttouched = true;
3824	4877	refreshContents();
3825	4878	}
3826	4879
..	..	@@ -4108,6 +5161,12 @@
4108	5161	refreshContents();
4109	5162	}
4110	5163
	5164	+ void ClearVersions()
	5165	+ {
	5166	+ group.selection.ClearVersions();
	5167	+ refreshContents();
	5168	+ }
	5169	+
4111	5170	void FlipV(boolean flip)
4112	5171	{
4113	5172	group.selection.FlipV(flip);
..	..	@@ -4135,6 +5194,18 @@
4135	5194	void MarkLeaves(boolean hide)
4136	5195	{
4137	5196	group.selection.MarkLeaves(hide);
	5197	+ refreshContents();
	5198	+ }
	5199	+
	5200	+ void RewindLeaves(boolean hide)
	5201	+ {
	5202	+ group.selection.RewindLeaves(hide);
	5203	+ refreshContents();
	5204	+ }
	5205	+
	5206	+ void RandomLeaves(boolean hide)
	5207	+ {
	5208	+ group.selection.RandomLeaves(hide);
4138	5209	refreshContents();
4139	5210	}
4140	5211
..	..	@@ -4209,28 +5280,25 @@
4209	5280	// }
4210	5281	// }
4211	5282
4212		- static boolean allparams = true;
4213		-
4214		- static Vector<Object3D> listUI = new Vector<Object3D>();
4215		-
4216	5283	void EditSelection(boolean newWindow)
4217	5284	{
	5285	+ if (group.selection == null)
	5286	+ {
	5287	+ EditElement(group, newWindow); // ? new
	5288	+ return;
	5289	+ }
	5290	+
4218	5291	// aConstraints.gridy = 0;
4219	5292	for (int i=0; i<group.selection.size(); i++)
4220	5293	{
4221	5294	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4222	5295	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4223		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5296	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4224	5297
4225	5298	Object3D elem = (Object3D)group.selection.elementAt(i);
4226	5299	if(elem != group \|\| !newWindow)
4227	5300	{
4228		- // if (!(elem instanceof Composite))
4229		- // newWindow = false;
4230		- listUI.add(elem);
4231		- elem.openEditWindow(this, newWindow); //, false);
4232		- System.out.println("edit : " + elem);
4233		- elem.editWindow.refreshContents(true); // ? new
	5301	+ EditElement(elem, newWindow); // ? new
4234	5302	}
4235	5303	}
4236	5304	}
..	..	@@ -4293,9 +5361,7 @@
4293	5361
4294	5362	freezemodel = false;
4295	5363	}
4296		-
4297		- boolean flashIt = true;
4298		-
	5364	+
4299	5365	public void valueChanged(TreeSelectionEvent e)
4300	5366	//public boolean handleEvent(Event event)
4301	5367	{
..	..	@@ -4305,7 +5371,8 @@
4305	5371	//new Exception().printStackTrace();
4306	5372
4307	5373	freezemodel = true;
4308		-
	5374	+ ClearUnpinned();
	5375	+
4309	5376	/**/
4310	5377	//switch (event.id)
4311	5378	{
..	..	@@ -4313,7 +5380,6 @@
4313	5380	//case 702: // Event.LIST_DESELECT
4314	5381	group.deselectAll();
4315	5382	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4316		- objEditor.ClearInfo(); // .GetMaterial());
4317	5383	if (tps != null)
4318	5384	{
4319	5385	for (int i=0; i < tps.length; i++)
..	..	@@ -4322,10 +5388,8 @@
4322	5388
4323	5389	//if (child.parent != null)
4324	5390	//child.parent.addSelectee(child);
	5391	+ objEditor.SetMaterial(child);
4325	5392	group.addSelectee(child);
4326		- objEditor.SetMaterial(child); // .GetMaterial());
4327		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4328		- System.err.println("info : " + child.GetPath());
4329	5393	}
4330	5394	}
4331	5395	// else
..	..	@@ -4335,23 +5399,28 @@
4335	5399	// System.err.println("info : " + group.GetPath());
4336	5400	// }
4337	5401
4338		- objEditor.SetText(); // jan 2014
4339		-
4340	5402	if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4341	5403	CameraPane.flash = true;
4342	5404
4343	5405	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4344	5406	// a camera
4345	5407	{
4346		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	5408	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crashes the camera because of invalid lightspace
4347	5409	{
4348	5410	CameraPane.camerachangeframe = 0; // don't refuse it
4349		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5411	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent(), true);
4350	5412	}
4351	5413	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4352	5414	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4353	5415	}
4354	5416
	5417	+ if (tps != null && tps.length == 1)
	5418	+ {
	5419	+ EditSelection(false);
	5420	+ }
	5421	+
	5422	+ SetPinStates(tps != null && tps.length > 0);
	5423	+
4355	5424	refreshContents();
4356	5425	//return true;
4357	5426	}
..	..	@@ -4360,6 +5429,53 @@
4360	5429
4361	5430	freezemodel = false;
4362	5431	}
	5432	+
	5433	+ void SetPinStates(boolean enabled)
	5434	+ {
	5435	+ editButton.setEnabled(enabled);
	5436	+ uneditButton.setEnabled(enabled);
	5437	+ //unselectButton.setEnabled(enabled);
	5438	+ flashSelectionButton.setEnabled(enabled);
	5439	+
	5440	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5441	+
	5442	+ boolean allComposites = true;
	5443	+
	5444	+ if (group.selection != null)
	5445	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5446	+ {
	5447	+ Object next = e.nextElement();
	5448	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5449	+ {
	5450	+ allComposites = false;
	5451	+ break;
	5452	+ }
	5453	+ }
	5454	+
	5455	+ rootButton.setEnabled(true); // allComposites);
	5456	+ }
	5457	+
	5458	+ void refreshContents(boolean cp)
	5459	+ {
	5460	+ if (Globals.SHOWINFO)
	5461	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5462	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5463	+ {
	5464	+ objEditor.ClearInfo(); // .GetMaterial());
	5465	+
	5466	+ for (int i=0; i < group.selection.Size(); i++)
	5467	+ {
	5468	+ Object3D child = (Object3D) group.selection.get(i);
	5469	+
	5470	+ objEditor.AddInfo(child, this, true);
	5471	+// System.err.println("info : " + child.GetPath());
	5472	+ }
	5473	+
	5474	+ objEditor.SetText(); // jan 2014
	5475	+ }
	5476	+
	5477	+ super.refreshContents(cp);
	5478	+ }
4363	5479
4364	5480	void linkSomething(Object3D thing)
4365	5481	{
..	..	@@ -4442,7 +5558,8 @@
4442	5558
4443	5559	if (cut)
4444	5560	{
4445		- Save();
	5561	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5562	+// Save();
4446	5563	//int indices[] = jList.getSelectedIndices();
4447	5564	//for (int i = indices.length - 1; i >= 0; i--)
4448	5565	//jList.remove(indices[i]);
..	..	@@ -4545,6 +5662,10 @@
4545	5662
4546	5663	void paste(boolean expand)
4547	5664	{
	5665	+ if (Globals.REPLACEONMAKE)
	5666	+ Save();
	5667	+ boolean keep = Globals.REPLACEONMAKE;
	5668	+ Globals.REPLACEONMAKE = false;
4548	5669	// if (GrafreeD.clipboard == null)
4549	5670	// return;
4550	5671	boolean first = true;
..	..	@@ -4604,6 +5725,7 @@
4604	5725	Grafreed.clipboard.get(0).parent = keepparent;
4605	5726	}
4606	5727
	5728	+ Globals.REPLACEONMAKE = keep;
4607	5729	ResetModel();
4608	5730	refreshContents();
4609	5731	}
..	..	@@ -4739,6 +5861,10 @@
4739	5861
4740	5862	void group(Object3D csg, boolean grab)
4741	5863	{
	5864	+ if (Globals.REPLACEONMAKE)
	5865	+ Save();
	5866	+ boolean keep = Globals.REPLACEONMAKE;
	5867	+ Globals.REPLACEONMAKE = false;
4742	5868	if (//false) // why??
4743	5869	!group.selection.isEmpty())
4744	5870	{
..	..	@@ -4852,10 +5978,15 @@
4852	5978	//node.add(csg);
4853	5979	//makeSomething(node);
4854	5980	makeSomething(csg);
	5981	+ Globals.REPLACEONMAKE = keep;
4855	5982	}
4856	5983
4857	5984	void Ungroup(Object3D g)
4858	5985	{
	5986	+ if (Globals.REPLACEONMAKE)
	5987	+ Save();
	5988	+ boolean keep = Globals.REPLACEONMAKE;
	5989	+ Globals.REPLACEONMAKE = false;
4859	5990	if (g instanceof HiddenObject)
4860	5991	{
4861	5992	HiddenObject h = (HiddenObject) g;
..	..	@@ -4872,6 +6003,7 @@
4872	6003	objEditor.makeSomething(g.get(i), false);
4873	6004	}
4874	6005	}
	6006	+ Globals.REPLACEONMAKE = keep;
4875	6007	}
4876	6008
4877	6009	void ungroup()
..	..	@@ -5160,10 +6292,43 @@
5160	6292	cButton clearpanelButton;
5161	6293	cButton unselectButton;
5162	6294
5163		- cButton saveButton;
5164		- cButton undoButton;
5165		- cButton redoButton;
	6295	+ cButton restoreCameraButton;
	6296	+
5166	6297	cButton oneStepButton;
	6298	+
	6299	+ cButton groupButton;
	6300	+ cButton ungroupButton;
	6301	+ cButton compositeButton;
	6302	+ cButton switchButton;
	6303	+ cButton loopButton;
	6304	+ cButton textureButton;
	6305	+
	6306	+ cButton skybox1Button;
	6307	+ cButton skybox2Button;
	6308	+ cButton skybox3Button;
	6309	+ cButton skybox4Button;
	6310	+ cButton skybox5Button;
	6311	+ cButton skybox6Button;
	6312	+ cButton skybox7Button;
	6313	+
	6314	+ cButton skybox11Button;
	6315	+ cButton skybox12Button;
	6316	+ cButton skybox13Button;
	6317	+ cButton skybox14Button;
	6318	+ cButton skybox15Button;
	6319	+ cButton skybox16Button;
	6320	+ cButton skybox17Button;
	6321	+
	6322	+ cButton gridButton;
	6323	+ cButton boxButton;
	6324	+ cButton sphereButton;
	6325	+ cButton coneButton;
	6326	+ cButton torusButton;
	6327	+ cButton superButton;
	6328	+ cButton kleinButton;
	6329	+ cButton particlesButton;
	6330	+ cButton overlayButton;
	6331	+ cButton lightButton;
5167	6332
5168	6333	cButton screenfitButton;
5169	6334	cButton screenfitpointButton;
..	..	@@ -5176,14 +6341,6 @@
5176	6341
5177	6342	cButton setsupportButton;
5178	6343
5179		- cButton twoButton;
5180		- cButton sixButton;
5181		- cButton threeButton;
5182		- cButton sevenButton;
5183		- cButton fourButton; // full panel
5184		- cButton oneButton; // full XYZ
5185		- //cButton currentLayout;
5186		-
5187	6344	//
5188	6345	//Composite
5189	6346	Object3D // to do !!
..	..	@@ -5193,12 +6350,12 @@
5193	6350	//JTree jTree;
5194	6351	private MenuItem lookAtItem;
5195	6352	private MenuItem lookFromItem;
5196		- private MenuItem switchItem;
5197		- private MenuItem cutItem;
	6353	+ private MenuItem switchViewItem;
	6354	+ private JMenuItem cutItem;
5198	6355	private MenuItem undoItem;
5199	6356	private MenuItem redoItem;
5200		- private MenuItem duplicateItem;
5201		- private MenuItem cloneItem;
	6357	+ private JMenuItem duplicateItem;
	6358	+ private JMenuItem cloneItem;
5202	6359	private MenuItem cloneSupportItem;
5203	6360	private MenuItem overwriteGeoItem;
5204	6361	private MenuItem overwriteMatItem;
..	..	@@ -5219,13 +6376,13 @@
5219	6376	private MenuItem cloneGeometriesItem;
5220	6377	private MenuItem shareGeometriesItem;
5221	6378	private MenuItem mergeGeometriesItem;
5222		- private MenuItem copyItem;
	6379	+ private JMenuItem copyItem;
5223	6380	private MenuItem pasteItem;
5224		- private MenuItem pasteIntoItem;
5225		- private MenuItem pasteLinkItem;
5226		- private MenuItem pasteCloneItem;
5227		- private MenuItem pasteExpandItem;
5228		- private MenuItem clearItem;
	6381	+ private JMenuItem pasteIntoItem;
	6382	+ private JMenuItem pasteLinkItem;
	6383	+ private JMenuItem pasteCloneItem;
	6384	+ private JMenuItem pasteExpandItem;
	6385	+ private JMenuItem deleteItem;
5229	6386	private MenuItem clearAllItem;
5230	6387	private MenuItem genUVItem;
5231	6388	private MenuItem genNormalsMESHItem;
..	..	@@ -5251,6 +6408,7 @@
5251	6408	private MenuItem clipMeshItem;
5252	6409	private MenuItem smoothMeshItem;
5253	6410	private MenuItem clearMaterialsItem;
	6411	+ private MenuItem clearVersionsItem;
5254	6412
5255	6413	private MenuItem liveleavesItem;
5256	6414	private MenuItem unliveleavesItem;
..	..	@@ -5260,6 +6418,10 @@
5260	6418	private MenuItem showleavesItem;
5261	6419	private MenuItem markleavesItem;
5262	6420	private MenuItem unmarkleavesItem;
	6421	+ private MenuItem rewindleavesItem;
	6422	+ private MenuItem unrewindleavesItem;
	6423	+ private MenuItem randomleavesItem;
	6424	+ private MenuItem unrandomleavesItem;
5263	6425
5264	6426	private MenuItem flipVItem;
5265	6427	private MenuItem unflipVItem;
..	..	@@ -5270,18 +6432,21 @@
5270	6432	private MenuItem maxTexturesItem;
5271	6433	private MenuItem panoTexturesItem;
5272	6434
	6435	+ private MenuItem textureRatioRItem;
	6436	+ private MenuItem textureRatioGItem;
	6437	+ private MenuItem textureRatioBItem;
5273	6438	private MenuItem resetCentroidItem;
5274	6439	private MenuItem resetCentroidXZItem;
5275	6440	private MenuItem resetTransformItem;
5276	6441	private MenuItem transformGeometryItem;
5277	6442	private MenuItem transformChildrenItem;
5278	6443	private MenuItem hideItem;
5279		- private MenuItem grabItem;
	6444	+ private JMenuItem grabItem;
5280	6445	private MenuItem backItem;
5281	6446	private MenuItem frontItem;
5282	6447	private MenuItem cameraItem;
5283	6448	private MenuItem compositeItem;
5284		- private MenuItem randomItem;
	6449	+ private MenuItem switchItem;
5285	6450	private MenuItem physicsItem;
5286	6451	private MenuItem frameselectorItem;
5287	6452	private MenuItem scriptNodeItem;
..	..	@@ -5289,7 +6454,7 @@
5289	6454	private MenuItem switchTransfoItem;
5290	6455	private MenuItem morphItem;
5291	6456	private MenuItem linkerItem;
5292		- private MenuItem ungroupItem;
	6457	+ private JMenuItem ungroupItem;
5293	6458	private MenuItem editItem;
5294	6459	private MenuItem openWindowItem;
5295	6460	private MenuItem editLeafItem;
..	..	@@ -5305,6 +6470,8 @@
5305	6470	private MenuItem attachBumpItem;
5306	6471	private MenuItem detachBumpItem;
5307	6472	private MenuItem pigmentBumpItem;
	6473	+ private MenuItem embedTexturesItem;
	6474	+ private MenuItem deEmbedTexturesItem;
5308	6475
5309	6476	private MenuItem particleItem;
5310	6477	private MenuItem ragdollItem;
..	..	@@ -5355,5 +6522,5 @@
5355	6522
5356	6523	Menu cameraMenu;
5357	6524	MenuItem editCameraItem;
5358		- MenuItem revertCameraItem;
	6525	+ MenuItem restoreCameraItem;
5359	6526	}