~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,35 +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	556
180		- menu.add("-");
181		- 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"));
182	560	pasteIntoItem.addActionListener(this);
183		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	561	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
184	562	pasteLinkItem.addActionListener(this);
185		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	563	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
186	564	pasteCloneItem.addActionListener(this);
187		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
188		-// pasteExpandItem.addActionListener(this);
189		- menu.add("-");
190		- clearItem = menu.add(new MenuItem("Clear"));
191		- 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();
192	571
193	572	if (Globals.ADVANCED)
194	573	{
..	..	@@ -202,23 +581,23 @@
202	581	//zBufferItem.addActionListener(this);
203	582	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
204	583	//normalLensItem.addActionListener(this);
205		- cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
206		- revertCameraItem.addActionListener(this);
	584	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	585	+ restoreCameraItem.addActionListener(this);
207	586
208		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
209		- toggleFullScreenItem.addItemListener(this);
210		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
211		- 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);
212	599
213		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
214		- toggleTextureItem.addItemListener(this);
215		- toggleTextureItem.setState(CameraPane.textureon);
216		-
217		- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
218		- toggleSwitchItem.addItemListener(this);
219		- toggleSwitchItem.setState(CameraPane.SWITCH);
220		-
221		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	600	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
222	601	toggleHandleItem.addItemListener(this);
223	602	toggleHandleItem.setState(CameraPane.HANDLES);
224	603
..	..	@@ -273,15 +652,13 @@
273	652	{
274	653	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
275	654	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
276		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
277		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	655	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
278	656	oe.cameraMenu.add("-");
279	657	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
280	658	openWindowItem.addActionListener(this);
281		- editLeafItem.addActionListener(this);
282	659	lookAtItem.addActionListener(this);
283	660	//lookFromItem.addActinoListener(this);
284		- //switchItem.addActionListener(this);
	661	+ //switchViewItem.addActionListener(this);
285	662	}
286	663
287	664	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -325,22 +702,37 @@
325	702	setMasterItem.addActionListener(this);
326	703	}
327	704
328		- oe.menuBar.add(menu = new Menu("Group"));
329		- grabItem = menu.add(new MenuItem("Grab"));
330		- grabItem.addActionListener(this);
	705	+ oe.menuBar.add(menu = new Menu("Order"));
	706	+
331	707	backItem = menu.add(new MenuItem("Back"));
332	708	backItem.addActionListener(this);
333	709	frontItem = menu.add(new MenuItem("Front"));
334	710	frontItem.addActionListener(this);
335		- compositeItem = menu.add(new MenuItem("Composite"));
336		- 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	+ {
337	719	hideItem = menu.add(new MenuItem("Hidden Group"));
338	720	hideItem.addActionListener(this);
339		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	721	+ }
	722	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
340	723	ungroupItem.addActionListener(this);
341		- menu.add("-");
342		- randomItem = menu.add(new MenuItem("Switch node"));
343		- 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	+ {
344	736	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
345	737	switchGeoItem.addActionListener(this);
346	738	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -348,8 +740,6 @@
348	740	morphItem = menu.add(new MenuItem("Morph Group"));
349	741	morphItem.addActionListener(this);
350	742
351		- if (Globals.ADVANCED)
352		- {
353	743	menu.add("-");
354	744	physicsItem = menu.add(new MenuItem("Physics"));
355	745	physicsItem.addActionListener(this);
..	..	@@ -357,13 +747,11 @@
357	747	frameselectorItem.addActionListener(this);
358	748	scriptNodeItem = menu.add(new MenuItem("Script Node"));
359	749	scriptNodeItem.addActionListener(this);
360		- cameraItem = menu.add(new MenuItem("Camera"));
361		- cameraItem.addActionListener(this);
362	750	}
363	751
364	752	oe.menuBar.add(menu = new Menu("Object"));
365		- textureItem = menu.add(new MenuItem("Texture"));
366		- textureItem.addActionListener(this);
	753	+// textureItem = menu.add(new MenuItem("Texture"));
	754	+// textureItem.addActionListener(this);
367	755	billboardItem = menu.add(new MenuItem("Billboard"));
368	756	billboardItem.addActionListener(this);
369	757	csgItem = menu.add(new MenuItem("CSG"));
..	..	@@ -374,24 +762,32 @@
374	762	shadowYItem.addActionListener(this);
375	763	shadowZItem = menu.add(new MenuItem("Shadow Blue"));
376	764	shadowZItem.addActionListener(this);
	765	+
	766	+ attributeItem = menu.add(new MenuItem("Attribute"));
	767	+ attributeItem.addActionListener(this);
377	768	if (Globals.ADVANCED)
378	769	{
379	770	menu.add("-");
380	771	linkerItem = menu.add(new MenuItem("Linker"));
381	772	linkerItem.addActionListener(this);
382		- attributeItem = menu.add(new MenuItem("Attribute"));
383		- attributeItem.addActionListener(this);
384	773	templateItem = menu.add(new MenuItem("Template"));
385	774	templateItem.addActionListener(this);
386	775	pointflowItem = menu.add(new MenuItem("Point Flow"));
387	776	pointflowItem.addActionListener(this);
388	777	}
389	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("-");
390	786	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
391	787	resetTransformItem.addActionListener(this);
392	788	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
393	789	resetCentroidItem.addActionListener(this);
394		- resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	790	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XZ"));
395	791	resetCentroidXZItem.addActionListener(this);
396	792	transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
397	793	transformGeometryItem.addActionListener(this);
..	..	@@ -407,9 +803,9 @@
407	803	genNormalsCADItem.addActionListener(this);
408	804	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
409	805	genNormalsMESHItem.addActionListener(this);
410		- if (Globals.ADVANCED)
	806	+ //if (Globals.ADVANCED)
411	807	{
412		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	808	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
413	809	genNormalsMINEItem.addActionListener(this);
414	810	}
415	811	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -443,6 +839,8 @@
443	839	}
444	840
445	841	oe.menuBar.add(menu = new Menu("Attributes"));
	842	+ clearVersionsItem = menu.add(new MenuItem("Clear Versions"));
	843	+ clearVersionsItem.addActionListener(this);
446	844	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
447	845	clearMaterialsItem.addActionListener(this);
448	846	resetAllItem = menu.add(new MenuItem("Reset All"));
..	..	@@ -465,9 +863,9 @@
465	863	hideleavesItem.addActionListener(this);
466	864	showleavesItem = menu.add(new MenuItem("Show Leaves"));
467	865	showleavesItem.addActionListener(this);
468		- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
	866	+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
469	867	markleavesItem.addActionListener(this);
470		- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
	868	+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
471	869	unmarkleavesItem.addActionListener(this);
472	870	rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
473	871	rewindleavesItem.addActionListener(this);
..	..	@@ -502,10 +900,15 @@
502	900	attachBumpItem.addActionListener(this);
503	901	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
504	902	pigmentBumpItem.addActionListener(this);
	903	+ //embedTexturesItem
505	904	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
506	905	detachPigmentItem.addActionListener(this);
507	906	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
508	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);
509	912	menu.add("-");
510	913	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
511	914	sortbysizeItem.addActionListener(this);
..	..	@@ -516,6 +919,9 @@
516	919	shareGeometriesItem.addActionListener(this);
517	920	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
518	921	mergeGeometriesItem.addActionListener(this);
	922	+ menu.add("-");
	923	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	924	+ editLeafItem.addActionListener(this);
