~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -16,6 +16,7 @@
16	16	//import buoy.widget.BFileChooser;
17	17
18	18	class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
	19	+ Grafreed.iResourceCallBack,
19	20	ObjectUI,
20	21	Runnable,
21	22	ActionListener,
..	..	@@ -23,6 +24,350 @@
23	24	DragGestureListener, DragSourceListener, DropTargetListener,
24	25	ItemListener // ListSelectionListener
25	26	{
	27	+
	28	+ public void AddSkyboxButton(String f, String s, cGridBag row)
	29	+ {
	30	+ cButton skyboxButton;
	31	+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
	32	+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Globals.NIMBUSLAF));
	33	+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
	34	+ skyboxButton.setToolTipText(s.equals("") ? "No background" : s);
	35	+ skyboxButton.addActionListener(new ActionListener()
	36	+ {
	37	+ @Override
	38	+ public void actionPerformed(ActionEvent e)
	39	+ {
	40	+ ChangeSkybox(path);
	41	+ }
	42	+ });
	43	+ }
	44	+
	45	+ public void AddTextureButton(String f, String c, final String t, int count, cGridBag row)
	46	+ {
	47	+ cButton textureButton;
	48	+ final String path = "textures/" + f + "/" + c + "/"; // + t;
	49	+ row.add(textureButton = GetButton(path + "icons/" + t, !Globals.NIMBUSLAF));
	50	+ textureButton.setToolTipText(c + count);
	51	+ textureButton.addActionListener(new ActionListener()
	52	+ {
	53	+ @Override
	54	+ public void actionPerformed(ActionEvent e)
	55	+ {
	56	+ ChangeTexture(path + t);
	57	+ }
	58	+ });
	59	+ }
	60	+
	61	+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
	62	+ {
	63	+ cGridBag tab0 = new cGridBag().setVertical(true);
	64	+
	65	+ tab0.setName("Urban");
	66	+ skyboxpanel.add(tab0);
	67	+
	68	+ cGridBag row0 = new cGridBag();
	69	+ cGridBag row1 = new cGridBag();
	70	+ cGridBag row2 = new cGridBag();
	71	+ cGridBag row3 = new cGridBag();
	72	+ cGridBag row4 = new cGridBag();
	73	+ cGridBag row5 = new cGridBag();
	74	+ cGridBag row6 = new cGridBag();
	75	+
	76	+ AddSkyboxButton("default", "", row0);
	77	+ //AddSkyboxButton("default", "cornell", row0);
	78	+ AddSkyboxButton("penguins", "dust", row0);
	79	+ AddSkyboxButton("penguins", "tropic", row0);
	80	+ AddSkyboxButton("penguins", "yonder", row0);
	81	+
	82	+ AddSkyboxButton("default", "uffizi", row1);
	83	+ AddSkyboxButton("bridge", "Bridge", row1);
	84	+ AddSkyboxButton("bridge", "Bridge2", row1);
	85	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	86	+
	87	+ AddSkyboxButton("urban", "Parliament", row2);
	88	+ AddSkyboxButton("urban", "Roundabout", row2);
	89	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	90	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	91	+
	92	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	93	+ AddSkyboxButton("urban", "UnionSquare", row3);
	94	+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
	95	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	96	+
	97	+ AddSkyboxButton("park", "Buddha", row4);
	98	+ AddSkyboxButton("park", "CNTower2", row4);
	99	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	100	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	101	+
	102	+ AddSkyboxButton("park", "Park", row5);
	103	+ AddSkyboxButton("park", "Pond", row5);
	104	+ AddSkyboxButton("park", "Skansen", row5);
	105	+ AddSkyboxButton("park", "Skansen2", row5);
	106	+
	107	+ AddSkyboxButton("park", "Skansen3", row6);
	108	+ AddSkyboxButton("park", "Skansen4", row6);
	109	+ AddSkyboxButton("park", "Skansen5", row6);
	110	+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
	111	+
	112	+ tab0.add(row0);
	113	+ tab0.add(row1);
	114	+ tab0.add(row2);
	115	+ tab0.add(row3);
	116	+ tab0.add(row4);
	117	+ tab0.add(row5);
	118	+ tab0.add(row6);
	119	+
	120	+ for (int i=5; --i>=0;)
	121	+ {
	122	+ //oe.toolboxPanel.Return();
	123	+ //tab0.add(new cGridBag());
	124	+ }
	125	+ }
	126	+
	127	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	128	+ {
	129	+ cGridBag tab0 = new cGridBag().setVertical(true);
	130	+
	131	+ tab0.setName("Nature");
	132	+ skyboxpanel.add(tab0);
	133	+
	134	+ cGridBag row0 = new cGridBag();
	135	+ cGridBag row1 = new cGridBag();
	136	+ cGridBag row2 = new cGridBag();
	137	+ cGridBag row3 = new cGridBag();
	138	+ cGridBag row4 = new cGridBag();
	139	+ cGridBag row5 = new cGridBag();
	140	+ cGridBag row6 = new cGridBag();
	141	+
	142	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	143	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	144	+ AddSkyboxButton("beach", "PalmTrees", row0);
	145	+ AddSkyboxButton("beach", "Tenerife", row0);
	146	+
	147	+ AddSkyboxButton("beach", "Tenerife2", row1);
	148	+ AddSkyboxButton("beach", "Tenerife3", row1);
	149	+ AddSkyboxButton("field", "FishPond", row1);
	150	+ AddSkyboxButton("field", "Footballfield", row1);
	151	+
	152	+ AddSkyboxButton("field", "Meadow", row2);
	153	+ AddSkyboxButton("field", "Sorsele", row2);
	154	+ AddSkyboxButton("field", "Sorsele2", row2);
	155	+ AddSkyboxButton("field", "Sorsele3", row2);
	156	+
	157	+ AddSkyboxButton("forest", "Brudslojan", row3);
	158	+ AddSkyboxButton("forest", "Langholmen2", row3);
	159	+ AddSkyboxButton("forest", "Plants", row3);
	160	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	161	+
	162	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	163	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	164	+ AddSkyboxButton("mountain", "Teide", row4);
	165	+ AddSkyboxButton("park", "Tantolunden4", row4);
	166	+
	167	+ AddSkyboxButton("park", "Stairs", row5);
	168	+ AddSkyboxButton("default", "skycube", row6);
	169	+ AddSkyboxButton("rocky", "Langholmen", row5);
	170	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	171	+
	172	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	173	+ AddSkyboxButton("default", "CloudyHills", row6);
	174	+ AddSkyboxButton("daz", "Autumn", row6);
	175	+ AddSkyboxButton("daz", "MountainTrail", row6);
	176	+ /*
	177	+Autumn
	178	+Greenlands
	179	+MountainTrail
	180	+Oasis
	181	+TheRock
	182	+TopOfTheWorld
	183	+Winter
	184	+ */
	185	+
	186	+ tab0.add(row0);
	187	+ tab0.add(row1);
	188	+ tab0.add(row2);
	189	+ tab0.add(row3);
	190	+ tab0.add(row4);
	191	+ tab0.add(row5);
	192	+ tab0.add(row6);
	193	+
	194	+ for (int i=5; --i>=0;)
	195	+ {
	196	+ //oe.toolboxPanel.Return();
	197	+ //tab0.add(new cGridBag());
	198	+ }
	199	+ }
	200	+
	201	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	202	+ {
	203	+ cGridBag tab0 = new cGridBag().setVertical(true);
	204	+
	205	+ tab0.setName("Night");
	206	+ skyboxpanel.add(tab0);
	207	+
	208	+ cGridBag row0 = new cGridBag();
	209	+ cGridBag row1 = new cGridBag();
	210	+ cGridBag row2 = new cGridBag();
	211	+ cGridBag row3 = new cGridBag();
	212	+ cGridBag row4 = new cGridBag();
	213	+ cGridBag row5 = new cGridBag();
	214	+ cGridBag row6 = new cGridBag();
	215	+
	216	+ AddSkyboxButton("night", "NightPath", row0);
	217	+ AddSkyboxButton("night", "PondNight", row0);
	218	+ AddSkyboxButton("night", "Powerlines", row0);
	219	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	220	+
	221	+ AddSkyboxButton("urban", "CNTower", row1);
	222	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	223	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	224	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
	225	+
	226	+ AddSkyboxButton("penguins", "kenon_star", row2);
	227	+ AddSkyboxButton("persson", "corona", row2);
	228	+ AddSkyboxButton("persson", "spaceskybox", row2);
	229	+ AddSkyboxButton("indoors", "Vasa", row2);
	230	+
	231	+ AddSkyboxButton("winter", "Backyard", row3);
	232	+ AddSkyboxButton("winter", "Creek", row3);
	233	+ AddSkyboxButton("winter", "FootballField3", row3);
	234	+ AddSkyboxButton("winter", "Forest", row3);
	235	+
	236	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	237	+ AddSkyboxButton("winter", "House", row4);
	238	+ AddSkyboxButton("winter", "IceLake", row4);
	239	+ AddSkyboxButton("winter", "IceRiver", row4);
	240	+
	241	+ AddSkyboxButton("winter", "Park3", row5);
	242	+ AddSkyboxButton("winter", "PondWinter", row5);
	243	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	244	+ AddSkyboxButton("winter", "Vindelalven", row5);
	245	+
	246	+ AddSkyboxButton("daz", "TheRock", row6);
	247	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	248	+ AddSkyboxButton("daz", "Winter", row6);
	249	+ AddSkyboxButton("mountain", "Ryfjallet", row6);
	250	+
	251	+ tab0.add(row0);
	252	+ tab0.add(row1);
	253	+ tab0.add(row2);
	254	+ tab0.add(row3);
	255	+ tab0.add(row4);
	256	+ tab0.add(row5);
	257	+ tab0.add(row6);
	258	+
	259	+ for (int i=5; --i>=0;)
	260	+ {
	261	+ //oe.toolboxPanel.Return();
	262	+ //tab0.add(new cGridBag());
	263	+ }
	264	+ }
	265	+
	266	+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
	267	+ {
	268	+ cGridBag tab0 = new cGridBag().setVertical(true);
	269	+
	270	+ tab0.setName("Others");
	271	+ skyboxpanel.add(tab0);
	272	+
	273	+ cGridBag row0 = new cGridBag();
	274	+ cGridBag row1 = new cGridBag();
	275	+ cGridBag row2 = new cGridBag();
	276	+ cGridBag row3 = new cGridBag();
	277	+ cGridBag row4 = new cGridBag();
	278	+ cGridBag row5 = new cGridBag();
	279	+ cGridBag row6 = new cGridBag();
	280	+
	281	+ AddSkyboxButton("mayhem", "afterrain", row0);
	282	+ AddSkyboxButton("mayhem", "aqua4", row0);
	283	+ AddSkyboxButton("mayhem", "aqua9", row0);
	284	+ AddSkyboxButton("mayhem", "flame", row0);
	285	+
	286	+ AddSkyboxButton("mayhem", "h2s", row1);
	287	+ AddSkyboxButton("mayhem", "prehistoric", row1);
	288	+ AddSkyboxButton("mayhem", "scorched", row1);
	289	+ AddSkyboxButton("penguins", "desertdawn", row1);
	290	+
	291	+ AddSkyboxButton("persson", "Citadella", row2);
	292	+ AddSkyboxButton("persson", "Citadella2", row2);
	293	+ AddSkyboxButton("persson", "clouds1", row2);
	294	+ AddSkyboxButton("penguins", "wrath", row2);
	295	+
	296	+ AddSkyboxButton("persson", "FishermansBastion", row3);
	297	+ AddSkyboxButton("persson", "HeroesSquare", row3);
	298	+ AddSkyboxButton("indoors", "DallasW", row3);
	299	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
	300	+
	301	+ AddSkyboxButton("persson", "LancellottiChapel", row4);
	302	+ AddSkyboxButton("persson", "PereaBeach1", row4);
	303	+ AddSkyboxButton("persson", "PereaBeach2", row4);
	304	+ AddSkyboxButton("persson", "redeclipse", row4);
	305	+
	306	+ AddSkyboxButton("daz", "Greenlands", row5);
	307	+ AddSkyboxButton("daz", "Oasis", row5);
	308	+ AddSkyboxButton("elyvisions", "arch3", row5);
	309	+ AddSkyboxButton("elyvisions", "calm_sea", row5);
	310	+
	311	+ AddSkyboxButton("elyvisions", "rainbow", row6);
	312	+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
	313	+ AddSkyboxButton("elyvisions", "heaven", row6);
	314	+ AddSkyboxButton("elyvisions", "hot", row6);
	315	+
	316	+ tab0.add(row0);
	317	+ tab0.add(row1);
	318	+ tab0.add(row2);
	319	+ tab0.add(row3);
	320	+ tab0.add(row4);
	321	+ tab0.add(row5);
	322	+ tab0.add(row6);
	323	+
	324	+ for (int i=5; --i>=0;)
	325	+ {
	326	+ //oe.toolboxPanel.Return();
	327	+ //tab0.add(new cGridBag());
	328	+ }
	329	+ }
	330	+
	331	+ public void ChangeSkybox(String skybox)
	332	+ {
	333	+ if (skybox.endsWith("/"))
	334	+ {
	335	+ group.skyboxname = null;
	336	+ group.skyboxext = null;
	337	+ cameraView.repaint();
	338	+ }
	339	+ else
	340	+ {
	341	+ //cameraView.envyoff = false;
	342	+ group.skyboxname = skybox;
	343	+ group.skyboxext = "jpg";
	344	+ cameraView.repaint();
	345	+ }
	346	+ }
	347	+
	348	+ public void CreateSkyboxPanel(cGridBag skyboxPanel)
	349	+ {
	350	+ JTabbedPane skyboxpane = new JTabbedPane(JTabbedPane.LEFT);
	351	+
	352	+ AddSkyboxTab0(skyboxpane);
	353	+ AddSkyboxTab1(skyboxpane);
	354	+ AddSkyboxTab2(skyboxpane);
	355	+ AddSkyboxTab3(skyboxpane);
	356	+
	357	+ skyboxPanel.add(skyboxpane);
	358	+ }
	359	+
	360	+ public void ChangeTexture(String texture)
	361	+ {
	362	+ for (int i=0; i<group.selection.size(); i++)
	363	+ {
	364	+ Object3D obj = group.selection.get(i);
	365	+ obj.SetPigmentTexture("@" + texture);
	366	+ }
	367	+
	368	+ refreshContents();
	369	+ }
	370	+
