~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -16,6 +16,7 @@
16	16	//import buoy.widget.BFileChooser;
17	17
18	18	class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
	19	+ Grafreed.iResourceCallBack,
19	20	ObjectUI,
20	21	Runnable,
21	22	ActionListener,
..	..	@@ -23,6 +24,360 @@
23	24	DragGestureListener, DragSourceListener, DropTargetListener,
24	25	ItemListener // ListSelectionListener
25	26	{
	27	+
	28	+ public void AddSkyboxButton(String f, String s, cGridBag row)
	29	+ {
	30	+ cButton skyboxButton;
	31	+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
	32	+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Globals.NIMBUSLAF));
	33	+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
	34	+ skyboxButton.setToolTipText(s.equals("") ? "No background" : s);
	35	+ skyboxButton.addActionListener(new ActionListener()
	36	+ {
	37	+ @Override
	38	+ public void actionPerformed(ActionEvent e)
	39	+ {
	40	+ ChangeSkybox(path);
	41	+ }
	42	+ });
	43	+ }
	44	+
	45	+ public void AddTextureButton(String f, String c, final String t, int count, cGridBag row)
	46	+ {
	47	+ cButton textureButton;
	48	+ final String path = "textures/" + f + "/" + c + "/"; // + t;
	49	+ row.add(textureButton = GetButton(path + "icons/" + t, !Globals.NIMBUSLAF));
	50	+ textureButton.setToolTipText(c + count);
	51	+ textureButton.addActionListener(new ActionListener()
	52	+ {
	53	+ @Override
	54	+ public void actionPerformed(ActionEvent e)
	55	+ {
	56	+ ChangeTexture(path + t);
	57	+ }
	58	+ });
	59	+ }
	60	+
	61	+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
	62	+ {
	63	+ cGridBag tab0 = new cGridBag().setVertical(true);
	64	+
	65	+ tab0.setName("Urban");
	66	+ skyboxpanel.add(tab0);
	67	+
	68	+ cGridBag row0 = new cGridBag();
	69	+ cGridBag row1 = new cGridBag();
	70	+ cGridBag row2 = new cGridBag();
	71	+ cGridBag row3 = new cGridBag();
	72	+ cGridBag row4 = new cGridBag();
	73	+ cGridBag row5 = new cGridBag();
	74	+ cGridBag row6 = new cGridBag();
	75	+
	76	+ AddSkyboxButton("default", "", row0);
	77	+ //AddSkyboxButton("default", "cornell", row0);
	78	+ AddSkyboxButton("penguins", "dust", row0);
	79	+ AddSkyboxButton("penguins", "tropic", row0);
	80	+ AddSkyboxButton("penguins", "yonder", row0);
	81	+
	82	+ AddSkyboxButton("default", "uffizi", row1);
	83	+ AddSkyboxButton("bridge", "Bridge", row1);
	84	+ AddSkyboxButton("bridge", "Bridge2", row1);
	85	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	86	+
	87	+ AddSkyboxButton("urban", "Parliament", row2);
	88	+ AddSkyboxButton("urban", "Roundabout", row2);
	89	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	90	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	91	+
	92	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	93	+ AddSkyboxButton("urban", "UnionSquare", row3);
	94	+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
	95	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	96	+
	97	+ AddSkyboxButton("park", "Buddha", row4);
	98	+ AddSkyboxButton("park", "CNTower2", row4);
	99	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	100	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	101	+
	102	+ AddSkyboxButton("park", "Park", row5);
	103	+ AddSkyboxButton("park", "Pond", row5);
	104	+ AddSkyboxButton("park", "Skansen", row5);
	105	+ AddSkyboxButton("park", "Skansen2", row5);
	106	+
	107	+ AddSkyboxButton("park", "Skansen3", row6);
	108	+ AddSkyboxButton("park", "Skansen4", row6);
	109	+ AddSkyboxButton("park", "Skansen5", row6);
	110	+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
	111	+
	112	+ tab0.add(row0);
	113	+ tab0.add(row1);
	114	+ tab0.add(row2);
	115	+ tab0.add(row3);
	116	+ tab0.add(row4);
	117	+ tab0.add(row5);
	118	+ tab0.add(row6);
	119	+
	120	+ for (int i=5; --i>=0;)
	121	+ {
	122	+ //oe.toolboxPanel.Return();
	123	+ //tab0.add(new cGridBag());
	124	+ }
	125	+ }
	126	+
	127	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	128	+ {
	129	+ cGridBag tab0 = new cGridBag().setVertical(true);
	130	+
	131	+ tab0.setName("Nature");
	132	+ skyboxpanel.add(tab0);
	133	+
	134	+ cGridBag row0 = new cGridBag();
	135	+ cGridBag row1 = new cGridBag();
	136	+ cGridBag row2 = new cGridBag();
	137	+ cGridBag row3 = new cGridBag();
	138	+ cGridBag row4 = new cGridBag();
	139	+ cGridBag row5 = new cGridBag();
	140	+ cGridBag row6 = new cGridBag();
	141	+
	142	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	143	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	144	+ AddSkyboxButton("beach", "PalmTrees", row0);
	145	+ AddSkyboxButton("beach", "Tenerife", row0);
	146	+
	147	+ AddSkyboxButton("beach", "Tenerife2", row1);
	148	+ AddSkyboxButton("beach", "Tenerife3", row1);
	149	+ AddSkyboxButton("field", "FishPond", row1);
	150	+ AddSkyboxButton("field", "Footballfield", row1);
	151	+
	152	+ AddSkyboxButton("field", "Meadow", row2);
	153	+ AddSkyboxButton("field", "Sorsele", row2);
	154	+ AddSkyboxButton("field", "Sorsele2", row2);
	155	+ AddSkyboxButton("field", "Sorsele3", row2);
	156	+
	157	+ AddSkyboxButton("forest", "Brudslojan", row3);
	158	+ AddSkyboxButton("forest", "Langholmen2", row3);
	159	+ AddSkyboxButton("forest", "Plants", row3);
	160	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	161	+
	162	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	163	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	164	+ AddSkyboxButton("mountain", "Teide", row4);
	165	+ AddSkyboxButton("park", "Tantolunden4", row4);
	166	+
	167	+ AddSkyboxButton("park", "Stairs", row5);
	168	+ AddSkyboxButton("default", "skycube", row6);
	169	+ AddSkyboxButton("rocky", "Langholmen", row5);
	170	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	171	+
	172	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	173	+ AddSkyboxButton("default", "CloudyHills", row6);
	174	+ AddSkyboxButton("daz", "Autumn", row6);
	175	+ AddSkyboxButton("daz", "MountainTrail", row6);
	176	+ /*
	177	+Autumn
	178	+Greenlands
	179	+MountainTrail
	180	+Oasis
	181	+TheRock
	182	+TopOfTheWorld
	183	+Winter
	184	+ */
	185	+
	186	+ tab0.add(row0);
	187	+ tab0.add(row1);
	188	+ tab0.add(row2);
	189	+ tab0.add(row3);
	190	+ tab0.add(row4);
	191	+ tab0.add(row5);
	192	+ tab0.add(row6);
	193	+
	194	+ for (int i=5; --i>=0;)
	195	+ {
	196	+ //oe.toolboxPanel.Return();
	197	+ //tab0.add(new cGridBag());
	198	+ }
	199	+ }
	200	+
	201	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	202	+ {
	203	+ cGridBag tab0 = new cGridBag().setVertical(true);
	204	+
	205	+ tab0.setName("Night");
	206	+ skyboxpanel.add(tab0);
	207	+
	208	+ cGridBag row0 = new cGridBag();
	209	+ cGridBag row1 = new cGridBag();
	210	+ cGridBag row2 = new cGridBag();
	211	+ cGridBag row3 = new cGridBag();
	212	+ cGridBag row4 = new cGridBag();
	213	+ cGridBag row5 = new cGridBag();
	214	+ cGridBag row6 = new cGridBag();
	215	+
	216	+ AddSkyboxButton("night", "NightPath", row0);
	217	+ AddSkyboxButton("night", "PondNight", row0);
	218	+ AddSkyboxButton("night", "Powerlines", row0);
	219	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	220	+
	221	+ AddSkyboxButton("urban", "CNTower", row1);
	222	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	223	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	224	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
	225	+
	226	+ AddSkyboxButton("penguins", "kenon_star", row2);
	227	+ AddSkyboxButton("persson", "corona", row2);
	228	+ AddSkyboxButton("persson", "spaceskybox", row2);
	229	+ AddSkyboxButton("indoors", "Vasa", row2);
	230	+
	231	+ AddSkyboxButton("winter", "Backyard", row3);
	232	+ AddSkyboxButton("winter", "Creek", row3);
	233	+ AddSkyboxButton("winter", "FootballField3", row3);
	234	+ AddSkyboxButton("winter", "Forest", row3);
	235	+
	236	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	237	+ AddSkyboxButton("winter", "House", row4);
	238	+ AddSkyboxButton("winter", "IceLake", row4);
	239	+ AddSkyboxButton("winter", "IceRiver", row4);
	240	+
	241	+ AddSkyboxButton("winter", "Park3", row5);
	242	+ AddSkyboxButton("winter", "PondWinter", row5);
	243	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	244	+ AddSkyboxButton("winter", "Vindelalven", row5);
	245	+
	246	+ AddSkyboxButton("daz", "TheRock", row6);
	247	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	248	+ AddSkyboxButton("daz", "Winter", row6);
	249	+ AddSkyboxButton("mountain", "Ryfjallet", row6);
	250	+
	251	+ tab0.add(row0);
	252	+ tab0.add(row1);
	253	+ tab0.add(row2);
	254	+ tab0.add(row3);
	255	+ tab0.add(row4);
	256	+ tab0.add(row5);
	257	+ tab0.add(row6);
	258	+
	259	+ for (int i=5; --i>=0;)
	260	+ {
	261	+ //oe.toolboxPanel.Return();
	262	+ //tab0.add(new cGridBag());
	263	+ }
	264	+ }
	265	+
	266	+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
	267	+ {
	268	+ cGridBag tab0 = new cGridBag().setVertical(true);
	269	+
	270	+ tab0.setName("Others");
	271	+ skyboxpanel.add(tab0);
	272	+
	273	+ cGridBag row0 = new cGridBag();
	274	+ cGridBag row1 = new cGridBag();
	275	+ cGridBag row2 = new cGridBag();
	276	+ cGridBag row3 = new cGridBag();
	277	+ cGridBag row4 = new cGridBag();
	278	+ cGridBag row5 = new cGridBag();
	279	+ cGridBag row6 = new cGridBag();
	280	+
	281	+ AddSkyboxButton("mayhem", "afterrain", row0);
	282	+ AddSkyboxButton("mayhem", "aqua4", row0);
	283	+ AddSkyboxButton("mayhem", "aqua9", row0);
	284	+ AddSkyboxButton("mayhem", "flame", row0);
	285	+
	286	+ AddSkyboxButton("mayhem", "h2s", row1);
	287	+ AddSkyboxButton("mayhem", "prehistoric", row1);
	288	+ AddSkyboxButton("mayhem", "scorched", row1);
	289	+ AddSkyboxButton("penguins", "desertdawn", row1);
	290	+
	291	+ AddSkyboxButton("persson", "Citadella", row2);
	292	+ AddSkyboxButton("persson", "Citadella2", row2);
	293	+ AddSkyboxButton("persson", "clouds1", row2);
	294	+ AddSkyboxButton("penguins", "wrath", row2);
	295	+
	296	+ AddSkyboxButton("persson", "FishermansBastion", row3);
	297	+ AddSkyboxButton("persson", "HeroesSquare", row3);
	298	+ AddSkyboxButton("indoors", "DallasW", row3);
	299	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
	300	+
	301	+ AddSkyboxButton("persson", "LancellottiChapel", row4);
	302	+ AddSkyboxButton("persson", "PereaBeach1", row4);
	303	+ AddSkyboxButton("persson", "PereaBeach2", row4);
	304	+ AddSkyboxButton("persson", "redeclipse", row4);
	305	+
	306	+ AddSkyboxButton("daz", "Greenlands", row5);
	307	+ AddSkyboxButton("daz", "Oasis", row5);
	308	+ AddSkyboxButton("elyvisions", "arch3", row5);
	309	+ AddSkyboxButton("elyvisions", "calm_sea", row5);
	310	+
	311	+ AddSkyboxButton("elyvisions", "rainbow", row6);
	312	+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
	313	+ AddSkyboxButton("elyvisions", "heaven", row6);
	314	+ AddSkyboxButton("elyvisions", "hot", row6);
	315	+
	316	+ tab0.add(row0);
	317	+ tab0.add(row1);
	318	+ tab0.add(row2);
	319	+ tab0.add(row3);
	320	+ tab0.add(row4);
	321	+ tab0.add(row5);
	322	+ tab0.add(row6);
	323	+
	324	+ for (int i=5; --i>=0;)
	325	+ {
	326	+ //oe.toolboxPanel.Return();
	327	+ //tab0.add(new cGridBag());
	328	+ }
	329	+ }
	330	+
	331	+ public void ChangeSkybox(String skybox)
	332	+ {
	333	+ if (skybox.endsWith("/"))
	334	+ {
	335	+ group.skyboxname = null;
	336	+ group.skyboxext = null;
	337	+ cameraView.repaint();
	338	+ }
	339	+ else
	340	+ {
	341	+ //cameraView.envyoff = false;
	342	+ group.skyboxname = skybox;
	343	+ group.skyboxext = "jpg";
	344	+ cameraView.repaint();
	345	+ }
	346	+ }
	347	+
	348	+ public void CreateSkyboxPanel(cGridBag skyboxPanel)
	349	+ {
	350	+ JTabbedPane skyboxpane = new JTabbedPane(JTabbedPane.LEFT);
	351	+
	352	+ AddSkyboxTab0(skyboxpane);
	353	+ AddSkyboxTab1(skyboxpane);
	354	+ AddSkyboxTab2(skyboxpane);
	355	+ AddSkyboxTab3(skyboxpane);
	356	+
	357	+ skyboxPanel.add(skyboxpane);
	358	+ }
	359	+
	360	+ public void ChangeTexture(String texture)
	361	+ {
	362	+ for (int i=0; i<group.selection.size(); i++)
	363	+ {
	364	+ Object3D obj = group.selection.get(i);
	365	+ obj.SetPigmentTexture("@" + texture);
	366	+ }
	367	+
	368	+ refreshContents();
	369	+ }
	370	+
	371	+ public void Show3DView()
	372	+ {
	373	+ // bug
	374	+ //gridPanel.setDividerLocation(1.0);
	375	+ //bigPanel.setDividerLocation(0.0);
	376	+ bigThree.ClearUI();
	377	+ bigThree.add(centralPanel);
	378	+ bigThree.FlushUI();
	379	+ }
	380	+
26	381	//ObjEditor objEditor;
27	382	public void closeUI2()
28	383	{
..	..	@@ -60,6 +415,16 @@
60	415	this.copy = this.group = group;
61	416	//selectees = this.group.selectees;
62	417
	418	+ assert(false);
	419	+
	420	+// if (copy.versionlist == null)
	421	+// {
	422	+// copy.versionlist = new Object3D[100];
	423	+// copy.versionindex = -1;
	424	+//
	425	+// //Save(true);
	426	+// }
	427	+
63	428	if(ui)
64	429	SetupUI(objEditor);
65	430	}
..	..	@@ -74,16 +439,28 @@
74	439	this.copy = this.group = copy;
75	440	//selectees = this.group.selectees;
76	441
77		- SetupMenu2(objEditor);
	442	+ SetupMenu2(this); //objEditor);
78	443	SetupUI2(objEditor);
79	444	objEditor.SetupUI(true);
80	445	SetupViews(objEditor);
81	446
82	447	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	448	+
	449	+// if (copy.versionlist == null)
	450	+// {
	451	+// copy.versionlist = new Object3D[100];
	452	+// copy.versionindex = -1;
	453	+//
	454	+// //Save(true);
	455	+// }
83	456	}
84	457
85	458	void CloneSelection(boolean supports)
86	459	{
	460	+ if (Globals.REPLACEONMAKE)
	461	+ Save();
	462	+ boolean keep = Globals.REPLACEONMAKE;
	463	+ Globals.REPLACEONMAKE = false;
87	464	// Object3D keep = GrafreeD.clipboard;
88	465	//Object3D obj;
89	466	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,18 +471,19 @@
94	471
95	472	makeSomething(clone, i==group.selection.size()-1);
96	473	}
	474	+ Globals.REPLACEONMAKE = keep;
97	475	}
98	476
99	477	void CloneClipboard(boolean supports)
100	478	{
101		- assert(GrafreeD.clipboard.parent == null);
102		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
103		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
104		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
105		- makeSomething(CloneObject(GrafreeD.clipboard.get(0), false));
	479	+ assert(Grafreed.clipboard.parent == null);
	480	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	481	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	482	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	483	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
106	484	else
107		- makeSomething(CloneObject(GrafreeD.clipboard, false));
108		- GrafreeD.clipboard.get(0).parent = keepparent;
	485	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	486	+ Grafreed.clipboard.get(0).parent = keepparent;
109	487	}
110	488
111	489	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -119,7 +497,7 @@
119	497	// obj.support = null;
120	498	if (!supports)
121	499	obj.SaveSupports();
122		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	500	+ Object3D clone = (Object3D)Grafreed.clone(obj);
123	501	obj.parent = parent;
124	502	// obj.support = support;
125	503	// clone.support = support; // aout 2013
..	..	@@ -148,58 +526,153 @@
148	526
149	527	//JTextField nameField;
150	528
151		- void SetupMenu2(ObjEditor oe)
	529	+ void SetupMenu2(GroupEditor oe)
152	530	{
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);
	531	+ oe.jTree = new cTree();
	532	+
