~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,135 @@
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 totalcount = 0;
	940	+
	941	+ int tabcount = 0;
	942	+ int colcount = 0;
	943	+ int rowcount = 0;
	944	+ int texturecount = 0;
	945	+
	946	+ int columns = 5;
	947	+ int rows = 7;
	948	+
	949	+ public void ResourceCallBack(String[] path)
	950	+ {
	951	+// for (int i = 0; i < path.length; i++)
	952	+// System.out.print(path[i] + "/");
	953	+// System.out.println();
	954	+
	955	+ if (//rowcount == 0 \|\|
	956	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	957	+ {
	958	+ currenttab = new cGridBag();
	959	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	960	+ currenttab.setName(tabname);
	961	+ //added = false;
	962	+ resourcecontainer.add(currenttab);
	963	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	964	+ rowcount = 1;
	965	+ colcount = 0;
	966	+ texturecount = 0;
	967	+ }
	968	+
	969	+ if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") \|\| path[2].toLowerCase().endsWith(".png")))
	970	+ {
	971	+ //if (!added)
	972	+ {
	973	+ //added = true;
	974	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	975	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	976	+ }
	977	+
	978	+ AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
	979	+ totalcount++;
	980	+
	981	+ if (++colcount >= columns)
	982	+ {
	983	+ colcount = 0;
	984	+ currenttab.Return();
	985	+
	986	+ if (rowcount++ >= rows)
	987	+ {
	988	+ rowcount = 0;
	989	+ }
	990	+ }
	991	+ }
	992	+ else
	993	+ {
	994	+// if (!path[path.length-1].equals("icons"))
	995	+// resourcecontainer.Return();
	996	+ }
	997	+ }
	998	+
	999	+ void CreateTexturePanel(cGridBag container)
	1000	+ {
	1001	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	1002	+ container.add(resourcecontainer);
	1003	+
	1004	+ Grafreed.ParseResources("textures", this);
	1005	+
	1006	+ // 935. System.out.println("Total = " + totalcount);
	1007	+ }
	1008	+
448	1009	void SetupUI2(ObjEditor oe)
449	1010	{
	1011	+ // June 2019
	1012	+ if (oe == null)
	1013	+ {
	1014	+ //super.SetupUI2(this);
	1015	+ //return;
	1016	+ }
	1017	+
	1018	+ if (copy != group)
	1019	+ {
	1020	+ //super.SetupUI2(this);
	1021	+ }
	1022	+
450	1023	//new Exception().printStackTrace();
451	1024
452	1025	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	1026	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
459	1027
460	1028	oe.buttonGroup = new ButtonGroup();
..	..	@@ -475,97 +1043,268 @@
475	1043	oe.radioPanel.add(dummyButton);
476	1044	oe.buttonGroup.add(dummyButton);
477	1045	*/
	1046	+ cGridBag versionManagerPanel = new cGridBag();
	1047	+
	1048	+ versionManagerPanel.preferredHeight = 4;
	1049	+
478	1050	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
479	1051
480		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
481		- liveCB.setToolTipText("Enabled animation");
482		- liveCB.addItemListener(this);
	1052	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1053	+ //minButton.setToolTipText("Minimize window");
	1054	+ //minButton.addActionListener(this);
	1055	+
	1056	+ if (Globals.ADVANCED)
	1057	+ {
	1058	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1059	+// maxButton.setToolTipText("Maximize window");
	1060	+// maxButton.addActionListener(this);
	1061	+ }
	1062	+
	1063	+ cButton gcButton;
	1064	+
	1065	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1066	+// gcButton.setToolTipText("Garbage collect");
	1067	+// gcButton.addActionListener(new ActionListener()
	1068	+// {
	1069	+// public void actionPerformed(ActionEvent e)
	1070	+// {
	1071	+// System.gc();
	1072	+// }
	1073	+// });
	1074	+
	1075	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1076	+ collapseButton.setToolTipText("Collapse toolbar");
	1077	+ collapseButton.addActionListener(this);
	1078	+
	1079	+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1080	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1081	+ maximize3DButton.addActionListener(this);
	1082	+
	1083	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1084	+ twoButton.setToolTipText("Show 3D view only");
	1085	+ twoButton.addActionListener(this);
	1086	+ this.fullscreenLayout = twoButton;
	1087	+
	1088	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1089	+ threeButton.setToolTipText("Show controls and 3D view");
	1090	+ threeButton.addActionListener(this);
	1091	+ if (Globals.ADVANCED)
	1092	+ {
	1093	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1094	+ sixButton.setToolTipText("Show 3D view and controls");
	1095	+ sixButton.addActionListener(this);
	1096	+ }
	1097	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1098	+// sevenButton.setToolTipText("3-column layout");
	1099	+// sevenButton.addActionListener(this);
	1100	+ //
	1101	+
	1102	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1103	+ fullButton.setToolTipText("Full-screen window");
	1104	+ fullButton.addActionListener(this);
	1105	+
	1106	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1107	+ screenfitButton.setToolTipText("Screen fit");
	1108	+ screenfitButton.addActionListener(this);
483	1109
484		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1110	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1111	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1112	+ restoreCameraButton.addActionListener(this);
	1113	+
	1114	+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1115	+ saveVersionButton.setToolTipText("Duplicate current version");
	1116	+ saveVersionButton.addActionListener(this);
	1117	+
	1118	+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1119	+ deleteVersionButton.setToolTipText("Delete current version");
	1120	+ deleteVersionButton.addActionListener(this);
	1121	+ deleteVersionButton.setEnabled(false);
	1122	+
	1123	+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1124	+ previousVersionButton.setToolTipText("Previous version");
	1125	+ previousVersionButton.addActionListener(this);
	1126	+ previousVersionButton.setEnabled(false);
	1127	+
	1128	+ cGridBag updown = new cGridBag().setVertical(true);
	1129	+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1130	+ restoreButton.setToolTipText("Undo (restore current version)");
	1131	+ restoreButton.addActionListener(this);
	1132	+ restoreButton.setEnabled(false);
	1133	+
	1134	+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1135	+ replaceButton.setToolTipText("Save (replace current version)");
	1136	+ replaceButton.addActionListener(this);
	1137	+ replaceButton.setEnabled(false);
	1138	+
	1139	+ versionManagerPanel.add(updown);
	1140	+
	1141	+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1142	+ nextVersionButton.setToolTipText("Next version");
	1143	+ nextVersionButton.addActionListener(this);
	1144	+ nextVersionButton.setEnabled(false);
	1145	+
	1146	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
485	1147	oneStepButton.setToolTipText("Animate one step forward");
486	1148	oneStepButton.addActionListener(this);
487	1149
488		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	1150	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1151	+ liveCB.setToolTipText("Enable animation");
	1152	+ liveCB.addItemListener(this);
	1153	+
	1154	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
489	1155	fastCB.setToolTipText("Fast mode");
490	1156	fastCB.addItemListener(this);
491	1157
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);
	1158	+ //oe.toolboxPanel.Return();
	1159	+
	1160	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1161	+// trackCB.setToolTipText("Enable tracking");
	1162	+// trackCB.addItemListener(this);
499	1163
500	1164	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
501	1165	// screenfitpointButton.addActionListener(this);
502	1166
503	1167	if (Globals.ADVANCED)
504	1168	{
505		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1169	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
506	1170	snapobjectButton.addActionListener(this);
507	1171	snapobjectButton.setToolTipText("Snap Object");
	1172	+
	1173	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1174	+ fourButton.addActionListener(this);
	1175	+ fourButton.setToolTipText("Show control panel only");
508	1176	}
509	1177
510		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
511		- flashSelectionButton.setToolTipText("Show selection");
512		- flashSelectionButton.addActionListener(this);
	1178	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
513	1179
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	1180
533		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
534		- rootButton.setToolTipText("Edit selection in new tab");
	1181	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1182	+ rootButton.setToolTipText("Open selection in new tab");
535	1183	rootButton.addActionListener(this);
536	1184
537		- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1185	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
538	1186	closeButton.setToolTipText("Close tab");
539	1187	closeButton.addActionListener(this);
540	1188	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
541	1189	//clearButton.addActionListener(this);
542		-
543		- cGridBag commandsPanel = new cGridBag();
	1190	+
	1191	+ cGridBag row1 = new cGridBag();
544	1192
545		- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
546		- editButton.setToolTipText("Edit selection");
	1193	+ // INSERT
	1194	+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1195	+ gridButton.setToolTipText("Create ground");
	1196	+ gridButton.addActionListener(this);
	1197	+
	1198	+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1199	+ boxButton.setToolTipText("Create box");
	1200	+ boxButton.addActionListener(this);
	1201	+
	1202	+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1203	+ superButton.setToolTipText("Create superellipsoid");
	1204	+ superButton.addActionListener(this);
	1205	+
	1206	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1207	+ sphereButton.setToolTipText("Create sphere");
	1208	+ sphereButton.addActionListener(this);
	1209	+
	1210	+ row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1211	+ coneButton.setToolTipText("Create cone");
	1212	+ coneButton.addActionListener(this);
	1213	+
	1214	+ row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1215	+ torusButton.setToolTipText("Create torus");
	1216	+ torusButton.addActionListener(this);
	1217	+
	1218	+ if (Globals.ADVANCED)
	1219	+ {
	1220	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1221	+ kleinButton.setToolTipText("Create Klein bottle");
	1222	+ kleinButton.addActionListener(this);
	1223	+ }
	1224	+
	1225	+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1226	+ particlesButton.setToolTipText("Create particle system");
	1227	+ particlesButton.addActionListener(this);
	1228	+
	1229	+ oe.toolboxPanel.add(row1);
	1230	+
	1231	+ cGridBag row2 = new cGridBag();
	1232	+
	1233	+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1234	+ groupButton.setToolTipText("Create group");
	1235	+ groupButton.addActionListener(this);
	1236	+
	1237	+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1238	+ compositeButton.setToolTipText("Create composite");
	1239	+ compositeButton.addActionListener(this);
	1240	+
	1241	+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1242	+ switchButton.setToolTipText("Create item switcher");
	1243	+ switchButton.addActionListener(this);
	1244	+
	1245	+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1246	+ loopButton.setToolTipText("Create loop");
	1247	+ loopButton.addActionListener(this);
	1248	+
	1249	+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1250	+ textureButton.setToolTipText("Create texture");
	1251	+ textureButton.addActionListener(this);
	1252	+
	1253	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1254	+ overlayButton.setToolTipText("Create overlay");
	1255	+ overlayButton.addActionListener(this);
	1256	+
	1257	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1258	+ lightButton.setToolTipText("Create light");
	1259	+ lightButton.addActionListener(this);
	1260	+
	1261	+ oe.toolboxPanel.add(row2);
	1262	+
	1263	+ cGridBag textures = new cGridBag();
	1264	+
	1265	+ CreateTexturePanel(textures);
	1266	+
	1267	+ int tabCount = resourcecontainer.getTabCount();
	1268	+
	1269	+ if (tabCount > 0)
	1270	+ resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
	1271	+
	1272	+ oe.toolboxPanel.add(textures);
	1273	+
	1274	+ textures.preferredHeight = 100;
	1275	+
	1276	+ CreateSkyboxPanel(oe.skyboxPanel);
	1277	+
	1278	+ // EDIT panel
	1279	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1280	+ editButton.setToolTipText("Pin selection controls");
547	1281	editButton.addActionListener(this);
548	1282
549		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
550		- uneditButton.setToolTipText("Unedit selection");
	1283	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1284	+ uneditButton.setToolTipText("Unpin and remove selection controls");
551	1285	uneditButton.addActionListener(this);
552	1286
553		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
554		- allParamsButton.setToolTipText("Edit all params");
	1287	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1288	+ allParamsButton.setToolTipText("Show all controls");
555	1289	allParamsButton.addActionListener(this);
556	1290
557		- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
558		- clearPanelButton.setToolTipText("Clear edit panel");
	1291	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1292	+ clearPanelButton.setToolTipText("Clear all controls");
559	1293	clearPanelButton.addActionListener(this);
560	1294
561		- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
562		- unselectButton.setToolTipText("Unselect");
563		- unselectButton.addActionListener(this);
	1295	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1296	+ //unselectButton.setToolTipText("Unselect");
	1297	+ //unselectButton.addActionListener(this);
564	1298
565		- commandsPanel.preferredHeight = 1;
	1299	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1300	+ flashSelectionButton.setToolTipText("Highlight selection");
	1301	+ flashSelectionButton.addActionListener(this);
566	1302
567		- oe.treePanel.add(commandsPanel);
568		- oe.treePanel.Return();
	1303	+ editCommandsPanel.preferredHeight = 1;
	1304	+
	1305	+ SetPinStates(false);
	1306	+// oe.treePanel.add(commandsPanel);
	1307	+// oe.treePanel.Return();
569	1308
570	1309	// oe.aConstraints.gridx += 1;
571	1310	// oe.aConstraints.weighty = 0;
..	..	@@ -580,34 +1319,24 @@
580	1319
581	1320	cGridBag jSPPanel = new cGridBag();
582	1321
	1322	+ jSPPanel.preferredHeight = 20;
	1323	+
583	1324	JScrollPane jSP;
584	1325	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
585		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1326	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
586	1327	ResetModel();
587	1328
588	1329	oe.treePanel.add(jSPPanel);
589	1330	oe.treePanel.Return();
590	1331
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);
	1332	+ oe.treePanel.add(versionManagerPanel);