519	925	if (Globals.ADVANCED)
520	926	{
521	927	// Pretty much the same as duplicate and clone.
..	..	@@ -532,6 +938,85 @@
532	938	buildToolsMenu(menu);
533	939	}
534	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	+
535	1020	void SetupUI2(ObjEditor oe)
536	1021	{
537	1022	// June 2019
..	..	@@ -549,11 +1034,6 @@
549	1034	//new Exception().printStackTrace();
550	1035
551	1036	oe.radioPanel = new JPanel(new GridBagLayout());
552		- oe.aConstraints.weightx = 1;
553		- oe.aConstraints.weighty = 0;
554		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
555		- oe.aConstraints.gridwidth = 100;
556		- oe.aConstraints.gridheight = 1;
557	1037	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
558	1038
559	1039	oe.buttonGroup = new ButtonGroup();
..	..	@@ -574,117 +1054,268 @@
574	1054	oe.radioPanel.add(dummyButton);
575	1055	oe.buttonGroup.add(dummyButton);
576	1056	*/
	1057	+ cGridBag versionManagerPanel = new cGridBag();
	1058	+
	1059	+ versionManagerPanel.preferredHeight = 4;
	1060	+
577	1061	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
578	1062
579	1063	//oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
580	1064	//minButton.setToolTipText("Minimize window");
581	1065	//minButton.addActionListener(this);
582	1066
583		- oe.toolbarPanel.add(maxButton = new cButton("\u271A", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
584		- maxButton.setToolTipText("Maximize window");
585		- maxButton.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	+ }
586	1073
587		- oe.toolbarPanel.add(fullButton = new cButton("\u2b1c", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
588		- fullButton.setToolTipText("Full-screen window");
589		- fullButton.addActionListener(this);
	1074	+ cButton gcButton;
590	1075
591		- oe.toolbarPanel.add(undoButton = new cButton("\u21a9", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
592		- undoButton.setToolTipText("Undo changes");
593		- undoButton.addActionListener(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	+// });
594	1085
595		- oe.toolbarPanel.add(redoButton = new cButton("\u21aa", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
596		- redoButton.setToolTipText("Redo changes");
597		- redoButton.addActionListener(this);
	1086	+ oe.toolbarPanel.add(fullScreenButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1087	+ fullScreenButton.setToolTipText("Full-screen window");
	1088	+ fullScreenButton.addActionListener(this);
598	1089
599		- oe.toolbarPanel.add(saveButton = new cButton("\u21e3", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
600		- saveButton.setToolTipText("Save changes");
601		- saveButton.addActionListener(this);
	1090	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1091	+ collapseButton.setToolTipText("Collapse toolbar");
	1092	+ collapseButton.addActionListener(this);
602	1093
603		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
604		- liveCB.setToolTipText("Enable animation");
605		- liveCB.addItemListener(this);
	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);
606	1120
607		- oe.toolbarPanel.add(oneStepButton = new cButton("\u29f4", !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);
608	1158	oneStepButton.setToolTipText("Animate one step forward");
609	1159	oneStepButton.addActionListener(this);
610	1160
611		- 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);
612	1166	fastCB.setToolTipText("Fast mode");
613	1167	fastCB.addItemListener(this);
614	1168
615		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK)); //, oe.aConstraints);
616		- trackCB.setToolTipText("Enable tracking");
617		- trackCB.addItemListener(this);
618		-
619		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
620		- screenfitButton.setToolTipText("Screen fit");
621		- 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);
622	1174
623	1175	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
624	1176	// screenfitpointButton.addActionListener(this);
625	1177
626	1178	if (Globals.ADVANCED)
627	1179	{
628		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1180	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
629	1181	snapobjectButton.addActionListener(this);
630	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");
631	1187	}
632	1188
633		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
634		- flashSelectionButton.setToolTipText("Show selection");
635		- flashSelectionButton.addActionListener(this);
	1189	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
636	1190
637		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
638		-
639		- oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
640		- twoButton.setToolTipText("Show center view only");
641		- twoButton.addActionListener(this);
642		- oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
643		- fourButton.addActionListener(this);
644		- fourButton.setToolTipText("Show left panel only");
645		- oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
646		- sixButton.setToolTipText("2-column layout left");
647		- sixButton.addActionListener(this);
648		- oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
649		- threeButton.setToolTipText("2-column layout right");
650		- threeButton.addActionListener(this);
651		- oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
652		- sevenButton.setToolTipText("3-column layout");
653		- sevenButton.addActionListener(this);
654		- //
655	1191
656		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
657		- 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");
658	1194	rootButton.addActionListener(this);
659	1195
660		- 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);
661	1197	closeButton.setToolTipText("Close tab");
662	1198	closeButton.addActionListener(this);
663	1199	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
664	1200	//clearButton.addActionListener(this);
665		-
666		- editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
667		- editButton.setToolTipText("Edit selection");
	1201	+
	1202	+ cGridBag row1 = new cGridBag();
	1203	+ row1.preferredHeight = 8;
	1204	+
	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");
668	1294	editButton.addActionListener(this);
669	1295
670		- editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
671		- uneditButton.setToolTipText("Unedit selection");
	1296	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1297	+ uneditButton.setToolTipText("Unpin and remove selection controls");
672	1298	uneditButton.addActionListener(this);
673	1299
674	1300	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
675		- allParamsButton.setToolTipText("Edit all params");
	1301	+ allParamsButton.setToolTipText("Show all controls");
676	1302	allParamsButton.addActionListener(this);
677	1303
678		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
679		- clearPanelButton.setToolTipText("Clear edit panel");
	1304	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1305	+ clearPanelButton.setToolTipText("Clear all controls");
680	1306	clearPanelButton.addActionListener(this);
681	1307
682		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
683		- unselectButton.setToolTipText("Unselect");
684		- unselectButton.addActionListener(this);
	1308	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1309	+ //unselectButton.setToolTipText("Unselect");
	1310	+ //unselectButton.addActionListener(this);
685	1311
	1312	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1313	+ flashSelectionButton.setToolTipText("Highlight selection");
	1314	+ flashSelectionButton.addActionListener(this);
	1315	+
686	1316	editCommandsPanel.preferredHeight = 1;
687	1317
	1318	+ SetPinStates(false);
688	1319	// oe.treePanel.add(commandsPanel);
689	1320	// oe.treePanel.Return();
690	1321
..	..	@@ -701,34 +1332,25 @@
701	1332
702	1333	cGridBag jSPPanel = new cGridBag();
703	1334
	1335	+ jSPPanel.preferredHeight = 20;
	1336	+
704	1337	JScrollPane jSP;
705	1338	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
706		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1339	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
707	1340	ResetModel();
708	1341
709	1342	oe.treePanel.add(jSPPanel);
710	1343	oe.treePanel.Return();
711	1344
712		- cGridBag copyOptionsPanel = new cGridBag();
713		-
714		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
715		- colorCB.setToolTipText("Copy color when dropped");
716		- colorCB.addItemListener(this);
717		-
718		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
719		- materialCB.setToolTipText("Copy material when dropped");
720		- materialCB.addItemListener(this);
721		-
722		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
723		- textureCB.setToolTipText("Copy texture when dropped");
724		- textureCB.addItemListener(this);
725		-
726		- copyOptionsPanel.preferredHeight = 1;
727		- oe.treePanel.add(copyOptionsPanel);
	1345	+ oe.treePanel.add(versionManagerPanel);
728	1346	oe.treePanel.Return();
729	1347
730		-// mainPanel.setDividerLocation(0.5); //1.0);
731		-// 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);
732	1354
733	1355	//jList.addListSelectionListener(this);
734	1356	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -736,7 +1358,7 @@
736	1358	//jTree.setEditable(true);
737	1359	oe.jTree.setDragEnabled(true);
738	1360	//jTree.setPreferredSize(new Dimension(10,10));
739		- jSP.setPreferredSize(new Dimension(100,200));
	1361	+ //jSP.setPreferredSize(new Dimension(100,200));
740	1362
741	1363	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
742	1364
..	..	@@ -748,73 +1370,116 @@
748	1370	dgr.addDragGestureListener(this);
749	1371	}catch(Exception e) {}
750	1372	*/
751		- radio.layout = sevenButton;
	1373	+ radio.layout = threeButton; // sixButton;
752	1374	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
753	1375	}
754	1376
755	1377	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
756	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	+
757	1393	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
758	1394	boxCB.setToolTipText("Display bounding boxes");
759	1395	boxCB.addItemListener(this);
760	1396
761	1397	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
762		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1398	+ zoomBoxCB.setToolTipText("Display only for wheel");
763	1399	zoomBoxCB.addItemListener(this);
764	1400
765	1401	if (true) // Globals.ADVANCED)
766	1402	{
767		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
768		- supportCB.setToolTipText("Enable rigging");
769		- 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);
770	1410
771	1411	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
772	1412	// localCB.addItemListener(this);
773	1413
	1414	+ panel.Return();
	1415	+
	1416	+ if (Globals.ADVANCED)
	1417	+ {
774	1418	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
775	1419	crowdCB.setToolTipText("Used for crowds");
776	1420	crowdCB.addItemListener(this);
	1421	+ }
777	1422
778	1423	panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
779	1424	smoothCB.setToolTipText("Snapping delay");
780	1425	smoothCB.addItemListener(this);
781	1426
782		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
783		- slowCB.setToolTipText("Smooth interpolation");
784		- 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);
785	1433
786		-// constraints.gridy += 1;
787	1434	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
788	1435	// speakerMocapCB.addItemListener(this);
789	1436
790	1437	if (false)
791	1438	{
792	1439	// handled in scripts
793		- //constraints.gridy += 1;
794	1440	panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
795	1441	speakerCameraCB.addItemListener(this);
796	1442
797		- //constraints.gridy += 1;
798	1443	panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
799	1444	speakerFocusCB.addItemListener(this);
800	1445
801		- //constraints.gridy += 1;
802		- panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
803		- smoothfocusCB.addItemListener(this);
	1446	+ panel.Return();
804	1447	}
805	1448
806		-//constraints.gridx += 1;
	1449	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	1450	+ smoothfocusCB.addItemListener(this);
	1451	+
	1452	+ panel.Return();
	1453	+
807	1454	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
808	1455	// debugCB.addItemListener(this);
809	1456
	1457	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1458	+ trackCB.setToolTipText("Enable tracking target");
	1459	+ trackCB.addItemListener(this);
	1460	+
810	1461	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
811		- oeilCB.setToolTipText("Move camera when tracking target");
	1462	+ oeilCB.setToolTipText("Move camera when tracking");
812	1463	oeilCB.addItemListener(this);
813	1464
814	1465	panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
815		- shadowCB.setToolTipText("Compute shadows when live");
	1466	+ shadowCB.setToolTipText("When live compute shadows");
816	1467	shadowCB.addItemListener(this);
817	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();
818	1483	if (Globals.ADVANCED)
819	1484	{
820	1485	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
..	..	@@ -825,18 +1490,31 @@
825	1490	}
826	1491
827	1492	cGridBag fill = new cGridBag();
828		-
829	1493	fill.preferredHeight = 200;
	1494	+ cGridBag fill2 = new cGridBag();
	1495	+ fill2.preferredHeight = 200;
	1496	+ cGridBag fill3 = new cGridBag();
	1497	+ fill3.preferredHeight = 200;
830	1498
831	1499	panel.add(fill);
	1500	+ panel.add(fill2);
	1501	+ panel.add(fill3);
832	1502
833	1503	}
834	1504
835	1505	void EditObject(Object3D obj)
836	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	+
837	1515	cRadio radioButton = new cRadio(obj.name);
838	1516
839		- // Patch to avoid bug with transparency.
	1517	+ // June 2019. Patch to avoid bug with transparency.
840	1518	radioButton.hadMaterial = obj.material != null;
841	1519	if (!radioButton.hadMaterial)
842	1520	{
..	..	@@ -844,7 +1522,7 @@
844	1522	}
845	1523
846	1524	radioButton.SetObject(obj);
847		- radioButton.layout = sevenButton;
	1525	+ radioButton.layout = threeButton; // sixButton;
848	1526	radioButton.SetCamera(cameraView.renderCamera, false);
849	1527	radioButton.addActionListener(this);
850	1528	radioPanel.add(radioButton);
..	..	@@ -858,31 +1536,37 @@
858	1536
859	1537	oe.SetupViews();
860	1538
	1539	+ if (Globals.DEBUG)
861	1540	System.out.println("SetupViews");
862	1541	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
863	1542	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
864	1543	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
865	1544	}
866	1545
867		- JCheckBox liveCB;
868		- JCheckBox supportCB;
869		- JCheckBox localCB;
870		- JCheckBox crowdCB;
871		- JCheckBox smoothCB;
872		- JCheckBox fastCB;
873		- JCheckBox slowCB;
874		- JCheckBox boxCB;
875		- JCheckBox zoomBoxCB;
876		- JCheckBox trackCB;
877		- JCheckBox smoothfocusCB;
878		-// JCheckBox speakerMocapCB;
879		- JCheckBox speakerCameraCB;
880		- JCheckBox speakerFocusCB;
881		- JCheckBox debugCB;
	1546	+ cToggleButton liveCB;
	1547	+ cCheckBox supportCB;
	1548	+ cCheckBox localCB;
	1549	+ cCheckBox crowdCB;
	1550	+ cCheckBox smoothCB;
	1551	+ cCheckBox minshaderCB;
882	1552
883		- JCheckBox oeilCB;
884		- JCheckBox shadowCB;
885		- JCheckBox lookAtCB;
	1553	+ cToggleButton fastCB;
	1554	+ cCheckBox slowCB;
	1555	+ cCheckBox boxCB;
	1556	+ cCheckBox zoomBoxCB;
	1557	+ cCheckBox freezeCB;
	1558	+ //cToggleButton trackCB;
	1559	+ cCheckBox trackCB;
	1560	+ cCheckBox smoothfocusCB;
	1561	+// JCheckBox speakerMocapCB;
	1562	+ cCheckBox speakerCameraCB;
	1563	+ cCheckBox speakerFocusCB;
	1564	+ cCheckBox debugCB;
	1565	+
	1566	+ cCheckBox oeilCB;
	1567	+ cCheckBox shadowCB;
	1568	+ cCheckBox autokeepCB;
	1569	+ cCheckBox lookAtCB;
886	1570
887	1571	// static int COLOR = 1;
888	1572	// static int MATERIAL = 2;
..	..	@@ -890,9 +1574,9 @@
890	1574
891	1575	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
892	1576
893		- JCheckBox colorCB;
894		- JCheckBox materialCB;
895		- JCheckBox textureCB;
	1577	+ cCheckBox colorCB;
	1578	+ cCheckBox materialCB;
	1579	+ cCheckBox textureCB;
896	1580
897	1581	public void itemStateChanged(ItemEvent e)
898	1582	{
..	..	@@ -936,6 +1620,12 @@
936	1620	{
937	1621	cameraView.ToggleInertia();
938	1622	cameraView.repaint();
	1623	+ }
	1624	+ else if(e.getSource() == minshaderCB)
	1625	+ {
	1626	+ Globals.MINSHADER ^= true;
	1627	+ cameraView.programInitialized = false;
	1628	+ cameraView.repaint();
939	1629	}
940	1630	else if(e.getSource() == localCB)
941	1631	{
..	..	@@ -989,6 +1679,14 @@
989	1679	{
990	1680	Globals.COMPUTESHADOWWHENLIVE ^= true;
991	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	+ }
992	1690	else if(e.getSource() == lookAtCB)
993	1691	{
994	1692	cameraView.ToggleLookAt();
..	..	@@ -1005,7 +1703,8 @@
1005	1703
1006	1704	/**/
1007	1705	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
1008		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1706	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1707	+ TreePath path = objEditor.jTree.getSelectionPath();
1009	1708	if ((path == null) \|\| (path.getPathCount() <= 1)) {
1010	1709	// We can't move the root node or an empty selection
1011	1710	return;
..	..	@@ -1068,8 +1767,6 @@
1068	1767	}
1069	1768	}
1070	1769
1071		- String string = (String) object;
1072		-
1073	1770	System.out.println("Transfer = " + object + "; drop : " + target);
1074	1771	// if( object instanceof java.io.File[])
1075	1772	// {
..	..	@@ -1077,6 +1774,8 @@
1077	1774	// objEditor.DropFile((java.io.File[]) object, true);
1078	1775	// return;
1079	1776	// }
	1777	+
	1778	+ String string = object.toString();
1080	1779
1081	1780	// File path for Mac and Windows
1082	1781	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1122,23 +1821,33 @@
1122	1821
1123	1822	assert target == objEditor.jTree;
1124	1823	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1824	+ Object3D destinationLeaf;
1125	1825	try {
1126		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1826	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1127	1827	} catch (Exception e) {
1128	1828	System.out.println("destinationPath : " + destinationPath);
1129	1829	return;
1130	1830	}
1131	1831
1132		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1832	+ for (int i=group.selection.size(); --i>=0;)
1133	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	+// {
1134	1843	loadClipboard(true);
1135	1844	objEditor.jTree.setSelectionPath(destinationPath);
1136	1845	pasteInto(false, false);
1137		- } else {
1138		- loadClipboard(false);
1139		- objEditor.jTree.setSelectionPath(destinationPath);
1140		- pasteInto(false, false); // true); // ???
1141		- }
	1846	+// } else {
	1847	+// loadClipboard(false);
	1848	+// objEditor.jTree.setSelectionPath(destinationPath);
	1849	+// pasteInto(false, false); // true); // ???
	1850	+// }
1142	1851	}
1143	1852	public void dropActionChanged(DropTargetDragEvent dtde)
1144	1853	// Called if the user has modified the current drop gesture
..	..	@@ -1194,7 +1903,12 @@
1194	1903	TreePath path;
1195	1904
1196	1905	public TransferableTreePath(TreePath tp) {
1197		- 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);
1198	1912	}
1199	1913
1200	1914	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1243,22 +1957,30 @@
1243	1957	{
1244	1958	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1245	1959	//heightFieldItem.addActionListener(this);
1246		- gridItem = menu.add(new MenuItem("Grid"));
1247		- gridItem.addActionListener(this);
1248		- rectoidItem = menu.add(new MenuItem("Box"));
1249		- rectoidItem.addActionListener(this);
1250		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1251		- ellipsoidItem.addActionListener(this);
1252		- coneItem = menu.add(new MenuItem("Cone"));
1253		- coneItem.addActionListener(this);
1254		- torusItem = menu.add(new MenuItem("Torus"));
1255		- torusItem.addActionListener(this);
1256		- superItem = menu.add(new MenuItem("Superellipsoid"));
1257		- 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	+ {
1258	1978	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1259	1979	kleinItem.addActionListener(this);
1260		- particleItem = menu.add(new MenuItem("Particle system"));
1261		- particleItem.addActionListener(this);
	1980	+ }
	1981	+
	1982	+// particleItem = menu.add(new MenuItem("Particle system"));
	1983	+// particleItem.addActionListener(this);
1262	1984	if (Globals.ADVANCED)
1263	1985	{
1264	1986	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1284,15 +2006,15 @@
1284	2006	}
1285	2007	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1286	2008	bezierItem.addActionListener(this);
1287		- overlayItem = menu.add(new MenuItem("Overlay"));
1288		- overlayItem.addActionListener(this);
1289		- lightItem = menu.add(new MenuItem("Light"));
1290		- 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);
1291	2013	menu.add("-");
1292	2014	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1293	2015	//superLoopItem.addActionListener(this);
1294		- loopItem = menu.add(new MenuItem("Loop"));
1295		- loopItem.addActionListener(this);
	2016	+// loopItem = menu.add(new MenuItem("Loop"));
	2017	+// loopItem.addActionListener(this);
1296	2018	doubleItem = menu.add(new MenuItem("Fork"));
1297	2019	doubleItem.addActionListener(this);
1298	2020	if (Globals.ADVANCED)
..	..	@@ -1308,6 +2030,9 @@
1308	2030	animationItem.addItemListener(this);
1309	2031	animationItem.setState(Globals.ANIMATION);
1310	2032
	2033	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	2034	+ archiveItem.addActionListener(this);
	2035	+
1311	2036	menu.add("-");
1312	2037	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1313	2038	parseverticesItem.addActionListener(this);
..	..	@@ -1320,6 +2045,8 @@
1320	2045	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1321	2046	reduce34MorphItem.addActionListener(this);
1322	2047	menu.add("-");
	2048	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	2049	+ memoryItem.addActionListener(this);
1323	2050	menu.add(computeAOItem = new MenuItem("Compute AO"));
1324	2051	computeAOItem.addActionListener(this);
1325	2052
..	..	@@ -1328,8 +2055,6 @@
1328	2055	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1329	2056	mirrorItem.addActionListener(this);
1330	2057	menu.add("-");
1331		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1332		- memoryItem.addActionListener(this);
1333	2058	menu.add(analyzeItem = new MenuItem("Analyze"));
1334	2059	analyzeItem.addActionListener(this);
1335	2060	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1364,7 +2089,7 @@
1364	2089	Object3D obj = (Object3D)group.selection.elementAt(0);
1365	2090	objEditor.ScreenFit(obj, false);
1366	2091
1367		- cameraView.pingthread.StepToTarget(true);
	2092	+ cameraView.pingthread.StepToTarget(); //true);
1368	2093	refreshContents();
1369	2094	}
1370	2095
..	..	@@ -1401,7 +2126,7 @@
1401	2126	obj.parent.TransformToWorld(maxima); //, maxima);
1402	2127	}
1403	2128
1404		- Object3D shadow = new Object3D("Shadow " + obj.name);
	2129	+ Object3D shadow = new Object3D("Shadow" + obj.name);