26	371	//ObjEditor objEditor;
27	372	public void closeUI2()
28	373	{
..	..	@@ -60,6 +405,16 @@
60	405	this.copy = this.group = group;
61	406	//selectees = this.group.selectees;
62	407
	408	+ assert(false);
	409	+
	410	+// if (copy.versionlist == null)
	411	+// {
	412	+// copy.versionlist = new Object3D[100];
	413	+// copy.versionindex = -1;
	414	+//
	415	+// //Save(true);
	416	+// }
	417	+
63	418	if(ui)
64	419	SetupUI(objEditor);
65	420	}
..	..	@@ -80,10 +435,22 @@
80	435	SetupViews(objEditor);
81	436
82	437	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	438	+
	439	+// if (copy.versionlist == null)
	440	+// {
	441	+// copy.versionlist = new Object3D[100];
	442	+// copy.versionindex = -1;
	443	+//
	444	+// //Save(true);
	445	+// }
83	446	}
84	447
85	448	void CloneSelection(boolean supports)
86	449	{
	450	+ if (Globals.REPLACEONMAKE)
	451	+ Save();
	452	+ boolean keep = Globals.REPLACEONMAKE;
	453	+ Globals.REPLACEONMAKE = false;
87	454	// Object3D keep = GrafreeD.clipboard;
88	455	//Object3D obj;
89	456	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,6 +461,7 @@
94	461
95	462	makeSomething(clone, i==group.selection.size()-1);
96	463	}
	464	+ Globals.REPLACEONMAKE = keep;
97	465	}
98	466
99	467	void CloneClipboard(boolean supports)
..	..	@@ -115,11 +483,16 @@
115	483
116	484	Object3D parent = obj.parent;
117	485	obj.parent = null;
	486	+
118	487	// Object3D support = obj.support;
119	488	// obj.support = null;
120	489	if (!supports)
121	490	obj.SaveSupports();
	491	+
122	492	Object3D clone = (Object3D)Grafreed.clone(obj);
	493	+
	494	+ clone.ResetUUIDs();
	495	+
