~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -16,6 +16,7 @@
16	16	//import buoy.widget.BFileChooser;
17	17
18	18	class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
	19	+ Grafreed.iResourceCallBack,
19	20	ObjectUI,
20	21	Runnable,
21	22	ActionListener,
..	..	@@ -23,6 +24,360 @@
23	24	DragGestureListener, DragSourceListener, DropTargetListener,
24	25	ItemListener // ListSelectionListener
25	26	{
	27	+
	28	+ public void AddSkyboxButton(String f, String s, cGridBag row)
	29	+ {
	30	+ cButton skyboxButton;
	31	+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
	32	+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.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, !Grafreed.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();
	351	+
	352	+ AddSkyboxTab0(skyboxpane);
	353	+ AddSkyboxTab1(skyboxpane);
	354	+ AddSkyboxTab2(skyboxpane);
	355	+ AddSkyboxTab3(skyboxpane);
	356	+
	357	+ skyboxPanel.add(skyboxpane);
	358	+ }
	359	+
	360	+ public void ChangeTexture(String texture)
	361	+ {
	362	+ for (int i=0; i<group.selection.size(); i++)
	363	+ {
	364	+ Object3D obj = group.selection.get(i);
	365	+ obj.SetPigmentTexture("@" + texture);
	366	+ }
	367	+
	368	+ refreshContents();
	369	+ }
	370	+
	371	+ public void Show3DView()
	372	+ {
	373	+ // bug
	374	+ //gridPanel.setDividerLocation(1.0);
	375	+ //bigPanel.setDividerLocation(0.0);
	376	+ bigThree.ClearUI();
	377	+ bigThree.add(centralPanel);
	378	+ bigThree.FlushUI();
	379	+ }
	380	+
26	381	//ObjEditor objEditor;
27	382	public void closeUI2()
28	383	{
..	..	@@ -60,6 +415,14 @@
60	415	this.copy = this.group = group;
61	416	//selectees = this.group.selectees;
62	417
	418	+ if (copy.versionlist == null)
	419	+ {
	420	+ copy.versionlist = new Object3D[100];
	421	+ copy.versionindex = -1;
	422	+
	423	+ Save(true);
	424	+ }
	425	+
63	426	if(ui)
64	427	SetupUI(objEditor);
65	428	}
..	..	@@ -74,16 +437,28 @@
74	437	this.copy = this.group = copy;
75	438	//selectees = this.group.selectees;
76	439
77		- SetupMenu2(objEditor);
	440	+ SetupMenu2(this); //objEditor);
78	441	SetupUI2(objEditor);
79	442	objEditor.SetupUI(true);
80	443	SetupViews(objEditor);
81	444
82	445	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	446	+
	447	+ if (copy.versionlist == null)
	448	+ {
	449	+ copy.versionlist = new Object3D[100];
	450	+ copy.versionindex = -1;
	451	+
	452	+ Save(true);
	453	+ }
83	454	}
84	455
85	456	void CloneSelection(boolean supports)
86	457	{
	458	+ if (Globals.REPLACEONMAKE)
	459	+ Save();
	460	+ boolean keep = Globals.REPLACEONMAKE;
	461	+ Globals.REPLACEONMAKE = false;
87	462	// Object3D keep = GrafreeD.clipboard;
88	463	//Object3D obj;
89	464	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,6 +469,7 @@
94	469
95	470	makeSomething(clone, i==group.selection.size()-1);
96	471	}
	472	+ Globals.REPLACEONMAKE = keep;
97	473	}
98	474
99	475	void CloneClipboard(boolean supports)
..	..	@@ -148,57 +524,54 @@
148	524
149	525	//JTextField nameField;
150	526
151		- void SetupMenu2(ObjEditor oe)
	527	+ void SetupMenu2(GroupEditor oe)