164	533	Menu menu;
165	534	oe.menuBar.add(menu = new Menu("Edit"));
166	535	//editItem = menu.add(new MenuItem("Edit"));
167	536	//editItem.addActionListener(this);
168		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	537	+
	538	+// undoItem = menu.add(new MenuItem("Undo"));
	539	+// undoItem.addActionListener(this);
	540	+// redoItem = menu.add(new MenuItem("Redo"));
	541	+// redoItem.addActionListener(this);
	542	+// menu.add("-");
	543	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
169	544	duplicateItem.addActionListener(this);
170		- menu.add("-");
171		- cloneItem = menu.add(new MenuItem("Clone"));
	545	+
	546	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
172	547	cloneItem.addActionListener(this);
	548	+ //if (Globals.ADVANCED)
	549	+ {
173	550	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
174	551	cloneSupportItem.addActionListener(this);
	552	+ }
	553	+ oe.jTree.popup.addSeparator();
175	554	menu.add("-");
176		- cutItem = menu.add(new MenuItem("Cut"));
	555	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
177	556	cutItem.addActionListener(this);
178		- copyItem = menu.add(new MenuItem("Copy"));
	557	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
179	558	copyItem.addActionListener(this);
180	559	pasteItem = menu.add(new MenuItem("Paste"));
181	560	pasteItem.addActionListener(this);
182		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	561	+
	562	+ oe.jTree.popup.addSeparator();
	563	+ //menu.add("-");
	564	+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
	565	+ pasteIntoItem.addActionListener(this);
	566	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
183	567	pasteLinkItem.addActionListener(this);
184		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	568	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
185	569	pasteCloneItem.addActionListener(this);
186		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	570	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
187	571	// pasteExpandItem.addActionListener(this);
188		- clearItem = menu.add(new MenuItem("Clear"));
189		- clearItem.addActionListener(this);
	572	+ //menu.add("-");
	573	+ oe.jTree.popup.addSeparator();
	574	+
	575	+ if (Globals.ADVANCED)
	576	+ {
	577	+ // Deletes the cameras...
190	578	clearAllItem = menu.add(new MenuItem("Clear All"));
191	579	clearAllItem.addActionListener(this);
	580	+ }
	581	+
	582	+ menuBar.add(cameraMenu = new Menu("View"));
	583	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	584	+ //zBufferItem.addActionListener(this);
	585	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	586	+ //normalLensItem.addActionListener(this);
	587	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	588	+ restoreCameraItem.addActionListener(this);
	589	+
	590	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	591	+// toggleFullScreenItem.addItemListener(this);
	592	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	593	+// cameraMenu.add("-");
	594	+//
	595	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	596	+// toggleTextureItem.addItemListener(this);
	597	+// toggleTextureItem.setState(CameraPane.textureon);
	598	+//
	599	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	600	+// toggleSwitchItem.addItemListener(this);
	601	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	602	+
	603	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	604	+ toggleHandleItem.addItemListener(this);
	605	+ toggleHandleItem.setState(CameraPane.HANDLES);
	606	+
	607	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	608	+ togglePaintItem.addItemListener(this);
	609	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	610	+
	611	+ if (Globals.ADVANCED)
	612	+ {
	613	+ cameraMenu.add("-");
	614	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	615	+ toggleLiveItem.addItemListener(this);
	616	+ toggleLiveItem.setState(Globals.isLIVE());
192	617
	618	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	619	+ stepItem.addActionListener(this);
	620	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	621	+ // toggleDLItem.addItemListener(this);
	622	+ // toggleDLItem.setState(false);
	623	+
	624	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	625	+ toggleRenderItem.addItemListener(this);
	626	+ toggleRenderItem.setState(!CameraPane.frozen);
	627	+
	628	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	629	+ toggleDebugItem.addItemListener(this);
	630	+ toggleDebugItem.setState(Globals.DEBUG);
	631	+
	632	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	633	+ toggleFrustumItem.addItemListener(this);
	634	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	635	+
	636	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	637	+ toggleFootContactItem.addItemListener(this);
	638	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	639	+
	640	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	641	+ toggleTimelineItem.addItemListener(this);
	642	+ }
	643	+
	644	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	645	+// toggleRootItem.addItemListener(this);
	646	+// toggleRootItem.setState(false);
	647	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	648	+// animationItem.addItemListener(this);
	649	+// animationItem.setState(CameraPane.ANIMATION);
	650	+ cameraMenu.add("-");
	651	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	652	+ editCameraItem.addActionListener(this);
	653	+
	654	+ if (Globals.ADVANCED)
	655	+ {
	656	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	657	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	658	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	659	+ oe.cameraMenu.add("-");
	660	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	661	+ openWindowItem.addActionListener(this);
	662	+ lookAtItem.addActionListener(this);
	663	+ //lookFromItem.addActinoListener(this);
	664	+ //switchViewItem.addActionListener(this);
	665	+ }
	666	+
193	667	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);
	668	+ if (Globals.ADVANCED)
	669	+ {
198	670	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
199	671	revertMeshItem.addActionListener(this);
200	672	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
201	673	resetreferencesItem.addActionListener(this);
202	674	menu.add("-");
	675	+ }
203	676	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
204	677	overwriteGeoItem.addActionListener(this);
205	678	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -211,79 +684,118 @@
211	684	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
212	685	overwriteUVItem.addActionListener(this);
213	686	menu.add("-");
	687	+ if (Globals.ADVANCED)
	688	+ {
214	689	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
215	690	generateMeshItem.addActionListener(this);
216	691	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
217	692	poseMeshItem.addActionListener(this);
218	693	menu.add("-");
	694	+ }
219	695	resetsupportItem = menu.add(new MenuItem("Reset support"));
220	696	resetsupportItem.addActionListener(this);
221	697	linkverticesItem = menu.add(new MenuItem("Link to Support"));
222	698	linkverticesItem.addActionListener(this);
223	699	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
224	700	relinkverticesItem.addActionListener(this);
	701	+
	702	+ if (Globals.ADVANCED)
	703	+ {
225	704	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
226	705	setMasterItem.addActionListener(this);
	706	+ }
227	707
228		- oe.menuBar.add(menu = new Menu("Group"));
229		- grabItem = menu.add(new MenuItem("Grab"));
230		- grabItem.addActionListener(this);
	708	+ oe.menuBar.add(menu = new Menu("Order"));
	709	+
231	710	backItem = menu.add(new MenuItem("Back"));
232	711	backItem.addActionListener(this);
233	712	frontItem = menu.add(new MenuItem("Front"));
234	713	frontItem.addActionListener(this);
235		- compositeItem = menu.add(new MenuItem("Composite"));
236		- compositeItem.addActionListener(this);
237		- hideItem = menu.add(new MenuItem("Hide"));
	714	+// compositeItem = menu.add(new MenuItem("Composite"));
	715	+// compositeItem.addActionListener(this);
	716	+
	717	+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
	718	+ grabItem.addActionListener(this);
	719	+
	720	+ if (Globals.ADVANCED)
	721	+ {
	722	+ hideItem = menu.add(new MenuItem("Hidden Group"));
238	723	hideItem.addActionListener(this);
239		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	724	+ }
	725	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
240	726	ungroupItem.addActionListener(this);
241		- menu.add("-");
242		- randomItem = menu.add(new MenuItem("Random"));
243		- randomItem.addActionListener(this);
244		- physicsItem = menu.add(new MenuItem("Physics"));
245		- physicsItem.addActionListener(this);
246		- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
247		- frameselectorItem.addActionListener(this);
	727	+
	728	+ oe.jTree.popup.addSeparator();
	729	+
	730	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	731	+ deleteItem.addActionListener(this);
	732	+
	733	+// menu.add("-");
	734	+//
	735	+// switchItem = menu.add(new MenuItem("Switch node"));
	736	+// switchItem.addActionListener(this);
	737	+ if (Globals.ADVANCED)
	738	+ {
248	739	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
249	740	switchGeoItem.addActionListener(this);
250	741	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
251	742	switchTransfoItem.addActionListener(this);
252		- morphItem = menu.add(new MenuItem("Morph"));
	743	+ morphItem = menu.add(new MenuItem("Morph Group"));
253	744	morphItem.addActionListener(this);
	745	+
	746	+ menu.add("-");
	747	+ physicsItem = menu.add(new MenuItem("Physics"));
	748	+ physicsItem.addActionListener(this);
	749	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	750	+ frameselectorItem.addActionListener(this);
254	751	scriptNodeItem = menu.add(new MenuItem("Script Node"));
255	752	scriptNodeItem.addActionListener(this);
256		- cameraItem = menu.add(new MenuItem("Camera"));
257		- cameraItem.addActionListener(this);
	753	+ }
258	754
259	755	oe.menuBar.add(menu = new Menu("Object"));
260		- textureItem = menu.add(new MenuItem("Texture"));
261		- textureItem.addActionListener(this);
	756	+// textureItem = menu.add(new MenuItem("Texture"));
	757	+// textureItem.addActionListener(this);
262	758	billboardItem = menu.add(new MenuItem("Billboard"));
263	759	billboardItem.addActionListener(this);
264	760	csgItem = menu.add(new MenuItem("CSG"));
265	761	csgItem.addActionListener(this);
266		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	762	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
267	763	shadowXItem.addActionListener(this);
268		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	764	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
269	765	shadowYItem.addActionListener(this);
270		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	766	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
271	767	shadowZItem.addActionListener(this);
	768	+
	769	+ if (Globals.ADVANCED)
	770	+ {
	771	+ attributeItem = menu.add(new MenuItem("Attribute"));
	772	+ attributeItem.addActionListener(this);
	773	+ menu.add("-");
272	774	linkerItem = menu.add(new MenuItem("Linker"));
273	775	linkerItem.addActionListener(this);
274	776	templateItem = menu.add(new MenuItem("Template"));
275	777	templateItem.addActionListener(this);
276		- attributeItem = menu.add(new MenuItem("Attribute"));
277		- attributeItem.addActionListener(this);
278	778	pointflowItem = menu.add(new MenuItem("Point Flow"));
279	779	pointflowItem.addActionListener(this);
	780	+ }
	781	+ menu.add("-");
	782	+ textureRatioRItem = menu.add(new MenuItem("Texture Ratio Red"));
	783	+ textureRatioRItem.addActionListener(this);
	784	+ textureRatioGItem = menu.add(new MenuItem("Texture Ratio Green"));
	785	+ textureRatioGItem.addActionListener(this);
	786	+ textureRatioBItem = menu.add(new MenuItem("Texture Ratio Blue"));
	787	+ textureRatioBItem.addActionListener(this);
280	788	menu.add("-");
281	789	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
282	790	resetTransformItem.addActionListener(this);
283	791	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
284	792	resetCentroidItem.addActionListener(this);
285		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
286		- transformgeometryItem.addActionListener(this);
	793	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XZ"));
	794	+ resetCentroidXZItem.addActionListener(this);
	795	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	796	+ transformGeometryItem.addActionListener(this);
	797	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	798	+ transformChildrenItem.addActionListener(this);
287	799
288	800	oe.menuBar.add(menu = new Menu("Geometry"));
289	801	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -294,8 +806,11 @@
294	806	genNormalsCADItem.addActionListener(this);
295	807	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
296	808	genNormalsMESHItem.addActionListener(this);
297		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	809	+ if (Globals.ADVANCED)
	810	+ {
	811	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
298	812	genNormalsMINEItem.addActionListener(this);
	813	+ }
299	814	stripifyItem = menu.add(new MenuItem("Stripify"));
300	815	stripifyItem.addActionListener(this);
301	816	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -317,31 +832,52 @@
317	832	reduce34MeshItem.addActionListener(this);
318	833	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
319	834	increaseMeshItem.addActionListener(this);
320		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
321		- smoothMeshItem.addActionListener(this);
322	835	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
323	836	clipMeshItem.addActionListener(this);
	837	+
	838	+ if (Globals.ADVANCED)
	839	+ {
	840	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	841	+ smoothMeshItem.addActionListener(this);
	842	+ }
324	843
325	844	oe.menuBar.add(menu = new Menu("Attributes"));
	845	+ clearVersionsItem = menu.add(new MenuItem("Clear Versions"));
	846	+ clearVersionsItem.addActionListener(this);
326	847	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
327	848	clearMaterialsItem.addActionListener(this);
	849	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	850	+ resetAllItem.addActionListener(this);
	851	+ stepAllItem = menu.add(new MenuItem("Step All"));
	852	+ stepAllItem.addActionListener(this);
328	853	menu.add("-");
329	854	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
330	855	liveleavesItem.addActionListener(this);
331	856	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
332	857	unliveleavesItem.addActionListener(this);
	858	+ if (Globals.ADVANCED)
	859	+ {
333	860	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
334	861	supportleavesItem.addActionListener(this);
335	862	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
336	863	unsupportleavesItem.addActionListener(this);
	864	+ }
337	865	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
338	866	hideleavesItem.addActionListener(this);
339	867	showleavesItem = menu.add(new MenuItem("Show Leaves"));
340	868	showleavesItem.addActionListener(this);
341		- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
	869	+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
342	870	markleavesItem.addActionListener(this);
343		- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
	871	+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
344	872	unmarkleavesItem.addActionListener(this);
	873	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	874	+ rewindleavesItem.addActionListener(this);
	875	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	876	+ unrewindleavesItem.addActionListener(this);
	877	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	878	+ randomleavesItem.addActionListener(this);
	879	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	880	+ unrandomleavesItem.addActionListener(this);
345	881	menu.add("-");
346	882	flipVItem = menu.add(new MenuItem("Flip V"));
347	883	flipVItem.addActionListener(this);
..	..	@@ -367,53 +903,135 @@
367	903	attachBumpItem.addActionListener(this);
368	904	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
369	905	pigmentBumpItem.addActionListener(this);
	906	+ //embedTexturesItem
370	907	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
371	908	detachPigmentItem.addActionListener(this);
372	909	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
373	910	detachBumpItem.addActionListener(this);
	911	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	912	+ embedTexturesItem.addActionListener(this);
	913	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	914	+ deEmbedTexturesItem.addActionListener(this);
374	915	menu.add("-");
375	916	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
376	917	sortbysizeItem.addActionListener(this);
377	918	sortbynameItem = menu.add(new MenuItem("Sort by name"));
378	919	sortbynameItem.addActionListener(this);
379	920	menu.add("-");
	921	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	922	+ shareGeometriesItem.addActionListener(this);
	923	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	924	+ mergeGeometriesItem.addActionListener(this);
	925	+ menu.add("-");
	926	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	927	+ editLeafItem.addActionListener(this);
	928	+ if (Globals.ADVANCED)
	929	+ {
	930	+ // Pretty much the same as duplicate and clone.
380	931	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
381	932	extractGeometriesItem.addActionListener(this);
382	933	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
383	934	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);
	935	+ }
388	936
389	937	oe.menuBar.add(menu = new Menu("Insert"));
390	938	buildCreateMenu(menu);
391	939
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	940	oe.menuBar.add(menu = new Menu("Tools"));
404	941	buildToolsMenu(menu);
405	942	}
406	943
	944	+ JTabbedPane resourcecontainer;
	945	+ cGridBag currenttab;
	946	+ //boolean added; // patch for jar
	947	+
	948	+ int totalcount = 0;
	949	+
	950	+ int tabcount = 0;
	951	+ int colcount = 0;
	952	+ int rowcount = 0;
	953	+ int texturecount = 0;
	954	+
	955	+ int columns = 5;
	956	+ int rows = 7;
	957	+
	958	+ public void ResourceCallBack(String[] path)
	959	+ {
	960	+// for (int i = 0; i < path.length; i++)
	961	+// System.out.print(path[i] + "/");
	962	+// System.out.println();
	963	+
	964	+ if (//rowcount == 0 \|\|
	965	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	966	+ {
	967	+ currenttab = new cGridBag();
	968	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	969	+ currenttab.setName(tabname);
	970	+ //added = false;
	971	+ resourcecontainer.add(currenttab);
	972	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	973	+ rowcount = 1;
	974	+ colcount = 0;
	975	+ texturecount = 0;
	976	+ }
	977	+
	978	+ if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") \|\| path[2].toLowerCase().endsWith(".png")))
	979	+ {
	980	+ //if (!added)
	981	+ {
	982	+ //added = true;
	983	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	984	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	985	+ }
	986	+
	987	+ AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
	988	+ totalcount++;
	989	+
	990	+ if (++colcount >= columns)
	991	+ {
	992	+ colcount = 0;
	993	+ currenttab.Return();
	994	+
	995	+ if (rowcount++ >= rows)
	996	+ {
	997	+ rowcount = 0;
	998	+ }
	999	+ }
	1000	+ }
	1001	+ else
	1002	+ {
	1003	+// if (!path[path.length-1].equals("icons"))
	1004	+// resourcecontainer.Return();
	1005	+ }
	1006	+ }
	1007	+
	1008	+ void CreateTexturePanel(cGridBag container)
	1009	+ {
	1010	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	1011	+ container.add(resourcecontainer);
	1012	+
	1013	+ Grafreed.ParseResources("textures", this);
	1014	+
	1015	+ // 935. System.out.println("Total = " + totalcount);
	1016	+ }
	1017	+
407	1018	void SetupUI2(ObjEditor oe)
408	1019	{
	1020	+ // June 2019
	1021	+ if (oe == null)
	1022	+ {
	1023	+ //super.SetupUI2(this);
	1024	+ //return;
	1025	+ }
	1026	+
	1027	+ if (copy != group)
	1028	+ {
	1029	+ //super.SetupUI2(this);
	1030	+ }
	1031	+
409	1032	//new Exception().printStackTrace();
410	1033
411	1034	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	1035	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
418	1036
419	1037	oe.buttonGroup = new ButtonGroup();
..	..	@@ -434,110 +1052,269 @@
434	1052	oe.radioPanel.add(dummyButton);
435	1053	oe.buttonGroup.add(dummyButton);
436	1054	*/
437		- aConstraints.gridy += 1;
	1055	+ cGridBag versionManagerPanel = new cGridBag();
	1056	+
	1057	+ versionManagerPanel.preferredHeight = 4;
438	1058
439	1059	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
440	1060
441		- oe.aConstraints.gridwidth = 1;
442		- oe.aConstraints.gridx = 0;
	1061	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1062	+ //minButton.setToolTipText("Minimize window");
	1063	+ //minButton.addActionListener(this);
443	1064
444		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
445		- liveCB.setToolTipText("Enabled animation");
446		- liveCB.addItemListener(this);
447		-
448		- oe.aConstraints.gridx += 1;
449		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK), oe.aConstraints);
450		- trackCB.setToolTipText("Enable tracking");
451		- trackCB.addItemListener(this);
452		-
453		- oe.aConstraints.gridx += 1;
454		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	1065	+ if (Globals.ADVANCED)
	1066	+ {
	1067	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1068	+// maxButton.setToolTipText("Maximize window");
	1069	+// maxButton.addActionListener(this);
	1070	+ }
	1071	+
	1072	+ cButton gcButton;
	1073	+
	1074	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1075	+// gcButton.setToolTipText("Garbage collect");
	1076	+// gcButton.addActionListener(new ActionListener()
	1077	+// {
	1078	+// public void actionPerformed(ActionEvent e)
	1079	+// {
	1080	+// System.gc();
	1081	+// }
	1082	+// });
	1083	+
	1084	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1085	+ collapseButton.setToolTipText("Collapse toolbar");
	1086	+ collapseButton.addActionListener(this);
	1087	+
	1088	+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1089	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1090	+ maximize3DButton.addActionListener(this);
	1091	+
	1092	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1093	+ twoButton.setToolTipText("Show 3D view only");
	1094	+ twoButton.addActionListener(this);
	1095	+ this.fullscreenLayout = twoButton;
	1096	+
	1097	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1098	+ threeButton.setToolTipText("Show controls and 3D view");
	1099	+ threeButton.addActionListener(this);
	1100	+ if (Globals.ADVANCED)
	1101	+ {
	1102	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1103	+ sixButton.setToolTipText("Show 3D view and controls");
	1104	+ sixButton.addActionListener(this);
	1105	+ }
	1106	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1107	+// sevenButton.setToolTipText("3-column layout");
	1108	+// sevenButton.addActionListener(this);
	1109	+ //
	1110	+
	1111	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1112	+ fullButton.setToolTipText("Full-screen window");
	1113	+ fullButton.addActionListener(this);
	1114	+
	1115	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