1405	2130
1406	2131	shadow.toParent = LA.newMatrix();
1407	2132	shadow.fromParent = LA.newMatrix();
..	..	@@ -1415,24 +2140,24 @@
1415	2140	switch(axis)
1416	2141	{
1417	2142	case 0 :
1418		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1419		- vert2.x = minima.x; vert2.y = maxima.y; vert2.z = minima.z;
1420		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1421		- 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;
1422	2147	norm = cVector.X;
1423	2148	break;
1424	2149	case 1 :
1425		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1426		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1427		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1428		- 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;
1429	2154	norm = cVector.Y;
1430	2155	break;
1431	2156	case 2 :
1432		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1433		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1434		- vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z;
1435		- 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;
1436	2161	norm = cVector.Z;
1437	2162	break;
1438	2163	}
..	..	@@ -1473,10 +2198,38 @@
1473	2198	shadow.material = new cMaterial(obj.material);
1474	2199	shadow.material.diffuse = 0.0001f;
1475	2200	shadow.material.specular = 0.0001f;
1476		- //shadow.projectedVertices[1].x = 300;
	2201	+ shadow.material.opacity = 0.75f;
	2202	+
	2203	+ AllocProjectedVertices(shadow);
	2204	+
	2205	+ shadow.projectedVertices[1].x = 300;
