~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -16,6 +16,7 @@
16	16	//import buoy.widget.BFileChooser;
17	17
18	18	class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
	19	+ Grafreed.iResourceCallBack,
19	20	ObjectUI,
20	21	Runnable,
21	22	ActionListener,
..	..	@@ -23,6 +24,360 @@
23	24	DragGestureListener, DragSourceListener, DropTargetListener,
24	25	ItemListener // ListSelectionListener
25	26	{
	27	+
	28	+ public void AddSkyboxButton(String f, String s, cGridBag row)
	29	+ {
	30	+ cButton skyboxButton;
	31	+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
	32	+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Globals.NIMBUSLAF));
	33	+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
	34	+ skyboxButton.setToolTipText(s.equals("") ? "No background" : s);
	35	+ skyboxButton.addActionListener(new ActionListener()
	36	+ {
	37	+ @Override
	38	+ public void actionPerformed(ActionEvent e)
	39	+ {
	40	+ ChangeSkybox(path);
	41	+ }
	42	+ });
	43	+ }
	44	+
	45	+ public void AddTextureButton(String f, String c, final String t, int count, cGridBag row)
	46	+ {
	47	+ cButton textureButton;
	48	+ final String path = "textures/" + f + "/" + c + "/"; // + t;
	49	+ row.add(textureButton = GetButton(path + "icons/" + t, !Globals.NIMBUSLAF));
	50	+ textureButton.setToolTipText(c + count);
	51	+ textureButton.addActionListener(new ActionListener()
	52	+ {
	53	+ @Override
	54	+ public void actionPerformed(ActionEvent e)
	55	+ {
	56	+ ChangeTexture(path + t);
	57	+ }
	58	+ });
	59	+ }
	60	+
	61	+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
	62	+ {
	63	+ cGridBag tab0 = new cGridBag().setVertical(true);
	64	+
	65	+ tab0.setName("Urban");
	66	+ skyboxpanel.add(tab0);
	67	+
	68	+ cGridBag row0 = new cGridBag();
	69	+ cGridBag row1 = new cGridBag();
	70	+ cGridBag row2 = new cGridBag();
	71	+ cGridBag row3 = new cGridBag();
	72	+ cGridBag row4 = new cGridBag();
	73	+ cGridBag row5 = new cGridBag();
	74	+ cGridBag row6 = new cGridBag();
	75	+
	76	+ AddSkyboxButton("default", "", row0);
	77	+ //AddSkyboxButton("default", "cornell", row0);
	78	+ AddSkyboxButton("penguins", "dust", row0);
	79	+ AddSkyboxButton("penguins", "tropic", row0);
	80	+ AddSkyboxButton("penguins", "yonder", row0);
	81	+
	82	+ AddSkyboxButton("default", "uffizi", row1);
	83	+ AddSkyboxButton("bridge", "Bridge", row1);
	84	+ AddSkyboxButton("bridge", "Bridge2", row1);
	85	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	86	+
	87	+ AddSkyboxButton("urban", "Parliament", row2);
	88	+ AddSkyboxButton("urban", "Roundabout", row2);
	89	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	90	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	91	+
	92	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	93	+ AddSkyboxButton("urban", "UnionSquare", row3);
	94	+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
	95	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	96	+
	97	+ AddSkyboxButton("park", "Buddha", row4);
	98	+ AddSkyboxButton("park", "CNTower2", row4);
	99	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	100	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	101	+
	102	+ AddSkyboxButton("park", "Park", row5);
	103	+ AddSkyboxButton("park", "Pond", row5);
	104	+ AddSkyboxButton("park", "Skansen", row5);
	105	+ AddSkyboxButton("park", "Skansen2", row5);
	106	+
	107	+ AddSkyboxButton("park", "Skansen3", row6);
	108	+ AddSkyboxButton("park", "Skansen4", row6);
	109	+ AddSkyboxButton("park", "Skansen5", row6);
	110	+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
	111	+
	112	+ tab0.add(row0);
	113	+ tab0.add(row1);
	114	+ tab0.add(row2);
	115	+ tab0.add(row3);
	116	+ tab0.add(row4);
	117	+ tab0.add(row5);
	118	+ tab0.add(row6);
	119	+
	120	+ for (int i=5; --i>=0;)
	121	+ {
	122	+ //oe.toolboxPanel.Return();
	123	+ //tab0.add(new cGridBag());
	124	+ }
	125	+ }
	126	+
	127	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	128	+ {
	129	+ cGridBag tab0 = new cGridBag().setVertical(true);
	130	+
	131	+ tab0.setName("Nature");
	132	+ skyboxpanel.add(tab0);
	133	+
	134	+ cGridBag row0 = new cGridBag();
	135	+ cGridBag row1 = new cGridBag();
	136	+ cGridBag row2 = new cGridBag();
	137	+ cGridBag row3 = new cGridBag();
	138	+ cGridBag row4 = new cGridBag();
	139	+ cGridBag row5 = new cGridBag();
	140	+ cGridBag row6 = new cGridBag();
	141	+
	142	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	143	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	144	+ AddSkyboxButton("beach", "PalmTrees", row0);
	145	+ AddSkyboxButton("beach", "Tenerife", row0);
	146	+
	147	+ AddSkyboxButton("beach", "Tenerife2", row1);
	148	+ AddSkyboxButton("beach", "Tenerife3", row1);
	149	+ AddSkyboxButton("field", "FishPond", row1);
	150	+ AddSkyboxButton("field", "Footballfield", row1);
	151	+
	152	+ AddSkyboxButton("field", "Meadow", row2);
	153	+ AddSkyboxButton("field", "Sorsele", row2);
	154	+ AddSkyboxButton("field", "Sorsele2", row2);
	155	+ AddSkyboxButton("field", "Sorsele3", row2);
	156	+
	157	+ AddSkyboxButton("forest", "Brudslojan", row3);
	158	+ AddSkyboxButton("forest", "Langholmen2", row3);
	159	+ AddSkyboxButton("forest", "Plants", row3);
	160	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	161	+
	162	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	163	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	164	+ AddSkyboxButton("mountain", "Teide", row4);
	165	+ AddSkyboxButton("park", "Tantolunden4", row4);
	166	+
	167	+ AddSkyboxButton("park", "Stairs", row5);
	168	+ AddSkyboxButton("default", "skycube", row6);
	169	+ AddSkyboxButton("rocky", "Langholmen", row5);
	170	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	171	+
	172	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	173	+ AddSkyboxButton("default", "CloudyHills", row6);
	174	+ AddSkyboxButton("daz", "Autumn", row6);
	175	+ AddSkyboxButton("daz", "MountainTrail", row6);
	176	+ /*
	177	+Autumn
	178	+Greenlands
	179	+MountainTrail
	180	+Oasis
	181	+TheRock
	182	+TopOfTheWorld
	183	+Winter
	184	+ */
	185	+
	186	+ tab0.add(row0);
	187	+ tab0.add(row1);
	188	+ tab0.add(row2);
	189	+ tab0.add(row3);
	190	+ tab0.add(row4);
	191	+ tab0.add(row5);
	192	+ tab0.add(row6);
	193	+
	194	+ for (int i=5; --i>=0;)
	195	+ {
	196	+ //oe.toolboxPanel.Return();
	197	+ //tab0.add(new cGridBag());
	198	+ }
	199	+ }
	200	+
	201	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	202	+ {
	203	+ cGridBag tab0 = new cGridBag().setVertical(true);
	204	+
	205	+ tab0.setName("Night");
	206	+ skyboxpanel.add(tab0);
	207	+
	208	+ cGridBag row0 = new cGridBag();
	209	+ cGridBag row1 = new cGridBag();
	210	+ cGridBag row2 = new cGridBag();
	211	+ cGridBag row3 = new cGridBag();
	212	+ cGridBag row4 = new cGridBag();
	213	+ cGridBag row5 = new cGridBag();
	214	+ cGridBag row6 = new cGridBag();
	215	+
	216	+ AddSkyboxButton("night", "NightPath", row0);
	217	+ AddSkyboxButton("night", "PondNight", row0);
	218	+ AddSkyboxButton("night", "Powerlines", row0);
	219	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	220	+
	221	+ AddSkyboxButton("urban", "CNTower", row1);
	222	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	223	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	224	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
	225	+
	226	+ AddSkyboxButton("penguins", "kenon_star", row2);
	227	+ AddSkyboxButton("persson", "corona", row2);
	228	+ AddSkyboxButton("persson", "spaceskybox", row2);
	229	+ AddSkyboxButton("indoors", "Vasa", row2);
	230	+
	231	+ AddSkyboxButton("winter", "Backyard", row3);
	232	+ AddSkyboxButton("winter", "Creek", row3);
	233	+ AddSkyboxButton("winter", "FootballField3", row3);
	234	+ AddSkyboxButton("winter", "Forest", row3);
	235	+
	236	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	237	+ AddSkyboxButton("winter", "House", row4);
	238	+ AddSkyboxButton("winter", "IceLake", row4);
	239	+ AddSkyboxButton("winter", "IceRiver", row4);
	240	+
	241	+ AddSkyboxButton("winter", "Park3", row5);
	242	+ AddSkyboxButton("winter", "PondWinter", row5);
	243	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	244	+ AddSkyboxButton("winter", "Vindelalven", row5);
	245	+
	246	+ AddSkyboxButton("daz", "TheRock", row6);
	247	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	248	+ AddSkyboxButton("daz", "Winter", row6);
	249	+ AddSkyboxButton("mountain", "Ryfjallet", row6);
	250	+
	251	+ tab0.add(row0);
	252	+ tab0.add(row1);
	253	+ tab0.add(row2);
	254	+ tab0.add(row3);
	255	+ tab0.add(row4);
	256	+ tab0.add(row5);
	257	+ tab0.add(row6);
	258	+
	259	+ for (int i=5; --i>=0;)
	260	+ {
	261	+ //oe.toolboxPanel.Return();
	262	+ //tab0.add(new cGridBag());
	263	+ }
	264	+ }
	265	+
	266	+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
	267	+ {
	268	+ cGridBag tab0 = new cGridBag().setVertical(true);
	269	+
	270	+ tab0.setName("Others");
	271	+ skyboxpanel.add(tab0);
	272	+
	273	+ cGridBag row0 = new cGridBag();
	274	+ cGridBag row1 = new cGridBag();
	275	+ cGridBag row2 = new cGridBag();
	276	+ cGridBag row3 = new cGridBag();
	277	+ cGridBag row4 = new cGridBag();
	278	+ cGridBag row5 = new cGridBag();
	279	+ cGridBag row6 = new cGridBag();
	280	+
	281	+ AddSkyboxButton("mayhem", "afterrain", row0);
	282	+ AddSkyboxButton("mayhem", "aqua4", row0);
	283	+ AddSkyboxButton("mayhem", "aqua9", row0);
	284	+ AddSkyboxButton("mayhem", "flame", row0);
	285	+
	286	+ AddSkyboxButton("mayhem", "h2s", row1);
	287	+ AddSkyboxButton("mayhem", "prehistoric", row1);
	288	+ AddSkyboxButton("mayhem", "scorched", row1);
	289	+ AddSkyboxButton("penguins", "desertdawn", row1);
	290	+
	291	+ AddSkyboxButton("persson", "Citadella", row2);
	292	+ AddSkyboxButton("persson", "Citadella2", row2);
	293	+ AddSkyboxButton("persson", "clouds1", row2);
	294	+ AddSkyboxButton("penguins", "wrath", row2);
	295	+
	296	+ AddSkyboxButton("persson", "FishermansBastion", row3);
	297	+ AddSkyboxButton("persson", "HeroesSquare", row3);
	298	+ AddSkyboxButton("indoors", "DallasW", row3);
	299	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
	300	+
	301	+ AddSkyboxButton("persson", "LancellottiChapel", row4);
	302	+ AddSkyboxButton("persson", "PereaBeach1", row4);
	303	+ AddSkyboxButton("persson", "PereaBeach2", row4);
	304	+ AddSkyboxButton("persson", "redeclipse", row4);
	305	+
	306	+ AddSkyboxButton("daz", "Greenlands", row5);
	307	+ AddSkyboxButton("daz", "Oasis", row5);
	308	+ AddSkyboxButton("elyvisions", "arch3", row5);
	309	+ AddSkyboxButton("elyvisions", "calm_sea", row5);
	310	+
	311	+ AddSkyboxButton("elyvisions", "rainbow", row6);
	312	+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
	313	+ AddSkyboxButton("elyvisions", "heaven", row6);
	314	+ AddSkyboxButton("elyvisions", "hot", row6);
	315	+
	316	+ tab0.add(row0);
	317	+ tab0.add(row1);
	318	+ tab0.add(row2);
	319	+ tab0.add(row3);
	320	+ tab0.add(row4);
	321	+ tab0.add(row5);
	322	+ tab0.add(row6);
	323	+
	324	+ for (int i=5; --i>=0;)
	325	+ {
	326	+ //oe.toolboxPanel.Return();
	327	+ //tab0.add(new cGridBag());
	328	+ }
	329	+ }
	330	+
	331	+ public void ChangeSkybox(String skybox)
	332	+ {
	333	+ if (skybox.endsWith("/"))
	334	+ {
	335	+ group.skyboxname = null;
	336	+ group.skyboxext = null;
	337	+ cameraView.repaint();
	338	+ }
	339	+ else
	340	+ {
	341	+ //cameraView.envyoff = false;
	342	+ group.skyboxname = skybox;
	343	+ group.skyboxext = "jpg";
	344	+ cameraView.repaint();
	345	+ }
	346	+ }
	347	+
	348	+ public void CreateSkyboxPanel(cGridBag skyboxPanel)
	349	+ {
	350	+ JTabbedPane skyboxpane = new JTabbedPane(JTabbedPane.LEFT);
	351	+
	352	+ AddSkyboxTab0(skyboxpane);
	353	+ AddSkyboxTab1(skyboxpane);
	354	+ AddSkyboxTab2(skyboxpane);
	355	+ AddSkyboxTab3(skyboxpane);
	356	+
	357	+ skyboxPanel.add(skyboxpane);
	358	+ }
	359	+
	360	+ public void ChangeTexture(String texture)
	361	+ {
	362	+ for (int i=0; i<group.selection.size(); i++)
	363	+ {
	364	+ Object3D obj = group.selection.get(i);
	365	+ obj.SetPigmentTexture("@" + texture);
	366	+ }
	367	+
	368	+ refreshContents();
	369	+ }
	370	+
	371	+ public void Show3DView()
	372	+ {
	373	+ // bug
	374	+ //gridPanel.setDividerLocation(1.0);
	375	+ //bigPanel.setDividerLocation(0.0);
	376	+ bigThree.ClearUI();
	377	+ bigThree.add(centralPanel);
	378	+ bigThree.FlushUI();
	379	+ }
	380	+