607	1333	oe.treePanel.Return();
	1334	+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1335	+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
	1336	+ versionSliderPane.preferredHeight = 3;
608	1337
609		-// mainPanel.setDividerLocation(0.5); //1.0);
610		-// mainPanel.setResizeWeight(0.5);
	1338	+// mainPanel.setDividerLocation(0.1); //1.0);
	1339	+ mainPanel.setResizeWeight(0.4);
611	1340
612	1341	//jList.addListSelectionListener(this);
613	1342	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -615,7 +1344,7 @@
615	1344	//jTree.setEditable(true);
616	1345	oe.jTree.setDragEnabled(true);
617	1346	//jTree.setPreferredSize(new Dimension(10,10));
618		- jSP.setPreferredSize(new Dimension(100,200));
	1347	+ //jSP.setPreferredSize(new Dimension(100,200));
619	1348
620	1349	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
621	1350
..	..	@@ -627,29 +1356,49 @@
627	1356	dgr.addDragGestureListener(this);
628	1357	}catch(Exception e) {}
629	1358	*/
630		- radio.layout = sevenButton;
	1359	+ radio.layout = threeButton; // sixButton;
631	1360	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
632	1361	}
633	1362
634	1363	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
635	1364	{
	1365	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1366	+ colorCB.setToolTipText("Copy color when dropped");
	1367	+ colorCB.addItemListener(this);
	1368	+
	1369	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1370	+ materialCB.setToolTipText("Copy material when dropped");
	1371	+ materialCB.addItemListener(this);
	1372	+
	1373	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1374	+ textureCB.setToolTipText("Copy texture when dropped");
	1375	+ textureCB.addItemListener(this);
	1376	+
	1377	+ panel.Return();
	1378	+
636	1379	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
637	1380	boxCB.setToolTipText("Display bounding boxes");
638	1381	boxCB.addItemListener(this);
639	1382
640	1383	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
641		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1384	+ zoomBoxCB.setToolTipText("Display only for wheel");
642	1385	zoomBoxCB.addItemListener(this);
643	1386
644		- if (Globals.ADVANCED)
	1387	+ if (true) // Globals.ADVANCED)
645	1388	{
646		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
647		- supportCB.setToolTipText("Enable rigging");
648		- supportCB.addItemListener(this);
	1389	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1390	+// supportCB.setToolTipText("Enable rigging");
	1391	+// supportCB.addItemListener(this);
	1392	+
	1393	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1394	+ freezeCB.setToolTipText("Fast moving camera");
	1395	+ freezeCB.addItemListener(this);
649	1396
650	1397	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
651	1398	// localCB.addItemListener(this);
652	1399
	1400	+ panel.Return();
	1401	+
653	1402	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
654	1403	crowdCB.setToolTipText("Used for crowds");
655	1404	crowdCB.addItemListener(this);
..	..	@@ -658,14 +1407,19 @@
658	1407	smoothCB.setToolTipText("Snapping delay");
659	1408	smoothCB.addItemListener(this);
660	1409
661		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
662		- slowCB.setToolTipText("Smooth interpolation");
663		- slowCB.addItemListener(this);
	1410	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1411	+// slowCB.setToolTipText("Smooth interpolation");
	1412	+// slowCB.addItemListener(this);
	1413	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1414	+ minshaderCB.setToolTipText("Minimal fast shader");
	1415	+ minshaderCB.addItemListener(this);
664	1416
665	1417	// constraints.gridy += 1;
666	1418	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
667	1419	// speakerMocapCB.addItemListener(this);
668	1420
	1421	+ panel.Return();
	1422	+
669	1423	if (false)
670	1424	{
671	1425	// handled in scripts
..	..	@@ -680,67 +1434,126 @@
680	1434	//constraints.gridy += 1;
681	1435	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
682	1436	smoothfocusCB.addItemListener(this);
	1437	+ panel.Return();
683	1438	}
684	1439
685	1440	//constraints.gridx += 1;
686	1441	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
687	1442	// debugCB.addItemListener(this);
688	1443
	1444	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1445	+ trackCB.setToolTipText("Enable tracking target");
	1446	+ trackCB.addItemListener(this);
	1447	+
689	1448	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1449	+ oeilCB.setToolTipText("Move camera when tracking");
690	1450	oeilCB.addItemListener(this);
691	1451
	1452	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1453	+ shadowCB.setToolTipText("When live compute shadows");
	1454	+ shadowCB.addItemListener(this);
	1455	+
	1456	+ panel.Return();
	1457	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1458	+ toggleTextureCB.setToolTipText("Load textures");
	1459	+ toggleTextureCB.addItemListener(this);
	1460	+
	1461	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1462	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1463	+ toggleSwitchCB.addItemListener(this);
	1464	+
	1465	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1466	+ autokeepCB.setToolTipText("On structure change");
	1467	+ autokeepCB.addItemListener(this);
	1468	+
	1469	+ panel.Return();
	1470	+ if (Globals.ADVANCED)
	1471	+ {
692	1472	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
693	1473	lookAtCB.setToolTipText("Look-at target");
694	1474	lookAtCB.addItemListener(this);
	1475	+ }
695	1476
696	1477	}
697	1478
698	1479	cGridBag fill = new cGridBag();
699		-
700	1480	fill.preferredHeight = 200;
	1481	+ cGridBag fill2 = new cGridBag();
	1482	+ fill2.preferredHeight = 200;
	1483	+ cGridBag fill3 = new cGridBag();
	1484	+ fill3.preferredHeight = 200;
701	1485
702	1486	panel.add(fill);
	1487	+ panel.add(fill2);
	1488	+ panel.add(fill3);
703	1489
704	1490	}
705	1491
706	1492	void EditObject(Object3D obj)
707	1493	{
	1494	+ assert(obj instanceof Composite);
	1495	+
	1496	+// if (obj.versionlist == null)
	1497	+// {
	1498	+// obj.versionlist = new Object3D[100];
	1499	+// obj.versionindex = -1;
	1500	+// }
	1501	+
708	1502	cRadio radioButton = new cRadio(obj.name);
	1503	+
	1504	+ // June 2019. Patch to avoid bug with transparency.
	1505	+ radioButton.hadMaterial = obj.material != null;
	1506	+ if (!radioButton.hadMaterial)
	1507	+ {
	1508	+ obj.material = new cMaterial();
	1509	+ }
	1510	+
709	1511	radioButton.SetObject(obj);
710		- radioButton.layout = sevenButton;
	1512	+ radioButton.layout = threeButton; // sixButton;
711	1513	radioButton.SetCamera(cameraView.renderCamera, false);
712	1514	radioButton.addActionListener(this);
713	1515	radioPanel.add(radioButton);
714	1516	buttonGroup.add(radioButton);
715	1517	radioButton.doClick();
716	1518	}
	1519	+
717	1520	void SetupViews(ObjEditor oe)
718	1521	{
	1522	+ theFrame = this;
	1523	+
719	1524	oe.SetupViews();
720	1525
	1526	+ if (Globals.DEBUG)
721	1527	System.out.println("SetupViews");
722	1528	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
723	1529	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
724	1530	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
725	1531	}
726	1532
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;
	1533	+ cToggleButton liveCB;
	1534	+ cCheckBox supportCB;
	1535	+ cCheckBox localCB;
	1536	+ cCheckBox crowdCB;
	1537	+ cCheckBox smoothCB;
	1538	+ cCheckBox minshaderCB;
	1539	+
	1540	+ cToggleButton fastCB;
	1541	+ cCheckBox slowCB;
	1542	+ cCheckBox boxCB;
	1543	+ cCheckBox zoomBoxCB;
	1544	+ cCheckBox freezeCB;
	1545	+ //cToggleButton trackCB;
	1546	+ cCheckBox trackCB;
	1547	+ cCheckBox smoothfocusCB;
738	1548	// JCheckBox speakerMocapCB;
739		- JCheckBox speakerCameraCB;
740		- JCheckBox speakerFocusCB;
741		- JCheckBox debugCB;
742		- JCheckBox oeilCB;
743		- JCheckBox lookAtCB;
	1549	+ cCheckBox speakerCameraCB;
	1550	+ cCheckBox speakerFocusCB;
	1551	+ cCheckBox debugCB;
	1552	+
	1553	+ cCheckBox oeilCB;
	1554	+ cCheckBox shadowCB;
	1555	+ cCheckBox autokeepCB;
	1556	+ cCheckBox lookAtCB;