152	528	{
153		- if (Globals.ADVANCED)
154		- {
155		- oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
156		- //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
157		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
158		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
159		- oe.cameraMenu.add("-");
160		- openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
161		- openWindowItem.addActionListener(this);
162		- editLeafItem.addActionListener(this);
163		- lookAtItem.addActionListener(this);
164		- //lookFromItem.addActinoListener(this);
165		- //switchItem.addActionListener(this);
166		- }
167		-
	529	+ oe.jTree = new cTree();
	530	+
168	531	Menu menu;
169	532	oe.menuBar.add(menu = new Menu("Edit"));
170	533	//editItem = menu.add(new MenuItem("Edit"));
171	534	//editItem.addActionListener(this);
172		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	535	+
	536	+// undoItem = menu.add(new MenuItem("Undo"));
	537	+// undoItem.addActionListener(this);
	538	+// redoItem = menu.add(new MenuItem("Redo"));
	539	+// redoItem.addActionListener(this);
	540	+// menu.add("-");
	541	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
173	542	duplicateItem.addActionListener(this);
174		- cloneItem = menu.add(new MenuItem("Clone"));
	543	+
	544	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
175	545	cloneItem.addActionListener(this);
176		- if (Globals.ADVANCED)
	546	+ //if (Globals.ADVANCED)
177	547	{
178	548	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
179	549	cloneSupportItem.addActionListener(this);
180	550	}
	551	+ oe.jTree.popup.addSeparator();
181	552	menu.add("-");
182		- cutItem = menu.add(new MenuItem("Cut"));
	553	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
183	554	cutItem.addActionListener(this);
184		- copyItem = menu.add(new MenuItem("Copy"));
	555	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
185	556	copyItem.addActionListener(this);
186	557	pasteItem = menu.add(new MenuItem("Paste"));
187	558	pasteItem.addActionListener(this);
188		- menu.add("-");
189	559
190		- menu.add("-");
191		- pasteIntoItem = menu.add(new MenuItem("Paste into"));
	560	+ oe.jTree.popup.addSeparator();
	561	+ //menu.add("-");
	562	+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
192	563	pasteIntoItem.addActionListener(this);
193		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	564	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
194	565	pasteLinkItem.addActionListener(this);
195		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	566	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
196	567	pasteCloneItem.addActionListener(this);
197		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	568	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
198	569	// pasteExpandItem.addActionListener(this);
199		- menu.add("-");
200		- clearItem = menu.add(new MenuItem("Clear"));
201		- clearItem.addActionListener(this);
	570	+ //menu.add("-");
	571	+ oe.jTree.popup.addSeparator();
	572	+
	573	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	574	+ deleteItem.addActionListener(this);
202	575
203	576	if (Globals.ADVANCED)
204	577	{
..	..	@@ -206,14 +579,95 @@
206	579	clearAllItem = menu.add(new MenuItem("Clear All"));
207	580	clearAllItem.addActionListener(this);
208	581	}
	582	+
	583	+ menuBar.add(cameraMenu = new Menu("View"));
	584	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	585	+ //zBufferItem.addActionListener(this);
	586	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	587	+ //normalLensItem.addActionListener(this);
	588	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	589	+ restoreCameraItem.addActionListener(this);
	590	+
	591	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	592	+// toggleFullScreenItem.addItemListener(this);
	593	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	594	+// cameraMenu.add("-");
	595	+//
	596	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	597	+// toggleTextureItem.addItemListener(this);
	598	+// toggleTextureItem.setState(CameraPane.textureon);
	599	+//
	600	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	601	+// toggleSwitchItem.addItemListener(this);
	602	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	603	+
	604	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	605	+ toggleHandleItem.addItemListener(this);
	606	+ toggleHandleItem.setState(CameraPane.HANDLES);
	607	+
	608	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	609	+ togglePaintItem.addItemListener(this);
	610	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	611	+
	612	+ if (Globals.ADVANCED)
	613	+ {
	614	+ cameraMenu.add("-");
	615	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	616	+ toggleLiveItem.addItemListener(this);
	617	+ toggleLiveItem.setState(Globals.isLIVE());
209	618
	619	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	620	+ stepItem.addActionListener(this);
	621	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	622	+ // toggleDLItem.addItemListener(this);
	623	+ // toggleDLItem.setState(false);
	624	+
	625	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	626	+ toggleRenderItem.addItemListener(this);
	627	+ toggleRenderItem.setState(!CameraPane.frozen);
	628	+
	629	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	630	+ toggleDebugItem.addItemListener(this);
	631	+ toggleDebugItem.setState(Globals.DEBUG);
	632	+
	633	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	634	+ toggleFrustumItem.addItemListener(this);
	635	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	636	+
	637	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	638	+ toggleFootContactItem.addItemListener(this);
	639	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	640	+
	641	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	642	+ toggleTimelineItem.addItemListener(this);
	643	+ }
	644	+
	645	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	646	+// toggleRootItem.addItemListener(this);
	647	+// toggleRootItem.setState(false);
	648	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	649	+// animationItem.addItemListener(this);
	650	+// animationItem.setState(CameraPane.ANIMATION);
	651	+ cameraMenu.add("-");
	652	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	653	+ editCameraItem.addActionListener(this);
	654	+
	655	+ if (Globals.ADVANCED)
	656	+ {
	657	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	658	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	659	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	660	+ oe.cameraMenu.add("-");
	661	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	662	+ openWindowItem.addActionListener(this);
	663	+ lookAtItem.addActionListener(this);
	664	+ //lookFromItem.addActinoListener(this);
	665	+ //switchViewItem.addActionListener(this);
	666	+ }
	667	+
210	668	oe.menuBar.add(menu = new Menu("Setting"));
211	669	if (Globals.ADVANCED)
212	670	{
213		- resetMeshItem = menu.add(new MenuItem("Reset All"));
214		- resetMeshItem.addActionListener(this);
215		- stepAllItem = menu.add(new MenuItem("Step All"));
216		- stepAllItem.addActionListener(this);
217	671	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
218	672	revertMeshItem.addActionListener(this);
219	673	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
..	..	@@ -253,21 +707,29 @@
253	707	}
254	708
255	709	oe.menuBar.add(menu = new Menu("Group"));
256		- grabItem = menu.add(new MenuItem("Grab"));
257		- grabItem.addActionListener(this);
	710	+// grabItem = menu.add(new MenuItem("Grab"));
	711	+// grabItem.addActionListener(this);
258	712	backItem = menu.add(new MenuItem("Back"));
259	713	backItem.addActionListener(this);
260	714	frontItem = menu.add(new MenuItem("Front"));
261	715	frontItem.addActionListener(this);
262		- compositeItem = menu.add(new MenuItem("Composite"));
263		- compositeItem.addActionListener(this);
	716	+// compositeItem = menu.add(new MenuItem("Composite"));
	717	+// compositeItem.addActionListener(this);
	718	+
	719	+ if (Globals.ADVANCED)
	720	+ {
264	721	hideItem = menu.add(new MenuItem("Hidden Group"));
265	722	hideItem.addActionListener(this);
266		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	723	+ }
	724	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
267	725	ungroupItem.addActionListener(this);
268		- menu.add("-");
269		- randomItem = menu.add(new MenuItem("Switch node"));
270		- randomItem.addActionListener(this);
	726	+
	727	+// menu.add("-");
	728	+//
	729	+// switchItem = menu.add(new MenuItem("Switch node"));
	730	+// switchItem.addActionListener(this);
	731	+ if (Globals.ADVANCED)
	732	+ {
271	733	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
272	734	switchGeoItem.addActionListener(this);
273	735	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -275,8 +737,6 @@
275	737	morphItem = menu.add(new MenuItem("Morph Group"));
276	738	morphItem.addActionListener(this);
277	739
278		- if (Globals.ADVANCED)
279		- {
280	740	menu.add("-");
281	741	physicsItem = menu.add(new MenuItem("Physics"));
282	742	physicsItem.addActionListener(this);
..	..	@@ -284,30 +744,29 @@
284	744	frameselectorItem.addActionListener(this);
285	745	scriptNodeItem = menu.add(new MenuItem("Script Node"));
286	746	scriptNodeItem.addActionListener(this);
287		- cameraItem = menu.add(new MenuItem("Camera"));
288		- cameraItem.addActionListener(this);
289	747	}
290	748
291	749	oe.menuBar.add(menu = new Menu("Object"));
292		- textureItem = menu.add(new MenuItem("Texture"));
293		- textureItem.addActionListener(this);
	750	+// textureItem = menu.add(new MenuItem("Texture"));
	751	+// textureItem.addActionListener(this);
294	752	billboardItem = menu.add(new MenuItem("Billboard"));
295	753	billboardItem.addActionListener(this);
296	754	csgItem = menu.add(new MenuItem("CSG"));
297	755	csgItem.addActionListener(this);
298		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	756	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
299	757	shadowXItem.addActionListener(this);
300		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	758	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
301	759	shadowYItem.addActionListener(this);
302		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	760	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
303	761	shadowZItem.addActionListener(this);
	762	+ attributeItem = menu.add(new MenuItem("Attribute"));
	763	+ attributeItem.addActionListener(this);
	764	+
304	765	if (Globals.ADVANCED)
305	766	{
306	767	menu.add("-");
307	768	linkerItem = menu.add(new MenuItem("Linker"));
308	769	linkerItem.addActionListener(this);
309		- attributeItem = menu.add(new MenuItem("Attribute"));
310		- attributeItem.addActionListener(this);
311	770	templateItem = menu.add(new MenuItem("Template"));
312	771	templateItem.addActionListener(this);
313	772	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -318,8 +777,12 @@
318	777	resetTransformItem.addActionListener(this);
319	778	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
320	779	resetCentroidItem.addActionListener(this);
321		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
322		- transformgeometryItem.addActionListener(this);
	780	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	781	+ resetCentroidXZItem.addActionListener(this);
	782	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	783	+ transformGeometryItem.addActionListener(this);
	784	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	785	+ transformChildrenItem.addActionListener(this);
323	786
324	787	oe.menuBar.add(menu = new Menu("Geometry"));
325	788	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -332,7 +795,7 @@
332	795	genNormalsMESHItem.addActionListener(this);
333	796	if (Globals.ADVANCED)
334	797	{
335		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	798	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
336	799	genNormalsMINEItem.addActionListener(this);
337	800	}
338	801	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -368,6 +831,10 @@
368	831	oe.menuBar.add(menu = new Menu("Attributes"));
369	832	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
370	833	clearMaterialsItem.addActionListener(this);
	834	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	835	+ resetAllItem.addActionListener(this);
	836	+ stepAllItem = menu.add(new MenuItem("Step All"));
	837	+ stepAllItem.addActionListener(this);
371	838	menu.add("-");
372	839	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
373	840	liveleavesItem.addActionListener(this);
..	..	@@ -388,6 +855,14 @@
388	855	markleavesItem.addActionListener(this);
389	856	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
390	857	unmarkleavesItem.addActionListener(this);
	858	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	859	+ rewindleavesItem.addActionListener(this);
	860	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	861	+ unrewindleavesItem.addActionListener(this);
	862	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	863	+ randomleavesItem.addActionListener(this);
	864	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	865	+ unrandomleavesItem.addActionListener(this);
391	866	menu.add("-");
392	867	flipVItem = menu.add(new MenuItem("Flip V"));
393	868	flipVItem.addActionListener(this);
..	..	@@ -413,58 +888,130 @@
413	888	attachBumpItem.addActionListener(this);
414	889	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
415	890	pigmentBumpItem.addActionListener(this);
	891	+ //embedTexturesItem
416	892	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
417	893	detachPigmentItem.addActionListener(this);
418	894	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
419	895	detachBumpItem.addActionListener(this);
	896	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	897	+ embedTexturesItem.addActionListener(this);
	898	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	899	+ deEmbedTexturesItem.addActionListener(this);
420	900	menu.add("-");
421	901	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
422	902	sortbysizeItem.addActionListener(this);
423	903	sortbynameItem = menu.add(new MenuItem("Sort by name"));
424	904	sortbynameItem.addActionListener(this);
	905	+ menu.add("-");
	906	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	907	+ shareGeometriesItem.addActionListener(this);
	908	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	909	+ mergeGeometriesItem.addActionListener(this);
	910	+ menu.add("-");
	911	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	912	+ editLeafItem.addActionListener(this);
425	913	if (Globals.ADVANCED)
426	914	{
427		- menu.add("-");
	915	+ // Pretty much the same as duplicate and clone.
428	916	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
429	917	extractGeometriesItem.addActionListener(this);
430	918	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
431	919	cloneGeometriesItem.addActionListener(this);
432		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
433		- shareGeometriesItem.addActionListener(this);
434		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
435		- mergeGeometriesItem.addActionListener(this);
436	920	}
437	921
438	922	oe.menuBar.add(menu = new Menu("Insert"));
439	923	buildCreateMenu(menu);
440	924
441		- oe.menuBar.add(menu = new Menu("Include"));
442		- importOBJItem = menu.add(new MenuItem("OBJ file..."));
443		- importOBJItem.addActionListener(this);
444		- menu.add("-");
445		- import3DSItem = menu.add(new MenuItem("3DS file..."));
446		- import3DSItem.addActionListener(this);
447		- menu.add("-");
448		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
449		- importVRMLX3DItem.addActionListener(this);
450		- menu.add("-");
451		- importGFDItem = menu.add(new MenuItem("GrafreeD file..."));
452		- importGFDItem.addActionListener(this);
453		-
454	925	oe.menuBar.add(menu = new Menu("Tools"));
455	926	buildToolsMenu(menu);
456	927	}
457	928
	929	+ JTabbedPane resourcecontainer;
	930	+ cGridBag currenttab;
	931	+ //boolean added; // patch for jar
	932	+
	933	+ int tabcount = 0;
	934	+ int colcount = 0;
	935	+ int rowcount = 0;
	936	+ int texturecount = 0;
	937	+
	938	+ int columns = 5;
	939	+ int rows = 7;
	940	+
	941	+ public void ResourceCallBack(String[] path)
	942	+ {
	943	+// for (int i = 0; i < path.length; i++)
	944	+// System.out.print(path[i] + "/");
	945	+// System.out.println();
	946	+
	947	+ if (//rowcount == 0 \|\|
	948	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	949	+ {
	950	+ currenttab = new cGridBag();
	951	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	952	+ currenttab.setName(tabname);
	953	+ //added = false;
	954	+ resourcecontainer.add(currenttab);
	955	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	956	+ rowcount = 1;
	957	+ colcount = 0;
	958	+ texturecount = 0;
	959	+ }
	960	+
	961	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	962	+ {
	963	+ //if (!added)
	964	+ {
	965	+ //added = true;
	966	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	967	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	968	+ }
	969	+
	970	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	971	+
	972	+ if (++colcount >= columns)
	973	+ {
	974	+ colcount = 0;
	975	+ currenttab.Return();
	976	+
	977	+ if (rowcount++ >= rows)
	978	+ {
	979	+ rowcount = 0;
	980	+ }
	981	+ }
	982	+ }
	983	+ else
	984	+ {
	985	+// if (!path[path.length-1].equals("icons"))
	986	+// resourcecontainer.Return();
	987	+ }
	988	+ }
	989	+
	990	+ void CreateTexturePanel(cGridBag container)
	991	+ {
	992	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	993	+ container.add(resourcecontainer);
	994	+
	995	+ Grafreed.ParseResources("textures", this);
	996	+ }
	997	+
458	998	void SetupUI2(ObjEditor oe)
459	999	{
	1000	+ // June 2019
	1001	+ if (oe == null)
	1002	+ {
	1003	+ //super.SetupUI2(this);
	1004	+ //return;
	1005	+ }
	1006	+
	1007	+ if (copy != group)
	1008	+ {
	1009	+ //super.SetupUI2(this);
	1010	+ }
	1011	+
460	1012	//new Exception().printStackTrace();
461	1013
462	1014	oe.radioPanel = new JPanel(new GridBagLayout());
463		- oe.aConstraints.weightx = 1;
464		- oe.aConstraints.weighty = 0;
465		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
466		- oe.aConstraints.gridwidth = 100;
467		- oe.aConstraints.gridheight = 1;
468	1015	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
469	1016
470	1017	oe.buttonGroup = new ButtonGroup();
..	..	@@ -485,27 +1032,122 @@
485	1032	oe.radioPanel.add(dummyButton);
486	1033	oe.buttonGroup.add(dummyButton);
487	1034	*/
	1035	+ cGridBag copyOptionsPanel = new cGridBag();
	1036	+
	1037	+ copyOptionsPanel.preferredHeight = 2;
	1038	+
488	1039	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
489	1040
490		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
491		- liveCB.setToolTipText("Enabled animation");
492		- liveCB.addItemListener(this);
	1041	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1042	+ //minButton.setToolTipText("Minimize window");
	1043	+ //minButton.addActionListener(this);
	1044	+
	1045	+ if (Globals.ADVANCED)
	1046	+ {
	1047	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1048	+// maxButton.setToolTipText("Maximize window");
	1049	+// maxButton.addActionListener(this);
	1050	+ }
	1051	+
	1052	+ cButton gcButton;
	1053	+
	1054	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1055	+// gcButton.setToolTipText("Garbage collect");
	1056	+// gcButton.addActionListener(new ActionListener()
	1057	+// {
	1058	+// public void actionPerformed(ActionEvent e)
	1059	+// {
	1060	+// System.gc();
	1061	+// }
	1062	+// });
	1063	+
	1064	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1065	+ collapseButton.setToolTipText("Collapse toolbar");
	1066	+ collapseButton.addActionListener(this);
	1067	+
	1068	+ oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1069	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1070	+ maximize3DButton.addActionListener(this);
	1071	+
	1072	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1073	+ twoButton.setToolTipText("Show 3D view only");
	1074	+ twoButton.addActionListener(this);
	1075	+ this.fullscreenLayout = twoButton;
	1076	+
	1077	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1078	+ threeButton.setToolTipText("Show controls and 3D view");
	1079	+ threeButton.addActionListener(this);
	1080	+ if (Globals.ADVANCED)
	1081	+ {
	1082	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1083	+ sixButton.setToolTipText("Show 3D view and controls");
	1084	+ sixButton.addActionListener(this);
	1085	+ }
	1086	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1087	+// sevenButton.setToolTipText("3-column layout");
	1088	+// sevenButton.addActionListener(this);
	1089	+ //
	1090	+
	1091	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1092	+ fullButton.setToolTipText("Full-screen window");
	1093	+ fullButton.addActionListener(this);
	1094	+
	1095	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1096	+ screenfitButton.setToolTipText("Screen fit");
	1097	+ screenfitButton.addActionListener(this);
493	1098
494		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1099	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1100	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1101	+ restoreCameraButton.addActionListener(this);
	1102	+
	1103	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1104	+ saveVersionButton.setToolTipText("Duplicate current version");
	1105	+ saveVersionButton.addActionListener(this);
	1106	+
	1107	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1108	+ deleteVersionButton.setToolTipText("Delete current version");
	1109	+ deleteVersionButton.addActionListener(this);
	1110	+
	1111	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1112	+ previousVersionButton.setToolTipText("Previous version");
	1113	+ previousVersionButton.addActionListener(this);
	1114	+ previousVersionButton.setEnabled(false);
	1115	+
	1116	+ cGridBag updown = new cGridBag().setVertical(true);
	1117	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1118	+ restoreButton.setToolTipText("Undo (restore current version)");
	1119	+ restoreButton.addActionListener(this);
	1120	+ //restoreButton.setEnabled(false);
	1121	+
	1122	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1123	+ replaceButton.setToolTipText("Save (replace current version)");
	1124	+ replaceButton.addActionListener(this);
	1125	+ //replaceButton.setEnabled(false);
	1126	+
	1127	+ copyOptionsPanel.add(updown);
	1128	+
	1129	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1130	+ nextVersionButton.setToolTipText("Next version");
	1131	+ nextVersionButton.addActionListener(this);
	1132	+ nextVersionButton.setEnabled(false);
	1133	+
	1134	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
495	1135	oneStepButton.setToolTipText("Animate one step forward");
496	1136	oneStepButton.addActionListener(this);
497	1137
498		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	1138	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1139	+ liveCB.setToolTipText("Enable animation");
	1140	+ liveCB.addItemListener(this);
	1141	+
	1142	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
499	1143	fastCB.setToolTipText("Fast mode");
500	1144	fastCB.addItemListener(this);
501	1145
502		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
503		- trackCB.setToolTipText("Enable tracking");
504		- trackCB.addItemListener(this);
505		-
506		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
507		- screenfitButton.setToolTipText("Screen fit");
508		- screenfitButton.addActionListener(this);
	1146	+ //oe.toolboxPanel.Return();
	1147	+
	1148	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1149	+// trackCB.setToolTipText("Enable tracking");
	1150	+// trackCB.addItemListener(this);
509	1151
510	1152	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
511	1153	// screenfitpointButton.addActionListener(this);
..	..	@@ -515,67 +1157,137 @@
515	1157	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
516	1158	snapobjectButton.addActionListener(this);
517	1159	snapobjectButton.setToolTipText("Snap Object");
	1160	+
	1161	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1162	+ fourButton.addActionListener(this);
	1163	+ fourButton.setToolTipText("Show control panel only");
518	1164	}
519	1165
520		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
521		- flashSelectionButton.setToolTipText("Show selection");
522		- flashSelectionButton.addActionListener(this);
	1166	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
523	1167
524		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
525		-
526		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
527		- twoButton.setToolTipText("Show center view only");
528		- twoButton.addActionListener(this);
529		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
530		- fourButton.addActionListener(this);
531		- fourButton.setToolTipText("Show left panel only");
532		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
533		- sixButton.setToolTipText("2-column layout left");
534		- sixButton.addActionListener(this);
535		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
536		- threeButton.setToolTipText("2-column layout right");
537		- threeButton.addActionListener(this);
538		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
539		- sevenButton.setToolTipText("3-column layout");
540		- sevenButton.addActionListener(this);
541		- //
542	1168
543		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
544		- rootButton.setToolTipText("Edit selection in new tab");
	1169	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1170	+ rootButton.setToolTipText("Open selection in new tab");
545	1171	rootButton.addActionListener(this);
546	1172
547		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1173	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
548	1174	closeButton.setToolTipText("Close tab");
549	1175	closeButton.addActionListener(this);
550	1176	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
551	1177	//clearButton.addActionListener(this);
552		-
553		- cGridBag commandsPanel = new cGridBag();
	1178	+
	1179	+ cGridBag row1 = new cGridBag();
554	1180
555		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
556		- editButton.setToolTipText("Edit selection");
	1181	+ // INSERT
	1182	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1183	+ gridButton.setToolTipText("Create ground");
	1184	+ gridButton.addActionListener(this);
	1185	+
	1186	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1187	+ boxButton.setToolTipText("Create box");
	1188	+ boxButton.addActionListener(this);
	1189	+
	1190	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1191	+ sphereButton.setToolTipText("Create sphere");
	1192	+ sphereButton.addActionListener(this);
	1193	+
	1194	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1195	+ coneButton.setToolTipText("Create cone");
	1196	+ coneButton.addActionListener(this);
	1197	+
	1198	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1199	+ torusButton.setToolTipText("Create torus");
	1200	+ torusButton.addActionListener(this);
	1201	+
	1202	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1203	+ superButton.setToolTipText("Create superellipsoid");
	1204	+ superButton.addActionListener(this);
	1205	+
	1206	+ if (Globals.ADVANCED)
	1207	+ {
	1208	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1209	+ kleinButton.setToolTipText("Create Klein bottle");
	1210	+ kleinButton.addActionListener(this);
	1211	+ }
	1212	+
	1213	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1214	+ particlesButton.setToolTipText("Create particle system");
	1215	+ particlesButton.addActionListener(this);
	1216	+
	1217	+ oe.toolboxPanel.add(row1);
	1218	+
	1219	+ cGridBag row2 = new cGridBag();
	1220	+
	1221	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1222	+ groupButton.setToolTipText("Create group");
	1223	+ groupButton.addActionListener(this);
	1224	+
	1225	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1226	+ compositeButton.setToolTipText("Create composite");
	1227	+ compositeButton.addActionListener(this);
	1228	+
	1229	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1230	+ switchButton.setToolTipText("Create item switcher");
	1231	+ switchButton.addActionListener(this);
	1232	+
	1233	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1234	+ loopButton.setToolTipText("Create loop");
	1235	+ loopButton.addActionListener(this);
	1236	+
	1237	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1238	+ textureButton.setToolTipText("Create texture");
	1239	+ textureButton.addActionListener(this);
	1240	+
	1241	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1242	+ overlayButton.setToolTipText("Create overlay");
	1243	+ overlayButton.addActionListener(this);
	1244	+
	1245	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1246	+ lightButton.setToolTipText("Create light");
	1247	+ lightButton.addActionListener(this);
	1248	+
	1249	+ oe.toolboxPanel.add(row2);
	1250	+
	1251	+ cGridBag textures = new cGridBag();
	1252	+
	1253	+ CreateTexturePanel(textures);
	1254	+
	1255	+ oe.toolboxPanel.add(textures);
	1256	+
	1257	+ textures.preferredHeight = 100;
	1258	+
	1259	+ CreateSkyboxPanel(oe.skyboxPanel);
	1260	+
	1261	+ // EDIT panel
	1262	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1263	+ editButton.setToolTipText("Pin selection controls");
557	1264	editButton.addActionListener(this);
558	1265
559		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
560		- uneditButton.setToolTipText("Unedit selection");
	1266	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1267	+ uneditButton.setToolTipText("Unpin and remove selection controls");
561	1268	uneditButton.addActionListener(this);
562	1269
563		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
564		- allParamsButton.setToolTipText("Edit all params");
	1270	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1271	+ allParamsButton.setToolTipText("Show all controls");
565	1272	allParamsButton.addActionListener(this);
566	1273
567		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
568		- clearPanelButton.setToolTipText("Clear edit panel");
	1274	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1275	+ clearPanelButton.setToolTipText("Clear all controls");
569	1276	clearPanelButton.addActionListener(this);
570	1277
571		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
572		- unselectButton.setToolTipText("Unselect");
573		- unselectButton.addActionListener(this);
	1278	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1279	+ //unselectButton.setToolTipText("Unselect");
	1280	+ //unselectButton.addActionListener(this);
574	1281
575		- commandsPanel.preferredHeight = 1;
	1282	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1283	+ flashSelectionButton.setToolTipText("Highlight selection");
	1284	+ flashSelectionButton.addActionListener(this);
576	1285
577		- oe.treePanel.add(commandsPanel);
578		- oe.treePanel.Return();
	1286	+ editCommandsPanel.preferredHeight = 1;
	1287	+
	1288	+ SetPinStates(false);
	1289	+// oe.treePanel.add(commandsPanel);
	1290	+// oe.treePanel.Return();
579	1291
580	1292	// oe.aConstraints.gridx += 1;
581	1293	// oe.aConstraints.weighty = 0;
..	..	@@ -592,32 +1304,20 @@
592	1304
593	1305	JScrollPane jSP;
594	1306	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
595		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1307	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
596	1308	ResetModel();
597	1309
598	1310	oe.treePanel.add(jSPPanel);
599	1311	oe.treePanel.Return();
600	1312
601		- cGridBag copyOptionsPanel = new cGridBag();
602		-
603		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
604		- colorCB.setToolTipText("Copy color when dropped");
605		- colorCB.addItemListener(this);
606		-
607		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
608		- materialCB.setToolTipText("Copy material when dropped");
609		- materialCB.addItemListener(this);
610		-
611		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
612		- textureCB.setToolTipText("Copy texture when dropped");
613		- textureCB.addItemListener(this);
614		-
615		- copyOptionsPanel.preferredHeight = 1;
616	1313	oe.treePanel.add(copyOptionsPanel);
617	1314	oe.treePanel.Return();
	1315	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1316	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1317	+ sliderPane.preferredHeight = 1;
618	1318
619		-// mainPanel.setDividerLocation(0.5); //1.0);
620		-// mainPanel.setResizeWeight(0.5);
	1319	+// mainPanel.setDividerLocation(0.1); //1.0);
	1320	+ mainPanel.setResizeWeight(0.4);
621	1321
622	1322	//jList.addListSelectionListener(this);
623	1323	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -625,7 +1325,7 @@
625	1325	//jTree.setEditable(true);
626	1326	oe.jTree.setDragEnabled(true);
627	1327	//jTree.setPreferredSize(new Dimension(10,10));
628		- jSP.setPreferredSize(new Dimension(100,200));
	1328	+ //jSP.setPreferredSize(new Dimension(100,200));
629	1329
630	1330	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
631	1331
..	..	@@ -637,29 +1337,49 @@
637	1337	dgr.addDragGestureListener(this);
638	1338	}catch(Exception e) {}
639	1339	*/
640		- radio.layout = sevenButton;
	1340	+ radio.layout = threeButton; // sixButton;
641	1341	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
642	1342	}
643	1343
644	1344	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
645	1345	{
	1346	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1347	+ colorCB.setToolTipText("Copy color when dropped");
	1348	+ colorCB.addItemListener(this);
	1349	+
	1350	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1351	+ materialCB.setToolTipText("Copy material when dropped");
	1352	+ materialCB.addItemListener(this);
	1353	+
	1354	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1355	+ textureCB.setToolTipText("Copy texture when dropped");
	1356	+ textureCB.addItemListener(this);
	1357	+
	1358	+ panel.Return();
	1359	+
646	1360	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
647	1361	boxCB.setToolTipText("Display bounding boxes");
648	1362	boxCB.addItemListener(this);
649	1363
650	1364	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
651		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1365	+ zoomBoxCB.setToolTipText("Display only for wheel");
652	1366	zoomBoxCB.addItemListener(this);
653	1367
654		- if (Globals.ADVANCED)
	1368	+ if (true) // Globals.ADVANCED)
655	1369	{
656		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
657		- supportCB.setToolTipText("Enable rigging");
658		- supportCB.addItemListener(this);
	1370	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1371	+// supportCB.setToolTipText("Enable rigging");
	1372	+// supportCB.addItemListener(this);
	1373	+
	1374	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1375	+ freezeCB.setToolTipText("Fast moving camera");
	1376	+ freezeCB.addItemListener(this);
659	1377
660	1378	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
661	1379	// localCB.addItemListener(this);
662	1380
	1381	+ panel.Return();
	1382	+
663	1383	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
664	1384	crowdCB.setToolTipText("Used for crowds");
665	1385	crowdCB.addItemListener(this);
..	..	@@ -668,14 +1388,19 @@
668	1388	smoothCB.setToolTipText("Snapping delay");
669	1389	smoothCB.addItemListener(this);
670	1390
671		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
672		- slowCB.setToolTipText("Smooth interpolation");
673		- slowCB.addItemListener(this);
	1391	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1392	+// slowCB.setToolTipText("Smooth interpolation");
	1393	+// slowCB.addItemListener(this);
	1394	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1395	+ minshaderCB.setToolTipText("Minimal fast shader");
	1396	+ minshaderCB.addItemListener(this);
674	1397
675	1398	// constraints.gridy += 1;
676	1399	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
677	1400	// speakerMocapCB.addItemListener(this);
678	1401
	1402	+ panel.Return();
	1403	+
679	1404	if (false)
680	1405	{
681	1406	// handled in scripts
..	..	@@ -690,42 +1415,93 @@
690	1415	//constraints.gridy += 1;
691	1416	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
692	1417	smoothfocusCB.addItemListener(this);
	1418	+ panel.Return();
693	1419	}
694	1420
695	1421	//constraints.gridx += 1;
696	1422	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
697	1423	// debugCB.addItemListener(this);
698	1424
	1425	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1426	+ trackCB.setToolTipText("Enable tracking target");
	1427	+ trackCB.addItemListener(this);
	1428	+
699	1429	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1430	+ oeilCB.setToolTipText("Move camera when tracking");
700	1431	oeilCB.addItemListener(this);
701	1432
	1433	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1434	+ shadowCB.setToolTipText("When live compute shadows");
	1435	+ shadowCB.addItemListener(this);
	1436	+
	1437	+ panel.Return();
	1438	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1439	+ toggleTextureCB.setToolTipText("Load textures");
	1440	+ toggleTextureCB.addItemListener(this);
	1441	+
	1442	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1443	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1444	+ toggleSwitchCB.addItemListener(this);
	1445	+
	1446	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1447	+ autokeepCB.setToolTipText("On structure change");
	1448	+ autokeepCB.addItemListener(this);
	1449	+
	1450	+ panel.Return();
	1451	+ if (Globals.ADVANCED)
	1452	+ {
702	1453	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
703	1454	lookAtCB.setToolTipText("Look-at target");
704	1455	lookAtCB.addItemListener(this);
	1456	+ }
705	1457
706	1458	}
707	1459
708	1460	cGridBag fill = new cGridBag();
709		-
710	1461	fill.preferredHeight = 200;
	1462	+ cGridBag fill2 = new cGridBag();
	1463	+ fill2.preferredHeight = 200;
	1464	+ cGridBag fill3 = new cGridBag();
	1465	+ fill3.preferredHeight = 200;
711	1466
712	1467	panel.add(fill);
	1468	+ panel.add(fill2);
	1469	+ panel.add(fill3);
713	1470
714	1471	}
715	1472
716	1473	void EditObject(Object3D obj)
717	1474	{
	1475	+ assert(obj instanceof Composite);
	1476	+
	1477	+// if (obj.versionlist == null)
	1478	+// {
	1479	+// obj.versionlist = new Object3D[100];
	1480	+// obj.versionindex = -1;
	1481	+// }
	1482	+
718	1483	cRadio radioButton = new cRadio(obj.name);
	1484	+
	1485	+ // June 2019. Patch to avoid bug with transparency.
	1486	+ radioButton.hadMaterial = obj.material != null;
	1487	+ if (!radioButton.hadMaterial)
	1488	+ {
	1489	+ obj.material = new cMaterial();
	1490	+ }
	1491	+
719	1492	radioButton.SetObject(obj);
720		- radioButton.layout = sevenButton;
	1493	+ radioButton.layout = threeButton; // sixButton;
721	1494	radioButton.SetCamera(cameraView.renderCamera, false);
722	1495	radioButton.addActionListener(this);
723	1496	radioPanel.add(radioButton);
724	1497	buttonGroup.add(radioButton);
725	1498	radioButton.doClick();
726	1499	}
	1500	+
727	1501	void SetupViews(ObjEditor oe)
728	1502	{
	1503	+ theFrame = this;
	1504	+
729	1505	oe.SetupViews();
730	1506
731	1507	System.out.println("SetupViews");
..	..	@@ -734,23 +1510,30 @@
734	1510	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
735	1511	}
736	1512
737		- JCheckBox liveCB;
738		- JCheckBox supportCB;
739		- JCheckBox localCB;
740		- JCheckBox crowdCB;
741		- JCheckBox smoothCB;
742		- JCheckBox fastCB;
743		- JCheckBox slowCB;
744		- JCheckBox boxCB;
745		- JCheckBox zoomBoxCB;
746		- JCheckBox trackCB;
747		- JCheckBox smoothfocusCB;
	1513	+ cToggleButton liveCB;
	1514	+ cCheckBox supportCB;
	1515	+ cCheckBox localCB;
	1516	+ cCheckBox crowdCB;
	1517	+ cCheckBox smoothCB;
	1518	+ cCheckBox minshaderCB;
	1519	+
	1520	+ cToggleButton fastCB;
	1521	+ cCheckBox slowCB;
	1522	+ cCheckBox boxCB;
	1523	+ cCheckBox zoomBoxCB;
	1524	+ cCheckBox freezeCB;
	1525	+ //cToggleButton trackCB;
	1526	+ cCheckBox trackCB;
	1527	+ cCheckBox smoothfocusCB;
748	1528	// JCheckBox speakerMocapCB;
749		- JCheckBox speakerCameraCB;
750		- JCheckBox speakerFocusCB;
751		- JCheckBox debugCB;
752		- JCheckBox oeilCB;
753		- JCheckBox lookAtCB;
	1529	+ cCheckBox speakerCameraCB;
	1530	+ cCheckBox speakerFocusCB;
	1531	+ cCheckBox debugCB;
	1532	+
	1533	+ cCheckBox oeilCB;
	1534	+ cCheckBox shadowCB;
	1535	+ cCheckBox autokeepCB;
	1536	+ cCheckBox lookAtCB;
754	1537
755	1538	// static int COLOR = 1;
756	1539	// static int MATERIAL = 2;
..	..	@@ -758,9 +1541,9 @@
758	1541
759	1542	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
760	1543
761		- JCheckBox colorCB;
762		- JCheckBox materialCB;
763		- JCheckBox textureCB;
	1544	+ cCheckBox colorCB;
	1545	+ cCheckBox materialCB;
	1546	+ cCheckBox textureCB;
764	1547
765	1548	public void itemStateChanged(ItemEvent e)
766	1549	{
..	..	@@ -788,6 +1571,7 @@
788	1571	} else if(e.getSource() == liveCB)
789	1572	{
790	1573	cameraView.ToggleLive();
	1574	+ refreshContents(false);
791	1575	}
792	1576	else if(e.getSource() == supportCB)
793	1577	{
..	..	@@ -803,6 +1587,12 @@
803	1587	{
804	1588	cameraView.ToggleInertia();
805	1589	cameraView.repaint();
	1590	+ }
	1591	+ else if(e.getSource() == minshaderCB)
	1592	+ {
	1593	+ Globals.MINSHADER ^= true;
	1594	+ cameraView.programInitialized = false;
	1595	+ cameraView.repaint();
806	1596	}
807	1597	else if(e.getSource() == localCB)
808	1598	{
..	..	@@ -852,6 +1642,18 @@
852	1642	{
853	1643	cameraView.ToggleOeil();
854	1644	}
	1645	+ else if(e.getSource() == shadowCB)
	1646	+ {
	1647	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1648	+ }
	1649	+ else if(e.getSource() == freezeCB)
	1650	+ {
	1651	+ Globals.FREEZEONMOVE ^= true;
	1652	+ }
	1653	+ else if(e.getSource() == autokeepCB)
	1654	+ {
	1655	+ Globals.REPLACEONMAKE ^= true;
	1656	+ }
855	1657	else if(e.getSource() == lookAtCB)
856	1658	{
857	1659	cameraView.ToggleLookAt();
..	..	@@ -868,7 +1670,8 @@
868	1670
869	1671	/**/
870	1672	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
871		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1673	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1674	+ TreePath path = objEditor.jTree.getSelectionPath();
872	1675	if ((path == null) \|\| (path.getPathCount() <= 1)) {
873	1676	// We can't move the root node or an empty selection
874	1677	return;
..	..	@@ -931,8 +1734,6 @@
931	1734	}
932	1735	}
933	1736
934		- String string = (String) object;
935		-
936	1737	System.out.println("Transfer = " + object + "; drop : " + target);
937	1738	// if( object instanceof java.io.File[])
938	1739	// {
..	..	@@ -940,6 +1741,8 @@
940	1741	// objEditor.DropFile((java.io.File[]) object, true);
941	1742	// return;
942	1743	// }
	1744	+
	1745	+ String string = object.toString();
943	1746
944	1747	// File path for Mac and Windows
945	1748	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -985,23 +1788,33 @@
985	1788
986	1789	assert target == objEditor.jTree;
987	1790	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1791	+ Object3D destinationLeaf;
988	1792	try {
989		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1793	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
990	1794	} catch (Exception e) {
991	1795	System.out.println("destinationPath : " + destinationPath);
992	1796	return;
993	1797	}
994	1798
995		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1799	+ for (int i=group.selection.size(); --i>=0;)
996	1800	{
	1801	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1802	+
	1803	+ // Cannot move into itself
	1804	+ if (child == destinationLeaf)
	1805	+ return;
	1806	+ }
	1807	+
	1808	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1809	+// {
997	1810	loadClipboard(true);
998	1811	objEditor.jTree.setSelectionPath(destinationPath);
999	1812	pasteInto(false, false);
1000		- } else {
1001		- loadClipboard(false);
1002		- objEditor.jTree.setSelectionPath(destinationPath);
1003		- pasteInto(false, false); // true); // ???
1004		- }
	1813	+// } else {
	1814	+// loadClipboard(false);
	1815	+// objEditor.jTree.setSelectionPath(destinationPath);
	1816	+// pasteInto(false, false); // true); // ???
	1817	+// }
1005	1818	}
1006	1819	public void dropActionChanged(DropTargetDragEvent dtde)
1007	1820	// Called if the user has modified the current drop gesture
..	..	@@ -1057,7 +1870,12 @@
1057	1870	TreePath path;
1058	1871
1059	1872	public TransferableTreePath(TreePath tp) {
1060		- path = tp;
	1873	+ Object[] objs = new Object[tp.getPathCount()];
	1874	+ for (int i=0; i<objs.length; i++)
	1875	+ {
	1876	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1877	+ }
	1878	+ path = new TreePath(objs);
1061	1879	}
1062	1880
1063	1881	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1106,22 +1924,30 @@
1106	1924	{
1107	1925	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1108	1926	//heightFieldItem.addActionListener(this);
1109		- gridItem = menu.add(new MenuItem("Grid"));
1110		- gridItem.addActionListener(this);
1111		- rectoidItem = menu.add(new MenuItem("Box"));
1112		- rectoidItem.addActionListener(this);
1113		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1114		- ellipsoidItem.addActionListener(this);
1115		- coneItem = menu.add(new MenuItem("Cone"));
1116		- coneItem.addActionListener(this);
1117		- torusItem = menu.add(new MenuItem("Torus"));
1118		- torusItem.addActionListener(this);
1119		- superItem = menu.add(new MenuItem("Superellipsoid"));
1120		- superItem.addActionListener(this);
	1927	+// gridItem = menu.add(new MenuItem("Grid"));
	1928	+// gridItem.addActionListener(this);
	1929	+// rectoidItem = menu.add(new MenuItem("Box"));
	1930	+// rectoidItem.addActionListener(this);
	1931	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1932	+// ellipsoidItem.addActionListener(this);
	1933	+// coneItem = menu.add(new MenuItem("Cone"));
	1934	+// coneItem.addActionListener(this);
	1935	+// torusItem = menu.add(new MenuItem("Torus"));
	1936	+// torusItem.addActionListener(this);
	1937	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1938	+// superItem.addActionListener(this);
	1939	+
	1940	+ cameraItem = menu.add(new MenuItem("Camera"));
	1941	+ cameraItem.addActionListener(this);
	1942	+
	1943	+ if (!Globals.ADVANCED)
	1944	+ {
1121	1945	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1122	1946	kleinItem.addActionListener(this);
1123		- particleItem = menu.add(new MenuItem("Particle system"));
1124		- particleItem.addActionListener(this);
	1947	+ }
	1948	+
	1949	+// particleItem = menu.add(new MenuItem("Particle system"));
	1950	+// particleItem.addActionListener(this);
1125	1951	if (Globals.ADVANCED)
1126	1952	{
1127	1953	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1147,15 +1973,15 @@
1147	1973	}
1148	1974	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1149	1975	bezierItem.addActionListener(this);
1150		- overlayItem = menu.add(new MenuItem("Overlay"));
1151		- overlayItem.addActionListener(this);
1152		- lightItem = menu.add(new MenuItem("Light"));
1153		- lightItem.addActionListener(this);
	1976	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1977	+// overlayItem.addActionListener(this);
	1978	+// lightItem = menu.add(new MenuItem("Light"));
	1979	+// lightItem.addActionListener(this);
1154	1980	menu.add("-");
1155	1981	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1156	1982	//superLoopItem.addActionListener(this);
1157		- loopItem = menu.add(new MenuItem("Loop"));
1158		- loopItem.addActionListener(this);
	1983	+// loopItem = menu.add(new MenuItem("Loop"));
	1984	+// loopItem.addActionListener(this);
1159	1985	doubleItem = menu.add(new MenuItem("Fork"));
1160	1986	doubleItem.addActionListener(this);
1161	1987	if (Globals.ADVANCED)
..	..	@@ -1171,6 +1997,9 @@
1171	1997	animationItem.addItemListener(this);
1172	1998	animationItem.setState(Globals.ANIMATION);
1173	1999
	2000	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	2001	+ archiveItem.addActionListener(this);
	2002	+
1174	2003	menu.add("-");
1175	2004	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1176	2005	parseverticesItem.addActionListener(this);
..	..	@@ -1183,6 +2012,8 @@
1183	2012	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1184	2013	reduce34MorphItem.addActionListener(this);
1185	2014	menu.add("-");
	2015	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	2016	+ memoryItem.addActionListener(this);
1186	2017	menu.add(computeAOItem = new MenuItem("Compute AO"));
1187	2018	computeAOItem.addActionListener(this);
1188	2019
..	..	@@ -1191,11 +2022,9 @@
1191	2022	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1192	2023	mirrorItem.addActionListener(this);
1193	2024	menu.add("-");
1194		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1195		- memoryItem.addActionListener(this);
1196	2025	menu.add(analyzeItem = new MenuItem("Analyze"));
1197	2026	analyzeItem.addActionListener(this);
1198		- menu.add(dumpItem = new MenuItem("Dump"));
	2027	+ menu.add(dumpItem = new MenuItem("Print"));
1199	2028	dumpItem.addActionListener(this);
1200	2029	// menu.add(pathItem = new MenuItem("From-to path"));
1201	2030	// pathItem.addActionListener(this);
..	..	@@ -1336,9 +2165,34 @@
1336	2165	shadow.material = new cMaterial(obj.material);
1337	2166	shadow.material.diffuse = 0.0001f;
1338	2167	shadow.material.specular = 0.0001f;
	2168	+ //shadow.projectedVertices[1].x = 300;
1339	2169
1340	2170	makeSomething(shadow);
1341	2171	}
	2172	+
	2173	+ private void ClearUnpinned()
	2174	+ {
	2175	+ //for (Object3D obj : listUI)
	2176	+ for (int i=listUI.size(); --i>=0;)
	2177	+ {
	2178	+ Object3D obj = listUI.elementAt(i);
	2179	+ if (!obj.pinned)
	2180	+ {
	2181	+ obj.CloseUI();
	2182	+ listUI.remove(i);
	2183	+ }
	2184	+ }
	2185	+ }
	2186	+
	2187	+ private void EditElement(Object3D elem, boolean newWindow)
	2188	+ {
	2189	+ // if (!(elem instanceof Composite))
	2190	+ // newWindow = false;
	2191	+ listUI.add(elem);
	2192	+ elem.openEditWindow(this, newWindow); //, false);
	2193	+ System.out.println("edit : " + elem);
	2194	+ elem.editWindow.refreshContents(true); // ? new
	2195	+ }
1342	2196
1343	2197	/**
1344	2198	* applyExample
..	..	@@ -1583,7 +2437,7 @@
1583	2437	{
1584	2438	ScreenFit();
1585	2439	} else
1586		- if (source == switchItem)
	2440	+ if (source == switchViewItem)
1587	2441	{
1588	2442	cVector v1 = new cVector();
1589	2443	cVector v2 = new cVector();
..	..	@@ -1592,11 +2446,11 @@
1592	2446	objEditor.cameraView.renderCamera.setAim(v2, v1);
1593	2447	objEditor.cameraView.repaint();
1594	2448	} else
1595		- if (source == rectoidItem)
	2449	+ if (source == rectoidItem \|\| source == boxButton)
1596	2450	{
1597	2451	makeSomething(new Box());
1598	2452	} else
1599		- if (source == particleItem)
	2453	+ if (source == particleItem \|\| source == particlesButton)
1600	2454	{
1601	2455	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1602	2456	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1675,27 +2529,27 @@
1675	2529
1676	2530	makeSomething(obj);
1677	2531	} else
1678		- if (source == gridItem)
	2532	+ if (source == gridItem \|\| source == gridButton)
1679	2533	{
1680	2534	makeSomething(new Grid());
1681	2535	} else
1682		- if (source == ellipsoidItem)
	2536	+ if (source == ellipsoidItem \|\| source == sphereButton)
1683	2537	{
1684	2538	makeSomething(new Sphere());
1685	2539	} else
1686		- if (source == coneItem)
	2540	+ if (source == coneItem \|\| source == coneButton)
1687	2541	{
1688	2542	makeSomething(new Cone());
1689	2543	} else
1690		- if (source == torusItem)
	2544	+ if (source == torusItem \|\| source == torusButton)
1691	2545	{
1692	2546	makeSomething(new Torus());
1693	2547	} else
1694		- if (source == superItem)
	2548	+ if (source == superItem \|\| source == superButton)
1695	2549	{
1696	2550	makeSomething(new Superellipsoid());
1697	2551	} else
1698		- if (source == kleinItem)
	2552	+ if (source == kleinItem \|\| source == kleinButton)
1699	2553	{
1700	2554	makeSomething(new Klein());
1701	2555	} else
..	..	@@ -1715,7 +2569,7 @@
1715	2569	{
1716	2570	makeSomething(new BezierSurface());
1717	2571	} else
1718		- if (source == overlayItem)
	2572	+ if (source == overlayItem \|\| source == overlayButton)
1719	2573	{
1720	2574	/*
1721	2575	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1763,10 +2617,27 @@
1763	2617	s.setup();
1764	2618	makeSomething(s);
1765	2619	} else
1766		- if (source == lightItem)
	2620	+ if (source == lightItem \|\| source == lightButton)
1767	2621	{
1768	2622	makeSomething(new Light());
1769	2623	} else
	2624	+// if (source == skybox1Button \|\|
	2625	+// source == skybox2Button \|\|
	2626	+// source == skybox3Button \|\|
	2627	+// source == skybox4Button \|\|
	2628	+// source == skybox5Button \|\|
	2629	+// source == skybox6Button \|\|
	2630	+// source == skybox7Button \|\|
	2631	+// source == skybox11Button \|\|
	2632	+// source == skybox12Button \|\|
	2633	+// source == skybox13Button \|\|
	2634	+// source == skybox14Button \|\|
	2635	+// source == skybox15Button \|\|
	2636	+// source == skybox16Button \|\|
	2637	+// source == skybox17Button)
	2638	+// {
	2639	+// ChangeSkybox(source);
	2640	+// } else
1770	2641	if (source == csgItem)
1771	2642	{
1772	2643	group(new CSG());
..	..	@@ -1813,30 +2684,38 @@
1813	2684
1814	2685	group(g);
1815	2686	} else
1816		- if (source == loopItem)
	2687	+ if (source == loopItem \|\| source == loopButton)
1817	2688	{
	2689	+ if (!group.selection.isEmpty())
	2690	+ {
1818	2691	Composite csg = new GroupLeaf();
1819	2692	csg.count = 5;
1820		- group(csg);
1821		- Composite child = new cGroup();
	2693	+ Composite child = new cGroup("Branch");
1822	2694	csg.addChild(child);
1823	2695	child.addChild(csg);
	2696	+ group(csg);
	2697	+ }
1824	2698	} else
1825	2699	if (source == doubleItem)
1826	2700	{
1827		- Composite csg = new GroupLeaf();
	2701	+ if (!group.selection.isEmpty())
	2702	+ {
	2703	+ Composite csg = new GroupLeaf("Fork");
1828	2704	csg.count = 5;
	2705	+ Composite child = new cGroup("Branch A");
	2706	+ csg.addChild(child);
	2707	+ child.addChild(csg);
	2708	+ child = new cGroup("Branch B");
	2709	+ csg.addChild(child);
	2710	+ child.addChild(csg);
1829	2711	group(csg);
1830		- Composite child = new cGroup();
1831		- csg.addChild(child);
1832		- child.addChild(csg);
1833		- child = new cGroup();
1834		- csg.addChild(child);
1835		- child.addChild(csg);
	2712	+ }
1836	2713	} else
1837	2714	if (source == tripleItem)
1838	2715	{
1839		- Composite csg = new GroupLeaf();
	2716	+ if (!group.selection.isEmpty())
	2717	+ {
	2718	+ Composite csg = new GroupLeaf("Trident");
1840	2719	csg.count = 4;
1841	2720	group(csg);
1842	2721	Composite child = new cGroup();
..	..	@@ -1848,36 +2727,12 @@
1848	2727	child = new cGroup();
1849	2728	csg.addChild(child);
1850	2729	child.addChild(csg);
1851		- } else
1852		-
1853		- if (source == importGFDItem)
1854		- {
1855		- ImportGFD();
1856		- } else
1857		- if (source == importVRMLX3DItem)
1858		- {
1859		- ImportVRMLX3D();
1860		- } else
1861		- if (source == import3DSItem)
1862		- {
1863		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1864		- } else
1865		- if (source == importOBJItem)
1866		- {
1867		- //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1868		- FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
1869		- browser.setVisible(true);
1870		- String filename = browser.getFile();
1871		- if (filename != null && filename.length() > 0)
1872		- {
1873		- String fullname = browser.getDirectory() + filename;
1874		- makeSomething(ReadOBJ(fullname), true);
1875		- }
	2730	+ }
1876	2731	} else
1877	2732	if (source == computeAOItem)
1878	2733	{
1879	2734	Globals.drawMode = CameraPane.OCCLUSION;
1880		- Globals.theRenderer.repaint();
	2735	+ cameraView.repaint();
1881	2736	} else
1882	2737	if (source == recompileItem)
1883	2738	{
..	..	@@ -1892,7 +2747,7 @@
1892	2747	if (source == invariantsItem)
1893	2748	{
1894	2749	System.out.println("Invariants:");
1895		- Grafreed.grafreeD.universe.invariants();
	2750	+ Grafreed.grafreed.universe.invariants();
1896	2751	} else
1897	2752	if (source == memoryItem)
1898	2753	{
..	..	@@ -1911,6 +2766,65 @@
1911	2766	{
1912	2767	DumpObject();
1913	2768	} else
	2769	+ if (source == minButton)
	2770	+ {
	2771	+ Minimize();
	2772	+ } else
	2773	+ if (source == maxButton)
	2774	+ {
	2775	+ Maximize();
	2776	+ } else
	2777	+ if (source == fullButton)
	2778	+ {
	2779	+ ToggleFullScreen();
	2780	+ } else
	2781	+ if (source == collapseButton)
	2782	+ {
	2783	+ this.expandedLayout = radio.layout;
	2784	+ CollapseToolbar();
	2785	+ } else
	2786	+ if (source == maximize3DButton)
	2787	+ {
	2788	+ this.expandedLayout = radio.layout;
	2789	+ radio.layout = twoButton;
	2790	+ Show3DView();
	2791	+ CollapseToolbar();
	2792	+ } else
	2793	+ if (source == previousVersionButton)
	2794	+ {
	2795	+ // Go to previous version
	2796	+ //if (!Undo())
	2797	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2798	+ PreviousVersion();
	2799	+ } else
	2800	+ if (source == restoreButton)
	2801	+ {
	2802	+ // Restore current version
	2803	+ Restore();
	2804	+ //restoreButton.setEnabled(false);
	2805	+ } else
	2806	+ if (source == replaceButton)
	2807	+ {
	2808	+ // Overwrite current version
	2809	+ Replace();
	2810	+ //replaceButton.setEnabled(false);
	2811	+ } else
	2812	+ if (source == nextVersionButton)
	2813	+ {
	2814	+ // Go to next version
	2815	+ NextVersion();
	2816	+ } else
	2817	+ if (source == saveVersionButton)
	2818	+ {
	2819	+ // Save a new version
	2820	+ if (!Save(true))
	2821	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2822	+ } else
	2823	+ if (source == deleteVersionButton)
	2824	+ {
	2825	+ // Delete a new version
	2826	+ DeleteVersion();
	2827	+ } else
1914	2828	if (source == oneStepButton)
1915	2829	{
1916	2830	Globals.ONESTEP = true;
..	..	@@ -1918,17 +2832,14 @@
1918	2832	} else
1919	2833	if (source == screenfitButton)
1920	2834	{
1921		- //Reload(lastConverter, lastFilename, true);
1922	2835	ScreenFit();
1923	2836	} else
1924	2837	if (source == screenfitpointButton)
1925	2838	{
1926		- //Reload(lastConverter, lastFilename, true);
1927	2839	ScreenFitPoint();
1928	2840	} else
1929	2841	if (source == snapobjectButton)
1930	2842	{
1931		- //Reload(lastConverter, lastFilename, true);
1932	2843	SnapObject();
1933	2844	} else
1934	2845	// if (event.getSource() == recompileButton)
..	..	@@ -1964,6 +2875,14 @@
1964	2875	if (source == cutItem \|\| source == clearButton)
1965	2876	{
1966	2877	loadClipboard(true);
	2878	+ } else
	2879	+ if (source == undoItem)
	2880	+ {
	2881	+ PreviousVersion();
	2882	+ } else
	2883	+ if (source == redoItem)
	2884	+ {
	2885	+ NextVersion();
1967	2886	} else
1968	2887	if (source == duplicateItem)
1969	2888	{
..	..	@@ -2276,7 +3195,7 @@
2276	3195	{
2277	3196	RevertMeshes();
2278	3197	} else
2279		- if (source == resetMeshItem)
	3198	+ if (source == resetAllItem)
2280	3199	{
2281	3200	ResetAll();
2282	3201	} else
..	..	@@ -2284,7 +3203,7 @@
2284	3203	{
2285	3204	StepAll();
2286	3205	} else
2287		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3206	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2288	3207	{
2289	3208	//int indices[] = jList.getSelectedIndices();
2290	3209	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2296,9 +3215,9 @@
2296	3215	{
2297	3216	ClearSelection(true);
2298	3217	} else
2299		- if (source == grabItem)
	3218	+ if (source == grabItem \|\| source == groupButton)
2300	3219	{
2301		- group(new cGroup(), true);
	3220	+ group(new cGroup(), false); // true);
2302	3221	} else
2303	3222	if (source == hideItem)
2304	3223	{
..	..	@@ -2316,11 +3235,11 @@
2316	3235	{
2317	3236	makeSomething(new Camera());
2318	3237	} else
2319		- if (source == compositeItem)
	3238	+ if (source == compositeItem \|\| source == compositeButton)
2320	3239	{
2321	3240	group(new Composite());
2322	3241	} else
2323		- if (source == randomItem)
	3242	+ if (source == switchItem \|\| source == switchButton)
2324	3243	{
2325	3244	RandomNode random = new RandomNode();
2326	3245	group(random);
..	..	@@ -2422,7 +3341,7 @@
2422	3341	{
2423	3342	group(new cLinker());
2424	3343	} else
2425		- if (source == textureItem)
	3344	+ if (source == textureItem \|\| source == textureButton)
2426	3345	{
2427	3346	group(new TextureNode());
2428	3347	} else
..	..	@@ -2442,17 +3361,42 @@
2442	3361	{
2443	3362	CastShadow(2);
2444	3363	} else
2445		- if (source == ungroupItem)
	3364	+ if (source == ungroupItem \|\| source == ungroupButton)
2446	3365	{
2447		- //ungroup();
	3366	+ boolean canUngroup = true;
	3367	+
2448	3368	for (int i=0; i<group.selection.size(); i++)
2449	3369	{
2450		- Ungroup(group.selection.get(i));
	3370	+ Object3D selectedItem = group.selection.get(i);
	3371	+
	3372	+ if (selectedItem.Size() == 0)
	3373	+ {
	3374	+ // Cannot ungroup leaves
	3375	+ canUngroup = false;
	3376	+ break;
	3377	+ }
	3378	+
	3379	+ if (selectedItem == group)
	3380	+ {
	3381	+ // Cannot ungroup root
	3382	+ canUngroup = false;
	3383	+ break;
	3384	+ }
2451	3385	}
2452	3386
2453		- ClearSelection(false);
2454		-
2455		- refreshContents();
	3387	+ if (canUngroup)
	3388	+ {
	3389	+ for (int i=0; i<group.selection.size(); i++)
	3390	+ {
	3391	+ Object3D selectedItem = group.selection.get(i);
	3392	+
	3393	+ Ungroup(selectedItem);
	3394	+ }
	3395	+
	3396	+ ClearSelection(false);
	3397	+
	3398	+ refreshContents();
	3399	+ }
2456	3400	} else
2457	3401	if (source == genUVItem)
2458	3402	{
..	..	@@ -2464,7 +3408,7 @@
2464	3408	} else
2465	3409	if (source == genNormalsMESHItem)
2466	3410	{
2467		- GenNormals(true); // TODO
	3411	+ GenNormalsMESH();
2468	3412	} else
2469	3413	if (source == genNormalsORGANItem)
2470	3414	{
..	..	@@ -2529,6 +3473,22 @@
2529	3473	if (source == unmarkleavesItem)
2530	3474	{
2531	3475	MarkLeaves(false);
	3476	+ } else
	3477	+ if (source == rewindleavesItem)
	3478	+ {
	3479	+ RewindLeaves(true);
	3480	+ } else
	3481	+ if (source == unrewindleavesItem)
	3482	+ {
	3483	+ RewindLeaves(false);
	3484	+ } else
	3485	+ if (source == randomleavesItem)
	3486	+ {
	3487	+ RandomLeaves(true);
	3488	+ } else
	3489	+ if (source == unrandomleavesItem)
	3490	+ {
	3491	+ RandomLeaves(false);
2532	3492	} else
2533	3493	if (source == flipVItem)
2534	3494	{
..	..	@@ -2614,9 +3574,13 @@
2614	3574	{
2615	3575	SmoothMesh();
2616	3576	} else
2617		- if (source == transformgeometryItem)
	3577	+ if (source == transformGeometryItem)
2618	3578	{
2619	3579	TransformGeometry();
	3580	+ } else
	3581	+ if (source == transformChildrenItem)
	3582	+ {
	3583	+ TransformChildren();
2620	3584	} else
2621	3585	if (source == resetTransformItem)
2622	3586	{
..	..	@@ -2624,7 +3588,11 @@
2624	3588	} else
2625	3589	if (source == resetCentroidItem)
2626	3590	{
2627		- ResetCentroid();
	3591	+ ResetCentroid(true);
	3592	+ } else
	3593	+ if (source == resetCentroidXZItem)
	3594	+ {
	3595	+ ResetCentroid(false);
2628	3596	} else
2629	3597	if (source == resetParentItem)
2630	3598	{
..	..	@@ -2729,7 +3697,7 @@
2729	3697	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2730	3698	{
2731	3699	obj = (Object3D)e.nextElement();
2732		- obj.SetBumpTexture(null);
	3700	+ obj.ResetBumpTexture();
2733	3701	}
2734	3702
2735	3703	refreshContents();
..	..	@@ -2745,6 +3713,31 @@
2745	3713
2746	3714	refreshContents();
2747	3715	} else
	3716	+ if (source == embedTexturesItem)
	3717	+ {
	3718	+ Object3D obj;
	3719	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3720	+ {
	3721	+ obj = (Object3D)e.nextElement();
	3722	+ obj.EmbedTextures(true);
	3723	+ }
	3724	+
	3725	+ refreshContents();
	3726	+ } else
	3727	+ if (source == deEmbedTexturesItem)
	3728	+ {
	3729	+ Object3D obj;
	3730	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3731	+ {
	3732	+ obj = (Object3D)e.nextElement();
	3733	+ obj.EmbedTextures(false);
	3734	+ }
	3735	+
	3736	+ CameraPane.texturepigment.clear();
	3737	+ CameraPane.texturebump.clear();
	3738	+
	3739	+ refreshContents();
	3740	+ } else
2748	3741	if (source == flashSelectionButton)
2749	3742	{
2750	3743	CameraPane.flash = true;
..	..	@@ -2756,42 +3749,36 @@
2756	3749	if (source == twoButton)
2757	3750	{
2758	3751	radio.layout = twoButton;
2759		- // bug
2760		- //gridPanel.setDividerLocation(1.0);
2761		- //bigPanel.setDividerLocation(0.0);
2762		-// bigThree.remove(scenePanel);
2763		-// bigThree.remove(centralPanel);
2764		-// bigThree.remove(XYZPanel);
2765		-// aWindowConstraints.gridx = 0;
2766		-// aWindowConstraints.gridy = 0;
2767		-// aWindowConstraints.gridwidth = 1;
2768		-// // aConstraints.gridheight = 3;
2769		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2770		-// aWindowConstraints.weightx = 0;
2771		-// aWindowConstraints.weighty = 1;
2772		-// //bigThree.add(jtp, aWindowConstraints);
2773		-// aWindowConstraints.weightx = 1;
2774		-// aWindowConstraints.gridwidth = 3;
2775		-// // aConstraints.gridheight = 3;
2776		-// aWindowConstraints.gridx = 1;
2777		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
2778		-// bigThree.add(centralPanel, aWindowConstraints);
2779		-// aWindowConstraints.weightx = 0;
2780		-// aWindowConstraints.gridx = 4;
2781		-// aWindowConstraints.gridwidth = 1;
2782		-// // aConstraints.gridheight = 3;
2783		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2784		-// //bigThree.add(XYZPanel, aWindowConstraints);
2785		-// scenePanel.setVisible(false);
2786		-// centralPanel.setVisible(true);
2787		-// XYZPanel.setVisible(false);
2788		- bigThree.ClearUI();
2789		- bigThree.add(centralPanel);
2790		- bigThree.FlushUI();
	3752	+
	3753	+ if (CameraPane.FULLSCREEN)
	3754	+ fullscreenLayout = radio.layout;
	3755	+
	3756	+ Show3DView();
	3757	+
	3758	+ cameraView.requestFocusInWindow();
	3759	+
	3760	+// refreshContents(true);
	3761	+//
	3762	+// try
	3763	+// {
	3764	+// java.awt.Robot bot = new java.awt.Robot();
	3765	+// int mask = InputEvent.BUTTON1_MASK;
	3766	+// bot.mouseMove(100, 100);
	3767	+// bot.mousePress(mask);
	3768	+// bot.mouseRelease(mask);
	3769	+// }
	3770	+// catch (Exception e)
	3771	+// {
	3772	+//
	3773	+// }
	3774	+
2791	3775	} else
2792	3776	if (source == threeButton)
2793	3777	{
2794	3778	radio.layout = threeButton;
	3779	+
	3780	+ if (CameraPane.FULLSCREEN)
	3781	+ fullscreenLayout = radio.layout;
2795	3782
2796	3783	// bigThree.remove(scenePanel);
2797	3784	// bigThree.remove(centralPanel);
..	..	@@ -2821,13 +3808,18 @@
2821	3808	// centralPanel.setVisible(true);
2822	3809	// XYZPanel.setVisible(true);
2823	3810	bigThree.ClearUI();
	3811	+ bigThree.add(scenePanel);
2824	3812	bigThree.add(centralPanel);
2825		- bigThree.add(XYZPanel);
2826	3813	bigThree.FlushUI();
	3814	+
	3815	+ cameraView.requestFocusInWindow();
2827	3816	} else
2828	3817	if (source == fourButton)
2829	3818	{
2830	3819	radio.layout = fourButton;
	3820	+
	3821	+ if (CameraPane.FULLSCREEN)
	3822	+ fullscreenLayout = radio.layout;
2831	3823
2832	3824	// bigThree.remove(scenePanel);
2833	3825	// bigThree.remove(centralPanel);
..	..	@@ -2859,10 +3851,15 @@
2859	3851	bigThree.ClearUI();
2860	3852	bigThree.add(scenePanel);
2861	3853	bigThree.FlushUI();
	3854	+
	3855	+ cameraView.requestFocusInWindow();
2862	3856	} else
2863	3857	if (source == sixButton)
2864	3858	{
2865	3859	radio.layout = sixButton;
	3860	+
	3861	+ if (CameraPane.FULLSCREEN)
	3862	+ fullscreenLayout = radio.layout;
2866	3863
2867	3864	// bigThree.remove(scenePanel);
2868	3865	// bigThree.remove(centralPanel);
..	..	@@ -2892,13 +3889,18 @@
2892	3889	// centralPanel.setVisible(true);
2893	3890	// XYZPanel.setVisible(false);
2894	3891	bigThree.ClearUI();
2895		- bigThree.add(scenePanel);
2896	3892	bigThree.add(centralPanel);
	3893	+ bigThree.add(scenePanel);
2897	3894	bigThree.FlushUI();
	3895	+
	3896	+ cameraView.requestFocusInWindow();
2898	3897	} else
2899	3898	if (source == sevenButton)
2900	3899	{
2901	3900	radio.layout = sevenButton;
	3901	+
	3902	+ if (CameraPane.FULLSCREEN)
	3903	+ fullscreenLayout = radio.layout;
2902	3904
2903	3905	// bigThree.remove(scenePanel);
2904	3906	// bigThree.remove(centralPanel);
..	..	@@ -2932,9 +3934,12 @@
2932	3934	bigThree.add(centralPanel);
2933	3935	bigThree.add(XYZPanel);
2934	3936	bigThree.FlushUI();
	3937	+
	3938	+ cameraView.requestFocusInWindow();
2935	3939	} else
2936	3940	if (source == rootButton)
2937	3941	{
	3942	+ Replace();
2938	3943	Object3D obj;
2939	3944	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2940	3945	{
..	..	@@ -2943,6 +3948,7 @@
2943	3948	EditObject(obj);
2944	3949	}
2945	3950
	3951	+ cameraView.requestFocusInWindow();
2946	3952	refreshContents(true);
2947	3953	} else
2948	3954	if (source == closeButton)
..	..	@@ -2952,22 +3958,37 @@
2952	3958	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2953	3959	{
2954	3960	ab = (cRadio)e.nextElement();
2955		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3961	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2956	3962	{
	3963	+ // Patch to avoid bug with transparency.
	3964	+ if (!ab.hadMaterial)
	3965	+ {
	3966	+ ab.object.material = null;
	3967	+ }
	3968	+
2957	3969	buttonGroup.remove(ab);
2958	3970	radioPanel.remove(ab);
2959	3971
2960		- ab.GetObject().editWindow = null;
	3972	+ //ab.GetObject().editWindow = null;
	3973	+ ab.GetObject().manipWindow = null;
2961	3974	// ab.GetObject().objectUI = null; // ?????????
2962	3975
2963	3976	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2964	3977	break;
2965	3978	}
2966	3979	}
	3980	+
	3981	+ cameraView.requestFocusInWindow();
2967	3982	refreshContents(true);
2968	3983	} else
2969	3984	if (source == editItem \|\| source == editButton)
2970	3985	{
	3986	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3987	+ {
	3988	+ Object3D child = (Object3D)e.nextElement();
	3989	+ child.pinned = true;
	3990	+ }
	3991	+
2971	3992	EditSelection(false);
2972	3993	} else
2973	3994	if (source == uneditButton)
..	..	@@ -2976,11 +3997,12 @@
2976	3997	{
2977	3998	Object3D child = (Object3D)e.nextElement();
2978	3999	if(child.editWindow != null)
2979		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4000	+ child.pinned = false;
2980	4001	child.CloseUI();
2981	4002	listUI.remove(child);
	4003	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2982	4004
2983		- child.editWindow = null; // ???????????
	4005	+ //child.editWindow = null; // ???????????
2984	4006	}
2985	4007	objEditor.ctrlPanel.FlushUI();
2986	4008	//objEditor.jTree.clearSelection();
..	..	@@ -2993,16 +4015,18 @@
2993	4015	//copy.ClearUI();
2994	4016	for (Object3D obj : listUI)
2995	4017	{
	4018	+ obj.pinned = false;
2996	4019	obj.CloseUI();
2997	4020	}
2998	4021	listUI.clear();
	4022	+ SetPinStates(group.selection.size() > 0);
2999	4023	refreshContents(true);
3000	4024	} else
3001	4025	if (source == allParamsButton)
3002	4026	{
3003	4027	assert(copy == group);
3004	4028
3005		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4029	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3006	4030
3007	4031	for (Object3D obj : listUI)
3008	4032	{
..	..	@@ -3051,6 +4075,7 @@
3051	4075	}
3052	4076
3053	4077	copy = group;
	4078	+
3054	4079	//Globals.theRenderer.object = group;
3055	4080	if(!useclient)
3056	4081	{
..	..	@@ -3066,20 +4091,61 @@
3066	4091	frontView.object = group;
3067	4092	sideView.object = group;
3068	4093	}
3069		- group.editWindow = this;
	4094	+
	4095	+// fix "+" issue
	4096	+ //group.editWindow = this;
	4097	+ group.manipWindow = this;
	4098	+
3070	4099	/*
3071	4100	currentLayout = radio.layout;
3072	4101	if (currentLayout == null)
3073	4102	currentLayout = sevenButton;
3074	4103	*/
3075	4104	radio.layout.doClick();
	4105	+
	4106	+ assert(copy instanceof Composite);
	4107	+
	4108	+ if (copy.versionlist == null)
	4109	+ {
	4110	+ copy.versionlist = new Object3D[100];
	4111	+ copy.versionindex = -1;
	4112	+
	4113	+ Save(true);
	4114	+ }
	4115	+
	4116	+ SetVersionStates();
	4117	+
	4118	+ ClearUnpinned();
	4119	+
	4120	+ //Grafreed.Assert(group != null);
	4121	+ //Grafreed.Assert(group.selection != null);
	4122	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4123	+ if (group.selection == null \|\| group.selection.size() == 1)
	4124	+ EditSelection(false);
3076	4125	keepparent = group.parent;
3077	4126	// PARENT = NULL or not???
3078	4127	//group.parent = null; // ROOT
3079	4128	//group.attributes = -1;
3080	4129	ResetModel();
	4130	+
	4131	+ cameraView.requestFocusInWindow();
3081	4132	refreshContents(true);
3082		- }
	4133	+ } else if (event.getSource() == editCameraItem)
	4134	+ {
	4135	+ cameraView.ProtectCamera();
	4136	+ cameraView.requestFocusInWindow();
	4137	+ cameraView.repaint();
	4138	+ return;
	4139	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	4140	+ {
	4141	+ cameraView.RevertCamera();
	4142	+ cameraView.requestFocusInWindow();
	4143	+ cameraView.repaint();
	4144	+ return;
	4145	+ // } else if (event.getSource() == textureButton)
	4146	+ // {
	4147	+ // return; // true;
	4148	+ }
3083	4149	else
3084	4150	{
3085	4151	//return super.action(event, arg);
..	..	@@ -3088,7 +4154,6 @@
3088	4154	}
3089	4155
3090	4156	boolean useclient = false;
3091		- cRadio radio;
3092	4157
3093	4158	void ToggleRoot()
3094	4159	{
..	..	@@ -3140,6 +4205,28 @@
3140	4205	refreshContents();
3141	4206	}
3142	4207
	4208	+ void TransformChildren()
	4209	+ {
	4210	+ Object3D obj;
	4211	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4212	+ {
	4213	+ obj = (Object3D)e.nextElement();
	4214	+ obj.KeepTextureMatrices();
	4215	+ obj.TransformChildren();
	4216	+ obj.RestoreTextureMatrices();
	4217	+
	4218	+// if (obj.parent == null)
	4219	+// {
	4220	+// System.out.println("NULL PARENT!");
	4221	+// new Exception().printStackTrace();
	4222	+// }
	4223	+// else
	4224	+// TouchTransform(obj);
	4225	+// //obj.parent.Touch();
	4226	+ }
	4227	+
	4228	+ refreshContents();
	4229	+ }
3143	4230
3144	4231	void ResetTransform()
3145	4232	{
..	..	@@ -3252,7 +4339,7 @@
3252	4339	refreshContents();
3253	4340	}
3254	4341
3255		- void ResetCentroid()
	4342	+ void ResetCentroid(boolean full)
3256	4343	{
3257	4344	Object3D obj;
3258	4345	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3267,12 +4354,16 @@
3267	4354	LA.matIdentity(Object3D.mat);
3268	4355	obj.getBounds(minima, maxima, false);
3269	4356	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3270		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	4357	+ if (full)
	4358	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3271	4359	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3272	4360	obj.TransformMesh(Object3D.mat);
	4361	+
3273	4362	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3274		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	4363	+ if (full)
	4364	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3275	4365	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	4366	+
3276	4367	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3277	4368	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3278	4369	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3301,7 +4392,8 @@
3301	4392
3302	4393	int size = obj.MemorySize();
3303	4394
3304		- System.err.println((size/1024) + " KB is the size of " + obj);
	4395	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4396	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3305	4397	}
3306	4398	}
3307	4399	catch (Exception e)
..	..	@@ -3382,6 +4474,13 @@
3382	4474	void GenNormals(boolean crease)
3383	4475	{
3384	4476	group.GenNormalsS(crease);
	4477	+
	4478	+ refreshContents();
	4479	+ }
	4480	+
	4481	+ void GenNormalsMESH()
	4482	+ {
	4483	+ group.GenNormalsMeshS();
3385	4484
3386	4485	refreshContents();
3387	4486	}
..	..	@@ -3613,7 +4712,16 @@
3613	4712	String pigment = Object3D.GetPigment(tex);
3614	4713	//String bump = Object3D.GetBump(tex);
3615	4714
3616		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4715	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4716	+
	4717	+ try
	4718	+ {
	4719	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
	4720	+ }
	4721	+ catch (Exception e)
	4722	+ {
	4723	+ System.err.println("FAIL: " + node);
	4724	+ }