123	496	obj.parent = parent;
124	497	// obj.support = support;
125	498	// clone.support = support; // aout 2013
..	..	@@ -150,40 +523,51 @@
150	523
151	524	void SetupMenu2(GroupEditor oe)
152	525	{
	526	+ oe.jTree = new cTree();
	527	+
153	528	Menu menu;
154	529	oe.menuBar.add(menu = new Menu("Edit"));
155	530	//editItem = menu.add(new MenuItem("Edit"));
156	531	//editItem.addActionListener(this);
157		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	532	+
	533	+// undoItem = menu.add(new MenuItem("Undo"));
	534	+// undoItem.addActionListener(this);
	535	+// redoItem = menu.add(new MenuItem("Redo"));
	536	+// redoItem.addActionListener(this);
	537	+// menu.add("-");
	538	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
158	539	duplicateItem.addActionListener(this);
159		- cloneItem = menu.add(new MenuItem("Clone"));
	540	+
	541	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
160	542	cloneItem.addActionListener(this);
161		- if (Globals.ADVANCED)
	543	+ //if (Globals.ADVANCED)
162	544	{
163	545	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
164	546	cloneSupportItem.addActionListener(this);
165	547	}
	548	+ oe.jTree.popup.addSeparator();
166	549	menu.add("-");
167		- cutItem = menu.add(new MenuItem("Cut"));
	550	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
168	551	cutItem.addActionListener(this);
169		- copyItem = menu.add(new MenuItem("Copy"));
	552	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
170	553	copyItem.addActionListener(this);
171	554	pasteItem = menu.add(new MenuItem("Paste"));
172	555	pasteItem.addActionListener(this);
173		- menu.add("-");
174	556
175		- menu.add("-");
176		- pasteIntoItem = menu.add(new MenuItem("Paste into"));
	557	+ oe.jTree.popup.addSeparator();
	558	+ //menu.add("-");
	559	+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
177	560	pasteIntoItem.addActionListener(this);
178		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	561	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
179	562	pasteLinkItem.addActionListener(this);
180		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	563	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
181	564	pasteCloneItem.addActionListener(this);
182		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
183		-// pasteExpandItem.addActionListener(this);
184		- menu.add("-");
185		- clearItem = menu.add(new MenuItem("Clear"));
186		- clearItem.addActionListener(this);
	565	+// CRASH
	566	+ pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
	567	+//
	568	+ pasteExpandItem.addActionListener(this);
	569	+ //menu.add("-");
	570	+ oe.jTree.popup.addSeparator();
187	571
188	572	if (Globals.ADVANCED)
189	573	{
..	..	@@ -197,23 +581,23 @@
197	581	//zBufferItem.addActionListener(this);
198	582	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
199	583	//normalLensItem.addActionListener(this);
200		- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
201		- revertCameraItem.addActionListener(this);
	584	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	585	+ restoreCameraItem.addActionListener(this);
202	586
203		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
204		- toggleFullScreenItem.addItemListener(this);
205		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
206		- cameraMenu.add("-");
	587	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	588	+// toggleFullScreenItem.addItemListener(this);
	589	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	590	+// cameraMenu.add("-");
	591	+//
	592	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	593	+// toggleTextureItem.addItemListener(this);
	594	+// toggleTextureItem.setState(CameraPane.textureon);
	595	+//
	596	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	597	+// toggleSwitchItem.addItemListener(this);
	598	+// toggleSwitchItem.setState(CameraPane.SWITCH);
207	599
208		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
209		- toggleTextureItem.addItemListener(this);
210		- toggleTextureItem.setState(CameraPane.textureon);
211		-
212		- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
213		- toggleSwitchItem.addItemListener(this);
214		- toggleSwitchItem.setState(CameraPane.SWITCH);
215		-
216		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	600	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
217	601	toggleHandleItem.addItemListener(this);
218	602	toggleHandleItem.setState(CameraPane.HANDLES);
219	603
..	..	@@ -240,7 +624,7 @@
240	624
241	625	cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
242	626	toggleDebugItem.addItemListener(this);
243		- toggleDebugItem.setState(CameraPane.DEBUG);
	627	+ toggleDebugItem.setState(Globals.DEBUG);
244	628
245	629	cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
246	630	toggleFrustumItem.addItemListener(this);
..	..	@@ -261,22 +645,20 @@
261	645	// animationItem.addItemListener(this);
262	646	// animationItem.setState(CameraPane.ANIMATION);
263	647	cameraMenu.add("-");
264		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
	648	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
265	649	editCameraItem.addActionListener(this);
266	650
267	651	if (Globals.ADVANCED)
268	652	{
269	653	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
270	654	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
271		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
272		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	655	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
273	656	oe.cameraMenu.add("-");
274	657	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
275	658	openWindowItem.addActionListener(this);
276		- editLeafItem.addActionListener(this);
277	659	lookAtItem.addActionListener(this);
278	660	//lookFromItem.addActinoListener(this);
279		- //switchItem.addActionListener(this);
	661	+ //switchViewItem.addActionListener(this);
280	662	}
281	663
282	664	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -320,22 +702,37 @@
320	702	setMasterItem.addActionListener(this);
321	703	}
322	704
323		- oe.menuBar.add(menu = new Menu("Group"));
324		- grabItem = menu.add(new MenuItem("Grab"));
325		- grabItem.addActionListener(this);
	705	+ oe.menuBar.add(menu = new Menu("Order"));
	706	+
326	707	backItem = menu.add(new MenuItem("Back"));
327	708	backItem.addActionListener(this);
328	709	frontItem = menu.add(new MenuItem("Front"));
329	710	frontItem.addActionListener(this);
330		- compositeItem = menu.add(new MenuItem("Composite"));
331		- compositeItem.addActionListener(this);
	711	+// compositeItem = menu.add(new MenuItem("Composite"));
	712	+// compositeItem.addActionListener(this);
	713	+
	714	+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
	715	+ grabItem.addActionListener(this);
	716	+
	717	+ if (Globals.ADVANCED)
	718	+ {
332	719	hideItem = menu.add(new MenuItem("Hidden Group"));
333	720	hideItem.addActionListener(this);
334		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	721	+ }
	722	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
335	723	ungroupItem.addActionListener(this);
336		- menu.add("-");
337		- randomItem = menu.add(new MenuItem("Switch node"));
338		- randomItem.addActionListener(this);
	724	+
	725	+ oe.jTree.popup.addSeparator();
	726	+
	727	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	728	+ deleteItem.addActionListener(this);
	729	+
	730	+// menu.add("-");
	731	+//
	732	+// switchItem = menu.add(new MenuItem("Switch node"));
	733	+// switchItem.addActionListener(this);
	734	+ if (Globals.ADVANCED)
	735	+ {
339	736	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
340	737	switchGeoItem.addActionListener(this);
341	738	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -343,8 +740,6 @@
343	740	morphItem = menu.add(new MenuItem("Morph Group"));
344	741	morphItem.addActionListener(this);
345	742
346		- if (Globals.ADVANCED)
347		- {
348	743	menu.add("-");
349	744	physicsItem = menu.add(new MenuItem("Physics"));
350	745	physicsItem.addActionListener(this);
..	..	@@ -352,41 +747,47 @@
352	747	frameselectorItem.addActionListener(this);
353	748	scriptNodeItem = menu.add(new MenuItem("Script Node"));
354	749	scriptNodeItem.addActionListener(this);
355		- cameraItem = menu.add(new MenuItem("Camera"));
356		- cameraItem.addActionListener(this);
357	750	}
358	751
359	752	oe.menuBar.add(menu = new Menu("Object"));
360		- textureItem = menu.add(new MenuItem("Texture"));
361		- textureItem.addActionListener(this);
	753	+// textureItem = menu.add(new MenuItem("Texture"));
	754	+// textureItem.addActionListener(this);
362	755	billboardItem = menu.add(new MenuItem("Billboard"));
363	756	billboardItem.addActionListener(this);
364	757	csgItem = menu.add(new MenuItem("CSG"));
365	758	csgItem.addActionListener(this);
366		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	759	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
367	760	shadowXItem.addActionListener(this);
368		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	761	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
369	762	shadowYItem.addActionListener(this);
370		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	763	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
371	764	shadowZItem.addActionListener(this);
	765	+
	766	+ attributeItem = menu.add(new MenuItem("Attribute"));
	767	+ attributeItem.addActionListener(this);
372	768	if (Globals.ADVANCED)
373	769	{
374	770	menu.add("-");
375	771	linkerItem = menu.add(new MenuItem("Linker"));
376	772	linkerItem.addActionListener(this);
377		- attributeItem = menu.add(new MenuItem("Attribute"));
378		- attributeItem.addActionListener(this);
379	773	templateItem = menu.add(new MenuItem("Template"));
380	774	templateItem.addActionListener(this);
381	775	pointflowItem = menu.add(new MenuItem("Point Flow"));
382	776	pointflowItem.addActionListener(this);
383	777	}
384	778	menu.add("-");
	779	+ textureRatioRItem = menu.add(new MenuItem("Texture Ratio Red"));
	780	+ textureRatioRItem.addActionListener(this);
	781	+ textureRatioGItem = menu.add(new MenuItem("Texture Ratio Green"));
	782	+ textureRatioGItem.addActionListener(this);
	783	+ textureRatioBItem = menu.add(new MenuItem("Texture Ratio Blue"));
	784	+ textureRatioBItem.addActionListener(this);
	785	+ menu.add("-");
385	786	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
386	787	resetTransformItem.addActionListener(this);
387	788	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
388	789	resetCentroidItem.addActionListener(this);
389		- resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	790	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XZ"));
390	791	resetCentroidXZItem.addActionListener(this);
391	792	transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
392	793	transformGeometryItem.addActionListener(this);
..	..	@@ -402,9 +803,9 @@
402	803	genNormalsCADItem.addActionListener(this);
403	804	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
404	805	genNormalsMESHItem.addActionListener(this);
405		- if (Globals.ADVANCED)
	806	+ //if (Globals.ADVANCED)
406	807	{
407		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	808	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
408	809	genNormalsMINEItem.addActionListener(this);
409	810	}
410	811	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -438,6 +839,8 @@
438	839	}
439	840
440	841	oe.menuBar.add(menu = new Menu("Attributes"));
	842	+ clearVersionsItem = menu.add(new MenuItem("Clear Versions"));
	843	+ clearVersionsItem.addActionListener(this);
441	844	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
442	845	clearMaterialsItem.addActionListener(this);
443	846	resetAllItem = menu.add(new MenuItem("Reset All"));
..	..	@@ -460,10 +863,18 @@
460	863	hideleavesItem.addActionListener(this);
461	864	showleavesItem = menu.add(new MenuItem("Show Leaves"));
462	865	showleavesItem.addActionListener(this);
463		- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
	866	+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
464	867	markleavesItem.addActionListener(this);
465		- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
	868	+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
466	869	unmarkleavesItem.addActionListener(this);
	870	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	871	+ rewindleavesItem.addActionListener(this);
	872	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	873	+ unrewindleavesItem.addActionListener(this);
	874	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	875	+ randomleavesItem.addActionListener(this);
	876	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	877	+ unrandomleavesItem.addActionListener(this);
467	878	menu.add("-");
468	879	flipVItem = menu.add(new MenuItem("Flip V"));
469	880	flipVItem.addActionListener(this);
..	..	@@ -489,10 +900,15 @@
489	900	attachBumpItem.addActionListener(this);
490	901	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
491	902	pigmentBumpItem.addActionListener(this);
	903	+ //embedTexturesItem
492	904	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
493	905	detachPigmentItem.addActionListener(this);
494	906	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
495	907	detachBumpItem.addActionListener(this);
	908	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	909	+ embedTexturesItem.addActionListener(this);
	910	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	911	+ deEmbedTexturesItem.addActionListener(this);
496	912	menu.add("-");
497	913	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
498	914	sortbysizeItem.addActionListener(this);
..	..	@@ -503,6 +919,9 @@
503	919	shareGeometriesItem.addActionListener(this);
504	920	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
505	921	mergeGeometriesItem.addActionListener(this);
	922	+ menu.add("-");
	923	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	924	+ editLeafItem.addActionListener(this);
506	925	if (Globals.ADVANCED)
507	926	{
508	927	// Pretty much the same as duplicate and clone.
..	..	@@ -519,16 +938,102 @@
519	938	buildToolsMenu(menu);
520	939	}
521	940
	941	+ JTabbedPane resourcecontainer;
	942	+ cGridBag currenttab;
	943	+ //boolean added; // patch for jar
	944	+
	945	+ int totalcount = 0;
	946	+
	947	+ int tabcount = 0;
	948	+ int colcount = 0;
	949	+ int rowcount = 0;
	950	+ int texturecount = 0;
	951	+
	952	+ int columns = 5;
	953	+ int rows = 7;
	954	+
	955	+ public void ResourceCallBack(String[] path)
	956	+ {
	957	+// for (int i = 0; i < path.length; i++)
	958	+// System.out.print(path[i] + "/");
	959	+// System.out.println();
	960	+
	961	+ if (//rowcount == 0 \|\|
	962	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	963	+ {
	964	+ currenttab = new cGridBag();
	965	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	966	+ currenttab.setName(tabname);
	967	+ //added = false;
	968	+ resourcecontainer.add(currenttab);
	969	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture " + tabname);
	970	+ rowcount = 1;
	971	+ colcount = 0;
	972	+ texturecount = 0;
	973	+ }
	974	+
	975	+ if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") \|\| path[2].toLowerCase().endsWith(".png")))
	976	+ {
	977	+ //if (!added)
	978	+ {
	979	+ //added = true;
	980	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	981	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	982	+ }
	983	+
	984	+ columns = 5;
	985	+
	986	+ if (path[0].contains("D&R") \|\| path[0].contains("Paint"))
	987	+ columns = 4;
	988	+
	989	+ AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
	990	+ totalcount++;
	991	+
	992	+ if (++colcount >= columns)
	993	+ {
	994	+ colcount = 0;
	995	+ currenttab.Return();
	996	+
	997	+ if (rowcount++ >= rows)
	998	+ {
	999	+ rowcount = 0;
	1000	+ }
	1001	+ }
	1002	+ }
	1003	+ else
	1004	+ {
	1005	+// if (!path[path.length-1].equals("icons"))
	1006	+// resourcecontainer.Return();
	1007	+ }
	1008	+ }
	1009	+
	1010	+ void CreateTexturePanel(cGridBag container)
	1011	+ {
	1012	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	1013	+ container.add(resourcecontainer);
	1014	+
	1015	+ Grafreed.ParseResources("textures", this);
	1016	+
	1017	+ // 935. System.out.println("Total = " + totalcount);
	1018	+ }
	1019	+
522	1020	void SetupUI2(ObjEditor oe)
523	1021	{
	1022	+ // June 2019
	1023	+ if (oe == null)
	1024	+ {
	1025	+ //super.SetupUI2(this);
	1026	+ //return;
	1027	+ }
	1028	+
	1029	+ if (copy != group)
	1030	+ {
	1031	+ //super.SetupUI2(this);
	1032	+ }
	1033	+
524	1034	//new Exception().printStackTrace();
525	1035
526	1036	oe.radioPanel = new JPanel(new GridBagLayout());
527		- oe.aConstraints.weightx = 1;
528		- oe.aConstraints.weighty = 0;
529		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
530		- oe.aConstraints.gridwidth = 100;
531		- oe.aConstraints.gridheight = 1;
532	1037	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
533	1038
534	1039	oe.buttonGroup = new ButtonGroup();
..	..	@@ -549,97 +1054,270 @@
549	1054	oe.radioPanel.add(dummyButton);
550	1055	oe.buttonGroup.add(dummyButton);
551	1056	*/
	1057	+ cGridBag versionManagerPanel = new cGridBag();
	1058	+
	1059	+ versionManagerPanel.preferredHeight = 4;
	1060	+
552	1061	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
553	1062
554		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
555		- liveCB.setToolTipText("Enable animation");
556		- liveCB.addItemListener(this);
	1063	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1064	+ //minButton.setToolTipText("Minimize window");
	1065	+ //minButton.addActionListener(this);
	1066	+
	1067	+ if (Globals.ADVANCED)
	1068	+ {
	1069	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1070	+// maxButton.setToolTipText("Maximize window");
	1071	+// maxButton.addActionListener(this);
	1072	+ }
	1073	+
	1074	+ cButton gcButton;
	1075	+
	1076	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1077	+// gcButton.setToolTipText("Garbage collect");
	1078	+// gcButton.addActionListener(new ActionListener()
	1079	+// {
	1080	+// public void actionPerformed(ActionEvent e)
	1081	+// {
	1082	+// System.gc();
	1083	+// }
	1084	+// });
	1085	+
	1086	+ oe.toolbarPanel.add(fullScreenButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1087	+ fullScreenButton.setToolTipText("Full-screen window");
	1088	+ fullScreenButton.addActionListener(this);
	1089	+
	1090	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1091	+ collapseButton.setToolTipText("Collapse toolbar");
	1092	+ collapseButton.addActionListener(this);
	1093	+
	1094	+// oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1095	+// maximize3DButton.setToolTipText("Maximize 3D view");
	1096	+// maximize3DButton.addActionListener(this);
	1097	+
	1098	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1099	+ twoButton.setToolTipText("Show 3D view only");
	1100	+ twoButton.addActionListener(this);
	1101	+ this.fullscreenLayout = twoButton;
	1102	+
	1103	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1104	+ threeButton.setToolTipText("Show controls and 3D view");
	1105	+ threeButton.addActionListener(this);
	1106	+ if (Globals.ADVANCED)
	1107	+ {
	1108	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1109	+ sixButton.setToolTipText("Show 3D view and controls");
	1110	+ sixButton.addActionListener(this);
	1111	+ }
	1112	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1113	+// sevenButton.setToolTipText("3-column layout");
	1114	+// sevenButton.addActionListener(this);
	1115	+ //
	1116	+
	1117	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1118	+ screenfitButton.setToolTipText("Screen fit");
	1119	+ screenfitButton.addActionListener(this);
557	1120
558		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1121	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1122	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1123	+ restoreCameraButton.addActionListener(this);
	1124	+
	1125	+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1126	+ saveVersionButton.setToolTipText("Duplicate current version");
	1127	+ saveVersionButton.addActionListener(this);
	1128	+
	1129	+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1130	+ deleteVersionButton.setToolTipText("Delete current version");
	1131	+ deleteVersionButton.addActionListener(this);
	1132	+ deleteVersionButton.setEnabled(false);
	1133	+
	1134	+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1135	+ previousVersionButton.setToolTipText("Previous version");
	1136	+ previousVersionButton.addActionListener(this);
	1137	+ previousVersionButton.setEnabled(false);
	1138	+
	1139	+ cGridBag updown = new cGridBag().setVertical(true);
	1140	+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1141	+ restoreButton.setToolTipText("Undo (restore current version)");
	1142	+ restoreButton.addActionListener(this);
	1143	+ restoreButton.setEnabled(false);
	1144	+
	1145	+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1146	+ replaceButton.setToolTipText("Save (replace current version)");
	1147	+ replaceButton.addActionListener(this);
	1148	+ replaceButton.setEnabled(false);
	1149	+
	1150	+ versionManagerPanel.add(updown);
	1151	+
	1152	+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1153	+ nextVersionButton.setToolTipText("Next version");
	1154	+ nextVersionButton.addActionListener(this);
	1155	+ nextVersionButton.setEnabled(false);
	1156	+
	1157	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
559	1158	oneStepButton.setToolTipText("Animate one step forward");
560	1159	oneStepButton.addActionListener(this);
561	1160
562		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	1161	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1162	+ liveCB.setToolTipText("Enable animation");
	1163	+ liveCB.addItemListener(this);
	1164	+
	1165	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
563	1166	fastCB.setToolTipText("Fast mode");
564	1167	fastCB.addItemListener(this);
565	1168
566		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
567		- trackCB.setToolTipText("Enable tracking");
568		- trackCB.addItemListener(this);
569		-
570		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
571		- screenfitButton.setToolTipText("Screen fit");
572		- screenfitButton.addActionListener(this);
	1169	+ //oe.toolboxPanel.Return();
	1170	+
	1171	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1172	+// trackCB.setToolTipText("Enable tracking");
	1173	+// trackCB.addItemListener(this);
573	1174
574	1175	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
575	1176	// screenfitpointButton.addActionListener(this);
576	1177
577	1178	if (Globals.ADVANCED)
578	1179	{
579		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1180	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
580	1181	snapobjectButton.addActionListener(this);
581	1182	snapobjectButton.setToolTipText("Snap Object");
	1183	+
	1184	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1185	+ fourButton.addActionListener(this);
	1186	+ fourButton.setToolTipText("Show control panel only");
582	1187	}
583	1188
584		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
585		- flashSelectionButton.setToolTipText("Show selection");
586		- flashSelectionButton.addActionListener(this);
	1189	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
587	1190
588		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
589		-
590		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
591		- twoButton.setToolTipText("Show center view only");
592		- twoButton.addActionListener(this);
593		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
594		- fourButton.addActionListener(this);
595		- fourButton.setToolTipText("Show left panel only");
596		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
597		- sixButton.setToolTipText("2-column layout left");
598		- sixButton.addActionListener(this);
599		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
600		- threeButton.setToolTipText("2-column layout right");
601		- threeButton.addActionListener(this);
602		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
603		- sevenButton.setToolTipText("3-column layout");
604		- sevenButton.addActionListener(this);
605		- //
606	1191
607		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
608		- rootButton.setToolTipText("Edit selection in new tab");
	1192	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1193	+ rootButton.setToolTipText("Open selection in new tab");
609	1194	rootButton.addActionListener(this);
610	1195
611		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1196	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
612	1197	closeButton.setToolTipText("Close tab");
613	1198	closeButton.addActionListener(this);
614	1199	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
615	1200	//clearButton.addActionListener(this);
616		-
617		- cGridBag commandsPanel = new cGridBag();
	1201	+
	1202	+ cGridBag row1 = new cGridBag();
	1203	+ row1.preferredHeight = 8;
618	1204
619		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
620		- editButton.setToolTipText("Edit selection");
	1205	+ // INSERT
	1206	+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1207	+ gridButton.setToolTipText("Create ground");
	1208	+ gridButton.addActionListener(this);
	1209	+
	1210	+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1211	+ boxButton.setToolTipText("Create box");
	1212	+ boxButton.addActionListener(this);
	1213	+
	1214	+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1215	+ superButton.setToolTipText("Create superellipsoid");
	1216	+ superButton.addActionListener(this);
	1217	+
	1218	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1219	+ sphereButton.setToolTipText("Create sphere");
	1220	+ sphereButton.addActionListener(this);
	1221	+
	1222	+ row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1223	+ coneButton.setToolTipText("Create cone");
	1224	+ coneButton.addActionListener(this);
	1225	+
	1226	+ row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1227	+ torusButton.setToolTipText("Create torus");
	1228	+ torusButton.addActionListener(this);
	1229	+
	1230	+ if (false) //Globals.ADVANCED)
	1231	+ {
	1232	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1233	+ kleinButton.setToolTipText("Create Klein bottle");
	1234	+ kleinButton.addActionListener(this);
	1235	+ }
	1236	+
	1237	+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1238	+ particlesButton.setToolTipText("Create particle system");
	1239	+ particlesButton.addActionListener(this);
	1240	+
	1241	+ oe.toolboxPanel.add(row1);
	1242	+
	1243	+ cGridBag row2 = new cGridBag();
	1244	+ row2.preferredHeight = 8;
	1245	+
	1246	+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1247	+ groupButton.setToolTipText("Create group");
	1248	+ groupButton.addActionListener(this);
	1249	+
	1250	+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1251	+ compositeButton.setToolTipText("Create composite");
	1252	+ compositeButton.addActionListener(this);
	1253	+
	1254	+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1255	+ switchButton.setToolTipText("Create item switcher");
	1256	+ switchButton.addActionListener(this);
	1257	+
	1258	+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1259	+ loopButton.setToolTipText("Create loop");
	1260	+ loopButton.addActionListener(this);
	1261	+
	1262	+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1263	+ textureButton.setToolTipText("Create texture");
	1264	+ textureButton.addActionListener(this);
	1265	+
	1266	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1267	+ overlayButton.setToolTipText("Create overlay");
	1268	+ overlayButton.addActionListener(this);
	1269	+
	1270	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1271	+ lightButton.setToolTipText("Create light");
	1272	+ lightButton.addActionListener(this);
	1273	+
	1274	+ oe.toolboxPanel.add(row2);
	1275	+
	1276	+ cGridBag textures = new cGridBag();
	1277	+
	1278	+ CreateTexturePanel(textures);
	1279	+
	1280	+ int tabCount = resourcecontainer.getTabCount();
	1281	+
	1282	+ if (tabCount > 0)
	1283	+ resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
	1284	+
	1285	+ oe.toolboxPanel.add(textures);
	1286	+
	1287	+ textures.preferredHeight = 100;
	1288	+
	1289	+ CreateSkyboxPanel(oe.skyboxPanel);
	1290	+
	1291	+ // EDIT panel
	1292	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1293	+ editButton.setToolTipText("Pin selection controls");
621	1294	editButton.addActionListener(this);
622	1295
623		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
624		- uneditButton.setToolTipText("Unedit selection");
	1296	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1297	+ uneditButton.setToolTipText("Unpin and remove selection controls");
625	1298	uneditButton.addActionListener(this);
626	1299
627		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
628		- allParamsButton.setToolTipText("Edit all params");
	1300	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1301	+ allParamsButton.setToolTipText("Show all controls");
629	1302	allParamsButton.addActionListener(this);
630	1303
631		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
632		- clearPanelButton.setToolTipText("Clear edit panel");
	1304	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1305	+ clearPanelButton.setToolTipText("Clear all controls");
633	1306	clearPanelButton.addActionListener(this);
634	1307
635		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
636		- unselectButton.setToolTipText("Unselect");
637		- unselectButton.addActionListener(this);
	1308	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1309	+ //unselectButton.setToolTipText("Unselect");
	1310	+ //unselectButton.addActionListener(this);
638	1311
639		- commandsPanel.preferredHeight = 1;
	1312	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1313	+ flashSelectionButton.setToolTipText("Highlight selection");
	1314	+ flashSelectionButton.addActionListener(this);
640	1315
641		- oe.treePanel.add(commandsPanel);
642		- oe.treePanel.Return();
	1316	+ editCommandsPanel.preferredHeight = 1;
	1317	+
	1318	+ SetPinStates(false);
	1319	+// oe.treePanel.add(commandsPanel);
	1320	+// oe.treePanel.Return();
643	1321
644	1322	// oe.aConstraints.gridx += 1;
645	1323	// oe.aConstraints.weighty = 0;
..	..	@@ -654,34 +1332,25 @@
654	1332
655	1333	cGridBag jSPPanel = new cGridBag();
656	1334
	1335	+ jSPPanel.preferredHeight = 20;
	1336	+
657	1337	JScrollPane jSP;
658	1338	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
659		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1339	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
660	1340	ResetModel();
661	1341
662	1342	oe.treePanel.add(jSPPanel);
663	1343	oe.treePanel.Return();
664	1344
665		- cGridBag copyOptionsPanel = new cGridBag();
666		-
667		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
668		- colorCB.setToolTipText("Copy color when dropped");
669		- colorCB.addItemListener(this);
670		-
671		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
672		- materialCB.setToolTipText("Copy material when dropped");
673		- materialCB.addItemListener(this);
674		-
675		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
676		- textureCB.setToolTipText("Copy texture when dropped");
677		- textureCB.addItemListener(this);
678		-
679		- copyOptionsPanel.preferredHeight = 1;
680		- oe.treePanel.add(copyOptionsPanel);
	1345	+ oe.treePanel.add(versionManagerPanel);
681	1346	oe.treePanel.Return();
682	1347
683		-// mainPanel.setDividerLocation(0.5); //1.0);
684		-// mainPanel.setResizeWeight(0.5);
	1348	+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1349	+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
	1350	+ versionSliderPane.preferredHeight = 3;
	1351	+
	1352	+// mainPanel.setDividerLocation(0.1); //1.0);
	1353	+ mainPanel.setResizeWeight(0.4);
685	1354
686	1355	//jList.addListSelectionListener(this);
687	1356	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -689,7 +1358,7 @@
689	1358	//jTree.setEditable(true);
690	1359	oe.jTree.setDragEnabled(true);
691	1360	//jTree.setPreferredSize(new Dimension(10,10));
692		- jSP.setPreferredSize(new Dimension(100,200));
	1361	+ //jSP.setPreferredSize(new Dimension(100,200));
693	1362
694	1363	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
695	1364
..	..	@@ -701,87 +1370,159 @@
701	1370	dgr.addDragGestureListener(this);
702	1371	}catch(Exception e) {}
703	1372	*/
704		- radio.layout = sevenButton;
	1373	+ radio.layout = threeButton; // sixButton;
705	1374	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
706	1375	}
707	1376
708	1377	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
709	1378	{
	1379	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1380	+ colorCB.setToolTipText("Copy color when dropped");
	1381	+ colorCB.addItemListener(this);
	1382	+
	1383	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1384	+ materialCB.setToolTipText("Copy material when dropped");
	1385	+ materialCB.addItemListener(this);
	1386	+
	1387	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1388	+ textureCB.setToolTipText("Copy texture when dropped");
	1389	+ textureCB.addItemListener(this);
	1390	+
	1391	+ panel.Return();
	1392	+
710	1393	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
711	1394	boxCB.setToolTipText("Display bounding boxes");
712	1395	boxCB.addItemListener(this);
713	1396
714	1397	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
715		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1398	+ zoomBoxCB.setToolTipText("Display only for wheel");
716	1399	zoomBoxCB.addItemListener(this);
717	1400
718	1401	if (true) // Globals.ADVANCED)
719	1402	{
720		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
721		- supportCB.setToolTipText("Enable rigging");
722		- supportCB.addItemListener(this);
	1403	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1404	+// supportCB.setToolTipText("Enable rigging");
	1405	+// supportCB.addItemListener(this);
	1406	+
	1407	+ panel.add(freezeCB = new cCheckBox("Fast cam", Globals.FREEZEONMOVE)); //, constraints);
	1408	+ freezeCB.setToolTipText("Fast moving camera");
	1409	+ freezeCB.addItemListener(this);
723	1410
724	1411	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
725	1412	// localCB.addItemListener(this);
726	1413
	1414	+ panel.Return();
	1415	+
	1416	+ if (Globals.ADVANCED)
	1417	+ {
727	1418	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
728	1419	crowdCB.setToolTipText("Used for crowds");
729	1420	crowdCB.addItemListener(this);
	1421	+ }
730	1422
731	1423	panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
732	1424	smoothCB.setToolTipText("Snapping delay");
733	1425	smoothCB.addItemListener(this);
734	1426
735		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
736		- slowCB.setToolTipText("Smooth interpolation");
737		- slowCB.addItemListener(this);
	1427	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1428	+// slowCB.setToolTipText("Smooth interpolation");
	1429	+// slowCB.addItemListener(this);
	1430	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1431	+ minshaderCB.setToolTipText("Minimal fast shader");
	1432	+ minshaderCB.addItemListener(this);
738	1433
739		-// constraints.gridy += 1;
740	1434	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
741	1435	// speakerMocapCB.addItemListener(this);
742	1436
743	1437	if (false)
744	1438	{
745	1439	// handled in scripts
746		- //constraints.gridy += 1;
747	1440	panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
748	1441	speakerCameraCB.addItemListener(this);
749	1442
750		- //constraints.gridy += 1;
751	1443	panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
752	1444	speakerFocusCB.addItemListener(this);
753	1445
754		- //constraints.gridy += 1;
755		- panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
756		- smoothfocusCB.addItemListener(this);
	1446	+ panel.Return();
757	1447	}
758	1448
759		-//constraints.gridx += 1;
	1449	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	1450	+ smoothfocusCB.addItemListener(this);
	1451	+
	1452	+ panel.Return();
	1453	+
760	1454	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
761	1455	// debugCB.addItemListener(this);
762	1456
	1457	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1458	+ trackCB.setToolTipText("Enable tracking target");
	1459	+ trackCB.addItemListener(this);
	1460	+
763	1461	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1462	+ oeilCB.setToolTipText("Move camera when tracking");
764	1463	oeilCB.addItemListener(this);
765	1464
	1465	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1466	+ shadowCB.setToolTipText("When live compute shadows");
	1467	+ shadowCB.addItemListener(this);
	1468	+
	1469	+ panel.Return();
	1470	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1471	+ toggleTextureCB.setToolTipText("Load textures");
	1472	+ toggleTextureCB.addItemListener(this);
	1473	+
	1474	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1475	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1476	+ toggleSwitchCB.addItemListener(this);
	1477	+
	1478	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1479	+ autokeepCB.setToolTipText("On structure change");
	1480	+ autokeepCB.addItemListener(this);
	1481	+
	1482	+ panel.Return();
	1483	+ if (Globals.ADVANCED)
	1484	+ {
766	1485	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
767	1486	lookAtCB.setToolTipText("Look-at target");
768	1487	lookAtCB.addItemListener(this);
	1488	+ }
769	1489
770	1490	}
771	1491
772	1492	cGridBag fill = new cGridBag();
773		-
774	1493	fill.preferredHeight = 200;
	1494	+ cGridBag fill2 = new cGridBag();
	1495	+ fill2.preferredHeight = 200;
	1496	+ cGridBag fill3 = new cGridBag();
	1497	+ fill3.preferredHeight = 200;
775	1498
776	1499	panel.add(fill);
	1500	+ panel.add(fill2);
	1501	+ panel.add(fill3);
777	1502
778	1503	}
779	1504
780	1505	void EditObject(Object3D obj)
781	1506	{
	1507	+ //assert(obj instanceof Composite);
	1508	+
	1509	+// if (obj.versionlist == null)
	1510	+// {
	1511	+// obj.versionlist = new Object3D[100];
	1512	+// obj.versionindex = -1;
	1513	+// }
	1514	+
782	1515	cRadio radioButton = new cRadio(obj.name);
	1516	+
	1517	+ // June 2019. Patch to avoid bug with transparency.
	1518	+ radioButton.hadMaterial = obj.material != null;
	1519	+ if (!radioButton.hadMaterial)
	1520	+ {
	1521	+ obj.material = new cMaterial();
	1522	+ }
	1523	+
783	1524	radioButton.SetObject(obj);
784		- radioButton.layout = sevenButton;
	1525	+ radioButton.layout = threeButton; // sixButton;
785	1526	radioButton.SetCamera(cameraView.renderCamera, false);
786	1527	radioButton.addActionListener(this);
787	1528	radioPanel.add(radioButton);
..	..	@@ -791,31 +1532,41 @@
791	1532
792	1533	void SetupViews(ObjEditor oe)
793	1534	{
	1535	+ theFrame = this;
	1536	+
794	1537	oe.SetupViews();
795	1538
	1539	+ if (Globals.DEBUG)
796	1540	System.out.println("SetupViews");
797	1541	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
798	1542	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
799	1543	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
800	1544	}
801	1545
802		- JCheckBox liveCB;
803		- JCheckBox supportCB;
804		- JCheckBox localCB;
805		- JCheckBox crowdCB;
806		- JCheckBox smoothCB;
807		- JCheckBox fastCB;
808		- JCheckBox slowCB;
809		- JCheckBox boxCB;
810		- JCheckBox zoomBoxCB;
811		- JCheckBox trackCB;
812		- JCheckBox smoothfocusCB;
	1546	+ cToggleButton liveCB;
	1547	+ cCheckBox supportCB;
	1548	+ cCheckBox localCB;
	1549	+ cCheckBox crowdCB;
	1550	+ cCheckBox smoothCB;
	1551	+ cCheckBox minshaderCB;
	1552	+
	1553	+ cToggleButton fastCB;
	1554	+ cCheckBox slowCB;
	1555	+ cCheckBox boxCB;
	1556	+ cCheckBox zoomBoxCB;
	1557	+ cCheckBox freezeCB;
	1558	+ //cToggleButton trackCB;
	1559	+ cCheckBox trackCB;
	1560	+ cCheckBox smoothfocusCB;
813	1561	// JCheckBox speakerMocapCB;
814		- JCheckBox speakerCameraCB;
815		- JCheckBox speakerFocusCB;
816		- JCheckBox debugCB;
817		- JCheckBox oeilCB;
818		- JCheckBox lookAtCB;
	1562	+ cCheckBox speakerCameraCB;
	1563	+ cCheckBox speakerFocusCB;
	1564	+ cCheckBox debugCB;
	1565	+
	1566	+ cCheckBox oeilCB;
	1567	+ cCheckBox shadowCB;
	1568	+ cCheckBox autokeepCB;
	1569	+ cCheckBox lookAtCB;
819	1570
820	1571	// static int COLOR = 1;
821	1572	// static int MATERIAL = 2;
..	..	@@ -823,9 +1574,9 @@
823	1574
824	1575	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
825	1576
826		- JCheckBox colorCB;
827		- JCheckBox materialCB;
828		- JCheckBox textureCB;
	1577	+ cCheckBox colorCB;
	1578	+ cCheckBox materialCB;
	1579	+ cCheckBox textureCB;
829	1580
830	1581	public void itemStateChanged(ItemEvent e)
831	1582	{
..	..	@@ -853,6 +1604,7 @@
853	1604	} else if(e.getSource() == liveCB)
854	1605	{
855	1606	cameraView.ToggleLive();
	1607	+ refreshContents(false);
856	1608	}
857	1609	else if(e.getSource() == supportCB)
858	1610	{
..	..	@@ -868,6 +1620,12 @@
868	1620	{
869	1621	cameraView.ToggleInertia();
870	1622	cameraView.repaint();
	1623	+ }
	1624	+ else if(e.getSource() == minshaderCB)
	1625	+ {
	1626	+ Globals.MINSHADER ^= true;
	1627	+ cameraView.programInitialized = false;
	1628	+ cameraView.repaint();
871	1629	}
872	1630	else if(e.getSource() == localCB)
873	1631	{
..	..	@@ -917,6 +1675,18 @@
917	1675	{
918	1676	cameraView.ToggleOeil();
919	1677	}
	1678	+ else if(e.getSource() == shadowCB)
	1679	+ {
	1680	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1681	+ }
	1682	+ else if(e.getSource() == freezeCB)
	1683	+ {
	1684	+ Globals.FREEZEONMOVE ^= true;
	1685	+ }
	1686	+ else if(e.getSource() == autokeepCB)
	1687	+ {
	1688	+ Globals.REPLACEONMAKE ^= true;
	1689	+ }
920	1690	else if(e.getSource() == lookAtCB)
921	1691	{
922	1692	cameraView.ToggleLookAt();
..	..	@@ -933,7 +1703,8 @@
933	1703
934	1704	/**/
935	1705	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
936		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1706	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1707	+ TreePath path = objEditor.jTree.getSelectionPath();
937	1708	if ((path == null) \|\| (path.getPathCount() <= 1)) {
938	1709	// We can't move the root node or an empty selection
939	1710	return;
..	..	@@ -996,8 +1767,6 @@
996	1767	}
997	1768	}
998	1769
999		- String string = (String) object;
1000		-
1001	1770	System.out.println("Transfer = " + object + "; drop : " + target);
1002	1771	// if( object instanceof java.io.File[])
1003	1772	// {
..	..	@@ -1005,6 +1774,8 @@
1005	1774	// objEditor.DropFile((java.io.File[]) object, true);
1006	1775	// return;
1007	1776	// }
	1777	+
	1778	+ String string = object.toString();
1008	1779
1009	1780	// File path for Mac and Windows
1010	1781	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1050,23 +1821,33 @@
1050	1821
1051	1822	assert target == objEditor.jTree;
1052	1823	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1824	+ Object3D destinationLeaf;
1053	1825	try {
1054		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1826	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1055	1827	} catch (Exception e) {
1056	1828	System.out.println("destinationPath : " + destinationPath);
1057	1829	return;
1058	1830	}
1059	1831
1060		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1832	+ for (int i=group.selection.size(); --i>=0;)
1061	1833	{
	1834	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1835	+
	1836	+ // Cannot move into itself
	1837	+ if (child == destinationLeaf)
	1838	+ return;
	1839	+ }
	1840	+
	1841	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1842	+// {
1062	1843	loadClipboard(true);
1063	1844	objEditor.jTree.setSelectionPath(destinationPath);
1064	1845	pasteInto(false, false);
1065		- } else {
1066		- loadClipboard(false);
1067		- objEditor.jTree.setSelectionPath(destinationPath);
1068		- pasteInto(false, false); // true); // ???
1069		- }
	1846	+// } else {
	1847	+// loadClipboard(false);
	1848	+// objEditor.jTree.setSelectionPath(destinationPath);
	1849	+// pasteInto(false, false); // true); // ???
	1850	+// }
1070	1851	}
1071	1852	public void dropActionChanged(DropTargetDragEvent dtde)
1072	1853	// Called if the user has modified the current drop gesture
..	..	@@ -1122,7 +1903,12 @@
1122	1903	TreePath path;
1123	1904
1124	1905	public TransferableTreePath(TreePath tp) {
1125		- path = tp;
	1906	+ Object[] objs = new Object[tp.getPathCount()];
	1907	+ for (int i=0; i<objs.length; i++)
	1908	+ {
	1909	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1910	+ }
	1911	+ path = new TreePath(objs);
1126	1912	}
1127	1913
1128	1914	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1171,22 +1957,30 @@
1171	1957	{
1172	1958	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1173	1959	//heightFieldItem.addActionListener(this);
1174		- gridItem = menu.add(new MenuItem("Grid"));
1175		- gridItem.addActionListener(this);
1176		- rectoidItem = menu.add(new MenuItem("Box"));
1177		- rectoidItem.addActionListener(this);
1178		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1179		- ellipsoidItem.addActionListener(this);
1180		- coneItem = menu.add(new MenuItem("Cone"));
1181		- coneItem.addActionListener(this);
1182		- torusItem = menu.add(new MenuItem("Torus"));
1183		- torusItem.addActionListener(this);
1184		- superItem = menu.add(new MenuItem("Superellipsoid"));
1185		- superItem.addActionListener(this);
	1960	+// gridItem = menu.add(new MenuItem("Grid"));
	1961	+// gridItem.addActionListener(this);
	1962	+// rectoidItem = menu.add(new MenuItem("Box"));
	1963	+// rectoidItem.addActionListener(this);
	1964	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1965	+// ellipsoidItem.addActionListener(this);
	1966	+// coneItem = menu.add(new MenuItem("Cone"));
	1967	+// coneItem.addActionListener(this);
	1968	+// torusItem = menu.add(new MenuItem("Torus"));
	1969	+// torusItem.addActionListener(this);
	1970	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1971	+// superItem.addActionListener(this);
	1972	+
	1973	+ cameraItem = menu.add(new MenuItem("Camera"));
	1974	+ cameraItem.addActionListener(this);
	1975	+
	1976	+ if (!Globals.ADVANCED)
	1977	+ {
1186	1978	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1187	1979	kleinItem.addActionListener(this);
1188		- particleItem = menu.add(new MenuItem("Particle system"));
1189		- particleItem.addActionListener(this);
	1980	+ }
	1981	+
	1982	+// particleItem = menu.add(new MenuItem("Particle system"));
	1983	+// particleItem.addActionListener(this);
1190	1984	if (Globals.ADVANCED)
1191	1985	{
1192	1986	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1212,15 +2006,15 @@
1212	2006	}
1213	2007	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1214	2008	bezierItem.addActionListener(this);
1215		- overlayItem = menu.add(new MenuItem("Overlay"));
1216		- overlayItem.addActionListener(this);
1217		- lightItem = menu.add(new MenuItem("Light"));
1218		- lightItem.addActionListener(this);
	2009	+// overlayItem = menu.add(new MenuItem("Overlay"));
	2010	+// overlayItem.addActionListener(this);
	2011	+// lightItem = menu.add(new MenuItem("Light"));
	2012	+// lightItem.addActionListener(this);
1219	2013	menu.add("-");
1220	2014	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1221	2015	//superLoopItem.addActionListener(this);
1222		- loopItem = menu.add(new MenuItem("Loop"));
1223		- loopItem.addActionListener(this);
	2016	+// loopItem = menu.add(new MenuItem("Loop"));
	2017	+// loopItem.addActionListener(this);
1224	2018	doubleItem = menu.add(new MenuItem("Fork"));
1225	2019	doubleItem.addActionListener(this);
1226	2020	if (Globals.ADVANCED)
..	..	@@ -1236,6 +2030,9 @@
1236	2030	animationItem.addItemListener(this);
1237	2031	animationItem.setState(Globals.ANIMATION);
1238	2032
	2033	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	2034	+ archiveItem.addActionListener(this);
	2035	+
1239	2036	menu.add("-");
1240	2037	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1241	2038	parseverticesItem.addActionListener(this);
..	..	@@ -1248,6 +2045,8 @@
1248	2045	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1249	2046	reduce34MorphItem.addActionListener(this);
1250	2047	menu.add("-");
	2048	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	2049	+ memoryItem.addActionListener(this);
1251	2050	menu.add(computeAOItem = new MenuItem("Compute AO"));
1252	2051	computeAOItem.addActionListener(this);
1253	2052
..	..	@@ -1256,11 +2055,9 @@
1256	2055	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1257	2056	mirrorItem.addActionListener(this);
1258	2057	menu.add("-");
1259		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1260		- memoryItem.addActionListener(this);
1261	2058	menu.add(analyzeItem = new MenuItem("Analyze"));
1262	2059	analyzeItem.addActionListener(this);
1263		- menu.add(dumpItem = new MenuItem("Dump"));
	2060	+ menu.add(dumpItem = new MenuItem("Print"));
1264	2061	dumpItem.addActionListener(this);
1265	2062	// menu.add(pathItem = new MenuItem("From-to path"));
1266	2063	// pathItem.addActionListener(this);
..	..	@@ -1292,7 +2089,7 @@
1292	2089	Object3D obj = (Object3D)group.selection.elementAt(0);
1293	2090	objEditor.ScreenFit(obj, false);
1294	2091
1295		- cameraView.pingthread.StepToTarget(true);
	2092	+ cameraView.pingthread.StepToTarget(); //true);
1296	2093	refreshContents();
1297	2094	}
1298	2095
..	..	@@ -1329,7 +2126,7 @@
1329	2126	obj.parent.TransformToWorld(maxima); //, maxima);
1330	2127	}
1331	2128
1332		- Object3D shadow = new Object3D("Shadow " + obj.name);
	2129	+ Object3D shadow = new Object3D("Shadow" + obj.name);
1333	2130
1334	2131	shadow.toParent = LA.newMatrix();
1335	2132	shadow.fromParent = LA.newMatrix();
..	..	@@ -1343,24 +2140,24 @@
1343	2140	switch(axis)
1344	2141	{
1345	2142	case 0 :
1346		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1347		- vert2.x = minima.x; vert2.y = maxima.y; vert2.z = minima.z;
1348		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1349		- vert4.x = minima.x; vert4.y = maxima.y; vert4.z = maxima.z;
	2143	+ vert1.x = minima.x + 0.001f; vert1.y = minima.y; vert1.z = minima.z;
	2144	+ vert2.x = minima.x + 0.001f; vert2.y = maxima.y; vert2.z = minima.z;
	2145	+ vert3.x = minima.x + 0.001f; vert3.y = minima.y; vert3.z = maxima.z;
	2146	+ vert4.x = minima.x + 0.001f; vert4.y = maxima.y; vert4.z = maxima.z;
1350	2147	norm = cVector.X;
1351	2148	break;
1352	2149	case 1 :
1353		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1354		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1355		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1356		- vert4.x = maxima.x; vert4.y = minima.y; vert4.z = maxima.z;
	2150	+ vert1.x = minima.x; vert1.y = minima.y + 0.001f; vert1.z = minima.z;
	2151	+ vert2.x = maxima.x; vert2.y = minima.y + 0.001f; vert2.z = minima.z;
	2152	+ vert3.x = minima.x; vert3.y = minima.y + 0.001f; vert3.z = maxima.z;
	2153	+ vert4.x = maxima.x; vert4.y = minima.y + 0.001f; vert4.z = maxima.z;
1357	2154	norm = cVector.Y;
1358	2155	break;
1359	2156	case 2 :
1360		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1361		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1362		- vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z;
1363		- vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z;
	2157	+ vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z + 0.001f;
	2158	+ vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z + 0.001f;
	2159	+ vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z + 0.001f;
	2160	+ vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z + 0.001f;
1364	2161	norm = cVector.Z;
1365	2162	break;
1366	2163	}
..	..	@@ -1401,9 +2198,38 @@
1401	2198	shadow.material = new cMaterial(obj.material);
1402	2199	shadow.material.diffuse = 0.0001f;
1403	2200	shadow.material.specular = 0.0001f;
	2201	+ shadow.material.opacity = 0.75f;
	2202	+
	2203	+ AllocProjectedVertices(shadow);
	2204	+
	2205	+ shadow.projectedVertices[1].x = 300;
1404	2206
1405	2207	makeSomething(shadow);
1406	2208	}
	2209	+
	2210	+ private void ClearUnpinned()
	2211	+ {
	2212	+ //for (Object3D obj : listUI)
	2213	+ for (int i=listUI.size(); --i>=0;)
	2214	+ {
	2215	+ Object3D obj = listUI.elementAt(i);
	2216	+ if (!obj.pinned)
	2217	+ {
	2218	+ obj.CloseUI();
	2219	+ listUI.remove(i);
	2220	+ }
	2221	+ }
	2222	+ }
	2223	+
	2224	+ private void EditElement(Object3D elem, boolean newWindow)
	2225	+ {
	2226	+ // if (!(elem instanceof Composite))
	2227	+ // newWindow = false;
	2228	+ listUI.add(elem);
	2229	+ elem.openEditWindow(this, newWindow); //, false);
	2230	+ System.out.println("edit : " + elem);
	2231	+ elem.editWindow.refreshContents(true); // ? new
	2232	+ }
1407	2233
1408	2234	/**
1409	2235	* applyExample
..	..	@@ -1648,7 +2474,7 @@
1648	2474	{
1649	2475	ScreenFit();
1650	2476	} else
1651		- if (source == switchItem)
	2477	+ if (source == switchViewItem)
1652	2478	{
1653	2479	cVector v1 = new cVector();
1654	2480	cVector v2 = new cVector();
..	..	@@ -1657,11 +2483,11 @@
1657	2483	objEditor.cameraView.renderCamera.setAim(v2, v1);
1658	2484	objEditor.cameraView.repaint();
1659	2485	} else
1660		- if (source == rectoidItem)
	2486	+ if (source == rectoidItem \|\| source == boxButton)
1661	2487	{
1662	2488	makeSomething(new Box());
1663	2489	} else
1664		- if (source == particleItem)
	2490	+ if (source == particleItem \|\| source == particlesButton)
1665	2491	{
1666	2492	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1667	2493	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1740,27 +2566,27 @@
1740	2566
1741	2567	makeSomething(obj);
1742	2568	} else
1743		- if (source == gridItem)
	2569	+ if (source == gridItem \|\| source == gridButton)
1744	2570	{
1745	2571	makeSomething(new Grid());
1746	2572	} else
1747		- if (source == ellipsoidItem)
	2573	+ if (source == ellipsoidItem \|\| source == sphereButton)
1748	2574	{
1749	2575	makeSomething(new Sphere());
1750	2576	} else
1751		- if (source == coneItem)
	2577	+ if (source == coneItem \|\| source == coneButton)
1752	2578	{
1753	2579	makeSomething(new Cone());
1754	2580	} else
1755		- if (source == torusItem)
	2581	+ if (source == torusItem \|\| source == torusButton)
1756	2582	{
1757	2583	makeSomething(new Torus());
1758	2584	} else
1759		- if (source == superItem)
	2585	+ if (source == superItem \|\| source == superButton)
1760	2586	{
1761	2587	makeSomething(new Superellipsoid());
1762	2588	} else
1763		- if (source == kleinItem)
	2589	+ if (source == kleinItem \|\| source == kleinButton)
1764	2590	{
1765	2591	makeSomething(new Klein());
1766	2592	} else
..	..	@@ -1780,7 +2606,7 @@
1780	2606	{
1781	2607	makeSomething(new BezierSurface());
1782	2608	} else
1783		- if (source == overlayItem)
	2609	+ if (source == overlayItem \|\| source == overlayButton)
1784	2610	{
1785	2611	/*
1786	2612	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1828,10 +2654,27 @@
1828	2654	s.setup();
1829	2655	makeSomething(s);
1830	2656	} else
1831		- if (source == lightItem)
	2657	+ if (source == lightItem \|\| source == lightButton)
1832	2658	{
1833	2659	makeSomething(new Light());
1834	2660	} else
	2661	+// if (source == skybox1Button \|\|
	2662	+// source == skybox2Button \|\|
	2663	+// source == skybox3Button \|\|
	2664	+// source == skybox4Button \|\|
	2665	+// source == skybox5Button \|\|
	2666	+// source == skybox6Button \|\|
	2667	+// source == skybox7Button \|\|
	2668	+// source == skybox11Button \|\|
	2669	+// source == skybox12Button \|\|
	2670	+// source == skybox13Button \|\|
	2671	+// source == skybox14Button \|\|
	2672	+// source == skybox15Button \|\|
	2673	+// source == skybox16Button \|\|
	2674	+// source == skybox17Button)
	2675	+// {
	2676	+// ChangeSkybox(source);
	2677	+// } else
1835	2678	if (source == csgItem)
1836	2679	{
1837	2680	group(new CSG());
..	..	@@ -1878,30 +2721,38 @@
1878	2721
1879	2722	group(g);
1880	2723	} else
1881		- if (source == loopItem)
	2724	+ if (source == loopItem \|\| source == loopButton)
1882	2725	{
	2726	+ if (!group.selection.isEmpty())
	2727	+ {
1883	2728	Composite csg = new GroupLeaf();
1884		- csg.count = 5;
1885	2729	group(csg);
1886		- Composite child = new cGroup();
	2730	+ csg.count = 5;
	2731	+ Composite child = new cGroup("Branch");
1887	2732	csg.addChild(child);
1888	2733	child.addChild(csg);
	2734	+ }
1889	2735	} else
1890	2736	if (source == doubleItem)
1891	2737	{
1892		- Composite csg = new GroupLeaf();
1893		- csg.count = 5;
	2738	+ if (!group.selection.isEmpty())
	2739	+ {
	2740	+ Composite csg = new GroupLeaf("Fork");
1894	2741	group(csg);
1895		- Composite child = new cGroup();
	2742	+ csg.count = 5;
	2743	+ Composite child = new cGroup("Branch A");
1896	2744	csg.addChild(child);
1897	2745	child.addChild(csg);
1898		- child = new cGroup();
	2746	+ child = new cGroup("Branch B");
1899	2747	csg.addChild(child);
1900	2748	child.addChild(csg);
	2749	+ }
1901	2750	} else
1902	2751	if (source == tripleItem)
1903	2752	{
1904		- Composite csg = new GroupLeaf();
	2753	+ if (!group.selection.isEmpty())
	2754	+ {
	2755	+ Composite csg = new GroupLeaf("Trident");
1905	2756	csg.count = 4;
1906	2757	group(csg);
1907	2758	Composite child = new cGroup();
..	..	@@ -1913,11 +2764,12 @@
1913	2764	child = new cGroup();
1914	2765	csg.addChild(child);
1915	2766	child.addChild(csg);
	2767	+ }
1916	2768	} else
1917	2769	if (source == computeAOItem)
1918	2770	{
1919	2771	Globals.drawMode = CameraPane.OCCLUSION;
1920		- Globals.theRenderer.repaint();
	2772	+ cameraView.repaint();
1921	2773	} else
1922	2774	if (source == recompileItem)
1923	2775	{
..	..	@@ -1932,7 +2784,7 @@
1932	2784	if (source == invariantsItem)
1933	2785	{
1934	2786	System.out.println("Invariants:");
1935		- Grafreed.grafreeD.universe.invariants();
	2787	+ Grafreed.grafreed.universe.invariants();
1936	2788	} else
1937	2789	if (source == memoryItem)
1938	2790	{
..	..	@@ -1951,6 +2803,65 @@
1951	2803	{
1952	2804	DumpObject();
1953	2805	} else
	2806	+ if (source == minButton)
	2807	+ {
	2808	+ Minimize();
	2809	+ } else
	2810	+ if (source == maxButton)
	2811	+ {
	2812	+ Maximize();
	2813	+ } else
	2814	+ if (source == fullScreenButton)
	2815	+ {
	2816	+ ToggleFullScreen();
	2817	+ } else
	2818	+ if (source == collapseButton)
	2819	+ {
	2820	+ this.expandedLayout = radio.layout;
	2821	+ CollapseToolbar();
	2822	+ } else
	2823	+// if (source == maximize3DButton)
	2824	+// {
	2825	+// this.expandedLayout = radio.layout;
	2826	+// radio.layout = twoButton;
	2827	+// CollapseToolbar();
	2828	+// Show3DView();
	2829	+// } else
	2830	+ if (source == previousVersionButton)
	2831	+ {
	2832	+ // Go to previous version
	2833	+ //if (!Undo())
	2834	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2835	+ PreviousVersion();
	2836	+ } else
	2837	+ if (source == restoreButton)
	2838	+ {
	2839	+ // Restore current version
	2840	+ Restore();
	2841	+ //restoreButton.setEnabled(false);
	2842	+ } else
	2843	+ if (source == replaceButton)
	2844	+ {
	2845	+ // Overwrite current version
	2846	+ Replace();
	2847	+ //replaceButton.setEnabled(false);
	2848	+ } else
	2849	+ if (source == nextVersionButton)
	2850	+ {
	2851	+ // Go to next version
	2852	+ NextVersion();
	2853	+ } else
	2854	+ if (source == saveVersionButton)
	2855	+ {
	2856	+ // Save a new version
	2857	+ if (!DuplicateVersion()) //true))
	2858	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2859	+ } else
	2860	+ if (source == deleteVersionButton)
	2861	+ {
	2862	+ // Delete a new version
	2863	+ DeleteVersion();
	2864	+ } else
1954	2865	if (source == oneStepButton)
1955	2866	{
1956	2867	Globals.ONESTEP = true;
..	..	@@ -1958,17 +2869,14 @@
1958	2869	} else
1959	2870	if (source == screenfitButton)
1960	2871	{
1961		- //Reload(lastConverter, lastFilename, true);
1962	2872	ScreenFit();
1963	2873	} else
1964	2874	if (source == screenfitpointButton)
1965	2875	{
1966		- //Reload(lastConverter, lastFilename, true);
1967	2876	ScreenFitPoint();
1968	2877	} else
1969	2878	if (source == snapobjectButton)
1970	2879	{
1971		- //Reload(lastConverter, lastFilename, true);
1972	2880	SnapObject();
1973	2881	} else
1974	2882	// if (event.getSource() == recompileButton)
..	..	@@ -2004,6 +2912,14 @@
2004	2912	if (source == cutItem \|\| source == clearButton)
2005	2913	{
2006	2914	loadClipboard(true);
	2915	+ } else
	2916	+ if (source == undoItem)
	2917	+ {
	2918	+ PreviousVersion();
	2919	+ } else
	2920	+ if (source == redoItem)
	2921	+ {
	2922	+ NextVersion();
2007	2923	} else
2008	2924	if (source == duplicateItem)
2009	2925	{
..	..	@@ -2324,7 +3240,7 @@
2324	3240	{
2325	3241	StepAll();
2326	3242	} else
2327		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3243	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2328	3244	{
2329	3245	//int indices[] = jList.getSelectedIndices();
2330	3246	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2336,9 +3252,9 @@
2336	3252	{
2337	3253	ClearSelection(true);
2338	3254	} else
2339		- if (source == grabItem)
	3255	+ if (source == grabItem \|\| source == groupButton)
2340	3256	{
2341		- group(new cGroup(), true);
	3257	+ group(new cGroup(), false); // true);
2342	3258	} else
2343	3259	if (source == hideItem)
2344	3260	{
..	..	@@ -2356,11 +3272,11 @@
2356	3272	{
2357	3273	makeSomething(new Camera());
2358	3274	} else
2359		- if (source == compositeItem)
	3275	+ if (source == compositeItem \|\| source == compositeButton)
2360	3276	{
2361	3277	group(new Composite());
2362	3278	} else
2363		- if (source == randomItem)
	3279	+ if (source == switchItem \|\| source == switchButton)
2364	3280	{
2365	3281	RandomNode random = new RandomNode();
2366	3282	group(random);
..	..	@@ -2462,7 +3378,7 @@
2462	3378	{
2463	3379	group(new cLinker());
2464	3380	} else
2465		- if (source == textureItem)
	3381	+ if (source == textureItem \|\| source == textureButton)
2466	3382	{
2467	3383	group(new TextureNode());
2468	3384	} else
..	..	@@ -2482,17 +3398,42 @@
2482	3398	{
2483	3399	CastShadow(2);
2484	3400	} else
2485		- if (source == ungroupItem)
	3401	+ if (source == ungroupItem \|\| source == ungroupButton)
2486	3402	{
2487		- //ungroup();
	3403	+ boolean canUngroup = true;
	3404	+
2488	3405	for (int i=0; i<group.selection.size(); i++)
2489	3406	{
2490		- Ungroup(group.selection.get(i));
	3407	+ Object3D selectedItem = group.selection.get(i);
	3408	+
	3409	+ if (selectedItem.Size() == 0)
	3410	+ {
	3411	+ // Cannot ungroup leaves
	3412	+ canUngroup = false;
	3413	+ break;
	3414	+ }
	3415	+
	3416	+ if (selectedItem == group)
	3417	+ {
	3418	+ // Cannot ungroup root
	3419	+ canUngroup = false;
	3420	+ break;
	3421	+ }
2491	3422	}
2492	3423
2493		- ClearSelection(false);
2494		-
2495		- refreshContents();
	3424	+ if (canUngroup)
	3425	+ {
	3426	+ for (int i=0; i<group.selection.size(); i++)
	3427	+ {
	3428	+ Object3D selectedItem = group.selection.get(i);
	3429	+
	3430	+ Ungroup(selectedItem);
	3431	+ }
	3432	+
	3433	+ ClearSelection(false);
	3434	+
	3435	+ refreshContents();
	3436	+ }
2496	3437	} else
2497	3438	if (source == genUVItem)
2498	3439	{
..	..	@@ -2504,7 +3445,7 @@
2504	3445	} else
2505	3446	if (source == genNormalsMESHItem)
2506	3447	{
2507		- GenNormals(true); // TODO
	3448	+ GenNormalsMESH();
2508	3449	} else
2509	3450	if (source == genNormalsORGANItem)
2510	3451	{
..	..	@@ -2538,6 +3479,10 @@
2538	3479	{
2539	3480	ClearMaterials();
2540	3481	} else
	3482	+ if (source == clearVersionsItem)
	3483	+ {
	3484	+ ClearVersions();
	3485	+ } else
2541	3486	if (source == liveleavesItem)
2542	3487	{
2543	3488	LiveLeaves(true);
..	..	@@ -2569,6 +3514,22 @@
2569	3514	if (source == unmarkleavesItem)
2570	3515	{
2571	3516	MarkLeaves(false);
	3517	+ } else
	3518	+ if (source == rewindleavesItem)
	3519	+ {
	3520	+ RewindLeaves(true);
	3521	+ } else
	3522	+ if (source == unrewindleavesItem)
	3523	+ {
	3524	+ RewindLeaves(false);
	3525	+ } else
	3526	+ if (source == randomleavesItem)
	3527	+ {
	3528	+ RandomLeaves(true);
	3529	+ } else
	3530	+ if (source == unrandomleavesItem)
	3531	+ {
	3532	+ RandomLeaves(false);
2572	3533	} else
2573	3534	if (source == flipVItem)
2574	3535	{
..	..	@@ -2661,6 +3622,18 @@
2661	3622	if (source == transformChildrenItem)
2662	3623	{
2663	3624	TransformChildren();
	3625	+ } else
	3626	+ if (source == textureRatioRItem)
	3627	+ {
	3628	+ TextureRatio(0);
	3629	+ } else
	3630	+ if (source == textureRatioGItem)
	3631	+ {
	3632	+ TextureRatio(1);
	3633	+ } else
	3634	+ if (source == textureRatioBItem)
	3635	+ {
	3636	+ TextureRatio(2);
2664	3637	} else
2665	3638	if (source == resetTransformItem)
2666	3639	{
..	..	@@ -2777,7 +3750,7 @@
2777	3750	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2778	3751	{
2779	3752	obj = (Object3D)e.nextElement();
2780		- obj.SetBumpTexture(null);
	3753	+ obj.ResetBumpTexture();
2781	3754	}
2782	3755
2783	3756	refreshContents();
..	..	@@ -2793,6 +3766,31 @@
2793	3766
2794	3767	refreshContents();
2795	3768	} else
	3769	+ if (source == embedTexturesItem)
	3770	+ {
	3771	+ Object3D obj;
	3772	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3773	+ {
	3774	+ obj = (Object3D)e.nextElement();
	3775	+ obj.EmbedTextures(true);
	3776	+ }
	3777	+
	3778	+ refreshContents();
	3779	+ } else
	3780	+ if (source == deEmbedTexturesItem)
	3781	+ {
	3782	+ Object3D obj;
	3783	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3784	+ {
	3785	+ obj = (Object3D)e.nextElement();
	3786	+ obj.EmbedTextures(false);
	3787	+ }
	3788	+
	3789	+ CameraPane.texturepigment.clear();
	3790	+ CameraPane.texturebump.clear();
	3791	+
	3792	+ refreshContents();
	3793	+ } else
2796	3794	if (source == flashSelectionButton)
2797	3795	{
2798	3796	CameraPane.flash = true;
..	..	@@ -2804,42 +3802,36 @@
2804	3802	if (source == twoButton)
2805	3803	{
2806	3804	radio.layout = twoButton;
2807		- // bug
2808		- //gridPanel.setDividerLocation(1.0);
2809		- //bigPanel.setDividerLocation(0.0);
2810		-// bigThree.remove(scenePanel);
2811		-// bigThree.remove(centralPanel);
2812		-// bigThree.remove(XYZPanel);
2813		-// aWindowConstraints.gridx = 0;
2814		-// aWindowConstraints.gridy = 0;
2815		-// aWindowConstraints.gridwidth = 1;
2816		-// // aConstraints.gridheight = 3;
2817		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2818		-// aWindowConstraints.weightx = 0;
2819		-// aWindowConstraints.weighty = 1;
2820		-// //bigThree.add(jtp, aWindowConstraints);
2821		-// aWindowConstraints.weightx = 1;
2822		-// aWindowConstraints.gridwidth = 3;
2823		-// // aConstraints.gridheight = 3;
2824		-// aWindowConstraints.gridx = 1;
2825		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
2826		-// bigThree.add(centralPanel, aWindowConstraints);
2827		-// aWindowConstraints.weightx = 0;
2828		-// aWindowConstraints.gridx = 4;
2829		-// aWindowConstraints.gridwidth = 1;
2830		-// // aConstraints.gridheight = 3;
2831		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2832		-// //bigThree.add(XYZPanel, aWindowConstraints);
2833		-// scenePanel.setVisible(false);
2834		-// centralPanel.setVisible(true);
2835		-// XYZPanel.setVisible(false);
2836		- bigThree.ClearUI();
2837		- bigThree.add(centralPanel);
2838		- bigThree.FlushUI();
	3805	+
	3806	+ if (CameraPane.FULLSCREEN)
	3807	+ fullscreenLayout = radio.layout;
	3808	+
	3809	+ Show3DView();
	3810	+
	3811	+ cameraView.requestFocusInWindow();
	3812	+
	3813	+// refreshContents(true);
	3814	+//
	3815	+// try
	3816	+// {
	3817	+// java.awt.Robot bot = new java.awt.Robot();
	3818	+// int mask = InputEvent.BUTTON1_MASK;
	3819	+// bot.mouseMove(100, 100);
	3820	+// bot.mousePress(mask);
	3821	+// bot.mouseRelease(mask);
	3822	+// }
	3823	+// catch (Exception e)
	3824	+// {
	3825	+//
	3826	+// }
	3827	+
2839	3828	} else
2840	3829	if (source == threeButton)
2841	3830	{
2842	3831	radio.layout = threeButton;
	3832	+
	3833	+ if (CameraPane.FULLSCREEN)
	3834	+ fullscreenLayout = radio.layout;
2843	3835
2844	3836	// bigThree.remove(scenePanel);
2845	3837	// bigThree.remove(centralPanel);
..	..	@@ -2869,13 +3861,18 @@
2869	3861	// centralPanel.setVisible(true);
2870	3862	// XYZPanel.setVisible(true);
2871	3863	bigThree.ClearUI();
	3864	+ bigThree.add(scenePanel);
2872	3865	bigThree.add(centralPanel);
2873		- bigThree.add(XYZPanel);
2874	3866	bigThree.FlushUI();
	3867	+
	3868	+ cameraView.requestFocusInWindow();
2875	3869	} else
2876	3870	if (source == fourButton)
2877	3871	{
2878	3872	radio.layout = fourButton;
	3873	+
	3874	+ if (CameraPane.FULLSCREEN)
	3875	+ fullscreenLayout = radio.layout;
2879	3876
2880	3877	// bigThree.remove(scenePanel);
2881	3878	// bigThree.remove(centralPanel);
..	..	@@ -2907,10 +3904,15 @@
2907	3904	bigThree.ClearUI();
2908	3905	bigThree.add(scenePanel);
2909	3906	bigThree.FlushUI();
	3907	+
	3908	+ cameraView.requestFocusInWindow();
2910	3909	} else
2911	3910	if (source == sixButton)
2912	3911	{
2913	3912	radio.layout = sixButton;
	3913	+
	3914	+ if (CameraPane.FULLSCREEN)
	3915	+ fullscreenLayout = radio.layout;
2914	3916
2915	3917	// bigThree.remove(scenePanel);
2916	3918	// bigThree.remove(centralPanel);
..	..	@@ -2940,13 +3942,18 @@
2940	3942	// centralPanel.setVisible(true);
2941	3943	// XYZPanel.setVisible(false);
2942	3944	bigThree.ClearUI();
2943		- bigThree.add(scenePanel);
2944	3945	bigThree.add(centralPanel);
	3946	+ bigThree.add(scenePanel);
2945	3947	bigThree.FlushUI();
	3948	+
	3949	+ cameraView.requestFocusInWindow();
2946	3950	} else
2947	3951	if (source == sevenButton)
2948	3952	{
2949	3953	radio.layout = sevenButton;
	3954	+
	3955	+ if (CameraPane.FULLSCREEN)
	3956	+ fullscreenLayout = radio.layout;
2950	3957
2951	3958	// bigThree.remove(scenePanel);
2952	3959	// bigThree.remove(centralPanel);
..	..	@@ -2980,9 +3987,12 @@
2980	3987	bigThree.add(centralPanel);
2981	3988	bigThree.add(XYZPanel);
2982	3989	bigThree.FlushUI();
	3990	+
	3991	+ cameraView.requestFocusInWindow();
2983	3992	} else
2984	3993	if (source == rootButton)
2985	3994	{
	3995	+ Replace();
2986	3996	Object3D obj;
2987	3997	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2988	3998	{
..	..	@@ -2991,31 +4001,50 @@
2991	4001	EditObject(obj);
2992	4002	}
2993	4003
	4004	+ cameraView.requestFocusInWindow();
2994	4005	refreshContents(true);
2995	4006	} else
2996	4007	if (source == closeButton)
2997	4008	{
2998	4009	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	4010	+ if (copy.versionlist != null)
	4011	+ Replace();
	4012	+
2999	4013	cRadio ab;
3000	4014	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3001	4015	{
3002	4016	ab = (cRadio)e.nextElement();
3003		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	4017	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3004	4018	{
	4019	+ // Patch to avoid bug with transparency.
	4020	+ if (!ab.hadMaterial)
	4021	+ {
	4022	+ ab.object.material = null;
	4023	+ }
	4024	+
3005	4025	buttonGroup.remove(ab);
3006	4026	radioPanel.remove(ab);
3007	4027
3008		- ab.GetObject().editWindow = null;
	4028	+ //ab.GetObject().editWindow = null;
	4029	+ ab.GetObject().manipWindow = null;
3009	4030	// ab.GetObject().objectUI = null; // ?????????
3010	4031
3011	4032	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
3012	4033	break;
3013	4034	}
3014	4035	}
	4036	+
	4037	+ cameraView.requestFocusInWindow();
3015	4038	refreshContents(true);
3016	4039	} else
3017	4040	if (source == editItem \|\| source == editButton)
3018	4041	{
	4042	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4043	+ {
	4044	+ Object3D child = (Object3D)e.nextElement();
	4045	+ child.pinned = true;
	4046	+ }
	4047	+
3019	4048	EditSelection(false);
3020	4049	} else
3021	4050	if (source == uneditButton)
..	..	@@ -3024,11 +4053,12 @@
3024	4053	{
3025	4054	Object3D child = (Object3D)e.nextElement();
3026	4055	if(child.editWindow != null)
3027		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4056	+ child.pinned = false;
3028	4057	child.CloseUI();
3029	4058	listUI.remove(child);
	4059	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3030	4060
3031		- child.editWindow = null; // ???????????
	4061	+ //child.editWindow = null; // ???????????
3032	4062	}
3033	4063	objEditor.ctrlPanel.FlushUI();
3034	4064	//objEditor.jTree.clearSelection();
..	..	@@ -3041,16 +4071,18 @@
3041	4071	//copy.ClearUI();
3042	4072	for (Object3D obj : listUI)
3043	4073	{
	4074	+ obj.pinned = false;
3044	4075	obj.CloseUI();
3045	4076	}
3046	4077	listUI.clear();
	4078	+ SetPinStates(group.selection.size() > 0);
3047	4079	refreshContents(true);
3048	4080	} else
3049	4081	if (source == allParamsButton)
3050	4082	{
3051	4083	assert(copy == group);
3052	4084
3053		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4085	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3054	4086
3055	4087	for (Object3D obj : listUI)
3056	4088	{
..	..	@@ -3076,6 +4108,9 @@
3076	4108	} else
3077	4109	if(source instanceof cRadio)
3078	4110	{
	4111	+ if (copy.versionlist != null)
	4112	+ Replace();
	4113	+
3079	4114	group.parent = keepparent;
3080	4115	group.attributes = 0;
3081	4116	//group.editWindow = null;
..	..	@@ -3099,6 +4134,7 @@
3099	4134	}
3100	4135
3101	4136	copy = group;
	4137	+
3102	4138	//Globals.theRenderer.object = group;
3103	4139	if(!useclient)
3104	4140	{
..	..	@@ -3115,7 +4151,9 @@
3115	4151	sideView.object = group;
3116	4152	}
3117	4153
3118		-// fix "+" issue group.editWindow = this;
	4154	+// fix "+" issue
	4155	+ //group.editWindow = this;
	4156	+ group.manipWindow = this;
3119	4157
3120	4158	/*
3121	4159	currentLayout = radio.layout;
..	..	@@ -3123,20 +4161,58 @@
3123	4161	currentLayout = sevenButton;
3124	4162	*/
3125	4163	radio.layout.doClick();
	4164	+
	4165	+ //assert(copy instanceof Composite);
	4166	+
	4167	+ if (copy.versionlist == null)
	4168	+ {
	4169	+ copy.versionindex = -1;
	4170	+
	4171	+ // Cannot work with loops
	4172	+ // To fix this issue, we first mark all nodes above the root,
	4173	+ // and check if any of these nodes are reachable below the root.
	4174	+ Grafreed.grafreed.universe.TagObjects(copy, true);
	4175	+
	4176	+ if (copy instanceof Composite && !copy.HasTags())
	4177	+ {
	4178	+ if (copy.versionlist == null)
	4179	+ copy.versionlist = new Object3D[100];
	4180	+
	4181	+ //Save(true);
	4182	+ }
	4183	+ else
	4184	+ copy.versionindex = -2;
	4185	+
	4186	+ Grafreed.grafreed.universe.TagObjects(copy, false);
	4187	+ }
	4188	+
	4189	+ SetVersionStates();
	4190	+
	4191	+ ClearUnpinned();
	4192	+
	4193	+ //Grafreed.Assert(group != null);
	4194	+ //Grafreed.Assert(group.selection != null);
	4195	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4196	+ if (group.selection == null \|\| group.selection.size() == 1)
	4197	+ EditSelection(false);
3126	4198	keepparent = group.parent;
3127	4199	// PARENT = NULL or not???
3128	4200	//group.parent = null; // ROOT
3129	4201	//group.attributes = -1;
3130	4202	ResetModel();
	4203	+
	4204	+ cameraView.requestFocusInWindow();
3131	4205	refreshContents(true);
3132	4206	} else if (event.getSource() == editCameraItem)
3133	4207	{
3134	4208	cameraView.ProtectCamera();
	4209	+ cameraView.requestFocusInWindow();
3135	4210	cameraView.repaint();
3136	4211	return;
3137		- } else if (event.getSource() == revertCameraItem)
	4212	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3138	4213	{
3139	4214	cameraView.RevertCamera();
	4215	+ cameraView.requestFocusInWindow();
3140	4216	cameraView.repaint();
3141	4217	return;
3142	4218	// } else if (event.getSource() == textureButton)
..	..	@@ -3151,7 +4227,6 @@
3151	4227	}
3152	4228
3153	4229	boolean useclient = false;
3154		- cRadio radio;
3155	4230
3156	4231	void ToggleRoot()
3157	4232	{
..	..	@@ -3226,9 +4301,46 @@
3226	4301	refreshContents();
3227	4302	}
3228	4303
	4304	+ void TextureRatio(int axis)
	4305	+ {
	4306	+ Object3D obj;
	4307	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4308	+ {
	4309	+ obj = (Object3D)e.nextElement();
	4310	+ obj.TextureRatio(axis);
	4311	+ }
	4312	+
	4313	+ refreshContents();
	4314	+ }
	4315	+
