~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -16,6 +16,7 @@
16	16	//import buoy.widget.BFileChooser;
17	17
18	18	class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
	19	+ Grafreed.iResourceCallBack,
19	20	ObjectUI,
20	21	Runnable,
21	22	ActionListener,
..	..	@@ -23,6 +24,360 @@
23	24	DragGestureListener, DragSourceListener, DropTargetListener,
24	25	ItemListener // ListSelectionListener
25	26	{
	27	+
	28	+ public void AddSkyboxButton(String f, String s, cGridBag row)
	29	+ {
	30	+ cButton skyboxButton;
	31	+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
	32	+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Globals.NIMBUSLAF));
	33	+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
	34	+ skyboxButton.setToolTipText(s.equals("") ? "No background" : s);
	35	+ skyboxButton.addActionListener(new ActionListener()
	36	+ {
	37	+ @Override
	38	+ public void actionPerformed(ActionEvent e)
	39	+ {
	40	+ ChangeSkybox(path);
	41	+ }
	42	+ });
	43	+ }
	44	+
	45	+ public void AddTextureButton(String f, String c, final String t, int count, cGridBag row)
	46	+ {
	47	+ cButton textureButton;
	48	+ final String path = "textures/" + f + "/" + c + "/"; // + t;
	49	+ row.add(textureButton = GetButton(path + "icons/" + t, !Globals.NIMBUSLAF));
	50	+ textureButton.setToolTipText(c + count);
	51	+ textureButton.addActionListener(new ActionListener()
	52	+ {
	53	+ @Override
	54	+ public void actionPerformed(ActionEvent e)
	55	+ {
	56	+ ChangeTexture(path + t);
	57	+ }
	58	+ });
	59	+ }
	60	+
	61	+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
	62	+ {
	63	+ cGridBag tab0 = new cGridBag().setVertical(true);
	64	+
	65	+ tab0.setName("Urban");
	66	+ skyboxpanel.add(tab0);
	67	+
	68	+ cGridBag row0 = new cGridBag();
	69	+ cGridBag row1 = new cGridBag();
	70	+ cGridBag row2 = new cGridBag();
	71	+ cGridBag row3 = new cGridBag();
	72	+ cGridBag row4 = new cGridBag();
	73	+ cGridBag row5 = new cGridBag();
	74	+ cGridBag row6 = new cGridBag();
	75	+
	76	+ AddSkyboxButton("default", "", row0);
	77	+ //AddSkyboxButton("default", "cornell", row0);
	78	+ AddSkyboxButton("penguins", "dust", row0);
	79	+ AddSkyboxButton("penguins", "tropic", row0);
	80	+ AddSkyboxButton("penguins", "yonder", row0);
	81	+
	82	+ AddSkyboxButton("default", "uffizi", row1);
	83	+ AddSkyboxButton("bridge", "Bridge", row1);
	84	+ AddSkyboxButton("bridge", "Bridge2", row1);
	85	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	86	+
	87	+ AddSkyboxButton("urban", "Parliament", row2);
	88	+ AddSkyboxButton("urban", "Roundabout", row2);
	89	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	90	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	91	+
	92	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	93	+ AddSkyboxButton("urban", "UnionSquare", row3);
	94	+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
	95	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	96	+
	97	+ AddSkyboxButton("park", "Buddha", row4);
	98	+ AddSkyboxButton("park", "CNTower2", row4);
	99	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	100	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	101	+
	102	+ AddSkyboxButton("park", "Park", row5);
	103	+ AddSkyboxButton("park", "Pond", row5);
	104	+ AddSkyboxButton("park", "Skansen", row5);
	105	+ AddSkyboxButton("park", "Skansen2", row5);
	106	+
	107	+ AddSkyboxButton("park", "Skansen3", row6);
	108	+ AddSkyboxButton("park", "Skansen4", row6);
	109	+ AddSkyboxButton("park", "Skansen5", row6);
	110	+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
	111	+
	112	+ tab0.add(row0);
	113	+ tab0.add(row1);
	114	+ tab0.add(row2);
	115	+ tab0.add(row3);
	116	+ tab0.add(row4);
	117	+ tab0.add(row5);
	118	+ tab0.add(row6);
	119	+
	120	+ for (int i=5; --i>=0;)
	121	+ {
	122	+ //oe.toolboxPanel.Return();
	123	+ //tab0.add(new cGridBag());
	124	+ }
	125	+ }
	126	+
	127	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	128	+ {
	129	+ cGridBag tab0 = new cGridBag().setVertical(true);
	130	+
	131	+ tab0.setName("Nature");
	132	+ skyboxpanel.add(tab0);
	133	+
	134	+ cGridBag row0 = new cGridBag();
	135	+ cGridBag row1 = new cGridBag();
	136	+ cGridBag row2 = new cGridBag();
	137	+ cGridBag row3 = new cGridBag();
	138	+ cGridBag row4 = new cGridBag();
	139	+ cGridBag row5 = new cGridBag();
	140	+ cGridBag row6 = new cGridBag();
	141	+
	142	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	143	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	144	+ AddSkyboxButton("beach", "PalmTrees", row0);
	145	+ AddSkyboxButton("beach", "Tenerife", row0);
	146	+
	147	+ AddSkyboxButton("beach", "Tenerife2", row1);
	148	+ AddSkyboxButton("beach", "Tenerife3", row1);
	149	+ AddSkyboxButton("field", "FishPond", row1);
	150	+ AddSkyboxButton("field", "Footballfield", row1);
	151	+
	152	+ AddSkyboxButton("field", "Meadow", row2);
	153	+ AddSkyboxButton("field", "Sorsele", row2);
	154	+ AddSkyboxButton("field", "Sorsele2", row2);
	155	+ AddSkyboxButton("field", "Sorsele3", row2);
	156	+
	157	+ AddSkyboxButton("forest", "Brudslojan", row3);
	158	+ AddSkyboxButton("forest", "Langholmen2", row3);
	159	+ AddSkyboxButton("forest", "Plants", row3);
	160	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	161	+
	162	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	163	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	164	+ AddSkyboxButton("mountain", "Teide", row4);
	165	+ AddSkyboxButton("park", "Tantolunden4", row4);
	166	+
	167	+ AddSkyboxButton("park", "Stairs", row5);
	168	+ AddSkyboxButton("default", "skycube", row6);
	169	+ AddSkyboxButton("rocky", "Langholmen", row5);
	170	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	171	+
	172	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	173	+ AddSkyboxButton("default", "CloudyHills", row6);
	174	+ AddSkyboxButton("daz", "Autumn", row6);
	175	+ AddSkyboxButton("daz", "MountainTrail", row6);
	176	+ /*
	177	+Autumn
	178	+Greenlands
	179	+MountainTrail
	180	+Oasis
	181	+TheRock
	182	+TopOfTheWorld
	183	+Winter
	184	+ */
	185	+
	186	+ tab0.add(row0);
	187	+ tab0.add(row1);
	188	+ tab0.add(row2);
	189	+ tab0.add(row3);
	190	+ tab0.add(row4);
	191	+ tab0.add(row5);
	192	+ tab0.add(row6);
	193	+
	194	+ for (int i=5; --i>=0;)
	195	+ {
	196	+ //oe.toolboxPanel.Return();
	197	+ //tab0.add(new cGridBag());
	198	+ }
	199	+ }
	200	+
	201	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	202	+ {
	203	+ cGridBag tab0 = new cGridBag().setVertical(true);
	204	+
	205	+ tab0.setName("Night");
	206	+ skyboxpanel.add(tab0);
	207	+
	208	+ cGridBag row0 = new cGridBag();
	209	+ cGridBag row1 = new cGridBag();
	210	+ cGridBag row2 = new cGridBag();
	211	+ cGridBag row3 = new cGridBag();
	212	+ cGridBag row4 = new cGridBag();
	213	+ cGridBag row5 = new cGridBag();
	214	+ cGridBag row6 = new cGridBag();
	215	+
	216	+ AddSkyboxButton("night", "NightPath", row0);
	217	+ AddSkyboxButton("night", "PondNight", row0);
	218	+ AddSkyboxButton("night", "Powerlines", row0);
	219	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	220	+
	221	+ AddSkyboxButton("urban", "CNTower", row1);
	222	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	223	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	224	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
	225	+
	226	+ AddSkyboxButton("penguins", "kenon_star", row2);
	227	+ AddSkyboxButton("persson", "corona", row2);
	228	+ AddSkyboxButton("persson", "spaceskybox", row2);
	229	+ AddSkyboxButton("indoors", "Vasa", row2);
	230	+
	231	+ AddSkyboxButton("winter", "Backyard", row3);
	232	+ AddSkyboxButton("winter", "Creek", row3);
	233	+ AddSkyboxButton("winter", "FootballField3", row3);
	234	+ AddSkyboxButton("winter", "Forest", row3);
	235	+
	236	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	237	+ AddSkyboxButton("winter", "House", row4);
	238	+ AddSkyboxButton("winter", "IceLake", row4);
	239	+ AddSkyboxButton("winter", "IceRiver", row4);
	240	+
	241	+ AddSkyboxButton("winter", "Park3", row5);
	242	+ AddSkyboxButton("winter", "PondWinter", row5);
	243	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	244	+ AddSkyboxButton("winter", "Vindelalven", row5);
	245	+
	246	+ AddSkyboxButton("daz", "TheRock", row6);
	247	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	248	+ AddSkyboxButton("daz", "Winter", row6);
	249	+ AddSkyboxButton("mountain", "Ryfjallet", row6);
	250	+
	251	+ tab0.add(row0);
	252	+ tab0.add(row1);
	253	+ tab0.add(row2);
	254	+ tab0.add(row3);
	255	+ tab0.add(row4);
	256	+ tab0.add(row5);
	257	+ tab0.add(row6);
	258	+
	259	+ for (int i=5; --i>=0;)
	260	+ {
	261	+ //oe.toolboxPanel.Return();
	262	+ //tab0.add(new cGridBag());
	263	+ }
	264	+ }
	265	+
	266	+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
	267	+ {
	268	+ cGridBag tab0 = new cGridBag().setVertical(true);
	269	+
	270	+ tab0.setName("Others");
	271	+ skyboxpanel.add(tab0);
	272	+
	273	+ cGridBag row0 = new cGridBag();
	274	+ cGridBag row1 = new cGridBag();
	275	+ cGridBag row2 = new cGridBag();
	276	+ cGridBag row3 = new cGridBag();
	277	+ cGridBag row4 = new cGridBag();
	278	+ cGridBag row5 = new cGridBag();
	279	+ cGridBag row6 = new cGridBag();
	280	+
	281	+ AddSkyboxButton("mayhem", "afterrain", row0);
	282	+ AddSkyboxButton("mayhem", "aqua4", row0);
	283	+ AddSkyboxButton("mayhem", "aqua9", row0);
	284	+ AddSkyboxButton("mayhem", "flame", row0);
	285	+
	286	+ AddSkyboxButton("mayhem", "h2s", row1);
	287	+ AddSkyboxButton("mayhem", "prehistoric", row1);
	288	+ AddSkyboxButton("mayhem", "scorched", row1);
	289	+ AddSkyboxButton("penguins", "desertdawn", row1);
	290	+
	291	+ AddSkyboxButton("persson", "Citadella", row2);
	292	+ AddSkyboxButton("persson", "Citadella2", row2);
	293	+ AddSkyboxButton("persson", "clouds1", row2);
	294	+ AddSkyboxButton("penguins", "wrath", row2);
	295	+
	296	+ AddSkyboxButton("persson", "FishermansBastion", row3);
	297	+ AddSkyboxButton("persson", "HeroesSquare", row3);
	298	+ AddSkyboxButton("indoors", "DallasW", row3);
	299	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
	300	+
	301	+ AddSkyboxButton("persson", "LancellottiChapel", row4);
	302	+ AddSkyboxButton("persson", "PereaBeach1", row4);
	303	+ AddSkyboxButton("persson", "PereaBeach2", row4);
	304	+ AddSkyboxButton("persson", "redeclipse", row4);
	305	+
	306	+ AddSkyboxButton("daz", "Greenlands", row5);
	307	+ AddSkyboxButton("daz", "Oasis", row5);
	308	+ AddSkyboxButton("elyvisions", "arch3", row5);
	309	+ AddSkyboxButton("elyvisions", "calm_sea", row5);
	310	+
	311	+ AddSkyboxButton("elyvisions", "rainbow", row6);
	312	+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
	313	+ AddSkyboxButton("elyvisions", "heaven", row6);
	314	+ AddSkyboxButton("elyvisions", "hot", row6);
	315	+
	316	+ tab0.add(row0);
	317	+ tab0.add(row1);
	318	+ tab0.add(row2);
	319	+ tab0.add(row3);
	320	+ tab0.add(row4);
	321	+ tab0.add(row5);
	322	+ tab0.add(row6);
	323	+
	324	+ for (int i=5; --i>=0;)
	325	+ {
	326	+ //oe.toolboxPanel.Return();
	327	+ //tab0.add(new cGridBag());
	328	+ }
	329	+ }
	330	+
	331	+ public void ChangeSkybox(String skybox)
	332	+ {
	333	+ if (skybox.endsWith("/"))
	334	+ {
	335	+ group.skyboxname = null;
	336	+ group.skyboxext = null;
	337	+ cameraView.repaint();
	338	+ }
	339	+ else
	340	+ {
	341	+ //cameraView.envyoff = false;
	342	+ group.skyboxname = skybox;
	343	+ group.skyboxext = "jpg";
	344	+ cameraView.repaint();
	345	+ }
	346	+ }
	347	+
	348	+ public void CreateSkyboxPanel(cGridBag skyboxPanel)
	349	+ {
	350	+ JTabbedPane skyboxpane = new JTabbedPane(JTabbedPane.LEFT);
	351	+
	352	+ AddSkyboxTab0(skyboxpane);
	353	+ AddSkyboxTab1(skyboxpane);
	354	+ AddSkyboxTab2(skyboxpane);
	355	+ AddSkyboxTab3(skyboxpane);
	356	+
	357	+ skyboxPanel.add(skyboxpane);
	358	+ }
	359	+
	360	+ public void ChangeTexture(String texture)
	361	+ {
	362	+ for (int i=0; i<group.selection.size(); i++)
	363	+ {
	364	+ Object3D obj = group.selection.get(i);
	365	+ obj.SetPigmentTexture("@" + texture);
	366	+ }
	367	+
	368	+ refreshContents();
	369	+ }
	370	+
	371	+ public void Show3DView()
	372	+ {
	373	+ // bug
	374	+ //gridPanel.setDividerLocation(1.0);
	375	+ //bigPanel.setDividerLocation(0.0);
	376	+ bigThree.ClearUI();
	377	+ bigThree.add(centralPanel);
	378	+ bigThree.FlushUI();
	379	+ }
	380	+
