~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -16,6 +16,7 @@
16	16	//import buoy.widget.BFileChooser;
17	17
18	18	class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
	19	+ Grafreed.iResourceCallBack,
19	20	ObjectUI,
20	21	Runnable,
21	22	ActionListener,
..	..	@@ -23,6 +24,360 @@
23	24	DragGestureListener, DragSourceListener, DropTargetListener,
24	25	ItemListener // ListSelectionListener
25	26	{
	27	+
	28	+ public void AddSkyboxButton(String f, String s, cGridBag row)
	29	+ {
	30	+ cButton skyboxButton;
	31	+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
	32	+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
	33	+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
	34	+ skyboxButton.setToolTipText(s.equals("") ? "No background" : s);
	35	+ skyboxButton.addActionListener(new ActionListener()
	36	+ {
	37	+ @Override
	38	+ public void actionPerformed(ActionEvent e)
	39	+ {
	40	+ ChangeSkybox(path);
	41	+ }
	42	+ });
	43	+ }
	44	+
	45	+ public void AddTextureButton(String f, String c, final String t, int count, cGridBag row)
	46	+ {
	47	+ cButton textureButton;
	48	+ final String path = "textures/" + f + "/" + c + "/"; // + t;
	49	+ row.add(textureButton = GetButton(path + "icons/" + t, !Grafreed.NIMBUSLAF));
	50	+ textureButton.setToolTipText(c + count);
	51	+ textureButton.addActionListener(new ActionListener()
	52	+ {
	53	+ @Override
	54	+ public void actionPerformed(ActionEvent e)
	55	+ {
	56	+ ChangeTexture(path + t);
	57	+ }
	58	+ });
	59	+ }
	60	+
	61	+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
	62	+ {
	63	+ cGridBag tab0 = new cGridBag().setVertical(true);
	64	+
	65	+ tab0.setName("Urban");
	66	+ skyboxpanel.add(tab0);
	67	+
	68	+ cGridBag row0 = new cGridBag();
	69	+ cGridBag row1 = new cGridBag();
	70	+ cGridBag row2 = new cGridBag();
	71	+ cGridBag row3 = new cGridBag();
	72	+ cGridBag row4 = new cGridBag();
	73	+ cGridBag row5 = new cGridBag();
	74	+ cGridBag row6 = new cGridBag();
	75	+
	76	+ AddSkyboxButton("default", "", row0);
	77	+ //AddSkyboxButton("default", "cornell", row0);
	78	+ AddSkyboxButton("penguins", "dust", row0);
	79	+ AddSkyboxButton("penguins", "tropic", row0);
	80	+ AddSkyboxButton("penguins", "yonder", row0);
	81	+
	82	+ AddSkyboxButton("default", "uffizi", row1);
	83	+ AddSkyboxButton("bridge", "Bridge", row1);
	84	+ AddSkyboxButton("bridge", "Bridge2", row1);
	85	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	86	+
	87	+ AddSkyboxButton("urban", "Parliament", row2);
	88	+ AddSkyboxButton("urban", "Roundabout", row2);
	89	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	90	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	91	+
	92	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	93	+ AddSkyboxButton("urban", "UnionSquare", row3);
	94	+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
	95	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	96	+
	97	+ AddSkyboxButton("park", "Buddha", row4);
	98	+ AddSkyboxButton("park", "CNTower2", row4);
	99	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	100	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	101	+
	102	+ AddSkyboxButton("park", "Park", row5);
	103	+ AddSkyboxButton("park", "Pond", row5);
	104	+ AddSkyboxButton("park", "Skansen", row5);
	105	+ AddSkyboxButton("park", "Skansen2", row5);
	106	+
	107	+ AddSkyboxButton("park", "Skansen3", row6);
	108	+ AddSkyboxButton("park", "Skansen4", row6);
	109	+ AddSkyboxButton("park", "Skansen5", row6);
	110	+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
	111	+
	112	+ tab0.add(row0);
	113	+ tab0.add(row1);
	114	+ tab0.add(row2);
	115	+ tab0.add(row3);
	116	+ tab0.add(row4);
	117	+ tab0.add(row5);
	118	+ tab0.add(row6);
	119	+
	120	+ for (int i=5; --i>=0;)
	121	+ {
	122	+ //oe.toolboxPanel.Return();
	123	+ //tab0.add(new cGridBag());
	124	+ }
	125	+ }
	126	+
	127	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	128	+ {
	129	+ cGridBag tab0 = new cGridBag().setVertical(true);
	130	+
	131	+ tab0.setName("Nature");
	132	+ skyboxpanel.add(tab0);
	133	+
	134	+ cGridBag row0 = new cGridBag();
	135	+ cGridBag row1 = new cGridBag();
	136	+ cGridBag row2 = new cGridBag();
	137	+ cGridBag row3 = new cGridBag();
	138	+ cGridBag row4 = new cGridBag();
	139	+ cGridBag row5 = new cGridBag();
	140	+ cGridBag row6 = new cGridBag();
	141	+
	142	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	143	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	144	+ AddSkyboxButton("beach", "PalmTrees", row0);
	145	+ AddSkyboxButton("beach", "Tenerife", row0);
	146	+
	147	+ AddSkyboxButton("beach", "Tenerife2", row1);
	148	+ AddSkyboxButton("beach", "Tenerife3", row1);
	149	+ AddSkyboxButton("field", "FishPond", row1);
	150	+ AddSkyboxButton("field", "Footballfield", row1);
	151	+
	152	+ AddSkyboxButton("field", "Meadow", row2);
	153	+ AddSkyboxButton("field", "Sorsele", row2);
	154	+ AddSkyboxButton("field", "Sorsele2", row2);
	155	+ AddSkyboxButton("field", "Sorsele3", row2);
	156	+
	157	+ AddSkyboxButton("forest", "Brudslojan", row3);
	158	+ AddSkyboxButton("forest", "Langholmen2", row3);
	159	+ AddSkyboxButton("forest", "Plants", row3);
	160	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	161	+
	162	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	163	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	164	+ AddSkyboxButton("mountain", "Teide", row4);
	165	+ AddSkyboxButton("park", "Tantolunden4", row4);
	166	+
	167	+ AddSkyboxButton("park", "Stairs", row5);
	168	+ AddSkyboxButton("default", "skycube", row6);
	169	+ AddSkyboxButton("rocky", "Langholmen", row5);
	170	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	171	+
	172	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	173	+ AddSkyboxButton("default", "CloudyHills", row6);
	174	+ AddSkyboxButton("daz", "Autumn", row6);
	175	+ AddSkyboxButton("daz", "MountainTrail", row6);
	176	+ /*
	177	+Autumn
	178	+Greenlands
	179	+MountainTrail
	180	+Oasis
	181	+TheRock
	182	+TopOfTheWorld
	183	+Winter
	184	+ */
	185	+
	186	+ tab0.add(row0);
	187	+ tab0.add(row1);
	188	+ tab0.add(row2);
	189	+ tab0.add(row3);
	190	+ tab0.add(row4);
	191	+ tab0.add(row5);
	192	+ tab0.add(row6);
	193	+
	194	+ for (int i=5; --i>=0;)
	195	+ {
	196	+ //oe.toolboxPanel.Return();
	197	+ //tab0.add(new cGridBag());
	198	+ }
	199	+ }
	200	+
	201	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	202	+ {
	203	+ cGridBag tab0 = new cGridBag().setVertical(true);
	204	+
	205	+ tab0.setName("Night");
	206	+ skyboxpanel.add(tab0);
	207	+
	208	+ cGridBag row0 = new cGridBag();
	209	+ cGridBag row1 = new cGridBag();
	210	+ cGridBag row2 = new cGridBag();
	211	+ cGridBag row3 = new cGridBag();
	212	+ cGridBag row4 = new cGridBag();
	213	+ cGridBag row5 = new cGridBag();
	214	+ cGridBag row6 = new cGridBag();
	215	+
	216	+ AddSkyboxButton("night", "NightPath", row0);
	217	+ AddSkyboxButton("night", "PondNight", row0);
	218	+ AddSkyboxButton("night", "Powerlines", row0);
	219	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	220	+
	221	+ AddSkyboxButton("urban", "CNTower", row1);
	222	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	223	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	224	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
	225	+
	226	+ AddSkyboxButton("penguins", "kenon_star", row2);
	227	+ AddSkyboxButton("persson", "corona", row2);
	228	+ AddSkyboxButton("persson", "spaceskybox", row2);
	229	+ AddSkyboxButton("indoors", "Vasa", row2);
	230	+
	231	+ AddSkyboxButton("winter", "Backyard", row3);
	232	+ AddSkyboxButton("winter", "Creek", row3);
	233	+ AddSkyboxButton("winter", "FootballField3", row3);
	234	+ AddSkyboxButton("winter", "Forest", row3);
	235	+
	236	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	237	+ AddSkyboxButton("winter", "House", row4);
	238	+ AddSkyboxButton("winter", "IceLake", row4);
	239	+ AddSkyboxButton("winter", "IceRiver", row4);
	240	+
	241	+ AddSkyboxButton("winter", "Park3", row5);
	242	+ AddSkyboxButton("winter", "PondWinter", row5);
	243	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	244	+ AddSkyboxButton("winter", "Vindelalven", row5);
	245	+
	246	+ AddSkyboxButton("daz", "TheRock", row6);
	247	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	248	+ AddSkyboxButton("daz", "Winter", row6);
	249	+ AddSkyboxButton("mountain", "Ryfjallet", row6);
	250	+
	251	+ tab0.add(row0);
	252	+ tab0.add(row1);
	253	+ tab0.add(row2);
	254	+ tab0.add(row3);
	255	+ tab0.add(row4);
	256	+ tab0.add(row5);
	257	+ tab0.add(row6);
	258	+
	259	+ for (int i=5; --i>=0;)
	260	+ {
	261	+ //oe.toolboxPanel.Return();
	262	+ //tab0.add(new cGridBag());
	263	+ }
	264	+ }
	265	+
	266	+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
	267	+ {
	268	+ cGridBag tab0 = new cGridBag().setVertical(true);
	269	+
	270	+ tab0.setName("Others");
	271	+ skyboxpanel.add(tab0);
	272	+
	273	+ cGridBag row0 = new cGridBag();
	274	+ cGridBag row1 = new cGridBag();
	275	+ cGridBag row2 = new cGridBag();
	276	+ cGridBag row3 = new cGridBag();
	277	+ cGridBag row4 = new cGridBag();
	278	+ cGridBag row5 = new cGridBag();
	279	+ cGridBag row6 = new cGridBag();
	280	+
	281	+ AddSkyboxButton("mayhem", "afterrain", row0);
	282	+ AddSkyboxButton("mayhem", "aqua4", row0);
	283	+ AddSkyboxButton("mayhem", "aqua9", row0);
	284	+ AddSkyboxButton("mayhem", "flame", row0);
	285	+
	286	+ AddSkyboxButton("mayhem", "h2s", row1);
	287	+ AddSkyboxButton("mayhem", "prehistoric", row1);
	288	+ AddSkyboxButton("mayhem", "scorched", row1);
	289	+ AddSkyboxButton("penguins", "desertdawn", row1);
	290	+
	291	+ AddSkyboxButton("persson", "Citadella", row2);
	292	+ AddSkyboxButton("persson", "Citadella2", row2);
	293	+ AddSkyboxButton("persson", "clouds1", row2);
	294	+ AddSkyboxButton("penguins", "wrath", row2);
	295	+
	296	+ AddSkyboxButton("persson", "FishermansBastion", row3);
	297	+ AddSkyboxButton("persson", "HeroesSquare", row3);
	298	+ AddSkyboxButton("indoors", "DallasW", row3);
	299	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
	300	+
	301	+ AddSkyboxButton("persson", "LancellottiChapel", row4);
	302	+ AddSkyboxButton("persson", "PereaBeach1", row4);
	303	+ AddSkyboxButton("persson", "PereaBeach2", row4);
	304	+ AddSkyboxButton("persson", "redeclipse", row4);
	305	+
	306	+ AddSkyboxButton("daz", "Greenlands", row5);
	307	+ AddSkyboxButton("daz", "Oasis", row5);
	308	+ AddSkyboxButton("elyvisions", "arch3", row5);
	309	+ AddSkyboxButton("elyvisions", "calm_sea", row5);
	310	+
	311	+ AddSkyboxButton("elyvisions", "rainbow", row6);
	312	+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
	313	+ AddSkyboxButton("elyvisions", "heaven", row6);
	314	+ AddSkyboxButton("elyvisions", "hot", row6);
	315	+
	316	+ tab0.add(row0);
	317	+ tab0.add(row1);
	318	+ tab0.add(row2);
	319	+ tab0.add(row3);
	320	+ tab0.add(row4);
	321	+ tab0.add(row5);
	322	+ tab0.add(row6);
	323	+
	324	+ for (int i=5; --i>=0;)
	325	+ {
	326	+ //oe.toolboxPanel.Return();
	327	+ //tab0.add(new cGridBag());
	328	+ }
	329	+ }
	330	+
	331	+ public void ChangeSkybox(String skybox)
	332	+ {
	333	+ if (skybox.endsWith("/"))
	334	+ {
	335	+ group.skyboxname = null;
	336	+ group.skyboxext = null;
	337	+ cameraView.repaint();
	338	+ }
	339	+ else
	340	+ {
	341	+ //cameraView.envyoff = false;
	342	+ group.skyboxname = skybox;
	343	+ group.skyboxext = "jpg";
	344	+ cameraView.repaint();
	345	+ }
	346	+ }
	347	+
	348	+ public void CreateSkyboxPanel(cGridBag skyboxPanel)
	349	+ {
	350	+ JTabbedPane skyboxpane = new JTabbedPane();
	351	+
	352	+ AddSkyboxTab0(skyboxpane);
	353	+ AddSkyboxTab1(skyboxpane);
	354	+ AddSkyboxTab2(skyboxpane);
	355	+ AddSkyboxTab3(skyboxpane);
	356	+
	357	+ skyboxPanel.add(skyboxpane);
	358	+ }
	359	+
	360	+ public void ChangeTexture(String texture)
	361	+ {
	362	+ for (int i=0; i<group.selection.size(); i++)
	363	+ {
	364	+ Object3D obj = group.selection.get(i);
	365	+ obj.SetPigmentTexture("@" + texture);
	366	+ }
	367	+
	368	+ refreshContents();
	369	+ }
	370	+
	371	+ public void Show3DView()
	372	+ {
	373	+ // bug
	374	+ //gridPanel.setDividerLocation(1.0);
	375	+ //bigPanel.setDividerLocation(0.0);
	376	+ bigThree.ClearUI();
	377	+ bigThree.add(centralPanel);
	378	+ bigThree.FlushUI();
	379	+ }
	380	+
26	381	//ObjEditor objEditor;
27	382	public void closeUI2()
28	383	{
..	..	@@ -60,6 +415,14 @@
60	415	this.copy = this.group = group;
61	416	//selectees = this.group.selectees;
62	417
	418	+ if (copy.versionlist == null)
	419	+ {
	420	+ copy.versionlist = new Object3D[100];
	421	+ copy.versionindex = -1;
	422	+
	423	+ Save(true);
	424	+ }
	425	+
63	426	if(ui)
64	427	SetupUI(objEditor);
65	428	}
..	..	@@ -74,16 +437,28 @@
74	437	this.copy = this.group = copy;
75	438	//selectees = this.group.selectees;
76	439
77		- SetupMenu2(objEditor);
	440	+ SetupMenu2(this); //objEditor);
78	441	SetupUI2(objEditor);
79	442	objEditor.SetupUI(true);
80	443	SetupViews(objEditor);
81	444
82	445	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	446	+
	447	+ if (copy.versionlist == null)
	448	+ {
	449	+ copy.versionlist = new Object3D[100];
	450	+ copy.versionindex = -1;
	451	+
	452	+ Save(true);
	453	+ }
83	454	}
84	455
85	456	void CloneSelection(boolean supports)
86	457	{
	458	+ if (Globals.REPLACEONMAKE)
	459	+ Save();
	460	+ boolean keep = Globals.REPLACEONMAKE;
	461	+ Globals.REPLACEONMAKE = false;
87	462	// Object3D keep = GrafreeD.clipboard;
88	463	//Object3D obj;
89	464	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,18 +469,19 @@
94	469
95	470	makeSomething(clone, i==group.selection.size()-1);
96	471	}
	472	+ Globals.REPLACEONMAKE = keep;
