~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,16 @@
60	415	this.copy = this.group = group;
61	416	//selectees = this.group.selectees;
62	417
	418	+ assert(false);
	419	+
	420	+ if (copy.versionlist == null)
	421	+ {
	422	+ copy.versionlist = new Object3D[100];
	423	+ copy.versionindex = -1;
	424	+
	425	+ //Save(true);
	426	+ }
	427	+
63	428	if(ui)
64	429	SetupUI(objEditor);
65	430	}
..	..	@@ -74,16 +439,28 @@
74	439	this.copy = this.group = copy;
75	440	//selectees = this.group.selectees;
76	441
77		- SetupMenu2(objEditor);
	442	+ SetupMenu2(this); //objEditor);
78	443	SetupUI2(objEditor);
79	444	objEditor.SetupUI(true);
80	445	SetupViews(objEditor);
81	446
82	447	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	448	+
	449	+ if (copy.versionlist == null)
	450	+ {
	451	+ copy.versionlist = new Object3D[100];
	452	+ copy.versionindex = -1;
	453	+
	454	+ //Save(true);
	455	+ }
83	456	}
84	457
85	458	void CloneSelection(boolean supports)
86	459	{
	460	+ if (Globals.REPLACEONMAKE)
	461	+ Save();
	462	+ boolean keep = Globals.REPLACEONMAKE;
	463	+ Globals.REPLACEONMAKE = false;
87	464	// Object3D keep = GrafreeD.clipboard;
88	465	//Object3D obj;
89	466	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,18 +471,19 @@
94	471
95	472	makeSomething(clone, i==group.selection.size()-1);
96	473	}
	474	+ Globals.REPLACEONMAKE = keep;
97	475	}
98	476
99	477	void CloneClipboard(boolean supports)
100	478	{
101		- assert(GrafreeD.clipboard.parent == null);
102		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
103		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
104		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
105		- makeSomething(CloneObject(GrafreeD.clipboard.get(0), false));
	479	+ assert(Grafreed.clipboard.parent == null);
	480	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	481	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	482	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	483	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
106	484	else
107		- makeSomething(CloneObject(GrafreeD.clipboard, false));
108		- GrafreeD.clipboard.get(0).parent = keepparent;
	485	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	486	+ Grafreed.clipboard.get(0).parent = keepparent;
109	487	}
110	488
111	489	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -119,7 +497,7 @@
119	497	// obj.support = null;
120	498	if (!supports)
121	499	obj.SaveSupports();
122		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	500	+ Object3D clone = (Object3D)Grafreed.clone(obj);
123	501	obj.parent = parent;
124	502	// obj.support = support;
125	503	// clone.support = support; // aout 2013
..	..	@@ -148,52 +526,51 @@
148	526
149	527	//JTextField nameField;
150	528
151		- void SetupMenu2(ObjEditor oe)
	529	+ void SetupMenu2(GroupEditor oe)