3617	4725
3618	4726	double s = v.s;
3619	4727
..	..	@@ -4000,6 +5108,18 @@
4000	5108	refreshContents();
4001	5109	}
4002	5110
	5111	+ void RewindLeaves(boolean hide)
	5112	+ {
	5113	+ group.selection.RewindLeaves(hide);
	5114	+ refreshContents();
	5115	+ }
	5116	+
	5117	+ void RandomLeaves(boolean hide)
	5118	+ {
	5119	+ group.selection.RandomLeaves(hide);
	5120	+ refreshContents();
	5121	+ }
	5122	+
4003	5123	void SetTexRes(int tr)
4004	5124	{
4005	5125	group.selection.SetTexRes(tr);
..	..	@@ -4071,28 +5191,25 @@
4071	5191	// }
4072	5192	// }
4073	5193
4074		- static boolean allparams = true;
4075		-
4076		- static Vector<Object3D> listUI = new Vector<Object3D>();
4077		-
4078	5194	void EditSelection(boolean newWindow)
4079	5195	{
	5196	+ if (group.selection == null)
	5197	+ {
	5198	+ EditElement(group, newWindow); // ? new
	5199	+ return;
	5200	+ }
	5201	+
4080	5202	// aConstraints.gridy = 0;
4081	5203	for (int i=0; i<group.selection.size(); i++)
4082	5204	{
4083	5205	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4084	5206	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4085		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5207	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4086	5208
4087	5209	Object3D elem = (Object3D)group.selection.elementAt(i);
4088		- if(elem != group)
	5210	+ if(elem != group \|\| !newWindow)
4089	5211	{
4090		- // if (!(elem instanceof Composite))
4091		- // newWindow = false;
4092		- listUI.add(elem);
4093		- elem.openEditWindow(this, newWindow); //, false);
4094		- System.out.println("edit : " + elem);
4095		- elem.editWindow.refreshContents(true); // ? new
	5212	+ EditElement(elem, newWindow); // ? new
4096	5213	}
4097	5214	}
4098	5215	}
..	..	@@ -4155,9 +5272,7 @@
4155	5272
4156	5273	freezemodel = false;
4157	5274	}
4158		-
4159		- boolean flashIt = true;
4160		-
	5275	+