455	1116	screenfitButton.setToolTipText("Screen fit");
456	1117	screenfitButton.addActionListener(this);
457		- oe.aConstraints.gridx += 1;
	1118	+
	1119	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1120	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1121	+ restoreCameraButton.addActionListener(this);
	1122	+
	1123	+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1124	+ saveVersionButton.setToolTipText("Duplicate current version");
	1125	+ saveVersionButton.addActionListener(this);
	1126	+
	1127	+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1128	+ deleteVersionButton.setToolTipText("Delete current version");
	1129	+ deleteVersionButton.addActionListener(this);
	1130	+ deleteVersionButton.setEnabled(false);
	1131	+
	1132	+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1133	+ previousVersionButton.setToolTipText("Previous version");
	1134	+ previousVersionButton.addActionListener(this);
	1135	+ previousVersionButton.setEnabled(false);
	1136	+
	1137	+ cGridBag updown = new cGridBag().setVertical(true);
	1138	+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1139	+ restoreButton.setToolTipText("Undo (restore current version)");
	1140	+ restoreButton.addActionListener(this);
	1141	+ restoreButton.setEnabled(false);
	1142	+
	1143	+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1144	+ replaceButton.setToolTipText("Save (replace current version)");
	1145	+ replaceButton.addActionListener(this);
	1146	+ replaceButton.setEnabled(false);
	1147	+
	1148	+ versionManagerPanel.add(updown);
	1149	+
	1150	+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1151	+ nextVersionButton.setToolTipText("Next version");
	1152	+ nextVersionButton.addActionListener(this);
	1153	+ nextVersionButton.setEnabled(false);
	1154	+
	1155	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1156	+ oneStepButton.setToolTipText("Animate one step forward");
	1157	+ oneStepButton.addActionListener(this);
	1158	+
	1159	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1160	+ liveCB.setToolTipText("Enable animation");
	1161	+ liveCB.addItemListener(this);
	1162	+
	1163	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	1164	+ fastCB.setToolTipText("Fast mode");
	1165	+ fastCB.addItemListener(this);
	1166	+
	1167	+ //oe.toolboxPanel.Return();
	1168	+
	1169	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1170	+// trackCB.setToolTipText("Enable tracking");
	1171	+// trackCB.addItemListener(this);
	1172	+
458	1173	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
459	1174	// screenfitpointButton.addActionListener(this);
460		-// oe.aConstraints.gridx += 1;
461		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
462		- snapobjectButton.addActionListener(this);
463		- snapobjectButton.setToolTipText("Snap Object");
464		- oe.aConstraints.gridx += 1;
465	1175
466		- //aConstraints.gridx = 0;
467		- //aConstraints.gridy += 1;
468		- oe.aConstraints.weighty = 0;
469		- oe.aConstraints.gridwidth = 1;
470		-
471		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
472		- flashSelectionButton.setToolTipText("Show selection");
473		- flashSelectionButton.addActionListener(this);
474		-
475		- oe.toolbarPanel.add(new cButton(" ", false));
476		-
477		- oe.aConstraints.gridx += 1;
478		- oe.aConstraints.weighty = 0;
479		- oe.aConstraints.gridwidth = 1;
480		-
481		- //
482		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
483		- twoButton.setToolTipText("Show center view only");
484		- twoButton.addActionListener(this);
485		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	1176	+ if (Globals.ADVANCED)
	1177	+ {
	1178	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1179	+ snapobjectButton.addActionListener(this);
	1180	+ snapobjectButton.setToolTipText("Snap Object");
	1181	+
	1182	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
486	1183	fourButton.addActionListener(this);
487		- fourButton.setToolTipText("Show left panel only");
488		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
489		- sixButton.setToolTipText("2-column layout left");
490		- sixButton.addActionListener(this);
491		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
492		- threeButton.setToolTipText("2-column layout right");
493		- threeButton.addActionListener(this);
494		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
495		- sevenButton.setToolTipText("3-column layout");
496		- sevenButton.addActionListener(this);
497		- //
	1184	+ fourButton.setToolTipText("Show control panel only");
	1185	+ }
498	1186
499		- oe.toolbarPanel.add(rootButton = new cButton(" o o o ")); //, oe.aConstraints);
500		- rootButton.setToolTipText("Edit object in new tab");
	1187	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	1188	+
	1189	+
	1190	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1191	+ rootButton.setToolTipText("Open selection in new tab");
501	1192	rootButton.addActionListener(this);
502		- oe.aConstraints.gridx += 1;
503		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	1193	+
	1194	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
504	1195	closeButton.setToolTipText("Close tab");
505	1196	closeButton.addActionListener(this);
506	1197	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
507	1198	//clearButton.addActionListener(this);
508		- oe.aConstraints.gridx += 1;
509		-
510		- oe.aConstraints.gridx = 1; //
511		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
512		- editButton.addActionListener(this);
513		- oe.aConstraints.gridx += 1;
514		- oe.aConstraints.weighty = 0;
515		- oe.aConstraints.gridwidth = 1;
516	1199
517		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	1200	+ cGridBag row1 = new cGridBag();
	1201	+
	1202	+ // INSERT
	1203	+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1204	+ gridButton.setToolTipText("Create ground");
	1205	+ gridButton.addActionListener(this);
	1206	+
	1207	+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1208	+ boxButton.setToolTipText("Create box");
	1209	+ boxButton.addActionListener(this);
	1210	+
	1211	+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1212	+ superButton.setToolTipText("Create superellipsoid");
	1213	+ superButton.addActionListener(this);
	1214	+
	1215	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1216	+ sphereButton.setToolTipText("Create sphere");
	1217	+ sphereButton.addActionListener(this);
	1218	+
	1219	+ row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1220	+ coneButton.setToolTipText("Create cone");
	1221	+ coneButton.addActionListener(this);
	1222	+
	1223	+ row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1224	+ torusButton.setToolTipText("Create torus");
	1225	+ torusButton.addActionListener(this);
	1226	+
	1227	+ if (false) //Globals.ADVANCED)
	1228	+ {
	1229	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1230	+ kleinButton.setToolTipText("Create Klein bottle");
	1231	+ kleinButton.addActionListener(this);
	1232	+ }
	1233	+
	1234	+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1235	+ particlesButton.setToolTipText("Create particle system");
	1236	+ particlesButton.addActionListener(this);
	1237	+
	1238	+ oe.toolboxPanel.add(row1);
	1239	+
	1240	+ cGridBag row2 = new cGridBag();
	1241	+
	1242	+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1243	+ groupButton.setToolTipText("Create group");
	1244	+ groupButton.addActionListener(this);
	1245	+
	1246	+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1247	+ compositeButton.setToolTipText("Create composite");
	1248	+ compositeButton.addActionListener(this);
	1249	+
	1250	+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1251	+ switchButton.setToolTipText("Create item switcher");
	1252	+ switchButton.addActionListener(this);
	1253	+
	1254	+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1255	+ loopButton.setToolTipText("Create loop");
	1256	+ loopButton.addActionListener(this);
	1257	+
	1258	+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1259	+ textureButton.setToolTipText("Create texture");
	1260	+ textureButton.addActionListener(this);
	1261	+
	1262	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1263	+ overlayButton.setToolTipText("Create overlay");
	1264	+ overlayButton.addActionListener(this);
	1265	+
	1266	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1267	+ lightButton.setToolTipText("Create light");
	1268	+ lightButton.addActionListener(this);
	1269	+
	1270	+ oe.toolboxPanel.add(row2);
	1271	+
	1272	+ cGridBag textures = new cGridBag();
	1273	+
	1274	+ CreateTexturePanel(textures);
	1275	+
	1276	+ int tabCount = resourcecontainer.getTabCount();
	1277	+
	1278	+ if (tabCount > 0)
	1279	+ resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
	1280	+
	1281	+ oe.toolboxPanel.add(textures);
	1282	+
	1283	+ textures.preferredHeight = 100;
	1284	+
	1285	+ CreateSkyboxPanel(oe.skyboxPanel);
	1286	+
	1287	+ // EDIT panel
	1288	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1289	+ editButton.setToolTipText("Pin selection controls");
	1290	+ editButton.addActionListener(this);
	1291	+
	1292	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1293	+ uneditButton.setToolTipText("Unpin and remove selection controls");
518	1294	uneditButton.addActionListener(this);
519	1295
520		- oe.aConstraints.gridx += 1;
521		- oe.aConstraints.weighty = 0;
522		- oe.aConstraints.gridwidth = 1;
523		-
524		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
525		- clearPanelButton.addActionListener(this);
526		-
527		- oe.aConstraints.gridx += 1;
528		- oe.aConstraints.weighty = 0;
529		- oe.aConstraints.gridwidth = 1;
530		-
531		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	1296	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1297	+ allParamsButton.setToolTipText("Show all controls");
532	1298	allParamsButton.addActionListener(this);
533	1299
534		- oe.aConstraints.gridx += 1;
535		- oe.aConstraints.weighty = 0;
536		- oe.aConstraints.gridwidth = 1;
537		-
538		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
539		- unselectButton.addActionListener(this);
	1300	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1301	+ clearPanelButton.setToolTipText("Clear all controls");
	1302	+ clearPanelButton.addActionListener(this);
540	1303
	1304	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1305	+ //unselectButton.setToolTipText("Unselect");
	1306	+ //unselectButton.addActionListener(this);
	1307	+
	1308	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1309	+ flashSelectionButton.setToolTipText("Highlight selection");
	1310	+ flashSelectionButton.addActionListener(this);
	1311	+
	1312	+ editCommandsPanel.preferredHeight = 1;
	1313	+
	1314	+ SetPinStates(false);
	1315	+// oe.treePanel.add(commandsPanel);
	1316	+// oe.treePanel.Return();
	1317	+
541	1318	// oe.aConstraints.gridx += 1;
542	1319	// oe.aConstraints.weighty = 0;
543	1320	// oe.aConstraints.gridwidth = 1;
..	..	@@ -549,47 +1326,34 @@
549	1326	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
550	1327	// gcButton.addActionListener(this);
551	1328
552		- oe.aConstraints.gridx = 0;
553		- oe.aConstraints.gridy += 1;
554		-
555		- //ctrlPanel.add(objList = new List(5, true));
556		- oe.aConstraints.gridwidth = 100;
557		- // oe.aConstraints.gridheight = 100;
558		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
559		- oe.aConstraints.gridheight = 1;
560		- oe.aConstraints.weighty = 0.5;
561		- oe.aConstraints.gridx = 0;
562		- JScrollPane jSP;
	1329	+ cGridBag jSPPanel = new cGridBag();
	1330	+
	1331	+ jSPPanel.preferredHeight = 20;
	1332	+
	1333	+ JScrollPane jSP;
563	1334	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
564		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	1335	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
565	1336	ResetModel();
566		- oe.aConstraints.weighty = 0.5;
567		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
568		- oe.aConstraints.gridy += 1;
569		- oe.aConstraints.gridwidth = 1;
570		-
571		- oe.aConstraints.weighty = 0;
572		- oe.aConstraints.gridwidth = 2;
573		-
574		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
575		- colorCB.addItemListener(this);
576		- oe.aConstraints.gridx += 2;
577		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
578		- materialCB.addItemListener(this);
579		- oe.aConstraints.gridx += 2;
580		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
581		- textureCB.addItemListener(this);
582		-
583		- oe.aConstraints.gridx = 0;
584		- oe.aConstraints.gridy += 1;
585	1337
	1338	+ oe.treePanel.add(jSPPanel);
	1339	+ oe.treePanel.Return();
	1340	+
	1341	+ oe.treePanel.add(versionManagerPanel);
	1342	+ oe.treePanel.Return();
	1343	+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1344	+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
	1345	+ versionSliderPane.preferredHeight = 3;
	1346	+
	1347	+// mainPanel.setDividerLocation(0.1); //1.0);
	1348	+ mainPanel.setResizeWeight(0.4);
	1349	+
586	1350	//jList.addListSelectionListener(this);
587	1351	oe.jTree.addTreeSelectionListener(this);
588	1352	//jTree.setRootVisible(false);
589	1353	//jTree.setEditable(true);
590	1354	oe.jTree.setDragEnabled(true);
591	1355	//jTree.setPreferredSize(new Dimension(10,10));
592		- jSP.setPreferredSize(new Dimension(100,200));
	1356	+ //jSP.setPreferredSize(new Dimension(100,200));
593	1357
594	1358	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
595	1359
..	..	@@ -601,53 +1365,70 @@
601	1365	dgr.addDragGestureListener(this);
602	1366	}catch(Exception e) {}
603	1367	*/
604		- radio.layout = sevenButton;
	1368	+ radio.layout = threeButton; // sixButton;