152	530	{
153		- if (Globals.ADVANCED)
154		- {
155		- oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
156		- //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
157		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
158		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
159		- oe.cameraMenu.add("-");
160		- openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
161		- openWindowItem.addActionListener(this);
162		- editLeafItem.addActionListener(this);
163		- lookAtItem.addActionListener(this);
164		- //lookFromItem.addActinoListener(this);
165		- //switchItem.addActionListener(this);
166		- }
167		-
	531	+ oe.jTree = new cTree();
	532	+
168	533	Menu menu;
169	534	oe.menuBar.add(menu = new Menu("Edit"));
170	535	//editItem = menu.add(new MenuItem("Edit"));
171	536	//editItem.addActionListener(this);
172		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	537	+
	538	+// undoItem = menu.add(new MenuItem("Undo"));
	539	+// undoItem.addActionListener(this);
	540	+// redoItem = menu.add(new MenuItem("Redo"));
	541	+// redoItem.addActionListener(this);
	542	+// menu.add("-");
	543	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
173	544	duplicateItem.addActionListener(this);
174		- cutItem = menu.add(new MenuItem("Cut"));
	545	+
	546	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
	547	+ cloneItem.addActionListener(this);
	548	+ //if (Globals.ADVANCED)
	549	+ {
	550	+ cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
	551	+ cloneSupportItem.addActionListener(this);
	552	+ }
	553	+ oe.jTree.popup.addSeparator();
	554	+ menu.add("-");
	555	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
175	556	cutItem.addActionListener(this);
176		- copyItem = menu.add(new MenuItem("Copy"));
	557	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
177	558	copyItem.addActionListener(this);
178	559	pasteItem = menu.add(new MenuItem("Paste"));
179	560	pasteItem.addActionListener(this);
180		- menu.add("-");
181		- cloneItem = menu.add(new MenuItem("Clone"));
182		- cloneItem.addActionListener(this);
183		- cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
184		- cloneSupportItem.addActionListener(this);
185		- menu.add("-");
186		- pasteIntoItem = menu.add(new MenuItem("Paste into"));
	561	+
	562	+ oe.jTree.popup.addSeparator();
	563	+ //menu.add("-");
	564	+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
187	565	pasteIntoItem.addActionListener(this);
188		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	566	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
189	567	pasteLinkItem.addActionListener(this);
190		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	568	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
191	569	pasteCloneItem.addActionListener(this);
192		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	570	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
193	571	// pasteExpandItem.addActionListener(this);
194		- menu.add("-");
195		- clearItem = menu.add(new MenuItem("Clear"));
196		- clearItem.addActionListener(this);
	572	+ //menu.add("-");
	573	+ oe.jTree.popup.addSeparator();
197	574
198	575	if (Globals.ADVANCED)
199	576	{
..	..	@@ -201,14 +578,95 @@
201	578	clearAllItem = menu.add(new MenuItem("Clear All"));
202	579	clearAllItem.addActionListener(this);
203	580	}
	581	+
	582	+ menuBar.add(cameraMenu = new Menu("View"));
	583	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	584	+ //zBufferItem.addActionListener(this);
	585	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	586	+ //normalLensItem.addActionListener(this);
	587	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	588	+ restoreCameraItem.addActionListener(this);
	589	+
	590	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	591	+// toggleFullScreenItem.addItemListener(this);
	592	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	593	+// cameraMenu.add("-");
	594	+//
	595	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	596	+// toggleTextureItem.addItemListener(this);
	597	+// toggleTextureItem.setState(CameraPane.textureon);
	598	+//
	599	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	600	+// toggleSwitchItem.addItemListener(this);
	601	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	602	+
	603	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	604	+ toggleHandleItem.addItemListener(this);
	605	+ toggleHandleItem.setState(CameraPane.HANDLES);
	606	+
	607	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	608	+ togglePaintItem.addItemListener(this);
	609	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	610	+
	611	+ if (Globals.ADVANCED)
	612	+ {
	613	+ cameraMenu.add("-");
	614	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	615	+ toggleLiveItem.addItemListener(this);
	616	+ toggleLiveItem.setState(Globals.isLIVE());
204	617
	618	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	619	+ stepItem.addActionListener(this);
	620	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	621	+ // toggleDLItem.addItemListener(this);
	622	+ // toggleDLItem.setState(false);
	623	+
	624	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	625	+ toggleRenderItem.addItemListener(this);
	626	+ toggleRenderItem.setState(!CameraPane.frozen);
	627	+
	628	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	629	+ toggleDebugItem.addItemListener(this);
	630	+ toggleDebugItem.setState(Globals.DEBUG);
	631	+
	632	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	633	+ toggleFrustumItem.addItemListener(this);
	634	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	635	+
	636	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	637	+ toggleFootContactItem.addItemListener(this);
	638	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	639	+
	640	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	641	+ toggleTimelineItem.addItemListener(this);
	642	+ }
	643	+
	644	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	645	+// toggleRootItem.addItemListener(this);
	646	+// toggleRootItem.setState(false);
	647	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	648	+// animationItem.addItemListener(this);
	649	+// animationItem.setState(CameraPane.ANIMATION);
	650	+ cameraMenu.add("-");
	651	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	652	+ editCameraItem.addActionListener(this);
	653	+
	654	+ if (Globals.ADVANCED)
	655	+ {
	656	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	657	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	658	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	659	+ oe.cameraMenu.add("-");
	660	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	661	+ openWindowItem.addActionListener(this);
	662	+ lookAtItem.addActionListener(this);
	663	+ //lookFromItem.addActinoListener(this);
	664	+ //switchViewItem.addActionListener(this);
	665	+ }
	666	+
205	667	oe.menuBar.add(menu = new Menu("Setting"));
206	668	if (Globals.ADVANCED)
207	669	{
208		- resetMeshItem = menu.add(new MenuItem("Reset All"));
209		- resetMeshItem.addActionListener(this);
210		- stepAllItem = menu.add(new MenuItem("Step All"));
211		- stepAllItem.addActionListener(this);
212	670	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
213	671	revertMeshItem.addActionListener(this);
214	672	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
..	..	@@ -247,22 +705,37 @@
247	705	setMasterItem.addActionListener(this);
248	706	}
249	707
250		- oe.menuBar.add(menu = new Menu("Group"));
251		- grabItem = menu.add(new MenuItem("Grab"));
252		- grabItem.addActionListener(this);
	708	+ oe.menuBar.add(menu = new Menu("Order"));
	709	+
253	710	backItem = menu.add(new MenuItem("Back"));
254	711	backItem.addActionListener(this);
255	712	frontItem = menu.add(new MenuItem("Front"));
256	713	frontItem.addActionListener(this);
257		- compositeItem = menu.add(new MenuItem("Composite"));
258		- compositeItem.addActionListener(this);
	714	+// compositeItem = menu.add(new MenuItem("Composite"));
	715	+// compositeItem.addActionListener(this);
	716	+
	717	+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
	718	+ grabItem.addActionListener(this);
	719	+
	720	+ if (Globals.ADVANCED)
	721	+ {
259	722	hideItem = menu.add(new MenuItem("Hidden Group"));
260	723	hideItem.addActionListener(this);
261		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	724	+ }
	725	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
262	726	ungroupItem.addActionListener(this);
263		- menu.add("-");
264		- randomItem = menu.add(new MenuItem("Switch node"));
265		- randomItem.addActionListener(this);
	727	+
	728	+ oe.jTree.popup.addSeparator();
	729	+
	730	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	731	+ deleteItem.addActionListener(this);
	732	+
	733	+// menu.add("-");
	734	+//
	735	+// switchItem = menu.add(new MenuItem("Switch node"));
	736	+// switchItem.addActionListener(this);
	737	+ if (Globals.ADVANCED)
	738	+ {
266	739	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
267	740	switchGeoItem.addActionListener(this);
268	741	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -270,49 +743,52 @@
270	743	morphItem = menu.add(new MenuItem("Morph Group"));
271	744	morphItem.addActionListener(this);
272	745
273		- if (Globals.ADVANCED)
274		- {
	746	+ menu.add("-");
275	747	physicsItem = menu.add(new MenuItem("Physics"));
276	748	physicsItem.addActionListener(this);
277	749	frameselectorItem = menu.add(new MenuItem("Frame Selector"));
278	750	frameselectorItem.addActionListener(this);
279	751	scriptNodeItem = menu.add(new MenuItem("Script Node"));
280	752	scriptNodeItem.addActionListener(this);
281		- cameraItem = menu.add(new MenuItem("Camera"));
282		- cameraItem.addActionListener(this);
283	753	}
284	754
285	755	oe.menuBar.add(menu = new Menu("Object"));
286		- textureItem = menu.add(new MenuItem("Texture"));
287		- textureItem.addActionListener(this);
	756	+// textureItem = menu.add(new MenuItem("Texture"));
	757	+// textureItem.addActionListener(this);
288	758	billboardItem = menu.add(new MenuItem("Billboard"));
289	759	billboardItem.addActionListener(this);
290	760	csgItem = menu.add(new MenuItem("CSG"));
291	761	csgItem.addActionListener(this);
292		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	762	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
293	763	shadowXItem.addActionListener(this);
294		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	764	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
295	765	shadowYItem.addActionListener(this);
296		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	766	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
297	767	shadowZItem.addActionListener(this);
298		- if (Globals.ADVANCED)
299		- {
300		- linkerItem = menu.add(new MenuItem("Linker"));
301		- linkerItem.addActionListener(this);
302	768	attributeItem = menu.add(new MenuItem("Attribute"));
303	769	attributeItem.addActionListener(this);
	770	+
	771	+ if (Globals.ADVANCED)
	772	+ {
	773	+ menu.add("-");
	774	+ linkerItem = menu.add(new MenuItem("Linker"));
	775	+ linkerItem.addActionListener(this);
304	776	templateItem = menu.add(new MenuItem("Template"));
305	777	templateItem.addActionListener(this);
306	778	pointflowItem = menu.add(new MenuItem("Point Flow"));
307	779	pointflowItem.addActionListener(this);
308		- menu.add("-");
309	780	}
	781	+ menu.add("-");
310	782	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
311	783	resetTransformItem.addActionListener(this);
312	784	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
313	785	resetCentroidItem.addActionListener(this);
314		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
315		- transformgeometryItem.addActionListener(this);
	786	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	787	+ resetCentroidXZItem.addActionListener(this);
	788	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	789	+ transformGeometryItem.addActionListener(this);
	790	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	791	+ transformChildrenItem.addActionListener(this);
316	792
317	793	oe.menuBar.add(menu = new Menu("Geometry"));
318	794	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -325,7 +801,7 @@
325	801	genNormalsMESHItem.addActionListener(this);
326	802	if (Globals.ADVANCED)
327	803	{
328		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	804	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
329	805	genNormalsMINEItem.addActionListener(this);
330	806	}
331	807	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -361,6 +837,10 @@
361	837	oe.menuBar.add(menu = new Menu("Attributes"));
362	838	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
363	839	clearMaterialsItem.addActionListener(this);
	840	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	841	+ resetAllItem.addActionListener(this);
	842	+ stepAllItem = menu.add(new MenuItem("Step All"));
	843	+ stepAllItem.addActionListener(this);
364	844	menu.add("-");
365	845	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
366	846	liveleavesItem.addActionListener(this);
..	..	@@ -381,6 +861,14 @@
381	861	markleavesItem.addActionListener(this);
382	862	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
383	863	unmarkleavesItem.addActionListener(this);
	864	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	865	+ rewindleavesItem.addActionListener(this);
	866	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	867	+ unrewindleavesItem.addActionListener(this);
	868	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	869	+ randomleavesItem.addActionListener(this);
	870	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	871	+ unrandomleavesItem.addActionListener(this);
384	872	menu.add("-");
385	873	flipVItem = menu.add(new MenuItem("Flip V"));
386	874	flipVItem.addActionListener(this);
..	..	@@ -406,55 +894,130 @@
406	894	attachBumpItem.addActionListener(this);
407	895	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
408	896	pigmentBumpItem.addActionListener(this);
	897	+ //embedTexturesItem
409	898	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
410	899	detachPigmentItem.addActionListener(this);
411	900	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
412	901	detachBumpItem.addActionListener(this);
	902	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	903	+ embedTexturesItem.addActionListener(this);
	904	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	905	+ deEmbedTexturesItem.addActionListener(this);
413	906	menu.add("-");
414	907	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
415	908	sortbysizeItem.addActionListener(this);
416	909	sortbynameItem = menu.add(new MenuItem("Sort by name"));
417	910	sortbynameItem.addActionListener(this);
	911	+ menu.add("-");
	912	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	913	+ shareGeometriesItem.addActionListener(this);
	914	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	915	+ mergeGeometriesItem.addActionListener(this);
	916	+ menu.add("-");
	917	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	918	+ editLeafItem.addActionListener(this);
418	919	if (Globals.ADVANCED)
419	920	{
420		- menu.add("-");
	921	+ // Pretty much the same as duplicate and clone.
421	922	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
422	923	extractGeometriesItem.addActionListener(this);
423	924	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
424	925	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	926	}
430	927
431	928	oe.menuBar.add(menu = new Menu("Insert"));
432	929	buildCreateMenu(menu);
433	930
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	931	oe.menuBar.add(menu = new Menu("Tools"));
445	932	buildToolsMenu(menu);
446	933	}
447	934
	935	+ JTabbedPane resourcecontainer;
	936	+ cGridBag currenttab;
	937	+ //boolean added; // patch for jar
	938	+
	939	+ int tabcount = 0;
	940	+ int colcount = 0;
	941	+ int rowcount = 0;
	942	+ int texturecount = 0;
	943	+
	944	+ int columns = 5;
	945	+ int rows = 7;
	946	+
	947	+ public void ResourceCallBack(String[] path)
	948	+ {
	949	+// for (int i = 0; i < path.length; i++)
	950	+// System.out.print(path[i] + "/");
	951	+// System.out.println();
	952	+
	953	+ if (//rowcount == 0 \|\|
	954	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	955	+ {
	956	+ currenttab = new cGridBag();
	957	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	958	+ currenttab.setName(tabname);
	959	+ //added = false;
	960	+ resourcecontainer.add(currenttab);
	961	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	962	+ rowcount = 1;
	963	+ colcount = 0;
	964	+ texturecount = 0;
	965	+ }
	966	+
	967	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	968	+ {
	969	+ //if (!added)
	970	+ {
	971	+ //added = true;
	972	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	973	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	974	+ }
	975	+
	976	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	977	+
	978	+ if (++colcount >= columns)
	979	+ {
	980	+ colcount = 0;
	981	+ currenttab.Return();
	982	+
	983	+ if (rowcount++ >= rows)
	984	+ {
	985	+ rowcount = 0;
	986	+ }
	987	+ }
	988	+ }
	989	+ else
	990	+ {
	991	+// if (!path[path.length-1].equals("icons"))
	992	+// resourcecontainer.Return();
	993	+ }
	994	+ }
	995	+
	996	+ void CreateTexturePanel(cGridBag container)
	997	+ {
	998	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	999	+ container.add(resourcecontainer);
	1000	+
	1001	+ Grafreed.ParseResources("textures", this);
	1002	+ }
	1003	+
448	1004	void SetupUI2(ObjEditor oe)
449	1005	{
	1006	+ // June 2019
	1007	+ if (oe == null)
	1008	+ {
	1009	+ //super.SetupUI2(this);
	1010	+ //return;
	1011	+ }
	1012	+
	1013	+ if (copy != group)
	1014	+ {
	1015	+ //super.SetupUI2(this);
	1016	+ }
	1017	+
450	1018	//new Exception().printStackTrace();
451	1019
452	1020	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	1021	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
459	1022
460	1023	oe.buttonGroup = new ButtonGroup();
..	..	@@ -475,97 +1038,263 @@
475	1038	oe.radioPanel.add(dummyButton);
476	1039	oe.buttonGroup.add(dummyButton);
477	1040	*/
	1041	+ cGridBag copyOptionsPanel = new cGridBag();
	1042	+
	1043	+ copyOptionsPanel.preferredHeight = 2;
	1044	+
478	1045	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
479	1046
480		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
481		- liveCB.setToolTipText("Enabled animation");
482		- liveCB.addItemListener(this);
	1047	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1048	+ //minButton.setToolTipText("Minimize window");
	1049	+ //minButton.addActionListener(this);
	1050	+
	1051	+ if (Globals.ADVANCED)
	1052	+ {
	1053	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1054	+// maxButton.setToolTipText("Maximize window");
	1055	+// maxButton.addActionListener(this);
	1056	+ }
	1057	+
	1058	+ cButton gcButton;
	1059	+
	1060	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1061	+// gcButton.setToolTipText("Garbage collect");
	1062	+// gcButton.addActionListener(new ActionListener()
	1063	+// {
	1064	+// public void actionPerformed(ActionEvent e)
	1065	+// {
	1066	+// System.gc();
	1067	+// }
	1068	+// });
	1069	+
	1070	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1071	+ collapseButton.setToolTipText("Collapse toolbar");
	1072	+ collapseButton.addActionListener(this);
	1073	+
	1074	+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/empty.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1075	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1076	+ maximize3DButton.addActionListener(this);
	1077	+
	1078	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1079	+ twoButton.setToolTipText("Show 3D view only");
	1080	+ twoButton.addActionListener(this);
	1081	+ this.fullscreenLayout = twoButton;
	1082	+
	1083	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1084	+ threeButton.setToolTipText("Show controls and 3D view");
	1085	+ threeButton.addActionListener(this);
	1086	+ if (Globals.ADVANCED)
	1087	+ {
	1088	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1089	+ sixButton.setToolTipText("Show 3D view and controls");
	1090	+ sixButton.addActionListener(this);
	1091	+ }
	1092	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1093	+// sevenButton.setToolTipText("3-column layout");
	1094	+// sevenButton.addActionListener(this);
	1095	+ //
	1096	+
	1097	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1098	+ fullButton.setToolTipText("Full-screen window");
	1099	+ fullButton.addActionListener(this);
	1100	+
	1101	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1102	+ screenfitButton.setToolTipText("Screen fit");
	1103	+ screenfitButton.addActionListener(this);
483	1104
484		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1105	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1106	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1107	+ restoreCameraButton.addActionListener(this);
	1108	+
	1109	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1110	+ saveVersionButton.setToolTipText("Duplicate current version");
	1111	+ saveVersionButton.addActionListener(this);
	1112	+
	1113	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1114	+ deleteVersionButton.setToolTipText("Delete current version");
	1115	+ deleteVersionButton.addActionListener(this);
	1116	+ deleteVersionButton.setEnabled(false);
	1117	+
	1118	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1119	+ previousVersionButton.setToolTipText("Previous version");
	1120	+ previousVersionButton.addActionListener(this);
	1121	+ previousVersionButton.setEnabled(false);
	1122	+
	1123	+ cGridBag updown = new cGridBag().setVertical(true);
	1124	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1125	+ restoreButton.setToolTipText("Undo (restore current version)");
	1126	+ restoreButton.addActionListener(this);
	1127	+ restoreButton.setEnabled(false);
	1128	+
	1129	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1130	+ replaceButton.setToolTipText("Save (replace current version)");
	1131	+ replaceButton.addActionListener(this);
	1132	+ replaceButton.setEnabled(false);
	1133	+
	1134	+ copyOptionsPanel.add(updown);
	1135	+
	1136	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1137	+ nextVersionButton.setToolTipText("Next version");
	1138	+ nextVersionButton.addActionListener(this);
	1139	+ nextVersionButton.setEnabled(false);
	1140	+
	1141	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
485	1142	oneStepButton.setToolTipText("Animate one step forward");
486	1143	oneStepButton.addActionListener(this);
487	1144
488		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	1145	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1146	+ liveCB.setToolTipText("Enable animation");
	1147	+ liveCB.addItemListener(this);
	1148	+
	1149	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
489	1150	fastCB.setToolTipText("Fast mode");
490	1151	fastCB.addItemListener(this);
491	1152
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);
	1153	+ //oe.toolboxPanel.Return();
	1154	+
	1155	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1156	+// trackCB.setToolTipText("Enable tracking");
	1157	+// trackCB.addItemListener(this);
499	1158
500	1159	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
501	1160	// screenfitpointButton.addActionListener(this);
502	1161
503	1162	if (Globals.ADVANCED)
504	1163	{
505		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1164	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
506	1165	snapobjectButton.addActionListener(this);
507	1166	snapobjectButton.setToolTipText("Snap Object");
	1167	+
	1168	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1169	+ fourButton.addActionListener(this);
	1170	+ fourButton.setToolTipText("Show control panel only");
508	1171	}
509	1172
510		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
511		- flashSelectionButton.setToolTipText("Show selection");
512		- flashSelectionButton.addActionListener(this);
	1173	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
513	1174
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	1175
533		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
534		- rootButton.setToolTipText("Edit selection in new tab");
	1176	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1177	+ rootButton.setToolTipText("Open selection in new tab");
535	1178	rootButton.addActionListener(this);
536	1179
537		- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1180	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
538	1181	closeButton.setToolTipText("Close tab");
539	1182	closeButton.addActionListener(this);
540	1183	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
541	1184	//clearButton.addActionListener(this);
542		-
543		- cGridBag commandsPanel = new cGridBag();
	1185	+
	1186	+ cGridBag row1 = new cGridBag();
544	1187
545		- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
546		- editButton.setToolTipText("Edit selection");
	1188	+ // INSERT
	1189	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1190	+ gridButton.setToolTipText("Create ground");
	1191	+ gridButton.addActionListener(this);
	1192	+
	1193	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1194	+ boxButton.setToolTipText("Create box");
	1195	+ boxButton.addActionListener(this);
	1196	+
	1197	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1198	+ superButton.setToolTipText("Create superellipsoid");
	1199	+ superButton.addActionListener(this);
	1200	+
	1201	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1202	+ sphereButton.setToolTipText("Create sphere");
	1203	+ sphereButton.addActionListener(this);
	1204	+
	1205	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1206	+ coneButton.setToolTipText("Create cone");
	1207	+ coneButton.addActionListener(this);
	1208	+
	1209	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1210	+ torusButton.setToolTipText("Create torus");
	1211	+ torusButton.addActionListener(this);
	1212	+
	1213	+ if (Globals.ADVANCED)
	1214	+ {
	1215	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1216	+ kleinButton.setToolTipText("Create Klein bottle");
	1217	+ kleinButton.addActionListener(this);
	1218	+ }
	1219	+
	1220	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1221	+ particlesButton.setToolTipText("Create particle system");
	1222	+ particlesButton.addActionListener(this);
	1223	+
	1224	+ oe.toolboxPanel.add(row1);
	1225	+
	1226	+ cGridBag row2 = new cGridBag();
	1227	+
	1228	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1229	+ groupButton.setToolTipText("Create group");
	1230	+ groupButton.addActionListener(this);
	1231	+
	1232	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1233	+ compositeButton.setToolTipText("Create composite");
	1234	+ compositeButton.addActionListener(this);
	1235	+
	1236	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1237	+ switchButton.setToolTipText("Create item switcher");
	1238	+ switchButton.addActionListener(this);
	1239	+
	1240	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1241	+ loopButton.setToolTipText("Create loop");
	1242	+ loopButton.addActionListener(this);
	1243	+
	1244	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1245	+ textureButton.setToolTipText("Create texture");
	1246	+ textureButton.addActionListener(this);
	1247	+
	1248	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1249	+ overlayButton.setToolTipText("Create overlay");
	1250	+ overlayButton.addActionListener(this);
	1251	+
	1252	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1253	+ lightButton.setToolTipText("Create light");
	1254	+ lightButton.addActionListener(this);
	1255	+
	1256	+ oe.toolboxPanel.add(row2);
	1257	+
	1258	+ cGridBag textures = new cGridBag();
	1259	+
	1260	+ CreateTexturePanel(textures);
	1261	+
	1262	+ oe.toolboxPanel.add(textures);
	1263	+
	1264	+ textures.preferredHeight = 100;
	1265	+
	1266	+ CreateSkyboxPanel(oe.skyboxPanel);
	1267	+
	1268	+ // EDIT panel
	1269	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1270	+ editButton.setToolTipText("Pin selection controls");
547	1271	editButton.addActionListener(this);
548	1272
549		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
550		- uneditButton.setToolTipText("Unedit selection");
	1273	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1274	+ uneditButton.setToolTipText("Unpin and remove selection controls");
551	1275	uneditButton.addActionListener(this);
552	1276
553		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
554		- allParamsButton.setToolTipText("Edit all params");
	1277	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1278	+ allParamsButton.setToolTipText("Show all controls");
555	1279	allParamsButton.addActionListener(this);
556	1280
557		- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
558		- clearPanelButton.setToolTipText("Clear edit panel");
	1281	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1282	+ clearPanelButton.setToolTipText("Clear all controls");
559	1283	clearPanelButton.addActionListener(this);
560	1284
561		- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
562		- unselectButton.setToolTipText("Unselect");
563		- unselectButton.addActionListener(this);
	1285	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1286	+ //unselectButton.setToolTipText("Unselect");
	1287	+ //unselectButton.addActionListener(this);
564	1288
565		- commandsPanel.preferredHeight = 1;
	1289	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1290	+ flashSelectionButton.setToolTipText("Highlight selection");
	1291	+ flashSelectionButton.addActionListener(this);
566	1292
567		- oe.treePanel.add(commandsPanel);
568		- oe.treePanel.Return();
	1293	+ editCommandsPanel.preferredHeight = 1;
	1294	+
	1295	+ SetPinStates(false);
	1296	+// oe.treePanel.add(commandsPanel);
	1297	+// oe.treePanel.Return();
569	1298
570	1299	// oe.aConstraints.gridx += 1;
571	1300	// oe.aConstraints.weighty = 0;
..	..	@@ -582,32 +1311,20 @@
582	1311
583	1312	JScrollPane jSP;
584	1313	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
585		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1314	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
586	1315	ResetModel();
587	1316
588	1317	oe.treePanel.add(jSPPanel);
589	1318	oe.treePanel.Return();
590	1319
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	1320	oe.treePanel.add(copyOptionsPanel);
607	1321	oe.treePanel.Return();
	1322	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1323	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1324	+ sliderPane.preferredHeight = 1;
608	1325
609		-// mainPanel.setDividerLocation(0.5); //1.0);
610		-// mainPanel.setResizeWeight(0.5);
	1326	+// mainPanel.setDividerLocation(0.1); //1.0);
	1327	+ mainPanel.setResizeWeight(0.4);
611	1328
612	1329	//jList.addListSelectionListener(this);
613	1330	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -615,7 +1332,7 @@
615	1332	//jTree.setEditable(true);
616	1333	oe.jTree.setDragEnabled(true);
617	1334	//jTree.setPreferredSize(new Dimension(10,10));
618		- jSP.setPreferredSize(new Dimension(100,200));
	1335	+ //jSP.setPreferredSize(new Dimension(100,200));
619	1336
620	1337	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
621	1338
..	..	@@ -627,29 +1344,49 @@
627	1344	dgr.addDragGestureListener(this);
628	1345	}catch(Exception e) {}
629	1346	*/
630		- radio.layout = sevenButton;
	1347	+ radio.layout = threeButton; // sixButton;
631	1348	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
632	1349	}
633	1350
634	1351	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
635	1352	{
	1353	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1354	+ colorCB.setToolTipText("Copy color when dropped");
	1355	+ colorCB.addItemListener(this);
	1356	+
	1357	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1358	+ materialCB.setToolTipText("Copy material when dropped");
	1359	+ materialCB.addItemListener(this);
	1360	+
	1361	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1362	+ textureCB.setToolTipText("Copy texture when dropped");
	1363	+ textureCB.addItemListener(this);
	1364	+
	1365	+ panel.Return();
	1366	+
636	1367	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
637	1368	boxCB.setToolTipText("Display bounding boxes");
638	1369	boxCB.addItemListener(this);
639	1370
640	1371	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
641		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1372	+ zoomBoxCB.setToolTipText("Display only for wheel");
642	1373	zoomBoxCB.addItemListener(this);
643	1374
644		- if (Globals.ADVANCED)
	1375	+ if (true) // Globals.ADVANCED)
645	1376	{
646		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
647		- supportCB.setToolTipText("Enable rigging");
648		- supportCB.addItemListener(this);
	1377	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1378	+// supportCB.setToolTipText("Enable rigging");
	1379	+// supportCB.addItemListener(this);
	1380	+
	1381	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1382	+ freezeCB.setToolTipText("Fast moving camera");
	1383	+ freezeCB.addItemListener(this);
649	1384
650	1385	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
651	1386	// localCB.addItemListener(this);
652	1387
	1388	+ panel.Return();
	1389	+
653	1390	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
654	1391	crowdCB.setToolTipText("Used for crowds");
655	1392	crowdCB.addItemListener(this);
..	..	@@ -658,14 +1395,19 @@
658	1395	smoothCB.setToolTipText("Snapping delay");
659	1396	smoothCB.addItemListener(this);
660	1397
661		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
662		- slowCB.setToolTipText("Smooth interpolation");
663		- slowCB.addItemListener(this);
	1398	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1399	+// slowCB.setToolTipText("Smooth interpolation");
	1400	+// slowCB.addItemListener(this);
	1401	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1402	+ minshaderCB.setToolTipText("Minimal fast shader");
	1403	+ minshaderCB.addItemListener(this);
664	1404
665	1405	// constraints.gridy += 1;
666	1406	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
667	1407	// speakerMocapCB.addItemListener(this);
668	1408
	1409	+ panel.Return();
	1410	+
669	1411	if (false)
670	1412	{
671	1413	// handled in scripts
..	..	@@ -680,67 +1422,126 @@
680	1422	//constraints.gridy += 1;
681	1423	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
682	1424	smoothfocusCB.addItemListener(this);
	1425	+ panel.Return();
683	1426	}
684	1427
685	1428	//constraints.gridx += 1;
686	1429	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
687	1430	// debugCB.addItemListener(this);
688	1431
	1432	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1433	+ trackCB.setToolTipText("Enable tracking target");
	1434	+ trackCB.addItemListener(this);
	1435	+
689	1436	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1437	+ oeilCB.setToolTipText("Move camera when tracking");
690	1438	oeilCB.addItemListener(this);
691	1439
	1440	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1441	+ shadowCB.setToolTipText("When live compute shadows");
	1442	+ shadowCB.addItemListener(this);
	1443	+
	1444	+ panel.Return();
	1445	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1446	+ toggleTextureCB.setToolTipText("Load textures");
	1447	+ toggleTextureCB.addItemListener(this);
	1448	+
	1449	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1450	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1451	+ toggleSwitchCB.addItemListener(this);
	1452	+
	1453	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1454	+ autokeepCB.setToolTipText("On structure change");
	1455	+ autokeepCB.addItemListener(this);
	1456	+
	1457	+ panel.Return();
	1458	+ if (Globals.ADVANCED)
	1459	+ {
692	1460	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
693	1461	lookAtCB.setToolTipText("Look-at target");
694	1462	lookAtCB.addItemListener(this);
	1463	+ }
695	1464
696	1465	}
697	1466
698	1467	cGridBag fill = new cGridBag();
699		-
700	1468	fill.preferredHeight = 200;
	1469	+ cGridBag fill2 = new cGridBag();
	1470	+ fill2.preferredHeight = 200;
	1471	+ cGridBag fill3 = new cGridBag();
	1472	+ fill3.preferredHeight = 200;
701	1473
702	1474	panel.add(fill);
	1475	+ panel.add(fill2);
	1476	+ panel.add(fill3);
703	1477
704	1478	}
705	1479
706	1480	void EditObject(Object3D obj)
707	1481	{
	1482	+ assert(obj instanceof Composite);
	1483	+
	1484	+// if (obj.versionlist == null)
	1485	+// {
	1486	+// obj.versionlist = new Object3D[100];
	1487	+// obj.versionindex = -1;
	1488	+// }
	1489	+
708	1490	cRadio radioButton = new cRadio(obj.name);
	1491	+
	1492	+ // June 2019. Patch to avoid bug with transparency.
	1493	+ radioButton.hadMaterial = obj.material != null;
	1494	+ if (!radioButton.hadMaterial)
	1495	+ {
	1496	+ obj.material = new cMaterial();
	1497	+ }
	1498	+
709	1499	radioButton.SetObject(obj);
710		- radioButton.layout = sevenButton;
	1500	+ radioButton.layout = threeButton; // sixButton;
711	1501	radioButton.SetCamera(cameraView.renderCamera, false);
712	1502	radioButton.addActionListener(this);
713	1503	radioPanel.add(radioButton);
714	1504	buttonGroup.add(radioButton);
715	1505	radioButton.doClick();
716	1506	}
	1507	+
717	1508	void SetupViews(ObjEditor oe)
718	1509	{
	1510	+ theFrame = this;
	1511	+
719	1512	oe.SetupViews();
720	1513
	1514	+ if (Globals.DEBUG)
721	1515	System.out.println("SetupViews");
722	1516	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
723	1517	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
724	1518	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
725	1519	}
726	1520
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;
	1521	+ cToggleButton liveCB;
	1522	+ cCheckBox supportCB;
	1523	+ cCheckBox localCB;
	1524	+ cCheckBox crowdCB;
	1525	+ cCheckBox smoothCB;
	1526	+ cCheckBox minshaderCB;
	1527	+
	1528	+ cToggleButton fastCB;
	1529	+ cCheckBox slowCB;
	1530	+ cCheckBox boxCB;
	1531	+ cCheckBox zoomBoxCB;
	1532	+ cCheckBox freezeCB;
	1533	+ //cToggleButton trackCB;
	1534	+ cCheckBox trackCB;
	1535	+ cCheckBox smoothfocusCB;
738	1536	// JCheckBox speakerMocapCB;
739		- JCheckBox speakerCameraCB;
740		- JCheckBox speakerFocusCB;
741		- JCheckBox debugCB;
742		- JCheckBox oeilCB;
743		- JCheckBox lookAtCB;
	1537	+ cCheckBox speakerCameraCB;
	1538	+ cCheckBox speakerFocusCB;
	1539	+ cCheckBox debugCB;
	1540	+
	1541	+ cCheckBox oeilCB;
	1542	+ cCheckBox shadowCB;
	1543	+ cCheckBox autokeepCB;
	1544	+ cCheckBox lookAtCB;
744	1545
745	1546	// static int COLOR = 1;
746	1547	// static int MATERIAL = 2;
..	..	@@ -748,9 +1549,9 @@
748	1549
749	1550	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
750	1551
751		- JCheckBox colorCB;
752		- JCheckBox materialCB;
753		- JCheckBox textureCB;
	1552	+ cCheckBox colorCB;
	1553	+ cCheckBox materialCB;
	1554	+ cCheckBox textureCB;
754	1555
755	1556	public void itemStateChanged(ItemEvent e)
756	1557	{
..	..	@@ -778,6 +1579,7 @@
778	1579	} else if(e.getSource() == liveCB)
779	1580	{
780	1581	cameraView.ToggleLive();
	1582	+ refreshContents(false);
781	1583	}
782	1584	else if(e.getSource() == supportCB)
783	1585	{
..	..	@@ -793,6 +1595,12 @@
793	1595	{
794	1596	cameraView.ToggleInertia();
795	1597	cameraView.repaint();
	1598	+ }
	1599	+ else if(e.getSource() == minshaderCB)
	1600	+ {
	1601	+ Globals.MINSHADER ^= true;
	1602	+ cameraView.programInitialized = false;
	1603	+ cameraView.repaint();
796	1604	}
797	1605	else if(e.getSource() == localCB)
798	1606	{
..	..	@@ -842,6 +1650,18 @@
842	1650	{
843	1651	cameraView.ToggleOeil();
844	1652	}
	1653	+ else if(e.getSource() == shadowCB)
	1654	+ {
	1655	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1656	+ }
	1657	+ else if(e.getSource() == freezeCB)
	1658	+ {
	1659	+ Globals.FREEZEONMOVE ^= true;
	1660	+ }
	1661	+ else if(e.getSource() == autokeepCB)
	1662	+ {
	1663	+ Globals.REPLACEONMAKE ^= true;
	1664	+ }
845	1665	else if(e.getSource() == lookAtCB)
846	1666	{
847	1667	cameraView.ToggleLookAt();
..	..	@@ -858,7 +1678,8 @@
858	1678
859	1679	/**/
860	1680	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
861		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1681	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1682	+ TreePath path = objEditor.jTree.getSelectionPath();
862	1683	if ((path == null) \|\| (path.getPathCount() <= 1)) {
863	1684	// We can't move the root node or an empty selection
864	1685	return;
..	..	@@ -921,8 +1742,6 @@
921	1742	}
922	1743	}
923	1744
924		- String string = (String) object;
925		-
926	1745	System.out.println("Transfer = " + object + "; drop : " + target);
927	1746	// if( object instanceof java.io.File[])
928	1747	// {
..	..	@@ -930,7 +1749,11 @@
930	1749	// objEditor.DropFile((java.io.File[]) object, true);
931	1750	// return;
932	1751	// }
933		- if (string.charAt(0) == '/')
	1752	+
	1753	+ String string = object.toString();
	1754	+
	1755	+ // File path for Mac and Windows
	1756	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
934	1757	{
935	1758	// file(s)
936	1759	String[] names = string.split("\n");
..	..	@@ -957,7 +1780,7 @@
957	1780
958	1781	flashIt = false;
959	1782	CameraPane pane = (CameraPane) target;
960		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1783	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
961	1784	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
962	1785
963	1786	if (group.selection.size() == 1)
..	..	@@ -973,23 +1796,33 @@
973	1796
974	1797	assert target == objEditor.jTree;
975	1798	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1799	+ Object3D destinationLeaf;
976	1800	try {
977		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1801	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
978	1802	} catch (Exception e) {
979	1803	System.out.println("destinationPath : " + destinationPath);
980	1804	return;
981	1805	}
982	1806
983		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1807	+ for (int i=group.selection.size(); --i>=0;)
984	1808	{
	1809	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1810	+
	1811	+ // Cannot move into itself
	1812	+ if (child == destinationLeaf)
	1813	+ return;
	1814	+ }
	1815	+
	1816	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1817	+// {
985	1818	loadClipboard(true);
986	1819	objEditor.jTree.setSelectionPath(destinationPath);
987	1820	pasteInto(false, false);
988		- } else {
989		- loadClipboard(false);
990		- objEditor.jTree.setSelectionPath(destinationPath);
991		- pasteInto(false, false); // true); // ???
992		- }
	1821	+// } else {
	1822	+// loadClipboard(false);
	1823	+// objEditor.jTree.setSelectionPath(destinationPath);
	1824	+// pasteInto(false, false); // true); // ???
	1825	+// }
993	1826	}
994	1827	public void dropActionChanged(DropTargetDragEvent dtde)
995	1828	// Called if the user has modified the current drop gesture
..	..	@@ -1045,7 +1878,12 @@
1045	1878	TreePath path;
1046	1879
1047	1880	public TransferableTreePath(TreePath tp) {
1048		- path = tp;
	1881	+ Object[] objs = new Object[tp.getPathCount()];
	1882	+ for (int i=0; i<objs.length; i++)
	1883	+ {
	1884	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1885	+ }
	1886	+ path = new TreePath(objs);
1049	1887	}
1050	1888
1051	1889	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1094,22 +1932,30 @@
1094	1932	{
1095	1933	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1096	1934	//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);
	1935	+// gridItem = menu.add(new MenuItem("Grid"));
	1936	+// gridItem.addActionListener(this);
	1937	+// rectoidItem = menu.add(new MenuItem("Box"));
	1938	+// rectoidItem.addActionListener(this);
	1939	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1940	+// ellipsoidItem.addActionListener(this);
	1941	+// coneItem = menu.add(new MenuItem("Cone"));
	1942	+// coneItem.addActionListener(this);
	1943	+// torusItem = menu.add(new MenuItem("Torus"));
	1944	+// torusItem.addActionListener(this);
	1945	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1946	+// superItem.addActionListener(this);
	1947	+
	1948	+ cameraItem = menu.add(new MenuItem("Camera"));
	1949	+ cameraItem.addActionListener(this);
	1950	+
	1951	+ if (!Globals.ADVANCED)
	1952	+ {
1109	1953	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1110	1954	kleinItem.addActionListener(this);
1111		- particleItem = menu.add(new MenuItem("Particle system"));
1112		- particleItem.addActionListener(this);
	1955	+ }
	1956	+
	1957	+// particleItem = menu.add(new MenuItem("Particle system"));
	1958	+// particleItem.addActionListener(this);
1113	1959	if (Globals.ADVANCED)
1114	1960	{
1115	1961	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1135,15 +1981,15 @@
1135	1981	}
1136	1982	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1137	1983	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);
	1984	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1985	+// overlayItem.addActionListener(this);
	1986	+// lightItem = menu.add(new MenuItem("Light"));
	1987	+// lightItem.addActionListener(this);
1142	1988	menu.add("-");
1143	1989	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1144	1990	//superLoopItem.addActionListener(this);
1145		- loopItem = menu.add(new MenuItem("Loop"));
1146		- loopItem.addActionListener(this);
	1991	+// loopItem = menu.add(new MenuItem("Loop"));
	1992	+// loopItem.addActionListener(this);
1147	1993	doubleItem = menu.add(new MenuItem("Fork"));
1148	1994	doubleItem.addActionListener(this);
1149	1995	if (Globals.ADVANCED)
..	..	@@ -1159,18 +2005,23 @@
1159	2005	animationItem.addItemListener(this);
1160	2006	animationItem.setState(Globals.ANIMATION);
1161	2007
	2008	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	2009	+ archiveItem.addActionListener(this);
	2010	+
1162	2011	menu.add("-");
1163	2012	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1164	2013	parseverticesItem.addActionListener(this);
1165	2014	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1166	2015	textureFieldItem.addActionListener(this);
1167		- alignItem = menu.add(new MenuItem("Align Object"));
	2016	+ alignItem = menu.add(new MenuItem("Align Objects"));
1168	2017	alignItem.addActionListener(this);
1169	2018	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1170	2019	reduceMorphItem.addActionListener(this);
1171	2020	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1172	2021	reduce34MorphItem.addActionListener(this);
1173		-
	2022	+ menu.add("-");
	2023	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	2024	+ memoryItem.addActionListener(this);
1174	2025	menu.add(computeAOItem = new MenuItem("Compute AO"));
1175	2026	computeAOItem.addActionListener(this);
1176	2027
..	..	@@ -1179,11 +2030,9 @@
1179	2030	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1180	2031	mirrorItem.addActionListener(this);
1181	2032	menu.add("-");
1182		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1183		- memoryItem.addActionListener(this);
1184	2033	menu.add(analyzeItem = new MenuItem("Analyze"));
1185	2034	analyzeItem.addActionListener(this);
1186		- menu.add(dumpItem = new MenuItem("Dump"));
	2035	+ menu.add(dumpItem = new MenuItem("Print"));
1187	2036	dumpItem.addActionListener(this);
1188	2037	// menu.add(pathItem = new MenuItem("From-to path"));
1189	2038	// pathItem.addActionListener(this);
..	..	@@ -1324,9 +2173,38 @@
1324	2173	shadow.material = new cMaterial(obj.material);
1325	2174	shadow.material.diffuse = 0.0001f;
1326	2175	shadow.material.specular = 0.0001f;
	2176	+ shadow.material.opacity = 0.75f;
	2177	+
	2178	+ AllocProjectedVertices(shadow);
	2179	+
	2180	+ shadow.projectedVertices[1].x = 300;
1327	2181
1328	2182	makeSomething(shadow);
1329	2183	}
	2184	+
	2185	+ private void ClearUnpinned()
	2186	+ {
	2187	+ //for (Object3D obj : listUI)
	2188	+ for (int i=listUI.size(); --i>=0;)
	2189	+ {
	2190	+ Object3D obj = listUI.elementAt(i);
	2191	+ if (!obj.pinned)
	2192	+ {
	2193	+ obj.CloseUI();
	2194	+ listUI.remove(i);
	2195	+ }
	2196	+ }
	2197	+ }
	2198	+
	2199	+ private void EditElement(Object3D elem, boolean newWindow)
	2200	+ {
	2201	+ // if (!(elem instanceof Composite))
	2202	+ // newWindow = false;
	2203	+ listUI.add(elem);
	2204	+ elem.openEditWindow(this, newWindow); //, false);
	2205	+ System.out.println("edit : " + elem);
	2206	+ elem.editWindow.refreshContents(true); // ? new
	2207	+ }
1330	2208
1331	2209	/**
1332	2210	* applyExample
..	..	@@ -1530,9 +2408,9 @@
1530	2408
1531	2409	void Overwrite(int mask)
1532	2410	{
1533		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2411	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1534	2412	{
1535		- Object3D content = GrafreeD.clipboard.get(0);
	2413	+ Object3D content = Grafreed.clipboard.get(0);
1536	2414
1537	2415	if (content instanceof cGroup && ((cGroup)content).transientlink )
1538	2416	content = ((cGroup)content).get(0);
..	..	@@ -1571,7 +2449,7 @@
1571	2449	{
1572	2450	ScreenFit();
1573	2451	} else
1574		- if (source == switchItem)
	2452	+ if (source == switchViewItem)
1575	2453	{
1576	2454	cVector v1 = new cVector();
1577	2455	cVector v2 = new cVector();
..	..	@@ -1580,11 +2458,11 @@
1580	2458	objEditor.cameraView.renderCamera.setAim(v2, v1);
1581	2459	objEditor.cameraView.repaint();
1582	2460	} else
1583		- if (source == rectoidItem)
	2461	+ if (source == rectoidItem \|\| source == boxButton)
1584	2462	{
1585	2463	makeSomething(new Box());
1586	2464	} else
1587		- if (source == particleItem)
	2465	+ if (source == particleItem \|\| source == particlesButton)
1588	2466	{
1589	2467	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1590	2468	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1663,27 +2541,27 @@
1663	2541
1664	2542	makeSomething(obj);
1665	2543	} else
1666		- if (source == gridItem)
	2544	+ if (source == gridItem \|\| source == gridButton)
1667	2545	{
1668	2546	makeSomething(new Grid());
1669	2547	} else
1670		- if (source == ellipsoidItem)
	2548	+ if (source == ellipsoidItem \|\| source == sphereButton)
1671	2549	{
1672	2550	makeSomething(new Sphere());
1673	2551	} else
1674		- if (source == coneItem)
	2552	+ if (source == coneItem \|\| source == coneButton)
1675	2553	{
1676	2554	makeSomething(new Cone());
1677	2555	} else
1678		- if (source == torusItem)
	2556	+ if (source == torusItem \|\| source == torusButton)
1679	2557	{
1680	2558	makeSomething(new Torus());
1681	2559	} else
1682		- if (source == superItem)
	2560	+ if (source == superItem \|\| source == superButton)
1683	2561	{
1684	2562	makeSomething(new Superellipsoid());
1685	2563	} else
1686		- if (source == kleinItem)
	2564	+ if (source == kleinItem \|\| source == kleinButton)
1687	2565	{
1688	2566	makeSomething(new Klein());
1689	2567	} else
..	..	@@ -1703,7 +2581,7 @@
1703	2581	{
1704	2582	makeSomething(new BezierSurface());
1705	2583	} else
1706		- if (source == overlayItem)
	2584	+ if (source == overlayItem \|\| source == overlayButton)
1707	2585	{
1708	2586	/*
1709	2587	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1751,10 +2629,27 @@
1751	2629	s.setup();
1752	2630	makeSomething(s);
1753	2631	} else
1754		- if (source == lightItem)
	2632	+ if (source == lightItem \|\| source == lightButton)
1755	2633	{
1756	2634	makeSomething(new Light());
1757	2635	} else
	2636	+// if (source == skybox1Button \|\|
	2637	+// source == skybox2Button \|\|
	2638	+// source == skybox3Button \|\|
	2639	+// source == skybox4Button \|\|
	2640	+// source == skybox5Button \|\|
	2641	+// source == skybox6Button \|\|
	2642	+// source == skybox7Button \|\|
	2643	+// source == skybox11Button \|\|
	2644	+// source == skybox12Button \|\|
	2645	+// source == skybox13Button \|\|
	2646	+// source == skybox14Button \|\|
	2647	+// source == skybox15Button \|\|
	2648	+// source == skybox16Button \|\|
	2649	+// source == skybox17Button)
	2650	+// {
	2651	+// ChangeSkybox(source);
	2652	+// } else
1758	2653	if (source == csgItem)
1759	2654	{
1760	2655	group(new CSG());
..	..	@@ -1801,30 +2696,38 @@
1801	2696
1802	2697	group(g);
1803	2698	} else
1804		- if (source == loopItem)
	2699	+ if (source == loopItem \|\| source == loopButton)
1805	2700	{
	2701	+ if (!group.selection.isEmpty())
	2702	+ {
1806	2703	Composite csg = new GroupLeaf();
1807	2704	csg.count = 5;
1808		- group(csg);
1809		- Composite child = new cGroup();
	2705	+ Composite child = new cGroup("Branch");
1810	2706	csg.addChild(child);
1811	2707	child.addChild(csg);
	2708	+ group(csg);
	2709	+ }
1812	2710	} else
1813	2711	if (source == doubleItem)
1814	2712	{
1815		- Composite csg = new GroupLeaf();
	2713	+ if (!group.selection.isEmpty())
	2714	+ {
	2715	+ Composite csg = new GroupLeaf("Fork");
1816	2716	csg.count = 5;
	2717	+ Composite child = new cGroup("Branch A");
	2718	+ csg.addChild(child);
	2719	+ child.addChild(csg);
	2720	+ child = new cGroup("Branch B");
	2721	+ csg.addChild(child);
	2722	+ child.addChild(csg);
1817	2723	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);
	2724	+ }
1824	2725	} else
1825	2726	if (source == tripleItem)
1826	2727	{
1827		- Composite csg = new GroupLeaf();
	2728	+ if (!group.selection.isEmpty())
	2729	+ {
	2730	+ Composite csg = new GroupLeaf("Trident");
1828	2731	csg.count = 4;
1829	2732	group(csg);
1830	2733	Composite child = new cGroup();
..	..	@@ -1836,28 +2739,12 @@
1836	2739	child = new cGroup();
1837	2740	csg.addChild(child);
1838	2741	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");
	2742	+ }
1856	2743	} else
1857	2744	if (source == computeAOItem)
1858	2745	{
1859	2746	Globals.drawMode = CameraPane.OCCLUSION;
1860		- Globals.theRenderer.repaint();
	2747	+ cameraView.repaint();
1861	2748	} else
1862	2749	if (source == recompileItem)
1863	2750	{
..	..	@@ -1872,7 +2759,7 @@
1872	2759	if (source == invariantsItem)
1873	2760	{
1874	2761	System.out.println("Invariants:");
1875		- GrafreeD.grafreeD.universe.invariants();
	2762	+ Grafreed.grafreed.universe.invariants();
1876	2763	} else
1877	2764	if (source == memoryItem)
1878	2765	{
..	..	@@ -1891,6 +2778,65 @@
1891	2778	{
1892	2779	DumpObject();
1893	2780	} else
	2781	+ if (source == minButton)
	2782	+ {
	2783	+ Minimize();
	2784	+ } else
	2785	+ if (source == maxButton)
	2786	+ {
	2787	+ Maximize();
	2788	+ } else
	2789	+ if (source == fullButton)
	2790	+ {
	2791	+ ToggleFullScreen();
	2792	+ } else
	2793	+ if (source == collapseButton)
	2794	+ {
	2795	+ this.expandedLayout = radio.layout;
	2796	+ CollapseToolbar();
	2797	+ } else
	2798	+ if (source == maximize3DButton)
	2799	+ {
	2800	+ this.expandedLayout = radio.layout;
	2801	+ radio.layout = twoButton;
	2802	+ Show3DView();
	2803	+ CollapseToolbar();
	2804	+ } else
	2805	+ if (source == previousVersionButton)
	2806	+ {
	2807	+ // Go to previous version
	2808	+ //if (!Undo())
	2809	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2810	+ PreviousVersion();
	2811	+ } else
	2812	+ if (source == restoreButton)
	2813	+ {
	2814	+ // Restore current version
	2815	+ Restore();
	2816	+ //restoreButton.setEnabled(false);
	2817	+ } else
	2818	+ if (source == replaceButton)
	2819	+ {
	2820	+ // Overwrite current version
	2821	+ Replace();
	2822	+ //replaceButton.setEnabled(false);
	2823	+ } else
	2824	+ if (source == nextVersionButton)
	2825	+ {
	2826	+ // Go to next version
	2827	+ NextVersion();
	2828	+ } else
	2829	+ if (source == saveVersionButton)
	2830	+ {
	2831	+ // Save a new version
	2832	+ if (!Save(true))
	2833	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2834	+ } else
	2835	+ if (source == deleteVersionButton)
	2836	+ {
	2837	+ // Delete a new version
	2838	+ DeleteVersion();
	2839	+ } else
1894	2840	if (source == oneStepButton)
1895	2841	{
1896	2842	Globals.ONESTEP = true;
..	..	@@ -1898,17 +2844,14 @@
1898	2844	} else
1899	2845	if (source == screenfitButton)
1900	2846	{
1901		- //Reload(lastConverter, lastFilename, true);
1902	2847	ScreenFit();
1903	2848	} else
1904	2849	if (source == screenfitpointButton)
1905	2850	{
1906		- //Reload(lastConverter, lastFilename, true);
1907	2851	ScreenFitPoint();
1908	2852	} else
1909	2853	if (source == snapobjectButton)
1910	2854	{
1911		- //Reload(lastConverter, lastFilename, true);
1912	2855	SnapObject();
1913	2856	} else
1914	2857	// if (event.getSource() == recompileButton)
..	..	@@ -1945,12 +2888,20 @@
1945	2888	{
1946	2889	loadClipboard(true);
1947	2890	} else
	2891	+ if (source == undoItem)
	2892	+ {
	2893	+ PreviousVersion();
	2894	+ } else
	2895	+ if (source == redoItem)
	2896	+ {
	2897	+ NextVersion();
	2898	+ } else
1948	2899	if (source == duplicateItem)
1949	2900	{
1950		- Object3D keep = GrafreeD.clipboard;
	2901	+ Object3D keep = Grafreed.clipboard;
1951	2902	loadClipboard(false);
1952	2903	paste(false);
1953		- GrafreeD.clipboard = keep;
	2904	+ Grafreed.clipboard = keep;
1954	2905	} else
1955	2906	if (source == cloneItem)
1956	2907	{
..	..	@@ -2170,9 +3121,9 @@
2170	3121	// group.selection.get(0).setMasterThis(content); // should be identity
2171	3122	// refreshContents();
2172	3123	// }
2173		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	3124	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2174	3125	{
2175		- Object3D content = GrafreeD.clipboard.get(0);
	3126	+ Object3D content = Grafreed.clipboard.get(0);
2176	3127
2177	3128	if (content instanceof cGroup && ((cGroup)content).transientlink )
2178	3129	content = ((cGroup)content).get(0);
..	..	@@ -2222,9 +3173,9 @@
2222	3173	} else
2223	3174	if (source == setMasterItem)
2224	3175	{
2225		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	3176	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2226	3177	{
2227		- Object3D content = GrafreeD.clipboard.get(0);
	3178	+ Object3D content = Grafreed.clipboard.get(0);
2228	3179
2229	3180	if (content instanceof cGroup && ((cGroup)content).transientlink )
2230	3181	content = ((cGroup)content).get(0);
..	..	@@ -2237,9 +3188,9 @@
2237	3188	{
2238	3189	if (group.selection.size() == 1)
2239	3190	{
2240		- if (GrafreeD.clipboard.size() == 1)
	3191	+ if (Grafreed.clipboard.size() == 1)
2241	3192	{
2242		- Object3D content = GrafreeD.clipboard.get(0);
	3193	+ Object3D content = Grafreed.clipboard.get(0);
2243	3194
2244	3195	if (content instanceof cGroup && ((cGroup)content).transientlink )
2245	3196	content = ((cGroup)content).get(0);
..	..	@@ -2256,7 +3207,7 @@
2256	3207	{
2257	3208	RevertMeshes();
2258	3209	} else
2259		- if (source == resetMeshItem)
	3210	+ if (source == resetAllItem)
2260	3211	{
2261	3212	ResetAll();
2262	3213	} else
..	..	@@ -2264,7 +3215,7 @@
2264	3215	{
2265	3216	StepAll();
2266	3217	} else
2267		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3218	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2268	3219	{
2269	3220	//int indices[] = jList.getSelectedIndices();
2270	3221	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2276,9 +3227,9 @@
2276	3227	{
2277	3228	ClearSelection(true);
2278	3229	} else
2279		- if (source == grabItem)
	3230	+ if (source == grabItem \|\| source == groupButton)
2280	3231	{
2281		- group(new cGroup(), true);
	3232	+ group(new cGroup(), false); // true);
2282	3233	} else
2283	3234	if (source == hideItem)
2284	3235	{
..	..	@@ -2296,11 +3247,11 @@
2296	3247	{
2297	3248	makeSomething(new Camera());
2298	3249	} else
2299		- if (source == compositeItem)
	3250	+ if (source == compositeItem \|\| source == compositeButton)
2300	3251	{
2301	3252	group(new Composite());
2302	3253	} else
2303		- if (source == randomItem)
	3254	+ if (source == switchItem \|\| source == switchButton)
2304	3255	{
2305	3256	RandomNode random = new RandomNode();
2306	3257	group(random);
..	..	@@ -2402,7 +3353,7 @@
2402	3353	{
2403	3354	group(new cLinker());
2404	3355	} else
2405		- if (source == textureItem)
	3356	+ if (source == textureItem \|\| source == textureButton)
2406	3357	{
2407	3358	group(new TextureNode());
2408	3359	} else
..	..	@@ -2422,17 +3373,42 @@
2422	3373	{
2423	3374	CastShadow(2);
2424	3375	} else
2425		- if (source == ungroupItem)
	3376	+ if (source == ungroupItem \|\| source == ungroupButton)
2426	3377	{
2427		- //ungroup();
	3378	+ boolean canUngroup = true;
	3379	+
2428	3380	for (int i=0; i<group.selection.size(); i++)
2429	3381	{
2430		- Ungroup(group.selection.get(i));
	3382	+ Object3D selectedItem = group.selection.get(i);
	3383	+
	3384	+ if (selectedItem.Size() == 0)
	3385	+ {
	3386	+ // Cannot ungroup leaves
	3387	+ canUngroup = false;
	3388	+ break;
	3389	+ }
	3390	+
	3391	+ if (selectedItem == group)
	3392	+ {
	3393	+ // Cannot ungroup root
	3394	+ canUngroup = false;
	3395	+ break;
	3396	+ }
2431	3397	}
2432	3398
2433		- ClearSelection(false);
2434		-
2435		- refreshContents();
	3399	+ if (canUngroup)
	3400	+ {
	3401	+ for (int i=0; i<group.selection.size(); i++)
	3402	+ {
	3403	+ Object3D selectedItem = group.selection.get(i);
	3404	+
	3405	+ Ungroup(selectedItem);
	3406	+ }
	3407	+
	3408	+ ClearSelection(false);
	3409	+
	3410	+ refreshContents();
	3411	+ }
2436	3412	} else
2437	3413	if (source == genUVItem)
2438	3414	{
..	..	@@ -2444,7 +3420,7 @@
2444	3420	} else
2445	3421	if (source == genNormalsMESHItem)
2446	3422	{
2447		- GenNormals(true); // TODO
	3423	+ GenNormalsMESH();
2448	3424	} else
2449	3425	if (source == genNormalsORGANItem)
2450	3426	{
..	..	@@ -2509,6 +3485,22 @@
2509	3485	if (source == unmarkleavesItem)
2510	3486	{
2511	3487	MarkLeaves(false);
	3488	+ } else
	3489	+ if (source == rewindleavesItem)
	3490	+ {
	3491	+ RewindLeaves(true);
	3492	+ } else
	3493	+ if (source == unrewindleavesItem)
	3494	+ {
	3495	+ RewindLeaves(false);
	3496	+ } else
	3497	+ if (source == randomleavesItem)
	3498	+ {
	3499	+ RandomLeaves(true);
	3500	+ } else
	3501	+ if (source == unrandomleavesItem)
	3502	+ {
	3503	+ RandomLeaves(false);
2512	3504	} else
2513	3505	if (source == flipVItem)
2514	3506	{
..	..	@@ -2594,9 +3586,13 @@
2594	3586	{
2595	3587	SmoothMesh();
2596	3588	} else
2597		- if (source == transformgeometryItem)
	3589	+ if (source == transformGeometryItem)
2598	3590	{
2599	3591	TransformGeometry();
	3592	+ } else
	3593	+ if (source == transformChildrenItem)
	3594	+ {
	3595	+ TransformChildren();
2600	3596	} else
2601	3597	if (source == resetTransformItem)
2602	3598	{
..	..	@@ -2604,7 +3600,11 @@
2604	3600	} else
2605	3601	if (source == resetCentroidItem)
2606	3602	{
2607		- ResetCentroid();
	3603	+ ResetCentroid(true);
	3604	+ } else
	3605	+ if (source == resetCentroidXZItem)
	3606	+ {
	3607	+ ResetCentroid(false);
2608	3608	} else
2609	3609	if (source == resetParentItem)
2610	3610	{
..	..	@@ -2709,7 +3709,7 @@
2709	3709	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2710	3710	{
2711	3711	obj = (Object3D)e.nextElement();
2712		- obj.SetBumpTexture(null);
	3712	+ obj.ResetBumpTexture();
2713	3713	}
2714	3714
2715	3715	refreshContents();
..	..	@@ -2725,6 +3725,31 @@
2725	3725
2726	3726	refreshContents();
2727	3727	} else
	3728	+ if (source == embedTexturesItem)
	3729	+ {
	3730	+ Object3D obj;
	3731	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3732	+ {
	3733	+ obj = (Object3D)e.nextElement();
	3734	+ obj.EmbedTextures(true);
	3735	+ }
	3736	+
	3737	+ refreshContents();
	3738	+ } else
	3739	+ if (source == deEmbedTexturesItem)
	3740	+ {
	3741	+ Object3D obj;
	3742	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3743	+ {
	3744	+ obj = (Object3D)e.nextElement();
	3745	+ obj.EmbedTextures(false);
	3746	+ }
	3747	+
	3748	+ CameraPane.texturepigment.clear();
	3749	+ CameraPane.texturebump.clear();
	3750	+
	3751	+ refreshContents();
	3752	+ } else
2728	3753	if (source == flashSelectionButton)
2729	3754	{
2730	3755	CameraPane.flash = true;
..	..	@@ -2736,42 +3761,36 @@
2736	3761	if (source == twoButton)
2737	3762	{
2738	3763	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();
	3764	+
	3765	+ if (CameraPane.FULLSCREEN)
	3766	+ fullscreenLayout = radio.layout;
	3767	+
	3768	+ Show3DView();
	3769	+
	3770	+ cameraView.requestFocusInWindow();
	3771	+
	3772	+// refreshContents(true);
	3773	+//
	3774	+// try
	3775	+// {
	3776	+// java.awt.Robot bot = new java.awt.Robot();
	3777	+// int mask = InputEvent.BUTTON1_MASK;
	3778	+// bot.mouseMove(100, 100);
	3779	+// bot.mousePress(mask);
	3780	+// bot.mouseRelease(mask);
	3781	+// }
	3782	+// catch (Exception e)
	3783	+// {
	3784	+//
	3785	+// }
	3786	+
2771	3787	} else
2772	3788	if (source == threeButton)
2773	3789	{
2774	3790	radio.layout = threeButton;
	3791	+
	3792	+ if (CameraPane.FULLSCREEN)
	3793	+ fullscreenLayout = radio.layout;
2775	3794
2776	3795	// bigThree.remove(scenePanel);
2777	3796	// bigThree.remove(centralPanel);
..	..	@@ -2801,13 +3820,18 @@
2801	3820	// centralPanel.setVisible(true);
2802	3821	// XYZPanel.setVisible(true);
2803	3822	bigThree.ClearUI();
	3823	+ bigThree.add(scenePanel);
2804	3824	bigThree.add(centralPanel);
2805		- bigThree.add(XYZPanel);
2806	3825	bigThree.FlushUI();
	3826	+
	3827	+ cameraView.requestFocusInWindow();
2807	3828	} else
2808	3829	if (source == fourButton)
2809	3830	{
2810	3831	radio.layout = fourButton;
	3832	+
	3833	+ if (CameraPane.FULLSCREEN)
	3834	+ fullscreenLayout = radio.layout;
2811	3835
2812	3836	// bigThree.remove(scenePanel);
2813	3837	// bigThree.remove(centralPanel);
..	..	@@ -2839,10 +3863,15 @@
2839	3863	bigThree.ClearUI();
2840	3864	bigThree.add(scenePanel);
2841	3865	bigThree.FlushUI();
	3866	+
	3867	+ cameraView.requestFocusInWindow();
2842	3868	} else
2843	3869	if (source == sixButton)
2844	3870	{
2845	3871	radio.layout = sixButton;
	3872	+
	3873	+ if (CameraPane.FULLSCREEN)
	3874	+ fullscreenLayout = radio.layout;
2846	3875
2847	3876	// bigThree.remove(scenePanel);
2848	3877	// bigThree.remove(centralPanel);
..	..	@@ -2872,13 +3901,18 @@
2872	3901	// centralPanel.setVisible(true);
2873	3902	// XYZPanel.setVisible(false);
2874	3903	bigThree.ClearUI();
2875		- bigThree.add(scenePanel);
2876	3904	bigThree.add(centralPanel);
	3905	+ bigThree.add(scenePanel);
2877	3906	bigThree.FlushUI();
	3907	+
	3908	+ cameraView.requestFocusInWindow();
2878	3909	} else
2879	3910	if (source == sevenButton)
2880	3911	{
2881	3912	radio.layout = sevenButton;
	3913	+
	3914	+ if (CameraPane.FULLSCREEN)
	3915	+ fullscreenLayout = radio.layout;
2882	3916
2883	3917	// bigThree.remove(scenePanel);
2884	3918	// bigThree.remove(centralPanel);
..	..	@@ -2912,9 +3946,12 @@
2912	3946	bigThree.add(centralPanel);
2913	3947	bigThree.add(XYZPanel);
2914	3948	bigThree.FlushUI();
	3949	+
	3950	+ cameraView.requestFocusInWindow();
2915	3951	} else
2916	3952	if (source == rootButton)
2917	3953	{
	3954	+ Replace();
2918	3955	Object3D obj;
2919	3956	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2920	3957	{
..	..	@@ -2923,6 +3960,7 @@
2923	3960	EditObject(obj);
2924	3961	}
2925	3962
	3963	+ cameraView.requestFocusInWindow();
2926	3964	refreshContents(true);
2927	3965	} else
2928	3966	if (source == closeButton)
..	..	@@ -2932,22 +3970,37 @@
2932	3970	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2933	3971	{
2934	3972	ab = (cRadio)e.nextElement();
2935		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3973	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2936	3974	{
	3975	+ // Patch to avoid bug with transparency.
	3976	+ if (!ab.hadMaterial)
	3977	+ {
	3978	+ ab.object.material = null;
	3979	+ }
	3980	+
2937	3981	buttonGroup.remove(ab);
2938	3982	radioPanel.remove(ab);
2939	3983
2940		- ab.GetObject().editWindow = null;
	3984	+ //ab.GetObject().editWindow = null;
	3985	+ ab.GetObject().manipWindow = null;
2941	3986	// ab.GetObject().objectUI = null; // ?????????
2942	3987
2943	3988	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2944	3989	break;
2945	3990	}
2946	3991	}
	3992	+
	3993	+ cameraView.requestFocusInWindow();
2947	3994	refreshContents(true);
2948	3995	} else
2949	3996	if (source == editItem \|\| source == editButton)
2950	3997	{
	3998	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3999	+ {
	4000	+ Object3D child = (Object3D)e.nextElement();
	4001	+ child.pinned = true;
	4002	+ }
	4003	+
2951	4004	EditSelection(false);
2952	4005	} else
2953	4006	if (source == uneditButton)
..	..	@@ -2956,11 +4009,12 @@
2956	4009	{
2957	4010	Object3D child = (Object3D)e.nextElement();
2958	4011	if(child.editWindow != null)
2959		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4012	+ child.pinned = false;
2960	4013	child.CloseUI();
2961	4014	listUI.remove(child);
	4015	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2962	4016
2963		- child.editWindow = null; // ???????????
	4017	+ //child.editWindow = null; // ???????????
2964	4018	}
2965	4019	objEditor.ctrlPanel.FlushUI();
2966	4020	//objEditor.jTree.clearSelection();
..	..	@@ -2973,16 +4027,18 @@
2973	4027	//copy.ClearUI();
2974	4028	for (Object3D obj : listUI)
2975	4029	{
	4030	+ obj.pinned = false;
2976	4031	obj.CloseUI();
2977	4032	}
2978	4033	listUI.clear();
	4034	+ SetPinStates(group.selection.size() > 0);
2979	4035	refreshContents(true);
2980	4036	} else
2981	4037	if (source == allParamsButton)
2982	4038	{
2983	4039	assert(copy == group);
2984	4040
2985		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4041	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2986	4042
2987	4043	for (Object3D obj : listUI)
2988	4044	{
..	..	@@ -3031,6 +4087,7 @@
3031	4087	}
3032	4088
3033	4089	copy = group;
	4090	+
3034	4091	//Globals.theRenderer.object = group;
3035	4092	if(!useclient)
3036	4093	{
..	..	@@ -3046,20 +4103,64 @@
3046	4103	frontView.object = group;
3047	4104	sideView.object = group;
3048	4105	}
3049		- group.editWindow = this;
	4106	+
	4107	+// fix "+" issue
	4108	+ //group.editWindow = this;
	4109	+ group.manipWindow = this;
	4110	+
3050	4111	/*
3051	4112	currentLayout = radio.layout;
3052	4113	if (currentLayout == null)
3053	4114	currentLayout = sevenButton;
3054	4115	*/
3055	4116	radio.layout.doClick();
	4117	+
	4118	+ assert(copy instanceof Composite);
	4119	+
	4120	+ if (copy.versionlist == null)
	4121	+ {
	4122	+ copy.versionlist = new Object3D[100];
	4123	+ copy.versionindex = -1;
	4124	+
	4125	+ // Cannot work with loops
	4126	+ // To fix this issue, first mark all nodes above the root,
	4127	+ // and check if any of these nodes are reachable below the root.
	4128	+ //Save(true);
	4129	+ }
	4130	+
	4131	+ SetVersionStates();
	4132	+
	4133	+ ClearUnpinned();
	4134	+
	4135	+ //Grafreed.Assert(group != null);
	4136	+ //Grafreed.Assert(group.selection != null);
	4137	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4138	+ if (group.selection == null \|\| group.selection.size() == 1)
	4139	+ EditSelection(false);
3056	4140	keepparent = group.parent;
3057	4141	// PARENT = NULL or not???
3058	4142	//group.parent = null; // ROOT
3059	4143	//group.attributes = -1;
3060	4144	ResetModel();
	4145	+
	4146	+ cameraView.requestFocusInWindow();
3061	4147	refreshContents(true);
3062		- }
	4148	+ } else if (event.getSource() == editCameraItem)
	4149	+ {
	4150	+ cameraView.ProtectCamera();
	4151	+ cameraView.requestFocusInWindow();
	4152	+ cameraView.repaint();
	4153	+ return;
	4154	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	4155	+ {
	4156	+ cameraView.RevertCamera();
	4157	+ cameraView.requestFocusInWindow();
	4158	+ cameraView.repaint();
	4159	+ return;
	4160	+ // } else if (event.getSource() == textureButton)
	4161	+ // {
	4162	+ // return; // true;
	4163	+ }
3063	4164	else
3064	4165	{
3065	4166	//return super.action(event, arg);
..	..	@@ -3068,7 +4169,6 @@
3068	4169	}
3069	4170
3070	4171	boolean useclient = false;
3071		- cRadio radio;
3072	4172
3073	4173	void ToggleRoot()
3074	4174	{
..	..	@@ -3120,6 +4220,28 @@
3120	4220	refreshContents();
3121	4221	}
3122	4222
	4223	+ void TransformChildren()
	4224	+ {
	4225	+ Object3D obj;
	4226	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4227	+ {
	4228	+ obj = (Object3D)e.nextElement();
	4229	+ obj.KeepTextureMatrices();
	4230	+ obj.TransformChildren();
	4231	+ obj.RestoreTextureMatrices();
	4232	+
	4233	+// if (obj.parent == null)
	4234	+// {
	4235	+// System.out.println("NULL PARENT!");
	4236	+// new Exception().printStackTrace();
	4237	+// }
	4238	+// else
	4239	+// TouchTransform(obj);
	4240	+// //obj.parent.Touch();
	4241	+ }
	4242	+
	4243	+ refreshContents();
	4244	+ }
3123	4245
3124	4246	void ResetTransform()
3125	4247	{
..	..	@@ -3232,7 +4354,7 @@
3232	4354	refreshContents();
3233	4355	}
3234	4356
3235		- void ResetCentroid()
	4357	+ void ResetCentroid(boolean full)
3236	4358	{
3237	4359	Object3D obj;
3238	4360	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3247,12 +4369,16 @@
3247	4369	LA.matIdentity(Object3D.mat);
3248	4370	obj.getBounds(minima, maxima, false);
3249	4371	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3250		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	4372	+ if (full)
	4373	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3251	4374	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3252	4375	obj.TransformMesh(Object3D.mat);
	4376	+
3253	4377	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3254		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	4378	+ if (full)
	4379	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3255	4380	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	4381	+
3256	4382	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3257	4383	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3258	4384	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3281,7 +4407,8 @@
3281	4407
3282	4408	int size = obj.MemorySize();
3283	4409
3284		- System.err.println((size/1024) + " KB is the size of " + obj);
	4410	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4411	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3285	4412	}
3286	4413	}
3287	4414	catch (Exception e)
..	..	@@ -3318,9 +4445,9 @@
3318	4445	obj = (Object3D)e.nextElement();
3319	4446
3320	4447	System.out.println("Object is: " + obj);
3321		- GrafreeD.AnalyzeObject(obj);
	4448	+ Grafreed.AnalyzeObject(obj);