97	473	}
98	474
99	475	void CloneClipboard(boolean supports)
100	476	{
101		- assert(GrafreeD.clipboard.parent == null);
102		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
103		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
104		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
105		- makeSomething(CloneObject(GrafreeD.clipboard.get(0), false));
	477	+ assert(Grafreed.clipboard.parent == null);
	478	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	479	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	480	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	481	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
106	482	else
107		- makeSomething(CloneObject(GrafreeD.clipboard, false));
108		- GrafreeD.clipboard.get(0).parent = keepparent;
	483	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	484	+ Grafreed.clipboard.get(0).parent = keepparent;
109	485	}
110	486
111	487	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -119,7 +495,7 @@
119	495	// obj.support = null;
120	496	if (!supports)
121	497	obj.SaveSupports();
122		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	498	+ Object3D clone = (Object3D)Grafreed.clone(obj);
123	499	obj.parent = parent;
124	500	// obj.support = support;
125	501	// clone.support = support; // aout 2013
..	..	@@ -148,58 +524,156 @@
148	524
149	525	//JTextField nameField;
150	526
151		- void SetupMenu2(ObjEditor oe)
	527	+ void SetupMenu2(GroupEditor oe)
152	528	{
153		- oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
154		- //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
155		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
156		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
157		- oe.cameraMenu.add("-");
158		- openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
159		- openWindowItem.addActionListener(this);
160		- editLeafItem.addActionListener(this);
161		- lookAtItem.addActionListener(this);
162		- //lookFromItem.addActinoListener(this);
163		- //switchItem.addActionListener(this);
	529	+ oe.jTree = new cTree();
	530	+
164	531	Menu menu;
165	532	oe.menuBar.add(menu = new Menu("Edit"));
166	533	//editItem = menu.add(new MenuItem("Edit"));
167	534	//editItem.addActionListener(this);
168		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	535	+
	536	+// undoItem = menu.add(new MenuItem("Undo"));
	537	+// undoItem.addActionListener(this);
	538	+// redoItem = menu.add(new MenuItem("Redo"));
	539	+// redoItem.addActionListener(this);
	540	+// menu.add("-");
	541	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
169	542	duplicateItem.addActionListener(this);
170		- menu.add("-");
171		- cloneItem = menu.add(new MenuItem("Clone"));
	543	+
	544	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
172	545	cloneItem.addActionListener(this);
	546	+ //if (Globals.ADVANCED)
	547	+ {
173	548	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
174	549	cloneSupportItem.addActionListener(this);
	550	+ }
	551	+ oe.jTree.popup.addSeparator();
175	552	menu.add("-");
176		- cutItem = menu.add(new MenuItem("Cut"));
	553	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
177	554	cutItem.addActionListener(this);
178		- copyItem = menu.add(new MenuItem("Copy"));
	555	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
179	556	copyItem.addActionListener(this);
180	557	pasteItem = menu.add(new MenuItem("Paste"));
181	558	pasteItem.addActionListener(this);
182		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	559	+
	560	+ oe.jTree.popup.addSeparator();
	561	+ //menu.add("-");
	562	+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
	563	+ pasteIntoItem.addActionListener(this);
	564	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
183	565	pasteLinkItem.addActionListener(this);
184		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	566	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
185	567	pasteCloneItem.addActionListener(this);
186		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	568	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
187	569	// pasteExpandItem.addActionListener(this);
188		- clearItem = menu.add(new MenuItem("Clear"));
189		- clearItem.addActionListener(this);
	570	+ //menu.add("-");
	571	+ oe.jTree.popup.addSeparator();
	572	+
	573	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	574	+ deleteItem.addActionListener(this);
	575	+
	576	+ if (Globals.ADVANCED)
	577	+ {
	578	+ // Deletes the cameras...
190	579	clearAllItem = menu.add(new MenuItem("Clear All"));
191	580	clearAllItem.addActionListener(this);
	581	+ }
	582	+
	583	+ menuBar.add(cameraMenu = new Menu("View"));
	584	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	585	+ //zBufferItem.addActionListener(this);
	586	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	587	+ //normalLensItem.addActionListener(this);
	588	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	589	+ restoreCameraItem.addActionListener(this);
	590	+
	591	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	592	+// toggleFullScreenItem.addItemListener(this);
	593	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	594	+// cameraMenu.add("-");
	595	+//
	596	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	597	+// toggleTextureItem.addItemListener(this);
	598	+// toggleTextureItem.setState(CameraPane.textureon);
	599	+//
	600	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	601	+// toggleSwitchItem.addItemListener(this);
	602	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	603	+
	604	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	605	+ toggleHandleItem.addItemListener(this);
	606	+ toggleHandleItem.setState(CameraPane.HANDLES);
	607	+
	608	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	609	+ togglePaintItem.addItemListener(this);
	610	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	611	+
	612	+ if (Globals.ADVANCED)
	613	+ {
	614	+ cameraMenu.add("-");
	615	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	616	+ toggleLiveItem.addItemListener(this);
	617	+ toggleLiveItem.setState(Globals.isLIVE());
192	618
	619	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	620	+ stepItem.addActionListener(this);
	621	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	622	+ // toggleDLItem.addItemListener(this);
	623	+ // toggleDLItem.setState(false);
	624	+
	625	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	626	+ toggleRenderItem.addItemListener(this);
	627	+ toggleRenderItem.setState(!CameraPane.frozen);
	628	+
	629	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	630	+ toggleDebugItem.addItemListener(this);
	631	+ toggleDebugItem.setState(Globals.DEBUG);
	632	+
	633	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	634	+ toggleFrustumItem.addItemListener(this);
	635	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	636	+
	637	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	638	+ toggleFootContactItem.addItemListener(this);
	639	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	640	+
	641	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	642	+ toggleTimelineItem.addItemListener(this);
	643	+ }
	644	+
	645	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	646	+// toggleRootItem.addItemListener(this);
	647	+// toggleRootItem.setState(false);
	648	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	649	+// animationItem.addItemListener(this);
	650	+// animationItem.setState(CameraPane.ANIMATION);
	651	+ cameraMenu.add("-");
	652	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	653	+ editCameraItem.addActionListener(this);
	654	+
	655	+ if (Globals.ADVANCED)
	656	+ {
	657	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	658	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	659	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	660	+ oe.cameraMenu.add("-");
	661	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	662	+ openWindowItem.addActionListener(this);
	663	+ lookAtItem.addActionListener(this);
	664	+ //lookFromItem.addActinoListener(this);
	665	+ //switchViewItem.addActionListener(this);
	666	+ }
	667	+
193	668	oe.menuBar.add(menu = new Menu("Setting"));
194		- resetMeshItem = menu.add(new MenuItem("Reset All"));
195		- resetMeshItem.addActionListener(this);
196		- stepAllItem = menu.add(new MenuItem("Step All"));
197		- stepAllItem.addActionListener(this);
	669	+ if (Globals.ADVANCED)
	670	+ {
198	671	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
199	672	revertMeshItem.addActionListener(this);
200	673	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
201	674	resetreferencesItem.addActionListener(this);
202	675	menu.add("-");
	676	+ }
203	677	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
204	678	overwriteGeoItem.addActionListener(this);
205	679	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -211,79 +685,104 @@
211	685	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
212	686	overwriteUVItem.addActionListener(this);
213	687	menu.add("-");
	688	+ if (Globals.ADVANCED)
	689	+ {
214	690	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
215	691	generateMeshItem.addActionListener(this);
216	692	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
217	693	poseMeshItem.addActionListener(this);
218	694	menu.add("-");
	695	+ }
219	696	resetsupportItem = menu.add(new MenuItem("Reset support"));
220	697	resetsupportItem.addActionListener(this);
221	698	linkverticesItem = menu.add(new MenuItem("Link to Support"));
222	699	linkverticesItem.addActionListener(this);
223	700	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
224	701	relinkverticesItem.addActionListener(this);
	702	+
	703	+ if (Globals.ADVANCED)
	704	+ {
225	705	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
226	706	setMasterItem.addActionListener(this);
	707	+ }
227	708
228	709	oe.menuBar.add(menu = new Menu("Group"));
229		- grabItem = menu.add(new MenuItem("Grab"));
230		- grabItem.addActionListener(this);
	710	+// grabItem = menu.add(new MenuItem("Grab"));
	711	+// grabItem.addActionListener(this);
231	712	backItem = menu.add(new MenuItem("Back"));
232	713	backItem.addActionListener(this);
233	714	frontItem = menu.add(new MenuItem("Front"));
234	715	frontItem.addActionListener(this);
235		- compositeItem = menu.add(new MenuItem("Composite"));
236		- compositeItem.addActionListener(this);
237		- hideItem = menu.add(new MenuItem("Hide"));
	716	+// compositeItem = menu.add(new MenuItem("Composite"));
	717	+// compositeItem.addActionListener(this);
	718	+
	719	+ if (Globals.ADVANCED)
	720	+ {
	721	+ hideItem = menu.add(new MenuItem("Hidden Group"));
238	722	hideItem.addActionListener(this);
239		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	723	+ }
	724	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
240	725	ungroupItem.addActionListener(this);
241		- menu.add("-");
242		- randomItem = menu.add(new MenuItem("Switch node"));
243		- randomItem.addActionListener(this);
	726	+
	727	+// menu.add("-");
	728	+//
	729	+// switchItem = menu.add(new MenuItem("Switch node"));
	730	+// switchItem.addActionListener(this);
	731	+ if (Globals.ADVANCED)
	732	+ {
244	733	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
245	734	switchGeoItem.addActionListener(this);
246	735	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
247	736	switchTransfoItem.addActionListener(this);
	737	+ morphItem = menu.add(new MenuItem("Morph Group"));
	738	+ morphItem.addActionListener(this);
	739	+
	740	+ menu.add("-");
248	741	physicsItem = menu.add(new MenuItem("Physics"));
249	742	physicsItem.addActionListener(this);
250	743	frameselectorItem = menu.add(new MenuItem("Frame Selector"));
251	744	frameselectorItem.addActionListener(this);
252		- morphItem = menu.add(new MenuItem("Morph"));
253		- morphItem.addActionListener(this);
254	745	scriptNodeItem = menu.add(new MenuItem("Script Node"));
255	746	scriptNodeItem.addActionListener(this);
256		- cameraItem = menu.add(new MenuItem("Camera"));
257		- cameraItem.addActionListener(this);
	747	+ }
258	748
259	749	oe.menuBar.add(menu = new Menu("Object"));
260		- textureItem = menu.add(new MenuItem("Texture"));
261		- textureItem.addActionListener(this);
	750	+// textureItem = menu.add(new MenuItem("Texture"));
	751	+// textureItem.addActionListener(this);
262	752	billboardItem = menu.add(new MenuItem("Billboard"));
263	753	billboardItem.addActionListener(this);
264	754	csgItem = menu.add(new MenuItem("CSG"));
265	755	csgItem.addActionListener(this);
266		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	756	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
267	757	shadowXItem.addActionListener(this);
268		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	758	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
269	759	shadowYItem.addActionListener(this);
270		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	760	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
271	761	shadowZItem.addActionListener(this);
	762	+ attributeItem = menu.add(new MenuItem("Attribute"));
	763	+ attributeItem.addActionListener(this);
	764	+
	765	+ if (Globals.ADVANCED)
	766	+ {
	767	+ menu.add("-");
272	768	linkerItem = menu.add(new MenuItem("Linker"));
273	769	linkerItem.addActionListener(this);
274	770	templateItem = menu.add(new MenuItem("Template"));
275	771	templateItem.addActionListener(this);
276		- attributeItem = menu.add(new MenuItem("Attribute"));
277		- attributeItem.addActionListener(this);
278	772	pointflowItem = menu.add(new MenuItem("Point Flow"));
279	773	pointflowItem.addActionListener(this);
	774	+ }
280	775	menu.add("-");
281	776	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
282	777	resetTransformItem.addActionListener(this);
283	778	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
284	779	resetCentroidItem.addActionListener(this);
285		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
286		- transformgeometryItem.addActionListener(this);
	780	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	781	+ resetCentroidXZItem.addActionListener(this);
	782	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	783	+ transformGeometryItem.addActionListener(this);
	784	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	785	+ transformChildrenItem.addActionListener(this);
287	786
288	787	oe.menuBar.add(menu = new Menu("Geometry"));
289	788	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -294,8 +793,11 @@
294	793	genNormalsCADItem.addActionListener(this);
295	794	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
296	795	genNormalsMESHItem.addActionListener(this);
297		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	796	+ if (Globals.ADVANCED)
	797	+ {
	798	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
298	799	genNormalsMINEItem.addActionListener(this);
	800	+ }
299	801	stripifyItem = menu.add(new MenuItem("Stripify"));
300	802	stripifyItem.addActionListener(this);
301	803	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -317,23 +819,34 @@
317	819	reduce34MeshItem.addActionListener(this);
318	820	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
319	821	increaseMeshItem.addActionListener(this);
320		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
321		- smoothMeshItem.addActionListener(this);
322	822	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
323	823	clipMeshItem.addActionListener(this);
	824	+
	825	+ if (Globals.ADVANCED)
	826	+ {
	827	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	828	+ smoothMeshItem.addActionListener(this);
	829	+ }
324	830
325	831	oe.menuBar.add(menu = new Menu("Attributes"));
326	832	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
327	833	clearMaterialsItem.addActionListener(this);
	834	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	835	+ resetAllItem.addActionListener(this);
	836	+ stepAllItem = menu.add(new MenuItem("Step All"));
	837	+ stepAllItem.addActionListener(this);
328	838	menu.add("-");
329	839	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
330	840	liveleavesItem.addActionListener(this);
331	841	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
332	842	unliveleavesItem.addActionListener(this);
	843	+ if (Globals.ADVANCED)
	844	+ {
333	845	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
334	846	supportleavesItem.addActionListener(this);
335	847	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
336	848	unsupportleavesItem.addActionListener(this);
	849	+ }
337	850	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
338	851	hideleavesItem.addActionListener(this);
339	852	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -342,6 +855,14 @@
342	855	markleavesItem.addActionListener(this);
343	856	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
344	857	unmarkleavesItem.addActionListener(this);
	858	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	859	+ rewindleavesItem.addActionListener(this);
	860	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	861	+ unrewindleavesItem.addActionListener(this);
	862	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	863	+ randomleavesItem.addActionListener(this);
	864	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	865	+ unrandomleavesItem.addActionListener(this);
345	866	menu.add("-");
346	867	flipVItem = menu.add(new MenuItem("Flip V"));
347	868	flipVItem.addActionListener(this);
..	..	@@ -367,53 +888,130 @@
367	888	attachBumpItem.addActionListener(this);
368	889	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
369	890	pigmentBumpItem.addActionListener(this);
	891	+ //embedTexturesItem
370	892	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
371	893	detachPigmentItem.addActionListener(this);
372	894	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
373	895	detachBumpItem.addActionListener(this);
	896	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	897	+ embedTexturesItem.addActionListener(this);
	898	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	899	+ deEmbedTexturesItem.addActionListener(this);
374	900	menu.add("-");
375	901	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
376	902	sortbysizeItem.addActionListener(this);
377	903	sortbynameItem = menu.add(new MenuItem("Sort by name"));
378	904	sortbynameItem.addActionListener(this);
379	905	menu.add("-");
	906	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	907	+ shareGeometriesItem.addActionListener(this);
	908	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	909	+ mergeGeometriesItem.addActionListener(this);
	910	+ menu.add("-");
	911	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	912	+ editLeafItem.addActionListener(this);
	913	+ if (Globals.ADVANCED)
	914	+ {
	915	+ // Pretty much the same as duplicate and clone.
380	916	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
381	917	extractGeometriesItem.addActionListener(this);
382	918	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
383	919	cloneGeometriesItem.addActionListener(this);
384		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
385		- shareGeometriesItem.addActionListener(this);
386		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
387		- mergeGeometriesItem.addActionListener(this);
	920	+ }
388	921
389	922	oe.menuBar.add(menu = new Menu("Insert"));
390	923	buildCreateMenu(menu);
391	924
392		-
393		- oe.menuBar.add(menu = new Menu("Include"));
394		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
395		- importGFDItem.addActionListener(this);
396		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
397		- importVRMLX3DItem.addActionListener(this);
398		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
399		- importOBJItem.addActionListener(this);
400		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
401		- import3DSItem.addActionListener(this);
402		-
403	925	oe.menuBar.add(menu = new Menu("Tools"));
404	926	buildToolsMenu(menu);
405	927	}
406	928
	929	+ JTabbedPane resourcecontainer;
	930	+ cGridBag currenttab;
	931	+ //boolean added; // patch for jar
	932	+
	933	+ int tabcount = 0;
	934	+ int colcount = 0;
	935	+ int rowcount = 0;
	936	+ int texturecount = 0;
	937	+
	938	+ int columns = 5;
	939	+ int rows = 7;
	940	+
	941	+ public void ResourceCallBack(String[] path)
	942	+ {
	943	+// for (int i = 0; i < path.length; i++)
	944	+// System.out.print(path[i] + "/");
	945	+// System.out.println();
	946	+
	947	+ if (//rowcount == 0 \|\|
	948	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	949	+ {
	950	+ currenttab = new cGridBag();
	951	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	952	+ currenttab.setName(tabname);
	953	+ //added = false;
	954	+ resourcecontainer.add(currenttab);
	955	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	956	+ rowcount = 1;
	957	+ colcount = 0;
	958	+ texturecount = 0;
	959	+ }
	960	+
	961	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	962	+ {
	963	+ //if (!added)
	964	+ {
	965	+ //added = true;
	966	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	967	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	968	+ }
	969	+
	970	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	971	+
	972	+ if (++colcount >= columns)
	973	+ {
	974	+ colcount = 0;
	975	+ currenttab.Return();
	976	+
	977	+ if (rowcount++ >= rows)
	978	+ {
	979	+ rowcount = 0;
	980	+ }
	981	+ }
	982	+ }
	983	+ else
	984	+ {
	985	+// if (!path[path.length-1].equals("icons"))
	986	+// resourcecontainer.Return();
	987	+ }
	988	+ }
	989	+
	990	+ void CreateTexturePanel(cGridBag container)
	991	+ {
	992	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	993	+ container.add(resourcecontainer);
	994	+
	995	+ Grafreed.ParseResources("textures", this);
	996	+ }
	997	+
407	998	void SetupUI2(ObjEditor oe)
408	999	{
	1000	+ // June 2019
	1001	+ if (oe == null)
	1002	+ {
	1003	+ //super.SetupUI2(this);
	1004	+ //return;
	1005	+ }
	1006	+
	1007	+ if (copy != group)
	1008	+ {
	1009	+ //super.SetupUI2(this);
	1010	+ }
	1011	+
409	1012	//new Exception().printStackTrace();
410	1013
411	1014	oe.radioPanel = new JPanel(new GridBagLayout());
412		- oe.aConstraints.weightx = 1;
413		- oe.aConstraints.weighty = 0;
414		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
415		- oe.aConstraints.gridwidth = 100;
416		- oe.aConstraints.gridheight = 1;
417	1015	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
418	1016
419	1017	oe.buttonGroup = new ButtonGroup();
..	..	@@ -434,93 +1032,262 @@
434	1032	oe.radioPanel.add(dummyButton);
435	1033	oe.buttonGroup.add(dummyButton);
436	1034	*/
	1035	+ cGridBag copyOptionsPanel = new cGridBag();
	1036	+
	1037	+ copyOptionsPanel.preferredHeight = 2;
	1038	+
437	1039	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
438	1040
439		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
440		- liveCB.setToolTipText("Enabled animation");
	1041	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1042	+ //minButton.setToolTipText("Minimize window");
	1043	+ //minButton.addActionListener(this);
	1044	+
	1045	+ if (Globals.ADVANCED)
	1046	+ {
	1047	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1048	+// maxButton.setToolTipText("Maximize window");
	1049	+// maxButton.addActionListener(this);
	1050	+ }
	1051	+
	1052	+ cButton gcButton;
	1053	+
	1054	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1055	+// gcButton.setToolTipText("Garbage collect");
	1056	+// gcButton.addActionListener(new ActionListener()
	1057	+// {
	1058	+// public void actionPerformed(ActionEvent e)
	1059	+// {
	1060	+// System.gc();
	1061	+// }
	1062	+// });
	1063	+
	1064	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1065	+ collapseButton.setToolTipText("Collapse toolbar");
	1066	+ collapseButton.addActionListener(this);
	1067	+
	1068	+ oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1069	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1070	+ maximize3DButton.addActionListener(this);
	1071	+
	1072	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1073	+ twoButton.setToolTipText("Show 3D view only");
	1074	+ twoButton.addActionListener(this);
	1075	+ this.fullscreenLayout = twoButton;
	1076	+
	1077	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1078	+ threeButton.setToolTipText("Show controls and 3D view");
	1079	+ threeButton.addActionListener(this);
	1080	+ if (Globals.ADVANCED)
	1081	+ {
	1082	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1083	+ sixButton.setToolTipText("Show 3D view and controls");
	1084	+ sixButton.addActionListener(this);
	1085	+ }
	1086	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1087	+// sevenButton.setToolTipText("3-column layout");
	1088	+// sevenButton.addActionListener(this);
	1089	+ //
	1090	+
	1091	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1092	+ fullButton.setToolTipText("Full-screen window");
	1093	+ fullButton.addActionListener(this);
	1094	+
	1095	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1096	+ screenfitButton.setToolTipText("Screen fit");
	1097	+ screenfitButton.addActionListener(this);
	1098	+
	1099	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1100	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1101	+ restoreCameraButton.addActionListener(this);
	1102	+
	1103	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1104	+ saveVersionButton.setToolTipText("Duplicate current version");
	1105	+ saveVersionButton.addActionListener(this);
	1106	+
	1107	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1108	+ deleteVersionButton.setToolTipText("Delete current version");
	1109	+ deleteVersionButton.addActionListener(this);
	1110	+
	1111	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1112	+ previousVersionButton.setToolTipText("Previous version");
	1113	+ previousVersionButton.addActionListener(this);
	1114	+ previousVersionButton.setEnabled(false);
	1115	+
	1116	+ cGridBag updown = new cGridBag().setVertical(true);
	1117	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1118	+ restoreButton.setToolTipText("Undo (restore current version)");
	1119	+ restoreButton.addActionListener(this);
	1120	+ //restoreButton.setEnabled(false);
	1121	+
	1122	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1123	+ replaceButton.setToolTipText("Save (replace current version)");
	1124	+ replaceButton.addActionListener(this);
	1125	+ //replaceButton.setEnabled(false);
	1126	+
	1127	+ copyOptionsPanel.add(updown);
	1128	+
	1129	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1130	+ nextVersionButton.setToolTipText("Next version");
	1131	+ nextVersionButton.addActionListener(this);
	1132	+ nextVersionButton.setEnabled(false);
	1133	+
	1134	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1135	+ oneStepButton.setToolTipText("Animate one step forward");
	1136	+ oneStepButton.addActionListener(this);
	1137	+
	1138	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1139	+ liveCB.setToolTipText("Enable animation");
441	1140	liveCB.addItemListener(this);
442	1141
443		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	1142	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
444	1143	fastCB.setToolTipText("Fast mode");
445	1144	fastCB.addItemListener(this);
446	1145
447		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
448		- trackCB.setToolTipText("Enable tracking");
449		- trackCB.addItemListener(this);
450		-
451		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
452		- screenfitButton.setToolTipText("Screen fit");
453		- screenfitButton.addActionListener(this);
	1146	+ //oe.toolboxPanel.Return();
	1147	+
	1148	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1149	+// trackCB.setToolTipText("Enable tracking");
	1150	+// trackCB.addItemListener(this);
454	1151
455	1152	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
456	1153	// screenfitpointButton.addActionListener(this);
457	1154
458	1155	if (Globals.ADVANCED)
459	1156	{
460		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1157	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
461	1158	snapobjectButton.addActionListener(this);
462	1159	snapobjectButton.setToolTipText("Snap Object");
	1160	+
	1161	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1162	+ fourButton.addActionListener(this);
	1163	+ fourButton.setToolTipText("Show control panel only");
463	1164	}
464	1165
465		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
466		- flashSelectionButton.setToolTipText("Show selection");
467		- flashSelectionButton.addActionListener(this);
	1166	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
468	1167
469		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
470		-
471		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
472		- twoButton.setToolTipText("Show center view only");
473		- twoButton.addActionListener(this);
474		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
475		- fourButton.addActionListener(this);
476		- fourButton.setToolTipText("Show left panel only");
477		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
478		- sixButton.setToolTipText("2-column layout left");
479		- sixButton.addActionListener(this);
480		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
481		- threeButton.setToolTipText("2-column layout right");
482		- threeButton.addActionListener(this);
483		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
484		- sevenButton.setToolTipText("3-column layout");
485		- sevenButton.addActionListener(this);
486		- //
487	1168
488		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
489		- rootButton.setToolTipText("Edit selection in new tab");
	1169	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1170	+ rootButton.setToolTipText("Open selection in new tab");
490	1171	rootButton.addActionListener(this);
491	1172
492		- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1173	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
493	1174	closeButton.setToolTipText("Close tab");
494	1175	closeButton.addActionListener(this);
495	1176	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
496	1177	//clearButton.addActionListener(this);
497		-
498		- cGridBag commandsPanel = new cGridBag();
	1178	+
	1179	+ cGridBag row1 = new cGridBag();
499	1180
500		- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
501		- editButton.setToolTipText("Edit selection");
	1181	+ // INSERT
	1182	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1183	+ gridButton.setToolTipText("Create ground");
	1184	+ gridButton.addActionListener(this);
	1185	+
	1186	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1187	+ boxButton.setToolTipText("Create box");
	1188	+ boxButton.addActionListener(this);
	1189	+
	1190	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1191	+ sphereButton.setToolTipText("Create sphere");
	1192	+ sphereButton.addActionListener(this);
	1193	+
	1194	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1195	+ coneButton.setToolTipText("Create cone");
	1196	+ coneButton.addActionListener(this);
	1197	+
	1198	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1199	+ torusButton.setToolTipText("Create torus");
	1200	+ torusButton.addActionListener(this);
	1201	+
	1202	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1203	+ superButton.setToolTipText("Create superellipsoid");
	1204	+ superButton.addActionListener(this);
	1205	+
	1206	+ if (Globals.ADVANCED)
	1207	+ {
	1208	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1209	+ kleinButton.setToolTipText("Create Klein bottle");
	1210	+ kleinButton.addActionListener(this);
	1211	+ }
	1212	+
	1213	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1214	+ particlesButton.setToolTipText("Create particle system");
	1215	+ particlesButton.addActionListener(this);
	1216	+
	1217	+ oe.toolboxPanel.add(row1);
	1218	+
	1219	+ cGridBag row2 = new cGridBag();
	1220	+
	1221	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1222	+ groupButton.setToolTipText("Create group");
	1223	+ groupButton.addActionListener(this);
	1224	+
	1225	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1226	+ compositeButton.setToolTipText("Create composite");
	1227	+ compositeButton.addActionListener(this);
	1228	+
	1229	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1230	+ switchButton.setToolTipText("Create item switcher");
	1231	+ switchButton.addActionListener(this);
	1232	+
	1233	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1234	+ loopButton.setToolTipText("Create loop");
	1235	+ loopButton.addActionListener(this);
	1236	+
	1237	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1238	+ textureButton.setToolTipText("Create texture");
	1239	+ textureButton.addActionListener(this);
	1240	+
	1241	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1242	+ overlayButton.setToolTipText("Create overlay");
	1243	+ overlayButton.addActionListener(this);
	1244	+
	1245	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1246	+ lightButton.setToolTipText("Create light");
	1247	+ lightButton.addActionListener(this);
	1248	+
	1249	+ oe.toolboxPanel.add(row2);
	1250	+
	1251	+ cGridBag textures = new cGridBag();
	1252	+
	1253	+ CreateTexturePanel(textures);
	1254	+
	1255	+ oe.toolboxPanel.add(textures);
	1256	+
	1257	+ textures.preferredHeight = 100;
	1258	+
	1259	+ CreateSkyboxPanel(oe.skyboxPanel);
	1260	+
	1261	+ // EDIT panel
	1262	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1263	+ editButton.setToolTipText("Pin selection controls");
502	1264	editButton.addActionListener(this);
503	1265
504		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
505		- uneditButton.setToolTipText("Unedit selection");
	1266	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1267	+ uneditButton.setToolTipText("Unpin and remove selection controls");
506	1268	uneditButton.addActionListener(this);
507	1269
508		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
509		- allParamsButton.setToolTipText("Edit all params");
	1270	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1271	+ allParamsButton.setToolTipText("Show all controls");
510	1272	allParamsButton.addActionListener(this);
511	1273
512		- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
513		- clearPanelButton.setToolTipText("Clear edit panel");
	1274	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1275	+ clearPanelButton.setToolTipText("Clear all controls");
514	1276	clearPanelButton.addActionListener(this);
515	1277
516		- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
517		- unselectButton.setToolTipText("Unselect");
518		- unselectButton.addActionListener(this);
	1278	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1279	+ //unselectButton.setToolTipText("Unselect");
	1280	+ //unselectButton.addActionListener(this);
519	1281
520		- commandsPanel.preferredHeight = 1;
	1282	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1283	+ flashSelectionButton.setToolTipText("Highlight selection");
	1284	+ flashSelectionButton.addActionListener(this);
521	1285
522		- oe.treePanel.add(commandsPanel);
523		- oe.treePanel.Return();
	1286	+ editCommandsPanel.preferredHeight = 1;
	1287	+
	1288	+ SetPinStates(false);
	1289	+// oe.treePanel.add(commandsPanel);
	1290	+// oe.treePanel.Return();
524	1291
525	1292	// oe.aConstraints.gridx += 1;
526	1293	// oe.aConstraints.weighty = 0;
..	..	@@ -537,32 +1304,20 @@
537	1304
538	1305	JScrollPane jSP;
539	1306	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
540		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1307	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
541	1308	ResetModel();
542	1309
543	1310	oe.treePanel.add(jSPPanel);
544	1311	oe.treePanel.Return();
545	1312
546		- cGridBag copyOptionsPanel = new cGridBag();
547		-
548		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
549		- colorCB.setToolTipText("Copy color when dropped");
550		- colorCB.addItemListener(this);
551		-
552		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
553		- materialCB.setToolTipText("Copy material when dropped");
554		- materialCB.addItemListener(this);
555		-
556		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
557		- textureCB.setToolTipText("Copy texture when dropped");
558		- textureCB.addItemListener(this);
559		-
560		- copyOptionsPanel.preferredHeight = 1;
561	1313	oe.treePanel.add(copyOptionsPanel);
562	1314	oe.treePanel.Return();
	1315	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1316	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1317	+ sliderPane.preferredHeight = 1;
563	1318
564		-// mainPanel.setDividerLocation(0.5); //1.0);
565		-// mainPanel.setResizeWeight(0.5);
	1319	+// mainPanel.setDividerLocation(0.1); //1.0);
	1320	+ mainPanel.setResizeWeight(0.4);
566	1321
567	1322	//jList.addListSelectionListener(this);
568	1323	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -570,7 +1325,7 @@
570	1325	//jTree.setEditable(true);
571	1326	oe.jTree.setDragEnabled(true);
572	1327	//jTree.setPreferredSize(new Dimension(10,10));
573		- jSP.setPreferredSize(new Dimension(100,200));
	1328	+ //jSP.setPreferredSize(new Dimension(100,200));
574	1329
575	1330	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
576	1331
..	..	@@ -582,19 +1337,49 @@
582	1337	dgr.addDragGestureListener(this);
583	1338	}catch(Exception e) {}
584	1339	*/
585		- radio.layout = sevenButton;
	1340	+ radio.layout = threeButton; // sixButton;
586	1341	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
587	1342	}
588	1343
589	1344	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
590	1345	{
591		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
592		- supportCB.setToolTipText("Enabled rigging");
593		- supportCB.addItemListener(this);
	1346	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1347	+ colorCB.setToolTipText("Copy color when dropped");
	1348	+ colorCB.addItemListener(this);
	1349	+
	1350	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1351	+ materialCB.setToolTipText("Copy material when dropped");
	1352	+ materialCB.addItemListener(this);
	1353	+
	1354	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1355	+ textureCB.setToolTipText("Copy texture when dropped");
	1356	+ textureCB.addItemListener(this);
	1357	+
	1358	+ panel.Return();
	1359	+
	1360	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	1361	+ boxCB.setToolTipText("Display bounding boxes");
	1362	+ boxCB.addItemListener(this);
	1363	+
	1364	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	1365	+ zoomBoxCB.setToolTipText("Display only for wheel");
	1366	+ zoomBoxCB.addItemListener(this);
	1367	+
	1368	+ if (true) // Globals.ADVANCED)
	1369	+ {
	1370	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1371	+// supportCB.setToolTipText("Enable rigging");
	1372	+// supportCB.addItemListener(this);
	1373	+
	1374	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1375	+ freezeCB.setToolTipText("Fast moving camera");
	1376	+ freezeCB.addItemListener(this);
594	1377
595	1378	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
596	1379	// localCB.addItemListener(this);
597	1380
	1381	+ panel.Return();
	1382	+
598	1383	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
599	1384	crowdCB.setToolTipText("Used for crowds");
600	1385	crowdCB.addItemListener(this);
..	..	@@ -603,22 +1388,19 @@
603	1388	smoothCB.setToolTipText("Snapping delay");
604	1389	smoothCB.addItemListener(this);
605	1390
606		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
607		- slowCB.setToolTipText("Smooth interpolation");
608		- slowCB.addItemListener(this);
	1391	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1392	+// slowCB.setToolTipText("Smooth interpolation");
	1393	+// slowCB.addItemListener(this);
	1394	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1395	+ minshaderCB.setToolTipText("Minimal fast shader");
	1396	+ minshaderCB.addItemListener(this);
609	1397
610		- panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
611		- boxCB.setToolTipText("Display bounding boxes");
612		- boxCB.addItemListener(this);
613		-
614		- panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
615		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
616		- zoomBoxCB.addItemListener(this);
617		-
618	1398	// constraints.gridy += 1;
619	1399	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
620	1400	// speakerMocapCB.addItemListener(this);
621	1401
	1402	+ panel.Return();
	1403	+
622	1404	if (false)
623	1405	{
624	1406	// handled in scripts
..	..	@@ -633,40 +1415,93 @@
633	1415	//constraints.gridy += 1;
634	1416	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
635	1417	smoothfocusCB.addItemListener(this);
	1418	+ panel.Return();
636	1419	}
637	1420
638	1421	//constraints.gridx += 1;
639	1422	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
640	1423	// debugCB.addItemListener(this);
641	1424
	1425	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1426	+ trackCB.setToolTipText("Enable tracking target");
	1427	+ trackCB.addItemListener(this);
	1428	+
642	1429	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1430	+ oeilCB.setToolTipText("Move camera when tracking");
643	1431	oeilCB.addItemListener(this);
644	1432
	1433	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1434	+ shadowCB.setToolTipText("When live compute shadows");
	1435	+ shadowCB.addItemListener(this);
	1436	+
	1437	+ panel.Return();
	1438	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1439	+ toggleTextureCB.setToolTipText("Load textures");
	1440	+ toggleTextureCB.addItemListener(this);
	1441	+
	1442	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1443	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1444	+ toggleSwitchCB.addItemListener(this);
	1445	+
	1446	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1447	+ autokeepCB.setToolTipText("On structure change");
	1448	+ autokeepCB.addItemListener(this);
	1449	+
	1450	+ panel.Return();
	1451	+ if (Globals.ADVANCED)
	1452	+ {
645	1453	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
646	1454	lookAtCB.setToolTipText("Look-at target");
647	1455	lookAtCB.addItemListener(this);
	1456	+ }
	1457	+
	1458	+ }
648	1459
649	1460	cGridBag fill = new cGridBag();
650		-
651	1461	fill.preferredHeight = 200;
	1462	+ cGridBag fill2 = new cGridBag();
	1463	+ fill2.preferredHeight = 200;
	1464	+ cGridBag fill3 = new cGridBag();
	1465	+ fill3.preferredHeight = 200;
652	1466
653	1467	panel.add(fill);
	1468	+ panel.add(fill2);
	1469	+ panel.add(fill3);
654	1470
655	1471	}
656	1472
657	1473	void EditObject(Object3D obj)
658	1474	{
	1475	+ assert(obj instanceof Composite);
	1476	+
	1477	+// if (obj.versionlist == null)
	1478	+// {
	1479	+// obj.versionlist = new Object3D[100];
	1480	+// obj.versionindex = -1;
	1481	+// }
	1482	+
659	1483	cRadio radioButton = new cRadio(obj.name);
	1484	+
	1485	+ // June 2019. Patch to avoid bug with transparency.
	1486	+ radioButton.hadMaterial = obj.material != null;
	1487	+ if (!radioButton.hadMaterial)
	1488	+ {
	1489	+ obj.material = new cMaterial();
	1490	+ }
	1491	+
660	1492	radioButton.SetObject(obj);
661		- radioButton.layout = sevenButton;
	1493	+ radioButton.layout = threeButton; // sixButton;
662	1494	radioButton.SetCamera(cameraView.renderCamera, false);
663	1495	radioButton.addActionListener(this);
664	1496	radioPanel.add(radioButton);
665	1497	buttonGroup.add(radioButton);
666	1498	radioButton.doClick();
667	1499	}
	1500	+
