~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -16,6 +16,7 @@
16	16	//import buoy.widget.BFileChooser;
17	17
18	18	class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
	19	+ Grafreed.iResourceCallBack,
19	20	ObjectUI,
20	21	Runnable,
21	22	ActionListener,
..	..	@@ -23,6 +24,360 @@
23	24	DragGestureListener, DragSourceListener, DropTargetListener,
24	25	ItemListener // ListSelectionListener
25	26	{
	27	+
	28	+ public void AddSkyboxButton(String f, String s, cGridBag row)
	29	+ {
	30	+ cButton skyboxButton;
	31	+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
	32	+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
	33	+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
	34	+ skyboxButton.setToolTipText(s.equals("") ? "No background" : s);
	35	+ skyboxButton.addActionListener(new ActionListener()
	36	+ {
	37	+ @Override
	38	+ public void actionPerformed(ActionEvent e)
	39	+ {
	40	+ ChangeSkybox(path);
	41	+ }
	42	+ });
	43	+ }
	44	+
	45	+ public void AddTextureButton(String f, String c, final String t, int count, cGridBag row)
	46	+ {
	47	+ cButton textureButton;
	48	+ final String path = "textures/" + f + "/" + c + "/"; // + t;
	49	+ row.add(textureButton = GetButton(path + "icons/" + t, !Grafreed.NIMBUSLAF));
	50	+ textureButton.setToolTipText(c + count);
	51	+ textureButton.addActionListener(new ActionListener()
	52	+ {
	53	+ @Override
	54	+ public void actionPerformed(ActionEvent e)
	55	+ {
	56	+ ChangeTexture(path + t);
	57	+ }
	58	+ });
	59	+ }
	60	+
	61	+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
	62	+ {
	63	+ cGridBag tab0 = new cGridBag().setVertical(true);
	64	+
	65	+ tab0.setName("Urban");
	66	+ skyboxpanel.add(tab0);
	67	+
	68	+ cGridBag row0 = new cGridBag();
	69	+ cGridBag row1 = new cGridBag();
	70	+ cGridBag row2 = new cGridBag();
	71	+ cGridBag row3 = new cGridBag();
	72	+ cGridBag row4 = new cGridBag();
	73	+ cGridBag row5 = new cGridBag();
	74	+ cGridBag row6 = new cGridBag();
	75	+
	76	+ AddSkyboxButton("default", "", row0);
	77	+ //AddSkyboxButton("default", "cornell", row0);
	78	+ AddSkyboxButton("penguins", "dust", row0);
	79	+ AddSkyboxButton("penguins", "tropic", row0);
	80	+ AddSkyboxButton("penguins", "yonder", row0);
	81	+
	82	+ AddSkyboxButton("default", "uffizi", row1);
	83	+ AddSkyboxButton("bridge", "Bridge", row1);
	84	+ AddSkyboxButton("bridge", "Bridge2", row1);
	85	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	86	+
	87	+ AddSkyboxButton("urban", "Parliament", row2);
	88	+ AddSkyboxButton("urban", "Roundabout", row2);
	89	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	90	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	91	+
	92	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	93	+ AddSkyboxButton("urban", "UnionSquare", row3);
	94	+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
	95	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	96	+
	97	+ AddSkyboxButton("park", "Buddha", row4);
	98	+ AddSkyboxButton("park", "CNTower2", row4);
	99	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	100	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	101	+
	102	+ AddSkyboxButton("park", "Park", row5);
	103	+ AddSkyboxButton("park", "Pond", row5);
	104	+ AddSkyboxButton("park", "Skansen", row5);
	105	+ AddSkyboxButton("park", "Skansen2", row5);
	106	+
	107	+ AddSkyboxButton("park", "Skansen3", row6);
	108	+ AddSkyboxButton("park", "Skansen4", row6);
	109	+ AddSkyboxButton("park", "Skansen5", row6);
	110	+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
	111	+
	112	+ tab0.add(row0);
	113	+ tab0.add(row1);
	114	+ tab0.add(row2);
	115	+ tab0.add(row3);
	116	+ tab0.add(row4);
	117	+ tab0.add(row5);
	118	+ tab0.add(row6);
	119	+
	120	+ for (int i=5; --i>=0;)
	121	+ {
	122	+ //oe.toolboxPanel.Return();
	123	+ //tab0.add(new cGridBag());
	124	+ }
	125	+ }
	126	+
	127	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	128	+ {
	129	+ cGridBag tab0 = new cGridBag().setVertical(true);
	130	+
	131	+ tab0.setName("Nature");
	132	+ skyboxpanel.add(tab0);
	133	+
	134	+ cGridBag row0 = new cGridBag();
	135	+ cGridBag row1 = new cGridBag();
	136	+ cGridBag row2 = new cGridBag();
	137	+ cGridBag row3 = new cGridBag();
	138	+ cGridBag row4 = new cGridBag();
	139	+ cGridBag row5 = new cGridBag();
	140	+ cGridBag row6 = new cGridBag();
	141	+
	142	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	143	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	144	+ AddSkyboxButton("beach", "PalmTrees", row0);
	145	+ AddSkyboxButton("beach", "Tenerife", row0);
	146	+
	147	+ AddSkyboxButton("beach", "Tenerife2", row1);
	148	+ AddSkyboxButton("beach", "Tenerife3", row1);
	149	+ AddSkyboxButton("field", "FishPond", row1);
	150	+ AddSkyboxButton("field", "Footballfield", row1);
	151	+
	152	+ AddSkyboxButton("field", "Meadow", row2);
	153	+ AddSkyboxButton("field", "Sorsele", row2);
	154	+ AddSkyboxButton("field", "Sorsele2", row2);
	155	+ AddSkyboxButton("field", "Sorsele3", row2);
	156	+
	157	+ AddSkyboxButton("forest", "Brudslojan", row3);
	158	+ AddSkyboxButton("forest", "Langholmen2", row3);
	159	+ AddSkyboxButton("forest", "Plants", row3);
	160	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	161	+
	162	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	163	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	164	+ AddSkyboxButton("mountain", "Teide", row4);
	165	+ AddSkyboxButton("park", "Tantolunden4", row4);
	166	+
	167	+ AddSkyboxButton("park", "Stairs", row5);
	168	+ AddSkyboxButton("default", "skycube", row6);
	169	+ AddSkyboxButton("rocky", "Langholmen", row5);
	170	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	171	+
	172	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	173	+ AddSkyboxButton("default", "CloudyHills", row6);
	174	+ AddSkyboxButton("daz", "Autumn", row6);
	175	+ AddSkyboxButton("daz", "MountainTrail", row6);
	176	+ /*
	177	+Autumn
	178	+Greenlands
	179	+MountainTrail
	180	+Oasis
	181	+TheRock
	182	+TopOfTheWorld
	183	+Winter
	184	+ */
	185	+
	186	+ tab0.add(row0);
	187	+ tab0.add(row1);
	188	+ tab0.add(row2);
	189	+ tab0.add(row3);
	190	+ tab0.add(row4);
	191	+ tab0.add(row5);
	192	+ tab0.add(row6);
	193	+
	194	+ for (int i=5; --i>=0;)
	195	+ {
	196	+ //oe.toolboxPanel.Return();
	197	+ //tab0.add(new cGridBag());
	198	+ }
	199	+ }
	200	+
	201	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	202	+ {
	203	+ cGridBag tab0 = new cGridBag().setVertical(true);
	204	+
	205	+ tab0.setName("Night");
	206	+ skyboxpanel.add(tab0);
	207	+
	208	+ cGridBag row0 = new cGridBag();
	209	+ cGridBag row1 = new cGridBag();
	210	+ cGridBag row2 = new cGridBag();
	211	+ cGridBag row3 = new cGridBag();
	212	+ cGridBag row4 = new cGridBag();
	213	+ cGridBag row5 = new cGridBag();
	214	+ cGridBag row6 = new cGridBag();
	215	+
	216	+ AddSkyboxButton("night", "NightPath", row0);
	217	+ AddSkyboxButton("night", "PondNight", row0);
	218	+ AddSkyboxButton("night", "Powerlines", row0);
	219	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	220	+
	221	+ AddSkyboxButton("urban", "CNTower", row1);
	222	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	223	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	224	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
	225	+
	226	+ AddSkyboxButton("penguins", "kenon_star", row2);
	227	+ AddSkyboxButton("persson", "corona", row2);
	228	+ AddSkyboxButton("persson", "spaceskybox", row2);
	229	+ AddSkyboxButton("indoors", "Vasa", row2);
	230	+
	231	+ AddSkyboxButton("winter", "Backyard", row3);
	232	+ AddSkyboxButton("winter", "Creek", row3);
	233	+ AddSkyboxButton("winter", "FootballField3", row3);
	234	+ AddSkyboxButton("winter", "Forest", row3);
	235	+
	236	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	237	+ AddSkyboxButton("winter", "House", row4);
	238	+ AddSkyboxButton("winter", "IceLake", row4);
	239	+ AddSkyboxButton("winter", "IceRiver", row4);
	240	+
	241	+ AddSkyboxButton("winter", "Park3", row5);
	242	+ AddSkyboxButton("winter", "PondWinter", row5);
	243	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	244	+ AddSkyboxButton("winter", "Vindelalven", row5);
	245	+
	246	+ AddSkyboxButton("daz", "TheRock", row6);
	247	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	248	+ AddSkyboxButton("daz", "Winter", row6);
	249	+ AddSkyboxButton("mountain", "Ryfjallet", row6);
	250	+
	251	+ tab0.add(row0);
	252	+ tab0.add(row1);
	253	+ tab0.add(row2);
	254	+ tab0.add(row3);
	255	+ tab0.add(row4);
	256	+ tab0.add(row5);
	257	+ tab0.add(row6);
	258	+
	259	+ for (int i=5; --i>=0;)
	260	+ {
	261	+ //oe.toolboxPanel.Return();
	262	+ //tab0.add(new cGridBag());
	263	+ }
	264	+ }
	265	+
	266	+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
	267	+ {
	268	+ cGridBag tab0 = new cGridBag().setVertical(true);
	269	+
	270	+ tab0.setName("Others");
	271	+ skyboxpanel.add(tab0);
	272	+
	273	+ cGridBag row0 = new cGridBag();
	274	+ cGridBag row1 = new cGridBag();
	275	+ cGridBag row2 = new cGridBag();
	276	+ cGridBag row3 = new cGridBag();
	277	+ cGridBag row4 = new cGridBag();
	278	+ cGridBag row5 = new cGridBag();
	279	+ cGridBag row6 = new cGridBag();
	280	+
	281	+ AddSkyboxButton("mayhem", "afterrain", row0);
	282	+ AddSkyboxButton("mayhem", "aqua4", row0);
	283	+ AddSkyboxButton("mayhem", "aqua9", row0);
	284	+ AddSkyboxButton("mayhem", "flame", row0);
	285	+
	286	+ AddSkyboxButton("mayhem", "h2s", row1);
	287	+ AddSkyboxButton("mayhem", "prehistoric", row1);
	288	+ AddSkyboxButton("mayhem", "scorched", row1);
	289	+ AddSkyboxButton("penguins", "desertdawn", row1);
	290	+
	291	+ AddSkyboxButton("persson", "Citadella", row2);
	292	+ AddSkyboxButton("persson", "Citadella2", row2);
	293	+ AddSkyboxButton("persson", "clouds1", row2);
	294	+ AddSkyboxButton("penguins", "wrath", row2);
	295	+
	296	+ AddSkyboxButton("persson", "FishermansBastion", row3);
	297	+ AddSkyboxButton("persson", "HeroesSquare", row3);
	298	+ AddSkyboxButton("indoors", "DallasW", row3);
	299	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
	300	+
	301	+ AddSkyboxButton("persson", "LancellottiChapel", row4);
	302	+ AddSkyboxButton("persson", "PereaBeach1", row4);
	303	+ AddSkyboxButton("persson", "PereaBeach2", row4);
	304	+ AddSkyboxButton("persson", "redeclipse", row4);
	305	+
	306	+ AddSkyboxButton("daz", "Greenlands", row5);
	307	+ AddSkyboxButton("daz", "Oasis", row5);
	308	+ AddSkyboxButton("elyvisions", "arch3", row5);
	309	+ AddSkyboxButton("elyvisions", "calm_sea", row5);
	310	+
	311	+ AddSkyboxButton("elyvisions", "rainbow", row6);
	312	+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
	313	+ AddSkyboxButton("elyvisions", "heaven", row6);
	314	+ AddSkyboxButton("elyvisions", "hot", row6);
	315	+
	316	+ tab0.add(row0);
	317	+ tab0.add(row1);
	318	+ tab0.add(row2);
	319	+ tab0.add(row3);
	320	+ tab0.add(row4);
	321	+ tab0.add(row5);
	322	+ tab0.add(row6);
	323	+
	324	+ for (int i=5; --i>=0;)
	325	+ {
	326	+ //oe.toolboxPanel.Return();
	327	+ //tab0.add(new cGridBag());
	328	+ }
	329	+ }
	330	+
	331	+ public void ChangeSkybox(String skybox)
	332	+ {
	333	+ if (skybox.endsWith("/"))
	334	+ {
	335	+ group.skyboxname = null;
	336	+ group.skyboxext = null;
	337	+ cameraView.repaint();
	338	+ }
	339	+ else
	340	+ {
	341	+ //cameraView.envyoff = false;
	342	+ group.skyboxname = skybox;
	343	+ group.skyboxext = "jpg";
	344	+ cameraView.repaint();
	345	+ }
	346	+ }
	347	+
	348	+ public void CreateSkyboxPanel(cGridBag skyboxPanel)
	349	+ {
	350	+ JTabbedPane skyboxpane = new JTabbedPane();
	351	+
	352	+ AddSkyboxTab0(skyboxpane);
	353	+ AddSkyboxTab1(skyboxpane);
	354	+ AddSkyboxTab2(skyboxpane);
	355	+ AddSkyboxTab3(skyboxpane);
	356	+
	357	+ skyboxPanel.add(skyboxpane);
	358	+ }
	359	+
	360	+ public void ChangeTexture(String texture)
	361	+ {
	362	+ for (int i=0; i<group.selection.size(); i++)
	363	+ {
	364	+ Object3D obj = group.selection.get(i);
	365	+ obj.SetPigmentTexture("@" + texture);
	366	+ }
	367	+
	368	+ refreshContents();
	369	+ }
	370	+
	371	+ public void Show3DView()
	372	+ {
	373	+ // bug
	374	+ //gridPanel.setDividerLocation(1.0);
	375	+ //bigPanel.setDividerLocation(0.0);
	376	+ bigThree.ClearUI();
	377	+ bigThree.add(centralPanel);
	378	+ bigThree.FlushUI();
	379	+ }
	380	+
26	381	//ObjEditor objEditor;
27	382	public void closeUI2()
28	383	{
..	..	@@ -60,6 +415,14 @@
60	415	this.copy = this.group = group;
61	416	//selectees = this.group.selectees;
62	417
	418	+ if (copy.versionlist == null)
	419	+ {
	420	+ copy.versionlist = new Object3D[100];
	421	+ copy.versionindex = -1;
	422	+
	423	+ Save(true);
	424	+ }
	425	+
63	426	if(ui)
64	427	SetupUI(objEditor);
65	428	}
..	..	@@ -74,16 +437,28 @@
74	437	this.copy = this.group = copy;
75	438	//selectees = this.group.selectees;
76	439
77		- SetupMenu2(objEditor);
	440	+ SetupMenu2(this); //objEditor);
78	441	SetupUI2(objEditor);
79	442	objEditor.SetupUI(true);
80	443	SetupViews(objEditor);
81	444
82	445	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	446	+
	447	+ if (copy.versionlist == null)
	448	+ {
	449	+ copy.versionlist = new Object3D[100];
	450	+ copy.versionindex = -1;
	451	+
	452	+ Save(true);
	453	+ }
83	454	}
84	455
85	456	void CloneSelection(boolean supports)
86	457	{
	458	+ if (Globals.REPLACEONMAKE)
	459	+ Save();
	460	+ boolean keep = Globals.REPLACEONMAKE;
	461	+ Globals.REPLACEONMAKE = false;
87	462	// Object3D keep = GrafreeD.clipboard;
88	463	//Object3D obj;
89	464	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,18 +469,19 @@
94	469
95	470	makeSomething(clone, i==group.selection.size()-1);
96	471	}
	472	+ Globals.REPLACEONMAKE = keep;