3322	4449	System.out.println("Boundary rep: " + obj.bRep);
3323		- GrafreeD.AnalyzeObject(obj.bRep);
	4450	+ Grafreed.AnalyzeObject(obj.bRep);
3324	4451
3325	4452	// System.err.println((size/1024) + " KB is the size of " + obj);
3326	4453	}
..	..	@@ -3362,6 +4489,13 @@
3362	4489	void GenNormals(boolean crease)
3363	4490	{
3364	4491	group.GenNormalsS(crease);
	4492	+
	4493	+ refreshContents();
	4494	+ }
	4495	+
	4496	+ void GenNormalsMESH()
	4497	+ {
	4498	+ group.GenNormalsMeshS();
3365	4499
3366	4500	refreshContents();
3367	4501	}
..	..	@@ -3534,8 +4668,8 @@
3534	4668
3535	4669	void ParseVertices()
3536	4670	{
3537		- boolean epsequal = GrafreeD.epsequal;
3538		- GrafreeD.epsequal = true;
	4671	+ boolean epsequal = Grafreed.epsequal;
	4672	+ Grafreed.epsequal = true;
3539	4673
3540	4674	for (int i=0; i<group.selection.size(); i++)
3541	4675	{
..	..	@@ -3560,7 +4694,7 @@
3560	4694	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3561	4695	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3562	4696
3563		- g.add(GrafreeD.clipboard);
	4697	+ g.add(Grafreed.clipboard);
3564	4698
3565	4699	buffer.add(g);
3566	4700	}
..	..	@@ -3575,7 +4709,7 @@
3575	4709	makeSomething(buffer, i==group.selection.size()-1);
3576	4710	}
3577	4711
3578		- GrafreeD.epsequal = epsequal;
	4712	+ Grafreed.epsequal = epsequal;