605	1369	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
606	1370	}
607	1371
608	1372	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
609	1373	{
610		- //constraints.gridx = 0;
611		- //constraints.gridy = 0;
612		- panel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
613		- fastCB.setToolTipText("Fast mode");
614		- fastCB.addItemListener(this);
615		- //constraints.gridy += 1;
616		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
617		- supportCB.setToolTipText("Enabled rigging");
618		- supportCB.addItemListener(this);
	1374	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1375	+ colorCB.setToolTipText("Copy color when dropped");
	1376	+ colorCB.addItemListener(this);
619	1377
620		- // constraints.gridy += 1;
	1378	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1379	+ materialCB.setToolTipText("Copy material when dropped");
	1380	+ materialCB.addItemListener(this);
	1381	+
	1382	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1383	+ textureCB.setToolTipText("Copy texture when dropped");
	1384	+ textureCB.addItemListener(this);
	1385	+
	1386	+ panel.Return();
	1387	+
	1388	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	1389	+ boxCB.setToolTipText("Display bounding boxes");
	1390	+ boxCB.addItemListener(this);
	1391	+
	1392	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	1393	+ zoomBoxCB.setToolTipText("Display only for wheel");
	1394	+ zoomBoxCB.addItemListener(this);
	1395	+
	1396	+ if (true) // Globals.ADVANCED)
	1397	+ {
	1398	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1399	+// supportCB.setToolTipText("Enable rigging");
	1400	+// supportCB.addItemListener(this);
	1401	+
	1402	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1403	+ freezeCB.setToolTipText("Fast moving camera");
	1404	+ freezeCB.addItemListener(this);
	1405	+
621	1406	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
622	1407	// localCB.addItemListener(this);
623	1408
624		- //constraints.gridy += 1;
	1409	+ panel.Return();
	1410	+
625	1411	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
626	1412	crowdCB.setToolTipText("Used for crowds");
627	1413	crowdCB.addItemListener(this);
628	1414
629		- //constraints.gridy += 1;
630	1415	panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
631	1416	smoothCB.setToolTipText("Snapping delay");
632	1417	smoothCB.addItemListener(this);
633	1418
634		- //constraints.gridy += 1;
635		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
636		- slowCB.setToolTipText("Smooth interpolation");
637		- slowCB.addItemListener(this);
638		- //constraints.gridy += 1;
639		- panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
640		- boxCB.setToolTipText("Display bounding boxes");
641		- boxCB.addItemListener(this);
642		- //constraints.gridy += 1;
643		- panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
644		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
645		- zoomBoxCB.addItemListener(this);
646		-
	1419	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1420	+// slowCB.setToolTipText("Smooth interpolation");
	1421	+// slowCB.addItemListener(this);
	1422	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1423	+ minshaderCB.setToolTipText("Minimal fast shader");
	1424	+ minshaderCB.addItemListener(this);
	1425	+
647	1426	// constraints.gridy += 1;
648	1427	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
649	1428	// speakerMocapCB.addItemListener(this);
650	1429
	1430	+ panel.Return();
	1431	+
651	1432	if (false)
652	1433	{
653	1434	// handled in scripts
..	..	@@ -662,61 +1443,126 @@
662	1443	//constraints.gridy += 1;
663	1444	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
664	1445	smoothfocusCB.addItemListener(this);
	1446	+ panel.Return();
665	1447	}
666	1448
667	1449	//constraints.gridx += 1;
668	1450	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
669	1451	// debugCB.addItemListener(this);
670	1452
671		- //constraints.gridy += 1;
	1453	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1454	+ trackCB.setToolTipText("Enable tracking target");
	1455	+ trackCB.addItemListener(this);
	1456	+
672	1457	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1458	+ oeilCB.setToolTipText("Move camera when tracking");
673	1459	oeilCB.addItemListener(this);
674	1460
675		- //constraints.gridy += 1;
	1461	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1462	+ shadowCB.setToolTipText("When live compute shadows");
	1463	+ shadowCB.addItemListener(this);
	1464	+
	1465	+ panel.Return();
	1466	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1467	+ toggleTextureCB.setToolTipText("Load textures");
	1468	+ toggleTextureCB.addItemListener(this);
	1469	+
	1470	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1471	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1472	+ toggleSwitchCB.addItemListener(this);
	1473	+
	1474	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1475	+ autokeepCB.setToolTipText("On structure change");
	1476	+ autokeepCB.addItemListener(this);
	1477	+
	1478	+ panel.Return();
	1479	+ if (Globals.ADVANCED)
	1480	+ {
676	1481	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
677	1482	lookAtCB.setToolTipText("Look-at target");
678	1483	lookAtCB.addItemListener(this);
	1484	+ }
	1485	+
	1486	+ }
	1487	+
	1488	+ cGridBag fill = new cGridBag();
	1489	+ fill.preferredHeight = 200;
	1490	+ cGridBag fill2 = new cGridBag();
	1491	+ fill2.preferredHeight = 200;
	1492	+ cGridBag fill3 = new cGridBag();
	1493	+ fill3.preferredHeight = 200;
	1494	+
	1495	+ panel.add(fill);
	1496	+ panel.add(fill2);
	1497	+ panel.add(fill3);
679	1498
680	1499	}
681	1500
682	1501	void EditObject(Object3D obj)
683	1502	{
	1503	+ //assert(obj instanceof Composite);
	1504	+
	1505	+// if (obj.versionlist == null)
	1506	+// {
	1507	+// obj.versionlist = new Object3D[100];
	1508	+// obj.versionindex = -1;
	1509	+// }
	1510	+
684	1511	cRadio radioButton = new cRadio(obj.name);
	1512	+
	1513	+ // June 2019. Patch to avoid bug with transparency.
	1514	+ radioButton.hadMaterial = obj.material != null;
	1515	+ if (!radioButton.hadMaterial)
	1516	+ {
	1517	+ obj.material = new cMaterial();
	1518	+ }
	1519	+
685	1520	radioButton.SetObject(obj);
686		- radioButton.layout = sevenButton;
	1521	+ radioButton.layout = threeButton; // sixButton;
687	1522	radioButton.SetCamera(cameraView.renderCamera, false);
688	1523	radioButton.addActionListener(this);
689	1524	radioPanel.add(radioButton);
690	1525	buttonGroup.add(radioButton);
691	1526	radioButton.doClick();
692	1527	}
	1528	+
693	1529	void SetupViews(ObjEditor oe)
694	1530	{
	1531	+ theFrame = this;
	1532	+
695	1533	oe.SetupViews();
696	1534
	1535	+ if (Globals.DEBUG)
697	1536	System.out.println("SetupViews");
698	1537	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
699	1538	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
700	1539	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
701	1540	}
702	1541
703		- JCheckBox liveCB;
704		- JCheckBox supportCB;
705		- JCheckBox localCB;
706		- JCheckBox crowdCB;
707		- JCheckBox smoothCB;
708		- JCheckBox fastCB;
709		- JCheckBox slowCB;
710		- JCheckBox boxCB;
711		- JCheckBox zoomBoxCB;
712		- JCheckBox trackCB;
713		- JCheckBox smoothfocusCB;
	1542	+ cToggleButton liveCB;
	1543	+ cCheckBox supportCB;
	1544	+ cCheckBox localCB;
	1545	+ cCheckBox crowdCB;
	1546	+ cCheckBox smoothCB;
	1547	+ cCheckBox minshaderCB;
	1548	+
	1549	+ cToggleButton fastCB;
	1550	+ cCheckBox slowCB;
	1551	+ cCheckBox boxCB;
	1552	+ cCheckBox zoomBoxCB;
	1553	+ cCheckBox freezeCB;
	1554	+ //cToggleButton trackCB;
	1555	+ cCheckBox trackCB;
	1556	+ cCheckBox smoothfocusCB;
714	1557	// JCheckBox speakerMocapCB;
715		- JCheckBox speakerCameraCB;
716		- JCheckBox speakerFocusCB;
717		- JCheckBox debugCB;
718		- JCheckBox oeilCB;
719		- JCheckBox lookAtCB;
	1558	+ cCheckBox speakerCameraCB;
	1559	+ cCheckBox speakerFocusCB;
	1560	+ cCheckBox debugCB;
	1561	+
	1562	+ cCheckBox oeilCB;
	1563	+ cCheckBox shadowCB;
	1564	+ cCheckBox autokeepCB;
	1565	+ cCheckBox lookAtCB;
720	1566
721	1567	// static int COLOR = 1;
722	1568	// static int MATERIAL = 2;
..	..	@@ -724,9 +1570,9 @@
724	1570
725	1571	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
726	1572
727		- JCheckBox colorCB;
728		- JCheckBox materialCB;
729		- JCheckBox textureCB;
	1573	+ cCheckBox colorCB;
	1574	+ cCheckBox materialCB;
	1575	+ cCheckBox textureCB;
730	1576
731	1577	public void itemStateChanged(ItemEvent e)
732	1578	{
..	..	@@ -754,6 +1600,7 @@
754	1600	} else if(e.getSource() == liveCB)
755	1601	{
756	1602	cameraView.ToggleLive();
	1603	+ refreshContents(false);
757	1604	}
758	1605	else if(e.getSource() == supportCB)
759	1606	{
..	..	@@ -769,6 +1616,12 @@
769	1616	{
770	1617	cameraView.ToggleInertia();
771	1618	cameraView.repaint();
	1619	+ }
	1620	+ else if(e.getSource() == minshaderCB)
	1621	+ {
	1622	+ Globals.MINSHADER ^= true;
	1623	+ cameraView.programInitialized = false;
	1624	+ cameraView.repaint();
772	1625	}
773	1626	else if(e.getSource() == localCB)
774	1627	{
..	..	@@ -818,6 +1671,18 @@
818	1671	{
819	1672	cameraView.ToggleOeil();
820	1673	}
	1674	+ else if(e.getSource() == shadowCB)
	1675	+ {
	1676	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1677	+ }
	1678	+ else if(e.getSource() == freezeCB)
	1679	+ {
	1680	+ Globals.FREEZEONMOVE ^= true;
	1681	+ }
	1682	+ else if(e.getSource() == autokeepCB)
	1683	+ {
	1684	+ Globals.REPLACEONMAKE ^= true;
	1685	+ }
821	1686	else if(e.getSource() == lookAtCB)
822	1687	{
823	1688	cameraView.ToggleLookAt();
..	..	@@ -834,7 +1699,8 @@
834	1699
835	1700	/**/
836	1701	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
837		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1702	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1703	+ TreePath path = objEditor.jTree.getSelectionPath();
838	1704	if ((path == null) \|\| (path.getPathCount() <= 1)) {
839	1705	// We can't move the root node or an empty selection
840	1706	return;
..	..	@@ -897,8 +1763,6 @@
897	1763	}
898	1764	}
899	1765
900		- String string = (String) object;
901		-
902	1766	System.out.println("Transfer = " + object + "; drop : " + target);
903	1767	// if( object instanceof java.io.File[])
904	1768	// {
..	..	@@ -906,7 +1770,11 @@
906	1770	// objEditor.DropFile((java.io.File[]) object, true);
907	1771	// return;
908	1772	// }
909		- if (string.charAt(0) == '/')
	1773	+
	1774	+ String string = object.toString();
	1775	+
	1776	+ // File path for Mac and Windows
	1777	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
910	1778	{
911	1779	// file(s)
912	1780	String[] names = string.split("\n");
..	..	@@ -933,7 +1801,7 @@
933	1801
934	1802	flashIt = false;
935	1803	CameraPane pane = (CameraPane) target;
936		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1804	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
937	1805	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
938	1806
939	1807	if (group.selection.size() == 1)
..	..	@@ -949,23 +1817,33 @@
949	1817
950	1818	assert target == objEditor.jTree;
951	1819	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1820	+ Object3D destinationLeaf;
952	1821	try {
953		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1822	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
954	1823	} catch (Exception e) {
955	1824	System.out.println("destinationPath : " + destinationPath);
956	1825	return;
957	1826	}
958	1827
959		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1828	+ for (int i=group.selection.size(); --i>=0;)
960	1829	{
	1830	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1831	+
	1832	+ // Cannot move into itself
	1833	+ if (child == destinationLeaf)
	1834	+ return;
	1835	+ }
	1836	+
	1837	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1838	+// {
961	1839	loadClipboard(true);
962	1840	objEditor.jTree.setSelectionPath(destinationPath);
963		- pasteInto(false);
964		- } else {
965		- loadClipboard(false);
966		- objEditor.jTree.setSelectionPath(destinationPath);
967		- pasteInto(false); // true); // ???
968		- }
	1841	+ pasteInto(false, false);
	1842	+// } else {
	1843	+// loadClipboard(false);
	1844	+// objEditor.jTree.setSelectionPath(destinationPath);
	1845	+// pasteInto(false, false); // true); // ???
	1846	+// }
969	1847	}
970	1848	public void dropActionChanged(DropTargetDragEvent dtde)
971	1849	// Called if the user has modified the current drop gesture
..	..	@@ -1021,7 +1899,12 @@
1021	1899	TreePath path;
1022	1900
1023	1901	public TransferableTreePath(TreePath tp) {
1024		- path = tp;
	1902	+ Object[] objs = new Object[tp.getPathCount()];
	1903	+ for (int i=0; i<objs.length; i++)
	1904	+ {
	1905	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1906	+ }
	1907	+ path = new TreePath(objs);
1025	1908	}
1026	1909
1027	1910	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1070,85 +1953,107 @@
1070	1953	{
1071	1954	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1072	1955	//heightFieldItem.addActionListener(this);
1073		- gridItem = menu.add(new MenuItem("Grid"));
1074		- gridItem.addActionListener(this);
1075		- rectoidItem = menu.add(new MenuItem("Box"));
1076		- rectoidItem.addActionListener(this);
1077		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1078		- ellipsoidItem.addActionListener(this);
1079		- coneItem = menu.add(new MenuItem("Cone"));
1080		- coneItem.addActionListener(this);
1081		- torusItem = menu.add(new MenuItem("Torus"));
1082		- torusItem.addActionListener(this);
1083		- superItem = menu.add(new MenuItem("Superellipsoid"));
1084		- superItem.addActionListener(this);
	1956	+// gridItem = menu.add(new MenuItem("Grid"));
	1957	+// gridItem.addActionListener(this);
	1958	+// rectoidItem = menu.add(new MenuItem("Box"));
	1959	+// rectoidItem.addActionListener(this);
	1960	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1961	+// ellipsoidItem.addActionListener(this);
	1962	+// coneItem = menu.add(new MenuItem("Cone"));
	1963	+// coneItem.addActionListener(this);
	1964	+// torusItem = menu.add(new MenuItem("Torus"));
	1965	+// torusItem.addActionListener(this);
	1966	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1967	+// superItem.addActionListener(this);
	1968	+
	1969	+ cameraItem = menu.add(new MenuItem("Camera"));
	1970	+ cameraItem.addActionListener(this);
	1971	+
	1972	+ if (!Globals.ADVANCED)
	1973	+ {
1085	1974	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1086	1975	kleinItem.addActionListener(this);
1087		- particleItem = menu.add(new MenuItem("Particle system"));
1088		- particleItem.addActionListener(this);
	1976	+ }
	1977	+
	1978	+// particleItem = menu.add(new MenuItem("Particle system"));
	1979	+// particleItem.addActionListener(this);
	1980	+ if (Globals.ADVANCED)
	1981	+ {
1089	1982	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1090	1983	ragdollItem.addActionListener(this);
1091	1984	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1092	1985	ragdoll2Item.addActionListener(this);
	1986	+ }
1093	1987	menu.add("-");
1094		- meshItem = menu.add(new MenuItem("Mesh"));
	1988	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1095	1989	meshItem.addActionListener(this);
1096	1990	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1097	1991	// meshGroupItem.addActionListener(this);
	1992	+ if (Globals.ADVANCED)
	1993	+ {
1098	1994	springItem = menu.add(new MenuItem("Spring"));
1099	1995	springItem.addActionListener(this);
1100	1996	flagItem = menu.add(new MenuItem("Flag"));
1101	1997	flagItem.addActionListener(this);
1102		- bezierItem = menu.add(new MenuItem("Patch"));
1103		- bezierItem.addActionListener(this);
1104		- checkerItem = menu.add(new MenuItem("Checker"));
1105		- checkerItem.addActionListener(this);
1106	1998	blobItem = menu.add(new MenuItem("Blob"));
1107	1999	blobItem.addActionListener(this);
1108	2000	latheItem = menu.add(new MenuItem("Lathe"));
1109	2001	latheItem.addActionListener(this);
1110		- lightItem = menu.add(new MenuItem("Light"));
1111		- lightItem.addActionListener(this);
	2002	+ }
	2003	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	2004	+ bezierItem.addActionListener(this);
	2005	+// overlayItem = menu.add(new MenuItem("Overlay"));
	2006	+// overlayItem.addActionListener(this);
	2007	+// lightItem = menu.add(new MenuItem("Light"));
	2008	+// lightItem.addActionListener(this);
1112	2009	menu.add("-");
1113	2010	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1114	2011	//superLoopItem.addActionListener(this);
1115		- loopItem = menu.add(new MenuItem("Loop"));
1116		- loopItem.addActionListener(this);
	2012	+// loopItem = menu.add(new MenuItem("Loop"));
	2013	+// loopItem.addActionListener(this);
1117	2014	doubleItem = menu.add(new MenuItem("Fork"));
1118	2015	doubleItem.addActionListener(this);
	2016	+ if (Globals.ADVANCED)
	2017	+ {
1119	2018	tripleItem = menu.add(new MenuItem("Trident"));
1120	2019	tripleItem.addActionListener(this);
	2020	+ }
1121	2021	}
1122	2022
1123	2023	void buildToolsMenu(Menu menu)
1124	2024	{
1125	2025	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1126	2026	animationItem.addItemListener(this);
1127		- animationItem.setState(CameraPane.ANIMATION);
	2027	+ animationItem.setState(Globals.ANIMATION);
	2028	+
	2029	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	2030	+ archiveItem.addActionListener(this);
1128	2031
1129	2032	menu.add("-");
1130	2033	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1131	2034	parseverticesItem.addActionListener(this);
1132	2035	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1133	2036	textureFieldItem.addActionListener(this);
1134		- alignItem = menu.add(new MenuItem("Align"));
	2037	+ alignItem = menu.add(new MenuItem("Align Objects"));
1135	2038	alignItem.addActionListener(this);
1136		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1137		- mirrorItem.addActionListener(this);
1138	2039	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1139	2040	reduceMorphItem.addActionListener(this);
1140	2041	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1141	2042	reduce34MorphItem.addActionListener(this);
1142		-
1143		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1144		- computeAOItem.addActionListener(this);
1145	2043	menu.add("-");
1146		-
1147	2044	menu.add(memoryItem = new MenuItem("Memory Usage"));
1148	2045	memoryItem.addActionListener(this);
	2046	+ menu.add(computeAOItem = new MenuItem("Compute AO"));
	2047	+ computeAOItem.addActionListener(this);
	2048	+
	2049	+ if (Globals.ADVANCED)
	2050	+ {
	2051	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	2052	+ mirrorItem.addActionListener(this);
	2053	+ menu.add("-");
1149	2054	menu.add(analyzeItem = new MenuItem("Analyze"));
1150	2055	analyzeItem.addActionListener(this);
1151		- menu.add(dumpItem = new MenuItem("Dump"));
	2056	+ menu.add(dumpItem = new MenuItem("Print"));
1152	2057	dumpItem.addActionListener(this);
1153	2058	// menu.add(pathItem = new MenuItem("From-to path"));
1154	2059	// pathItem.addActionListener(this);
..	..	@@ -1166,6 +2071,7 @@
1166	2071	menu.add("-");
1167	2072	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1168	2073	editScriptItem.addActionListener(this);
	2074	+ }
1169	2075	}
1170	2076
1171	2077	void ScreenFit()
..	..	@@ -1230,24 +2136,24 @@
1230	2136	switch(axis)
1231	2137	{
1232	2138	case 0 :
1233		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1234		- vert2.x = minima.x; vert2.y = maxima.y; vert2.z = minima.z;
1235		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1236		- vert4.x = minima.x; vert4.y = maxima.y; vert4.z = maxima.z;
	2139	+ vert1.x = minima.x + 0.001f; vert1.y = minima.y; vert1.z = minima.z;
	2140	+ vert2.x = minima.x + 0.001f; vert2.y = maxima.y; vert2.z = minima.z;
	2141	+ vert3.x = minima.x + 0.001f; vert3.y = minima.y; vert3.z = maxima.z;
	2142	+ vert4.x = minima.x + 0.001f; vert4.y = maxima.y; vert4.z = maxima.z;
1237	2143	norm = cVector.X;
1238	2144	break;
1239	2145	case 1 :
1240		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1241		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1242		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1243		- vert4.x = maxima.x; vert4.y = minima.y; vert4.z = maxima.z;
	2146	+ vert1.x = minima.x; vert1.y = minima.y + 0.001f; vert1.z = minima.z;
	2147	+ vert2.x = maxima.x; vert2.y = minima.y + 0.001f; vert2.z = minima.z;
	2148	+ vert3.x = minima.x; vert3.y = minima.y + 0.001f; vert3.z = maxima.z;
	2149	+ vert4.x = maxima.x; vert4.y = minima.y + 0.001f; vert4.z = maxima.z;
1244	2150	norm = cVector.Y;
1245	2151	break;
1246	2152	case 2 :
1247		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1248		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1249		- vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z;
1250		- vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z;
	2153	+ vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z + 0.001f;
	2154	+ vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z + 0.001f;
	2155	+ vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z + 0.001f;
	2156	+ vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z + 0.001f;
1251	2157	norm = cVector.Z;
1252	2158	break;
1253	2159	}
..	..	@@ -1288,9 +2194,38 @@
1288	2194	shadow.material = new cMaterial(obj.material);
1289	2195	shadow.material.diffuse = 0.0001f;
1290	2196	shadow.material.specular = 0.0001f;
	2197	+ shadow.material.opacity = 0.75f;
	2198	+
	2199	+ AllocProjectedVertices(shadow);
	2200	+
	2201	+ shadow.projectedVertices[1].x = 300;
1291	2202
1292	2203	makeSomething(shadow);
1293	2204	}
	2205	+
	2206	+ private void ClearUnpinned()
	2207	+ {
	2208	+ //for (Object3D obj : listUI)
	2209	+ for (int i=listUI.size(); --i>=0;)
	2210	+ {
	2211	+ Object3D obj = listUI.elementAt(i);
	2212	+ if (!obj.pinned)
	2213	+ {
	2214	+ obj.CloseUI();
	2215	+ listUI.remove(i);
	2216	+ }
	2217	+ }
	2218	+ }
	2219	+
	2220	+ private void EditElement(Object3D elem, boolean newWindow)
	2221	+ {
	2222	+ // if (!(elem instanceof Composite))
	2223	+ // newWindow = false;
	2224	+ listUI.add(elem);
	2225	+ elem.openEditWindow(this, newWindow); //, false);
	2226	+ System.out.println("edit : " + elem);
	2227	+ elem.editWindow.refreshContents(true); // ? new
	2228	+ }
