~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -16,6 +16,7 @@
16	16	//import buoy.widget.BFileChooser;
17	17
18	18	class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
	19	+ Grafreed.iResourceCallBack,
19	20	ObjectUI,
20	21	Runnable,
21	22	ActionListener,
..	..	@@ -23,6 +24,360 @@
23	24	DragGestureListener, DragSourceListener, DropTargetListener,
24	25	ItemListener // ListSelectionListener
25	26	{
	27	+
	28	+ public void AddSkyboxButton(String f, String s, cGridBag row)
	29	+ {
	30	+ cButton skyboxButton;
	31	+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
	32	+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Globals.NIMBUSLAF));
	33	+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
	34	+ skyboxButton.setToolTipText(s.equals("") ? "No background" : s);
	35	+ skyboxButton.addActionListener(new ActionListener()
	36	+ {
	37	+ @Override
	38	+ public void actionPerformed(ActionEvent e)
	39	+ {
	40	+ ChangeSkybox(path);
	41	+ }
	42	+ });
	43	+ }
	44	+
	45	+ public void AddTextureButton(String f, String c, final String t, int count, cGridBag row)
	46	+ {
	47	+ cButton textureButton;
	48	+ final String path = "textures/" + f + "/" + c + "/"; // + t;
	49	+ row.add(textureButton = GetButton(path + "icons/" + t, !Globals.NIMBUSLAF));
	50	+ textureButton.setToolTipText(c + count);
	51	+ textureButton.addActionListener(new ActionListener()
	52	+ {
	53	+ @Override
	54	+ public void actionPerformed(ActionEvent e)
	55	+ {
	56	+ ChangeTexture(path + t);
	57	+ }
	58	+ });
	59	+ }
	60	+
	61	+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
	62	+ {
	63	+ cGridBag tab0 = new cGridBag().setVertical(true);
	64	+
	65	+ tab0.setName("Urban");
	66	+ skyboxpanel.add(tab0);
	67	+
	68	+ cGridBag row0 = new cGridBag();
	69	+ cGridBag row1 = new cGridBag();
	70	+ cGridBag row2 = new cGridBag();
	71	+ cGridBag row3 = new cGridBag();
	72	+ cGridBag row4 = new cGridBag();
	73	+ cGridBag row5 = new cGridBag();
	74	+ cGridBag row6 = new cGridBag();
	75	+
	76	+ AddSkyboxButton("default", "", row0);
	77	+ //AddSkyboxButton("default", "cornell", row0);
	78	+ AddSkyboxButton("penguins", "dust", row0);
	79	+ AddSkyboxButton("penguins", "tropic", row0);
	80	+ AddSkyboxButton("penguins", "yonder", row0);
	81	+
	82	+ AddSkyboxButton("default", "uffizi", row1);
	83	+ AddSkyboxButton("bridge", "Bridge", row1);
	84	+ AddSkyboxButton("bridge", "Bridge2", row1);
	85	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	86	+
	87	+ AddSkyboxButton("urban", "Parliament", row2);
	88	+ AddSkyboxButton("urban", "Roundabout", row2);
	89	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	90	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	91	+
	92	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	93	+ AddSkyboxButton("urban", "UnionSquare", row3);
	94	+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
	95	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	96	+
	97	+ AddSkyboxButton("park", "Buddha", row4);
	98	+ AddSkyboxButton("park", "CNTower2", row4);
	99	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	100	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	101	+
	102	+ AddSkyboxButton("park", "Park", row5);
	103	+ AddSkyboxButton("park", "Pond", row5);
	104	+ AddSkyboxButton("park", "Skansen", row5);
	105	+ AddSkyboxButton("park", "Skansen2", row5);
	106	+
	107	+ AddSkyboxButton("park", "Skansen3", row6);
	108	+ AddSkyboxButton("park", "Skansen4", row6);
	109	+ AddSkyboxButton("park", "Skansen5", row6);
	110	+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
	111	+
	112	+ tab0.add(row0);
	113	+ tab0.add(row1);
	114	+ tab0.add(row2);
	115	+ tab0.add(row3);
	116	+ tab0.add(row4);
	117	+ tab0.add(row5);
	118	+ tab0.add(row6);
	119	+
	120	+ for (int i=5; --i>=0;)
	121	+ {
	122	+ //oe.toolboxPanel.Return();
	123	+ //tab0.add(new cGridBag());
	124	+ }
	125	+ }
	126	+
	127	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	128	+ {
	129	+ cGridBag tab0 = new cGridBag().setVertical(true);
	130	+
	131	+ tab0.setName("Nature");
	132	+ skyboxpanel.add(tab0);
	133	+
	134	+ cGridBag row0 = new cGridBag();
	135	+ cGridBag row1 = new cGridBag();
	136	+ cGridBag row2 = new cGridBag();
	137	+ cGridBag row3 = new cGridBag();
	138	+ cGridBag row4 = new cGridBag();
	139	+ cGridBag row5 = new cGridBag();
	140	+ cGridBag row6 = new cGridBag();
	141	+
	142	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	143	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	144	+ AddSkyboxButton("beach", "PalmTrees", row0);
	145	+ AddSkyboxButton("beach", "Tenerife", row0);
	146	+
	147	+ AddSkyboxButton("beach", "Tenerife2", row1);
	148	+ AddSkyboxButton("beach", "Tenerife3", row1);
	149	+ AddSkyboxButton("field", "FishPond", row1);
	150	+ AddSkyboxButton("field", "Footballfield", row1);
	151	+
	152	+ AddSkyboxButton("field", "Meadow", row2);
	153	+ AddSkyboxButton("field", "Sorsele", row2);
	154	+ AddSkyboxButton("field", "Sorsele2", row2);
	155	+ AddSkyboxButton("field", "Sorsele3", row2);
	156	+
	157	+ AddSkyboxButton("forest", "Brudslojan", row3);
	158	+ AddSkyboxButton("forest", "Langholmen2", row3);
	159	+ AddSkyboxButton("forest", "Plants", row3);
	160	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	161	+
	162	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	163	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	164	+ AddSkyboxButton("mountain", "Teide", row4);
	165	+ AddSkyboxButton("park", "Tantolunden4", row4);
	166	+
	167	+ AddSkyboxButton("park", "Stairs", row5);
	168	+ AddSkyboxButton("default", "skycube", row6);
	169	+ AddSkyboxButton("rocky", "Langholmen", row5);
	170	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	171	+
	172	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	173	+ AddSkyboxButton("default", "CloudyHills", row6);
	174	+ AddSkyboxButton("daz", "Autumn", row6);
	175	+ AddSkyboxButton("daz", "MountainTrail", row6);
	176	+ /*
	177	+Autumn
	178	+Greenlands
	179	+MountainTrail
	180	+Oasis
	181	+TheRock
	182	+TopOfTheWorld
	183	+Winter
	184	+ */
	185	+
	186	+ tab0.add(row0);
	187	+ tab0.add(row1);
	188	+ tab0.add(row2);
	189	+ tab0.add(row3);
	190	+ tab0.add(row4);
	191	+ tab0.add(row5);
	192	+ tab0.add(row6);
	193	+
	194	+ for (int i=5; --i>=0;)
	195	+ {
	196	+ //oe.toolboxPanel.Return();
	197	+ //tab0.add(new cGridBag());
	198	+ }
	199	+ }
	200	+
	201	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	202	+ {
	203	+ cGridBag tab0 = new cGridBag().setVertical(true);
	204	+
	205	+ tab0.setName("Night");
	206	+ skyboxpanel.add(tab0);
	207	+
	208	+ cGridBag row0 = new cGridBag();
	209	+ cGridBag row1 = new cGridBag();
	210	+ cGridBag row2 = new cGridBag();
	211	+ cGridBag row3 = new cGridBag();
	212	+ cGridBag row4 = new cGridBag();
	213	+ cGridBag row5 = new cGridBag();
	214	+ cGridBag row6 = new cGridBag();
	215	+
	216	+ AddSkyboxButton("night", "NightPath", row0);
	217	+ AddSkyboxButton("night", "PondNight", row0);
	218	+ AddSkyboxButton("night", "Powerlines", row0);
	219	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	220	+
	221	+ AddSkyboxButton("urban", "CNTower", row1);
	222	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	223	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	224	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
	225	+
	226	+ AddSkyboxButton("penguins", "kenon_star", row2);
	227	+ AddSkyboxButton("persson", "corona", row2);
	228	+ AddSkyboxButton("persson", "spaceskybox", row2);
	229	+ AddSkyboxButton("indoors", "Vasa", row2);
	230	+
	231	+ AddSkyboxButton("winter", "Backyard", row3);
	232	+ AddSkyboxButton("winter", "Creek", row3);
	233	+ AddSkyboxButton("winter", "FootballField3", row3);
	234	+ AddSkyboxButton("winter", "Forest", row3);
	235	+
	236	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	237	+ AddSkyboxButton("winter", "House", row4);
	238	+ AddSkyboxButton("winter", "IceLake", row4);
	239	+ AddSkyboxButton("winter", "IceRiver", row4);
	240	+
	241	+ AddSkyboxButton("winter", "Park3", row5);
	242	+ AddSkyboxButton("winter", "PondWinter", row5);
	243	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	244	+ AddSkyboxButton("winter", "Vindelalven", row5);
	245	+
	246	+ AddSkyboxButton("daz", "TheRock", row6);
	247	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	248	+ AddSkyboxButton("daz", "Winter", row6);
	249	+ AddSkyboxButton("mountain", "Ryfjallet", row6);
	250	+
	251	+ tab0.add(row0);
	252	+ tab0.add(row1);
	253	+ tab0.add(row2);
	254	+ tab0.add(row3);
	255	+ tab0.add(row4);
	256	+ tab0.add(row5);
	257	+ tab0.add(row6);
	258	+
	259	+ for (int i=5; --i>=0;)
	260	+ {
	261	+ //oe.toolboxPanel.Return();
	262	+ //tab0.add(new cGridBag());
	263	+ }
	264	+ }
	265	+
	266	+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
	267	+ {
	268	+ cGridBag tab0 = new cGridBag().setVertical(true);
	269	+
	270	+ tab0.setName("Others");
	271	+ skyboxpanel.add(tab0);
	272	+
	273	+ cGridBag row0 = new cGridBag();
	274	+ cGridBag row1 = new cGridBag();
	275	+ cGridBag row2 = new cGridBag();
	276	+ cGridBag row3 = new cGridBag();
	277	+ cGridBag row4 = new cGridBag();
	278	+ cGridBag row5 = new cGridBag();
	279	+ cGridBag row6 = new cGridBag();
	280	+
	281	+ AddSkyboxButton("mayhem", "afterrain", row0);
	282	+ AddSkyboxButton("mayhem", "aqua4", row0);
	283	+ AddSkyboxButton("mayhem", "aqua9", row0);
	284	+ AddSkyboxButton("mayhem", "flame", row0);
	285	+
	286	+ AddSkyboxButton("mayhem", "h2s", row1);
	287	+ AddSkyboxButton("mayhem", "prehistoric", row1);
	288	+ AddSkyboxButton("mayhem", "scorched", row1);
	289	+ AddSkyboxButton("penguins", "desertdawn", row1);
	290	+
	291	+ AddSkyboxButton("persson", "Citadella", row2);
	292	+ AddSkyboxButton("persson", "Citadella2", row2);
	293	+ AddSkyboxButton("persson", "clouds1", row2);
	294	+ AddSkyboxButton("penguins", "wrath", row2);
	295	+
	296	+ AddSkyboxButton("persson", "FishermansBastion", row3);
	297	+ AddSkyboxButton("persson", "HeroesSquare", row3);
	298	+ AddSkyboxButton("indoors", "DallasW", row3);
	299	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
	300	+
	301	+ AddSkyboxButton("persson", "LancellottiChapel", row4);
	302	+ AddSkyboxButton("persson", "PereaBeach1", row4);
	303	+ AddSkyboxButton("persson", "PereaBeach2", row4);
	304	+ AddSkyboxButton("persson", "redeclipse", row4);
	305	+
	306	+ AddSkyboxButton("daz", "Greenlands", row5);
	307	+ AddSkyboxButton("daz", "Oasis", row5);
	308	+ AddSkyboxButton("elyvisions", "arch3", row5);
	309	+ AddSkyboxButton("elyvisions", "calm_sea", row5);
	310	+
	311	+ AddSkyboxButton("elyvisions", "rainbow", row6);
	312	+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
	313	+ AddSkyboxButton("elyvisions", "heaven", row6);
	314	+ AddSkyboxButton("elyvisions", "hot", row6);
	315	+
	316	+ tab0.add(row0);
	317	+ tab0.add(row1);
	318	+ tab0.add(row2);
	319	+ tab0.add(row3);
	320	+ tab0.add(row4);
	321	+ tab0.add(row5);
	322	+ tab0.add(row6);
	323	+
	324	+ for (int i=5; --i>=0;)
	325	+ {
	326	+ //oe.toolboxPanel.Return();
	327	+ //tab0.add(new cGridBag());
	328	+ }
	329	+ }
	330	+
	331	+ public void ChangeSkybox(String skybox)
	332	+ {
	333	+ if (skybox.endsWith("/"))
	334	+ {
	335	+ group.skyboxname = null;
	336	+ group.skyboxext = null;
	337	+ cameraView.repaint();
	338	+ }
	339	+ else
	340	+ {
	341	+ //cameraView.envyoff = false;
	342	+ group.skyboxname = skybox;
	343	+ group.skyboxext = "jpg";
	344	+ cameraView.repaint();
	345	+ }
	346	+ }
	347	+
	348	+ public void CreateSkyboxPanel(cGridBag skyboxPanel)
	349	+ {
	350	+ JTabbedPane skyboxpane = new JTabbedPane(JTabbedPane.LEFT);
	351	+
	352	+ AddSkyboxTab0(skyboxpane);
	353	+ AddSkyboxTab1(skyboxpane);
	354	+ AddSkyboxTab2(skyboxpane);
	355	+ AddSkyboxTab3(skyboxpane);
	356	+
	357	+ skyboxPanel.add(skyboxpane);
	358	+ }
	359	+
	360	+ public void ChangeTexture(String texture)
	361	+ {
	362	+ for (int i=0; i<group.selection.size(); i++)
	363	+ {
	364	+ Object3D obj = group.selection.get(i);
	365	+ obj.SetPigmentTexture("@" + texture);
	366	+ }
	367	+
	368	+ refreshContents();
	369	+ }
	370	+
	371	+ public void Show3DView()
	372	+ {
	373	+ // bug
	374	+ //gridPanel.setDividerLocation(1.0);
	375	+ //bigPanel.setDividerLocation(0.0);
	376	+ bigThree.ClearUI();
	377	+ bigThree.add(centralPanel);
	378	+ bigThree.FlushUI();
	379	+ }
	380	+
26	381	//ObjEditor objEditor;
27	382	public void closeUI2()
28	383	{
..	..	@@ -60,6 +415,16 @@
60	415	this.copy = this.group = group;
61	416	//selectees = this.group.selectees;
62	417
	418	+ assert(false);
	419	+
	420	+// if (copy.versionlist == null)
	421	+// {
	422	+// copy.versionlist = new Object3D[100];
	423	+// copy.versionindex = -1;
	424	+//
	425	+// //Save(true);
	426	+// }
	427	+
63	428	if(ui)
64	429	SetupUI(objEditor);
65	430	}
..	..	@@ -74,16 +439,28 @@
74	439	this.copy = this.group = copy;
75	440	//selectees = this.group.selectees;
76	441
77		- SetupMenu2(objEditor);
	442	+ SetupMenu2(this); //objEditor);
78	443	SetupUI2(objEditor);
79	444	objEditor.SetupUI(true);
80	445	SetupViews(objEditor);
81	446
82	447	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	448	+
	449	+// if (copy.versionlist == null)
	450	+// {
	451	+// copy.versionlist = new Object3D[100];
	452	+// copy.versionindex = -1;
	453	+//
	454	+// //Save(true);
	455	+// }