3579	4713
3580	4714	refreshContents();
3581	4715	}
..	..	@@ -3593,7 +4727,16 @@
3593	4727	String pigment = Object3D.GetPigment(tex);
3594	4728	//String bump = Object3D.GetBump(tex);
3595	4729
3596		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4730	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4731	+
	4732	+ try
	4733	+ {
	4734	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
	4735	+ }
	4736	+ catch (Exception e)
	4737	+ {
	4738	+ System.err.println("FAIL: " + node);
	4739	+ }
3597	4740
3598	4741	double s = v.s;
3599	4742
..	..	@@ -3725,7 +4868,7 @@
3725	4868	return;
3726	4869
3727	4870	Object3D poses = group.selection.get(0);
3728		- Object3D ref = GrafreeD.clipboard.get(0);
	4871	+ Object3D ref = Grafreed.clipboard.get(0);
3729	4872
3730	4873	Object3D newgroup = new Object3D("Po:" + poses.name);
3731	4874
..	..	@@ -3919,9 +5062,9 @@
3919	5062
3920	5063	void ClipMesh()
3921	5064	{
3922		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	5065	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3923	5066	{
3924		- Object3D content = GrafreeD.clipboard.get(0);
	5067	+ Object3D content = Grafreed.clipboard.get(0);
3925	5068
3926	5069	if (content instanceof cGroup && ((cGroup)content).transientlink )
3927	5070	content = ((cGroup)content).get(0);
..	..	@@ -3930,7 +5073,7 @@
3930	5073	// {
3931	5074	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3932	5075	// }
3933		- group.selection.ClipMesh(GrafreeD.clipboard);
	5076	+ group.selection.ClipMesh(Grafreed.clipboard);
3934	5077	}
3935	5078	// group.selection.ClipMesh(GrafreeD.clipboard);
3936	5079	System.out.println("DONE.");
..	..	@@ -3977,6 +5120,18 @@
3977	5120	void MarkLeaves(boolean hide)
3978	5121	{
3979	5122	group.selection.MarkLeaves(hide);
	5123	+ refreshContents();
	5124	+ }
	5125	+
	5126	+ void RewindLeaves(boolean hide)
	5127	+ {
	5128	+ group.selection.RewindLeaves(hide);
	5129	+ refreshContents();
	5130	+ }
	5131	+
	5132	+ void RandomLeaves(boolean hide)
	5133	+ {
	5134	+ group.selection.RandomLeaves(hide);
3980	5135	refreshContents();
3981	5136	}
3982	5137
..	..	@@ -4051,28 +5206,25 @@
4051	5206	// }
4052	5207	// }
4053	5208
4054		- static boolean allparams = true;
4055		-
4056		- static Vector<Object3D> listUI = new Vector<Object3D>();
4057		-
4058	5209	void EditSelection(boolean newWindow)
4059	5210	{
	5211	+ if (group.selection == null)
	5212	+ {
	5213	+ EditElement(group, newWindow); // ? new
	5214	+ return;
	5215	+ }
	5216	+
4060	5217	// aConstraints.gridy = 0;
4061	5218	for (int i=0; i<group.selection.size(); i++)
4062	5219	{
4063	5220	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4064	5221	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4065		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5222	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4066	5223
4067	5224	Object3D elem = (Object3D)group.selection.elementAt(i);
4068		- if(elem != group)
	5225	+ if(elem != group \|\| !newWindow)
4069	5226	{
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
	5227	+ EditElement(elem, newWindow); // ? new
4076	5228	}
4077	5229	}
4078	5230	}
..	..	@@ -4135,9 +5287,7 @@
4135	5287
4136	5288	freezemodel = false;
4137	5289	}
4138		-
4139		- boolean flashIt = true;
4140		-
	5290	+