1294	2229
1295	2230	/**
1296	2231	* applyExample
..	..	@@ -1494,9 +2429,9 @@
1494	2429
1495	2430	void Overwrite(int mask)
1496	2431	{
1497		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2432	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1498	2433	{
1499		- Object3D content = GrafreeD.clipboard.get(0);
	2434	+ Object3D content = Grafreed.clipboard.get(0);
1500	2435
1501	2436	if (content instanceof cGroup && ((cGroup)content).transientlink )
1502	2437	content = ((cGroup)content).get(0);
..	..	@@ -1535,7 +2470,7 @@
1535	2470	{
1536	2471	ScreenFit();
1537	2472	} else
1538		- if (source == switchItem)
	2473	+ if (source == switchViewItem)
1539	2474	{
1540	2475	cVector v1 = new cVector();
1541	2476	cVector v2 = new cVector();
..	..	@@ -1544,11 +2479,11 @@
1544	2479	objEditor.cameraView.renderCamera.setAim(v2, v1);
1545	2480	objEditor.cameraView.repaint();
1546	2481	} else
1547		- if (source == rectoidItem)
	2482	+ if (source == rectoidItem \|\| source == boxButton)
1548	2483	{
1549	2484	makeSomething(new Box());
1550	2485	} else
1551		- if (source == particleItem)
	2486	+ if (source == particleItem \|\| source == particlesButton)
1552	2487	{
1553	2488	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1554	2489	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1627,27 +2562,27 @@
1627	2562
1628	2563	makeSomething(obj);
1629	2564	} else
1630		- if (source == gridItem)
	2565	+ if (source == gridItem \|\| source == gridButton)
1631	2566	{
1632	2567	makeSomething(new Grid());
1633	2568	} else
1634		- if (source == ellipsoidItem)
	2569	+ if (source == ellipsoidItem \|\| source == sphereButton)
1635	2570	{
1636	2571	makeSomething(new Sphere());
1637	2572	} else
1638		- if (source == coneItem)
	2573	+ if (source == coneItem \|\| source == coneButton)
1639	2574	{
1640	2575	makeSomething(new Cone());
1641	2576	} else
1642		- if (source == torusItem)
	2577	+ if (source == torusItem \|\| source == torusButton)
1643	2578	{
1644	2579	makeSomething(new Torus());
1645	2580	} else
1646		- if (source == superItem)
	2581	+ if (source == superItem \|\| source == superButton)
1647	2582	{
1648	2583	makeSomething(new Superellipsoid());
1649	2584	} else
1650		- if (source == kleinItem)
	2585	+ if (source == kleinItem \|\| source == kleinButton)
1651	2586	{
1652	2587	makeSomething(new Klein());
1653	2588	} else
..	..	@@ -1667,7 +2602,7 @@
1667	2602	{
1668	2603	makeSomething(new BezierSurface());
1669	2604	} else
1670		- if (source == checkerItem)
	2605	+ if (source == overlayItem \|\| source == overlayButton)
1671	2606	{
1672	2607	/*
1673	2608	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1715,10 +2650,27 @@
1715	2650	s.setup();
1716	2651	makeSomething(s);
1717	2652	} else
1718		- if (source == lightItem)
	2653	+ if (source == lightItem \|\| source == lightButton)
1719	2654	{
1720	2655	makeSomething(new Light());
1721	2656	} else
	2657	+// if (source == skybox1Button \|\|
	2658	+// source == skybox2Button \|\|
	2659	+// source == skybox3Button \|\|
	2660	+// source == skybox4Button \|\|
	2661	+// source == skybox5Button \|\|
	2662	+// source == skybox6Button \|\|
	2663	+// source == skybox7Button \|\|
	2664	+// source == skybox11Button \|\|
	2665	+// source == skybox12Button \|\|
	2666	+// source == skybox13Button \|\|
	2667	+// source == skybox14Button \|\|
	2668	+// source == skybox15Button \|\|
	2669	+// source == skybox16Button \|\|
	2670	+// source == skybox17Button)
	2671	+// {
	2672	+// ChangeSkybox(source);
	2673	+// } else
1722	2674	if (source == csgItem)
1723	2675	{
1724	2676	group(new CSG());
..	..	@@ -1765,30 +2717,38 @@
1765	2717
1766	2718	group(g);
1767	2719	} else
1768		- if (source == loopItem)
	2720	+ if (source == loopItem \|\| source == loopButton)
1769	2721	{
	2722	+ if (!group.selection.isEmpty())
	2723	+ {
1770	2724	Composite csg = new GroupLeaf();
1771	2725	csg.count = 5;
1772		- group(csg);
1773		- Composite child = new cGroup();
	2726	+ Composite child = new cGroup("Branch");
1774	2727	csg.addChild(child);
1775	2728	child.addChild(csg);
	2729	+ group(csg);
	2730	+ }
1776	2731	} else
1777	2732	if (source == doubleItem)
1778	2733	{
1779		- Composite csg = new GroupLeaf();
	2734	+ if (!group.selection.isEmpty())
	2735	+ {
	2736	+ Composite csg = new GroupLeaf("Fork");
1780	2737	csg.count = 5;
	2738	+ Composite child = new cGroup("Branch A");
	2739	+ csg.addChild(child);
	2740	+ child.addChild(csg);
	2741	+ child = new cGroup("Branch B");
	2742	+ csg.addChild(child);
	2743	+ child.addChild(csg);
1781	2744	group(csg);
1782		- Composite child = new cGroup();
1783		- csg.addChild(child);
1784		- child.addChild(csg);
1785		- child = new cGroup();
1786		- csg.addChild(child);
1787		- child.addChild(csg);
	2745	+ }
1788	2746	} else
1789	2747	if (source == tripleItem)
1790	2748	{
1791		- Composite csg = new GroupLeaf();
	2749	+ if (!group.selection.isEmpty())
	2750	+ {
	2751	+ Composite csg = new GroupLeaf("Trident");
1792	2752	csg.count = 4;
1793	2753	group(csg);
1794	2754	Composite child = new cGroup();
..	..	@@ -1800,28 +2760,12 @@
1800	2760	child = new cGroup();
1801	2761	csg.addChild(child);
1802	2762	child.addChild(csg);
1803		- } else
1804		-
1805		- if (source == importGFDItem)
1806		- {
1807		- ImportGFD();
1808		- } else
1809		- if (source == importVRMLX3DItem)
1810		- {
1811		- ImportVRMLX3D();
1812		- } else
1813		- if (source == import3DSItem)
1814		- {
1815		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1816		- } else
1817		- if (source == importOBJItem)
1818		- {
1819		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	2763	+ }
1820	2764	} else
1821	2765	if (source == computeAOItem)
1822	2766	{
1823	2767	Globals.drawMode = CameraPane.OCCLUSION;
1824		- Globals.theRenderer.repaint();
	2768	+ cameraView.repaint();
1825	2769	} else
1826	2770	if (source == recompileItem)
1827	2771	{
..	..	@@ -1836,7 +2780,7 @@
1836	2780	if (source == invariantsItem)
1837	2781	{
1838	2782	System.out.println("Invariants:");
1839		- GrafreeD.grafreeD.universe.invariants();
	2783	+ Grafreed.grafreed.universe.invariants();
1840	2784	} else
1841	2785	if (source == memoryItem)
1842	2786	{
..	..	@@ -1855,19 +2799,80 @@
1855	2799	{
1856	2800	DumpObject();
1857	2801	} else
	2802	+ if (source == minButton)
	2803	+ {
	2804	+ Minimize();
	2805	+ } else
	2806	+ if (source == maxButton)
	2807	+ {
	2808	+ Maximize();
	2809	+ } else
	2810	+ if (source == fullButton)
	2811	+ {
	2812	+ ToggleFullScreen();
	2813	+ } else
	2814	+ if (source == collapseButton)
	2815	+ {
	2816	+ this.expandedLayout = radio.layout;
	2817	+ CollapseToolbar();
	2818	+ } else
	2819	+ if (source == maximize3DButton)
	2820	+ {
	2821	+ this.expandedLayout = radio.layout;
	2822	+ radio.layout = twoButton;
	2823	+ Show3DView();
	2824	+ CollapseToolbar();
	2825	+ } else
	2826	+ if (source == previousVersionButton)
	2827	+ {
	2828	+ // Go to previous version
	2829	+ //if (!Undo())
	2830	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2831	+ PreviousVersion();
	2832	+ } else
	2833	+ if (source == restoreButton)
	2834	+ {
	2835	+ // Restore current version
	2836	+ Restore();
	2837	+ //restoreButton.setEnabled(false);
	2838	+ } else
	2839	+ if (source == replaceButton)
	2840	+ {
	2841	+ // Overwrite current version
	2842	+ Replace();
	2843	+ //replaceButton.setEnabled(false);
	2844	+ } else
	2845	+ if (source == nextVersionButton)
	2846	+ {
	2847	+ // Go to next version
	2848	+ NextVersion();
	2849	+ } else
	2850	+ if (source == saveVersionButton)
	2851	+ {
	2852	+ // Save a new version
	2853	+ if (!Save(true))
	2854	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2855	+ } else
	2856	+ if (source == deleteVersionButton)
	2857	+ {
	2858	+ // Delete a new version
	2859	+ DeleteVersion();
	2860	+ } else
	2861	+ if (source == oneStepButton)
	2862	+ {
	2863	+ Globals.ONESTEP = true;
	2864	+ cameraView.repaint();
	2865	+ } else
1858	2866	if (source == screenfitButton)
1859	2867	{
1860		- //Reload(lastConverter, lastFilename, true);
1861	2868	ScreenFit();
1862	2869	} else
1863	2870	if (source == screenfitpointButton)
1864	2871	{
1865		- //Reload(lastConverter, lastFilename, true);
1866	2872	ScreenFitPoint();
1867	2873	} else
1868	2874	if (source == snapobjectButton)
1869	2875	{
1870		- //Reload(lastConverter, lastFilename, true);
1871	2876	SnapObject();
1872	2877	} else
1873	2878	// if (event.getSource() == recompileButton)
..	..	@@ -1904,12 +2909,20 @@
1904	2909	{
1905	2910	loadClipboard(true);
1906	2911	} else
	2912	+ if (source == undoItem)
	2913	+ {
	2914	+ PreviousVersion();
	2915	+ } else
	2916	+ if (source == redoItem)
	2917	+ {
	2918	+ NextVersion();
	2919	+ } else
1907	2920	if (source == duplicateItem)
1908	2921	{
1909		- Object3D keep = GrafreeD.clipboard;
	2922	+ Object3D keep = Grafreed.clipboard;
1910	2923	loadClipboard(false);
1911	2924	paste(false);
1912		- GrafreeD.clipboard = keep;
	2925	+ Grafreed.clipboard = keep;
1913	2926	} else
1914	2927	if (source == cloneItem)
1915	2928	{
..	..	@@ -1927,13 +2940,17 @@
1927	2940	{
1928	2941	paste(false);
1929	2942	} else
	2943	+ if (source == pasteIntoItem)
	2944	+ {
	2945	+ pasteInto(true, false);
	2946	+ } else
1930	2947	if (source == pasteLinkItem)
1931	2948	{
1932		- pasteInto(false);
	2949	+ pasteInto(false, false);
1933	2950	} else
1934	2951	if (source == pasteCloneItem)
1935	2952	{
1936		- pasteInto(true);
	2953	+ pasteInto(true, true);
1937	2954	} else
1938	2955	if (source == pasteExpandItem)
1939	2956	{
..	..	@@ -2125,9 +3142,9 @@
2125	3142	// group.selection.get(0).setMasterThis(content); // should be identity
2126	3143	// refreshContents();
2127	3144	// }
2128		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	3145	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2129	3146	{
2130		- Object3D content = GrafreeD.clipboard.get(0);
	3147	+ Object3D content = Grafreed.clipboard.get(0);
2131	3148
2132	3149	if (content instanceof cGroup && ((cGroup)content).transientlink )
2133	3150	content = ((cGroup)content).get(0);
..	..	@@ -2135,11 +3152,11 @@
2135	3152	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2136	3153	for (int i=0; i<group.selection.size(); i++)
2137	3154	{
2138		- boolean random = CameraPane.RANDOM;
2139		- CameraPane.RANDOM = false; // parse all random nodes
	3155	+ boolean random = CameraPane.SWITCH;
	3156	+ CameraPane.SWITCH = false; // parse all random nodes
2140	3157	group.selection.get(i).linkVerticesThis(content);
2141	3158	// group.selection.get(i).setMasterThis(content); // should be identity
2142		- CameraPane.RANDOM = random;
	3159	+ CameraPane.SWITCH = random;
2143	3160	}
2144	3161	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2145	3162	refreshContents();
..	..	@@ -2149,20 +3166,20 @@
2149	3166	{
2150	3167	for (int i=0; i<group.selection.size(); i++)
2151	3168	{
2152		- boolean random = CameraPane.RANDOM;
2153		- CameraPane.RANDOM = false; // parse all random nodes
	3169	+ boolean random = CameraPane.SWITCH;
	3170	+ CameraPane.SWITCH = false; // parse all random nodes
2154	3171	group.selection.get(i).linkVerticesThis(null);
2155		- CameraPane.RANDOM = random;
	3172	+ CameraPane.SWITCH = random;
2156	3173	}
2157	3174
2158	3175	refreshContents();
2159	3176	} else
2160	3177	if (source == relinkverticesItem)
2161	3178	{
2162		- boolean random = CameraPane.RANDOM;
2163		- CameraPane.RANDOM = false; // parse all random nodes
	3179	+ boolean random = CameraPane.SWITCH;
	3180	+ CameraPane.SWITCH = false; // parse all random nodes
2164	3181	group.selection.RelinkToSupport();
2165		- CameraPane.RANDOM = random;
	3182	+ CameraPane.SWITCH = random;
2166	3183
2167	3184	refreshContents();
2168	3185	} else
..	..	@@ -2177,9 +3194,9 @@
2177	3194	} else
2178	3195	if (source == setMasterItem)
2179	3196	{
2180		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	3197	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2181	3198	{
2182		- Object3D content = GrafreeD.clipboard.get(0);
	3199	+ Object3D content = Grafreed.clipboard.get(0);
2183	3200
2184	3201	if (content instanceof cGroup && ((cGroup)content).transientlink )
2185	3202	content = ((cGroup)content).get(0);
..	..	@@ -2192,9 +3209,9 @@
2192	3209	{
2193	3210	if (group.selection.size() == 1)
2194	3211	{
2195		- if (GrafreeD.clipboard.size() == 1)
	3212	+ if (Grafreed.clipboard.size() == 1)
2196	3213	{
2197		- Object3D content = GrafreeD.clipboard.get(0);
	3214	+ Object3D content = Grafreed.clipboard.get(0);
2198	3215
2199	3216	if (content instanceof cGroup && ((cGroup)content).transientlink )
2200	3217	content = ((cGroup)content).get(0);
..	..	@@ -2211,7 +3228,7 @@
2211	3228	{
2212	3229	RevertMeshes();
2213	3230	} else
2214		- if (source == resetMeshItem)
	3231	+ if (source == resetAllItem)
2215	3232	{
2216	3233	ResetAll();
2217	3234	} else
..	..	@@ -2219,7 +3236,7 @@
2219	3236	{
2220	3237	StepAll();
2221	3238	} else
2222		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3239	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2223	3240	{
2224	3241	//int indices[] = jList.getSelectedIndices();
2225	3242	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2231,9 +3248,9 @@
2231	3248	{
2232	3249	ClearSelection(true);
2233	3250	} else
2234		- if (source == grabItem)
	3251	+ if (source == grabItem \|\| source == groupButton)
2235	3252	{
2236		- group(new cGroup(), true);
	3253	+ group(new cGroup(), false); // true);
2237	3254	} else
2238	3255	if (source == hideItem)
2239	3256	{
..	..	@@ -2251,16 +3268,16 @@
2251	3268	{
2252	3269	makeSomething(new Camera());
2253	3270	} else
2254		- if (source == compositeItem)
	3271	+ if (source == compositeItem \|\| source == compositeButton)
2255	3272	{
2256	3273	group(new Composite());
2257	3274	} else
2258		- if (source == randomItem)
	3275	+ if (source == switchItem \|\| source == switchButton)
2259	3276	{
2260	3277	RandomNode random = new RandomNode();
2261	3278	group(random);
2262	3279	if (random.size() > 0)
2263		- random.name = random.get(0).name + "Rnd";
	3280	+ random.name = random.get(0).name + "Switch";
2264	3281	} else
2265	3282	if (source == physicsItem)
2266	3283	{
..	..	@@ -2357,7 +3374,7 @@
2357	3374	{
2358	3375	group(new cLinker());
2359	3376	} else
2360		- if (source == textureItem)
	3377	+ if (source == textureItem \|\| source == textureButton)
2361	3378	{
2362	3379	group(new TextureNode());
2363	3380	} else
..	..	@@ -2377,17 +3394,42 @@
2377	3394	{
2378	3395	CastShadow(2);
2379	3396	} else
2380		- if (source == ungroupItem)
	3397	+ if (source == ungroupItem \|\| source == ungroupButton)
2381	3398	{
2382		- //ungroup();
	3399	+ boolean canUngroup = true;
	3400	+
2383	3401	for (int i=0; i<group.selection.size(); i++)
2384	3402	{
2385		- Ungroup(group.selection.get(i));
	3403	+ Object3D selectedItem = group.selection.get(i);
	3404	+
	3405	+ if (selectedItem.Size() == 0)
	3406	+ {
	3407	+ // Cannot ungroup leaves
	3408	+ canUngroup = false;
	3409	+ break;
	3410	+ }
	3411	+
	3412	+ if (selectedItem == group)
	3413	+ {
	3414	+ // Cannot ungroup root
	3415	+ canUngroup = false;
	3416	+ break;
	3417	+ }
2386	3418	}
2387	3419
2388		- ClearSelection(false);
2389		-
2390		- refreshContents();
	3420	+ if (canUngroup)
	3421	+ {
	3422	+ for (int i=0; i<group.selection.size(); i++)
	3423	+ {
	3424	+ Object3D selectedItem = group.selection.get(i);
	3425	+
	3426	+ Ungroup(selectedItem);
	3427	+ }
	3428	+
	3429	+ ClearSelection(false);
	3430	+
	3431	+ refreshContents();
	3432	+ }
2391	3433	} else
2392	3434	if (source == genUVItem)
2393	3435	{
..	..	@@ -2399,7 +3441,7 @@
2399	3441	} else
2400	3442	if (source == genNormalsMESHItem)
2401	3443	{
2402		- GenNormals(true); // TODO
	3444	+ GenNormalsMESH();
2403	3445	} else
2404	3446	if (source == genNormalsORGANItem)
2405	3447	{
..	..	@@ -2433,6 +3475,10 @@
2433	3475	{
2434	3476	ClearMaterials();
2435	3477	} else
	3478	+ if (source == clearVersionsItem)
	3479	+ {
	3480	+ ClearVersions();
	3481	+ } else
2436	3482	if (source == liveleavesItem)
2437	3483	{
2438	3484	LiveLeaves(true);
..	..	@@ -2464,6 +3510,22 @@
2464	3510	if (source == unmarkleavesItem)
2465	3511	{
2466	3512	MarkLeaves(false);
	3513	+ } else
	3514	+ if (source == rewindleavesItem)
	3515	+ {
	3516	+ RewindLeaves(true);
	3517	+ } else
	3518	+ if (source == unrewindleavesItem)
	3519	+ {
	3520	+ RewindLeaves(false);
	3521	+ } else
	3522	+ if (source == randomleavesItem)
	3523	+ {
	3524	+ RandomLeaves(true);
	3525	+ } else
	3526	+ if (source == unrandomleavesItem)
	3527	+ {
	3528	+ RandomLeaves(false);
2467	3529	} else
2468	3530	if (source == flipVItem)
2469	3531	{
..	..	@@ -2549,9 +3611,25 @@
2549	3611	{
2550	3612	SmoothMesh();
2551	3613	} else
2552		- if (source == transformgeometryItem)
	3614	+ if (source == transformGeometryItem)
2553	3615	{
2554	3616	TransformGeometry();
	3617	+ } else
	3618	+ if (source == transformChildrenItem)
	3619	+ {
	3620	+ TransformChildren();
	3621	+ } else
	3622	+ if (source == textureRatioRItem)
	3623	+ {
	3624	+ TextureRatio(0);
	3625	+ } else
	3626	+ if (source == textureRatioGItem)
	3627	+ {
	3628	+ TextureRatio(1);
	3629	+ } else
	3630	+ if (source == textureRatioBItem)
	3631	+ {
	3632	+ TextureRatio(2);
2555	3633	} else
2556	3634	if (source == resetTransformItem)
2557	3635	{
..	..	@@ -2559,7 +3637,11 @@
2559	3637	} else
2560	3638	if (source == resetCentroidItem)
2561	3639	{
2562		- ResetCentroid();
	3640	+ ResetCentroid(true);
	3641	+ } else
	3642	+ if (source == resetCentroidXZItem)
	3643	+ {
	3644	+ ResetCentroid(false);
2563	3645	} else
2564	3646	if (source == resetParentItem)
2565	3647	{
..	..	@@ -2664,7 +3746,7 @@
2664	3746	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2665	3747	{
2666	3748	obj = (Object3D)e.nextElement();
2667		- obj.SetBumpTexture(null);
	3749	+ obj.ResetBumpTexture();
2668	3750	}
2669	3751
2670	3752	refreshContents();
..	..	@@ -2680,6 +3762,31 @@
2680	3762
2681	3763	refreshContents();
2682	3764	} else
	3765	+ if (source == embedTexturesItem)
	3766	+ {
	3767	+ Object3D obj;
	3768	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3769	+ {
	3770	+ obj = (Object3D)e.nextElement();
	3771	+ obj.EmbedTextures(true);
	3772	+ }
	3773	+
	3774	+ refreshContents();
	3775	+ } else
	3776	+ if (source == deEmbedTexturesItem)
	3777	+ {
	3778	+ Object3D obj;
	3779	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3780	+ {
	3781	+ obj = (Object3D)e.nextElement();
	3782	+ obj.EmbedTextures(false);
	3783	+ }
	3784	+
	3785	+ CameraPane.texturepigment.clear();
	3786	+ CameraPane.texturebump.clear();
	3787	+
	3788	+ refreshContents();
	3789	+ } else
2683	3790	if (source == flashSelectionButton)
2684	3791	{
2685	3792	CameraPane.flash = true;
..	..	@@ -2691,42 +3798,36 @@
2691	3798	if (source == twoButton)
2692	3799	{
2693	3800	radio.layout = twoButton;
2694		- // bug
2695		- //gridPanel.setDividerLocation(1.0);
2696		- //bigPanel.setDividerLocation(0.0);
2697		-// bigThree.remove(scenePanel);
2698		-// bigThree.remove(centralPanel);
2699		-// bigThree.remove(XYZPanel);
2700		-// aWindowConstraints.gridx = 0;
2701		-// aWindowConstraints.gridy = 0;
2702		-// aWindowConstraints.gridwidth = 1;
2703		-// // aConstraints.gridheight = 3;
2704		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2705		-// aWindowConstraints.weightx = 0;
2706		-// aWindowConstraints.weighty = 1;
2707		-// //bigThree.add(jtp, aWindowConstraints);
2708		-// aWindowConstraints.weightx = 1;
2709		-// aWindowConstraints.gridwidth = 3;
2710		-// // aConstraints.gridheight = 3;
2711		-// aWindowConstraints.gridx = 1;
2712		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
2713		-// bigThree.add(centralPanel, aWindowConstraints);
2714		-// aWindowConstraints.weightx = 0;
2715		-// aWindowConstraints.gridx = 4;
2716		-// aWindowConstraints.gridwidth = 1;
2717		-// // aConstraints.gridheight = 3;
2718		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2719		-// //bigThree.add(XYZPanel, aWindowConstraints);
2720		-// scenePanel.setVisible(false);
2721		-// centralPanel.setVisible(true);
2722		-// XYZPanel.setVisible(false);
2723		- bigThree.ClearUI();
2724		- bigThree.add(centralPanel);
2725		- bigThree.FlushUI();
	3801	+
	3802	+ if (CameraPane.FULLSCREEN)
	3803	+ fullscreenLayout = radio.layout;
	3804	+
	3805	+ Show3DView();
	3806	+
	3807	+ cameraView.requestFocusInWindow();
	3808	+
	3809	+// refreshContents(true);
	3810	+//
	3811	+// try
	3812	+// {
	3813	+// java.awt.Robot bot = new java.awt.Robot();
	3814	+// int mask = InputEvent.BUTTON1_MASK;
	3815	+// bot.mouseMove(100, 100);
	3816	+// bot.mousePress(mask);
	3817	+// bot.mouseRelease(mask);
	3818	+// }
	3819	+// catch (Exception e)
	3820	+// {
	3821	+//
	3822	+// }
	3823	+
2726	3824	} else
2727	3825	if (source == threeButton)
2728	3826	{
2729	3827	radio.layout = threeButton;
	3828	+
	3829	+ if (CameraPane.FULLSCREEN)
	3830	+ fullscreenLayout = radio.layout;
2730	3831
2731	3832	// bigThree.remove(scenePanel);
2732	3833	// bigThree.remove(centralPanel);
..	..	@@ -2756,13 +3857,18 @@
2756	3857	// centralPanel.setVisible(true);
2757	3858	// XYZPanel.setVisible(true);
2758	3859	bigThree.ClearUI();
	3860	+ bigThree.add(scenePanel);
2759	3861	bigThree.add(centralPanel);
2760		- bigThree.add(XYZPanel);
2761	3862	bigThree.FlushUI();
	3863	+
	3864	+ cameraView.requestFocusInWindow();
2762	3865	} else
2763	3866	if (source == fourButton)
2764	3867	{
2765	3868	radio.layout = fourButton;
	3869	+
	3870	+ if (CameraPane.FULLSCREEN)
	3871	+ fullscreenLayout = radio.layout;
2766	3872
2767	3873	// bigThree.remove(scenePanel);
2768	3874	// bigThree.remove(centralPanel);
..	..	@@ -2794,10 +3900,15 @@
2794	3900	bigThree.ClearUI();
2795	3901	bigThree.add(scenePanel);
2796	3902	bigThree.FlushUI();
	3903	+
	3904	+ cameraView.requestFocusInWindow();
2797	3905	} else
2798	3906	if (source == sixButton)
2799	3907	{
2800	3908	radio.layout = sixButton;
	3909	+
	3910	+ if (CameraPane.FULLSCREEN)
	3911	+ fullscreenLayout = radio.layout;
2801	3912
2802	3913	// bigThree.remove(scenePanel);
2803	3914	// bigThree.remove(centralPanel);
..	..	@@ -2827,13 +3938,18 @@
2827	3938	// centralPanel.setVisible(true);
2828	3939	// XYZPanel.setVisible(false);
2829	3940	bigThree.ClearUI();
2830		- bigThree.add(scenePanel);
2831	3941	bigThree.add(centralPanel);
	3942	+ bigThree.add(scenePanel);
2832	3943	bigThree.FlushUI();
	3944	+
	3945	+ cameraView.requestFocusInWindow();
2833	3946	} else
2834	3947	if (source == sevenButton)
2835	3948	{
2836	3949	radio.layout = sevenButton;
	3950	+
	3951	+ if (CameraPane.FULLSCREEN)
	3952	+ fullscreenLayout = radio.layout;
2837	3953
2838	3954	// bigThree.remove(scenePanel);
2839	3955	// bigThree.remove(centralPanel);
..	..	@@ -2867,9 +3983,12 @@
2867	3983	bigThree.add(centralPanel);
2868	3984	bigThree.add(XYZPanel);
2869	3985	bigThree.FlushUI();
	3986	+
	3987	+ cameraView.requestFocusInWindow();
2870	3988	} else
2871	3989	if (source == rootButton)
2872	3990	{
	3991	+ Replace();
2873	3992	Object3D obj;
2874	3993	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2875	3994	{
..	..	@@ -2878,31 +3997,50 @@
2878	3997	EditObject(obj);
2879	3998	}
2880	3999
	4000	+ cameraView.requestFocusInWindow();
2881	4001	refreshContents(true);
2882	4002	} else
2883	4003	if (source == closeButton)
2884	4004	{
2885	4005	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	4006	+ if (copy.versionlist != null)
	4007	+ Replace();
	4008	+
2886	4009	cRadio ab;
2887	4010	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2888	4011	{
2889	4012	ab = (cRadio)e.nextElement();
2890		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	4013	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2891	4014	{
	4015	+ // Patch to avoid bug with transparency.
	4016	+ if (!ab.hadMaterial)
	4017	+ {
	4018	+ ab.object.material = null;
	4019	+ }
	4020	+
2892	4021	buttonGroup.remove(ab);
2893	4022	radioPanel.remove(ab);
2894	4023
2895		- ab.GetObject().editWindow = null;
	4024	+ //ab.GetObject().editWindow = null;
	4025	+ ab.GetObject().manipWindow = null;
2896	4026	// ab.GetObject().objectUI = null; // ?????????
2897	4027
2898	4028	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2899	4029	break;
2900	4030	}
2901	4031	}
	4032	+
	4033	+ cameraView.requestFocusInWindow();
2902	4034	refreshContents(true);
2903	4035	} else
2904	4036	if (source == editItem \|\| source == editButton)
2905	4037	{
	4038	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4039	+ {
	4040	+ Object3D child = (Object3D)e.nextElement();
	4041	+ child.pinned = true;
	4042	+ }
	4043	+
2906	4044	EditSelection(false);
2907	4045	} else
2908	4046	if (source == uneditButton)
..	..	@@ -2911,13 +4049,14 @@
2911	4049	{
2912	4050	Object3D child = (Object3D)e.nextElement();
2913	4051	if(child.editWindow != null)
2914		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4052	+ child.pinned = false;
2915	4053	child.CloseUI();
2916	4054	listUI.remove(child);
	4055	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2917	4056
2918		- child.editWindow = null; // ???????????
	4057	+ //child.editWindow = null; // ???????????
2919	4058	}
2920		- objEditor.ctrlPanel.validate();
	4059	+ objEditor.ctrlPanel.FlushUI();
2921	4060	//objEditor.jTree.clearSelection();
2922	4061	//objEditor.ResetSliders();
2923	4062	refreshContents(true);
..	..	@@ -2928,16 +4067,18 @@
2928	4067	//copy.ClearUI();
2929	4068	for (Object3D obj : listUI)
2930	4069	{
	4070	+ obj.pinned = false;
2931	4071	obj.CloseUI();
2932	4072	}
2933	4073	listUI.clear();
	4074	+ SetPinStates(group.selection.size() > 0);
2934	4075	refreshContents(true);
2935	4076	} else
2936	4077	if (source == allParamsButton)
2937	4078	{
2938	4079	assert(copy == group);
2939	4080
2940		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4081	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2941	4082
2942	4083	for (Object3D obj : listUI)
2943	4084	{
..	..	@@ -2963,6 +4104,9 @@
2963	4104	} else
2964	4105	if(source instanceof cRadio)
2965	4106	{
	4107	+ if (copy.versionlist != null)
	4108	+ Replace();
	4109	+
2966	4110	group.parent = keepparent;
2967	4111	group.attributes = 0;
2968	4112	//group.editWindow = null;
..	..	@@ -2986,6 +4130,7 @@
2986	4130	}
2987	4131
2988	4132	copy = group;
	4133	+
2989	4134	//Globals.theRenderer.object = group;
2990	4135	if(!useclient)
2991	4136	{
..	..	@@ -3001,20 +4146,74 @@
3001	4146	frontView.object = group;
3002	4147	sideView.object = group;
3003	4148	}
3004		- group.editWindow = this;
	4149	+
	4150	+// fix "+" issue
	4151	+ //group.editWindow = this;
	4152	+ group.manipWindow = this;
	4153	+
3005	4154	/*
3006	4155	currentLayout = radio.layout;
3007	4156	if (currentLayout == null)
3008	4157	currentLayout = sevenButton;
3009	4158	*/
3010	4159	radio.layout.doClick();
	4160	+
	4161	+ //assert(copy instanceof Composite);
	4162	+
	4163	+ if (copy.versionlist == null)
	4164	+ {
	4165	+ copy.versionindex = -1;
	4166	+
	4167	+ // Cannot work with loops
	4168	+ // To fix this issue, we first mark all nodes above the root,
	4169	+ // and check if any of these nodes are reachable below the root.
	4170	+ Grafreed.grafreed.universe.TagObjects(copy, true);
	4171	+
	4172	+ if (copy instanceof Composite && copy.versionlist == null && !copy.HasTags())
	4173	+ {
	4174	+ copy.versionlist = new Object3D[100];
	4175	+
	4176	+ //Save(true);
	4177	+ }
	4178	+ else
	4179	+ copy.versionindex = -2;
	4180	+
	4181	+ Grafreed.grafreed.universe.TagObjects(copy, false);
	4182	+ }
	4183	+
	4184	+ SetVersionStates();
	4185	+
	4186	+ ClearUnpinned();
	4187	+
	4188	+ //Grafreed.Assert(group != null);
	4189	+ //Grafreed.Assert(group.selection != null);
	4190	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4191	+ if (group.selection == null \|\| group.selection.size() == 1)
	4192	+ EditSelection(false);