26	381	//ObjEditor objEditor;
27	382	public void closeUI2()
28	383	{
..	..	@@ -60,6 +415,16 @@
60	415	this.copy = this.group = group;
61	416	//selectees = this.group.selectees;
62	417
	418	+ assert(false);
	419	+
	420	+ if (copy.versionlist == null)
	421	+ {
	422	+ copy.versionlist = new Object3D[100];
	423	+ copy.versionindex = -1;
	424	+
	425	+ //Save(true);
	426	+ }
	427	+
63	428	if(ui)
64	429	SetupUI(objEditor);
65	430	}
..	..	@@ -74,16 +439,28 @@
74	439	this.copy = this.group = copy;
75	440	//selectees = this.group.selectees;
76	441
77		- SetupMenu2(objEditor);
	442	+ SetupMenu2(this); //objEditor);
78	443	SetupUI2(objEditor);
79	444	objEditor.SetupUI(true);
80	445	SetupViews(objEditor);
81	446
82	447	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	448	+
	449	+ if (copy.versionlist == null)
	450	+ {
	451	+ copy.versionlist = new Object3D[100];
	452	+ copy.versionindex = -1;
	453	+
	454	+ //Save(true);
	455	+ }
83	456	}
84	457
85	458	void CloneSelection(boolean supports)
86	459	{
	460	+ if (Globals.REPLACEONMAKE)
	461	+ Save();
	462	+ boolean keep = Globals.REPLACEONMAKE;
	463	+ Globals.REPLACEONMAKE = false;
87	464	// Object3D keep = GrafreeD.clipboard;
88	465	//Object3D obj;
89	466	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,6 +471,7 @@
94	471
95	472	makeSomething(clone, i==group.selection.size()-1);
96	473	}
	474	+ Globals.REPLACEONMAKE = keep;
97	475	}
98	476
99	477	void CloneClipboard(boolean supports)
..	..	@@ -148,57 +526,51 @@
148	526
149	527	//JTextField nameField;
150	528
151		- void SetupMenu2(ObjEditor oe)
	529	+ void SetupMenu2(GroupEditor oe)