668	1501	void SetupViews(ObjEditor oe)
669	1502	{
	1503	+ theFrame = this;
	1504	+
670	1505	oe.SetupViews();
671	1506
672	1507	System.out.println("SetupViews");
..	..	@@ -675,23 +1510,30 @@
675	1510	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
676	1511	}
677	1512
678		- JCheckBox liveCB;
679		- JCheckBox supportCB;
680		- JCheckBox localCB;
681		- JCheckBox crowdCB;
682		- JCheckBox smoothCB;
683		- JCheckBox fastCB;
684		- JCheckBox slowCB;
685		- JCheckBox boxCB;
686		- JCheckBox zoomBoxCB;
687		- JCheckBox trackCB;
688		- JCheckBox smoothfocusCB;
	1513	+ cToggleButton liveCB;
	1514	+ cCheckBox supportCB;
	1515	+ cCheckBox localCB;
	1516	+ cCheckBox crowdCB;
	1517	+ cCheckBox smoothCB;
	1518	+ cCheckBox minshaderCB;
	1519	+
	1520	+ cToggleButton fastCB;
	1521	+ cCheckBox slowCB;
	1522	+ cCheckBox boxCB;
	1523	+ cCheckBox zoomBoxCB;
	1524	+ cCheckBox freezeCB;
	1525	+ //cToggleButton trackCB;
	1526	+ cCheckBox trackCB;
	1527	+ cCheckBox smoothfocusCB;
