~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,314 @@
23	24	DragGestureListener, DragSourceListener, DropTargetListener,
24	25	ItemListener // ListSelectionListener
25	26	{
	27	+
	28	+ public void AddSkyboxButton(String f, String s, cGridBag row)
	29	+ {
	30	+ cButton skyboxButton;
	31	+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
	32	+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
	33	+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
	34	+ skyboxButton.setToolTipText(s);
	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 AddSkyboxTab0(JTabbedPane skyboxpanel)
	46	+ {
	47	+ cGridBag tab0 = new cGridBag().setVertical(true);
	48	+
	49	+ tab0.setName("Urban");
	50	+ skyboxpanel.add(tab0);
	51	+
	52	+ cGridBag row0 = new cGridBag();
	53	+ cGridBag row1 = new cGridBag();
	54	+ cGridBag row2 = new cGridBag();
	55	+ cGridBag row3 = new cGridBag();
	56	+ cGridBag row4 = new cGridBag();
	57	+ cGridBag row5 = new cGridBag();
	58	+ cGridBag row6 = new cGridBag();
	59	+
	60	+ AddSkyboxButton("default", "rgb", row0);
	61	+ //AddSkyboxButton("default", "cornell", row0);
	62	+ AddSkyboxButton("penguins", "dust", row0);
	63	+ AddSkyboxButton("penguins", "tropic", row0);
	64	+ AddSkyboxButton("penguins", "yonder", row0);
	65	+
	66	+ AddSkyboxButton("default", "uffizi", row1);
	67	+ AddSkyboxButton("bridge", "Bridge", row1);
	68	+ AddSkyboxButton("bridge", "Bridge2", row1);
	69	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	70	+
	71	+ AddSkyboxButton("urban", "Parliament", row2);
	72	+ AddSkyboxButton("urban", "Roundabout", row2);
	73	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	74	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	75	+
	76	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	77	+ AddSkyboxButton("urban", "UnionSquare", row3);
	78	+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
	79	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	80	+
	81	+ AddSkyboxButton("park", "Buddha", row4);
	82	+ AddSkyboxButton("park", "CNTower2", row4);
	83	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	84	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	85	+
	86	+ AddSkyboxButton("park", "Park", row5);
	87	+ AddSkyboxButton("park", "Pond", row5);
	88	+ AddSkyboxButton("park", "Skansen", row5);
	89	+ AddSkyboxButton("park", "Skansen2", row5);
	90	+
	91	+ AddSkyboxButton("park", "Skansen3", row6);
	92	+ AddSkyboxButton("park", "Skansen4", row6);
	93	+ AddSkyboxButton("park", "Skansen5", row6);
	94	+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
	95	+
	96	+ tab0.add(row0);
	97	+ tab0.add(row1);
	98	+ tab0.add(row2);
	99	+ tab0.add(row3);
	100	+ tab0.add(row4);
	101	+ tab0.add(row5);
	102	+ tab0.add(row6);
	103	+
	104	+ for (int i=5; --i>=0;)
	105	+ {
	106	+ //oe.toolboxPanel.Return();
	107	+ //tab0.add(new cGridBag());
	108	+ }
	109	+ }
	110	+
	111	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	112	+ {
	113	+ cGridBag tab0 = new cGridBag().setVertical(true);
	114	+
	115	+ tab0.setName("Nature");
	116	+ skyboxpanel.add(tab0);
	117	+
	118	+ cGridBag row0 = new cGridBag();
	119	+ cGridBag row1 = new cGridBag();
	120	+ cGridBag row2 = new cGridBag();
	121	+ cGridBag row3 = new cGridBag();
	122	+ cGridBag row4 = new cGridBag();
	123	+ cGridBag row5 = new cGridBag();
	124	+ cGridBag row6 = new cGridBag();
	125	+
	126	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	127	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	128	+ AddSkyboxButton("beach", "PalmTrees", row0);
	129	+ AddSkyboxButton("beach", "Tenerife", row0);
	130	+
	131	+ AddSkyboxButton("beach", "Tenerife2", row1);
	132	+ AddSkyboxButton("beach", "Tenerife3", row1);
	133	+ AddSkyboxButton("field", "FishPond", row1);
	134	+ AddSkyboxButton("field", "Footballfield", row1);
	135	+
	136	+ AddSkyboxButton("field", "Meadow", row2);
	137	+ AddSkyboxButton("field", "Sorsele", row2);
	138	+ AddSkyboxButton("field", "Sorsele2", row2);
	139	+ AddSkyboxButton("field", "Sorsele3", row2);
	140	+
	141	+ AddSkyboxButton("forest", "Brudslojan", row3);
	142	+ AddSkyboxButton("forest", "Langholmen2", row3);
	143	+ AddSkyboxButton("forest", "Plants", row3);
	144	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	145	+
	146	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	147	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	148	+ AddSkyboxButton("mountain", "Teide", row4);
	149	+ AddSkyboxButton("park", "Tantolunden4", row4);
	150	+
	151	+ AddSkyboxButton("park", "Stairs", row5);
	152	+ AddSkyboxButton("default", "skycube", row6);
	153	+ AddSkyboxButton("rocky", "Langholmen", row5);
	154	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	155	+
	156	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	157	+ AddSkyboxButton("default", "CloudyHills", row6);
	158	+ AddSkyboxButton("daz", "Autumn", row6);
	159	+ AddSkyboxButton("daz", "MountainTrail", row6);
	160	+ /*
	161	+Autumn
	162	+Greenlands
	163	+MountainTrail
	164	+Oasis
	165	+TheRock
	166	+TopOfTheWorld
	167	+Winter
	168	+ */
	169	+
	170	+ tab0.add(row0);
	171	+ tab0.add(row1);
	172	+ tab0.add(row2);
	173	+ tab0.add(row3);
	174	+ tab0.add(row4);
	175	+ tab0.add(row5);
	176	+ tab0.add(row6);
	177	+
	178	+ for (int i=5; --i>=0;)
	179	+ {
	180	+ //oe.toolboxPanel.Return();
	181	+ //tab0.add(new cGridBag());
	182	+ }
	183	+ }
	184	+
	185	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	186	+ {
	187	+ cGridBag tab0 = new cGridBag().setVertical(true);
	188	+
	189	+ tab0.setName("Night");
	190	+ skyboxpanel.add(tab0);
	191	+
	192	+ cGridBag row0 = new cGridBag();
	193	+ cGridBag row1 = new cGridBag();
	194	+ cGridBag row2 = new cGridBag();
	195	+ cGridBag row3 = new cGridBag();
	196	+ cGridBag row4 = new cGridBag();
	197	+ cGridBag row5 = new cGridBag();
	198	+ cGridBag row6 = new cGridBag();
	199	+
	200	+ AddSkyboxButton("night", "NightPath", row0);
	201	+ AddSkyboxButton("night", "PondNight", row0);
	202	+ AddSkyboxButton("night", "Powerlines", row0);
	203	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	204	+
	205	+ AddSkyboxButton("urban", "CNTower", row1);
	206	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	207	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	208	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
	209	+
	210	+ AddSkyboxButton("penguins", "kenon_star", row2);
	211	+ AddSkyboxButton("persson", "corona", row2);
	212	+ AddSkyboxButton("persson", "spaceskybox", row2);
	213	+ AddSkyboxButton("indoors", "Vasa", row2);
	214	+
	215	+ AddSkyboxButton("winter", "Backyard", row3);
	216	+ AddSkyboxButton("winter", "Creek", row3);
	217	+ AddSkyboxButton("winter", "FootballField3", row3);
	218	+ AddSkyboxButton("winter", "Forest", row3);
	219	+
	220	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	221	+ AddSkyboxButton("winter", "House", row4);
	222	+ AddSkyboxButton("winter", "IceLake", row4);
	223	+ AddSkyboxButton("winter", "IceRiver", row4);
	224	+
	225	+ AddSkyboxButton("winter", "Park3", row5);
	226	+ AddSkyboxButton("winter", "PondWinter", row5);
	227	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	228	+ AddSkyboxButton("winter", "Vindelalven", row5);
	229	+
	230	+ AddSkyboxButton("daz", "TheRock", row6);
	231	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	232	+ AddSkyboxButton("daz", "Winter", row6);
	233	+ AddSkyboxButton("mountain", "Ryfjallet", row6);
	234	+
	235	+ tab0.add(row0);
	236	+ tab0.add(row1);
	237	+ tab0.add(row2);
	238	+ tab0.add(row3);
	239	+ tab0.add(row4);
	240	+ tab0.add(row5);
	241	+ tab0.add(row6);
	242	+
	243	+ for (int i=5; --i>=0;)
	244	+ {
	245	+ //oe.toolboxPanel.Return();
	246	+ //tab0.add(new cGridBag());
	247	+ }
	248	+ }
	249	+
	250	+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
	251	+ {
	252	+ cGridBag tab0 = new cGridBag().setVertical(true);
	253	+
	254	+ tab0.setName("Others");
	255	+ skyboxpanel.add(tab0);
	256	+
	257	+ cGridBag row0 = new cGridBag();
	258	+ cGridBag row1 = new cGridBag();
	259	+ cGridBag row2 = new cGridBag();
	260	+ cGridBag row3 = new cGridBag();
	261	+ cGridBag row4 = new cGridBag();
	262	+ cGridBag row5 = new cGridBag();
	263	+ cGridBag row6 = new cGridBag();
	264	+
	265	+ AddSkyboxButton("mayhem", "afterrain", row0);
	266	+ AddSkyboxButton("mayhem", "aqua4", row0);
	267	+ AddSkyboxButton("mayhem", "aqua9", row0);
	268	+ AddSkyboxButton("mayhem", "flame", row0);
	269	+
	270	+ AddSkyboxButton("mayhem", "h2s", row1);
	271	+ AddSkyboxButton("mayhem", "prehistoric", row1);
	272	+ AddSkyboxButton("mayhem", "scorched", row1);
	273	+ AddSkyboxButton("penguins", "desertdawn", row1);
	274	+
	275	+ AddSkyboxButton("persson", "Citadella", row2);
	276	+ AddSkyboxButton("persson", "Citadella2", row2);
	277	+ AddSkyboxButton("persson", "clouds1", row2);
	278	+ AddSkyboxButton("penguins", "wrath", row2);
	279	+
	280	+ AddSkyboxButton("persson", "FishermansBastion", row3);
	281	+ AddSkyboxButton("persson", "HeroesSquare", row3);
	282	+ AddSkyboxButton("indoors", "DallasW", row3);
	283	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
	284	+
	285	+ AddSkyboxButton("persson", "LancellottiChapel", row4);
	286	+ AddSkyboxButton("persson", "PereaBeach1", row4);
	287	+ AddSkyboxButton("persson", "PereaBeach2", row4);
	288	+ AddSkyboxButton("persson", "redeclipse", row4);
	289	+
	290	+ AddSkyboxButton("daz", "Greenlands", row5);
	291	+ AddSkyboxButton("daz", "Oasis", row5);
	292	+ AddSkyboxButton("elyvisions", "arch3", row5);
	293	+ AddSkyboxButton("elyvisions", "calm_sea", row5);
	294	+
	295	+ AddSkyboxButton("elyvisions", "rainbow", row6);
	296	+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
	297	+ AddSkyboxButton("elyvisions", "heaven", row6);
	298	+ AddSkyboxButton("elyvisions", "hot", row6);
	299	+
	300	+ tab0.add(row0);
	301	+ tab0.add(row1);
	302	+ tab0.add(row2);
	303	+ tab0.add(row3);
	304	+ tab0.add(row4);
	305	+ tab0.add(row5);
	306	+ tab0.add(row6);
	307	+
	308	+ for (int i=5; --i>=0;)
	309	+ {
	310	+ //oe.toolboxPanel.Return();
	311	+ //tab0.add(new cGridBag());
	312	+ }
	313	+ }
	314	+
	315	+ public void CallBack(String[] path)
	316	+ {
	317	+ for (int i = 0; i < path.length; i++)
	318	+ {
	319	+ System.out.print(path[i] + "/");
	320	+ }
	321	+
	322	+ System.out.println();
	323	+ }
	324	+
	325	+ public void ChangeSkybox(String skybox)
	326	+ {
	327	+ //cameraView.envyoff = false;
	328	+ group.skyboxname = skybox;
	329	+ group.skyboxext = "jpg";
	330	+ cameraView.repaint();
	331	+
	332	+ Grafreed.ParseResources("textures", this);
	333	+ }
	334	+
26	335	//ObjEditor objEditor;
27	336	public void closeUI2()
28	337	{
..	..	@@ -60,6 +369,12 @@
60	369	this.copy = this.group = group;
61	370	//selectees = this.group.selectees;
62	371
	372	+ if (copy.versionlist == null)
	373	+ {
	374	+ copy.versionlist = new Object3D[100];
	375	+ copy.versionindex = -1;
	376	+ }
	377	+
63	378	if(ui)
64	379	SetupUI(objEditor);
65	380	}
..	..	@@ -80,10 +395,22 @@
80	395	SetupViews(objEditor);
81	396
82	397	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	398	+
	399	+ if (copy.versionlist == null)
	400	+ {
	401	+ copy.versionlist = new Object3D[100];
	402	+ copy.versionindex = -1;
	403	+
	404	+ Save(true);
	405	+ }
83	406	}
84	407
85	408	void CloneSelection(boolean supports)
86	409	{
	410	+ if (Globals.REPLACEONMAKE)
	411	+ Save();
	412	+ boolean keep = Globals.REPLACEONMAKE;
	413	+ Globals.REPLACEONMAKE = false;
87	414	// Object3D keep = GrafreeD.clipboard;
88	415	//Object3D obj;
89	416	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,6 +421,7 @@
94	421
95	422	makeSomething(clone, i==group.selection.size()-1);
96	423	}
	424	+ Globals.REPLACEONMAKE = keep;
97	425	}
98	426
99	427	void CloneClipboard(boolean supports)
..	..	@@ -150,16 +478,19 @@
150	478
151	479	void SetupMenu2(GroupEditor oe)
152	480	{
	481	+ oe.jTree = new cTree();
	482	+
153	483	Menu menu;
154	484	oe.menuBar.add(menu = new Menu("Edit"));
155	485	//editItem = menu.add(new MenuItem("Edit"));
156	486	//editItem.addActionListener(this);
157		- undoItem = menu.add(new MenuItem("Undo"));
158		- undoItem.addActionListener(this);
159		- redoItem = menu.add(new MenuItem("Redo"));
160		- redoItem.addActionListener(this);
161		- menu.add("-");
162		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	487	+
	488	+// undoItem = menu.add(new MenuItem("Undo"));
	489	+// undoItem.addActionListener(this);
	490	+// redoItem = menu.add(new MenuItem("Redo"));
	491	+// redoItem.addActionListener(this);
	492	+// menu.add("-");
	493	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
163	494	duplicateItem.addActionListener(this);
164	495	cloneItem = menu.add(new MenuItem("Clone"));
165	496	cloneItem.addActionListener(this);
..	..	@@ -175,7 +506,6 @@
175	506	copyItem.addActionListener(this);
176	507	pasteItem = menu.add(new MenuItem("Paste"));
177	508	pasteItem.addActionListener(this);
178		- menu.add("-");
179	509
180	510	menu.add("-");
181	511	pasteIntoItem = menu.add(new MenuItem("Paste into"));
..	..	@@ -187,8 +517,8 @@
187	517	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
188	518	// pasteExpandItem.addActionListener(this);
189	519	menu.add("-");
190		- clearItem = menu.add(new MenuItem("Clear"));
191		- clearItem.addActionListener(this);
	520	+ deleteItem = menu.add(new MenuItem("Delete"));
	521	+ deleteItem.addActionListener(this);
192	522
193	523	if (Globals.ADVANCED)
194	524	{
..	..	@@ -202,23 +532,23 @@
202	532	//zBufferItem.addActionListener(this);
203	533	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
204	534	//normalLensItem.addActionListener(this);
205		- cameraMenu.add(revertCameraItem = new MenuItem("Restore Camera"));
206		- revertCameraItem.addActionListener(this);
	535	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	536	+ restoreCameraItem.addActionListener(this);
207	537
208		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
209		- toggleFullScreenItem.addItemListener(this);
210		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
211		- cameraMenu.add("-");
	538	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	539	+// toggleFullScreenItem.addItemListener(this);
	540	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	541	+// cameraMenu.add("-");
	542	+//
	543	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	544	+// toggleTextureItem.addItemListener(this);
	545	+// toggleTextureItem.setState(CameraPane.textureon);
	546	+//
	547	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	548	+// toggleSwitchItem.addItemListener(this);
	549	+// toggleSwitchItem.setState(CameraPane.SWITCH);
212	550
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"));
	551	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
222	552	toggleHandleItem.addItemListener(this);
223	553	toggleHandleItem.setState(CameraPane.HANDLES);
224	554
..	..	@@ -245,7 +575,7 @@
245	575
246	576	cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
247	577	toggleDebugItem.addItemListener(this);
248		- toggleDebugItem.setState(CameraPane.DEBUG);
	578	+ toggleDebugItem.setState(Globals.DEBUG);
249	579
250	580	cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
251	581	toggleFrustumItem.addItemListener(this);
..	..	@@ -266,14 +596,14 @@
266	596	// animationItem.addItemListener(this);
267	597	// animationItem.setState(CameraPane.ANIMATION);
268	598	cameraMenu.add("-");
269		- cameraMenu.add(editCameraItem = new MenuItem("Save Camera"));
	599	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
270	600	editCameraItem.addActionListener(this);
271	601
272	602	if (Globals.ADVANCED)
273	603	{
274	604	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
275	605	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
276		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
	606	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
277	607	editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
278	608	oe.cameraMenu.add("-");
279	609	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
..	..	@@ -281,7 +611,7 @@
281	611	editLeafItem.addActionListener(this);
282	612	lookAtItem.addActionListener(this);
283	613	//lookFromItem.addActinoListener(this);
284		- //switchItem.addActionListener(this);
	614	+ //switchViewItem.addActionListener(this);
285	615	}
286	616
287	617	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -326,21 +656,29 @@
326	656	}
327	657
328	658	oe.menuBar.add(menu = new Menu("Group"));
329		- grabItem = menu.add(new MenuItem("Grab"));
330		- grabItem.addActionListener(this);
	659	+// grabItem = menu.add(new MenuItem("Grab"));
	660	+// grabItem.addActionListener(this);
331	661	backItem = menu.add(new MenuItem("Back"));
332	662	backItem.addActionListener(this);
333	663	frontItem = menu.add(new MenuItem("Front"));
334	664	frontItem.addActionListener(this);
335		- compositeItem = menu.add(new MenuItem("Composite"));
336		- compositeItem.addActionListener(this);
	665	+// compositeItem = menu.add(new MenuItem("Composite"));
	666	+// compositeItem.addActionListener(this);
	667	+
	668	+ if (Globals.ADVANCED)
	669	+ {
337	670	hideItem = menu.add(new MenuItem("Hidden Group"));
338	671	hideItem.addActionListener(this);
	672	+ }
339	673	ungroupItem = menu.add(new MenuItem("Ungroup"));
340	674	ungroupItem.addActionListener(this);
341		- menu.add("-");
342		- randomItem = menu.add(new MenuItem("Switch node"));
343		- randomItem.addActionListener(this);
	675	+
	676	+// menu.add("-");
	677	+//
	678	+// switchItem = menu.add(new MenuItem("Switch node"));
	679	+// switchItem.addActionListener(this);
	680	+ if (Globals.ADVANCED)
	681	+ {
344	682	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
345	683	switchGeoItem.addActionListener(this);
346	684	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -348,8 +686,6 @@
348	686	morphItem = menu.add(new MenuItem("Morph Group"));
349	687	morphItem.addActionListener(this);
350	688
351		- if (Globals.ADVANCED)
352		- {
353	689	menu.add("-");
354	690	physicsItem = menu.add(new MenuItem("Physics"));
355	691	physicsItem.addActionListener(this);
..	..	@@ -357,30 +693,29 @@
357	693	frameselectorItem.addActionListener(this);
358	694	scriptNodeItem = menu.add(new MenuItem("Script Node"));
359	695	scriptNodeItem.addActionListener(this);
360		- cameraItem = menu.add(new MenuItem("Camera"));
361		- cameraItem.addActionListener(this);
362	696	}
363	697
364	698	oe.menuBar.add(menu = new Menu("Object"));
365		- textureItem = menu.add(new MenuItem("Texture"));
366		- textureItem.addActionListener(this);
	699	+// textureItem = menu.add(new MenuItem("Texture"));
	700	+// textureItem.addActionListener(this);
367	701	billboardItem = menu.add(new MenuItem("Billboard"));
368	702	billboardItem.addActionListener(this);
369	703	csgItem = menu.add(new MenuItem("CSG"));
370	704	csgItem.addActionListener(this);
371		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	705	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
372	706	shadowXItem.addActionListener(this);
373		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	707	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
374	708	shadowYItem.addActionListener(this);
375		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	709	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
376	710	shadowZItem.addActionListener(this);
	711	+ attributeItem = menu.add(new MenuItem("Attribute"));
	712	+ attributeItem.addActionListener(this);
	713	+
377	714	if (Globals.ADVANCED)
378	715	{
379	716	menu.add("-");
380	717	linkerItem = menu.add(new MenuItem("Linker"));
381	718	linkerItem.addActionListener(this);
382		- attributeItem = menu.add(new MenuItem("Attribute"));
383		- attributeItem.addActionListener(this);
384	719	templateItem = menu.add(new MenuItem("Template"));
385	720	templateItem.addActionListener(this);
386	721	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -409,7 +744,7 @@
409	744	genNormalsMESHItem.addActionListener(this);
410	745	if (Globals.ADVANCED)
411	746	{
412		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	747	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
413	748	genNormalsMINEItem.addActionListener(this);
414	749	}
415	750	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -469,6 +804,14 @@
469	804	markleavesItem.addActionListener(this);
470	805	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
471	806	unmarkleavesItem.addActionListener(this);
	807	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	808	+ rewindleavesItem.addActionListener(this);
	809	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	810	+ unrewindleavesItem.addActionListener(this);
	811	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	812	+ randomleavesItem.addActionListener(this);
	813	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	814	+ unrandomleavesItem.addActionListener(this);
472	815	menu.add("-");
473	816	flipVItem = menu.add(new MenuItem("Flip V"));
474	817	flipVItem.addActionListener(this);
..	..	@@ -494,10 +837,15 @@
494	837	attachBumpItem.addActionListener(this);
495	838	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
496	839	pigmentBumpItem.addActionListener(this);
	840	+ //embedTexturesItem
497	841	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
498	842	detachPigmentItem.addActionListener(this);
499	843	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
500	844	detachBumpItem.addActionListener(this);
	845	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	846	+ embedTexturesItem.addActionListener(this);
	847	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	848	+ deEmbedTexturesItem.addActionListener(this);
501	849	menu.add("-");
502	850	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
503	851	sortbysizeItem.addActionListener(this);
..	..	@@ -524,8 +872,21 @@
524	872	buildToolsMenu(menu);
525	873	}
526	874
	875	+
527	876	void SetupUI2(ObjEditor oe)
528	877	{
	878	+ // June 2019
	879	+ if (oe == null)
	880	+ {
	881	+ //super.SetupUI2(this);
	882	+ //return;
	883	+ }
	884	+
	885	+ if (copy != group)
	886	+ {
	887	+ //super.SetupUI2(this);
	888	+ }
	889	+
529	890	//new Exception().printStackTrace();
530	891
531	892	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -554,27 +915,83 @@
554	915	oe.radioPanel.add(dummyButton);
555	916	oe.buttonGroup.add(dummyButton);
556	917	*/
	918	+ cGridBag copyOptionsPanel = new cGridBag();
	919	+
	920	+ copyOptionsPanel.preferredHeight = 2;
	921	+
557	922	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
558	923
559		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	924	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	925	+ //minButton.setToolTipText("Minimize window");
	926	+ //minButton.addActionListener(this);
	927	+
	928	+ if (Globals.ADVANCED)
	929	+ {
	930	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	931	+ maxButton.setToolTipText("Maximize window");
	932	+ maxButton.addActionListener(this);
	933	+ }
	934	+
	935	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	936	+ fullButton.setToolTipText("Full-screen window");
	937	+ fullButton.addActionListener(this);
	938	+
	939	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	940	+ screenfitButton.setToolTipText("Screen fit");
	941	+ screenfitButton.addActionListener(this);
	942	+
	943	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	944	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	945	+ restoreCameraButton.addActionListener(this);
	946	+
	947	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	948	+ saveVersionButton.setToolTipText("Duplicate current version");
	949	+ saveVersionButton.addActionListener(this);
	950	+
	951	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	952	+ deleteVersionButton.setToolTipText("Delete current version");
	953	+ deleteVersionButton.addActionListener(this);
	954	+
	955	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	956	+ previousVersionButton.setToolTipText("Previous version");
	957	+ previousVersionButton.addActionListener(this);
	958	+ previousVersionButton.setEnabled(false);
	959	+
	960	+ cGridBag updown = new cGridBag().setVertical(true);
	961	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	962	+ restoreButton.setToolTipText("Undo (restore current version)");
	963	+ restoreButton.addActionListener(this);
	964	+ //restoreButton.setEnabled(false);
	965	+
	966	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	967	+ replaceButton.setToolTipText("Save (replace current version)");
	968	+ replaceButton.addActionListener(this);
	969	+ //replaceButton.setEnabled(false);
	970	+
	971	+ copyOptionsPanel.add(updown);
	972	+
	973	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	974	+ nextVersionButton.setToolTipText("Next version");
	975	+ nextVersionButton.addActionListener(this);
	976	+ nextVersionButton.setEnabled(false);
	977	+
	978	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
560	979	liveCB.setToolTipText("Enable animation");
561	980	liveCB.addItemListener(this);
562	981
563		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	982	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
564	983	oneStepButton.setToolTipText("Animate one step forward");
565	984	oneStepButton.addActionListener(this);
566	985
567		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	986	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
568	987	fastCB.setToolTipText("Fast mode");
569	988	fastCB.addItemListener(this);
570	989
571		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
572		- trackCB.setToolTipText("Enable tracking");
573		- trackCB.addItemListener(this);
574		-
575		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
576		- screenfitButton.setToolTipText("Screen fit");
577		- screenfitButton.addActionListener(this);
	990	+ //oe.toolboxPanel.Return();
	991	+
	992	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	993	+// trackCB.setToolTipText("Enable tracking");
	994	+// trackCB.addItemListener(this);
578	995
579	996	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
580	997	// screenfitpointButton.addActionListener(this);
..	..	@@ -584,67 +1001,156 @@
584	1001	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
585	1002	snapobjectButton.addActionListener(this);
586	1003	snapobjectButton.setToolTipText("Snap Object");
	1004	+
	1005	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1006	+ fourButton.addActionListener(this);
	1007	+ fourButton.setToolTipText("Show control panel only");
587	1008	}
588	1009
589		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
590		- flashSelectionButton.setToolTipText("Show selection");
591		- flashSelectionButton.addActionListener(this);
	1010	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
592	1011
593		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
594		-
595		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
596		- twoButton.setToolTipText("Show center view only");
	1012	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1013	+ twoButton.setToolTipText("Show 3D view only");
597	1014	twoButton.addActionListener(this);
598		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
599		- fourButton.addActionListener(this);
600		- fourButton.setToolTipText("Show left panel only");
601		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
602		- sixButton.setToolTipText("2-column layout left");
603		- sixButton.addActionListener(this);
604		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
605		- threeButton.setToolTipText("2-column layout right");
	1015	+ this.fullscreenLayout = twoButton;
	1016	+
	1017	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1018	+ threeButton.setToolTipText("Show controls and 3D view");
606	1019	threeButton.addActionListener(this);
607		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
608		- sevenButton.setToolTipText("3-column layout");
609		- sevenButton.addActionListener(this);
	1020	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1021	+ sixButton.setToolTipText("Show 3D view and controls");
	1022	+ sixButton.addActionListener(this);
	1023	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1024	+// sevenButton.setToolTipText("3-column layout");
	1025	+// sevenButton.addActionListener(this);
610	1026	//
611	1027
612		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
613		- rootButton.setToolTipText("Edit selection in new tab");
	1028	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1029	+ rootButton.setToolTipText("Open selection in new tab");
614	1030	rootButton.addActionListener(this);
615	1031
616		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1032	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
617	1033	closeButton.setToolTipText("Close tab");
618	1034	closeButton.addActionListener(this);
619	1035	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
620	1036	//clearButton.addActionListener(this);
621		-
622		- cGridBag commandsPanel = new cGridBag();
	1037	+
	1038	+ cGridBag row1 = new cGridBag();
623	1039
624		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
625		- editButton.setToolTipText("Edit selection");
	1040	+ // INSERT
	1041	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1042	+ gridButton.setToolTipText("Create grid");
	1043	+ gridButton.addActionListener(this);
	1044	+
	1045	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1046	+ boxButton.setToolTipText("Create box");
	1047	+ boxButton.addActionListener(this);
	1048	+
	1049	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1050	+ sphereButton.setToolTipText("Create sphere");
	1051	+ sphereButton.addActionListener(this);
	1052	+
	1053	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1054	+ coneButton.setToolTipText("Create cone");
	1055	+ coneButton.addActionListener(this);
	1056	+
	1057	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1058	+ torusButton.setToolTipText("Create torus");
	1059	+ torusButton.addActionListener(this);
	1060	+
	1061	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1062	+ superButton.setToolTipText("Create superellipsoid");
	1063	+ superButton.addActionListener(this);
	1064	+
	1065	+ if (Globals.ADVANCED)
	1066	+ {
	1067	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1068	+ kleinButton.setToolTipText("Create Klein bottle");
	1069	+ kleinButton.addActionListener(this);
	1070	+ }
	1071	+
	1072	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1073	+ particlesButton.setToolTipText("Create particle system");
	1074	+ particlesButton.addActionListener(this);
	1075	+
	1076	+ oe.toolboxPanel.add(row1);
	1077	+
	1078	+ cGridBag row2 = new cGridBag();
	1079	+
	1080	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1081	+ groupButton.setToolTipText("Create group");
	1082	+ groupButton.addActionListener(this);
	1083	+
	1084	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1085	+ compositeButton.setToolTipText("Create composite");
	1086	+ compositeButton.addActionListener(this);
	1087	+
	1088	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1089	+ switchButton.setToolTipText("Create item switcher");
	1090	+ switchButton.addActionListener(this);
	1091	+
	1092	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1093	+ loopButton.setToolTipText("Create loop");
	1094	+ loopButton.addActionListener(this);
	1095	+
	1096	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1097	+ textureButton.setToolTipText("Create texture");
	1098	+ textureButton.addActionListener(this);
	1099	+
	1100	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1101	+ overlayButton.setToolTipText("Create overlay");
	1102	+ overlayButton.addActionListener(this);
	1103	+
	1104	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1105	+ lightButton.setToolTipText("Create light");
	1106	+ lightButton.addActionListener(this);
	1107	+
	1108	+ oe.toolboxPanel.add(row2);
	1109	+
	1110	+ // ENVYMAPS
	1111	+ cGridBag skyboxpane = new cGridBag();
	1112	+ skyboxpane.preferredHeight = 100;
	1113	+
	1114	+ oe.toolboxPanel.add(skyboxpane);
	1115	+
	1116	+ JTabbedPane skyboxpanel = new JTabbedPane();
	1117	+ skyboxpane.add(skyboxpanel);
	1118	+
	1119	+ AddSkyboxTab0(skyboxpanel);
	1120	+ AddSkyboxTab1(skyboxpanel);
	1121	+ AddSkyboxTab2(skyboxpanel);
	1122	+ AddSkyboxTab3(skyboxpanel);
	1123	+
	1124	+ // EDIT panel
	1125	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1126	+ editButton.setToolTipText("Pin selection controls");
626	1127	editButton.addActionListener(this);
627	1128
628		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
629		- uneditButton.setToolTipText("Unedit selection");
	1129	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1130	+ uneditButton.setToolTipText("Unpin and remove selection controls");
630	1131	uneditButton.addActionListener(this);
631	1132
632		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
633		- allParamsButton.setToolTipText("Edit all params");
	1133	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1134	+ allParamsButton.setToolTipText("Show all controle");
634	1135	allParamsButton.addActionListener(this);
635	1136
636		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1137	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
637	1138	clearPanelButton.setToolTipText("Clear edit panel");
638	1139	clearPanelButton.addActionListener(this);
639	1140
640		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1141	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
641	1142	unselectButton.setToolTipText("Unselect");
642	1143	unselectButton.addActionListener(this);
643	1144
644		- commandsPanel.preferredHeight = 1;
	1145	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1146	+ flashSelectionButton.setToolTipText("Highlight selection");
	1147	+ flashSelectionButton.addActionListener(this);
645	1148
646		- oe.treePanel.add(commandsPanel);
647		- oe.treePanel.Return();
	1149	+ editCommandsPanel.preferredHeight = 1;
	1150	+
	1151	+ SetPinStates(false);
	1152	+// oe.treePanel.add(commandsPanel);
	1153	+// oe.treePanel.Return();
648	1154
649	1155	// oe.aConstraints.gridx += 1;
650	1156	// oe.aConstraints.weighty = 0;
..	..	@@ -661,32 +1167,20 @@
661	1167
662	1168	JScrollPane jSP;
663	1169	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
664		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1170	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
665	1171	ResetModel();
666	1172
667	1173	oe.treePanel.add(jSPPanel);
668	1174	oe.treePanel.Return();
669	1175
670		- cGridBag copyOptionsPanel = new cGridBag();
671		-
672		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
673		- colorCB.setToolTipText("Copy color when dropped");
674		- colorCB.addItemListener(this);
675		-
676		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
677		- materialCB.setToolTipText("Copy material when dropped");
678		- materialCB.addItemListener(this);
679		-
680		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
681		- textureCB.setToolTipText("Copy texture when dropped");
682		- textureCB.addItemListener(this);
683		-
684		- copyOptionsPanel.preferredHeight = 1;
685	1176	oe.treePanel.add(copyOptionsPanel);
686	1177	oe.treePanel.Return();
	1178	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1179	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1180	+ sliderPane.preferredHeight = 1;
687	1181
688		-// mainPanel.setDividerLocation(0.5); //1.0);
689		-// mainPanel.setResizeWeight(0.5);
	1182	+// mainPanel.setDividerLocation(0.1); //1.0);
	1183	+ mainPanel.setResizeWeight(0.4);
690	1184
691	1185	//jList.addListSelectionListener(this);
692	1186	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -694,7 +1188,7 @@
694	1188	//jTree.setEditable(true);
695	1189	oe.jTree.setDragEnabled(true);
696	1190	//jTree.setPreferredSize(new Dimension(10,10));
697		- jSP.setPreferredSize(new Dimension(100,200));
	1191	+ //jSP.setPreferredSize(new Dimension(100,200));
698	1192
699	1193	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
700	1194
..	..	@@ -706,29 +1200,49 @@
706	1200	dgr.addDragGestureListener(this);
707	1201	}catch(Exception e) {}
708	1202	*/
709		- radio.layout = sevenButton;
	1203	+ radio.layout = threeButton; // sixButton;
710	1204	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
711	1205	}
712	1206
713	1207	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
714	1208	{
	1209	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1210	+ colorCB.setToolTipText("Copy color when dropped");
	1211	+ colorCB.addItemListener(this);
	1212	+
	1213	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1214	+ materialCB.setToolTipText("Copy material when dropped");
	1215	+ materialCB.addItemListener(this);
	1216	+
	1217	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1218	+ textureCB.setToolTipText("Copy texture when dropped");
	1219	+ textureCB.addItemListener(this);
	1220	+
	1221	+ panel.Return();
	1222	+
715	1223	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
716	1224	boxCB.setToolTipText("Display bounding boxes");
717	1225	boxCB.addItemListener(this);
718	1226
719	1227	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
720		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1228	+ zoomBoxCB.setToolTipText("Display only for wheel");
721	1229	zoomBoxCB.addItemListener(this);
722	1230
723	1231	if (true) // Globals.ADVANCED)
724	1232	{
725		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
726		- supportCB.setToolTipText("Enable rigging");
727		- supportCB.addItemListener(this);
	1233	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1234	+// supportCB.setToolTipText("Enable rigging");
	1235	+// supportCB.addItemListener(this);
	1236	+
	1237	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1238	+ freezeCB.setToolTipText("Fast moving camera");
	1239	+ freezeCB.addItemListener(this);
728	1240
729	1241	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
730	1242	// localCB.addItemListener(this);
731	1243
	1244	+ panel.Return();
	1245	+
732	1246	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
733	1247	crowdCB.setToolTipText("Used for crowds");
734	1248	crowdCB.addItemListener(this);
..	..	@@ -737,14 +1251,19 @@
737	1251	smoothCB.setToolTipText("Snapping delay");
738	1252	smoothCB.addItemListener(this);
739	1253
740		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
741		- slowCB.setToolTipText("Smooth interpolation");
742		- slowCB.addItemListener(this);
	1254	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1255	+// slowCB.setToolTipText("Smooth interpolation");
	1256	+// slowCB.addItemListener(this);
	1257	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1258	+ minshaderCB.setToolTipText("Minimal fast shader");
	1259	+ minshaderCB.addItemListener(this);
743	1260
744	1261	// constraints.gridy += 1;
745	1262	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
746	1263	// speakerMocapCB.addItemListener(this);
747	1264
	1265	+ panel.Return();
	1266	+
748	1267	if (false)
749	1268	{
750	1269	// handled in scripts
..	..	@@ -759,34 +1278,74 @@
759	1278	//constraints.gridy += 1;
760	1279	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
761	1280	smoothfocusCB.addItemListener(this);
	1281	+ panel.Return();
762	1282	}
763	1283
764	1284	//constraints.gridx += 1;
765	1285	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
766	1286	// debugCB.addItemListener(this);
767	1287
	1288	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1289	+ trackCB.setToolTipText("Enable tracking target");
	1290	+ trackCB.addItemListener(this);
	1291	+
768	1292	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1293	+ oeilCB.setToolTipText("Move camera when tracking");
769	1294	oeilCB.addItemListener(this);
770	1295
	1296	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1297	+ shadowCB.setToolTipText("When live compute shadows");
	1298	+ shadowCB.addItemListener(this);
	1299	+
	1300	+ panel.Return();
	1301	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1302	+ toggleTextureCB.setToolTipText("Load textures");
	1303	+ toggleTextureCB.addItemListener(this);
	1304	+
	1305	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1306	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1307	+ toggleSwitchCB.addItemListener(this);
	1308	+
	1309	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1310	+ autokeepCB.setToolTipText("On structure change");
	1311	+ autokeepCB.addItemListener(this);
	1312	+
	1313	+ panel.Return();
	1314	+ if (Globals.ADVANCED)
	1315	+ {
771	1316	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
772	1317	lookAtCB.setToolTipText("Look-at target");
773	1318	lookAtCB.addItemListener(this);
	1319	+ }
774	1320
775	1321	}
776	1322
777	1323	cGridBag fill = new cGridBag();
778		-
779	1324	fill.preferredHeight = 200;
	1325	+ cGridBag fill2 = new cGridBag();
	1326	+ fill2.preferredHeight = 200;
	1327	+ cGridBag fill3 = new cGridBag();
	1328	+ fill3.preferredHeight = 200;
780	1329
781	1330	panel.add(fill);
	1331	+ panel.add(fill2);
	1332	+ panel.add(fill3);
782	1333
783	1334	}
784	1335
785	1336	void EditObject(Object3D obj)
786	1337	{
787	1338	cRadio radioButton = new cRadio(obj.name);
	1339	+
	1340	+ // June 2019. Patch to avoid bug with transparency.
	1341	+ radioButton.hadMaterial = obj.material != null;
	1342	+ if (!radioButton.hadMaterial)
	1343	+ {
	1344	+ obj.material = new cMaterial();
	1345	+ }
	1346	+
788	1347	radioButton.SetObject(obj);
789		- radioButton.layout = sevenButton;
	1348	+ radioButton.layout = threeButton; // sixButton;
790	1349	radioButton.SetCamera(cameraView.renderCamera, false);
791	1350	radioButton.addActionListener(this);
792	1351	radioPanel.add(radioButton);
..	..	@@ -796,6 +1355,8 @@
796	1355
797	1356	void SetupViews(ObjEditor oe)
798	1357	{
	1358	+ theFrame = this;
	1359	+
799	1360	oe.SetupViews();
800	1361
801	1362	System.out.println("SetupViews");
..	..	@@ -804,23 +1365,30 @@
804	1365	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
805	1366	}
806	1367
807		- JCheckBox liveCB;
808		- JCheckBox supportCB;
809		- JCheckBox localCB;
810		- JCheckBox crowdCB;
811		- JCheckBox smoothCB;
812		- JCheckBox fastCB;
813		- JCheckBox slowCB;
814		- JCheckBox boxCB;
815		- JCheckBox zoomBoxCB;
816		- JCheckBox trackCB;
817		- JCheckBox smoothfocusCB;
	1368	+ cToggleButton liveCB;
	1369	+ cCheckBox supportCB;
	1370	+ cCheckBox localCB;
	1371	+ cCheckBox crowdCB;
	1372	+ cCheckBox smoothCB;
	1373	+ cCheckBox minshaderCB;
	1374	+
	1375	+ cToggleButton fastCB;
	1376	+ cCheckBox slowCB;
	1377	+ cCheckBox boxCB;
	1378	+ cCheckBox zoomBoxCB;
	1379	+ cCheckBox freezeCB;
	1380	+ //cToggleButton trackCB;
	1381	+ cCheckBox trackCB;
	1382	+ cCheckBox smoothfocusCB;
818	1383	// JCheckBox speakerMocapCB;
819		- JCheckBox speakerCameraCB;
820		- JCheckBox speakerFocusCB;
821		- JCheckBox debugCB;
822		- JCheckBox oeilCB;
823		- JCheckBox lookAtCB;
	1384	+ cCheckBox speakerCameraCB;
	1385	+ cCheckBox speakerFocusCB;
	1386	+ cCheckBox debugCB;
	1387	+
	1388	+ cCheckBox oeilCB;
	1389	+ cCheckBox shadowCB;
	1390	+ cCheckBox autokeepCB;
	1391	+ cCheckBox lookAtCB;
824	1392
825	1393	// static int COLOR = 1;
826	1394	// static int MATERIAL = 2;
..	..	@@ -828,9 +1396,9 @@
828	1396
829	1397	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
830	1398
831		- JCheckBox colorCB;
832		- JCheckBox materialCB;
833		- JCheckBox textureCB;
	1399	+ cCheckBox colorCB;
	1400	+ cCheckBox materialCB;
	1401	+ cCheckBox textureCB;
834	1402
835	1403	public void itemStateChanged(ItemEvent e)
836	1404	{
..	..	@@ -858,6 +1426,7 @@
858	1426	} else if(e.getSource() == liveCB)
859	1427	{
860	1428	cameraView.ToggleLive();
	1429	+ refreshContents(false);
861	1430	}
862	1431	else if(e.getSource() == supportCB)
863	1432	{
..	..	@@ -873,6 +1442,12 @@
873	1442	{
874	1443	cameraView.ToggleInertia();
875	1444	cameraView.repaint();
	1445	+ }
	1446	+ else if(e.getSource() == minshaderCB)
	1447	+ {
	1448	+ Globals.MINSHADER ^= true;
	1449	+ cameraView.programInitialized = false;
	1450	+ cameraView.repaint();
876	1451	}
877	1452	else if(e.getSource() == localCB)
878	1453	{
..	..	@@ -922,6 +1497,18 @@
922	1497	{
923	1498	cameraView.ToggleOeil();
924	1499	}
	1500	+ else if(e.getSource() == shadowCB)
	1501	+ {
	1502	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1503	+ }
	1504	+ else if(e.getSource() == freezeCB)
	1505	+ {
	1506	+ Globals.FREEZEONMOVE ^= true;
	1507	+ }
	1508	+ else if(e.getSource() == autokeepCB)
	1509	+ {
	1510	+ Globals.REPLACEONMAKE ^= true;
	1511	+ }
925	1512	else if(e.getSource() == lookAtCB)
926	1513	{
927	1514	cameraView.ToggleLookAt();
..	..	@@ -938,7 +1525,8 @@
938	1525
939	1526	/**/
940	1527	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
941		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1528	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1529	+ TreePath path = objEditor.jTree.getSelectionPath();
942	1530	if ((path == null) \|\| (path.getPathCount() <= 1)) {
943	1531	// We can't move the root node or an empty selection
944	1532	return;
..	..	@@ -1001,8 +1589,6 @@
1001	1589	}
1002	1590	}
1003	1591
1004		- String string = (String) object;
1005		-
1006	1592	System.out.println("Transfer = " + object + "; drop : " + target);
1007	1593	// if( object instanceof java.io.File[])
1008	1594	// {
..	..	@@ -1010,6 +1596,8 @@
1010	1596	// objEditor.DropFile((java.io.File[]) object, true);
1011	1597	// return;
1012	1598	// }
	1599	+
	1600	+ String string = object.toString();
1013	1601
1014	1602	// File path for Mac and Windows
1015	1603	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1055,23 +1643,33 @@
1055	1643
1056	1644	assert target == objEditor.jTree;
1057	1645	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1646	+ Object3D destinationLeaf;
1058	1647	try {
1059		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1648	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1060	1649	} catch (Exception e) {
1061	1650	System.out.println("destinationPath : " + destinationPath);
1062	1651	return;
1063	1652	}
1064	1653
1065		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1654	+ for (int i=group.selection.size(); --i>=0;)
1066	1655	{
	1656	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1657	+
	1658	+ // Cannot move into itself
	1659	+ if (child == destinationLeaf)
	1660	+ return;
	1661	+ }
	1662	+
	1663	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1664	+// {
1067	1665	loadClipboard(true);
1068	1666	objEditor.jTree.setSelectionPath(destinationPath);
1069	1667	pasteInto(false, false);
1070		- } else {
1071		- loadClipboard(false);
1072		- objEditor.jTree.setSelectionPath(destinationPath);
1073		- pasteInto(false, false); // true); // ???
1074		- }
	1668	+// } else {
	1669	+// loadClipboard(false);
	1670	+// objEditor.jTree.setSelectionPath(destinationPath);
	1671	+// pasteInto(false, false); // true); // ???
	1672	+// }
1075	1673	}
1076	1674	public void dropActionChanged(DropTargetDragEvent dtde)
1077	1675	// Called if the user has modified the current drop gesture
..	..	@@ -1176,22 +1774,30 @@
1176	1774	{
1177	1775	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1178	1776	//heightFieldItem.addActionListener(this);
1179		- gridItem = menu.add(new MenuItem("Grid"));
1180		- gridItem.addActionListener(this);
1181		- rectoidItem = menu.add(new MenuItem("Box"));
1182		- rectoidItem.addActionListener(this);
1183		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1184		- ellipsoidItem.addActionListener(this);
1185		- coneItem = menu.add(new MenuItem("Cone"));
1186		- coneItem.addActionListener(this);
1187		- torusItem = menu.add(new MenuItem("Torus"));
1188		- torusItem.addActionListener(this);
1189		- superItem = menu.add(new MenuItem("Superellipsoid"));
1190		- superItem.addActionListener(this);
	1777	+// gridItem = menu.add(new MenuItem("Grid"));
	1778	+// gridItem.addActionListener(this);
	1779	+// rectoidItem = menu.add(new MenuItem("Box"));
	1780	+// rectoidItem.addActionListener(this);
	1781	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1782	+// ellipsoidItem.addActionListener(this);
	1783	+// coneItem = menu.add(new MenuItem("Cone"));
	1784	+// coneItem.addActionListener(this);
	1785	+// torusItem = menu.add(new MenuItem("Torus"));
	1786	+// torusItem.addActionListener(this);
	1787	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1788	+// superItem.addActionListener(this);
	1789	+
	1790	+ cameraItem = menu.add(new MenuItem("Camera"));
	1791	+ cameraItem.addActionListener(this);
	1792	+
	1793	+ if (!Globals.ADVANCED)
	1794	+ {
1191	1795	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1192	1796	kleinItem.addActionListener(this);
1193		- particleItem = menu.add(new MenuItem("Particle system"));
1194		- particleItem.addActionListener(this);
	1797	+ }
	1798	+
	1799	+// particleItem = menu.add(new MenuItem("Particle system"));
	1800	+// particleItem.addActionListener(this);
1195	1801	if (Globals.ADVANCED)
1196	1802	{
1197	1803	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1217,15 +1823,15 @@
1217	1823	}
1218	1824	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1219	1825	bezierItem.addActionListener(this);
1220		- overlayItem = menu.add(new MenuItem("Overlay"));
1221		- overlayItem.addActionListener(this);
1222		- lightItem = menu.add(new MenuItem("Light"));
1223		- lightItem.addActionListener(this);
	1826	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1827	+// overlayItem.addActionListener(this);
	1828	+// lightItem = menu.add(new MenuItem("Light"));
	1829	+// lightItem.addActionListener(this);
1224	1830	menu.add("-");
1225	1831	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1226	1832	//superLoopItem.addActionListener(this);
1227		- loopItem = menu.add(new MenuItem("Loop"));
1228		- loopItem.addActionListener(this);
	1833	+// loopItem = menu.add(new MenuItem("Loop"));
	1834	+// loopItem.addActionListener(this);
1229	1835	doubleItem = menu.add(new MenuItem("Fork"));
1230	1836	doubleItem.addActionListener(this);
1231	1837	if (Globals.ADVANCED)
..	..	@@ -1241,6 +1847,9 @@
1241	1847	animationItem.addItemListener(this);
1242	1848	animationItem.setState(Globals.ANIMATION);
1243	1849
	1850	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1851	+ archiveItem.addActionListener(this);
	1852	+
1244	1853	menu.add("-");
1245	1854	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1246	1855	parseverticesItem.addActionListener(this);
..	..	@@ -1253,6 +1862,8 @@
1253	1862	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1254	1863	reduce34MorphItem.addActionListener(this);
1255	1864	menu.add("-");
	1865	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1866	+ memoryItem.addActionListener(this);
1256	1867	menu.add(computeAOItem = new MenuItem("Compute AO"));
1257	1868	computeAOItem.addActionListener(this);
1258	1869
..	..	@@ -1261,11 +1872,9 @@
1261	1872	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1262	1873	mirrorItem.addActionListener(this);
1263	1874	menu.add("-");
1264		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1265		- memoryItem.addActionListener(this);
1266	1875	menu.add(analyzeItem = new MenuItem("Analyze"));
1267	1876	analyzeItem.addActionListener(this);
1268		- menu.add(dumpItem = new MenuItem("Dump"));
	1877	+ menu.add(dumpItem = new MenuItem("Print"));
1269	1878	dumpItem.addActionListener(this);
1270	1879	// menu.add(pathItem = new MenuItem("From-to path"));
1271	1880	// pathItem.addActionListener(this);
..	..	@@ -1406,9 +2015,34 @@
1406	2015	shadow.material = new cMaterial(obj.material);
1407	2016	shadow.material.diffuse = 0.0001f;
1408	2017	shadow.material.specular = 0.0001f;
	2018	+ //shadow.projectedVertices[1].x = 300;
1409	2019
1410	2020	makeSomething(shadow);
1411	2021	}
	2022	+
	2023	+ private void ClearUnpinned()
	2024	+ {
	2025	+ //for (Object3D obj : listUI)
	2026	+ for (int i=listUI.size(); --i>=0;)
	2027	+ {
	2028	+ Object3D obj = listUI.elementAt(i);
	2029	+ if (!obj.pinned)
	2030	+ {
	2031	+ obj.CloseUI();
	2032	+ listUI.remove(i);
	2033	+ }
	2034	+ }
	2035	+ }
	2036	+
	2037	+ private void EditElement(Object3D elem, boolean newWindow)
	2038	+ {
	2039	+ // if (!(elem instanceof Composite))
	2040	+ // newWindow = false;
	2041	+ listUI.add(elem);
	2042	+ elem.openEditWindow(this, newWindow); //, false);
	2043	+ System.out.println("edit : " + elem);
	2044	+ elem.editWindow.refreshContents(true); // ? new
	2045	+ }
1412	2046
1413	2047	/**
1414	2048	* applyExample
..	..	@@ -1653,7 +2287,7 @@
1653	2287	{
1654	2288	ScreenFit();
1655	2289	} else
1656		- if (source == switchItem)
	2290	+ if (source == switchViewItem)
1657	2291	{
1658	2292	cVector v1 = new cVector();
1659	2293	cVector v2 = new cVector();
..	..	@@ -1662,11 +2296,11 @@
1662	2296	objEditor.cameraView.renderCamera.setAim(v2, v1);
1663	2297	objEditor.cameraView.repaint();
1664	2298	} else
1665		- if (source == rectoidItem)
	2299	+ if (source == rectoidItem \|\| source == boxButton)
1666	2300	{
1667	2301	makeSomething(new Box());
1668	2302	} else
1669		- if (source == particleItem)
	2303	+ if (source == particleItem \|\| source == particlesButton)
1670	2304	{
1671	2305	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1672	2306	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1745,27 +2379,27 @@
1745	2379
1746	2380	makeSomething(obj);
1747	2381	} else
1748		- if (source == gridItem)
	2382	+ if (source == gridItem \|\| source == gridButton)
1749	2383	{
1750	2384	makeSomething(new Grid());
1751	2385	} else
1752		- if (source == ellipsoidItem)
	2386	+ if (source == ellipsoidItem \|\| source == sphereButton)
1753	2387	{
1754	2388	makeSomething(new Sphere());
1755	2389	} else
1756		- if (source == coneItem)
	2390	+ if (source == coneItem \|\| source == coneButton)
1757	2391	{
1758	2392	makeSomething(new Cone());
1759	2393	} else
1760		- if (source == torusItem)
	2394	+ if (source == torusItem \|\| source == torusButton)
1761	2395	{
1762	2396	makeSomething(new Torus());
1763	2397	} else
1764		- if (source == superItem)
	2398	+ if (source == superItem \|\| source == superButton)
1765	2399	{
1766	2400	makeSomething(new Superellipsoid());
1767	2401	} else
1768		- if (source == kleinItem)
	2402	+ if (source == kleinItem \|\| source == kleinButton)
1769	2403	{
1770	2404	makeSomething(new Klein());
1771	2405	} else
..	..	@@ -1785,7 +2419,7 @@
1785	2419	{
1786	2420	makeSomething(new BezierSurface());
1787	2421	} else
1788		- if (source == overlayItem)
	2422	+ if (source == overlayItem \|\| source == overlayButton)
1789	2423	{
1790	2424	/*
1791	2425	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1833,10 +2467,27 @@
1833	2467	s.setup();
1834	2468	makeSomething(s);
1835	2469	} else
1836		- if (source == lightItem)
	2470	+ if (source == lightItem \|\| source == lightButton)
1837	2471	{
1838	2472	makeSomething(new Light());
1839	2473	} else
	2474	+// if (source == skybox1Button \|\|
	2475	+// source == skybox2Button \|\|
	2476	+// source == skybox3Button \|\|
	2477	+// source == skybox4Button \|\|
	2478	+// source == skybox5Button \|\|
	2479	+// source == skybox6Button \|\|
	2480	+// source == skybox7Button \|\|
	2481	+// source == skybox11Button \|\|
	2482	+// source == skybox12Button \|\|
	2483	+// source == skybox13Button \|\|
	2484	+// source == skybox14Button \|\|
	2485	+// source == skybox15Button \|\|
	2486	+// source == skybox16Button \|\|
	2487	+// source == skybox17Button)
	2488	+// {
	2489	+// ChangeSkybox(source);
	2490	+// } else
1840	2491	if (source == csgItem)
1841	2492	{
1842	2493	group(new CSG());
..	..	@@ -1883,30 +2534,30 @@
1883	2534
1884	2535	group(g);
1885	2536	} else
1886		- if (source == loopItem)
	2537	+ if (source == loopItem \|\| source == loopButton)
1887	2538	{
1888	2539	Composite csg = new GroupLeaf();
1889	2540	csg.count = 5;
1890	2541	group(csg);
1891		- Composite child = new cGroup();
	2542	+ Composite child = new cGroup("Branch");
1892	2543	csg.addChild(child);
1893	2544	child.addChild(csg);
1894	2545	} else
1895	2546	if (source == doubleItem)
1896	2547	{
1897		- Composite csg = new GroupLeaf();
	2548	+ Composite csg = new GroupLeaf("Fork");
1898	2549	csg.count = 5;
1899	2550	group(csg);
1900		- Composite child = new cGroup();
	2551	+ Composite child = new cGroup("Branch A");
1901	2552	csg.addChild(child);
1902	2553	child.addChild(csg);
1903		- child = new cGroup();
	2554	+ child = new cGroup("Branch B");
1904	2555	csg.addChild(child);
1905	2556	child.addChild(csg);
1906	2557	} else
1907	2558	if (source == tripleItem)
1908	2559	{
1909		- Composite csg = new GroupLeaf();
	2560	+ Composite csg = new GroupLeaf("Trident");
1910	2561	csg.count = 4;
1911	2562	group(csg);
1912	2563	Composite child = new cGroup();
..	..	@@ -1922,7 +2573,7 @@
1922	2573	if (source == computeAOItem)
1923	2574	{
1924	2575	Globals.drawMode = CameraPane.OCCLUSION;
1925		- Globals.theRenderer.repaint();
	2576	+ cameraView.repaint();
1926	2577	} else
1927	2578	if (source == recompileItem)
1928	2579	{
..	..	@@ -1937,7 +2588,7 @@
1937	2588	if (source == invariantsItem)
1938	2589	{
1939	2590	System.out.println("Invariants:");
1940		- Grafreed.grafreeD.universe.invariants();
	2591	+ Grafreed.grafreed.universe.invariants();
1941	2592	} else
1942	2593	if (source == memoryItem)
1943	2594	{
..	..	@@ -1956,6 +2607,53 @@
1956	2607	{
1957	2608	DumpObject();
1958	2609	} else
	2610	+ if (source == minButton)
	2611	+ {
	2612	+ Minimize();
	2613	+ } else
	2614	+ if (source == maxButton)
	2615	+ {
	2616	+ Maximize();
	2617	+ } else
	2618	+ if (source == fullButton)
	2619	+ {
	2620	+ ToggleFullScreen();
	2621	+ } else
	2622	+ if (source == previousVersionButton)
	2623	+ {
	2624	+ // Go to previous version
	2625	+ //if (!Undo())
	2626	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2627	+ PreviousVersion();
	2628	+ } else
	2629	+ if (source == restoreButton)
	2630	+ {
	2631	+ // Restore current version
	2632	+ Restore();
	2633	+ //restoreButton.setEnabled(false);
	2634	+ } else
	2635	+ if (source == replaceButton)
	2636	+ {
	2637	+ // Overwrite current version
	2638	+ Replace();
	2639	+ //replaceButton.setEnabled(false);
	2640	+ } else
	2641	+ if (source == nextVersionButton)
	2642	+ {
	2643	+ // Go to next version
	2644	+ NextVersion();
	2645	+ } else
	2646	+ if (source == saveVersionButton)
	2647	+ {
	2648	+ // Save a new version
	2649	+ if (!Save(true))
	2650	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2651	+ } else
	2652	+ if (source == deleteVersionButton)
	2653	+ {
	2654	+ // Delete a new version
	2655	+ DeleteVersion();
	2656	+ } else
1959	2657	if (source == oneStepButton)
1960	2658	{
1961	2659	Globals.ONESTEP = true;
..	..	@@ -1963,17 +2661,14 @@
1963	2661	} else
1964	2662	if (source == screenfitButton)
1965	2663	{
1966		- //Reload(lastConverter, lastFilename, true);
1967	2664	ScreenFit();
1968	2665	} else
1969	2666	if (source == screenfitpointButton)
1970	2667	{
1971		- //Reload(lastConverter, lastFilename, true);
1972	2668	ScreenFitPoint();
1973	2669	} else
1974	2670	if (source == snapobjectButton)
1975	2671	{
1976		- //Reload(lastConverter, lastFilename, true);
1977	2672	SnapObject();
1978	2673	} else
1979	2674	// if (event.getSource() == recompileButton)
..	..	@@ -2012,11 +2707,11 @@
2012	2707	} else
2013	2708	if (source == undoItem)
2014	2709	{
2015		- Undo();
	2710	+ PreviousVersion();
2016	2711	} else
2017	2712	if (source == redoItem)
2018	2713	{
2019		- Redo();
	2714	+ NextVersion();
2020	2715	} else
2021	2716	if (source == duplicateItem)
2022	2717	{
..	..	@@ -2337,7 +3032,7 @@
2337	3032	{
2338	3033	StepAll();
2339	3034	} else
2340		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3035	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2341	3036	{
2342	3037	//int indices[] = jList.getSelectedIndices();
2343	3038	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2349,9 +3044,9 @@
2349	3044	{
2350	3045	ClearSelection(true);
2351	3046	} else
2352		- if (source == grabItem)
	3047	+ if (source == grabItem \|\| source == groupButton)
2353	3048	{
2354		- group(new cGroup(), true);
	3049	+ group(new cGroup(), false); // true);
2355	3050	} else
2356	3051	if (source == hideItem)
2357	3052	{
..	..	@@ -2369,11 +3064,11 @@
2369	3064	{
2370	3065	makeSomething(new Camera());
2371	3066	} else
2372		- if (source == compositeItem)
	3067	+ if (source == compositeItem \|\| source == compositeButton)
2373	3068	{
2374	3069	group(new Composite());
2375	3070	} else
2376		- if (source == randomItem)
	3071	+ if (source == switchItem \|\| source == switchButton)
2377	3072	{
2378	3073	RandomNode random = new RandomNode();
2379	3074	group(random);
..	..	@@ -2475,7 +3170,7 @@
2475	3170	{
2476	3171	group(new cLinker());
2477	3172	} else
2478		- if (source == textureItem)
	3173	+ if (source == textureItem \|\| source == textureButton)
2479	3174	{
2480	3175	group(new TextureNode());
2481	3176	} else
..	..	@@ -2495,17 +3190,30 @@
2495	3190	{
2496	3191	CastShadow(2);
2497	3192	} else
2498		- if (source == ungroupItem)
	3193	+ if (source == ungroupItem \|\| source == ungroupButton)
2499	3194	{
2500		- //ungroup();
	3195	+ boolean hasRoot = false;
	3196	+
2501	3197	for (int i=0; i<group.selection.size(); i++)
2502	3198	{
2503		- Ungroup(group.selection.get(i));
	3199	+ if (group.selection.get(i) == group)
	3200	+ {
	3201	+ hasRoot = true;
	3202	+ break;
	3203	+ }
2504	3204	}
2505	3205
2506		- ClearSelection(false);
2507		-
2508		- refreshContents();
	3206	+ if (!hasRoot)
	3207	+ {
	3208	+ for (int i=0; i<group.selection.size(); i++)
	3209	+ {
	3210	+ Ungroup(group.selection.get(i));
	3211	+ }
	3212	+
	3213	+ ClearSelection(false);
	3214	+
	3215	+ refreshContents();
	3216	+ }
2509	3217	} else
2510	3218	if (source == genUVItem)
2511	3219	{
..	..	@@ -2517,7 +3225,7 @@
2517	3225	} else
2518	3226	if (source == genNormalsMESHItem)
2519	3227	{
2520		- GenNormals(true); // TODO
	3228	+ GenNormalsMESH();
2521	3229	} else
2522	3230	if (source == genNormalsORGANItem)
2523	3231	{
..	..	@@ -2582,6 +3290,22 @@
2582	3290	if (source == unmarkleavesItem)
2583	3291	{
2584	3292	MarkLeaves(false);
	3293	+ } else
	3294	+ if (source == rewindleavesItem)
	3295	+ {
	3296	+ RewindLeaves(true);
	3297	+ } else
	3298	+ if (source == unrewindleavesItem)
	3299	+ {
	3300	+ RewindLeaves(false);
	3301	+ } else
	3302	+ if (source == randomleavesItem)
	3303	+ {
	3304	+ RandomLeaves(true);
	3305	+ } else
	3306	+ if (source == unrandomleavesItem)
	3307	+ {
	3308	+ RandomLeaves(false);
2585	3309	} else
2586	3310	if (source == flipVItem)
2587	3311	{
..	..	@@ -2790,7 +3514,7 @@
2790	3514	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2791	3515	{
2792	3516	obj = (Object3D)e.nextElement();
2793		- obj.SetBumpTexture(null);
	3517	+ obj.ResetBumpTexture();
2794	3518	}
2795	3519
2796	3520	refreshContents();
..	..	@@ -2806,6 +3530,31 @@
2806	3530
2807	3531	refreshContents();
2808	3532	} else
	3533	+ if (source == embedTexturesItem)
	3534	+ {
	3535	+ Object3D obj;
	3536	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3537	+ {
	3538	+ obj = (Object3D)e.nextElement();
	3539	+ obj.EmbedTextures(true);
	3540	+ }
	3541	+
	3542	+ refreshContents();
	3543	+ } else
	3544	+ if (source == deEmbedTexturesItem)
	3545	+ {
	3546	+ Object3D obj;
	3547	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3548	+ {
	3549	+ obj = (Object3D)e.nextElement();
	3550	+ obj.EmbedTextures(false);
	3551	+ }
	3552	+
	3553	+ CameraPane.texturepigment.clear();
	3554	+ CameraPane.texturebump.clear();
	3555	+
	3556	+ refreshContents();
	3557	+ } else
2809	3558	if (source == flashSelectionButton)
2810	3559	{
2811	3560	CameraPane.flash = true;
..	..	@@ -2817,6 +3566,10 @@
2817	3566	if (source == twoButton)
2818	3567	{
2819	3568	radio.layout = twoButton;
	3569	+
	3570	+ if (CameraPane.FULLSCREEN)
	3571	+ fullscreenLayout = radio.layout;
	3572	+
2820	3573	// bug
2821	3574	//gridPanel.setDividerLocation(1.0);
2822	3575	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2849,10 +3602,31 @@
2849	3602	bigThree.ClearUI();
2850	3603	bigThree.add(centralPanel);
2851	3604	bigThree.FlushUI();
	3605	+
	3606	+ cameraView.requestFocusInWindow();
	3607	+
	3608	+// refreshContents(true);
	3609	+//
	3610	+// try
	3611	+// {
	3612	+// java.awt.Robot bot = new java.awt.Robot();
	3613	+// int mask = InputEvent.BUTTON1_MASK;
	3614	+// bot.mouseMove(100, 100);
	3615	+// bot.mousePress(mask);
	3616	+// bot.mouseRelease(mask);
	3617	+// }
	3618	+// catch (Exception e)
	3619	+// {
	3620	+//
	3621	+// }
	3622	+
2852	3623	} else
2853	3624	if (source == threeButton)
2854	3625	{
2855	3626	radio.layout = threeButton;
	3627	+
	3628	+ if (CameraPane.FULLSCREEN)
	3629	+ fullscreenLayout = radio.layout;
2856	3630
2857	3631	// bigThree.remove(scenePanel);
2858	3632	// bigThree.remove(centralPanel);
..	..	@@ -2882,13 +3656,18 @@
2882	3656	// centralPanel.setVisible(true);
2883	3657	// XYZPanel.setVisible(true);
2884	3658	bigThree.ClearUI();
	3659	+ bigThree.add(scenePanel);
2885	3660	bigThree.add(centralPanel);
2886		- bigThree.add(XYZPanel);
2887	3661	bigThree.FlushUI();
	3662	+
	3663	+ cameraView.requestFocusInWindow();
2888	3664	} else
2889	3665	if (source == fourButton)
2890	3666	{
2891	3667	radio.layout = fourButton;
	3668	+
	3669	+ if (CameraPane.FULLSCREEN)
	3670	+ fullscreenLayout = radio.layout;
2892	3671
2893	3672	// bigThree.remove(scenePanel);
2894	3673	// bigThree.remove(centralPanel);
..	..	@@ -2920,10 +3699,15 @@
2920	3699	bigThree.ClearUI();
2921	3700	bigThree.add(scenePanel);
2922	3701	bigThree.FlushUI();
	3702	+
	3703	+ cameraView.requestFocusInWindow();
2923	3704	} else
2924	3705	if (source == sixButton)
2925	3706	{
2926	3707	radio.layout = sixButton;
	3708	+
	3709	+ if (CameraPane.FULLSCREEN)
	3710	+ fullscreenLayout = radio.layout;
2927	3711
2928	3712	// bigThree.remove(scenePanel);
2929	3713	// bigThree.remove(centralPanel);
..	..	@@ -2953,13 +3737,18 @@
2953	3737	// centralPanel.setVisible(true);
2954	3738	// XYZPanel.setVisible(false);
2955	3739	bigThree.ClearUI();
2956		- bigThree.add(scenePanel);
2957	3740	bigThree.add(centralPanel);
	3741	+ bigThree.add(scenePanel);
2958	3742	bigThree.FlushUI();
	3743	+
	3744	+ cameraView.requestFocusInWindow();
2959	3745	} else
2960	3746	if (source == sevenButton)
2961	3747	{
2962	3748	radio.layout = sevenButton;
	3749	+
	3750	+ if (CameraPane.FULLSCREEN)
	3751	+ fullscreenLayout = radio.layout;
2963	3752
2964	3753	// bigThree.remove(scenePanel);
2965	3754	// bigThree.remove(centralPanel);
..	..	@@ -2993,6 +3782,8 @@
2993	3782	bigThree.add(centralPanel);
2994	3783	bigThree.add(XYZPanel);
2995	3784	bigThree.FlushUI();
	3785	+
	3786	+ cameraView.requestFocusInWindow();
2996	3787	} else
2997	3788	if (source == rootButton)
2998	3789	{
..	..	@@ -3004,6 +3795,7 @@
3004	3795	EditObject(obj);
3005	3796	}
3006	3797
	3798	+ cameraView.requestFocusInWindow();
3007	3799	refreshContents(true);
3008	3800	} else
3009	3801	if (source == closeButton)
..	..	@@ -3013,22 +3805,37 @@
3013	3805	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3014	3806	{
3015	3807	ab = (cRadio)e.nextElement();
3016		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3808	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3017	3809	{
	3810	+ // Patch to avoid bug with transparency.
	3811	+ if (!ab.hadMaterial)
	3812	+ {
	3813	+ ab.object.material = null;
	3814	+ }
	3815	+
3018	3816	buttonGroup.remove(ab);
3019	3817	radioPanel.remove(ab);
3020	3818
3021		- ab.GetObject().editWindow = null;
	3819	+ //ab.GetObject().editWindow = null;
	3820	+ ab.GetObject().manipWindow = null;
3022	3821	// ab.GetObject().objectUI = null; // ?????????
3023	3822
3024	3823	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
3025	3824	break;
3026	3825	}
3027	3826	}
	3827	+
	3828	+ cameraView.requestFocusInWindow();
3028	3829	refreshContents(true);
3029	3830	} else
3030	3831	if (source == editItem \|\| source == editButton)
3031	3832	{
	3833	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3834	+ {
	3835	+ Object3D child = (Object3D)e.nextElement();
	3836	+ child.pinned = true;
	3837	+ }
	3838	+
3032	3839	EditSelection(false);
3033	3840	} else
3034	3841	if (source == uneditButton)
..	..	@@ -3037,11 +3844,12 @@
3037	3844	{
3038	3845	Object3D child = (Object3D)e.nextElement();
3039	3846	if(child.editWindow != null)
3040		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3847	+ child.pinned = false;
3041	3848	child.CloseUI();
3042	3849	listUI.remove(child);
	3850	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3043	3851
3044		- child.editWindow = null; // ???????????
	3852	+ //child.editWindow = null; // ???????????
3045	3853	}
3046	3854	objEditor.ctrlPanel.FlushUI();
3047	3855	//objEditor.jTree.clearSelection();
..	..	@@ -3054,16 +3862,18 @@
3054	3862	//copy.ClearUI();
3055	3863	for (Object3D obj : listUI)
3056	3864	{
	3865	+ obj.pinned = false;
3057	3866	obj.CloseUI();
3058	3867	}
3059	3868	listUI.clear();
	3869	+ SetPinStates(group.selection.size() > 0);
3060	3870	refreshContents(true);
3061	3871	} else
3062	3872	if (source == allParamsButton)
3063	3873	{
3064	3874	assert(copy == group);
3065	3875
3066		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3876	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3067	3877
3068	3878	for (Object3D obj : listUI)
3069	3879	{
..	..	@@ -3112,6 +3922,9 @@
3112	3922	}
3113	3923
3114	3924	copy = group;
	3925	+
	3926	+ SetUndoStates();
	3927	+
3115	3928	//Globals.theRenderer.object = group;
3116	3929	if(!useclient)
3117	3930	{
..	..	@@ -3128,7 +3941,9 @@
3128	3941	sideView.object = group;
3129	3942	}
3130	3943
3131		-// fix "+" issue group.editWindow = this;
	3944	+// fix "+" issue
	3945	+ //group.editWindow = this;
	3946	+ group.manipWindow = this;
3132	3947
3133	3948	/*
3134	3949	currentLayout = radio.layout;
..	..	@@ -3136,20 +3951,32 @@
3136	3951	currentLayout = sevenButton;
3137	3952	*/
3138	3953	radio.layout.doClick();
	3954	+
	3955	+ ClearUnpinned();
	3956	+
	3957	+ //Grafreed.Assert(group != null);
	3958	+ //Grafreed.Assert(group.selection != null);
	3959	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	3960	+ if (group.selection == null \|\| group.selection.size() == 1)
	3961	+ EditSelection(false);
3139	3962	keepparent = group.parent;
3140	3963	// PARENT = NULL or not???
3141	3964	//group.parent = null; // ROOT
3142	3965	//group.attributes = -1;
3143	3966	ResetModel();
	3967	+
	3968	+ cameraView.requestFocusInWindow();
3144	3969	refreshContents(true);
3145	3970	} else if (event.getSource() == editCameraItem)
3146	3971	{
3147	3972	cameraView.ProtectCamera();
	3973	+ cameraView.requestFocusInWindow();
3148	3974	cameraView.repaint();
3149	3975	return;
3150		- } else if (event.getSource() == revertCameraItem)
	3976	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3151	3977	{
3152	3978	cameraView.RevertCamera();
	3979	+ cameraView.requestFocusInWindow();
3153	3980	cameraView.repaint();
3154	3981	return;
3155	3982	// } else if (event.getSource() == textureButton)
..	..	@@ -3164,7 +3991,6 @@
3164	3991	}
3165	3992
3166	3993	boolean useclient = false;
3167		- cRadio radio;
3168	3994
3169	3995	void ToggleRoot()
3170	3996	{
..	..	@@ -3403,7 +4229,8 @@
3403	4229
3404	4230	int size = obj.MemorySize();
3405	4231
3406		- System.err.println((size/1024) + " KB is the size of " + obj);
	4232	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4233	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3407	4234	}