3229	4316	void ResetTransform()
3230	4317	{
3231	4318	ResetTransform(-1);
	4319	+ }
	4320	+
	4321	+ void ScaleSelection(int scale)
	4322	+ {
	4323	+ Object3D obj;
	4324	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4325	+ {
	4326	+ obj = (Object3D)e.nextElement();
	4327	+
	4328	+ if (obj.toParent == null)
	4329	+ continue;
	4330	+
	4331	+ obj.Scale(scale);
	4332	+
	4333	+ if (obj.parent == null)
	4334	+ {
	4335	+ System.out.println("NULL PARENT!");
	4336	+ // new Exception().printStackTrace();
	4337	+ }
	4338	+ else
	4339	+ TouchTransform(obj);
	4340	+ //obj.parent.Touch();
	4341	+ }
	4342	+
	4343	+ refreshContents();
3232	4344	}
3233	4345
3234	4346	void ResetTransform(int mask)
..	..	@@ -3241,42 +4353,8 @@
3241	4353	if (obj.toParent == null)
3242	4354	continue;
3243	4355
3244		- if (mask == -1)
3245		- {
3246		- if (obj instanceof Camera) // jan 2014
3247		- {
3248		- LA.matIdentity(obj.toParent);
3249		- LA.matIdentity(obj.fromParent);
3250		- }
3251		- else
3252		- {
3253		- obj.toParent = null; // jan 2014 LA.matIdentity(obj.toParent);
3254		- obj.fromParent = null; // LA.matIdentity(obj.fromParent);
3255		- }
3256		- TouchTransform(obj);
3257		- continue;
3258		- }
3259		- if ((mask&2) != 0) // Scale
3260		- {
3261		- obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
3262		- obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
3263		- obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
3264		- obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
3265		- obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
3266		- obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
3267		- }
3268		- if ((mask&4) != 0) // Rotation
3269		- {
3270		- // ?
3271		- }
3272		- if ((mask&1) != 0) // Translation
3273		- {
3274		- if (obj.toParent != null)
3275		- {
3276		- obj.toParent[3][0] = obj.toParent[3][1] = obj.toParent[3][2] = 0;
3277		- obj.fromParent[3][0] = obj.fromParent[3][1] = obj.fromParent[3][2] = 0;
3278		- }
3279		- }
	4356	+ obj.ResetTransform(mask);
	4357	+