152	530	{
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		-
	531	+ oe.jTree = new cTree();
	532	+
168	533	Menu menu;
169	534	oe.menuBar.add(menu = new Menu("Edit"));
170	535	//editItem = menu.add(new MenuItem("Edit"));
171	536	//editItem.addActionListener(this);
172		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	537	+
	538	+// undoItem = menu.add(new MenuItem("Undo"));
	539	+// undoItem.addActionListener(this);
	540	+// redoItem = menu.add(new MenuItem("Redo"));
	541	+// redoItem.addActionListener(this);
	542	+// menu.add("-");
	543	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
173	544	duplicateItem.addActionListener(this);
174		- cloneItem = menu.add(new MenuItem("Clone"));
	545	+
	546	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
175	547	cloneItem.addActionListener(this);
176		- if (Globals.ADVANCED)
	548	+ //if (Globals.ADVANCED)
177	549	{
178	550	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
179	551	cloneSupportItem.addActionListener(this);
180	552	}
	553	+ oe.jTree.popup.addSeparator();
181	554	menu.add("-");
182		- cutItem = menu.add(new MenuItem("Cut"));
	555	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
183	556	cutItem.addActionListener(this);
184		- copyItem = menu.add(new MenuItem("Copy"));
	557	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
185	558	copyItem.addActionListener(this);
186	559	pasteItem = menu.add(new MenuItem("Paste"));
187	560	pasteItem.addActionListener(this);
188		- menu.add("-");
189	561
190		- menu.add("-");
191		- pasteIntoItem = menu.add(new MenuItem("Paste into"));
	562	+ oe.jTree.popup.addSeparator();
	563	+ //menu.add("-");
	564	+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
192	565	pasteIntoItem.addActionListener(this);
193		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	566	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
194	567	pasteLinkItem.addActionListener(this);
195		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	568	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
196	569	pasteCloneItem.addActionListener(this);
197		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	570	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
198	571	// pasteExpandItem.addActionListener(this);
199		- menu.add("-");
200		- clearItem = menu.add(new MenuItem("Clear"));
201		- clearItem.addActionListener(this);
	572	+ //menu.add("-");
	573	+ oe.jTree.popup.addSeparator();
202	574
203	575	if (Globals.ADVANCED)
204	576	{
..	..	@@ -206,7 +578,92 @@
206	578	clearAllItem = menu.add(new MenuItem("Clear All"));
207	579	clearAllItem.addActionListener(this);
208	580	}
	581	+
	582	+ menuBar.add(cameraMenu = new Menu("View"));
	583	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	584	+ //zBufferItem.addActionListener(this);
	585	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	586	+ //normalLensItem.addActionListener(this);
	587	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	588	+ restoreCameraItem.addActionListener(this);
	589	+
	590	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	591	+// toggleFullScreenItem.addItemListener(this);
	592	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	593	+// cameraMenu.add("-");
	594	+//
	595	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	596	+// toggleTextureItem.addItemListener(this);
	597	+// toggleTextureItem.setState(CameraPane.textureon);
	598	+//
	599	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	600	+// toggleSwitchItem.addItemListener(this);
	601	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	602	+
	603	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	604	+ toggleHandleItem.addItemListener(this);
	605	+ toggleHandleItem.setState(CameraPane.HANDLES);
	606	+
	607	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	608	+ togglePaintItem.addItemListener(this);
	609	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	610	+
	611	+ if (Globals.ADVANCED)
	612	+ {
	613	+ cameraMenu.add("-");
	614	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	615	+ toggleLiveItem.addItemListener(this);
	616	+ toggleLiveItem.setState(Globals.isLIVE());
209	617
	618	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	619	+ stepItem.addActionListener(this);
	620	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	621	+ // toggleDLItem.addItemListener(this);
	622	+ // toggleDLItem.setState(false);
	623	+
	624	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	625	+ toggleRenderItem.addItemListener(this);
	626	+ toggleRenderItem.setState(!CameraPane.frozen);
	627	+
	628	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	629	+ toggleDebugItem.addItemListener(this);
	630	+ toggleDebugItem.setState(Globals.DEBUG);
	631	+
	632	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	633	+ toggleFrustumItem.addItemListener(this);
	634	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	635	+
	636	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	637	+ toggleFootContactItem.addItemListener(this);
	638	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	639	+
	640	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	641	+ toggleTimelineItem.addItemListener(this);
	642	+ }
	643	+
	644	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	645	+// toggleRootItem.addItemListener(this);
	646	+// toggleRootItem.setState(false);
	647	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	648	+// animationItem.addItemListener(this);
	649	+// animationItem.setState(CameraPane.ANIMATION);
	650	+ cameraMenu.add("-");
	651	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	652	+ editCameraItem.addActionListener(this);
	653	+
	654	+ if (Globals.ADVANCED)
	655	+ {
	656	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	657	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	658	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	659	+ oe.cameraMenu.add("-");
	660	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	661	+ openWindowItem.addActionListener(this);
	662	+ lookAtItem.addActionListener(this);
	663	+ //lookFromItem.addActinoListener(this);
	664	+ //switchViewItem.addActionListener(this);
	665	+ }
	666	+
210	667	oe.menuBar.add(menu = new Menu("Setting"));
211	668	if (Globals.ADVANCED)
212	669	{
..	..	@@ -248,22 +705,37 @@
248	705	setMasterItem.addActionListener(this);
249	706	}
250	707
251		- oe.menuBar.add(menu = new Menu("Group"));
252		- grabItem = menu.add(new MenuItem("Grab"));
253		- grabItem.addActionListener(this);
	708	+ oe.menuBar.add(menu = new Menu("Order"));
	709	+
254	710	backItem = menu.add(new MenuItem("Back"));
255	711	backItem.addActionListener(this);
256	712	frontItem = menu.add(new MenuItem("Front"));
257	713	frontItem.addActionListener(this);
258		- compositeItem = menu.add(new MenuItem("Composite"));
259		- compositeItem.addActionListener(this);
	714	+// compositeItem = menu.add(new MenuItem("Composite"));
	715	+// compositeItem.addActionListener(this);
	716	+
	717	+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
	718	+ grabItem.addActionListener(this);
	719	+
	720	+ if (Globals.ADVANCED)
	721	+ {
260	722	hideItem = menu.add(new MenuItem("Hidden Group"));
261	723	hideItem.addActionListener(this);
262		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	724	+ }
	725	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
263	726	ungroupItem.addActionListener(this);
264		- menu.add("-");
265		- randomItem = menu.add(new MenuItem("Switch node"));
266		- randomItem.addActionListener(this);
	727	+
	728	+ oe.jTree.popup.addSeparator();
	729	+
	730	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	731	+ deleteItem.addActionListener(this);
	732	+
	733	+// menu.add("-");
	734	+//
	735	+// switchItem = menu.add(new MenuItem("Switch node"));
	736	+// switchItem.addActionListener(this);
	737	+ if (Globals.ADVANCED)
	738	+ {
267	739	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
268	740	switchGeoItem.addActionListener(this);
269	741	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -271,8 +743,6 @@
271	743	morphItem = menu.add(new MenuItem("Morph Group"));
272	744	morphItem.addActionListener(this);
273	745
274		- if (Globals.ADVANCED)
275		- {
276	746	menu.add("-");
277	747	physicsItem = menu.add(new MenuItem("Physics"));
278	748	physicsItem.addActionListener(this);
..	..	@@ -280,30 +750,29 @@
280	750	frameselectorItem.addActionListener(this);
281	751	scriptNodeItem = menu.add(new MenuItem("Script Node"));
282	752	scriptNodeItem.addActionListener(this);
283		- cameraItem = menu.add(new MenuItem("Camera"));
284		- cameraItem.addActionListener(this);
285	753	}
286	754
287	755	oe.menuBar.add(menu = new Menu("Object"));
288		- textureItem = menu.add(new MenuItem("Texture"));
289		- textureItem.addActionListener(this);
	756	+// textureItem = menu.add(new MenuItem("Texture"));
	757	+// textureItem.addActionListener(this);
290	758	billboardItem = menu.add(new MenuItem("Billboard"));
291	759	billboardItem.addActionListener(this);
292	760	csgItem = menu.add(new MenuItem("CSG"));
293	761	csgItem.addActionListener(this);
294		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	762	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
295	763	shadowXItem.addActionListener(this);
296		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	764	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
297	765	shadowYItem.addActionListener(this);
298		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	766	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
299	767	shadowZItem.addActionListener(this);
	768	+ attributeItem = menu.add(new MenuItem("Attribute"));
	769	+ attributeItem.addActionListener(this);
	770	+
300	771	if (Globals.ADVANCED)
301	772	{
302	773	menu.add("-");
303	774	linkerItem = menu.add(new MenuItem("Linker"));
304	775	linkerItem.addActionListener(this);
305		- attributeItem = menu.add(new MenuItem("Attribute"));
306		- attributeItem.addActionListener(this);
307	776	templateItem = menu.add(new MenuItem("Template"));
308	777	templateItem.addActionListener(this);
309	778	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -332,7 +801,7 @@
332	801	genNormalsMESHItem.addActionListener(this);
333	802	if (Globals.ADVANCED)
334	803	{
335		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	804	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
336	805	genNormalsMINEItem.addActionListener(this);
337	806	}
338	807	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -388,10 +857,18 @@
388	857	hideleavesItem.addActionListener(this);
389	858	showleavesItem = menu.add(new MenuItem("Show Leaves"));
390	859	showleavesItem.addActionListener(this);
391		- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
	860	+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
392	861	markleavesItem.addActionListener(this);
393		- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
	862	+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
394	863	unmarkleavesItem.addActionListener(this);
	864	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	865	+ rewindleavesItem.addActionListener(this);
	866	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	867	+ unrewindleavesItem.addActionListener(this);
	868	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	869	+ randomleavesItem.addActionListener(this);
	870	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	871	+ unrandomleavesItem.addActionListener(this);
395	872	menu.add("-");
396	873	flipVItem = menu.add(new MenuItem("Flip V"));
397	874	flipVItem.addActionListener(this);
..	..	@@ -417,10 +894,15 @@
417	894	attachBumpItem.addActionListener(this);
418	895	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
419	896	pigmentBumpItem.addActionListener(this);
	897	+ //embedTexturesItem
420	898	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
421	899	detachPigmentItem.addActionListener(this);
422	900	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
423	901	detachBumpItem.addActionListener(this);
	902	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	903	+ embedTexturesItem.addActionListener(this);
	904	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	905	+ deEmbedTexturesItem.addActionListener(this);
424	906	menu.add("-");
425	907	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
426	908	sortbysizeItem.addActionListener(this);
..	..	@@ -431,6 +913,9 @@
431	913	shareGeometriesItem.addActionListener(this);
432	914	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
433	915	mergeGeometriesItem.addActionListener(this);
	916	+ menu.add("-");
	917	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	918	+ editLeafItem.addActionListener(this);
434	919	if (Globals.ADVANCED)
435	920	{
436	921	// Pretty much the same as duplicate and clone.
..	..	@@ -443,33 +928,96 @@
443	928	oe.menuBar.add(menu = new Menu("Insert"));
444	929	buildCreateMenu(menu);
445	930
446		- oe.menuBar.add(menu = new Menu("Include"));
447		- importOBJItem = menu.add(new MenuItem("OBJ file..."));
448		- importOBJItem.addActionListener(this);
449		- menu.add("-");
450		- import3DSItem = menu.add(new MenuItem("3DS file..."));
451		- import3DSItem.addActionListener(this);
452		- menu.add("-");
453		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
454		- importVRMLX3DItem.addActionListener(this);
455		- menu.add("-");
456		- importGFDItem = menu.add(new MenuItem("GrafreeD file..."));
457		- importGFDItem.addActionListener(this);
458		-
459	931	oe.menuBar.add(menu = new Menu("Tools"));
460	932	buildToolsMenu(menu);
461	933	}
462	934
	935	+ JTabbedPane resourcecontainer;
	936	+ cGridBag currenttab;
	937	+ //boolean added; // patch for jar
	938	+
	939	+ int tabcount = 0;
	940	+ int colcount = 0;
	941	+ int rowcount = 0;
	942	+ int texturecount = 0;
	943	+
	944	+ int columns = 5;
	945	+ int rows = 7;
	946	+
	947	+ public void ResourceCallBack(String[] path)
	948	+ {
	949	+// for (int i = 0; i < path.length; i++)
	950	+// System.out.print(path[i] + "/");
	951	+// System.out.println();
	952	+
	953	+ if (//rowcount == 0 \|\|
	954	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	955	+ {
	956	+ currenttab = new cGridBag();
	957	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	958	+ currenttab.setName(tabname);
	959	+ //added = false;
	960	+ resourcecontainer.add(currenttab);
	961	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	962	+ rowcount = 1;
	963	+ colcount = 0;
	964	+ texturecount = 0;
	965	+ }
	966	+
	967	+ if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") \|\| path[2].toLowerCase().endsWith(".png")))
	968	+ {
	969	+ //if (!added)
	970	+ {
	971	+ //added = true;
	972	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	973	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	974	+ }
	975	+
	976	+ AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
	977	+
	978	+ if (++colcount >= columns)
	979	+ {
	980	+ colcount = 0;
	981	+ currenttab.Return();
	982	+
	983	+ if (rowcount++ >= rows)
	984	+ {
	985	+ rowcount = 0;
	986	+ }
	987	+ }
	988	+ }
	989	+ else
	990	+ {
	991	+// if (!path[path.length-1].equals("icons"))
	992	+// resourcecontainer.Return();
	993	+ }
	994	+ }
	995	+
	996	+ void CreateTexturePanel(cGridBag container)
	997	+ {
	998	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	999	+ container.add(resourcecontainer);
	1000	+
	1001	+ Grafreed.ParseResources("textures", this);
	1002	+ }
	1003	+
463	1004	void SetupUI2(ObjEditor oe)
464	1005	{
	1006	+ // June 2019
	1007	+ if (oe == null)
	1008	+ {
	1009	+ //super.SetupUI2(this);
	1010	+ //return;
	1011	+ }
	1012	+
	1013	+ if (copy != group)
	1014	+ {
	1015	+ //super.SetupUI2(this);
	1016	+ }
	1017	+
465	1018	//new Exception().printStackTrace();
466	1019
467	1020	oe.radioPanel = new JPanel(new GridBagLayout());
468		- oe.aConstraints.weightx = 1;
469		- oe.aConstraints.weighty = 0;
470		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
471		- oe.aConstraints.gridwidth = 100;
472		- oe.aConstraints.gridheight = 1;
473	1021	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
474	1022
475	1023	oe.buttonGroup = new ButtonGroup();
..	..	@@ -490,97 +1038,268 @@
490	1038	oe.radioPanel.add(dummyButton);
491	1039	oe.buttonGroup.add(dummyButton);
492	1040	*/
	1041	+ cGridBag versionManagerPanel = new cGridBag();
	1042	+
	1043	+ versionManagerPanel.preferredHeight = 4;
	1044	+
493	1045	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
494	1046
495		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
496		- liveCB.setToolTipText("Enable animation");
497		- liveCB.addItemListener(this);
	1047	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1048	+ //minButton.setToolTipText("Minimize window");
	1049	+ //minButton.addActionListener(this);
	1050	+
	1051	+ if (Globals.ADVANCED)
	1052	+ {
	1053	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1054	+// maxButton.setToolTipText("Maximize window");
	1055	+// maxButton.addActionListener(this);
	1056	+ }
	1057	+
	1058	+ cButton gcButton;
	1059	+
	1060	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1061	+// gcButton.setToolTipText("Garbage collect");
	1062	+// gcButton.addActionListener(new ActionListener()
	1063	+// {
	1064	+// public void actionPerformed(ActionEvent e)
	1065	+// {
	1066	+// System.gc();
	1067	+// }
	1068	+// });
	1069	+
	1070	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1071	+ collapseButton.setToolTipText("Collapse toolbar");
	1072	+ collapseButton.addActionListener(this);
	1073	+
	1074	+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1075	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1076	+ maximize3DButton.addActionListener(this);
	1077	+
	1078	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1079	+ twoButton.setToolTipText("Show 3D view only");
	1080	+ twoButton.addActionListener(this);
	1081	+ this.fullscreenLayout = twoButton;
	1082	+
	1083	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1084	+ threeButton.setToolTipText("Show controls and 3D view");
	1085	+ threeButton.addActionListener(this);
	1086	+ if (Globals.ADVANCED)
	1087	+ {
	1088	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1089	+ sixButton.setToolTipText("Show 3D view and controls");
	1090	+ sixButton.addActionListener(this);
	1091	+ }
	1092	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1093	+// sevenButton.setToolTipText("3-column layout");
	1094	+// sevenButton.addActionListener(this);
	1095	+ //
	1096	+
	1097	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1098	+ fullButton.setToolTipText("Full-screen window");
	1099	+ fullButton.addActionListener(this);
	1100	+
	1101	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1102	+ screenfitButton.setToolTipText("Screen fit");
	1103	+ screenfitButton.addActionListener(this);
498	1104
499		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1105	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1106	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1107	+ restoreCameraButton.addActionListener(this);
	1108	+
	1109	+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1110	+ saveVersionButton.setToolTipText("Duplicate current version");
	1111	+ saveVersionButton.addActionListener(this);
	1112	+
	1113	+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1114	+ deleteVersionButton.setToolTipText("Delete current version");
	1115	+ deleteVersionButton.addActionListener(this);
	1116	+ deleteVersionButton.setEnabled(false);
	1117	+
	1118	+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1119	+ previousVersionButton.setToolTipText("Previous version");
	1120	+ previousVersionButton.addActionListener(this);
	1121	+ previousVersionButton.setEnabled(false);
	1122	+
	1123	+ cGridBag updown = new cGridBag().setVertical(true);
	1124	+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1125	+ restoreButton.setToolTipText("Undo (restore current version)");
	1126	+ restoreButton.addActionListener(this);
	1127	+ restoreButton.setEnabled(false);
	1128	+
	1129	+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1130	+ replaceButton.setToolTipText("Save (replace current version)");
	1131	+ replaceButton.addActionListener(this);
	1132	+ replaceButton.setEnabled(false);
	1133	+
	1134	+ versionManagerPanel.add(updown);
	1135	+
	1136	+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1137	+ nextVersionButton.setToolTipText("Next version");
	1138	+ nextVersionButton.addActionListener(this);
	1139	+ nextVersionButton.setEnabled(false);
	1140	+
	1141	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
500	1142	oneStepButton.setToolTipText("Animate one step forward");
501	1143	oneStepButton.addActionListener(this);
502	1144
503		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	1145	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1146	+ liveCB.setToolTipText("Enable animation");
	1147	+ liveCB.addItemListener(this);
	1148	+
	1149	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
504	1150	fastCB.setToolTipText("Fast mode");
505	1151	fastCB.addItemListener(this);
506	1152
507		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
508		- trackCB.setToolTipText("Enable tracking");
509		- trackCB.addItemListener(this);
510		-
511		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
512		- screenfitButton.setToolTipText("Screen fit");
513		- screenfitButton.addActionListener(this);
	1153	+ //oe.toolboxPanel.Return();
	1154	+
	1155	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1156	+// trackCB.setToolTipText("Enable tracking");
	1157	+// trackCB.addItemListener(this);
514	1158
515	1159	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
516	1160	// screenfitpointButton.addActionListener(this);
517	1161
518	1162	if (Globals.ADVANCED)
519	1163	{
520		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1164	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
521	1165	snapobjectButton.addActionListener(this);
522	1166	snapobjectButton.setToolTipText("Snap Object");
	1167	+
	1168	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1169	+ fourButton.addActionListener(this);
	1170	+ fourButton.setToolTipText("Show control panel only");
523	1171	}
524	1172
525		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
526		- flashSelectionButton.setToolTipText("Show selection");
527		- flashSelectionButton.addActionListener(this);
	1173	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
528	1174
529		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
530		-
531		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
532		- twoButton.setToolTipText("Show center view only");
533		- twoButton.addActionListener(this);
534		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
535		- fourButton.addActionListener(this);
536		- fourButton.setToolTipText("Show left panel only");
537		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
538		- sixButton.setToolTipText("2-column layout left");
539		- sixButton.addActionListener(this);
540		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
541		- threeButton.setToolTipText("2-column layout right");
542		- threeButton.addActionListener(this);
543		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
544		- sevenButton.setToolTipText("3-column layout");
545		- sevenButton.addActionListener(this);
546		- //
547	1175
548		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
549		- rootButton.setToolTipText("Edit selection in new tab");
	1176	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1177	+ rootButton.setToolTipText("Open selection in new tab");
550	1178	rootButton.addActionListener(this);
551	1179
552		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1180	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
553	1181	closeButton.setToolTipText("Close tab");
554	1182	closeButton.addActionListener(this);
555	1183	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
556	1184	//clearButton.addActionListener(this);
557		-
558		- cGridBag commandsPanel = new cGridBag();
	1185	+
	1186	+ cGridBag row1 = new cGridBag();
559	1187
560		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
561		- editButton.setToolTipText("Edit selection");
	1188	+ // INSERT
	1189	+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1190	+ gridButton.setToolTipText("Create ground");
	1191	+ gridButton.addActionListener(this);
	1192	+
	1193	+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1194	+ boxButton.setToolTipText("Create box");
	1195	+ boxButton.addActionListener(this);
	1196	+
	1197	+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1198	+ superButton.setToolTipText("Create superellipsoid");
	1199	+ superButton.addActionListener(this);
	1200	+
	1201	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1202	+ sphereButton.setToolTipText("Create sphere");
	1203	+ sphereButton.addActionListener(this);
	1204	+
	1205	+ row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1206	+ coneButton.setToolTipText("Create cone");
	1207	+ coneButton.addActionListener(this);
	1208	+
	1209	+ row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1210	+ torusButton.setToolTipText("Create torus");
	1211	+ torusButton.addActionListener(this);
	1212	+
	1213	+ if (Globals.ADVANCED)
	1214	+ {
	1215	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1216	+ kleinButton.setToolTipText("Create Klein bottle");
	1217	+ kleinButton.addActionListener(this);
	1218	+ }
	1219	+
	1220	+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1221	+ particlesButton.setToolTipText("Create particle system");
	1222	+ particlesButton.addActionListener(this);
	1223	+
	1224	+ oe.toolboxPanel.add(row1);
	1225	+
	1226	+ cGridBag row2 = new cGridBag();
	1227	+
	1228	+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1229	+ groupButton.setToolTipText("Create group");
	1230	+ groupButton.addActionListener(this);
	1231	+
	1232	+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1233	+ compositeButton.setToolTipText("Create composite");
	1234	+ compositeButton.addActionListener(this);
	1235	+
	1236	+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1237	+ switchButton.setToolTipText("Create item switcher");
	1238	+ switchButton.addActionListener(this);
	1239	+
	1240	+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1241	+ loopButton.setToolTipText("Create loop");
	1242	+ loopButton.addActionListener(this);
	1243	+
	1244	+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1245	+ textureButton.setToolTipText("Create texture");
	1246	+ textureButton.addActionListener(this);
	1247	+
	1248	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1249	+ overlayButton.setToolTipText("Create overlay");
	1250	+ overlayButton.addActionListener(this);
	1251	+
	1252	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1253	+ lightButton.setToolTipText("Create light");
	1254	+ lightButton.addActionListener(this);
	1255	+
	1256	+ oe.toolboxPanel.add(row2);
	1257	+
	1258	+ cGridBag textures = new cGridBag();
	1259	+
	1260	+ CreateTexturePanel(textures);
	1261	+
	1262	+ int tabCount = resourcecontainer.getTabCount();
	1263	+
	1264	+ if (tabCount > 0)
	1265	+ resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
	1266	+
	1267	+ oe.toolboxPanel.add(textures);
	1268	+
	1269	+ textures.preferredHeight = 100;
	1270	+
	1271	+ CreateSkyboxPanel(oe.skyboxPanel);
	1272	+
	1273	+ // EDIT panel
	1274	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1275	+ editButton.setToolTipText("Pin selection controls");
562	1276	editButton.addActionListener(this);
563	1277
564		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
565		- uneditButton.setToolTipText("Unedit selection");
	1278	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1279	+ uneditButton.setToolTipText("Unpin and remove selection controls");
566	1280	uneditButton.addActionListener(this);
567	1281
568		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
569		- allParamsButton.setToolTipText("Edit all params");
	1282	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1283	+ allParamsButton.setToolTipText("Show all controls");
570	1284	allParamsButton.addActionListener(this);
571	1285
572		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
573		- clearPanelButton.setToolTipText("Clear edit panel");
	1286	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1287	+ clearPanelButton.setToolTipText("Clear all controls");
574	1288	clearPanelButton.addActionListener(this);
575	1289
576		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
577		- unselectButton.setToolTipText("Unselect");
578		- unselectButton.addActionListener(this);
	1290	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1291	+ //unselectButton.setToolTipText("Unselect");
	1292	+ //unselectButton.addActionListener(this);
579	1293
580		- commandsPanel.preferredHeight = 1;
	1294	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1295	+ flashSelectionButton.setToolTipText("Highlight selection");
	1296	+ flashSelectionButton.addActionListener(this);
581	1297
582		- oe.treePanel.add(commandsPanel);
583		- oe.treePanel.Return();
	1298	+ editCommandsPanel.preferredHeight = 1;
	1299	+
	1300	+ SetPinStates(false);
	1301	+// oe.treePanel.add(commandsPanel);
	1302	+// oe.treePanel.Return();
584	1303
585	1304	// oe.aConstraints.gridx += 1;
586	1305	// oe.aConstraints.weighty = 0;
..	..	@@ -595,34 +1314,24 @@
595	1314
596	1315	cGridBag jSPPanel = new cGridBag();
597	1316
	1317	+ jSPPanel.preferredHeight = 20;
	1318	+
598	1319	JScrollPane jSP;
599	1320	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
600		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1321	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
601	1322	ResetModel();
602	1323
603	1324	oe.treePanel.add(jSPPanel);
604	1325	oe.treePanel.Return();
605	1326
606		- cGridBag copyOptionsPanel = new cGridBag();
607		-
608		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
609		- colorCB.setToolTipText("Copy color when dropped");
610		- colorCB.addItemListener(this);
611		-
612		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
613		- materialCB.setToolTipText("Copy material when dropped");
614		- materialCB.addItemListener(this);
615		-
616		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
617		- textureCB.setToolTipText("Copy texture when dropped");
618		- textureCB.addItemListener(this);
619		-
620		- copyOptionsPanel.preferredHeight = 1;
621		- oe.treePanel.add(copyOptionsPanel);
	1327	+ oe.treePanel.add(versionManagerPanel);
622	1328	oe.treePanel.Return();
	1329	+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1330	+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
	1331	+ versionSliderPane.preferredHeight = 3;
623	1332
624		-// mainPanel.setDividerLocation(0.5); //1.0);
625		-// mainPanel.setResizeWeight(0.5);
	1333	+// mainPanel.setDividerLocation(0.1); //1.0);
	1334	+ mainPanel.setResizeWeight(0.4);
626	1335
627	1336	//jList.addListSelectionListener(this);
628	1337	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -630,7 +1339,7 @@
630	1339	//jTree.setEditable(true);
631	1340	oe.jTree.setDragEnabled(true);
632	1341	//jTree.setPreferredSize(new Dimension(10,10));
633		- jSP.setPreferredSize(new Dimension(100,200));
	1342	+ //jSP.setPreferredSize(new Dimension(100,200));
634	1343
635	1344	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
636	1345
..	..	@@ -642,29 +1351,49 @@
642	1351	dgr.addDragGestureListener(this);
643	1352	}catch(Exception e) {}
644	1353	*/
645		- radio.layout = sevenButton;
	1354	+ radio.layout = threeButton; // sixButton;
646	1355	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
647	1356	}
648	1357
649	1358	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
650	1359	{
	1360	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1361	+ colorCB.setToolTipText("Copy color when dropped");
	1362	+ colorCB.addItemListener(this);
	1363	+
	1364	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1365	+ materialCB.setToolTipText("Copy material when dropped");
	1366	+ materialCB.addItemListener(this);
	1367	+
	1368	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1369	+ textureCB.setToolTipText("Copy texture when dropped");
	1370	+ textureCB.addItemListener(this);
	1371	+
	1372	+ panel.Return();
	1373	+
651	1374	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
652	1375	boxCB.setToolTipText("Display bounding boxes");
653	1376	boxCB.addItemListener(this);
654	1377
655	1378	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
656		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1379	+ zoomBoxCB.setToolTipText("Display only for wheel");
657	1380	zoomBoxCB.addItemListener(this);
658	1381
659	1382	if (true) // Globals.ADVANCED)
660	1383	{
661		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
662		- supportCB.setToolTipText("Enable rigging");
663		- supportCB.addItemListener(this);
	1384	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1385	+// supportCB.setToolTipText("Enable rigging");
	1386	+// supportCB.addItemListener(this);
	1387	+
	1388	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1389	+ freezeCB.setToolTipText("Fast moving camera");
	1390	+ freezeCB.addItemListener(this);
664	1391
665	1392	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
666	1393	// localCB.addItemListener(this);
667	1394
	1395	+ panel.Return();
	1396	+
668	1397	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
669	1398	crowdCB.setToolTipText("Used for crowds");
670	1399	crowdCB.addItemListener(this);
..	..	@@ -673,14 +1402,19 @@
673	1402	smoothCB.setToolTipText("Snapping delay");
674	1403	smoothCB.addItemListener(this);
675	1404
676		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
677		- slowCB.setToolTipText("Smooth interpolation");
678		- slowCB.addItemListener(this);
	1405	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1406	+// slowCB.setToolTipText("Smooth interpolation");
	1407	+// slowCB.addItemListener(this);
	1408	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1409	+ minshaderCB.setToolTipText("Minimal fast shader");
	1410	+ minshaderCB.addItemListener(this);
679	1411
680	1412	// constraints.gridy += 1;
681	1413	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
682	1414	// speakerMocapCB.addItemListener(this);
683	1415
	1416	+ panel.Return();
	1417	+
684	1418	if (false)
685	1419	{
686	1420	// handled in scripts
..	..	@@ -695,34 +1429,82 @@
695	1429	//constraints.gridy += 1;
696	1430	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
697	1431	smoothfocusCB.addItemListener(this);
	1432	+ panel.Return();
698	1433	}
699	1434
700	1435	//constraints.gridx += 1;
701	1436	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
702	1437	// debugCB.addItemListener(this);
703	1438
	1439	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1440	+ trackCB.setToolTipText("Enable tracking target");
	1441	+ trackCB.addItemListener(this);
	1442	+
704	1443	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1444	+ oeilCB.setToolTipText("Move camera when tracking");
705	1445	oeilCB.addItemListener(this);
706	1446
	1447	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1448	+ shadowCB.setToolTipText("When live compute shadows");
	1449	+ shadowCB.addItemListener(this);
	1450	+
	1451	+ panel.Return();
	1452	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1453	+ toggleTextureCB.setToolTipText("Load textures");
	1454	+ toggleTextureCB.addItemListener(this);
	1455	+
	1456	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1457	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1458	+ toggleSwitchCB.addItemListener(this);
	1459	+
	1460	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1461	+ autokeepCB.setToolTipText("On structure change");
	1462	+ autokeepCB.addItemListener(this);
	1463	+
	1464	+ panel.Return();
	1465	+ if (Globals.ADVANCED)
	1466	+ {
707	1467	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
708	1468	lookAtCB.setToolTipText("Look-at target");
709	1469	lookAtCB.addItemListener(this);
	1470	+ }
710	1471
711	1472	}
712	1473
713	1474	cGridBag fill = new cGridBag();
714		-
715	1475	fill.preferredHeight = 200;
	1476	+ cGridBag fill2 = new cGridBag();
	1477	+ fill2.preferredHeight = 200;
	1478	+ cGridBag fill3 = new cGridBag();
	1479	+ fill3.preferredHeight = 200;
716	1480
717	1481	panel.add(fill);
	1482	+ panel.add(fill2);
	1483	+ panel.add(fill3);
718	1484
719	1485	}
720	1486
721	1487	void EditObject(Object3D obj)
722	1488	{
	1489	+ assert(obj instanceof Composite);
	1490	+
	1491	+// if (obj.versionlist == null)
	1492	+// {
	1493	+// obj.versionlist = new Object3D[100];
	1494	+// obj.versionindex = -1;
	1495	+// }
	1496	+
723	1497	cRadio radioButton = new cRadio(obj.name);
	1498	+
	1499	+ // June 2019. Patch to avoid bug with transparency.
	1500	+ radioButton.hadMaterial = obj.material != null;
	1501	+ if (!radioButton.hadMaterial)
	1502	+ {
	1503	+ obj.material = new cMaterial();
	1504	+ }
	1505	+
724	1506	radioButton.SetObject(obj);
725		- radioButton.layout = sevenButton;
	1507	+ radioButton.layout = threeButton; // sixButton;
726	1508	radioButton.SetCamera(cameraView.renderCamera, false);
727	1509	radioButton.addActionListener(this);
728	1510	radioPanel.add(radioButton);
..	..	@@ -732,31 +1514,41 @@
732	1514
733	1515	void SetupViews(ObjEditor oe)
734	1516	{
	1517	+ theFrame = this;
	1518	+
735	1519	oe.SetupViews();
736	1520
	1521	+ if (Globals.DEBUG)
737	1522	System.out.println("SetupViews");
738	1523	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
739	1524	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
740	1525	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
741	1526	}
742	1527
743		- JCheckBox liveCB;
744		- JCheckBox supportCB;
745		- JCheckBox localCB;
746		- JCheckBox crowdCB;
747		- JCheckBox smoothCB;
748		- JCheckBox fastCB;
749		- JCheckBox slowCB;
750		- JCheckBox boxCB;
751		- JCheckBox zoomBoxCB;
752		- JCheckBox trackCB;
753		- JCheckBox smoothfocusCB;
	1528	+ cToggleButton liveCB;
	1529	+ cCheckBox supportCB;
	1530	+ cCheckBox localCB;
	1531	+ cCheckBox crowdCB;
	1532	+ cCheckBox smoothCB;
	1533	+ cCheckBox minshaderCB;
	1534	+
	1535	+ cToggleButton fastCB;
	1536	+ cCheckBox slowCB;
	1537	+ cCheckBox boxCB;
	1538	+ cCheckBox zoomBoxCB;
	1539	+ cCheckBox freezeCB;
	1540	+ //cToggleButton trackCB;
	1541	+ cCheckBox trackCB;
	1542	+ cCheckBox smoothfocusCB;
754	1543	// JCheckBox speakerMocapCB;
755		- JCheckBox speakerCameraCB;
756		- JCheckBox speakerFocusCB;
757		- JCheckBox debugCB;
758		- JCheckBox oeilCB;
759		- JCheckBox lookAtCB;
	1544	+ cCheckBox speakerCameraCB;
	1545	+ cCheckBox speakerFocusCB;
	1546	+ cCheckBox debugCB;
	1547	+
	1548	+ cCheckBox oeilCB;
	1549	+ cCheckBox shadowCB;
	1550	+ cCheckBox autokeepCB;
	1551	+ cCheckBox lookAtCB;
760	1552
761	1553	// static int COLOR = 1;
762	1554	// static int MATERIAL = 2;
..	..	@@ -764,9 +1556,9 @@
764	1556
765	1557	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
766	1558
767		- JCheckBox colorCB;
768		- JCheckBox materialCB;
769		- JCheckBox textureCB;
	1559	+ cCheckBox colorCB;
	1560	+ cCheckBox materialCB;
	1561	+ cCheckBox textureCB;
770	1562
771	1563	public void itemStateChanged(ItemEvent e)
772	1564	{
..	..	@@ -794,6 +1586,7 @@
794	1586	} else if(e.getSource() == liveCB)
795	1587	{
796	1588	cameraView.ToggleLive();
	1589	+ refreshContents(false);
797	1590	}
798	1591	else if(e.getSource() == supportCB)
799	1592	{
..	..	@@ -809,6 +1602,12 @@
809	1602	{
810	1603	cameraView.ToggleInertia();
811	1604	cameraView.repaint();
	1605	+ }
	1606	+ else if(e.getSource() == minshaderCB)
	1607	+ {
	1608	+ Globals.MINSHADER ^= true;
	1609	+ cameraView.programInitialized = false;
	1610	+ cameraView.repaint();
812	1611	}
813	1612	else if(e.getSource() == localCB)
814	1613	{
..	..	@@ -858,6 +1657,18 @@
858	1657	{
859	1658	cameraView.ToggleOeil();
860	1659	}
	1660	+ else if(e.getSource() == shadowCB)
	1661	+ {
	1662	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1663	+ }
	1664	+ else if(e.getSource() == freezeCB)
	1665	+ {
	1666	+ Globals.FREEZEONMOVE ^= true;
	1667	+ }
	1668	+ else if(e.getSource() == autokeepCB)
	1669	+ {
	1670	+ Globals.REPLACEONMAKE ^= true;
	1671	+ }
861	1672	else if(e.getSource() == lookAtCB)
862	1673	{
863	1674	cameraView.ToggleLookAt();
..	..	@@ -874,7 +1685,8 @@
874	1685
875	1686	/**/
876	1687	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
877		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1688	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1689	+ TreePath path = objEditor.jTree.getSelectionPath();
878	1690	if ((path == null) \|\| (path.getPathCount() <= 1)) {
879	1691	// We can't move the root node or an empty selection
880	1692	return;
..	..	@@ -937,8 +1749,6 @@
937	1749	}
938	1750	}
939	1751
940		- String string = (String) object;
941		-
942	1752	System.out.println("Transfer = " + object + "; drop : " + target);
943	1753	// if( object instanceof java.io.File[])
944	1754	// {
..	..	@@ -946,6 +1756,8 @@
946	1756	// objEditor.DropFile((java.io.File[]) object, true);
947	1757	// return;
948	1758	// }
	1759	+
	1760	+ String string = object.toString();
949	1761
950	1762	// File path for Mac and Windows
951	1763	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -991,23 +1803,33 @@
991	1803
992	1804	assert target == objEditor.jTree;
993	1805	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1806	+ Object3D destinationLeaf;
994	1807	try {
995		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1808	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
996	1809	} catch (Exception e) {
997	1810	System.out.println("destinationPath : " + destinationPath);
998	1811	return;
999	1812	}
1000	1813
1001		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1814	+ for (int i=group.selection.size(); --i>=0;)
1002	1815	{
	1816	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1817	+
	1818	+ // Cannot move into itself
	1819	+ if (child == destinationLeaf)
	1820	+ return;
	1821	+ }
	1822	+
	1823	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1824	+// {
1003	1825	loadClipboard(true);
1004	1826	objEditor.jTree.setSelectionPath(destinationPath);
1005	1827	pasteInto(false, false);
1006		- } else {
1007		- loadClipboard(false);
1008		- objEditor.jTree.setSelectionPath(destinationPath);
1009		- pasteInto(false, false); // true); // ???
1010		- }
	1828	+// } else {
	1829	+// loadClipboard(false);
	1830	+// objEditor.jTree.setSelectionPath(destinationPath);
	1831	+// pasteInto(false, false); // true); // ???
	1832	+// }
1011	1833	}
1012	1834	public void dropActionChanged(DropTargetDragEvent dtde)
1013	1835	// Called if the user has modified the current drop gesture
..	..	@@ -1063,7 +1885,12 @@
1063	1885	TreePath path;
1064	1886
1065	1887	public TransferableTreePath(TreePath tp) {
1066		- path = tp;
	1888	+ Object[] objs = new Object[tp.getPathCount()];
	1889	+ for (int i=0; i<objs.length; i++)
	1890	+ {
	1891	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1892	+ }
	1893	+ path = new TreePath(objs);
1067	1894	}
1068	1895
1069	1896	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1112,22 +1939,30 @@
1112	1939	{
1113	1940	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1114	1941	//heightFieldItem.addActionListener(this);
1115		- gridItem = menu.add(new MenuItem("Grid"));
1116		- gridItem.addActionListener(this);
1117		- rectoidItem = menu.add(new MenuItem("Box"));
1118		- rectoidItem.addActionListener(this);
1119		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1120		- ellipsoidItem.addActionListener(this);
1121		- coneItem = menu.add(new MenuItem("Cone"));
1122		- coneItem.addActionListener(this);
1123		- torusItem = menu.add(new MenuItem("Torus"));
1124		- torusItem.addActionListener(this);
1125		- superItem = menu.add(new MenuItem("Superellipsoid"));
1126		- superItem.addActionListener(this);
	1942	+// gridItem = menu.add(new MenuItem("Grid"));
	1943	+// gridItem.addActionListener(this);
	1944	+// rectoidItem = menu.add(new MenuItem("Box"));
	1945	+// rectoidItem.addActionListener(this);
	1946	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1947	+// ellipsoidItem.addActionListener(this);
	1948	+// coneItem = menu.add(new MenuItem("Cone"));
	1949	+// coneItem.addActionListener(this);
	1950	+// torusItem = menu.add(new MenuItem("Torus"));
	1951	+// torusItem.addActionListener(this);
	1952	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1953	+// superItem.addActionListener(this);
	1954	+
	1955	+ cameraItem = menu.add(new MenuItem("Camera"));
	1956	+ cameraItem.addActionListener(this);
	1957	+
	1958	+ if (!Globals.ADVANCED)
	1959	+ {
1127	1960	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1128	1961	kleinItem.addActionListener(this);
1129		- particleItem = menu.add(new MenuItem("Particle system"));
1130		- particleItem.addActionListener(this);
	1962	+ }
	1963	+
	1964	+// particleItem = menu.add(new MenuItem("Particle system"));
	1965	+// particleItem.addActionListener(this);
1131	1966	if (Globals.ADVANCED)
1132	1967	{
1133	1968	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1153,15 +1988,15 @@
1153	1988	}
1154	1989	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1155	1990	bezierItem.addActionListener(this);
1156		- overlayItem = menu.add(new MenuItem("Overlay"));
1157		- overlayItem.addActionListener(this);
1158		- lightItem = menu.add(new MenuItem("Light"));
1159		- lightItem.addActionListener(this);
	1991	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1992	+// overlayItem.addActionListener(this);
	1993	+// lightItem = menu.add(new MenuItem("Light"));
	1994	+// lightItem.addActionListener(this);
1160	1995	menu.add("-");
1161	1996	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1162	1997	//superLoopItem.addActionListener(this);
1163		- loopItem = menu.add(new MenuItem("Loop"));
1164		- loopItem.addActionListener(this);
	1998	+// loopItem = menu.add(new MenuItem("Loop"));
	1999	+// loopItem.addActionListener(this);
1165	2000	doubleItem = menu.add(new MenuItem("Fork"));
1166	2001	doubleItem.addActionListener(this);
1167	2002	if (Globals.ADVANCED)
..	..	@@ -1177,6 +2012,9 @@
1177	2012	animationItem.addItemListener(this);
1178	2013	animationItem.setState(Globals.ANIMATION);
1179	2014
	2015	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	2016	+ archiveItem.addActionListener(this);
	2017	+
1180	2018	menu.add("-");
1181	2019	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1182	2020	parseverticesItem.addActionListener(this);
..	..	@@ -1189,6 +2027,8 @@
1189	2027	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1190	2028	reduce34MorphItem.addActionListener(this);
1191	2029	menu.add("-");
	2030	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	2031	+ memoryItem.addActionListener(this);
1192	2032	menu.add(computeAOItem = new MenuItem("Compute AO"));
1193	2033	computeAOItem.addActionListener(this);
1194	2034
..	..	@@ -1197,11 +2037,9 @@
1197	2037	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1198	2038	mirrorItem.addActionListener(this);
1199	2039	menu.add("-");
1200		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1201		- memoryItem.addActionListener(this);
1202	2040	menu.add(analyzeItem = new MenuItem("Analyze"));
1203	2041	analyzeItem.addActionListener(this);
1204		- menu.add(dumpItem = new MenuItem("Dump"));
	2042	+ menu.add(dumpItem = new MenuItem("Print"));
1205	2043	dumpItem.addActionListener(this);
1206	2044	// menu.add(pathItem = new MenuItem("From-to path"));
1207	2045	// pathItem.addActionListener(this);
..	..	@@ -1342,9 +2180,38 @@
1342	2180	shadow.material = new cMaterial(obj.material);
1343	2181	shadow.material.diffuse = 0.0001f;
1344	2182	shadow.material.specular = 0.0001f;
	2183	+ shadow.material.opacity = 0.75f;
	2184	+
	2185	+ AllocProjectedVertices(shadow);
	2186	+
	2187	+ shadow.projectedVertices[1].x = 300;
1345	2188
1346	2189	makeSomething(shadow);
1347	2190	}
	2191	+
	2192	+ private void ClearUnpinned()
	2193	+ {
	2194	+ //for (Object3D obj : listUI)
	2195	+ for (int i=listUI.size(); --i>=0;)
	2196	+ {
	2197	+ Object3D obj = listUI.elementAt(i);
	2198	+ if (!obj.pinned)
	2199	+ {
	2200	+ obj.CloseUI();
	2201	+ listUI.remove(i);
	2202	+ }
	2203	+ }
	2204	+ }
	2205	+
	2206	+ private void EditElement(Object3D elem, boolean newWindow)
	2207	+ {
	2208	+ // if (!(elem instanceof Composite))
	2209	+ // newWindow = false;
	2210	+ listUI.add(elem);
	2211	+ elem.openEditWindow(this, newWindow); //, false);
	2212	+ System.out.println("edit : " + elem);
	2213	+ elem.editWindow.refreshContents(true); // ? new
	2214	+ }
1348	2215
1349	2216	/**
1350	2217	* applyExample
..	..	@@ -1589,7 +2456,7 @@
1589	2456	{
1590	2457	ScreenFit();
1591	2458	} else
1592		- if (source == switchItem)
	2459	+ if (source == switchViewItem)
1593	2460	{
1594	2461	cVector v1 = new cVector();
1595	2462	cVector v2 = new cVector();
..	..	@@ -1598,11 +2465,11 @@
1598	2465	objEditor.cameraView.renderCamera.setAim(v2, v1);
1599	2466	objEditor.cameraView.repaint();
1600	2467	} else
1601		- if (source == rectoidItem)
	2468	+ if (source == rectoidItem \|\| source == boxButton)
1602	2469	{
1603	2470	makeSomething(new Box());
1604	2471	} else
1605		- if (source == particleItem)
	2472	+ if (source == particleItem \|\| source == particlesButton)
1606	2473	{
1607	2474	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1608	2475	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1681,27 +2548,27 @@
1681	2548
1682	2549	makeSomething(obj);
1683	2550	} else
1684		- if (source == gridItem)
	2551	+ if (source == gridItem \|\| source == gridButton)
1685	2552	{
1686	2553	makeSomething(new Grid());
1687	2554	} else
1688		- if (source == ellipsoidItem)
	2555	+ if (source == ellipsoidItem \|\| source == sphereButton)
1689	2556	{
1690	2557	makeSomething(new Sphere());
1691	2558	} else
1692		- if (source == coneItem)
	2559	+ if (source == coneItem \|\| source == coneButton)
1693	2560	{
1694	2561	makeSomething(new Cone());
1695	2562	} else
1696		- if (source == torusItem)
	2563	+ if (source == torusItem \|\| source == torusButton)
1697	2564	{
1698	2565	makeSomething(new Torus());
1699	2566	} else
1700		- if (source == superItem)
	2567	+ if (source == superItem \|\| source == superButton)
1701	2568	{
1702	2569	makeSomething(new Superellipsoid());
1703	2570	} else
1704		- if (source == kleinItem)
	2571	+ if (source == kleinItem \|\| source == kleinButton)
1705	2572	{
1706	2573	makeSomething(new Klein());
1707	2574	} else
..	..	@@ -1721,7 +2588,7 @@
1721	2588	{
1722	2589	makeSomething(new BezierSurface());
1723	2590	} else
1724		- if (source == overlayItem)
	2591	+ if (source == overlayItem \|\| source == overlayButton)
1725	2592	{
1726	2593	/*
1727	2594	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1769,10 +2636,27 @@
1769	2636	s.setup();
1770	2637	makeSomething(s);
1771	2638	} else
1772		- if (source == lightItem)
	2639	+ if (source == lightItem \|\| source == lightButton)
1773	2640	{
1774	2641	makeSomething(new Light());
1775	2642	} else
	2643	+// if (source == skybox1Button \|\|
	2644	+// source == skybox2Button \|\|
	2645	+// source == skybox3Button \|\|
	2646	+// source == skybox4Button \|\|
	2647	+// source == skybox5Button \|\|
	2648	+// source == skybox6Button \|\|
	2649	+// source == skybox7Button \|\|
	2650	+// source == skybox11Button \|\|
	2651	+// source == skybox12Button \|\|
	2652	+// source == skybox13Button \|\|
	2653	+// source == skybox14Button \|\|
	2654	+// source == skybox15Button \|\|
	2655	+// source == skybox16Button \|\|
	2656	+// source == skybox17Button)
	2657	+// {
	2658	+// ChangeSkybox(source);
	2659	+// } else
1776	2660	if (source == csgItem)
1777	2661	{
1778	2662	group(new CSG());
..	..	@@ -1819,30 +2703,38 @@
1819	2703
1820	2704	group(g);
1821	2705	} else
1822		- if (source == loopItem)
	2706	+ if (source == loopItem \|\| source == loopButton)
1823	2707	{
	2708	+ if (!group.selection.isEmpty())
	2709	+ {
1824	2710	Composite csg = new GroupLeaf();
1825	2711	csg.count = 5;
1826		- group(csg);
1827		- Composite child = new cGroup();
	2712	+ Composite child = new cGroup("Branch");
1828	2713	csg.addChild(child);
1829	2714	child.addChild(csg);
	2715	+ group(csg);
	2716	+ }
1830	2717	} else
1831	2718	if (source == doubleItem)
1832	2719	{
1833		- Composite csg = new GroupLeaf();
	2720	+ if (!group.selection.isEmpty())
	2721	+ {
	2722	+ Composite csg = new GroupLeaf("Fork");
1834	2723	csg.count = 5;
	2724	+ Composite child = new cGroup("Branch A");
	2725	+ csg.addChild(child);
	2726	+ child.addChild(csg);
	2727	+ child = new cGroup("Branch B");
	2728	+ csg.addChild(child);
	2729	+ child.addChild(csg);
1835	2730	group(csg);
1836		- Composite child = new cGroup();
1837		- csg.addChild(child);
1838		- child.addChild(csg);
1839		- child = new cGroup();
1840		- csg.addChild(child);
1841		- child.addChild(csg);
	2731	+ }
1842	2732	} else
1843	2733	if (source == tripleItem)
1844	2734	{
1845		- Composite csg = new GroupLeaf();
	2735	+ if (!group.selection.isEmpty())
	2736	+ {
	2737	+ Composite csg = new GroupLeaf("Trident");
1846	2738	csg.count = 4;
1847	2739	group(csg);
1848	2740	Composite child = new cGroup();
..	..	@@ -1854,36 +2746,12 @@
1854	2746	child = new cGroup();
1855	2747	csg.addChild(child);
1856	2748	child.addChild(csg);
1857		- } else
1858		-
1859		- if (source == importGFDItem)
1860		- {
1861		- ImportGFD();
1862		- } else
1863		- if (source == importVRMLX3DItem)
1864		- {
1865		- ImportVRMLX3D();
1866		- } else
1867		- if (source == import3DSItem)
1868		- {
1869		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1870		- } else
1871		- if (source == importOBJItem)
1872		- {
1873		- //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1874		- FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
1875		- browser.setVisible(true);
1876		- String filename = browser.getFile();
1877		- if (filename != null && filename.length() > 0)
1878		- {
1879		- String fullname = browser.getDirectory() + filename;
1880		- makeSomething(ReadOBJ(fullname), true);
1881		- }
	2749	+ }
1882	2750	} else
1883	2751	if (source == computeAOItem)
1884	2752	{
1885	2753	Globals.drawMode = CameraPane.OCCLUSION;
1886		- Globals.theRenderer.repaint();
	2754	+ cameraView.repaint();
1887	2755	} else
1888	2756	if (source == recompileItem)
1889	2757	{
..	..	@@ -1898,7 +2766,7 @@
1898	2766	if (source == invariantsItem)
1899	2767	{
1900	2768	System.out.println("Invariants:");
1901		- Grafreed.grafreeD.universe.invariants();
	2769	+ Grafreed.grafreed.universe.invariants();
1902	2770	} else
1903	2771	if (source == memoryItem)
1904	2772	{
..	..	@@ -1917,6 +2785,65 @@
1917	2785	{
1918	2786	DumpObject();
1919	2787	} else
	2788	+ if (source == minButton)
	2789	+ {
	2790	+ Minimize();
	2791	+ } else
	2792	+ if (source == maxButton)
	2793	+ {
	2794	+ Maximize();
	2795	+ } else
	2796	+ if (source == fullButton)
	2797	+ {
	2798	+ ToggleFullScreen();
	2799	+ } else
	2800	+ if (source == collapseButton)
	2801	+ {
	2802	+ this.expandedLayout = radio.layout;
	2803	+ CollapseToolbar();
	2804	+ } else
	2805	+ if (source == maximize3DButton)
	2806	+ {
	2807	+ this.expandedLayout = radio.layout;
	2808	+ radio.layout = twoButton;
	2809	+ Show3DView();
	2810	+ CollapseToolbar();
	2811	+ } else
	2812	+ if (source == previousVersionButton)
	2813	+ {
	2814	+ // Go to previous version
	2815	+ //if (!Undo())
	2816	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2817	+ PreviousVersion();
	2818	+ } else
	2819	+ if (source == restoreButton)
	2820	+ {
	2821	+ // Restore current version
	2822	+ Restore();
	2823	+ //restoreButton.setEnabled(false);
	2824	+ } else
	2825	+ if (source == replaceButton)
	2826	+ {
	2827	+ // Overwrite current version
	2828	+ Replace();
	2829	+ //replaceButton.setEnabled(false);
	2830	+ } else
	2831	+ if (source == nextVersionButton)
	2832	+ {
	2833	+ // Go to next version
	2834	+ NextVersion();
	2835	+ } else
	2836	+ if (source == saveVersionButton)
	2837	+ {
	2838	+ // Save a new version
	2839	+ if (!Save(true))
	2840	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2841	+ } else
	2842	+ if (source == deleteVersionButton)
	2843	+ {
	2844	+ // Delete a new version
	2845	+ DeleteVersion();
	2846	+ } else
1920	2847	if (source == oneStepButton)
1921	2848	{
1922	2849	Globals.ONESTEP = true;
..	..	@@ -1924,17 +2851,14 @@
1924	2851	} else
1925	2852	if (source == screenfitButton)
1926	2853	{
1927		- //Reload(lastConverter, lastFilename, true);
1928	2854	ScreenFit();
1929	2855	} else
1930	2856	if (source == screenfitpointButton)
1931	2857	{
1932		- //Reload(lastConverter, lastFilename, true);
1933	2858	ScreenFitPoint();
1934	2859	} else
1935	2860	if (source == snapobjectButton)
1936	2861	{
1937		- //Reload(lastConverter, lastFilename, true);
1938	2862	SnapObject();
1939	2863	} else
1940	2864	// if (event.getSource() == recompileButton)
..	..	@@ -1970,6 +2894,14 @@
1970	2894	if (source == cutItem \|\| source == clearButton)
1971	2895	{
1972	2896	loadClipboard(true);
	2897	+ } else
	2898	+ if (source == undoItem)
	2899	+ {
	2900	+ PreviousVersion();
	2901	+ } else
	2902	+ if (source == redoItem)
	2903	+ {
	2904	+ NextVersion();
1973	2905	} else
1974	2906	if (source == duplicateItem)
1975	2907	{
..	..	@@ -2290,7 +3222,7 @@
2290	3222	{
2291	3223	StepAll();
2292	3224	} else
2293		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3225	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2294	3226	{
2295	3227	//int indices[] = jList.getSelectedIndices();
2296	3228	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2302,9 +3234,9 @@
2302	3234	{
2303	3235	ClearSelection(true);
2304	3236	} else
2305		- if (source == grabItem)
	3237	+ if (source == grabItem \|\| source == groupButton)
2306	3238	{
2307		- group(new cGroup(), true);
	3239	+ group(new cGroup(), false); // true);
2308	3240	} else
2309	3241	if (source == hideItem)
2310	3242	{
..	..	@@ -2322,11 +3254,11 @@
2322	3254	{
2323	3255	makeSomething(new Camera());
2324	3256	} else
2325		- if (source == compositeItem)
	3257	+ if (source == compositeItem \|\| source == compositeButton)
2326	3258	{
2327	3259	group(new Composite());
2328	3260	} else
2329		- if (source == randomItem)
	3261	+ if (source == switchItem \|\| source == switchButton)
2330	3262	{
2331	3263	RandomNode random = new RandomNode();
2332	3264	group(random);
..	..	@@ -2428,7 +3360,7 @@
2428	3360	{
2429	3361	group(new cLinker());
2430	3362	} else
2431		- if (source == textureItem)
	3363	+ if (source == textureItem \|\| source == textureButton)
2432	3364	{
2433	3365	group(new TextureNode());
2434	3366	} else
..	..	@@ -2448,17 +3380,42 @@
2448	3380	{
2449	3381	CastShadow(2);
2450	3382	} else
2451		- if (source == ungroupItem)
	3383	+ if (source == ungroupItem \|\| source == ungroupButton)
2452	3384	{
2453		- //ungroup();
	3385	+ boolean canUngroup = true;
	3386	+
2454	3387	for (int i=0; i<group.selection.size(); i++)
2455	3388	{
2456		- Ungroup(group.selection.get(i));
	3389	+ Object3D selectedItem = group.selection.get(i);
	3390	+
	3391	+ if (selectedItem.Size() == 0)
	3392	+ {
	3393	+ // Cannot ungroup leaves
	3394	+ canUngroup = false;
	3395	+ break;
	3396	+ }
	3397	+
	3398	+ if (selectedItem == group)
	3399	+ {
	3400	+ // Cannot ungroup root
	3401	+ canUngroup = false;
	3402	+ break;
	3403	+ }
2457	3404	}
2458	3405
2459		- ClearSelection(false);
2460		-
2461		- refreshContents();
	3406	+ if (canUngroup)
	3407	+ {
	3408	+ for (int i=0; i<group.selection.size(); i++)
	3409	+ {
	3410	+ Object3D selectedItem = group.selection.get(i);
	3411	+
	3412	+ Ungroup(selectedItem);
	3413	+ }
	3414	+
	3415	+ ClearSelection(false);
	3416	+
	3417	+ refreshContents();
	3418	+ }
2462	3419	} else
2463	3420	if (source == genUVItem)
2464	3421	{
..	..	@@ -2470,7 +3427,7 @@
2470	3427	} else
2471	3428	if (source == genNormalsMESHItem)
2472	3429	{
2473		- GenNormals(true); // TODO
	3430	+ GenNormalsMESH();
2474	3431	} else
2475	3432	if (source == genNormalsORGANItem)
2476	3433	{
..	..	@@ -2535,6 +3492,22 @@
2535	3492	if (source == unmarkleavesItem)
2536	3493	{
2537	3494	MarkLeaves(false);
	3495	+ } else
	3496	+ if (source == rewindleavesItem)
	3497	+ {
	3498	+ RewindLeaves(true);
	3499	+ } else
	3500	+ if (source == unrewindleavesItem)
	3501	+ {
	3502	+ RewindLeaves(false);
	3503	+ } else
	3504	+ if (source == randomleavesItem)
	3505	+ {
	3506	+ RandomLeaves(true);
	3507	+ } else
	3508	+ if (source == unrandomleavesItem)
	3509	+ {
	3510	+ RandomLeaves(false);
2538	3511	} else
2539	3512	if (source == flipVItem)
2540	3513	{
..	..	@@ -2743,7 +3716,7 @@
2743	3716	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2744	3717	{
2745	3718	obj = (Object3D)e.nextElement();
2746		- obj.SetBumpTexture(null);
	3719	+ obj.ResetBumpTexture();
2747	3720	}
2748	3721
2749	3722	refreshContents();
..	..	@@ -2759,6 +3732,31 @@
2759	3732
2760	3733	refreshContents();
2761	3734	} else
	3735	+ if (source == embedTexturesItem)
	3736	+ {
	3737	+ Object3D obj;
	3738	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3739	+ {
	3740	+ obj = (Object3D)e.nextElement();
	3741	+ obj.EmbedTextures(true);
	3742	+ }
	3743	+
	3744	+ refreshContents();
	3745	+ } else
	3746	+ if (source == deEmbedTexturesItem)
	3747	+ {
	3748	+ Object3D obj;
	3749	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3750	+ {
	3751	+ obj = (Object3D)e.nextElement();
	3752	+ obj.EmbedTextures(false);
	3753	+ }
	3754	+
	3755	+ CameraPane.texturepigment.clear();
	3756	+ CameraPane.texturebump.clear();
	3757	+
	3758	+ refreshContents();
	3759	+ } else
2762	3760	if (source == flashSelectionButton)
2763	3761	{
2764	3762	CameraPane.flash = true;
..	..	@@ -2770,42 +3768,36 @@
2770	3768	if (source == twoButton)
2771	3769	{
2772	3770	radio.layout = twoButton;
2773		- // bug
2774		- //gridPanel.setDividerLocation(1.0);
2775		- //bigPanel.setDividerLocation(0.0);
2776		-// bigThree.remove(scenePanel);
2777		-// bigThree.remove(centralPanel);
2778		-// bigThree.remove(XYZPanel);
2779		-// aWindowConstraints.gridx = 0;
2780		-// aWindowConstraints.gridy = 0;
2781		-// aWindowConstraints.gridwidth = 1;
2782		-// // aConstraints.gridheight = 3;
2783		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2784		-// aWindowConstraints.weightx = 0;
2785		-// aWindowConstraints.weighty = 1;
2786		-// //bigThree.add(jtp, aWindowConstraints);
2787		-// aWindowConstraints.weightx = 1;
2788		-// aWindowConstraints.gridwidth = 3;
2789		-// // aConstraints.gridheight = 3;
2790		-// aWindowConstraints.gridx = 1;
2791		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
2792		-// bigThree.add(centralPanel, aWindowConstraints);
2793		-// aWindowConstraints.weightx = 0;
2794		-// aWindowConstraints.gridx = 4;
2795		-// aWindowConstraints.gridwidth = 1;
2796		-// // aConstraints.gridheight = 3;
2797		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2798		-// //bigThree.add(XYZPanel, aWindowConstraints);
2799		-// scenePanel.setVisible(false);
2800		-// centralPanel.setVisible(true);
2801		-// XYZPanel.setVisible(false);
2802		- bigThree.ClearUI();
2803		- bigThree.add(centralPanel);
2804		- bigThree.FlushUI();
	3771	+
	3772	+ if (CameraPane.FULLSCREEN)
	3773	+ fullscreenLayout = radio.layout;
	3774	+
	3775	+ Show3DView();
	3776	+
	3777	+ cameraView.requestFocusInWindow();
	3778	+
	3779	+// refreshContents(true);
	3780	+//
	3781	+// try
	3782	+// {
	3783	+// java.awt.Robot bot = new java.awt.Robot();
	3784	+// int mask = InputEvent.BUTTON1_MASK;
	3785	+// bot.mouseMove(100, 100);
	3786	+// bot.mousePress(mask);
	3787	+// bot.mouseRelease(mask);
	3788	+// }
	3789	+// catch (Exception e)
	3790	+// {
	3791	+//
	3792	+// }
	3793	+
2805	3794	} else
2806	3795	if (source == threeButton)
2807	3796	{
2808	3797	radio.layout = threeButton;
	3798	+
	3799	+ if (CameraPane.FULLSCREEN)
	3800	+ fullscreenLayout = radio.layout;
2809	3801
2810	3802	// bigThree.remove(scenePanel);
2811	3803	// bigThree.remove(centralPanel);
..	..	@@ -2835,13 +3827,18 @@
2835	3827	// centralPanel.setVisible(true);
2836	3828	// XYZPanel.setVisible(true);
2837	3829	bigThree.ClearUI();
	3830	+ bigThree.add(scenePanel);
2838	3831	bigThree.add(centralPanel);
2839		- bigThree.add(XYZPanel);
2840	3832	bigThree.FlushUI();
	3833	+
	3834	+ cameraView.requestFocusInWindow();
2841	3835	} else
2842	3836	if (source == fourButton)
2843	3837	{
2844	3838	radio.layout = fourButton;
	3839	+
	3840	+ if (CameraPane.FULLSCREEN)
	3841	+ fullscreenLayout = radio.layout;
2845	3842
2846	3843	// bigThree.remove(scenePanel);
2847	3844	// bigThree.remove(centralPanel);
..	..	@@ -2873,10 +3870,15 @@
2873	3870	bigThree.ClearUI();
2874	3871	bigThree.add(scenePanel);
2875	3872	bigThree.FlushUI();
	3873	+
	3874	+ cameraView.requestFocusInWindow();
2876	3875	} else
2877	3876	if (source == sixButton)
2878	3877	{
2879	3878	radio.layout = sixButton;
	3879	+
	3880	+ if (CameraPane.FULLSCREEN)
	3881	+ fullscreenLayout = radio.layout;
2880	3882
2881	3883	// bigThree.remove(scenePanel);
2882	3884	// bigThree.remove(centralPanel);
..	..	@@ -2906,13 +3908,18 @@
2906	3908	// centralPanel.setVisible(true);
2907	3909	// XYZPanel.setVisible(false);
2908	3910	bigThree.ClearUI();
2909		- bigThree.add(scenePanel);
2910	3911	bigThree.add(centralPanel);
	3912	+ bigThree.add(scenePanel);
2911	3913	bigThree.FlushUI();
	3914	+
	3915	+ cameraView.requestFocusInWindow();
2912	3916	} else
2913	3917	if (source == sevenButton)
2914	3918	{
2915	3919	radio.layout = sevenButton;
	3920	+
	3921	+ if (CameraPane.FULLSCREEN)
	3922	+ fullscreenLayout = radio.layout;
2916	3923
2917	3924	// bigThree.remove(scenePanel);
2918	3925	// bigThree.remove(centralPanel);
..	..	@@ -2946,9 +3953,12 @@
2946	3953	bigThree.add(centralPanel);
2947	3954	bigThree.add(XYZPanel);
2948	3955	bigThree.FlushUI();
	3956	+
	3957	+ cameraView.requestFocusInWindow();
2949	3958	} else
2950	3959	if (source == rootButton)
2951	3960	{
	3961	+ Replace();
2952	3962	Object3D obj;
2953	3963	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2954	3964	{
..	..	@@ -2957,31 +3967,49 @@
2957	3967	EditObject(obj);
2958	3968	}
2959	3969
	3970	+ cameraView.requestFocusInWindow();
2960	3971	refreshContents(true);
2961	3972	} else
2962	3973	if (source == closeButton)
2963	3974	{
2964	3975	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	3976	+ Replace();
	3977	+
2965	3978	cRadio ab;
2966	3979	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2967	3980	{
2968	3981	ab = (cRadio)e.nextElement();
2969		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3982	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2970	3983	{
	3984	+ // Patch to avoid bug with transparency.
	3985	+ if (!ab.hadMaterial)
	3986	+ {
	3987	+ ab.object.material = null;
	3988	+ }
	3989	+
2971	3990	buttonGroup.remove(ab);
2972	3991	radioPanel.remove(ab);
2973	3992
2974		- ab.GetObject().editWindow = null;
	3993	+ //ab.GetObject().editWindow = null;
	3994	+ ab.GetObject().manipWindow = null;
2975	3995	// ab.GetObject().objectUI = null; // ?????????
2976	3996
2977	3997	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2978	3998	break;
2979	3999	}
2980	4000	}
	4001	+
	4002	+ cameraView.requestFocusInWindow();
2981	4003	refreshContents(true);
2982	4004	} else
2983	4005	if (source == editItem \|\| source == editButton)
2984	4006	{
	4007	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4008	+ {
	4009	+ Object3D child = (Object3D)e.nextElement();
	4010	+ child.pinned = true;
	4011	+ }
	4012	+
2985	4013	EditSelection(false);
2986	4014	} else
2987	4015	if (source == uneditButton)
..	..	@@ -2990,11 +4018,12 @@
2990	4018	{
2991	4019	Object3D child = (Object3D)e.nextElement();
2992	4020	if(child.editWindow != null)
2993		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4021	+ child.pinned = false;
2994	4022	child.CloseUI();
2995	4023	listUI.remove(child);
	4024	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2996	4025
2997		- child.editWindow = null; // ???????????
	4026	+ //child.editWindow = null; // ???????????
2998	4027	}
2999	4028	objEditor.ctrlPanel.FlushUI();
3000	4029	//objEditor.jTree.clearSelection();
..	..	@@ -3007,16 +4036,18 @@
3007	4036	//copy.ClearUI();
3008	4037	for (Object3D obj : listUI)
3009	4038	{
	4039	+ obj.pinned = false;
3010	4040	obj.CloseUI();
3011	4041	}
3012	4042	listUI.clear();
	4043	+ SetPinStates(group.selection.size() > 0);
3013	4044	refreshContents(true);
3014	4045	} else
3015	4046	if (source == allParamsButton)
3016	4047	{
3017	4048	assert(copy == group);
3018	4049
3019		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4050	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3020	4051
3021	4052	for (Object3D obj : listUI)
3022	4053	{
..	..	@@ -3042,6 +4073,8 @@
3042	4073	} else
3043	4074	if(source instanceof cRadio)
3044	4075	{
	4076	+ Replace();
	4077	+
3045	4078	group.parent = keepparent;
3046	4079	group.attributes = 0;
3047	4080	//group.editWindow = null;
..	..	@@ -3065,6 +4098,7 @@
3065	4098	}
3066	4099
3067	4100	copy = group;
	4101	+
3068	4102	//Globals.theRenderer.object = group;
3069	4103	if(!useclient)
3070	4104	{
..	..	@@ -3081,7 +4115,9 @@
3081	4115	sideView.object = group;
3082	4116	}
3083	4117
3084		-// fix "+" issue group.editWindow = this;
	4118	+// fix "+" issue
	4119	+ //group.editWindow = this;
	4120	+ group.manipWindow = this;
3085	4121
3086	4122	/*
3087	4123	currentLayout = radio.layout;
..	..	@@ -3089,13 +4125,61 @@
3089	4125	currentLayout = sevenButton;
3090	4126	*/
3091	4127	radio.layout.doClick();
	4128	+
	4129	+ assert(copy instanceof Composite);
	4130	+
	4131	+ if (copy.versionlist == null)
	4132	+ {
	4133	+ copy.versionindex = -1;
	4134	+
	4135	+ // Cannot work with loops
	4136	+ // To fix this issue, we first mark all nodes above the root,
	4137	+ // and check if any of these nodes are reachable below the root.
	4138	+ Grafreed.grafreed.universe.TagObjects(copy, true);
	4139	+
	4140	+ if (!copy.HasTags())
	4141	+ {
	4142	+ copy.versionlist = new Object3D[100];
	4143	+
	4144	+ Save(true);
	4145	+ }
	4146	+
	4147	+ Grafreed.grafreed.universe.TagObjects(copy, false);
	4148	+ }
	4149	+
	4150	+ SetVersionStates();
	4151	+
	4152	+ ClearUnpinned();
	4153	+
	4154	+ //Grafreed.Assert(group != null);
	4155	+ //Grafreed.Assert(group.selection != null);
	4156	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4157	+ if (group.selection == null \|\| group.selection.size() == 1)
	4158	+ EditSelection(false);
3092	4159	keepparent = group.parent;
3093	4160	// PARENT = NULL or not???
3094	4161	//group.parent = null; // ROOT
3095	4162	//group.attributes = -1;
3096	4163	ResetModel();
	4164	+
	4165	+ cameraView.requestFocusInWindow();
3097	4166	refreshContents(true);
3098		- }
	4167	+ } else if (event.getSource() == editCameraItem)
	4168	+ {
	4169	+ cameraView.ProtectCamera();
	4170	+ cameraView.requestFocusInWindow();
	4171	+ cameraView.repaint();
	4172	+ return;
	4173	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	4174	+ {
	4175	+ cameraView.RevertCamera();
	4176	+ cameraView.requestFocusInWindow();
	4177	+ cameraView.repaint();
	4178	+ return;
	4179	+ // } else if (event.getSource() == textureButton)
	4180	+ // {
	4181	+ // return; // true;
	4182	+ }
3099	4183	else
3100	4184	{
3101	4185	//return super.action(event, arg);
..	..	@@ -3104,7 +4188,6 @@
3104	4188	}
3105	4189
3106	4190	boolean useclient = false;
3107		- cRadio radio;
3108	4191
3109	4192	void ToggleRoot()
3110	4193	{
..	..	@@ -3209,7 +4292,7 @@
3209	4292	TouchTransform(obj);
3210	4293	continue;
3211	4294	}
3212		- if ((mask&2) != 0) // Scale
	4295	+ if ((mask&2) != 0) // Scale/rotation
3213	4296	{
3214	4297	obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
3215	4298	obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
..	..	@@ -3217,10 +4300,6 @@
3217	4300	obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
3218	4301	obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
3219	4302	obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
3220		- }
3221		- if ((mask&4) != 0) // Rotation
3222		- {
3223		- // ?
3224	4303	}
3225	4304	if ((mask&1) != 0) // Translation
3226	4305	{
..	..	@@ -3343,7 +4422,8 @@
3343	4422
3344	4423	int size = obj.MemorySize();
3345	4424
3346		- System.err.println((size/1024) + " KB is the size of " + obj);
	4425	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4426	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3347	4427	}
3348	4428	}
3349	4429	catch (Exception e)
..	..	@@ -3424,6 +4504,13 @@
3424	4504	void GenNormals(boolean crease)
3425	4505	{
3426	4506	group.GenNormalsS(crease);
	4507	+
	4508	+ refreshContents();
	4509	+ }
	4510	+
	4511	+ void GenNormalsMESH()
	4512	+ {
	4513	+ group.GenNormalsMeshS();
3427	4514
3428	4515	refreshContents();
3429	4516	}
..	..	@@ -3659,7 +4746,7 @@
3659	4746
3660	4747	try
3661	4748	{
3662		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4749	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
3663	4750	}
3664	4751	catch (Exception e)
3665	4752	{
..	..	@@ -4051,6 +5138,18 @@
4051	5138	refreshContents();
4052	5139	}
4053	5140
	5141	+ void RewindLeaves(boolean hide)
	5142	+ {
	5143	+ group.selection.RewindLeaves(hide);
	5144	+ refreshContents();
	5145	+ }
	5146	+
	5147	+ void RandomLeaves(boolean hide)
	5148	+ {
	5149	+ group.selection.RandomLeaves(hide);
	5150	+ refreshContents();
	5151	+ }
	5152	+
4054	5153	void SetTexRes(int tr)
4055	5154	{
4056	5155	group.selection.SetTexRes(tr);
..	..	@@ -4122,28 +5221,25 @@
4122	5221	// }
4123	5222	// }
4124	5223
4125		- static boolean allparams = true;
4126		-
4127		- static Vector<Object3D> listUI = new Vector<Object3D>();
4128		-
4129	5224	void EditSelection(boolean newWindow)
4130	5225	{
	5226	+ if (group.selection == null)
	5227	+ {
	5228	+ EditElement(group, newWindow); // ? new
	5229	+ return;
	5230	+ }
	5231	+
4131	5232	// aConstraints.gridy = 0;
4132	5233	for (int i=0; i<group.selection.size(); i++)
4133	5234	{
4134	5235	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4135	5236	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4136		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5237	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4137	5238
4138	5239	Object3D elem = (Object3D)group.selection.elementAt(i);
4139	5240	if(elem != group \|\| !newWindow)
4140	5241	{
4141		- // if (!(elem instanceof Composite))
4142		- // newWindow = false;
4143		- listUI.add(elem);
4144		- elem.openEditWindow(this, newWindow); //, false);
4145		- System.out.println("edit : " + elem);
4146		- elem.editWindow.refreshContents(true); // ? new
	5242	+ EditElement(elem, newWindow); // ? new
4147	5243	}
4148	5244	}
4149	5245	}
..	..	@@ -4206,9 +5302,7 @@
4206	5302
4207	5303	freezemodel = false;
4208	5304	}
4209		-
4210		- boolean flashIt = true;
4211		-
	5305	+
4212	5306	public void valueChanged(TreeSelectionEvent e)
4213	5307	//public boolean handleEvent(Event event)
4214	5308	{
..	..	@@ -4218,7 +5312,8 @@
4218	5312	//new Exception().printStackTrace();
4219	5313
4220	5314	freezemodel = true;
4221		-
	5315	+ ClearUnpinned();
	5316	+
4222	5317	/**/
4223	5318	//switch (event.id)
4224	5319	{
..	..	@@ -4226,7 +5321,6 @@
4226	5321	//case 702: // Event.LIST_DESELECT
4227	5322	group.deselectAll();
4228	5323	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4229		- objEditor.ClearInfo(); // .GetMaterial());
4230	5324	if (tps != null)
4231	5325	{
4232	5326	for (int i=0; i < tps.length; i++)
..	..	@@ -4235,10 +5329,8 @@
4235	5329
4236	5330	//if (child.parent != null)
4237	5331	//child.parent.addSelectee(child);
	5332	+ objEditor.SetMaterial(child);
4238	5333	group.addSelectee(child);
4239		- objEditor.SetMaterial(child); // .GetMaterial());
4240		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4241		- System.err.println("info : " + child.GetPath());
4242	5334	}
4243	5335	}
4244	5336	// else
..	..	@@ -4248,20 +5340,28 @@
4248	5340	// System.err.println("info : " + group.GetPath());
4249	5341	// }
4250	5342
4251		- objEditor.SetText(); // jan 2014
4252		-
4253		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	5343	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4254	5344	CameraPane.flash = true;
4255	5345
4256		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5346	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4257	5347	// a camera
4258	5348	{
4259		- CameraPane.camerachangeframe = 0; // don't refuse it
4260		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5349	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5350	+ {
	5351	+ CameraPane.camerachangeframe = 0; // don't refuse it
	5352	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5353	+ }
4261	5354	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4262	5355	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4263	5356	}
4264	5357
	5358	+ if (tps != null && tps.length == 1)
	5359	+ {
	5360	+ EditSelection(false);
	5361	+ }
	5362	+
	5363	+ SetPinStates(tps != null && tps.length > 0);
	5364	+
4265	5365	refreshContents();
4266	5366	//return true;
4267	5367	}
..	..	@@ -4270,6 +5370,53 @@
4270	5370
4271	5371	freezemodel = false;
4272	5372	}
	5373	+
	5374	+ void SetPinStates(boolean enabled)
	5375	+ {
	5376	+ editButton.setEnabled(enabled);
	5377	+ uneditButton.setEnabled(enabled);
	5378	+ //unselectButton.setEnabled(enabled);
	5379	+ flashSelectionButton.setEnabled(enabled);
	5380	+
	5381	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5382	+
	5383	+ boolean allComposites = true;
	5384	+
	5385	+ if (group.selection != null)
	5386	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5387	+ {
	5388	+ Object next = e.nextElement();
	5389	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5390	+ {
	5391	+ allComposites = false;
	5392	+ break;
	5393	+ }
	5394	+ }
	5395	+
	5396	+ rootButton.setEnabled(allComposites);
	5397	+ }
	5398	+
	5399	+ void refreshContents(boolean cp)
	5400	+ {
	5401	+ if (Globals.ADVANCED)
	5402	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5403	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5404	+ {
	5405	+ objEditor.ClearInfo(); // .GetMaterial());
	5406	+
	5407	+ for (int i=0; i < group.selection.Size(); i++)
	5408	+ {
	5409	+ Object3D child = (Object3D) group.selection.get(i);
	5410	+
	5411	+ objEditor.AddInfo(child, this, true);
	5412	+// System.err.println("info : " + child.GetPath());
	5413	+ }
	5414	+
	5415	+ objEditor.SetText(); // jan 2014
	5416	+ }
	5417	+
	5418	+ super.refreshContents(cp);
	5419	+ }
4273	5420
4274	5421	void linkSomething(Object3D thing)
4275	5422	{
..	..	@@ -4341,6 +5488,7 @@
4341	5488	{
4342	5489	if (group.selection.isEmpty())
4343	5490	return;
	5491	+
4344	5492	Grafreed.clipboardIsTempGroup = false;
4345	5493	Composite tGroup = null;
4346	5494	if (group.selection.size() > 0) // 1)
..	..	@@ -4351,6 +5499,8 @@
4351	5499
4352	5500	if (cut)
4353	5501	{
	5502	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5503	+// Save();
4354	5504	//int indices[] = jList.getSelectedIndices();
4355	5505	//for (int i = indices.length - 1; i >= 0; i--)
4356	5506	//jList.remove(indices[i]);
..	..	@@ -4440,8 +5590,10 @@
4440	5590	}
4441	5591
4442	5592	}
	5593	+
4443	5594	if (Grafreed.clipboardIsTempGroup)
4444	5595	Grafreed.clipboard = tGroup;
	5596	+
4445	5597	if (cut)
4446	5598	{
4447	5599	ResetModel();
..	..	@@ -4451,6 +5603,10 @@
4451	5603
4452	5604	void paste(boolean expand)
4453	5605	{
	5606	+ if (Globals.REPLACEONMAKE)
	5607	+ Save();
	5608	+ boolean keep = Globals.REPLACEONMAKE;
	5609	+ Globals.REPLACEONMAKE = false;
4454	5610	// if (GrafreeD.clipboard == null)
4455	5611	// return;
4456	5612	boolean first = true;
..	..	@@ -4510,6 +5666,7 @@
4510	5666	Grafreed.clipboard.get(0).parent = keepparent;
4511	5667	}
4512	5668
	5669	+ Globals.REPLACEONMAKE = keep;
4513	5670	ResetModel();
4514	5671	refreshContents();
4515	5672	}
..	..	@@ -4645,6 +5802,10 @@
4645	5802
4646	5803	void group(Object3D csg, boolean grab)
4647	5804	{
	5805	+ if (Globals.REPLACEONMAKE)
	5806	+ Save();
	5807	+ boolean keep = Globals.REPLACEONMAKE;
	5808	+ Globals.REPLACEONMAKE = false;
4648	5809	if (//false) // why??
4649	5810	!group.selection.isEmpty())
4650	5811	{
..	..	@@ -4758,10 +5919,15 @@
4758	5919	//node.add(csg);
4759	5920	//makeSomething(node);
4760	5921	makeSomething(csg);
	5922	+ Globals.REPLACEONMAKE = keep;
4761	5923	}
4762	5924
4763	5925	void Ungroup(Object3D g)
4764	5926	{
	5927	+ if (Globals.REPLACEONMAKE)
	5928	+ Save();
	5929	+ boolean keep = Globals.REPLACEONMAKE;
	5930	+ Globals.REPLACEONMAKE = false;
4765	5931	if (g instanceof HiddenObject)
4766	5932	{
4767	5933	HiddenObject h = (HiddenObject) g;
..	..	@@ -4778,6 +5944,7 @@
4778	5944	objEditor.makeSomething(g.get(i), false);
4779	5945	}
4780	5946	}
	5947	+ Globals.REPLACEONMAKE = keep;
4781	5948	}
4782	5949
4783	5950	void ungroup()
..	..	@@ -4973,21 +6140,6 @@
4973	6140	}
4974	6141	*/
4975	6142
4976		- void ImportGFD()
4977		- {
4978		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4979		- browser.show();
4980		- String filename = browser.getFile();
4981		- if (filename != null && filename.length() > 0)
4982		- {
4983		- String fullname = browser.getDirectory() + filename;
4984		-
4985		- //Object3D readobj =
4986		- objEditor.ReadGFD(fullname, objEditor);
4987		- //makeSomething(readobj);
4988		- }
4989		- }
4990		-
4991	6143	/*
4992	6144	public void Callback(Object obj)
4993	6145	{
..	..	@@ -5011,23 +6163,6 @@
5011	6163	}
5012	6164	*/
5013	6165
5014		- void ImportVRMLX3D()
5015		- {
5016		- if (Grafreed.standAlone)
5017		- {
5018		- /**/
5019		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
5020		- browser.show();
5021		- String filename = browser.getFile();
5022		- if (filename != null && filename.length() > 0)
5023		- {
5024		- String fullname = browser.getDirectory() + filename;
5025		- LoadVRMLX3D(fullname);
5026		- }
5027		- /**/
5028		- }
5029		- }
5030		-
5031	6166	String GetFile(String dialogName)
5032	6167	{
5033	6168	if (Grafreed.standAlone)
..	..	@@ -5098,7 +6233,43 @@
5098	6233	cButton clearpanelButton;
5099	6234	cButton unselectButton;
5100	6235
	6236	+ cButton restoreCameraButton;
	6237	+
5101	6238	cButton oneStepButton;
	6239	+
	6240	+ cButton groupButton;
	6241	+ cButton ungroupButton;
	6242	+ cButton compositeButton;
	6243	+ cButton switchButton;
	6244	+ cButton loopButton;
	6245	+ cButton textureButton;
	6246	+
	6247	+ cButton skybox1Button;
	6248	+ cButton skybox2Button;
	6249	+ cButton skybox3Button;
	6250	+ cButton skybox4Button;
	6251	+ cButton skybox5Button;
	6252	+ cButton skybox6Button;
	6253	+ cButton skybox7Button;
	6254	+
	6255	+ cButton skybox11Button;
	6256	+ cButton skybox12Button;
	6257	+ cButton skybox13Button;
	6258	+ cButton skybox14Button;
	6259	+ cButton skybox15Button;
	6260	+ cButton skybox16Button;
	6261	+ cButton skybox17Button;
	6262	+
	6263	+ cButton gridButton;
	6264	+ cButton boxButton;
	6265	+ cButton sphereButton;
	6266	+ cButton coneButton;
	6267	+ cButton torusButton;
	6268	+ cButton superButton;
	6269	+ cButton kleinButton;
	6270	+ cButton particlesButton;
	6271	+ cButton overlayButton;
	6272	+ cButton lightButton;
5102	6273
5103	6274	cButton screenfitButton;
5104	6275	cButton screenfitpointButton;
..	..	@@ -5111,14 +6282,6 @@
5111	6282
5112	6283	cButton setsupportButton;
5113	6284
5114		- cButton twoButton;
5115		- cButton sixButton;
5116		- cButton threeButton;
5117		- cButton sevenButton;
5118		- cButton fourButton; // full panel
5119		- cButton oneButton; // full XYZ
5120		- //cButton currentLayout;
5121		-
5122	6285	//
5123	6286	//Composite
5124	6287	Object3D // to do !!
..	..	@@ -5128,10 +6291,12 @@
5128	6291	//JTree jTree;
5129	6292	private MenuItem lookAtItem;
5130	6293	private MenuItem lookFromItem;
5131		- private MenuItem switchItem;
5132		- private MenuItem cutItem;
5133		- private MenuItem duplicateItem;
5134		- private MenuItem cloneItem;
	6294	+ private MenuItem switchViewItem;
	6295	+ private JMenuItem cutItem;
	6296	+ private MenuItem undoItem;
	6297	+ private MenuItem redoItem;
	6298	+ private JMenuItem duplicateItem;
	6299	+ private JMenuItem cloneItem;
5135	6300	private MenuItem cloneSupportItem;
5136	6301	private MenuItem overwriteGeoItem;
5137	6302	private MenuItem overwriteMatItem;
..	..	@@ -5152,13 +6317,13 @@
5152	6317	private MenuItem cloneGeometriesItem;
5153	6318	private MenuItem shareGeometriesItem;
5154	6319	private MenuItem mergeGeometriesItem;
5155		- private MenuItem copyItem;
	6320	+ private JMenuItem copyItem;
5156	6321	private MenuItem pasteItem;
5157		- private MenuItem pasteIntoItem;
5158		- private MenuItem pasteLinkItem;
5159		- private MenuItem pasteCloneItem;
5160		- private MenuItem pasteExpandItem;
5161		- private MenuItem clearItem;
	6322	+ private JMenuItem pasteIntoItem;
	6323	+ private JMenuItem pasteLinkItem;
	6324	+ private JMenuItem pasteCloneItem;
	6325	+ private JMenuItem pasteExpandItem;
	6326	+ private JMenuItem deleteItem;
5162	6327	private MenuItem clearAllItem;
5163	6328	private MenuItem genUVItem;
5164	6329	private MenuItem genNormalsMESHItem;
..	..	@@ -5193,6 +6358,10 @@
5193	6358	private MenuItem showleavesItem;
5194	6359	private MenuItem markleavesItem;
5195	6360	private MenuItem unmarkleavesItem;
	6361	+ private MenuItem rewindleavesItem;
	6362	+ private MenuItem unrewindleavesItem;
	6363	+ private MenuItem randomleavesItem;
	6364	+ private MenuItem unrandomleavesItem;
5196	6365
5197	6366	private MenuItem flipVItem;
5198	6367	private MenuItem unflipVItem;
..	..	@@ -5209,12 +6378,12 @@
5209	6378	private MenuItem transformGeometryItem;
5210	6379	private MenuItem transformChildrenItem;
5211	6380	private MenuItem hideItem;
5212		- private MenuItem grabItem;
	6381	+ private JMenuItem grabItem;
5213	6382	private MenuItem backItem;
5214	6383	private MenuItem frontItem;
5215	6384	private MenuItem cameraItem;
5216	6385	private MenuItem compositeItem;
5217		- private MenuItem randomItem;
	6386	+ private MenuItem switchItem;
5218	6387	private MenuItem physicsItem;
5219	6388	private MenuItem frameselectorItem;
5220	6389	private MenuItem scriptNodeItem;
..	..	@@ -5222,7 +6391,7 @@
5222	6391	private MenuItem switchTransfoItem;
5223	6392	private MenuItem morphItem;
5224	6393	private MenuItem linkerItem;
5225		- private MenuItem ungroupItem;
	6394	+ private JMenuItem ungroupItem;
5226	6395	private MenuItem editItem;
5227	6396	private MenuItem openWindowItem;
5228	6397	private MenuItem editLeafItem;
..	..	@@ -5238,6 +6407,8 @@
5238	6407	private MenuItem attachBumpItem;
5239	6408	private MenuItem detachBumpItem;
5240	6409	private MenuItem pigmentBumpItem;
	6410	+ private MenuItem embedTexturesItem;
	6411	+ private MenuItem deEmbedTexturesItem;
5241	6412
5242	6413	private MenuItem particleItem;
5243	6414	private MenuItem ragdollItem;
..	..	@@ -5276,11 +6447,6 @@
5276	6447	private MenuItem doubleItem;
5277	6448	private MenuItem tripleItem;
5278	6449
5279		- private MenuItem importGFDItem;
5280		- private MenuItem importVRMLX3DItem;
5281		- private MenuItem import3DSItem;
5282		- private MenuItem importOBJItem;
5283		-
5284	6450	private MenuItem computeAOItem;
5285	6451	private MenuItem recompileItem;
5286	6452	private MenuItem editScriptItem;
..	..	@@ -5290,4 +6456,8 @@
5290	6456	private MenuItem analyzeItem;
5291	6457	private MenuItem dumpItem;
5292	6458	//boolean freezemodel = false;
	6459	+
	6460	+ Menu cameraMenu;
	6461	+ MenuItem editCameraItem;
	6462	+ MenuItem restoreCameraItem;
5293	6463	}