3011	4193	keepparent = group.parent;
3012	4194	// PARENT = NULL or not???
3013	4195	//group.parent = null; // ROOT
3014	4196	//group.attributes = -1;
3015	4197	ResetModel();
	4198	+
	4199	+ cameraView.requestFocusInWindow();
3016	4200	refreshContents(true);
3017		- }
	4201	+ } else if (event.getSource() == editCameraItem)
	4202	+ {
	4203	+ cameraView.ProtectCamera();
	4204	+ cameraView.requestFocusInWindow();
	4205	+ cameraView.repaint();
	4206	+ return;
	4207	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	4208	+ {
	4209	+ cameraView.RevertCamera();
	4210	+ cameraView.requestFocusInWindow();
	4211	+ cameraView.repaint();
	4212	+ return;
	4213	+ // } else if (event.getSource() == textureButton)
	4214	+ // {
	4215	+ // return; // true;
	4216	+ }
3018	4217	else
3019	4218	{
3020	4219	//return super.action(event, arg);
..	..	@@ -3023,7 +4222,6 @@
3023	4222	}
3024	4223
3025	4224	boolean useclient = false;
3026		- cRadio radio;
3027	4225
3028	4226	void ToggleRoot()
3029	4227	{
..	..	@@ -3075,6 +4273,40 @@
3075	4273	refreshContents();
3076	4274	}
3077	4275
	4276	+ void TransformChildren()
	4277	+ {
	4278	+ Object3D obj;
	4279	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4280	+ {
	4281	+ obj = (Object3D)e.nextElement();
	4282	+ obj.KeepTextureMatrices();
	4283	+ obj.TransformChildren();
	4284	+ obj.RestoreTextureMatrices();
	4285	+
	4286	+// if (obj.parent == null)
	4287	+// {
	4288	+// System.out.println("NULL PARENT!");
	4289	+// new Exception().printStackTrace();
	4290	+// }
	4291	+// else
	4292	+// TouchTransform(obj);
	4293	+// //obj.parent.Touch();
	4294	+ }
	4295	+
	4296	+ refreshContents();
	4297	+ }
	4298	+
	4299	+ void TextureRatio(int axis)
	4300	+ {
	4301	+ Object3D obj;
	4302	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4303	+ {
	4304	+ obj = (Object3D)e.nextElement();
	4305	+ obj.TextureRatio(axis);
	4306	+ }
	4307	+
	4308	+ refreshContents();
	4309	+ }
3078	4310
3079	4311	void ResetTransform()
3080	4312	{
..	..	@@ -3091,42 +4323,8 @@
3091	4323	if (obj.toParent == null)
3092	4324	continue;
3093	4325
3094		- if (mask == -1)
3095		- {
3096		- if (obj instanceof Camera) // jan 2014
3097		- {
3098		- LA.matIdentity(obj.toParent);
3099		- LA.matIdentity(obj.fromParent);
3100		- }
3101		- else
3102		- {
3103		- obj.toParent = null; // jan 2014 LA.matIdentity(obj.toParent);
3104		- obj.fromParent = null; // LA.matIdentity(obj.fromParent);
3105		- }
3106		- TouchTransform(obj);
3107		- continue;
3108		- }
3109		- if ((mask&2) != 0) // Scale
3110		- {
3111		- obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
3112		- obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
3113		- obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
3114		- obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
3115		- obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
3116		- obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
3117		- }
3118		- if ((mask&4) != 0) // Rotation
3119		- {
3120		- // ?
3121		- }
3122		- if ((mask&1) != 0) // Translation
3123		- {
3124		- if (obj.toParent != null)
3125		- {
3126		- obj.toParent[3][0] = obj.toParent[3][1] = obj.toParent[3][2] = 0;
3127		- obj.fromParent[3][0] = obj.fromParent[3][1] = obj.fromParent[3][2] = 0;
3128		- }
3129		- }
	4326	+ obj.ResetTransform(mask);
	4327	+
3130	4328	if (obj.parent == null)
3131	4329	{
3132	4330	System.out.println("NULL PARENT!");
..	..	@@ -3187,7 +4385,7 @@
3187	4385	refreshContents();
3188	4386	}
3189	4387
3190		- void ResetCentroid()
	4388	+ void ResetCentroid(boolean full)
3191	4389	{
3192	4390	Object3D obj;
3193	4391	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3202,12 +4400,16 @@
3202	4400	LA.matIdentity(Object3D.mat);
3203	4401	obj.getBounds(minima, maxima, false);
3204	4402	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3205		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	4403	+ if (full)
	4404	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3206	4405	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3207	4406	obj.TransformMesh(Object3D.mat);
	4407	+
3208	4408	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3209		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	4409	+ if (full)
	4410	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3210	4411	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	4412	+
3211	4413	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3212	4414	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3213	4415	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3236,7 +4438,8 @@
3236	4438
3237	4439	int size = obj.MemorySize();
3238	4440
3239		- System.err.println((size/1024) + " KB is the size of " + obj);
	4441	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4442	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3240	4443	}
3241	4444	}
3242	4445	catch (Exception e)
..	..	@@ -3273,9 +4476,9 @@
3273	4476	obj = (Object3D)e.nextElement();
3274	4477
3275	4478	System.out.println("Object is: " + obj);
3276		- GrafreeD.AnalyzeObject(obj);
	4479	+ Grafreed.AnalyzeObject(obj);
3277	4480	System.out.println("Boundary rep: " + obj.bRep);
3278		- GrafreeD.AnalyzeObject(obj.bRep);
	4481	+ Grafreed.AnalyzeObject(obj.bRep);
3279	4482
3280	4483	// System.err.println((size/1024) + " KB is the size of " + obj);
3281	4484	}
..	..	@@ -3317,6 +4520,13 @@
3317	4520	void GenNormals(boolean crease)
3318	4521	{
3319	4522	group.GenNormalsS(crease);
	4523	+
	4524	+ refreshContents();
	4525	+ }
	4526	+
	4527	+ void GenNormalsMESH()
	4528	+ {
	4529	+ group.GenNormalsMeshS();
3320	4530
3321	4531	refreshContents();
3322	4532	}
..	..	@@ -3489,8 +4699,8 @@
3489	4699
3490	4700	void ParseVertices()
3491	4701	{
3492		- boolean epsequal = GrafreeD.epsequal;
3493		- GrafreeD.epsequal = true;
	4702	+ boolean epsequal = Grafreed.epsequal;
	4703	+ Grafreed.epsequal = true;
3494	4704
3495	4705	for (int i=0; i<group.selection.size(); i++)
3496	4706	{
..	..	@@ -3515,7 +4725,7 @@
3515	4725	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3516	4726	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3517	4727
3518		- g.add(GrafreeD.clipboard);
	4728	+ g.add(Grafreed.clipboard);
3519	4729
3520	4730	buffer.add(g);
3521	4731	}
..	..	@@ -3530,7 +4740,7 @@
3530	4740	makeSomething(buffer, i==group.selection.size()-1);
3531	4741	}
3532	4742
3533		- GrafreeD.epsequal = epsequal;
	4743	+ Grafreed.epsequal = epsequal;