97	473	}
98	474
99	475	void CloneClipboard(boolean supports)
100	476	{
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));
	477	+ assert(Grafreed.clipboard.parent == null);
	478	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	479	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	480	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	481	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
106	482	else
107		- makeSomething(CloneObject(GrafreeD.clipboard, false));
108		- GrafreeD.clipboard.get(0).parent = keepparent;
	483	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	484	+ Grafreed.clipboard.get(0).parent = keepparent;
109	485	}
110	486
111	487	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -119,7 +495,7 @@
119	495	// obj.support = null;
120	496	if (!supports)
121	497	obj.SaveSupports();
122		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	498	+ Object3D clone = (Object3D)Grafreed.clone(obj);
123	499	obj.parent = parent;
124	500	// obj.support = support;
125	501	// clone.support = support; // aout 2013
..	..	@@ -148,52 +524,54 @@
148	524
149	525	//JTextField nameField;
150	526
151		- void SetupMenu2(ObjEditor oe)
	527	+ void SetupMenu2(GroupEditor oe)
152	528	{
153		- if (Globals.ADVANCED)
154		- {
155		- oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
156		- //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
157		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
158		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
159		- oe.cameraMenu.add("-");
160		- openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
161		- openWindowItem.addActionListener(this);
162		- editLeafItem.addActionListener(this);
163		- lookAtItem.addActionListener(this);
164		- //lookFromItem.addActinoListener(this);
165		- //switchItem.addActionListener(this);
166		- }
167		-
	529	+ oe.jTree = new cTree();
	530	+
168	531	Menu menu;
169	532	oe.menuBar.add(menu = new Menu("Edit"));
170	533	//editItem = menu.add(new MenuItem("Edit"));
171	534	//editItem.addActionListener(this);
172		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	535	+
	536	+// undoItem = menu.add(new MenuItem("Undo"));
	537	+// undoItem.addActionListener(this);
	538	+// redoItem = menu.add(new MenuItem("Redo"));
	539	+// redoItem.addActionListener(this);
	540	+// menu.add("-");
	541	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
173	542	duplicateItem.addActionListener(this);
174		- cutItem = menu.add(new MenuItem("Cut"));
	543	+
	544	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
	545	+ cloneItem.addActionListener(this);
	546	+ //if (Globals.ADVANCED)
	547	+ {
	548	+ cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
	549	+ cloneSupportItem.addActionListener(this);
	550	+ }
	551	+ oe.jTree.popup.addSeparator();
	552	+ menu.add("-");
	553	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
175	554	cutItem.addActionListener(this);
176		- copyItem = menu.add(new MenuItem("Copy"));
	555	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
177	556	copyItem.addActionListener(this);
178	557	pasteItem = menu.add(new MenuItem("Paste"));
179	558	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"));
	559	+
	560	+ oe.jTree.popup.addSeparator();
	561	+ //menu.add("-");
	562	+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
187	563	pasteIntoItem.addActionListener(this);
188		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	564	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
189	565	pasteLinkItem.addActionListener(this);
190		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	566	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
191	567	pasteCloneItem.addActionListener(this);
192		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	568	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
193	569	// pasteExpandItem.addActionListener(this);
194		- menu.add("-");
195		- clearItem = menu.add(new MenuItem("Clear"));
196		- clearItem.addActionListener(this);
	570	+ //menu.add("-");
	571	+ oe.jTree.popup.addSeparator();
	572	+
	573	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	574	+ deleteItem.addActionListener(this);
197	575
198	576	if (Globals.ADVANCED)
199	577	{
..	..	@@ -201,14 +579,95 @@
201	579	clearAllItem = menu.add(new MenuItem("Clear All"));
202	580	clearAllItem.addActionListener(this);
203	581	}
	582	+
	583	+ menuBar.add(cameraMenu = new Menu("View"));
	584	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	585	+ //zBufferItem.addActionListener(this);
	586	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	587	+ //normalLensItem.addActionListener(this);
	588	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	589	+ restoreCameraItem.addActionListener(this);
	590	+
	591	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	592	+// toggleFullScreenItem.addItemListener(this);
	593	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	594	+// cameraMenu.add("-");
	595	+//
	596	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	597	+// toggleTextureItem.addItemListener(this);
	598	+// toggleTextureItem.setState(CameraPane.textureon);
	599	+//
	600	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	601	+// toggleSwitchItem.addItemListener(this);
	602	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	603	+
	604	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	605	+ toggleHandleItem.addItemListener(this);
	606	+ toggleHandleItem.setState(CameraPane.HANDLES);
	607	+
	608	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	609	+ togglePaintItem.addItemListener(this);
	610	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	611	+
	612	+ if (Globals.ADVANCED)
	613	+ {
	614	+ cameraMenu.add("-");
	615	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	616	+ toggleLiveItem.addItemListener(this);
	617	+ toggleLiveItem.setState(Globals.isLIVE());
204	618
	619	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	620	+ stepItem.addActionListener(this);
	621	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	622	+ // toggleDLItem.addItemListener(this);
	623	+ // toggleDLItem.setState(false);
	624	+
	625	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	626	+ toggleRenderItem.addItemListener(this);
	627	+ toggleRenderItem.setState(!CameraPane.frozen);
	628	+
	629	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	630	+ toggleDebugItem.addItemListener(this);
	631	+ toggleDebugItem.setState(Globals.DEBUG);
	632	+
	633	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	634	+ toggleFrustumItem.addItemListener(this);
	635	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	636	+
	637	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	638	+ toggleFootContactItem.addItemListener(this);
	639	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	640	+
	641	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	642	+ toggleTimelineItem.addItemListener(this);
	643	+ }
	644	+
	645	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	646	+// toggleRootItem.addItemListener(this);
	647	+// toggleRootItem.setState(false);
	648	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	649	+// animationItem.addItemListener(this);
	650	+// animationItem.setState(CameraPane.ANIMATION);
	651	+ cameraMenu.add("-");
	652	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	653	+ editCameraItem.addActionListener(this);
	654	+
	655	+ if (Globals.ADVANCED)
	656	+ {
	657	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	658	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	659	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	660	+ oe.cameraMenu.add("-");
	661	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	662	+ openWindowItem.addActionListener(this);
	663	+ lookAtItem.addActionListener(this);
	664	+ //lookFromItem.addActinoListener(this);
	665	+ //switchViewItem.addActionListener(this);
	666	+ }
	667	+
205	668	oe.menuBar.add(menu = new Menu("Setting"));
206	669	if (Globals.ADVANCED)
207	670	{
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	671	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
213	672	revertMeshItem.addActionListener(this);
214	673	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
..	..	@@ -248,21 +707,29 @@
248	707	}
249	708
250	709	oe.menuBar.add(menu = new Menu("Group"));
251		- grabItem = menu.add(new MenuItem("Grab"));
252		- grabItem.addActionListener(this);
	710	+// grabItem = menu.add(new MenuItem("Grab"));
	711	+// grabItem.addActionListener(this);
253	712	backItem = menu.add(new MenuItem("Back"));
254	713	backItem.addActionListener(this);
255	714	frontItem = menu.add(new MenuItem("Front"));
256	715	frontItem.addActionListener(this);
257		- compositeItem = menu.add(new MenuItem("Composite"));
258		- compositeItem.addActionListener(this);
	716	+// compositeItem = menu.add(new MenuItem("Composite"));
	717	+// compositeItem.addActionListener(this);
	718	+
	719	+ if (Globals.ADVANCED)
	720	+ {
259	721	hideItem = menu.add(new MenuItem("Hidden Group"));
260	722	hideItem.addActionListener(this);
261		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	723	+ }
	724	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
262	725	ungroupItem.addActionListener(this);
263		- menu.add("-");
264		- randomItem = menu.add(new MenuItem("Switch node"));
265		- randomItem.addActionListener(this);
	726	+
	727	+// menu.add("-");
	728	+//
	729	+// switchItem = menu.add(new MenuItem("Switch node"));
	730	+// switchItem.addActionListener(this);
	731	+ if (Globals.ADVANCED)
	732	+ {
266	733	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
267	734	switchGeoItem.addActionListener(this);
268	735	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -270,49 +737,52 @@
270	737	morphItem = menu.add(new MenuItem("Morph Group"));
271	738	morphItem.addActionListener(this);
272	739
273		- if (Globals.ADVANCED)
274		- {
	740	+ menu.add("-");
275	741	physicsItem = menu.add(new MenuItem("Physics"));
276	742	physicsItem.addActionListener(this);
277	743	frameselectorItem = menu.add(new MenuItem("Frame Selector"));
278	744	frameselectorItem.addActionListener(this);
279	745	scriptNodeItem = menu.add(new MenuItem("Script Node"));
280	746	scriptNodeItem.addActionListener(this);
281		- cameraItem = menu.add(new MenuItem("Camera"));
282		- cameraItem.addActionListener(this);
283	747	}
284	748
285	749	oe.menuBar.add(menu = new Menu("Object"));
286		- textureItem = menu.add(new MenuItem("Texture"));
287		- textureItem.addActionListener(this);
	750	+// textureItem = menu.add(new MenuItem("Texture"));
	751	+// textureItem.addActionListener(this);
288	752	billboardItem = menu.add(new MenuItem("Billboard"));
289	753	billboardItem.addActionListener(this);
290	754	csgItem = menu.add(new MenuItem("CSG"));
291	755	csgItem.addActionListener(this);
292		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	756	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
293	757	shadowXItem.addActionListener(this);
294		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	758	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
295	759	shadowYItem.addActionListener(this);
296		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	760	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
297	761	shadowZItem.addActionListener(this);
298		- if (Globals.ADVANCED)
299		- {
300		- linkerItem = menu.add(new MenuItem("Linker"));
301		- linkerItem.addActionListener(this);
302	762	attributeItem = menu.add(new MenuItem("Attribute"));
303	763	attributeItem.addActionListener(this);
	764	+
	765	+ if (Globals.ADVANCED)
	766	+ {
	767	+ menu.add("-");
	768	+ linkerItem = menu.add(new MenuItem("Linker"));
	769	+ linkerItem.addActionListener(this);
304	770	templateItem = menu.add(new MenuItem("Template"));
305	771	templateItem.addActionListener(this);
306	772	pointflowItem = menu.add(new MenuItem("Point Flow"));
307	773	pointflowItem.addActionListener(this);
308		- menu.add("-");
309	774	}
	775	+ menu.add("-");
310	776	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
311	777	resetTransformItem.addActionListener(this);
312	778	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
313	779	resetCentroidItem.addActionListener(this);
314		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
315		- transformgeometryItem.addActionListener(this);
	780	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	781	+ resetCentroidXZItem.addActionListener(this);
	782	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	783	+ transformGeometryItem.addActionListener(this);
	784	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	785	+ transformChildrenItem.addActionListener(this);
316	786
317	787	oe.menuBar.add(menu = new Menu("Geometry"));
318	788	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -325,7 +795,7 @@
325	795	genNormalsMESHItem.addActionListener(this);
326	796	if (Globals.ADVANCED)
327	797	{
328		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	798	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
329	799	genNormalsMINEItem.addActionListener(this);
330	800	}
331	801	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -361,6 +831,10 @@
361	831	oe.menuBar.add(menu = new Menu("Attributes"));
362	832	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
363	833	clearMaterialsItem.addActionListener(this);
	834	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	835	+ resetAllItem.addActionListener(this);
	836	+ stepAllItem = menu.add(new MenuItem("Step All"));
	837	+ stepAllItem.addActionListener(this);
364	838	menu.add("-");
365	839	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
366	840	liveleavesItem.addActionListener(this);
..	..	@@ -381,6 +855,14 @@
381	855	markleavesItem.addActionListener(this);
382	856	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
383	857	unmarkleavesItem.addActionListener(this);
	858	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	859	+ rewindleavesItem.addActionListener(this);
	860	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	861	+ unrewindleavesItem.addActionListener(this);
	862	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	863	+ randomleavesItem.addActionListener(this);
	864	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	865	+ unrandomleavesItem.addActionListener(this);
384	866	menu.add("-");
385	867	flipVItem = menu.add(new MenuItem("Flip V"));
386	868	flipVItem.addActionListener(this);
..	..	@@ -406,55 +888,129 @@
406	888	attachBumpItem.addActionListener(this);
407	889	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
408	890	pigmentBumpItem.addActionListener(this);
	891	+ //embedTexturesItem
409	892	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
410	893	detachPigmentItem.addActionListener(this);
411	894	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
412	895	detachBumpItem.addActionListener(this);
	896	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	897	+ embedTexturesItem.addActionListener(this);
	898	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	899	+ deEmbedTexturesItem.addActionListener(this);
413	900	menu.add("-");
414	901	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
415	902	sortbysizeItem.addActionListener(this);
416	903	sortbynameItem = menu.add(new MenuItem("Sort by name"));
417	904	sortbynameItem.addActionListener(this);
	905	+ menu.add("-");
	906	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	907	+ shareGeometriesItem.addActionListener(this);
	908	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	909	+ mergeGeometriesItem.addActionListener(this);
	910	+ menu.add("-");
	911	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	912	+ editLeafItem.addActionListener(this);
418	913	if (Globals.ADVANCED)
419	914	{
420		- menu.add("-");
	915	+ // Pretty much the same as duplicate and clone.
421	916	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
422	917	extractGeometriesItem.addActionListener(this);
423	918	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
424	919	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	920	}
430	921
431	922	oe.menuBar.add(menu = new Menu("Insert"));
432	923	buildCreateMenu(menu);
433	924
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	925	oe.menuBar.add(menu = new Menu("Tools"));
445	926	buildToolsMenu(menu);
446	927	}
447	928
	929	+ JTabbedPane resourcecontainer;
	930	+ cGridBag currenttab;
	931	+ boolean added; // patch for jar
	932	+
	933	+ int tabcount = 0;
	934	+ int colcount = 0;
	935	+ int rowcount = 0;
	936	+ int texturecount = 0;
	937	+
	938	+ int columns = 5;
	939	+ int rows = 7;
	940	+
	941	+ public void ResourceCallBack(String[] path)
	942	+ {
	943	+ for (int i = 0; i < path.length; i++)
	944	+ System.out.print(path[i] + "/");
	945	+ System.out.println();
	946	+
	947	+ if (//rowcount == 0 \|\|
	948	+ path.length == 1)
	949	+ {
	950	+ currenttab = new cGridBag();
	951	+ added = false;
	952	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	953	+ currenttab.setName(tabname);
	954	+ rowcount = 1;
	955	+ colcount = 0;
	956	+ texturecount = 0;
	957	+ }
	958	+
	959	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	960	+ {
	961	+ if (!added)
	962	+ {
	963	+ added = true;
	964	+ resourcecontainer.add(currenttab);
	965	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	966	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	967	+ }
	968	+
	969	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	970	+
	971	+ if (++colcount >= columns)
	972	+ {
	973	+ colcount = 0;
	974	+ currenttab.Return();
	975	+
	976	+ if (rowcount++ >= rows)
	977	+ {
	978	+ rowcount = 0;
	979	+ }
	980	+ }
	981	+ }
	982	+ else
	983	+ {
	984	+// if (!path[path.length-1].equals("icons"))
	985	+// resourcecontainer.Return();
	986	+ }
	987	+ }
	988	+
	989	+ void CreateTexturePanel(cGridBag container)
	990	+ {
	991	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	992	+ container.add(resourcecontainer);
	993	+
	994	+ Grafreed.ParseResources("textures", this);
	995	+ }
	996	+
448	997	void SetupUI2(ObjEditor oe)
449	998	{
	999	+ // June 2019
	1000	+ if (oe == null)
	1001	+ {
	1002	+ //super.SetupUI2(this);
	1003	+ //return;
	1004	+ }
	1005	+
	1006	+ if (copy != group)
	1007	+ {
	1008	+ //super.SetupUI2(this);
	1009	+ }
	1010	+
450	1011	//new Exception().printStackTrace();
451	1012
452	1013	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	1014	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
459	1015
460	1016	oe.buttonGroup = new ButtonGroup();
..	..	@@ -475,97 +1031,262 @@
475	1031	oe.radioPanel.add(dummyButton);
476	1032	oe.buttonGroup.add(dummyButton);
477	1033	*/
	1034	+ cGridBag copyOptionsPanel = new cGridBag();
	1035	+
	1036	+ copyOptionsPanel.preferredHeight = 2;
	1037	+
478	1038	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
479	1039
480		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
481		- liveCB.setToolTipText("Enabled animation");
482		- liveCB.addItemListener(this);
	1040	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1041	+ //minButton.setToolTipText("Minimize window");
	1042	+ //minButton.addActionListener(this);
	1043	+
	1044	+ if (Globals.ADVANCED)
	1045	+ {
	1046	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1047	+// maxButton.setToolTipText("Maximize window");
	1048	+// maxButton.addActionListener(this);
	1049	+ }
	1050	+
	1051	+ cButton gcButton;
	1052	+
	1053	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1054	+// gcButton.setToolTipText("Garbage collect");
	1055	+// gcButton.addActionListener(new ActionListener()
	1056	+// {
	1057	+// public void actionPerformed(ActionEvent e)
	1058	+// {
	1059	+// System.gc();
	1060	+// }
	1061	+// });
	1062	+
	1063	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1064	+ collapseButton.setToolTipText("Collapse toolbar");
	1065	+ collapseButton.addActionListener(this);
	1066	+
	1067	+ oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1068	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1069	+ maximize3DButton.addActionListener(this);
	1070	+
	1071	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1072	+ twoButton.setToolTipText("Show 3D view only");
	1073	+ twoButton.addActionListener(this);
	1074	+ this.fullscreenLayout = twoButton;
	1075	+
	1076	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1077	+ threeButton.setToolTipText("Show controls and 3D view");
	1078	+ threeButton.addActionListener(this);
	1079	+ if (Globals.ADVANCED)
	1080	+ {
	1081	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1082	+ sixButton.setToolTipText("Show 3D view and controls");
	1083	+ sixButton.addActionListener(this);
	1084	+ }
	1085	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1086	+// sevenButton.setToolTipText("3-column layout");
	1087	+// sevenButton.addActionListener(this);
	1088	+ //
	1089	+
	1090	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1091	+ fullButton.setToolTipText("Full-screen window");
	1092	+ fullButton.addActionListener(this);
	1093	+
	1094	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1095	+ screenfitButton.setToolTipText("Screen fit");
	1096	+ screenfitButton.addActionListener(this);
483	1097
484		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1098	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1099	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1100	+ restoreCameraButton.addActionListener(this);
	1101	+
	1102	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1103	+ saveVersionButton.setToolTipText("Duplicate current version");
	1104	+ saveVersionButton.addActionListener(this);
	1105	+
	1106	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1107	+ deleteVersionButton.setToolTipText("Delete current version");
	1108	+ deleteVersionButton.addActionListener(this);
	1109	+
	1110	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1111	+ previousVersionButton.setToolTipText("Previous version");
	1112	+ previousVersionButton.addActionListener(this);
	1113	+ previousVersionButton.setEnabled(false);
	1114	+
	1115	+ cGridBag updown = new cGridBag().setVertical(true);
	1116	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1117	+ restoreButton.setToolTipText("Undo (restore current version)");
	1118	+ restoreButton.addActionListener(this);
	1119	+ //restoreButton.setEnabled(false);
	1120	+
	1121	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1122	+ replaceButton.setToolTipText("Save (replace current version)");
	1123	+ replaceButton.addActionListener(this);
	1124	+ //replaceButton.setEnabled(false);
	1125	+
	1126	+ copyOptionsPanel.add(updown);
	1127	+
	1128	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1129	+ nextVersionButton.setToolTipText("Next version");
	1130	+ nextVersionButton.addActionListener(this);
	1131	+ nextVersionButton.setEnabled(false);
	1132	+
	1133	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
485	1134	oneStepButton.setToolTipText("Animate one step forward");
486	1135	oneStepButton.addActionListener(this);
487	1136
488		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	1137	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1138	+ liveCB.setToolTipText("Enable animation");
	1139	+ liveCB.addItemListener(this);
	1140	+
	1141	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
489	1142	fastCB.setToolTipText("Fast mode");
490	1143	fastCB.addItemListener(this);
491	1144
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);
	1145	+ //oe.toolboxPanel.Return();
	1146	+
	1147	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1148	+// trackCB.setToolTipText("Enable tracking");
	1149	+// trackCB.addItemListener(this);
499	1150
500	1151	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
501	1152	// screenfitpointButton.addActionListener(this);
502	1153
503	1154	if (Globals.ADVANCED)
504	1155	{
505		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1156	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
506	1157	snapobjectButton.addActionListener(this);
507	1158	snapobjectButton.setToolTipText("Snap Object");
	1159	+
	1160	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1161	+ fourButton.addActionListener(this);
	1162	+ fourButton.setToolTipText("Show control panel only");
508	1163	}
509	1164
510		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
511		- flashSelectionButton.setToolTipText("Show selection");
512		- flashSelectionButton.addActionListener(this);
	1165	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
513	1166
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	1167
533		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
534		- rootButton.setToolTipText("Edit selection in new tab");
	1168	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1169	+ rootButton.setToolTipText("Open selection in new tab");
535	1170	rootButton.addActionListener(this);
536	1171
537		- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1172	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
538	1173	closeButton.setToolTipText("Close tab");
539	1174	closeButton.addActionListener(this);
540	1175	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
541	1176	//clearButton.addActionListener(this);
542		-
543		- cGridBag commandsPanel = new cGridBag();
	1177	+
	1178	+ cGridBag row1 = new cGridBag();
544	1179
545		- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
546		- editButton.setToolTipText("Edit selection");
	1180	+ // INSERT
	1181	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1182	+ gridButton.setToolTipText("Create ground");
	1183	+ gridButton.addActionListener(this);
	1184	+
	1185	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1186	+ boxButton.setToolTipText("Create box");
	1187	+ boxButton.addActionListener(this);
	1188	+
	1189	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1190	+ sphereButton.setToolTipText("Create sphere");
	1191	+ sphereButton.addActionListener(this);
	1192	+
	1193	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1194	+ coneButton.setToolTipText("Create cone");
	1195	+ coneButton.addActionListener(this);
	1196	+
	1197	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1198	+ torusButton.setToolTipText("Create torus");
	1199	+ torusButton.addActionListener(this);
	1200	+
	1201	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1202	+ superButton.setToolTipText("Create superellipsoid");
	1203	+ superButton.addActionListener(this);
	1204	+
	1205	+ if (Globals.ADVANCED)
	1206	+ {
	1207	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1208	+ kleinButton.setToolTipText("Create Klein bottle");
	1209	+ kleinButton.addActionListener(this);
	1210	+ }
	1211	+
	1212	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1213	+ particlesButton.setToolTipText("Create particle system");
	1214	+ particlesButton.addActionListener(this);
	1215	+
	1216	+ oe.toolboxPanel.add(row1);
	1217	+
	1218	+ cGridBag row2 = new cGridBag();
	1219	+
	1220	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1221	+ groupButton.setToolTipText("Create group");
	1222	+ groupButton.addActionListener(this);
	1223	+
	1224	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1225	+ compositeButton.setToolTipText("Create composite");
	1226	+ compositeButton.addActionListener(this);
	1227	+
	1228	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1229	+ switchButton.setToolTipText("Create item switcher");
	1230	+ switchButton.addActionListener(this);
	1231	+
	1232	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1233	+ loopButton.setToolTipText("Create loop");
	1234	+ loopButton.addActionListener(this);
	1235	+
	1236	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1237	+ textureButton.setToolTipText("Create texture");
	1238	+ textureButton.addActionListener(this);
	1239	+
	1240	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1241	+ overlayButton.setToolTipText("Create overlay");
	1242	+ overlayButton.addActionListener(this);
	1243	+
	1244	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1245	+ lightButton.setToolTipText("Create light");
	1246	+ lightButton.addActionListener(this);
	1247	+
	1248	+ oe.toolboxPanel.add(row2);
	1249	+
	1250	+ cGridBag textures = new cGridBag();
	1251	+
	1252	+ CreateTexturePanel(textures);
	1253	+
	1254	+ oe.toolboxPanel.add(textures);
	1255	+
	1256	+ textures.preferredHeight = 100;
	1257	+
	1258	+ CreateSkyboxPanel(oe.skyboxPanel);
	1259	+
	1260	+ // EDIT panel
	1261	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1262	+ editButton.setToolTipText("Pin selection controls");
547	1263	editButton.addActionListener(this);
548	1264
549		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
550		- uneditButton.setToolTipText("Unedit selection");
	1265	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1266	+ uneditButton.setToolTipText("Unpin and remove selection controls");
551	1267	uneditButton.addActionListener(this);
552	1268
553		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
554		- allParamsButton.setToolTipText("Edit all params");
	1269	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1270	+ allParamsButton.setToolTipText("Show all controls");
555	1271	allParamsButton.addActionListener(this);
556	1272
557		- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
558		- clearPanelButton.setToolTipText("Clear edit panel");
	1273	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1274	+ clearPanelButton.setToolTipText("Clear all controls");
559	1275	clearPanelButton.addActionListener(this);
560	1276
561		- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
562		- unselectButton.setToolTipText("Unselect");
563		- unselectButton.addActionListener(this);
	1277	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1278	+ //unselectButton.setToolTipText("Unselect");
	1279	+ //unselectButton.addActionListener(this);
564	1280
565		- commandsPanel.preferredHeight = 1;
	1281	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1282	+ flashSelectionButton.setToolTipText("Highlight selection");
	1283	+ flashSelectionButton.addActionListener(this);
566	1284
567		- oe.treePanel.add(commandsPanel);
568		- oe.treePanel.Return();
	1285	+ editCommandsPanel.preferredHeight = 1;
	1286	+
	1287	+ SetPinStates(false);
	1288	+// oe.treePanel.add(commandsPanel);
	1289	+// oe.treePanel.Return();
569	1290
570	1291	// oe.aConstraints.gridx += 1;
571	1292	// oe.aConstraints.weighty = 0;
..	..	@@ -582,32 +1303,20 @@
582	1303
583	1304	JScrollPane jSP;
584	1305	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
585		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1306	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
586	1307	ResetModel();
587	1308
588	1309	oe.treePanel.add(jSPPanel);
589	1310	oe.treePanel.Return();
590	1311
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	1312	oe.treePanel.add(copyOptionsPanel);
607	1313	oe.treePanel.Return();
	1314	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1315	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1316	+ sliderPane.preferredHeight = 1;
608	1317
609		-// mainPanel.setDividerLocation(0.5); //1.0);
610		-// mainPanel.setResizeWeight(0.5);
	1318	+// mainPanel.setDividerLocation(0.1); //1.0);
	1319	+ mainPanel.setResizeWeight(0.4);
611	1320
612	1321	//jList.addListSelectionListener(this);
613	1322	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -615,7 +1324,7 @@
615	1324	//jTree.setEditable(true);
616	1325	oe.jTree.setDragEnabled(true);
617	1326	//jTree.setPreferredSize(new Dimension(10,10));
618		- jSP.setPreferredSize(new Dimension(100,200));
	1327	+ //jSP.setPreferredSize(new Dimension(100,200));
619	1328
620	1329	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
621	1330
..	..	@@ -627,29 +1336,49 @@
627	1336	dgr.addDragGestureListener(this);
628	1337	}catch(Exception e) {}
629	1338	*/
630		- radio.layout = sevenButton;
	1339	+ radio.layout = threeButton; // sixButton;
631	1340	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
632	1341	}
633	1342
634	1343	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
635	1344	{
	1345	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1346	+ colorCB.setToolTipText("Copy color when dropped");
	1347	+ colorCB.addItemListener(this);
	1348	+
	1349	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1350	+ materialCB.setToolTipText("Copy material when dropped");
	1351	+ materialCB.addItemListener(this);
	1352	+
	1353	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1354	+ textureCB.setToolTipText("Copy texture when dropped");
	1355	+ textureCB.addItemListener(this);
	1356	+
	1357	+ panel.Return();
	1358	+
636	1359	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
637	1360	boxCB.setToolTipText("Display bounding boxes");
638	1361	boxCB.addItemListener(this);
639	1362
640	1363	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
641		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1364	+ zoomBoxCB.setToolTipText("Display only for wheel");
642	1365	zoomBoxCB.addItemListener(this);
643	1366
644		- if (Globals.ADVANCED)
	1367	+ if (true) // Globals.ADVANCED)
645	1368	{
646		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
647		- supportCB.setToolTipText("Enable rigging");
648		- supportCB.addItemListener(this);
	1369	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1370	+// supportCB.setToolTipText("Enable rigging");
	1371	+// supportCB.addItemListener(this);
	1372	+
	1373	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1374	+ freezeCB.setToolTipText("Fast moving camera");
	1375	+ freezeCB.addItemListener(this);
649	1376
650	1377	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
651	1378	// localCB.addItemListener(this);
652	1379
	1380	+ panel.Return();
	1381	+
653	1382	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
654	1383	crowdCB.setToolTipText("Used for crowds");
655	1384	crowdCB.addItemListener(this);
..	..	@@ -658,14 +1387,19 @@
658	1387	smoothCB.setToolTipText("Snapping delay");
659	1388	smoothCB.addItemListener(this);
660	1389
661		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
662		- slowCB.setToolTipText("Smooth interpolation");
663		- slowCB.addItemListener(this);
	1390	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1391	+// slowCB.setToolTipText("Smooth interpolation");
	1392	+// slowCB.addItemListener(this);
	1393	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1394	+ minshaderCB.setToolTipText("Minimal fast shader");
	1395	+ minshaderCB.addItemListener(this);
664	1396
665	1397	// constraints.gridy += 1;
666	1398	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
667	1399	// speakerMocapCB.addItemListener(this);
668	1400
	1401	+ panel.Return();
	1402	+
669	1403	if (false)
670	1404	{
671	1405	// handled in scripts
..	..	@@ -680,42 +1414,93 @@
680	1414	//constraints.gridy += 1;
681	1415	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
682	1416	smoothfocusCB.addItemListener(this);
	1417	+ panel.Return();
683	1418	}
684	1419
685	1420	//constraints.gridx += 1;
686	1421	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
687	1422	// debugCB.addItemListener(this);
688	1423
	1424	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1425	+ trackCB.setToolTipText("Enable tracking target");
	1426	+ trackCB.addItemListener(this);
	1427	+
689	1428	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1429	+ oeilCB.setToolTipText("Move camera when tracking");
690	1430	oeilCB.addItemListener(this);
691	1431
	1432	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1433	+ shadowCB.setToolTipText("When live compute shadows");
	1434	+ shadowCB.addItemListener(this);
	1435	+
	1436	+ panel.Return();
	1437	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1438	+ toggleTextureCB.setToolTipText("Load textures");
	1439	+ toggleTextureCB.addItemListener(this);
	1440	+
	1441	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1442	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1443	+ toggleSwitchCB.addItemListener(this);
	1444	+
	1445	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1446	+ autokeepCB.setToolTipText("On structure change");
	1447	+ autokeepCB.addItemListener(this);
	1448	+
	1449	+ panel.Return();
	1450	+ if (Globals.ADVANCED)
	1451	+ {
692	1452	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
693	1453	lookAtCB.setToolTipText("Look-at target");
694	1454	lookAtCB.addItemListener(this);
	1455	+ }
695	1456
696	1457	}
697	1458
698	1459	cGridBag fill = new cGridBag();
699		-
700	1460	fill.preferredHeight = 200;
	1461	+ cGridBag fill2 = new cGridBag();
	1462	+ fill2.preferredHeight = 200;
	1463	+ cGridBag fill3 = new cGridBag();
	1464	+ fill3.preferredHeight = 200;
701	1465
702	1466	panel.add(fill);
	1467	+ panel.add(fill2);
	1468	+ panel.add(fill3);
703	1469
704	1470	}
705	1471
706	1472	void EditObject(Object3D obj)
707	1473	{
	1474	+ assert(obj instanceof Composite);
	1475	+
	1476	+// if (obj.versionlist == null)
	1477	+// {
	1478	+// obj.versionlist = new Object3D[100];
	1479	+// obj.versionindex = -1;
	1480	+// }
	1481	+
708	1482	cRadio radioButton = new cRadio(obj.name);
	1483	+
	1484	+ // June 2019. Patch to avoid bug with transparency.
	1485	+ radioButton.hadMaterial = obj.material != null;
	1486	+ if (!radioButton.hadMaterial)
	1487	+ {
	1488	+ obj.material = new cMaterial();
	1489	+ }
	1490	+
709	1491	radioButton.SetObject(obj);
710		- radioButton.layout = sevenButton;
	1492	+ radioButton.layout = threeButton; // sixButton;
711	1493	radioButton.SetCamera(cameraView.renderCamera, false);
712	1494	radioButton.addActionListener(this);
713	1495	radioPanel.add(radioButton);
714	1496	buttonGroup.add(radioButton);
715	1497	radioButton.doClick();
716	1498	}
	1499	+