83	456	}
84	457
85	458	void CloneSelection(boolean supports)
86	459	{
	460	+ if (Globals.REPLACEONMAKE)
	461	+ Save();
	462	+ boolean keep = Globals.REPLACEONMAKE;
	463	+ Globals.REPLACEONMAKE = false;
87	464	// Object3D keep = GrafreeD.clipboard;
88	465	//Object3D obj;
89	466	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,18 +471,19 @@
94	471
95	472	makeSomething(clone, i==group.selection.size()-1);
96	473	}
	474	+ Globals.REPLACEONMAKE = keep;
97	475	}
98	476
99	477	void CloneClipboard(boolean supports)
100	478	{
101		- assert(GrafreeD.clipboard.parent == null);
102		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
103		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
104		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
105		- makeSomething(CloneObject(GrafreeD.clipboard.get(0), false));
	479	+ assert(Grafreed.clipboard.parent == null);
	480	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	481	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	482	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	483	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
106	484	else
107		- makeSomething(CloneObject(GrafreeD.clipboard, false));
108		- GrafreeD.clipboard.get(0).parent = keepparent;
	485	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	486	+ Grafreed.clipboard.get(0).parent = keepparent;
109	487	}
110	488
111	489	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -119,7 +497,7 @@
119	497	// obj.support = null;
120	498	if (!supports)
121	499	obj.SaveSupports();
122		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	500	+ Object3D clone = (Object3D)Grafreed.clone(obj);
123	501	obj.parent = parent;
124	502	// obj.support = support;
125	503	// clone.support = support; // aout 2013
..	..	@@ -148,52 +526,51 @@
148	526
149	527	//JTextField nameField;
150	528
151		- void SetupMenu2(ObjEditor oe)
	529	+ void SetupMenu2(GroupEditor oe)