4161	5276	public void valueChanged(TreeSelectionEvent e)
4162	5277	//public boolean handleEvent(Event event)
4163	5278	{
..	..	@@ -4167,7 +5282,8 @@
4167	5282	//new Exception().printStackTrace();
4168	5283
4169	5284	freezemodel = true;
4170		-
	5285	+ ClearUnpinned();
	5286	+
4171	5287	/**/
4172	5288	//switch (event.id)
4173	5289	{
..	..	@@ -4175,7 +5291,6 @@
4175	5291	//case 702: // Event.LIST_DESELECT
4176	5292	group.deselectAll();
4177	5293	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4178		- objEditor.ClearInfo(); // .GetMaterial());
4179	5294	if (tps != null)
4180	5295	{
4181	5296	for (int i=0; i < tps.length; i++)
..	..	@@ -4184,10 +5299,8 @@
4184	5299
4185	5300	//if (child.parent != null)
4186	5301	//child.parent.addSelectee(child);
	5302	+ objEditor.SetMaterial(child);
4187	5303	group.addSelectee(child);
4188		- objEditor.SetMaterial(child); // .GetMaterial());
4189		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4190		- System.err.println("info : " + child.GetPath());
4191	5304	}
4192	5305	}
4193	5306	// else
..	..	@@ -4197,20 +5310,28 @@
4197	5310	// System.err.println("info : " + group.GetPath());
4198	5311	// }
4199	5312
4200		- objEditor.SetText(); // jan 2014
4201		-
4202		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	5313	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4203	5314	CameraPane.flash = true;
4204	5315
4205		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5316	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4206	5317	// a camera
4207	5318	{
4208		- CameraPane.camerachangeframe = 0; // don't refuse it
4209		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5319	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5320	+ {
	5321	+ CameraPane.camerachangeframe = 0; // don't refuse it
	5322	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5323	+ }
4210	5324	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4211	5325	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4212	5326	}
4213	5327
	5328	+ if (tps != null && tps.length == 1)
	5329	+ {
	5330	+ EditSelection(false);
	5331	+ }
	5332	+
	5333	+ SetPinStates(tps != null && tps.length > 0);
	5334	+
4214	5335	refreshContents();
4215	5336	//return true;
4216	5337	}
..	..	@@ -4219,6 +5340,51 @@
4219	5340
4220	5341	freezemodel = false;
4221	5342	}
	5343	+
	5344	+ void SetPinStates(boolean enabled)
	5345	+ {
	5346	+ editButton.setEnabled(enabled);
	5347	+ uneditButton.setEnabled(enabled);
	5348	+ //unselectButton.setEnabled(enabled);
	5349	+ flashSelectionButton.setEnabled(enabled);
	5350	+
	5351	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5352	+
	5353	+ boolean allComposites = true;
	5354	+
	5355	+ if (group.selection != null)
	5356	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5357	+ {
	5358	+ if (!(e.nextElement() instanceof Composite))
	5359	+ {
	5360	+ allComposites = false;
	5361	+ break;
	5362	+ }
	5363	+ }
	5364	+
	5365	+ rootButton.setEnabled(allComposites);
	5366	+ }
	5367	+
	5368	+ void refreshContents(boolean cp)
	5369	+ {
	5370	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5371	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5372	+ {
	5373	+ objEditor.ClearInfo(); // .GetMaterial());
	5374	+
	5375	+ for (int i=0; i < group.selection.Size(); i++)
	5376	+ {
	5377	+ Object3D child = (Object3D) group.selection.get(i);
	5378	+
	5379	+ objEditor.AddInfo(child, this, true);
	5380	+// System.err.println("info : " + child.GetPath());
	5381	+ }
	5382	+
	5383	+ objEditor.SetText(); // jan 2014
	5384	+ }
	5385	+
	5386	+ super.refreshContents(cp);
	5387	+ }