744	1557
745	1558	// static int COLOR = 1;
746	1559	// static int MATERIAL = 2;
..	..	@@ -748,9 +1561,9 @@
748	1561
749	1562	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
750	1563
751		- JCheckBox colorCB;
752		- JCheckBox materialCB;
753		- JCheckBox textureCB;
	1564	+ cCheckBox colorCB;
	1565	+ cCheckBox materialCB;
	1566	+ cCheckBox textureCB;
754	1567
755	1568	public void itemStateChanged(ItemEvent e)
756	1569	{
..	..	@@ -778,6 +1591,7 @@
778	1591	} else if(e.getSource() == liveCB)
779	1592	{
780	1593	cameraView.ToggleLive();
	1594	+ refreshContents(false);
781	1595	}
782	1596	else if(e.getSource() == supportCB)
783	1597	{
..	..	@@ -793,6 +1607,12 @@
793	1607	{
794	1608	cameraView.ToggleInertia();
795	1609	cameraView.repaint();
	1610	+ }
	1611	+ else if(e.getSource() == minshaderCB)
	1612	+ {
	1613	+ Globals.MINSHADER ^= true;
	1614	+ cameraView.programInitialized = false;
	1615	+ cameraView.repaint();
796	1616	}
797	1617	else if(e.getSource() == localCB)
798	1618	{
..	..	@@ -842,6 +1662,18 @@
842	1662	{
843	1663	cameraView.ToggleOeil();
844	1664	}
	1665	+ else if(e.getSource() == shadowCB)
	1666	+ {
	1667	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1668	+ }
	1669	+ else if(e.getSource() == freezeCB)
	1670	+ {
	1671	+ Globals.FREEZEONMOVE ^= true;
	1672	+ }
	1673	+ else if(e.getSource() == autokeepCB)
	1674	+ {
	1675	+ Globals.REPLACEONMAKE ^= true;
	1676	+ }
845	1677	else if(e.getSource() == lookAtCB)
846	1678	{
847	1679	cameraView.ToggleLookAt();
..	..	@@ -858,7 +1690,8 @@
858	1690
859	1691	/**/
860	1692	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
861		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1693	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1694	+ TreePath path = objEditor.jTree.getSelectionPath();
862	1695	if ((path == null) \|\| (path.getPathCount() <= 1)) {
863	1696	// We can't move the root node or an empty selection
864	1697	return;
..	..	@@ -921,8 +1754,6 @@
921	1754	}
922	1755	}
923	1756
924		- String string = (String) object;
925		-
926	1757	System.out.println("Transfer = " + object + "; drop : " + target);
927	1758	// if( object instanceof java.io.File[])
928	1759	// {
..	..	@@ -930,7 +1761,11 @@
930	1761	// objEditor.DropFile((java.io.File[]) object, true);
931	1762	// return;
932	1763	// }
933		- if (string.charAt(0) == '/')
	1764	+
	1765	+ String string = object.toString();
	1766	+
	1767	+ // File path for Mac and Windows
	1768	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
934	1769	{
935	1770	// file(s)
936	1771	String[] names = string.split("\n");
..	..	@@ -957,7 +1792,7 @@
957	1792
958	1793	flashIt = false;
959	1794	CameraPane pane = (CameraPane) target;
960		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1795	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
961	1796	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
962	1797
963	1798	if (group.selection.size() == 1)
..	..	@@ -973,23 +1808,33 @@
973	1808
974	1809	assert target == objEditor.jTree;
975	1810	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1811	+ Object3D destinationLeaf;
976	1812	try {
977		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1813	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
978	1814	} catch (Exception e) {
979	1815	System.out.println("destinationPath : " + destinationPath);
980	1816	return;
981	1817	}
982	1818
983		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1819	+ for (int i=group.selection.size(); --i>=0;)
984	1820	{
	1821	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1822	+
	1823	+ // Cannot move into itself
	1824	+ if (child == destinationLeaf)
	1825	+ return;
	1826	+ }
	1827	+
	1828	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1829	+// {
985	1830	loadClipboard(true);
986	1831	objEditor.jTree.setSelectionPath(destinationPath);
987	1832	pasteInto(false, false);
988		- } else {
989		- loadClipboard(false);
990		- objEditor.jTree.setSelectionPath(destinationPath);
991		- pasteInto(false, false); // true); // ???
992		- }
	1833	+// } else {
	1834	+// loadClipboard(false);
	1835	+// objEditor.jTree.setSelectionPath(destinationPath);
	1836	+// pasteInto(false, false); // true); // ???
	1837	+// }
993	1838	}
994	1839	public void dropActionChanged(DropTargetDragEvent dtde)
995	1840	// Called if the user has modified the current drop gesture
..	..	@@ -1045,7 +1890,12 @@
1045	1890	TreePath path;
1046	1891
1047	1892	public TransferableTreePath(TreePath tp) {
1048		- path = tp;
	1893	+ Object[] objs = new Object[tp.getPathCount()];
	1894	+ for (int i=0; i<objs.length; i++)
	1895	+ {
	1896	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1897	+ }
	1898	+ path = new TreePath(objs);
1049	1899	}
1050	1900
1051	1901	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1094,22 +1944,30 @@
1094	1944	{
1095	1945	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1096	1946	//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);
	1947	+// gridItem = menu.add(new MenuItem("Grid"));
	1948	+// gridItem.addActionListener(this);
	1949	+// rectoidItem = menu.add(new MenuItem("Box"));
	1950	+// rectoidItem.addActionListener(this);
	1951	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1952	+// ellipsoidItem.addActionListener(this);
	1953	+// coneItem = menu.add(new MenuItem("Cone"));
	1954	+// coneItem.addActionListener(this);
	1955	+// torusItem = menu.add(new MenuItem("Torus"));
	1956	+// torusItem.addActionListener(this);
	1957	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1958	+// superItem.addActionListener(this);
	1959	+
	1960	+ cameraItem = menu.add(new MenuItem("Camera"));
	1961	+ cameraItem.addActionListener(this);
	1962	+
	1963	+ if (!Globals.ADVANCED)
	1964	+ {
1109	1965	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1110	1966	kleinItem.addActionListener(this);
1111		- particleItem = menu.add(new MenuItem("Particle system"));
1112		- particleItem.addActionListener(this);
	1967	+ }
	1968	+
	1969	+// particleItem = menu.add(new MenuItem("Particle system"));
	1970	+// particleItem.addActionListener(this);
1113	1971	if (Globals.ADVANCED)
1114	1972	{
1115	1973	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1135,15 +1993,15 @@
1135	1993	}
1136	1994	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1137	1995	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);
	1996	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1997	+// overlayItem.addActionListener(this);
	1998	+// lightItem = menu.add(new MenuItem("Light"));
	1999	+// lightItem.addActionListener(this);
1142	2000	menu.add("-");
1143	2001	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1144	2002	//superLoopItem.addActionListener(this);
1145		- loopItem = menu.add(new MenuItem("Loop"));
1146		- loopItem.addActionListener(this);
	2003	+// loopItem = menu.add(new MenuItem("Loop"));
	2004	+// loopItem.addActionListener(this);
1147	2005	doubleItem = menu.add(new MenuItem("Fork"));
1148	2006	doubleItem.addActionListener(this);
1149	2007	if (Globals.ADVANCED)
..	..	@@ -1159,18 +2017,23 @@
1159	2017	animationItem.addItemListener(this);
1160	2018	animationItem.setState(Globals.ANIMATION);
1161	2019
	2020	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	2021	+ archiveItem.addActionListener(this);
	2022	+
1162	2023	menu.add("-");
1163	2024	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1164	2025	parseverticesItem.addActionListener(this);
1165	2026	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1166	2027	textureFieldItem.addActionListener(this);
1167		- alignItem = menu.add(new MenuItem("Align Object"));
	2028	+ alignItem = menu.add(new MenuItem("Align Objects"));
1168	2029	alignItem.addActionListener(this);
1169	2030	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1170	2031	reduceMorphItem.addActionListener(this);
1171	2032	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1172	2033	reduce34MorphItem.addActionListener(this);
1173		-
	2034	+ menu.add("-");
	2035	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	2036	+ memoryItem.addActionListener(this);
1174	2037	menu.add(computeAOItem = new MenuItem("Compute AO"));
1175	2038	computeAOItem.addActionListener(this);
1176	2039
..	..	@@ -1179,11 +2042,9 @@
1179	2042	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1180	2043	mirrorItem.addActionListener(this);
1181	2044	menu.add("-");
1182		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1183		- memoryItem.addActionListener(this);
1184	2045	menu.add(analyzeItem = new MenuItem("Analyze"));
1185	2046	analyzeItem.addActionListener(this);
1186		- menu.add(dumpItem = new MenuItem("Dump"));
	2047	+ menu.add(dumpItem = new MenuItem("Print"));
1187	2048	dumpItem.addActionListener(this);
1188	2049	// menu.add(pathItem = new MenuItem("From-to path"));
1189	2050	// pathItem.addActionListener(this);
..	..	@@ -1324,9 +2185,38 @@
1324	2185	shadow.material = new cMaterial(obj.material);
1325	2186	shadow.material.diffuse = 0.0001f;
1326	2187	shadow.material.specular = 0.0001f;
	2188	+ shadow.material.opacity = 0.75f;
	2189	+
	2190	+ AllocProjectedVertices(shadow);
	2191	+
	2192	+ shadow.projectedVertices[1].x = 300;
1327	2193
1328	2194	makeSomething(shadow);
1329	2195	}
	2196	+
	2197	+ private void ClearUnpinned()
	2198	+ {
	2199	+ //for (Object3D obj : listUI)
	2200	+ for (int i=listUI.size(); --i>=0;)
	2201	+ {
	2202	+ Object3D obj = listUI.elementAt(i);
	2203	+ if (!obj.pinned)
	2204	+ {
	2205	+ obj.CloseUI();
	2206	+ listUI.remove(i);
	2207	+ }
	2208	+ }
	2209	+ }
	2210	+
	2211	+ private void EditElement(Object3D elem, boolean newWindow)
	2212	+ {
	2213	+ // if (!(elem instanceof Composite))
	2214	+ // newWindow = false;
	2215	+ listUI.add(elem);
	2216	+ elem.openEditWindow(this, newWindow); //, false);
	2217	+ System.out.println("edit : " + elem);
	2218	+ elem.editWindow.refreshContents(true); // ? new
	2219	+ }