152	530	{
153		- if (Globals.ADVANCED)
154		- {
155		- oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
156		- //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
157		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
158		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
159		- oe.cameraMenu.add("-");
160		- openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
161		- openWindowItem.addActionListener(this);
162		- editLeafItem.addActionListener(this);
163		- lookAtItem.addActionListener(this);
164		- //lookFromItem.addActinoListener(this);
165		- //switchItem.addActionListener(this);
166		- }
167		-
	531	+ oe.jTree = new cTree();
	532	+
168	533	Menu menu;
169	534	oe.menuBar.add(menu = new Menu("Edit"));
170	535	//editItem = menu.add(new MenuItem("Edit"));
171	536	//editItem.addActionListener(this);
172		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	537	+
	538	+// undoItem = menu.add(new MenuItem("Undo"));
	539	+// undoItem.addActionListener(this);
	540	+// redoItem = menu.add(new MenuItem("Redo"));
	541	+// redoItem.addActionListener(this);
	542	+// menu.add("-");
	543	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
173	544	duplicateItem.addActionListener(this);
174		- cutItem = menu.add(new MenuItem("Cut"));
	545	+
	546	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
	547	+ cloneItem.addActionListener(this);
	548	+ //if (Globals.ADVANCED)
	549	+ {
	550	+ cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
	551	+ cloneSupportItem.addActionListener(this);
	552	+ }
	553	+ oe.jTree.popup.addSeparator();
	554	+ menu.add("-");
	555	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
175	556	cutItem.addActionListener(this);
176		- copyItem = menu.add(new MenuItem("Copy"));
	557	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
177	558	copyItem.addActionListener(this);
178	559	pasteItem = menu.add(new MenuItem("Paste"));
179	560	pasteItem.addActionListener(this);
180		- menu.add("-");
181		- cloneItem = menu.add(new MenuItem("Clone"));
182		- cloneItem.addActionListener(this);
183		- cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
184		- cloneSupportItem.addActionListener(this);
185		- menu.add("-");
186		- pasteIntoItem = menu.add(new MenuItem("Paste into"));
	561	+
	562	+ oe.jTree.popup.addSeparator();
	563	+ //menu.add("-");
	564	+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
187	565	pasteIntoItem.addActionListener(this);
188		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	566	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
189	567	pasteLinkItem.addActionListener(this);
190		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	568	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
191	569	pasteCloneItem.addActionListener(this);
192		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	570	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
193	571	// pasteExpandItem.addActionListener(this);
194		- menu.add("-");
195		- clearItem = menu.add(new MenuItem("Clear"));
196		- clearItem.addActionListener(this);
	572	+ //menu.add("-");
	573	+ oe.jTree.popup.addSeparator();
197	574
198	575	if (Globals.ADVANCED)
199	576	{
..	..	@@ -201,14 +578,95 @@
201	578	clearAllItem = menu.add(new MenuItem("Clear All"));
202	579	clearAllItem.addActionListener(this);
203	580	}
	581	+
	582	+ menuBar.add(cameraMenu = new Menu("View"));
	583	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	584	+ //zBufferItem.addActionListener(this);
	585	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	586	+ //normalLensItem.addActionListener(this);
	587	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	588	+ restoreCameraItem.addActionListener(this);
	589	+
	590	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	591	+// toggleFullScreenItem.addItemListener(this);
	592	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	593	+// cameraMenu.add("-");
	594	+//
	595	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	596	+// toggleTextureItem.addItemListener(this);
	597	+// toggleTextureItem.setState(CameraPane.textureon);
	598	+//
	599	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	600	+// toggleSwitchItem.addItemListener(this);
	601	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	602	+
	603	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	604	+ toggleHandleItem.addItemListener(this);
	605	+ toggleHandleItem.setState(CameraPane.HANDLES);
	606	+
	607	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	608	+ togglePaintItem.addItemListener(this);
	609	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	610	+
	611	+ if (Globals.ADVANCED)
	612	+ {
	613	+ cameraMenu.add("-");
	614	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	615	+ toggleLiveItem.addItemListener(this);
	616	+ toggleLiveItem.setState(Globals.isLIVE());
204	617
	618	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	619	+ stepItem.addActionListener(this);
	620	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	621	+ // toggleDLItem.addItemListener(this);
	622	+ // toggleDLItem.setState(false);
	623	+
	624	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	625	+ toggleRenderItem.addItemListener(this);
	626	+ toggleRenderItem.setState(!CameraPane.frozen);
	627	+
	628	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	629	+ toggleDebugItem.addItemListener(this);
	630	+ toggleDebugItem.setState(Globals.DEBUG);
	631	+
	632	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	633	+ toggleFrustumItem.addItemListener(this);
	634	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	635	+
	636	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	637	+ toggleFootContactItem.addItemListener(this);
	638	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	639	+
	640	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	641	+ toggleTimelineItem.addItemListener(this);
	642	+ }
	643	+
	644	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	645	+// toggleRootItem.addItemListener(this);
	646	+// toggleRootItem.setState(false);
	647	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	648	+// animationItem.addItemListener(this);
	649	+// animationItem.setState(CameraPane.ANIMATION);
	650	+ cameraMenu.add("-");
	651	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	652	+ editCameraItem.addActionListener(this);
	653	+
	654	+ if (Globals.ADVANCED)
	655	+ {
	656	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	657	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	658	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	659	+ oe.cameraMenu.add("-");
	660	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	661	+ openWindowItem.addActionListener(this);
	662	+ lookAtItem.addActionListener(this);
	663	+ //lookFromItem.addActinoListener(this);
	664	+ //switchViewItem.addActionListener(this);
	665	+ }
	666	+
205	667	oe.menuBar.add(menu = new Menu("Setting"));
206	668	if (Globals.ADVANCED)
207	669	{
208		- resetMeshItem = menu.add(new MenuItem("Reset All"));
209		- resetMeshItem.addActionListener(this);
210		- stepAllItem = menu.add(new MenuItem("Step All"));
211		- stepAllItem.addActionListener(this);
212	670	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
213	671	revertMeshItem.addActionListener(this);
214	672	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
..	..	@@ -247,22 +705,37 @@
247	705	setMasterItem.addActionListener(this);
248	706	}
249	707
250		- oe.menuBar.add(menu = new Menu("Group"));
251		- grabItem = menu.add(new MenuItem("Grab"));
252		- grabItem.addActionListener(this);
	708	+ oe.menuBar.add(menu = new Menu("Order"));
	709	+
253	710	backItem = menu.add(new MenuItem("Back"));
254	711	backItem.addActionListener(this);
255	712	frontItem = menu.add(new MenuItem("Front"));
256	713	frontItem.addActionListener(this);
257		- compositeItem = menu.add(new MenuItem("Composite"));
258		- compositeItem.addActionListener(this);
	714	+// compositeItem = menu.add(new MenuItem("Composite"));
	715	+// compositeItem.addActionListener(this);
	716	+
	717	+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
	718	+ grabItem.addActionListener(this);
	719	+
	720	+ if (Globals.ADVANCED)
	721	+ {
259	722	hideItem = menu.add(new MenuItem("Hidden Group"));
260	723	hideItem.addActionListener(this);
261		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	724	+ }
	725	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
262	726	ungroupItem.addActionListener(this);
263		- menu.add("-");
264		- randomItem = menu.add(new MenuItem("Switch node"));
265		- randomItem.addActionListener(this);
	727	+
	728	+ oe.jTree.popup.addSeparator();
	729	+
	730	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	731	+ deleteItem.addActionListener(this);
	732	+
	733	+// menu.add("-");
	734	+//
	735	+// switchItem = menu.add(new MenuItem("Switch node"));
	736	+// switchItem.addActionListener(this);
	737	+ if (Globals.ADVANCED)
	738	+ {
266	739	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
267	740	switchGeoItem.addActionListener(this);
268	741	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -270,49 +743,52 @@
270	743	morphItem = menu.add(new MenuItem("Morph Group"));
271	744	morphItem.addActionListener(this);
272	745
273		- if (Globals.ADVANCED)
274		- {
	746	+ menu.add("-");
275	747	physicsItem = menu.add(new MenuItem("Physics"));
276	748	physicsItem.addActionListener(this);
277	749	frameselectorItem = menu.add(new MenuItem("Frame Selector"));
278	750	frameselectorItem.addActionListener(this);
279	751	scriptNodeItem = menu.add(new MenuItem("Script Node"));
280	752	scriptNodeItem.addActionListener(this);
281		- cameraItem = menu.add(new MenuItem("Camera"));
282		- cameraItem.addActionListener(this);
283	753	}
284	754
285	755	oe.menuBar.add(menu = new Menu("Object"));
286		- textureItem = menu.add(new MenuItem("Texture"));
287		- textureItem.addActionListener(this);
	756	+// textureItem = menu.add(new MenuItem("Texture"));
	757	+// textureItem.addActionListener(this);
288	758	billboardItem = menu.add(new MenuItem("Billboard"));
289	759	billboardItem.addActionListener(this);
290	760	csgItem = menu.add(new MenuItem("CSG"));
291	761	csgItem.addActionListener(this);
292		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	762	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
293	763	shadowXItem.addActionListener(this);
294		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	764	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
295	765	shadowYItem.addActionListener(this);
296		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	766	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
297	767	shadowZItem.addActionListener(this);
298		- if (Globals.ADVANCED)
299		- {
300		- linkerItem = menu.add(new MenuItem("Linker"));
301		- linkerItem.addActionListener(this);
302	768	attributeItem = menu.add(new MenuItem("Attribute"));
303	769	attributeItem.addActionListener(this);
	770	+
	771	+ if (Globals.ADVANCED)
	772	+ {
	773	+ menu.add("-");
	774	+ linkerItem = menu.add(new MenuItem("Linker"));
	775	+ linkerItem.addActionListener(this);
304	776	templateItem = menu.add(new MenuItem("Template"));
305	777	templateItem.addActionListener(this);
306	778	pointflowItem = menu.add(new MenuItem("Point Flow"));
307	779	pointflowItem.addActionListener(this);
308		- menu.add("-");
309	780	}
	781	+ menu.add("-");
310	782	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
311	783	resetTransformItem.addActionListener(this);
312	784	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
313	785	resetCentroidItem.addActionListener(this);
314		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
315		- transformgeometryItem.addActionListener(this);
	786	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	787	+ resetCentroidXZItem.addActionListener(this);
	788	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	789	+ transformGeometryItem.addActionListener(this);
	790	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	791	+ transformChildrenItem.addActionListener(this);
316	792
317	793	oe.menuBar.add(menu = new Menu("Geometry"));
318	794	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -325,7 +801,7 @@
325	801	genNormalsMESHItem.addActionListener(this);
326	802	if (Globals.ADVANCED)
327	803	{
328		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	804	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
329	805	genNormalsMINEItem.addActionListener(this);
330	806	}
331	807	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -359,8 +835,14 @@
359	835	}
360	836
361	837	oe.menuBar.add(menu = new Menu("Attributes"));
	838	+ clearVersionsItem = menu.add(new MenuItem("Clear Versions"));
	839	+ clearVersionsItem.addActionListener(this);
362	840	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
363	841	clearMaterialsItem.addActionListener(this);
	842	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	843	+ resetAllItem.addActionListener(this);
	844	+ stepAllItem = menu.add(new MenuItem("Step All"));
	845	+ stepAllItem.addActionListener(this);
364	846	menu.add("-");
365	847	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
366	848	liveleavesItem.addActionListener(this);
..	..	@@ -377,10 +859,18 @@
377	859	hideleavesItem.addActionListener(this);
378	860	showleavesItem = menu.add(new MenuItem("Show Leaves"));
379	861	showleavesItem.addActionListener(this);
380		- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
	862	+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
381	863	markleavesItem.addActionListener(this);
382		- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
	864	+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
383	865	unmarkleavesItem.addActionListener(this);
	866	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	867	+ rewindleavesItem.addActionListener(this);
	868	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	869	+ unrewindleavesItem.addActionListener(this);
	870	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	871	+ randomleavesItem.addActionListener(this);
	872	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	873	+ unrandomleavesItem.addActionListener(this);
384	874	menu.add("-");
385	875	flipVItem = menu.add(new MenuItem("Flip V"));
386	876	flipVItem.addActionListener(this);
..	..	@@ -406,55 +896,135 @@
406	896	attachBumpItem.addActionListener(this);
407	897	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
408	898	pigmentBumpItem.addActionListener(this);
	899	+ //embedTexturesItem
409	900	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
410	901	detachPigmentItem.addActionListener(this);
411	902	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
412	903	detachBumpItem.addActionListener(this);
	904	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	905	+ embedTexturesItem.addActionListener(this);
	906	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	907	+ deEmbedTexturesItem.addActionListener(this);
413	908	menu.add("-");
414	909	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
415	910	sortbysizeItem.addActionListener(this);
416	911	sortbynameItem = menu.add(new MenuItem("Sort by name"));
417	912	sortbynameItem.addActionListener(this);
	913	+ menu.add("-");
	914	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	915	+ shareGeometriesItem.addActionListener(this);
	916	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	917	+ mergeGeometriesItem.addActionListener(this);
	918	+ menu.add("-");
	919	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	920	+ editLeafItem.addActionListener(this);
418	921	if (Globals.ADVANCED)
419	922	{
420		- menu.add("-");
	923	+ // Pretty much the same as duplicate and clone.
421	924	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
422	925	extractGeometriesItem.addActionListener(this);
423	926	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
424	927	cloneGeometriesItem.addActionListener(this);
425		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
426		- shareGeometriesItem.addActionListener(this);
427		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
428		- mergeGeometriesItem.addActionListener(this);
429	928	}
430	929
431	930	oe.menuBar.add(menu = new Menu("Insert"));
432	931	buildCreateMenu(menu);
433	932
434		- oe.menuBar.add(menu = new Menu("Include"));
435		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
436		- importGFDItem.addActionListener(this);
437		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
438		- importVRMLX3DItem.addActionListener(this);
439		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
440		- importOBJItem.addActionListener(this);
441		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
442		- import3DSItem.addActionListener(this);
443		-
444	933	oe.menuBar.add(menu = new Menu("Tools"));
445	934	buildToolsMenu(menu);
446	935	}
447	936
	937	+ JTabbedPane resourcecontainer;
	938	+ cGridBag currenttab;
	939	+ //boolean added; // patch for jar
	940	+
	941	+ int totalcount = 0;
	942	+
	943	+ int tabcount = 0;
	944	+ int colcount = 0;
	945	+ int rowcount = 0;
	946	+ int texturecount = 0;
	947	+
	948	+ int columns = 5;
	949	+ int rows = 7;
	950	+
	951	+ public void ResourceCallBack(String[] path)
	952	+ {
	953	+// for (int i = 0; i < path.length; i++)
	954	+// System.out.print(path[i] + "/");
	955	+// System.out.println();
	956	+
	957	+ if (//rowcount == 0 \|\|
	958	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	959	+ {
	960	+ currenttab = new cGridBag();
	961	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	962	+ currenttab.setName(tabname);
	963	+ //added = false;
	964	+ resourcecontainer.add(currenttab);
	965	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	966	+ rowcount = 1;
	967	+ colcount = 0;
	968	+ texturecount = 0;
	969	+ }
	970	+
	971	+ if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") \|\| path[2].toLowerCase().endsWith(".png")))
	972	+ {
	973	+ //if (!added)
	974	+ {
	975	+ //added = true;
	976	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	977	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	978	+ }
	979	+
	980	+ AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
	981	+ totalcount++;
	982	+
	983	+ if (++colcount >= columns)
	984	+ {
	985	+ colcount = 0;
	986	+ currenttab.Return();
	987	+
	988	+ if (rowcount++ >= rows)
	989	+ {
	990	+ rowcount = 0;
	991	+ }
	992	+ }
	993	+ }
	994	+ else
	995	+ {
	996	+// if (!path[path.length-1].equals("icons"))
	997	+// resourcecontainer.Return();
	998	+ }
	999	+ }
	1000	+
	1001	+ void CreateTexturePanel(cGridBag container)
	1002	+ {
	1003	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	1004	+ container.add(resourcecontainer);
	1005	+
	1006	+ Grafreed.ParseResources("textures", this);
	1007	+
	1008	+ // 935. System.out.println("Total = " + totalcount);
	1009	+ }
	1010	+
448	1011	void SetupUI2(ObjEditor oe)
449	1012	{
	1013	+ // June 2019
	1014	+ if (oe == null)
	1015	+ {
	1016	+ //super.SetupUI2(this);
	1017	+ //return;
	1018	+ }
	1019	+
	1020	+ if (copy != group)
	1021	+ {
	1022	+ //super.SetupUI2(this);
	1023	+ }
	1024	+
450	1025	//new Exception().printStackTrace();
451	1026
452	1027	oe.radioPanel = new JPanel(new GridBagLayout());
453		- oe.aConstraints.weightx = 1;
454		- oe.aConstraints.weighty = 0;
455		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
456		- oe.aConstraints.gridwidth = 100;
457		- oe.aConstraints.gridheight = 1;
458	1028	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
459	1029
460	1030	oe.buttonGroup = new ButtonGroup();
..	..	@@ -475,97 +1045,268 @@
475	1045	oe.radioPanel.add(dummyButton);
476	1046	oe.buttonGroup.add(dummyButton);
477	1047	*/
	1048	+ cGridBag versionManagerPanel = new cGridBag();
	1049	+
	1050	+ versionManagerPanel.preferredHeight = 4;
	1051	+
478	1052	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
479	1053
480		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
481		- liveCB.setToolTipText("Enabled animation");
482		- liveCB.addItemListener(this);
	1054	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1055	+ //minButton.setToolTipText("Minimize window");
	1056	+ //minButton.addActionListener(this);
	1057	+
	1058	+ if (Globals.ADVANCED)
	1059	+ {
	1060	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1061	+// maxButton.setToolTipText("Maximize window");
	1062	+// maxButton.addActionListener(this);
	1063	+ }
	1064	+
	1065	+ cButton gcButton;
	1066	+
	1067	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1068	+// gcButton.setToolTipText("Garbage collect");
	1069	+// gcButton.addActionListener(new ActionListener()
	1070	+// {
	1071	+// public void actionPerformed(ActionEvent e)
	1072	+// {
	1073	+// System.gc();
	1074	+// }
	1075	+// });
	1076	+
	1077	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1078	+ collapseButton.setToolTipText("Collapse toolbar");
	1079	+ collapseButton.addActionListener(this);
	1080	+
	1081	+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1082	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1083	+ maximize3DButton.addActionListener(this);
	1084	+
	1085	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1086	+ twoButton.setToolTipText("Show 3D view only");
	1087	+ twoButton.addActionListener(this);
	1088	+ this.fullscreenLayout = twoButton;
	1089	+
	1090	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1091	+ threeButton.setToolTipText("Show controls and 3D view");
	1092	+ threeButton.addActionListener(this);
	1093	+ if (Globals.ADVANCED)
	1094	+ {
	1095	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1096	+ sixButton.setToolTipText("Show 3D view and controls");
	1097	+ sixButton.addActionListener(this);
	1098	+ }
	1099	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1100	+// sevenButton.setToolTipText("3-column layout");
	1101	+// sevenButton.addActionListener(this);
	1102	+ //
	1103	+
	1104	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1105	+ fullButton.setToolTipText("Full-screen window");
	1106	+ fullButton.addActionListener(this);
	1107	+
	1108	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1109	+ screenfitButton.setToolTipText("Screen fit");
	1110	+ screenfitButton.addActionListener(this);
483	1111
484		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1112	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1113	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1114	+ restoreCameraButton.addActionListener(this);
	1115	+
	1116	+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1117	+ saveVersionButton.setToolTipText("Duplicate current version");
	1118	+ saveVersionButton.addActionListener(this);
	1119	+
	1120	+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1121	+ deleteVersionButton.setToolTipText("Delete current version");
	1122	+ deleteVersionButton.addActionListener(this);
	1123	+ deleteVersionButton.setEnabled(false);
	1124	+
	1125	+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1126	+ previousVersionButton.setToolTipText("Previous version");
	1127	+ previousVersionButton.addActionListener(this);
	1128	+ previousVersionButton.setEnabled(false);
	1129	+
	1130	+ cGridBag updown = new cGridBag().setVertical(true);
	1131	+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1132	+ restoreButton.setToolTipText("Undo (restore current version)");
	1133	+ restoreButton.addActionListener(this);
	1134	+ restoreButton.setEnabled(false);
	1135	+
	1136	+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1137	+ replaceButton.setToolTipText("Save (replace current version)");
	1138	+ replaceButton.addActionListener(this);
	1139	+ replaceButton.setEnabled(false);
	1140	+
	1141	+ versionManagerPanel.add(updown);
	1142	+
	1143	+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1144	+ nextVersionButton.setToolTipText("Next version");
	1145	+ nextVersionButton.addActionListener(this);
	1146	+ nextVersionButton.setEnabled(false);
	1147	+
	1148	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
485	1149	oneStepButton.setToolTipText("Animate one step forward");
486	1150	oneStepButton.addActionListener(this);
487	1151
488		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	1152	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1153	+ liveCB.setToolTipText("Enable animation");
	1154	+ liveCB.addItemListener(this);
	1155	+
	1156	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
489	1157	fastCB.setToolTipText("Fast mode");
490	1158	fastCB.addItemListener(this);
491	1159
492		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
493		- trackCB.setToolTipText("Enable tracking");
494		- trackCB.addItemListener(this);
495		-
496		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
497		- screenfitButton.setToolTipText("Screen fit");
498		- screenfitButton.addActionListener(this);
	1160	+ //oe.toolboxPanel.Return();
	1161	+
	1162	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1163	+// trackCB.setToolTipText("Enable tracking");
	1164	+// trackCB.addItemListener(this);
499	1165
500	1166	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
501	1167	// screenfitpointButton.addActionListener(this);
502	1168
503	1169	if (Globals.ADVANCED)
504	1170	{
505		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1171	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
506	1172	snapobjectButton.addActionListener(this);
507	1173	snapobjectButton.setToolTipText("Snap Object");
	1174	+
	1175	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1176	+ fourButton.addActionListener(this);
	1177	+ fourButton.setToolTipText("Show control panel only");
508	1178	}
509	1179
510		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
511		- flashSelectionButton.setToolTipText("Show selection");
512		- flashSelectionButton.addActionListener(this);
	1180	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
513	1181
514		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
515		-
516		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
517		- twoButton.setToolTipText("Show center view only");
518		- twoButton.addActionListener(this);
519		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
520		- fourButton.addActionListener(this);
521		- fourButton.setToolTipText("Show left panel only");
522		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
523		- sixButton.setToolTipText("2-column layout left");
524		- sixButton.addActionListener(this);
525		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
526		- threeButton.setToolTipText("2-column layout right");
527		- threeButton.addActionListener(this);
528		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
529		- sevenButton.setToolTipText("3-column layout");
530		- sevenButton.addActionListener(this);
531		- //
532	1182
533		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
534		- rootButton.setToolTipText("Edit selection in new tab");
	1183	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1184	+ rootButton.setToolTipText("Open selection in new tab");
535	1185	rootButton.addActionListener(this);
536	1186
537		- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1187	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
538	1188	closeButton.setToolTipText("Close tab");
539	1189	closeButton.addActionListener(this);
540	1190	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
541	1191	//clearButton.addActionListener(this);
542		-
543		- cGridBag commandsPanel = new cGridBag();
	1192	+
	1193	+ cGridBag row1 = new cGridBag();
544	1194
545		- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
546		- editButton.setToolTipText("Edit selection");
	1195	+ // INSERT
	1196	+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1197	+ gridButton.setToolTipText("Create ground");
	1198	+ gridButton.addActionListener(this);
	1199	+
	1200	+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1201	+ boxButton.setToolTipText("Create box");
	1202	+ boxButton.addActionListener(this);
	1203	+
	1204	+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1205	+ superButton.setToolTipText("Create superellipsoid");
	1206	+ superButton.addActionListener(this);
	1207	+
	1208	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1209	+ sphereButton.setToolTipText("Create sphere");
	1210	+ sphereButton.addActionListener(this);
	1211	+
	1212	+ row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1213	+ coneButton.setToolTipText("Create cone");
	1214	+ coneButton.addActionListener(this);
	1215	+
	1216	+ row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1217	+ torusButton.setToolTipText("Create torus");
	1218	+ torusButton.addActionListener(this);
	1219	+
	1220	+ if (Globals.ADVANCED)
	1221	+ {
	1222	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1223	+ kleinButton.setToolTipText("Create Klein bottle");
	1224	+ kleinButton.addActionListener(this);
	1225	+ }
	1226	+
	1227	+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1228	+ particlesButton.setToolTipText("Create particle system");
	1229	+ particlesButton.addActionListener(this);
	1230	+
	1231	+ oe.toolboxPanel.add(row1);
	1232	+
	1233	+ cGridBag row2 = new cGridBag();
	1234	+
	1235	+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1236	+ groupButton.setToolTipText("Create group");
	1237	+ groupButton.addActionListener(this);
	1238	+
	1239	+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1240	+ compositeButton.setToolTipText("Create composite");
	1241	+ compositeButton.addActionListener(this);
	1242	+
	1243	+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1244	+ switchButton.setToolTipText("Create item switcher");
	1245	+ switchButton.addActionListener(this);
	1246	+
	1247	+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1248	+ loopButton.setToolTipText("Create loop");
	1249	+ loopButton.addActionListener(this);
	1250	+
	1251	+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1252	+ textureButton.setToolTipText("Create texture");
	1253	+ textureButton.addActionListener(this);
	1254	+
	1255	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1256	+ overlayButton.setToolTipText("Create overlay");
	1257	+ overlayButton.addActionListener(this);
	1258	+
	1259	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1260	+ lightButton.setToolTipText("Create light");
	1261	+ lightButton.addActionListener(this);
	1262	+
	1263	+ oe.toolboxPanel.add(row2);
	1264	+
	1265	+ cGridBag textures = new cGridBag();
	1266	+
	1267	+ CreateTexturePanel(textures);
	1268	+
	1269	+ int tabCount = resourcecontainer.getTabCount();
	1270	+
	1271	+ if (tabCount > 0)
	1272	+ resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
	1273	+
	1274	+ oe.toolboxPanel.add(textures);
	1275	+
	1276	+ textures.preferredHeight = 100;
	1277	+
	1278	+ CreateSkyboxPanel(oe.skyboxPanel);
	1279	+
	1280	+ // EDIT panel
	1281	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1282	+ editButton.setToolTipText("Pin selection controls");
547	1283	editButton.addActionListener(this);
548	1284
549		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
550		- uneditButton.setToolTipText("Unedit selection");
	1285	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1286	+ uneditButton.setToolTipText("Unpin and remove selection controls");
551	1287	uneditButton.addActionListener(this);
552	1288
553		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
554		- allParamsButton.setToolTipText("Edit all params");
	1289	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1290	+ allParamsButton.setToolTipText("Show all controls");
555	1291	allParamsButton.addActionListener(this);
556	1292
557		- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
558		- clearPanelButton.setToolTipText("Clear edit panel");
	1293	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1294	+ clearPanelButton.setToolTipText("Clear all controls");
559	1295	clearPanelButton.addActionListener(this);
560	1296
561		- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
562		- unselectButton.setToolTipText("Unselect");
563		- unselectButton.addActionListener(this);
	1297	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1298	+ //unselectButton.setToolTipText("Unselect");
	1299	+ //unselectButton.addActionListener(this);
564	1300
565		- commandsPanel.preferredHeight = 1;
	1301	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1302	+ flashSelectionButton.setToolTipText("Highlight selection");
	1303	+ flashSelectionButton.addActionListener(this);
566	1304
567		- oe.treePanel.add(commandsPanel);
568		- oe.treePanel.Return();
	1305	+ editCommandsPanel.preferredHeight = 1;
	1306	+
	1307	+ SetPinStates(false);
	1308	+// oe.treePanel.add(commandsPanel);
	1309	+// oe.treePanel.Return();
569	1310
570	1311	// oe.aConstraints.gridx += 1;
571	1312	// oe.aConstraints.weighty = 0;
..	..	@@ -580,34 +1321,24 @@
580	1321
581	1322	cGridBag jSPPanel = new cGridBag();
582	1323
	1324	+ jSPPanel.preferredHeight = 20;
	1325	+
583	1326	JScrollPane jSP;
584	1327	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
585		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1328	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
586	1329	ResetModel();
587	1330
588	1331	oe.treePanel.add(jSPPanel);
589	1332	oe.treePanel.Return();
590	1333
591		- cGridBag copyOptionsPanel = new cGridBag();
592		-
593		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
594		- colorCB.setToolTipText("Copy color when dropped");
595		- colorCB.addItemListener(this);
596		-
597		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
598		- materialCB.setToolTipText("Copy material when dropped");
599		- materialCB.addItemListener(this);
600		-
601		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
602		- textureCB.setToolTipText("Copy texture when dropped");
603		- textureCB.addItemListener(this);
604		-
605		- copyOptionsPanel.preferredHeight = 1;
606		- oe.treePanel.add(copyOptionsPanel);
	1334	+ oe.treePanel.add(versionManagerPanel);
607	1335	oe.treePanel.Return();
	1336	+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1337	+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
	1338	+ versionSliderPane.preferredHeight = 3;
608	1339
609		-// mainPanel.setDividerLocation(0.5); //1.0);
610		-// mainPanel.setResizeWeight(0.5);
	1340	+// mainPanel.setDividerLocation(0.1); //1.0);
	1341	+ mainPanel.setResizeWeight(0.4);
611	1342
612	1343	//jList.addListSelectionListener(this);
613	1344	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -615,7 +1346,7 @@
615	1346	//jTree.setEditable(true);
616	1347	oe.jTree.setDragEnabled(true);
617	1348	//jTree.setPreferredSize(new Dimension(10,10));
618		- jSP.setPreferredSize(new Dimension(100,200));
	1349	+ //jSP.setPreferredSize(new Dimension(100,200));
619	1350
620	1351	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
621	1352
..	..	@@ -627,29 +1358,49 @@
627	1358	dgr.addDragGestureListener(this);
628	1359	}catch(Exception e) {}
629	1360	*/
630		- radio.layout = sevenButton;
	1361	+ radio.layout = threeButton; // sixButton;
631	1362	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
632	1363	}
633	1364
634	1365	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
635	1366	{
	1367	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1368	+ colorCB.setToolTipText("Copy color when dropped");
	1369	+ colorCB.addItemListener(this);
	1370	+
	1371	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1372	+ materialCB.setToolTipText("Copy material when dropped");
	1373	+ materialCB.addItemListener(this);
	1374	+
	1375	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1376	+ textureCB.setToolTipText("Copy texture when dropped");
	1377	+ textureCB.addItemListener(this);
	1378	+
	1379	+ panel.Return();
	1380	+
636	1381	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
637	1382	boxCB.setToolTipText("Display bounding boxes");
638	1383	boxCB.addItemListener(this);
639	1384
640	1385	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
641		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1386	+ zoomBoxCB.setToolTipText("Display only for wheel");
642	1387	zoomBoxCB.addItemListener(this);
643	1388
644		- if (Globals.ADVANCED)
	1389	+ if (true) // Globals.ADVANCED)
645	1390	{
646		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
647		- supportCB.setToolTipText("Enable rigging");
648		- supportCB.addItemListener(this);
	1391	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1392	+// supportCB.setToolTipText("Enable rigging");
	1393	+// supportCB.addItemListener(this);
	1394	+
	1395	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1396	+ freezeCB.setToolTipText("Fast moving camera");
	1397	+ freezeCB.addItemListener(this);
649	1398
650	1399	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
651	1400	// localCB.addItemListener(this);
652	1401
	1402	+ panel.Return();
	1403	+
653	1404	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
654	1405	crowdCB.setToolTipText("Used for crowds");
655	1406	crowdCB.addItemListener(this);
..	..	@@ -658,14 +1409,19 @@
658	1409	smoothCB.setToolTipText("Snapping delay");
659	1410	smoothCB.addItemListener(this);
660	1411
661		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
662		- slowCB.setToolTipText("Smooth interpolation");
663		- slowCB.addItemListener(this);
	1412	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1413	+// slowCB.setToolTipText("Smooth interpolation");
	1414	+// slowCB.addItemListener(this);
	1415	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1416	+ minshaderCB.setToolTipText("Minimal fast shader");
	1417	+ minshaderCB.addItemListener(this);
664	1418
665	1419	// constraints.gridy += 1;
666	1420	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
667	1421	// speakerMocapCB.addItemListener(this);
668	1422
	1423	+ panel.Return();
	1424	+
669	1425	if (false)
670	1426	{
671	1427	// handled in scripts
..	..	@@ -680,67 +1436,126 @@
680	1436	//constraints.gridy += 1;
681	1437	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
682	1438	smoothfocusCB.addItemListener(this);
	1439	+ panel.Return();
683	1440	}
684	1441
685	1442	//constraints.gridx += 1;
686	1443	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
687	1444	// debugCB.addItemListener(this);
688	1445
	1446	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1447	+ trackCB.setToolTipText("Enable tracking target");
	1448	+ trackCB.addItemListener(this);
	1449	+
689	1450	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1451	+ oeilCB.setToolTipText("Move camera when tracking");
690	1452	oeilCB.addItemListener(this);
691	1453
	1454	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1455	+ shadowCB.setToolTipText("When live compute shadows");
	1456	+ shadowCB.addItemListener(this);
	1457	+
	1458	+ panel.Return();
	1459	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1460	+ toggleTextureCB.setToolTipText("Load textures");
	1461	+ toggleTextureCB.addItemListener(this);
	1462	+
	1463	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1464	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1465	+ toggleSwitchCB.addItemListener(this);
	1466	+
	1467	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1468	+ autokeepCB.setToolTipText("On structure change");
	1469	+ autokeepCB.addItemListener(this);
	1470	+
	1471	+ panel.Return();
	1472	+ if (Globals.ADVANCED)
	1473	+ {
692	1474	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
693	1475	lookAtCB.setToolTipText("Look-at target");
694	1476	lookAtCB.addItemListener(this);
	1477	+ }
695	1478
696	1479	}
697	1480
698	1481	cGridBag fill = new cGridBag();
699		-
700	1482	fill.preferredHeight = 200;
	1483	+ cGridBag fill2 = new cGridBag();
	1484	+ fill2.preferredHeight = 200;
	1485	+ cGridBag fill3 = new cGridBag();
	1486	+ fill3.preferredHeight = 200;
701	1487
702	1488	panel.add(fill);
	1489	+ panel.add(fill2);
	1490	+ panel.add(fill3);
703	1491
704	1492	}
705	1493
706	1494	void EditObject(Object3D obj)
707	1495	{
	1496	+ assert(obj instanceof Composite);
	1497	+
	1498	+// if (obj.versionlist == null)
	1499	+// {
	1500	+// obj.versionlist = new Object3D[100];
	1501	+// obj.versionindex = -1;
	1502	+// }
	1503	+
708	1504	cRadio radioButton = new cRadio(obj.name);
	1505	+
	1506	+ // June 2019. Patch to avoid bug with transparency.
	1507	+ radioButton.hadMaterial = obj.material != null;
	1508	+ if (!radioButton.hadMaterial)
	1509	+ {
	1510	+ obj.material = new cMaterial();
	1511	+ }
	1512	+
709	1513	radioButton.SetObject(obj);
710		- radioButton.layout = sevenButton;
	1514	+ radioButton.layout = threeButton; // sixButton;
711	1515	radioButton.SetCamera(cameraView.renderCamera, false);
712	1516	radioButton.addActionListener(this);
713	1517	radioPanel.add(radioButton);
714	1518	buttonGroup.add(radioButton);
715	1519	radioButton.doClick();
716	1520	}
	1521	+
717	1522	void SetupViews(ObjEditor oe)
718	1523	{
	1524	+ theFrame = this;
	1525	+
719	1526	oe.SetupViews();
720	1527
	1528	+ if (Globals.DEBUG)
721	1529	System.out.println("SetupViews");
722	1530	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
723	1531	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
724	1532	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
725	1533	}
726	1534
727		- JCheckBox liveCB;
728		- JCheckBox supportCB;
729		- JCheckBox localCB;
730		- JCheckBox crowdCB;
731		- JCheckBox smoothCB;
732		- JCheckBox fastCB;
733		- JCheckBox slowCB;
734		- JCheckBox boxCB;
735		- JCheckBox zoomBoxCB;
736		- JCheckBox trackCB;
737		- JCheckBox smoothfocusCB;
	1535	+ cToggleButton liveCB;
	1536	+ cCheckBox supportCB;
	1537	+ cCheckBox localCB;
	1538	+ cCheckBox crowdCB;
	1539	+ cCheckBox smoothCB;
	1540	+ cCheckBox minshaderCB;
	1541	+
	1542	+ cToggleButton fastCB;
	1543	+ cCheckBox slowCB;
	1544	+ cCheckBox boxCB;
	1545	+ cCheckBox zoomBoxCB;
	1546	+ cCheckBox freezeCB;
	1547	+ //cToggleButton trackCB;
	1548	+ cCheckBox trackCB;
	1549	+ cCheckBox smoothfocusCB;
738	1550	// JCheckBox speakerMocapCB;
739		- JCheckBox speakerCameraCB;
740		- JCheckBox speakerFocusCB;
741		- JCheckBox debugCB;
742		- JCheckBox oeilCB;
743		- JCheckBox lookAtCB;
	1551	+ cCheckBox speakerCameraCB;
	1552	+ cCheckBox speakerFocusCB;
	1553	+ cCheckBox debugCB;
	1554	+
	1555	+ cCheckBox oeilCB;
	1556	+ cCheckBox shadowCB;
	1557	+ cCheckBox autokeepCB;
	1558	+ cCheckBox lookAtCB;
744	1559
745	1560	// static int COLOR = 1;
746	1561	// static int MATERIAL = 2;
..	..	@@ -748,9 +1563,9 @@
748	1563
749	1564	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
750	1565
751		- JCheckBox colorCB;
752		- JCheckBox materialCB;
753		- JCheckBox textureCB;
	1566	+ cCheckBox colorCB;
	1567	+ cCheckBox materialCB;
	1568	+ cCheckBox textureCB;
754	1569
755	1570	public void itemStateChanged(ItemEvent e)
756	1571	{
..	..	@@ -778,6 +1593,7 @@
778	1593	} else if(e.getSource() == liveCB)
779	1594	{
780	1595	cameraView.ToggleLive();
	1596	+ refreshContents(false);
781	1597	}
782	1598	else if(e.getSource() == supportCB)
783	1599	{
..	..	@@ -793,6 +1609,12 @@
793	1609	{
794	1610	cameraView.ToggleInertia();
795	1611	cameraView.repaint();
	1612	+ }
	1613	+ else if(e.getSource() == minshaderCB)
	1614	+ {
	1615	+ Globals.MINSHADER ^= true;
	1616	+ cameraView.programInitialized = false;
	1617	+ cameraView.repaint();
796	1618	}
797	1619	else if(e.getSource() == localCB)
798	1620	{
..	..	@@ -842,6 +1664,18 @@
842	1664	{
843	1665	cameraView.ToggleOeil();
844	1666	}
	1667	+ else if(e.getSource() == shadowCB)
	1668	+ {
	1669	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1670	+ }
	1671	+ else if(e.getSource() == freezeCB)
	1672	+ {
	1673	+ Globals.FREEZEONMOVE ^= true;
	1674	+ }
	1675	+ else if(e.getSource() == autokeepCB)
	1676	+ {
	1677	+ Globals.REPLACEONMAKE ^= true;
	1678	+ }
845	1679	else if(e.getSource() == lookAtCB)
846	1680	{
847	1681	cameraView.ToggleLookAt();
..	..	@@ -858,7 +1692,8 @@
858	1692
859	1693	/**/
860	1694	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
861		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1695	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1696	+ TreePath path = objEditor.jTree.getSelectionPath();
862	1697	if ((path == null) \|\| (path.getPathCount() <= 1)) {
863	1698	// We can't move the root node or an empty selection
864	1699	return;
..	..	@@ -921,8 +1756,6 @@
921	1756	}
922	1757	}
923	1758
924		- String string = (String) object;
925		-
926	1759	System.out.println("Transfer = " + object + "; drop : " + target);
927	1760	// if( object instanceof java.io.File[])
928	1761	// {
..	..	@@ -930,7 +1763,11 @@
930	1763	// objEditor.DropFile((java.io.File[]) object, true);
931	1764	// return;
932	1765	// }
933		- if (string.charAt(0) == '/')
	1766	+
	1767	+ String string = object.toString();
	1768	+
	1769	+ // File path for Mac and Windows
	1770	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
934	1771	{
935	1772	// file(s)
936	1773	String[] names = string.split("\n");
..	..	@@ -957,7 +1794,7 @@
957	1794
958	1795	flashIt = false;
959	1796	CameraPane pane = (CameraPane) target;
960		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1797	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
961	1798	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
962	1799
963	1800	if (group.selection.size() == 1)
..	..	@@ -973,23 +1810,33 @@
973	1810
974	1811	assert target == objEditor.jTree;
975	1812	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1813	+ Object3D destinationLeaf;
976	1814	try {
977		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1815	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
978	1816	} catch (Exception e) {
979	1817	System.out.println("destinationPath : " + destinationPath);
980	1818	return;
981	1819	}
982	1820
983		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1821	+ for (int i=group.selection.size(); --i>=0;)
984	1822	{
	1823	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1824	+
	1825	+ // Cannot move into itself
	1826	+ if (child == destinationLeaf)
	1827	+ return;
	1828	+ }
	1829	+
	1830	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1831	+// {
985	1832	loadClipboard(true);
986	1833	objEditor.jTree.setSelectionPath(destinationPath);
987	1834	pasteInto(false, false);
988		- } else {
989		- loadClipboard(false);
990		- objEditor.jTree.setSelectionPath(destinationPath);
991		- pasteInto(false, false); // true); // ???
992		- }
	1835	+// } else {
	1836	+// loadClipboard(false);
	1837	+// objEditor.jTree.setSelectionPath(destinationPath);
	1838	+// pasteInto(false, false); // true); // ???
	1839	+// }
993	1840	}
994	1841	public void dropActionChanged(DropTargetDragEvent dtde)
995	1842	// Called if the user has modified the current drop gesture
..	..	@@ -1045,7 +1892,12 @@
1045	1892	TreePath path;
1046	1893
1047	1894	public TransferableTreePath(TreePath tp) {
1048		- path = tp;
	1895	+ Object[] objs = new Object[tp.getPathCount()];
	1896	+ for (int i=0; i<objs.length; i++)
	1897	+ {
	1898	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1899	+ }
	1900	+ path = new TreePath(objs);
1049	1901	}
1050	1902
1051	1903	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1094,22 +1946,30 @@
1094	1946	{
1095	1947	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1096	1948	//heightFieldItem.addActionListener(this);
1097		- gridItem = menu.add(new MenuItem("Grid"));
1098		- gridItem.addActionListener(this);
1099		- rectoidItem = menu.add(new MenuItem("Box"));
1100		- rectoidItem.addActionListener(this);
1101		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1102		- ellipsoidItem.addActionListener(this);
1103		- coneItem = menu.add(new MenuItem("Cone"));
1104		- coneItem.addActionListener(this);
1105		- torusItem = menu.add(new MenuItem("Torus"));
1106		- torusItem.addActionListener(this);
1107		- superItem = menu.add(new MenuItem("Superellipsoid"));
1108		- superItem.addActionListener(this);
	1949	+// gridItem = menu.add(new MenuItem("Grid"));
	1950	+// gridItem.addActionListener(this);
	1951	+// rectoidItem = menu.add(new MenuItem("Box"));
	1952	+// rectoidItem.addActionListener(this);
	1953	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1954	+// ellipsoidItem.addActionListener(this);
	1955	+// coneItem = menu.add(new MenuItem("Cone"));
	1956	+// coneItem.addActionListener(this);
	1957	+// torusItem = menu.add(new MenuItem("Torus"));
	1958	+// torusItem.addActionListener(this);
	1959	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1960	+// superItem.addActionListener(this);
	1961	+
	1962	+ cameraItem = menu.add(new MenuItem("Camera"));
	1963	+ cameraItem.addActionListener(this);
	1964	+
	1965	+ if (!Globals.ADVANCED)
	1966	+ {
1109	1967	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1110	1968	kleinItem.addActionListener(this);
1111		- particleItem = menu.add(new MenuItem("Particle system"));
1112		- particleItem.addActionListener(this);
	1969	+ }
	1970	+
	1971	+// particleItem = menu.add(new MenuItem("Particle system"));
	1972	+// particleItem.addActionListener(this);
1113	1973	if (Globals.ADVANCED)
1114	1974	{
1115	1975	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1135,15 +1995,15 @@
1135	1995	}
1136	1996	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1137	1997	bezierItem.addActionListener(this);
1138		- overlayItem = menu.add(new MenuItem("Overlay"));
1139		- overlayItem.addActionListener(this);
1140		- lightItem = menu.add(new MenuItem("Light"));
1141		- lightItem.addActionListener(this);
	1998	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1999	+// overlayItem.addActionListener(this);
	2000	+// lightItem = menu.add(new MenuItem("Light"));
	2001	+// lightItem.addActionListener(this);
1142	2002	menu.add("-");
1143	2003	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1144	2004	//superLoopItem.addActionListener(this);
1145		- loopItem = menu.add(new MenuItem("Loop"));
1146		- loopItem.addActionListener(this);
	2005	+// loopItem = menu.add(new MenuItem("Loop"));
	2006	+// loopItem.addActionListener(this);
1147	2007	doubleItem = menu.add(new MenuItem("Fork"));
1148	2008	doubleItem.addActionListener(this);
1149	2009	if (Globals.ADVANCED)
..	..	@@ -1159,18 +2019,23 @@
1159	2019	animationItem.addItemListener(this);
1160	2020	animationItem.setState(Globals.ANIMATION);
1161	2021
	2022	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	2023	+ archiveItem.addActionListener(this);
	2024	+
1162	2025	menu.add("-");
1163	2026	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1164	2027	parseverticesItem.addActionListener(this);
1165	2028	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1166	2029	textureFieldItem.addActionListener(this);
1167		- alignItem = menu.add(new MenuItem("Align Object"));
	2030	+ alignItem = menu.add(new MenuItem("Align Objects"));
1168	2031	alignItem.addActionListener(this);
1169	2032	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1170	2033	reduceMorphItem.addActionListener(this);
1171	2034	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1172	2035	reduce34MorphItem.addActionListener(this);
1173		-
	2036	+ menu.add("-");
	2037	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	2038	+ memoryItem.addActionListener(this);
1174	2039	menu.add(computeAOItem = new MenuItem("Compute AO"));
1175	2040	computeAOItem.addActionListener(this);
1176	2041
..	..	@@ -1179,11 +2044,9 @@
1179	2044	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1180	2045	mirrorItem.addActionListener(this);
1181	2046	menu.add("-");
1182		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1183		- memoryItem.addActionListener(this);
1184	2047	menu.add(analyzeItem = new MenuItem("Analyze"));
1185	2048	analyzeItem.addActionListener(this);
1186		- menu.add(dumpItem = new MenuItem("Dump"));
	2049	+ menu.add(dumpItem = new MenuItem("Print"));
1187	2050	dumpItem.addActionListener(this);
1188	2051	// menu.add(pathItem = new MenuItem("From-to path"));
1189	2052	// pathItem.addActionListener(this);
..	..	@@ -1266,24 +2129,24 @@
1266	2129	switch(axis)
1267	2130	{
1268	2131	case 0 :
1269		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1270		- vert2.x = minima.x; vert2.y = maxima.y; vert2.z = minima.z;
1271		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1272		- vert4.x = minima.x; vert4.y = maxima.y; vert4.z = maxima.z;
	2132	+ vert1.x = minima.x + 0.001f; vert1.y = minima.y; vert1.z = minima.z;
	2133	+ vert2.x = minima.x + 0.001f; vert2.y = maxima.y; vert2.z = minima.z;
	2134	+ vert3.x = minima.x + 0.001f; vert3.y = minima.y; vert3.z = maxima.z;
	2135	+ vert4.x = minima.x + 0.001f; vert4.y = maxima.y; vert4.z = maxima.z;
1273	2136	norm = cVector.X;
1274	2137	break;
1275	2138	case 1 :
1276		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1277		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1278		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1279		- vert4.x = maxima.x; vert4.y = minima.y; vert4.z = maxima.z;
	2139	+ vert1.x = minima.x; vert1.y = minima.y + 0.001f; vert1.z = minima.z;
	2140	+ vert2.x = maxima.x; vert2.y = minima.y + 0.001f; vert2.z = minima.z;
	2141	+ vert3.x = minima.x; vert3.y = minima.y + 0.001f; vert3.z = maxima.z;
	2142	+ vert4.x = maxima.x; vert4.y = minima.y + 0.001f; vert4.z = maxima.z;
1280	2143	norm = cVector.Y;
1281	2144	break;
1282	2145	case 2 :
1283		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1284		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1285		- vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z;
1286		- vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z;
	2146	+ vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z + 0.001f;
	2147	+ vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z + 0.001f;
	2148	+ vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z + 0.001f;
	2149	+ vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z + 0.001f;
1287	2150	norm = cVector.Z;
1288	2151	break;
1289	2152	}
..	..	@@ -1324,9 +2187,38 @@
1324	2187	shadow.material = new cMaterial(obj.material);
1325	2188	shadow.material.diffuse = 0.0001f;
1326	2189	shadow.material.specular = 0.0001f;
	2190	+ shadow.material.opacity = 0.75f;
	2191	+
	2192	+ AllocProjectedVertices(shadow);
	2193	+
	2194	+ shadow.projectedVertices[1].x = 300;
1327	2195
1328	2196	makeSomething(shadow);
1329	2197	}
	2198	+
	2199	+ private void ClearUnpinned()
	2200	+ {
	2201	+ //for (Object3D obj : listUI)
	2202	+ for (int i=listUI.size(); --i>=0;)
	2203	+ {
	2204	+ Object3D obj = listUI.elementAt(i);
	2205	+ if (!obj.pinned)
	2206	+ {
	2207	+ obj.CloseUI();
	2208	+ listUI.remove(i);
	2209	+ }
	2210	+ }
	2211	+ }
	2212	+
	2213	+ private void EditElement(Object3D elem, boolean newWindow)
	2214	+ {
	2215	+ // if (!(elem instanceof Composite))
	2216	+ // newWindow = false;
	2217	+ listUI.add(elem);
	2218	+ elem.openEditWindow(this, newWindow); //, false);
	2219	+ System.out.println("edit : " + elem);
	2220	+ elem.editWindow.refreshContents(true); // ? new
	2221	+ }
1330	2222
1331	2223	/**
1332	2224	* applyExample
..	..	@@ -1530,9 +2422,9 @@
1530	2422
1531	2423	void Overwrite(int mask)
1532	2424	{
1533		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2425	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1534	2426	{
1535		- Object3D content = GrafreeD.clipboard.get(0);
	2427	+ Object3D content = Grafreed.clipboard.get(0);
1536	2428
1537	2429	if (content instanceof cGroup && ((cGroup)content).transientlink )
1538	2430	content = ((cGroup)content).get(0);
..	..	@@ -1571,7 +2463,7 @@
1571	2463	{
1572	2464	ScreenFit();
1573	2465	} else
1574		- if (source == switchItem)
	2466	+ if (source == switchViewItem)
1575	2467	{
1576	2468	cVector v1 = new cVector();
1577	2469	cVector v2 = new cVector();
..	..	@@ -1580,11 +2472,11 @@
1580	2472	objEditor.cameraView.renderCamera.setAim(v2, v1);
1581	2473	objEditor.cameraView.repaint();
1582	2474	} else
1583		- if (source == rectoidItem)
	2475	+ if (source == rectoidItem \|\| source == boxButton)
1584	2476	{
1585	2477	makeSomething(new Box());
1586	2478	} else
1587		- if (source == particleItem)
	2479	+ if (source == particleItem \|\| source == particlesButton)
1588	2480	{
1589	2481	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1590	2482	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1663,27 +2555,27 @@
1663	2555
1664	2556	makeSomething(obj);
1665	2557	} else
1666		- if (source == gridItem)
	2558	+ if (source == gridItem \|\| source == gridButton)
1667	2559	{
1668	2560	makeSomething(new Grid());
1669	2561	} else
1670		- if (source == ellipsoidItem)
	2562	+ if (source == ellipsoidItem \|\| source == sphereButton)
1671	2563	{
1672	2564	makeSomething(new Sphere());
1673	2565	} else
1674		- if (source == coneItem)
	2566	+ if (source == coneItem \|\| source == coneButton)
1675	2567	{
1676	2568	makeSomething(new Cone());
1677	2569	} else
1678		- if (source == torusItem)
	2570	+ if (source == torusItem \|\| source == torusButton)
1679	2571	{
1680	2572	makeSomething(new Torus());
1681	2573	} else
1682		- if (source == superItem)
	2574	+ if (source == superItem \|\| source == superButton)
1683	2575	{
1684	2576	makeSomething(new Superellipsoid());
1685	2577	} else
1686		- if (source == kleinItem)
	2578	+ if (source == kleinItem \|\| source == kleinButton)
1687	2579	{
1688	2580	makeSomething(new Klein());
1689	2581	} else
..	..	@@ -1703,7 +2595,7 @@
1703	2595	{
1704	2596	makeSomething(new BezierSurface());
1705	2597	} else
1706		- if (source == overlayItem)
	2598	+ if (source == overlayItem \|\| source == overlayButton)
1707	2599	{
1708	2600	/*
1709	2601	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1751,10 +2643,27 @@
1751	2643	s.setup();
1752	2644	makeSomething(s);
1753	2645	} else
1754		- if (source == lightItem)
	2646	+ if (source == lightItem \|\| source == lightButton)
1755	2647	{
1756	2648	makeSomething(new Light());
1757	2649	} else
	2650	+// if (source == skybox1Button \|\|
	2651	+// source == skybox2Button \|\|
	2652	+// source == skybox3Button \|\|
	2653	+// source == skybox4Button \|\|
	2654	+// source == skybox5Button \|\|
	2655	+// source == skybox6Button \|\|
	2656	+// source == skybox7Button \|\|
	2657	+// source == skybox11Button \|\|
	2658	+// source == skybox12Button \|\|
	2659	+// source == skybox13Button \|\|
	2660	+// source == skybox14Button \|\|
	2661	+// source == skybox15Button \|\|
	2662	+// source == skybox16Button \|\|
	2663	+// source == skybox17Button)
	2664	+// {
	2665	+// ChangeSkybox(source);
	2666	+// } else
1758	2667	if (source == csgItem)
1759	2668	{
1760	2669	group(new CSG());
..	..	@@ -1801,30 +2710,38 @@
1801	2710
1802	2711	group(g);
1803	2712	} else
1804		- if (source == loopItem)
	2713	+ if (source == loopItem \|\| source == loopButton)
1805	2714	{
	2715	+ if (!group.selection.isEmpty())
	2716	+ {
1806	2717	Composite csg = new GroupLeaf();
1807	2718	csg.count = 5;
1808		- group(csg);
1809		- Composite child = new cGroup();
	2719	+ Composite child = new cGroup("Branch");
1810	2720	csg.addChild(child);
1811	2721	child.addChild(csg);
	2722	+ group(csg);
	2723	+ }
1812	2724	} else
1813	2725	if (source == doubleItem)
1814	2726	{
1815		- Composite csg = new GroupLeaf();
	2727	+ if (!group.selection.isEmpty())
	2728	+ {
	2729	+ Composite csg = new GroupLeaf("Fork");
1816	2730	csg.count = 5;
	2731	+ Composite child = new cGroup("Branch A");
	2732	+ csg.addChild(child);
	2733	+ child.addChild(csg);
	2734	+ child = new cGroup("Branch B");
	2735	+ csg.addChild(child);
	2736	+ child.addChild(csg);
1817	2737	group(csg);
1818		- Composite child = new cGroup();
1819		- csg.addChild(child);
1820		- child.addChild(csg);
1821		- child = new cGroup();
1822		- csg.addChild(child);
1823		- child.addChild(csg);
	2738	+ }
1824	2739	} else
1825	2740	if (source == tripleItem)
1826	2741	{
1827		- Composite csg = new GroupLeaf();
	2742	+ if (!group.selection.isEmpty())
	2743	+ {
	2744	+ Composite csg = new GroupLeaf("Trident");
1828	2745	csg.count = 4;
1829	2746	group(csg);
1830	2747	Composite child = new cGroup();
..	..	@@ -1836,28 +2753,12 @@
1836	2753	child = new cGroup();
1837	2754	csg.addChild(child);
1838	2755	child.addChild(csg);
1839		- } else
1840		-
1841		- if (source == importGFDItem)
1842		- {
1843		- ImportGFD();
1844		- } else
1845		- if (source == importVRMLX3DItem)
1846		- {
1847		- ImportVRMLX3D();
1848		- } else
1849		- if (source == import3DSItem)
1850		- {
1851		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1852		- } else
1853		- if (source == importOBJItem)
1854		- {
1855		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	2756	+ }
1856	2757	} else
1857	2758	if (source == computeAOItem)
1858	2759	{
1859	2760	Globals.drawMode = CameraPane.OCCLUSION;
1860		- Globals.theRenderer.repaint();
	2761	+ cameraView.repaint();
1861	2762	} else
1862	2763	if (source == recompileItem)
1863	2764	{
..	..	@@ -1872,7 +2773,7 @@
1872	2773	if (source == invariantsItem)
1873	2774	{
1874	2775	System.out.println("Invariants:");
1875		- GrafreeD.grafreeD.universe.invariants();
	2776	+ Grafreed.grafreed.universe.invariants();
1876	2777	} else
1877	2778	if (source == memoryItem)
1878	2779	{
..	..	@@ -1891,6 +2792,65 @@
1891	2792	{
1892	2793	DumpObject();
1893	2794	} else
	2795	+ if (source == minButton)
	2796	+ {
	2797	+ Minimize();
	2798	+ } else
	2799	+ if (source == maxButton)
	2800	+ {
	2801	+ Maximize();
	2802	+ } else
	2803	+ if (source == fullButton)
	2804	+ {
	2805	+ ToggleFullScreen();
	2806	+ } else
	2807	+ if (source == collapseButton)
	2808	+ {
	2809	+ this.expandedLayout = radio.layout;
	2810	+ CollapseToolbar();
	2811	+ } else
	2812	+ if (source == maximize3DButton)
	2813	+ {
	2814	+ this.expandedLayout = radio.layout;
	2815	+ radio.layout = twoButton;
	2816	+ Show3DView();
	2817	+ CollapseToolbar();
	2818	+ } else
	2819	+ if (source == previousVersionButton)
	2820	+ {
	2821	+ // Go to previous version
	2822	+ //if (!Undo())
	2823	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2824	+ PreviousVersion();
	2825	+ } else
	2826	+ if (source == restoreButton)
	2827	+ {
	2828	+ // Restore current version
	2829	+ Restore();
	2830	+ //restoreButton.setEnabled(false);
	2831	+ } else
	2832	+ if (source == replaceButton)
	2833	+ {
	2834	+ // Overwrite current version
	2835	+ Replace();
	2836	+ //replaceButton.setEnabled(false);
	2837	+ } else
	2838	+ if (source == nextVersionButton)
	2839	+ {
	2840	+ // Go to next version
	2841	+ NextVersion();
	2842	+ } else
	2843	+ if (source == saveVersionButton)
	2844	+ {
	2845	+ // Save a new version
	2846	+ if (!Save(true))
	2847	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2848	+ } else
	2849	+ if (source == deleteVersionButton)
	2850	+ {
	2851	+ // Delete a new version
	2852	+ DeleteVersion();
	2853	+ } else
1894	2854	if (source == oneStepButton)
1895	2855	{
1896	2856	Globals.ONESTEP = true;
..	..	@@ -1898,17 +2858,14 @@
1898	2858	} else
1899	2859	if (source == screenfitButton)
1900	2860	{
1901		- //Reload(lastConverter, lastFilename, true);
1902	2861	ScreenFit();
1903	2862	} else
1904	2863	if (source == screenfitpointButton)
1905	2864	{
1906		- //Reload(lastConverter, lastFilename, true);
1907	2865	ScreenFitPoint();
1908	2866	} else
1909	2867	if (source == snapobjectButton)
1910	2868	{
1911		- //Reload(lastConverter, lastFilename, true);
1912	2869	SnapObject();
1913	2870	} else
1914	2871	// if (event.getSource() == recompileButton)
..	..	@@ -1945,12 +2902,20 @@
1945	2902	{
1946	2903	loadClipboard(true);
1947	2904	} else
	2905	+ if (source == undoItem)
	2906	+ {
	2907	+ PreviousVersion();
	2908	+ } else
	2909	+ if (source == redoItem)
	2910	+ {
	2911	+ NextVersion();
	2912	+ } else
1948	2913	if (source == duplicateItem)
1949	2914	{
1950		- Object3D keep = GrafreeD.clipboard;
	2915	+ Object3D keep = Grafreed.clipboard;
1951	2916	loadClipboard(false);
1952	2917	paste(false);
1953		- GrafreeD.clipboard = keep;
	2918	+ Grafreed.clipboard = keep;
1954	2919	} else
1955	2920	if (source == cloneItem)
1956	2921	{
..	..	@@ -2170,9 +3135,9 @@
2170	3135	// group.selection.get(0).setMasterThis(content); // should be identity
2171	3136	// refreshContents();
2172	3137	// }
2173		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	3138	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2174	3139	{
2175		- Object3D content = GrafreeD.clipboard.get(0);
	3140	+ Object3D content = Grafreed.clipboard.get(0);
2176	3141
2177	3142	if (content instanceof cGroup && ((cGroup)content).transientlink )
2178	3143	content = ((cGroup)content).get(0);
..	..	@@ -2222,9 +3187,9 @@
2222	3187	} else
2223	3188	if (source == setMasterItem)
2224	3189	{
2225		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	3190	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2226	3191	{
2227		- Object3D content = GrafreeD.clipboard.get(0);
	3192	+ Object3D content = Grafreed.clipboard.get(0);
2228	3193
2229	3194	if (content instanceof cGroup && ((cGroup)content).transientlink )
2230	3195	content = ((cGroup)content).get(0);
..	..	@@ -2237,9 +3202,9 @@
2237	3202	{
2238	3203	if (group.selection.size() == 1)
2239	3204	{
2240		- if (GrafreeD.clipboard.size() == 1)
	3205	+ if (Grafreed.clipboard.size() == 1)
2241	3206	{
2242		- Object3D content = GrafreeD.clipboard.get(0);
	3207	+ Object3D content = Grafreed.clipboard.get(0);
2243	3208
2244	3209	if (content instanceof cGroup && ((cGroup)content).transientlink )
2245	3210	content = ((cGroup)content).get(0);
..	..	@@ -2256,7 +3221,7 @@
2256	3221	{
2257	3222	RevertMeshes();
2258	3223	} else
2259		- if (source == resetMeshItem)
	3224	+ if (source == resetAllItem)
2260	3225	{
2261	3226	ResetAll();
2262	3227	} else
..	..	@@ -2264,7 +3229,7 @@
2264	3229	{
2265	3230	StepAll();
2266	3231	} else
2267		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3232	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2268	3233	{
2269	3234	//int indices[] = jList.getSelectedIndices();
2270	3235	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2276,9 +3241,9 @@
2276	3241	{
2277	3242	ClearSelection(true);
2278	3243	} else
2279		- if (source == grabItem)
	3244	+ if (source == grabItem \|\| source == groupButton)
2280	3245	{
2281		- group(new cGroup(), true);
	3246	+ group(new cGroup(), false); // true);
2282	3247	} else
2283	3248	if (source == hideItem)
2284	3249	{
..	..	@@ -2296,11 +3261,11 @@
2296	3261	{
2297	3262	makeSomething(new Camera());
2298	3263	} else
2299		- if (source == compositeItem)
	3264	+ if (source == compositeItem \|\| source == compositeButton)
2300	3265	{
2301	3266	group(new Composite());
2302	3267	} else
2303		- if (source == randomItem)
	3268	+ if (source == switchItem \|\| source == switchButton)
2304	3269	{
2305	3270	RandomNode random = new RandomNode();
2306	3271	group(random);
..	..	@@ -2402,7 +3367,7 @@
2402	3367	{
2403	3368	group(new cLinker());
2404	3369	} else
2405		- if (source == textureItem)
	3370	+ if (source == textureItem \|\| source == textureButton)
2406	3371	{
2407	3372	group(new TextureNode());
2408	3373	} else
..	..	@@ -2422,17 +3387,42 @@
2422	3387	{
2423	3388	CastShadow(2);
2424	3389	} else
2425		- if (source == ungroupItem)
	3390	+ if (source == ungroupItem \|\| source == ungroupButton)
2426	3391	{
2427		- //ungroup();
	3392	+ boolean canUngroup = true;
	3393	+
2428	3394	for (int i=0; i<group.selection.size(); i++)
2429	3395	{
2430		- Ungroup(group.selection.get(i));
	3396	+ Object3D selectedItem = group.selection.get(i);
	3397	+
	3398	+ if (selectedItem.Size() == 0)
	3399	+ {
	3400	+ // Cannot ungroup leaves
	3401	+ canUngroup = false;
	3402	+ break;
	3403	+ }
	3404	+
	3405	+ if (selectedItem == group)
	3406	+ {
	3407	+ // Cannot ungroup root
	3408	+ canUngroup = false;
	3409	+ break;
	3410	+ }
2431	3411	}
2432	3412
2433		- ClearSelection(false);
2434		-
2435		- refreshContents();
	3413	+ if (canUngroup)
	3414	+ {
	3415	+ for (int i=0; i<group.selection.size(); i++)
	3416	+ {
	3417	+ Object3D selectedItem = group.selection.get(i);
	3418	+
	3419	+ Ungroup(selectedItem);
	3420	+ }
	3421	+
	3422	+ ClearSelection(false);
	3423	+
	3424	+ refreshContents();
	3425	+ }
2436	3426	} else
2437	3427	if (source == genUVItem)
2438	3428	{
..	..	@@ -2444,7 +3434,7 @@
2444	3434	} else
2445	3435	if (source == genNormalsMESHItem)
2446	3436	{
2447		- GenNormals(true); // TODO
	3437	+ GenNormalsMESH();
2448	3438	} else
2449	3439	if (source == genNormalsORGANItem)
2450	3440	{
..	..	@@ -2478,6 +3468,10 @@
2478	3468	{
2479	3469	ClearMaterials();
2480	3470	} else
	3471	+ if (source == clearVersionsItem)
	3472	+ {
	3473	+ ClearVersions();
	3474	+ } else
2481	3475	if (source == liveleavesItem)
2482	3476	{
2483	3477	LiveLeaves(true);
..	..	@@ -2509,6 +3503,22 @@
2509	3503	if (source == unmarkleavesItem)
2510	3504	{
2511	3505	MarkLeaves(false);
	3506	+ } else
	3507	+ if (source == rewindleavesItem)
	3508	+ {
	3509	+ RewindLeaves(true);
	3510	+ } else
	3511	+ if (source == unrewindleavesItem)
	3512	+ {
	3513	+ RewindLeaves(false);
	3514	+ } else
	3515	+ if (source == randomleavesItem)
	3516	+ {
	3517	+ RandomLeaves(true);
	3518	+ } else
	3519	+ if (source == unrandomleavesItem)
	3520	+ {
	3521	+ RandomLeaves(false);
2512	3522	} else
2513	3523	if (source == flipVItem)
2514	3524	{
..	..	@@ -2594,9 +3604,13 @@
2594	3604	{
2595	3605	SmoothMesh();
2596	3606	} else
2597		- if (source == transformgeometryItem)
	3607	+ if (source == transformGeometryItem)
2598	3608	{
2599	3609	TransformGeometry();
	3610	+ } else
	3611	+ if (source == transformChildrenItem)
	3612	+ {
	3613	+ TransformChildren();
2600	3614	} else
2601	3615	if (source == resetTransformItem)
2602	3616	{
..	..	@@ -2604,7 +3618,11 @@
2604	3618	} else
2605	3619	if (source == resetCentroidItem)
2606	3620	{
2607		- ResetCentroid();
	3621	+ ResetCentroid(true);
	3622	+ } else
	3623	+ if (source == resetCentroidXZItem)
	3624	+ {
	3625	+ ResetCentroid(false);
2608	3626	} else
2609	3627	if (source == resetParentItem)
2610	3628	{
..	..	@@ -2709,7 +3727,7 @@
2709	3727	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2710	3728	{
2711	3729	obj = (Object3D)e.nextElement();
2712		- obj.SetBumpTexture(null);
	3730	+ obj.ResetBumpTexture();
2713	3731	}
2714	3732
2715	3733	refreshContents();
..	..	@@ -2725,6 +3743,31 @@
2725	3743
2726	3744	refreshContents();
2727	3745	} else
	3746	+ if (source == embedTexturesItem)
	3747	+ {
	3748	+ Object3D obj;
	3749	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3750	+ {
	3751	+ obj = (Object3D)e.nextElement();
	3752	+ obj.EmbedTextures(true);
	3753	+ }
	3754	+
	3755	+ refreshContents();
	3756	+ } else
	3757	+ if (source == deEmbedTexturesItem)
	3758	+ {
	3759	+ Object3D obj;
	3760	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3761	+ {
	3762	+ obj = (Object3D)e.nextElement();
	3763	+ obj.EmbedTextures(false);
	3764	+ }
	3765	+
	3766	+ CameraPane.texturepigment.clear();
	3767	+ CameraPane.texturebump.clear();
	3768	+
	3769	+ refreshContents();
	3770	+ } else
2728	3771	if (source == flashSelectionButton)
2729	3772	{
2730	3773	CameraPane.flash = true;
..	..	@@ -2736,42 +3779,36 @@
2736	3779	if (source == twoButton)
2737	3780	{
2738	3781	radio.layout = twoButton;
2739		- // bug
2740		- //gridPanel.setDividerLocation(1.0);
2741		- //bigPanel.setDividerLocation(0.0);
2742		-// bigThree.remove(scenePanel);
2743		-// bigThree.remove(centralPanel);
2744		-// bigThree.remove(XYZPanel);
2745		-// aWindowConstraints.gridx = 0;
2746		-// aWindowConstraints.gridy = 0;
2747		-// aWindowConstraints.gridwidth = 1;
2748		-// // aConstraints.gridheight = 3;
2749		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2750		-// aWindowConstraints.weightx = 0;
2751		-// aWindowConstraints.weighty = 1;
2752		-// //bigThree.add(jtp, aWindowConstraints);
2753		-// aWindowConstraints.weightx = 1;
2754		-// aWindowConstraints.gridwidth = 3;
2755		-// // aConstraints.gridheight = 3;
2756		-// aWindowConstraints.gridx = 1;
2757		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
2758		-// bigThree.add(centralPanel, aWindowConstraints);
2759		-// aWindowConstraints.weightx = 0;
2760		-// aWindowConstraints.gridx = 4;
2761		-// aWindowConstraints.gridwidth = 1;
2762		-// // aConstraints.gridheight = 3;
2763		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2764		-// //bigThree.add(XYZPanel, aWindowConstraints);
2765		-// scenePanel.setVisible(false);
2766		-// centralPanel.setVisible(true);
2767		-// XYZPanel.setVisible(false);
2768		- bigThree.ClearUI();
2769		- bigThree.add(centralPanel);
2770		- bigThree.FlushUI();
	3782	+
	3783	+ if (CameraPane.FULLSCREEN)
	3784	+ fullscreenLayout = radio.layout;
	3785	+
	3786	+ Show3DView();
	3787	+
	3788	+ cameraView.requestFocusInWindow();
	3789	+
	3790	+// refreshContents(true);
	3791	+//
	3792	+// try
	3793	+// {
	3794	+// java.awt.Robot bot = new java.awt.Robot();
	3795	+// int mask = InputEvent.BUTTON1_MASK;
	3796	+// bot.mouseMove(100, 100);
	3797	+// bot.mousePress(mask);
	3798	+// bot.mouseRelease(mask);
	3799	+// }
	3800	+// catch (Exception e)
	3801	+// {
	3802	+//
	3803	+// }
	3804	+
2771	3805	} else
2772	3806	if (source == threeButton)
2773	3807	{
2774	3808	radio.layout = threeButton;
	3809	+
	3810	+ if (CameraPane.FULLSCREEN)
	3811	+ fullscreenLayout = radio.layout;
2775	3812
2776	3813	// bigThree.remove(scenePanel);
2777	3814	// bigThree.remove(centralPanel);
..	..	@@ -2801,13 +3838,18 @@
2801	3838	// centralPanel.setVisible(true);
2802	3839	// XYZPanel.setVisible(true);
2803	3840	bigThree.ClearUI();
	3841	+ bigThree.add(scenePanel);
2804	3842	bigThree.add(centralPanel);
2805		- bigThree.add(XYZPanel);
2806	3843	bigThree.FlushUI();
	3844	+
	3845	+ cameraView.requestFocusInWindow();
2807	3846	} else
2808	3847	if (source == fourButton)
2809	3848	{
2810	3849	radio.layout = fourButton;
	3850	+
	3851	+ if (CameraPane.FULLSCREEN)
	3852	+ fullscreenLayout = radio.layout;
2811	3853
2812	3854	// bigThree.remove(scenePanel);
2813	3855	// bigThree.remove(centralPanel);
..	..	@@ -2839,10 +3881,15 @@
2839	3881	bigThree.ClearUI();
2840	3882	bigThree.add(scenePanel);
2841	3883	bigThree.FlushUI();
	3884	+
	3885	+ cameraView.requestFocusInWindow();
2842	3886	} else
2843	3887	if (source == sixButton)
2844	3888	{
2845	3889	radio.layout = sixButton;
	3890	+
	3891	+ if (CameraPane.FULLSCREEN)
	3892	+ fullscreenLayout = radio.layout;
2846	3893
2847	3894	// bigThree.remove(scenePanel);
2848	3895	// bigThree.remove(centralPanel);
..	..	@@ -2872,13 +3919,18 @@
2872	3919	// centralPanel.setVisible(true);
2873	3920	// XYZPanel.setVisible(false);
2874	3921	bigThree.ClearUI();
2875		- bigThree.add(scenePanel);
2876	3922	bigThree.add(centralPanel);
	3923	+ bigThree.add(scenePanel);
2877	3924	bigThree.FlushUI();
	3925	+
	3926	+ cameraView.requestFocusInWindow();
2878	3927	} else
2879	3928	if (source == sevenButton)
2880	3929	{
2881	3930	radio.layout = sevenButton;
	3931	+
	3932	+ if (CameraPane.FULLSCREEN)
	3933	+ fullscreenLayout = radio.layout;
2882	3934
2883	3935	// bigThree.remove(scenePanel);
2884	3936	// bigThree.remove(centralPanel);
..	..	@@ -2912,9 +3964,12 @@
2912	3964	bigThree.add(centralPanel);
2913	3965	bigThree.add(XYZPanel);
2914	3966	bigThree.FlushUI();
	3967	+
	3968	+ cameraView.requestFocusInWindow();
2915	3969	} else
2916	3970	if (source == rootButton)
2917	3971	{
	3972	+ Replace();
2918	3973	Object3D obj;
2919	3974	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2920	3975	{
..	..	@@ -2923,31 +3978,49 @@
2923	3978	EditObject(obj);
2924	3979	}
2925	3980
	3981	+ cameraView.requestFocusInWindow();
2926	3982	refreshContents(true);
2927	3983	} else
2928	3984	if (source == closeButton)
2929	3985	{
2930	3986	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	3987	+ Replace();
	3988	+
2931	3989	cRadio ab;
2932	3990	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2933	3991	{
2934	3992	ab = (cRadio)e.nextElement();
2935		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3993	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2936	3994	{
	3995	+ // Patch to avoid bug with transparency.
	3996	+ if (!ab.hadMaterial)
	3997	+ {
	3998	+ ab.object.material = null;
	3999	+ }
	4000	+
2937	4001	buttonGroup.remove(ab);
2938	4002	radioPanel.remove(ab);
2939	4003
2940		- ab.GetObject().editWindow = null;
	4004	+ //ab.GetObject().editWindow = null;
	4005	+ ab.GetObject().manipWindow = null;
2941	4006	// ab.GetObject().objectUI = null; // ?????????
2942	4007
2943	4008	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2944	4009	break;
2945	4010	}
2946	4011	}
	4012	+
	4013	+ cameraView.requestFocusInWindow();
2947	4014	refreshContents(true);
2948	4015	} else
2949	4016	if (source == editItem \|\| source == editButton)
2950	4017	{
	4018	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4019	+ {
	4020	+ Object3D child = (Object3D)e.nextElement();
	4021	+ child.pinned = true;
	4022	+ }
	4023	+
2951	4024	EditSelection(false);
2952	4025	} else
2953	4026	if (source == uneditButton)
..	..	@@ -2956,11 +4029,12 @@
2956	4029	{
2957	4030	Object3D child = (Object3D)e.nextElement();
2958	4031	if(child.editWindow != null)
2959		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4032	+ child.pinned = false;
2960	4033	child.CloseUI();
2961	4034	listUI.remove(child);
	4035	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2962	4036
2963		- child.editWindow = null; // ???????????
	4037	+ //child.editWindow = null; // ???????????
2964	4038	}
2965	4039	objEditor.ctrlPanel.FlushUI();
2966	4040	//objEditor.jTree.clearSelection();
..	..	@@ -2973,16 +4047,18 @@
2973	4047	//copy.ClearUI();
2974	4048	for (Object3D obj : listUI)
2975	4049	{
	4050	+ obj.pinned = false;
2976	4051	obj.CloseUI();
2977	4052	}
2978	4053	listUI.clear();
	4054	+ SetPinStates(group.selection.size() > 0);
2979	4055	refreshContents(true);
2980	4056	} else
2981	4057	if (source == allParamsButton)
2982	4058	{
2983	4059	assert(copy == group);
2984	4060
2985		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4061	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2986	4062
2987	4063	for (Object3D obj : listUI)
2988	4064	{
..	..	@@ -3008,6 +4084,8 @@
3008	4084	} else
3009	4085	if(source instanceof cRadio)
3010	4086	{
	4087	+ Replace();
	4088	+
3011	4089	group.parent = keepparent;
3012	4090	group.attributes = 0;
3013	4091	//group.editWindow = null;
..	..	@@ -3031,6 +4109,7 @@
3031	4109	}
3032	4110
3033	4111	copy = group;
	4112	+
3034	4113	//Globals.theRenderer.object = group;
3035	4114	if(!useclient)
3036	4115	{
..	..	@@ -3046,20 +4125,74 @@
3046	4125	frontView.object = group;
3047	4126	sideView.object = group;
3048	4127	}
3049		- group.editWindow = this;
	4128	+
	4129	+// fix "+" issue
	4130	+ //group.editWindow = this;
	4131	+ group.manipWindow = this;
	4132	+
3050	4133	/*
3051	4134	currentLayout = radio.layout;
3052	4135	if (currentLayout == null)
3053	4136	currentLayout = sevenButton;
3054	4137	*/
3055	4138	radio.layout.doClick();
	4139	+
	4140	+ assert(copy instanceof Composite);
	4141	+
	4142	+ if (copy.versionlist == null)
	4143	+ {
	4144	+ copy.versionindex = -1;
	4145	+
	4146	+ // Cannot work with loops
	4147	+ // To fix this issue, we first mark all nodes above the root,
	4148	+ // and check if any of these nodes are reachable below the root.
	4149	+ Grafreed.grafreed.universe.TagObjects(copy, true);
	4150	+
	4151	+ if (copy.versionlist == null && !copy.HasTags())
	4152	+ {
	4153	+ copy.versionlist = new Object3D[100];
	4154	+
	4155	+ //Save(true);
	4156	+ }
	4157	+ else
	4158	+ copy.versionindex = -2;
	4159	+
	4160	+ Grafreed.grafreed.universe.TagObjects(copy, false);
	4161	+ }
	4162	+
	4163	+ SetVersionStates();
	4164	+
	4165	+ ClearUnpinned();
	4166	+
	4167	+ //Grafreed.Assert(group != null);
	4168	+ //Grafreed.Assert(group.selection != null);
	4169	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4170	+ if (group.selection == null \|\| group.selection.size() == 1)
	4171	+ EditSelection(false);
3056	4172	keepparent = group.parent;
3057	4173	// PARENT = NULL or not???
3058	4174	//group.parent = null; // ROOT
3059	4175	//group.attributes = -1;
3060	4176	ResetModel();
	4177	+
	4178	+ cameraView.requestFocusInWindow();
3061	4179	refreshContents(true);
3062		- }
	4180	+ } else if (event.getSource() == editCameraItem)
	4181	+ {
	4182	+ cameraView.ProtectCamera();
	4183	+ cameraView.requestFocusInWindow();
	4184	+ cameraView.repaint();
	4185	+ return;
	4186	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	4187	+ {
	4188	+ cameraView.RevertCamera();
	4189	+ cameraView.requestFocusInWindow();
	4190	+ cameraView.repaint();
	4191	+ return;
	4192	+ // } else if (event.getSource() == textureButton)
	4193	+ // {
	4194	+ // return; // true;
	4195	+ }
3063	4196	else
3064	4197	{
3065	4198	//return super.action(event, arg);
..	..	@@ -3068,7 +4201,6 @@
3068	4201	}
3069	4202
3070	4203	boolean useclient = false;
3071		- cRadio radio;
3072	4204
3073	4205	void ToggleRoot()
3074	4206	{
..	..	@@ -3120,6 +4252,28 @@
3120	4252	refreshContents();
3121	4253	}
3122	4254
	4255	+ void TransformChildren()
	4256	+ {
	4257	+ Object3D obj;
	4258	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4259	+ {
	4260	+ obj = (Object3D)e.nextElement();
	4261	+ obj.KeepTextureMatrices();
	4262	+ obj.TransformChildren();
	4263	+ obj.RestoreTextureMatrices();
	4264	+
	4265	+// if (obj.parent == null)
	4266	+// {
	4267	+// System.out.println("NULL PARENT!");
	4268	+// new Exception().printStackTrace();
	4269	+// }
	4270	+// else
	4271	+// TouchTransform(obj);
	4272	+// //obj.parent.Touch();
	4273	+ }
	4274	+
	4275	+ refreshContents();
	4276	+ }
3123	4277
3124	4278	void ResetTransform()
3125	4279	{
..	..	@@ -3151,7 +4305,7 @@
3151	4305	TouchTransform(obj);
3152	4306	continue;
3153	4307	}
3154		- if ((mask&2) != 0) // Scale
	4308	+ if ((mask&2) != 0) // Scale/rotation
3155	4309	{
3156	4310	obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
3157	4311	obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
..	..	@@ -3159,10 +4313,6 @@
3159	4313	obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
3160	4314	obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
3161	4315	obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
3162		- }
3163		- if ((mask&4) != 0) // Rotation
3164		- {
3165		- // ?
3166	4316	}
3167	4317	if ((mask&1) != 0) // Translation
3168	4318	{
..	..	@@ -3232,7 +4382,7 @@
3232	4382	refreshContents();
3233	4383	}
3234	4384
3235		- void ResetCentroid()
	4385	+ void ResetCentroid(boolean full)
3236	4386	{
3237	4387	Object3D obj;
3238	4388	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3247,12 +4397,16 @@
3247	4397	LA.matIdentity(Object3D.mat);
3248	4398	obj.getBounds(minima, maxima, false);
3249	4399	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3250		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	4400	+ if (full)
	4401	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3251	4402	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3252	4403	obj.TransformMesh(Object3D.mat);
	4404	+
3253	4405	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3254		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	4406	+ if (full)
	4407	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3255	4408	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	4409	+
3256	4410	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3257	4411	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3258	4412	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3281,7 +4435,8 @@
3281	4435
3282	4436	int size = obj.MemorySize();
3283	4437
3284		- System.err.println((size/1024) + " KB is the size of " + obj);
	4438	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4439	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3285	4440	}
3286	4441	}
3287	4442	catch (Exception e)
..	..	@@ -3318,9 +4473,9 @@
3318	4473	obj = (Object3D)e.nextElement();
3319	4474
3320	4475	System.out.println("Object is: " + obj);
3321		- GrafreeD.AnalyzeObject(obj);
	4476	+ Grafreed.AnalyzeObject(obj);
