~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -16,6 +16,7 @@
16	16	//import buoy.widget.BFileChooser;
17	17
18	18	class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
	19	+ Grafreed.iResourceCallBack,
19	20	ObjectUI,
20	21	Runnable,
21	22	ActionListener,
..	..	@@ -23,6 +24,360 @@
23	24	DragGestureListener, DragSourceListener, DropTargetListener,
24	25	ItemListener // ListSelectionListener
25	26	{
	27	+
	28	+ public void AddSkyboxButton(String f, String s, cGridBag row)
	29	+ {
	30	+ cButton skyboxButton;
	31	+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
	32	+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
	33	+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
	34	+ skyboxButton.setToolTipText(s.equals("") ? "No background" : s);
	35	+ skyboxButton.addActionListener(new ActionListener()
	36	+ {
	37	+ @Override
	38	+ public void actionPerformed(ActionEvent e)
	39	+ {
	40	+ ChangeSkybox(path);
	41	+ }
	42	+ });
	43	+ }
	44	+
	45	+ public void AddTextureButton(String f, String c, final String t, int count, cGridBag row)
	46	+ {
	47	+ cButton textureButton;
	48	+ final String path = "textures/" + f + "/" + c + "/"; // + t;
	49	+ row.add(textureButton = GetButton(path + "icons/" + t, !Grafreed.NIMBUSLAF));
	50	+ textureButton.setToolTipText(c + count);
	51	+ textureButton.addActionListener(new ActionListener()
	52	+ {
	53	+ @Override
	54	+ public void actionPerformed(ActionEvent e)
	55	+ {
	56	+ ChangeTexture(path + t);
	57	+ }
	58	+ });
	59	+ }
	60	+
	61	+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
	62	+ {
	63	+ cGridBag tab0 = new cGridBag().setVertical(true);
	64	+
	65	+ tab0.setName("Urban");
	66	+ skyboxpanel.add(tab0);
	67	+
	68	+ cGridBag row0 = new cGridBag();
	69	+ cGridBag row1 = new cGridBag();
	70	+ cGridBag row2 = new cGridBag();
	71	+ cGridBag row3 = new cGridBag();
	72	+ cGridBag row4 = new cGridBag();
	73	+ cGridBag row5 = new cGridBag();
	74	+ cGridBag row6 = new cGridBag();
	75	+
	76	+ AddSkyboxButton("default", "", row0);
	77	+ //AddSkyboxButton("default", "cornell", row0);
	78	+ AddSkyboxButton("penguins", "dust", row0);
	79	+ AddSkyboxButton("penguins", "tropic", row0);
	80	+ AddSkyboxButton("penguins", "yonder", row0);
	81	+
	82	+ AddSkyboxButton("default", "uffizi", row1);
	83	+ AddSkyboxButton("bridge", "Bridge", row1);
	84	+ AddSkyboxButton("bridge", "Bridge2", row1);
	85	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	86	+
	87	+ AddSkyboxButton("urban", "Parliament", row2);
	88	+ AddSkyboxButton("urban", "Roundabout", row2);
	89	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	90	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	91	+
	92	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	93	+ AddSkyboxButton("urban", "UnionSquare", row3);
	94	+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
	95	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	96	+
	97	+ AddSkyboxButton("park", "Buddha", row4);
	98	+ AddSkyboxButton("park", "CNTower2", row4);
	99	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	100	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	101	+
	102	+ AddSkyboxButton("park", "Park", row5);
	103	+ AddSkyboxButton("park", "Pond", row5);
	104	+ AddSkyboxButton("park", "Skansen", row5);
	105	+ AddSkyboxButton("park", "Skansen2", row5);
	106	+
	107	+ AddSkyboxButton("park", "Skansen3", row6);
	108	+ AddSkyboxButton("park", "Skansen4", row6);
	109	+ AddSkyboxButton("park", "Skansen5", row6);
	110	+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
	111	+
	112	+ tab0.add(row0);
	113	+ tab0.add(row1);
	114	+ tab0.add(row2);
	115	+ tab0.add(row3);
	116	+ tab0.add(row4);
	117	+ tab0.add(row5);
	118	+ tab0.add(row6);
	119	+
	120	+ for (int i=5; --i>=0;)
	121	+ {
	122	+ //oe.toolboxPanel.Return();
	123	+ //tab0.add(new cGridBag());
	124	+ }
	125	+ }
	126	+
	127	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	128	+ {
	129	+ cGridBag tab0 = new cGridBag().setVertical(true);
	130	+
	131	+ tab0.setName("Nature");
	132	+ skyboxpanel.add(tab0);
	133	+
	134	+ cGridBag row0 = new cGridBag();
	135	+ cGridBag row1 = new cGridBag();
	136	+ cGridBag row2 = new cGridBag();
	137	+ cGridBag row3 = new cGridBag();
	138	+ cGridBag row4 = new cGridBag();
	139	+ cGridBag row5 = new cGridBag();
	140	+ cGridBag row6 = new cGridBag();
	141	+
	142	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	143	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	144	+ AddSkyboxButton("beach", "PalmTrees", row0);
	145	+ AddSkyboxButton("beach", "Tenerife", row0);
	146	+
	147	+ AddSkyboxButton("beach", "Tenerife2", row1);
	148	+ AddSkyboxButton("beach", "Tenerife3", row1);
	149	+ AddSkyboxButton("field", "FishPond", row1);
	150	+ AddSkyboxButton("field", "Footballfield", row1);
	151	+
	152	+ AddSkyboxButton("field", "Meadow", row2);
	153	+ AddSkyboxButton("field", "Sorsele", row2);
	154	+ AddSkyboxButton("field", "Sorsele2", row2);
	155	+ AddSkyboxButton("field", "Sorsele3", row2);
	156	+
	157	+ AddSkyboxButton("forest", "Brudslojan", row3);
	158	+ AddSkyboxButton("forest", "Langholmen2", row3);
	159	+ AddSkyboxButton("forest", "Plants", row3);
	160	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	161	+
	162	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	163	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	164	+ AddSkyboxButton("mountain", "Teide", row4);
	165	+ AddSkyboxButton("park", "Tantolunden4", row4);
	166	+
	167	+ AddSkyboxButton("park", "Stairs", row5);
	168	+ AddSkyboxButton("default", "skycube", row6);
	169	+ AddSkyboxButton("rocky", "Langholmen", row5);
	170	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	171	+
	172	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	173	+ AddSkyboxButton("default", "CloudyHills", row6);
	174	+ AddSkyboxButton("daz", "Autumn", row6);
	175	+ AddSkyboxButton("daz", "MountainTrail", row6);
	176	+ /*
	177	+Autumn
	178	+Greenlands
	179	+MountainTrail
	180	+Oasis
	181	+TheRock
	182	+TopOfTheWorld
	183	+Winter
	184	+ */
	185	+
	186	+ tab0.add(row0);
	187	+ tab0.add(row1);
	188	+ tab0.add(row2);
	189	+ tab0.add(row3);
	190	+ tab0.add(row4);
	191	+ tab0.add(row5);
	192	+ tab0.add(row6);
	193	+
	194	+ for (int i=5; --i>=0;)
	195	+ {
	196	+ //oe.toolboxPanel.Return();
	197	+ //tab0.add(new cGridBag());
	198	+ }
	199	+ }
	200	+
	201	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	202	+ {
	203	+ cGridBag tab0 = new cGridBag().setVertical(true);
	204	+
	205	+ tab0.setName("Night");
	206	+ skyboxpanel.add(tab0);
	207	+
	208	+ cGridBag row0 = new cGridBag();
	209	+ cGridBag row1 = new cGridBag();
	210	+ cGridBag row2 = new cGridBag();
	211	+ cGridBag row3 = new cGridBag();
	212	+ cGridBag row4 = new cGridBag();
	213	+ cGridBag row5 = new cGridBag();
	214	+ cGridBag row6 = new cGridBag();
	215	+
	216	+ AddSkyboxButton("night", "NightPath", row0);
	217	+ AddSkyboxButton("night", "PondNight", row0);
	218	+ AddSkyboxButton("night", "Powerlines", row0);
	219	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	220	+
	221	+ AddSkyboxButton("urban", "CNTower", row1);
	222	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	223	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	224	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
	225	+
	226	+ AddSkyboxButton("penguins", "kenon_star", row2);
	227	+ AddSkyboxButton("persson", "corona", row2);
	228	+ AddSkyboxButton("persson", "spaceskybox", row2);
	229	+ AddSkyboxButton("indoors", "Vasa", row2);
	230	+
	231	+ AddSkyboxButton("winter", "Backyard", row3);
	232	+ AddSkyboxButton("winter", "Creek", row3);
	233	+ AddSkyboxButton("winter", "FootballField3", row3);
	234	+ AddSkyboxButton("winter", "Forest", row3);
	235	+
	236	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	237	+ AddSkyboxButton("winter", "House", row4);
	238	+ AddSkyboxButton("winter", "IceLake", row4);
	239	+ AddSkyboxButton("winter", "IceRiver", row4);
	240	+
	241	+ AddSkyboxButton("winter", "Park3", row5);
	242	+ AddSkyboxButton("winter", "PondWinter", row5);
	243	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	244	+ AddSkyboxButton("winter", "Vindelalven", row5);
	245	+
	246	+ AddSkyboxButton("daz", "TheRock", row6);
	247	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	248	+ AddSkyboxButton("daz", "Winter", row6);
	249	+ AddSkyboxButton("mountain", "Ryfjallet", row6);
	250	+
	251	+ tab0.add(row0);
	252	+ tab0.add(row1);
	253	+ tab0.add(row2);
	254	+ tab0.add(row3);
	255	+ tab0.add(row4);
	256	+ tab0.add(row5);
	257	+ tab0.add(row6);
	258	+
	259	+ for (int i=5; --i>=0;)
	260	+ {
	261	+ //oe.toolboxPanel.Return();
	262	+ //tab0.add(new cGridBag());
	263	+ }
	264	+ }
	265	+
	266	+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
	267	+ {
	268	+ cGridBag tab0 = new cGridBag().setVertical(true);
	269	+
	270	+ tab0.setName("Others");
	271	+ skyboxpanel.add(tab0);
	272	+
	273	+ cGridBag row0 = new cGridBag();
	274	+ cGridBag row1 = new cGridBag();
	275	+ cGridBag row2 = new cGridBag();
	276	+ cGridBag row3 = new cGridBag();
	277	+ cGridBag row4 = new cGridBag();
	278	+ cGridBag row5 = new cGridBag();
	279	+ cGridBag row6 = new cGridBag();
	280	+
	281	+ AddSkyboxButton("mayhem", "afterrain", row0);
	282	+ AddSkyboxButton("mayhem", "aqua4", row0);
	283	+ AddSkyboxButton("mayhem", "aqua9", row0);
	284	+ AddSkyboxButton("mayhem", "flame", row0);
	285	+
	286	+ AddSkyboxButton("mayhem", "h2s", row1);
	287	+ AddSkyboxButton("mayhem", "prehistoric", row1);
	288	+ AddSkyboxButton("mayhem", "scorched", row1);
	289	+ AddSkyboxButton("penguins", "desertdawn", row1);
	290	+
	291	+ AddSkyboxButton("persson", "Citadella", row2);
	292	+ AddSkyboxButton("persson", "Citadella2", row2);
	293	+ AddSkyboxButton("persson", "clouds1", row2);
	294	+ AddSkyboxButton("penguins", "wrath", row2);
	295	+
	296	+ AddSkyboxButton("persson", "FishermansBastion", row3);
	297	+ AddSkyboxButton("persson", "HeroesSquare", row3);
	298	+ AddSkyboxButton("indoors", "DallasW", row3);
	299	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
	300	+
	301	+ AddSkyboxButton("persson", "LancellottiChapel", row4);
	302	+ AddSkyboxButton("persson", "PereaBeach1", row4);
	303	+ AddSkyboxButton("persson", "PereaBeach2", row4);
	304	+ AddSkyboxButton("persson", "redeclipse", row4);
	305	+
	306	+ AddSkyboxButton("daz", "Greenlands", row5);
	307	+ AddSkyboxButton("daz", "Oasis", row5);
	308	+ AddSkyboxButton("elyvisions", "arch3", row5);
	309	+ AddSkyboxButton("elyvisions", "calm_sea", row5);
	310	+
	311	+ AddSkyboxButton("elyvisions", "rainbow", row6);
	312	+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
	313	+ AddSkyboxButton("elyvisions", "heaven", row6);
	314	+ AddSkyboxButton("elyvisions", "hot", row6);
	315	+
	316	+ tab0.add(row0);
	317	+ tab0.add(row1);
	318	+ tab0.add(row2);
	319	+ tab0.add(row3);
	320	+ tab0.add(row4);
	321	+ tab0.add(row5);
	322	+ tab0.add(row6);
	323	+
	324	+ for (int i=5; --i>=0;)
	325	+ {
	326	+ //oe.toolboxPanel.Return();
	327	+ //tab0.add(new cGridBag());
	328	+ }
	329	+ }
	330	+
	331	+ public void ChangeSkybox(String skybox)
	332	+ {
	333	+ if (skybox.endsWith("/"))
	334	+ {
	335	+ group.skyboxname = null;
	336	+ group.skyboxext = null;
	337	+ cameraView.repaint();
	338	+ }
	339	+ else
	340	+ {
	341	+ //cameraView.envyoff = false;
	342	+ group.skyboxname = skybox;
	343	+ group.skyboxext = "jpg";
	344	+ cameraView.repaint();
	345	+ }
	346	+ }
	347	+
	348	+ public void CreateSkyboxPanel(cGridBag skyboxPanel)
	349	+ {
	350	+ JTabbedPane skyboxpane = new JTabbedPane();
	351	+
	352	+ AddSkyboxTab0(skyboxpane);
	353	+ AddSkyboxTab1(skyboxpane);
	354	+ AddSkyboxTab2(skyboxpane);
	355	+ AddSkyboxTab3(skyboxpane);
	356	+
	357	+ skyboxPanel.add(skyboxpane);
	358	+ }
	359	+
	360	+ public void ChangeTexture(String texture)
	361	+ {
	362	+ for (int i=0; i<group.selection.size(); i++)
	363	+ {
	364	+ Object3D obj = group.selection.get(i);
	365	+ obj.SetPigmentTexture("@" + texture);
	366	+ }
	367	+
	368	+ refreshContents();
	369	+ }
	370	+
	371	+ public void Show3DView()
	372	+ {
	373	+ // bug
	374	+ //gridPanel.setDividerLocation(1.0);
	375	+ //bigPanel.setDividerLocation(0.0);
	376	+ bigThree.ClearUI();
	377	+ bigThree.add(centralPanel);
	378	+ bigThree.FlushUI();
	379	+ }
	380	+
26	381	//ObjEditor objEditor;
27	382	public void closeUI2()
28	383	{
..	..	@@ -60,6 +415,14 @@
60	415	this.copy = this.group = group;
61	416	//selectees = this.group.selectees;
62	417
	418	+ if (copy.versionlist == null)
	419	+ {
	420	+ copy.versionlist = new Object3D[100];
	421	+ copy.versionindex = -1;
	422	+
	423	+ Save(true);
	424	+ }
	425	+
63	426	if(ui)
64	427	SetupUI(objEditor);
65	428	}
..	..	@@ -80,10 +443,22 @@
80	443	SetupViews(objEditor);
81	444
82	445	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	446	+
	447	+ if (copy.versionlist == null)
	448	+ {
	449	+ copy.versionlist = new Object3D[100];
	450	+ copy.versionindex = -1;
	451	+
	452	+ Save(true);
	453	+ }
83	454	}
84	455
85	456	void CloneSelection(boolean supports)
86	457	{
	458	+ if (Globals.REPLACEONMAKE)
	459	+ Save();
	460	+ boolean keep = Globals.REPLACEONMAKE;
	461	+ Globals.REPLACEONMAKE = false;
87	462	// Object3D keep = GrafreeD.clipboard;
88	463	//Object3D obj;
89	464	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,6 +469,7 @@
94	469
95	470	makeSomething(clone, i==group.selection.size()-1);
96	471	}
	472	+ Globals.REPLACEONMAKE = keep;