1330	2220
1331	2221	/**
1332	2222	* applyExample
..	..	@@ -1530,9 +2420,9 @@
1530	2420
1531	2421	void Overwrite(int mask)
1532	2422	{
1533		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2423	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1534	2424	{
1535		- Object3D content = GrafreeD.clipboard.get(0);
	2425	+ Object3D content = Grafreed.clipboard.get(0);
1536	2426
1537	2427	if (content instanceof cGroup && ((cGroup)content).transientlink )
1538	2428	content = ((cGroup)content).get(0);
..	..	@@ -1571,7 +2461,7 @@
1571	2461	{
1572	2462	ScreenFit();
1573	2463	} else
1574		- if (source == switchItem)
	2464	+ if (source == switchViewItem)
1575	2465	{
1576	2466	cVector v1 = new cVector();
1577	2467	cVector v2 = new cVector();
..	..	@@ -1580,11 +2470,11 @@
1580	2470	objEditor.cameraView.renderCamera.setAim(v2, v1);
1581	2471	objEditor.cameraView.repaint();
1582	2472	} else
1583		- if (source == rectoidItem)
	2473	+ if (source == rectoidItem \|\| source == boxButton)
1584	2474	{
1585	2475	makeSomething(new Box());
1586	2476	} else
1587		- if (source == particleItem)
	2477	+ if (source == particleItem \|\| source == particlesButton)
1588	2478	{
1589	2479	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1590	2480	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1663,27 +2553,27 @@
1663	2553
1664	2554	makeSomething(obj);
1665	2555	} else
1666		- if (source == gridItem)
	2556	+ if (source == gridItem \|\| source == gridButton)
1667	2557	{
1668	2558	makeSomething(new Grid());
1669	2559	} else
1670		- if (source == ellipsoidItem)
	2560	+ if (source == ellipsoidItem \|\| source == sphereButton)
1671	2561	{
1672	2562	makeSomething(new Sphere());
1673	2563	} else
1674		- if (source == coneItem)
	2564	+ if (source == coneItem \|\| source == coneButton)
1675	2565	{
1676	2566	makeSomething(new Cone());
1677	2567	} else
1678		- if (source == torusItem)
	2568	+ if (source == torusItem \|\| source == torusButton)
1679	2569	{
1680	2570	makeSomething(new Torus());
1681	2571	} else
1682		- if (source == superItem)
	2572	+ if (source == superItem \|\| source == superButton)
1683	2573	{
1684	2574	makeSomething(new Superellipsoid());
1685	2575	} else
1686		- if (source == kleinItem)
	2576	+ if (source == kleinItem \|\| source == kleinButton)
1687	2577	{
1688	2578	makeSomething(new Klein());
1689	2579	} else
..	..	@@ -1703,7 +2593,7 @@
1703	2593	{
1704	2594	makeSomething(new BezierSurface());
1705	2595	} else
1706		- if (source == overlayItem)
	2596	+ if (source == overlayItem \|\| source == overlayButton)
1707	2597	{
1708	2598	/*
1709	2599	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1751,10 +2641,27 @@
1751	2641	s.setup();
1752	2642	makeSomething(s);
1753	2643	} else
1754		- if (source == lightItem)
	2644	+ if (source == lightItem \|\| source == lightButton)
1755	2645	{
1756	2646	makeSomething(new Light());
1757	2647	} else
	2648	+// if (source == skybox1Button \|\|
	2649	+// source == skybox2Button \|\|
	2650	+// source == skybox3Button \|\|
	2651	+// source == skybox4Button \|\|
	2652	+// source == skybox5Button \|\|
	2653	+// source == skybox6Button \|\|
	2654	+// source == skybox7Button \|\|
	2655	+// source == skybox11Button \|\|
	2656	+// source == skybox12Button \|\|
	2657	+// source == skybox13Button \|\|
	2658	+// source == skybox14Button \|\|
	2659	+// source == skybox15Button \|\|
	2660	+// source == skybox16Button \|\|
	2661	+// source == skybox17Button)
	2662	+// {
	2663	+// ChangeSkybox(source);
	2664	+// } else
1758	2665	if (source == csgItem)
1759	2666	{
1760	2667	group(new CSG());
..	..	@@ -1801,30 +2708,38 @@
1801	2708
1802	2709	group(g);
1803	2710	} else
1804		- if (source == loopItem)
	2711	+ if (source == loopItem \|\| source == loopButton)
1805	2712	{
	2713	+ if (!group.selection.isEmpty())
	2714	+ {
1806	2715	Composite csg = new GroupLeaf();
1807	2716	csg.count = 5;
1808		- group(csg);
1809		- Composite child = new cGroup();
	2717	+ Composite child = new cGroup("Branch");
1810	2718	csg.addChild(child);
1811	2719	child.addChild(csg);
	2720	+ group(csg);
	2721	+ }
1812	2722	} else
1813	2723	if (source == doubleItem)
1814	2724	{
1815		- Composite csg = new GroupLeaf();
	2725	+ if (!group.selection.isEmpty())
	2726	+ {
	2727	+ Composite csg = new GroupLeaf("Fork");
1816	2728	csg.count = 5;
	2729	+ Composite child = new cGroup("Branch A");
	2730	+ csg.addChild(child);
	2731	+ child.addChild(csg);
	2732	+ child = new cGroup("Branch B");
	2733	+ csg.addChild(child);
	2734	+ child.addChild(csg);
1817	2735	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);
	2736	+ }
1824	2737	} else
1825	2738	if (source == tripleItem)
1826	2739	{
1827		- Composite csg = new GroupLeaf();
	2740	+ if (!group.selection.isEmpty())
	2741	+ {
	2742	+ Composite csg = new GroupLeaf("Trident");
1828	2743	csg.count = 4;
1829	2744	group(csg);
1830	2745	Composite child = new cGroup();
..	..	@@ -1836,28 +2751,12 @@
1836	2751	child = new cGroup();
1837	2752	csg.addChild(child);
1838	2753	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");
	2754	+ }
1856	2755	} else
1857	2756	if (source == computeAOItem)
1858	2757	{
1859	2758	Globals.drawMode = CameraPane.OCCLUSION;
1860		- Globals.theRenderer.repaint();
	2759	+ cameraView.repaint();
1861	2760	} else
1862	2761	if (source == recompileItem)
1863	2762	{
..	..	@@ -1872,7 +2771,7 @@
1872	2771	if (source == invariantsItem)
1873	2772	{
1874	2773	System.out.println("Invariants:");
1875		- GrafreeD.grafreeD.universe.invariants();
	2774	+ Grafreed.grafreed.universe.invariants();
1876	2775	} else
1877	2776	if (source == memoryItem)
1878	2777	{
..	..	@@ -1891,6 +2790,65 @@
1891	2790	{
1892	2791	DumpObject();
1893	2792	} else
	2793	+ if (source == minButton)
	2794	+ {
	2795	+ Minimize();
	2796	+ } else
	2797	+ if (source == maxButton)
	2798	+ {
	2799	+ Maximize();
	2800	+ } else
	2801	+ if (source == fullButton)
	2802	+ {
	2803	+ ToggleFullScreen();
	2804	+ } else
	2805	+ if (source == collapseButton)
	2806	+ {
	2807	+ this.expandedLayout = radio.layout;
	2808	+ CollapseToolbar();
	2809	+ } else
	2810	+ if (source == maximize3DButton)
	2811	+ {
	2812	+ this.expandedLayout = radio.layout;
	2813	+ radio.layout = twoButton;
	2814	+ Show3DView();
	2815	+ CollapseToolbar();
	2816	+ } else
	2817	+ if (source == previousVersionButton)
	2818	+ {
	2819	+ // Go to previous version
	2820	+ //if (!Undo())
	2821	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2822	+ PreviousVersion();
	2823	+ } else
	2824	+ if (source == restoreButton)
	2825	+ {
	2826	+ // Restore current version
	2827	+ Restore();
	2828	+ //restoreButton.setEnabled(false);
	2829	+ } else
	2830	+ if (source == replaceButton)
	2831	+ {
	2832	+ // Overwrite current version
	2833	+ Replace();
	2834	+ //replaceButton.setEnabled(false);
	2835	+ } else
	2836	+ if (source == nextVersionButton)
	2837	+ {
	2838	+ // Go to next version
	2839	+ NextVersion();
	2840	+ } else
	2841	+ if (source == saveVersionButton)
	2842	+ {
	2843	+ // Save a new version
	2844	+ if (!Save(true))
	2845	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2846	+ } else
	2847	+ if (source == deleteVersionButton)
	2848	+ {
	2849	+ // Delete a new version
	2850	+ DeleteVersion();
	2851	+ } else
1894	2852	if (source == oneStepButton)
1895	2853	{
1896	2854	Globals.ONESTEP = true;
..	..	@@ -1898,17 +2856,14 @@
1898	2856	} else
1899	2857	if (source == screenfitButton)
1900	2858	{
1901		- //Reload(lastConverter, lastFilename, true);
1902	2859	ScreenFit();
1903	2860	} else
1904	2861	if (source == screenfitpointButton)
1905	2862	{
1906		- //Reload(lastConverter, lastFilename, true);
1907	2863	ScreenFitPoint();
1908	2864	} else
1909	2865	if (source == snapobjectButton)
1910	2866	{
1911		- //Reload(lastConverter, lastFilename, true);
1912	2867	SnapObject();
1913	2868	} else
1914	2869	// if (event.getSource() == recompileButton)
..	..	@@ -1945,12 +2900,20 @@
1945	2900	{
1946	2901	loadClipboard(true);
1947	2902	} else
	2903	+ if (source == undoItem)
	2904	+ {
	2905	+ PreviousVersion();
	2906	+ } else
	2907	+ if (source == redoItem)
	2908	+ {
	2909	+ NextVersion();
	2910	+ } else
1948	2911	if (source == duplicateItem)
1949	2912	{
1950		- Object3D keep = GrafreeD.clipboard;
	2913	+ Object3D keep = Grafreed.clipboard;
1951	2914	loadClipboard(false);
1952	2915	paste(false);
1953		- GrafreeD.clipboard = keep;
	2916	+ Grafreed.clipboard = keep;
1954	2917	} else
1955	2918	if (source == cloneItem)
1956	2919	{
..	..	@@ -2170,9 +3133,9 @@
2170	3133	// group.selection.get(0).setMasterThis(content); // should be identity
2171	3134	// refreshContents();
2172	3135	// }
2173		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	3136	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2174	3137	{
2175		- Object3D content = GrafreeD.clipboard.get(0);
	3138	+ Object3D content = Grafreed.clipboard.get(0);
2176	3139
2177	3140	if (content instanceof cGroup && ((cGroup)content).transientlink )
2178	3141	content = ((cGroup)content).get(0);
..	..	@@ -2222,9 +3185,9 @@
2222	3185	} else
2223	3186	if (source == setMasterItem)
2224	3187	{
2225		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	3188	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2226	3189	{
2227		- Object3D content = GrafreeD.clipboard.get(0);
	3190	+ Object3D content = Grafreed.clipboard.get(0);
2228	3191
2229	3192	if (content instanceof cGroup && ((cGroup)content).transientlink )
2230	3193	content = ((cGroup)content).get(0);
..	..	@@ -2237,9 +3200,9 @@
2237	3200	{
2238	3201	if (group.selection.size() == 1)
2239	3202	{
2240		- if (GrafreeD.clipboard.size() == 1)
	3203	+ if (Grafreed.clipboard.size() == 1)
2241	3204	{
2242		- Object3D content = GrafreeD.clipboard.get(0);
	3205	+ Object3D content = Grafreed.clipboard.get(0);
2243	3206
2244	3207	if (content instanceof cGroup && ((cGroup)content).transientlink )
2245	3208	content = ((cGroup)content).get(0);
..	..	@@ -2256,7 +3219,7 @@
2256	3219	{
2257	3220	RevertMeshes();
2258	3221	} else
2259		- if (source == resetMeshItem)
	3222	+ if (source == resetAllItem)
2260	3223	{
2261	3224	ResetAll();
2262	3225	} else
..	..	@@ -2264,7 +3227,7 @@
2264	3227	{
2265	3228	StepAll();
2266	3229	} else
2267		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3230	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2268	3231	{
2269	3232	//int indices[] = jList.getSelectedIndices();
2270	3233	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2276,9 +3239,9 @@
2276	3239	{
2277	3240	ClearSelection(true);
2278	3241	} else
2279		- if (source == grabItem)
	3242	+ if (source == grabItem \|\| source == groupButton)
2280	3243	{
2281		- group(new cGroup(), true);
	3244	+ group(new cGroup(), false); // true);
2282	3245	} else
2283	3246	if (source == hideItem)
2284	3247	{
..	..	@@ -2296,11 +3259,11 @@
2296	3259	{
2297	3260	makeSomething(new Camera());
2298	3261	} else
2299		- if (source == compositeItem)
	3262	+ if (source == compositeItem \|\| source == compositeButton)
2300	3263	{
2301	3264	group(new Composite());
2302	3265	} else
2303		- if (source == randomItem)
	3266	+ if (source == switchItem \|\| source == switchButton)
2304	3267	{
2305	3268	RandomNode random = new RandomNode();
2306	3269	group(random);
..	..	@@ -2402,7 +3365,7 @@
2402	3365	{
2403	3366	group(new cLinker());
2404	3367	} else
2405		- if (source == textureItem)
	3368	+ if (source == textureItem \|\| source == textureButton)
2406	3369	{
2407	3370	group(new TextureNode());
2408	3371	} else
..	..	@@ -2422,17 +3385,42 @@
2422	3385	{
2423	3386	CastShadow(2);
2424	3387	} else
2425		- if (source == ungroupItem)
	3388	+ if (source == ungroupItem \|\| source == ungroupButton)
2426	3389	{
2427		- //ungroup();
	3390	+ boolean canUngroup = true;
	3391	+
2428	3392	for (int i=0; i<group.selection.size(); i++)
2429	3393	{
2430		- Ungroup(group.selection.get(i));
	3394	+ Object3D selectedItem = group.selection.get(i);
	3395	+
	3396	+ if (selectedItem.Size() == 0)
	3397	+ {
	3398	+ // Cannot ungroup leaves
	3399	+ canUngroup = false;
	3400	+ break;
	3401	+ }
	3402	+
	3403	+ if (selectedItem == group)
	3404	+ {
	3405	+ // Cannot ungroup root
	3406	+ canUngroup = false;
	3407	+ break;
	3408	+ }
2431	3409	}
2432	3410
2433		- ClearSelection(false);
2434		-
2435		- refreshContents();
	3411	+ if (canUngroup)
	3412	+ {
	3413	+ for (int i=0; i<group.selection.size(); i++)
	3414	+ {
	3415	+ Object3D selectedItem = group.selection.get(i);
	3416	+
	3417	+ Ungroup(selectedItem);
	3418	+ }
	3419	+
	3420	+ ClearSelection(false);
	3421	+
	3422	+ refreshContents();
	3423	+ }
2436	3424	} else
2437	3425	if (source == genUVItem)
2438	3426	{
..	..	@@ -2444,7 +3432,7 @@
2444	3432	} else
2445	3433	if (source == genNormalsMESHItem)
2446	3434	{
2447		- GenNormals(true); // TODO
	3435	+ GenNormalsMESH();
2448	3436	} else
2449	3437	if (source == genNormalsORGANItem)
2450	3438	{
..	..	@@ -2509,6 +3497,22 @@
2509	3497	if (source == unmarkleavesItem)
2510	3498	{
2511	3499	MarkLeaves(false);
	3500	+ } else
	3501	+ if (source == rewindleavesItem)
	3502	+ {
	3503	+ RewindLeaves(true);
	3504	+ } else
	3505	+ if (source == unrewindleavesItem)
	3506	+ {
	3507	+ RewindLeaves(false);
	3508	+ } else
	3509	+ if (source == randomleavesItem)
	3510	+ {
	3511	+ RandomLeaves(true);
	3512	+ } else
	3513	+ if (source == unrandomleavesItem)
	3514	+ {
	3515	+ RandomLeaves(false);
2512	3516	} else
2513	3517	if (source == flipVItem)
2514	3518	{
..	..	@@ -2594,9 +3598,13 @@
2594	3598	{
2595	3599	SmoothMesh();
2596	3600	} else
2597		- if (source == transformgeometryItem)
	3601	+ if (source == transformGeometryItem)
2598	3602	{
2599	3603	TransformGeometry();
	3604	+ } else
	3605	+ if (source == transformChildrenItem)
	3606	+ {
	3607	+ TransformChildren();
2600	3608	} else
2601	3609	if (source == resetTransformItem)
2602	3610	{
..	..	@@ -2604,7 +3612,11 @@
2604	3612	} else
2605	3613	if (source == resetCentroidItem)
2606	3614	{
2607		- ResetCentroid();
	3615	+ ResetCentroid(true);
	3616	+ } else
	3617	+ if (source == resetCentroidXZItem)
	3618	+ {
	3619	+ ResetCentroid(false);
2608	3620	} else
2609	3621	if (source == resetParentItem)
2610	3622	{
..	..	@@ -2709,7 +3721,7 @@
2709	3721	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2710	3722	{
2711	3723	obj = (Object3D)e.nextElement();
2712		- obj.SetBumpTexture(null);
	3724	+ obj.ResetBumpTexture();
2713	3725	}
2714	3726
2715	3727	refreshContents();
..	..	@@ -2725,6 +3737,31 @@
2725	3737
2726	3738	refreshContents();
2727	3739	} else
	3740	+ if (source == embedTexturesItem)
	3741	+ {
	3742	+ Object3D obj;
	3743	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3744	+ {
	3745	+ obj = (Object3D)e.nextElement();
	3746	+ obj.EmbedTextures(true);
	3747	+ }
	3748	+
	3749	+ refreshContents();
	3750	+ } else
	3751	+ if (source == deEmbedTexturesItem)
	3752	+ {
	3753	+ Object3D obj;
	3754	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3755	+ {
	3756	+ obj = (Object3D)e.nextElement();
	3757	+ obj.EmbedTextures(false);
	3758	+ }
	3759	+
	3760	+ CameraPane.texturepigment.clear();
	3761	+ CameraPane.texturebump.clear();
	3762	+
	3763	+ refreshContents();
	3764	+ } else
2728	3765	if (source == flashSelectionButton)
2729	3766	{
2730	3767	CameraPane.flash = true;
..	..	@@ -2736,42 +3773,36 @@
2736	3773	if (source == twoButton)
2737	3774	{
2738	3775	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();
	3776	+
	3777	+ if (CameraPane.FULLSCREEN)
	3778	+ fullscreenLayout = radio.layout;
	3779	+
	3780	+ Show3DView();
	3781	+
	3782	+ cameraView.requestFocusInWindow();
	3783	+
	3784	+// refreshContents(true);
	3785	+//
	3786	+// try
	3787	+// {
	3788	+// java.awt.Robot bot = new java.awt.Robot();
	3789	+// int mask = InputEvent.BUTTON1_MASK;
	3790	+// bot.mouseMove(100, 100);
	3791	+// bot.mousePress(mask);
	3792	+// bot.mouseRelease(mask);
	3793	+// }
	3794	+// catch (Exception e)
	3795	+// {
	3796	+//
	3797	+// }
	3798	+
2771	3799	} else
2772	3800	if (source == threeButton)
2773	3801	{
2774	3802	radio.layout = threeButton;
	3803	+
	3804	+ if (CameraPane.FULLSCREEN)
	3805	+ fullscreenLayout = radio.layout;
2775	3806
2776	3807	// bigThree.remove(scenePanel);
2777	3808	// bigThree.remove(centralPanel);
..	..	@@ -2801,13 +3832,18 @@
2801	3832	// centralPanel.setVisible(true);
2802	3833	// XYZPanel.setVisible(true);
2803	3834	bigThree.ClearUI();
	3835	+ bigThree.add(scenePanel);
2804	3836	bigThree.add(centralPanel);
2805		- bigThree.add(XYZPanel);
2806	3837	bigThree.FlushUI();
	3838	+
	3839	+ cameraView.requestFocusInWindow();
2807	3840	} else
2808	3841	if (source == fourButton)
2809	3842	{
2810	3843	radio.layout = fourButton;
	3844	+
	3845	+ if (CameraPane.FULLSCREEN)
	3846	+ fullscreenLayout = radio.layout;
2811	3847
2812	3848	// bigThree.remove(scenePanel);
2813	3849	// bigThree.remove(centralPanel);
..	..	@@ -2839,10 +3875,15 @@
2839	3875	bigThree.ClearUI();
2840	3876	bigThree.add(scenePanel);
2841	3877	bigThree.FlushUI();
	3878	+
	3879	+ cameraView.requestFocusInWindow();
2842	3880	} else
2843	3881	if (source == sixButton)
2844	3882	{
2845	3883	radio.layout = sixButton;
	3884	+
	3885	+ if (CameraPane.FULLSCREEN)
	3886	+ fullscreenLayout = radio.layout;
2846	3887
2847	3888	// bigThree.remove(scenePanel);
2848	3889	// bigThree.remove(centralPanel);
..	..	@@ -2872,13 +3913,18 @@
2872	3913	// centralPanel.setVisible(true);
2873	3914	// XYZPanel.setVisible(false);
2874	3915	bigThree.ClearUI();
2875		- bigThree.add(scenePanel);
2876	3916	bigThree.add(centralPanel);
	3917	+ bigThree.add(scenePanel);
2877	3918	bigThree.FlushUI();
	3919	+
	3920	+ cameraView.requestFocusInWindow();
2878	3921	} else
2879	3922	if (source == sevenButton)
2880	3923	{
2881	3924	radio.layout = sevenButton;
	3925	+
	3926	+ if (CameraPane.FULLSCREEN)
	3927	+ fullscreenLayout = radio.layout;
2882	3928
2883	3929	// bigThree.remove(scenePanel);
2884	3930	// bigThree.remove(centralPanel);
..	..	@@ -2912,9 +3958,12 @@
2912	3958	bigThree.add(centralPanel);
2913	3959	bigThree.add(XYZPanel);
2914	3960	bigThree.FlushUI();
	3961	+
	3962	+ cameraView.requestFocusInWindow();
2915	3963	} else
2916	3964	if (source == rootButton)
2917	3965	{
	3966	+ Replace();
2918	3967	Object3D obj;
2919	3968	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2920	3969	{
..	..	@@ -2923,31 +3972,49 @@
2923	3972	EditObject(obj);
2924	3973	}
2925	3974
	3975	+ cameraView.requestFocusInWindow();
2926	3976	refreshContents(true);
2927	3977	} else
2928	3978	if (source == closeButton)
2929	3979	{
2930	3980	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	3981	+ Replace();
	3982	+
2931	3983	cRadio ab;
2932	3984	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2933	3985	{
2934	3986	ab = (cRadio)e.nextElement();
2935		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3987	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2936	3988	{
	3989	+ // Patch to avoid bug with transparency.
	3990	+ if (!ab.hadMaterial)
	3991	+ {
	3992	+ ab.object.material = null;
	3993	+ }
	3994	+
2937	3995	buttonGroup.remove(ab);
2938	3996	radioPanel.remove(ab);
2939	3997
2940		- ab.GetObject().editWindow = null;
	3998	+ //ab.GetObject().editWindow = null;
	3999	+ ab.GetObject().manipWindow = null;
2941	4000	// ab.GetObject().objectUI = null; // ?????????
2942	4001
2943	4002	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2944	4003	break;
2945	4004	}
2946	4005	}
	4006	+
	4007	+ cameraView.requestFocusInWindow();
2947	4008	refreshContents(true);
2948	4009	} else
2949	4010	if (source == editItem \|\| source == editButton)
2950	4011	{
	4012	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4013	+ {
	4014	+ Object3D child = (Object3D)e.nextElement();
	4015	+ child.pinned = true;
	4016	+ }
	4017	+
2951	4018	EditSelection(false);
2952	4019	} else
2953	4020	if (source == uneditButton)
..	..	@@ -2956,11 +4023,12 @@
2956	4023	{
2957	4024	Object3D child = (Object3D)e.nextElement();
2958	4025	if(child.editWindow != null)
2959		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4026	+ child.pinned = false;
2960	4027	child.CloseUI();
2961	4028	listUI.remove(child);
	4029	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2962	4030
2963		- child.editWindow = null; // ???????????
	4031	+ //child.editWindow = null; // ???????????
2964	4032	}
2965	4033	objEditor.ctrlPanel.FlushUI();
2966	4034	//objEditor.jTree.clearSelection();
..	..	@@ -2973,16 +4041,18 @@
2973	4041	//copy.ClearUI();
2974	4042	for (Object3D obj : listUI)
2975	4043	{
	4044	+ obj.pinned = false;
2976	4045	obj.CloseUI();
2977	4046	}
2978	4047	listUI.clear();
	4048	+ SetPinStates(group.selection.size() > 0);
2979	4049	refreshContents(true);
2980	4050	} else
2981	4051	if (source == allParamsButton)
2982	4052	{
2983	4053	assert(copy == group);
2984	4054
2985		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4055	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2986	4056
2987	4057	for (Object3D obj : listUI)
2988	4058	{
..	..	@@ -3008,6 +4078,8 @@
3008	4078	} else
3009	4079	if(source instanceof cRadio)
3010	4080	{
	4081	+ Replace();
	4082	+
3011	4083	group.parent = keepparent;
3012	4084	group.attributes = 0;
3013	4085	//group.editWindow = null;
..	..	@@ -3031,6 +4103,7 @@
3031	4103	}
3032	4104
3033	4105	copy = group;
	4106	+
3034	4107	//Globals.theRenderer.object = group;
3035	4108	if(!useclient)
3036	4109	{
..	..	@@ -3046,20 +4119,72 @@
3046	4119	frontView.object = group;
3047	4120	sideView.object = group;
3048	4121	}
3049		- group.editWindow = this;
	4122	+
	4123	+// fix "+" issue
	4124	+ //group.editWindow = this;
	4125	+ group.manipWindow = this;
	4126	+
3050	4127	/*
3051	4128	currentLayout = radio.layout;
3052	4129	if (currentLayout == null)
3053	4130	currentLayout = sevenButton;
3054	4131	*/
3055	4132	radio.layout.doClick();
	4133	+
	4134	+ assert(copy instanceof Composite);
	4135	+
	4136	+ if (copy.versionlist == null)
	4137	+ {
	4138	+ copy.versionindex = -1;
	4139	+
	4140	+ // Cannot work with loops
	4141	+ // To fix this issue, we first mark all nodes above the root,
	4142	+ // and check if any of these nodes are reachable below the root.
	4143	+ Grafreed.grafreed.universe.TagObjects(copy, true);
	4144	+
	4145	+ if (!copy.HasTags())
	4146	+ {
	4147	+ copy.versionlist = new Object3D[100];
	4148	+
	4149	+ Save(true);
	4150	+ }
	4151	+
	4152	+ Grafreed.grafreed.universe.TagObjects(copy, false);
	4153	+ }
	4154	+
	4155	+ SetVersionStates();
	4156	+
	4157	+ ClearUnpinned();
	4158	+
	4159	+ //Grafreed.Assert(group != null);
	4160	+ //Grafreed.Assert(group.selection != null);
	4161	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4162	+ if (group.selection == null \|\| group.selection.size() == 1)
	4163	+ EditSelection(false);