717	1500	void SetupViews(ObjEditor oe)
718	1501	{
	1502	+ theFrame = this;
	1503	+
719	1504	oe.SetupViews();
720	1505
721	1506	System.out.println("SetupViews");
..	..	@@ -724,23 +1509,30 @@
724	1509	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
725	1510	}
726	1511
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;
	1512	+ cToggleButton liveCB;
	1513	+ cCheckBox supportCB;
	1514	+ cCheckBox localCB;
	1515	+ cCheckBox crowdCB;
	1516	+ cCheckBox smoothCB;
	1517	+ cCheckBox minshaderCB;
	1518	+
	1519	+ cToggleButton fastCB;
	1520	+ cCheckBox slowCB;
	1521	+ cCheckBox boxCB;
	1522	+ cCheckBox zoomBoxCB;
	1523	+ cCheckBox freezeCB;
	1524	+ //cToggleButton trackCB;
	1525	+ cCheckBox trackCB;
	1526	+ cCheckBox smoothfocusCB;
738	1527	// JCheckBox speakerMocapCB;
739		- JCheckBox speakerCameraCB;
740		- JCheckBox speakerFocusCB;
741		- JCheckBox debugCB;
742		- JCheckBox oeilCB;
743		- JCheckBox lookAtCB;
	1528	+ cCheckBox speakerCameraCB;
	1529	+ cCheckBox speakerFocusCB;
	1530	+ cCheckBox debugCB;
	1531	+
	1532	+ cCheckBox oeilCB;
	1533	+ cCheckBox shadowCB;
	1534	+ cCheckBox autokeepCB;
	1535	+ cCheckBox lookAtCB;