3322	4477	System.out.println("Boundary rep: " + obj.bRep);
3323		- GrafreeD.AnalyzeObject(obj.bRep);
	4478	+ Grafreed.AnalyzeObject(obj.bRep);
3324	4479
3325	4480	// System.err.println((size/1024) + " KB is the size of " + obj);
3326	4481	}
..	..	@@ -3362,6 +4517,13 @@
3362	4517	void GenNormals(boolean crease)
3363	4518	{
3364	4519	group.GenNormalsS(crease);
	4520	+
	4521	+ refreshContents();
	4522	+ }
	4523	+
	4524	+ void GenNormalsMESH()
	4525	+ {
	4526	+ group.GenNormalsMeshS();
3365	4527
3366	4528	refreshContents();
3367	4529	}
..	..	@@ -3534,8 +4696,8 @@
3534	4696
3535	4697	void ParseVertices()
3536	4698	{
3537		- boolean epsequal = GrafreeD.epsequal;
3538		- GrafreeD.epsequal = true;
	4699	+ boolean epsequal = Grafreed.epsequal;
	4700	+ Grafreed.epsequal = true;
3539	4701
3540	4702	for (int i=0; i<group.selection.size(); i++)
3541	4703	{
..	..	@@ -3560,7 +4722,7 @@
3560	4722	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3561	4723	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3562	4724
3563		- g.add(GrafreeD.clipboard);
	4725	+ g.add(Grafreed.clipboard);
3564	4726
3565	4727	buffer.add(g);
3566	4728	}
..	..	@@ -3575,7 +4737,7 @@
3575	4737	makeSomething(buffer, i==group.selection.size()-1);
3576	4738	}
3577	4739
3578		- GrafreeD.epsequal = epsequal;
	4740	+ Grafreed.epsequal = epsequal;