4141	5291	public void valueChanged(TreeSelectionEvent e)
4142	5292	//public boolean handleEvent(Event event)
4143	5293	{
..	..	@@ -4147,7 +5297,8 @@
4147	5297	//new Exception().printStackTrace();
4148	5298
4149	5299	freezemodel = true;
4150		-
	5300	+ ClearUnpinned();
	5301	+
4151	5302	/**/
4152	5303	//switch (event.id)
4153	5304	{
..	..	@@ -4155,7 +5306,6 @@
4155	5306	//case 702: // Event.LIST_DESELECT
4156	5307	group.deselectAll();
4157	5308	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4158		- objEditor.ClearInfo(); // .GetMaterial());
4159	5309	if (tps != null)
4160	5310	{
4161	5311	for (int i=0; i < tps.length; i++)
..	..	@@ -4164,10 +5314,8 @@
4164	5314
4165	5315	//if (child.parent != null)
4166	5316	//child.parent.addSelectee(child);
	5317	+ objEditor.SetMaterial(child);
4167	5318	group.addSelectee(child);
4168		- objEditor.SetMaterial(child); // .GetMaterial());
4169		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4170		- System.err.println("info : " + child.GetPath());
4171	5319	}
4172	5320	}
4173	5321	// else
..	..	@@ -4177,20 +5325,28 @@
4177	5325	// System.err.println("info : " + group.GetPath());
4178	5326	// }
4179	5327
4180		- objEditor.SetText(); // jan 2014
4181		-
4182		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	5328	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4183	5329	CameraPane.flash = true;
4184	5330
4185		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5331	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4186	5332	// a camera
4187	5333	{
4188		- CameraPane.camerachangeframe = 0; // don't refuse it
4189		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5334	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5335	+ {
	5336	+ CameraPane.camerachangeframe = 0; // don't refuse it
	5337	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5338	+ }
4190	5339	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4191	5340	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4192	5341	}
4193	5342
	5343	+ if (tps != null && tps.length == 1)
	5344	+ {
	5345	+ EditSelection(false);
	5346	+ }
	5347	+
	5348	+ SetPinStates(tps != null && tps.length > 0);
	5349	+
4194	5350	refreshContents();
4195	5351	//return true;
4196	5352	}
..	..	@@ -4199,6 +5355,52 @@
4199	5355
4200	5356	freezemodel = false;
4201	5357	}
	5358	+
	5359	+ void SetPinStates(boolean enabled)
	5360	+ {
	5361	+ editButton.setEnabled(enabled);
	5362	+ uneditButton.setEnabled(enabled);
	5363	+ //unselectButton.setEnabled(enabled);
	5364	+ flashSelectionButton.setEnabled(enabled);
	5365	+
	5366	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5367	+
	5368	+ boolean allComposites = true;
	5369	+
	5370	+ if (group.selection != null)
	5371	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5372	+ {
	5373	+ Object next = e.nextElement();
	5374	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5375	+ {
	5376	+ allComposites = false;
	5377	+ break;
	5378	+ }
	5379	+ }
	5380	+
	5381	+ rootButton.setEnabled(allComposites);
	5382	+ }
	5383	+
	5384	+ void refreshContents(boolean cp)
	5385	+ {
	5386	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5387	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5388	+ {
	5389	+ objEditor.ClearInfo(); // .GetMaterial());
	5390	+
	5391	+ for (int i=0; i < group.selection.Size(); i++)
	5392	+ {
	5393	+ Object3D child = (Object3D) group.selection.get(i);
	5394	+
	5395	+ objEditor.AddInfo(child, this, true);
	5396	+// System.err.println("info : " + child.GetPath());
	5397	+ }
	5398	+
	5399	+ objEditor.SetText(); // jan 2014
	5400	+ }
	5401	+
	5402	+ super.refreshContents(cp);
	5403	+ }