3534	4744
3535	4745	refreshContents();
3536	4746	}
..	..	@@ -3548,7 +4758,16 @@
3548	4758	String pigment = Object3D.GetPigment(tex);
3549	4759	//String bump = Object3D.GetBump(tex);
3550	4760
3551		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4761	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4762	+
	4763	+ try
	4764	+ {
	4765	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
	4766	+ }
	4767	+ catch (Exception e)
	4768	+ {
	4769	+ System.err.println("FAIL: " + node);
	4770	+ }
3552	4771
3553	4772	double s = v.s;
3554	4773
..	..	@@ -3614,6 +4833,12 @@
3614	4833	{
3615	4834	Object3D obj = group.selection.get(i);
3616	4835
	4836	+ if (obj.toParent == null)
	4837	+ {
	4838	+ obj.toParent = LA.newMatrix();
	4839	+ obj.fromParent = LA.newMatrix();
	4840	+ }
	4841	+
3617	4842	LA.matTranslate(obj.toParent, i * scale, 0, 0);
3618	4843	LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3619	4844	}
..	..	@@ -3636,11 +4861,11 @@
3636	4861
3637	4862	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3638	4863
3639		- boolean random = CameraPane.RANDOM;
3640		- CameraPane.RANDOM = false; // parse all random nodes
	4864	+ boolean random = CameraPane.SWITCH;
	4865	+ CameraPane.SWITCH = false; // parse all random nodes
3641	4866	lowres.linkVerticesThis(null);
3642	4867	lowres.linkVerticesThis(sn);
3643		- CameraPane.RANDOM = random;
	4868	+ CameraPane.SWITCH = random;
3644	4869
3645	4870	System.err.flush();
3646	4871
..	..	@@ -3680,7 +4905,7 @@
3680	4905	return;
3681	4906
3682	4907	Object3D poses = group.selection.get(0);
3683		- Object3D ref = GrafreeD.clipboard.get(0);
	4908	+ Object3D ref = Grafreed.clipboard.get(0);
3684	4909
3685	4910	Object3D newgroup = new Object3D("Po:" + poses.name);
3686	4911
..	..	@@ -3874,9 +5099,9 @@
3874	5099
3875	5100	void ClipMesh()
3876	5101	{
3877		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	5102	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3878	5103	{
3879		- Object3D content = GrafreeD.clipboard.get(0);
	5104	+ Object3D content = Grafreed.clipboard.get(0);
3880	5105
3881	5106	if (content instanceof cGroup && ((cGroup)content).transientlink )
3882	5107	content = ((cGroup)content).get(0);
..	..	@@ -3885,7 +5110,7 @@
3885	5110	// {
3886	5111	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3887	5112	// }
3888		- group.selection.ClipMesh(GrafreeD.clipboard);
	5113	+ group.selection.ClipMesh(Grafreed.clipboard);
3889	5114	}
3890	5115	// group.selection.ClipMesh(GrafreeD.clipboard);
3891	5116	System.out.println("DONE.");
..	..	@@ -3902,6 +5127,12 @@
3902	5127	void ClearMaterials()
3903	5128	{
3904	5129	group.selection.ClearMaterials();
	5130	+ refreshContents();
	5131	+ }
	5132	+
	5133	+ void ClearVersions()
	5134	+ {
	5135	+ group.selection.ClearVersions();
3905	5136	refreshContents();
3906	5137	}
3907	5138
..	..	@@ -3932,6 +5163,18 @@
3932	5163	void MarkLeaves(boolean hide)
3933	5164	{
3934	5165	group.selection.MarkLeaves(hide);
	5166	+ refreshContents();
	5167	+ }
	5168	+
	5169	+ void RewindLeaves(boolean hide)
	5170	+ {
	5171	+ group.selection.RewindLeaves(hide);
	5172	+ refreshContents();
	5173	+ }
	5174	+
	5175	+ void RandomLeaves(boolean hide)
	5176	+ {
	5177	+ group.selection.RandomLeaves(hide);
3935	5178	refreshContents();
3936	5179	}
3937	5180
..	..	@@ -4006,28 +5249,25 @@
4006	5249	// }
4007	5250	// }
4008	5251
4009		- static boolean allparams = true;
4010		-
4011		- static Vector<Object3D> listUI = new Vector<Object3D>();
4012		-
4013	5252	void EditSelection(boolean newWindow)
4014	5253	{
	5254	+ if (group.selection == null)
	5255	+ {
	5256	+ EditElement(group, newWindow); // ? new
	5257	+ return;
	5258	+ }
	5259	+
4015	5260	// aConstraints.gridy = 0;
4016	5261	for (int i=0; i<group.selection.size(); i++)
4017	5262	{
4018	5263	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4019	5264	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4020		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5265	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4021	5266
4022	5267	Object3D elem = (Object3D)group.selection.elementAt(i);
4023		- if(elem != group)
	5268	+ if(elem != group \|\| !newWindow)
4024	5269	{
4025		- // if (!(elem instanceof Composite))
4026		- // newWindow = false;
4027		- listUI.add(elem);
4028		- elem.openEditWindow(this, newWindow); //, false);
4029		- System.out.println("edit : " + elem);
4030		- elem.editWindow.refreshContents(true); // ? new
	5270	+ EditElement(elem, newWindow); // ? new
4031	5271	}
4032	5272	}
4033	5273	}
..	..	@@ -4090,9 +5330,7 @@
4090	5330
4091	5331	freezemodel = false;
4092	5332	}
4093		-
4094		- boolean flashIt = true;
4095		-
	5333	+
4096	5334	public void valueChanged(TreeSelectionEvent e)
4097	5335	//public boolean handleEvent(Event event)
4098	5336	{
..	..	@@ -4102,7 +5340,8 @@
4102	5340	//new Exception().printStackTrace();
4103	5341
4104	5342	freezemodel = true;
4105		-
	5343	+ ClearUnpinned();
	5344	+
4106	5345	/**/
4107	5346	//switch (event.id)
4108	5347	{
..	..	@@ -4110,7 +5349,6 @@
4110	5349	//case 702: // Event.LIST_DESELECT
4111	5350	group.deselectAll();
4112	5351	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4113		- objEditor.ClearInfo(); // .GetMaterial());
4114	5352	if (tps != null)
4115	5353	{
4116	5354	for (int i=0; i < tps.length; i++)
..	..	@@ -4119,33 +5357,39 @@
4119	5357
4120	5358	//if (child.parent != null)
4121	5359	//child.parent.addSelectee(child);
	5360	+ objEditor.SetMaterial(child);
4122	5361	group.addSelectee(child);
4123		- objEditor.SetMaterial(child); // .GetMaterial());
4124		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4125		- System.err.println("info : " + child.GetPath());
4126	5362	}
4127	5363	}
4128		- else
4129		- {
4130		- objEditor.SetMaterial(group); // .GetMaterial());
4131		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4132		- System.err.println("info : " + group.GetPath());
4133		- }
	5364	+// else
	5365	+// {
	5366	+// objEditor.SetMaterial(group); // .GetMaterial());
	5367	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	5368	+// System.err.println("info : " + group.GetPath());
	5369	+// }
4134	5370
4135		- objEditor.SetText(); // jan 2014
4136		-
4137		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	5371	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4138	5372	CameraPane.flash = true;
4139	5373
4140		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5374	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4141	5375	// a camera
4142	5376	{
4143		- CameraPane.camerachangeframe = 0; // don't refuse it
4144		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5377	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5378	+ {
	5379	+ CameraPane.camerachangeframe = 0; // don't refuse it
	5380	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5381	+ }
4145	5382	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4146	5383	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4147	5384	}
4148	5385
	5386	+ if (tps != null && tps.length == 1)
	5387	+ {
	5388	+ EditSelection(false);
	5389	+ }
	5390	+
	5391	+ SetPinStates(tps != null && tps.length > 0);
	5392	+
4149	5393	refreshContents();
4150	5394	//return true;
4151	5395	}
..	..	@@ -4154,6 +5398,53 @@
4154	5398
4155	5399	freezemodel = false;
4156	5400	}
	5401	+
	5402	+ void SetPinStates(boolean enabled)
	5403	+ {
	5404	+ editButton.setEnabled(enabled);
	5405	+ uneditButton.setEnabled(enabled);
	5406	+ //unselectButton.setEnabled(enabled);
	5407	+ flashSelectionButton.setEnabled(enabled);
	5408	+
	5409	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5410	+
	5411	+ boolean allComposites = true;
	5412	+
	5413	+ if (group.selection != null)
	5414	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5415	+ {
	5416	+ Object next = e.nextElement();
	5417	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5418	+ {
	5419	+ allComposites = false;
	5420	+ break;
	5421	+ }
	5422	+ }
	5423	+
	5424	+ rootButton.setEnabled(true); // allComposites);
	5425	+ }
	5426	+
	5427	+ void refreshContents(boolean cp)
	5428	+ {
	5429	+ if (Globals.ADVANCED)
	5430	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5431	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5432	+ {
	5433	+ objEditor.ClearInfo(); // .GetMaterial());
	5434	+
	5435	+ for (int i=0; i < group.selection.Size(); i++)
	5436	+ {
	5437	+ Object3D child = (Object3D) group.selection.get(i);
	5438	+
	5439	+ objEditor.AddInfo(child, this, true);
	5440	+// System.err.println("info : " + child.GetPath());
	5441	+ }
	5442	+
	5443	+ objEditor.SetText(); // jan 2014
	5444	+ }
	5445	+
	5446	+ super.refreshContents(cp);
	5447	+ }