3579	4741
3580	4742	refreshContents();
3581	4743	}
..	..	@@ -3593,7 +4755,16 @@
3593	4755	String pigment = Object3D.GetPigment(tex);
3594	4756	//String bump = Object3D.GetBump(tex);
3595	4757
3596		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4758	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4759	+
	4760	+ try
	4761	+ {
	4762	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
	4763	+ }
	4764	+ catch (Exception e)
	4765	+ {
	4766	+ System.err.println("FAIL: " + node);
	4767	+ }
3597	4768
3598	4769	double s = v.s;
3599	4770
..	..	@@ -3725,7 +4896,7 @@
3725	4896	return;
3726	4897
3727	4898	Object3D poses = group.selection.get(0);
3728		- Object3D ref = GrafreeD.clipboard.get(0);
	4899	+ Object3D ref = Grafreed.clipboard.get(0);
3729	4900
3730	4901	Object3D newgroup = new Object3D("Po:" + poses.name);
3731	4902
..	..	@@ -3919,9 +5090,9 @@
3919	5090
3920	5091	void ClipMesh()
3921	5092	{
3922		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	5093	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3923	5094	{
3924		- Object3D content = GrafreeD.clipboard.get(0);
	5095	+ Object3D content = Grafreed.clipboard.get(0);
3925	5096
3926	5097	if (content instanceof cGroup && ((cGroup)content).transientlink )
3927	5098	content = ((cGroup)content).get(0);
..	..	@@ -3930,7 +5101,7 @@
3930	5101	// {
3931	5102	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3932	5103	// }
3933		- group.selection.ClipMesh(GrafreeD.clipboard);
	5104	+ group.selection.ClipMesh(Grafreed.clipboard);
3934	5105	}
3935	5106	// group.selection.ClipMesh(GrafreeD.clipboard);
3936	5107	System.out.println("DONE.");
..	..	@@ -3947,6 +5118,12 @@
3947	5118	void ClearMaterials()
3948	5119	{
3949	5120	group.selection.ClearMaterials();
	5121	+ refreshContents();
	5122	+ }
	5123	+
	5124	+ void ClearVersions()
	5125	+ {
	5126	+ group.selection.ClearVersions();
3950	5127	refreshContents();
3951	5128	}
3952	5129
..	..	@@ -3977,6 +5154,18 @@
3977	5154	void MarkLeaves(boolean hide)
3978	5155	{
3979	5156	group.selection.MarkLeaves(hide);
	5157	+ refreshContents();
	5158	+ }
	5159	+
	5160	+ void RewindLeaves(boolean hide)
	5161	+ {
	5162	+ group.selection.RewindLeaves(hide);
	5163	+ refreshContents();
	5164	+ }
	5165	+
	5166	+ void RandomLeaves(boolean hide)
	5167	+ {
	5168	+ group.selection.RandomLeaves(hide);
3980	5169	refreshContents();
3981	5170	}
3982	5171
..	..	@@ -4051,28 +5240,25 @@
4051	5240	// }
4052	5241	// }
4053	5242
4054		- static boolean allparams = true;
4055		-
4056		- static Vector<Object3D> listUI = new Vector<Object3D>();
4057		-
4058	5243	void EditSelection(boolean newWindow)
4059	5244	{
	5245	+ if (group.selection == null)
	5246	+ {
	5247	+ EditElement(group, newWindow); // ? new
	5248	+ return;
	5249	+ }
	5250	+
4060	5251	// aConstraints.gridy = 0;
4061	5252	for (int i=0; i<group.selection.size(); i++)
4062	5253	{
4063	5254	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4064	5255	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4065		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5256	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4066	5257
4067	5258	Object3D elem = (Object3D)group.selection.elementAt(i);
4068		- if(elem != group)
	5259	+ if(elem != group \|\| !newWindow)
4069	5260	{
4070		- // if (!(elem instanceof Composite))
4071		- // newWindow = false;
4072		- listUI.add(elem);
4073		- elem.openEditWindow(this, newWindow); //, false);
4074		- System.out.println("edit : " + elem);
4075		- elem.editWindow.refreshContents(true); // ? new
	5261	+ EditElement(elem, newWindow); // ? new
4076	5262	}
4077	5263	}
4078	5264	}
..	..	@@ -4135,9 +5321,7 @@
4135	5321
4136	5322	freezemodel = false;
4137	5323	}
4138		-
4139		- boolean flashIt = true;
4140		-
	5324	+