4202	5404
4203	5405	void linkSomething(Object3D thing)
4204	5406	{
..	..	@@ -4270,16 +5472,19 @@
4270	5472	{
4271	5473	if (group.selection.isEmpty())
4272	5474	return;
4273		- GrafreeD.clipboardIsTempGroup = false;
	5475	+
	5476	+ Grafreed.clipboardIsTempGroup = false;
4274	5477	Composite tGroup = null;
4275	5478	if (group.selection.size() > 0) // 1)
4276	5479	{
4277	5480	tGroup = new cGroup();
4278		- GrafreeD.clipboardIsTempGroup = true;
	5481	+ Grafreed.clipboardIsTempGroup = true;
4279	5482	}
4280	5483
4281	5484	if (cut)
4282	5485	{
	5486	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5487	+// Save();
4283	5488	//int indices[] = jList.getSelectedIndices();
4284	5489	//for (int i = indices.length - 1; i >= 0; i--)
4285	5490	//jList.remove(indices[i]);
..	..	@@ -4315,16 +5520,16 @@
4315	5520	//System.out.println("cut " + child);
4316	5521	//System.out.println("parent = " + child.parent);
4317	5522	// tmp.addChild(child);
4318		- if (GrafreeD.clipboardIsTempGroup)
	5523	+ if (Grafreed.clipboardIsTempGroup)
4319	5524	tGroup.add/Child/(tmp);
4320	5525	else
4321		- GrafreeD.clipboard = tmp;
	5526	+ Grafreed.clipboard = tmp;
4322	5527	}
4323	5528	else
4324		- if (GrafreeD.clipboardIsTempGroup)
	5529	+ if (Grafreed.clipboardIsTempGroup)
4325	5530	tGroup.add/Child/(child);
4326	5531	else
4327		- GrafreeD.clipboard = child;
	5532	+ Grafreed.clipboard = child;
4328	5533	}
4329	5534
4330	5535	//ResetModel();
..	..	@@ -4356,21 +5561,23 @@
4356	5561	//System.out.println("cut " + elem);
4357	5562	//System.out.println("parent = " + elem.parent);
4358	5563	// tmp.addChild(elem);
4359		- if (GrafreeD.clipboardIsTempGroup)
	5564	+ if (Grafreed.clipboardIsTempGroup)
4360	5565	tGroup.add/Child/(tmp);
4361	5566	else
4362		- GrafreeD.clipboard = tmp;
	5567	+ Grafreed.clipboard = tmp;
4363	5568	}
4364	5569	else
4365		- if (GrafreeD.clipboardIsTempGroup)
	5570	+ if (Grafreed.clipboardIsTempGroup)