26	381	//ObjEditor objEditor;
27	382	public void closeUI2()
28	383	{
..	..	@@ -60,6 +415,16 @@
60	415	this.copy = this.group = group;
61	416	//selectees = this.group.selectees;
62	417
	418	+ assert(false);
	419	+
	420	+ if (copy.versionlist == null)
	421	+ {
	422	+ copy.versionlist = new Object3D[100];
	423	+ copy.versionindex = -1;
	424	+
	425	+ //Save(true);
	426	+ }
	427	+
63	428	if(ui)
64	429	SetupUI(objEditor);
65	430	}
..	..	@@ -74,16 +439,28 @@
74	439	this.copy = this.group = copy;
75	440	//selectees = this.group.selectees;
76	441
77		- SetupMenu2(objEditor);
	442	+ SetupMenu2(this); //objEditor);
78	443	SetupUI2(objEditor);
79	444	objEditor.SetupUI(true);
80	445	SetupViews(objEditor);
81	446
82	447	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	448	+
	449	+ if (copy.versionlist == null)
	450	+ {
	451	+ copy.versionlist = new Object3D[100];
	452	+ copy.versionindex = -1;
	453	+
	454	+ //Save(true);
	455	+ }
83	456	}
84	457
85	458	void CloneSelection(boolean supports)
86	459	{
	460	+ if (Globals.REPLACEONMAKE)
	461	+ Save();
	462	+ boolean keep = Globals.REPLACEONMAKE;
	463	+ Globals.REPLACEONMAKE = false;
87	464	// Object3D keep = GrafreeD.clipboard;
88	465	//Object3D obj;
89	466	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,18 +471,19 @@
94	471
95	472	makeSomething(clone, i==group.selection.size()-1);
96	473	}
	474	+ Globals.REPLACEONMAKE = keep;
97	475	}
98	476
99	477	void CloneClipboard(boolean supports)
100	478	{
101		- assert(GrafreeD.clipboard.parent == null);
102		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
103		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
104		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
105		- makeSomething(CloneObject(GrafreeD.clipboard.get(0), false));
	479	+ assert(Grafreed.clipboard.parent == null);
	480	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	481	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	482	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	483	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
106	484	else
107		- makeSomething(CloneObject(GrafreeD.clipboard, false));
108		- GrafreeD.clipboard.get(0).parent = keepparent;
	485	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	486	+ Grafreed.clipboard.get(0).parent = keepparent;
109	487	}
110	488
111	489	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -119,7 +497,7 @@
119	497	// obj.support = null;
120	498	if (!supports)
121	499	obj.SaveSupports();
122		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	500	+ Object3D clone = (Object3D)Grafreed.clone(obj);
123	501	obj.parent = parent;
124	502	// obj.support = support;
125	503	// clone.support = support; // aout 2013
..	..	@@ -148,52 +526,51 @@
148	526
149	527	//JTextField nameField;
150	528
151		- void SetupMenu2(ObjEditor oe)
	529	+ void SetupMenu2(GroupEditor oe)