3408	4235	}
3409	4236	catch (Exception e)
..	..	@@ -3484,6 +4311,13 @@
3484	4311	void GenNormals(boolean crease)
3485	4312	{
3486	4313	group.GenNormalsS(crease);
	4314	+
	4315	+ refreshContents();
	4316	+ }
	4317	+
	4318	+ void GenNormalsMESH()
	4319	+ {
	4320	+ group.GenNormalsMeshS();
3487	4321
3488	4322	refreshContents();
3489	4323	}
..	..	@@ -3719,7 +4553,7 @@
3719	4553
3720	4554	try
3721	4555	{
3722		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4556	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
3723	4557	}
3724	4558	catch (Exception e)
3725	4559	{
..	..	@@ -4111,6 +4945,18 @@
4111	4945	refreshContents();
4112	4946	}
4113	4947
	4948	+ void RewindLeaves(boolean hide)
	4949	+ {
	4950	+ group.selection.RewindLeaves(hide);
	4951	+ refreshContents();
	4952	+ }
	4953	+
	4954	+ void RandomLeaves(boolean hide)
	4955	+ {
	4956	+ group.selection.RandomLeaves(hide);
	4957	+ refreshContents();
	4958	+ }
	4959	+
4114	4960	void SetTexRes(int tr)
4115	4961	{
4116	4962	group.selection.SetTexRes(tr);
..	..	@@ -4182,28 +5028,25 @@
4182	5028	// }
4183	5029	// }
4184	5030
4185		- static boolean allparams = true;
4186		-
4187		- static Vector<Object3D> listUI = new Vector<Object3D>();
4188		-
4189	5031	void EditSelection(boolean newWindow)
4190	5032	{
	5033	+ if (group.selection == null)
	5034	+ {
	5035	+ EditElement(group, newWindow); // ? new
	5036	+ return;
	5037	+ }
	5038	+
4191	5039	// aConstraints.gridy = 0;
4192	5040	for (int i=0; i<group.selection.size(); i++)
4193	5041	{
4194	5042	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4195	5043	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4196		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5044	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4197	5045
4198	5046	Object3D elem = (Object3D)group.selection.elementAt(i);
4199	5047	if(elem != group \|\| !newWindow)
4200	5048	{
4201		- // if (!(elem instanceof Composite))
4202		- // newWindow = false;
4203		- listUI.add(elem);
4204		- elem.openEditWindow(this, newWindow); //, false);
4205		- System.out.println("edit : " + elem);
4206		- elem.editWindow.refreshContents(true); // ? new
	5049	+ EditElement(elem, newWindow); // ? new
4207	5050	}
4208	5051	}
4209	5052	}
..	..	@@ -4266,9 +5109,7 @@
4266	5109
4267	5110	freezemodel = false;
4268	5111	}
4269		-
4270		- boolean flashIt = true;
4271		-
	5112	+