4366	5571	tGroup.add/Child/(child);
4367	5572	else
4368		- GrafreeD.clipboard = child;
	5573	+ Grafreed.clipboard = child;
4369	5574	}
4370	5575
4371	5576	}
4372		- if (GrafreeD.clipboardIsTempGroup)
4373		- GrafreeD.clipboard = tGroup;
	5577	+
	5578	+ if (Grafreed.clipboardIsTempGroup)
	5579	+ Grafreed.clipboard = tGroup;
	5580	+
4374	5581	if (cut)
4375	5582	{
4376	5583	ResetModel();
..	..	@@ -4380,11 +5587,15 @@
4380	5587
4381	5588	void paste(boolean expand)
4382	5589	{
	5590	+ if (Globals.REPLACEONMAKE)
	5591	+ Save();
	5592	+ boolean keep = Globals.REPLACEONMAKE;
	5593	+ Globals.REPLACEONMAKE = false;
4383	5594	// if (GrafreeD.clipboard == null)
4384	5595	// return;
4385	5596	boolean first = true;
4386	5597
4387		- if (GrafreeD.clipboardIsTempGroup)
	5598	+ if (Grafreed.clipboardIsTempGroup)
4388	5599	{
4389	5600	Composite temp;
4390	5601
..	..	@@ -4395,7 +5606,7 @@
4395	5606	temp = (Composite)Applet3D.clipboard.deepCopy();
4396	5607	*/
4397	5608	Object3D elem;
4398		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5609	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4399	5610	{
4400	5611	Object3D child = (Object3D)e.nextElement();
4401	5612
..	..	@@ -4429,16 +5640,17 @@
4429	5640	//Object3D cb = Applet3D.clipboard;
4430	5641	//temp.addChild(cb);
4431	5642	//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());
	5643	+ assert(Grafreed.clipboard.parent == null);
	5644	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5645	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5646	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5647	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4437	5648	else
4438		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4439		- GrafreeD.clipboard.get(0).parent = keepparent;
	5649	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5650	+ Grafreed.clipboard.get(0).parent = keepparent;
4440	5651	}
4441	5652
	5653	+ Globals.REPLACEONMAKE = keep;
4442	5654	ResetModel();
4443	5655	refreshContents();
4444	5656	}
..	..	@@ -4485,9 +5697,9 @@
4485	5697	{
4486	5698	boolean first = true;
4487	5699
4488		- if (GrafreeD.clipboardIsTempGroup)
	5700	+ if (Grafreed.clipboardIsTempGroup)
4489	5701	{
4490		- Composite temp = (Composite)GrafreeD.clipboard;
	5702	+ Composite temp = (Composite)Grafreed.clipboard;
4491	5703	Object3D copy;
4492	5704	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4493	5705	{
..	..	@@ -4497,7 +5709,7 @@
4497	5709	}
4498	5710	} else
4499	5711	{
4500		- linkSomething(GrafreeD.clipboard); //.get(0));
	5712	+ linkSomething(Grafreed.clipboard); //.get(0));
4501	5713	}
4502	5714	}
4503	5715	}
..	..	@@ -4574,6 +5786,10 @@
4574	5786
4575	5787	void group(Object3D csg, boolean grab)
4576	5788	{
	5789	+ if (Globals.REPLACEONMAKE)
	5790	+ Save();
	5791	+ boolean keep = Globals.REPLACEONMAKE;
	5792	+ Globals.REPLACEONMAKE = false;
4577	5793	if (//false) // why??
4578	5794	!group.selection.isEmpty())
4579	5795	{
..	..	@@ -4687,10 +5903,15 @@
4687	5903	//node.add(csg);
4688	5904	//makeSomething(node);
4689	5905	makeSomething(csg);
	5906	+ Globals.REPLACEONMAKE = keep;
4690	5907	}
4691	5908
4692	5909	void Ungroup(Object3D g)
4693	5910	{
	5911	+ if (Globals.REPLACEONMAKE)
	5912	+ Save();
	5913	+ boolean keep = Globals.REPLACEONMAKE;
	5914	+ Globals.REPLACEONMAKE = false;
4694	5915	if (g instanceof HiddenObject)
4695	5916	{
4696	5917	HiddenObject h = (HiddenObject) g;
..	..	@@ -4707,6 +5928,7 @@
4707	5928	objEditor.makeSomething(g.get(i), false);
4708	5929	}
4709	5930	}
	5931	+ Globals.REPLACEONMAKE = keep;
4710	5932	}
4711	5933
4712	5934	void ungroup()
..	..	@@ -4902,21 +6124,6 @@
4902	6124	}
4903	6125	*/
4904	6126
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	6127	/*
4921	6128	public void Callback(Object obj)
4922	6129	{
..	..	@@ -4940,26 +6147,9 @@
4940	6147	}
4941	6148	*/
4942	6149
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	6150	String GetFile(String dialogName)
4961	6151	{
4962		- if (GrafreeD.standAlone)
	6152	+ if (Grafreed.standAlone)
4963	6153	{
4964	6154	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4965	6155	browser.show();
..	..	@@ -5027,7 +6217,43 @@
5027	6217	cButton clearpanelButton;
5028	6218	cButton unselectButton;
5029	6219
	6220	+ cButton restoreCameraButton;
	6221	+
5030	6222	cButton oneStepButton;
	6223	+
	6224	+ cButton groupButton;
	6225	+ cButton ungroupButton;
	6226	+ cButton compositeButton;
	6227	+ cButton switchButton;
	6228	+ cButton loopButton;
	6229	+ cButton textureButton;
	6230	+
	6231	+ cButton skybox1Button;
	6232	+ cButton skybox2Button;
	6233	+ cButton skybox3Button;
	6234	+ cButton skybox4Button;
	6235	+ cButton skybox5Button;
	6236	+ cButton skybox6Button;
	6237	+ cButton skybox7Button;
	6238	+
	6239	+ cButton skybox11Button;
	6240	+ cButton skybox12Button;
	6241	+ cButton skybox13Button;
	6242	+ cButton skybox14Button;
	6243	+ cButton skybox15Button;
	6244	+ cButton skybox16Button;
	6245	+ cButton skybox17Button;
	6246	+
	6247	+ cButton gridButton;
	6248	+ cButton boxButton;
	6249	+ cButton sphereButton;
	6250	+ cButton coneButton;
	6251	+ cButton torusButton;
	6252	+ cButton superButton;
	6253	+ cButton kleinButton;
	6254	+ cButton particlesButton;
	6255	+ cButton overlayButton;
	6256	+ cButton lightButton;
5031	6257
5032	6258	cButton screenfitButton;
5033	6259	cButton screenfitpointButton;
..	..	@@ -5040,14 +6266,6 @@
5040	6266
5041	6267	cButton setsupportButton;
5042	6268
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	6269	//
5052	6270	//Composite
5053	6271	Object3D // to do !!
..	..	@@ -5057,10 +6275,12 @@
5057	6275	//JTree jTree;
5058	6276	private MenuItem lookAtItem;
5059	6277	private MenuItem lookFromItem;
5060		- private MenuItem switchItem;
5061		- private MenuItem cutItem;
5062		- private MenuItem duplicateItem;
5063		- private MenuItem cloneItem;
	6278	+ private MenuItem switchViewItem;
	6279	+ private JMenuItem cutItem;
	6280	+ private MenuItem undoItem;
	6281	+ private MenuItem redoItem;
	6282	+ private JMenuItem duplicateItem;
	6283	+ private JMenuItem cloneItem;
5064	6284	private MenuItem cloneSupportItem;
5065	6285	private MenuItem overwriteGeoItem;
5066	6286	private MenuItem overwriteMatItem;
..	..	@@ -5072,7 +6292,7 @@
5072	6292	private MenuItem linkverticesItem;
5073	6293	private MenuItem relinkverticesItem;
5074	6294	private MenuItem setMasterItem;
5075		- private MenuItem resetMeshItem;
	6295	+ private MenuItem resetAllItem;
5076	6296	private MenuItem stepAllItem;
5077	6297	private MenuItem revertMeshItem;
5078	6298	private MenuItem poseMeshItem;
..	..	@@ -5081,13 +6301,13 @@
5081	6301	private MenuItem cloneGeometriesItem;
5082	6302	private MenuItem shareGeometriesItem;
5083	6303	private MenuItem mergeGeometriesItem;
5084		- private MenuItem copyItem;
	6304	+ private JMenuItem copyItem;
5085	6305	private MenuItem pasteItem;
5086		- private MenuItem pasteIntoItem;
5087		- private MenuItem pasteLinkItem;
5088		- private MenuItem pasteCloneItem;
5089		- private MenuItem pasteExpandItem;
5090		- private MenuItem clearItem;
	6306	+ private JMenuItem pasteIntoItem;
	6307	+ private JMenuItem pasteLinkItem;
	6308	+ private JMenuItem pasteCloneItem;
	6309	+ private JMenuItem pasteExpandItem;
	6310	+ private JMenuItem deleteItem;
5091	6311	private MenuItem clearAllItem;
5092	6312	private MenuItem genUVItem;
5093	6313	private MenuItem genNormalsMESHItem;
..	..	@@ -5122,6 +6342,10 @@
5122	6342	private MenuItem showleavesItem;
5123	6343	private MenuItem markleavesItem;
5124	6344	private MenuItem unmarkleavesItem;
	6345	+ private MenuItem rewindleavesItem;
	6346	+ private MenuItem unrewindleavesItem;
	6347	+ private MenuItem randomleavesItem;
	6348	+ private MenuItem unrandomleavesItem;
5125	6349
5126	6350	private MenuItem flipVItem;
5127	6351	private MenuItem unflipVItem;
..	..	@@ -5133,15 +6357,17 @@
5133	6357	private MenuItem panoTexturesItem;
5134	6358
5135	6359	private MenuItem resetCentroidItem;
5136		- private MenuItem transformgeometryItem;
	6360	+ private MenuItem resetCentroidXZItem;
5137	6361	private MenuItem resetTransformItem;
	6362	+ private MenuItem transformGeometryItem;
	6363	+ private MenuItem transformChildrenItem;
5138	6364	private MenuItem hideItem;
5139		- private MenuItem grabItem;
	6365	+ private JMenuItem grabItem;
5140	6366	private MenuItem backItem;
5141	6367	private MenuItem frontItem;
5142	6368	private MenuItem cameraItem;
5143	6369	private MenuItem compositeItem;
5144		- private MenuItem randomItem;
	6370	+ private MenuItem switchItem;
5145	6371	private MenuItem physicsItem;
5146	6372	private MenuItem frameselectorItem;
5147	6373	private MenuItem scriptNodeItem;
..	..	@@ -5149,7 +6375,7 @@
5149	6375	private MenuItem switchTransfoItem;
5150	6376	private MenuItem morphItem;
5151	6377	private MenuItem linkerItem;
5152		- private MenuItem ungroupItem;
	6378	+ private JMenuItem ungroupItem;
5153	6379	private MenuItem editItem;
5154	6380	private MenuItem openWindowItem;
5155	6381	private MenuItem editLeafItem;
..	..	@@ -5165,6 +6391,8 @@
5165	6391	private MenuItem attachBumpItem;
5166	6392	private MenuItem detachBumpItem;
5167	6393	private MenuItem pigmentBumpItem;
	6394	+ private MenuItem embedTexturesItem;
	6395	+ private MenuItem deEmbedTexturesItem;
5168	6396
5169	6397	private MenuItem particleItem;
5170	6398	private MenuItem ragdollItem;
..	..	@@ -5203,11 +6431,6 @@
5203	6431	private MenuItem doubleItem;
5204	6432	private MenuItem tripleItem;
5205	6433
5206		- private MenuItem importGFDItem;
5207		- private MenuItem importVRMLX3DItem;
5208		- private MenuItem import3DSItem;
5209		- private MenuItem importOBJItem;
5210		-
5211	6434	private MenuItem computeAOItem;
5212	6435	private MenuItem recompileItem;
5213	6436	private MenuItem editScriptItem;
..	..	@@ -5217,4 +6440,8 @@
5217	6440	private MenuItem analyzeItem;
5218	6441	private MenuItem dumpItem;
5219	6442	//boolean freezemodel = false;
	6443	+
	6444	+ Menu cameraMenu;
	6445	+ MenuItem editCameraItem;
	6446	+ MenuItem restoreCameraItem;
5220	6447	}