152	530	{
153		- if (Globals.ADVANCED)
154		- {
155		- oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
156		- //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
157		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
158		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
159		- oe.cameraMenu.add("-");
160		- openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
161		- openWindowItem.addActionListener(this);
162		- editLeafItem.addActionListener(this);
163		- lookAtItem.addActionListener(this);
164		- //lookFromItem.addActinoListener(this);
165		- //switchItem.addActionListener(this);
166		- }
167		-
	531	+ oe.jTree = new cTree();
	532	+
168	533	Menu menu;
169	534	oe.menuBar.add(menu = new Menu("Edit"));
170	535	//editItem = menu.add(new MenuItem("Edit"));
171	536	//editItem.addActionListener(this);
172		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	537	+
	538	+// undoItem = menu.add(new MenuItem("Undo"));
	539	+// undoItem.addActionListener(this);
	540	+// redoItem = menu.add(new MenuItem("Redo"));
	541	+// redoItem.addActionListener(this);
	542	+// menu.add("-");
	543	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
173	544	duplicateItem.addActionListener(this);
174		- cutItem = menu.add(new MenuItem("Cut"));
	545	+
	546	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
	547	+ cloneItem.addActionListener(this);
	548	+ //if (Globals.ADVANCED)
	549	+ {
	550	+ cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
	551	+ cloneSupportItem.addActionListener(this);
	552	+ }
	553	+ oe.jTree.popup.addSeparator();
	554	+ menu.add("-");
	555	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
175	556	cutItem.addActionListener(this);
176		- copyItem = menu.add(new MenuItem("Copy"));
	557	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
177	558	copyItem.addActionListener(this);
178	559	pasteItem = menu.add(new MenuItem("Paste"));
179	560	pasteItem.addActionListener(this);
180		- menu.add("-");
181		- cloneItem = menu.add(new MenuItem("Clone"));
182		- cloneItem.addActionListener(this);
183		- cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
184		- cloneSupportItem.addActionListener(this);
185		- menu.add("-");
186		- pasteIntoItem = menu.add(new MenuItem("Paste into"));
	561	+
	562	+ oe.jTree.popup.addSeparator();
	563	+ //menu.add("-");
	564	+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
187	565	pasteIntoItem.addActionListener(this);
188		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	566	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
189	567	pasteLinkItem.addActionListener(this);
190		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	568	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
191	569	pasteCloneItem.addActionListener(this);
192		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	570	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
193	571	// pasteExpandItem.addActionListener(this);
194		- menu.add("-");
195		- clearItem = menu.add(new MenuItem("Clear"));
196		- clearItem.addActionListener(this);
	572	+ //menu.add("-");
	573	+ oe.jTree.popup.addSeparator();
197	574
198	575	if (Globals.ADVANCED)
199	576	{
..	..	@@ -201,14 +578,95 @@
201	578	clearAllItem = menu.add(new MenuItem("Clear All"));
202	579	clearAllItem.addActionListener(this);
203	580	}
	581	+
	582	+ menuBar.add(cameraMenu = new Menu("View"));
	583	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	584	+ //zBufferItem.addActionListener(this);
	585	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	586	+ //normalLensItem.addActionListener(this);
	587	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	588	+ restoreCameraItem.addActionListener(this);
	589	+
	590	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	591	+// toggleFullScreenItem.addItemListener(this);
	592	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	593	+// cameraMenu.add("-");
	594	+//
	595	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	596	+// toggleTextureItem.addItemListener(this);
	597	+// toggleTextureItem.setState(CameraPane.textureon);
	598	+//
	599	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	600	+// toggleSwitchItem.addItemListener(this);
	601	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	602	+
	603	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	604	+ toggleHandleItem.addItemListener(this);
	605	+ toggleHandleItem.setState(CameraPane.HANDLES);
	606	+
	607	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	608	+ togglePaintItem.addItemListener(this);
	609	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	610	+
	611	+ if (Globals.ADVANCED)
	612	+ {
	613	+ cameraMenu.add("-");
	614	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	615	+ toggleLiveItem.addItemListener(this);
	616	+ toggleLiveItem.setState(Globals.isLIVE());
204	617
	618	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	619	+ stepItem.addActionListener(this);
	620	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	621	+ // toggleDLItem.addItemListener(this);
	622	+ // toggleDLItem.setState(false);
	623	+
	624	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	625	+ toggleRenderItem.addItemListener(this);
	626	+ toggleRenderItem.setState(!CameraPane.frozen);
	627	+
	628	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	629	+ toggleDebugItem.addItemListener(this);
	630	+ toggleDebugItem.setState(Globals.DEBUG);
	631	+
	632	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	633	+ toggleFrustumItem.addItemListener(this);
	634	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	635	+
	636	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	637	+ toggleFootContactItem.addItemListener(this);
	638	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	639	+
	640	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	641	+ toggleTimelineItem.addItemListener(this);
	642	+ }
	643	+
	644	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	645	+// toggleRootItem.addItemListener(this);
	646	+// toggleRootItem.setState(false);
	647	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	648	+// animationItem.addItemListener(this);
	649	+// animationItem.setState(CameraPane.ANIMATION);
	650	+ cameraMenu.add("-");
	651	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	652	+ editCameraItem.addActionListener(this);
	653	+
	654	+ if (Globals.ADVANCED)
	655	+ {
	656	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	657	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	658	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	659	+ oe.cameraMenu.add("-");
	660	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	661	+ openWindowItem.addActionListener(this);
	662	+ lookAtItem.addActionListener(this);
	663	+ //lookFromItem.addActinoListener(this);
	664	+ //switchViewItem.addActionListener(this);
	665	+ }
	666	+
205	667	oe.menuBar.add(menu = new Menu("Setting"));
206	668	if (Globals.ADVANCED)
207	669	{
208		- resetMeshItem = menu.add(new MenuItem("Reset All"));
209		- resetMeshItem.addActionListener(this);
210		- stepAllItem = menu.add(new MenuItem("Step All"));
211		- stepAllItem.addActionListener(this);
212	670	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
213	671	revertMeshItem.addActionListener(this);
214	672	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
..	..	@@ -247,22 +705,37 @@
247	705	setMasterItem.addActionListener(this);
248	706	}
249	707
250		- oe.menuBar.add(menu = new Menu("Group"));
251		- grabItem = menu.add(new MenuItem("Grab"));
252		- grabItem.addActionListener(this);
	708	+ oe.menuBar.add(menu = new Menu("Order"));
	709	+
253	710	backItem = menu.add(new MenuItem("Back"));
254	711	backItem.addActionListener(this);
255	712	frontItem = menu.add(new MenuItem("Front"));
256	713	frontItem.addActionListener(this);
257		- compositeItem = menu.add(new MenuItem("Composite"));
258		- compositeItem.addActionListener(this);
	714	+// compositeItem = menu.add(new MenuItem("Composite"));
	715	+// compositeItem.addActionListener(this);
	716	+
	717	+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
	718	+ grabItem.addActionListener(this);
	719	+
	720	+ if (Globals.ADVANCED)
	721	+ {
259	722	hideItem = menu.add(new MenuItem("Hidden Group"));
260	723	hideItem.addActionListener(this);
261		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	724	+ }
	725	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
262	726	ungroupItem.addActionListener(this);
263		- menu.add("-");
264		- randomItem = menu.add(new MenuItem("Switch node"));
265		- randomItem.addActionListener(this);
	727	+
	728	+ oe.jTree.popup.addSeparator();
	729	+
	730	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	731	+ deleteItem.addActionListener(this);
	732	+
	733	+// menu.add("-");
	734	+//
	735	+// switchItem = menu.add(new MenuItem("Switch node"));
	736	+// switchItem.addActionListener(this);
	737	+ if (Globals.ADVANCED)
	738	+ {
266	739	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
267	740	switchGeoItem.addActionListener(this);
268	741	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -270,49 +743,52 @@
270	743	morphItem = menu.add(new MenuItem("Morph Group"));
271	744	morphItem.addActionListener(this);
272	745
273		- if (Globals.ADVANCED)
274		- {
	746	+ menu.add("-");
275	747	physicsItem = menu.add(new MenuItem("Physics"));
276	748	physicsItem.addActionListener(this);
277	749	frameselectorItem = menu.add(new MenuItem("Frame Selector"));
278	750	frameselectorItem.addActionListener(this);
279	751	scriptNodeItem = menu.add(new MenuItem("Script Node"));
280	752	scriptNodeItem.addActionListener(this);
281		- cameraItem = menu.add(new MenuItem("Camera"));
282		- cameraItem.addActionListener(this);
283	753	}
284	754
285	755	oe.menuBar.add(menu = new Menu("Object"));
286		- textureItem = menu.add(new MenuItem("Texture"));
287		- textureItem.addActionListener(this);
	756	+// textureItem = menu.add(new MenuItem("Texture"));
	757	+// textureItem.addActionListener(this);
288	758	billboardItem = menu.add(new MenuItem("Billboard"));
289	759	billboardItem.addActionListener(this);
290	760	csgItem = menu.add(new MenuItem("CSG"));
291	761	csgItem.addActionListener(this);
292		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	762	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
293	763	shadowXItem.addActionListener(this);
294		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	764	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
295	765	shadowYItem.addActionListener(this);
296		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	766	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
297	767	shadowZItem.addActionListener(this);
298		- if (Globals.ADVANCED)
299		- {
300		- linkerItem = menu.add(new MenuItem("Linker"));
301		- linkerItem.addActionListener(this);
302	768	attributeItem = menu.add(new MenuItem("Attribute"));
303	769	attributeItem.addActionListener(this);
	770	+
	771	+ if (Globals.ADVANCED)
	772	+ {
	773	+ menu.add("-");
	774	+ linkerItem = menu.add(new MenuItem("Linker"));
	775	+ linkerItem.addActionListener(this);
304	776	templateItem = menu.add(new MenuItem("Template"));
305	777	templateItem.addActionListener(this);
306	778	pointflowItem = menu.add(new MenuItem("Point Flow"));
307	779	pointflowItem.addActionListener(this);
308		- menu.add("-");
309	780	}
	781	+ menu.add("-");
310	782	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
311	783	resetTransformItem.addActionListener(this);
312	784	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
313	785	resetCentroidItem.addActionListener(this);
314		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
315		- transformgeometryItem.addActionListener(this);
	786	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	787	+ resetCentroidXZItem.addActionListener(this);
	788	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	789	+ transformGeometryItem.addActionListener(this);
	790	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	791	+ transformChildrenItem.addActionListener(this);
316	792
317	793	oe.menuBar.add(menu = new Menu("Geometry"));
318	794	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -325,7 +801,7 @@
325	801	genNormalsMESHItem.addActionListener(this);
326	802	if (Globals.ADVANCED)
327	803	{
328		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	804	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
329	805	genNormalsMINEItem.addActionListener(this);
330	806	}
331	807	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -361,6 +837,10 @@
361	837	oe.menuBar.add(menu = new Menu("Attributes"));
362	838	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
363	839	clearMaterialsItem.addActionListener(this);
	840	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	841	+ resetAllItem.addActionListener(this);
	842	+ stepAllItem = menu.add(new MenuItem("Step All"));
	843	+ stepAllItem.addActionListener(this);
364	844	menu.add("-");
365	845	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
366	846	liveleavesItem.addActionListener(this);
..	..	@@ -377,10 +857,18 @@
377	857	hideleavesItem.addActionListener(this);
378	858	showleavesItem = menu.add(new MenuItem("Show Leaves"));
379	859	showleavesItem.addActionListener(this);
380		- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
	860	+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
381	861	markleavesItem.addActionListener(this);
382		- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
	862	+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
383	863	unmarkleavesItem.addActionListener(this);
	864	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	865	+ rewindleavesItem.addActionListener(this);
	866	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	867	+ unrewindleavesItem.addActionListener(this);
	868	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	869	+ randomleavesItem.addActionListener(this);
	870	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	871	+ unrandomleavesItem.addActionListener(this);
384	872	menu.add("-");
385	873	flipVItem = menu.add(new MenuItem("Flip V"));
386	874	flipVItem.addActionListener(this);
..	..	@@ -406,55 +894,130 @@
406	894	attachBumpItem.addActionListener(this);
407	895	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
408	896	pigmentBumpItem.addActionListener(this);
	897	+ //embedTexturesItem
409	898	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
410	899	detachPigmentItem.addActionListener(this);
411	900	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
412	901	detachBumpItem.addActionListener(this);
	902	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	903	+ embedTexturesItem.addActionListener(this);
	904	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	905	+ deEmbedTexturesItem.addActionListener(this);
413	906	menu.add("-");
414	907	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
415	908	sortbysizeItem.addActionListener(this);
416	909	sortbynameItem = menu.add(new MenuItem("Sort by name"));
417	910	sortbynameItem.addActionListener(this);
	911	+ menu.add("-");
	912	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	913	+ shareGeometriesItem.addActionListener(this);
	914	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	915	+ mergeGeometriesItem.addActionListener(this);
	916	+ menu.add("-");
	917	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	918	+ editLeafItem.addActionListener(this);
418	919	if (Globals.ADVANCED)
419	920	{
420		- menu.add("-");
	921	+ // Pretty much the same as duplicate and clone.
421	922	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
422	923	extractGeometriesItem.addActionListener(this);
423	924	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
424	925	cloneGeometriesItem.addActionListener(this);
425		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
426		- shareGeometriesItem.addActionListener(this);
427		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
428		- mergeGeometriesItem.addActionListener(this);
429	926	}
430	927
431	928	oe.menuBar.add(menu = new Menu("Insert"));
432	929	buildCreateMenu(menu);
433	930
434		- oe.menuBar.add(menu = new Menu("Include"));
435		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
436		- importGFDItem.addActionListener(this);
437		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
438		- importVRMLX3DItem.addActionListener(this);
439		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
440		- importOBJItem.addActionListener(this);
441		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
442		- import3DSItem.addActionListener(this);
443		-
444	931	oe.menuBar.add(menu = new Menu("Tools"));
445	932	buildToolsMenu(menu);
446	933	}
447	934
	935	+ JTabbedPane resourcecontainer;
	936	+ cGridBag currenttab;
	937	+ //boolean added; // patch for jar
	938	+
	939	+ int tabcount = 0;
	940	+ int colcount = 0;
	941	+ int rowcount = 0;
	942	+ int texturecount = 0;
	943	+
	944	+ int columns = 5;
	945	+ int rows = 7;
	946	+
	947	+ public void ResourceCallBack(String[] path)
	948	+ {
	949	+// for (int i = 0; i < path.length; i++)
	950	+// System.out.print(path[i] + "/");
	951	+// System.out.println();
	952	+
	953	+ if (//rowcount == 0 \|\|
	954	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	955	+ {
	956	+ currenttab = new cGridBag();
	957	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	958	+ currenttab.setName(tabname);
	959	+ //added = false;
	960	+ resourcecontainer.add(currenttab);
	961	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	962	+ rowcount = 1;
	963	+ colcount = 0;
	964	+ texturecount = 0;
	965	+ }
	966	+
	967	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	968	+ {
	969	+ //if (!added)
	970	+ {
	971	+ //added = true;
	972	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	973	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	974	+ }
	975	+
	976	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	977	+
	978	+ if (++colcount >= columns)
	979	+ {
	980	+ colcount = 0;
	981	+ currenttab.Return();
	982	+
	983	+ if (rowcount++ >= rows)
	984	+ {
	985	+ rowcount = 0;
	986	+ }
	987	+ }
	988	+ }
	989	+ else
	990	+ {
	991	+// if (!path[path.length-1].equals("icons"))
	992	+// resourcecontainer.Return();
	993	+ }
	994	+ }
	995	+
	996	+ void CreateTexturePanel(cGridBag container)
	997	+ {
	998	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	999	+ container.add(resourcecontainer);
	1000	+
	1001	+ Grafreed.ParseResources("textures", this);
	1002	+ }
	1003	+
448	1004	void SetupUI2(ObjEditor oe)
449	1005	{
	1006	+ // June 2019
	1007	+ if (oe == null)
	1008	+ {
	1009	+ //super.SetupUI2(this);
	1010	+ //return;
	1011	+ }
	1012	+
	1013	+ if (copy != group)
	1014	+ {
	1015	+ //super.SetupUI2(this);
	1016	+ }
	1017	+
450	1018	//new Exception().printStackTrace();
451	1019
452	1020	oe.radioPanel = new JPanel(new GridBagLayout());
453		- oe.aConstraints.weightx = 1;
454		- oe.aConstraints.weighty = 0;
455		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
456		- oe.aConstraints.gridwidth = 100;
457		- oe.aConstraints.gridheight = 1;
458	1021	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
459	1022
460	1023	oe.buttonGroup = new ButtonGroup();
..	..	@@ -475,97 +1038,265 @@
475	1038	oe.radioPanel.add(dummyButton);
476	1039	oe.buttonGroup.add(dummyButton);
477	1040	*/
	1041	+ cGridBag versionManagerPanel = new cGridBag();
	1042	+
	1043	+ versionManagerPanel.preferredHeight = 4;
	1044	+
478	1045	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
479	1046
480		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
481		- liveCB.setToolTipText("Enabled animation");
482		- liveCB.addItemListener(this);
	1047	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1048	+ //minButton.setToolTipText("Minimize window");
	1049	+ //minButton.addActionListener(this);
	1050	+
	1051	+ if (Globals.ADVANCED)
	1052	+ {
	1053	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1054	+// maxButton.setToolTipText("Maximize window");
	1055	+// maxButton.addActionListener(this);
	1056	+ }
	1057	+
	1058	+ cButton gcButton;
	1059	+
	1060	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1061	+// gcButton.setToolTipText("Garbage collect");
	1062	+// gcButton.addActionListener(new ActionListener()
	1063	+// {
	1064	+// public void actionPerformed(ActionEvent e)
	1065	+// {
	1066	+// System.gc();
	1067	+// }
	1068	+// });
	1069	+
	1070	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1071	+ collapseButton.setToolTipText("Collapse toolbar");
	1072	+ collapseButton.addActionListener(this);
	1073	+
	1074	+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1075	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1076	+ maximize3DButton.addActionListener(this);
	1077	+
	1078	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1079	+ twoButton.setToolTipText("Show 3D view only");
	1080	+ twoButton.addActionListener(this);
	1081	+ this.fullscreenLayout = twoButton;
	1082	+
	1083	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1084	+ threeButton.setToolTipText("Show controls and 3D view");
	1085	+ threeButton.addActionListener(this);
	1086	+ if (Globals.ADVANCED)
	1087	+ {
	1088	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1089	+ sixButton.setToolTipText("Show 3D view and controls");
	1090	+ sixButton.addActionListener(this);
	1091	+ }
	1092	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1093	+// sevenButton.setToolTipText("3-column layout");
	1094	+// sevenButton.addActionListener(this);
	1095	+ //
	1096	+
	1097	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1098	+ fullButton.setToolTipText("Full-screen window");
	1099	+ fullButton.addActionListener(this);
	1100	+
	1101	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1102	+ screenfitButton.setToolTipText("Screen fit");
	1103	+ screenfitButton.addActionListener(this);
483	1104
484		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1105	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1106	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1107	+ restoreCameraButton.addActionListener(this);
	1108	+
	1109	+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1110	+ saveVersionButton.setToolTipText("Duplicate current version");
	1111	+ saveVersionButton.addActionListener(this);
	1112	+
	1113	+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1114	+ deleteVersionButton.setToolTipText("Delete current version");
	1115	+ deleteVersionButton.addActionListener(this);
	1116	+ deleteVersionButton.setEnabled(false);
	1117	+
	1118	+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1119	+ previousVersionButton.setToolTipText("Previous version");
	1120	+ previousVersionButton.addActionListener(this);
	1121	+ previousVersionButton.setEnabled(false);
	1122	+
	1123	+ cGridBag updown = new cGridBag().setVertical(true);
	1124	+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1125	+ restoreButton.setToolTipText("Undo (restore current version)");
	1126	+ restoreButton.addActionListener(this);
	1127	+ restoreButton.setEnabled(false);
	1128	+
	1129	+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1130	+ replaceButton.setToolTipText("Save (replace current version)");
	1131	+ replaceButton.addActionListener(this);
	1132	+ replaceButton.setEnabled(false);
	1133	+
	1134	+ versionManagerPanel.add(updown);
	1135	+
	1136	+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1137	+ nextVersionButton.setToolTipText("Next version");
	1138	+ nextVersionButton.addActionListener(this);
	1139	+ nextVersionButton.setEnabled(false);
	1140	+
	1141	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
485	1142	oneStepButton.setToolTipText("Animate one step forward");
486	1143	oneStepButton.addActionListener(this);
487	1144
488		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	1145	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1146	+ liveCB.setToolTipText("Enable animation");
	1147	+ liveCB.addItemListener(this);
	1148	+
	1149	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
489	1150	fastCB.setToolTipText("Fast mode");
490	1151	fastCB.addItemListener(this);
491	1152
492		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
493		- trackCB.setToolTipText("Enable tracking");
494		- trackCB.addItemListener(this);
495		-
496		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
497		- screenfitButton.setToolTipText("Screen fit");
498		- screenfitButton.addActionListener(this);
	1153	+ //oe.toolboxPanel.Return();
	1154	+
	1155	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1156	+// trackCB.setToolTipText("Enable tracking");
	1157	+// trackCB.addItemListener(this);
499	1158
500	1159	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
501	1160	// screenfitpointButton.addActionListener(this);
502	1161
503	1162	if (Globals.ADVANCED)
504	1163	{
505		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1164	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
506	1165	snapobjectButton.addActionListener(this);
507	1166	snapobjectButton.setToolTipText("Snap Object");
	1167	+
	1168	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1169	+ fourButton.addActionListener(this);
	1170	+ fourButton.setToolTipText("Show control panel only");
508	1171	}
509	1172
510		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
511		- flashSelectionButton.setToolTipText("Show selection");
512		- flashSelectionButton.addActionListener(this);
	1173	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
513	1174
514		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
515		-
516		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
517		- twoButton.setToolTipText("Show center view only");
518		- twoButton.addActionListener(this);
519		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
520		- fourButton.addActionListener(this);
521		- fourButton.setToolTipText("Show left panel only");
522		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
523		- sixButton.setToolTipText("2-column layout left");
524		- sixButton.addActionListener(this);
525		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
526		- threeButton.setToolTipText("2-column layout right");
527		- threeButton.addActionListener(this);
528		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
529		- sevenButton.setToolTipText("3-column layout");
530		- sevenButton.addActionListener(this);
531		- //
532	1175
533		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
534		- rootButton.setToolTipText("Edit selection in new tab");
	1176	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1177	+ rootButton.setToolTipText("Open selection in new tab");
535	1178	rootButton.addActionListener(this);
536	1179
537		- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1180	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
538	1181	closeButton.setToolTipText("Close tab");
539	1182	closeButton.addActionListener(this);
540	1183	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
541	1184	//clearButton.addActionListener(this);
542		-
543		- cGridBag commandsPanel = new cGridBag();
	1185	+
	1186	+ cGridBag row1 = new cGridBag();
544	1187
545		- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
546		- editButton.setToolTipText("Edit selection");
	1188	+ // INSERT
	1189	+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1190	+ gridButton.setToolTipText("Create ground");
	1191	+ gridButton.addActionListener(this);
	1192	+
	1193	+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1194	+ boxButton.setToolTipText("Create box");
	1195	+ boxButton.addActionListener(this);
	1196	+
	1197	+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1198	+ superButton.setToolTipText("Create superellipsoid");
	1199	+ superButton.addActionListener(this);
	1200	+
	1201	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1202	+ sphereButton.setToolTipText("Create sphere");
	1203	+ sphereButton.addActionListener(this);
	1204	+
	1205	+ row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1206	+ coneButton.setToolTipText("Create cone");
	1207	+ coneButton.addActionListener(this);
	1208	+
	1209	+ row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1210	+ torusButton.setToolTipText("Create torus");
	1211	+ torusButton.addActionListener(this);
	1212	+
	1213	+ if (Globals.ADVANCED)
	1214	+ {
	1215	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1216	+ kleinButton.setToolTipText("Create Klein bottle");
	1217	+ kleinButton.addActionListener(this);
	1218	+ }
	1219	+
	1220	+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1221	+ particlesButton.setToolTipText("Create particle system");
	1222	+ particlesButton.addActionListener(this);
	1223	+
	1224	+ oe.toolboxPanel.add(row1);
	1225	+
	1226	+ cGridBag row2 = new cGridBag();
	1227	+
	1228	+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1229	+ groupButton.setToolTipText("Create group");
	1230	+ groupButton.addActionListener(this);
	1231	+
	1232	+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1233	+ compositeButton.setToolTipText("Create composite");
	1234	+ compositeButton.addActionListener(this);
	1235	+
	1236	+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1237	+ switchButton.setToolTipText("Create item switcher");
	1238	+ switchButton.addActionListener(this);
	1239	+
	1240	+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1241	+ loopButton.setToolTipText("Create loop");
	1242	+ loopButton.addActionListener(this);
	1243	+
	1244	+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1245	+ textureButton.setToolTipText("Create texture");
	1246	+ textureButton.addActionListener(this);
	1247	+
	1248	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1249	+ overlayButton.setToolTipText("Create overlay");
	1250	+ overlayButton.addActionListener(this);
	1251	+
	1252	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1253	+ lightButton.setToolTipText("Create light");
	1254	+ lightButton.addActionListener(this);
	1255	+
	1256	+ oe.toolboxPanel.add(row2);
	1257	+
	1258	+ cGridBag textures = new cGridBag();
	1259	+
	1260	+ CreateTexturePanel(textures);
	1261	+
	1262	+ resourcecontainer.setSelectedIndex((int)(Math.random() * resourcecontainer.getTabCount()));
	1263	+
	1264	+ oe.toolboxPanel.add(textures);
	1265	+
	1266	+ textures.preferredHeight = 100;
	1267	+
	1268	+ CreateSkyboxPanel(oe.skyboxPanel);
	1269	+
	1270	+ // EDIT panel
	1271	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1272	+ editButton.setToolTipText("Pin selection controls");
547	1273	editButton.addActionListener(this);
548	1274
549		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
550		- uneditButton.setToolTipText("Unedit selection");
	1275	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1276	+ uneditButton.setToolTipText("Unpin and remove selection controls");
551	1277	uneditButton.addActionListener(this);
552	1278
553		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
554		- allParamsButton.setToolTipText("Edit all params");
	1279	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1280	+ allParamsButton.setToolTipText("Show all controls");
555	1281	allParamsButton.addActionListener(this);
556	1282
557		- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
558		- clearPanelButton.setToolTipText("Clear edit panel");
	1283	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1284	+ clearPanelButton.setToolTipText("Clear all controls");
559	1285	clearPanelButton.addActionListener(this);
560	1286
561		- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
562		- unselectButton.setToolTipText("Unselect");
563		- unselectButton.addActionListener(this);
	1287	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1288	+ //unselectButton.setToolTipText("Unselect");
	1289	+ //unselectButton.addActionListener(this);
564	1290
565		- commandsPanel.preferredHeight = 1;
	1291	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1292	+ flashSelectionButton.setToolTipText("Highlight selection");
	1293	+ flashSelectionButton.addActionListener(this);
566	1294
567		- oe.treePanel.add(commandsPanel);
568		- oe.treePanel.Return();
	1295	+ editCommandsPanel.preferredHeight = 1;
	1296	+
	1297	+ SetPinStates(false);
	1298	+// oe.treePanel.add(commandsPanel);
	1299	+// oe.treePanel.Return();
569	1300
570	1301	// oe.aConstraints.gridx += 1;
571	1302	// oe.aConstraints.weighty = 0;
..	..	@@ -580,34 +1311,24 @@
580	1311
581	1312	cGridBag jSPPanel = new cGridBag();
582	1313
	1314	+ jSPPanel.preferredHeight = 20;
	1315	+
583	1316	JScrollPane jSP;
584	1317	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
585		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1318	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
586	1319	ResetModel();
587	1320
588	1321	oe.treePanel.add(jSPPanel);
589	1322	oe.treePanel.Return();
590	1323
591		- cGridBag copyOptionsPanel = new cGridBag();
592		-
593		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
594		- colorCB.setToolTipText("Copy color when dropped");
595		- colorCB.addItemListener(this);
596		-
597		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
598		- materialCB.setToolTipText("Copy material when dropped");
599		- materialCB.addItemListener(this);
600		-
601		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
602		- textureCB.setToolTipText("Copy texture when dropped");
603		- textureCB.addItemListener(this);
604		-
605		- copyOptionsPanel.preferredHeight = 1;
606		- oe.treePanel.add(copyOptionsPanel);
	1324	+ oe.treePanel.add(versionManagerPanel);
607	1325	oe.treePanel.Return();
	1326	+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1327	+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
	1328	+ versionSliderPane.preferredHeight = 3;
608	1329
609		-// mainPanel.setDividerLocation(0.5); //1.0);
610		-// mainPanel.setResizeWeight(0.5);
	1330	+// mainPanel.setDividerLocation(0.1); //1.0);
	1331	+ mainPanel.setResizeWeight(0.4);
611	1332
612	1333	//jList.addListSelectionListener(this);
613	1334	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -615,7 +1336,7 @@
615	1336	//jTree.setEditable(true);
616	1337	oe.jTree.setDragEnabled(true);
617	1338	//jTree.setPreferredSize(new Dimension(10,10));
618		- jSP.setPreferredSize(new Dimension(100,200));
	1339	+ //jSP.setPreferredSize(new Dimension(100,200));
619	1340
620	1341	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
621	1342
..	..	@@ -627,29 +1348,49 @@
627	1348	dgr.addDragGestureListener(this);
628	1349	}catch(Exception e) {}
629	1350	*/
630		- radio.layout = sevenButton;
	1351	+ radio.layout = threeButton; // sixButton;
631	1352	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
632	1353	}
633	1354
634	1355	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
635	1356	{
	1357	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1358	+ colorCB.setToolTipText("Copy color when dropped");
	1359	+ colorCB.addItemListener(this);
	1360	+
	1361	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1362	+ materialCB.setToolTipText("Copy material when dropped");
	1363	+ materialCB.addItemListener(this);
	1364	+
	1365	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1366	+ textureCB.setToolTipText("Copy texture when dropped");
	1367	+ textureCB.addItemListener(this);
	1368	+
	1369	+ panel.Return();
	1370	+
636	1371	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
637	1372	boxCB.setToolTipText("Display bounding boxes");
638	1373	boxCB.addItemListener(this);
639	1374
640	1375	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
641		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1376	+ zoomBoxCB.setToolTipText("Display only for wheel");
642	1377	zoomBoxCB.addItemListener(this);
643	1378
644		- if (Globals.ADVANCED)
	1379	+ if (true) // Globals.ADVANCED)
645	1380	{
646		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
647		- supportCB.setToolTipText("Enable rigging");
648		- supportCB.addItemListener(this);
	1381	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1382	+// supportCB.setToolTipText("Enable rigging");
	1383	+// supportCB.addItemListener(this);
	1384	+
	1385	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1386	+ freezeCB.setToolTipText("Fast moving camera");
	1387	+ freezeCB.addItemListener(this);
649	1388
650	1389	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
651	1390	// localCB.addItemListener(this);
652	1391
	1392	+ panel.Return();
	1393	+
653	1394	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
654	1395	crowdCB.setToolTipText("Used for crowds");
655	1396	crowdCB.addItemListener(this);
..	..	@@ -658,14 +1399,19 @@
658	1399	smoothCB.setToolTipText("Snapping delay");
659	1400	smoothCB.addItemListener(this);
660	1401
661		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
662		- slowCB.setToolTipText("Smooth interpolation");
663		- slowCB.addItemListener(this);
	1402	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1403	+// slowCB.setToolTipText("Smooth interpolation");
	1404	+// slowCB.addItemListener(this);
	1405	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1406	+ minshaderCB.setToolTipText("Minimal fast shader");
	1407	+ minshaderCB.addItemListener(this);
664	1408
665	1409	// constraints.gridy += 1;
666	1410	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
667	1411	// speakerMocapCB.addItemListener(this);
668	1412
	1413	+ panel.Return();
	1414	+
669	1415	if (false)
670	1416	{
671	1417	// handled in scripts
..	..	@@ -680,67 +1426,126 @@
680	1426	//constraints.gridy += 1;
681	1427	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
682	1428	smoothfocusCB.addItemListener(this);
	1429	+ panel.Return();
683	1430	}
684	1431
685	1432	//constraints.gridx += 1;
686	1433	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
687	1434	// debugCB.addItemListener(this);
688	1435
	1436	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1437	+ trackCB.setToolTipText("Enable tracking target");
	1438	+ trackCB.addItemListener(this);
	1439	+
689	1440	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1441	+ oeilCB.setToolTipText("Move camera when tracking");
690	1442	oeilCB.addItemListener(this);
691	1443
	1444	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1445	+ shadowCB.setToolTipText("When live compute shadows");
	1446	+ shadowCB.addItemListener(this);
	1447	+
	1448	+ panel.Return();
	1449	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1450	+ toggleTextureCB.setToolTipText("Load textures");
	1451	+ toggleTextureCB.addItemListener(this);
	1452	+
	1453	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1454	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1455	+ toggleSwitchCB.addItemListener(this);
	1456	+
	1457	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1458	+ autokeepCB.setToolTipText("On structure change");
	1459	+ autokeepCB.addItemListener(this);
	1460	+
	1461	+ panel.Return();
	1462	+ if (Globals.ADVANCED)
	1463	+ {
692	1464	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
693	1465	lookAtCB.setToolTipText("Look-at target");
694	1466	lookAtCB.addItemListener(this);
	1467	+ }
695	1468
696	1469	}
697	1470
698	1471	cGridBag fill = new cGridBag();
699		-
700	1472	fill.preferredHeight = 200;
	1473	+ cGridBag fill2 = new cGridBag();
	1474	+ fill2.preferredHeight = 200;
	1475	+ cGridBag fill3 = new cGridBag();
	1476	+ fill3.preferredHeight = 200;
701	1477
702	1478	panel.add(fill);
	1479	+ panel.add(fill2);
	1480	+ panel.add(fill3);
703	1481
704	1482	}
705	1483
706	1484	void EditObject(Object3D obj)
707	1485	{
	1486	+ assert(obj instanceof Composite);
	1487	+
	1488	+// if (obj.versionlist == null)
	1489	+// {
	1490	+// obj.versionlist = new Object3D[100];
	1491	+// obj.versionindex = -1;
	1492	+// }
	1493	+
708	1494	cRadio radioButton = new cRadio(obj.name);
	1495	+
	1496	+ // June 2019. Patch to avoid bug with transparency.
	1497	+ radioButton.hadMaterial = obj.material != null;
	1498	+ if (!radioButton.hadMaterial)
	1499	+ {
	1500	+ obj.material = new cMaterial();
	1501	+ }
	1502	+
709	1503	radioButton.SetObject(obj);
710		- radioButton.layout = sevenButton;
	1504	+ radioButton.layout = threeButton; // sixButton;
711	1505	radioButton.SetCamera(cameraView.renderCamera, false);
712	1506	radioButton.addActionListener(this);
713	1507	radioPanel.add(radioButton);
714	1508	buttonGroup.add(radioButton);
715	1509	radioButton.doClick();
716	1510	}
	1511	+
717	1512	void SetupViews(ObjEditor oe)
718	1513	{
	1514	+ theFrame = this;
	1515	+
719	1516	oe.SetupViews();
720	1517
	1518	+ if (Globals.DEBUG)
721	1519	System.out.println("SetupViews");
722	1520	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
723	1521	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
724	1522	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
725	1523	}
726	1524
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;
	1525	+ cToggleButton liveCB;
	1526	+ cCheckBox supportCB;
	1527	+ cCheckBox localCB;
	1528	+ cCheckBox crowdCB;
	1529	+ cCheckBox smoothCB;
	1530	+ cCheckBox minshaderCB;
	1531	+
	1532	+ cToggleButton fastCB;
	1533	+ cCheckBox slowCB;
	1534	+ cCheckBox boxCB;
	1535	+ cCheckBox zoomBoxCB;
	1536	+ cCheckBox freezeCB;
	1537	+ //cToggleButton trackCB;
	1538	+ cCheckBox trackCB;
	1539	+ cCheckBox smoothfocusCB;
738	1540	// JCheckBox speakerMocapCB;
739		- JCheckBox speakerCameraCB;
740		- JCheckBox speakerFocusCB;
741		- JCheckBox debugCB;
742		- JCheckBox oeilCB;
743		- JCheckBox lookAtCB;
	1541	+ cCheckBox speakerCameraCB;
	1542	+ cCheckBox speakerFocusCB;
	1543	+ cCheckBox debugCB;
	1544	+
	1545	+ cCheckBox oeilCB;
	1546	+ cCheckBox shadowCB;
	1547	+ cCheckBox autokeepCB;
	1548	+ cCheckBox lookAtCB;
744	1549
745	1550	// static int COLOR = 1;
746	1551	// static int MATERIAL = 2;
..	..	@@ -748,9 +1553,9 @@
748	1553
749	1554	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
750	1555
751		- JCheckBox colorCB;
752		- JCheckBox materialCB;
753		- JCheckBox textureCB;
	1556	+ cCheckBox colorCB;
	1557	+ cCheckBox materialCB;
	1558	+ cCheckBox textureCB;
754	1559
755	1560	public void itemStateChanged(ItemEvent e)
756	1561	{
..	..	@@ -778,6 +1583,7 @@
778	1583	} else if(e.getSource() == liveCB)
779	1584	{
780	1585	cameraView.ToggleLive();
	1586	+ refreshContents(false);
781	1587	}
782	1588	else if(e.getSource() == supportCB)
783	1589	{
..	..	@@ -793,6 +1599,12 @@
793	1599	{
794	1600	cameraView.ToggleInertia();
795	1601	cameraView.repaint();
	1602	+ }
	1603	+ else if(e.getSource() == minshaderCB)
	1604	+ {
	1605	+ Globals.MINSHADER ^= true;
	1606	+ cameraView.programInitialized = false;
	1607	+ cameraView.repaint();
796	1608	}
797	1609	else if(e.getSource() == localCB)
798	1610	{
..	..	@@ -842,6 +1654,18 @@
842	1654	{
843	1655	cameraView.ToggleOeil();
844	1656	}
	1657	+ else if(e.getSource() == shadowCB)
	1658	+ {
	1659	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1660	+ }
	1661	+ else if(e.getSource() == freezeCB)
	1662	+ {
	1663	+ Globals.FREEZEONMOVE ^= true;
	1664	+ }
	1665	+ else if(e.getSource() == autokeepCB)
	1666	+ {
	1667	+ Globals.REPLACEONMAKE ^= true;
	1668	+ }
845	1669	else if(e.getSource() == lookAtCB)
846	1670	{
847	1671	cameraView.ToggleLookAt();
..	..	@@ -858,7 +1682,8 @@
858	1682
859	1683	/**/
860	1684	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
861		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1685	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1686	+ TreePath path = objEditor.jTree.getSelectionPath();
862	1687	if ((path == null) \|\| (path.getPathCount() <= 1)) {
863	1688	// We can't move the root node or an empty selection
864	1689	return;
..	..	@@ -921,8 +1746,6 @@
921	1746	}
922	1747	}
923	1748
924		- String string = (String) object;
925		-
926	1749	System.out.println("Transfer = " + object + "; drop : " + target);
927	1750	// if( object instanceof java.io.File[])
928	1751	// {
..	..	@@ -930,7 +1753,11 @@
930	1753	// objEditor.DropFile((java.io.File[]) object, true);
931	1754	// return;
932	1755	// }
933		- if (string.charAt(0) == '/')
	1756	+
	1757	+ String string = object.toString();
	1758	+
	1759	+ // File path for Mac and Windows
	1760	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
934	1761	{
935	1762	// file(s)
936	1763	String[] names = string.split("\n");
..	..	@@ -957,7 +1784,7 @@
957	1784
958	1785	flashIt = false;
959	1786	CameraPane pane = (CameraPane) target;
960		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1787	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
961	1788	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
962	1789
963	1790	if (group.selection.size() == 1)
..	..	@@ -973,23 +1800,33 @@
973	1800
974	1801	assert target == objEditor.jTree;
975	1802	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1803	+ Object3D destinationLeaf;
976	1804	try {
977		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1805	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
978	1806	} catch (Exception e) {
979	1807	System.out.println("destinationPath : " + destinationPath);
980	1808	return;
981	1809	}
982	1810
983		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1811	+ for (int i=group.selection.size(); --i>=0;)
984	1812	{
	1813	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1814	+
	1815	+ // Cannot move into itself
	1816	+ if (child == destinationLeaf)
	1817	+ return;
	1818	+ }
	1819	+
	1820	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1821	+// {
985	1822	loadClipboard(true);
986	1823	objEditor.jTree.setSelectionPath(destinationPath);
987	1824	pasteInto(false, false);
988		- } else {
989		- loadClipboard(false);
990		- objEditor.jTree.setSelectionPath(destinationPath);
991		- pasteInto(false, false); // true); // ???
992		- }
	1825	+// } else {
	1826	+// loadClipboard(false);
	1827	+// objEditor.jTree.setSelectionPath(destinationPath);
	1828	+// pasteInto(false, false); // true); // ???
	1829	+// }
993	1830	}
994	1831	public void dropActionChanged(DropTargetDragEvent dtde)
995	1832	// Called if the user has modified the current drop gesture
..	..	@@ -1045,7 +1882,12 @@
1045	1882	TreePath path;
1046	1883
1047	1884	public TransferableTreePath(TreePath tp) {
1048		- path = tp;
	1885	+ Object[] objs = new Object[tp.getPathCount()];
	1886	+ for (int i=0; i<objs.length; i++)
	1887	+ {
	1888	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1889	+ }
	1890	+ path = new TreePath(objs);
1049	1891	}
1050	1892
1051	1893	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1094,22 +1936,30 @@
1094	1936	{
1095	1937	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1096	1938	//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);
	1939	+// gridItem = menu.add(new MenuItem("Grid"));
	1940	+// gridItem.addActionListener(this);
	1941	+// rectoidItem = menu.add(new MenuItem("Box"));
	1942	+// rectoidItem.addActionListener(this);
	1943	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1944	+// ellipsoidItem.addActionListener(this);
	1945	+// coneItem = menu.add(new MenuItem("Cone"));
	1946	+// coneItem.addActionListener(this);
	1947	+// torusItem = menu.add(new MenuItem("Torus"));
	1948	+// torusItem.addActionListener(this);
	1949	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1950	+// superItem.addActionListener(this);
	1951	+
	1952	+ cameraItem = menu.add(new MenuItem("Camera"));
	1953	+ cameraItem.addActionListener(this);
	1954	+
	1955	+ if (!Globals.ADVANCED)
	1956	+ {
1109	1957	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1110	1958	kleinItem.addActionListener(this);
1111		- particleItem = menu.add(new MenuItem("Particle system"));
1112		- particleItem.addActionListener(this);
	1959	+ }
	1960	+
	1961	+// particleItem = menu.add(new MenuItem("Particle system"));
	1962	+// particleItem.addActionListener(this);
1113	1963	if (Globals.ADVANCED)
1114	1964	{
1115	1965	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1135,15 +1985,15 @@
1135	1985	}
1136	1986	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1137	1987	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);
	1988	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1989	+// overlayItem.addActionListener(this);
	1990	+// lightItem = menu.add(new MenuItem("Light"));
	1991	+// lightItem.addActionListener(this);
1142	1992	menu.add("-");
1143	1993	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1144	1994	//superLoopItem.addActionListener(this);
1145		- loopItem = menu.add(new MenuItem("Loop"));
1146		- loopItem.addActionListener(this);
	1995	+// loopItem = menu.add(new MenuItem("Loop"));
	1996	+// loopItem.addActionListener(this);
1147	1997	doubleItem = menu.add(new MenuItem("Fork"));
1148	1998	doubleItem.addActionListener(this);
1149	1999	if (Globals.ADVANCED)
..	..	@@ -1159,18 +2009,23 @@
1159	2009	animationItem.addItemListener(this);
1160	2010	animationItem.setState(Globals.ANIMATION);
1161	2011
	2012	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	2013	+ archiveItem.addActionListener(this);
	2014	+
1162	2015	menu.add("-");
1163	2016	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1164	2017	parseverticesItem.addActionListener(this);
1165	2018	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1166	2019	textureFieldItem.addActionListener(this);
1167		- alignItem = menu.add(new MenuItem("Align Object"));
	2020	+ alignItem = menu.add(new MenuItem("Align Objects"));
1168	2021	alignItem.addActionListener(this);
1169	2022	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1170	2023	reduceMorphItem.addActionListener(this);
1171	2024	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1172	2025	reduce34MorphItem.addActionListener(this);
1173		-
	2026	+ menu.add("-");
	2027	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	2028	+ memoryItem.addActionListener(this);
1174	2029	menu.add(computeAOItem = new MenuItem("Compute AO"));
1175	2030	computeAOItem.addActionListener(this);
1176	2031
..	..	@@ -1179,11 +2034,9 @@
1179	2034	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1180	2035	mirrorItem.addActionListener(this);
1181	2036	menu.add("-");
1182		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1183		- memoryItem.addActionListener(this);
1184	2037	menu.add(analyzeItem = new MenuItem("Analyze"));
1185	2038	analyzeItem.addActionListener(this);
1186		- menu.add(dumpItem = new MenuItem("Dump"));
	2039	+ menu.add(dumpItem = new MenuItem("Print"));
1187	2040	dumpItem.addActionListener(this);
1188	2041	// menu.add(pathItem = new MenuItem("From-to path"));
1189	2042	// pathItem.addActionListener(this);
..	..	@@ -1324,9 +2177,38 @@
1324	2177	shadow.material = new cMaterial(obj.material);
1325	2178	shadow.material.diffuse = 0.0001f;
1326	2179	shadow.material.specular = 0.0001f;
	2180	+ shadow.material.opacity = 0.75f;
	2181	+
	2182	+ AllocProjectedVertices(shadow);
	2183	+
	2184	+ shadow.projectedVertices[1].x = 300;
1327	2185
1328	2186	makeSomething(shadow);
1329	2187	}
	2188	+
	2189	+ private void ClearUnpinned()
	2190	+ {
	2191	+ //for (Object3D obj : listUI)
	2192	+ for (int i=listUI.size(); --i>=0;)
	2193	+ {
	2194	+ Object3D obj = listUI.elementAt(i);
	2195	+ if (!obj.pinned)
	2196	+ {
	2197	+ obj.CloseUI();
	2198	+ listUI.remove(i);
	2199	+ }
	2200	+ }
	2201	+ }
	2202	+
	2203	+ private void EditElement(Object3D elem, boolean newWindow)
	2204	+ {
	2205	+ // if (!(elem instanceof Composite))
	2206	+ // newWindow = false;
	2207	+ listUI.add(elem);
	2208	+ elem.openEditWindow(this, newWindow); //, false);
	2209	+ System.out.println("edit : " + elem);
	2210	+ elem.editWindow.refreshContents(true); // ? new
	2211	+ }
1330	2212
1331	2213	/**
1332	2214	* applyExample
..	..	@@ -1530,9 +2412,9 @@
1530	2412
1531	2413	void Overwrite(int mask)
1532	2414	{
1533		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2415	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1534	2416	{
1535		- Object3D content = GrafreeD.clipboard.get(0);
	2417	+ Object3D content = Grafreed.clipboard.get(0);
1536	2418
1537	2419	if (content instanceof cGroup && ((cGroup)content).transientlink )
1538	2420	content = ((cGroup)content).get(0);
..	..	@@ -1571,7 +2453,7 @@
1571	2453	{
1572	2454	ScreenFit();
1573	2455	} else
1574		- if (source == switchItem)
	2456	+ if (source == switchViewItem)
1575	2457	{
1576	2458	cVector v1 = new cVector();
1577	2459	cVector v2 = new cVector();
..	..	@@ -1580,11 +2462,11 @@
1580	2462	objEditor.cameraView.renderCamera.setAim(v2, v1);
1581	2463	objEditor.cameraView.repaint();
1582	2464	} else
1583		- if (source == rectoidItem)
	2465	+ if (source == rectoidItem \|\| source == boxButton)
1584	2466	{
1585	2467	makeSomething(new Box());
1586	2468	} else
1587		- if (source == particleItem)
	2469	+ if (source == particleItem \|\| source == particlesButton)
1588	2470	{
1589	2471	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1590	2472	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1663,27 +2545,27 @@
1663	2545
1664	2546	makeSomething(obj);
1665	2547	} else
1666		- if (source == gridItem)
	2548	+ if (source == gridItem \|\| source == gridButton)
1667	2549	{
1668	2550	makeSomething(new Grid());
1669	2551	} else
1670		- if (source == ellipsoidItem)
	2552	+ if (source == ellipsoidItem \|\| source == sphereButton)
1671	2553	{
1672	2554	makeSomething(new Sphere());
1673	2555	} else
1674		- if (source == coneItem)
	2556	+ if (source == coneItem \|\| source == coneButton)
1675	2557	{
1676	2558	makeSomething(new Cone());
1677	2559	} else
1678		- if (source == torusItem)
	2560	+ if (source == torusItem \|\| source == torusButton)
1679	2561	{
1680	2562	makeSomething(new Torus());
1681	2563	} else
1682		- if (source == superItem)
	2564	+ if (source == superItem \|\| source == superButton)
1683	2565	{
1684	2566	makeSomething(new Superellipsoid());
1685	2567	} else
1686		- if (source == kleinItem)
	2568	+ if (source == kleinItem \|\| source == kleinButton)
1687	2569	{
1688	2570	makeSomething(new Klein());
1689	2571	} else
..	..	@@ -1703,7 +2585,7 @@
1703	2585	{
1704	2586	makeSomething(new BezierSurface());
1705	2587	} else
1706		- if (source == overlayItem)
	2588	+ if (source == overlayItem \|\| source == overlayButton)
1707	2589	{
1708	2590	/*
1709	2591	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1751,10 +2633,27 @@
1751	2633	s.setup();
1752	2634	makeSomething(s);
1753	2635	} else
1754		- if (source == lightItem)
	2636	+ if (source == lightItem \|\| source == lightButton)
1755	2637	{
1756	2638	makeSomething(new Light());
1757	2639	} else
	2640	+// if (source == skybox1Button \|\|
	2641	+// source == skybox2Button \|\|
	2642	+// source == skybox3Button \|\|
	2643	+// source == skybox4Button \|\|
	2644	+// source == skybox5Button \|\|
	2645	+// source == skybox6Button \|\|
	2646	+// source == skybox7Button \|\|
	2647	+// source == skybox11Button \|\|
	2648	+// source == skybox12Button \|\|
	2649	+// source == skybox13Button \|\|
	2650	+// source == skybox14Button \|\|
	2651	+// source == skybox15Button \|\|
	2652	+// source == skybox16Button \|\|
	2653	+// source == skybox17Button)
	2654	+// {
	2655	+// ChangeSkybox(source);
	2656	+// } else
1758	2657	if (source == csgItem)
1759	2658	{
1760	2659	group(new CSG());
..	..	@@ -1801,30 +2700,38 @@
1801	2700
1802	2701	group(g);
1803	2702	} else
1804		- if (source == loopItem)
	2703	+ if (source == loopItem \|\| source == loopButton)
1805	2704	{
	2705	+ if (!group.selection.isEmpty())
	2706	+ {
1806	2707	Composite csg = new GroupLeaf();
1807	2708	csg.count = 5;
1808		- group(csg);
1809		- Composite child = new cGroup();
	2709	+ Composite child = new cGroup("Branch");
1810	2710	csg.addChild(child);
1811	2711	child.addChild(csg);
	2712	+ group(csg);
	2713	+ }
1812	2714	} else
1813	2715	if (source == doubleItem)
1814	2716	{
1815		- Composite csg = new GroupLeaf();
	2717	+ if (!group.selection.isEmpty())
	2718	+ {
	2719	+ Composite csg = new GroupLeaf("Fork");
1816	2720	csg.count = 5;
	2721	+ Composite child = new cGroup("Branch A");
	2722	+ csg.addChild(child);
	2723	+ child.addChild(csg);
	2724	+ child = new cGroup("Branch B");
	2725	+ csg.addChild(child);
	2726	+ child.addChild(csg);
1817	2727	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);
	2728	+ }
1824	2729	} else
1825	2730	if (source == tripleItem)
1826	2731	{
1827		- Composite csg = new GroupLeaf();
	2732	+ if (!group.selection.isEmpty())
	2733	+ {
	2734	+ Composite csg = new GroupLeaf("Trident");
1828	2735	csg.count = 4;
1829	2736	group(csg);
1830	2737	Composite child = new cGroup();
..	..	@@ -1836,28 +2743,12 @@
1836	2743	child = new cGroup();
1837	2744	csg.addChild(child);
1838	2745	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");
	2746	+ }
1856	2747	} else
1857	2748	if (source == computeAOItem)
1858	2749	{
1859	2750	Globals.drawMode = CameraPane.OCCLUSION;
1860		- Globals.theRenderer.repaint();
	2751	+ cameraView.repaint();
1861	2752	} else
1862	2753	if (source == recompileItem)
1863	2754	{
..	..	@@ -1872,7 +2763,7 @@
1872	2763	if (source == invariantsItem)
1873	2764	{
1874	2765	System.out.println("Invariants:");
1875		- GrafreeD.grafreeD.universe.invariants();
	2766	+ Grafreed.grafreed.universe.invariants();
1876	2767	} else
1877	2768	if (source == memoryItem)
1878	2769	{
..	..	@@ -1891,6 +2782,65 @@
1891	2782	{
1892	2783	DumpObject();
1893	2784	} else
	2785	+ if (source == minButton)
	2786	+ {
	2787	+ Minimize();
	2788	+ } else
	2789	+ if (source == maxButton)
	2790	+ {
	2791	+ Maximize();
	2792	+ } else
	2793	+ if (source == fullButton)
	2794	+ {
	2795	+ ToggleFullScreen();
	2796	+ } else
	2797	+ if (source == collapseButton)
	2798	+ {
	2799	+ this.expandedLayout = radio.layout;
	2800	+ CollapseToolbar();
	2801	+ } else
	2802	+ if (source == maximize3DButton)
	2803	+ {
	2804	+ this.expandedLayout = radio.layout;
	2805	+ radio.layout = twoButton;
	2806	+ Show3DView();
	2807	+ CollapseToolbar();
	2808	+ } else
	2809	+ if (source == previousVersionButton)
	2810	+ {
	2811	+ // Go to previous version
	2812	+ //if (!Undo())
	2813	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2814	+ PreviousVersion();
	2815	+ } else
	2816	+ if (source == restoreButton)
	2817	+ {
	2818	+ // Restore current version
	2819	+ Restore();
	2820	+ //restoreButton.setEnabled(false);
	2821	+ } else
	2822	+ if (source == replaceButton)
	2823	+ {
	2824	+ // Overwrite current version
	2825	+ Replace();
	2826	+ //replaceButton.setEnabled(false);
	2827	+ } else
	2828	+ if (source == nextVersionButton)
	2829	+ {
	2830	+ // Go to next version
	2831	+ NextVersion();
	2832	+ } else
	2833	+ if (source == saveVersionButton)
	2834	+ {
	2835	+ // Save a new version
	2836	+ if (!Save(true))
	2837	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2838	+ } else
	2839	+ if (source == deleteVersionButton)
	2840	+ {
	2841	+ // Delete a new version
	2842	+ DeleteVersion();
	2843	+ } else
1894	2844	if (source == oneStepButton)
1895	2845	{
1896	2846	Globals.ONESTEP = true;
..	..	@@ -1898,17 +2848,14 @@
1898	2848	} else
1899	2849	if (source == screenfitButton)
1900	2850	{
1901		- //Reload(lastConverter, lastFilename, true);
1902	2851	ScreenFit();
1903	2852	} else
1904	2853	if (source == screenfitpointButton)
1905	2854	{
1906		- //Reload(lastConverter, lastFilename, true);
1907	2855	ScreenFitPoint();
1908	2856	} else
1909	2857	if (source == snapobjectButton)
1910	2858	{
1911		- //Reload(lastConverter, lastFilename, true);
1912	2859	SnapObject();
1913	2860	} else
1914	2861	// if (event.getSource() == recompileButton)
..	..	@@ -1945,12 +2892,20 @@
1945	2892	{
1946	2893	loadClipboard(true);
1947	2894	} else
	2895	+ if (source == undoItem)
	2896	+ {
	2897	+ PreviousVersion();
	2898	+ } else
	2899	+ if (source == redoItem)
	2900	+ {
	2901	+ NextVersion();
	2902	+ } else
1948	2903	if (source == duplicateItem)
1949	2904	{
1950		- Object3D keep = GrafreeD.clipboard;
	2905	+ Object3D keep = Grafreed.clipboard;
1951	2906	loadClipboard(false);
1952	2907	paste(false);
1953		- GrafreeD.clipboard = keep;
	2908	+ Grafreed.clipboard = keep;
1954	2909	} else
1955	2910	if (source == cloneItem)
1956	2911	{
..	..	@@ -2170,9 +3125,9 @@
2170	3125	// group.selection.get(0).setMasterThis(content); // should be identity
2171	3126	// refreshContents();
2172	3127	// }
2173		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	3128	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2174	3129	{
2175		- Object3D content = GrafreeD.clipboard.get(0);
	3130	+ Object3D content = Grafreed.clipboard.get(0);
2176	3131
2177	3132	if (content instanceof cGroup && ((cGroup)content).transientlink )
2178	3133	content = ((cGroup)content).get(0);
..	..	@@ -2222,9 +3177,9 @@
2222	3177	} else
2223	3178	if (source == setMasterItem)
2224	3179	{
2225		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	3180	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2226	3181	{
2227		- Object3D content = GrafreeD.clipboard.get(0);
	3182	+ Object3D content = Grafreed.clipboard.get(0);
2228	3183
2229	3184	if (content instanceof cGroup && ((cGroup)content).transientlink )
2230	3185	content = ((cGroup)content).get(0);
..	..	@@ -2237,9 +3192,9 @@
2237	3192	{
2238	3193	if (group.selection.size() == 1)
2239	3194	{
2240		- if (GrafreeD.clipboard.size() == 1)
	3195	+ if (Grafreed.clipboard.size() == 1)
2241	3196	{
2242		- Object3D content = GrafreeD.clipboard.get(0);
	3197	+ Object3D content = Grafreed.clipboard.get(0);
2243	3198
2244	3199	if (content instanceof cGroup && ((cGroup)content).transientlink )
2245	3200	content = ((cGroup)content).get(0);
..	..	@@ -2256,7 +3211,7 @@
2256	3211	{
2257	3212	RevertMeshes();
2258	3213	} else
2259		- if (source == resetMeshItem)
	3214	+ if (source == resetAllItem)
2260	3215	{
2261	3216	ResetAll();
2262	3217	} else
..	..	@@ -2264,7 +3219,7 @@
2264	3219	{
2265	3220	StepAll();
2266	3221	} else
2267		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3222	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2268	3223	{
2269	3224	//int indices[] = jList.getSelectedIndices();
2270	3225	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2276,9 +3231,9 @@
2276	3231	{
2277	3232	ClearSelection(true);
2278	3233	} else
2279		- if (source == grabItem)
	3234	+ if (source == grabItem \|\| source == groupButton)
2280	3235	{
2281		- group(new cGroup(), true);
	3236	+ group(new cGroup(), false); // true);
2282	3237	} else
2283	3238	if (source == hideItem)
2284	3239	{
..	..	@@ -2296,11 +3251,11 @@
2296	3251	{
2297	3252	makeSomething(new Camera());
2298	3253	} else
2299		- if (source == compositeItem)
	3254	+ if (source == compositeItem \|\| source == compositeButton)
2300	3255	{
2301	3256	group(new Composite());
2302	3257	} else
2303		- if (source == randomItem)
	3258	+ if (source == switchItem \|\| source == switchButton)
2304	3259	{
2305	3260	RandomNode random = new RandomNode();
2306	3261	group(random);
..	..	@@ -2402,7 +3357,7 @@
2402	3357	{
2403	3358	group(new cLinker());
2404	3359	} else
2405		- if (source == textureItem)
	3360	+ if (source == textureItem \|\| source == textureButton)
2406	3361	{
2407	3362	group(new TextureNode());
2408	3363	} else
..	..	@@ -2422,17 +3377,42 @@
2422	3377	{
2423	3378	CastShadow(2);
2424	3379	} else
2425		- if (source == ungroupItem)
	3380	+ if (source == ungroupItem \|\| source == ungroupButton)
2426	3381	{
2427		- //ungroup();
	3382	+ boolean canUngroup = true;
	3383	+
2428	3384	for (int i=0; i<group.selection.size(); i++)
2429	3385	{
2430		- Ungroup(group.selection.get(i));
	3386	+ Object3D selectedItem = group.selection.get(i);
	3387	+
	3388	+ if (selectedItem.Size() == 0)
	3389	+ {
	3390	+ // Cannot ungroup leaves
	3391	+ canUngroup = false;
	3392	+ break;
	3393	+ }
	3394	+
	3395	+ if (selectedItem == group)
	3396	+ {
	3397	+ // Cannot ungroup root
	3398	+ canUngroup = false;
	3399	+ break;
	3400	+ }
2431	3401	}
2432	3402
2433		- ClearSelection(false);
2434		-
2435		- refreshContents();
	3403	+ if (canUngroup)
	3404	+ {
	3405	+ for (int i=0; i<group.selection.size(); i++)
	3406	+ {
	3407	+ Object3D selectedItem = group.selection.get(i);
	3408	+
	3409	+ Ungroup(selectedItem);
	3410	+ }
	3411	+
	3412	+ ClearSelection(false);
	3413	+
	3414	+ refreshContents();
	3415	+ }
2436	3416	} else
2437	3417	if (source == genUVItem)
2438	3418	{
..	..	@@ -2444,7 +3424,7 @@
2444	3424	} else
2445	3425	if (source == genNormalsMESHItem)
2446	3426	{
2447		- GenNormals(true); // TODO
	3427	+ GenNormalsMESH();
2448	3428	} else
2449	3429	if (source == genNormalsORGANItem)
2450	3430	{
..	..	@@ -2509,6 +3489,22 @@
2509	3489	if (source == unmarkleavesItem)
2510	3490	{
2511	3491	MarkLeaves(false);
	3492	+ } else
	3493	+ if (source == rewindleavesItem)
	3494	+ {
	3495	+ RewindLeaves(true);
	3496	+ } else
	3497	+ if (source == unrewindleavesItem)
	3498	+ {
	3499	+ RewindLeaves(false);
	3500	+ } else
	3501	+ if (source == randomleavesItem)
	3502	+ {
	3503	+ RandomLeaves(true);
	3504	+ } else
	3505	+ if (source == unrandomleavesItem)
	3506	+ {
	3507	+ RandomLeaves(false);
2512	3508	} else
2513	3509	if (source == flipVItem)
2514	3510	{
..	..	@@ -2594,9 +3590,13 @@
2594	3590	{
2595	3591	SmoothMesh();
2596	3592	} else
2597		- if (source == transformgeometryItem)
	3593	+ if (source == transformGeometryItem)
2598	3594	{
2599	3595	TransformGeometry();
	3596	+ } else
	3597	+ if (source == transformChildrenItem)
	3598	+ {
	3599	+ TransformChildren();
2600	3600	} else
2601	3601	if (source == resetTransformItem)
2602	3602	{
..	..	@@ -2604,7 +3604,11 @@
2604	3604	} else
2605	3605	if (source == resetCentroidItem)
2606	3606	{
2607		- ResetCentroid();
	3607	+ ResetCentroid(true);
	3608	+ } else
	3609	+ if (source == resetCentroidXZItem)
	3610	+ {
	3611	+ ResetCentroid(false);
2608	3612	} else
2609	3613	if (source == resetParentItem)
2610	3614	{
..	..	@@ -2709,7 +3713,7 @@
2709	3713	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2710	3714	{
2711	3715	obj = (Object3D)e.nextElement();
2712		- obj.SetBumpTexture(null);
	3716	+ obj.ResetBumpTexture();
2713	3717	}
2714	3718
2715	3719	refreshContents();
..	..	@@ -2725,6 +3729,31 @@
2725	3729
2726	3730	refreshContents();
2727	3731	} else
	3732	+ if (source == embedTexturesItem)
	3733	+ {
	3734	+ Object3D obj;
	3735	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3736	+ {
	3737	+ obj = (Object3D)e.nextElement();
	3738	+ obj.EmbedTextures(true);
	3739	+ }
	3740	+
	3741	+ refreshContents();
	3742	+ } else
	3743	+ if (source == deEmbedTexturesItem)
	3744	+ {
	3745	+ Object3D obj;
	3746	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3747	+ {
	3748	+ obj = (Object3D)e.nextElement();
	3749	+ obj.EmbedTextures(false);
	3750	+ }
	3751	+
	3752	+ CameraPane.texturepigment.clear();
	3753	+ CameraPane.texturebump.clear();
	3754	+
	3755	+ refreshContents();
	3756	+ } else
2728	3757	if (source == flashSelectionButton)
2729	3758	{
2730	3759	CameraPane.flash = true;
..	..	@@ -2736,42 +3765,36 @@
2736	3765	if (source == twoButton)
2737	3766	{
2738	3767	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();
	3768	+
	3769	+ if (CameraPane.FULLSCREEN)
	3770	+ fullscreenLayout = radio.layout;
	3771	+
	3772	+ Show3DView();
	3773	+
	3774	+ cameraView.requestFocusInWindow();
	3775	+
	3776	+// refreshContents(true);
	3777	+//
	3778	+// try
	3779	+// {
	3780	+// java.awt.Robot bot = new java.awt.Robot();
	3781	+// int mask = InputEvent.BUTTON1_MASK;
	3782	+// bot.mouseMove(100, 100);
	3783	+// bot.mousePress(mask);
	3784	+// bot.mouseRelease(mask);
	3785	+// }
	3786	+// catch (Exception e)
	3787	+// {
	3788	+//
	3789	+// }
	3790	+
2771	3791	} else
2772	3792	if (source == threeButton)
2773	3793	{
2774	3794	radio.layout = threeButton;
	3795	+
	3796	+ if (CameraPane.FULLSCREEN)
	3797	+ fullscreenLayout = radio.layout;
2775	3798
2776	3799	// bigThree.remove(scenePanel);
2777	3800	// bigThree.remove(centralPanel);
..	..	@@ -2801,13 +3824,18 @@
2801	3824	// centralPanel.setVisible(true);
2802	3825	// XYZPanel.setVisible(true);
2803	3826	bigThree.ClearUI();
	3827	+ bigThree.add(scenePanel);
2804	3828	bigThree.add(centralPanel);
2805		- bigThree.add(XYZPanel);
2806	3829	bigThree.FlushUI();
	3830	+
	3831	+ cameraView.requestFocusInWindow();
2807	3832	} else
2808	3833	if (source == fourButton)
2809	3834	{
2810	3835	radio.layout = fourButton;
	3836	+
	3837	+ if (CameraPane.FULLSCREEN)
	3838	+ fullscreenLayout = radio.layout;
2811	3839
2812	3840	// bigThree.remove(scenePanel);
2813	3841	// bigThree.remove(centralPanel);
..	..	@@ -2839,10 +3867,15 @@
2839	3867	bigThree.ClearUI();
2840	3868	bigThree.add(scenePanel);
2841	3869	bigThree.FlushUI();
	3870	+
	3871	+ cameraView.requestFocusInWindow();
2842	3872	} else
2843	3873	if (source == sixButton)
2844	3874	{
2845	3875	radio.layout = sixButton;
	3876	+
	3877	+ if (CameraPane.FULLSCREEN)
	3878	+ fullscreenLayout = radio.layout;
2846	3879
2847	3880	// bigThree.remove(scenePanel);
2848	3881	// bigThree.remove(centralPanel);
..	..	@@ -2872,13 +3905,18 @@
2872	3905	// centralPanel.setVisible(true);
2873	3906	// XYZPanel.setVisible(false);
2874	3907	bigThree.ClearUI();
2875		- bigThree.add(scenePanel);
2876	3908	bigThree.add(centralPanel);
	3909	+ bigThree.add(scenePanel);
2877	3910	bigThree.FlushUI();
	3911	+
	3912	+ cameraView.requestFocusInWindow();
2878	3913	} else
2879	3914	if (source == sevenButton)
2880	3915	{
2881	3916	radio.layout = sevenButton;
	3917	+
	3918	+ if (CameraPane.FULLSCREEN)
	3919	+ fullscreenLayout = radio.layout;
2882	3920
2883	3921	// bigThree.remove(scenePanel);
2884	3922	// bigThree.remove(centralPanel);
..	..	@@ -2912,9 +3950,12 @@
2912	3950	bigThree.add(centralPanel);
2913	3951	bigThree.add(XYZPanel);
2914	3952	bigThree.FlushUI();
	3953	+
	3954	+ cameraView.requestFocusInWindow();
2915	3955	} else
2916	3956	if (source == rootButton)
2917	3957	{
	3958	+ Replace();
2918	3959	Object3D obj;
2919	3960	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2920	3961	{
..	..	@@ -2923,31 +3964,49 @@
2923	3964	EditObject(obj);
2924	3965	}
2925	3966
	3967	+ cameraView.requestFocusInWindow();
2926	3968	refreshContents(true);
2927	3969	} else
2928	3970	if (source == closeButton)
2929	3971	{
2930	3972	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	3973	+ Replace();
	3974	+
2931	3975	cRadio ab;
2932	3976	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2933	3977	{
2934	3978	ab = (cRadio)e.nextElement();
2935		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3979	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2936	3980	{
	3981	+ // Patch to avoid bug with transparency.
	3982	+ if (!ab.hadMaterial)
	3983	+ {
	3984	+ ab.object.material = null;
	3985	+ }
	3986	+
2937	3987	buttonGroup.remove(ab);
2938	3988	radioPanel.remove(ab);
2939	3989
2940		- ab.GetObject().editWindow = null;
	3990	+ //ab.GetObject().editWindow = null;
	3991	+ ab.GetObject().manipWindow = null;
2941	3992	// ab.GetObject().objectUI = null; // ?????????
2942	3993
2943	3994	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2944	3995	break;
2945	3996	}
2946	3997	}
	3998	+
	3999	+ cameraView.requestFocusInWindow();
2947	4000	refreshContents(true);
2948	4001	} else
2949	4002	if (source == editItem \|\| source == editButton)
2950	4003	{
	4004	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4005	+ {
	4006	+ Object3D child = (Object3D)e.nextElement();
	4007	+ child.pinned = true;
	4008	+ }
	4009	+
2951	4010	EditSelection(false);
2952	4011	} else
2953	4012	if (source == uneditButton)
..	..	@@ -2956,11 +4015,12 @@
2956	4015	{
2957	4016	Object3D child = (Object3D)e.nextElement();
2958	4017	if(child.editWindow != null)
2959		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4018	+ child.pinned = false;
2960	4019	child.CloseUI();
2961	4020	listUI.remove(child);
	4021	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2962	4022
2963		- child.editWindow = null; // ???????????
	4023	+ //child.editWindow = null; // ???????????
2964	4024	}
2965	4025	objEditor.ctrlPanel.FlushUI();
2966	4026	//objEditor.jTree.clearSelection();
..	..	@@ -2973,16 +4033,18 @@
2973	4033	//copy.ClearUI();
2974	4034	for (Object3D obj : listUI)
2975	4035	{
	4036	+ obj.pinned = false;
2976	4037	obj.CloseUI();
2977	4038	}
2978	4039	listUI.clear();
	4040	+ SetPinStates(group.selection.size() > 0);
2979	4041	refreshContents(true);
2980	4042	} else
2981	4043	if (source == allParamsButton)
2982	4044	{
2983	4045	assert(copy == group);
2984	4046
2985		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4047	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2986	4048
2987	4049	for (Object3D obj : listUI)
2988	4050	{
..	..	@@ -3008,6 +4070,8 @@
3008	4070	} else
3009	4071	if(source instanceof cRadio)
3010	4072	{
	4073	+ Replace();
	4074	+
3011	4075	group.parent = keepparent;
3012	4076	group.attributes = 0;
3013	4077	//group.editWindow = null;
..	..	@@ -3031,6 +4095,7 @@
3031	4095	}
3032	4096
3033	4097	copy = group;
	4098	+
3034	4099	//Globals.theRenderer.object = group;
3035	4100	if(!useclient)
3036	4101	{
..	..	@@ -3046,20 +4111,72 @@
3046	4111	frontView.object = group;
3047	4112	sideView.object = group;
3048	4113	}
3049		- group.editWindow = this;
	4114	+
	4115	+// fix "+" issue
	4116	+ //group.editWindow = this;
	4117	+ group.manipWindow = this;
	4118	+
3050	4119	/*
3051	4120	currentLayout = radio.layout;
3052	4121	if (currentLayout == null)
3053	4122	currentLayout = sevenButton;
3054	4123	*/
3055	4124	radio.layout.doClick();
	4125	+
	4126	+ assert(copy instanceof Composite);
	4127	+
	4128	+ if (copy.versionlist == null)
	4129	+ {
	4130	+ copy.versionindex = -1;
	4131	+
	4132	+ // Cannot work with loops
	4133	+ // To fix this issue, we first mark all nodes above the root,
	4134	+ // and check if any of these nodes are reachable below the root.
	4135	+ Grafreed.grafreed.universe.TagObjects(copy, true);
	4136	+
	4137	+ if (!copy.HasTags())
	4138	+ {
	4139	+ copy.versionlist = new Object3D[100];
	4140	+
	4141	+ Save(true);
	4142	+ }
	4143	+
	4144	+ Grafreed.grafreed.universe.TagObjects(copy, false);
	4145	+ }
	4146	+
	4147	+ SetVersionStates();
	4148	+
	4149	+ ClearUnpinned();
	4150	+
	4151	+ //Grafreed.Assert(group != null);
	4152	+ //Grafreed.Assert(group.selection != null);
	4153	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4154	+ if (group.selection == null \|\| group.selection.size() == 1)
	4155	+ EditSelection(false);
3056	4156	keepparent = group.parent;
3057	4157	// PARENT = NULL or not???
3058	4158	//group.parent = null; // ROOT
3059	4159	//group.attributes = -1;
3060	4160	ResetModel();
	4161	+
	4162	+ cameraView.requestFocusInWindow();
3061	4163	refreshContents(true);
3062		- }
	4164	+ } else if (event.getSource() == editCameraItem)
	4165	+ {
	4166	+ cameraView.ProtectCamera();
	4167	+ cameraView.requestFocusInWindow();
	4168	+ cameraView.repaint();
	4169	+ return;
	4170	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	4171	+ {
	4172	+ cameraView.RevertCamera();
	4173	+ cameraView.requestFocusInWindow();
	4174	+ cameraView.repaint();
	4175	+ return;
	4176	+ // } else if (event.getSource() == textureButton)
	4177	+ // {
	4178	+ // return; // true;
	4179	+ }
3063	4180	else
3064	4181	{
3065	4182	//return super.action(event, arg);
..	..	@@ -3068,7 +4185,6 @@
3068	4185	}
3069	4186
3070	4187	boolean useclient = false;
3071		- cRadio radio;
3072	4188
3073	4189	void ToggleRoot()
3074	4190	{
..	..	@@ -3120,6 +4236,28 @@
3120	4236	refreshContents();
3121	4237	}
3122	4238
	4239	+ void TransformChildren()
	4240	+ {
	4241	+ Object3D obj;
	4242	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4243	+ {
	4244	+ obj = (Object3D)e.nextElement();
	4245	+ obj.KeepTextureMatrices();
	4246	+ obj.TransformChildren();
	4247	+ obj.RestoreTextureMatrices();
	4248	+
	4249	+// if (obj.parent == null)
	4250	+// {
	4251	+// System.out.println("NULL PARENT!");
	4252	+// new Exception().printStackTrace();
	4253	+// }
	4254	+// else
	4255	+// TouchTransform(obj);
	4256	+// //obj.parent.Touch();
	4257	+ }
	4258	+
	4259	+ refreshContents();
	4260	+ }
3123	4261
3124	4262	void ResetTransform()
3125	4263	{
..	..	@@ -3151,7 +4289,7 @@
3151	4289	TouchTransform(obj);
3152	4290	continue;
3153	4291	}
3154		- if ((mask&2) != 0) // Scale
	4292	+ if ((mask&2) != 0) // Scale/rotation
3155	4293	{
3156	4294	obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
3157	4295	obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
..	..	@@ -3159,10 +4297,6 @@
3159	4297	obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
3160	4298	obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
3161	4299	obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
3162		- }
3163		- if ((mask&4) != 0) // Rotation
3164		- {
3165		- // ?
3166	4300	}
3167	4301	if ((mask&1) != 0) // Translation
3168	4302	{
..	..	@@ -3232,7 +4366,7 @@
3232	4366	refreshContents();
3233	4367	}
3234	4368
3235		- void ResetCentroid()
	4369	+ void ResetCentroid(boolean full)
3236	4370	{
3237	4371	Object3D obj;
3238	4372	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3247,12 +4381,16 @@
3247	4381	LA.matIdentity(Object3D.mat);
3248	4382	obj.getBounds(minima, maxima, false);
3249	4383	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3250		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	4384	+ if (full)
	4385	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3251	4386	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3252	4387	obj.TransformMesh(Object3D.mat);
	4388	+
3253	4389	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3254		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	4390	+ if (full)
	4391	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3255	4392	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	4393	+
3256	4394	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3257	4395	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3258	4396	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3281,7 +4419,8 @@
3281	4419
3282	4420	int size = obj.MemorySize();
3283	4421
3284		- System.err.println((size/1024) + " KB is the size of " + obj);
	4422	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4423	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3285	4424	}
3286	4425	}
3287	4426	catch (Exception e)
..	..	@@ -3318,9 +4457,9 @@
3318	4457	obj = (Object3D)e.nextElement();
3319	4458
3320	4459	System.out.println("Object is: " + obj);
3321		- GrafreeD.AnalyzeObject(obj);
	4460	+ Grafreed.AnalyzeObject(obj);