3280	4358	if (obj.parent == null)
3281	4359	{
3282	4360	System.out.println("NULL PARENT!");
..	..	@@ -3390,7 +4468,8 @@
3390	4468
3391	4469	int size = obj.MemorySize();
3392	4470
3393		- System.err.println((size/1024) + " KB is the size of " + obj);
	4471	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4472	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3394	4473	}
3395	4474	}
3396	4475	catch (Exception e)
..	..	@@ -3471,6 +4550,13 @@
3471	4550	void GenNormals(boolean crease)
3472	4551	{
3473	4552	group.GenNormalsS(crease);
	4553	+
	4554	+ refreshContents();
	4555	+ }
	4556	+
	4557	+ void GenNormalsMESH()
	4558	+ {
	4559	+ group.GenNormalsMeshS();
3474	4560
3475	4561	refreshContents();
3476	4562	}
..	..	@@ -3706,7 +4792,7 @@
3706	4792
3707	4793	try
3708	4794	{
3709		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4795	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
3710	4796	}
3711	4797	catch (Exception e)
3712	4798	{
..	..	@@ -3777,10 +4863,17 @@
3777	4863	{
3778	4864	Object3D obj = group.selection.get(i);
3779	4865
	4866	+ if (obj.toParent == null)
	4867	+ {
	4868	+ obj.toParent = LA.newMatrix();
	4869	+ obj.fromParent = LA.newMatrix();
	4870	+ }
	4871	+
3780	4872	LA.matTranslate(obj.toParent, i * scale, 0, 0);
3781	4873	LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3782	4874	}
3783	4875
	4876	+ Globals.lighttouched = true;
3784	4877	refreshContents();
3785	4878	}
3786	4879
..	..	@@ -4068,6 +5161,12 @@
4068	5161	refreshContents();
4069	5162	}
4070	5163
	5164	+ void ClearVersions()
	5165	+ {
	5166	+ group.selection.ClearVersions();
	5167	+ refreshContents();
	5168	+ }
	5169	+