4141	5325	public void valueChanged(TreeSelectionEvent e)
4142	5326	//public boolean handleEvent(Event event)
4143	5327	{
..	..	@@ -4147,7 +5331,8 @@
4147	5331	//new Exception().printStackTrace();
4148	5332
4149	5333	freezemodel = true;
4150		-
	5334	+ ClearUnpinned();
	5335	+
4151	5336	/**/
4152	5337	//switch (event.id)
4153	5338	{
..	..	@@ -4155,7 +5340,6 @@
4155	5340	//case 702: // Event.LIST_DESELECT
4156	5341	group.deselectAll();
4157	5342	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4158		- objEditor.ClearInfo(); // .GetMaterial());
4159	5343	if (tps != null)
4160	5344	{
4161	5345	for (int i=0; i < tps.length; i++)
..	..	@@ -4164,10 +5348,8 @@
4164	5348
4165	5349	//if (child.parent != null)
4166	5350	//child.parent.addSelectee(child);
	5351	+ objEditor.SetMaterial(child);
4167	5352	group.addSelectee(child);
4168		- objEditor.SetMaterial(child); // .GetMaterial());
4169		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4170		- System.err.println("info : " + child.GetPath());
4171	5353	}
4172	5354	}
4173	5355	// else
..	..	@@ -4177,20 +5359,28 @@
4177	5359	// System.err.println("info : " + group.GetPath());
4178	5360	// }
4179	5361
4180		- objEditor.SetText(); // jan 2014
4181		-
4182		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	5362	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4183	5363	CameraPane.flash = true;
4184	5364
4185		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5365	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4186	5366	// a camera
4187	5367	{
4188		- CameraPane.camerachangeframe = 0; // don't refuse it
4189		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5368	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5369	+ {
	5370	+ CameraPane.camerachangeframe = 0; // don't refuse it
	5371	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5372	+ }
4190	5373	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4191	5374	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4192	5375	}
4193	5376
	5377	+ if (tps != null && tps.length == 1)
	5378	+ {
	5379	+ EditSelection(false);
	5380	+ }
	5381	+
	5382	+ SetPinStates(tps != null && tps.length > 0);
	5383	+
4194	5384	refreshContents();
4195	5385	//return true;
4196	5386	}
..	..	@@ -4199,6 +5389,53 @@
4199	5389
4200	5390	freezemodel = false;
4201	5391	}
	5392	+
	5393	+ void SetPinStates(boolean enabled)
	5394	+ {
	5395	+ editButton.setEnabled(enabled);
	5396	+ uneditButton.setEnabled(enabled);
	5397	+ //unselectButton.setEnabled(enabled);
	5398	+ flashSelectionButton.setEnabled(enabled);
	5399	+
	5400	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5401	+
	5402	+ boolean allComposites = true;
	5403	+
	5404	+ if (group.selection != null)
	5405	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5406	+ {
	5407	+ Object next = e.nextElement();
	5408	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5409	+ {
	5410	+ allComposites = false;
	5411	+ break;
	5412	+ }
	5413	+ }
	5414	+
	5415	+ rootButton.setEnabled(allComposites);
	5416	+ }
	5417	+
	5418	+ void refreshContents(boolean cp)
	5419	+ {
	5420	+ if (Globals.ADVANCED)
	5421	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5422	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5423	+ {
	5424	+ objEditor.ClearInfo(); // .GetMaterial());
	5425	+
	5426	+ for (int i=0; i < group.selection.Size(); i++)
	5427	+ {
	5428	+ Object3D child = (Object3D) group.selection.get(i);
	5429	+
	5430	+ objEditor.AddInfo(child, this, true);
	5431	+// System.err.println("info : " + child.GetPath());
	5432	+ }
	5433	+
	5434	+ objEditor.SetText(); // jan 2014
	5435	+ }
	5436	+
	5437	+ super.refreshContents(cp);
	5438	+ }