3056	4164	keepparent = group.parent;
3057	4165	// PARENT = NULL or not???
3058	4166	//group.parent = null; // ROOT
3059	4167	//group.attributes = -1;
3060	4168	ResetModel();
	4169	+
	4170	+ cameraView.requestFocusInWindow();
3061	4171	refreshContents(true);
3062		- }
	4172	+ } else if (event.getSource() == editCameraItem)
	4173	+ {
	4174	+ cameraView.ProtectCamera();
	4175	+ cameraView.requestFocusInWindow();
	4176	+ cameraView.repaint();
	4177	+ return;
	4178	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	4179	+ {
	4180	+ cameraView.RevertCamera();
	4181	+ cameraView.requestFocusInWindow();
	4182	+ cameraView.repaint();
	4183	+ return;
	4184	+ // } else if (event.getSource() == textureButton)
	4185	+ // {
	4186	+ // return; // true;
	4187	+ }
3063	4188	else
3064	4189	{
3065	4190	//return super.action(event, arg);
..	..	@@ -3068,7 +4193,6 @@
3068	4193	}
3069	4194
3070	4195	boolean useclient = false;
3071		- cRadio radio;
3072	4196
3073	4197	void ToggleRoot()
3074	4198	{
..	..	@@ -3120,6 +4244,28 @@
3120	4244	refreshContents();
3121	4245	}
3122	4246
	4247	+ void TransformChildren()
	4248	+ {
	4249	+ Object3D obj;
	4250	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4251	+ {
	4252	+ obj = (Object3D)e.nextElement();
	4253	+ obj.KeepTextureMatrices();
	4254	+ obj.TransformChildren();
	4255	+ obj.RestoreTextureMatrices();
	4256	+
	4257	+// if (obj.parent == null)
	4258	+// {
	4259	+// System.out.println("NULL PARENT!");
	4260	+// new Exception().printStackTrace();
	4261	+// }
	4262	+// else
	4263	+// TouchTransform(obj);
	4264	+// //obj.parent.Touch();
	4265	+ }
	4266	+
	4267	+ refreshContents();
	4268	+ }
3123	4269
3124	4270	void ResetTransform()
3125	4271	{
..	..	@@ -3151,7 +4297,7 @@
3151	4297	TouchTransform(obj);
3152	4298	continue;
3153	4299	}
3154		- if ((mask&2) != 0) // Scale
	4300	+ if ((mask&2) != 0) // Scale/rotation
3155	4301	{
3156	4302	obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
3157	4303	obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
..	..	@@ -3159,10 +4305,6 @@
3159	4305	obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
3160	4306	obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
3161	4307	obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
3162		- }
3163		- if ((mask&4) != 0) // Rotation
3164		- {
3165		- // ?
3166	4308	}
3167	4309	if ((mask&1) != 0) // Translation
3168	4310	{
..	..	@@ -3232,7 +4374,7 @@
3232	4374	refreshContents();
3233	4375	}
3234	4376
3235		- void ResetCentroid()
	4377	+ void ResetCentroid(boolean full)
3236	4378	{
3237	4379	Object3D obj;
3238	4380	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3247,12 +4389,16 @@
3247	4389	LA.matIdentity(Object3D.mat);
3248	4390	obj.getBounds(minima, maxima, false);
3249	4391	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3250		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	4392	+ if (full)
	4393	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3251	4394	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3252	4395	obj.TransformMesh(Object3D.mat);
	4396	+
3253	4397	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3254		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	4398	+ if (full)
	4399	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3255	4400	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	4401	+
3256	4402	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3257	4403	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3258	4404	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3281,7 +4427,8 @@
3281	4427
3282	4428	int size = obj.MemorySize();
3283	4429
3284		- System.err.println((size/1024) + " KB is the size of " + obj);
	4430	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4431	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3285	4432	}
3286	4433	}
3287	4434	catch (Exception e)
..	..	@@ -3318,9 +4465,9 @@
3318	4465	obj = (Object3D)e.nextElement();
3319	4466
3320	4467	System.out.println("Object is: " + obj);
3321		- GrafreeD.AnalyzeObject(obj);
	4468	+ Grafreed.AnalyzeObject(obj);