3322	4461	System.out.println("Boundary rep: " + obj.bRep);
3323		- GrafreeD.AnalyzeObject(obj.bRep);
	4462	+ Grafreed.AnalyzeObject(obj.bRep);
3324	4463
3325	4464	// System.err.println((size/1024) + " KB is the size of " + obj);
3326	4465	}
..	..	@@ -3362,6 +4501,13 @@
3362	4501	void GenNormals(boolean crease)
3363	4502	{
3364	4503	group.GenNormalsS(crease);
	4504	+
	4505	+ refreshContents();
	4506	+ }
	4507	+
	4508	+ void GenNormalsMESH()
	4509	+ {
	4510	+ group.GenNormalsMeshS();
3365	4511
3366	4512	refreshContents();
3367	4513	}
..	..	@@ -3534,8 +4680,8 @@
3534	4680
3535	4681	void ParseVertices()
3536	4682	{
3537		- boolean epsequal = GrafreeD.epsequal;
3538		- GrafreeD.epsequal = true;
	4683	+ boolean epsequal = Grafreed.epsequal;
	4684	+ Grafreed.epsequal = true;
3539	4685
3540	4686	for (int i=0; i<group.selection.size(); i++)
3541	4687	{
..	..	@@ -3560,7 +4706,7 @@
3560	4706	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3561	4707	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3562	4708
3563		- g.add(GrafreeD.clipboard);
	4709	+ g.add(Grafreed.clipboard);
3564	4710
3565	4711	buffer.add(g);
3566	4712	}
..	..	@@ -3575,7 +4721,7 @@
3575	4721	makeSomething(buffer, i==group.selection.size()-1);
3576	4722	}
3577	4723
3578		- GrafreeD.epsequal = epsequal;
	4724	+ Grafreed.epsequal = epsequal;