744	1536
745	1537	// static int COLOR = 1;
746	1538	// static int MATERIAL = 2;
..	..	@@ -748,9 +1540,9 @@
748	1540
749	1541	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
750	1542
751		- JCheckBox colorCB;
752		- JCheckBox materialCB;
753		- JCheckBox textureCB;
	1543	+ cCheckBox colorCB;
	1544	+ cCheckBox materialCB;
	1545	+ cCheckBox textureCB;
754	1546
755	1547	public void itemStateChanged(ItemEvent e)
756	1548	{
..	..	@@ -778,6 +1570,7 @@
778	1570	} else if(e.getSource() == liveCB)
779	1571	{
780	1572	cameraView.ToggleLive();
	1573	+ refreshContents(false);
781	1574	}
782	1575	else if(e.getSource() == supportCB)
783	1576	{
..	..	@@ -793,6 +1586,12 @@
793	1586	{
794	1587	cameraView.ToggleInertia();
795	1588	cameraView.repaint();
	1589	+ }
	1590	+ else if(e.getSource() == minshaderCB)
	1591	+ {
	1592	+ Globals.MINSHADER ^= true;
	1593	+ cameraView.programInitialized = false;
	1594	+ cameraView.repaint();
796	1595	}
797	1596	else if(e.getSource() == localCB)
798	1597	{
..	..	@@ -842,6 +1641,18 @@
842	1641	{
843	1642	cameraView.ToggleOeil();
844	1643	}
	1644	+ else if(e.getSource() == shadowCB)
	1645	+ {
	1646	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1647	+ }
	1648	+ else if(e.getSource() == freezeCB)
	1649	+ {
	1650	+ Globals.FREEZEONMOVE ^= true;
	1651	+ }
	1652	+ else if(e.getSource() == autokeepCB)
	1653	+ {
	1654	+ Globals.REPLACEONMAKE ^= true;
	1655	+ }
845	1656	else if(e.getSource() == lookAtCB)
846	1657	{
847	1658	cameraView.ToggleLookAt();
..	..	@@ -858,7 +1669,8 @@
858	1669
859	1670	/**/
860	1671	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
861		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1672	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1673	+ TreePath path = objEditor.jTree.getSelectionPath();
862	1674	if ((path == null) \|\| (path.getPathCount() <= 1)) {
863	1675	// We can't move the root node or an empty selection
864	1676	return;
..	..	@@ -921,8 +1733,6 @@
921	1733	}
922	1734	}
923	1735
924		- String string = (String) object;
925		-
926	1736	System.out.println("Transfer = " + object + "; drop : " + target);
927	1737	// if( object instanceof java.io.File[])
928	1738	// {
..	..	@@ -930,7 +1740,11 @@
930	1740	// objEditor.DropFile((java.io.File[]) object, true);
931	1741	// return;
932	1742	// }
933		- if (string.charAt(0) == '/')
	1743	+
	1744	+ String string = object.toString();
	1745	+
	1746	+ // File path for Mac and Windows
	1747	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
934	1748	{
935	1749	// file(s)
936	1750	String[] names = string.split("\n");
..	..	@@ -957,7 +1771,7 @@
957	1771
958	1772	flashIt = false;
959	1773	CameraPane pane = (CameraPane) target;
960		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1774	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
961	1775	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
962	1776
963	1777	if (group.selection.size() == 1)
..	..	@@ -973,23 +1787,33 @@
973	1787
974	1788	assert target == objEditor.jTree;
975	1789	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1790	+ Object3D destinationLeaf;
976	1791	try {
977		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1792	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
978	1793	} catch (Exception e) {
979	1794	System.out.println("destinationPath : " + destinationPath);
980	1795	return;
981	1796	}
982	1797
983		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1798	+ for (int i=group.selection.size(); --i>=0;)
984	1799	{
	1800	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1801	+
	1802	+ // Cannot move into itself
	1803	+ if (child == destinationLeaf)
	1804	+ return;
	1805	+ }
	1806	+
	1807	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1808	+// {
985	1809	loadClipboard(true);
986	1810	objEditor.jTree.setSelectionPath(destinationPath);
987	1811	pasteInto(false, false);
988		- } else {
989		- loadClipboard(false);
990		- objEditor.jTree.setSelectionPath(destinationPath);
991		- pasteInto(false, false); // true); // ???
992		- }
	1812	+// } else {
	1813	+// loadClipboard(false);
	1814	+// objEditor.jTree.setSelectionPath(destinationPath);
	1815	+// pasteInto(false, false); // true); // ???
	1816	+// }
993	1817	}
994	1818	public void dropActionChanged(DropTargetDragEvent dtde)
995	1819	// Called if the user has modified the current drop gesture
..	..	@@ -1045,7 +1869,12 @@
1045	1869	TreePath path;
1046	1870
1047	1871	public TransferableTreePath(TreePath tp) {
1048		- path = tp;
	1872	+ Object[] objs = new Object[tp.getPathCount()];
	1873	+ for (int i=0; i<objs.length; i++)
	1874	+ {
	1875	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1876	+ }
	1877	+ path = new TreePath(objs);
1049	1878	}
1050	1879
1051	1880	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1094,22 +1923,30 @@
1094	1923	{
1095	1924	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1096	1925	//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);
	1926	+// gridItem = menu.add(new MenuItem("Grid"));
	1927	+// gridItem.addActionListener(this);
	1928	+// rectoidItem = menu.add(new MenuItem("Box"));
	1929	+// rectoidItem.addActionListener(this);
	1930	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1931	+// ellipsoidItem.addActionListener(this);
	1932	+// coneItem = menu.add(new MenuItem("Cone"));
	1933	+// coneItem.addActionListener(this);
	1934	+// torusItem = menu.add(new MenuItem("Torus"));
	1935	+// torusItem.addActionListener(this);
	1936	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1937	+// superItem.addActionListener(this);
	1938	+
	1939	+ cameraItem = menu.add(new MenuItem("Camera"));
	1940	+ cameraItem.addActionListener(this);
	1941	+
	1942	+ if (!Globals.ADVANCED)
	1943	+ {
1109	1944	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1110	1945	kleinItem.addActionListener(this);
1111		- particleItem = menu.add(new MenuItem("Particle system"));
1112		- particleItem.addActionListener(this);
	1946	+ }
	1947	+
	1948	+// particleItem = menu.add(new MenuItem("Particle system"));
	1949	+// particleItem.addActionListener(this);
1113	1950	if (Globals.ADVANCED)
1114	1951	{
1115	1952	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1135,15 +1972,15 @@
1135	1972	}
1136	1973	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1137	1974	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);
	1975	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1976	+// overlayItem.addActionListener(this);
	1977	+// lightItem = menu.add(new MenuItem("Light"));
	1978	+// lightItem.addActionListener(this);
1142	1979	menu.add("-");
1143	1980	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1144	1981	//superLoopItem.addActionListener(this);
1145		- loopItem = menu.add(new MenuItem("Loop"));
1146		- loopItem.addActionListener(this);
	1982	+// loopItem = menu.add(new MenuItem("Loop"));
	1983	+// loopItem.addActionListener(this);
1147	1984	doubleItem = menu.add(new MenuItem("Fork"));
1148	1985	doubleItem.addActionListener(this);
1149	1986	if (Globals.ADVANCED)
..	..	@@ -1159,18 +1996,23 @@
1159	1996	animationItem.addItemListener(this);
1160	1997	animationItem.setState(Globals.ANIMATION);
1161	1998
	1999	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	2000	+ archiveItem.addActionListener(this);
	2001	+
1162	2002	menu.add("-");
1163	2003	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1164	2004	parseverticesItem.addActionListener(this);
1165	2005	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1166	2006	textureFieldItem.addActionListener(this);
1167		- alignItem = menu.add(new MenuItem("Align Object"));
	2007	+ alignItem = menu.add(new MenuItem("Align Objects"));
1168	2008	alignItem.addActionListener(this);
1169	2009	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1170	2010	reduceMorphItem.addActionListener(this);
1171	2011	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1172	2012	reduce34MorphItem.addActionListener(this);
1173		-
	2013	+ menu.add("-");
	2014	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	2015	+ memoryItem.addActionListener(this);
1174	2016	menu.add(computeAOItem = new MenuItem("Compute AO"));
1175	2017	computeAOItem.addActionListener(this);
1176	2018
..	..	@@ -1179,11 +2021,9 @@
1179	2021	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1180	2022	mirrorItem.addActionListener(this);
1181	2023	menu.add("-");
1182		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1183		- memoryItem.addActionListener(this);
1184	2024	menu.add(analyzeItem = new MenuItem("Analyze"));
1185	2025	analyzeItem.addActionListener(this);
1186		- menu.add(dumpItem = new MenuItem("Dump"));
	2026	+ menu.add(dumpItem = new MenuItem("Print"));
1187	2027	dumpItem.addActionListener(this);
1188	2028	// menu.add(pathItem = new MenuItem("From-to path"));
1189	2029	// pathItem.addActionListener(this);
..	..	@@ -1324,9 +2164,34 @@
1324	2164	shadow.material = new cMaterial(obj.material);
1325	2165	shadow.material.diffuse = 0.0001f;
1326	2166	shadow.material.specular = 0.0001f;
	2167	+ //shadow.projectedVertices[1].x = 300;
1327	2168
1328	2169	makeSomething(shadow);
1329	2170	}
	2171	+
	2172	+ private void ClearUnpinned()
	2173	+ {
	2174	+ //for (Object3D obj : listUI)
	2175	+ for (int i=listUI.size(); --i>=0;)
	2176	+ {
	2177	+ Object3D obj = listUI.elementAt(i);
	2178	+ if (!obj.pinned)
	2179	+ {
	2180	+ obj.CloseUI();
	2181	+ listUI.remove(i);
	2182	+ }
	2183	+ }
	2184	+ }
	2185	+
	2186	+ private void EditElement(Object3D elem, boolean newWindow)
	2187	+ {
	2188	+ // if (!(elem instanceof Composite))
	2189	+ // newWindow = false;
	2190	+ listUI.add(elem);
	2191	+ elem.openEditWindow(this, newWindow); //, false);
	2192	+ System.out.println("edit : " + elem);
	2193	+ elem.editWindow.refreshContents(true); // ? new
	2194	+ }