3322	4469	System.out.println("Boundary rep: " + obj.bRep);
3323		- GrafreeD.AnalyzeObject(obj.bRep);
	4470	+ Grafreed.AnalyzeObject(obj.bRep);
3324	4471
3325	4472	// System.err.println((size/1024) + " KB is the size of " + obj);
3326	4473	}
..	..	@@ -3362,6 +4509,13 @@
3362	4509	void GenNormals(boolean crease)
3363	4510	{
3364	4511	group.GenNormalsS(crease);
	4512	+
	4513	+ refreshContents();
	4514	+ }
	4515	+
	4516	+ void GenNormalsMESH()
	4517	+ {
	4518	+ group.GenNormalsMeshS();
3365	4519
3366	4520	refreshContents();
3367	4521	}
..	..	@@ -3534,8 +4688,8 @@
3534	4688
3535	4689	void ParseVertices()
3536	4690	{
3537		- boolean epsequal = GrafreeD.epsequal;
3538		- GrafreeD.epsequal = true;
	4691	+ boolean epsequal = Grafreed.epsequal;
	4692	+ Grafreed.epsequal = true;
3539	4693
3540	4694	for (int i=0; i<group.selection.size(); i++)
3541	4695	{
..	..	@@ -3560,7 +4714,7 @@
3560	4714	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3561	4715	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3562	4716
3563		- g.add(GrafreeD.clipboard);
	4717	+ g.add(Grafreed.clipboard);
3564	4718
3565	4719	buffer.add(g);
3566	4720	}
..	..	@@ -3575,7 +4729,7 @@
3575	4729	makeSomething(buffer, i==group.selection.size()-1);
3576	4730	}
3577	4731
3578		- GrafreeD.epsequal = epsequal;
	4732	+ Grafreed.epsequal = epsequal;
3579	4733
3580	4734	refreshContents();
3581	4735	}
..	..	@@ -3593,7 +4747,16 @@
3593	4747	String pigment = Object3D.GetPigment(tex);
3594	4748	//String bump = Object3D.GetBump(tex);
3595	4749
3596		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4750	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4751	+
	4752	+ try
	4753	+ {
	4754	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
	4755	+ }
	4756	+ catch (Exception e)
	4757	+ {
	4758	+ System.err.println("FAIL: " + node);
	4759	+ }