4071	5170	void FlipV(boolean flip)
4072	5171	{
4073	5172	group.selection.FlipV(flip);
..	..	@@ -4095,6 +5194,18 @@
4095	5194	void MarkLeaves(boolean hide)
4096	5195	{
4097	5196	group.selection.MarkLeaves(hide);
	5197	+ refreshContents();
	5198	+ }
	5199	+
	5200	+ void RewindLeaves(boolean hide)
	5201	+ {
	5202	+ group.selection.RewindLeaves(hide);
	5203	+ refreshContents();
	5204	+ }
	5205	+
	5206	+ void RandomLeaves(boolean hide)
	5207	+ {
	5208	+ group.selection.RandomLeaves(hide);
4098	5209	refreshContents();
4099	5210	}
4100	5211
..	..	@@ -4169,28 +5280,25 @@
4169	5280	// }
4170	5281	// }
4171	5282
4172		- static boolean allparams = true;
4173		-
4174		- static Vector<Object3D> listUI = new Vector<Object3D>();
4175		-
4176	5283	void EditSelection(boolean newWindow)
4177	5284	{
	5285	+ if (group.selection == null)
	5286	+ {
	5287	+ EditElement(group, newWindow); // ? new
	5288	+ return;
	5289	+ }
	5290	+
4178	5291	// aConstraints.gridy = 0;
4179	5292	for (int i=0; i<group.selection.size(); i++)
4180	5293	{
4181	5294	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4182	5295	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4183		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5296	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4184	5297
4185	5298	Object3D elem = (Object3D)group.selection.elementAt(i);
4186	5299	if(elem != group \|\| !newWindow)
4187	5300	{
4188		- // if (!(elem instanceof Composite))
4189		- // newWindow = false;
4190		- listUI.add(elem);
4191		- elem.openEditWindow(this, newWindow); //, false);
4192		- System.out.println("edit : " + elem);
4193		- elem.editWindow.refreshContents(true); // ? new
	5301	+ EditElement(elem, newWindow); // ? new
4194	5302	}
4195	5303	}
4196	5304	}
..	..	@@ -4253,9 +5361,7 @@
4253	5361
4254	5362	freezemodel = false;
4255	5363	}
4256		-
4257		- boolean flashIt = true;
4258		-
	5364	+