4272	5113	public void valueChanged(TreeSelectionEvent e)
4273	5114	//public boolean handleEvent(Event event)
4274	5115	{
..	..	@@ -4278,7 +5119,8 @@
4278	5119	//new Exception().printStackTrace();
4279	5120
4280	5121	freezemodel = true;
4281		-
	5122	+ ClearUnpinned();
	5123	+
4282	5124	/**/
4283	5125	//switch (event.id)
4284	5126	{
..	..	@@ -4286,7 +5128,6 @@
4286	5128	//case 702: // Event.LIST_DESELECT
4287	5129	group.deselectAll();
4288	5130	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4289		- objEditor.ClearInfo(); // .GetMaterial());
4290	5131	if (tps != null)
4291	5132	{
4292	5133	for (int i=0; i < tps.length; i++)
..	..	@@ -4295,10 +5136,8 @@
4295	5136
4296	5137	//if (child.parent != null)
4297	5138	//child.parent.addSelectee(child);
	5139	+ objEditor.SetMaterial(child);
4298	5140	group.addSelectee(child);
4299		- objEditor.SetMaterial(child); // .GetMaterial());
4300		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4301		- System.err.println("info : " + child.GetPath());
4302	5141	}
4303	5142	}
4304	5143	// else
..	..	@@ -4308,17 +5147,13 @@
4308	5147	// System.err.println("info : " + group.GetPath());
4309	5148	// }
4310	5149
4311		- objEditor.SetText(); // jan 2014
4312		-
4313		- Object3D object = (Object3D) tps[0].getLastPathComponent();
4314		-
4315		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(object instanceof Camera))
	5150	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4316	5151	CameraPane.flash = true;