4202	5439
4203	5440	void linkSomething(Object3D thing)
4204	5441	{
..	..	@@ -4270,16 +5507,19 @@
4270	5507	{
4271	5508	if (group.selection.isEmpty())
4272	5509	return;
4273		- GrafreeD.clipboardIsTempGroup = false;
	5510	+
	5511	+ Grafreed.clipboardIsTempGroup = false;
4274	5512	Composite tGroup = null;
4275	5513	if (group.selection.size() > 0) // 1)
4276	5514	{
4277	5515	tGroup = new cGroup();
4278		- GrafreeD.clipboardIsTempGroup = true;
	5516	+ Grafreed.clipboardIsTempGroup = true;
4279	5517	}
4280	5518
4281	5519	if (cut)
4282	5520	{
	5521	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5522	+// Save();
4283	5523	//int indices[] = jList.getSelectedIndices();
4284	5524	//for (int i = indices.length - 1; i >= 0; i--)
4285	5525	//jList.remove(indices[i]);
..	..	@@ -4315,16 +5555,16 @@
4315	5555	//System.out.println("cut " + child);
4316	5556	//System.out.println("parent = " + child.parent);
4317	5557	// tmp.addChild(child);
4318		- if (GrafreeD.clipboardIsTempGroup)
	5558	+ if (Grafreed.clipboardIsTempGroup)
4319	5559	tGroup.add/Child/(tmp);
4320	5560	else
4321		- GrafreeD.clipboard = tmp;
	5561	+ Grafreed.clipboard = tmp;
4322	5562	}
4323	5563	else
4324		- if (GrafreeD.clipboardIsTempGroup)
	5564	+ if (Grafreed.clipboardIsTempGroup)
4325	5565	tGroup.add/Child/(child);
4326	5566	else
4327		- GrafreeD.clipboard = child;
	5567	+ Grafreed.clipboard = child;
4328	5568	}
4329	5569
4330	5570	//ResetModel();
..	..	@@ -4356,21 +5596,23 @@
4356	5596	//System.out.println("cut " + elem);
4357	5597	//System.out.println("parent = " + elem.parent);
4358	5598	// tmp.addChild(elem);
4359		- if (GrafreeD.clipboardIsTempGroup)
	5599	+ if (Grafreed.clipboardIsTempGroup)
4360	5600	tGroup.add/Child/(tmp);
4361	5601	else
4362		- GrafreeD.clipboard = tmp;
	5602	+ Grafreed.clipboard = tmp;
4363	5603	}
4364	5604	else
4365		- if (GrafreeD.clipboardIsTempGroup)
	5605	+ if (Grafreed.clipboardIsTempGroup)