689	1528	// JCheckBox speakerMocapCB;
690		- JCheckBox speakerCameraCB;
691		- JCheckBox speakerFocusCB;
692		- JCheckBox debugCB;
693		- JCheckBox oeilCB;
694		- JCheckBox lookAtCB;
	1529	+ cCheckBox speakerCameraCB;
	1530	+ cCheckBox speakerFocusCB;
	1531	+ cCheckBox debugCB;
	1532	+
	1533	+ cCheckBox oeilCB;
	1534	+ cCheckBox shadowCB;
	1535	+ cCheckBox autokeepCB;
	1536	+ cCheckBox lookAtCB;
695	1537
696	1538	// static int COLOR = 1;
697	1539	// static int MATERIAL = 2;
..	..	@@ -699,9 +1541,9 @@
699	1541
700	1542	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
701	1543
702		- JCheckBox colorCB;
703		- JCheckBox materialCB;
704		- JCheckBox textureCB;
	1544	+ cCheckBox colorCB;
	1545	+ cCheckBox materialCB;
	1546	+ cCheckBox textureCB;
705	1547
706	1548	public void itemStateChanged(ItemEvent e)
707	1549	{
..	..	@@ -729,6 +1571,7 @@
729	1571	} else if(e.getSource() == liveCB)
730	1572	{
731	1573	cameraView.ToggleLive();
	1574	+ refreshContents(false);
732	1575	}
733	1576	else if(e.getSource() == supportCB)
734	1577	{
..	..	@@ -744,6 +1587,12 @@
744	1587	{
745	1588	cameraView.ToggleInertia();
746	1589	cameraView.repaint();
	1590	+ }
	1591	+ else if(e.getSource() == minshaderCB)
	1592	+ {
	1593	+ Globals.MINSHADER ^= true;
	1594	+ cameraView.programInitialized = false;
	1595	+ cameraView.repaint();
747	1596	}
748	1597	else if(e.getSource() == localCB)
749	1598	{
..	..	@@ -793,6 +1642,18 @@
793	1642	{
794	1643	cameraView.ToggleOeil();
795	1644	}
	1645	+ else if(e.getSource() == shadowCB)
	1646	+ {
	1647	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1648	+ }
	1649	+ else if(e.getSource() == freezeCB)
	1650	+ {
	1651	+ Globals.FREEZEONMOVE ^= true;
	1652	+ }
	1653	+ else if(e.getSource() == autokeepCB)
	1654	+ {
	1655	+ Globals.REPLACEONMAKE ^= true;
	1656	+ }
796	1657	else if(e.getSource() == lookAtCB)
797	1658	{
798	1659	cameraView.ToggleLookAt();
..	..	@@ -809,7 +1670,8 @@
809	1670
810	1671	/**/
811	1672	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
812		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1673	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1674	+ TreePath path = objEditor.jTree.getSelectionPath();
813	1675	if ((path == null) \|\| (path.getPathCount() <= 1)) {
814	1676	// We can't move the root node or an empty selection
815	1677	return;
..	..	@@ -872,8 +1734,6 @@
872	1734	}
873	1735	}
874	1736
875		- String string = (String) object;
876		-
877	1737	System.out.println("Transfer = " + object + "; drop : " + target);
878	1738	// if( object instanceof java.io.File[])
879	1739	// {
..	..	@@ -881,7 +1741,11 @@
881	1741	// objEditor.DropFile((java.io.File[]) object, true);
882	1742	// return;
883	1743	// }
884		- if (string.charAt(0) == '/')
	1744	+
	1745	+ String string = object.toString();
	1746	+
	1747	+ // File path for Mac and Windows
	1748	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
885	1749	{
886	1750	// file(s)
887	1751	String[] names = string.split("\n");
..	..	@@ -908,7 +1772,7 @@
908	1772
909	1773	flashIt = false;
910	1774	CameraPane pane = (CameraPane) target;
911		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1775	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
912	1776	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
913	1777
914	1778	if (group.selection.size() == 1)
..	..	@@ -924,23 +1788,33 @@
924	1788
925	1789	assert target == objEditor.jTree;
926	1790	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1791	+ Object3D destinationLeaf;
927	1792	try {
928		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1793	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
929	1794	} catch (Exception e) {
930	1795	System.out.println("destinationPath : " + destinationPath);
931	1796	return;
932	1797	}
933	1798
934		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1799	+ for (int i=group.selection.size(); --i>=0;)
935	1800	{
	1801	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1802	+
	1803	+ // Cannot move into itself
	1804	+ if (child == destinationLeaf)
	1805	+ return;
	1806	+ }
	1807	+
	1808	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1809	+// {
936	1810	loadClipboard(true);
937	1811	objEditor.jTree.setSelectionPath(destinationPath);
938		- pasteInto(false);
939		- } else {
940		- loadClipboard(false);
941		- objEditor.jTree.setSelectionPath(destinationPath);
942		- pasteInto(false); // true); // ???
943		- }
	1812	+ pasteInto(false, false);
	1813	+// } else {
	1814	+// loadClipboard(false);
	1815	+// objEditor.jTree.setSelectionPath(destinationPath);
	1816	+// pasteInto(false, false); // true); // ???
	1817	+// }
944	1818	}
945	1819	public void dropActionChanged(DropTargetDragEvent dtde)
946	1820	// Called if the user has modified the current drop gesture
..	..	@@ -996,7 +1870,12 @@
996	1870	TreePath path;
997	1871
998	1872	public TransferableTreePath(TreePath tp) {
999		- path = tp;
	1873	+ Object[] objs = new Object[tp.getPathCount()];
	1874	+ for (int i=0; i<objs.length; i++)
	1875	+ {
	1876	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1877	+ }
	1878	+ path = new TreePath(objs);
1000	1879	}
1001	1880
1002	1881	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1045,54 +1924,71 @@
1045	1924	{
1046	1925	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1047	1926	//heightFieldItem.addActionListener(this);
1048		- gridItem = menu.add(new MenuItem("Grid"));
1049		- gridItem.addActionListener(this);
1050		- rectoidItem = menu.add(new MenuItem("Box"));
1051		- rectoidItem.addActionListener(this);
1052		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1053		- ellipsoidItem.addActionListener(this);
1054		- coneItem = menu.add(new MenuItem("Cone"));
1055		- coneItem.addActionListener(this);
1056		- torusItem = menu.add(new MenuItem("Torus"));
1057		- torusItem.addActionListener(this);
1058		- superItem = menu.add(new MenuItem("Superellipsoid"));
1059		- superItem.addActionListener(this);
	1927	+// gridItem = menu.add(new MenuItem("Grid"));
	1928	+// gridItem.addActionListener(this);
	1929	+// rectoidItem = menu.add(new MenuItem("Box"));
	1930	+// rectoidItem.addActionListener(this);
	1931	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1932	+// ellipsoidItem.addActionListener(this);
	1933	+// coneItem = menu.add(new MenuItem("Cone"));
	1934	+// coneItem.addActionListener(this);
	1935	+// torusItem = menu.add(new MenuItem("Torus"));
	1936	+// torusItem.addActionListener(this);
	1937	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1938	+// superItem.addActionListener(this);
	1939	+
	1940	+ cameraItem = menu.add(new MenuItem("Camera"));
	1941	+ cameraItem.addActionListener(this);
	1942	+
	1943	+ if (!Globals.ADVANCED)
	1944	+ {
1060	1945	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1061	1946	kleinItem.addActionListener(this);
1062		- particleItem = menu.add(new MenuItem("Particle system"));
1063		- particleItem.addActionListener(this);
	1947	+ }
	1948	+
	1949	+// particleItem = menu.add(new MenuItem("Particle system"));
	1950	+// particleItem.addActionListener(this);
	1951	+ if (Globals.ADVANCED)
	1952	+ {
1064	1953	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1065	1954	ragdollItem.addActionListener(this);
1066	1955	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1067	1956	ragdoll2Item.addActionListener(this);
	1957	+ }
1068	1958	menu.add("-");
1069		- meshItem = menu.add(new MenuItem("Mesh"));
	1959	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1070	1960	meshItem.addActionListener(this);
1071	1961	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1072	1962	// meshGroupItem.addActionListener(this);
	1963	+ if (Globals.ADVANCED)
	1964	+ {
1073	1965	springItem = menu.add(new MenuItem("Spring"));
1074	1966	springItem.addActionListener(this);
1075	1967	flagItem = menu.add(new MenuItem("Flag"));
1076	1968	flagItem.addActionListener(this);
1077		- bezierItem = menu.add(new MenuItem("Patch"));
1078		- bezierItem.addActionListener(this);
1079		- checkerItem = menu.add(new MenuItem("Checker"));
1080		- checkerItem.addActionListener(this);
1081	1969	blobItem = menu.add(new MenuItem("Blob"));
1082	1970	blobItem.addActionListener(this);
1083	1971	latheItem = menu.add(new MenuItem("Lathe"));
1084	1972	latheItem.addActionListener(this);
1085		- lightItem = menu.add(new MenuItem("Light"));
1086		- lightItem.addActionListener(this);
	1973	+ }
	1974	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1975	+ bezierItem.addActionListener(this);
	1976	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1977	+// overlayItem.addActionListener(this);
	1978	+// lightItem = menu.add(new MenuItem("Light"));
	1979	+// lightItem.addActionListener(this);
1087	1980	menu.add("-");
1088	1981	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1089	1982	//superLoopItem.addActionListener(this);
1090		- loopItem = menu.add(new MenuItem("Loop"));
1091		- loopItem.addActionListener(this);
	1983	+// loopItem = menu.add(new MenuItem("Loop"));
	1984	+// loopItem.addActionListener(this);
1092	1985	doubleItem = menu.add(new MenuItem("Fork"));
1093	1986	doubleItem.addActionListener(this);
	1987	+ if (Globals.ADVANCED)
	1988	+ {
1094	1989	tripleItem = menu.add(new MenuItem("Trident"));
1095	1990	tripleItem.addActionListener(this);
	1991	+ }
1096	1992	}
1097	1993
1098	1994	void buildToolsMenu(Menu menu)
..	..	@@ -1101,29 +1997,34 @@
1101	1997	animationItem.addItemListener(this);
1102	1998	animationItem.setState(Globals.ANIMATION);
1103	1999
	2000	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	2001	+ archiveItem.addActionListener(this);
	2002	+
1104	2003	menu.add("-");
1105	2004	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1106	2005	parseverticesItem.addActionListener(this);
1107	2006	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1108	2007	textureFieldItem.addActionListener(this);
1109		- alignItem = menu.add(new MenuItem("Align"));
	2008	+ alignItem = menu.add(new MenuItem("Align Objects"));
1110	2009	alignItem.addActionListener(this);
1111		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1112		- mirrorItem.addActionListener(this);
1113	2010	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1114	2011	reduceMorphItem.addActionListener(this);
1115	2012	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1116	2013	reduce34MorphItem.addActionListener(this);
1117		-
1118		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1119		- computeAOItem.addActionListener(this);
1120	2014	menu.add("-");
1121		-
1122	2015	menu.add(memoryItem = new MenuItem("Memory Usage"));
1123	2016	memoryItem.addActionListener(this);
	2017	+ menu.add(computeAOItem = new MenuItem("Compute AO"));
	2018	+ computeAOItem.addActionListener(this);
	2019	+
	2020	+ if (Globals.ADVANCED)
	2021	+ {
	2022	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	2023	+ mirrorItem.addActionListener(this);
	2024	+ menu.add("-");
1124	2025	menu.add(analyzeItem = new MenuItem("Analyze"));
1125	2026	analyzeItem.addActionListener(this);
1126		- menu.add(dumpItem = new MenuItem("Dump"));
	2027	+ menu.add(dumpItem = new MenuItem("Print"));
1127	2028	dumpItem.addActionListener(this);
1128	2029	// menu.add(pathItem = new MenuItem("From-to path"));
1129	2030	// pathItem.addActionListener(this);
..	..	@@ -1141,6 +2042,7 @@
1141	2042	menu.add("-");
1142	2043	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1143	2044	editScriptItem.addActionListener(this);
	2045	+ }
1144	2046	}
1145	2047
1146	2048	void ScreenFit()
..	..	@@ -1263,9 +2165,34 @@
1263	2165	shadow.material = new cMaterial(obj.material);
1264	2166	shadow.material.diffuse = 0.0001f;
1265	2167	shadow.material.specular = 0.0001f;
	2168	+ //shadow.projectedVertices[1].x = 300;