4317	5152
4318		- if (tps != null && tps.length > 0 && object instanceof Camera)
	5153	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4319	5154	// a camera
4320	5155	{
4321		- if (object != Globals.theRenderer.LightCamera())
	5156	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4322	5157	{
4323	5158	CameraPane.camerachangeframe = 0; // don't refuse it
4324	5159	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4327,6 +5162,13 @@
4327	5162	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4328	5163	}
4329	5164
	5165	+ if (tps != null && tps.length == 1)
	5166	+ {
	5167	+ EditSelection(false);
	5168	+ }
	5169	+
	5170	+ SetPinStates(tps != null && tps.length > 0);
	5171	+
4330	5172	refreshContents();
4331	5173	//return true;
4332	5174	}
..	..	@@ -4335,6 +5177,37 @@
4335	5177
4336	5178	freezemodel = false;
4337	5179	}
	5180	+
	5181	+ void SetPinStates(boolean enabled)
	5182	+ {
	5183	+ editButton.setEnabled(enabled);
	5184	+ uneditButton.setEnabled(enabled);
	5185	+ unselectButton.setEnabled(enabled);
	5186	+ flashSelectionButton.setEnabled(enabled);
	5187	+
	5188	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5189	+ }
	5190	+
	5191	+ void refreshContents(boolean cp)
	5192	+ {
	5193	+ if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5194	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5195	+ {
	5196	+ objEditor.ClearInfo(); // .GetMaterial());
	5197	+
	5198	+ for (int i=0; i < group.selection.Size(); i++)
	5199	+ {
	5200	+ Object3D child = (Object3D) group.selection.get(i);
	5201	+
	5202	+ objEditor.AddInfo(child, this, true);
	5203	+ System.err.println("info : " + child.GetPath());
	5204	+ }
	5205	+
	5206	+ objEditor.SetText(); // jan 2014
	5207	+ }
	5208	+
	5209	+ super.refreshContents(cp);
	5210	+ }