1477	2206
1478	2207	makeSomething(shadow);
1479	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	+ }
1480	2233
1481	2234	/**
1482	2235	* applyExample
..	..	@@ -1721,7 +2474,7 @@
1721	2474	{
1722	2475	ScreenFit();
1723	2476	} else
1724		- if (source == switchItem)
	2477	+ if (source == switchViewItem)
1725	2478	{
1726	2479	cVector v1 = new cVector();
1727	2480	cVector v2 = new cVector();
..	..	@@ -1730,11 +2483,11 @@
1730	2483	objEditor.cameraView.renderCamera.setAim(v2, v1);
1731	2484	objEditor.cameraView.repaint();
1732	2485	} else
1733		- if (source == rectoidItem)
	2486	+ if (source == rectoidItem \|\| source == boxButton)
1734	2487	{
1735	2488	makeSomething(new Box());
1736	2489	} else
1737		- if (source == particleItem)
	2490	+ if (source == particleItem \|\| source == particlesButton)
1738	2491	{
1739	2492	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1740	2493	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1813,27 +2566,27 @@
1813	2566
1814	2567	makeSomething(obj);
1815	2568	} else
1816		- if (source == gridItem)
	2569	+ if (source == gridItem \|\| source == gridButton)
1817	2570	{
1818	2571	makeSomething(new Grid());
1819	2572	} else
1820		- if (source == ellipsoidItem)
	2573	+ if (source == ellipsoidItem \|\| source == sphereButton)
1821	2574	{
1822	2575	makeSomething(new Sphere());
1823	2576	} else
1824		- if (source == coneItem)
	2577	+ if (source == coneItem \|\| source == coneButton)
1825	2578	{
1826	2579	makeSomething(new Cone());
1827	2580	} else
1828		- if (source == torusItem)
	2581	+ if (source == torusItem \|\| source == torusButton)
1829	2582	{
1830	2583	makeSomething(new Torus());
1831	2584	} else
1832		- if (source == superItem)
	2585	+ if (source == superItem \|\| source == superButton)
1833	2586	{
1834	2587	makeSomething(new Superellipsoid());
1835	2588	} else
1836		- if (source == kleinItem)
	2589	+ if (source == kleinItem \|\| source == kleinButton)
1837	2590	{
1838	2591	makeSomething(new Klein());
1839	2592	} else
..	..	@@ -1853,7 +2606,7 @@
1853	2606	{
1854	2607	makeSomething(new BezierSurface());
1855	2608	} else
1856		- if (source == overlayItem)
	2609	+ if (source == overlayItem \|\| source == overlayButton)
1857	2610	{
1858	2611	/*
1859	2612	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1901,10 +2654,27 @@
1901	2654	s.setup();
1902	2655	makeSomething(s);
1903	2656	} else
1904		- if (source == lightItem)
	2657	+ if (source == lightItem \|\| source == lightButton)
1905	2658	{
1906	2659	makeSomething(new Light());
1907	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
1908	2678	if (source == csgItem)
1909	2679	{
1910	2680	group(new CSG());
..	..	@@ -1951,30 +2721,38 @@
1951	2721
1952	2722	group(g);
1953	2723	} else
1954		- if (source == loopItem)
	2724	+ if (source == loopItem \|\| source == loopButton)
1955	2725	{
	2726	+ if (!group.selection.isEmpty())
	2727	+ {
1956	2728	Composite csg = new GroupLeaf();
1957		- csg.count = 5;
1958	2729	group(csg);
1959		- Composite child = new cGroup();
	2730	+ csg.count = 5;
	2731	+ Composite child = new cGroup("Branch");
1960	2732	csg.addChild(child);
1961	2733	child.addChild(csg);
	2734	+ }
1962	2735	} else
1963	2736	if (source == doubleItem)
1964	2737	{
1965		- Composite csg = new GroupLeaf();
1966		- csg.count = 5;
	2738	+ if (!group.selection.isEmpty())
	2739	+ {
	2740	+ Composite csg = new GroupLeaf("Fork");
1967	2741	group(csg);
1968		- Composite child = new cGroup();
	2742	+ csg.count = 5;
	2743	+ Composite child = new cGroup("Branch A");
1969	2744	csg.addChild(child);
1970	2745	child.addChild(csg);
1971		- child = new cGroup();
	2746	+ child = new cGroup("Branch B");
1972	2747	csg.addChild(child);
1973	2748	child.addChild(csg);
	2749	+ }
1974	2750	} else
1975	2751	if (source == tripleItem)
1976	2752	{
1977		- Composite csg = new GroupLeaf();
	2753	+ if (!group.selection.isEmpty())
	2754	+ {
	2755	+ Composite csg = new GroupLeaf("Trident");
1978	2756	csg.count = 4;
1979	2757	group(csg);
1980	2758	Composite child = new cGroup();
..	..	@@ -1986,11 +2764,12 @@
1986	2764	child = new cGroup();
1987	2765	csg.addChild(child);
1988	2766	child.addChild(csg);
	2767	+ }
1989	2768	} else
1990	2769	if (source == computeAOItem)
1991	2770	{
1992	2771	Globals.drawMode = CameraPane.OCCLUSION;
1993		- Globals.theRenderer.repaint();
	2772	+ cameraView.repaint();
1994	2773	} else
1995	2774	if (source == recompileItem)
1996	2775	{
..	..	@@ -2005,7 +2784,7 @@
2005	2784	if (source == invariantsItem)
2006	2785	{
2007	2786	System.out.println("Invariants:");
2008		- Grafreed.grafreeD.universe.invariants();
	2787	+ Grafreed.grafreed.universe.invariants();
2009	2788	} else
2010	2789	if (source == memoryItem)
2011	2790	{
..	..	@@ -2032,21 +2811,56 @@
2032	2811	{
2033	2812	Maximize();
2034	2813	} else
2035		- if (source == fullButton)
	2814	+ if (source == fullScreenButton)
2036	2815	{
2037	2816	ToggleFullScreen();
2038	2817	} else
2039		- if (source == undoButton)
	2818	+ if (source == collapseButton)
2040	2819	{
2041		- Undo();
	2820	+ this.expandedLayout = radio.layout;
	2821	+ CollapseToolbar();
2042	2822	} else
2043		- if (source == redoButton)
	2823	+// if (source == maximize3DButton)
	2824	+// {
	2825	+// this.expandedLayout = radio.layout;
	2826	+// radio.layout = twoButton;
	2827	+// CollapseToolbar();
	2828	+// Show3DView();
	2829	+// } else
	2830	+ if (source == previousVersionButton)
2044	2831	{
2045		- Redo();
	2832	+ // Go to previous version
	2833	+ //if (!Undo())
	2834	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2835	+ PreviousVersion();
2046	2836	} else
2047		- if (source == saveButton)
	2837	+ if (source == restoreButton)
2048	2838	{
2049		- Save();
	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();
2050	2864	} else
2051	2865	if (source == oneStepButton)
2052	2866	{
..	..	@@ -2055,17 +2869,14 @@
2055	2869	} else
2056	2870	if (source == screenfitButton)
2057	2871	{
2058		- //Reload(lastConverter, lastFilename, true);
2059	2872	ScreenFit();
2060	2873	} else
2061	2874	if (source == screenfitpointButton)
2062	2875	{
2063		- //Reload(lastConverter, lastFilename, true);
2064	2876	ScreenFitPoint();
2065	2877	} else
2066	2878	if (source == snapobjectButton)
2067	2879	{
2068		- //Reload(lastConverter, lastFilename, true);
2069	2880	SnapObject();
2070	2881	} else
2071	2882	// if (event.getSource() == recompileButton)
..	..	@@ -2104,11 +2915,11 @@
2104	2915	} else
2105	2916	if (source == undoItem)
2106	2917	{
2107		- Undo();
	2918	+ PreviousVersion();
2108	2919	} else
2109	2920	if (source == redoItem)
2110	2921	{
2111		- Redo();
	2922	+ NextVersion();
2112	2923	} else
2113	2924	if (source == duplicateItem)
2114	2925	{
..	..	@@ -2429,7 +3240,7 @@
2429	3240	{
2430	3241	StepAll();
2431	3242	} else
2432		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3243	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2433	3244	{
2434	3245	//int indices[] = jList.getSelectedIndices();
2435	3246	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2441,9 +3252,9 @@
2441	3252	{
2442	3253	ClearSelection(true);
2443	3254	} else
2444		- if (source == grabItem)
	3255	+ if (source == grabItem \|\| source == groupButton)
2445	3256	{
2446		- group(new cGroup(), true);
	3257	+ group(new cGroup(), false); // true);
2447	3258	} else
2448	3259	if (source == hideItem)
2449	3260	{
..	..	@@ -2461,11 +3272,11 @@
2461	3272	{
2462	3273	makeSomething(new Camera());
2463	3274	} else
2464		- if (source == compositeItem)
	3275	+ if (source == compositeItem \|\| source == compositeButton)
2465	3276	{
2466	3277	group(new Composite());
2467	3278	} else
2468		- if (source == randomItem)
	3279	+ if (source == switchItem \|\| source == switchButton)
2469	3280	{
2470	3281	RandomNode random = new RandomNode();
2471	3282	group(random);
..	..	@@ -2567,7 +3378,7 @@
2567	3378	{
2568	3379	group(new cLinker());
2569	3380	} else
2570		- if (source == textureItem)
	3381	+ if (source == textureItem \|\| source == textureButton)
2571	3382	{
2572	3383	group(new TextureNode());
2573	3384	} else
..	..	@@ -2587,17 +3398,42 @@
2587	3398	{
2588	3399	CastShadow(2);
2589	3400	} else
2590		- if (source == ungroupItem)
	3401	+ if (source == ungroupItem \|\| source == ungroupButton)
2591	3402	{
2592		- //ungroup();
	3403	+ boolean canUngroup = true;
	3404	+
2593	3405	for (int i=0; i<group.selection.size(); i++)
2594	3406	{
2595		- 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	+ }
2596	3422	}
2597	3423
2598		- ClearSelection(false);
2599		-
2600		- 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	+ }
2601	3437	} else
2602	3438	if (source == genUVItem)
2603	3439	{
..	..	@@ -2642,6 +3478,10 @@
2642	3478	if (source == clearMaterialsItem)
2643	3479	{
2644	3480	ClearMaterials();
	3481	+ } else
	3482	+ if (source == clearVersionsItem)
	3483	+ {
	3484	+ ClearVersions();
2645	3485	} else
2646	3486	if (source == liveleavesItem)
2647	3487	{
..	..	@@ -2783,6 +3623,18 @@
2783	3623	{
2784	3624	TransformChildren();
2785	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);
	3637	+ } else
2786	3638	if (source == resetTransformItem)
2787	3639	{
2788	3640	ResetTransform();
..	..	@@ -2898,7 +3750,7 @@
2898	3750	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2899	3751	{
2900	3752	obj = (Object3D)e.nextElement();
2901		- obj.SetBumpTexture(null);
	3753	+ obj.ResetBumpTexture();
2902	3754	}
2903	3755
2904	3756	refreshContents();
..	..	@@ -2914,6 +3766,31 @@
2914	3766
2915	3767	refreshContents();
2916	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
2917	3794	if (source == flashSelectionButton)
2918	3795	{
2919	3796	CameraPane.flash = true;
..	..	@@ -2925,38 +3802,11 @@
2925	3802	if (source == twoButton)
2926	3803	{
2927	3804	radio.layout = twoButton;
2928		- // bug
2929		- //gridPanel.setDividerLocation(1.0);
2930		- //bigPanel.setDividerLocation(0.0);
2931		-// bigThree.remove(scenePanel);
2932		-// bigThree.remove(centralPanel);
2933		-// bigThree.remove(XYZPanel);
2934		-// aWindowConstraints.gridx = 0;
2935		-// aWindowConstraints.gridy = 0;
2936		-// aWindowConstraints.gridwidth = 1;
2937		-// // aConstraints.gridheight = 3;
2938		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2939		-// aWindowConstraints.weightx = 0;
2940		-// aWindowConstraints.weighty = 1;
2941		-// //bigThree.add(jtp, aWindowConstraints);
2942		-// aWindowConstraints.weightx = 1;
2943		-// aWindowConstraints.gridwidth = 3;
2944		-// // aConstraints.gridheight = 3;
2945		-// aWindowConstraints.gridx = 1;
2946		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
2947		-// bigThree.add(centralPanel, aWindowConstraints);
2948		-// aWindowConstraints.weightx = 0;
2949		-// aWindowConstraints.gridx = 4;
2950		-// aWindowConstraints.gridwidth = 1;
2951		-// // aConstraints.gridheight = 3;
2952		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2953		-// //bigThree.add(XYZPanel, aWindowConstraints);
2954		-// scenePanel.setVisible(false);
2955		-// centralPanel.setVisible(true);
2956		-// XYZPanel.setVisible(false);
2957		- bigThree.ClearUI();
2958		- bigThree.add(centralPanel);
2959		- bigThree.FlushUI();
	3805	+
	3806	+ if (CameraPane.FULLSCREEN)
	3807	+ fullscreenLayout = radio.layout;
	3808	+
	3809	+ Show3DView();
2960	3810
2961	3811	cameraView.requestFocusInWindow();
2962	3812
..	..	@@ -2979,6 +3829,9 @@
2979	3829	if (source == threeButton)
2980	3830	{
2981	3831	radio.layout = threeButton;
	3832	+
	3833	+ if (CameraPane.FULLSCREEN)
	3834	+ fullscreenLayout = radio.layout;
2982	3835
2983	3836	// bigThree.remove(scenePanel);
2984	3837	// bigThree.remove(centralPanel);
..	..	@@ -3008,8 +3861,8 @@
3008	3861	// centralPanel.setVisible(true);
3009	3862	// XYZPanel.setVisible(true);
3010	3863	bigThree.ClearUI();
	3864	+ bigThree.add(scenePanel);
3011	3865	bigThree.add(centralPanel);
3012		- bigThree.add(XYZPanel);
3013	3866	bigThree.FlushUI();
3014	3867
3015	3868	cameraView.requestFocusInWindow();
..	..	@@ -3017,6 +3870,9 @@
3017	3870	if (source == fourButton)
3018	3871	{
3019	3872	radio.layout = fourButton;
	3873	+
	3874	+ if (CameraPane.FULLSCREEN)
	3875	+ fullscreenLayout = radio.layout;
3020	3876
3021	3877	// bigThree.remove(scenePanel);
3022	3878	// bigThree.remove(centralPanel);
..	..	@@ -3055,6 +3911,9 @@
3055	3911	{
3056	3912	radio.layout = sixButton;
3057	3913
	3914	+ if (CameraPane.FULLSCREEN)
	3915	+ fullscreenLayout = radio.layout;
	3916	+
3058	3917	// bigThree.remove(scenePanel);
3059	3918	// bigThree.remove(centralPanel);
3060	3919	// bigThree.remove(XYZPanel);
..	..	@@ -3083,8 +3942,8 @@
3083	3942	// centralPanel.setVisible(true);
3084	3943	// XYZPanel.setVisible(false);
3085	3944	bigThree.ClearUI();
3086		- bigThree.add(scenePanel);
3087	3945	bigThree.add(centralPanel);
	3946	+ bigThree.add(scenePanel);
3088	3947	bigThree.FlushUI();
3089	3948
3090	3949	cameraView.requestFocusInWindow();
..	..	@@ -3092,6 +3951,9 @@
3092	3951	if (source == sevenButton)
3093	3952	{
3094	3953	radio.layout = sevenButton;
	3954	+
	3955	+ if (CameraPane.FULLSCREEN)
	3956	+ fullscreenLayout = radio.layout;
3095	3957
3096	3958	// bigThree.remove(scenePanel);
3097	3959	// bigThree.remove(centralPanel);
..	..	@@ -3130,6 +3992,7 @@
3130	3992	} else
3131	3993	if (source == rootButton)
3132	3994	{
	3995	+ Replace();
3133	3996	Object3D obj;
3134	3997	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3135	3998	{
..	..	@@ -3144,6 +4007,9 @@
3144	4007	if (source == closeButton)
3145	4008	{
3146	4009	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	4010	+ if (copy.versionlist != null)
	4011	+ Replace();
	4012	+
3147	4013	cRadio ab;
3148	4014	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3149	4015	{
..	..	@@ -3159,7 +4025,8 @@
3159	4025	buttonGroup.remove(ab);
3160	4026	radioPanel.remove(ab);
3161	4027
3162		- ab.GetObject().editWindow = null;
	4028	+ //ab.GetObject().editWindow = null;
	4029	+ ab.GetObject().manipWindow = null;
3163	4030	// ab.GetObject().objectUI = null; // ?????????
3164	4031
3165	4032	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
..	..	@@ -3172,6 +4039,12 @@
3172	4039	} else
3173	4040	if (source == editItem \|\| source == editButton)
3174	4041	{
	4042	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4043	+ {
	4044	+ Object3D child = (Object3D)e.nextElement();
	4045	+ child.pinned = true;
	4046	+ }
	4047	+
3175	4048	EditSelection(false);
3176	4049	} else
3177	4050	if (source == uneditButton)
..	..	@@ -3180,9 +4053,10 @@
3180	4053	{
3181	4054	Object3D child = (Object3D)e.nextElement();
3182	4055	if(child.editWindow != null)
3183		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4056	+ child.pinned = false;
3184	4057	child.CloseUI();
3185	4058	listUI.remove(child);
	4059	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3186	4060
3187	4061	//child.editWindow = null; // ???????????
3188	4062	}
..	..	@@ -3197,16 +4071,18 @@
3197	4071	//copy.ClearUI();
3198	4072	for (Object3D obj : listUI)
3199	4073	{
	4074	+ obj.pinned = false;
3200	4075	obj.CloseUI();
3201	4076	}
3202	4077	listUI.clear();
	4078	+ SetPinStates(group.selection.size() > 0);
3203	4079	refreshContents(true);
3204	4080	} else
3205	4081	if (source == allParamsButton)
3206	4082	{
3207	4083	assert(copy == group);
3208	4084
3209		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4085	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3210	4086
3211	4087	for (Object3D obj : listUI)
3212	4088	{
..	..	@@ -3232,6 +4108,9 @@
3232	4108	} else
3233	4109	if(source instanceof cRadio)
3234	4110	{
	4111	+ if (copy.versionlist != null)
	4112	+ Replace();
	4113	+
3235	4114	group.parent = keepparent;
3236	4115	group.attributes = 0;
3237	4116	//group.editWindow = null;
..	..	@@ -3255,6 +4134,7 @@
3255	4134	}
3256	4135
3257	4136	copy = group;
	4137	+
3258	4138	//Globals.theRenderer.object = group;
3259	4139	if(!useclient)
3260	4140	{
..	..	@@ -3273,6 +4153,7 @@
3273	4153
3274	4154	// fix "+" issue
3275	4155	//group.editWindow = this;
	4156	+ group.manipWindow = this;
3276	4157
3277	4158	/*
3278	4159	currentLayout = radio.layout;
..	..	@@ -3280,6 +4161,40 @@
3280	4161	currentLayout = sevenButton;
3281	4162	*/
3282	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);
3283	4198	keepparent = group.parent;
3284	4199	// PARENT = NULL or not???
3285	4200	//group.parent = null; // ROOT
..	..	@@ -3291,11 +4206,13 @@
3291	4206	} else if (event.getSource() == editCameraItem)
3292	4207	{
3293	4208	cameraView.ProtectCamera();
	4209	+ cameraView.requestFocusInWindow();
3294	4210	cameraView.repaint();
3295	4211	return;
3296		- } else if (event.getSource() == revertCameraItem)
	4212	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3297	4213	{
3298	4214	cameraView.RevertCamera();
	4215	+ cameraView.requestFocusInWindow();
3299	4216	cameraView.repaint();
3300	4217	return;
3301	4218	// } else if (event.getSource() == textureButton)
..	..	@@ -3384,9 +4301,46 @@
3384	4301	refreshContents();
3385	4302	}
3386	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	+
3387	4316	void ResetTransform()
3388	4317	{
3389	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();
3390	4344	}
3391	4345
3392	4346	void ResetTransform(int mask)
..	..	@@ -3399,42 +4353,8 @@
3399	4353	if (obj.toParent == null)
3400	4354	continue;
3401	4355
3402		- if (mask == -1)
3403		- {
3404		- if (obj instanceof Camera) // jan 2014
3405		- {
3406		- LA.matIdentity(obj.toParent);
3407		- LA.matIdentity(obj.fromParent);
3408		- }
3409		- else
3410		- {
3411		- obj.toParent = null; // jan 2014 LA.matIdentity(obj.toParent);
3412		- obj.fromParent = null; // LA.matIdentity(obj.fromParent);
3413		- }
3414		- TouchTransform(obj);
3415		- continue;
3416		- }
3417		- if ((mask&2) != 0) // Scale
3418		- {
3419		- obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
3420		- obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
3421		- obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
3422		- obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
3423		- obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
3424		- obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
3425		- }
3426		- if ((mask&4) != 0) // Rotation
3427		- {
3428		- // ?
3429		- }
3430		- if ((mask&1) != 0) // Translation
3431		- {
3432		- if (obj.toParent != null)
3433		- {
3434		- obj.toParent[3][0] = obj.toParent[3][1] = obj.toParent[3][2] = 0;
3435		- obj.fromParent[3][0] = obj.fromParent[3][1] = obj.fromParent[3][2] = 0;
3436		- }
3437		- }
	4356	+ obj.ResetTransform(mask);
	4357	+