1266	2169
1267	2170	makeSomething(shadow);
1268	2171	}
	2172	+
	2173	+ private void ClearUnpinned()
	2174	+ {
	2175	+ //for (Object3D obj : listUI)
	2176	+ for (int i=listUI.size(); --i>=0;)
	2177	+ {
	2178	+ Object3D obj = listUI.elementAt(i);
	2179	+ if (!obj.pinned)
	2180	+ {
	2181	+ obj.CloseUI();
	2182	+ listUI.remove(i);
	2183	+ }
	2184	+ }
	2185	+ }
	2186	+
	2187	+ private void EditElement(Object3D elem, boolean newWindow)
	2188	+ {
	2189	+ // if (!(elem instanceof Composite))
	2190	+ // newWindow = false;
	2191	+ listUI.add(elem);
	2192	+ elem.openEditWindow(this, newWindow); //, false);
	2193	+ System.out.println("edit : " + elem);
	2194	+ elem.editWindow.refreshContents(true); // ? new
	2195	+ }
1269	2196
1270	2197	/**
1271	2198	* applyExample
..	..	@@ -1469,9 +2396,9 @@
1469	2396
1470	2397	void Overwrite(int mask)
1471	2398	{
1472		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2399	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1473	2400	{
1474		- Object3D content = GrafreeD.clipboard.get(0);
	2401	+ Object3D content = Grafreed.clipboard.get(0);
1475	2402
1476	2403	if (content instanceof cGroup && ((cGroup)content).transientlink )
1477	2404	content = ((cGroup)content).get(0);
..	..	@@ -1510,7 +2437,7 @@
1510	2437	{
1511	2438	ScreenFit();
1512	2439	} else
1513		- if (source == switchItem)
	2440	+ if (source == switchViewItem)
1514	2441	{
1515	2442	cVector v1 = new cVector();
1516	2443	cVector v2 = new cVector();
..	..	@@ -1519,11 +2446,11 @@
1519	2446	objEditor.cameraView.renderCamera.setAim(v2, v1);
1520	2447	objEditor.cameraView.repaint();
1521	2448	} else
1522		- if (source == rectoidItem)
	2449	+ if (source == rectoidItem \|\| source == boxButton)
1523	2450	{
1524	2451	makeSomething(new Box());
1525	2452	} else
1526		- if (source == particleItem)
	2453	+ if (source == particleItem \|\| source == particlesButton)
1527	2454	{
1528	2455	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1529	2456	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1602,27 +2529,27 @@
1602	2529
1603	2530	makeSomething(obj);
1604	2531	} else
1605		- if (source == gridItem)
	2532	+ if (source == gridItem \|\| source == gridButton)
1606	2533	{
1607	2534	makeSomething(new Grid());
1608	2535	} else
1609		- if (source == ellipsoidItem)
	2536	+ if (source == ellipsoidItem \|\| source == sphereButton)
1610	2537	{
1611	2538	makeSomething(new Sphere());
1612	2539	} else
1613		- if (source == coneItem)
	2540	+ if (source == coneItem \|\| source == coneButton)
1614	2541	{
1615	2542	makeSomething(new Cone());
1616	2543	} else
1617		- if (source == torusItem)
	2544	+ if (source == torusItem \|\| source == torusButton)
1618	2545	{
1619	2546	makeSomething(new Torus());
1620	2547	} else
1621		- if (source == superItem)
	2548	+ if (source == superItem \|\| source == superButton)
1622	2549	{
1623	2550	makeSomething(new Superellipsoid());
1624	2551	} else
1625		- if (source == kleinItem)
	2552	+ if (source == kleinItem \|\| source == kleinButton)
1626	2553	{
1627	2554	makeSomething(new Klein());
1628	2555	} else
..	..	@@ -1642,7 +2569,7 @@
1642	2569	{
1643	2570	makeSomething(new BezierSurface());
1644	2571	} else
1645		- if (source == checkerItem)
	2572	+ if (source == overlayItem \|\| source == overlayButton)
1646	2573	{
1647	2574	/*
1648	2575	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1690,10 +2617,27 @@
1690	2617	s.setup();
1691	2618	makeSomething(s);
1692	2619	} else
1693		- if (source == lightItem)
	2620	+ if (source == lightItem \|\| source == lightButton)
1694	2621	{
1695	2622	makeSomething(new Light());
1696	2623	} else
	2624	+// if (source == skybox1Button \|\|
	2625	+// source == skybox2Button \|\|
	2626	+// source == skybox3Button \|\|
	2627	+// source == skybox4Button \|\|
	2628	+// source == skybox5Button \|\|
	2629	+// source == skybox6Button \|\|
	2630	+// source == skybox7Button \|\|
	2631	+// source == skybox11Button \|\|
	2632	+// source == skybox12Button \|\|
	2633	+// source == skybox13Button \|\|
	2634	+// source == skybox14Button \|\|
	2635	+// source == skybox15Button \|\|
	2636	+// source == skybox16Button \|\|
	2637	+// source == skybox17Button)
	2638	+// {
	2639	+// ChangeSkybox(source);
	2640	+// } else
1697	2641	if (source == csgItem)
1698	2642	{
1699	2643	group(new CSG());
..	..	@@ -1740,30 +2684,38 @@
1740	2684
1741	2685	group(g);
1742	2686	} else
1743		- if (source == loopItem)
	2687	+ if (source == loopItem \|\| source == loopButton)
1744	2688	{
	2689	+ if (!group.selection.isEmpty())
	2690	+ {
1745	2691	Composite csg = new GroupLeaf();
1746	2692	csg.count = 5;
1747		- group(csg);
1748		- Composite child = new cGroup();
	2693	+ Composite child = new cGroup("Branch");
1749	2694	csg.addChild(child);
1750	2695	child.addChild(csg);
	2696	+ group(csg);
	2697	+ }
1751	2698	} else
1752	2699	if (source == doubleItem)
1753	2700	{
1754		- Composite csg = new GroupLeaf();
	2701	+ if (!group.selection.isEmpty())
	2702	+ {
	2703	+ Composite csg = new GroupLeaf("Fork");
1755	2704	csg.count = 5;
	2705	+ Composite child = new cGroup("Branch A");
	2706	+ csg.addChild(child);
	2707	+ child.addChild(csg);
	2708	+ child = new cGroup("Branch B");
	2709	+ csg.addChild(child);
	2710	+ child.addChild(csg);
1756	2711	group(csg);
1757		- Composite child = new cGroup();
1758		- csg.addChild(child);
1759		- child.addChild(csg);
1760		- child = new cGroup();
1761		- csg.addChild(child);
1762		- child.addChild(csg);
	2712	+ }
1763	2713	} else
1764	2714	if (source == tripleItem)
1765	2715	{
1766		- Composite csg = new GroupLeaf();
	2716	+ if (!group.selection.isEmpty())
	2717	+ {
	2718	+ Composite csg = new GroupLeaf("Trident");
1767	2719	csg.count = 4;
1768	2720	group(csg);
1769	2721	Composite child = new cGroup();
..	..	@@ -1775,28 +2727,12 @@
1775	2727	child = new cGroup();
1776	2728	csg.addChild(child);
1777	2729	child.addChild(csg);
1778		- } else
1779		-
1780		- if (source == importGFDItem)
1781		- {
1782		- ImportGFD();
1783		- } else
1784		- if (source == importVRMLX3DItem)
1785		- {
1786		- ImportVRMLX3D();
1787		- } else
1788		- if (source == import3DSItem)
1789		- {
1790		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1791		- } else
1792		- if (source == importOBJItem)
1793		- {
1794		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	2730	+ }
1795	2731	} else
1796	2732	if (source == computeAOItem)
1797	2733	{
1798	2734	Globals.drawMode = CameraPane.OCCLUSION;
1799		- Globals.theRenderer.repaint();
	2735	+ cameraView.repaint();
1800	2736	} else
1801	2737	if (source == recompileItem)
1802	2738	{
..	..	@@ -1811,7 +2747,7 @@
1811	2747	if (source == invariantsItem)
1812	2748	{
1813	2749	System.out.println("Invariants:");
1814		- GrafreeD.grafreeD.universe.invariants();
	2750	+ Grafreed.grafreed.universe.invariants();
1815	2751	} else
1816	2752	if (source == memoryItem)
1817	2753	{
..	..	@@ -1830,19 +2766,80 @@
1830	2766	{
1831	2767	DumpObject();
1832	2768	} else
	2769	+ if (source == minButton)
	2770	+ {
	2771	+ Minimize();
	2772	+ } else
	2773	+ if (source == maxButton)
	2774	+ {
	2775	+ Maximize();
	2776	+ } else
	2777	+ if (source == fullButton)
	2778	+ {
	2779	+ ToggleFullScreen();
	2780	+ } else
	2781	+ if (source == collapseButton)
	2782	+ {
	2783	+ this.expandedLayout = radio.layout;
	2784	+ CollapseToolbar();
	2785	+ } else
	2786	+ if (source == maximize3DButton)
	2787	+ {
	2788	+ this.expandedLayout = radio.layout;
	2789	+ radio.layout = twoButton;
	2790	+ Show3DView();
	2791	+ CollapseToolbar();
	2792	+ } else
	2793	+ if (source == previousVersionButton)
	2794	+ {
	2795	+ // Go to previous version
	2796	+ //if (!Undo())
	2797	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2798	+ PreviousVersion();
	2799	+ } else
	2800	+ if (source == restoreButton)
	2801	+ {
	2802	+ // Restore current version
	2803	+ Restore();
	2804	+ //restoreButton.setEnabled(false);
	2805	+ } else
	2806	+ if (source == replaceButton)
	2807	+ {
	2808	+ // Overwrite current version
	2809	+ Replace();
	2810	+ //replaceButton.setEnabled(false);
	2811	+ } else
	2812	+ if (source == nextVersionButton)
	2813	+ {
	2814	+ // Go to next version
	2815	+ NextVersion();
	2816	+ } else
	2817	+ if (source == saveVersionButton)
	2818	+ {
	2819	+ // Save a new version
	2820	+ if (!Save(true))
	2821	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2822	+ } else
	2823	+ if (source == deleteVersionButton)
	2824	+ {
	2825	+ // Delete a new version
	2826	+ DeleteVersion();
	2827	+ } else
	2828	+ if (source == oneStepButton)
	2829	+ {
	2830	+ Globals.ONESTEP = true;
	2831	+ cameraView.repaint();
	2832	+ } else
1833	2833	if (source == screenfitButton)
1834	2834	{
1835		- //Reload(lastConverter, lastFilename, true);
1836	2835	ScreenFit();
1837	2836	} else
1838	2837	if (source == screenfitpointButton)
1839	2838	{
1840		- //Reload(lastConverter, lastFilename, true);
1841	2839	ScreenFitPoint();
1842	2840	} else
1843	2841	if (source == snapobjectButton)
1844	2842	{
1845		- //Reload(lastConverter, lastFilename, true);
1846	2843	SnapObject();
1847	2844	} else
1848	2845	// if (event.getSource() == recompileButton)
..	..	@@ -1879,12 +2876,20 @@
1879	2876	{
1880	2877	loadClipboard(true);
1881	2878	} else
	2879	+ if (source == undoItem)
	2880	+ {
	2881	+ PreviousVersion();
	2882	+ } else
	2883	+ if (source == redoItem)
	2884	+ {
	2885	+ NextVersion();
	2886	+ } else
1882	2887	if (source == duplicateItem)
1883	2888	{
1884		- Object3D keep = GrafreeD.clipboard;
	2889	+ Object3D keep = Grafreed.clipboard;
1885	2890	loadClipboard(false);
1886	2891	paste(false);
1887		- GrafreeD.clipboard = keep;
	2892	+ Grafreed.clipboard = keep;
1888	2893	} else
1889	2894	if (source == cloneItem)
1890	2895	{
..	..	@@ -1902,13 +2907,17 @@
1902	2907	{
1903	2908	paste(false);
1904	2909	} else
	2910	+ if (source == pasteIntoItem)
	2911	+ {
	2912	+ pasteInto(true, false);
	2913	+ } else
1905	2914	if (source == pasteLinkItem)
1906	2915	{
1907		- pasteInto(false);
	2916	+ pasteInto(false, false);
1908	2917	} else
1909	2918	if (source == pasteCloneItem)
1910	2919	{
1911		- pasteInto(true);
	2920	+ pasteInto(true, true);
1912	2921	} else
1913	2922	if (source == pasteExpandItem)
1914	2923	{
..	..	@@ -2100,9 +3109,9 @@
2100	3109	// group.selection.get(0).setMasterThis(content); // should be identity
2101	3110	// refreshContents();
2102	3111	// }
2103		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	3112	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2104	3113	{
2105		- Object3D content = GrafreeD.clipboard.get(0);
	3114	+ Object3D content = Grafreed.clipboard.get(0);
2106	3115
2107	3116	if (content instanceof cGroup && ((cGroup)content).transientlink )
2108	3117	content = ((cGroup)content).get(0);
..	..	@@ -2110,11 +3119,11 @@
2110	3119	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2111	3120	for (int i=0; i<group.selection.size(); i++)
2112	3121	{
2113		- boolean random = CameraPane.RANDOM;
2114		- CameraPane.RANDOM = false; // parse all random nodes
	3122	+ boolean random = CameraPane.SWITCH;
	3123	+ CameraPane.SWITCH = false; // parse all random nodes
2115	3124	group.selection.get(i).linkVerticesThis(content);
2116	3125	// group.selection.get(i).setMasterThis(content); // should be identity
2117		- CameraPane.RANDOM = random;
	3126	+ CameraPane.SWITCH = random;
2118	3127	}
2119	3128	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2120	3129	refreshContents();
..	..	@@ -2124,20 +3133,20 @@
2124	3133	{
2125	3134	for (int i=0; i<group.selection.size(); i++)
2126	3135	{
2127		- boolean random = CameraPane.RANDOM;
2128		- CameraPane.RANDOM = false; // parse all random nodes
	3136	+ boolean random = CameraPane.SWITCH;
	3137	+ CameraPane.SWITCH = false; // parse all random nodes
2129	3138	group.selection.get(i).linkVerticesThis(null);
2130		- CameraPane.RANDOM = random;
	3139	+ CameraPane.SWITCH = random;
2131	3140	}
2132	3141
2133	3142	refreshContents();
2134	3143	} else
2135	3144	if (source == relinkverticesItem)
2136	3145	{
2137		- boolean random = CameraPane.RANDOM;
2138		- CameraPane.RANDOM = false; // parse all random nodes
	3146	+ boolean random = CameraPane.SWITCH;
	3147	+ CameraPane.SWITCH = false; // parse all random nodes
2139	3148	group.selection.RelinkToSupport();
2140		- CameraPane.RANDOM = random;
	3149	+ CameraPane.SWITCH = random;
2141	3150
2142	3151	refreshContents();
2143	3152	} else
..	..	@@ -2152,9 +3161,9 @@
2152	3161	} else
2153	3162	if (source == setMasterItem)
2154	3163	{
2155		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	3164	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2156	3165	{
2157		- Object3D content = GrafreeD.clipboard.get(0);
	3166	+ Object3D content = Grafreed.clipboard.get(0);
2158	3167
2159	3168	if (content instanceof cGroup && ((cGroup)content).transientlink )
2160	3169	content = ((cGroup)content).get(0);
..	..	@@ -2167,9 +3176,9 @@
2167	3176	{
2168	3177	if (group.selection.size() == 1)
2169	3178	{
2170		- if (GrafreeD.clipboard.size() == 1)
	3179	+ if (Grafreed.clipboard.size() == 1)
2171	3180	{
2172		- Object3D content = GrafreeD.clipboard.get(0);
	3181	+ Object3D content = Grafreed.clipboard.get(0);
2173	3182
2174	3183	if (content instanceof cGroup && ((cGroup)content).transientlink )
2175	3184	content = ((cGroup)content).get(0);
..	..	@@ -2186,7 +3195,7 @@
2186	3195	{
2187	3196	RevertMeshes();
2188	3197	} else
2189		- if (source == resetMeshItem)
	3198	+ if (source == resetAllItem)
2190	3199	{
2191	3200	ResetAll();
2192	3201	} else
..	..	@@ -2194,7 +3203,7 @@
2194	3203	{
2195	3204	StepAll();
2196	3205	} else
2197		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3206	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2198	3207	{
2199	3208	//int indices[] = jList.getSelectedIndices();
2200	3209	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2206,9 +3215,9 @@
2206	3215	{
2207	3216	ClearSelection(true);
2208	3217	} else
2209		- if (source == grabItem)
	3218	+ if (source == grabItem \|\| source == groupButton)
2210	3219	{
2211		- group(new cGroup(), true);
	3220	+ group(new cGroup(), false); // true);
2212	3221	} else
2213	3222	if (source == hideItem)
2214	3223	{
..	..	@@ -2226,11 +3235,11 @@
2226	3235	{
2227	3236	makeSomething(new Camera());
2228	3237	} else
2229		- if (source == compositeItem)
	3238	+ if (source == compositeItem \|\| source == compositeButton)
2230	3239	{
2231	3240	group(new Composite());
2232	3241	} else
2233		- if (source == randomItem)
	3242	+ if (source == switchItem \|\| source == switchButton)
2234	3243	{
2235	3244	RandomNode random = new RandomNode();
2236	3245	group(random);
..	..	@@ -2332,7 +3341,7 @@
2332	3341	{
2333	3342	group(new cLinker());
2334	3343	} else
2335		- if (source == textureItem)
	3344	+ if (source == textureItem \|\| source == textureButton)
2336	3345	{
2337	3346	group(new TextureNode());
2338	3347	} else
..	..	@@ -2352,17 +3361,42 @@
2352	3361	{
2353	3362	CastShadow(2);
2354	3363	} else
2355		- if (source == ungroupItem)
	3364	+ if (source == ungroupItem \|\| source == ungroupButton)
2356	3365	{
2357		- //ungroup();
	3366	+ boolean canUngroup = true;
	3367	+
2358	3368	for (int i=0; i<group.selection.size(); i++)
2359	3369	{
2360		- Ungroup(group.selection.get(i));
	3370	+ Object3D selectedItem = group.selection.get(i);
	3371	+
	3372	+ if (selectedItem.Size() == 0)
	3373	+ {
	3374	+ // Cannot ungroup leaves
	3375	+ canUngroup = false;
	3376	+ break;
	3377	+ }
	3378	+
	3379	+ if (selectedItem == group)
	3380	+ {
	3381	+ // Cannot ungroup root
	3382	+ canUngroup = false;
	3383	+ break;
	3384	+ }
2361	3385	}
2362	3386
2363		- ClearSelection(false);
2364		-
2365		- refreshContents();
	3387	+ if (canUngroup)
	3388	+ {
	3389	+ for (int i=0; i<group.selection.size(); i++)
	3390	+ {
	3391	+ Object3D selectedItem = group.selection.get(i);
	3392	+
	3393	+ Ungroup(selectedItem);
	3394	+ }
	3395	+
	3396	+ ClearSelection(false);
	3397	+
	3398	+ refreshContents();
	3399	+ }
2366	3400	} else
2367	3401	if (source == genUVItem)
2368	3402	{
..	..	@@ -2374,7 +3408,7 @@
2374	3408	} else
2375	3409	if (source == genNormalsMESHItem)
2376	3410	{
2377		- GenNormals(true); // TODO
	3411	+ GenNormalsMESH();
2378	3412	} else
2379	3413	if (source == genNormalsORGANItem)
2380	3414	{
..	..	@@ -2439,6 +3473,22 @@
2439	3473	if (source == unmarkleavesItem)
2440	3474	{
2441	3475	MarkLeaves(false);
	3476	+ } else
	3477	+ if (source == rewindleavesItem)
	3478	+ {
	3479	+ RewindLeaves(true);
	3480	+ } else
	3481	+ if (source == unrewindleavesItem)
	3482	+ {
	3483	+ RewindLeaves(false);
	3484	+ } else
	3485	+ if (source == randomleavesItem)
	3486	+ {
	3487	+ RandomLeaves(true);
	3488	+ } else
	3489	+ if (source == unrandomleavesItem)
	3490	+ {
	3491	+ RandomLeaves(false);
2442	3492	} else
2443	3493	if (source == flipVItem)
2444	3494	{
..	..	@@ -2524,9 +3574,13 @@
2524	3574	{
2525	3575	SmoothMesh();
2526	3576	} else
2527		- if (source == transformgeometryItem)
	3577	+ if (source == transformGeometryItem)
2528	3578	{
2529	3579	TransformGeometry();
	3580	+ } else
	3581	+ if (source == transformChildrenItem)
	3582	+ {
	3583	+ TransformChildren();
2530	3584	} else
2531	3585	if (source == resetTransformItem)
2532	3586	{
..	..	@@ -2534,7 +3588,11 @@
2534	3588	} else
2535	3589	if (source == resetCentroidItem)
2536	3590	{
2537		- ResetCentroid();
	3591	+ ResetCentroid(true);
	3592	+ } else
	3593	+ if (source == resetCentroidXZItem)
	3594	+ {
	3595	+ ResetCentroid(false);
2538	3596	} else
2539	3597	if (source == resetParentItem)
2540	3598	{
..	..	@@ -2639,7 +3697,7 @@
2639	3697	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2640	3698	{
2641	3699	obj = (Object3D)e.nextElement();
2642		- obj.SetBumpTexture(null);
	3700	+ obj.ResetBumpTexture();
2643	3701	}
2644	3702
2645	3703	refreshContents();
..	..	@@ -2655,6 +3713,31 @@
2655	3713
2656	3714	refreshContents();
2657	3715	} else
	3716	+ if (source == embedTexturesItem)
	3717	+ {
	3718	+ Object3D obj;
	3719	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3720	+ {
	3721	+ obj = (Object3D)e.nextElement();
	3722	+ obj.EmbedTextures(true);
	3723	+ }
	3724	+
	3725	+ refreshContents();
	3726	+ } else
	3727	+ if (source == deEmbedTexturesItem)
	3728	+ {
	3729	+ Object3D obj;
	3730	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3731	+ {
	3732	+ obj = (Object3D)e.nextElement();
	3733	+ obj.EmbedTextures(false);
	3734	+ }
	3735	+
	3736	+ CameraPane.texturepigment.clear();
	3737	+ CameraPane.texturebump.clear();
	3738	+
	3739	+ refreshContents();
	3740	+ } else
2658	3741	if (source == flashSelectionButton)
2659	3742	{
2660	3743	CameraPane.flash = true;
..	..	@@ -2666,42 +3749,36 @@
2666	3749	if (source == twoButton)
2667	3750	{
2668	3751	radio.layout = twoButton;
2669		- // bug
2670		- //gridPanel.setDividerLocation(1.0);
2671		- //bigPanel.setDividerLocation(0.0);
2672		-// bigThree.remove(scenePanel);
2673		-// bigThree.remove(centralPanel);
2674		-// bigThree.remove(XYZPanel);
2675		-// aWindowConstraints.gridx = 0;
2676		-// aWindowConstraints.gridy = 0;
2677		-// aWindowConstraints.gridwidth = 1;
2678		-// // aConstraints.gridheight = 3;
2679		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2680		-// aWindowConstraints.weightx = 0;
2681		-// aWindowConstraints.weighty = 1;
2682		-// //bigThree.add(jtp, aWindowConstraints);
2683		-// aWindowConstraints.weightx = 1;
2684		-// aWindowConstraints.gridwidth = 3;
2685		-// // aConstraints.gridheight = 3;
2686		-// aWindowConstraints.gridx = 1;
2687		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
2688		-// bigThree.add(centralPanel, aWindowConstraints);
2689		-// aWindowConstraints.weightx = 0;
2690		-// aWindowConstraints.gridx = 4;
2691		-// aWindowConstraints.gridwidth = 1;
2692		-// // aConstraints.gridheight = 3;
2693		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2694		-// //bigThree.add(XYZPanel, aWindowConstraints);
2695		-// scenePanel.setVisible(false);
2696		-// centralPanel.setVisible(true);
2697		-// XYZPanel.setVisible(false);
2698		- bigThree.ClearUI();
2699		- bigThree.add(centralPanel);
2700		- bigThree.FlushUI();
	3752	+
	3753	+ if (CameraPane.FULLSCREEN)
	3754	+ fullscreenLayout = radio.layout;
	3755	+
	3756	+ Show3DView();
	3757	+
	3758	+ cameraView.requestFocusInWindow();
	3759	+
	3760	+// refreshContents(true);
	3761	+//
	3762	+// try
	3763	+// {
	3764	+// java.awt.Robot bot = new java.awt.Robot();
	3765	+// int mask = InputEvent.BUTTON1_MASK;
	3766	+// bot.mouseMove(100, 100);
	3767	+// bot.mousePress(mask);
	3768	+// bot.mouseRelease(mask);
	3769	+// }
	3770	+// catch (Exception e)
	3771	+// {
	3772	+//
	3773	+// }
	3774	+
2701	3775	} else
2702	3776	if (source == threeButton)
2703	3777	{
2704	3778	radio.layout = threeButton;
	3779	+
	3780	+ if (CameraPane.FULLSCREEN)
	3781	+ fullscreenLayout = radio.layout;
2705	3782
2706	3783	// bigThree.remove(scenePanel);
2707	3784	// bigThree.remove(centralPanel);
..	..	@@ -2731,13 +3808,18 @@
2731	3808	// centralPanel.setVisible(true);
2732	3809	// XYZPanel.setVisible(true);
2733	3810	bigThree.ClearUI();
	3811	+ bigThree.add(scenePanel);
2734	3812	bigThree.add(centralPanel);
2735		- bigThree.add(XYZPanel);
2736	3813	bigThree.FlushUI();
	3814	+
	3815	+ cameraView.requestFocusInWindow();
2737	3816	} else
2738	3817	if (source == fourButton)
2739	3818	{
2740	3819	radio.layout = fourButton;
	3820	+
	3821	+ if (CameraPane.FULLSCREEN)
	3822	+ fullscreenLayout = radio.layout;
2741	3823
2742	3824	// bigThree.remove(scenePanel);
2743	3825	// bigThree.remove(centralPanel);
..	..	@@ -2769,10 +3851,15 @@
2769	3851	bigThree.ClearUI();
2770	3852	bigThree.add(scenePanel);
2771	3853	bigThree.FlushUI();
	3854	+
	3855	+ cameraView.requestFocusInWindow();
2772	3856	} else
2773	3857	if (source == sixButton)
2774	3858	{
2775	3859	radio.layout = sixButton;
	3860	+
	3861	+ if (CameraPane.FULLSCREEN)
	3862	+ fullscreenLayout = radio.layout;
2776	3863
2777	3864	// bigThree.remove(scenePanel);
2778	3865	// bigThree.remove(centralPanel);
..	..	@@ -2802,13 +3889,18 @@
2802	3889	// centralPanel.setVisible(true);
2803	3890	// XYZPanel.setVisible(false);
2804	3891	bigThree.ClearUI();
2805		- bigThree.add(scenePanel);
2806	3892	bigThree.add(centralPanel);
	3893	+ bigThree.add(scenePanel);
2807	3894	bigThree.FlushUI();
	3895	+
	3896	+ cameraView.requestFocusInWindow();
2808	3897	} else
2809	3898	if (source == sevenButton)
2810	3899	{
2811	3900	radio.layout = sevenButton;
	3901	+
	3902	+ if (CameraPane.FULLSCREEN)
	3903	+ fullscreenLayout = radio.layout;
2812	3904
2813	3905	// bigThree.remove(scenePanel);
2814	3906	// bigThree.remove(centralPanel);
..	..	@@ -2842,9 +3934,12 @@
2842	3934	bigThree.add(centralPanel);
2843	3935	bigThree.add(XYZPanel);
2844	3936	bigThree.FlushUI();
	3937	+
	3938	+ cameraView.requestFocusInWindow();
2845	3939	} else
2846	3940	if (source == rootButton)
2847	3941	{
	3942	+ Replace();
2848	3943	Object3D obj;
2849	3944	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2850	3945	{
..	..	@@ -2853,6 +3948,7 @@
2853	3948	EditObject(obj);
2854	3949	}
2855	3950
	3951	+ cameraView.requestFocusInWindow();
2856	3952	refreshContents(true);
2857	3953	} else
2858	3954	if (source == closeButton)
..	..	@@ -2862,22 +3958,37 @@
2862	3958	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2863	3959	{
2864	3960	ab = (cRadio)e.nextElement();
2865		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3961	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2866	3962	{
	3963	+ // Patch to avoid bug with transparency.
	3964	+ if (!ab.hadMaterial)
	3965	+ {
	3966	+ ab.object.material = null;
	3967	+ }
	3968	+
2867	3969	buttonGroup.remove(ab);
2868	3970	radioPanel.remove(ab);
2869	3971
2870		- ab.GetObject().editWindow = null;
	3972	+ //ab.GetObject().editWindow = null;
	3973	+ ab.GetObject().manipWindow = null;
2871	3974	// ab.GetObject().objectUI = null; // ?????????
2872	3975
2873	3976	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2874	3977	break;
2875	3978	}
2876	3979	}
	3980	+
	3981	+ cameraView.requestFocusInWindow();
2877	3982	refreshContents(true);
2878	3983	} else
2879	3984	if (source == editItem \|\| source == editButton)
2880	3985	{
	3986	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3987	+ {
	3988	+ Object3D child = (Object3D)e.nextElement();
	3989	+ child.pinned = true;
	3990	+ }
	3991	+
2881	3992	EditSelection(false);
2882	3993	} else
2883	3994	if (source == uneditButton)
..	..	@@ -2886,11 +3997,12 @@
2886	3997	{
2887	3998	Object3D child = (Object3D)e.nextElement();
2888	3999	if(child.editWindow != null)
2889		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4000	+ child.pinned = false;
2890	4001	child.CloseUI();
2891	4002	listUI.remove(child);
	4003	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2892	4004
2893		- child.editWindow = null; // ???????????
	4005	+ //child.editWindow = null; // ???????????
2894	4006	}
2895	4007	objEditor.ctrlPanel.FlushUI();
2896	4008	//objEditor.jTree.clearSelection();
..	..	@@ -2903,16 +4015,18 @@
2903	4015	//copy.ClearUI();
2904	4016	for (Object3D obj : listUI)
2905	4017	{
	4018	+ obj.pinned = false;
2906	4019	obj.CloseUI();
2907	4020	}
2908	4021	listUI.clear();
	4022	+ SetPinStates(group.selection.size() > 0);
2909	4023	refreshContents(true);
2910	4024	} else
2911	4025	if (source == allParamsButton)
2912	4026	{
2913	4027	assert(copy == group);
2914	4028
2915		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4029	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2916	4030
2917	4031	for (Object3D obj : listUI)
2918	4032	{
..	..	@@ -2961,6 +4075,7 @@
2961	4075	}
2962	4076
2963	4077	copy = group;
	4078	+
2964	4079	//Globals.theRenderer.object = group;
2965	4080	if(!useclient)
2966	4081	{
..	..	@@ -2976,20 +4091,61 @@
2976	4091	frontView.object = group;
2977	4092	sideView.object = group;
2978	4093	}
2979		- group.editWindow = this;
	4094	+
	4095	+// fix "+" issue
	4096	+ //group.editWindow = this;
	4097	+ group.manipWindow = this;
	4098	+
2980	4099	/*
2981	4100	currentLayout = radio.layout;
2982	4101	if (currentLayout == null)
2983	4102	currentLayout = sevenButton;
2984	4103	*/
2985	4104	radio.layout.doClick();
	4105	+
	4106	+ assert(copy instanceof Composite);
	4107	+
	4108	+ if (copy.versionlist == null)
	4109	+ {
	4110	+ copy.versionlist = new Object3D[100];
	4111	+ copy.versionindex = -1;
	4112	+
	4113	+ Save(true);
	4114	+ }
	4115	+
	4116	+ SetVersionStates();
	4117	+
	4118	+ ClearUnpinned();
	4119	+
	4120	+ //Grafreed.Assert(group != null);
	4121	+ //Grafreed.Assert(group.selection != null);
	4122	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4123	+ if (group.selection == null \|\| group.selection.size() == 1)
	4124	+ EditSelection(false);