4338	5211
4339	5212	void linkSomething(Object3D thing)
4340	5213	{
..	..	@@ -4406,6 +5279,7 @@
4406	5279	{
4407	5280	if (group.selection.isEmpty())
4408	5281	return;
	5282	+
4409	5283	Grafreed.clipboardIsTempGroup = false;
4410	5284	Composite tGroup = null;
4411	5285	if (group.selection.size() > 0) // 1)
..	..	@@ -4416,6 +5290,8 @@
4416	5290
4417	5291	if (cut)
4418	5292	{
	5293	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5294	+// Save();
4419	5295	//int indices[] = jList.getSelectedIndices();
4420	5296	//for (int i = indices.length - 1; i >= 0; i--)
4421	5297	//jList.remove(indices[i]);
..	..	@@ -4505,8 +5381,10 @@
4505	5381	}
4506	5382
4507	5383	}
	5384	+
4508	5385	if (Grafreed.clipboardIsTempGroup)
4509	5386	Grafreed.clipboard = tGroup;
	5387	+
4510	5388	if (cut)
4511	5389	{
4512	5390	ResetModel();
..	..	@@ -4516,6 +5394,10 @@
4516	5394
4517	5395	void paste(boolean expand)
4518	5396	{
	5397	+ if (Globals.REPLACEONMAKE)
	5398	+ Save();
	5399	+ boolean keep = Globals.REPLACEONMAKE;
	5400	+ Globals.REPLACEONMAKE = false;
4519	5401	// if (GrafreeD.clipboard == null)
4520	5402	// return;
4521	5403	boolean first = true;
..	..	@@ -4575,6 +5457,7 @@
4575	5457	Grafreed.clipboard.get(0).parent = keepparent;
4576	5458	}
4577	5459
	5460	+ Globals.REPLACEONMAKE = keep;
4578	5461	ResetModel();
4579	5462	refreshContents();
4580	5463	}
..	..	@@ -4710,6 +5593,10 @@
4710	5593
4711	5594	void group(Object3D csg, boolean grab)
4712	5595	{
	5596	+ if (Globals.REPLACEONMAKE)
	5597	+ Save();
	5598	+ boolean keep = Globals.REPLACEONMAKE;
	5599	+ Globals.REPLACEONMAKE = false;
4713	5600	if (//false) // why??
4714	5601	!group.selection.isEmpty())
4715	5602	{
..	..	@@ -4823,10 +5710,15 @@
4823	5710	//node.add(csg);
4824	5711	//makeSomething(node);
4825	5712	makeSomething(csg);
	5713	+ Globals.REPLACEONMAKE = keep;
4826	5714	}
4827	5715
4828	5716	void Ungroup(Object3D g)
4829	5717	{
	5718	+ if (Globals.REPLACEONMAKE)
	5719	+ Save();
	5720	+ boolean keep = Globals.REPLACEONMAKE;
	5721	+ Globals.REPLACEONMAKE = false;
4830	5722	if (g instanceof HiddenObject)
4831	5723	{
4832	5724	HiddenObject h = (HiddenObject) g;
..	..	@@ -4843,6 +5735,7 @@
4843	5735	objEditor.makeSomething(g.get(i), false);
4844	5736	}
4845	5737	}
	5738	+ Globals.REPLACEONMAKE = keep;
4846	5739	}
4847	5740
4848	5741	void ungroup()
..	..	@@ -5131,7 +6024,43 @@
5131	6024	cButton clearpanelButton;
5132	6025	cButton unselectButton;
5133	6026
	6027	+ cButton restoreCameraButton;
	6028	+
5134	6029	cButton oneStepButton;
	6030	+
	6031	+ cButton groupButton;
	6032	+ cButton ungroupButton;
	6033	+ cButton compositeButton;
	6034	+ cButton switchButton;
	6035	+ cButton loopButton;
	6036	+ cButton textureButton;
	6037	+
	6038	+ cButton skybox1Button;
	6039	+ cButton skybox2Button;
	6040	+ cButton skybox3Button;
	6041	+ cButton skybox4Button;
	6042	+ cButton skybox5Button;
	6043	+ cButton skybox6Button;
	6044	+ cButton skybox7Button;
	6045	+
	6046	+ cButton skybox11Button;
	6047	+ cButton skybox12Button;
	6048	+ cButton skybox13Button;
	6049	+ cButton skybox14Button;
	6050	+ cButton skybox15Button;
	6051	+ cButton skybox16Button;
	6052	+ cButton skybox17Button;
	6053	+
	6054	+ cButton gridButton;
	6055	+ cButton boxButton;
	6056	+ cButton sphereButton;
	6057	+ cButton coneButton;
	6058	+ cButton torusButton;
	6059	+ cButton superButton;
	6060	+ cButton kleinButton;
	6061	+ cButton particlesButton;
	6062	+ cButton overlayButton;
	6063	+ cButton lightButton;
5135	6064
5136	6065	cButton screenfitButton;
5137	6066	cButton screenfitpointButton;
..	..	@@ -5144,14 +6073,6 @@
5144	6073
5145	6074	cButton setsupportButton;
5146	6075
5147		- cButton twoButton;
5148		- cButton sixButton;
5149		- cButton threeButton;
5150		- cButton sevenButton;
5151		- cButton fourButton; // full panel
5152		- cButton oneButton; // full XYZ
5153		- //cButton currentLayout;
5154		-
5155	6076	//
5156	6077	//Composite
5157	6078	Object3D // to do !!
..	..	@@ -5161,11 +6082,11 @@
5161	6082	//JTree jTree;
5162	6083	private MenuItem lookAtItem;
5163	6084	private MenuItem lookFromItem;
5164		- private MenuItem switchItem;
	6085	+ private MenuItem switchViewItem;
5165	6086	private MenuItem cutItem;
5166	6087	private MenuItem undoItem;
5167	6088	private MenuItem redoItem;
5168		- private MenuItem duplicateItem;
	6089	+ private JMenuItem duplicateItem;
5169	6090	private MenuItem cloneItem;
5170	6091	private MenuItem cloneSupportItem;
5171	6092	private MenuItem overwriteGeoItem;
..	..	@@ -5193,7 +6114,7 @@
5193	6114	private MenuItem pasteLinkItem;
5194	6115	private MenuItem pasteCloneItem;
5195	6116	private MenuItem pasteExpandItem;
5196		- private MenuItem clearItem;
	6117	+ private MenuItem deleteItem;
5197	6118	private MenuItem clearAllItem;
5198	6119	private MenuItem genUVItem;
5199	6120	private MenuItem genNormalsMESHItem;
..	..	@@ -5228,6 +6149,10 @@
5228	6149	private MenuItem showleavesItem;
5229	6150	private MenuItem markleavesItem;
5230	6151	private MenuItem unmarkleavesItem;
	6152	+ private MenuItem rewindleavesItem;
	6153	+ private MenuItem unrewindleavesItem;
	6154	+ private MenuItem randomleavesItem;
	6155	+ private MenuItem unrandomleavesItem;
5231	6156
5232	6157	private MenuItem flipVItem;
5233	6158	private MenuItem unflipVItem;
..	..	@@ -5249,7 +6174,7 @@
5249	6174	private MenuItem frontItem;
5250	6175	private MenuItem cameraItem;
5251	6176	private MenuItem compositeItem;
5252		- private MenuItem randomItem;
	6177	+ private MenuItem switchItem;
5253	6178	private MenuItem physicsItem;
5254	6179	private MenuItem frameselectorItem;
5255	6180	private MenuItem scriptNodeItem;
..	..	@@ -5273,6 +6198,8 @@
5273	6198	private MenuItem attachBumpItem;
5274	6199	private MenuItem detachBumpItem;
5275	6200	private MenuItem pigmentBumpItem;
	6201	+ private MenuItem embedTexturesItem;
	6202	+ private MenuItem deEmbedTexturesItem;
5276	6203
5277	6204	private MenuItem particleItem;
5278	6205	private MenuItem ragdollItem;
..	..	@@ -5323,5 +6250,5 @@
5323	6250
5324	6251	Menu cameraMenu;
5325	6252	MenuItem editCameraItem;
5326		- MenuItem revertCameraItem;
	6253	+ MenuItem restoreCameraItem;
5327	6254	}