4366	5606	tGroup.add/Child/(child);
4367	5607	else
4368		- GrafreeD.clipboard = child;
	5608	+ Grafreed.clipboard = child;
4369	5609	}
4370	5610
4371	5611	}
4372		- if (GrafreeD.clipboardIsTempGroup)
4373		- GrafreeD.clipboard = tGroup;
	5612	+
	5613	+ if (Grafreed.clipboardIsTempGroup)
	5614	+ Grafreed.clipboard = tGroup;
	5615	+
4374	5616	if (cut)
4375	5617	{
4376	5618	ResetModel();
..	..	@@ -4380,11 +5622,15 @@
4380	5622
4381	5623	void paste(boolean expand)
4382	5624	{
	5625	+ if (Globals.REPLACEONMAKE)
	5626	+ Save();
	5627	+ boolean keep = Globals.REPLACEONMAKE;
	5628	+ Globals.REPLACEONMAKE = false;
4383	5629	// if (GrafreeD.clipboard == null)
4384	5630	// return;
4385	5631	boolean first = true;
4386	5632
4387		- if (GrafreeD.clipboardIsTempGroup)
	5633	+ if (Grafreed.clipboardIsTempGroup)
4388	5634	{
4389	5635	Composite temp;
4390	5636
..	..	@@ -4395,7 +5641,7 @@
4395	5641	temp = (Composite)Applet3D.clipboard.deepCopy();
4396	5642	*/
4397	5643	Object3D elem;
4398		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5644	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4399	5645	{
4400	5646	Object3D child = (Object3D)e.nextElement();
4401	5647
..	..	@@ -4429,16 +5675,17 @@
4429	5675	//Object3D cb = Applet3D.clipboard;
4430	5676	//temp.addChild(cb);
4431	5677	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4432		- assert(GrafreeD.clipboard.parent == null);
4433		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4434		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4435		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4436		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	5678	+ assert(Grafreed.clipboard.parent == null);
	5679	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5680	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5681	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5682	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4437	5683	else
4438		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4439		- GrafreeD.clipboard.get(0).parent = keepparent;
	5684	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5685	+ Grafreed.clipboard.get(0).parent = keepparent;
4440	5686	}
4441	5687
	5688	+ Globals.REPLACEONMAKE = keep;
4442	5689	ResetModel();
4443	5690	refreshContents();
4444	5691	}
..	..	@@ -4485,9 +5732,9 @@
4485	5732	{
4486	5733	boolean first = true;
4487	5734
4488		- if (GrafreeD.clipboardIsTempGroup)
	5735	+ if (Grafreed.clipboardIsTempGroup)
4489	5736	{
4490		- Composite temp = (Composite)GrafreeD.clipboard;
	5737	+ Composite temp = (Composite)Grafreed.clipboard;
4491	5738	Object3D copy;
4492	5739	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4493	5740	{
..	..	@@ -4497,7 +5744,7 @@
4497	5744	}
4498	5745	} else
4499	5746	{
4500		- linkSomething(GrafreeD.clipboard); //.get(0));
	5747	+ linkSomething(Grafreed.clipboard); //.get(0));
4501	5748	}
4502	5749	}
4503	5750	}
..	..	@@ -4574,6 +5821,10 @@
4574	5821
4575	5822	void group(Object3D csg, boolean grab)
4576	5823	{
	5824	+ if (Globals.REPLACEONMAKE)
	5825	+ Save();
	5826	+ boolean keep = Globals.REPLACEONMAKE;
	5827	+ Globals.REPLACEONMAKE = false;
4577	5828	if (//false) // why??
4578	5829	!group.selection.isEmpty())
4579	5830	{
..	..	@@ -4687,10 +5938,15 @@
4687	5938	//node.add(csg);
4688	5939	//makeSomething(node);
4689	5940	makeSomething(csg);
	5941	+ Globals.REPLACEONMAKE = keep;
4690	5942	}
4691	5943
4692	5944	void Ungroup(Object3D g)
4693	5945	{
	5946	+ if (Globals.REPLACEONMAKE)
	5947	+ Save();
	5948	+ boolean keep = Globals.REPLACEONMAKE;
	5949	+ Globals.REPLACEONMAKE = false;
4694	5950	if (g instanceof HiddenObject)
4695	5951	{
4696	5952	HiddenObject h = (HiddenObject) g;
..	..	@@ -4707,6 +5963,7 @@
4707	5963	objEditor.makeSomething(g.get(i), false);
4708	5964	}
4709	5965	}
	5966	+ Globals.REPLACEONMAKE = keep;
4710	5967	}
4711	5968
4712	5969	void ungroup()
..	..	@@ -4902,21 +6159,6 @@
4902	6159	}
4903	6160	*/
4904	6161
4905		- void ImportGFD()
4906		- {
4907		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4908		- browser.show();
4909		- String filename = browser.getFile();
4910		- if (filename != null && filename.length() > 0)
4911		- {
4912		- String fullname = browser.getDirectory() + filename;
4913		-
4914		- //Object3D readobj =
4915		- objEditor.ReadGFD(fullname, objEditor);
4916		- //makeSomething(readobj);
4917		- }
4918		- }
4919		-
4920	6162	/*
4921	6163	public void Callback(Object obj)
4922	6164	{
..	..	@@ -4940,26 +6182,9 @@
4940	6182	}
4941	6183	*/
4942	6184
4943		- void ImportVRMLX3D()
4944		- {
4945		- if (GrafreeD.standAlone)
4946		- {
4947		- /**/
4948		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4949		- browser.show();
4950		- String filename = browser.getFile();
4951		- if (filename != null && filename.length() > 0)
4952		- {
4953		- String fullname = browser.getDirectory() + filename;
4954		- LoadVRMLX3D(fullname);
4955		- }
4956		- /**/
4957		- }
4958		- }
4959		-
4960	6185	String GetFile(String dialogName)
4961	6186	{
4962		- if (GrafreeD.standAlone)
	6187	+ if (Grafreed.standAlone)
4963	6188	{
4964	6189	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4965	6190	browser.show();
..	..	@@ -5027,7 +6252,43 @@
5027	6252	cButton clearpanelButton;
5028	6253	cButton unselectButton;
5029	6254
	6255	+ cButton restoreCameraButton;
	6256	+
5030	6257	cButton oneStepButton;
	6258	+
	6259	+ cButton groupButton;
	6260	+ cButton ungroupButton;
	6261	+ cButton compositeButton;
	6262	+ cButton switchButton;
	6263	+ cButton loopButton;
	6264	+ cButton textureButton;
	6265	+
	6266	+ cButton skybox1Button;
	6267	+ cButton skybox2Button;
	6268	+ cButton skybox3Button;
	6269	+ cButton skybox4Button;
	6270	+ cButton skybox5Button;
	6271	+ cButton skybox6Button;
	6272	+ cButton skybox7Button;
	6273	+
	6274	+ cButton skybox11Button;
	6275	+ cButton skybox12Button;
	6276	+ cButton skybox13Button;
	6277	+ cButton skybox14Button;
	6278	+ cButton skybox15Button;
	6279	+ cButton skybox16Button;
	6280	+ cButton skybox17Button;
	6281	+
	6282	+ cButton gridButton;
	6283	+ cButton boxButton;
	6284	+ cButton sphereButton;
	6285	+ cButton coneButton;
	6286	+ cButton torusButton;
	6287	+ cButton superButton;
	6288	+ cButton kleinButton;
	6289	+ cButton particlesButton;
	6290	+ cButton overlayButton;
	6291	+ cButton lightButton;
5031	6292
5032	6293	cButton screenfitButton;
5033	6294	cButton screenfitpointButton;
..	..	@@ -5040,14 +6301,6 @@
5040	6301
5041	6302	cButton setsupportButton;
5042	6303
5043		- cButton twoButton;
5044		- cButton sixButton;
5045		- cButton threeButton;
5046		- cButton sevenButton;
5047		- cButton fourButton; // full panel
5048		- cButton oneButton; // full XYZ
5049		- //cButton currentLayout;
5050		-
5051	6304	//
5052	6305	//Composite
5053	6306	Object3D // to do !!
..	..	@@ -5057,10 +6310,12 @@
5057	6310	//JTree jTree;
5058	6311	private MenuItem lookAtItem;
5059	6312	private MenuItem lookFromItem;
5060		- private MenuItem switchItem;
5061		- private MenuItem cutItem;
5062		- private MenuItem duplicateItem;
5063		- private MenuItem cloneItem;
	6313	+ private MenuItem switchViewItem;
	6314	+ private JMenuItem cutItem;
	6315	+ private MenuItem undoItem;
	6316	+ private MenuItem redoItem;
	6317	+ private JMenuItem duplicateItem;
	6318	+ private JMenuItem cloneItem;
5064	6319	private MenuItem cloneSupportItem;
5065	6320	private MenuItem overwriteGeoItem;
5066	6321	private MenuItem overwriteMatItem;
..	..	@@ -5072,7 +6327,7 @@
5072	6327	private MenuItem linkverticesItem;
5073	6328	private MenuItem relinkverticesItem;
5074	6329	private MenuItem setMasterItem;
5075		- private MenuItem resetMeshItem;
	6330	+ private MenuItem resetAllItem;
5076	6331	private MenuItem stepAllItem;
5077	6332	private MenuItem revertMeshItem;
5078	6333	private MenuItem poseMeshItem;
..	..	@@ -5081,13 +6336,13 @@
5081	6336	private MenuItem cloneGeometriesItem;
5082	6337	private MenuItem shareGeometriesItem;
5083	6338	private MenuItem mergeGeometriesItem;
5084		- private MenuItem copyItem;
	6339	+ private JMenuItem copyItem;
5085	6340	private MenuItem pasteItem;
5086		- private MenuItem pasteIntoItem;
5087		- private MenuItem pasteLinkItem;
5088		- private MenuItem pasteCloneItem;
5089		- private MenuItem pasteExpandItem;
5090		- private MenuItem clearItem;
	6341	+ private JMenuItem pasteIntoItem;
	6342	+ private JMenuItem pasteLinkItem;
	6343	+ private JMenuItem pasteCloneItem;
	6344	+ private JMenuItem pasteExpandItem;
	6345	+ private JMenuItem deleteItem;
5091	6346	private MenuItem clearAllItem;
5092	6347	private MenuItem genUVItem;
5093	6348	private MenuItem genNormalsMESHItem;
..	..	@@ -5113,6 +6368,7 @@
5113	6368	private MenuItem clipMeshItem;
5114	6369	private MenuItem smoothMeshItem;
5115	6370	private MenuItem clearMaterialsItem;
	6371	+ private MenuItem clearVersionsItem;
5116	6372
5117	6373	private MenuItem liveleavesItem;
5118	6374	private MenuItem unliveleavesItem;
..	..	@@ -5122,6 +6378,10 @@
5122	6378	private MenuItem showleavesItem;
5123	6379	private MenuItem markleavesItem;
5124	6380	private MenuItem unmarkleavesItem;
	6381	+ private MenuItem rewindleavesItem;
	6382	+ private MenuItem unrewindleavesItem;
	6383	+ private MenuItem randomleavesItem;
	6384	+ private MenuItem unrandomleavesItem;
5125	6385
5126	6386	private MenuItem flipVItem;
5127	6387	private MenuItem unflipVItem;
..	..	@@ -5133,15 +6393,17 @@
5133	6393	private MenuItem panoTexturesItem;
5134	6394
5135	6395	private MenuItem resetCentroidItem;
5136		- private MenuItem transformgeometryItem;
	6396	+ private MenuItem resetCentroidXZItem;
5137	6397	private MenuItem resetTransformItem;
	6398	+ private MenuItem transformGeometryItem;
	6399	+ private MenuItem transformChildrenItem;
5138	6400	private MenuItem hideItem;
5139		- private MenuItem grabItem;
	6401	+ private JMenuItem grabItem;
5140	6402	private MenuItem backItem;
5141	6403	private MenuItem frontItem;
5142	6404	private MenuItem cameraItem;
5143	6405	private MenuItem compositeItem;
5144		- private MenuItem randomItem;
	6406	+ private MenuItem switchItem;
5145	6407	private MenuItem physicsItem;
5146	6408	private MenuItem frameselectorItem;
5147	6409	private MenuItem scriptNodeItem;
..	..	@@ -5149,7 +6411,7 @@
5149	6411	private MenuItem switchTransfoItem;
5150	6412	private MenuItem morphItem;
5151	6413	private MenuItem linkerItem;
5152		- private MenuItem ungroupItem;
	6414	+ private JMenuItem ungroupItem;
5153	6415	private MenuItem editItem;
5154	6416	private MenuItem openWindowItem;
5155	6417	private MenuItem editLeafItem;
..	..	@@ -5165,6 +6427,8 @@
5165	6427	private MenuItem attachBumpItem;
5166	6428	private MenuItem detachBumpItem;
5167	6429	private MenuItem pigmentBumpItem;
	6430	+ private MenuItem embedTexturesItem;
	6431	+ private MenuItem deEmbedTexturesItem;
5168	6432
5169	6433	private MenuItem particleItem;
5170	6434	private MenuItem ragdollItem;
..	..	@@ -5203,11 +6467,6 @@
5203	6467	private MenuItem doubleItem;
5204	6468	private MenuItem tripleItem;
5205	6469
5206		- private MenuItem importGFDItem;
5207		- private MenuItem importVRMLX3DItem;
5208		- private MenuItem import3DSItem;
5209		- private MenuItem importOBJItem;
5210		-
5211	6470	private MenuItem computeAOItem;
5212	6471	private MenuItem recompileItem;
5213	6472	private MenuItem editScriptItem;
..	..	@@ -5217,4 +6476,8 @@
5217	6476	private MenuItem analyzeItem;
5218	6477	private MenuItem dumpItem;
5219	6478	//boolean freezemodel = false;
	6479	+
	6480	+ Menu cameraMenu;
	6481	+ MenuItem editCameraItem;
	6482	+ MenuItem restoreCameraItem;
5220	6483	}