2986	4125	keepparent = group.parent;
2987	4126	// PARENT = NULL or not???
2988	4127	//group.parent = null; // ROOT
2989	4128	//group.attributes = -1;
2990	4129	ResetModel();
	4130	+
	4131	+ cameraView.requestFocusInWindow();
2991	4132	refreshContents(true);
2992		- }
	4133	+ } else if (event.getSource() == editCameraItem)
	4134	+ {
	4135	+ cameraView.ProtectCamera();
	4136	+ cameraView.requestFocusInWindow();
	4137	+ cameraView.repaint();
	4138	+ return;
	4139	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	4140	+ {
	4141	+ cameraView.RevertCamera();
	4142	+ cameraView.requestFocusInWindow();
	4143	+ cameraView.repaint();
	4144	+ return;
	4145	+ // } else if (event.getSource() == textureButton)
	4146	+ // {
	4147	+ // return; // true;
	4148	+ }
2993	4149	else
2994	4150	{
2995	4151	//return super.action(event, arg);
..	..	@@ -2998,7 +4154,6 @@
2998	4154	}
2999	4155
3000	4156	boolean useclient = false;
3001		- cRadio radio;
3002	4157
3003	4158	void ToggleRoot()
3004	4159	{
..	..	@@ -3050,6 +4205,28 @@
3050	4205	refreshContents();
3051	4206	}
3052	4207
	4208	+ void TransformChildren()
	4209	+ {
	4210	+ Object3D obj;
	4211	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4212	+ {
	4213	+ obj = (Object3D)e.nextElement();
	4214	+ obj.KeepTextureMatrices();
	4215	+ obj.TransformChildren();
	4216	+ obj.RestoreTextureMatrices();
	4217	+
	4218	+// if (obj.parent == null)
	4219	+// {
	4220	+// System.out.println("NULL PARENT!");
	4221	+// new Exception().printStackTrace();
	4222	+// }
	4223	+// else
	4224	+// TouchTransform(obj);
	4225	+// //obj.parent.Touch();
	4226	+ }
	4227	+
	4228	+ refreshContents();
	4229	+ }
3053	4230
3054	4231	void ResetTransform()
3055	4232	{
..	..	@@ -3162,7 +4339,7 @@
3162	4339	refreshContents();
3163	4340	}
3164	4341
3165		- void ResetCentroid()
	4342	+ void ResetCentroid(boolean full)
3166	4343	{
3167	4344	Object3D obj;
3168	4345	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3177,12 +4354,16 @@
3177	4354	LA.matIdentity(Object3D.mat);
3178	4355	obj.getBounds(minima, maxima, false);
3179	4356	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3180		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	4357	+ if (full)
	4358	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3181	4359	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3182	4360	obj.TransformMesh(Object3D.mat);
	4361	+
3183	4362	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3184		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	4363	+ if (full)
	4364	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3185	4365	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	4366	+
3186	4367	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3187	4368	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3188	4369	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3211,7 +4392,8 @@
3211	4392
3212	4393	int size = obj.MemorySize();
3213	4394
3214		- System.err.println((size/1024) + " KB is the size of " + obj);
	4395	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4396	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3215	4397	}
3216	4398	}
3217	4399	catch (Exception e)
..	..	@@ -3248,9 +4430,9 @@
3248	4430	obj = (Object3D)e.nextElement();
3249	4431
3250	4432	System.out.println("Object is: " + obj);
3251		- GrafreeD.AnalyzeObject(obj);
	4433	+ Grafreed.AnalyzeObject(obj);