1330	2195
1331	2196	/**
1332	2197	* applyExample
..	..	@@ -1530,9 +2395,9 @@
1530	2395
1531	2396	void Overwrite(int mask)
1532	2397	{
1533		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2398	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1534	2399	{
1535		- Object3D content = GrafreeD.clipboard.get(0);
	2400	+ Object3D content = Grafreed.clipboard.get(0);
1536	2401
1537	2402	if (content instanceof cGroup && ((cGroup)content).transientlink )
1538	2403	content = ((cGroup)content).get(0);
..	..	@@ -1571,7 +2436,7 @@
1571	2436	{
1572	2437	ScreenFit();
1573	2438	} else
1574		- if (source == switchItem)
	2439	+ if (source == switchViewItem)
1575	2440	{
1576	2441	cVector v1 = new cVector();
1577	2442	cVector v2 = new cVector();
..	..	@@ -1580,11 +2445,11 @@
1580	2445	objEditor.cameraView.renderCamera.setAim(v2, v1);
1581	2446	objEditor.cameraView.repaint();
1582	2447	} else
1583		- if (source == rectoidItem)
	2448	+ if (source == rectoidItem \|\| source == boxButton)
1584	2449	{
1585	2450	makeSomething(new Box());
1586	2451	} else
1587		- if (source == particleItem)
	2452	+ if (source == particleItem \|\| source == particlesButton)
1588	2453	{
1589	2454	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1590	2455	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1663,27 +2528,27 @@
1663	2528
1664	2529	makeSomething(obj);
1665	2530	} else
1666		- if (source == gridItem)
	2531	+ if (source == gridItem \|\| source == gridButton)
1667	2532	{
1668	2533	makeSomething(new Grid());
1669	2534	} else
1670		- if (source == ellipsoidItem)
	2535	+ if (source == ellipsoidItem \|\| source == sphereButton)
1671	2536	{
1672	2537	makeSomething(new Sphere());
1673	2538	} else
1674		- if (source == coneItem)
	2539	+ if (source == coneItem \|\| source == coneButton)
1675	2540	{
1676	2541	makeSomething(new Cone());
1677	2542	} else
1678		- if (source == torusItem)
	2543	+ if (source == torusItem \|\| source == torusButton)
1679	2544	{
1680	2545	makeSomething(new Torus());
1681	2546	} else
1682		- if (source == superItem)
	2547	+ if (source == superItem \|\| source == superButton)
1683	2548	{
1684	2549	makeSomething(new Superellipsoid());
1685	2550	} else
1686		- if (source == kleinItem)
	2551	+ if (source == kleinItem \|\| source == kleinButton)
1687	2552	{
1688	2553	makeSomething(new Klein());
1689	2554	} else
..	..	@@ -1703,7 +2568,7 @@
1703	2568	{
1704	2569	makeSomething(new BezierSurface());
1705	2570	} else
1706		- if (source == overlayItem)
	2571	+ if (source == overlayItem \|\| source == overlayButton)
1707	2572	{
1708	2573	/*
1709	2574	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1751,10 +2616,27 @@
1751	2616	s.setup();
1752	2617	makeSomething(s);
1753	2618	} else
1754		- if (source == lightItem)
	2619	+ if (source == lightItem \|\| source == lightButton)
1755	2620	{
1756	2621	makeSomething(new Light());
1757	2622	} else
	2623	+// if (source == skybox1Button \|\|
	2624	+// source == skybox2Button \|\|
	2625	+// source == skybox3Button \|\|
	2626	+// source == skybox4Button \|\|
	2627	+// source == skybox5Button \|\|
	2628	+// source == skybox6Button \|\|
	2629	+// source == skybox7Button \|\|
	2630	+// source == skybox11Button \|\|
	2631	+// source == skybox12Button \|\|
	2632	+// source == skybox13Button \|\|
	2633	+// source == skybox14Button \|\|
	2634	+// source == skybox15Button \|\|
	2635	+// source == skybox16Button \|\|
	2636	+// source == skybox17Button)
	2637	+// {
	2638	+// ChangeSkybox(source);
	2639	+// } else
1758	2640	if (source == csgItem)
1759	2641	{
1760	2642	group(new CSG());
..	..	@@ -1801,30 +2683,38 @@
1801	2683
1802	2684	group(g);
1803	2685	} else
1804		- if (source == loopItem)
	2686	+ if (source == loopItem \|\| source == loopButton)
1805	2687	{
	2688	+ if (!group.selection.isEmpty())
	2689	+ {
1806	2690	Composite csg = new GroupLeaf();
1807	2691	csg.count = 5;
1808		- group(csg);
1809		- Composite child = new cGroup();
	2692	+ Composite child = new cGroup("Branch");
1810	2693	csg.addChild(child);
1811	2694	child.addChild(csg);
	2695	+ group(csg);
	2696	+ }
1812	2697	} else
1813	2698	if (source == doubleItem)
1814	2699	{
1815		- Composite csg = new GroupLeaf();
	2700	+ if (!group.selection.isEmpty())
	2701	+ {
	2702	+ Composite csg = new GroupLeaf("Fork");
1816	2703	csg.count = 5;
	2704	+ Composite child = new cGroup("Branch A");
	2705	+ csg.addChild(child);
	2706	+ child.addChild(csg);
	2707	+ child = new cGroup("Branch B");
	2708	+ csg.addChild(child);
	2709	+ child.addChild(csg);
1817	2710	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);
	2711	+ }
1824	2712	} else
1825	2713	if (source == tripleItem)
1826	2714	{
1827		- Composite csg = new GroupLeaf();
	2715	+ if (!group.selection.isEmpty())
	2716	+ {
	2717	+ Composite csg = new GroupLeaf("Trident");
1828	2718	csg.count = 4;
1829	2719	group(csg);
1830	2720	Composite child = new cGroup();
..	..	@@ -1836,28 +2726,12 @@
1836	2726	child = new cGroup();
1837	2727	csg.addChild(child);
1838	2728	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");
	2729	+ }
1856	2730	} else
1857	2731	if (source == computeAOItem)
1858	2732	{
1859	2733	Globals.drawMode = CameraPane.OCCLUSION;
1860		- Globals.theRenderer.repaint();
	2734	+ cameraView.repaint();
1861	2735	} else
1862	2736	if (source == recompileItem)
1863	2737	{
..	..	@@ -1872,7 +2746,7 @@
1872	2746	if (source == invariantsItem)
1873	2747	{
1874	2748	System.out.println("Invariants:");
1875		- GrafreeD.grafreeD.universe.invariants();
	2749	+ Grafreed.grafreed.universe.invariants();
1876	2750	} else
1877	2751	if (source == memoryItem)
1878	2752	{
..	..	@@ -1891,6 +2765,65 @@
1891	2765	{
1892	2766	DumpObject();
1893	2767	} else
	2768	+ if (source == minButton)
	2769	+ {
	2770	+ Minimize();
	2771	+ } else
	2772	+ if (source == maxButton)
	2773	+ {
	2774	+ Maximize();
	2775	+ } else
	2776	+ if (source == fullButton)
	2777	+ {
	2778	+ ToggleFullScreen();
	2779	+ } else
	2780	+ if (source == collapseButton)
	2781	+ {
	2782	+ this.expandedLayout = radio.layout;
	2783	+ CollapseToolbar();
	2784	+ } else
	2785	+ if (source == maximize3DButton)
	2786	+ {
	2787	+ this.expandedLayout = radio.layout;
	2788	+ radio.layout = twoButton;
	2789	+ Show3DView();
	2790	+ CollapseToolbar();
	2791	+ } else
	2792	+ if (source == previousVersionButton)
	2793	+ {
	2794	+ // Go to previous version
	2795	+ //if (!Undo())
	2796	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2797	+ PreviousVersion();
	2798	+ } else
	2799	+ if (source == restoreButton)
	2800	+ {
	2801	+ // Restore current version
	2802	+ Restore();
	2803	+ //restoreButton.setEnabled(false);
	2804	+ } else
	2805	+ if (source == replaceButton)
	2806	+ {
	2807	+ // Overwrite current version
	2808	+ Replace();
	2809	+ //replaceButton.setEnabled(false);
	2810	+ } else
	2811	+ if (source == nextVersionButton)
	2812	+ {
	2813	+ // Go to next version
	2814	+ NextVersion();
	2815	+ } else
	2816	+ if (source == saveVersionButton)
	2817	+ {
	2818	+ // Save a new version
	2819	+ if (!Save(true))
	2820	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2821	+ } else
	2822	+ if (source == deleteVersionButton)
	2823	+ {
	2824	+ // Delete a new version
	2825	+ DeleteVersion();
	2826	+ } else
1894	2827	if (source == oneStepButton)
1895	2828	{
1896	2829	Globals.ONESTEP = true;
..	..	@@ -1898,17 +2831,14 @@
1898	2831	} else
1899	2832	if (source == screenfitButton)
1900	2833	{
1901		- //Reload(lastConverter, lastFilename, true);
1902	2834	ScreenFit();
1903	2835	} else
1904	2836	if (source == screenfitpointButton)
1905	2837	{
1906		- //Reload(lastConverter, lastFilename, true);
1907	2838	ScreenFitPoint();
1908	2839	} else
1909	2840	if (source == snapobjectButton)
1910	2841	{
1911		- //Reload(lastConverter, lastFilename, true);
1912	2842	SnapObject();
1913	2843	} else
1914	2844	// if (event.getSource() == recompileButton)
..	..	@@ -1945,12 +2875,20 @@
1945	2875	{
1946	2876	loadClipboard(true);
1947	2877	} else
	2878	+ if (source == undoItem)
	2879	+ {
	2880	+ PreviousVersion();
	2881	+ } else
	2882	+ if (source == redoItem)
	2883	+ {
	2884	+ NextVersion();
	2885	+ } else
1948	2886	if (source == duplicateItem)
1949	2887	{
1950		- Object3D keep = GrafreeD.clipboard;
	2888	+ Object3D keep = Grafreed.clipboard;
1951	2889	loadClipboard(false);
1952	2890	paste(false);
1953		- GrafreeD.clipboard = keep;
	2891	+ Grafreed.clipboard = keep;
1954	2892	} else
1955	2893	if (source == cloneItem)
1956	2894	{
..	..	@@ -2170,9 +3108,9 @@
2170	3108	// group.selection.get(0).setMasterThis(content); // should be identity
2171	3109	// refreshContents();
2172	3110	// }
2173		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	3111	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2174	3112	{
2175		- Object3D content = GrafreeD.clipboard.get(0);
	3113	+ Object3D content = Grafreed.clipboard.get(0);
2176	3114
2177	3115	if (content instanceof cGroup && ((cGroup)content).transientlink )
2178	3116	content = ((cGroup)content).get(0);
..	..	@@ -2222,9 +3160,9 @@
2222	3160	} else
2223	3161	if (source == setMasterItem)
2224	3162	{
2225		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	3163	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2226	3164	{
2227		- Object3D content = GrafreeD.clipboard.get(0);
	3165	+ Object3D content = Grafreed.clipboard.get(0);
2228	3166
2229	3167	if (content instanceof cGroup && ((cGroup)content).transientlink )
2230	3168	content = ((cGroup)content).get(0);
..	..	@@ -2237,9 +3175,9 @@
2237	3175	{
2238	3176	if (group.selection.size() == 1)
2239	3177	{
2240		- if (GrafreeD.clipboard.size() == 1)
	3178	+ if (Grafreed.clipboard.size() == 1)
2241	3179	{
2242		- Object3D content = GrafreeD.clipboard.get(0);
	3180	+ Object3D content = Grafreed.clipboard.get(0);
2243	3181
2244	3182	if (content instanceof cGroup && ((cGroup)content).transientlink )
2245	3183	content = ((cGroup)content).get(0);
..	..	@@ -2256,7 +3194,7 @@
2256	3194	{
2257	3195	RevertMeshes();
2258	3196	} else
2259		- if (source == resetMeshItem)
	3197	+ if (source == resetAllItem)
2260	3198	{
2261	3199	ResetAll();
2262	3200	} else
..	..	@@ -2264,7 +3202,7 @@
2264	3202	{
2265	3203	StepAll();
2266	3204	} else
2267		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3205	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2268	3206	{
2269	3207	//int indices[] = jList.getSelectedIndices();
2270	3208	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2276,9 +3214,9 @@
2276	3214	{
2277	3215	ClearSelection(true);
2278	3216	} else
2279		- if (source == grabItem)
	3217	+ if (source == grabItem \|\| source == groupButton)
2280	3218	{
2281		- group(new cGroup(), true);
	3219	+ group(new cGroup(), false); // true);
2282	3220	} else
2283	3221	if (source == hideItem)
2284	3222	{
..	..	@@ -2296,11 +3234,11 @@
2296	3234	{
2297	3235	makeSomething(new Camera());
2298	3236	} else
2299		- if (source == compositeItem)
	3237	+ if (source == compositeItem \|\| source == compositeButton)
2300	3238	{
2301	3239	group(new Composite());
2302	3240	} else
2303		- if (source == randomItem)
	3241	+ if (source == switchItem \|\| source == switchButton)
2304	3242	{
2305	3243	RandomNode random = new RandomNode();
2306	3244	group(random);
..	..	@@ -2402,7 +3340,7 @@
2402	3340	{
2403	3341	group(new cLinker());
2404	3342	} else
2405		- if (source == textureItem)
	3343	+ if (source == textureItem \|\| source == textureButton)
2406	3344	{
2407	3345	group(new TextureNode());
2408	3346	} else
..	..	@@ -2422,17 +3360,42 @@
2422	3360	{
2423	3361	CastShadow(2);
2424	3362	} else
2425		- if (source == ungroupItem)
	3363	+ if (source == ungroupItem \|\| source == ungroupButton)
2426	3364	{
2427		- //ungroup();
	3365	+ boolean canUngroup = true;
	3366	+
2428	3367	for (int i=0; i<group.selection.size(); i++)
2429	3368	{
2430		- Ungroup(group.selection.get(i));
	3369	+ Object3D selectedItem = group.selection.get(i);
	3370	+
	3371	+ if (selectedItem.Size() == 0)
	3372	+ {
	3373	+ // Cannot ungroup leaves
	3374	+ canUngroup = false;
	3375	+ break;
	3376	+ }
	3377	+
	3378	+ if (selectedItem == group)
	3379	+ {
	3380	+ // Cannot ungroup root
	3381	+ canUngroup = false;
	3382	+ break;
	3383	+ }
2431	3384	}
2432	3385
2433		- ClearSelection(false);
2434		-
2435		- refreshContents();
	3386	+ if (canUngroup)
	3387	+ {
	3388	+ for (int i=0; i<group.selection.size(); i++)
	3389	+ {
	3390	+ Object3D selectedItem = group.selection.get(i);
	3391	+
	3392	+ Ungroup(selectedItem);
	3393	+ }
	3394	+
	3395	+ ClearSelection(false);
	3396	+
	3397	+ refreshContents();
	3398	+ }
2436	3399	} else
2437	3400	if (source == genUVItem)
2438	3401	{
..	..	@@ -2444,7 +3407,7 @@
2444	3407	} else
2445	3408	if (source == genNormalsMESHItem)
2446	3409	{
2447		- GenNormals(true); // TODO
	3410	+ GenNormalsMESH();
2448	3411	} else
2449	3412	if (source == genNormalsORGANItem)
2450	3413	{
..	..	@@ -2509,6 +3472,22 @@
2509	3472	if (source == unmarkleavesItem)
2510	3473	{
2511	3474	MarkLeaves(false);
	3475	+ } else
	3476	+ if (source == rewindleavesItem)
	3477	+ {
	3478	+ RewindLeaves(true);
	3479	+ } else
	3480	+ if (source == unrewindleavesItem)
	3481	+ {
	3482	+ RewindLeaves(false);
	3483	+ } else
	3484	+ if (source == randomleavesItem)
	3485	+ {
	3486	+ RandomLeaves(true);
	3487	+ } else
	3488	+ if (source == unrandomleavesItem)
	3489	+ {
	3490	+ RandomLeaves(false);
2512	3491	} else
2513	3492	if (source == flipVItem)
2514	3493	{
..	..	@@ -2594,9 +3573,13 @@
2594	3573	{
2595	3574	SmoothMesh();
2596	3575	} else
2597		- if (source == transformgeometryItem)
	3576	+ if (source == transformGeometryItem)
2598	3577	{
2599	3578	TransformGeometry();
	3579	+ } else
	3580	+ if (source == transformChildrenItem)
	3581	+ {
	3582	+ TransformChildren();
2600	3583	} else
2601	3584	if (source == resetTransformItem)
2602	3585	{
..	..	@@ -2604,7 +3587,11 @@
2604	3587	} else
2605	3588	if (source == resetCentroidItem)
2606	3589	{
2607		- ResetCentroid();
	3590	+ ResetCentroid(true);
	3591	+ } else
	3592	+ if (source == resetCentroidXZItem)
	3593	+ {
	3594	+ ResetCentroid(false);
2608	3595	} else
2609	3596	if (source == resetParentItem)
2610	3597	{
..	..	@@ -2709,7 +3696,7 @@
2709	3696	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2710	3697	{
2711	3698	obj = (Object3D)e.nextElement();
2712		- obj.SetBumpTexture(null);
	3699	+ obj.ResetBumpTexture();
2713	3700	}
2714	3701
2715	3702	refreshContents();
..	..	@@ -2725,6 +3712,31 @@
2725	3712
2726	3713	refreshContents();
2727	3714	} else
	3715	+ if (source == embedTexturesItem)
	3716	+ {
	3717	+ Object3D obj;
	3718	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3719	+ {
	3720	+ obj = (Object3D)e.nextElement();
	3721	+ obj.EmbedTextures(true);
	3722	+ }
	3723	+
	3724	+ refreshContents();
	3725	+ } else
	3726	+ if (source == deEmbedTexturesItem)
	3727	+ {
	3728	+ Object3D obj;
	3729	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3730	+ {
	3731	+ obj = (Object3D)e.nextElement();
	3732	+ obj.EmbedTextures(false);
	3733	+ }
	3734	+
	3735	+ CameraPane.texturepigment.clear();
	3736	+ CameraPane.texturebump.clear();
	3737	+
	3738	+ refreshContents();
	3739	+ } else
2728	3740	if (source == flashSelectionButton)
2729	3741	{
2730	3742	CameraPane.flash = true;
..	..	@@ -2736,42 +3748,36 @@
2736	3748	if (source == twoButton)
2737	3749	{
2738	3750	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();
	3751	+
	3752	+ if (CameraPane.FULLSCREEN)
	3753	+ fullscreenLayout = radio.layout;
	3754	+
	3755	+ Show3DView();
	3756	+
	3757	+ cameraView.requestFocusInWindow();
	3758	+
	3759	+// refreshContents(true);
	3760	+//
	3761	+// try
	3762	+// {
	3763	+// java.awt.Robot bot = new java.awt.Robot();
	3764	+// int mask = InputEvent.BUTTON1_MASK;
	3765	+// bot.mouseMove(100, 100);
	3766	+// bot.mousePress(mask);
	3767	+// bot.mouseRelease(mask);
	3768	+// }
	3769	+// catch (Exception e)
	3770	+// {
	3771	+//
	3772	+// }
	3773	+
2771	3774	} else
2772	3775	if (source == threeButton)
2773	3776	{
2774	3777	radio.layout = threeButton;
	3778	+
	3779	+ if (CameraPane.FULLSCREEN)
	3780	+ fullscreenLayout = radio.layout;
2775	3781
2776	3782	// bigThree.remove(scenePanel);
2777	3783	// bigThree.remove(centralPanel);
..	..	@@ -2801,13 +3807,18 @@
2801	3807	// centralPanel.setVisible(true);
2802	3808	// XYZPanel.setVisible(true);
2803	3809	bigThree.ClearUI();
	3810	+ bigThree.add(scenePanel);
2804	3811	bigThree.add(centralPanel);
2805		- bigThree.add(XYZPanel);
2806	3812	bigThree.FlushUI();
	3813	+
	3814	+ cameraView.requestFocusInWindow();
2807	3815	} else
2808	3816	if (source == fourButton)
2809	3817	{
2810	3818	radio.layout = fourButton;
	3819	+
	3820	+ if (CameraPane.FULLSCREEN)
	3821	+ fullscreenLayout = radio.layout;
2811	3822
2812	3823	// bigThree.remove(scenePanel);
2813	3824	// bigThree.remove(centralPanel);
..	..	@@ -2839,10 +3850,15 @@
2839	3850	bigThree.ClearUI();
2840	3851	bigThree.add(scenePanel);
2841	3852	bigThree.FlushUI();
	3853	+
	3854	+ cameraView.requestFocusInWindow();
2842	3855	} else
2843	3856	if (source == sixButton)
2844	3857	{
2845	3858	radio.layout = sixButton;
	3859	+
	3860	+ if (CameraPane.FULLSCREEN)
	3861	+ fullscreenLayout = radio.layout;
2846	3862
2847	3863	// bigThree.remove(scenePanel);
2848	3864	// bigThree.remove(centralPanel);
..	..	@@ -2872,13 +3888,18 @@
2872	3888	// centralPanel.setVisible(true);
2873	3889	// XYZPanel.setVisible(false);
2874	3890	bigThree.ClearUI();
2875		- bigThree.add(scenePanel);
2876	3891	bigThree.add(centralPanel);
	3892	+ bigThree.add(scenePanel);
2877	3893	bigThree.FlushUI();
	3894	+
	3895	+ cameraView.requestFocusInWindow();
2878	3896	} else
2879	3897	if (source == sevenButton)
2880	3898	{
2881	3899	radio.layout = sevenButton;
	3900	+
	3901	+ if (CameraPane.FULLSCREEN)
	3902	+ fullscreenLayout = radio.layout;
2882	3903
2883	3904	// bigThree.remove(scenePanel);
2884	3905	// bigThree.remove(centralPanel);
..	..	@@ -2912,9 +3933,12 @@
2912	3933	bigThree.add(centralPanel);
2913	3934	bigThree.add(XYZPanel);
2914	3935	bigThree.FlushUI();
	3936	+
	3937	+ cameraView.requestFocusInWindow();
2915	3938	} else
2916	3939	if (source == rootButton)
2917	3940	{
	3941	+ Replace();
2918	3942	Object3D obj;
2919	3943	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2920	3944	{
..	..	@@ -2923,6 +3947,7 @@
2923	3947	EditObject(obj);
2924	3948	}
2925	3949
	3950	+ cameraView.requestFocusInWindow();
2926	3951	refreshContents(true);
2927	3952	} else
2928	3953	if (source == closeButton)
..	..	@@ -2932,22 +3957,37 @@
2932	3957	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2933	3958	{
2934	3959	ab = (cRadio)e.nextElement();
2935		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3960	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2936	3961	{
	3962	+ // Patch to avoid bug with transparency.
	3963	+ if (!ab.hadMaterial)
	3964	+ {
	3965	+ ab.object.material = null;
	3966	+ }
	3967	+
2937	3968	buttonGroup.remove(ab);
2938	3969	radioPanel.remove(ab);
2939	3970
2940		- ab.GetObject().editWindow = null;
	3971	+ //ab.GetObject().editWindow = null;
	3972	+ ab.GetObject().manipWindow = null;
2941	3973	// ab.GetObject().objectUI = null; // ?????????
2942	3974
2943	3975	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2944	3976	break;
2945	3977	}
2946	3978	}
	3979	+
	3980	+ cameraView.requestFocusInWindow();
2947	3981	refreshContents(true);
2948	3982	} else
2949	3983	if (source == editItem \|\| source == editButton)
2950	3984	{
	3985	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3986	+ {
	3987	+ Object3D child = (Object3D)e.nextElement();
	3988	+ child.pinned = true;
	3989	+ }
	3990	+
2951	3991	EditSelection(false);
2952	3992	} else
2953	3993	if (source == uneditButton)
..	..	@@ -2956,11 +3996,12 @@
2956	3996	{
2957	3997	Object3D child = (Object3D)e.nextElement();
2958	3998	if(child.editWindow != null)
2959		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3999	+ child.pinned = false;
2960	4000	child.CloseUI();
2961	4001	listUI.remove(child);
	4002	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2962	4003
2963		- child.editWindow = null; // ???????????
	4004	+ //child.editWindow = null; // ???????????
2964	4005	}
2965	4006	objEditor.ctrlPanel.FlushUI();
2966	4007	//objEditor.jTree.clearSelection();
..	..	@@ -2973,16 +4014,18 @@
2973	4014	//copy.ClearUI();
2974	4015	for (Object3D obj : listUI)
2975	4016	{
	4017	+ obj.pinned = false;
2976	4018	obj.CloseUI();
2977	4019	}
2978	4020	listUI.clear();
	4021	+ SetPinStates(group.selection.size() > 0);
2979	4022	refreshContents(true);
2980	4023	} else
2981	4024	if (source == allParamsButton)
2982	4025	{
2983	4026	assert(copy == group);
2984	4027
2985		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4028	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2986	4029
2987	4030	for (Object3D obj : listUI)
2988	4031	{
..	..	@@ -3031,6 +4074,7 @@
3031	4074	}
3032	4075
3033	4076	copy = group;
	4077	+
3034	4078	//Globals.theRenderer.object = group;
3035	4079	if(!useclient)
3036	4080	{
..	..	@@ -3046,20 +4090,61 @@
3046	4090	frontView.object = group;
3047	4091	sideView.object = group;
3048	4092	}
3049		- group.editWindow = this;
	4093	+
	4094	+// fix "+" issue
	4095	+ //group.editWindow = this;
	4096	+ group.manipWindow = this;
	4097	+
3050	4098	/*
3051	4099	currentLayout = radio.layout;
3052	4100	if (currentLayout == null)
3053	4101	currentLayout = sevenButton;
3054	4102	*/
3055	4103	radio.layout.doClick();
	4104	+
	4105	+ assert(copy instanceof Composite);
	4106	+
	4107	+ if (copy.versionlist == null)
	4108	+ {
	4109	+ copy.versionlist = new Object3D[100];
	4110	+ copy.versionindex = -1;
	4111	+
	4112	+ Save(true);
	4113	+ }
	4114	+
	4115	+ SetVersionStates();
	4116	+
	4117	+ ClearUnpinned();
	4118	+
	4119	+ //Grafreed.Assert(group != null);
	4120	+ //Grafreed.Assert(group.selection != null);
	4121	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4122	+ if (group.selection == null \|\| group.selection.size() == 1)
	4123	+ EditSelection(false);