3597	4760
3598	4761	double s = v.s;
3599	4762
..	..	@@ -3725,7 +4888,7 @@
3725	4888	return;
3726	4889
3727	4890	Object3D poses = group.selection.get(0);
3728		- Object3D ref = GrafreeD.clipboard.get(0);
	4891	+ Object3D ref = Grafreed.clipboard.get(0);
3729	4892
3730	4893	Object3D newgroup = new Object3D("Po:" + poses.name);
3731	4894
..	..	@@ -3919,9 +5082,9 @@
3919	5082
3920	5083	void ClipMesh()
3921	5084	{
3922		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	5085	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3923	5086	{
3924		- Object3D content = GrafreeD.clipboard.get(0);
	5087	+ Object3D content = Grafreed.clipboard.get(0);
3925	5088
3926	5089	if (content instanceof cGroup && ((cGroup)content).transientlink )
3927	5090	content = ((cGroup)content).get(0);
..	..	@@ -3930,7 +5093,7 @@
3930	5093	// {
3931	5094	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3932	5095	// }
3933		- group.selection.ClipMesh(GrafreeD.clipboard);
	5096	+ group.selection.ClipMesh(Grafreed.clipboard);
3934	5097	}
3935	5098	// group.selection.ClipMesh(GrafreeD.clipboard);
3936	5099	System.out.println("DONE.");
..	..	@@ -3977,6 +5140,18 @@
3977	5140	void MarkLeaves(boolean hide)
3978	5141	{
3979	5142	group.selection.MarkLeaves(hide);
	5143	+ refreshContents();
	5144	+ }
	5145	+
	5146	+ void RewindLeaves(boolean hide)
	5147	+ {
	5148	+ group.selection.RewindLeaves(hide);
	5149	+ refreshContents();
	5150	+ }
	5151	+
	5152	+ void RandomLeaves(boolean hide)
	5153	+ {
	5154	+ group.selection.RandomLeaves(hide);
3980	5155	refreshContents();
3981	5156	}
3982	5157
..	..	@@ -4051,28 +5226,25 @@
4051	5226	// }
4052	5227	// }
4053	5228
4054		- static boolean allparams = true;
4055		-
4056		- static Vector<Object3D> listUI = new Vector<Object3D>();
4057		-
4058	5229	void EditSelection(boolean newWindow)
4059	5230	{
	5231	+ if (group.selection == null)
	5232	+ {
	5233	+ EditElement(group, newWindow); // ? new
	5234	+ return;
	5235	+ }
	5236	+
4060	5237	// aConstraints.gridy = 0;
4061	5238	for (int i=0; i<group.selection.size(); i++)
4062	5239	{
4063	5240	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4064	5241	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4065		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5242	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4066	5243
4067	5244	Object3D elem = (Object3D)group.selection.elementAt(i);
4068		- if(elem != group)
	5245	+ if(elem != group \|\| !newWindow)
4069	5246	{
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
	5247	+ EditElement(elem, newWindow); // ? new
4076	5248	}
4077	5249	}
4078	5250	}
..	..	@@ -4135,9 +5307,7 @@
4135	5307
4136	5308	freezemodel = false;
4137	5309	}
4138		-
4139		- boolean flashIt = true;
4140		-
	5310	+
4141	5311	public void valueChanged(TreeSelectionEvent e)
4142	5312	//public boolean handleEvent(Event event)
4143	5313	{
..	..	@@ -4147,7 +5317,8 @@
4147	5317	//new Exception().printStackTrace();
4148	5318
4149	5319	freezemodel = true;
4150		-
	5320	+ ClearUnpinned();
	5321	+
4151	5322	/**/
4152	5323	//switch (event.id)
4153	5324	{
..	..	@@ -4155,7 +5326,6 @@
4155	5326	//case 702: // Event.LIST_DESELECT
4156	5327	group.deselectAll();
4157	5328	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4158		- objEditor.ClearInfo(); // .GetMaterial());
4159	5329	if (tps != null)
4160	5330	{
4161	5331	for (int i=0; i < tps.length; i++)
..	..	@@ -4164,10 +5334,8 @@
4164	5334
4165	5335	//if (child.parent != null)
4166	5336	//child.parent.addSelectee(child);
	5337	+ objEditor.SetMaterial(child);
4167	5338	group.addSelectee(child);
4168		- objEditor.SetMaterial(child); // .GetMaterial());
4169		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4170		- System.err.println("info : " + child.GetPath());
4171	5339	}
4172	5340	}
4173	5341	// else
..	..	@@ -4177,20 +5345,28 @@
4177	5345	// System.err.println("info : " + group.GetPath());
4178	5346	// }
4179	5347
4180		- objEditor.SetText(); // jan 2014
4181		-
4182		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	5348	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4183	5349	CameraPane.flash = true;
4184	5350
4185		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5351	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4186	5352	// a camera
4187	5353	{
4188		- CameraPane.camerachangeframe = 0; // don't refuse it
4189		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5354	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5355	+ {
	5356	+ CameraPane.camerachangeframe = 0; // don't refuse it
	5357	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5358	+ }
4190	5359	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4191	5360	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4192	5361	}
4193	5362
	5363	+ if (tps != null && tps.length == 1)
	5364	+ {
	5365	+ EditSelection(false);
	5366	+ }
	5367	+
	5368	+ SetPinStates(tps != null && tps.length > 0);
	5369	+
4194	5370	refreshContents();
4195	5371	//return true;
4196	5372	}
..	..	@@ -4199,6 +5375,53 @@
4199	5375
4200	5376	freezemodel = false;
4201	5377	}
	5378	+
	5379	+ void SetPinStates(boolean enabled)
	5380	+ {
	5381	+ editButton.setEnabled(enabled);
	5382	+ uneditButton.setEnabled(enabled);
	5383	+ //unselectButton.setEnabled(enabled);
	5384	+ flashSelectionButton.setEnabled(enabled);
	5385	+
	5386	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5387	+
	5388	+ boolean allComposites = true;
	5389	+
	5390	+ if (group.selection != null)
	5391	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5392	+ {
	5393	+ Object next = e.nextElement();
	5394	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5395	+ {
	5396	+ allComposites = false;
	5397	+ break;
	5398	+ }
	5399	+ }
	5400	+
	5401	+ rootButton.setEnabled(allComposites);
	5402	+ }
	5403	+
	5404	+ void refreshContents(boolean cp)
	5405	+ {
	5406	+ if (Globals.ADVANCED)
	5407	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5408	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5409	+ {
	5410	+ objEditor.ClearInfo(); // .GetMaterial());
	5411	+
	5412	+ for (int i=0; i < group.selection.Size(); i++)
	5413	+ {
	5414	+ Object3D child = (Object3D) group.selection.get(i);
	5415	+
	5416	+ objEditor.AddInfo(child, this, true);
	5417	+// System.err.println("info : " + child.GetPath());
	5418	+ }
	5419	+
	5420	+ objEditor.SetText(); // jan 2014
	5421	+ }
	5422	+
	5423	+ super.refreshContents(cp);
	5424	+ }
4202	5425
4203	5426	void linkSomething(Object3D thing)
4204	5427	{
..	..	@@ -4270,16 +5493,19 @@
4270	5493	{
4271	5494	if (group.selection.isEmpty())
4272	5495	return;
4273		- GrafreeD.clipboardIsTempGroup = false;
	5496	+
	5497	+ Grafreed.clipboardIsTempGroup = false;
4274	5498	Composite tGroup = null;
4275	5499	if (group.selection.size() > 0) // 1)
4276	5500	{
4277	5501	tGroup = new cGroup();
4278		- GrafreeD.clipboardIsTempGroup = true;
	5502	+ Grafreed.clipboardIsTempGroup = true;
4279	5503	}
4280	5504
4281	5505	if (cut)
4282	5506	{
	5507	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5508	+// Save();
4283	5509	//int indices[] = jList.getSelectedIndices();
4284	5510	//for (int i = indices.length - 1; i >= 0; i--)
4285	5511	//jList.remove(indices[i]);
..	..	@@ -4315,16 +5541,16 @@
4315	5541	//System.out.println("cut " + child);
4316	5542	//System.out.println("parent = " + child.parent);
4317	5543	// tmp.addChild(child);
4318		- if (GrafreeD.clipboardIsTempGroup)
	5544	+ if (Grafreed.clipboardIsTempGroup)
4319	5545	tGroup.add/Child/(tmp);
4320	5546	else
4321		- GrafreeD.clipboard = tmp;
	5547	+ Grafreed.clipboard = tmp;
4322	5548	}
4323	5549	else
4324		- if (GrafreeD.clipboardIsTempGroup)
	5550	+ if (Grafreed.clipboardIsTempGroup)
4325	5551	tGroup.add/Child/(child);
4326	5552	else
4327		- GrafreeD.clipboard = child;
	5553	+ Grafreed.clipboard = child;
4328	5554	}
4329	5555
4330	5556	//ResetModel();
..	..	@@ -4356,21 +5582,23 @@
4356	5582	//System.out.println("cut " + elem);
4357	5583	//System.out.println("parent = " + elem.parent);
4358	5584	// tmp.addChild(elem);
4359		- if (GrafreeD.clipboardIsTempGroup)
	5585	+ if (Grafreed.clipboardIsTempGroup)
4360	5586	tGroup.add/Child/(tmp);
4361	5587	else
4362		- GrafreeD.clipboard = tmp;
	5588	+ Grafreed.clipboard = tmp;
4363	5589	}
4364	5590	else
4365		- if (GrafreeD.clipboardIsTempGroup)
	5591	+ if (Grafreed.clipboardIsTempGroup)
4366	5592	tGroup.add/Child/(child);
4367	5593	else
4368		- GrafreeD.clipboard = child;
	5594	+ Grafreed.clipboard = child;
4369	5595	}
4370	5596
4371	5597	}
4372		- if (GrafreeD.clipboardIsTempGroup)
4373		- GrafreeD.clipboard = tGroup;
	5598	+
	5599	+ if (Grafreed.clipboardIsTempGroup)
	5600	+ Grafreed.clipboard = tGroup;
	5601	+