3252	4434	System.out.println("Boundary rep: " + obj.bRep);
3253		- GrafreeD.AnalyzeObject(obj.bRep);
	4435	+ Grafreed.AnalyzeObject(obj.bRep);
3254	4436
3255	4437	// System.err.println((size/1024) + " KB is the size of " + obj);
3256	4438	}
..	..	@@ -3292,6 +4474,13 @@
3292	4474	void GenNormals(boolean crease)
3293	4475	{
3294	4476	group.GenNormalsS(crease);
	4477	+
	4478	+ refreshContents();
	4479	+ }
	4480	+
	4481	+ void GenNormalsMESH()
	4482	+ {
	4483	+ group.GenNormalsMeshS();
3295	4484
3296	4485	refreshContents();
3297	4486	}
..	..	@@ -3464,8 +4653,8 @@
3464	4653
3465	4654	void ParseVertices()
3466	4655	{
3467		- boolean epsequal = GrafreeD.epsequal;
3468		- GrafreeD.epsequal = true;
	4656	+ boolean epsequal = Grafreed.epsequal;
	4657	+ Grafreed.epsequal = true;
3469	4658
3470	4659	for (int i=0; i<group.selection.size(); i++)
3471	4660	{
..	..	@@ -3490,7 +4679,7 @@
3490	4679	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3491	4680	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3492	4681
3493		- g.add(GrafreeD.clipboard);
	4682	+ g.add(Grafreed.clipboard);
3494	4683
3495	4684	buffer.add(g);
3496	4685	}
..	..	@@ -3505,7 +4694,7 @@
3505	4694	makeSomething(buffer, i==group.selection.size()-1);
3506	4695	}
3507	4696
3508		- GrafreeD.epsequal = epsequal;
	4697	+ Grafreed.epsequal = epsequal;
3509	4698
3510	4699	refreshContents();
3511	4700	}
..	..	@@ -3523,7 +4712,16 @@
3523	4712	String pigment = Object3D.GetPigment(tex);
3524	4713	//String bump = Object3D.GetBump(tex);
3525	4714
3526		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4715	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4716	+
	4717	+ try
	4718	+ {
	4719	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
	4720	+ }
	4721	+ catch (Exception e)
	4722	+ {
	4723	+ System.err.println("FAIL: " + node);
	4724	+ }
3527	4725
3528	4726	double s = v.s;
3529	4727
..	..	@@ -3611,11 +4809,11 @@
3611	4809
3612	4810	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3613	4811
3614		- boolean random = CameraPane.RANDOM;
3615		- CameraPane.RANDOM = false; // parse all random nodes
	4812	+ boolean random = CameraPane.SWITCH;
	4813	+ CameraPane.SWITCH = false; // parse all random nodes
3616	4814	lowres.linkVerticesThis(null);
3617	4815	lowres.linkVerticesThis(sn);
3618		- CameraPane.RANDOM = random;
	4816	+ CameraPane.SWITCH = random;
3619	4817
3620	4818	System.err.flush();
3621	4819
..	..	@@ -3655,7 +4853,7 @@
3655	4853	return;
3656	4854
3657	4855	Object3D poses = group.selection.get(0);
3658		- Object3D ref = GrafreeD.clipboard.get(0);
	4856	+ Object3D ref = Grafreed.clipboard.get(0);
3659	4857
3660	4858	Object3D newgroup = new Object3D("Po:" + poses.name);
3661	4859
..	..	@@ -3849,9 +5047,9 @@
3849	5047
3850	5048	void ClipMesh()
3851	5049	{
3852		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	5050	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3853	5051	{
3854		- Object3D content = GrafreeD.clipboard.get(0);
	5052	+ Object3D content = Grafreed.clipboard.get(0);
3855	5053
3856	5054	if (content instanceof cGroup && ((cGroup)content).transientlink )
3857	5055	content = ((cGroup)content).get(0);
..	..	@@ -3860,7 +5058,7 @@
3860	5058	// {
3861	5059	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3862	5060	// }
3863		- group.selection.ClipMesh(GrafreeD.clipboard);
	5061	+ group.selection.ClipMesh(Grafreed.clipboard);
3864	5062	}
3865	5063	// group.selection.ClipMesh(GrafreeD.clipboard);
3866	5064	System.out.println("DONE.");
..	..	@@ -3907,6 +5105,18 @@
3907	5105	void MarkLeaves(boolean hide)
3908	5106	{
3909	5107	group.selection.MarkLeaves(hide);
	5108	+ refreshContents();
	5109	+ }
	5110	+
	5111	+ void RewindLeaves(boolean hide)
	5112	+ {
	5113	+ group.selection.RewindLeaves(hide);
	5114	+ refreshContents();
	5115	+ }
	5116	+
	5117	+ void RandomLeaves(boolean hide)
	5118	+ {
	5119	+ group.selection.RandomLeaves(hide);
3910	5120	refreshContents();
3911	5121	}
3912	5122
..	..	@@ -3981,28 +5191,25 @@
3981	5191	// }
3982	5192	// }
3983	5193
3984		- static boolean allparams = true;
3985		-
3986		- static Vector<Object3D> listUI = new Vector<Object3D>();
3987		-
3988	5194	void EditSelection(boolean newWindow)
3989	5195	{
	5196	+ if (group.selection == null)
	5197	+ {
	5198	+ EditElement(group, newWindow); // ? new
	5199	+ return;
	5200	+ }
	5201	+
3990	5202	// aConstraints.gridy = 0;
3991	5203	for (int i=0; i<group.selection.size(); i++)
3992	5204	{
3993	5205	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
3994	5206	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3995		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5207	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3996	5208
3997	5209	Object3D elem = (Object3D)group.selection.elementAt(i);
3998		- if(elem != group)
	5210	+ if(elem != group \|\| !newWindow)
3999	5211	{
4000		- // if (!(elem instanceof Composite))
4001		- // newWindow = false;
4002		- listUI.add(elem);
4003		- elem.openEditWindow(this, newWindow); //, false);
4004		- System.out.println("edit : " + elem);
4005		- elem.editWindow.refreshContents(true); // ? new
	5212	+ EditElement(elem, newWindow); // ? new
4006	5213	}
4007	5214	}
4008	5215	}
..	..	@@ -4065,9 +5272,7 @@
4065	5272
4066	5273	freezemodel = false;
4067	5274	}
4068		-
4069		- boolean flashIt = true;
4070		-
	5275	+
4071	5276	public void valueChanged(TreeSelectionEvent e)
4072	5277	//public boolean handleEvent(Event event)
4073	5278	{
..	..	@@ -4077,7 +5282,8 @@
4077	5282	//new Exception().printStackTrace();
4078	5283
4079	5284	freezemodel = true;
4080		-
	5285	+ ClearUnpinned();
	5286	+
4081	5287	/**/
4082	5288	//switch (event.id)
4083	5289	{
..	..	@@ -4085,7 +5291,6 @@
4085	5291	//case 702: // Event.LIST_DESELECT
4086	5292	group.deselectAll();
4087	5293	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4088		- objEditor.ClearInfo(); // .GetMaterial());
4089	5294	if (tps != null)
4090	5295	{
4091	5296	for (int i=0; i < tps.length; i++)
..	..	@@ -4094,10 +5299,8 @@
4094	5299
4095	5300	//if (child.parent != null)
4096	5301	//child.parent.addSelectee(child);
	5302	+ objEditor.SetMaterial(child);
4097	5303	group.addSelectee(child);
4098		- objEditor.SetMaterial(child); // .GetMaterial());
4099		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4100		- System.err.println("info : " + child.GetPath());
4101	5304	}
4102	5305	}
4103	5306	// else
..	..	@@ -4107,20 +5310,28 @@
4107	5310	// System.err.println("info : " + group.GetPath());
4108	5311	// }
4109	5312
4110		- objEditor.SetText(); // jan 2014
4111		-
4112		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	5313	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4113	5314	CameraPane.flash = true;
4114	5315
4115		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5316	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4116	5317	// a camera
4117	5318	{
4118		- CameraPane.camerachangeframe = 0; // don't refuse it
4119		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5319	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5320	+ {
	5321	+ CameraPane.camerachangeframe = 0; // don't refuse it
	5322	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5323	+ }
4120	5324	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4121	5325	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4122	5326	}
4123	5327
	5328	+ if (tps != null && tps.length == 1)
	5329	+ {
	5330	+ EditSelection(false);
	5331	+ }
	5332	+
	5333	+ SetPinStates(tps != null && tps.length > 0);
	5334	+
4124	5335	refreshContents();
4125	5336	//return true;
4126	5337	}
..	..	@@ -4129,6 +5340,51 @@
4129	5340
4130	5341	freezemodel = false;
4131	5342	}
	5343	+
	5344	+ void SetPinStates(boolean enabled)
	5345	+ {
	5346	+ editButton.setEnabled(enabled);
	5347	+ uneditButton.setEnabled(enabled);
	5348	+ //unselectButton.setEnabled(enabled);
	5349	+ flashSelectionButton.setEnabled(enabled);
	5350	+
	5351	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5352	+
	5353	+ boolean allComposites = true;
	5354	+
	5355	+ if (group.selection != null)
	5356	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5357	+ {
	5358	+ if (!(e.nextElement() instanceof Composite))
	5359	+ {
	5360	+ allComposites = false;
	5361	+ break;
	5362	+ }
	5363	+ }
	5364	+
	5365	+ rootButton.setEnabled(allComposites);
	5366	+ }
	5367	+
	5368	+ void refreshContents(boolean cp)
	5369	+ {
	5370	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5371	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5372	+ {
	5373	+ objEditor.ClearInfo(); // .GetMaterial());
	5374	+
	5375	+ for (int i=0; i < group.selection.Size(); i++)
	5376	+ {
	5377	+ Object3D child = (Object3D) group.selection.get(i);
	5378	+
	5379	+ objEditor.AddInfo(child, this, true);
	5380	+// System.err.println("info : " + child.GetPath());
	5381	+ }
	5382	+
	5383	+ objEditor.SetText(); // jan 2014
	5384	+ }
	5385	+
	5386	+ super.refreshContents(cp);
	5387	+ }