3438	4358	if (obj.parent == null)
3439	4359	{
3440	4360	System.out.println("NULL PARENT!");
..	..	@@ -3872,7 +4792,7 @@
3872	4792
3873	4793	try
3874	4794	{
3875		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4795	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
3876	4796	}
3877	4797	catch (Exception e)
3878	4798	{
..	..	@@ -3943,10 +4863,17 @@
3943	4863	{
3944	4864	Object3D obj = group.selection.get(i);
3945	4865
	4866	+ if (obj.toParent == null)
	4867	+ {
	4868	+ obj.toParent = LA.newMatrix();
	4869	+ obj.fromParent = LA.newMatrix();
	4870	+ }
	4871	+
3946	4872	LA.matTranslate(obj.toParent, i * scale, 0, 0);
3947	4873	LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3948	4874	}
3949	4875
	4876	+ Globals.lighttouched = true;
3950	4877	refreshContents();
3951	4878	}
3952	4879
..	..	@@ -4234,6 +5161,12 @@
4234	5161	refreshContents();
4235	5162	}
4236	5163
	5164	+ void ClearVersions()
	5165	+ {
	5166	+ group.selection.ClearVersions();
	5167	+ refreshContents();
	5168	+ }
	5169	+
4237	5170	void FlipV(boolean flip)
4238	5171	{
4239	5172	group.selection.FlipV(flip);
..	..	@@ -4347,28 +5280,25 @@
4347	5280	// }
4348	5281	// }
4349	5282
4350		- static boolean allparams = true;
4351		-
4352		- static Vector<Object3D> listUI = new Vector<Object3D>();
4353		-
4354	5283	void EditSelection(boolean newWindow)
4355	5284	{
	5285	+ if (group.selection == null)
	5286	+ {
	5287	+ EditElement(group, newWindow); // ? new
	5288	+ return;
	5289	+ }
	5290	+
4356	5291	// aConstraints.gridy = 0;
4357	5292	for (int i=0; i<group.selection.size(); i++)
4358	5293	{
4359	5294	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4360	5295	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4361		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5296	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4362	5297
4363	5298	Object3D elem = (Object3D)group.selection.elementAt(i);
4364	5299	if(elem != group \|\| !newWindow)
4365	5300	{
4366		- // if (!(elem instanceof Composite))
4367		- // newWindow = false;
4368		- listUI.add(elem);
4369		- elem.openEditWindow(this, newWindow); //, false);
4370		- System.out.println("edit : " + elem);
4371		- elem.editWindow.refreshContents(true); // ? new
	5301	+ EditElement(elem, newWindow); // ? new
4372	5302	}
4373	5303	}
4374	5304	}
..	..	@@ -4431,9 +5361,7 @@
4431	5361
4432	5362	freezemodel = false;
4433	5363	}
4434		-
4435		- boolean flashIt = true;
4436		-
	5364	+