4222	5388
4223	5389	void linkSomething(Object3D thing)
4224	5390	{
..	..	@@ -4290,6 +5456,7 @@
4290	5456	{
4291	5457	if (group.selection.isEmpty())
4292	5458	return;
	5459	+
4293	5460	Grafreed.clipboardIsTempGroup = false;
4294	5461	Composite tGroup = null;
4295	5462	if (group.selection.size() > 0) // 1)
..	..	@@ -4300,6 +5467,8 @@
4300	5467
4301	5468	if (cut)
4302	5469	{
	5470	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5471	+// Save();
4303	5472	//int indices[] = jList.getSelectedIndices();
4304	5473	//for (int i = indices.length - 1; i >= 0; i--)
4305	5474	//jList.remove(indices[i]);
..	..	@@ -4389,8 +5558,10 @@
4389	5558	}
4390	5559
4391	5560	}
	5561	+
4392	5562	if (Grafreed.clipboardIsTempGroup)
4393	5563	Grafreed.clipboard = tGroup;
	5564	+
4394	5565	if (cut)
4395	5566	{
4396	5567	ResetModel();
..	..	@@ -4400,6 +5571,10 @@
4400	5571
4401	5572	void paste(boolean expand)
4402	5573	{
	5574	+ if (Globals.REPLACEONMAKE)
	5575	+ Save();
	5576	+ boolean keep = Globals.REPLACEONMAKE;
	5577	+ Globals.REPLACEONMAKE = false;
4403	5578	// if (GrafreeD.clipboard == null)
4404	5579	// return;
4405	5580	boolean first = true;
..	..	@@ -4459,6 +5634,7 @@
4459	5634	Grafreed.clipboard.get(0).parent = keepparent;
4460	5635	}
4461	5636
	5637	+ Globals.REPLACEONMAKE = keep;
4462	5638	ResetModel();
4463	5639	refreshContents();
4464	5640	}
..	..	@@ -4594,6 +5770,10 @@
4594	5770
4595	5771	void group(Object3D csg, boolean grab)
4596	5772	{
	5773	+ if (Globals.REPLACEONMAKE)
	5774	+ Save();
	5775	+ boolean keep = Globals.REPLACEONMAKE;
	5776	+ Globals.REPLACEONMAKE = false;
4597	5777	if (//false) // why??
4598	5778	!group.selection.isEmpty())
4599	5779	{
..	..	@@ -4707,10 +5887,15 @@
4707	5887	//node.add(csg);
4708	5888	//makeSomething(node);
4709	5889	makeSomething(csg);
	5890	+ Globals.REPLACEONMAKE = keep;
4710	5891	}
4711	5892
4712	5893	void Ungroup(Object3D g)
4713	5894	{
	5895	+ if (Globals.REPLACEONMAKE)
	5896	+ Save();
	5897	+ boolean keep = Globals.REPLACEONMAKE;
	5898	+ Globals.REPLACEONMAKE = false;
4714	5899	if (g instanceof HiddenObject)
4715	5900	{
4716	5901	HiddenObject h = (HiddenObject) g;
..	..	@@ -4727,6 +5912,7 @@
4727	5912	objEditor.makeSomething(g.get(i), false);
4728	5913	}
4729	5914	}
	5915	+ Globals.REPLACEONMAKE = keep;
4730	5916	}
4731	5917
4732	5918	void ungroup()
..	..	@@ -4922,21 +6108,6 @@
4922	6108	}
4923	6109	*/
4924	6110
4925		- void ImportGFD()
4926		- {
4927		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4928		- browser.show();
4929		- String filename = browser.getFile();
4930		- if (filename != null && filename.length() > 0)
4931		- {
4932		- String fullname = browser.getDirectory() + filename;
4933		-
4934		- //Object3D readobj =
4935		- objEditor.ReadGFD(fullname, objEditor);
4936		- //makeSomething(readobj);
4937		- }
4938		- }
4939		-
4940	6111	/*
4941	6112	public void Callback(Object obj)
4942	6113	{
..	..	@@ -4960,23 +6131,6 @@
4960	6131	}
4961	6132	*/
4962	6133
4963		- void ImportVRMLX3D()
4964		- {
4965		- if (Grafreed.standAlone)
4966		- {
4967		- /**/
4968		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4969		- browser.show();
4970		- String filename = browser.getFile();
4971		- if (filename != null && filename.length() > 0)
4972		- {
4973		- String fullname = browser.getDirectory() + filename;
4974		- LoadVRMLX3D(fullname);
4975		- }
4976		- /**/
4977		- }
4978		- }
4979		-
4980	6134	String GetFile(String dialogName)
4981	6135	{
4982	6136	if (Grafreed.standAlone)
..	..	@@ -5047,7 +6201,43 @@
5047	6201	cButton clearpanelButton;
5048	6202	cButton unselectButton;
5049	6203
	6204	+ cButton restoreCameraButton;
	6205	+
5050	6206	cButton oneStepButton;
	6207	+
	6208	+ cButton groupButton;
	6209	+ cButton ungroupButton;
	6210	+ cButton compositeButton;
	6211	+ cButton switchButton;
	6212	+ cButton loopButton;
	6213	+ cButton textureButton;
	6214	+
	6215	+ cButton skybox1Button;
	6216	+ cButton skybox2Button;
	6217	+ cButton skybox3Button;
	6218	+ cButton skybox4Button;
	6219	+ cButton skybox5Button;
	6220	+ cButton skybox6Button;
	6221	+ cButton skybox7Button;
	6222	+
	6223	+ cButton skybox11Button;
	6224	+ cButton skybox12Button;
	6225	+ cButton skybox13Button;
	6226	+ cButton skybox14Button;
	6227	+ cButton skybox15Button;
	6228	+ cButton skybox16Button;
	6229	+ cButton skybox17Button;
	6230	+
	6231	+ cButton gridButton;
	6232	+ cButton boxButton;
	6233	+ cButton sphereButton;
	6234	+ cButton coneButton;
	6235	+ cButton torusButton;
	6236	+ cButton superButton;
	6237	+ cButton kleinButton;
	6238	+ cButton particlesButton;
	6239	+ cButton overlayButton;
	6240	+ cButton lightButton;
5051	6241
5052	6242	cButton screenfitButton;
5053	6243	cButton screenfitpointButton;
..	..	@@ -5060,14 +6250,6 @@
5060	6250
5061	6251	cButton setsupportButton;
5062	6252
5063		- cButton twoButton;
5064		- cButton sixButton;
5065		- cButton threeButton;
5066		- cButton sevenButton;
5067		- cButton fourButton; // full panel
5068		- cButton oneButton; // full XYZ
5069		- //cButton currentLayout;
5070		-
5071	6253	//
5072	6254	//Composite
5073	6255	Object3D // to do !!
..	..	@@ -5077,10 +6259,12 @@
5077	6259	//JTree jTree;
5078	6260	private MenuItem lookAtItem;
5079	6261	private MenuItem lookFromItem;
5080		- private MenuItem switchItem;
5081		- private MenuItem cutItem;
5082		- private MenuItem duplicateItem;
5083		- private MenuItem cloneItem;
	6262	+ private MenuItem switchViewItem;
	6263	+ private JMenuItem cutItem;
	6264	+ private MenuItem undoItem;
	6265	+ private MenuItem redoItem;
	6266	+ private JMenuItem duplicateItem;
	6267	+ private JMenuItem cloneItem;
5084	6268	private MenuItem cloneSupportItem;
5085	6269	private MenuItem overwriteGeoItem;
5086	6270	private MenuItem overwriteMatItem;
..	..	@@ -5092,7 +6276,7 @@
5092	6276	private MenuItem linkverticesItem;
5093	6277	private MenuItem relinkverticesItem;
5094	6278	private MenuItem setMasterItem;
5095		- private MenuItem resetMeshItem;
	6279	+ private MenuItem resetAllItem;
5096	6280	private MenuItem stepAllItem;
5097	6281	private MenuItem revertMeshItem;
5098	6282	private MenuItem poseMeshItem;
..	..	@@ -5101,13 +6285,13 @@
5101	6285	private MenuItem cloneGeometriesItem;
5102	6286	private MenuItem shareGeometriesItem;
5103	6287	private MenuItem mergeGeometriesItem;
5104		- private MenuItem copyItem;
	6288	+ private JMenuItem copyItem;
5105	6289	private MenuItem pasteItem;
5106		- private MenuItem pasteIntoItem;
5107		- private MenuItem pasteLinkItem;
5108		- private MenuItem pasteCloneItem;
5109		- private MenuItem pasteExpandItem;
5110		- private MenuItem clearItem;
	6290	+ private JMenuItem pasteIntoItem;
	6291	+ private JMenuItem pasteLinkItem;
	6292	+ private JMenuItem pasteCloneItem;
	6293	+ private JMenuItem pasteExpandItem;
	6294	+ private JMenuItem deleteItem;
5111	6295	private MenuItem clearAllItem;
5112	6296	private MenuItem genUVItem;
5113	6297	private MenuItem genNormalsMESHItem;
..	..	@@ -5142,6 +6326,10 @@
5142	6326	private MenuItem showleavesItem;
5143	6327	private MenuItem markleavesItem;
5144	6328	private MenuItem unmarkleavesItem;
	6329	+ private MenuItem rewindleavesItem;
	6330	+ private MenuItem unrewindleavesItem;
	6331	+ private MenuItem randomleavesItem;
	6332	+ private MenuItem unrandomleavesItem;
5145	6333
5146	6334	private MenuItem flipVItem;
5147	6335	private MenuItem unflipVItem;
..	..	@@ -5153,15 +6341,17 @@
5153	6341	private MenuItem panoTexturesItem;
5154	6342
5155	6343	private MenuItem resetCentroidItem;
5156		- private MenuItem transformgeometryItem;
	6344	+ private MenuItem resetCentroidXZItem;
5157	6345	private MenuItem resetTransformItem;
	6346	+ private MenuItem transformGeometryItem;
	6347	+ private MenuItem transformChildrenItem;
5158	6348	private MenuItem hideItem;
5159	6349	private MenuItem grabItem;
5160	6350	private MenuItem backItem;
5161	6351	private MenuItem frontItem;
5162	6352	private MenuItem cameraItem;
5163	6353	private MenuItem compositeItem;
5164		- private MenuItem randomItem;
	6354	+ private MenuItem switchItem;
5165	6355	private MenuItem physicsItem;
5166	6356	private MenuItem frameselectorItem;
5167	6357	private MenuItem scriptNodeItem;
..	..	@@ -5169,7 +6359,7 @@
5169	6359	private MenuItem switchTransfoItem;
5170	6360	private MenuItem morphItem;
5171	6361	private MenuItem linkerItem;
5172		- private MenuItem ungroupItem;
	6362	+ private JMenuItem ungroupItem;
5173	6363	private MenuItem editItem;
5174	6364	private MenuItem openWindowItem;
5175	6365	private MenuItem editLeafItem;
..	..	@@ -5185,6 +6375,8 @@
5185	6375	private MenuItem attachBumpItem;
5186	6376	private MenuItem detachBumpItem;
5187	6377	private MenuItem pigmentBumpItem;
	6378	+ private MenuItem embedTexturesItem;
	6379	+ private MenuItem deEmbedTexturesItem;
5188	6380
5189	6381	private MenuItem particleItem;
5190	6382	private MenuItem ragdollItem;
..	..	@@ -5223,11 +6415,6 @@
5223	6415	private MenuItem doubleItem;
5224	6416	private MenuItem tripleItem;
5225	6417
5226		- private MenuItem importGFDItem;
5227		- private MenuItem importVRMLX3DItem;
5228		- private MenuItem import3DSItem;
5229		- private MenuItem importOBJItem;
5230		-
5231	6418	private MenuItem computeAOItem;
5232	6419	private MenuItem recompileItem;
5233	6420	private MenuItem editScriptItem;
..	..	@@ -5237,4 +6424,8 @@
5237	6424	private MenuItem analyzeItem;
5238	6425	private MenuItem dumpItem;
5239	6426	//boolean freezemodel = false;
	6427	+
	6428	+ Menu cameraMenu;
	6429	+ MenuItem editCameraItem;
	6430	+ MenuItem restoreCameraItem;
5240	6431	}