97	473	}
98	474
99	475	void CloneClipboard(boolean supports)
..	..	@@ -150,6 +526,8 @@
150	526
151	527	void SetupMenu2(GroupEditor oe)
152	528	{
	529	+ oe.jTree = new cTree();
	530	+
153	531	Menu menu;
154	532	oe.menuBar.add(menu = new Menu("Edit"));
155	533	//editItem = menu.add(new MenuItem("Edit"));
..	..	@@ -160,36 +538,37 @@
160	538	// redoItem = menu.add(new MenuItem("Redo"));
161	539	// redoItem.addActionListener(this);
162	540	// menu.add("-");
163		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	541	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
164	542	duplicateItem.addActionListener(this);
165		- cloneItem = menu.add(new MenuItem("Clone"));
	543	+
	544	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
166	545	cloneItem.addActionListener(this);
167		- if (Globals.ADVANCED)
	546	+ //if (Globals.ADVANCED)
168	547	{
169	548	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
170	549	cloneSupportItem.addActionListener(this);
171	550	}
	551	+ oe.jTree.popup.addSeparator();
172	552	menu.add("-");
173		- cutItem = menu.add(new MenuItem("Cut"));
	553	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
174	554	cutItem.addActionListener(this);
175		- copyItem = menu.add(new MenuItem("Copy"));
	555	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
176	556	copyItem.addActionListener(this);
177	557	pasteItem = menu.add(new MenuItem("Paste"));
178	558	pasteItem.addActionListener(this);
179		- menu.add("-");
180	559
181		- menu.add("-");
182		- pasteIntoItem = menu.add(new MenuItem("Paste into"));
	560	+ oe.jTree.popup.addSeparator();
	561	+ //menu.add("-");
	562	+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
183	563	pasteIntoItem.addActionListener(this);
184		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	564	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
185	565	pasteLinkItem.addActionListener(this);
186		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	566	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
187	567	pasteCloneItem.addActionListener(this);
188		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	568	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
189	569	// pasteExpandItem.addActionListener(this);
190		- menu.add("-");
191		- clearItem = menu.add(new MenuItem("Clear"));
192		- clearItem.addActionListener(this);
	570	+ //menu.add("-");
	571	+ oe.jTree.popup.addSeparator();
193	572
194	573	if (Globals.ADVANCED)
195	574	{
..	..	@@ -203,23 +582,23 @@
203	582	//zBufferItem.addActionListener(this);
204	583	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
205	584	//normalLensItem.addActionListener(this);
206		- cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
207		- revertCameraItem.addActionListener(this);
	585	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	586	+ restoreCameraItem.addActionListener(this);
208	587
209		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
210		- toggleFullScreenItem.addItemListener(this);
211		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
212		- cameraMenu.add("-");
	588	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	589	+// toggleFullScreenItem.addItemListener(this);
	590	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	591	+// cameraMenu.add("-");
	592	+//
	593	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	594	+// toggleTextureItem.addItemListener(this);
	595	+// toggleTextureItem.setState(CameraPane.textureon);
	596	+//
	597	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	598	+// toggleSwitchItem.addItemListener(this);
	599	+// toggleSwitchItem.setState(CameraPane.SWITCH);
213	600
214		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
215		- toggleTextureItem.addItemListener(this);
216		- toggleTextureItem.setState(CameraPane.textureon);
217		-
218		- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
219		- toggleSwitchItem.addItemListener(this);
220		- toggleSwitchItem.setState(CameraPane.SWITCH);
221		-
222		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	601	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
223	602	toggleHandleItem.addItemListener(this);
224	603	toggleHandleItem.setState(CameraPane.HANDLES);
225	604
..	..	@@ -274,15 +653,13 @@
274	653	{
275	654	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
276	655	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
277		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
278		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	656	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
279	657	oe.cameraMenu.add("-");
280	658	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
281	659	openWindowItem.addActionListener(this);
282		- editLeafItem.addActionListener(this);
283	660	lookAtItem.addActionListener(this);
284	661	//lookFromItem.addActinoListener(this);
285		- //switchItem.addActionListener(this);
	662	+ //switchViewItem.addActionListener(this);
286	663	}
287	664
288	665	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -326,22 +703,37 @@
326	703	setMasterItem.addActionListener(this);
327	704	}
328	705
329		- oe.menuBar.add(menu = new Menu("Group"));
330		- grabItem = menu.add(new MenuItem("Grab"));
331		- grabItem.addActionListener(this);
	706	+ oe.menuBar.add(menu = new Menu("Order"));
	707	+
332	708	backItem = menu.add(new MenuItem("Back"));
333	709	backItem.addActionListener(this);
334	710	frontItem = menu.add(new MenuItem("Front"));
335	711	frontItem.addActionListener(this);
336		- compositeItem = menu.add(new MenuItem("Composite"));
337		- compositeItem.addActionListener(this);
	712	+// compositeItem = menu.add(new MenuItem("Composite"));
	713	+// compositeItem.addActionListener(this);
	714	+
	715	+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
	716	+ grabItem.addActionListener(this);
	717	+
	718	+ if (Globals.ADVANCED)
	719	+ {
338	720	hideItem = menu.add(new MenuItem("Hidden Group"));
339	721	hideItem.addActionListener(this);
340		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	722	+ }
	723	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
341	724	ungroupItem.addActionListener(this);
342		- menu.add("-");
343		- randomItem = menu.add(new MenuItem("Switch node"));
344		- randomItem.addActionListener(this);
	725	+
	726	+ oe.jTree.popup.addSeparator();
	727	+
	728	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	729	+ deleteItem.addActionListener(this);
	730	+
	731	+// menu.add("-");
	732	+//
	733	+// switchItem = menu.add(new MenuItem("Switch node"));
	734	+// switchItem.addActionListener(this);
	735	+ if (Globals.ADVANCED)
	736	+ {
345	737	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
346	738	switchGeoItem.addActionListener(this);
347	739	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -349,8 +741,6 @@
349	741	morphItem = menu.add(new MenuItem("Morph Group"));
350	742	morphItem.addActionListener(this);
351	743
352		- if (Globals.ADVANCED)
353		- {
354	744	menu.add("-");
355	745	physicsItem = menu.add(new MenuItem("Physics"));
356	746	physicsItem.addActionListener(this);
..	..	@@ -358,30 +748,29 @@
358	748	frameselectorItem.addActionListener(this);
359	749	scriptNodeItem = menu.add(new MenuItem("Script Node"));
360	750	scriptNodeItem.addActionListener(this);
361		- cameraItem = menu.add(new MenuItem("Camera"));
362		- cameraItem.addActionListener(this);
363	751	}
364	752
365	753	oe.menuBar.add(menu = new Menu("Object"));
366		- textureItem = menu.add(new MenuItem("Texture"));
367		- textureItem.addActionListener(this);
	754	+// textureItem = menu.add(new MenuItem("Texture"));
	755	+// textureItem.addActionListener(this);
368	756	billboardItem = menu.add(new MenuItem("Billboard"));
369	757	billboardItem.addActionListener(this);
370	758	csgItem = menu.add(new MenuItem("CSG"));
371	759	csgItem.addActionListener(this);
372		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	760	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
373	761	shadowXItem.addActionListener(this);
374		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	762	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
375	763	shadowYItem.addActionListener(this);
376		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	764	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
377	765	shadowZItem.addActionListener(this);
	766	+ attributeItem = menu.add(new MenuItem("Attribute"));
	767	+ attributeItem.addActionListener(this);
	768	+
378	769	if (Globals.ADVANCED)
379	770	{
380	771	menu.add("-");
381	772	linkerItem = menu.add(new MenuItem("Linker"));
382	773	linkerItem.addActionListener(this);
383		- attributeItem = menu.add(new MenuItem("Attribute"));
384		- attributeItem.addActionListener(this);
385	774	templateItem = menu.add(new MenuItem("Template"));
386	775	templateItem.addActionListener(this);
387	776	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -410,7 +799,7 @@
410	799	genNormalsMESHItem.addActionListener(this);
411	800	if (Globals.ADVANCED)
412	801	{
413		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	802	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
414	803	genNormalsMINEItem.addActionListener(this);
415	804	}
416	805	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -503,10 +892,15 @@
503	892	attachBumpItem.addActionListener(this);
504	893	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
505	894	pigmentBumpItem.addActionListener(this);
	895	+ //embedTexturesItem
506	896	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
507	897	detachPigmentItem.addActionListener(this);
508	898	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
509	899	detachBumpItem.addActionListener(this);
	900	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	901	+ embedTexturesItem.addActionListener(this);
	902	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	903	+ deEmbedTexturesItem.addActionListener(this);
510	904	menu.add("-");
511	905	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
512	906	sortbysizeItem.addActionListener(this);
..	..	@@ -517,6 +911,9 @@
517	911	shareGeometriesItem.addActionListener(this);
518	912	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
519	913	mergeGeometriesItem.addActionListener(this);
	914	+ menu.add("-");
	915	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	916	+ editLeafItem.addActionListener(this);
520	917	if (Globals.ADVANCED)
521	918	{
522	919	// Pretty much the same as duplicate and clone.
..	..	@@ -533,6 +930,75 @@
533	930	buildToolsMenu(menu);
534	931	}
535	932
	933	+ JTabbedPane resourcecontainer;
	934	+ cGridBag currenttab;
	935	+ //boolean added; // patch for jar
	936	+
	937	+ int tabcount = 0;
	938	+ int colcount = 0;
	939	+ int rowcount = 0;
	940	+ int texturecount = 0;
	941	+
	942	+ int columns = 5;
	943	+ int rows = 7;
	944	+
	945	+ public void ResourceCallBack(String[] path)
	946	+ {
	947	+// for (int i = 0; i < path.length; i++)
	948	+// System.out.print(path[i] + "/");
	949	+// System.out.println();
	950	+
	951	+ if (//rowcount == 0 \|\|
	952	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	953	+ {
	954	+ currenttab = new cGridBag();
	955	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	956	+ currenttab.setName(tabname);
	957	+ //added = false;
	958	+ resourcecontainer.add(currenttab);
	959	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	960	+ rowcount = 1;
	961	+ colcount = 0;
	962	+ texturecount = 0;
	963	+ }
	964	+
	965	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	966	+ {
	967	+ //if (!added)
	968	+ {
	969	+ //added = true;
	970	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	971	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	972	+ }
	973	+
	974	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	975	+
	976	+ if (++colcount >= columns)
	977	+ {
	978	+ colcount = 0;
	979	+ currenttab.Return();
	980	+
	981	+ if (rowcount++ >= rows)
	982	+ {
	983	+ rowcount = 0;
	984	+ }
	985	+ }
	986	+ }
	987	+ else
	988	+ {
	989	+// if (!path[path.length-1].equals("icons"))
	990	+// resourcecontainer.Return();
	991	+ }
	992	+ }
	993	+
	994	+ void CreateTexturePanel(cGridBag container)
	995	+ {
	996	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	997	+ container.add(resourcecontainer);
	998	+
	999	+ Grafreed.ParseResources("textures", this);
	1000	+ }
	1001	+
536	1002	void SetupUI2(ObjEditor oe)
537	1003	{
538	1004	// June 2019
..	..	@@ -550,11 +1016,6 @@
550	1016	//new Exception().printStackTrace();
551	1017
552	1018	oe.radioPanel = new JPanel(new GridBagLayout());
553		- oe.aConstraints.weightx = 1;
554		- oe.aConstraints.weighty = 0;
555		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
556		- oe.aConstraints.gridwidth = 100;
557		- oe.aConstraints.gridheight = 1;
558	1019	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
559	1020
560	1021	oe.buttonGroup = new ButtonGroup();
..	..	@@ -575,51 +1036,122 @@
575	1036	oe.radioPanel.add(dummyButton);
576	1037	oe.buttonGroup.add(dummyButton);
577	1038	*/
	1039	+ cGridBag copyOptionsPanel = new cGridBag();
	1040	+
	1041	+ copyOptionsPanel.preferredHeight = 2;
	1042	+
578	1043	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
579	1044
580	1045	//oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
581	1046	//minButton.setToolTipText("Minimize window");
582	1047	//minButton.addActionListener(this);
583	1048
584		- oe.toolbarPanel.add(maxButton = new cButton("\u271A", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
585		- maxButton.setToolTipText("Maximize window");
586		- maxButton.addActionListener(this);
	1049	+ if (Globals.ADVANCED)
	1050	+ {
	1051	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1052	+// maxButton.setToolTipText("Maximize window");
	1053	+// maxButton.addActionListener(this);
	1054	+ }
587	1055
588		- oe.toolbarPanel.add(fullButton = new cButton("\u2b1c", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1056	+ cButton gcButton;
	1057	+
	1058	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1059	+// gcButton.setToolTipText("Garbage collect");
	1060	+// gcButton.addActionListener(new ActionListener()
	1061	+// {
	1062	+// public void actionPerformed(ActionEvent e)
	1063	+// {
	1064	+// System.gc();
	1065	+// }
	1066	+// });
	1067	+
	1068	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1069	+ collapseButton.setToolTipText("Collapse toolbar");
	1070	+ collapseButton.addActionListener(this);
	1071	+
	1072	+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/empty.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1073	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1074	+ maximize3DButton.addActionListener(this);
	1075	+
	1076	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1077	+ twoButton.setToolTipText("Show 3D view only");
	1078	+ twoButton.addActionListener(this);
	1079	+ this.fullscreenLayout = twoButton;
	1080	+
	1081	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1082	+ threeButton.setToolTipText("Show controls and 3D view");
	1083	+ threeButton.addActionListener(this);
	1084	+ if (Globals.ADVANCED)
	1085	+ {
	1086	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1087	+ sixButton.setToolTipText("Show 3D view and controls");
	1088	+ sixButton.addActionListener(this);
	1089	+ }
	1090	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1091	+// sevenButton.setToolTipText("3-column layout");
	1092	+// sevenButton.addActionListener(this);
	1093	+ //
	1094	+
	1095	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
589	1096	fullButton.setToolTipText("Full-screen window");
590	1097	fullButton.addActionListener(this);
591	1098
592		- oe.toolbarPanel.add(undoButton = new cButton("\u21a9", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
593		- undoButton.setToolTipText("Undo changes");
594		- undoButton.addActionListener(this);
595		-
596		- oe.toolbarPanel.add(redoButton = new cButton("\u21aa", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
597		- redoButton.setToolTipText("Redo changes");
598		- redoButton.addActionListener(this);
599		-
600		- oe.toolbarPanel.add(saveButton = new cButton("\u21e3", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
601		- saveButton.setToolTipText("Save changes");
602		- saveButton.addActionListener(this);
603		-
604		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
605		- liveCB.setToolTipText("Enable animation");
606		- liveCB.addItemListener(this);
	1099	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1100	+ screenfitButton.setToolTipText("Screen fit");
	1101	+ screenfitButton.addActionListener(this);
607	1102
608		- oe.toolbarPanel.add(oneStepButton = new cButton("\u29f4", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1103	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1104	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1105	+ restoreCameraButton.addActionListener(this);
	1106	+
	1107	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1108	+ saveVersionButton.setToolTipText("Duplicate current version");
	1109	+ saveVersionButton.addActionListener(this);
	1110	+
	1111	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1112	+ deleteVersionButton.setToolTipText("Delete current version");
	1113	+ deleteVersionButton.addActionListener(this);
	1114	+
	1115	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1116	+ previousVersionButton.setToolTipText("Previous version");
	1117	+ previousVersionButton.addActionListener(this);
	1118	+ previousVersionButton.setEnabled(false);
	1119	+
	1120	+ cGridBag updown = new cGridBag().setVertical(true);
	1121	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1122	+ restoreButton.setToolTipText("Undo (restore current version)");
	1123	+ restoreButton.addActionListener(this);
	1124	+ //restoreButton.setEnabled(false);
	1125	+
	1126	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1127	+ replaceButton.setToolTipText("Save (replace current version)");
	1128	+ replaceButton.addActionListener(this);
	1129	+ //replaceButton.setEnabled(false);
	1130	+
	1131	+ copyOptionsPanel.add(updown);
	1132	+
	1133	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1134	+ nextVersionButton.setToolTipText("Next version");
	1135	+ nextVersionButton.addActionListener(this);
	1136	+ nextVersionButton.setEnabled(false);
	1137	+
	1138	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
609	1139	oneStepButton.setToolTipText("Animate one step forward");
610	1140	oneStepButton.addActionListener(this);
611	1141
612		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	1142	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1143	+ liveCB.setToolTipText("Enable animation");
	1144	+ liveCB.addItemListener(this);
	1145	+
	1146	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
613	1147	fastCB.setToolTipText("Fast mode");
614	1148	fastCB.addItemListener(this);
615	1149
616		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK)); //, oe.aConstraints);
617		- trackCB.setToolTipText("Enable tracking");
618		- trackCB.addItemListener(this);
619		-
620		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
621		- screenfitButton.setToolTipText("Screen fit");
622		- screenfitButton.addActionListener(this);
	1150	+ //oe.toolboxPanel.Return();
	1151	+
	1152	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1153	+// trackCB.setToolTipText("Enable tracking");
	1154	+// trackCB.addItemListener(this);
623	1155
624	1156	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
625	1157	// screenfitpointButton.addActionListener(this);
..	..	@@ -629,67 +1161,137 @@
629	1161	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
630	1162	snapobjectButton.addActionListener(this);
631	1163	snapobjectButton.setToolTipText("Snap Object");
	1164	+
	1165	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1166	+ fourButton.addActionListener(this);
	1167	+ fourButton.setToolTipText("Show control panel only");
632	1168	}
633	1169
634		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
635		- flashSelectionButton.setToolTipText("Show selection");
636		- flashSelectionButton.addActionListener(this);
	1170	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
637	1171
638		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
639		-
640		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
641		- twoButton.setToolTipText("Show center view only");
642		- twoButton.addActionListener(this);
643		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
644		- fourButton.addActionListener(this);
645		- fourButton.setToolTipText("Show left panel only");
646		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
647		- sixButton.setToolTipText("2-column layout left");
648		- sixButton.addActionListener(this);
649		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
650		- threeButton.setToolTipText("2-column layout right");
651		- threeButton.addActionListener(this);
652		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
653		- sevenButton.setToolTipText("3-column layout");
654		- sevenButton.addActionListener(this);
655		- //
656	1172
657		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
658		- rootButton.setToolTipText("Edit selection in new tab");
	1173	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1174	+ rootButton.setToolTipText("Open selection in new tab");
659	1175	rootButton.addActionListener(this);
660	1176
661		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1177	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
662	1178	closeButton.setToolTipText("Close tab");
663	1179	closeButton.addActionListener(this);
664	1180	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
665	1181	//clearButton.addActionListener(this);
666		-
667		- cGridBag commandsPanel = new cGridBag();
	1182	+
	1183	+ cGridBag row1 = new cGridBag();
668	1184
669		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
670		- editButton.setToolTipText("Edit selection");
	1185	+ // INSERT
	1186	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1187	+ gridButton.setToolTipText("Create ground");
	1188	+ gridButton.addActionListener(this);
	1189	+
	1190	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1191	+ boxButton.setToolTipText("Create box");
	1192	+ boxButton.addActionListener(this);
	1193	+
	1194	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1195	+ superButton.setToolTipText("Create superellipsoid");
	1196	+ superButton.addActionListener(this);
	1197	+
	1198	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1199	+ sphereButton.setToolTipText("Create sphere");
	1200	+ sphereButton.addActionListener(this);
	1201	+
	1202	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1203	+ coneButton.setToolTipText("Create cone");
	1204	+ coneButton.addActionListener(this);
	1205	+
	1206	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1207	+ torusButton.setToolTipText("Create torus");
	1208	+ torusButton.addActionListener(this);
	1209	+
	1210	+ if (Globals.ADVANCED)
	1211	+ {
	1212	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1213	+ kleinButton.setToolTipText("Create Klein bottle");
	1214	+ kleinButton.addActionListener(this);
	1215	+ }
	1216	+
	1217	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1218	+ particlesButton.setToolTipText("Create particle system");
	1219	+ particlesButton.addActionListener(this);
	1220	+
	1221	+ oe.toolboxPanel.add(row1);
	1222	+
	1223	+ cGridBag row2 = new cGridBag();
	1224	+
	1225	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1226	+ groupButton.setToolTipText("Create group");
	1227	+ groupButton.addActionListener(this);
	1228	+
	1229	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1230	+ compositeButton.setToolTipText("Create composite");
	1231	+ compositeButton.addActionListener(this);
	1232	+
	1233	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1234	+ switchButton.setToolTipText("Create item switcher");
	1235	+ switchButton.addActionListener(this);
	1236	+
	1237	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1238	+ loopButton.setToolTipText("Create loop");
	1239	+ loopButton.addActionListener(this);
	1240	+
	1241	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1242	+ textureButton.setToolTipText("Create texture");
	1243	+ textureButton.addActionListener(this);
	1244	+
	1245	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1246	+ overlayButton.setToolTipText("Create overlay");
	1247	+ overlayButton.addActionListener(this);
	1248	+
	1249	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1250	+ lightButton.setToolTipText("Create light");
	1251	+ lightButton.addActionListener(this);
	1252	+
	1253	+ oe.toolboxPanel.add(row2);
	1254	+
	1255	+ cGridBag textures = new cGridBag();
	1256	+
	1257	+ CreateTexturePanel(textures);
	1258	+
	1259	+ oe.toolboxPanel.add(textures);
	1260	+
	1261	+ textures.preferredHeight = 100;
	1262	+
	1263	+ CreateSkyboxPanel(oe.skyboxPanel);
	1264	+
	1265	+ // EDIT panel
	1266	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1267	+ editButton.setToolTipText("Pin selection controls");
671	1268	editButton.addActionListener(this);
672	1269
673		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
674		- uneditButton.setToolTipText("Unedit selection");
	1270	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1271	+ uneditButton.setToolTipText("Unpin and remove selection controls");
675	1272	uneditButton.addActionListener(this);
676	1273
677		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
678		- allParamsButton.setToolTipText("Edit all params");
	1274	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1275	+ allParamsButton.setToolTipText("Show all controls");
679	1276	allParamsButton.addActionListener(this);
680	1277
681		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
682		- clearPanelButton.setToolTipText("Clear edit panel");
	1278	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1279	+ clearPanelButton.setToolTipText("Clear all controls");
683	1280	clearPanelButton.addActionListener(this);
684	1281
685		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
686		- unselectButton.setToolTipText("Unselect");
687		- unselectButton.addActionListener(this);
	1282	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1283	+ //unselectButton.setToolTipText("Unselect");
	1284	+ //unselectButton.addActionListener(this);
688	1285
689		- commandsPanel.preferredHeight = 1;
	1286	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1287	+ flashSelectionButton.setToolTipText("Highlight selection");
	1288	+ flashSelectionButton.addActionListener(this);
690	1289
691		- oe.treePanel.add(commandsPanel);
692		- oe.treePanel.Return();
	1290	+ editCommandsPanel.preferredHeight = 1;
	1291	+
	1292	+ SetPinStates(false);
	1293	+// oe.treePanel.add(commandsPanel);
	1294	+// oe.treePanel.Return();
693	1295
694	1296	// oe.aConstraints.gridx += 1;
695	1297	// oe.aConstraints.weighty = 0;
..	..	@@ -706,32 +1308,20 @@
706	1308
707	1309	JScrollPane jSP;
708	1310	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
709		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1311	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
710	1312	ResetModel();
711	1313
712	1314	oe.treePanel.add(jSPPanel);
713	1315	oe.treePanel.Return();
714	1316
715		- cGridBag copyOptionsPanel = new cGridBag();
716		-
717		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
718		- colorCB.setToolTipText("Copy color when dropped");
719		- colorCB.addItemListener(this);
720		-
721		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
722		- materialCB.setToolTipText("Copy material when dropped");
723		- materialCB.addItemListener(this);
724		-
725		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
726		- textureCB.setToolTipText("Copy texture when dropped");
727		- textureCB.addItemListener(this);
728		-
729		- copyOptionsPanel.preferredHeight = 1;
730	1317	oe.treePanel.add(copyOptionsPanel);
731	1318	oe.treePanel.Return();
	1319	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1320	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1321	+ sliderPane.preferredHeight = 1;
732	1322
733		-// mainPanel.setDividerLocation(0.5); //1.0);
734		-// mainPanel.setResizeWeight(0.5);
	1323	+// mainPanel.setDividerLocation(0.1); //1.0);
	1324	+ mainPanel.setResizeWeight(0.4);
735	1325
736	1326	//jList.addListSelectionListener(this);
737	1327	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -739,7 +1329,7 @@
739	1329	//jTree.setEditable(true);
740	1330	oe.jTree.setDragEnabled(true);
741	1331	//jTree.setPreferredSize(new Dimension(10,10));
742		- jSP.setPreferredSize(new Dimension(100,200));
	1332	+ //jSP.setPreferredSize(new Dimension(100,200));
743	1333
744	1334	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
745	1335
..	..	@@ -751,29 +1341,49 @@
751	1341	dgr.addDragGestureListener(this);
752	1342	}catch(Exception e) {}
753	1343	*/
754		- radio.layout = sevenButton;
	1344	+ radio.layout = threeButton; // sixButton;
755	1345	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
756	1346	}
757	1347
758	1348	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
759	1349	{
	1350	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1351	+ colorCB.setToolTipText("Copy color when dropped");
	1352	+ colorCB.addItemListener(this);
	1353	+
	1354	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1355	+ materialCB.setToolTipText("Copy material when dropped");
	1356	+ materialCB.addItemListener(this);
	1357	+
	1358	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1359	+ textureCB.setToolTipText("Copy texture when dropped");
	1360	+ textureCB.addItemListener(this);
	1361	+
	1362	+ panel.Return();
	1363	+
760	1364	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
761	1365	boxCB.setToolTipText("Display bounding boxes");
762	1366	boxCB.addItemListener(this);
763	1367
764	1368	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
765		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1369	+ zoomBoxCB.setToolTipText("Display only for wheel");
766	1370	zoomBoxCB.addItemListener(this);
767	1371
768	1372	if (true) // Globals.ADVANCED)
769	1373	{
770		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
771		- supportCB.setToolTipText("Enable rigging");
772		- supportCB.addItemListener(this);
	1374	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1375	+// supportCB.setToolTipText("Enable rigging");
	1376	+// supportCB.addItemListener(this);
	1377	+
	1378	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1379	+ freezeCB.setToolTipText("Fast moving camera");
	1380	+ freezeCB.addItemListener(this);
773	1381
774	1382	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
775	1383	// localCB.addItemListener(this);
776	1384
	1385	+ panel.Return();
	1386	+
777	1387	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
778	1388	crowdCB.setToolTipText("Used for crowds");
779	1389	crowdCB.addItemListener(this);
..	..	@@ -782,14 +1392,19 @@
782	1392	smoothCB.setToolTipText("Snapping delay");
783	1393	smoothCB.addItemListener(this);
784	1394
785		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
786		- slowCB.setToolTipText("Smooth interpolation");
787		- slowCB.addItemListener(this);
	1395	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1396	+// slowCB.setToolTipText("Smooth interpolation");
	1397	+// slowCB.addItemListener(this);
	1398	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1399	+ minshaderCB.setToolTipText("Minimal fast shader");
	1400	+ minshaderCB.addItemListener(this);
788	1401
789	1402	// constraints.gridy += 1;
790	1403	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
791	1404	// speakerMocapCB.addItemListener(this);
792	1405
	1406	+ panel.Return();
	1407	+
793	1408	if (false)
794	1409	{
795	1410	// handled in scripts
..	..	@@ -804,34 +1419,82 @@
804	1419	//constraints.gridy += 1;
805	1420	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
806	1421	smoothfocusCB.addItemListener(this);
	1422	+ panel.Return();
807	1423	}
808	1424
809	1425	//constraints.gridx += 1;
810	1426	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
811	1427	// debugCB.addItemListener(this);
812	1428
	1429	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1430	+ trackCB.setToolTipText("Enable tracking target");
	1431	+ trackCB.addItemListener(this);
	1432	+
813	1433	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1434	+ oeilCB.setToolTipText("Move camera when tracking");
814	1435	oeilCB.addItemListener(this);
815	1436
	1437	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1438	+ shadowCB.setToolTipText("When live compute shadows");
	1439	+ shadowCB.addItemListener(this);
	1440	+
	1441	+ panel.Return();
	1442	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1443	+ toggleTextureCB.setToolTipText("Load textures");
	1444	+ toggleTextureCB.addItemListener(this);
	1445	+
	1446	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1447	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1448	+ toggleSwitchCB.addItemListener(this);
	1449	+
	1450	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1451	+ autokeepCB.setToolTipText("On structure change");
	1452	+ autokeepCB.addItemListener(this);
	1453	+
	1454	+ panel.Return();
	1455	+ if (Globals.ADVANCED)
	1456	+ {
816	1457	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
817	1458	lookAtCB.setToolTipText("Look-at target");
818	1459	lookAtCB.addItemListener(this);
	1460	+ }
819	1461
820	1462	}
821	1463
822	1464	cGridBag fill = new cGridBag();
823		-
824	1465	fill.preferredHeight = 200;
	1466	+ cGridBag fill2 = new cGridBag();
	1467	+ fill2.preferredHeight = 200;
	1468	+ cGridBag fill3 = new cGridBag();
	1469	+ fill3.preferredHeight = 200;
825	1470
826	1471	panel.add(fill);
	1472	+ panel.add(fill2);
	1473	+ panel.add(fill3);
827	1474
828	1475	}
829	1476
830	1477	void EditObject(Object3D obj)
831	1478	{
	1479	+ assert(obj instanceof Composite);
	1480	+
	1481	+// if (obj.versionlist == null)
	1482	+// {
	1483	+// obj.versionlist = new Object3D[100];
	1484	+// obj.versionindex = -1;
	1485	+// }
	1486	+
832	1487	cRadio radioButton = new cRadio(obj.name);
	1488	+
	1489	+ // June 2019. Patch to avoid bug with transparency.
	1490	+ radioButton.hadMaterial = obj.material != null;
	1491	+ if (!radioButton.hadMaterial)
	1492	+ {
	1493	+ obj.material = new cMaterial();
	1494	+ }
	1495	+
833	1496	radioButton.SetObject(obj);
834		- radioButton.layout = sevenButton;
	1497	+ radioButton.layout = threeButton; // sixButton;
835	1498	radioButton.SetCamera(cameraView.renderCamera, false);
836	1499	radioButton.addActionListener(this);
837	1500	radioPanel.add(radioButton);
..	..	@@ -845,29 +1508,37 @@
845	1508
846	1509	oe.SetupViews();
847	1510
	1511	+ if (Globals.DEBUG)
848	1512	System.out.println("SetupViews");
849	1513	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
850	1514	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
851	1515	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
852	1516	}
853	1517
854		- JCheckBox liveCB;
855		- JCheckBox supportCB;
856		- JCheckBox localCB;
857		- JCheckBox crowdCB;
858		- JCheckBox smoothCB;
859		- JCheckBox fastCB;
860		- JCheckBox slowCB;
861		- JCheckBox boxCB;
862		- JCheckBox zoomBoxCB;
863		- JCheckBox trackCB;
864		- JCheckBox smoothfocusCB;
	1518	+ cToggleButton liveCB;
	1519	+ cCheckBox supportCB;
	1520	+ cCheckBox localCB;
	1521	+ cCheckBox crowdCB;
	1522	+ cCheckBox smoothCB;
	1523	+ cCheckBox minshaderCB;
	1524	+
	1525	+ cToggleButton fastCB;
	1526	+ cCheckBox slowCB;
	1527	+ cCheckBox boxCB;
	1528	+ cCheckBox zoomBoxCB;
	1529	+ cCheckBox freezeCB;
	1530	+ //cToggleButton trackCB;
	1531	+ cCheckBox trackCB;
	1532	+ cCheckBox smoothfocusCB;
865	1533	// JCheckBox speakerMocapCB;
866		- JCheckBox speakerCameraCB;
867		- JCheckBox speakerFocusCB;
868		- JCheckBox debugCB;
869		- JCheckBox oeilCB;
870		- JCheckBox lookAtCB;
	1534	+ cCheckBox speakerCameraCB;
	1535	+ cCheckBox speakerFocusCB;
	1536	+ cCheckBox debugCB;
	1537	+
	1538	+ cCheckBox oeilCB;
	1539	+ cCheckBox shadowCB;
	1540	+ cCheckBox autokeepCB;
	1541	+ cCheckBox lookAtCB;
871	1542
872	1543	// static int COLOR = 1;
873	1544	// static int MATERIAL = 2;
..	..	@@ -875,9 +1546,9 @@
875	1546
876	1547	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
877	1548
878		- JCheckBox colorCB;
879		- JCheckBox materialCB;
880		- JCheckBox textureCB;
	1549	+ cCheckBox colorCB;
	1550	+ cCheckBox materialCB;
	1551	+ cCheckBox textureCB;
881	1552
882	1553	public void itemStateChanged(ItemEvent e)
883	1554	{
..	..	@@ -921,6 +1592,12 @@
921	1592	{
922	1593	cameraView.ToggleInertia();
923	1594	cameraView.repaint();
	1595	+ }
	1596	+ else if(e.getSource() == minshaderCB)
	1597	+ {
	1598	+ Globals.MINSHADER ^= true;
	1599	+ cameraView.programInitialized = false;
	1600	+ cameraView.repaint();
924	1601	}
925	1602	else if(e.getSource() == localCB)
926	1603	{
..	..	@@ -970,6 +1647,18 @@
970	1647	{
971	1648	cameraView.ToggleOeil();
972	1649	}
	1650	+ else if(e.getSource() == shadowCB)
	1651	+ {
	1652	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1653	+ }
	1654	+ else if(e.getSource() == freezeCB)
	1655	+ {
	1656	+ Globals.FREEZEONMOVE ^= true;
	1657	+ }
	1658	+ else if(e.getSource() == autokeepCB)
	1659	+ {
	1660	+ Globals.REPLACEONMAKE ^= true;
	1661	+ }
973	1662	else if(e.getSource() == lookAtCB)
974	1663	{
975	1664	cameraView.ToggleLookAt();
..	..	@@ -986,7 +1675,8 @@
986	1675
987	1676	/**/
988	1677	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
989		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1678	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1679	+ TreePath path = objEditor.jTree.getSelectionPath();
990	1680	if ((path == null) \|\| (path.getPathCount() <= 1)) {
991	1681	// We can't move the root node or an empty selection
992	1682	return;
..	..	@@ -1049,8 +1739,6 @@
1049	1739	}
1050	1740	}
1051	1741
1052		- String string = (String) object;
1053		-
1054	1742	System.out.println("Transfer = " + object + "; drop : " + target);
1055	1743	// if( object instanceof java.io.File[])
1056	1744	// {
..	..	@@ -1058,6 +1746,8 @@
1058	1746	// objEditor.DropFile((java.io.File[]) object, true);
1059	1747	// return;
1060	1748	// }
	1749	+
	1750	+ String string = object.toString();
1061	1751
1062	1752	// File path for Mac and Windows
1063	1753	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1103,23 +1793,33 @@
1103	1793
1104	1794	assert target == objEditor.jTree;
1105	1795	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1796	+ Object3D destinationLeaf;
1106	1797	try {
1107		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1798	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1108	1799	} catch (Exception e) {
1109	1800	System.out.println("destinationPath : " + destinationPath);
1110	1801	return;
1111	1802	}
1112	1803
1113		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1804	+ for (int i=group.selection.size(); --i>=0;)
1114	1805	{
	1806	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1807	+
	1808	+ // Cannot move into itself
	1809	+ if (child == destinationLeaf)
	1810	+ return;
	1811	+ }
	1812	+
	1813	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1814	+// {
1115	1815	loadClipboard(true);
1116	1816	objEditor.jTree.setSelectionPath(destinationPath);
1117	1817	pasteInto(false, false);
1118		- } else {
1119		- loadClipboard(false);
1120		- objEditor.jTree.setSelectionPath(destinationPath);
1121		- pasteInto(false, false); // true); // ???
1122		- }
	1818	+// } else {
	1819	+// loadClipboard(false);
	1820	+// objEditor.jTree.setSelectionPath(destinationPath);
	1821	+// pasteInto(false, false); // true); // ???
	1822	+// }
1123	1823	}
1124	1824	public void dropActionChanged(DropTargetDragEvent dtde)
1125	1825	// Called if the user has modified the current drop gesture
..	..	@@ -1175,7 +1875,12 @@
1175	1875	TreePath path;
1176	1876
1177	1877	public TransferableTreePath(TreePath tp) {
1178		- path = tp;
	1878	+ Object[] objs = new Object[tp.getPathCount()];
	1879	+ for (int i=0; i<objs.length; i++)
	1880	+ {
	1881	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1882	+ }
	1883	+ path = new TreePath(objs);
1179	1884	}
1180	1885
1181	1886	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1224,22 +1929,30 @@
1224	1929	{
1225	1930	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1226	1931	//heightFieldItem.addActionListener(this);
1227		- gridItem = menu.add(new MenuItem("Grid"));
1228		- gridItem.addActionListener(this);
1229		- rectoidItem = menu.add(new MenuItem("Box"));
1230		- rectoidItem.addActionListener(this);
1231		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1232		- ellipsoidItem.addActionListener(this);
1233		- coneItem = menu.add(new MenuItem("Cone"));
1234		- coneItem.addActionListener(this);
1235		- torusItem = menu.add(new MenuItem("Torus"));
1236		- torusItem.addActionListener(this);
1237		- superItem = menu.add(new MenuItem("Superellipsoid"));
1238		- superItem.addActionListener(this);
	1932	+// gridItem = menu.add(new MenuItem("Grid"));
	1933	+// gridItem.addActionListener(this);
	1934	+// rectoidItem = menu.add(new MenuItem("Box"));
	1935	+// rectoidItem.addActionListener(this);
	1936	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1937	+// ellipsoidItem.addActionListener(this);
	1938	+// coneItem = menu.add(new MenuItem("Cone"));
	1939	+// coneItem.addActionListener(this);
	1940	+// torusItem = menu.add(new MenuItem("Torus"));
	1941	+// torusItem.addActionListener(this);
	1942	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1943	+// superItem.addActionListener(this);
	1944	+
	1945	+ cameraItem = menu.add(new MenuItem("Camera"));
	1946	+ cameraItem.addActionListener(this);
	1947	+
	1948	+ if (!Globals.ADVANCED)
	1949	+ {
1239	1950	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1240	1951	kleinItem.addActionListener(this);
1241		- particleItem = menu.add(new MenuItem("Particle system"));
1242		- particleItem.addActionListener(this);
	1952	+ }
	1953	+
	1954	+// particleItem = menu.add(new MenuItem("Particle system"));
	1955	+// particleItem.addActionListener(this);
1243	1956	if (Globals.ADVANCED)
1244	1957	{
1245	1958	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1265,15 +1978,15 @@
1265	1978	}
1266	1979	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1267	1980	bezierItem.addActionListener(this);
1268		- overlayItem = menu.add(new MenuItem("Overlay"));
1269		- overlayItem.addActionListener(this);
1270		- lightItem = menu.add(new MenuItem("Light"));
1271		- lightItem.addActionListener(this);
	1981	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1982	+// overlayItem.addActionListener(this);
	1983	+// lightItem = menu.add(new MenuItem("Light"));
	1984	+// lightItem.addActionListener(this);
1272	1985	menu.add("-");
1273	1986	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1274	1987	//superLoopItem.addActionListener(this);
1275		- loopItem = menu.add(new MenuItem("Loop"));
1276		- loopItem.addActionListener(this);
	1988	+// loopItem = menu.add(new MenuItem("Loop"));
	1989	+// loopItem.addActionListener(this);
1277	1990	doubleItem = menu.add(new MenuItem("Fork"));
1278	1991	doubleItem.addActionListener(this);
1279	1992	if (Globals.ADVANCED)
..	..	@@ -1289,6 +2002,9 @@
1289	2002	animationItem.addItemListener(this);
1290	2003	animationItem.setState(Globals.ANIMATION);
1291	2004
	2005	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	2006	+ archiveItem.addActionListener(this);
	2007	+
1292	2008	menu.add("-");
1293	2009	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1294	2010	parseverticesItem.addActionListener(this);
..	..	@@ -1301,6 +2017,8 @@
1301	2017	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1302	2018	reduce34MorphItem.addActionListener(this);
1303	2019	menu.add("-");
	2020	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	2021	+ memoryItem.addActionListener(this);
1304	2022	menu.add(computeAOItem = new MenuItem("Compute AO"));
1305	2023	computeAOItem.addActionListener(this);
1306	2024
..	..	@@ -1309,8 +2027,6 @@
1309	2027	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1310	2028	mirrorItem.addActionListener(this);
1311	2029	menu.add("-");
1312		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1313		- memoryItem.addActionListener(this);
1314	2030	menu.add(analyzeItem = new MenuItem("Analyze"));
1315	2031	analyzeItem.addActionListener(this);
1316	2032	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1454,9 +2170,38 @@
1454	2170	shadow.material = new cMaterial(obj.material);
1455	2171	shadow.material.diffuse = 0.0001f;
1456	2172	shadow.material.specular = 0.0001f;
	2173	+ shadow.material.opacity = 0.75f;
	2174	+
	2175	+ AllocProjectedVertices(shadow);
	2176	+
	2177	+ shadow.projectedVertices[1].x = 300;
1457	2178
1458	2179	makeSomething(shadow);
1459	2180	}
	2181	+
	2182	+ private void ClearUnpinned()
	2183	+ {
	2184	+ //for (Object3D obj : listUI)
	2185	+ for (int i=listUI.size(); --i>=0;)
	2186	+ {
	2187	+ Object3D obj = listUI.elementAt(i);
	2188	+ if (!obj.pinned)
	2189	+ {
	2190	+ obj.CloseUI();
	2191	+ listUI.remove(i);
	2192	+ }
	2193	+ }
	2194	+ }
	2195	+
	2196	+ private void EditElement(Object3D elem, boolean newWindow)
	2197	+ {
	2198	+ // if (!(elem instanceof Composite))
	2199	+ // newWindow = false;
	2200	+ listUI.add(elem);
	2201	+ elem.openEditWindow(this, newWindow); //, false);
	2202	+ System.out.println("edit : " + elem);
	2203	+ elem.editWindow.refreshContents(true); // ? new
	2204	+ }
1460	2205
1461	2206	/**
1462	2207	* applyExample
..	..	@@ -1701,7 +2446,7 @@
1701	2446	{
1702	2447	ScreenFit();
1703	2448	} else
1704		- if (source == switchItem)
	2449	+ if (source == switchViewItem)
1705	2450	{
1706	2451	cVector v1 = new cVector();
1707	2452	cVector v2 = new cVector();
..	..	@@ -1710,11 +2455,11 @@
1710	2455	objEditor.cameraView.renderCamera.setAim(v2, v1);
1711	2456	objEditor.cameraView.repaint();
1712	2457	} else
1713		- if (source == rectoidItem)
	2458	+ if (source == rectoidItem \|\| source == boxButton)
1714	2459	{
1715	2460	makeSomething(new Box());
1716	2461	} else
1717		- if (source == particleItem)
	2462	+ if (source == particleItem \|\| source == particlesButton)
1718	2463	{
1719	2464	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1720	2465	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1793,27 +2538,27 @@
1793	2538
1794	2539	makeSomething(obj);
1795	2540	} else
1796		- if (source == gridItem)
	2541	+ if (source == gridItem \|\| source == gridButton)
1797	2542	{
1798	2543	makeSomething(new Grid());
1799	2544	} else
1800		- if (source == ellipsoidItem)
	2545	+ if (source == ellipsoidItem \|\| source == sphereButton)
1801	2546	{
1802	2547	makeSomething(new Sphere());
1803	2548	} else
1804		- if (source == coneItem)
	2549	+ if (source == coneItem \|\| source == coneButton)
1805	2550	{
1806	2551	makeSomething(new Cone());
1807	2552	} else
1808		- if (source == torusItem)
	2553	+ if (source == torusItem \|\| source == torusButton)
1809	2554	{
1810	2555	makeSomething(new Torus());
1811	2556	} else
1812		- if (source == superItem)
	2557	+ if (source == superItem \|\| source == superButton)
1813	2558	{
1814	2559	makeSomething(new Superellipsoid());
1815	2560	} else
1816		- if (source == kleinItem)
	2561	+ if (source == kleinItem \|\| source == kleinButton)
1817	2562	{
1818	2563	makeSomething(new Klein());
1819	2564	} else
..	..	@@ -1833,7 +2578,7 @@
1833	2578	{
1834	2579	makeSomething(new BezierSurface());
1835	2580	} else
1836		- if (source == overlayItem)
	2581	+ if (source == overlayItem \|\| source == overlayButton)
1837	2582	{
1838	2583	/*
1839	2584	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1881,10 +2626,27 @@
1881	2626	s.setup();
1882	2627	makeSomething(s);
1883	2628	} else
1884		- if (source == lightItem)
	2629	+ if (source == lightItem \|\| source == lightButton)
1885	2630	{
1886	2631	makeSomething(new Light());
1887	2632	} else
	2633	+// if (source == skybox1Button \|\|
	2634	+// source == skybox2Button \|\|
	2635	+// source == skybox3Button \|\|
	2636	+// source == skybox4Button \|\|
	2637	+// source == skybox5Button \|\|
	2638	+// source == skybox6Button \|\|
	2639	+// source == skybox7Button \|\|
	2640	+// source == skybox11Button \|\|
	2641	+// source == skybox12Button \|\|
	2642	+// source == skybox13Button \|\|
	2643	+// source == skybox14Button \|\|
	2644	+// source == skybox15Button \|\|
	2645	+// source == skybox16Button \|\|
	2646	+// source == skybox17Button)
	2647	+// {
	2648	+// ChangeSkybox(source);
	2649	+// } else
1888	2650	if (source == csgItem)
1889	2651	{
1890	2652	group(new CSG());
..	..	@@ -1931,30 +2693,38 @@
1931	2693
1932	2694	group(g);
1933	2695	} else
1934		- if (source == loopItem)
	2696	+ if (source == loopItem \|\| source == loopButton)
1935	2697	{
	2698	+ if (!group.selection.isEmpty())
	2699	+ {
1936	2700	Composite csg = new GroupLeaf();
1937	2701	csg.count = 5;
1938		- group(csg);
1939		- Composite child = new cGroup();
	2702	+ Composite child = new cGroup("Branch");
1940	2703	csg.addChild(child);
1941	2704	child.addChild(csg);
	2705	+ group(csg);
	2706	+ }
1942	2707	} else
1943	2708	if (source == doubleItem)
1944	2709	{
1945		- Composite csg = new GroupLeaf();
	2710	+ if (!group.selection.isEmpty())
	2711	+ {
	2712	+ Composite csg = new GroupLeaf("Fork");
1946	2713	csg.count = 5;
	2714	+ Composite child = new cGroup("Branch A");
	2715	+ csg.addChild(child);
	2716	+ child.addChild(csg);
	2717	+ child = new cGroup("Branch B");
	2718	+ csg.addChild(child);
	2719	+ child.addChild(csg);
1947	2720	group(csg);
1948		- Composite child = new cGroup();
1949		- csg.addChild(child);
1950		- child.addChild(csg);
1951		- child = new cGroup();
1952		- csg.addChild(child);
1953		- child.addChild(csg);
	2721	+ }
1954	2722	} else
1955	2723	if (source == tripleItem)
1956	2724	{
1957		- Composite csg = new GroupLeaf();
	2725	+ if (!group.selection.isEmpty())
	2726	+ {
	2727	+ Composite csg = new GroupLeaf("Trident");
1958	2728	csg.count = 4;
1959	2729	group(csg);
1960	2730	Composite child = new cGroup();
..	..	@@ -1966,11 +2736,12 @@
1966	2736	child = new cGroup();
1967	2737	csg.addChild(child);
1968	2738	child.addChild(csg);
	2739	+ }
1969	2740	} else
1970	2741	if (source == computeAOItem)
1971	2742	{
1972	2743	Globals.drawMode = CameraPane.OCCLUSION;
1973		- Globals.theRenderer.repaint();
	2744	+ cameraView.repaint();
1974	2745	} else
1975	2746	if (source == recompileItem)
1976	2747	{
..	..	@@ -1985,7 +2756,7 @@
1985	2756	if (source == invariantsItem)
1986	2757	{
1987	2758	System.out.println("Invariants:");
1988		- Grafreed.grafreeD.universe.invariants();
	2759	+ Grafreed.grafreed.universe.invariants();
1989	2760	} else
1990	2761	if (source == memoryItem)
1991	2762	{
..	..	@@ -2016,17 +2787,52 @@
2016	2787	{
2017	2788	ToggleFullScreen();
2018	2789	} else
2019		- if (source == undoButton)
	2790	+ if (source == collapseButton)
2020	2791	{
2021		- Undo();
	2792	+ this.expandedLayout = radio.layout;
	2793	+ CollapseToolbar();
2022	2794	} else
2023		- if (source == redoButton)
	2795	+ if (source == maximize3DButton)
2024	2796	{
2025		- Redo();
	2797	+ this.expandedLayout = radio.layout;
	2798	+ radio.layout = twoButton;
	2799	+ Show3DView();
	2800	+ CollapseToolbar();
2026	2801	} else
2027		- if (source == saveButton)
	2802	+ if (source == previousVersionButton)
2028	2803	{
2029		- Save();
	2804	+ // Go to previous version
	2805	+ //if (!Undo())
	2806	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2807	+ PreviousVersion();
	2808	+ } else
	2809	+ if (source == restoreButton)
	2810	+ {
	2811	+ // Restore current version
	2812	+ Restore();
	2813	+ //restoreButton.setEnabled(false);
	2814	+ } else
	2815	+ if (source == replaceButton)
	2816	+ {
	2817	+ // Overwrite current version
	2818	+ Replace();
	2819	+ //replaceButton.setEnabled(false);
	2820	+ } else
	2821	+ if (source == nextVersionButton)
	2822	+ {
	2823	+ // Go to next version
	2824	+ NextVersion();
	2825	+ } else
	2826	+ if (source == saveVersionButton)
	2827	+ {
	2828	+ // Save a new version
	2829	+ if (!Save(true))
	2830	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2831	+ } else
	2832	+ if (source == deleteVersionButton)
	2833	+ {
	2834	+ // Delete a new version
	2835	+ DeleteVersion();
2030	2836	} else
2031	2837	if (source == oneStepButton)
2032	2838	{
..	..	@@ -2035,17 +2841,14 @@
2035	2841	} else
2036	2842	if (source == screenfitButton)
2037	2843	{
2038		- //Reload(lastConverter, lastFilename, true);
2039	2844	ScreenFit();
2040	2845	} else
2041	2846	if (source == screenfitpointButton)
2042	2847	{
2043		- //Reload(lastConverter, lastFilename, true);
2044	2848	ScreenFitPoint();
2045	2849	} else
2046	2850	if (source == snapobjectButton)
2047	2851	{
2048		- //Reload(lastConverter, lastFilename, true);
2049	2852	SnapObject();
2050	2853	} else
2051	2854	// if (event.getSource() == recompileButton)
..	..	@@ -2084,11 +2887,11 @@
2084	2887	} else
2085	2888	if (source == undoItem)
2086	2889	{
2087		- Undo();
	2890	+ PreviousVersion();
2088	2891	} else
2089	2892	if (source == redoItem)
2090	2893	{
2091		- Redo();
	2894	+ NextVersion();
2092	2895	} else
2093	2896	if (source == duplicateItem)
2094	2897	{
..	..	@@ -2409,7 +3212,7 @@
2409	3212	{
2410	3213	StepAll();
2411	3214	} else
2412		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3215	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2413	3216	{
2414	3217	//int indices[] = jList.getSelectedIndices();
2415	3218	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2421,9 +3224,9 @@
2421	3224	{
2422	3225	ClearSelection(true);
2423	3226	} else
2424		- if (source == grabItem)
	3227	+ if (source == grabItem \|\| source == groupButton)
2425	3228	{
2426		- group(new cGroup(), true);
	3229	+ group(new cGroup(), false); // true);
2427	3230	} else
2428	3231	if (source == hideItem)
2429	3232	{
..	..	@@ -2441,11 +3244,11 @@
2441	3244	{
2442	3245	makeSomething(new Camera());
2443	3246	} else
2444		- if (source == compositeItem)
	3247	+ if (source == compositeItem \|\| source == compositeButton)
2445	3248	{
2446	3249	group(new Composite());
2447	3250	} else
2448		- if (source == randomItem)
	3251	+ if (source == switchItem \|\| source == switchButton)
2449	3252	{
2450	3253	RandomNode random = new RandomNode();
2451	3254	group(random);
..	..	@@ -2547,7 +3350,7 @@
2547	3350	{
2548	3351	group(new cLinker());
2549	3352	} else
2550		- if (source == textureItem)
	3353	+ if (source == textureItem \|\| source == textureButton)
2551	3354	{
2552	3355	group(new TextureNode());
2553	3356	} else
..	..	@@ -2567,17 +3370,42 @@
2567	3370	{
2568	3371	CastShadow(2);
2569	3372	} else
2570		- if (source == ungroupItem)
	3373	+ if (source == ungroupItem \|\| source == ungroupButton)
2571	3374	{
2572		- //ungroup();
	3375	+ boolean canUngroup = true;
	3376	+
2573	3377	for (int i=0; i<group.selection.size(); i++)
2574	3378	{
2575		- Ungroup(group.selection.get(i));
	3379	+ Object3D selectedItem = group.selection.get(i);
	3380	+
	3381	+ if (selectedItem.Size() == 0)
	3382	+ {
	3383	+ // Cannot ungroup leaves
	3384	+ canUngroup = false;
	3385	+ break;
	3386	+ }
	3387	+
	3388	+ if (selectedItem == group)
	3389	+ {
	3390	+ // Cannot ungroup root
	3391	+ canUngroup = false;
	3392	+ break;
	3393	+ }
2576	3394	}
2577	3395
2578		- ClearSelection(false);
2579		-
2580		- refreshContents();
	3396	+ if (canUngroup)
	3397	+ {
	3398	+ for (int i=0; i<group.selection.size(); i++)
	3399	+ {
	3400	+ Object3D selectedItem = group.selection.get(i);
	3401	+
	3402	+ Ungroup(selectedItem);
	3403	+ }
	3404	+
	3405	+ ClearSelection(false);
	3406	+
	3407	+ refreshContents();
	3408	+ }
2581	3409	} else
2582	3410	if (source == genUVItem)
2583	3411	{
..	..	@@ -2878,7 +3706,7 @@
2878	3706	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2879	3707	{
2880	3708	obj = (Object3D)e.nextElement();
2881		- obj.SetBumpTexture(null);
	3709	+ obj.ResetBumpTexture();
2882	3710	}
2883	3711
2884	3712	refreshContents();
..	..	@@ -2894,6 +3722,31 @@
2894	3722
2895	3723	refreshContents();
2896	3724	} else
	3725	+ if (source == embedTexturesItem)
	3726	+ {
	3727	+ Object3D obj;
	3728	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3729	+ {
	3730	+ obj = (Object3D)e.nextElement();
	3731	+ obj.EmbedTextures(true);
	3732	+ }
	3733	+
	3734	+ refreshContents();
	3735	+ } else
	3736	+ if (source == deEmbedTexturesItem)
	3737	+ {
	3738	+ Object3D obj;
	3739	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3740	+ {
	3741	+ obj = (Object3D)e.nextElement();
	3742	+ obj.EmbedTextures(false);
	3743	+ }
	3744	+
	3745	+ CameraPane.texturepigment.clear();
	3746	+ CameraPane.texturebump.clear();
	3747	+
	3748	+ refreshContents();
	3749	+ } else
2897	3750	if (source == flashSelectionButton)
2898	3751	{
2899	3752	CameraPane.flash = true;
..	..	@@ -2905,38 +3758,11 @@
2905	3758	if (source == twoButton)
2906	3759	{
2907	3760	radio.layout = twoButton;
2908		- // bug
2909		- //gridPanel.setDividerLocation(1.0);
2910		- //bigPanel.setDividerLocation(0.0);
2911		-// bigThree.remove(scenePanel);
2912		-// bigThree.remove(centralPanel);
2913		-// bigThree.remove(XYZPanel);
2914		-// aWindowConstraints.gridx = 0;
2915		-// aWindowConstraints.gridy = 0;
2916		-// aWindowConstraints.gridwidth = 1;
2917		-// // aConstraints.gridheight = 3;
2918		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2919		-// aWindowConstraints.weightx = 0;
2920		-// aWindowConstraints.weighty = 1;
2921		-// //bigThree.add(jtp, aWindowConstraints);
2922		-// aWindowConstraints.weightx = 1;
2923		-// aWindowConstraints.gridwidth = 3;
2924		-// // aConstraints.gridheight = 3;
2925		-// aWindowConstraints.gridx = 1;
2926		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
2927		-// bigThree.add(centralPanel, aWindowConstraints);
2928		-// aWindowConstraints.weightx = 0;
2929		-// aWindowConstraints.gridx = 4;
2930		-// aWindowConstraints.gridwidth = 1;
2931		-// // aConstraints.gridheight = 3;
2932		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2933		-// //bigThree.add(XYZPanel, aWindowConstraints);
2934		-// scenePanel.setVisible(false);
2935		-// centralPanel.setVisible(true);
2936		-// XYZPanel.setVisible(false);
2937		- bigThree.ClearUI();
2938		- bigThree.add(centralPanel);
2939		- bigThree.FlushUI();
	3761	+
	3762	+ if (CameraPane.FULLSCREEN)
	3763	+ fullscreenLayout = radio.layout;
	3764	+
	3765	+ Show3DView();
2940	3766
2941	3767	cameraView.requestFocusInWindow();
2942	3768
..	..	@@ -2959,6 +3785,9 @@
2959	3785	if (source == threeButton)
2960	3786	{
2961	3787	radio.layout = threeButton;
	3788	+
	3789	+ if (CameraPane.FULLSCREEN)
	3790	+ fullscreenLayout = radio.layout;
2962	3791
2963	3792	// bigThree.remove(scenePanel);
2964	3793	// bigThree.remove(centralPanel);
..	..	@@ -2988,8 +3817,8 @@
2988	3817	// centralPanel.setVisible(true);
2989	3818	// XYZPanel.setVisible(true);
2990	3819	bigThree.ClearUI();
	3820	+ bigThree.add(scenePanel);
2991	3821	bigThree.add(centralPanel);
2992		- bigThree.add(XYZPanel);
2993	3822	bigThree.FlushUI();
2994	3823
2995	3824	cameraView.requestFocusInWindow();
..	..	@@ -2997,6 +3826,9 @@
2997	3826	if (source == fourButton)
2998	3827	{
2999	3828	radio.layout = fourButton;
	3829	+
	3830	+ if (CameraPane.FULLSCREEN)
	3831	+ fullscreenLayout = radio.layout;
3000	3832
3001	3833	// bigThree.remove(scenePanel);
3002	3834	// bigThree.remove(centralPanel);
..	..	@@ -3035,6 +3867,9 @@
3035	3867	{
3036	3868	radio.layout = sixButton;
3037	3869
	3870	+ if (CameraPane.FULLSCREEN)
	3871	+ fullscreenLayout = radio.layout;
	3872	+
3038	3873	// bigThree.remove(scenePanel);
3039	3874	// bigThree.remove(centralPanel);
3040	3875	// bigThree.remove(XYZPanel);
..	..	@@ -3063,8 +3898,8 @@
3063	3898	// centralPanel.setVisible(true);
3064	3899	// XYZPanel.setVisible(false);
3065	3900	bigThree.ClearUI();
3066		- bigThree.add(scenePanel);
3067	3901	bigThree.add(centralPanel);
	3902	+ bigThree.add(scenePanel);
3068	3903	bigThree.FlushUI();
3069	3904
3070	3905	cameraView.requestFocusInWindow();
..	..	@@ -3072,6 +3907,9 @@
3072	3907	if (source == sevenButton)
3073	3908	{
3074	3909	radio.layout = sevenButton;
	3910	+
	3911	+ if (CameraPane.FULLSCREEN)
	3912	+ fullscreenLayout = radio.layout;
3075	3913
3076	3914	// bigThree.remove(scenePanel);
3077	3915	// bigThree.remove(centralPanel);
..	..	@@ -3110,6 +3948,7 @@
3110	3948	} else
3111	3949	if (source == rootButton)
3112	3950	{
	3951	+ Replace();
3113	3952	Object3D obj;
3114	3953	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3115	3954	{
..	..	@@ -3128,12 +3967,19 @@
3128	3967	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3129	3968	{
3130	3969	ab = (cRadio)e.nextElement();
3131		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3970	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3132	3971	{
	3972	+ // Patch to avoid bug with transparency.
	3973	+ if (!ab.hadMaterial)
	3974	+ {
	3975	+ ab.object.material = null;
	3976	+ }
	3977	+
3133	3978	buttonGroup.remove(ab);
3134	3979	radioPanel.remove(ab);
3135	3980
3136		- ab.GetObject().editWindow = null;
	3981	+ //ab.GetObject().editWindow = null;
	3982	+ ab.GetObject().manipWindow = null;
3137	3983	// ab.GetObject().objectUI = null; // ?????????
3138	3984
3139	3985	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
..	..	@@ -3146,6 +3992,12 @@
3146	3992	} else
3147	3993	if (source == editItem \|\| source == editButton)
3148	3994	{
	3995	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3996	+ {
	3997	+ Object3D child = (Object3D)e.nextElement();
	3998	+ child.pinned = true;
	3999	+ }
	4000	+
3149	4001	EditSelection(false);
3150	4002	} else
3151	4003	if (source == uneditButton)
..	..	@@ -3154,9 +4006,10 @@
3154	4006	{
3155	4007	Object3D child = (Object3D)e.nextElement();
3156	4008	if(child.editWindow != null)
3157		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4009	+ child.pinned = false;
3158	4010	child.CloseUI();
3159	4011	listUI.remove(child);
	4012	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3160	4013
3161	4014	//child.editWindow = null; // ???????????
3162	4015	}
..	..	@@ -3171,16 +4024,18 @@
3171	4024	//copy.ClearUI();
3172	4025	for (Object3D obj : listUI)
3173	4026	{
	4027	+ obj.pinned = false;
3174	4028	obj.CloseUI();
3175	4029	}
3176	4030	listUI.clear();
	4031	+ SetPinStates(group.selection.size() > 0);
3177	4032	refreshContents(true);
3178	4033	} else
3179	4034	if (source == allParamsButton)
3180	4035	{
3181	4036	assert(copy == group);
3182	4037
3183		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4038	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3184	4039
3185	4040	for (Object3D obj : listUI)
3186	4041	{
..	..	@@ -3229,6 +4084,7 @@
3229	4084	}
3230	4085
3231	4086	copy = group;
	4087	+
3232	4088	//Globals.theRenderer.object = group;
3233	4089	if(!useclient)
3234	4090	{
..	..	@@ -3247,6 +4103,7 @@
3247	4103
3248	4104	// fix "+" issue
3249	4105	//group.editWindow = this;
	4106	+ group.manipWindow = this;
3250	4107
3251	4108	/*
3252	4109	currentLayout = radio.layout;
..	..	@@ -3254,6 +4111,29 @@
3254	4111	currentLayout = sevenButton;
3255	4112	*/
3256	4113	radio.layout.doClick();
	4114	+
	4115	+ assert(copy instanceof Composite);
	4116	+
	4117	+ if (copy.versionlist == null)
	4118	+ {
	4119	+ copy.versionlist = new Object3D[100];
	4120	+ copy.versionindex = -1;
	4121	+
	4122	+ // Cannot work with loops
	4123	+ // To fix this issue, first mark all nodes above the root,
	4124	+ // and check if any of these nodes are reachable below the root.
	4125	+ //Save(true);
	4126	+ }
	4127	+
	4128	+ SetVersionStates();
	4129	+
	4130	+ ClearUnpinned();
	4131	+
	4132	+ //Grafreed.Assert(group != null);
	4133	+ //Grafreed.Assert(group.selection != null);
	4134	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4135	+ if (group.selection == null \|\| group.selection.size() == 1)
	4136	+ EditSelection(false);
3257	4137	keepparent = group.parent;
3258	4138	// PARENT = NULL or not???
3259	4139	//group.parent = null; // ROOT
..	..	@@ -3265,11 +4145,13 @@
3265	4145	} else if (event.getSource() == editCameraItem)
3266	4146	{
3267	4147	cameraView.ProtectCamera();
	4148	+ cameraView.requestFocusInWindow();
3268	4149	cameraView.repaint();
3269	4150	return;
3270		- } else if (event.getSource() == revertCameraItem)
	4151	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3271	4152	{
3272	4153	cameraView.RevertCamera();
	4154	+ cameraView.requestFocusInWindow();
3273	4155	cameraView.repaint();
3274	4156	return;
3275	4157	// } else if (event.getSource() == textureButton)
..	..	@@ -3846,7 +4728,7 @@
3846	4728
3847	4729	try
3848	4730	{
3849		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4731	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
3850	4732	}
3851	4733	catch (Exception e)
3852	4734	{
..	..	@@ -4321,28 +5203,25 @@
4321	5203	// }
4322	5204	// }
4323	5205
4324		- static boolean allparams = true;
4325		-
4326		- static Vector<Object3D> listUI = new Vector<Object3D>();
4327		-
4328	5206	void EditSelection(boolean newWindow)
4329	5207	{
	5208	+ if (group.selection == null)
	5209	+ {
	5210	+ EditElement(group, newWindow); // ? new
	5211	+ return;
	5212	+ }
	5213	+
4330	5214	// aConstraints.gridy = 0;
4331	5215	for (int i=0; i<group.selection.size(); i++)
4332	5216	{
4333	5217	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4334	5218	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4335		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5219	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4336	5220
4337	5221	Object3D elem = (Object3D)group.selection.elementAt(i);
4338	5222	if(elem != group \|\| !newWindow)
4339	5223	{
4340		- // if (!(elem instanceof Composite))
4341		- // newWindow = false;
4342		- listUI.add(elem);
4343		- elem.openEditWindow(this, newWindow); //, false);
4344		- System.out.println("edit : " + elem);
4345		- elem.editWindow.refreshContents(true); // ? new
	5224	+ EditElement(elem, newWindow); // ? new
4346	5225	}
4347	5226	}
4348	5227	}
..	..	@@ -4405,9 +5284,7 @@
4405	5284
4406	5285	freezemodel = false;
4407	5286	}
4408		-
4409		- boolean flashIt = true;
4410		-
	5287	+
4411	5288	public void valueChanged(TreeSelectionEvent e)
4412	5289	//public boolean handleEvent(Event event)
4413	5290	{
..	..	@@ -4417,7 +5294,8 @@
4417	5294	//new Exception().printStackTrace();
4418	5295
4419	5296	freezemodel = true;
4420		-
	5297	+ ClearUnpinned();
	5298	+
4421	5299	/**/
4422	5300	//switch (event.id)
4423	5301	{
..	..	@@ -4450,7 +5328,7 @@
4450	5328	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4451	5329	// a camera
4452	5330	{
4453		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	5331	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4454	5332	{
4455	5333	CameraPane.camerachangeframe = 0; // don't refuse it
4456	5334	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4459,6 +5337,13 @@
4459	5337	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4460	5338	}
4461	5339
	5340	+ if (tps != null && tps.length == 1)
	5341	+ {
	5342	+ EditSelection(false);
	5343	+ }
	5344	+
	5345	+ SetPinStates(tps != null && tps.length > 0);
	5346	+
4462	5347	refreshContents();
4463	5348	//return true;
4464	5349	}
..	..	@@ -4468,9 +5353,35 @@
4468	5353	freezemodel = false;
4469	5354	}
4470	5355
	5356	+ void SetPinStates(boolean enabled)
	5357	+ {
	5358	+ editButton.setEnabled(enabled);
	5359	+ uneditButton.setEnabled(enabled);
	5360	+ //unselectButton.setEnabled(enabled);
	5361	+ flashSelectionButton.setEnabled(enabled);
	5362	+
	5363	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5364	+
	5365	+ boolean allComposites = true;
	5366	+
	5367	+ if (group.selection != null)
	5368	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5369	+ {
	5370	+ Object next = e.nextElement();
	5371	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5372	+ {
	5373	+ allComposites = false;
	5374	+ break;
	5375	+ }
	5376	+ }
	5377	+
	5378	+ rootButton.setEnabled(allComposites);
	5379	+ }
	5380	+
4471	5381	void refreshContents(boolean cp)
4472	5382	{
4473		- if (!Globals.MOUSEDRAGGED)
	5383	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5384	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4474	5385	{
4475	5386	objEditor.ClearInfo(); // .GetMaterial());
4476	5387
..	..	@@ -4479,7 +5390,7 @@
4479	5390	Object3D child = (Object3D) group.selection.get(i);
4480	5391
4481	5392	objEditor.AddInfo(child, this, true);
4482		- System.err.println("info : " + child.GetPath());
	5393	+// System.err.println("info : " + child.GetPath());
4483	5394	}
4484	5395
4485	5396	objEditor.SetText(); // jan 2014
..	..	@@ -4569,7 +5480,8 @@
4569	5480
4570	5481	if (cut)
4571	5482	{
4572		- Save();
	5483	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5484	+// Save();
4573	5485	//int indices[] = jList.getSelectedIndices();
4574	5486	//for (int i = indices.length - 1; i >= 0; i--)
4575	5487	//jList.remove(indices[i]);
..	..	@@ -4672,6 +5584,10 @@
4672	5584
4673	5585	void paste(boolean expand)
4674	5586	{
	5587	+ if (Globals.REPLACEONMAKE)
	5588	+ Save();
	5589	+ boolean keep = Globals.REPLACEONMAKE;
	5590	+ Globals.REPLACEONMAKE = false;
4675	5591	// if (GrafreeD.clipboard == null)
4676	5592	// return;
4677	5593	boolean first = true;
..	..	@@ -4731,6 +5647,7 @@
4731	5647	Grafreed.clipboard.get(0).parent = keepparent;
4732	5648	}
4733	5649
	5650	+ Globals.REPLACEONMAKE = keep;
4734	5651	ResetModel();
4735	5652	refreshContents();
4736	5653	}
..	..	@@ -4866,6 +5783,10 @@
4866	5783
4867	5784	void group(Object3D csg, boolean grab)
4868	5785	{
	5786	+ if (Globals.REPLACEONMAKE)
	5787	+ Save();
	5788	+ boolean keep = Globals.REPLACEONMAKE;
	5789	+ Globals.REPLACEONMAKE = false;
4869	5790	if (//false) // why??
4870	5791	!group.selection.isEmpty())
4871	5792	{
..	..	@@ -4979,10 +5900,15 @@
4979	5900	//node.add(csg);
4980	5901	//makeSomething(node);
4981	5902	makeSomething(csg);
	5903	+ Globals.REPLACEONMAKE = keep;
4982	5904	}
4983	5905
4984	5906	void Ungroup(Object3D g)
4985	5907	{
	5908	+ if (Globals.REPLACEONMAKE)
	5909	+ Save();
	5910	+ boolean keep = Globals.REPLACEONMAKE;
	5911	+ Globals.REPLACEONMAKE = false;
4986	5912	if (g instanceof HiddenObject)
4987	5913	{
4988	5914	HiddenObject h = (HiddenObject) g;
..	..	@@ -4999,6 +5925,7 @@
4999	5925	objEditor.makeSomething(g.get(i), false);
5000	5926	}
5001	5927	}
	5928	+ Globals.REPLACEONMAKE = keep;
5002	5929	}
5003	5930
5004	5931	void ungroup()
..	..	@@ -5287,13 +6214,43 @@
5287	6214	cButton clearpanelButton;
5288	6215	cButton unselectButton;
5289	6216
5290		- cButton minButton;
5291		- cButton maxButton;
5292		- cButton fullButton;
5293		- cButton undoButton;
5294		- cButton redoButton;
5295		- cButton saveButton;
	6217	+ cButton restoreCameraButton;
	6218	+
5296	6219	cButton oneStepButton;
	6220	+
	6221	+ cButton groupButton;
	6222	+ cButton ungroupButton;
	6223	+ cButton compositeButton;
	6224	+ cButton switchButton;
	6225	+ cButton loopButton;
	6226	+ cButton textureButton;
	6227	+
	6228	+ cButton skybox1Button;
	6229	+ cButton skybox2Button;
	6230	+ cButton skybox3Button;
	6231	+ cButton skybox4Button;
	6232	+ cButton skybox5Button;
	6233	+ cButton skybox6Button;
	6234	+ cButton skybox7Button;
	6235	+
	6236	+ cButton skybox11Button;
	6237	+ cButton skybox12Button;
	6238	+ cButton skybox13Button;
	6239	+ cButton skybox14Button;
	6240	+ cButton skybox15Button;
	6241	+ cButton skybox16Button;
	6242	+ cButton skybox17Button;
	6243	+
	6244	+ cButton gridButton;
	6245	+ cButton boxButton;
	6246	+ cButton sphereButton;
	6247	+ cButton coneButton;
	6248	+ cButton torusButton;
	6249	+ cButton superButton;
	6250	+ cButton kleinButton;
	6251	+ cButton particlesButton;
	6252	+ cButton overlayButton;
	6253	+ cButton lightButton;
5297	6254
5298	6255	cButton screenfitButton;
5299	6256	cButton screenfitpointButton;
..	..	@@ -5315,12 +6272,12 @@
5315	6272	//JTree jTree;
5316	6273	private MenuItem lookAtItem;
5317	6274	private MenuItem lookFromItem;
5318		- private MenuItem switchItem;
5319		- private MenuItem cutItem;
	6275	+ private MenuItem switchViewItem;
	6276	+ private JMenuItem cutItem;
5320	6277	private MenuItem undoItem;
5321	6278	private MenuItem redoItem;
5322		- private MenuItem duplicateItem;
5323		- private MenuItem cloneItem;
	6279	+ private JMenuItem duplicateItem;
	6280	+ private JMenuItem cloneItem;
5324	6281	private MenuItem cloneSupportItem;
5325	6282	private MenuItem overwriteGeoItem;
5326	6283	private MenuItem overwriteMatItem;
..	..	@@ -5341,13 +6298,13 @@
5341	6298	private MenuItem cloneGeometriesItem;
5342	6299	private MenuItem shareGeometriesItem;
5343	6300	private MenuItem mergeGeometriesItem;
5344		- private MenuItem copyItem;
	6301	+ private JMenuItem copyItem;
5345	6302	private MenuItem pasteItem;
5346		- private MenuItem pasteIntoItem;
5347		- private MenuItem pasteLinkItem;
5348		- private MenuItem pasteCloneItem;
5349		- private MenuItem pasteExpandItem;
5350		- private MenuItem clearItem;
	6303	+ private JMenuItem pasteIntoItem;
	6304	+ private JMenuItem pasteLinkItem;
	6305	+ private JMenuItem pasteCloneItem;
	6306	+ private JMenuItem pasteExpandItem;
	6307	+ private JMenuItem deleteItem;
5351	6308	private MenuItem clearAllItem;
5352	6309	private MenuItem genUVItem;
5353	6310	private MenuItem genNormalsMESHItem;
..	..	@@ -5402,12 +6359,12 @@
5402	6359	private MenuItem transformGeometryItem;
5403	6360	private MenuItem transformChildrenItem;
5404	6361	private MenuItem hideItem;
5405		- private MenuItem grabItem;
	6362	+ private JMenuItem grabItem;
5406	6363	private MenuItem backItem;
5407	6364	private MenuItem frontItem;
5408	6365	private MenuItem cameraItem;
5409	6366	private MenuItem compositeItem;
5410		- private MenuItem randomItem;
	6367	+ private MenuItem switchItem;
5411	6368	private MenuItem physicsItem;
5412	6369	private MenuItem frameselectorItem;
5413	6370	private MenuItem scriptNodeItem;
..	..	@@ -5415,7 +6372,7 @@
5415	6372	private MenuItem switchTransfoItem;
5416	6373	private MenuItem morphItem;
5417	6374	private MenuItem linkerItem;
5418		- private MenuItem ungroupItem;
	6375	+ private JMenuItem ungroupItem;
5419	6376	private MenuItem editItem;
5420	6377	private MenuItem openWindowItem;
5421	6378	private MenuItem editLeafItem;
..	..	@@ -5431,6 +6388,8 @@
5431	6388	private MenuItem attachBumpItem;
5432	6389	private MenuItem detachBumpItem;
5433	6390	private MenuItem pigmentBumpItem;
	6391	+ private MenuItem embedTexturesItem;
	6392	+ private MenuItem deEmbedTexturesItem;
5434	6393
5435	6394	private MenuItem particleItem;
5436	6395	private MenuItem ragdollItem;
..	..	@@ -5481,5 +6440,5 @@
5481	6440
5482	6441	Menu cameraMenu;
5483	6442	MenuItem editCameraItem;
5484		- MenuItem revertCameraItem;
	6443	+ MenuItem restoreCameraItem;
5485	6444	}