3579	4725
3580	4726	refreshContents();
3581	4727	}
..	..	@@ -3593,7 +4739,16 @@
3593	4739	String pigment = Object3D.GetPigment(tex);
3594	4740	//String bump = Object3D.GetBump(tex);
3595	4741
3596		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4742	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4743	+
	4744	+ try
	4745	+ {
	4746	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
	4747	+ }
	4748	+ catch (Exception e)
	4749	+ {
	4750	+ System.err.println("FAIL: " + node);
	4751	+ }
3597	4752
3598	4753	double s = v.s;
3599	4754
..	..	@@ -3725,7 +4880,7 @@
3725	4880	return;
3726	4881
3727	4882	Object3D poses = group.selection.get(0);
3728		- Object3D ref = GrafreeD.clipboard.get(0);
	4883	+ Object3D ref = Grafreed.clipboard.get(0);
3729	4884
3730	4885	Object3D newgroup = new Object3D("Po:" + poses.name);
3731	4886
..	..	@@ -3919,9 +5074,9 @@
3919	5074
3920	5075	void ClipMesh()
3921	5076	{
3922		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	5077	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3923	5078	{
3924		- Object3D content = GrafreeD.clipboard.get(0);
	5079	+ Object3D content = Grafreed.clipboard.get(0);
3925	5080
3926	5081	if (content instanceof cGroup && ((cGroup)content).transientlink )
3927	5082	content = ((cGroup)content).get(0);
..	..	@@ -3930,7 +5085,7 @@
3930	5085	// {
3931	5086	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3932	5087	// }
3933		- group.selection.ClipMesh(GrafreeD.clipboard);
	5088	+ group.selection.ClipMesh(Grafreed.clipboard);
3934	5089	}
3935	5090	// group.selection.ClipMesh(GrafreeD.clipboard);
3936	5091	System.out.println("DONE.");
..	..	@@ -3977,6 +5132,18 @@
3977	5132	void MarkLeaves(boolean hide)
3978	5133	{
3979	5134	group.selection.MarkLeaves(hide);
	5135	+ refreshContents();
	5136	+ }
	5137	+
	5138	+ void RewindLeaves(boolean hide)
	5139	+ {
	5140	+ group.selection.RewindLeaves(hide);
	5141	+ refreshContents();
	5142	+ }
	5143	+
	5144	+ void RandomLeaves(boolean hide)
	5145	+ {
	5146	+ group.selection.RandomLeaves(hide);
3980	5147	refreshContents();
3981	5148	}
3982	5149
..	..	@@ -4051,28 +5218,25 @@
4051	5218	// }
4052	5219	// }
4053	5220
4054		- static boolean allparams = true;
4055		-
4056		- static Vector<Object3D> listUI = new Vector<Object3D>();
4057		-
4058	5221	void EditSelection(boolean newWindow)
4059	5222	{
	5223	+ if (group.selection == null)
	5224	+ {
	5225	+ EditElement(group, newWindow); // ? new
	5226	+ return;
	5227	+ }
	5228	+
4060	5229	// aConstraints.gridy = 0;
4061	5230	for (int i=0; i<group.selection.size(); i++)
4062	5231	{
4063	5232	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4064	5233	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4065		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5234	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4066	5235
4067	5236	Object3D elem = (Object3D)group.selection.elementAt(i);
4068		- if(elem != group)
	5237	+ if(elem != group \|\| !newWindow)
4069	5238	{
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
	5239	+ EditElement(elem, newWindow); // ? new
4076	5240	}
4077	5241	}
4078	5242	}
..	..	@@ -4135,9 +5299,7 @@
4135	5299
4136	5300	freezemodel = false;
4137	5301	}
4138		-
4139		- boolean flashIt = true;
4140		-
	5302	+