4259	5365	public void valueChanged(TreeSelectionEvent e)
4260	5366	//public boolean handleEvent(Event event)
4261	5367	{
..	..	@@ -4265,7 +5371,8 @@
4265	5371	//new Exception().printStackTrace();
4266	5372
4267	5373	freezemodel = true;
4268		-
	5374	+ ClearUnpinned();
	5375	+
4269	5376	/**/
4270	5377	//switch (event.id)
4271	5378	{
..	..	@@ -4273,7 +5380,6 @@
4273	5380	//case 702: // Event.LIST_DESELECT
4274	5381	group.deselectAll();
4275	5382	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4276		- objEditor.ClearInfo(); // .GetMaterial());
4277	5383	if (tps != null)
4278	5384	{
4279	5385	for (int i=0; i < tps.length; i++)
..	..	@@ -4282,10 +5388,8 @@
4282	5388
4283	5389	//if (child.parent != null)
4284	5390	//child.parent.addSelectee(child);
	5391	+ objEditor.SetMaterial(child);
4285	5392	group.addSelectee(child);
4286		- objEditor.SetMaterial(child); // .GetMaterial());
4287		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4288		- System.err.println("info : " + child.GetPath());
4289	5393	}
4290	5394	}
4291	5395	// else
..	..	@@ -4295,20 +5399,28 @@
4295	5399	// System.err.println("info : " + group.GetPath());
4296	5400	// }
4297	5401
4298		- objEditor.SetText(); // jan 2014
4299		-
4300		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	5402	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4301	5403	CameraPane.flash = true;
4302	5404
4303		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5405	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4304	5406	// a camera
4305	5407	{
4306		- CameraPane.camerachangeframe = 0; // don't refuse it
4307		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5408	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crashes the camera because of invalid lightspace
	5409	+ {
	5410	+ CameraPane.camerachangeframe = 0; // don't refuse it
	5411	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent(), true);
	5412	+ }
4308	5413	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4309	5414	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4310	5415	}
4311	5416
	5417	+ if (tps != null && tps.length == 1)
	5418	+ {
	5419	+ EditSelection(false);
	5420	+ }
	5421	+
	5422	+ SetPinStates(tps != null && tps.length > 0);
	5423	+