4157	5448
4158	5449	void linkSomething(Object3D thing)
4159	5450	{
..	..	@@ -4225,16 +5516,19 @@
4225	5516	{
4226	5517	if (group.selection.isEmpty())
4227	5518	return;
4228		- GrafreeD.clipboardIsTempGroup = false;
	5519	+
	5520	+ Grafreed.clipboardIsTempGroup = false;
4229	5521	Composite tGroup = null;
4230	5522	if (group.selection.size() > 0) // 1)
4231	5523	{
4232	5524	tGroup = new cGroup();
4233		- GrafreeD.clipboardIsTempGroup = true;
	5525	+ Grafreed.clipboardIsTempGroup = true;
4234	5526	}
4235	5527
4236	5528	if (cut)
4237	5529	{
	5530	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5531	+// Save();
4238	5532	//int indices[] = jList.getSelectedIndices();
4239	5533	//for (int i = indices.length - 1; i >= 0; i--)
4240	5534	//jList.remove(indices[i]);
..	..	@@ -4270,16 +5564,16 @@
4270	5564	//System.out.println("cut " + child);
4271	5565	//System.out.println("parent = " + child.parent);
4272	5566	// tmp.addChild(child);
4273		- if (GrafreeD.clipboardIsTempGroup)
	5567	+ if (Grafreed.clipboardIsTempGroup)
4274	5568	tGroup.add/Child/(tmp);
4275	5569	else
4276		- GrafreeD.clipboard = tmp;
	5570	+ Grafreed.clipboard = tmp;
4277	5571	}
4278	5572	else
4279		- if (GrafreeD.clipboardIsTempGroup)
	5573	+ if (Grafreed.clipboardIsTempGroup)
4280	5574	tGroup.add/Child/(child);
4281	5575	else
4282		- GrafreeD.clipboard = child;
	5576	+ Grafreed.clipboard = child;
4283	5577	}
4284	5578
4285	5579	//ResetModel();
..	..	@@ -4311,21 +5605,23 @@
4311	5605	//System.out.println("cut " + elem);
4312	5606	//System.out.println("parent = " + elem.parent);
4313	5607	// tmp.addChild(elem);
4314		- if (GrafreeD.clipboardIsTempGroup)
	5608	+ if (Grafreed.clipboardIsTempGroup)
4315	5609	tGroup.add/Child/(tmp);
4316	5610	else
4317		- GrafreeD.clipboard = tmp;
	5611	+ Grafreed.clipboard = tmp;
4318	5612	}
4319	5613	else
4320		- if (GrafreeD.clipboardIsTempGroup)
	5614	+ if (Grafreed.clipboardIsTempGroup)
4321	5615	tGroup.add/Child/(child);
4322	5616	else
4323		- GrafreeD.clipboard = child;
	5617	+ Grafreed.clipboard = child;
4324	5618	}
4325	5619
4326	5620	}
4327		- if (GrafreeD.clipboardIsTempGroup)
4328		- GrafreeD.clipboard = tGroup;
	5621	+
	5622	+ if (Grafreed.clipboardIsTempGroup)
	5623	+ Grafreed.clipboard = tGroup;
	5624	+
4329	5625	if (cut)
4330	5626	{
4331	5627	ResetModel();
..	..	@@ -4335,11 +5631,15 @@
4335	5631
4336	5632	void paste(boolean expand)
4337	5633	{
	5634	+ if (Globals.REPLACEONMAKE)
	5635	+ Save();
	5636	+ boolean keep = Globals.REPLACEONMAKE;
	5637	+ Globals.REPLACEONMAKE = false;
4338	5638	// if (GrafreeD.clipboard == null)
4339	5639	// return;
4340	5640	boolean first = true;
4341	5641
4342		- if (GrafreeD.clipboardIsTempGroup)
	5642	+ if (Grafreed.clipboardIsTempGroup)
4343	5643	{
4344	5644	Composite temp;
4345	5645
..	..	@@ -4350,7 +5650,7 @@
4350	5650	temp = (Composite)Applet3D.clipboard.deepCopy();
4351	5651	*/
4352	5652	Object3D elem;
4353		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5653	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4354	5654	{
4355	5655	Object3D child = (Object3D)e.nextElement();
4356	5656
..	..	@@ -4384,21 +5684,22 @@
4384	5684	//Object3D cb = Applet3D.clipboard;
4385	5685	//temp.addChild(cb);
4386	5686	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4387		- assert(GrafreeD.clipboard.parent == null);
4388		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4389		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4390		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4391		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	5687	+ assert(Grafreed.clipboard.parent == null);
	5688	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5689	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5690	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5691	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4392	5692	else
4393		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4394		- GrafreeD.clipboard.get(0).parent = keepparent;
	5693	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5694	+ Grafreed.clipboard.get(0).parent = keepparent;
4395	5695	}
4396	5696
	5697	+ Globals.REPLACEONMAKE = keep;
4397	5698	ResetModel();
4398	5699	refreshContents();
4399	5700	}
4400	5701
4401		- void pasteInto(boolean copyit)
	5702	+ void pasteInto(boolean copyit, boolean clone)
4402	5703	{
4403	5704	// if (GrafreeD.clipboard == null)
4404	5705	// return;
..	..	@@ -4427,15 +5728,22 @@
4427	5728	if (copyit)
4428	5729	{
4429	5730	// paste(false);
4430		- CloneClipboard(false); // sept 2014
	5731	+ if (clone)
	5732	+ {
	5733	+ CloneClipboard(false); // sept 2014
	5734	+ }
	5735	+ else
	5736	+ {
	5737	+ paste(false);
	5738	+ }
4431	5739	}
4432	5740	else
4433	5741	{
4434	5742	boolean first = true;
4435	5743
4436		- if (GrafreeD.clipboardIsTempGroup)
	5744	+ if (Grafreed.clipboardIsTempGroup)
4437	5745	{
4438		- Composite temp = (Composite)GrafreeD.clipboard;
	5746	+ Composite temp = (Composite)Grafreed.clipboard;
4439	5747	Object3D copy;
4440	5748	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4441	5749	{
..	..	@@ -4445,7 +5753,7 @@
4445	5753	}
4446	5754	} else
4447	5755	{
4448		- linkSomething(GrafreeD.clipboard); //.get(0));
	5756	+ linkSomething(Grafreed.clipboard); //.get(0));
4449	5757	}
4450	5758	}
4451	5759	}
..	..	@@ -4522,6 +5830,10 @@
4522	5830
4523	5831	void group(Object3D csg, boolean grab)
4524	5832	{
	5833	+ if (Globals.REPLACEONMAKE)
	5834	+ Save();
	5835	+ boolean keep = Globals.REPLACEONMAKE;
	5836	+ Globals.REPLACEONMAKE = false;
4525	5837	if (//false) // why??
4526	5838	!group.selection.isEmpty())
4527	5839	{
..	..	@@ -4635,10 +5947,15 @@
4635	5947	//node.add(csg);
4636	5948	//makeSomething(node);
4637	5949	makeSomething(csg);
	5950	+ Globals.REPLACEONMAKE = keep;
4638	5951	}
4639	5952
4640	5953	void Ungroup(Object3D g)
4641	5954	{
	5955	+ if (Globals.REPLACEONMAKE)
	5956	+ Save();
	5957	+ boolean keep = Globals.REPLACEONMAKE;
	5958	+ Globals.REPLACEONMAKE = false;
4642	5959	if (g instanceof HiddenObject)
4643	5960	{
4644	5961	HiddenObject h = (HiddenObject) g;
..	..	@@ -4655,6 +5972,7 @@
4655	5972	objEditor.makeSomething(g.get(i), false);
4656	5973	}
4657	5974	}
	5975	+ Globals.REPLACEONMAKE = keep;
4658	5976	}
4659	5977
4660	5978	void ungroup()
..	..	@@ -4850,21 +6168,6 @@
4850	6168	}
4851	6169	*/
4852	6170
4853		- void ImportGFD()
4854		- {
4855		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4856		- browser.show();
4857		- String filename = browser.getFile();
4858		- if (filename != null && filename.length() > 0)
4859		- {
4860		- String fullname = browser.getDirectory() + filename;
4861		-
4862		- //Object3D readobj =
4863		- objEditor.ReadGFD(fullname, objEditor);
4864		- //makeSomething(readobj);
4865		- }
4866		- }
4867		-
4868	6171	/*
4869	6172	public void Callback(Object obj)
4870	6173	{
..	..	@@ -4888,26 +6191,9 @@
4888	6191	}
4889	6192	*/
4890	6193
4891		- void ImportVRMLX3D()
4892		- {
4893		- if (GrafreeD.standAlone)
4894		- {
4895		- /**/
4896		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4897		- browser.show();
4898		- String filename = browser.getFile();
4899		- if (filename != null && filename.length() > 0)
4900		- {
4901		- String fullname = browser.getDirectory() + filename;
4902		- LoadVRMLX3D(fullname);
4903		- }
4904		- /**/
4905		- }
4906		- }
4907		-
4908	6194	String GetFile(String dialogName)
4909	6195	{
4910		- if (GrafreeD.standAlone)
	6196	+ if (Grafreed.standAlone)
4911	6197	{
4912	6198	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4913	6199	browser.show();
..	..	@@ -4971,10 +6257,48 @@
4971	6257	cButton flashSelectionButton;
4972	6258	cButton editButton;
4973	6259	cButton uneditButton;
	6260	+ JCheckBox allParamsButton;
4974	6261	cButton clearpanelButton;
4975		- cButton allParamsButton;
4976	6262	cButton unselectButton;
4977	6263
	6264	+ cButton restoreCameraButton;
	6265	+
	6266	+ cButton oneStepButton;
	6267	+
	6268	+ cButton groupButton;
	6269	+ cButton ungroupButton;
	6270	+ cButton compositeButton;
	6271	+ cButton switchButton;
	6272	+ cButton loopButton;
	6273	+ cButton textureButton;
	6274	+
	6275	+ cButton skybox1Button;
	6276	+ cButton skybox2Button;
	6277	+ cButton skybox3Button;
	6278	+ cButton skybox4Button;
	6279	+ cButton skybox5Button;
	6280	+ cButton skybox6Button;
	6281	+ cButton skybox7Button;
	6282	+
	6283	+ cButton skybox11Button;
	6284	+ cButton skybox12Button;
	6285	+ cButton skybox13Button;
	6286	+ cButton skybox14Button;
	6287	+ cButton skybox15Button;
	6288	+ cButton skybox16Button;
	6289	+ cButton skybox17Button;
	6290	+
	6291	+ cButton gridButton;
	6292	+ cButton boxButton;
	6293	+ cButton sphereButton;
	6294	+ cButton coneButton;
	6295	+ cButton torusButton;
	6296	+ cButton superButton;
	6297	+ cButton kleinButton;
	6298	+ cButton particlesButton;
	6299	+ cButton overlayButton;
	6300	+ cButton lightButton;
	6301	+
4978	6302	cButton screenfitButton;
4979	6303	cButton screenfitpointButton;
4980	6304	cButton snapobjectButton;
..	..	@@ -4986,14 +6310,6 @@
4986	6310
4987	6311	cButton setsupportButton;
4988	6312
4989		- cButton twoButton;
4990		- cButton sixButton;
4991		- cButton threeButton;
4992		- cButton sevenButton;
4993		- cButton fourButton; // full panel
4994		- cButton oneButton; // full XYZ
4995		- //cButton currentLayout;
4996		-
4997	6313	//
4998	6314	//Composite
4999	6315	Object3D // to do !!
..	..	@@ -5003,10 +6319,12 @@
5003	6319	//JTree jTree;
5004	6320	private MenuItem lookAtItem;
5005	6321	private MenuItem lookFromItem;
5006		- private MenuItem switchItem;
5007		- private MenuItem cutItem;
5008		- private MenuItem duplicateItem;
5009		- private MenuItem cloneItem;
	6322	+ private MenuItem switchViewItem;
	6323	+ private JMenuItem cutItem;
	6324	+ private MenuItem undoItem;
	6325	+ private MenuItem redoItem;
	6326	+ private JMenuItem duplicateItem;
	6327	+ private JMenuItem cloneItem;
5010	6328	private MenuItem cloneSupportItem;
5011	6329	private MenuItem overwriteGeoItem;
5012	6330	private MenuItem overwriteMatItem;
..	..	@@ -5018,7 +6336,7 @@
5018	6336	private MenuItem linkverticesItem;
5019	6337	private MenuItem relinkverticesItem;
5020	6338	private MenuItem setMasterItem;
5021		- private MenuItem resetMeshItem;
	6339	+ private MenuItem resetAllItem;
5022	6340	private MenuItem stepAllItem;
5023	6341	private MenuItem revertMeshItem;
5024	6342	private MenuItem poseMeshItem;
..	..	@@ -5027,12 +6345,13 @@
5027	6345	private MenuItem cloneGeometriesItem;
5028	6346	private MenuItem shareGeometriesItem;
5029	6347	private MenuItem mergeGeometriesItem;
5030		- private MenuItem copyItem;
	6348	+ private JMenuItem copyItem;
5031	6349	private MenuItem pasteItem;
5032		- private MenuItem pasteLinkItem;
5033		- private MenuItem pasteCloneItem;
5034		- private MenuItem pasteExpandItem;
5035		- private MenuItem clearItem;
	6350	+ private JMenuItem pasteIntoItem;
	6351	+ private JMenuItem pasteLinkItem;
	6352	+ private JMenuItem pasteCloneItem;
	6353	+ private JMenuItem pasteExpandItem;
	6354	+ private JMenuItem deleteItem;
5036	6355	private MenuItem clearAllItem;
5037	6356	private MenuItem genUVItem;
5038	6357	private MenuItem genNormalsMESHItem;
..	..	@@ -5058,6 +6377,7 @@
5058	6377	private MenuItem clipMeshItem;
5059	6378	private MenuItem smoothMeshItem;
5060	6379	private MenuItem clearMaterialsItem;
	6380	+ private MenuItem clearVersionsItem;
5061	6381
5062	6382	private MenuItem liveleavesItem;
5063	6383	private MenuItem unliveleavesItem;
..	..	@@ -5067,6 +6387,10 @@
5067	6387	private MenuItem showleavesItem;
5068	6388	private MenuItem markleavesItem;
5069	6389	private MenuItem unmarkleavesItem;
	6390	+ private MenuItem rewindleavesItem;
	6391	+ private MenuItem unrewindleavesItem;
	6392	+ private MenuItem randomleavesItem;
	6393	+ private MenuItem unrandomleavesItem;
5070	6394
5071	6395	private MenuItem flipVItem;
5072	6396	private MenuItem unflipVItem;
..	..	@@ -5077,16 +6401,21 @@
5077	6401	private MenuItem maxTexturesItem;
5078	6402	private MenuItem panoTexturesItem;
5079	6403
	6404	+ private MenuItem textureRatioRItem;
	6405	+ private MenuItem textureRatioGItem;
	6406	+ private MenuItem textureRatioBItem;
5080	6407	private MenuItem resetCentroidItem;
5081		- private MenuItem transformgeometryItem;
	6408	+ private MenuItem resetCentroidXZItem;
5082	6409	private MenuItem resetTransformItem;
	6410	+ private MenuItem transformGeometryItem;
	6411	+ private MenuItem transformChildrenItem;
5083	6412	private MenuItem hideItem;
5084		- private MenuItem grabItem;
	6413	+ private JMenuItem grabItem;
5085	6414	private MenuItem backItem;
5086	6415	private MenuItem frontItem;
5087	6416	private MenuItem cameraItem;
5088	6417	private MenuItem compositeItem;
5089		- private MenuItem randomItem;
	6418	+ private MenuItem switchItem;
5090	6419	private MenuItem physicsItem;
5091	6420	private MenuItem frameselectorItem;
5092	6421	private MenuItem scriptNodeItem;
..	..	@@ -5094,7 +6423,7 @@
5094	6423	private MenuItem switchTransfoItem;
5095	6424	private MenuItem morphItem;
5096	6425	private MenuItem linkerItem;
5097		- private MenuItem ungroupItem;
	6426	+ private JMenuItem ungroupItem;
5098	6427	private MenuItem editItem;
5099	6428	private MenuItem openWindowItem;
5100	6429	private MenuItem editLeafItem;
..	..	@@ -5110,6 +6439,8 @@
5110	6439	private MenuItem attachBumpItem;
5111	6440	private MenuItem detachBumpItem;
5112	6441	private MenuItem pigmentBumpItem;
	6442	+ private MenuItem embedTexturesItem;
	6443	+ private MenuItem deEmbedTexturesItem;
5113	6444
5114	6445	private MenuItem particleItem;
5115	6446	private MenuItem ragdollItem;
..	..	@@ -5126,7 +6457,7 @@
5126	6457	private MenuItem blobItem;
5127	6458	private MenuItem latheItem;
5128	6459	private MenuItem bezierItem;
5129		- private MenuItem checkerItem;
	6460	+ private MenuItem overlayItem;
5130	6461	private MenuItem meshItem;
5131	6462	// private MenuItem meshGroupItem;
5132	6463	private MenuItem springItem;
..	..	@@ -5148,11 +6479,6 @@
5148	6479	private MenuItem doubleItem;
5149	6480	private MenuItem tripleItem;
5150	6481
5151		- private MenuItem importGFDItem;
5152		- private MenuItem importVRMLX3DItem;
5153		- private MenuItem import3DSItem;
5154		- private MenuItem importOBJItem;
5155		-
5156	6482	private MenuItem computeAOItem;
5157	6483	private MenuItem recompileItem;
5158	6484	private MenuItem editScriptItem;
..	..	@@ -5162,4 +6488,8 @@
5162	6488	private MenuItem analyzeItem;
5163	6489	private MenuItem dumpItem;
5164	6490	//boolean freezemodel = false;
	6491	+
	6492	+ Menu cameraMenu;
	6493	+ MenuItem editCameraItem;
	6494	+ MenuItem restoreCameraItem;
5165	6495	}