4141	5303	public void valueChanged(TreeSelectionEvent e)
4142	5304	//public boolean handleEvent(Event event)
4143	5305	{
..	..	@@ -4147,7 +5309,8 @@
4147	5309	//new Exception().printStackTrace();
4148	5310
4149	5311	freezemodel = true;
4150		-
	5312	+ ClearUnpinned();
	5313	+
4151	5314	/**/
4152	5315	//switch (event.id)
4153	5316	{
..	..	@@ -4155,7 +5318,6 @@
4155	5318	//case 702: // Event.LIST_DESELECT
4156	5319	group.deselectAll();
4157	5320	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4158		- objEditor.ClearInfo(); // .GetMaterial());
4159	5321	if (tps != null)
4160	5322	{
4161	5323	for (int i=0; i < tps.length; i++)
..	..	@@ -4164,10 +5326,8 @@
4164	5326
4165	5327	//if (child.parent != null)
4166	5328	//child.parent.addSelectee(child);
	5329	+ objEditor.SetMaterial(child);
4167	5330	group.addSelectee(child);
4168		- objEditor.SetMaterial(child); // .GetMaterial());
4169		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4170		- System.err.println("info : " + child.GetPath());
4171	5331	}
4172	5332	}
4173	5333	// else
..	..	@@ -4177,20 +5337,28 @@
4177	5337	// System.err.println("info : " + group.GetPath());
4178	5338	// }
4179	5339
4180		- objEditor.SetText(); // jan 2014
4181		-
4182		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	5340	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4183	5341	CameraPane.flash = true;
4184	5342
4185		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5343	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4186	5344	// a camera
4187	5345	{
4188		- CameraPane.camerachangeframe = 0; // don't refuse it
4189		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5346	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5347	+ {
	5348	+ CameraPane.camerachangeframe = 0; // don't refuse it
	5349	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5350	+ }
4190	5351	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4191	5352	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4192	5353	}
4193	5354
	5355	+ if (tps != null && tps.length == 1)
	5356	+ {
	5357	+ EditSelection(false);
	5358	+ }
	5359	+
	5360	+ SetPinStates(tps != null && tps.length > 0);
	5361	+
4194	5362	refreshContents();
4195	5363	//return true;
4196	5364	}
..	..	@@ -4199,6 +5367,53 @@
4199	5367
4200	5368	freezemodel = false;
4201	5369	}
	5370	+
	5371	+ void SetPinStates(boolean enabled)
	5372	+ {
	5373	+ editButton.setEnabled(enabled);
	5374	+ uneditButton.setEnabled(enabled);
	5375	+ //unselectButton.setEnabled(enabled);
	5376	+ flashSelectionButton.setEnabled(enabled);
	5377	+
	5378	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5379	+
	5380	+ boolean allComposites = true;
	5381	+
	5382	+ if (group.selection != null)
	5383	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5384	+ {
	5385	+ Object next = e.nextElement();
	5386	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5387	+ {
	5388	+ allComposites = false;
	5389	+ break;
	5390	+ }
	5391	+ }
	5392	+
	5393	+ rootButton.setEnabled(allComposites);
	5394	+ }
	5395	+
	5396	+ void refreshContents(boolean cp)
	5397	+ {
	5398	+ if (Globals.ADVANCED)
	5399	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5400	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5401	+ {
	5402	+ objEditor.ClearInfo(); // .GetMaterial());
	5403	+
	5404	+ for (int i=0; i < group.selection.Size(); i++)
	5405	+ {
	5406	+ Object3D child = (Object3D) group.selection.get(i);
	5407	+
	5408	+ objEditor.AddInfo(child, this, true);
	5409	+// System.err.println("info : " + child.GetPath());
	5410	+ }
	5411	+
	5412	+ objEditor.SetText(); // jan 2014
	5413	+ }
	5414	+
	5415	+ super.refreshContents(cp);
	5416	+ }