4312	5424	refreshContents();
4313	5425	//return true;
4314	5426	}
..	..	@@ -4317,6 +5429,53 @@
4317	5429
4318	5430	freezemodel = false;
4319	5431	}
	5432	+
	5433	+ void SetPinStates(boolean enabled)
	5434	+ {
	5435	+ editButton.setEnabled(enabled);
	5436	+ uneditButton.setEnabled(enabled);
	5437	+ //unselectButton.setEnabled(enabled);
	5438	+ flashSelectionButton.setEnabled(enabled);
	5439	+
	5440	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5441	+
	5442	+ boolean allComposites = true;
	5443	+
	5444	+ if (group.selection != null)
	5445	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5446	+ {
	5447	+ Object next = e.nextElement();
	5448	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5449	+ {
	5450	+ allComposites = false;
	5451	+ break;
	5452	+ }
	5453	+ }
	5454	+
	5455	+ rootButton.setEnabled(true); // allComposites);
	5456	+ }
	5457	+
	5458	+ void refreshContents(boolean cp)
	5459	+ {
	5460	+ if (Globals.SHOWINFO)
	5461	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5462	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5463	+ {
	5464	+ objEditor.ClearInfo(); // .GetMaterial());
	5465	+
	5466	+ for (int i=0; i < group.selection.Size(); i++)
	5467	+ {
	5468	+ Object3D child = (Object3D) group.selection.get(i);
	5469	+
	5470	+ objEditor.AddInfo(child, this, true);
	5471	+// System.err.println("info : " + child.GetPath());
	5472	+ }
	5473	+
	5474	+ objEditor.SetText(); // jan 2014
	5475	+ }
	5476	+
	5477	+ super.refreshContents(cp);
	5478	+ }
4320	5479
4321	5480	void linkSomething(Object3D thing)
4322	5481	{
..	..	@@ -4388,6 +5547,7 @@
4388	5547	{
4389	5548	if (group.selection.isEmpty())
4390	5549	return;
	5550	+
4391	5551	Grafreed.clipboardIsTempGroup = false;
4392	5552	Composite tGroup = null;
4393	5553	if (group.selection.size() > 0) // 1)
..	..	@@ -4398,6 +5558,8 @@
4398	5558
4399	5559	if (cut)
4400	5560	{
	5561	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5562	+// Save();
4401	5563	//int indices[] = jList.getSelectedIndices();
4402	5564	//for (int i = indices.length - 1; i >= 0; i--)
4403	5565	//jList.remove(indices[i]);
..	..	@@ -4487,8 +5649,10 @@
4487	5649	}
4488	5650
4489	5651	}
	5652	+
4490	5653	if (Grafreed.clipboardIsTempGroup)
4491	5654	Grafreed.clipboard = tGroup;
	5655	+
4492	5656	if (cut)
4493	5657	{
4494	5658	ResetModel();
..	..	@@ -4498,6 +5662,10 @@
4498	5662
4499	5663	void paste(boolean expand)
4500	5664	{
	5665	+ if (Globals.REPLACEONMAKE)
	5666	+ Save();
	5667	+ boolean keep = Globals.REPLACEONMAKE;
	5668	+ Globals.REPLACEONMAKE = false;
4501	5669	// if (GrafreeD.clipboard == null)
4502	5670	// return;
4503	5671	boolean first = true;
..	..	@@ -4557,6 +5725,7 @@
4557	5725	Grafreed.clipboard.get(0).parent = keepparent;
4558	5726	}
4559	5727
	5728	+ Globals.REPLACEONMAKE = keep;
4560	5729	ResetModel();
4561	5730	refreshContents();
4562	5731	}
..	..	@@ -4692,6 +5861,10 @@
4692	5861
4693	5862	void group(Object3D csg, boolean grab)
4694	5863	{
	5864	+ if (Globals.REPLACEONMAKE)
	5865	+ Save();
	5866	+ boolean keep = Globals.REPLACEONMAKE;
	5867	+ Globals.REPLACEONMAKE = false;
4695	5868	if (//false) // why??
4696	5869	!group.selection.isEmpty())
4697	5870	{
..	..	@@ -4805,10 +5978,15 @@
4805	5978	//node.add(csg);
4806	5979	//makeSomething(node);
4807	5980	makeSomething(csg);
	5981	+ Globals.REPLACEONMAKE = keep;
4808	5982	}
4809	5983
4810	5984	void Ungroup(Object3D g)
4811	5985	{
	5986	+ if (Globals.REPLACEONMAKE)
	5987	+ Save();
	5988	+ boolean keep = Globals.REPLACEONMAKE;
	5989	+ Globals.REPLACEONMAKE = false;
4812	5990	if (g instanceof HiddenObject)
4813	5991	{
4814	5992	HiddenObject h = (HiddenObject) g;
..	..	@@ -4825,6 +6003,7 @@
4825	6003	objEditor.makeSomething(g.get(i), false);
4826	6004	}
4827	6005	}
	6006	+ Globals.REPLACEONMAKE = keep;
4828	6007	}
4829	6008
4830	6009	void ungroup()
..	..	@@ -5113,7 +6292,43 @@
5113	6292	cButton clearpanelButton;
5114	6293	cButton unselectButton;
5115	6294
	6295	+ cButton restoreCameraButton;
	6296	+
5116	6297	cButton oneStepButton;
	6298	+
	6299	+ cButton groupButton;
	6300	+ cButton ungroupButton;
	6301	+ cButton compositeButton;
	6302	+ cButton switchButton;
	6303	+ cButton loopButton;
	6304	+ cButton textureButton;
	6305	+
	6306	+ cButton skybox1Button;
	6307	+ cButton skybox2Button;
	6308	+ cButton skybox3Button;
	6309	+ cButton skybox4Button;
	6310	+ cButton skybox5Button;
	6311	+ cButton skybox6Button;
	6312	+ cButton skybox7Button;
	6313	+
	6314	+ cButton skybox11Button;
	6315	+ cButton skybox12Button;
	6316	+ cButton skybox13Button;
	6317	+ cButton skybox14Button;
	6318	+ cButton skybox15Button;
	6319	+ cButton skybox16Button;
	6320	+ cButton skybox17Button;
	6321	+
	6322	+ cButton gridButton;
	6323	+ cButton boxButton;
	6324	+ cButton sphereButton;
	6325	+ cButton coneButton;
	6326	+ cButton torusButton;
	6327	+ cButton superButton;
	6328	+ cButton kleinButton;
	6329	+ cButton particlesButton;
	6330	+ cButton overlayButton;
	6331	+ cButton lightButton;
5117	6332
5118	6333	cButton screenfitButton;
5119	6334	cButton screenfitpointButton;
..	..	@@ -5126,14 +6341,6 @@
5126	6341
5127	6342	cButton setsupportButton;
5128	6343
5129		- cButton twoButton;
5130		- cButton sixButton;
5131		- cButton threeButton;
5132		- cButton sevenButton;
5133		- cButton fourButton; // full panel
5134		- cButton oneButton; // full XYZ
5135		- //cButton currentLayout;
5136		-
5137	6344	//
5138	6345	//Composite
5139	6346	Object3D // to do !!
..	..	@@ -5143,10 +6350,12 @@
5143	6350	//JTree jTree;
5144	6351	private MenuItem lookAtItem;
5145	6352	private MenuItem lookFromItem;
5146		- private MenuItem switchItem;
5147		- private MenuItem cutItem;
5148		- private MenuItem duplicateItem;
5149		- private MenuItem cloneItem;
	6353	+ private MenuItem switchViewItem;
	6354	+ private JMenuItem cutItem;
	6355	+ private MenuItem undoItem;
	6356	+ private MenuItem redoItem;
	6357	+ private JMenuItem duplicateItem;
	6358	+ private JMenuItem cloneItem;
5150	6359	private MenuItem cloneSupportItem;
5151	6360	private MenuItem overwriteGeoItem;
5152	6361	private MenuItem overwriteMatItem;
..	..	@@ -5167,13 +6376,13 @@
5167	6376	private MenuItem cloneGeometriesItem;
5168	6377	private MenuItem shareGeometriesItem;
5169	6378	private MenuItem mergeGeometriesItem;
5170		- private MenuItem copyItem;
	6379	+ private JMenuItem copyItem;
5171	6380	private MenuItem pasteItem;
5172		- private MenuItem pasteIntoItem;
5173		- private MenuItem pasteLinkItem;
5174		- private MenuItem pasteCloneItem;
5175		- private MenuItem pasteExpandItem;
5176		- private MenuItem clearItem;
	6381	+ private JMenuItem pasteIntoItem;
	6382	+ private JMenuItem pasteLinkItem;
	6383	+ private JMenuItem pasteCloneItem;
	6384	+ private JMenuItem pasteExpandItem;
	6385	+ private JMenuItem deleteItem;
5177	6386	private MenuItem clearAllItem;
5178	6387	private MenuItem genUVItem;
5179	6388	private MenuItem genNormalsMESHItem;
..	..	@@ -5199,6 +6408,7 @@
5199	6408	private MenuItem clipMeshItem;
5200	6409	private MenuItem smoothMeshItem;
5201	6410	private MenuItem clearMaterialsItem;
	6411	+ private MenuItem clearVersionsItem;
5202	6412
5203	6413	private MenuItem liveleavesItem;
5204	6414	private MenuItem unliveleavesItem;
..	..	@@ -5208,6 +6418,10 @@
5208	6418	private MenuItem showleavesItem;
5209	6419	private MenuItem markleavesItem;
5210	6420	private MenuItem unmarkleavesItem;
	6421	+ private MenuItem rewindleavesItem;
	6422	+ private MenuItem unrewindleavesItem;
	6423	+ private MenuItem randomleavesItem;
	6424	+ private MenuItem unrandomleavesItem;
5211	6425
5212	6426	private MenuItem flipVItem;
5213	6427	private MenuItem unflipVItem;
..	..	@@ -5218,18 +6432,21 @@
5218	6432	private MenuItem maxTexturesItem;
5219	6433	private MenuItem panoTexturesItem;
5220	6434
	6435	+ private MenuItem textureRatioRItem;
	6436	+ private MenuItem textureRatioGItem;
	6437	+ private MenuItem textureRatioBItem;
5221	6438	private MenuItem resetCentroidItem;
5222	6439	private MenuItem resetCentroidXZItem;
5223	6440	private MenuItem resetTransformItem;
5224	6441	private MenuItem transformGeometryItem;
5225	6442	private MenuItem transformChildrenItem;
5226	6443	private MenuItem hideItem;
5227		- private MenuItem grabItem;
	6444	+ private JMenuItem grabItem;
5228	6445	private MenuItem backItem;
5229	6446	private MenuItem frontItem;
5230	6447	private MenuItem cameraItem;
5231	6448	private MenuItem compositeItem;
5232		- private MenuItem randomItem;
	6449	+ private MenuItem switchItem;
5233	6450	private MenuItem physicsItem;
5234	6451	private MenuItem frameselectorItem;
5235	6452	private MenuItem scriptNodeItem;
..	..	@@ -5237,7 +6454,7 @@
5237	6454	private MenuItem switchTransfoItem;
5238	6455	private MenuItem morphItem;
5239	6456	private MenuItem linkerItem;
5240		- private MenuItem ungroupItem;
	6457	+ private JMenuItem ungroupItem;
5241	6458	private MenuItem editItem;
5242	6459	private MenuItem openWindowItem;
5243	6460	private MenuItem editLeafItem;
..	..	@@ -5253,6 +6470,8 @@
5253	6470	private MenuItem attachBumpItem;
5254	6471	private MenuItem detachBumpItem;
5255	6472	private MenuItem pigmentBumpItem;
	6473	+ private MenuItem embedTexturesItem;
	6474	+ private MenuItem deEmbedTexturesItem;
5256	6475
5257	6476	private MenuItem particleItem;
5258	6477	private MenuItem ragdollItem;
..	..	@@ -5303,5 +6522,5 @@
5303	6522
5304	6523	Menu cameraMenu;
5305	6524	MenuItem editCameraItem;
5306		- MenuItem revertCameraItem;
	6525	+ MenuItem restoreCameraItem;
5307	6526	}