~nbriere/GrafreeD.git - Noware Git Repository

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