4202	5417
4203	5418	void linkSomething(Object3D thing)
4204	5419	{
..	..	@@ -4270,16 +5485,19 @@
4270	5485	{
4271	5486	if (group.selection.isEmpty())
4272	5487	return;
4273		- GrafreeD.clipboardIsTempGroup = false;
	5488	+
	5489	+ Grafreed.clipboardIsTempGroup = false;
4274	5490	Composite tGroup = null;
4275	5491	if (group.selection.size() > 0) // 1)
4276	5492	{
4277	5493	tGroup = new cGroup();
4278		- GrafreeD.clipboardIsTempGroup = true;
	5494	+ Grafreed.clipboardIsTempGroup = true;
4279	5495	}
4280	5496
4281	5497	if (cut)
4282	5498	{
	5499	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5500	+// Save();
4283	5501	//int indices[] = jList.getSelectedIndices();
4284	5502	//for (int i = indices.length - 1; i >= 0; i--)
4285	5503	//jList.remove(indices[i]);
..	..	@@ -4315,16 +5533,16 @@
4315	5533	//System.out.println("cut " + child);
4316	5534	//System.out.println("parent = " + child.parent);
4317	5535	// tmp.addChild(child);
4318		- if (GrafreeD.clipboardIsTempGroup)
	5536	+ if (Grafreed.clipboardIsTempGroup)
4319	5537	tGroup.add/Child/(tmp);
4320	5538	else
4321		- GrafreeD.clipboard = tmp;
	5539	+ Grafreed.clipboard = tmp;
4322	5540	}
4323	5541	else
4324		- if (GrafreeD.clipboardIsTempGroup)
	5542	+ if (Grafreed.clipboardIsTempGroup)
4325	5543	tGroup.add/Child/(child);
4326	5544	else
4327		- GrafreeD.clipboard = child;
	5545	+ Grafreed.clipboard = child;
4328	5546	}
4329	5547
4330	5548	//ResetModel();
..	..	@@ -4356,21 +5574,23 @@
4356	5574	//System.out.println("cut " + elem);
4357	5575	//System.out.println("parent = " + elem.parent);
4358	5576	// tmp.addChild(elem);
4359		- if (GrafreeD.clipboardIsTempGroup)
	5577	+ if (Grafreed.clipboardIsTempGroup)
4360	5578	tGroup.add/Child/(tmp);
4361	5579	else
4362		- GrafreeD.clipboard = tmp;
	5580	+ Grafreed.clipboard = tmp;
4363	5581	}
4364	5582	else
4365		- if (GrafreeD.clipboardIsTempGroup)
	5583	+ if (Grafreed.clipboardIsTempGroup)