4132	5388
4133	5389	void linkSomething(Object3D thing)
4134	5390	{
..	..	@@ -4200,16 +5456,19 @@
4200	5456	{
4201	5457	if (group.selection.isEmpty())
4202	5458	return;
4203		- GrafreeD.clipboardIsTempGroup = false;
	5459	+
	5460	+ Grafreed.clipboardIsTempGroup = false;
4204	5461	Composite tGroup = null;
4205	5462	if (group.selection.size() > 0) // 1)
4206	5463	{
4207	5464	tGroup = new cGroup();
4208		- GrafreeD.clipboardIsTempGroup = true;
	5465	+ Grafreed.clipboardIsTempGroup = true;
4209	5466	}
4210	5467
4211	5468	if (cut)
4212	5469	{
	5470	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5471	+// Save();
4213	5472	//int indices[] = jList.getSelectedIndices();
4214	5473	//for (int i = indices.length - 1; i >= 0; i--)
4215	5474	//jList.remove(indices[i]);
..	..	@@ -4245,16 +5504,16 @@
4245	5504	//System.out.println("cut " + child);
4246	5505	//System.out.println("parent = " + child.parent);
4247	5506	// tmp.addChild(child);
4248		- if (GrafreeD.clipboardIsTempGroup)
	5507	+ if (Grafreed.clipboardIsTempGroup)
4249	5508	tGroup.add/Child/(tmp);
4250	5509	else
4251		- GrafreeD.clipboard = tmp;
	5510	+ Grafreed.clipboard = tmp;
4252	5511	}
4253	5512	else
4254		- if (GrafreeD.clipboardIsTempGroup)
	5513	+ if (Grafreed.clipboardIsTempGroup)
4255	5514	tGroup.add/Child/(child);
4256	5515	else
4257		- GrafreeD.clipboard = child;
	5516	+ Grafreed.clipboard = child;
4258	5517	}
4259	5518
4260	5519	//ResetModel();
..	..	@@ -4286,21 +5545,23 @@
4286	5545	//System.out.println("cut " + elem);
4287	5546	//System.out.println("parent = " + elem.parent);
4288	5547	// tmp.addChild(elem);
4289		- if (GrafreeD.clipboardIsTempGroup)
	5548	+ if (Grafreed.clipboardIsTempGroup)
4290	5549	tGroup.add/Child/(tmp);
4291	5550	else
4292		- GrafreeD.clipboard = tmp;
	5551	+ Grafreed.clipboard = tmp;
4293	5552	}
4294	5553	else
4295		- if (GrafreeD.clipboardIsTempGroup)
	5554	+ if (Grafreed.clipboardIsTempGroup)
4296	5555	tGroup.add/Child/(child);
4297	5556	else
4298		- GrafreeD.clipboard = child;
	5557	+ Grafreed.clipboard = child;
4299	5558	}
4300	5559
4301	5560	}
4302		- if (GrafreeD.clipboardIsTempGroup)
4303		- GrafreeD.clipboard = tGroup;
	5561	+
	5562	+ if (Grafreed.clipboardIsTempGroup)
	5563	+ Grafreed.clipboard = tGroup;
	5564	+
4304	5565	if (cut)
4305	5566	{
4306	5567	ResetModel();
..	..	@@ -4310,11 +5571,15 @@
4310	5571
4311	5572	void paste(boolean expand)
4312	5573	{
	5574	+ if (Globals.REPLACEONMAKE)
	5575	+ Save();
	5576	+ boolean keep = Globals.REPLACEONMAKE;
	5577	+ Globals.REPLACEONMAKE = false;
4313	5578	// if (GrafreeD.clipboard == null)
4314	5579	// return;
4315	5580	boolean first = true;
4316	5581
4317		- if (GrafreeD.clipboardIsTempGroup)
	5582	+ if (Grafreed.clipboardIsTempGroup)
4318	5583	{
4319	5584	Composite temp;
4320	5585
..	..	@@ -4325,7 +5590,7 @@
4325	5590	temp = (Composite)Applet3D.clipboard.deepCopy();
4326	5591	*/
4327	5592	Object3D elem;
4328		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5593	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4329	5594	{
4330	5595	Object3D child = (Object3D)e.nextElement();
4331	5596
..	..	@@ -4359,21 +5624,22 @@
4359	5624	//Object3D cb = Applet3D.clipboard;
4360	5625	//temp.addChild(cb);
4361	5626	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4362		- assert(GrafreeD.clipboard.parent == null);
4363		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4364		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4365		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4366		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	5627	+ assert(Grafreed.clipboard.parent == null);
	5628	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5629	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5630	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5631	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4367	5632	else
4368		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4369		- GrafreeD.clipboard.get(0).parent = keepparent;
	5633	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5634	+ Grafreed.clipboard.get(0).parent = keepparent;
4370	5635	}
4371	5636
	5637	+ Globals.REPLACEONMAKE = keep;
4372	5638	ResetModel();
4373	5639	refreshContents();
4374	5640	}
4375	5641
4376		- void pasteInto(boolean copyit)
	5642	+ void pasteInto(boolean copyit, boolean clone)
4377	5643	{
4378	5644	// if (GrafreeD.clipboard == null)
4379	5645	// return;
..	..	@@ -4402,15 +5668,22 @@
4402	5668	if (copyit)
4403	5669	{
4404	5670	// paste(false);
4405		- CloneClipboard(false); // sept 2014
	5671	+ if (clone)
	5672	+ {
	5673	+ CloneClipboard(false); // sept 2014
	5674	+ }
	5675	+ else
	5676	+ {
	5677	+ paste(false);
	5678	+ }
4406	5679	}
4407	5680	else
4408	5681	{
4409	5682	boolean first = true;
4410	5683
4411		- if (GrafreeD.clipboardIsTempGroup)
	5684	+ if (Grafreed.clipboardIsTempGroup)
4412	5685	{
4413		- Composite temp = (Composite)GrafreeD.clipboard;
	5686	+ Composite temp = (Composite)Grafreed.clipboard;
4414	5687	Object3D copy;
4415	5688	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4416	5689	{
..	..	@@ -4420,7 +5693,7 @@
4420	5693	}
4421	5694	} else
4422	5695	{
4423		- linkSomething(GrafreeD.clipboard); //.get(0));
	5696	+ linkSomething(Grafreed.clipboard); //.get(0));
4424	5697	}
4425	5698	}
4426	5699	}
..	..	@@ -4497,6 +5770,10 @@
4497	5770
4498	5771	void group(Object3D csg, boolean grab)
4499	5772	{
	5773	+ if (Globals.REPLACEONMAKE)
	5774	+ Save();
	5775	+ boolean keep = Globals.REPLACEONMAKE;
	5776	+ Globals.REPLACEONMAKE = false;
4500	5777	if (//false) // why??
4501	5778	!group.selection.isEmpty())
4502	5779	{
..	..	@@ -4610,10 +5887,15 @@
4610	5887	//node.add(csg);
4611	5888	//makeSomething(node);
4612	5889	makeSomething(csg);
	5890	+ Globals.REPLACEONMAKE = keep;
4613	5891	}
4614	5892
4615	5893	void Ungroup(Object3D g)
4616	5894	{
	5895	+ if (Globals.REPLACEONMAKE)
	5896	+ Save();
	5897	+ boolean keep = Globals.REPLACEONMAKE;
	5898	+ Globals.REPLACEONMAKE = false;
4617	5899	if (g instanceof HiddenObject)
4618	5900	{
4619	5901	HiddenObject h = (HiddenObject) g;
..	..	@@ -4630,6 +5912,7 @@
4630	5912	objEditor.makeSomething(g.get(i), false);
4631	5913	}
4632	5914	}
	5915	+ Globals.REPLACEONMAKE = keep;
4633	5916	}
4634	5917
4635	5918	void ungroup()
..	..	@@ -4825,21 +6108,6 @@
4825	6108	}
4826	6109	*/
4827	6110
4828		- void ImportGFD()
4829		- {
4830		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4831		- browser.show();
4832		- String filename = browser.getFile();
4833		- if (filename != null && filename.length() > 0)
4834		- {
4835		- String fullname = browser.getDirectory() + filename;
4836		-
4837		- //Object3D readobj =
4838		- objEditor.ReadGFD(fullname, objEditor);
4839		- //makeSomething(readobj);
4840		- }
4841		- }
4842		-
4843	6111	/*
4844	6112	public void Callback(Object obj)
4845	6113	{
..	..	@@ -4863,26 +6131,9 @@
4863	6131	}
4864	6132	*/
4865	6133
4866		- void ImportVRMLX3D()
4867		- {
4868		- if (GrafreeD.standAlone)
4869		- {
4870		- /**/
4871		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4872		- browser.show();
4873		- String filename = browser.getFile();
4874		- if (filename != null && filename.length() > 0)
4875		- {
4876		- String fullname = browser.getDirectory() + filename;
4877		- LoadVRMLX3D(fullname);
4878		- }
4879		- /**/
4880		- }
4881		- }
4882		-
4883	6134	String GetFile(String dialogName)
4884	6135	{
4885		- if (GrafreeD.standAlone)
	6136	+ if (Grafreed.standAlone)
4886	6137	{
4887	6138	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4888	6139	browser.show();
..	..	@@ -4950,6 +6201,44 @@
4950	6201	cButton clearpanelButton;
4951	6202	cButton unselectButton;
4952	6203
	6204	+ cButton restoreCameraButton;
	6205	+
	6206	+ cButton oneStepButton;
	6207	+
	6208	+ cButton groupButton;
	6209	+ cButton ungroupButton;
	6210	+ cButton compositeButton;
	6211	+ cButton switchButton;
	6212	+ cButton loopButton;
	6213	+ cButton textureButton;
	6214	+
	6215	+ cButton skybox1Button;
	6216	+ cButton skybox2Button;
	6217	+ cButton skybox3Button;
	6218	+ cButton skybox4Button;
	6219	+ cButton skybox5Button;
	6220	+ cButton skybox6Button;
	6221	+ cButton skybox7Button;
	6222	+
	6223	+ cButton skybox11Button;
	6224	+ cButton skybox12Button;
	6225	+ cButton skybox13Button;
	6226	+ cButton skybox14Button;
	6227	+ cButton skybox15Button;
	6228	+ cButton skybox16Button;
	6229	+ cButton skybox17Button;
	6230	+
	6231	+ cButton gridButton;
	6232	+ cButton boxButton;
	6233	+ cButton sphereButton;
	6234	+ cButton coneButton;
	6235	+ cButton torusButton;
	6236	+ cButton superButton;
	6237	+ cButton kleinButton;
	6238	+ cButton particlesButton;
	6239	+ cButton overlayButton;
	6240	+ cButton lightButton;
	6241	+
4953	6242	cButton screenfitButton;
4954	6243	cButton screenfitpointButton;
4955	6244	cButton snapobjectButton;
..	..	@@ -4961,14 +6250,6 @@
4961	6250
4962	6251	cButton setsupportButton;
4963	6252
4964		- cButton twoButton;
4965		- cButton sixButton;
4966		- cButton threeButton;
4967		- cButton sevenButton;
4968		- cButton fourButton; // full panel
4969		- cButton oneButton; // full XYZ
4970		- //cButton currentLayout;
4971		-
4972	6253	//
4973	6254	//Composite
4974	6255	Object3D // to do !!
..	..	@@ -4978,10 +6259,12 @@
4978	6259	//JTree jTree;
4979	6260	private MenuItem lookAtItem;
4980	6261	private MenuItem lookFromItem;
4981		- private MenuItem switchItem;
4982		- private MenuItem cutItem;
4983		- private MenuItem duplicateItem;
4984		- private MenuItem cloneItem;
	6262	+ private MenuItem switchViewItem;
	6263	+ private JMenuItem cutItem;
	6264	+ private MenuItem undoItem;
	6265	+ private MenuItem redoItem;
	6266	+ private JMenuItem duplicateItem;
	6267	+ private JMenuItem cloneItem;
4985	6268	private MenuItem cloneSupportItem;
4986	6269	private MenuItem overwriteGeoItem;
4987	6270	private MenuItem overwriteMatItem;
..	..	@@ -4993,7 +6276,7 @@
4993	6276	private MenuItem linkverticesItem;
4994	6277	private MenuItem relinkverticesItem;
4995	6278	private MenuItem setMasterItem;
4996		- private MenuItem resetMeshItem;
	6279	+ private MenuItem resetAllItem;
4997	6280	private MenuItem stepAllItem;
4998	6281	private MenuItem revertMeshItem;
4999	6282	private MenuItem poseMeshItem;
..	..	@@ -5002,12 +6285,13 @@
5002	6285	private MenuItem cloneGeometriesItem;
5003	6286	private MenuItem shareGeometriesItem;
5004	6287	private MenuItem mergeGeometriesItem;
5005		- private MenuItem copyItem;
	6288	+ private JMenuItem copyItem;
5006	6289	private MenuItem pasteItem;
5007		- private MenuItem pasteLinkItem;
5008		- private MenuItem pasteCloneItem;
5009		- private MenuItem pasteExpandItem;
5010		- private MenuItem clearItem;
	6290	+ private JMenuItem pasteIntoItem;
	6291	+ private JMenuItem pasteLinkItem;
	6292	+ private JMenuItem pasteCloneItem;
	6293	+ private JMenuItem pasteExpandItem;
	6294	+ private JMenuItem deleteItem;
5011	6295	private MenuItem clearAllItem;
5012	6296	private MenuItem genUVItem;
5013	6297	private MenuItem genNormalsMESHItem;
..	..	@@ -5042,6 +6326,10 @@
5042	6326	private MenuItem showleavesItem;
5043	6327	private MenuItem markleavesItem;
5044	6328	private MenuItem unmarkleavesItem;
	6329	+ private MenuItem rewindleavesItem;
	6330	+ private MenuItem unrewindleavesItem;
	6331	+ private MenuItem randomleavesItem;
	6332	+ private MenuItem unrandomleavesItem;
5045	6333
5046	6334	private MenuItem flipVItem;
5047	6335	private MenuItem unflipVItem;
..	..	@@ -5053,15 +6341,17 @@
5053	6341	private MenuItem panoTexturesItem;
5054	6342
5055	6343	private MenuItem resetCentroidItem;
5056		- private MenuItem transformgeometryItem;
	6344	+ private MenuItem resetCentroidXZItem;
5057	6345	private MenuItem resetTransformItem;
	6346	+ private MenuItem transformGeometryItem;
	6347	+ private MenuItem transformChildrenItem;
5058	6348	private MenuItem hideItem;
5059	6349	private MenuItem grabItem;
5060	6350	private MenuItem backItem;
5061	6351	private MenuItem frontItem;
5062	6352	private MenuItem cameraItem;
5063	6353	private MenuItem compositeItem;
5064		- private MenuItem randomItem;
	6354	+ private MenuItem switchItem;
5065	6355	private MenuItem physicsItem;
5066	6356	private MenuItem frameselectorItem;
5067	6357	private MenuItem scriptNodeItem;
..	..	@@ -5069,7 +6359,7 @@
5069	6359	private MenuItem switchTransfoItem;
5070	6360	private MenuItem morphItem;
5071	6361	private MenuItem linkerItem;
5072		- private MenuItem ungroupItem;
	6362	+ private JMenuItem ungroupItem;
5073	6363	private MenuItem editItem;
5074	6364	private MenuItem openWindowItem;
5075	6365	private MenuItem editLeafItem;
..	..	@@ -5085,6 +6375,8 @@
5085	6375	private MenuItem attachBumpItem;
5086	6376	private MenuItem detachBumpItem;
5087	6377	private MenuItem pigmentBumpItem;
	6378	+ private MenuItem embedTexturesItem;
	6379	+ private MenuItem deEmbedTexturesItem;
5088	6380
5089	6381	private MenuItem particleItem;
5090	6382	private MenuItem ragdollItem;
..	..	@@ -5101,7 +6393,7 @@
5101	6393	private MenuItem blobItem;
5102	6394	private MenuItem latheItem;
5103	6395	private MenuItem bezierItem;
5104		- private MenuItem checkerItem;
	6396	+ private MenuItem overlayItem;
5105	6397	private MenuItem meshItem;
5106	6398	// private MenuItem meshGroupItem;
5107	6399	private MenuItem springItem;
..	..	@@ -5123,11 +6415,6 @@
5123	6415	private MenuItem doubleItem;
5124	6416	private MenuItem tripleItem;
5125	6417
5126		- private MenuItem importGFDItem;
5127		- private MenuItem importVRMLX3DItem;
5128		- private MenuItem import3DSItem;
5129		- private MenuItem importOBJItem;
5130		-
5131	6418	private MenuItem computeAOItem;
5132	6419	private MenuItem recompileItem;
5133	6420	private MenuItem editScriptItem;
..	..	@@ -5137,4 +6424,8 @@
5137	6424	private MenuItem analyzeItem;
5138	6425	private MenuItem dumpItem;
5139	6426	//boolean freezemodel = false;
	6427	+
	6428	+ Menu cameraMenu;
	6429	+ MenuItem editCameraItem;
	6430	+ MenuItem restoreCameraItem;
5140	6431	}