3056	4124	keepparent = group.parent;
3057	4125	// PARENT = NULL or not???
3058	4126	//group.parent = null; // ROOT
3059	4127	//group.attributes = -1;
3060	4128	ResetModel();
	4129	+
	4130	+ cameraView.requestFocusInWindow();
3061	4131	refreshContents(true);
3062		- }
	4132	+ } else if (event.getSource() == editCameraItem)
	4133	+ {
	4134	+ cameraView.ProtectCamera();
	4135	+ cameraView.requestFocusInWindow();
	4136	+ cameraView.repaint();
	4137	+ return;
	4138	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	4139	+ {
	4140	+ cameraView.RevertCamera();
	4141	+ cameraView.requestFocusInWindow();
	4142	+ cameraView.repaint();
	4143	+ return;
	4144	+ // } else if (event.getSource() == textureButton)
	4145	+ // {
	4146	+ // return; // true;
	4147	+ }
3063	4148	else
3064	4149	{
3065	4150	//return super.action(event, arg);
..	..	@@ -3068,7 +4153,6 @@
3068	4153	}
3069	4154
3070	4155	boolean useclient = false;
3071		- cRadio radio;
3072	4156
3073	4157	void ToggleRoot()
3074	4158	{
..	..	@@ -3120,6 +4204,28 @@
3120	4204	refreshContents();
3121	4205	}
3122	4206
	4207	+ void TransformChildren()
	4208	+ {
	4209	+ Object3D obj;
	4210	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4211	+ {
	4212	+ obj = (Object3D)e.nextElement();
	4213	+ obj.KeepTextureMatrices();
	4214	+ obj.TransformChildren();
	4215	+ obj.RestoreTextureMatrices();
	4216	+
	4217	+// if (obj.parent == null)
	4218	+// {
	4219	+// System.out.println("NULL PARENT!");
	4220	+// new Exception().printStackTrace();
	4221	+// }
	4222	+// else
	4223	+// TouchTransform(obj);
	4224	+// //obj.parent.Touch();
	4225	+ }
	4226	+
	4227	+ refreshContents();
	4228	+ }
3123	4229
3124	4230	void ResetTransform()
3125	4231	{
..	..	@@ -3232,7 +4338,7 @@
3232	4338	refreshContents();
3233	4339	}
3234	4340
3235		- void ResetCentroid()
	4341	+ void ResetCentroid(boolean full)
3236	4342	{
3237	4343	Object3D obj;
3238	4344	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3247,12 +4353,16 @@
3247	4353	LA.matIdentity(Object3D.mat);
3248	4354	obj.getBounds(minima, maxima, false);
3249	4355	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3250		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	4356	+ if (full)
	4357	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3251	4358	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3252	4359	obj.TransformMesh(Object3D.mat);
	4360	+
3253	4361	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3254		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	4362	+ if (full)
	4363	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3255	4364	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	4365	+
3256	4366	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3257	4367	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3258	4368	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3281,7 +4391,8 @@
3281	4391
3282	4392	int size = obj.MemorySize();
3283	4393
3284		- System.err.println((size/1024) + " KB is the size of " + obj);
	4394	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4395	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3285	4396	}
3286	4397	}
3287	4398	catch (Exception e)
..	..	@@ -3318,9 +4429,9 @@
3318	4429	obj = (Object3D)e.nextElement();
3319	4430
3320	4431	System.out.println("Object is: " + obj);
3321		- GrafreeD.AnalyzeObject(obj);
	4432	+ Grafreed.AnalyzeObject(obj);