4374	5602	if (cut)
4375	5603	{
4376	5604	ResetModel();
..	..	@@ -4380,11 +5608,15 @@
4380	5608
4381	5609	void paste(boolean expand)
4382	5610	{
	5611	+ if (Globals.REPLACEONMAKE)
	5612	+ Save();
	5613	+ boolean keep = Globals.REPLACEONMAKE;
	5614	+ Globals.REPLACEONMAKE = false;
4383	5615	// if (GrafreeD.clipboard == null)
4384	5616	// return;
4385	5617	boolean first = true;
4386	5618
4387		- if (GrafreeD.clipboardIsTempGroup)
	5619	+ if (Grafreed.clipboardIsTempGroup)
4388	5620	{
4389	5621	Composite temp;
4390	5622
..	..	@@ -4395,7 +5627,7 @@
4395	5627	temp = (Composite)Applet3D.clipboard.deepCopy();
4396	5628	*/
4397	5629	Object3D elem;
4398		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5630	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4399	5631	{
4400	5632	Object3D child = (Object3D)e.nextElement();
4401	5633
..	..	@@ -4429,16 +5661,17 @@
4429	5661	//Object3D cb = Applet3D.clipboard;
4430	5662	//temp.addChild(cb);
4431	5663	//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());
	5664	+ assert(Grafreed.clipboard.parent == null);
	5665	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5666	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5667	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5668	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4437	5669	else
4438		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4439		- GrafreeD.clipboard.get(0).parent = keepparent;
	5670	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5671	+ Grafreed.clipboard.get(0).parent = keepparent;
4440	5672	}
4441	5673
	5674	+ Globals.REPLACEONMAKE = keep;
4442	5675	ResetModel();
4443	5676	refreshContents();
4444	5677	}
..	..	@@ -4485,9 +5718,9 @@
4485	5718	{
4486	5719	boolean first = true;
4487	5720
4488		- if (GrafreeD.clipboardIsTempGroup)
	5721	+ if (Grafreed.clipboardIsTempGroup)
4489	5722	{
4490		- Composite temp = (Composite)GrafreeD.clipboard;
	5723	+ Composite temp = (Composite)Grafreed.clipboard;
4491	5724	Object3D copy;
4492	5725	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4493	5726	{
..	..	@@ -4497,7 +5730,7 @@
4497	5730	}
4498	5731	} else
4499	5732	{
4500		- linkSomething(GrafreeD.clipboard); //.get(0));
	5733	+ linkSomething(Grafreed.clipboard); //.get(0));
4501	5734	}
4502	5735	}
4503	5736	}
..	..	@@ -4574,6 +5807,10 @@
4574	5807
4575	5808	void group(Object3D csg, boolean grab)
4576	5809	{
	5810	+ if (Globals.REPLACEONMAKE)
	5811	+ Save();
	5812	+ boolean keep = Globals.REPLACEONMAKE;
	5813	+ Globals.REPLACEONMAKE = false;
4577	5814	if (//false) // why??
4578	5815	!group.selection.isEmpty())
4579	5816	{
..	..	@@ -4687,10 +5924,15 @@
4687	5924	//node.add(csg);
4688	5925	//makeSomething(node);
4689	5926	makeSomething(csg);
	5927	+ Globals.REPLACEONMAKE = keep;
4690	5928	}
4691	5929
4692	5930	void Ungroup(Object3D g)
4693	5931	{
	5932	+ if (Globals.REPLACEONMAKE)
	5933	+ Save();
	5934	+ boolean keep = Globals.REPLACEONMAKE;
	5935	+ Globals.REPLACEONMAKE = false;
4694	5936	if (g instanceof HiddenObject)
4695	5937	{
4696	5938	HiddenObject h = (HiddenObject) g;
..	..	@@ -4707,6 +5949,7 @@
4707	5949	objEditor.makeSomething(g.get(i), false);
4708	5950	}
4709	5951	}
	5952	+ Globals.REPLACEONMAKE = keep;
4710	5953	}
4711	5954
4712	5955	void ungroup()
..	..	@@ -4902,21 +6145,6 @@
4902	6145	}
4903	6146	*/
4904	6147
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	6148	/*
4921	6149	public void Callback(Object obj)
4922	6150	{
..	..	@@ -4940,26 +6168,9 @@
4940	6168	}
4941	6169	*/
4942	6170
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	6171	String GetFile(String dialogName)
4961	6172	{
4962		- if (GrafreeD.standAlone)
	6173	+ if (Grafreed.standAlone)
4963	6174	{
4964	6175	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4965	6176	browser.show();
..	..	@@ -5027,7 +6238,43 @@
5027	6238	cButton clearpanelButton;
5028	6239	cButton unselectButton;
5029	6240
	6241	+ cButton restoreCameraButton;
	6242	+
5030	6243	cButton oneStepButton;
	6244	+
	6245	+ cButton groupButton;
	6246	+ cButton ungroupButton;
	6247	+ cButton compositeButton;
	6248	+ cButton switchButton;
	6249	+ cButton loopButton;
	6250	+ cButton textureButton;
	6251	+
	6252	+ cButton skybox1Button;
	6253	+ cButton skybox2Button;
	6254	+ cButton skybox3Button;
	6255	+ cButton skybox4Button;
	6256	+ cButton skybox5Button;
	6257	+ cButton skybox6Button;
	6258	+ cButton skybox7Button;
	6259	+
	6260	+ cButton skybox11Button;
	6261	+ cButton skybox12Button;
	6262	+ cButton skybox13Button;
	6263	+ cButton skybox14Button;
	6264	+ cButton skybox15Button;
	6265	+ cButton skybox16Button;
	6266	+ cButton skybox17Button;
	6267	+
	6268	+ cButton gridButton;
	6269	+ cButton boxButton;
	6270	+ cButton sphereButton;
	6271	+ cButton coneButton;
	6272	+ cButton torusButton;
	6273	+ cButton superButton;
	6274	+ cButton kleinButton;
	6275	+ cButton particlesButton;
	6276	+ cButton overlayButton;
	6277	+ cButton lightButton;
5031	6278
5032	6279	cButton screenfitButton;
5033	6280	cButton screenfitpointButton;
..	..	@@ -5040,14 +6287,6 @@
5040	6287
5041	6288	cButton setsupportButton;
5042	6289
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	6290	//
5052	6291	//Composite
5053	6292	Object3D // to do !!
..	..	@@ -5057,10 +6296,12 @@
5057	6296	//JTree jTree;
5058	6297	private MenuItem lookAtItem;
5059	6298	private MenuItem lookFromItem;
5060		- private MenuItem switchItem;
5061		- private MenuItem cutItem;
5062		- private MenuItem duplicateItem;
5063		- private MenuItem cloneItem;
	6299	+ private MenuItem switchViewItem;
	6300	+ private JMenuItem cutItem;
	6301	+ private MenuItem undoItem;
	6302	+ private MenuItem redoItem;
	6303	+ private JMenuItem duplicateItem;
	6304	+ private JMenuItem cloneItem;
5064	6305	private MenuItem cloneSupportItem;
5065	6306	private MenuItem overwriteGeoItem;
5066	6307	private MenuItem overwriteMatItem;
..	..	@@ -5072,7 +6313,7 @@
5072	6313	private MenuItem linkverticesItem;
5073	6314	private MenuItem relinkverticesItem;
5074	6315	private MenuItem setMasterItem;
5075		- private MenuItem resetMeshItem;
	6316	+ private MenuItem resetAllItem;
5076	6317	private MenuItem stepAllItem;
5077	6318	private MenuItem revertMeshItem;
5078	6319	private MenuItem poseMeshItem;
..	..	@@ -5081,13 +6322,13 @@
5081	6322	private MenuItem cloneGeometriesItem;
5082	6323	private MenuItem shareGeometriesItem;
5083	6324	private MenuItem mergeGeometriesItem;
5084		- private MenuItem copyItem;
	6325	+ private JMenuItem copyItem;
5085	6326	private MenuItem pasteItem;
5086		- private MenuItem pasteIntoItem;
5087		- private MenuItem pasteLinkItem;
5088		- private MenuItem pasteCloneItem;
5089		- private MenuItem pasteExpandItem;
5090		- private MenuItem clearItem;
	6327	+ private JMenuItem pasteIntoItem;
	6328	+ private JMenuItem pasteLinkItem;
	6329	+ private JMenuItem pasteCloneItem;
	6330	+ private JMenuItem pasteExpandItem;
	6331	+ private JMenuItem deleteItem;
5091	6332	private MenuItem clearAllItem;
5092	6333	private MenuItem genUVItem;
5093	6334	private MenuItem genNormalsMESHItem;
..	..	@@ -5122,6 +6363,10 @@
5122	6363	private MenuItem showleavesItem;
5123	6364	private MenuItem markleavesItem;
5124	6365	private MenuItem unmarkleavesItem;
	6366	+ private MenuItem rewindleavesItem;
	6367	+ private MenuItem unrewindleavesItem;
	6368	+ private MenuItem randomleavesItem;
	6369	+ private MenuItem unrandomleavesItem;
5125	6370
5126	6371	private MenuItem flipVItem;
5127	6372	private MenuItem unflipVItem;
..	..	@@ -5133,15 +6378,17 @@
5133	6378	private MenuItem panoTexturesItem;
5134	6379
5135	6380	private MenuItem resetCentroidItem;
5136		- private MenuItem transformgeometryItem;
	6381	+ private MenuItem resetCentroidXZItem;
5137	6382	private MenuItem resetTransformItem;
	6383	+ private MenuItem transformGeometryItem;
	6384	+ private MenuItem transformChildrenItem;
5138	6385	private MenuItem hideItem;
5139		- private MenuItem grabItem;
	6386	+ private JMenuItem grabItem;
5140	6387	private MenuItem backItem;
5141	6388	private MenuItem frontItem;
5142	6389	private MenuItem cameraItem;
5143	6390	private MenuItem compositeItem;
5144		- private MenuItem randomItem;
	6391	+ private MenuItem switchItem;
5145	6392	private MenuItem physicsItem;
5146	6393	private MenuItem frameselectorItem;
5147	6394	private MenuItem scriptNodeItem;
..	..	@@ -5149,7 +6396,7 @@
5149	6396	private MenuItem switchTransfoItem;
5150	6397	private MenuItem morphItem;
5151	6398	private MenuItem linkerItem;
5152		- private MenuItem ungroupItem;
	6399	+ private JMenuItem ungroupItem;
5153	6400	private MenuItem editItem;
5154	6401	private MenuItem openWindowItem;
5155	6402	private MenuItem editLeafItem;
..	..	@@ -5165,6 +6412,8 @@
5165	6412	private MenuItem attachBumpItem;
5166	6413	private MenuItem detachBumpItem;
5167	6414	private MenuItem pigmentBumpItem;
	6415	+ private MenuItem embedTexturesItem;
	6416	+ private MenuItem deEmbedTexturesItem;
5168	6417
5169	6418	private MenuItem particleItem;
5170	6419	private MenuItem ragdollItem;
..	..	@@ -5203,11 +6452,6 @@
5203	6452	private MenuItem doubleItem;
5204	6453	private MenuItem tripleItem;
5205	6454
5206		- private MenuItem importGFDItem;
5207		- private MenuItem importVRMLX3DItem;
5208		- private MenuItem import3DSItem;
5209		- private MenuItem importOBJItem;
5210		-
5211	6455	private MenuItem computeAOItem;
5212	6456	private MenuItem recompileItem;
5213	6457	private MenuItem editScriptItem;
..	..	@@ -5217,4 +6461,8 @@
5217	6461	private MenuItem analyzeItem;
5218	6462	private MenuItem dumpItem;
5219	6463	//boolean freezemodel = false;
	6464	+
	6465	+ Menu cameraMenu;
	6466	+ MenuItem editCameraItem;
	6467	+ MenuItem restoreCameraItem;
5220	6468	}