4437	5365	public void valueChanged(TreeSelectionEvent e)
4438	5366	//public boolean handleEvent(Event event)
4439	5367	{
..	..	@@ -4443,7 +5371,8 @@
4443	5371	//new Exception().printStackTrace();
4444	5372
4445	5373	freezemodel = true;
4446		-
	5374	+ ClearUnpinned();
	5375	+
4447	5376	/**/
4448	5377	//switch (event.id)
4449	5378	{
..	..	@@ -4476,15 +5405,22 @@
4476	5405	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4477	5406	// a camera
4478	5407	{
4479		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	5408	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crashes the camera because of invalid lightspace
4480	5409	{
4481	5410	CameraPane.camerachangeframe = 0; // don't refuse it
4482		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5411	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent(), true);
4483	5412	}
4484	5413	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4485	5414	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4486	5415	}
4487	5416
	5417	+ if (tps != null && tps.length == 1)
	5418	+ {
	5419	+ EditSelection(false);
	5420	+ }
	5421	+
	5422	+ SetPinStates(tps != null && tps.length > 0);
	5423	+
4488	5424	refreshContents();
4489	5425	//return true;
4490	5426	}
..	..	@@ -4494,9 +5430,36 @@
4494	5430	freezemodel = false;
4495	5431	}
4496	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	+
4497	5458	void refreshContents(boolean cp)
4498	5459	{
4499		- if (!Globals.MOUSEDRAGGED)
	5460	+ if (Globals.SHOWINFO)
	5461	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5462	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4500	5463	{
4501	5464	objEditor.ClearInfo(); // .GetMaterial());
4502	5465
..	..	@@ -4505,7 +5468,7 @@
4505	5468	Object3D child = (Object3D) group.selection.get(i);
4506	5469
4507	5470	objEditor.AddInfo(child, this, true);
4508		- System.err.println("info : " + child.GetPath());
	5471	+// System.err.println("info : " + child.GetPath());
4509	5472	}
4510	5473
4511	5474	objEditor.SetText(); // jan 2014
..	..	@@ -4595,7 +5558,8 @@
4595	5558
4596	5559	if (cut)
4597	5560	{
4598		- Save();
	5561	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5562	+// Save();
4599	5563	//int indices[] = jList.getSelectedIndices();
4600	5564	//for (int i = indices.length - 1; i >= 0; i--)
4601	5565	//jList.remove(indices[i]);
..	..	@@ -4698,6 +5662,10 @@
4698	5662
4699	5663	void paste(boolean expand)
4700	5664	{
	5665	+ if (Globals.REPLACEONMAKE)
	5666	+ Save();
	5667	+ boolean keep = Globals.REPLACEONMAKE;
	5668	+ Globals.REPLACEONMAKE = false;
4701	5669	// if (GrafreeD.clipboard == null)
4702	5670	// return;
4703	5671	boolean first = true;
..	..	@@ -4757,6 +5725,7 @@
4757	5725	Grafreed.clipboard.get(0).parent = keepparent;
4758	5726	}
4759	5727
	5728	+ Globals.REPLACEONMAKE = keep;
4760	5729	ResetModel();
4761	5730	refreshContents();
4762	5731	}
..	..	@@ -4892,6 +5861,10 @@
4892	5861
4893	5862	void group(Object3D csg, boolean grab)
4894	5863	{
	5864	+ if (Globals.REPLACEONMAKE)
	5865	+ Save();
	5866	+ boolean keep = Globals.REPLACEONMAKE;
	5867	+ Globals.REPLACEONMAKE = false;
4895	5868	if (//false) // why??
4896	5869	!group.selection.isEmpty())
4897	5870	{
..	..	@@ -5005,10 +5978,15 @@
5005	5978	//node.add(csg);
5006	5979	//makeSomething(node);
5007	5980	makeSomething(csg);
	5981	+ Globals.REPLACEONMAKE = keep;
5008	5982	}
5009	5983
5010	5984	void Ungroup(Object3D g)
5011	5985	{
	5986	+ if (Globals.REPLACEONMAKE)
	5987	+ Save();
	5988	+ boolean keep = Globals.REPLACEONMAKE;
	5989	+ Globals.REPLACEONMAKE = false;
5012	5990	if (g instanceof HiddenObject)
5013	5991	{
5014	5992	HiddenObject h = (HiddenObject) g;
..	..	@@ -5025,6 +6003,7 @@
5025	6003	objEditor.makeSomething(g.get(i), false);
5026	6004	}
5027	6005	}
	6006	+ Globals.REPLACEONMAKE = keep;
5028	6007	}
5029	6008
5030	6009	void ungroup()
..	..	@@ -5313,13 +6292,43 @@
5313	6292	cButton clearpanelButton;
5314	6293	cButton unselectButton;
5315	6294
5316		- cButton minButton;
5317		- cButton maxButton;
5318		- cButton fullButton;
5319		- cButton undoButton;
5320		- cButton redoButton;
5321		- cButton saveButton;
	6295	+ cButton restoreCameraButton;
	6296	+
5322	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;
5323	6332
5324	6333	cButton screenfitButton;
5325	6334	cButton screenfitpointButton;
..	..	@@ -5341,12 +6350,12 @@
5341	6350	//JTree jTree;
5342	6351	private MenuItem lookAtItem;
5343	6352	private MenuItem lookFromItem;
5344		- private MenuItem switchItem;
5345		- private MenuItem cutItem;
	6353	+ private MenuItem switchViewItem;
	6354	+ private JMenuItem cutItem;
5346	6355	private MenuItem undoItem;
5347	6356	private MenuItem redoItem;
5348		- private MenuItem duplicateItem;
5349		- private MenuItem cloneItem;
	6357	+ private JMenuItem duplicateItem;
	6358	+ private JMenuItem cloneItem;
5350	6359	private MenuItem cloneSupportItem;
5351	6360	private MenuItem overwriteGeoItem;
5352	6361	private MenuItem overwriteMatItem;
..	..	@@ -5367,13 +6376,13 @@
5367	6376	private MenuItem cloneGeometriesItem;
5368	6377	private MenuItem shareGeometriesItem;
5369	6378	private MenuItem mergeGeometriesItem;
5370		- private MenuItem copyItem;
	6379	+ private JMenuItem copyItem;
5371	6380	private MenuItem pasteItem;
5372		- private MenuItem pasteIntoItem;
5373		- private MenuItem pasteLinkItem;
5374		- private MenuItem pasteCloneItem;
5375		- private MenuItem pasteExpandItem;
5376		- private MenuItem clearItem;
	6381	+ private JMenuItem pasteIntoItem;
	6382	+ private JMenuItem pasteLinkItem;
	6383	+ private JMenuItem pasteCloneItem;
	6384	+ private JMenuItem pasteExpandItem;
	6385	+ private JMenuItem deleteItem;
5377	6386	private MenuItem clearAllItem;
5378	6387	private MenuItem genUVItem;
5379	6388	private MenuItem genNormalsMESHItem;
..	..	@@ -5399,6 +6408,7 @@
5399	6408	private MenuItem clipMeshItem;
5400	6409	private MenuItem smoothMeshItem;
5401	6410	private MenuItem clearMaterialsItem;
	6411	+ private MenuItem clearVersionsItem;
5402	6412
5403	6413	private MenuItem liveleavesItem;
5404	6414	private MenuItem unliveleavesItem;
..	..	@@ -5422,18 +6432,21 @@
5422	6432	private MenuItem maxTexturesItem;
5423	6433	private MenuItem panoTexturesItem;
5424	6434
	6435	+ private MenuItem textureRatioRItem;
	6436	+ private MenuItem textureRatioGItem;
	6437	+ private MenuItem textureRatioBItem;
5425	6438	private MenuItem resetCentroidItem;
5426	6439	private MenuItem resetCentroidXZItem;
5427	6440	private MenuItem resetTransformItem;
5428	6441	private MenuItem transformGeometryItem;
5429	6442	private MenuItem transformChildrenItem;
5430	6443	private MenuItem hideItem;
5431		- private MenuItem grabItem;
	6444	+ private JMenuItem grabItem;
5432	6445	private MenuItem backItem;
5433	6446	private MenuItem frontItem;
5434	6447	private MenuItem cameraItem;
5435	6448	private MenuItem compositeItem;
5436		- private MenuItem randomItem;
	6449	+ private MenuItem switchItem;
5437	6450	private MenuItem physicsItem;
5438	6451	private MenuItem frameselectorItem;
5439	6452	private MenuItem scriptNodeItem;
..	..	@@ -5441,7 +6454,7 @@
5441	6454	private MenuItem switchTransfoItem;
5442	6455	private MenuItem morphItem;
5443	6456	private MenuItem linkerItem;
5444		- private MenuItem ungroupItem;
	6457	+ private JMenuItem ungroupItem;
5445	6458	private MenuItem editItem;
5446	6459	private MenuItem openWindowItem;
5447	6460	private MenuItem editLeafItem;
..	..	@@ -5457,6 +6470,8 @@
5457	6470	private MenuItem attachBumpItem;
5458	6471	private MenuItem detachBumpItem;
5459	6472	private MenuItem pigmentBumpItem;
	6473	+ private MenuItem embedTexturesItem;
	6474	+ private MenuItem deEmbedTexturesItem;
5460	6475
5461	6476	private MenuItem particleItem;
5462	6477	private MenuItem ragdollItem;
..	..	@@ -5507,5 +6522,5 @@
5507	6522
5508	6523	Menu cameraMenu;
5509	6524	MenuItem editCameraItem;
5510		- MenuItem revertCameraItem;
	6525	+ MenuItem restoreCameraItem;
5511	6526	}