3322	4433	System.out.println("Boundary rep: " + obj.bRep);
3323		- GrafreeD.AnalyzeObject(obj.bRep);
	4434	+ Grafreed.AnalyzeObject(obj.bRep);
3324	4435
3325	4436	// System.err.println((size/1024) + " KB is the size of " + obj);
3326	4437	}
..	..	@@ -3362,6 +4473,13 @@
3362	4473	void GenNormals(boolean crease)
3363	4474	{
3364	4475	group.GenNormalsS(crease);
	4476	+
	4477	+ refreshContents();
	4478	+ }
	4479	+
	4480	+ void GenNormalsMESH()
	4481	+ {
	4482	+ group.GenNormalsMeshS();
3365	4483
3366	4484	refreshContents();
3367	4485	}
..	..	@@ -3534,8 +4652,8 @@
3534	4652
3535	4653	void ParseVertices()
3536	4654	{
3537		- boolean epsequal = GrafreeD.epsequal;
3538		- GrafreeD.epsequal = true;
	4655	+ boolean epsequal = Grafreed.epsequal;
	4656	+ Grafreed.epsequal = true;
3539	4657
3540	4658	for (int i=0; i<group.selection.size(); i++)
3541	4659	{
..	..	@@ -3560,7 +4678,7 @@
3560	4678	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3561	4679	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3562	4680
3563		- g.add(GrafreeD.clipboard);
	4681	+ g.add(Grafreed.clipboard);
3564	4682
3565	4683	buffer.add(g);
3566	4684	}
..	..	@@ -3575,7 +4693,7 @@
3575	4693	makeSomething(buffer, i==group.selection.size()-1);
3576	4694	}
3577	4695
3578		- GrafreeD.epsequal = epsequal;
	4696	+ Grafreed.epsequal = epsequal;
3579	4697
3580	4698	refreshContents();
3581	4699	}
..	..	@@ -3593,7 +4711,16 @@
3593	4711	String pigment = Object3D.GetPigment(tex);
3594	4712	//String bump = Object3D.GetBump(tex);
3595	4713
3596		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4714	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4715	+
	4716	+ try
	4717	+ {
	4718	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
	4719	+ }
	4720	+ catch (Exception e)
	4721	+ {
	4722	+ System.err.println("FAIL: " + node);
	4723	+ }
3597	4724
3598	4725	double s = v.s;
3599	4726
..	..	@@ -3725,7 +4852,7 @@
3725	4852	return;
3726	4853
3727	4854	Object3D poses = group.selection.get(0);
3728		- Object3D ref = GrafreeD.clipboard.get(0);
	4855	+ Object3D ref = Grafreed.clipboard.get(0);
3729	4856
3730	4857	Object3D newgroup = new Object3D("Po:" + poses.name);
3731	4858
..	..	@@ -3919,9 +5046,9 @@
3919	5046
3920	5047	void ClipMesh()
3921	5048	{
3922		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	5049	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3923	5050	{
3924		- Object3D content = GrafreeD.clipboard.get(0);
	5051	+ Object3D content = Grafreed.clipboard.get(0);
3925	5052
3926	5053	if (content instanceof cGroup && ((cGroup)content).transientlink )
3927	5054	content = ((cGroup)content).get(0);
..	..	@@ -3930,7 +5057,7 @@
3930	5057	// {
3931	5058	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3932	5059	// }
3933		- group.selection.ClipMesh(GrafreeD.clipboard);
	5060	+ group.selection.ClipMesh(Grafreed.clipboard);
3934	5061	}
3935	5062	// group.selection.ClipMesh(GrafreeD.clipboard);
3936	5063	System.out.println("DONE.");
..	..	@@ -3977,6 +5104,18 @@
3977	5104	void MarkLeaves(boolean hide)
3978	5105	{
3979	5106	group.selection.MarkLeaves(hide);
	5107	+ refreshContents();
	5108	+ }
	5109	+
	5110	+ void RewindLeaves(boolean hide)
	5111	+ {
	5112	+ group.selection.RewindLeaves(hide);
	5113	+ refreshContents();
	5114	+ }
	5115	+
	5116	+ void RandomLeaves(boolean hide)
	5117	+ {
	5118	+ group.selection.RandomLeaves(hide);
3980	5119	refreshContents();
3981	5120	}
3982	5121
..	..	@@ -4051,28 +5190,25 @@
4051	5190	// }
4052	5191	// }
4053	5192
4054		- static boolean allparams = true;
4055		-
4056		- static Vector<Object3D> listUI = new Vector<Object3D>();
4057		-
4058	5193	void EditSelection(boolean newWindow)
4059	5194	{
	5195	+ if (group.selection == null)
	5196	+ {
	5197	+ EditElement(group, newWindow); // ? new
	5198	+ return;
	5199	+ }
	5200	+
4060	5201	// aConstraints.gridy = 0;
4061	5202	for (int i=0; i<group.selection.size(); i++)
4062	5203	{
4063	5204	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4064	5205	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4065		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5206	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4066	5207
4067	5208	Object3D elem = (Object3D)group.selection.elementAt(i);
4068		- if(elem != group)
	5209	+ if(elem != group \|\| !newWindow)
4069	5210	{
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
	5211	+ EditElement(elem, newWindow); // ? new
4076	5212	}
4077	5213	}
4078	5214	}
..	..	@@ -4135,9 +5271,7 @@
4135	5271
4136	5272	freezemodel = false;
4137	5273	}
4138		-
4139		- boolean flashIt = true;
4140		-
	5274	+
4141	5275	public void valueChanged(TreeSelectionEvent e)
4142	5276	//public boolean handleEvent(Event event)
4143	5277	{
..	..	@@ -4147,7 +5281,8 @@
4147	5281	//new Exception().printStackTrace();
4148	5282
4149	5283	freezemodel = true;
4150		-
	5284	+ ClearUnpinned();
	5285	+
4151	5286	/**/
4152	5287	//switch (event.id)
4153	5288	{
..	..	@@ -4155,7 +5290,6 @@
4155	5290	//case 702: // Event.LIST_DESELECT
4156	5291	group.deselectAll();
4157	5292	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4158		- objEditor.ClearInfo(); // .GetMaterial());
4159	5293	if (tps != null)
4160	5294	{
4161	5295	for (int i=0; i < tps.length; i++)
..	..	@@ -4164,10 +5298,8 @@
4164	5298
4165	5299	//if (child.parent != null)
4166	5300	//child.parent.addSelectee(child);
	5301	+ objEditor.SetMaterial(child);
4167	5302	group.addSelectee(child);
4168		- objEditor.SetMaterial(child); // .GetMaterial());
4169		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4170		- System.err.println("info : " + child.GetPath());
4171	5303	}
4172	5304	}
4173	5305	// else
..	..	@@ -4177,20 +5309,28 @@
4177	5309	// System.err.println("info : " + group.GetPath());
4178	5310	// }
4179	5311
4180		- objEditor.SetText(); // jan 2014
4181		-
4182		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	5312	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4183	5313	CameraPane.flash = true;
4184	5314
4185		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5315	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4186	5316	// a camera
4187	5317	{
4188		- CameraPane.camerachangeframe = 0; // don't refuse it
4189		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5318	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5319	+ {
	5320	+ CameraPane.camerachangeframe = 0; // don't refuse it
	5321	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5322	+ }
4190	5323	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4191	5324	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4192	5325	}
4193	5326
	5327	+ if (tps != null && tps.length == 1)
	5328	+ {
	5329	+ EditSelection(false);
	5330	+ }
	5331	+
	5332	+ SetPinStates(tps != null && tps.length > 0);
	5333	+
4194	5334	refreshContents();
4195	5335	//return true;
4196	5336	}
..	..	@@ -4199,6 +5339,51 @@
4199	5339
4200	5340	freezemodel = false;
4201	5341	}
	5342	+
	5343	+ void SetPinStates(boolean enabled)
	5344	+ {
	5345	+ editButton.setEnabled(enabled);
	5346	+ uneditButton.setEnabled(enabled);
	5347	+ //unselectButton.setEnabled(enabled);
	5348	+ flashSelectionButton.setEnabled(enabled);
	5349	+
	5350	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5351	+
	5352	+ boolean allComposites = true;
	5353	+
	5354	+ if (group.selection != null)
	5355	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5356	+ {
	5357	+ if (!(e.nextElement() instanceof Composite))
	5358	+ {
	5359	+ allComposites = false;
	5360	+ break;
	5361	+ }
	5362	+ }
	5363	+
	5364	+ rootButton.setEnabled(allComposites);
	5365	+ }
	5366	+
	5367	+ void refreshContents(boolean cp)
	5368	+ {
	5369	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5370	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5371	+ {
	5372	+ objEditor.ClearInfo(); // .GetMaterial());
	5373	+
	5374	+ for (int i=0; i < group.selection.Size(); i++)
	5375	+ {
	5376	+ Object3D child = (Object3D) group.selection.get(i);
	5377	+
	5378	+ objEditor.AddInfo(child, this, true);
	5379	+// System.err.println("info : " + child.GetPath());
	5380	+ }
	5381	+
	5382	+ objEditor.SetText(); // jan 2014
	5383	+ }
	5384	+
	5385	+ super.refreshContents(cp);
	5386	+ }