4366	5584	tGroup.add/Child/(child);
4367	5585	else
4368		- GrafreeD.clipboard = child;
	5586	+ Grafreed.clipboard = child;
4369	5587	}
4370	5588
4371	5589	}
4372		- if (GrafreeD.clipboardIsTempGroup)
4373		- GrafreeD.clipboard = tGroup;
	5590	+
	5591	+ if (Grafreed.clipboardIsTempGroup)
	5592	+ Grafreed.clipboard = tGroup;
	5593	+
4374	5594	if (cut)
4375	5595	{
4376	5596	ResetModel();
..	..	@@ -4380,11 +5600,15 @@
4380	5600
4381	5601	void paste(boolean expand)
4382	5602	{
	5603	+ if (Globals.REPLACEONMAKE)
	5604	+ Save();
	5605	+ boolean keep = Globals.REPLACEONMAKE;
	5606	+ Globals.REPLACEONMAKE = false;
4383	5607	// if (GrafreeD.clipboard == null)
4384	5608	// return;
4385	5609	boolean first = true;
4386	5610
4387		- if (GrafreeD.clipboardIsTempGroup)
	5611	+ if (Grafreed.clipboardIsTempGroup)
4388	5612	{
4389	5613	Composite temp;
4390	5614
..	..	@@ -4395,7 +5619,7 @@
4395	5619	temp = (Composite)Applet3D.clipboard.deepCopy();
4396	5620	*/
4397	5621	Object3D elem;
4398		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5622	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4399	5623	{
4400	5624	Object3D child = (Object3D)e.nextElement();
4401	5625
..	..	@@ -4429,16 +5653,17 @@
4429	5653	//Object3D cb = Applet3D.clipboard;
4430	5654	//temp.addChild(cb);
4431	5655	//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());
	5656	+ assert(Grafreed.clipboard.parent == null);
	5657	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5658	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5659	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5660	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4437	5661	else
4438		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4439		- GrafreeD.clipboard.get(0).parent = keepparent;
	5662	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5663	+ Grafreed.clipboard.get(0).parent = keepparent;
4440	5664	}
4441	5665
	5666	+ Globals.REPLACEONMAKE = keep;
4442	5667	ResetModel();
4443	5668	refreshContents();
4444	5669	}
..	..	@@ -4485,9 +5710,9 @@
4485	5710	{
4486	5711	boolean first = true;
4487	5712
4488		- if (GrafreeD.clipboardIsTempGroup)
	5713	+ if (Grafreed.clipboardIsTempGroup)
4489	5714	{
4490		- Composite temp = (Composite)GrafreeD.clipboard;
	5715	+ Composite temp = (Composite)Grafreed.clipboard;
4491	5716	Object3D copy;
4492	5717	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4493	5718	{
..	..	@@ -4497,7 +5722,7 @@
4497	5722	}
4498	5723	} else
4499	5724	{
4500		- linkSomething(GrafreeD.clipboard); //.get(0));
	5725	+ linkSomething(Grafreed.clipboard); //.get(0));
4501	5726	}
4502	5727	}
4503	5728	}
..	..	@@ -4574,6 +5799,10 @@
4574	5799
4575	5800	void group(Object3D csg, boolean grab)
4576	5801	{
	5802	+ if (Globals.REPLACEONMAKE)
	5803	+ Save();
	5804	+ boolean keep = Globals.REPLACEONMAKE;
	5805	+ Globals.REPLACEONMAKE = false;
4577	5806	if (//false) // why??
4578	5807	!group.selection.isEmpty())
4579	5808	{
..	..	@@ -4687,10 +5916,15 @@
4687	5916	//node.add(csg);
4688	5917	//makeSomething(node);
4689	5918	makeSomething(csg);
	5919	+ Globals.REPLACEONMAKE = keep;
4690	5920	}
4691	5921
4692	5922	void Ungroup(Object3D g)
4693	5923	{
	5924	+ if (Globals.REPLACEONMAKE)
	5925	+ Save();
	5926	+ boolean keep = Globals.REPLACEONMAKE;
	5927	+ Globals.REPLACEONMAKE = false;
4694	5928	if (g instanceof HiddenObject)
4695	5929	{
4696	5930	HiddenObject h = (HiddenObject) g;
..	..	@@ -4707,6 +5941,7 @@
4707	5941	objEditor.makeSomething(g.get(i), false);
4708	5942	}
4709	5943	}
	5944	+ Globals.REPLACEONMAKE = keep;
4710	5945	}
4711	5946
4712	5947	void ungroup()
..	..	@@ -4902,21 +6137,6 @@
4902	6137	}
4903	6138	*/
4904	6139
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	6140	/*
4921	6141	public void Callback(Object obj)
4922	6142	{
..	..	@@ -4940,26 +6160,9 @@
4940	6160	}
4941	6161	*/
4942	6162
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	6163	String GetFile(String dialogName)
4961	6164	{
4962		- if (GrafreeD.standAlone)
	6165	+ if (Grafreed.standAlone)
4963	6166	{
4964	6167	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4965	6168	browser.show();
..	..	@@ -5027,7 +6230,43 @@
5027	6230	cButton clearpanelButton;
5028	6231	cButton unselectButton;
5029	6232
	6233	+ cButton restoreCameraButton;
	6234	+
5030	6235	cButton oneStepButton;
	6236	+
	6237	+ cButton groupButton;
	6238	+ cButton ungroupButton;
	6239	+ cButton compositeButton;
	6240	+ cButton switchButton;
	6241	+ cButton loopButton;
	6242	+ cButton textureButton;
	6243	+
	6244	+ cButton skybox1Button;
	6245	+ cButton skybox2Button;
	6246	+ cButton skybox3Button;
	6247	+ cButton skybox4Button;
	6248	+ cButton skybox5Button;
	6249	+ cButton skybox6Button;
	6250	+ cButton skybox7Button;
	6251	+
	6252	+ cButton skybox11Button;
	6253	+ cButton skybox12Button;
	6254	+ cButton skybox13Button;
	6255	+ cButton skybox14Button;
	6256	+ cButton skybox15Button;
	6257	+ cButton skybox16Button;
	6258	+ cButton skybox17Button;
	6259	+
	6260	+ cButton gridButton;
	6261	+ cButton boxButton;
	6262	+ cButton sphereButton;
	6263	+ cButton coneButton;
	6264	+ cButton torusButton;
	6265	+ cButton superButton;
	6266	+ cButton kleinButton;
	6267	+ cButton particlesButton;
	6268	+ cButton overlayButton;
	6269	+ cButton lightButton;
5031	6270
5032	6271	cButton screenfitButton;
5033	6272	cButton screenfitpointButton;
..	..	@@ -5040,14 +6279,6 @@
5040	6279
5041	6280	cButton setsupportButton;
5042	6281
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	6282	//
5052	6283	//Composite
5053	6284	Object3D // to do !!
..	..	@@ -5057,10 +6288,12 @@
5057	6288	//JTree jTree;
5058	6289	private MenuItem lookAtItem;
5059	6290	private MenuItem lookFromItem;
5060		- private MenuItem switchItem;
5061		- private MenuItem cutItem;
5062		- private MenuItem duplicateItem;
5063		- private MenuItem cloneItem;
	6291	+ private MenuItem switchViewItem;
	6292	+ private JMenuItem cutItem;
	6293	+ private MenuItem undoItem;
	6294	+ private MenuItem redoItem;
	6295	+ private JMenuItem duplicateItem;
	6296	+ private JMenuItem cloneItem;
5064	6297	private MenuItem cloneSupportItem;
5065	6298	private MenuItem overwriteGeoItem;
5066	6299	private MenuItem overwriteMatItem;
..	..	@@ -5072,7 +6305,7 @@
5072	6305	private MenuItem linkverticesItem;
5073	6306	private MenuItem relinkverticesItem;
5074	6307	private MenuItem setMasterItem;
5075		- private MenuItem resetMeshItem;
	6308	+ private MenuItem resetAllItem;
5076	6309	private MenuItem stepAllItem;
5077	6310	private MenuItem revertMeshItem;
5078	6311	private MenuItem poseMeshItem;
..	..	@@ -5081,13 +6314,13 @@
5081	6314	private MenuItem cloneGeometriesItem;
5082	6315	private MenuItem shareGeometriesItem;
5083	6316	private MenuItem mergeGeometriesItem;
5084		- private MenuItem copyItem;
	6317	+ private JMenuItem copyItem;
5085	6318	private MenuItem pasteItem;
5086		- private MenuItem pasteIntoItem;
5087		- private MenuItem pasteLinkItem;
5088		- private MenuItem pasteCloneItem;
5089		- private MenuItem pasteExpandItem;
5090		- private MenuItem clearItem;
	6319	+ private JMenuItem pasteIntoItem;
	6320	+ private JMenuItem pasteLinkItem;
	6321	+ private JMenuItem pasteCloneItem;
	6322	+ private JMenuItem pasteExpandItem;
	6323	+ private JMenuItem deleteItem;
5091	6324	private MenuItem clearAllItem;
5092	6325	private MenuItem genUVItem;
5093	6326	private MenuItem genNormalsMESHItem;
..	..	@@ -5122,6 +6355,10 @@
5122	6355	private MenuItem showleavesItem;
5123	6356	private MenuItem markleavesItem;
5124	6357	private MenuItem unmarkleavesItem;
	6358	+ private MenuItem rewindleavesItem;
	6359	+ private MenuItem unrewindleavesItem;
	6360	+ private MenuItem randomleavesItem;
	6361	+ private MenuItem unrandomleavesItem;
5125	6362
5126	6363	private MenuItem flipVItem;
5127	6364	private MenuItem unflipVItem;
..	..	@@ -5133,15 +6370,17 @@
5133	6370	private MenuItem panoTexturesItem;
5134	6371
5135	6372	private MenuItem resetCentroidItem;
5136		- private MenuItem transformgeometryItem;
	6373	+ private MenuItem resetCentroidXZItem;
5137	6374	private MenuItem resetTransformItem;
	6375	+ private MenuItem transformGeometryItem;
	6376	+ private MenuItem transformChildrenItem;
5138	6377	private MenuItem hideItem;
5139		- private MenuItem grabItem;
	6378	+ private JMenuItem grabItem;
5140	6379	private MenuItem backItem;
5141	6380	private MenuItem frontItem;
5142	6381	private MenuItem cameraItem;
5143	6382	private MenuItem compositeItem;
5144		- private MenuItem randomItem;
	6383	+ private MenuItem switchItem;
5145	6384	private MenuItem physicsItem;
5146	6385	private MenuItem frameselectorItem;
5147	6386	private MenuItem scriptNodeItem;
..	..	@@ -5149,7 +6388,7 @@
5149	6388	private MenuItem switchTransfoItem;
5150	6389	private MenuItem morphItem;
5151	6390	private MenuItem linkerItem;
5152		- private MenuItem ungroupItem;
	6391	+ private JMenuItem ungroupItem;
5153	6392	private MenuItem editItem;
5154	6393	private MenuItem openWindowItem;
5155	6394	private MenuItem editLeafItem;
..	..	@@ -5165,6 +6404,8 @@
5165	6404	private MenuItem attachBumpItem;
5166	6405	private MenuItem detachBumpItem;
5167	6406	private MenuItem pigmentBumpItem;
	6407	+ private MenuItem embedTexturesItem;
	6408	+ private MenuItem deEmbedTexturesItem;
5168	6409
5169	6410	private MenuItem particleItem;
5170	6411	private MenuItem ragdollItem;
..	..	@@ -5203,11 +6444,6 @@
5203	6444	private MenuItem doubleItem;
5204	6445	private MenuItem tripleItem;
5205	6446
5206		- private MenuItem importGFDItem;
5207		- private MenuItem importVRMLX3DItem;
5208		- private MenuItem import3DSItem;
5209		- private MenuItem importOBJItem;
5210		-
5211	6447	private MenuItem computeAOItem;
5212	6448	private MenuItem recompileItem;
5213	6449	private MenuItem editScriptItem;
..	..	@@ -5217,4 +6453,8 @@
5217	6453	private MenuItem analyzeItem;
5218	6454	private MenuItem dumpItem;
5219	6455	//boolean freezemodel = false;
	6456	+
	6457	+ Menu cameraMenu;
	6458	+ MenuItem editCameraItem;
	6459	+ MenuItem restoreCameraItem;
5220	6460	}