4202	5387
4203	5388	void linkSomething(Object3D thing)
4204	5389	{
..	..	@@ -4270,16 +5455,19 @@
4270	5455	{
4271	5456	if (group.selection.isEmpty())
4272	5457	return;
4273		- GrafreeD.clipboardIsTempGroup = false;
	5458	+
	5459	+ Grafreed.clipboardIsTempGroup = false;
4274	5460	Composite tGroup = null;
4275	5461	if (group.selection.size() > 0) // 1)
4276	5462	{
4277	5463	tGroup = new cGroup();
4278		- GrafreeD.clipboardIsTempGroup = true;
	5464	+ Grafreed.clipboardIsTempGroup = true;
4279	5465	}
4280	5466
4281	5467	if (cut)
4282	5468	{
	5469	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5470	+// Save();
4283	5471	//int indices[] = jList.getSelectedIndices();
4284	5472	//for (int i = indices.length - 1; i >= 0; i--)
4285	5473	//jList.remove(indices[i]);
..	..	@@ -4315,16 +5503,16 @@
4315	5503	//System.out.println("cut " + child);
4316	5504	//System.out.println("parent = " + child.parent);
4317	5505	// tmp.addChild(child);
4318		- if (GrafreeD.clipboardIsTempGroup)
	5506	+ if (Grafreed.clipboardIsTempGroup)
4319	5507	tGroup.add/Child/(tmp);
4320	5508	else
4321		- GrafreeD.clipboard = tmp;
	5509	+ Grafreed.clipboard = tmp;
4322	5510	}
4323	5511	else
4324		- if (GrafreeD.clipboardIsTempGroup)
	5512	+ if (Grafreed.clipboardIsTempGroup)
4325	5513	tGroup.add/Child/(child);
4326	5514	else
4327		- GrafreeD.clipboard = child;
	5515	+ Grafreed.clipboard = child;
4328	5516	}
4329	5517
4330	5518	//ResetModel();
..	..	@@ -4356,21 +5544,23 @@
4356	5544	//System.out.println("cut " + elem);
4357	5545	//System.out.println("parent = " + elem.parent);
4358	5546	// tmp.addChild(elem);
4359		- if (GrafreeD.clipboardIsTempGroup)
	5547	+ if (Grafreed.clipboardIsTempGroup)
4360	5548	tGroup.add/Child/(tmp);
4361	5549	else
4362		- GrafreeD.clipboard = tmp;
	5550	+ Grafreed.clipboard = tmp;
4363	5551	}
4364	5552	else
4365		- if (GrafreeD.clipboardIsTempGroup)
	5553	+ if (Grafreed.clipboardIsTempGroup)
4366	5554	tGroup.add/Child/(child);
4367	5555	else
4368		- GrafreeD.clipboard = child;
	5556	+ Grafreed.clipboard = child;
4369	5557	}
4370	5558
4371	5559	}
4372		- if (GrafreeD.clipboardIsTempGroup)
4373		- GrafreeD.clipboard = tGroup;
	5560	+
	5561	+ if (Grafreed.clipboardIsTempGroup)
	5562	+ Grafreed.clipboard = tGroup;
	5563	+
4374	5564	if (cut)
4375	5565	{
4376	5566	ResetModel();
..	..	@@ -4380,11 +5570,15 @@
4380	5570
4381	5571	void paste(boolean expand)
4382	5572	{
	5573	+ if (Globals.REPLACEONMAKE)
	5574	+ Save();
	5575	+ boolean keep = Globals.REPLACEONMAKE;
	5576	+ Globals.REPLACEONMAKE = false;
4383	5577	// if (GrafreeD.clipboard == null)
4384	5578	// return;
4385	5579	boolean first = true;
4386	5580
4387		- if (GrafreeD.clipboardIsTempGroup)
	5581	+ if (Grafreed.clipboardIsTempGroup)
4388	5582	{
4389	5583	Composite temp;
4390	5584
..	..	@@ -4395,7 +5589,7 @@
4395	5589	temp = (Composite)Applet3D.clipboard.deepCopy();
4396	5590	*/
4397	5591	Object3D elem;
4398		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5592	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4399	5593	{
4400	5594	Object3D child = (Object3D)e.nextElement();
4401	5595
..	..	@@ -4429,16 +5623,17 @@
4429	5623	//Object3D cb = Applet3D.clipboard;
4430	5624	//temp.addChild(cb);
4431	5625	//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());
	5626	+ assert(Grafreed.clipboard.parent == null);
	5627	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5628	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5629	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5630	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4437	5631	else
4438		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4439		- GrafreeD.clipboard.get(0).parent = keepparent;
	5632	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5633	+ Grafreed.clipboard.get(0).parent = keepparent;
4440	5634	}
4441	5635
	5636	+ Globals.REPLACEONMAKE = keep;
4442	5637	ResetModel();
4443	5638	refreshContents();
4444	5639	}
..	..	@@ -4485,9 +5680,9 @@
4485	5680	{
4486	5681	boolean first = true;
4487	5682
4488		- if (GrafreeD.clipboardIsTempGroup)
	5683	+ if (Grafreed.clipboardIsTempGroup)
4489	5684	{
4490		- Composite temp = (Composite)GrafreeD.clipboard;
	5685	+ Composite temp = (Composite)Grafreed.clipboard;
4491	5686	Object3D copy;
4492	5687	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4493	5688	{
..	..	@@ -4497,7 +5692,7 @@
4497	5692	}
4498	5693	} else
4499	5694	{
4500		- linkSomething(GrafreeD.clipboard); //.get(0));
	5695	+ linkSomething(Grafreed.clipboard); //.get(0));
4501	5696	}
4502	5697	}
4503	5698	}
..	..	@@ -4574,6 +5769,10 @@
4574	5769
4575	5770	void group(Object3D csg, boolean grab)
4576	5771	{
	5772	+ if (Globals.REPLACEONMAKE)
	5773	+ Save();
	5774	+ boolean keep = Globals.REPLACEONMAKE;
	5775	+ Globals.REPLACEONMAKE = false;
4577	5776	if (//false) // why??
4578	5777	!group.selection.isEmpty())
4579	5778	{
..	..	@@ -4687,10 +5886,15 @@
4687	5886	//node.add(csg);
4688	5887	//makeSomething(node);
4689	5888	makeSomething(csg);
	5889	+ Globals.REPLACEONMAKE = keep;
4690	5890	}
4691	5891
4692	5892	void Ungroup(Object3D g)
4693	5893	{
	5894	+ if (Globals.REPLACEONMAKE)
	5895	+ Save();
	5896	+ boolean keep = Globals.REPLACEONMAKE;
	5897	+ Globals.REPLACEONMAKE = false;
4694	5898	if (g instanceof HiddenObject)
4695	5899	{
4696	5900	HiddenObject h = (HiddenObject) g;
..	..	@@ -4707,6 +5911,7 @@
4707	5911	objEditor.makeSomething(g.get(i), false);
4708	5912	}
4709	5913	}
	5914	+ Globals.REPLACEONMAKE = keep;
4710	5915	}
4711	5916
4712	5917	void ungroup()
..	..	@@ -4902,21 +6107,6 @@
4902	6107	}
4903	6108	*/
4904	6109
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	6110	/*
4921	6111	public void Callback(Object obj)
4922	6112	{
..	..	@@ -4940,26 +6130,9 @@
4940	6130	}
4941	6131	*/
4942	6132
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	6133	String GetFile(String dialogName)
4961	6134	{
4962		- if (GrafreeD.standAlone)
	6135	+ if (Grafreed.standAlone)
4963	6136	{
4964	6137	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4965	6138	browser.show();
..	..	@@ -5027,7 +6200,43 @@
5027	6200	cButton clearpanelButton;
5028	6201	cButton unselectButton;
5029	6202
	6203	+ cButton restoreCameraButton;
	6204	+
5030	6205	cButton oneStepButton;
	6206	+
	6207	+ cButton groupButton;
	6208	+ cButton ungroupButton;
	6209	+ cButton compositeButton;
	6210	+ cButton switchButton;
	6211	+ cButton loopButton;
	6212	+ cButton textureButton;
	6213	+
	6214	+ cButton skybox1Button;
	6215	+ cButton skybox2Button;
	6216	+ cButton skybox3Button;
	6217	+ cButton skybox4Button;
	6218	+ cButton skybox5Button;
	6219	+ cButton skybox6Button;
	6220	+ cButton skybox7Button;
	6221	+
	6222	+ cButton skybox11Button;
	6223	+ cButton skybox12Button;
	6224	+ cButton skybox13Button;
	6225	+ cButton skybox14Button;
	6226	+ cButton skybox15Button;
	6227	+ cButton skybox16Button;
	6228	+ cButton skybox17Button;
	6229	+
	6230	+ cButton gridButton;
	6231	+ cButton boxButton;
	6232	+ cButton sphereButton;
	6233	+ cButton coneButton;
	6234	+ cButton torusButton;
	6235	+ cButton superButton;
	6236	+ cButton kleinButton;
	6237	+ cButton particlesButton;
	6238	+ cButton overlayButton;
	6239	+ cButton lightButton;
5031	6240
5032	6241	cButton screenfitButton;
5033	6242	cButton screenfitpointButton;
..	..	@@ -5040,14 +6249,6 @@
5040	6249
5041	6250	cButton setsupportButton;
5042	6251
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	6252	//
5052	6253	//Composite
5053	6254	Object3D // to do !!
..	..	@@ -5057,10 +6258,12 @@
5057	6258	//JTree jTree;
5058	6259	private MenuItem lookAtItem;
5059	6260	private MenuItem lookFromItem;
5060		- private MenuItem switchItem;
5061		- private MenuItem cutItem;
5062		- private MenuItem duplicateItem;
5063		- private MenuItem cloneItem;
	6261	+ private MenuItem switchViewItem;
	6262	+ private JMenuItem cutItem;
	6263	+ private MenuItem undoItem;
	6264	+ private MenuItem redoItem;
	6265	+ private JMenuItem duplicateItem;
	6266	+ private JMenuItem cloneItem;
5064	6267	private MenuItem cloneSupportItem;
5065	6268	private MenuItem overwriteGeoItem;
5066	6269	private MenuItem overwriteMatItem;
..	..	@@ -5072,7 +6275,7 @@
5072	6275	private MenuItem linkverticesItem;
5073	6276	private MenuItem relinkverticesItem;
5074	6277	private MenuItem setMasterItem;
5075		- private MenuItem resetMeshItem;
	6278	+ private MenuItem resetAllItem;
5076	6279	private MenuItem stepAllItem;
5077	6280	private MenuItem revertMeshItem;
5078	6281	private MenuItem poseMeshItem;
..	..	@@ -5081,13 +6284,13 @@
5081	6284	private MenuItem cloneGeometriesItem;
5082	6285	private MenuItem shareGeometriesItem;
5083	6286	private MenuItem mergeGeometriesItem;
5084		- private MenuItem copyItem;
	6287	+ private JMenuItem copyItem;
5085	6288	private MenuItem pasteItem;
5086		- private MenuItem pasteIntoItem;
5087		- private MenuItem pasteLinkItem;
5088		- private MenuItem pasteCloneItem;
5089		- private MenuItem pasteExpandItem;
5090		- private MenuItem clearItem;
	6289	+ private JMenuItem pasteIntoItem;
	6290	+ private JMenuItem pasteLinkItem;
	6291	+ private JMenuItem pasteCloneItem;
	6292	+ private JMenuItem pasteExpandItem;
	6293	+ private JMenuItem deleteItem;
5091	6294	private MenuItem clearAllItem;
5092	6295	private MenuItem genUVItem;
5093	6296	private MenuItem genNormalsMESHItem;
..	..	@@ -5122,6 +6325,10 @@
5122	6325	private MenuItem showleavesItem;
5123	6326	private MenuItem markleavesItem;
5124	6327	private MenuItem unmarkleavesItem;
	6328	+ private MenuItem rewindleavesItem;
	6329	+ private MenuItem unrewindleavesItem;
	6330	+ private MenuItem randomleavesItem;
	6331	+ private MenuItem unrandomleavesItem;
5125	6332
5126	6333	private MenuItem flipVItem;
5127	6334	private MenuItem unflipVItem;
..	..	@@ -5133,15 +6340,17 @@
5133	6340	private MenuItem panoTexturesItem;
5134	6341
5135	6342	private MenuItem resetCentroidItem;
5136		- private MenuItem transformgeometryItem;
	6343	+ private MenuItem resetCentroidXZItem;
5137	6344	private MenuItem resetTransformItem;
	6345	+ private MenuItem transformGeometryItem;
	6346	+ private MenuItem transformChildrenItem;
5138	6347	private MenuItem hideItem;
5139	6348	private MenuItem grabItem;
5140	6349	private MenuItem backItem;
5141	6350	private MenuItem frontItem;
5142	6351	private MenuItem cameraItem;
5143	6352	private MenuItem compositeItem;
5144		- private MenuItem randomItem;
	6353	+ private MenuItem switchItem;
5145	6354	private MenuItem physicsItem;
5146	6355	private MenuItem frameselectorItem;
5147	6356	private MenuItem scriptNodeItem;
..	..	@@ -5149,7 +6358,7 @@
5149	6358	private MenuItem switchTransfoItem;
5150	6359	private MenuItem morphItem;
5151	6360	private MenuItem linkerItem;
5152		- private MenuItem ungroupItem;
	6361	+ private JMenuItem ungroupItem;
5153	6362	private MenuItem editItem;
5154	6363	private MenuItem openWindowItem;
5155	6364	private MenuItem editLeafItem;
..	..	@@ -5165,6 +6374,8 @@
5165	6374	private MenuItem attachBumpItem;
5166	6375	private MenuItem detachBumpItem;
5167	6376	private MenuItem pigmentBumpItem;
	6377	+ private MenuItem embedTexturesItem;
	6378	+ private MenuItem deEmbedTexturesItem;
5168	6379
5169	6380	private MenuItem particleItem;
5170	6381	private MenuItem ragdollItem;
..	..	@@ -5203,11 +6414,6 @@
5203	6414	private MenuItem doubleItem;
5204	6415	private MenuItem tripleItem;
5205	6416
5206		- private MenuItem importGFDItem;
5207		- private MenuItem importVRMLX3DItem;
5208		- private MenuItem import3DSItem;
5209		- private MenuItem importOBJItem;
5210		-
5211	6417	private MenuItem computeAOItem;
5212	6418	private MenuItem recompileItem;
5213	6419	private MenuItem editScriptItem;
..	..	@@ -5217,4 +6423,8 @@
5217	6423	private MenuItem analyzeItem;
5218	6424	private MenuItem dumpItem;
5219	6425	//boolean freezemodel = false;
	6426	+
	6427	+ Menu cameraMenu;
	6428	+ MenuItem editCameraItem;
	6429	+ MenuItem restoreCameraItem;
5220	6430	}