~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -12,9 +12,11 @@
12	12	import com.jme.math.Vector3f;
13	13	import com.jme.renderer.ColorRGBA;
14	14
	15	+import grafeme.ui.*;
15	16	//import buoy.widget.BFileChooser;
16	17
17		-class GroupEditor extends ObjEditor implements iParse, //iCallBack,
	18	+class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
	19	+ Grafreed.iResourceCallBack,
18	20	ObjectUI,
19	21	Runnable,
20	22	ActionListener,
..	..	@@ -22,6 +24,341 @@
22	24	DragGestureListener, DragSourceListener, DropTargetListener,
23	25	ItemListener // ListSelectionListener
24	26	{
	27	+
	28	+ public void AddSkyboxButton(String f, String s, cGridBag row)
	29	+ {
	30	+ cButton skyboxButton;
	31	+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
	32	+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
	33	+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
	34	+ skyboxButton.setToolTipText(s);
	35	+ skyboxButton.addActionListener(new ActionListener()
	36	+ {
	37	+ @Override
	38	+ public void actionPerformed(ActionEvent e)
	39	+ {
	40	+ ChangeSkybox(path);
	41	+ }
	42	+ });
	43	+ }
	44	+
	45	+ public void AddTextureButton(String f, String c, final String t, int count, cGridBag row)
	46	+ {
	47	+ cButton textureButton;
	48	+ final String path = "textures/" + f + "/" + c + "/"; // + t;
	49	+ row.add(textureButton = GetButton(path + "icons/" + t, !Grafreed.NIMBUSLAF));
	50	+ textureButton.setToolTipText(c + count);
	51	+ textureButton.addActionListener(new ActionListener()
	52	+ {
	53	+ @Override
	54	+ public void actionPerformed(ActionEvent e)
	55	+ {
	56	+ ChangeTexture(path + t);
	57	+ }
	58	+ });
	59	+ }
	60	+
	61	+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
	62	+ {
	63	+ cGridBag tab0 = new cGridBag().setVertical(true);
	64	+
	65	+ tab0.setName("Urban");
	66	+ skyboxpanel.add(tab0);
	67	+
	68	+ cGridBag row0 = new cGridBag();
	69	+ cGridBag row1 = new cGridBag();
	70	+ cGridBag row2 = new cGridBag();
	71	+ cGridBag row3 = new cGridBag();
	72	+ cGridBag row4 = new cGridBag();
	73	+ cGridBag row5 = new cGridBag();
	74	+ cGridBag row6 = new cGridBag();
	75	+
	76	+ AddSkyboxButton("default", "rgb", 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	+ //cameraView.envyoff = false;
	334	+ group.skyboxname = skybox;
	335	+ group.skyboxext = "jpg";
	336	+ cameraView.repaint();
	337	+ }
	338	+
	339	+ public void CreateSkyboxPanel(cGridBag skyboxPanel)
	340	+ {
	341	+ JTabbedPane skyboxpane = new JTabbedPane();
	342	+
	343	+ AddSkyboxTab0(skyboxpane);
	344	+ AddSkyboxTab1(skyboxpane);
	345	+ AddSkyboxTab2(skyboxpane);
	346	+ AddSkyboxTab3(skyboxpane);
	347	+
	348	+ skyboxPanel.add(skyboxpane);
	349	+ }
	350	+
	351	+ public void ChangeTexture(String texture)
	352	+ {
	353	+ for (int i=0; i<group.selection.size(); i++)
	354	+ {
	355	+ Object3D obj = group.selection.get(i);
	356	+ obj.SetPigmentTexture("@" + texture);
	357	+ }
	358	+
	359	+ refreshContents();
	360	+ }
	361	+
25	362	//ObjEditor objEditor;
26	363	public void closeUI2()
27	364	{
..	..	@@ -59,6 +396,12 @@
59	396	this.copy = this.group = group;
60	397	//selectees = this.group.selectees;
61	398
	399	+ if (copy.versionlist == null)
	400	+ {
	401	+ copy.versionlist = new Object3D[100];
	402	+ copy.versionindex = -1;
	403	+ }
	404	+
62	405	if(ui)
63	406	SetupUI(objEditor);
64	407	}
..	..	@@ -73,17 +416,29 @@
73	416	this.copy = this.group = copy;
74	417	//selectees = this.group.selectees;
75	418
76		- SetupMenu2(objEditor);
	419	+ SetupMenu2(this); //objEditor);
77	420	SetupUI2(objEditor);
78	421	objEditor.SetupUI(true);
79	422	SetupViews(objEditor);
80	423
81	424	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	425	+
	426	+ if (copy.versionlist == null)
	427	+ {
	428	+ copy.versionlist = new Object3D[100];
	429	+ copy.versionindex = -1;
	430	+
	431	+ Save(true);
	432	+ }
82	433	}
83	434
84	435	void CloneSelection(boolean supports)
85	436	{
86		- // Object3D keep = GraphreeD.clipboard;
	437	+ if (Globals.REPLACEONMAKE)
	438	+ Save();
	439	+ boolean keep = Globals.REPLACEONMAKE;
	440	+ Globals.REPLACEONMAKE = false;
	441	+ // Object3D keep = GrafreeD.clipboard;
87	442	//Object3D obj;
88	443	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
89	444	{
..	..	@@ -93,18 +448,19 @@
93	448
94	449	makeSomething(clone, i==group.selection.size()-1);
95	450	}
	451	+ Globals.REPLACEONMAKE = keep;
96	452	}
97	453
98	454	void CloneClipboard(boolean supports)
99	455	{
100		- assert(GraphreeD.clipboard.parent == null);
101		- Object3D /Composite/ keepparent = GraphreeD.clipboard.get(0).parent;
102		- GraphreeD.clipboard.get(0).parent = null; // Avoid copy?
103		- if (LA.isIdentity(GraphreeD.clipboard.toParent))
104		- makeSomething(CloneObject(GraphreeD.clipboard.get(0), false));
	456	+ assert(Grafreed.clipboard.parent == null);
	457	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	458	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	459	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	460	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
105	461	else
106		- makeSomething(CloneObject(GraphreeD.clipboard, false));
107		- GraphreeD.clipboard.get(0).parent = keepparent;
	462	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	463	+ Grafreed.clipboard.get(0).parent = keepparent;
108	464	}
109	465
110	466	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -118,7 +474,7 @@
118	474	// obj.support = null;
119	475	if (!supports)
120	476	obj.SaveSupports();
121		- Object3D clone = (Object3D)GraphreeD.clone(obj);
	477	+ Object3D clone = (Object3D)Grafreed.clone(obj);
122	478	obj.parent = parent;
123	479	// obj.support = support;
124	480	// clone.support = support; // aout 2013
..	..	@@ -147,30 +503,29 @@
147	503
148	504	//JTextField nameField;
149	505
150		- void SetupMenu2(ObjEditor oe)
	506	+ void SetupMenu2(GroupEditor oe)
151	507	{
152		- oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
153		- //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
154		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
155		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
156		- oe.cameraMenu.add("-");
157		- openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
158		- openWindowItem.addActionListener(this);
159		- editLeafItem.addActionListener(this);
160		- lookAtItem.addActionListener(this);
161		- //lookFromItem.addActinoListener(this);
162		- //switchItem.addActionListener(this);
	508	+ oe.jTree = new cTree();
	509	+
163	510	Menu menu;
164	511	oe.menuBar.add(menu = new Menu("Edit"));
165	512	//editItem = menu.add(new MenuItem("Edit"));
166	513	//editItem.addActionListener(this);
167		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	514	+
	515	+// undoItem = menu.add(new MenuItem("Undo"));
	516	+// undoItem.addActionListener(this);
	517	+// redoItem = menu.add(new MenuItem("Redo"));
	518	+// redoItem.addActionListener(this);
	519	+// menu.add("-");
	520	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
168	521	duplicateItem.addActionListener(this);
169		- menu.add("-");
170	522	cloneItem = menu.add(new MenuItem("Clone"));
171	523	cloneItem.addActionListener(this);
	524	+ if (Globals.ADVANCED)
	525	+ {
172	526	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
173	527	cloneSupportItem.addActionListener(this);
	528	+ }
174	529	menu.add("-");
175	530	cutItem = menu.add(new MenuItem("Cut"));
176	531	cutItem.addActionListener(this);
..	..	@@ -178,26 +533,123 @@
178	533	copyItem.addActionListener(this);
179	534	pasteItem = menu.add(new MenuItem("Paste"));
180	535	pasteItem.addActionListener(this);
	536	+
	537	+ menu.add("-");
	538	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	539	+ pasteIntoItem.addActionListener(this);
181	540	pasteLinkItem = menu.add(new MenuItem("Paste link"));
182	541	pasteLinkItem.addActionListener(this);
183	542	pasteCloneItem = menu.add(new MenuItem("Paste clone"));
184	543	pasteCloneItem.addActionListener(this);
185	544	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
186	545	// pasteExpandItem.addActionListener(this);
187		- clearItem = menu.add(new MenuItem("Clear"));
188		- clearItem.addActionListener(this);
	546	+ menu.add("-");
	547	+ deleteItem = menu.add(new MenuItem("Delete"));
	548	+ deleteItem.addActionListener(this);
	549	+
	550	+ if (Globals.ADVANCED)
	551	+ {
	552	+ // Deletes the cameras...
189	553	clearAllItem = menu.add(new MenuItem("Clear All"));
190	554	clearAllItem.addActionListener(this);
191		- menu.add("-");
192		- resetMeshItem = menu.add(new MenuItem("Reset All"));
193		- resetMeshItem.addActionListener(this);
194		- stepAllItem = menu.add(new MenuItem("Step All"));
195		- stepAllItem.addActionListener(this);
	555	+ }
	556	+
	557	+ menuBar.add(cameraMenu = new Menu("View"));
	558	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	559	+ //zBufferItem.addActionListener(this);
	560	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	561	+ //normalLensItem.addActionListener(this);
	562	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	563	+ restoreCameraItem.addActionListener(this);
	564	+
	565	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	566	+// toggleFullScreenItem.addItemListener(this);
	567	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	568	+// cameraMenu.add("-");
	569	+//
	570	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	571	+// toggleTextureItem.addItemListener(this);
	572	+// toggleTextureItem.setState(CameraPane.textureon);
	573	+//
	574	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	575	+// toggleSwitchItem.addItemListener(this);
	576	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	577	+
	578	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	579	+ toggleHandleItem.addItemListener(this);
	580	+ toggleHandleItem.setState(CameraPane.HANDLES);
	581	+
	582	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	583	+ togglePaintItem.addItemListener(this);
	584	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	585	+
	586	+ if (Globals.ADVANCED)
	587	+ {
	588	+ cameraMenu.add("-");
	589	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	590	+ toggleLiveItem.addItemListener(this);
	591	+ toggleLiveItem.setState(Globals.isLIVE());
	592	+
	593	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	594	+ stepItem.addActionListener(this);
	595	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	596	+ // toggleDLItem.addItemListener(this);
	597	+ // toggleDLItem.setState(false);
	598	+
	599	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	600	+ toggleRenderItem.addItemListener(this);
	601	+ toggleRenderItem.setState(!CameraPane.frozen);
	602	+
	603	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	604	+ toggleDebugItem.addItemListener(this);
	605	+ toggleDebugItem.setState(Globals.DEBUG);
	606	+
	607	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	608	+ toggleFrustumItem.addItemListener(this);
	609	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	610	+
	611	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	612	+ toggleFootContactItem.addItemListener(this);
	613	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	614	+
	615	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	616	+ toggleTimelineItem.addItemListener(this);
	617	+ }
	618	+
	619	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	620	+// toggleRootItem.addItemListener(this);
	621	+// toggleRootItem.setState(false);
	622	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	623	+// animationItem.addItemListener(this);
	624	+// animationItem.setState(CameraPane.ANIMATION);
	625	+ cameraMenu.add("-");
	626	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	627	+ editCameraItem.addActionListener(this);
	628	+
	629	+ if (Globals.ADVANCED)
	630	+ {
	631	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	632	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	633	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	634	+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	635	+ oe.cameraMenu.add("-");
	636	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	637	+ openWindowItem.addActionListener(this);
	638	+ editLeafItem.addActionListener(this);
	639	+ lookAtItem.addActionListener(this);
	640	+ //lookFromItem.addActinoListener(this);
	641	+ //switchViewItem.addActionListener(this);
	642	+ }
	643	+
	644	+ oe.menuBar.add(menu = new Menu("Setting"));
	645	+ if (Globals.ADVANCED)
	646	+ {
196	647	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
197	648	revertMeshItem.addActionListener(this);
198	649	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
199	650	resetreferencesItem.addActionListener(this);
200	651	menu.add("-");
	652	+ }
201	653	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
202	654	overwriteGeoItem.addActionListener(this);
203	655	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -209,72 +661,104 @@
209	661	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
210	662	overwriteUVItem.addActionListener(this);
211	663	menu.add("-");
	664	+ if (Globals.ADVANCED)
	665	+ {
212	666	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
213	667	generateMeshItem.addActionListener(this);
214	668	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
215	669	poseMeshItem.addActionListener(this);
216	670	menu.add("-");
	671	+ }
217	672	resetsupportItem = menu.add(new MenuItem("Reset support"));
218	673	resetsupportItem.addActionListener(this);
219	674	linkverticesItem = menu.add(new MenuItem("Link to Support"));
220	675	linkverticesItem.addActionListener(this);
	676	+ relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
	677	+ relinkverticesItem.addActionListener(this);
	678	+
	679	+ if (Globals.ADVANCED)
	680	+ {
221	681	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
222	682	setMasterItem.addActionListener(this);
	683	+ }
223	684
224		- oe.menuBar.add(menu = new Menu("Object"));
225		- grabItem = menu.add(new MenuItem("Grab"));
226		- grabItem.addActionListener(this);
227		- frontItem = menu.add(new MenuItem("Front"));
228		- frontItem.addActionListener(this);
	685	+ oe.menuBar.add(menu = new Menu("Group"));
	686	+// grabItem = menu.add(new MenuItem("Grab"));
	687	+// grabItem.addActionListener(this);
229	688	backItem = menu.add(new MenuItem("Back"));
230	689	backItem.addActionListener(this);
231		- compositeItem = menu.add(new MenuItem("Composite"));
232		- compositeItem.addActionListener(this);
233		- menu.add("-");
234		- randomItem = menu.add(new MenuItem("Random"));
235		- randomItem.addActionListener(this);
236		- physicsItem = menu.add(new MenuItem("Physics"));
237		- physicsItem.addActionListener(this);
238		- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
239		- frameselectorItem.addActionListener(this);
	690	+ frontItem = menu.add(new MenuItem("Front"));
	691	+ frontItem.addActionListener(this);
	692	+// compositeItem = menu.add(new MenuItem("Composite"));
	693	+// compositeItem.addActionListener(this);
	694	+
	695	+ if (Globals.ADVANCED)
	696	+ {
	697	+ hideItem = menu.add(new MenuItem("Hidden Group"));
	698	+ hideItem.addActionListener(this);
	699	+ }
	700	+ ungroupItem = menu.add(new MenuItem("Ungroup"));
	701	+ ungroupItem.addActionListener(this);
	702	+
	703	+// menu.add("-");
	704	+//
	705	+// switchItem = menu.add(new MenuItem("Switch node"));
	706	+// switchItem.addActionListener(this);
	707	+ if (Globals.ADVANCED)
	708	+ {
240	709	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
241	710	switchGeoItem.addActionListener(this);
242	711	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
243	712	switchTransfoItem.addActionListener(this);
244		- morphItem = menu.add(new MenuItem("Morph"));
	713	+ morphItem = menu.add(new MenuItem("Morph Group"));
245	714	morphItem.addActionListener(this);
	715	+
	716	+ menu.add("-");
	717	+ physicsItem = menu.add(new MenuItem("Physics"));
	718	+ physicsItem.addActionListener(this);
	719	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	720	+ frameselectorItem.addActionListener(this);
246	721	scriptNodeItem = menu.add(new MenuItem("Script Node"));
247	722	scriptNodeItem.addActionListener(this);
248		- cameraItem = menu.add(new MenuItem("Camera"));
249		- cameraItem.addActionListener(this);
250		- menu.add("-");
251		- textureItem = menu.add(new MenuItem("Texture"));
252		- textureItem.addActionListener(this);
	723	+ }
	724	+
	725	+ oe.menuBar.add(menu = new Menu("Object"));
	726	+// textureItem = menu.add(new MenuItem("Texture"));
	727	+// textureItem.addActionListener(this);
	728	+ billboardItem = menu.add(new MenuItem("Billboard"));
	729	+ billboardItem.addActionListener(this);
253	730	csgItem = menu.add(new MenuItem("CSG"));
254	731	csgItem.addActionListener(this);
255		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	732	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
256	733	shadowXItem.addActionListener(this);
257		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	734	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
258	735	shadowYItem.addActionListener(this);
259		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	736	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
260	737	shadowZItem.addActionListener(this);
	738	+ attributeItem = menu.add(new MenuItem("Attribute"));
	739	+ attributeItem.addActionListener(this);
	740	+
	741	+ if (Globals.ADVANCED)
	742	+ {
	743	+ menu.add("-");
261	744	linkerItem = menu.add(new MenuItem("Linker"));
262	745	linkerItem.addActionListener(this);
263	746	templateItem = menu.add(new MenuItem("Template"));
264	747	templateItem.addActionListener(this);
265		- attributeItem = menu.add(new MenuItem("Attribute"));
266		- attributeItem.addActionListener(this);
267	748	pointflowItem = menu.add(new MenuItem("Point Flow"));
268	749	pointflowItem.addActionListener(this);
	750	+ }
269	751	menu.add("-");
270		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
271		- transformgeometryItem.addActionListener(this);
272	752	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
273	753	resetTransformItem.addActionListener(this);
274	754	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
275	755	resetCentroidItem.addActionListener(this);
276		- ungroupItem = menu.add(new MenuItem("Ungroup"));
277		- ungroupItem.addActionListener(this);
	756	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	757	+ resetCentroidXZItem.addActionListener(this);
	758	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	759	+ transformGeometryItem.addActionListener(this);
	760	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	761	+ transformChildrenItem.addActionListener(this);
278	762
279	763	oe.menuBar.add(menu = new Menu("Geometry"));
280	764	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -283,6 +767,13 @@
283	767	genNormalsORGANItem.addActionListener(this);
284	768	genNormalsCADItem = menu.add(new MenuItem("CAD Normals"));
285	769	genNormalsCADItem.addActionListener(this);
	770	+ genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
	771	+ genNormalsMESHItem.addActionListener(this);
	772	+ if (Globals.ADVANCED)
	773	+ {
	774	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
	775	+ genNormalsMINEItem.addActionListener(this);
	776	+ }
286	777	stripifyItem = menu.add(new MenuItem("Stripify"));
287	778	stripifyItem.addActionListener(this);
288	779	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -292,8 +783,6 @@
292	783	untrimItem = menu.add(new MenuItem("Untrim"));
293	784	untrimItem.addActionListener(this);
294	785	menu.add("-");
295		- clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
296		- clearMaterialsItem.addActionListener(this);
297	786	clearColorsItem = menu.add(new MenuItem("Clear AO"));
298	787	clearColorsItem.addActionListener(this);
299	788	reverseNormalsItem = menu.add(new MenuItem("Reverse Normals"));
..	..	@@ -306,19 +795,34 @@
306	795	reduce34MeshItem.addActionListener(this);
307	796	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
308	797	increaseMeshItem.addActionListener(this);
309		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
310		- smoothMeshItem.addActionListener(this);
311	798	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
312	799	clipMeshItem.addActionListener(this);
	800	+
	801	+ if (Globals.ADVANCED)
	802	+ {
	803	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	804	+ smoothMeshItem.addActionListener(this);
	805	+ }
	806	+
	807	+ oe.menuBar.add(menu = new Menu("Attributes"));
	808	+ clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
	809	+ clearMaterialsItem.addActionListener(this);
	810	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	811	+ resetAllItem.addActionListener(this);
	812	+ stepAllItem = menu.add(new MenuItem("Step All"));
	813	+ stepAllItem.addActionListener(this);
313	814	menu.add("-");
314	815	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
315	816	liveleavesItem.addActionListener(this);
316	817	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
317	818	unliveleavesItem.addActionListener(this);
	819	+ if (Globals.ADVANCED)
	820	+ {
318	821	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
319	822	supportleavesItem.addActionListener(this);
320	823	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
321	824	unsupportleavesItem.addActionListener(this);
	825	+ }
322	826	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
323	827	hideleavesItem.addActionListener(this);
324	828	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -327,32 +831,31 @@
327	831	markleavesItem.addActionListener(this);
328	832	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
329	833	unmarkleavesItem.addActionListener(this);
	834	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	835	+ rewindleavesItem.addActionListener(this);
	836	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	837	+ unrewindleavesItem.addActionListener(this);
	838	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	839	+ randomleavesItem.addActionListener(this);
	840	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	841	+ unrandomleavesItem.addActionListener(this);
330	842	menu.add("-");
331	843	flipVItem = menu.add(new MenuItem("Flip V"));
332	844	flipVItem.addActionListener(this);
333	845	unflipVItem = menu.add(new MenuItem("Unflip V"));
334	846	unflipVItem.addActionListener(this);
335		- lowTexturesItem = menu.add(new MenuItem("Low Texture"));
	847	+ lowTexturesItem = menu.add(new MenuItem("Low Texture (256)"));
336	848	lowTexturesItem.addActionListener(this);
337		- normalTexturesItem = menu.add(new MenuItem("Normal Texture"));
	849	+ normalTexturesItem = menu.add(new MenuItem("Normal Texture (512)"));
338	850	normalTexturesItem.addActionListener(this);
339		- highTexturesItem = menu.add(new MenuItem("High Texture"));
	851	+ highTexturesItem = menu.add(new MenuItem("High Texture (1024)"));
340	852	highTexturesItem.addActionListener(this);
341		- veryhighTexturesItem = menu.add(new MenuItem("Very high Texture"));
	853	+ veryhighTexturesItem = menu.add(new MenuItem("Very high Texture (2048)"));
342	854	veryhighTexturesItem.addActionListener(this);
343		- maxTexturesItem = menu.add(new MenuItem("Max Texture"));
	855	+ maxTexturesItem = menu.add(new MenuItem("Max Texture (4096)"));
344	856	maxTexturesItem.addActionListener(this);
345		- panoTexturesItem = menu.add(new MenuItem("Panoramic Texture"));
	857	+ panoTexturesItem = menu.add(new MenuItem("Panoramic Texture (8192)"));
346	858	panoTexturesItem.addActionListener(this);
347		- menu.add("-");
348		- extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
349		- extractGeometriesItem.addActionListener(this);
350		- cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
351		- cloneGeometriesItem.addActionListener(this);
352		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
353		- shareGeometriesItem.addActionListener(this);
354		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
355		- mergeGeometriesItem.addActionListener(this);
356	859
357	860	oe.menuBar.add(menu = new Menu("Selection"));
358	861	attachPigmentItem = menu.add(new MenuItem("Attach Pigment..."));
..	..	@@ -361,23 +864,123 @@
361	864	attachBumpItem.addActionListener(this);
362	865	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
363	866	pigmentBumpItem.addActionListener(this);
	867	+ //embedTexturesItem
364	868	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
365	869	detachPigmentItem.addActionListener(this);
366	870	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
367	871	detachBumpItem.addActionListener(this);
	872	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	873	+ embedTexturesItem.addActionListener(this);
	874	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	875	+ deEmbedTexturesItem.addActionListener(this);
368	876	menu.add("-");
369	877	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
370	878	sortbysizeItem.addActionListener(this);
371	879	sortbynameItem = menu.add(new MenuItem("Sort by name"));
372	880	sortbynameItem.addActionListener(this);
	881	+ menu.add("-");
	882	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	883	+ shareGeometriesItem.addActionListener(this);
	884	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	885	+ mergeGeometriesItem.addActionListener(this);
	886	+ if (Globals.ADVANCED)
	887	+ {
	888	+ // Pretty much the same as duplicate and clone.
	889	+ extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
	890	+ extractGeometriesItem.addActionListener(this);
	891	+ cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
	892	+ cloneGeometriesItem.addActionListener(this);
	893	+ }
	894	+
373	895	oe.menuBar.add(menu = new Menu("Insert"));
374	896	buildCreateMenu(menu);
375		- oe.menuBar.add(menu = new Menu("Tools"));
	897	+
	898	+ oe.menuBar.add(menu = new Menu("Tools"));
376	899	buildToolsMenu(menu);
377	900	}
378	901
	902	+ JTabbedPane resourcecontainer;
	903	+ cGridBag currenttab;
	904	+ boolean added; // patch for jar
	905	+
	906	+ int tabcount = 0;
	907	+ int colcount = 0;
	908	+ int rowcount = 0;
	909	+ int texturecount = 0;
	910	+
	911	+ int columns = 5;
	912	+ int rows = 7;
	913	+
	914	+ public void ResourceCallBack(String[] path)
	915	+ {
	916	+// for (int i = 0; i < path.length; i++)
	917	+// System.out.print(path[i] + "/");
	918	+// System.out.println();
	919	+
	920	+ if (//rowcount == 0 \|\|
	921	+ path.length == 1)
	922	+ {
	923	+ currenttab = new cGridBag();
	924	+ added = false;
	925	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	926	+ currenttab.setName(tabname);
	927	+ rowcount = 1;
	928	+ colcount = 0;
	929	+ texturecount = 0;
	930	+ }
	931	+
	932	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	933	+ {
	934	+ if (!added)
	935	+ {
	936	+ added = true;
	937	+ resourcecontainer.add(currenttab);
	938	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	939	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	940	+ }
	941	+
	942	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	943	+
	944	+ if (++colcount >= columns)
	945	+ {
	946	+ colcount = 0;
	947	+ currenttab.Return();
	948	+
	949	+ if (rowcount++ >= rows)
	950	+ {
	951	+ rowcount = 0;
	952	+ }
	953	+ }
	954	+ }
	955	+ else
	956	+ {
	957	+// if (!path[path.length-1].equals("icons"))
	958	+// resourcecontainer.Return();
	959	+ }
	960	+ }
	961	+
	962	+ void CreateTexturePanel(cGridBag container)
	963	+ {
	964	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	965	+ container.add(resourcecontainer);
	966	+
	967	+ Grafreed.ParseResources("textures", this);
	968	+ }
	969	+
379	970	void SetupUI2(ObjEditor oe)
380	971	{
	972	+ // June 2019
	973	+ if (oe == null)
	974	+ {
	975	+ //super.SetupUI2(this);
	976	+ //return;
	977	+ }
	978	+
	979	+ if (copy != group)
	980	+ {
	981	+ //super.SetupUI2(this);
	982	+ }
	983	+
381	984	//new Exception().printStackTrace();
382	985
383	986	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -406,150 +1009,239 @@
406	1009	oe.radioPanel.add(dummyButton);
407	1010	oe.buttonGroup.add(dummyButton);
408	1011	*/
409		- aConstraints.gridy += 1;
410		- oe.aConstraints.gridwidth = 1;
411		- oe.aConstraints.gridx = 0;
	1012	+ cGridBag copyOptionsPanel = new cGridBag();
	1013	+
	1014	+ copyOptionsPanel.preferredHeight = 2;
412	1015
413		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
	1016	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
	1017	+
	1018	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1019	+ //minButton.setToolTipText("Minimize window");
	1020	+ //minButton.addActionListener(this);
	1021	+
	1022	+ if (Globals.ADVANCED)
	1023	+ {
	1024	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1025	+ maxButton.setToolTipText("Maximize window");
	1026	+ maxButton.addActionListener(this);
	1027	+ }
	1028	+
	1029	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1030	+ fullButton.setToolTipText("Full-screen window");
	1031	+ fullButton.addActionListener(this);
	1032	+
	1033	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1034	+ screenfitButton.setToolTipText("Screen fit");
	1035	+ screenfitButton.addActionListener(this);
	1036	+
	1037	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1038	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1039	+ restoreCameraButton.addActionListener(this);
	1040	+
	1041	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1042	+ saveVersionButton.setToolTipText("Duplicate current version");
	1043	+ saveVersionButton.addActionListener(this);
	1044	+
	1045	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1046	+ deleteVersionButton.setToolTipText("Delete current version");
	1047	+ deleteVersionButton.addActionListener(this);
	1048	+
	1049	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1050	+ previousVersionButton.setToolTipText("Previous version");
	1051	+ previousVersionButton.addActionListener(this);
	1052	+ previousVersionButton.setEnabled(false);
	1053	+
	1054	+ cGridBag updown = new cGridBag().setVertical(true);
	1055	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1056	+ restoreButton.setToolTipText("Undo (restore current version)");
	1057	+ restoreButton.addActionListener(this);
	1058	+ //restoreButton.setEnabled(false);
	1059	+
	1060	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1061	+ replaceButton.setToolTipText("Save (replace current version)");
	1062	+ replaceButton.addActionListener(this);
	1063	+ //replaceButton.setEnabled(false);
	1064	+
	1065	+ copyOptionsPanel.add(updown);
	1066	+
	1067	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1068	+ nextVersionButton.setToolTipText("Next version");
	1069	+ nextVersionButton.addActionListener(this);
	1070	+ nextVersionButton.setEnabled(false);
	1071	+
	1072	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1073	+ liveCB.setToolTipText("Enable animation");
414	1074	liveCB.addItemListener(this);
415	1075
416		- oe.aConstraints.gridx += 1;
417		- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
418		- supportCB.addItemListener(this);
419		-
420		- // oe.aConstraints.gridx += 1;
421		- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
422		- // localCB.addItemListener(this);
423		-
424		- oe.aConstraints.gridx += 1;
425		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", CameraPane.CROWD), oe.aConstraints);
426		- crowdCB.addItemListener(this);
427		-
428		- oe.aConstraints.gridx += 1;
429		- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
430		- smoothCB.addItemListener(this);
431		-
432		- oe.aConstraints.gridx += 1;
433		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
	1076	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1077	+ oneStepButton.setToolTipText("Animate one step forward");
	1078	+ oneStepButton.addActionListener(this);
	1079	+
	1080	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	1081	+ fastCB.setToolTipText("Fast mode");
434	1082	fastCB.addItemListener(this);
435		- oe.aConstraints.gridx += 1;
436		- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
437		- slowCB.addItemListener(this);
438		- oe.aConstraints.gridx += 1;
439		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.FAST), oe.aConstraints);
440		- boxCB.addItemListener(this);
	1083	+
	1084	+ //oe.toolboxPanel.Return();
	1085	+
	1086	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1087	+// trackCB.setToolTipText("Enable tracking");
	1088	+// trackCB.addItemListener(this);
441	1089
442		-// oe.aConstraints.gridx += 1;
443		-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
444		-// speakerMocapCB.addItemListener(this);
445		-
446		- if (false)
447		- {
448		- // handled in scripts
449		- oe.aConstraints.gridx += 1;
450		- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
451		- speakerCameraCB.addItemListener(this);
452		-
453		- oe.aConstraints.gridx += 1;
454		- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
455		- speakerFocusCB.addItemListener(this);
456		-
457		- oe.aConstraints.gridx += 1;
458		- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
459		- smoothfocusCB.addItemListener(this);
460		- }
461		-
462		-//oe.aConstraints.gridx += 1;
463		-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
464		-// debugCB.addItemListener(this);
465		-
466		- oe.aConstraints.gridx += 1;
467		- oe.toolbarPanel.add(oeilCB = new cCheckBox("O", CameraPane.OEIL), oe.aConstraints);
468		- oeilCB.addItemListener(this);
469		-
470		- oe.aConstraints.gridx += 1;
471		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("T", CameraPane.LOOKAT), oe.aConstraints);
472		- lookAtCB.addItemListener(this);
473		-
474		- oe.aConstraints.gridx += 1;
475		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
476		- trackCB.addItemListener(this);
477		-
478		- oe.aConstraints.gridx += 1;
479		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
480		- screenfitButton.addActionListener(this);
481		- oe.aConstraints.gridx += 1;
482	1090	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
483	1091	// screenfitpointButton.addActionListener(this);
484		-// oe.aConstraints.gridx += 1;
485		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
486		- snapobjectButton.addActionListener(this);
487		- oe.aConstraints.gridx += 1;
488	1092
489		- //aConstraints.gridx = 0;
490		- //aConstraints.gridy += 1;
491		- oe.aConstraints.weighty = 0;
492		- oe.aConstraints.gridwidth = 1;
493		-
494		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
495		- flashSelectionButton.addActionListener(this);
496		- oe.aConstraints.gridx += 1;
497		- oe.aConstraints.weighty = 0;
498		- oe.aConstraints.gridwidth = 1;
499		-
500		- //
501		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
502		- twoButton.addActionListener(this);
503		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	1093	+ if (Globals.ADVANCED)
	1094	+ {
	1095	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1096	+ snapobjectButton.addActionListener(this);
	1097	+ snapobjectButton.setToolTipText("Snap Object");
	1098	+
	1099	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
504	1100	fourButton.addActionListener(this);
505		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
506		- sixButton.addActionListener(this);
507		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	1101	+ fourButton.setToolTipText("Show control panel only");
	1102	+ }
	1103	+
	1104	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	1105	+
	1106	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1107	+ twoButton.setToolTipText("Show 3D view only");
	1108	+ twoButton.addActionListener(this);
	1109	+ this.fullscreenLayout = twoButton;
	1110	+
	1111	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1112	+ threeButton.setToolTipText("Show controls and 3D view");
508	1113	threeButton.addActionListener(this);
509		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
510		- sevenButton.addActionListener(this);
	1114	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1115	+ sixButton.setToolTipText("Show 3D view and controls");
	1116	+ sixButton.addActionListener(this);
	1117	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1118	+// sevenButton.setToolTipText("3-column layout");
	1119	+// sevenButton.addActionListener(this);
511	1120	//
512	1121
513		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	1122	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1123	+ rootButton.setToolTipText("Open selection in new tab");
514	1124	rootButton.addActionListener(this);
515		- oe.aConstraints.gridx += 1;
516		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	1125	+
	1126	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1127	+ closeButton.setToolTipText("Close tab");
517	1128	closeButton.addActionListener(this);
518	1129	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
519	1130	//clearButton.addActionListener(this);
520		- oe.aConstraints.gridx += 1;
521		-
522		- oe.aConstraints.gridx = 1; //
523		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
524		- editButton.addActionListener(this);
525		- oe.aConstraints.gridx += 1;
526		- oe.aConstraints.weighty = 0;
527		- oe.aConstraints.gridwidth = 1;
528	1131
529		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	1132	+ cGridBag row1 = new cGridBag();
	1133	+
	1134	+ // INSERT
	1135	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1136	+ gridButton.setToolTipText("Create grid");
	1137	+ gridButton.addActionListener(this);
	1138	+
	1139	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1140	+ boxButton.setToolTipText("Create box");
	1141	+ boxButton.addActionListener(this);
	1142	+
	1143	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1144	+ sphereButton.setToolTipText("Create sphere");
	1145	+ sphereButton.addActionListener(this);
	1146	+
	1147	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1148	+ coneButton.setToolTipText("Create cone");
	1149	+ coneButton.addActionListener(this);
	1150	+
	1151	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1152	+ torusButton.setToolTipText("Create torus");
	1153	+ torusButton.addActionListener(this);
	1154	+
	1155	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1156	+ superButton.setToolTipText("Create superellipsoid");
	1157	+ superButton.addActionListener(this);
	1158	+
	1159	+ if (Globals.ADVANCED)
	1160	+ {
	1161	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1162	+ kleinButton.setToolTipText("Create Klein bottle");
	1163	+ kleinButton.addActionListener(this);
	1164	+ }
	1165	+
	1166	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1167	+ particlesButton.setToolTipText("Create particle system");
	1168	+ particlesButton.addActionListener(this);
	1169	+
	1170	+ oe.toolboxPanel.add(row1);
	1171	+
	1172	+ cGridBag row2 = new cGridBag();
	1173	+
	1174	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1175	+ groupButton.setToolTipText("Create group");
	1176	+ groupButton.addActionListener(this);
	1177	+
	1178	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1179	+ compositeButton.setToolTipText("Create composite");
	1180	+ compositeButton.addActionListener(this);
	1181	+
	1182	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1183	+ switchButton.setToolTipText("Create item switcher");
	1184	+ switchButton.addActionListener(this);
	1185	+
	1186	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1187	+ loopButton.setToolTipText("Create loop");
	1188	+ loopButton.addActionListener(this);
	1189	+
	1190	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1191	+ textureButton.setToolTipText("Create texture");
	1192	+ textureButton.addActionListener(this);
	1193	+
	1194	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1195	+ overlayButton.setToolTipText("Create overlay");
	1196	+ overlayButton.addActionListener(this);
	1197	+
	1198	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1199	+ lightButton.setToolTipText("Create light");
	1200	+ lightButton.addActionListener(this);
	1201	+
	1202	+ oe.toolboxPanel.add(row2);
	1203	+
	1204	+ cGridBag textures = new cGridBag();
	1205	+
	1206	+ CreateTexturePanel(textures);
	1207	+
	1208	+ oe.toolboxPanel.add(textures);
	1209	+
	1210	+ textures.preferredHeight = 100;
	1211	+
	1212	+ CreateSkyboxPanel(oe.skyboxPanel);
	1213	+
	1214	+ // EDIT panel
	1215	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1216	+ editButton.setToolTipText("Pin selection controls");
	1217	+ editButton.addActionListener(this);
	1218	+
	1219	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1220	+ uneditButton.setToolTipText("Unpin and remove selection controls");
530	1221	uneditButton.addActionListener(this);
531	1222
532		- oe.aConstraints.gridx += 1;
533		- oe.aConstraints.weighty = 0;
534		- oe.aConstraints.gridwidth = 1;
535		-
536		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
537		- clearPanelButton.addActionListener(this);
538		-
539		- oe.aConstraints.gridx += 1;
540		- oe.aConstraints.weighty = 0;
541		- oe.aConstraints.gridwidth = 1;
542		-
543		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	1223	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1224	+ allParamsButton.setToolTipText("Show all controls");
544	1225	allParamsButton.addActionListener(this);
545	1226
546		- oe.aConstraints.gridx += 1;
547		- oe.aConstraints.weighty = 0;
548		- oe.aConstraints.gridwidth = 1;
549		-
550		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
551		- unselectButton.addActionListener(this);
	1227	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1228	+ clearPanelButton.setToolTipText("Clear all controls");
	1229	+ clearPanelButton.addActionListener(this);
552	1230
	1231	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1232	+ //unselectButton.setToolTipText("Unselect");
	1233	+ //unselectButton.addActionListener(this);
	1234	+
	1235	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1236	+ flashSelectionButton.setToolTipText("Highlight selection");
	1237	+ flashSelectionButton.addActionListener(this);
	1238	+
	1239	+ editCommandsPanel.preferredHeight = 1;
	1240	+
	1241	+ SetPinStates(false);
	1242	+// oe.treePanel.add(commandsPanel);
	1243	+// oe.treePanel.Return();
	1244	+
553	1245	// oe.aConstraints.gridx += 1;
554	1246	// oe.aConstraints.weighty = 0;
555	1247	// oe.aConstraints.gridwidth = 1;
..	..	@@ -561,47 +1253,32 @@
561	1253	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
562	1254	// gcButton.addActionListener(this);
563	1255
564		- oe.aConstraints.gridx = 0;
565		- oe.aConstraints.gridy += 1;
566		-
567		- //ctrlPanel.add(objList = new List(5, true));
568		- oe.aConstraints.gridwidth = 100;
569		- // oe.aConstraints.gridheight = 100;
570		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
571		- oe.aConstraints.gridheight = 1;
572		- oe.aConstraints.weighty = 0.5;
573		- oe.aConstraints.gridx = 0;
574		- JScrollPane jSP;
	1256	+ cGridBag jSPPanel = new cGridBag();
	1257	+
	1258	+ JScrollPane jSP;
575	1259	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
576		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	1260	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
577	1261	ResetModel();
578		- oe.aConstraints.weighty = 0.5;
579		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
580		- oe.aConstraints.gridy += 1;
581		- oe.aConstraints.gridwidth = 1;
582		-
583		- oe.aConstraints.weighty = 0;
584		- oe.aConstraints.gridwidth = 2;
585		-
586		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
587		- colorCB.addItemListener(this);
588		- oe.aConstraints.gridx += 2;
589		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
590		- materialCB.addItemListener(this);
591		- oe.aConstraints.gridx += 2;
592		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
593		- textureCB.addItemListener(this);
594		-
595		- oe.aConstraints.gridx = 0;
596		- oe.aConstraints.gridy += 1;
597	1262
	1263	+ oe.treePanel.add(jSPPanel);
	1264	+ oe.treePanel.Return();
	1265	+
	1266	+ oe.treePanel.add(copyOptionsPanel);
	1267	+ oe.treePanel.Return();
	1268	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1269	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1270	+ sliderPane.preferredHeight = 1;
	1271	+
	1272	+// mainPanel.setDividerLocation(0.1); //1.0);
	1273	+ mainPanel.setResizeWeight(0.4);
	1274	+
598	1275	//jList.addListSelectionListener(this);
599	1276	oe.jTree.addTreeSelectionListener(this);
600	1277	//jTree.setRootVisible(false);
601	1278	//jTree.setEditable(true);
602	1279	oe.jTree.setDragEnabled(true);
603	1280	//jTree.setPreferredSize(new Dimension(10,10));
604		- jSP.setPreferredSize(new Dimension(100,200));
	1281	+ //jSP.setPreferredSize(new Dimension(100,200));
605	1282
606	1283	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
607	1284
..	..	@@ -613,23 +1290,163 @@
613	1290	dgr.addDragGestureListener(this);
614	1291	}catch(Exception e) {}
615	1292	*/
616		- radio.layout = sevenButton;
	1293	+ radio.layout = threeButton; // sixButton;
617	1294	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
618	1295	}
	1296	+
	1297	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	1298	+ {
	1299	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1300	+ colorCB.setToolTipText("Copy color when dropped");
	1301	+ colorCB.addItemListener(this);
	1302	+
	1303	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1304	+ materialCB.setToolTipText("Copy material when dropped");
	1305	+ materialCB.addItemListener(this);
	1306	+
	1307	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1308	+ textureCB.setToolTipText("Copy texture when dropped");
	1309	+ textureCB.addItemListener(this);
	1310	+
	1311	+ panel.Return();
	1312	+
	1313	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	1314	+ boxCB.setToolTipText("Display bounding boxes");
	1315	+ boxCB.addItemListener(this);
	1316	+
	1317	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	1318	+ zoomBoxCB.setToolTipText("Display only for wheel");
	1319	+ zoomBoxCB.addItemListener(this);
	1320	+
	1321	+ if (true) // Globals.ADVANCED)
	1322	+ {
	1323	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1324	+// supportCB.setToolTipText("Enable rigging");
	1325	+// supportCB.addItemListener(this);
	1326	+
	1327	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1328	+ freezeCB.setToolTipText("Fast moving camera");
	1329	+ freezeCB.addItemListener(this);
	1330	+
	1331	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	1332	+ // localCB.addItemListener(this);
	1333	+
	1334	+ panel.Return();
	1335	+
	1336	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	1337	+ crowdCB.setToolTipText("Used for crowds");
	1338	+ crowdCB.addItemListener(this);
	1339	+
	1340	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	1341	+ smoothCB.setToolTipText("Snapping delay");
	1342	+ smoothCB.addItemListener(this);
	1343	+
	1344	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1345	+// slowCB.setToolTipText("Smooth interpolation");
	1346	+// slowCB.addItemListener(this);
	1347	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1348	+ minshaderCB.setToolTipText("Minimal fast shader");
	1349	+ minshaderCB.addItemListener(this);
	1350	+
	1351	+// constraints.gridy += 1;
	1352	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	1353	+// speakerMocapCB.addItemListener(this);
	1354	+
	1355	+ panel.Return();
	1356	+
	1357	+ if (false)
	1358	+ {
	1359	+ // handled in scripts
	1360	+ //constraints.gridy += 1;
	1361	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	1362	+ speakerCameraCB.addItemListener(this);
	1363	+
	1364	+ //constraints.gridy += 1;
	1365	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	1366	+ speakerFocusCB.addItemListener(this);
	1367	+
	1368	+ //constraints.gridy += 1;
	1369	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	1370	+ smoothfocusCB.addItemListener(this);
	1371	+ panel.Return();
	1372	+ }
	1373	+
	1374	+//constraints.gridx += 1;
	1375	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	1376	+// debugCB.addItemListener(this);
	1377	+
	1378	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1379	+ trackCB.setToolTipText("Enable tracking target");
	1380	+ trackCB.addItemListener(this);
	1381	+
	1382	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1383	+ oeilCB.setToolTipText("Move camera when tracking");
	1384	+ oeilCB.addItemListener(this);
	1385	+
	1386	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1387	+ shadowCB.setToolTipText("When live compute shadows");
	1388	+ shadowCB.addItemListener(this);
	1389	+
	1390	+ panel.Return();
	1391	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1392	+ toggleTextureCB.setToolTipText("Load textures");
	1393	+ toggleTextureCB.addItemListener(this);
	1394	+
	1395	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1396	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1397	+ toggleSwitchCB.addItemListener(this);
	1398	+
	1399	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1400	+ autokeepCB.setToolTipText("On structure change");
	1401	+ autokeepCB.addItemListener(this);
	1402	+
	1403	+ panel.Return();
	1404	+ if (Globals.ADVANCED)
	1405	+ {
	1406	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	1407	+ lookAtCB.setToolTipText("Look-at target");
	1408	+ lookAtCB.addItemListener(this);
	1409	+ }
	1410	+
	1411	+ }
	1412	+
	1413	+ cGridBag fill = new cGridBag();
	1414	+ fill.preferredHeight = 200;
	1415	+ cGridBag fill2 = new cGridBag();
	1416	+ fill2.preferredHeight = 200;
	1417	+ cGridBag fill3 = new cGridBag();
	1418	+ fill3.preferredHeight = 200;
	1419	+
	1420	+ panel.add(fill);
	1421	+ panel.add(fill2);
	1422	+ panel.add(fill3);
	1423	+
	1424	+ }
619	1425
620	1426	void EditObject(Object3D obj)
621	1427	{
622		- cRadio dummyButton = new cRadio(obj.name);
623		- dummyButton.SetObject(obj);
624		- dummyButton.layout = sevenButton;
625		- dummyButton.SetCamera(cameraView.renderCamera, false);
626		- dummyButton.addActionListener(this);
627		- radioPanel.add(dummyButton);
628		- buttonGroup.add(dummyButton);
629		- dummyButton.doClick();
	1428	+ cRadio radioButton = new cRadio(obj.name);
	1429	+
	1430	+ // June 2019. Patch to avoid bug with transparency.
	1431	+ radioButton.hadMaterial = obj.material != null;
	1432	+ if (!radioButton.hadMaterial)
	1433	+ {
	1434	+ obj.material = new cMaterial();
	1435	+ }
	1436	+
	1437	+ radioButton.SetObject(obj);
	1438	+ radioButton.layout = threeButton; // sixButton;
	1439	+ radioButton.SetCamera(cameraView.renderCamera, false);
	1440	+ radioButton.addActionListener(this);
	1441	+ radioPanel.add(radioButton);
	1442	+ buttonGroup.add(radioButton);
	1443	+ radioButton.doClick();
630	1444	}
	1445	+
631	1446	void SetupViews(ObjEditor oe)
632	1447	{
	1448	+ theFrame = this;
	1449	+
633	1450	oe.SetupViews();
634	1451
635	1452	System.out.println("SetupViews");
..	..	@@ -638,22 +1455,30 @@
638	1455	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
639	1456	}
640	1457
641		- JCheckBox liveCB;
642		- JCheckBox supportCB;
643		- JCheckBox localCB;
644		- JCheckBox crowdCB;
645		- JCheckBox smoothCB;
646		- JCheckBox fastCB;
647		- JCheckBox slowCB;
648		- JCheckBox boxCB;
649		- JCheckBox trackCB;
650		- JCheckBox smoothfocusCB;
	1458	+ cToggleButton liveCB;
	1459	+ cCheckBox supportCB;
	1460	+ cCheckBox localCB;
	1461	+ cCheckBox crowdCB;
	1462	+ cCheckBox smoothCB;
	1463	+ cCheckBox minshaderCB;
	1464	+
	1465	+ cToggleButton fastCB;
	1466	+ cCheckBox slowCB;
	1467	+ cCheckBox boxCB;
	1468	+ cCheckBox zoomBoxCB;
	1469	+ cCheckBox freezeCB;
	1470	+ //cToggleButton trackCB;
	1471	+ cCheckBox trackCB;
	1472	+ cCheckBox smoothfocusCB;
651	1473	// JCheckBox speakerMocapCB;
652		- JCheckBox speakerCameraCB;
653		- JCheckBox speakerFocusCB;
654		- JCheckBox debugCB;
655		- JCheckBox oeilCB;
656		- JCheckBox lookAtCB;
	1474	+ cCheckBox speakerCameraCB;
	1475	+ cCheckBox speakerFocusCB;
	1476	+ cCheckBox debugCB;
	1477	+
	1478	+ cCheckBox oeilCB;
	1479	+ cCheckBox shadowCB;
	1480	+ cCheckBox autokeepCB;
	1481	+ cCheckBox lookAtCB;
657	1482
658	1483	// static int COLOR = 1;
659	1484	// static int MATERIAL = 2;
..	..	@@ -661,9 +1486,9 @@
661	1486
662	1487	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
663	1488
664		- JCheckBox colorCB;
665		- JCheckBox materialCB;
666		- JCheckBox textureCB;
	1489	+ cCheckBox colorCB;
	1490	+ cCheckBox materialCB;
	1491	+ cCheckBox textureCB;
667	1492
668	1493	public void itemStateChanged(ItemEvent e)
669	1494	{
..	..	@@ -688,10 +1513,10 @@
688	1513	dropAttributes \|= Object3D.TEXTURE;
689	1514	else
690	1515	dropAttributes &= ~Object3D.TEXTURE;
691		- }
692		- else if(e.getSource() == liveCB)
	1516	+ } else if(e.getSource() == liveCB)
693	1517	{
694	1518	cameraView.ToggleLive();
	1519	+ refreshContents(false);
695	1520	}
696	1521	else if(e.getSource() == supportCB)
697	1522	{
..	..	@@ -707,6 +1532,12 @@
707	1532	{
708	1533	cameraView.ToggleInertia();
709	1534	cameraView.repaint();
	1535	+ }
	1536	+ else if(e.getSource() == minshaderCB)
	1537	+ {
	1538	+ Globals.MINSHADER ^= true;
	1539	+ cameraView.programInitialized = false;
	1540	+ cameraView.repaint();
710	1541	}
711	1542	else if(e.getSource() == localCB)
712	1543	{
..	..	@@ -726,6 +1557,10 @@
726	1557	Recompile();
727	1558	cameraView.repaint();
728	1559	// refreshContents();
	1560	+ }
	1561	+ else if(e.getSource() == zoomBoxCB)
	1562	+ {
	1563	+ cameraView.ToggleZoomBoxMode();
729	1564	}
730	1565	else if(e.getSource() == smoothfocusCB)
731	1566	{
..	..	@@ -752,6 +1587,18 @@
752	1587	{
753	1588	cameraView.ToggleOeil();
754	1589	}
	1590	+ else if(e.getSource() == shadowCB)
	1591	+ {
	1592	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1593	+ }
	1594	+ else if(e.getSource() == freezeCB)
	1595	+ {
	1596	+ Globals.FREEZEONMOVE ^= true;
	1597	+ }
	1598	+ else if(e.getSource() == autokeepCB)
	1599	+ {
	1600	+ Globals.REPLACEONMAKE ^= true;
	1601	+ }
755	1602	else if(e.getSource() == lookAtCB)
756	1603	{
757	1604	cameraView.ToggleLookAt();
..	..	@@ -768,7 +1615,8 @@
768	1615
769	1616	/**/
770	1617	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
771		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1618	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1619	+ TreePath path = objEditor.jTree.getSelectionPath();
772	1620	if ((path == null) \|\| (path.getPathCount() <= 1)) {
773	1621	// We can't move the root node or an empty selection
774	1622	return;
..	..	@@ -831,8 +1679,6 @@
831	1679	}
832	1680	}
833	1681
834		- String string = (String) object;
835		-
836	1682	System.out.println("Transfer = " + object + "; drop : " + target);
837	1683	// if( object instanceof java.io.File[])
838	1684	// {
..	..	@@ -840,7 +1686,11 @@
840	1686	// objEditor.DropFile((java.io.File[]) object, true);
841	1687	// return;
842	1688	// }
843		- if (string.charAt(0) == '/')
	1689	+
	1690	+ String string = object.toString();
	1691	+
	1692	+ // File path for Mac and Windows
	1693	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
844	1694	{
845	1695	// file(s)
846	1696	String[] names = string.split("\n");
..	..	@@ -867,7 +1717,7 @@
867	1717
868	1718	flashIt = false;
869	1719	CameraPane pane = (CameraPane) target;
870		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1720	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
871	1721	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
872	1722
873	1723	if (group.selection.size() == 1)
..	..	@@ -883,23 +1733,33 @@
883	1733
884	1734	assert target == objEditor.jTree;
885	1735	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1736	+ Object3D destinationLeaf;
886	1737	try {
887		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1738	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
888	1739	} catch (Exception e) {
889	1740	System.out.println("destinationPath : " + destinationPath);
890	1741	return;
891	1742	}
892	1743
893		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1744	+ for (int i=group.selection.size(); --i>=0;)
894	1745	{
	1746	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1747	+
	1748	+ // Cannot move into itself
	1749	+ if (child == destinationLeaf)
	1750	+ return;
	1751	+ }
	1752	+
	1753	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1754	+// {
895	1755	loadClipboard(true);
896	1756	objEditor.jTree.setSelectionPath(destinationPath);
897		- pasteInto(false);
898		- } else {
899		- loadClipboard(false);
900		- objEditor.jTree.setSelectionPath(destinationPath);
901		- pasteInto(false); // true); // ???
902		- }
	1757	+ pasteInto(false, false);
	1758	+// } else {
	1759	+// loadClipboard(false);
	1760	+// objEditor.jTree.setSelectionPath(destinationPath);
	1761	+// pasteInto(false, false); // true); // ???
	1762	+// }
903	1763	}
904	1764	public void dropActionChanged(DropTargetDragEvent dtde)
905	1765	// Called if the user has modified the current drop gesture
..	..	@@ -1002,90 +1862,109 @@
1002	1862
1003	1863	void buildCreateMenu(Menu menu)
1004	1864	{
1005		- gridItem = menu.add(new MenuItem("Grid"));
1006		- gridItem.addActionListener(this);
1007		- rectoidItem = menu.add(new MenuItem("Box"));
1008		- rectoidItem.addActionListener(this);
1009		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1010		- ellipsoidItem.addActionListener(this);
1011		- coneItem = menu.add(new MenuItem("Cone"));
1012		- coneItem.addActionListener(this);
1013		- torusItem = menu.add(new MenuItem("Torus"));
1014		- torusItem.addActionListener(this);
1015		- superItem = menu.add(new MenuItem("Superellipsoid"));
1016		- superItem.addActionListener(this);
1017		- particleItem = menu.add(new MenuItem("Particle system"));
1018		- particleItem.addActionListener(this);
	1865	+ //heightFieldItem = menu.add(new MenuItem("Height Field"));
	1866	+ //heightFieldItem.addActionListener(this);
	1867	+// gridItem = menu.add(new MenuItem("Grid"));
	1868	+// gridItem.addActionListener(this);
	1869	+// rectoidItem = menu.add(new MenuItem("Box"));
	1870	+// rectoidItem.addActionListener(this);
	1871	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1872	+// ellipsoidItem.addActionListener(this);
	1873	+// coneItem = menu.add(new MenuItem("Cone"));
	1874	+// coneItem.addActionListener(this);
	1875	+// torusItem = menu.add(new MenuItem("Torus"));
	1876	+// torusItem.addActionListener(this);
	1877	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1878	+// superItem.addActionListener(this);
	1879	+
	1880	+ cameraItem = menu.add(new MenuItem("Camera"));
	1881	+ cameraItem.addActionListener(this);
	1882	+
	1883	+ if (!Globals.ADVANCED)
	1884	+ {
	1885	+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
	1886	+ kleinItem.addActionListener(this);
	1887	+ }
	1888	+
	1889	+// particleItem = menu.add(new MenuItem("Particle system"));
	1890	+// particleItem.addActionListener(this);
	1891	+ if (Globals.ADVANCED)
	1892	+ {
1019	1893	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1020	1894	ragdollItem.addActionListener(this);
1021	1895	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1022	1896	ragdoll2Item.addActionListener(this);
	1897	+ }
1023	1898	menu.add("-");
1024		- meshItem = menu.add(new MenuItem("Mesh"));
	1899	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1025	1900	meshItem.addActionListener(this);
1026	1901	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1027	1902	// meshGroupItem.addActionListener(this);
	1903	+ if (Globals.ADVANCED)
	1904	+ {
1028	1905	springItem = menu.add(new MenuItem("Spring"));
1029	1906	springItem.addActionListener(this);
1030	1907	flagItem = menu.add(new MenuItem("Flag"));
1031	1908	flagItem.addActionListener(this);
1032		- bezierItem = menu.add(new MenuItem("Patch"));
1033		- bezierItem.addActionListener(this);
1034		- checkerItem = menu.add(new MenuItem("Checker"));
1035		- checkerItem.addActionListener(this);
1036	1909	blobItem = menu.add(new MenuItem("Blob"));
1037	1910	blobItem.addActionListener(this);
1038	1911	latheItem = menu.add(new MenuItem("Lathe"));
1039	1912	latheItem.addActionListener(this);
1040		- lightItem = menu.add(new MenuItem("Light"));
1041		- lightItem.addActionListener(this);
	1913	+ }
	1914	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1915	+ bezierItem.addActionListener(this);
	1916	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1917	+// overlayItem.addActionListener(this);
	1918	+// lightItem = menu.add(new MenuItem("Light"));
	1919	+// lightItem.addActionListener(this);
1042	1920	menu.add("-");
1043	1921	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1044	1922	//superLoopItem.addActionListener(this);
1045		- loopItem = menu.add(new MenuItem("Loop"));
1046		- loopItem.addActionListener(this);
	1923	+// loopItem = menu.add(new MenuItem("Loop"));
	1924	+// loopItem.addActionListener(this);
1047	1925	doubleItem = menu.add(new MenuItem("Fork"));
1048	1926	doubleItem.addActionListener(this);
	1927	+ if (Globals.ADVANCED)
	1928	+ {
1049	1929	tripleItem = menu.add(new MenuItem("Trident"));
1050	1930	tripleItem.addActionListener(this);
1051		- menu.add("-");
1052		- importGFDItem = menu.add(new MenuItem("GraphreeD Object..."));
1053		- importGFDItem.addActionListener(this);
1054		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
1055		- importVRMLX3DItem.addActionListener(this);
1056		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
1057		- importOBJItem.addActionListener(this);
1058		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
1059		- import3DSItem.addActionListener(this);
	1931	+ }
1060	1932	}
1061	1933
1062	1934	void buildToolsMenu(Menu menu)
1063	1935	{
1064	1936	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1065	1937	animationItem.addItemListener(this);
1066		- animationItem.setState(CameraPane.ANIMATION);
	1938	+ animationItem.setState(Globals.ANIMATION);
	1939	+
	1940	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1941	+ archiveItem.addActionListener(this);
1067	1942
1068	1943	menu.add("-");
1069	1944	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1070	1945	parseverticesItem.addActionListener(this);
1071		- alignItem = menu.add(new MenuItem("Align"));
	1946	+ textureFieldItem = menu.add(new MenuItem("Texture Field"));
	1947	+ textureFieldItem.addActionListener(this);
	1948	+ alignItem = menu.add(new MenuItem("Align Objects"));
1072	1949	alignItem.addActionListener(this);
1073		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1074		- mirrorItem.addActionListener(this);
1075	1950	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1076	1951	reduceMorphItem.addActionListener(this);
1077	1952	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1078	1953	reduce34MorphItem.addActionListener(this);
1079		-
1080		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1081		- computeAOItem.addActionListener(this);
1082	1954	menu.add("-");
1083		-
1084	1955	menu.add(memoryItem = new MenuItem("Memory Usage"));
1085	1956	memoryItem.addActionListener(this);
	1957	+ menu.add(computeAOItem = new MenuItem("Compute AO"));
	1958	+ computeAOItem.addActionListener(this);
	1959	+
	1960	+ if (Globals.ADVANCED)
	1961	+ {
	1962	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1963	+ mirrorItem.addActionListener(this);
	1964	+ menu.add("-");
1086	1965	menu.add(analyzeItem = new MenuItem("Analyze"));
1087	1966	analyzeItem.addActionListener(this);
1088		- menu.add(dumpItem = new MenuItem("Dump"));
	1967	+ menu.add(dumpItem = new MenuItem("Print"));
1089	1968	dumpItem.addActionListener(this);
1090	1969	// menu.add(pathItem = new MenuItem("From-to path"));
1091	1970	// pathItem.addActionListener(this);
..	..	@@ -1094,6 +1973,8 @@
1094	1973	resetParentItem.addActionListener(this);
1095	1974	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1096	1975	repairParentItem.addActionListener(this);
	1976	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1977	+ repairShadowItem.addActionListener(this);
1097	1978	menu.add(invariantsItem = new MenuItem("Invariants"));
1098	1979	invariantsItem.addActionListener(this);
1099	1980	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1101,6 +1982,7 @@
1101	1982	menu.add("-");
1102	1983	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1103	1984	editScriptItem.addActionListener(this);
	1985	+ }
1104	1986	}
1105	1987
1106	1988	void ScreenFit()
..	..	@@ -1223,9 +2105,34 @@
1223	2105	shadow.material = new cMaterial(obj.material);
1224	2106	shadow.material.diffuse = 0.0001f;
1225	2107	shadow.material.specular = 0.0001f;
	2108	+ //shadow.projectedVertices[1].x = 300;
1226	2109
1227	2110	makeSomething(shadow);
1228	2111	}
	2112	+
	2113	+ private void ClearUnpinned()
	2114	+ {
	2115	+ //for (Object3D obj : listUI)
	2116	+ for (int i=listUI.size(); --i>=0;)
	2117	+ {
	2118	+ Object3D obj = listUI.elementAt(i);
	2119	+ if (!obj.pinned)
	2120	+ {
	2121	+ obj.CloseUI();
	2122	+ listUI.remove(i);
	2123	+ }
	2124	+ }
	2125	+ }
	2126	+
	2127	+ private void EditElement(Object3D elem, boolean newWindow)
	2128	+ {
	2129	+ // if (!(elem instanceof Composite))
	2130	+ // newWindow = false;
	2131	+ listUI.add(elem);
	2132	+ elem.openEditWindow(this, newWindow); //, false);
	2133	+ System.out.println("edit : " + elem);
	2134	+ elem.editWindow.refreshContents(true); // ? new
	2135	+ }
1229	2136
1230	2137	/**
1231	2138	* applyExample
..	..	@@ -1429,9 +2336,9 @@
1429	2336
1430	2337	void Overwrite(int mask)
1431	2338	{
1432		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2339	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1433	2340	{
1434		- Object3D content = GraphreeD.clipboard.get(0);
	2341	+ Object3D content = Grafreed.clipboard.get(0);
1435	2342
1436	2343	if (content instanceof cGroup && ((cGroup)content).transientlink )
1437	2344	content = ((cGroup)content).get(0);
..	..	@@ -1454,6 +2361,7 @@
1454	2361	//
1455	2362	public void actionPerformed(ActionEvent event) // , Object arg)
1456	2363	{
	2364	+ Object source = event.getSource();
1457	2365	/*
1458	2366	if (event.getSource() == nameField)
1459	2367	{
..	..	@@ -1465,11 +2373,11 @@
1465	2373	}
1466	2374	else
1467	2375	*/
1468		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	2376	+ if (source == lookAtItem \|\| source == lookFromItem)
1469	2377	{
1470	2378	ScreenFit();
1471	2379	} else
1472		- if (event.getSource() == switchItem)
	2380	+ if (source == switchViewItem)
1473	2381	{
1474	2382	cVector v1 = new cVector();
1475	2383	cVector v2 = new cVector();
..	..	@@ -1478,11 +2386,11 @@
1478	2386	objEditor.cameraView.renderCamera.setAim(v2, v1);
1479	2387	objEditor.cameraView.repaint();
1480	2388	} else
1481		- if (event.getSource() == rectoidItem)
	2389	+ if (source == rectoidItem \|\| source == boxButton)
1482	2390	{
1483	2391	makeSomething(new Box());
1484	2392	} else
1485		- if (event.getSource() == particleItem)
	2393	+ if (source == particleItem \|\| source == particlesButton)
1486	2394	{
1487	2395	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1488	2396	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1503,9 +2411,9 @@
1503	2411	applyExample(particleGeom, "SMOKE");
1504	2412	makeSomething(particleGeom);
1505	2413	} else
1506		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	2414	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1507	2415	{
1508		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	2416	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1509	2417
1510	2418	ragdoll.toParent = LA.newMatrix();
1511	2419	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1521,27 +2429,71 @@
1521	2429	makeSomething(ragdoll);
1522	2430	//makeSomething(new VehicleDemo());
1523	2431	} else
1524		- if (event.getSource() == gridItem)
	2432	+ /*
	2433	+ */
	2434	+ if (source == heightFieldItem)
	2435	+ {
	2436	+ Object3D obj = new Object3D();
	2437	+
	2438	+ obj.CreateMaterial();
	2439	+ obj.bRep = new BoundaryRep();
	2440	+
	2441	+ obj.bRep.CreateMesh(new iHeightField()
	2442	+ {
	2443	+ public double f(double x, double y)
	2444	+ {
	2445	+ // The Mandelbrot set is represented by coloring
	2446	+ // each point (x,y) according to the number of
	2447	+ // iterations it takes before the while loop in
	2448	+ // this method ends. For points that are actually
	2449	+ // in the Mandelbrot set, or very close to it, the
	2450	+ // count will reach the maximum value, 80. These
	2451	+ // points will be colored purple. All other colors
	2452	+ // represent points that are definitely NOT in the set.
	2453	+ x -= 600;
	2454	+ y -= 500;
	2455	+ x /= 200;
	2456	+ y /= 200;
	2457	+ int count = 0;
	2458	+ double zx = x;
	2459	+ double zy = y;
	2460	+ while (count < 80 && Math.abs(x) < 100 && Math.abs(zy) < 100) {
	2461	+ double new_zx = zxzx - zyzy + x;
	2462	+ zy = 2zxzy + y;
	2463	+ zx = new_zx;
	2464	+ count++;
	2465	+ }
	2466	+ return count; // Math.sqrt(count);
	2467	+ }
	2468	+ }, 1000,1000);
	2469	+
	2470	+ makeSomething(obj);
	2471	+ } else
	2472	+ if (source == gridItem \|\| source == gridButton)
1525	2473	{
1526	2474	makeSomething(new Grid());
1527	2475	} else
1528		- if (event.getSource() == ellipsoidItem)
	2476	+ if (source == ellipsoidItem \|\| source == sphereButton)
1529	2477	{
1530	2478	makeSomething(new Sphere());
1531	2479	} else
1532		- if (event.getSource() == coneItem)
	2480	+ if (source == coneItem \|\| source == coneButton)
1533	2481	{
1534	2482	makeSomething(new Cone());
1535	2483	} else
1536		- if (event.getSource() == torusItem)
	2484	+ if (source == torusItem \|\| source == torusButton)
1537	2485	{
1538	2486	makeSomething(new Torus());
1539	2487	} else
1540		- if (event.getSource() == superItem)
	2488	+ if (source == superItem \|\| source == superButton)
1541	2489	{
1542	2490	makeSomething(new Superellipsoid());
1543	2491	} else
1544		- if (event.getSource() == blobItem)
	2492	+ if (source == kleinItem \|\| source == kleinButton)
	2493	+ {
	2494	+ makeSomething(new Klein());
	2495	+ } else
	2496	+ if (source == blobItem)
1545	2497	{
1546	2498	Blob blob = new Blob();
1547	2499	BlobComponent comp = new BlobComponent();
..	..	@@ -1549,15 +2501,15 @@
1549	2501	//blob.retile();
1550	2502	makeSomething(blob);
1551	2503	} else
1552		- if (event.getSource() == latheItem)
	2504	+ if (source == latheItem)
1553	2505	{
1554	2506	makeSomething(new Lathe());
1555	2507	} else
1556		- if (event.getSource() == bezierItem)
	2508	+ if (source == bezierItem)
1557	2509	{
1558	2510	makeSomething(new BezierSurface());
1559	2511	} else
1560		- if (event.getSource() == checkerItem)
	2512	+ if (source == overlayItem \|\| source == overlayButton)
1561	2513	{
1562	2514	/*
1563	2515	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1570,9 +2522,9 @@
1570	2522	LA.matConcat(obj.toParent, cameraView.renderCamera.fromParent, obj.toParent);
1571	2523	LA.matInvert(obj.toParent, obj.fromParent);
1572	2524	*/
1573		- makeSomething(new CheckerIG());
	2525	+ makeSomething(new Checker());
1574	2526	} else
1575		- if (event.getSource() == meshItem)
	2527	+ if (source == meshItem)
1576	2528	{
1577	2529	Object3D itemtomake = new Object3D();
1578	2530	Object3D child;
..	..	@@ -1593,35 +2545,52 @@
1593	2545	makeSomething(child);
1594	2546	}
1595	2547	} else
1596		- if (event.getSource() == springItem)
	2548	+ if (source == springItem)
1597	2549	{
1598	2550	cSpring s = new cSpring();
1599	2551	s.setup();
1600	2552	makeSomething(s);
1601	2553	} else
1602		- if (event.getSource() == flagItem)
	2554	+ if (source == flagItem)
1603	2555	{
1604	2556	cSpring s = new cFlag();
1605	2557	s.setup();
1606	2558	makeSomething(s);
1607	2559	} else
1608		- if (event.getSource() == lightItem)
	2560	+ if (source == lightItem \|\| source == lightButton)
1609	2561	{
1610	2562	makeSomething(new Light());
1611	2563	} else
1612		- if (event.getSource() == csgItem)
	2564	+// if (source == skybox1Button \|\|
	2565	+// source == skybox2Button \|\|
	2566	+// source == skybox3Button \|\|
	2567	+// source == skybox4Button \|\|
	2568	+// source == skybox5Button \|\|
	2569	+// source == skybox6Button \|\|
	2570	+// source == skybox7Button \|\|
	2571	+// source == skybox11Button \|\|
	2572	+// source == skybox12Button \|\|
	2573	+// source == skybox13Button \|\|
	2574	+// source == skybox14Button \|\|
	2575	+// source == skybox15Button \|\|
	2576	+// source == skybox16Button \|\|
	2577	+// source == skybox17Button)
	2578	+// {
	2579	+// ChangeSkybox(source);
	2580	+// } else
	2581	+ if (source == csgItem)
1613	2582	{
1614	2583	group(new CSG());
1615	2584	} else
1616		- if (event.getSource() == templateItem)
	2585	+ if (source == templateItem)
1617	2586	{
1618	2587	group(new cTemplate());
1619	2588	} else
1620		- if (event.getSource() == attributeItem)
	2589	+ if (source == attributeItem)
1621	2590	{
1622	2591	makeSomething(new Attribute());
1623	2592	} else
1624		- if (event.getSource() == pointflowItem)
	2593	+ if (source == pointflowItem)
1625	2594	{
1626	2595	makeSomething(new PointFlow());
1627	2596	} else
..	..	@@ -1633,7 +2602,7 @@
1633	2602	} else
1634	2603	*/
1635	2604
1636		- if (event.getSource() == superLoopItem)
	2605	+ if (source == superLoopItem)
1637	2606	{
1638	2607	Composite g = new cGroup();
1639	2608	for (int i=0; i<15; i++)
..	..	@@ -1655,30 +2624,30 @@
1655	2624
1656	2625	group(g);
1657	2626	} else
1658		- if (event.getSource() == loopItem)
	2627	+ if (source == loopItem \|\| source == loopButton)
1659	2628	{
1660	2629	Composite csg = new GroupLeaf();
1661	2630	csg.count = 5;
1662	2631	group(csg);
1663		- Composite child = new cGroup();
	2632	+ Composite child = new cGroup("Branch");
1664	2633	csg.addChild(child);
1665	2634	child.addChild(csg);
1666	2635	} else
1667		- if (event.getSource() == doubleItem)
	2636	+ if (source == doubleItem)
1668	2637	{
1669		- Composite csg = new GroupLeaf();
	2638	+ Composite csg = new GroupLeaf("Fork");
1670	2639	csg.count = 5;
1671	2640	group(csg);
1672		- Composite child = new cGroup();
	2641	+ Composite child = new cGroup("Branch A");
1673	2642	csg.addChild(child);
1674	2643	child.addChild(csg);
1675		- child = new cGroup();
	2644	+ child = new cGroup("Branch B");
1676	2645	csg.addChild(child);
1677	2646	child.addChild(csg);
1678	2647	} else
1679		- if (event.getSource() == tripleItem)
	2648	+ if (source == tripleItem)
1680	2649	{
1681		- Composite csg = new GroupLeaf();
	2650	+ Composite csg = new GroupLeaf("Trident");
1682	2651	csg.count = 4;
1683	2652	group(csg);
1684	2653	Composite child = new cGroup();
..	..	@@ -1691,73 +2660,105 @@
1691	2660	csg.addChild(child);
1692	2661	child.addChild(csg);
1693	2662	} else
1694		-
1695		- if (event.getSource() == importGFDItem)
	2663	+ if (source == computeAOItem)
1696	2664	{
1697		- ImportGFD();
	2665	+ Globals.drawMode = CameraPane.OCCLUSION;
	2666	+ cameraView.repaint();
1698	2667	} else
1699		- if (event.getSource() == importVRMLX3DItem)
1700		- {
1701		- ImportVRMLX3D();
1702		- } else
1703		- if (event.getSource() == import3DSItem)
1704		- {
1705		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1706		- } else
1707		- if (event.getSource() == importOBJItem)
1708		- {
1709		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1710		- } else
1711		- if (event.getSource() == computeAOItem)
1712		- {
1713		- CameraPane.drawMode = CameraPane.OCCLUSION;
1714		- CameraPane.theRenderer.repaint();
1715		- } else
1716		- if (event.getSource() == recompileItem)
	2668	+ if (source == recompileItem)
1717	2669	{
1718	2670	Recompile();
1719	2671	refreshContents();
1720	2672	} else
1721		- if (event.getSource() == editScriptItem)
	2673	+ if (source == editScriptItem)
1722	2674	{
1723	2675	OpenDialog();
1724	2676	refreshContents();
1725	2677	} else
1726		- if (event.getSource() == invariantsItem)
	2678	+ if (source == invariantsItem)
1727	2679	{
1728	2680	System.out.println("Invariants:");
1729		- GraphreeD.theApplet3D.universe.invariants();
	2681	+ Grafreed.grafreed.universe.invariants();
1730	2682	} else
1731		- if (event.getSource() == memoryItem)
	2683	+ if (source == memoryItem)
1732	2684	{
1733	2685	//System.out.println("Invariants:");
1734	2686	PrintMemory();
1735	2687	} else
1736		- if (event.getSource() == pathItem)
	2688	+ if (source == pathItem)
1737	2689	{
1738	2690	PrintPath();
1739	2691	} else
1740		- if (event.getSource() == analyzeItem)
	2692	+ if (source == analyzeItem)
1741	2693	{
1742	2694	AnalyzeObject();
1743	2695	} else
1744		- if (event.getSource() == dumpItem)
	2696	+ if (source == dumpItem)
1745	2697	{
1746	2698	DumpObject();
1747	2699	} else
1748		- if (event.getSource() == screenfitButton)
	2700	+ if (source == minButton)
1749	2701	{
1750		- //Reload(lastConverter, lastFilename, true);
	2702	+ Minimize();
	2703	+ } else
	2704	+ if (source == maxButton)
	2705	+ {
	2706	+ Maximize();
	2707	+ } else
	2708	+ if (source == fullButton)
	2709	+ {
	2710	+ ToggleFullScreen();
	2711	+ } else
	2712	+ if (source == previousVersionButton)
	2713	+ {
	2714	+ // Go to previous version
	2715	+ //if (!Undo())
	2716	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2717	+ PreviousVersion();
	2718	+ } else
	2719	+ if (source == restoreButton)
	2720	+ {
	2721	+ // Restore current version
	2722	+ Restore();
	2723	+ //restoreButton.setEnabled(false);
	2724	+ } else
	2725	+ if (source == replaceButton)
	2726	+ {
	2727	+ // Overwrite current version
	2728	+ Replace();
	2729	+ //replaceButton.setEnabled(false);
	2730	+ } else
	2731	+ if (source == nextVersionButton)
	2732	+ {
	2733	+ // Go to next version
	2734	+ NextVersion();
	2735	+ } else
	2736	+ if (source == saveVersionButton)
	2737	+ {
	2738	+ // Save a new version
	2739	+ if (!Save(true))
	2740	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2741	+ } else
	2742	+ if (source == deleteVersionButton)
	2743	+ {
	2744	+ // Delete a new version
	2745	+ DeleteVersion();
	2746	+ } else
	2747	+ if (source == oneStepButton)
	2748	+ {
	2749	+ Globals.ONESTEP = true;
	2750	+ cameraView.repaint();
	2751	+ } else
	2752	+ if (source == screenfitButton)
	2753	+ {
1751	2754	ScreenFit();
1752	2755	} else
1753		- if (event.getSource() == screenfitpointButton)
	2756	+ if (source == screenfitpointButton)
1754	2757	{
1755		- //Reload(lastConverter, lastFilename, true);
1756	2758	ScreenFitPoint();
1757	2759	} else
1758		- if (event.getSource() == snapobjectButton)
	2760	+ if (source == snapobjectButton)
1759	2761	{
1760		- //Reload(lastConverter, lastFilename, true);
1761	2762	SnapObject();
1762	2763	} else
1763	2764	// if (event.getSource() == recompileButton)
..	..	@@ -1766,13 +2767,13 @@
1766	2767	// Recompile();
1767	2768	// refreshContents();
1768	2769	// } else
1769		- if (event.getSource() == gcButton)
	2770	+ if (source == gcButton)
1770	2771	{
1771	2772	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1772	2773	System.gc();
1773	2774	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1774	2775	} else
1775		- if (event.getSource() == editLeafItem)
	2776	+ if (source == editLeafItem)
1776	2777	{
1777	2778	Object3D obj;
1778	2779	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1786,65 +2787,78 @@
1786	2787	}
1787	2788	refreshContents(true);
1788	2789	} else
1789		- if (event.getSource() == openWindowItem)
	2790	+ if (source == openWindowItem)
1790	2791	{
1791	2792	EditSelection(true);
1792	2793	} else
1793		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2794	+ if (source == cutItem \|\| source == clearButton)
1794	2795	{
1795	2796	loadClipboard(true);
1796	2797	} else
1797		- if (event.getSource() == duplicateItem)
	2798	+ if (source == undoItem)
1798	2799	{
1799		- Object3D keep = GraphreeD.clipboard;
	2800	+ PreviousVersion();
	2801	+ } else
	2802	+ if (source == redoItem)
	2803	+ {
	2804	+ NextVersion();
	2805	+ } else
	2806	+ if (source == duplicateItem)
	2807	+ {
	2808	+ Object3D keep = Grafreed.clipboard;
1800	2809	loadClipboard(false);
1801	2810	paste(false);
1802		- GraphreeD.clipboard = keep;
	2811	+ Grafreed.clipboard = keep;
1803	2812	} else
1804		- if (event.getSource() == cloneItem)
	2813	+ if (source == cloneItem)
1805	2814	{
1806	2815	CloneSelection(false);
1807	2816	} else
1808		- if (event.getSource() == cloneSupportItem)
	2817	+ if (source == cloneSupportItem)
1809	2818	{
1810	2819	CloneSelection(true);
1811	2820	} else
1812		- if (event.getSource() == copyItem)
	2821	+ if (source == copyItem)
1813	2822	{
1814	2823	loadClipboard(false);
1815	2824	} else
1816		- if (event.getSource() == pasteItem)
	2825	+ if (source == pasteItem)
1817	2826	{
1818	2827	paste(false);
1819	2828	} else
1820		- if (event.getSource() == pasteLinkItem)
	2829	+ if (source == pasteIntoItem)
1821	2830	{
1822		- pasteInto(false);
	2831	+ pasteInto(true, false);
1823	2832	} else
1824		- if (event.getSource() == pasteCloneItem)
	2833	+ if (source == pasteLinkItem)
1825	2834	{
1826		- pasteInto(true);
	2835	+ pasteInto(false, false);
1827	2836	} else
1828		- if (event.getSource() == pasteExpandItem)
	2837	+ if (source == pasteCloneItem)
	2838	+ {
	2839	+ pasteInto(true, true);
	2840	+ } else
	2841	+ if (source == pasteExpandItem)
1829	2842	{
1830	2843	paste(true);
1831	2844	} else
1832		- if (event.getSource() == synchronizeItem)
	2845	+ if (source == synchronizeItem)
1833	2846	{
1834	2847	Overwrite(Object3D.TRANSFORM);
1835	2848	} else
1836		- if (event.getSource() == overwriteNameItem)
	2849	+ if (source == overwriteNameItem)
1837	2850	{
1838	2851	Overwrite(Object3D.NAME);
1839	2852	} else
1840		- if (event.getSource() == overwriteUVItem)
	2853	+ if (source == overwriteUVItem)
1841	2854	{
1842	2855	Overwrite(Object3D.UV);
1843	2856	} else
1844		- if (event.getSource() == overwriteMatItem)
	2857	+ if (source == overwriteMatItem)
1845	2858	{
	2859	+ /* july 2015
1846	2860	if ((dropAttributes & Object3D.TEXTURE) == 0)
1847		- Overwrite(Object3D.MATERIAL);
	2861	+ Overwrite(Object3D.MATERIAL \| Object3D.COLOR);
1848	2862	else
1849	2863	{
1850	2864	if ((dropAttributes & Object3D.COLOR) == 0 && (dropAttributes & Object3D.MATERIAL) == 0)
..	..	@@ -1856,13 +2870,16 @@
1856	2870	Overwrite(Object3D.MATERIAL \| Object3D.TEXTURE);
1857	2871	}
1858	2872	}
	2873	+ */
	2874	+
	2875	+ Overwrite(dropAttributes);
1859	2876	}
1860		- if (event.getSource() == overwriteGeoItem)
	2877	+ if (source == overwriteGeoItem)
1861	2878	{
1862	2879	Overwrite(Object3D.GEOMETRY);
1863		-// if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2880	+// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
1864	2881	// {
1865		-// Object3D content = GraphreeD.clipboard.get(0);
	2882	+// Object3D content = GrafreeD.clipboard.get(0);
1866	2883	//
1867	2884	// if (content instanceof cGroup && ((cGroup)content).transientlink )
1868	2885	// content = ((cGroup)content).get(0);
..	..	@@ -1874,7 +2891,7 @@
1874	2891	// refreshContents();
1875	2892	// }
1876	2893	} else
1877		- if (event.getSource() == generateMeshItem)
	2894	+ if (source == generateMeshItem)
1878	2895	{
1879	2896	//if (group.selection.size() == 1)
1880	2897	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1885,7 +2902,7 @@
1885	2902	ResetModel();
1886	2903	refreshContents();
1887	2904	} else
1888		- if (event.getSource() == extractGeometriesItem)
	2905	+ if (source == extractGeometriesItem)
1889	2906	{
1890	2907	boolean one = false;
1891	2908
..	..	@@ -1912,7 +2929,7 @@
1912	2929	ResetModel();
1913	2930	refreshContents();
1914	2931	} else
1915		- if (event.getSource() == cloneGeometriesItem)
	2932	+ if (source == cloneGeometriesItem)
1916	2933	{
1917	2934	boolean one = false;
1918	2935
..	..	@@ -1938,32 +2955,37 @@
1938	2955	ResetModel();
1939	2956	refreshContents();
1940	2957	} else
1941		- if (event.getSource() == shareGeometriesItem)
	2958	+ if (source == shareGeometriesItem)
1942	2959	{
1943	2960	boolean one = false;
1944	2961
1945	2962	if (group.selection.size() == 1)
1946	2963	one = true;
1947	2964
	2965	+ Object3D merge = null;
	2966	+
1948	2967	Object3D content = new cGroup();
1949	2968
1950	2969	for (int i=0; i<group.selection.size(); i++)
1951	2970	{
1952		- Object3D sel = new Merge(group.selection.get(i));
	2971	+ merge = new Merge(group.selection.get(i));
1953	2972
1954	2973	if (one)
1955		- makeSomething(sel, false);
	2974	+ makeSomething(merge, false);
1956	2975	else
1957		- content.addChild(sel);
	2976	+ content.addChild(merge);
1958	2977	}
1959	2978
1960	2979	if (!one)
1961		- makeSomething(content, false);
1962		-
1963		- ResetModel();
1964		- refreshContents();
	2980	+ makeSomething(content, true);
	2981	+ else
	2982	+ {
	2983	+ ResetModel();
	2984	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	2985	+ refreshContents();
	2986	+ }
1965	2987	} else
1966		- if (event.getSource() == mergeGeometriesItem)
	2988	+ if (source == mergeGeometriesItem)
1967	2989	{
1968	2990	boolean one = false;
1969	2991
..	..	@@ -1993,11 +3015,11 @@
1993	3015	ResetModel();
1994	3016	refreshContents();
1995	3017	} else
1996		- if (event.getSource() == linkverticesItem)
	3018	+ if (source == linkverticesItem)
1997	3019	{
1998		-// if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	3020	+// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
1999	3021	// {
2000		-// Object3D content = GraphreeD.clipboard.get(0);
	3022	+// Object3D content = GrafreeD.clipboard.get(0);
2001	3023	//
2002	3024	// if (content instanceof cGroup && ((cGroup)content).transientlink )
2003	3025	// content = ((cGroup)content).get(0);
..	..	@@ -2006,39 +3028,48 @@
2006	3028	// group.selection.get(0).setMasterThis(content); // should be identity
2007	3029	// refreshContents();
2008	3030	// }
2009		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	3031	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2010	3032	{
2011		- Object3D content = GraphreeD.clipboard.get(0);
	3033	+ Object3D content = Grafreed.clipboard.get(0);
2012	3034
2013	3035	if (content instanceof cGroup && ((cGroup)content).transientlink )
2014	3036	content = ((cGroup)content).get(0);
2015	3037
2016		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	3038	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2017	3039	for (int i=0; i<group.selection.size(); i++)
2018	3040	{
2019		- boolean random = CameraPane.RANDOM;
2020		- CameraPane.RANDOM = false; // parse all random nodes
	3041	+ boolean random = CameraPane.SWITCH;
	3042	+ CameraPane.SWITCH = false; // parse all random nodes
2021	3043	group.selection.get(i).linkVerticesThis(content);
2022	3044	// group.selection.get(i).setMasterThis(content); // should be identity
2023		- CameraPane.RANDOM = random;
	3045	+ CameraPane.SWITCH = random;
2024	3046	}
2025		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	3047	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2026	3048	refreshContents();
2027	3049	}
2028	3050	} else
2029		- if (event.getSource() == resetsupportItem)
	3051	+ if (source == resetsupportItem)
2030	3052	{
2031	3053	for (int i=0; i<group.selection.size(); i++)
2032	3054	{
2033		- boolean random = CameraPane.RANDOM;
2034		- CameraPane.RANDOM = false; // parse all random nodes
	3055	+ boolean random = CameraPane.SWITCH;
	3056	+ CameraPane.SWITCH = false; // parse all random nodes
2035	3057	group.selection.get(i).linkVerticesThis(null);
2036		- CameraPane.RANDOM = random;
	3058	+ CameraPane.SWITCH = random;
2037	3059	}
2038	3060
2039	3061	refreshContents();
2040	3062	} else
2041		- if (event.getSource() == resetreferencesItem)
	3063	+ if (source == relinkverticesItem)
	3064	+ {
	3065	+ boolean random = CameraPane.SWITCH;
	3066	+ CameraPane.SWITCH = false; // parse all random nodes
	3067	+ group.selection.RelinkToSupport();
	3068	+ CameraPane.SWITCH = random;
	3069	+
	3070	+ refreshContents();
	3071	+ } else
	3072	+ if (source == resetreferencesItem)
2042	3073	{
2043	3074	for (int i=0; i<group.selection.size(); i++)
2044	3075	{
..	..	@@ -2047,11 +3078,11 @@
2047	3078
2048	3079	refreshContents();
2049	3080	} else
2050		- if (event.getSource() == setMasterItem)
	3081	+ if (source == setMasterItem)
2051	3082	{
2052		- if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	3083	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2053	3084	{
2054		- Object3D content = GraphreeD.clipboard.get(0);
	3085	+ Object3D content = Grafreed.clipboard.get(0);
2055	3086
2056	3087	if (content instanceof cGroup && ((cGroup)content).transientlink )
2057	3088	content = ((cGroup)content).get(0);
..	..	@@ -2060,13 +3091,13 @@
2060	3091	refreshContents();
2061	3092	}
2062	3093	} else
2063		- if (event.getSource() == poseMeshItem)
	3094	+ if (source == poseMeshItem)
2064	3095	{
2065	3096	if (group.selection.size() == 1)
2066	3097	{
2067		- if (GraphreeD.clipboard.size() == 1)
	3098	+ if (Grafreed.clipboard.size() == 1)
2068	3099	{
2069		- Object3D content = GraphreeD.clipboard.get(0);
	3100	+ Object3D content = Grafreed.clipboard.get(0);
2070	3101
2071	3102	if (content instanceof cGroup && ((cGroup)content).transientlink )
2072	3103	content = ((cGroup)content).get(0);
..	..	@@ -2079,19 +3110,19 @@
2079	3110	}
2080	3111
2081	3112	} else
2082		- if (event.getSource() == revertMeshItem)
	3113	+ if (source == revertMeshItem)
2083	3114	{
2084	3115	RevertMeshes();
2085	3116	} else
2086		- if (event.getSource() == resetMeshItem)
	3117	+ if (source == resetAllItem)
2087	3118	{
2088	3119	ResetAll();
2089	3120	} else
2090		- if (event.getSource() == stepAllItem)
	3121	+ if (source == stepAllItem)
2091	3122	{
2092	3123	StepAll();
2093	3124	} else
2094		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	3125	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2095	3126	{
2096	3127	//int indices[] = jList.getSelectedIndices();
2097	3128	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2099,42 +3130,46 @@
2099	3130
2100	3131	ClearSelection(false);
2101	3132	} else
2102		- if (event.getSource() == clearAllItem)
	3133	+ if (source == clearAllItem)
2103	3134	{
2104	3135	ClearSelection(true);
2105	3136	} else
2106		- if (event.getSource() == grabItem)
	3137	+ if (source == grabItem \|\| source == groupButton)
2107	3138	{
2108		- group(new cGroup(), true);
	3139	+ group(new cGroup(), false); // true);
2109	3140	} else
2110		- if (event.getSource() == frontItem)
	3141	+ if (source == hideItem)
	3142	+ {
	3143	+ group(new HiddenObject());
	3144	+ } else
	3145	+ if (source == frontItem)
2111	3146	{
2112	3147	front();
2113	3148	} else
2114		- if (event.getSource() == backItem)
	3149	+ if (source == backItem)
2115	3150	{
2116	3151	back();
2117	3152	} else
2118		- if (event.getSource() == cameraItem)
	3153	+ if (source == cameraItem)
2119	3154	{
2120	3155	makeSomething(new Camera());
2121	3156	} else
2122		- if (event.getSource() == compositeItem)
	3157	+ if (source == compositeItem \|\| source == compositeButton)
2123	3158	{
2124	3159	group(new Composite());
2125	3160	} else
2126		- if (event.getSource() == randomItem)
	3161	+ if (source == switchItem \|\| source == switchButton)
2127	3162	{
2128	3163	RandomNode random = new RandomNode();
2129	3164	group(random);
2130	3165	if (random.size() > 0)
2131		- random.name = random.get(0).name + "Rnd";
	3166	+ random.name = random.get(0).name + "Switch";
2132	3167	} else
2133		- if (event.getSource() == physicsItem)
	3168	+ if (source == physicsItem)
2134	3169	{
2135	3170	group(new PhysicsNode());
2136	3171	} else
2137		- if (event.getSource() == frameselectorItem)
	3172	+ if (source == frameselectorItem)
2138	3173	{
2139	3174	for (int i=0; i<group.selection.size(); i++)
2140	3175	{
..	..	@@ -2146,7 +3181,7 @@
2146	3181	ResetModel();
2147	3182	refreshContents();
2148	3183	} else
2149		- if (event.getSource() == switchGeoItem)
	3184	+ if (source == switchGeoItem)
2150	3185	{
2151	3186	for (int i=0; i<group.selection.size(); i++)
2152	3187	{
..	..	@@ -2158,7 +3193,7 @@
2158	3193	ResetModel();
2159	3194	refreshContents();
2160	3195	} else
2161		- if (event.getSource() == switchTransfoItem)
	3196	+ if (source == switchTransfoItem)
2162	3197	{
2163	3198	for (int i=0; i<group.selection.size(); i++)
2164	3199	{
..	..	@@ -2170,7 +3205,7 @@
2170	3205	ResetModel();
2171	3206	refreshContents();
2172	3207	} else
2173		- if (event.getSource() == morphItem)
	3208	+ if (source == morphItem)
2174	3209	{
2175	3210	for (int i=0; i<group.selection.size(); i++)
2176	3211	{
..	..	@@ -2182,7 +3217,7 @@
2182	3217	ResetModel();
2183	3218	refreshContents();
2184	3219	} else
2185		- if (event.getSource() == scriptNodeItem)
	3220	+ if (source == scriptNodeItem)
2186	3221	{
2187	3222	boolean atleastone = false;
2188	3223
..	..	@@ -2221,191 +3256,252 @@
2221	3256	}
2222	3257	}
2223	3258	} else
2224		- if (event.getSource() == linkerItem)
	3259	+ if (source == linkerItem)
2225	3260	{
2226	3261	group(new cLinker());
2227	3262	} else
2228		- if (event.getSource() == textureItem)
	3263	+ if (source == textureItem \|\| source == textureButton)
2229	3264	{
2230	3265	group(new TextureNode());
2231	3266	} else
2232		- if (event.getSource() == shadowXItem)
	3267	+ if (source == billboardItem)
	3268	+ {
	3269	+ group(new BillboardNode());
	3270	+ } else
	3271	+ if (source == shadowXItem)
2233	3272	{
2234	3273	CastShadow(0);
2235	3274	} else
2236		- if (event.getSource() == shadowYItem)
	3275	+ if (source == shadowYItem)
2237	3276	{
2238	3277	CastShadow(1);
2239	3278	} else
2240		- if (event.getSource() == shadowZItem)
	3279	+ if (source == shadowZItem)
2241	3280	{
2242	3281	CastShadow(2);
2243	3282	} else
2244		- if (event.getSource() == ungroupItem)
	3283	+ if (source == ungroupItem \|\| source == ungroupButton)
2245	3284	{
2246		- ungroup();
	3285	+ boolean hasRoot = false;
	3286	+
	3287	+ for (int i=0; i<group.selection.size(); i++)
	3288	+ {
	3289	+ if (group.selection.get(i) == group)
	3290	+ {
	3291	+ hasRoot = true;
	3292	+ break;
	3293	+ }
	3294	+ }
	3295	+
	3296	+ if (!hasRoot)
	3297	+ {
	3298	+ for (int i=0; i<group.selection.size(); i++)
	3299	+ {
	3300	+ Ungroup(group.selection.get(i));
	3301	+ }
	3302	+
	3303	+ ClearSelection(false);
	3304	+
	3305	+ refreshContents();
	3306	+ }
2247	3307	} else
2248		- if (event.getSource() == genUVItem)
	3308	+ if (source == genUVItem)
2249	3309	{
2250	3310	GenUV();
2251	3311	} else
2252		- if (event.getSource() == genNormalsCADItem)
	3312	+ if (source == genNormalsCADItem)
2253	3313	{
2254	3314	GenNormals(true);
2255	3315	} else
2256		- if (event.getSource() == genNormalsORGANItem)
	3316	+ if (source == genNormalsMESHItem)
	3317	+ {
	3318	+ GenNormalsMESH();
	3319	+ } else
	3320	+ if (source == genNormalsORGANItem)
2257	3321	{
2258	3322	GenNormals(false);
2259	3323	} else
2260		- if (event.getSource() == stripifyItem)
	3324	+ if (source == genNormalsMINEItem)
	3325	+ {
	3326	+ GenNormalsMINE();
	3327	+ } else
	3328	+ if (source == stripifyItem)
2261	3329	{
2262	3330	Stripify();
2263	3331	} else
2264		- if (event.getSource() == unstripifyItem)
	3332	+ if (source == unstripifyItem)
2265	3333	{
2266	3334	Unstripify();
2267	3335	} else
2268		- if (event.getSource() == trimItem)
	3336	+ if (source == trimItem)
2269	3337	{
2270	3338	Trim();
2271	3339	} else
2272		- if (event.getSource() == untrimItem)
	3340	+ if (source == untrimItem)
2273	3341	{
2274	3342	Untrim();
2275	3343	} else
2276		- if (event.getSource() == clearColorsItem)
	3344	+ if (source == clearColorsItem)
2277	3345	{
2278	3346	ClearColors();
2279	3347	} else
2280		- if (event.getSource() == clearMaterialsItem)
	3348	+ if (source == clearMaterialsItem)
2281	3349	{
2282	3350	ClearMaterials();
2283	3351	} else
2284		- if (event.getSource() == liveleavesItem)
	3352	+ if (source == liveleavesItem)
2285	3353	{
2286	3354	LiveLeaves(true);
2287	3355	} else
2288		- if (event.getSource() == unliveleavesItem)
	3356	+ if (source == unliveleavesItem)
2289	3357	{
2290	3358	LiveLeaves(false);
2291	3359	} else
2292		- if (event.getSource() == supportleavesItem)
	3360	+ if (source == supportleavesItem)
2293	3361	{
2294	3362	SupportLeaves(true);
2295	3363	} else
2296		- if (event.getSource() == unsupportleavesItem)
	3364	+ if (source == unsupportleavesItem)
2297	3365	{
2298	3366	SupportLeaves(false);
2299	3367	} else
2300		- if (event.getSource() == hideleavesItem)
	3368	+ if (source == hideleavesItem)
2301	3369	{
2302	3370	HideLeaves(true);
2303	3371	} else
2304		- if (event.getSource() == showleavesItem)
	3372	+ if (source == showleavesItem)
2305	3373	{
2306	3374	HideLeaves(false);
2307	3375	} else
2308		- if (event.getSource() == markleavesItem)
	3376	+ if (source == markleavesItem)
2309	3377	{
2310	3378	MarkLeaves(true);
2311	3379	} else
2312		- if (event.getSource() == unmarkleavesItem)
	3380	+ if (source == unmarkleavesItem)
2313	3381	{
2314	3382	MarkLeaves(false);
2315	3383	} else
2316		- if (event.getSource() == flipVItem)
	3384	+ if (source == rewindleavesItem)
	3385	+ {
	3386	+ RewindLeaves(true);
	3387	+ } else
	3388	+ if (source == unrewindleavesItem)
	3389	+ {
	3390	+ RewindLeaves(false);
	3391	+ } else
	3392	+ if (source == randomleavesItem)
	3393	+ {
	3394	+ RandomLeaves(true);
	3395	+ } else
	3396	+ if (source == unrandomleavesItem)
	3397	+ {
	3398	+ RandomLeaves(false);
	3399	+ } else
	3400	+ if (source == flipVItem)
2317	3401	{
2318	3402	FlipV(true);
2319	3403	} else
2320		- if (event.getSource() == unflipVItem)
	3404	+ if (source == unflipVItem)
2321	3405	{
2322	3406	FlipV(false);
2323	3407	} else
2324		- if (event.getSource() == lowTexturesItem)
	3408	+ if (source == lowTexturesItem)
2325	3409	{
2326	3410	SetTexRes(0);
2327	3411	} else
2328		- if (event.getSource() == normalTexturesItem)
	3412	+ if (source == normalTexturesItem)
2329	3413	{
2330	3414	SetTexRes(1);
2331	3415	} else
2332		- if (event.getSource() == highTexturesItem)
	3416	+ if (source == highTexturesItem)
2333	3417	{
2334	3418	SetTexRes(2);
2335	3419	} else
2336		- if (event.getSource() == veryhighTexturesItem)
	3420	+ if (source == veryhighTexturesItem)
2337	3421	{
2338	3422	SetTexRes(3);
2339	3423	} else
2340		- if (event.getSource() == maxTexturesItem)
	3424	+ if (source == maxTexturesItem)
2341	3425	{
2342	3426	SetTexRes(4);
2343	3427	} else
2344		- if (event.getSource() == panoTexturesItem)
	3428	+ if (source == panoTexturesItem)
2345	3429	{
2346	3430	SetTexRes(5);
2347	3431	} else
2348		- if (event.getSource() == reverseNormalsItem)
	3432	+ if (source == reverseNormalsItem)
2349	3433	{
2350	3434	ReverseNormals();
2351	3435	} else
2352		- if (event.getSource() == parseverticesItem)
	3436	+ if (source == parseverticesItem)
2353	3437	{
2354	3438	ParseVertices();
2355	3439	} else
2356		- if (event.getSource() == alignItem)
	3440	+ if (source == textureFieldItem)
	3441	+ {
	3442	+ TextureVertices();
	3443	+ } else
	3444	+ if (source == alignItem)
2357	3445	{
2358	3446	Align();
2359	3447	} else
2360		- if (event.getSource() == mirrorItem)
	3448	+ if (source == mirrorItem)
2361	3449	{
2362	3450	MirrorPoses();
2363	3451	} else
2364		- if (event.getSource() == reduceMorphItem)
	3452	+ if (source == reduceMorphItem)
2365	3453	{
2366	3454	MeshReduction(false);
2367	3455	} else
2368		- if (event.getSource() == reduce34MorphItem)
	3456	+ if (source == reduce34MorphItem)
2369	3457	{
2370	3458	MeshReduction(true);
2371	3459	} else
2372		- if (event.getSource() == reverseTrianglesItem)
	3460	+ if (source == reverseTrianglesItem)
2373	3461	{
2374	3462	ReverseTriangles();
2375	3463	} else
2376		- if (event.getSource() == reduceMeshItem)
	3464	+ if (source == reduceMeshItem)
2377	3465	{
2378	3466	ReduceMesh(false);
2379	3467	} else
2380		- if (event.getSource() == reduce34MeshItem)
	3468	+ if (source == reduce34MeshItem)
2381	3469	{
2382	3470	ReduceMesh(true);
2383	3471	} else
2384		- if (event.getSource() == increaseMeshItem)
	3472	+ if (source == increaseMeshItem)
2385	3473	{
2386	3474	IncreaseMesh();
2387	3475	} else
2388		- if (event.getSource() == clipMeshItem)
	3476	+ if (source == clipMeshItem)
2389	3477	{
2390	3478	ClipMesh();
2391	3479	} else
2392		- if (event.getSource() == smoothMeshItem)
	3480	+ if (source == smoothMeshItem)
2393	3481	{
2394	3482	SmoothMesh();
2395	3483	} else
2396		- if (event.getSource() == transformgeometryItem)
	3484	+ if (source == transformGeometryItem)
2397	3485	{
2398	3486	TransformGeometry();
2399	3487	} else
2400		- if (event.getSource() == resetTransformItem)
	3488	+ if (source == transformChildrenItem)
	3489	+ {
	3490	+ TransformChildren();
	3491	+ } else
	3492	+ if (source == resetTransformItem)
2401	3493	{
2402	3494	ResetTransform();
2403	3495	} else
2404		- if (event.getSource() == resetCentroidItem)
	3496	+ if (source == resetCentroidItem)
2405	3497	{
2406		- ResetCentroid();
	3498	+ ResetCentroid(true);
2407	3499	} else
2408		- if (event.getSource() == resetParentItem)
	3500	+ if (source == resetCentroidXZItem)
	3501	+ {
	3502	+ ResetCentroid(false);
	3503	+ } else
	3504	+ if (source == resetParentItem)
2409	3505	{
2410	3506	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2411	3507	{
..	..	@@ -2415,7 +3511,7 @@
2415	3511
2416	3512	refreshContents();
2417	3513	} else
2418		- if (event.getSource() == repairParentItem)
	3514	+ if (source == repairParentItem)
2419	3515	{
2420	3516	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2421	3517	{
..	..	@@ -2429,7 +3525,21 @@
2429	3525
2430	3526	refreshContents();
2431	3527	} else
2432		- if (event.getSource() == sortbysizeItem)
	3528	+ if (source == repairShadowItem)
	3529	+ {
	3530	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3531	+ {
	3532	+ Object3D obj = (Object3D)e.nextElement();
	3533	+ obj.RepairShadow();
	3534	+// for (int i=0; i<obj.size(); i++)
	3535	+// {
	3536	+// obj.get(i).parent = obj;
	3537	+// }
	3538	+ }
	3539	+
	3540	+ refreshContents();
	3541	+ } else
	3542	+ if (source == sortbysizeItem)
2433	3543	{
2434	3544	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2435	3545	{
..	..	@@ -2441,7 +3551,7 @@
2441	3551	ResetModel();
2442	3552	refreshContents();
2443	3553	} else
2444		- if (event.getSource() == sortbynameItem)
	3554	+ if (source == sortbynameItem)
2445	3555	{
2446	3556	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2447	3557	{
..	..	@@ -2453,7 +3563,7 @@
2453	3563	ResetModel();
2454	3564	refreshContents();
2455	3565	} else
2456		- if (event.getSource() == attachPigmentItem)
	3566	+ if (source == attachPigmentItem)
2457	3567	{
2458	3568	String texture = GetFile("Attach pigment");
2459	3569	Object3D obj;
..	..	@@ -2465,7 +3575,7 @@
2465	3575
2466	3576	refreshContents();
2467	3577	} else
2468		- if (event.getSource() == detachPigmentItem)
	3578	+ if (source == detachPigmentItem)
2469	3579	{
2470	3580	Object3D obj;
2471	3581	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2476,7 +3586,7 @@
2476	3586
2477	3587	refreshContents();
2478	3588	} else
2479		- if (event.getSource() == attachBumpItem)
	3589	+ if (source == attachBumpItem)
2480	3590	{
2481	3591	String texture = GetFile("Attach bump");
2482	3592	Object3D obj;
..	..	@@ -2488,18 +3598,18 @@
2488	3598
2489	3599	refreshContents();
2490	3600	} else
2491		- if (event.getSource() == detachBumpItem)
	3601	+ if (source == detachBumpItem)
2492	3602	{
2493	3603	Object3D obj;
2494	3604	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2495	3605	{
2496	3606	obj = (Object3D)e.nextElement();
2497		- obj.SetBumpTexture(null);
	3607	+ obj.ResetBumpTexture();
2498	3608	}
2499	3609
2500	3610	refreshContents();
2501	3611	} else
2502		- if (event.getSource() == pigmentBumpItem)
	3612	+ if (source == pigmentBumpItem)
2503	3613	{
2504	3614	Object3D obj;
2505	3615	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2510,158 +3620,262 @@
2510	3620
2511	3621	refreshContents();
2512	3622	} else
2513		- if (event.getSource() == flashSelectionButton)
	3623	+ if (source == embedTexturesItem)
	3624	+ {
	3625	+ Object3D obj;
	3626	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3627	+ {
	3628	+ obj = (Object3D)e.nextElement();
	3629	+ obj.EmbedTextures(true);
	3630	+ }
	3631	+
	3632	+ refreshContents();
	3633	+ } else
	3634	+ if (source == deEmbedTexturesItem)
	3635	+ {
	3636	+ Object3D obj;
	3637	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3638	+ {
	3639	+ obj = (Object3D)e.nextElement();
	3640	+ obj.EmbedTextures(false);
	3641	+ }
	3642	+
	3643	+ CameraPane.texturepigment.clear();
	3644	+ CameraPane.texturebump.clear();
	3645	+
	3646	+ refreshContents();
	3647	+ } else
	3648	+ if (source == flashSelectionButton)
2514	3649	{
2515	3650	CameraPane.flash = true;
2516	3651	refreshContents();
2517	3652	} else
2518		- if (event.getSource() == oneButton)
	3653	+ if (source == oneButton)
2519	3654	{
2520	3655	} else
2521		- if (event.getSource() == twoButton)
	3656	+ if (source == twoButton)
2522	3657	{
2523	3658	radio.layout = twoButton;
	3659	+
	3660	+ if (CameraPane.FULLSCREEN)
	3661	+ fullscreenLayout = radio.layout;
	3662	+
2524	3663	// bug
2525	3664	//gridPanel.setDividerLocation(1.0);
2526	3665	//bigPanel.setDividerLocation(0.0);
2527		- bigThree.remove(jtp);
2528		- bigThree.remove(cameraPanel);
2529		- bigThree.remove(XYZPanel);
2530		- aWindowConstraints.gridx = 0;
2531		- aWindowConstraints.gridy = 0;
2532		- aWindowConstraints.gridwidth = 1;
2533		- // aConstraints.gridheight = 3;
2534		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2535		- aWindowConstraints.weightx = 0;
2536		- aWindowConstraints.weighty = 1;
2537		- //bigThree.add(jtp, aWindowConstraints);
2538		- aWindowConstraints.weightx = 1;
2539		- aWindowConstraints.gridwidth = 3;
2540		- // aConstraints.gridheight = 3;
2541		- aWindowConstraints.gridx = 1;
2542		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2543		- bigThree.add(cameraPanel, aWindowConstraints);
2544		- aWindowConstraints.weightx = 0;
2545		- aWindowConstraints.gridx = 4;
2546		- aWindowConstraints.gridwidth = 1;
2547		- // aConstraints.gridheight = 3;
2548		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2549		- //bigThree.add(XYZPanel, aWindowConstraints);
2550		- bigThree.revalidate();
	3666	+// bigThree.remove(scenePanel);
	3667	+// bigThree.remove(centralPanel);
	3668	+// bigThree.remove(XYZPanel);
	3669	+// aWindowConstraints.gridx = 0;
	3670	+// aWindowConstraints.gridy = 0;
	3671	+// aWindowConstraints.gridwidth = 1;
	3672	+// // aConstraints.gridheight = 3;
	3673	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3674	+// aWindowConstraints.weightx = 0;
	3675	+// aWindowConstraints.weighty = 1;
	3676	+// //bigThree.add(jtp, aWindowConstraints);
	3677	+// aWindowConstraints.weightx = 1;
	3678	+// aWindowConstraints.gridwidth = 3;
	3679	+// // aConstraints.gridheight = 3;
	3680	+// aWindowConstraints.gridx = 1;
	3681	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3682	+// bigThree.add(centralPanel, aWindowConstraints);
	3683	+// aWindowConstraints.weightx = 0;
	3684	+// aWindowConstraints.gridx = 4;
	3685	+// aWindowConstraints.gridwidth = 1;
	3686	+// // aConstraints.gridheight = 3;
	3687	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3688	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3689	+// scenePanel.setVisible(false);
	3690	+// centralPanel.setVisible(true);
	3691	+// XYZPanel.setVisible(false);
	3692	+ bigThree.ClearUI();
	3693	+ bigThree.add(centralPanel);
	3694	+ bigThree.FlushUI();
	3695	+
	3696	+ cameraView.requestFocusInWindow();
	3697	+
	3698	+// refreshContents(true);
	3699	+//
	3700	+// try
	3701	+// {
	3702	+// java.awt.Robot bot = new java.awt.Robot();
	3703	+// int mask = InputEvent.BUTTON1_MASK;
	3704	+// bot.mouseMove(100, 100);
	3705	+// bot.mousePress(mask);
	3706	+// bot.mouseRelease(mask);
	3707	+// }
	3708	+// catch (Exception e)
	3709	+// {
	3710	+//
	3711	+// }
	3712	+
2551	3713	} else
2552		- if (event.getSource() == threeButton)
	3714	+ if (source == threeButton)
2553	3715	{
2554	3716	radio.layout = threeButton;
2555		- bigThree.remove(jtp);
2556		- bigThree.remove(cameraPanel);
2557		- bigThree.remove(XYZPanel);
2558		- aWindowConstraints.gridx = 0;
2559		- aWindowConstraints.gridy = 0;
2560		- aWindowConstraints.gridwidth = 1;
2561		- // aConstraints.gridheight = 3;
2562		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2563		- aWindowConstraints.weightx = 0;
2564		- aWindowConstraints.weighty = 1;
2565		- //bigThree.add(jtp, aWindowConstraints);
2566		- aWindowConstraints.weightx = 1;
2567		- aWindowConstraints.gridwidth = 3;
2568		- // aConstraints.gridheight = 3;
2569		- aWindowConstraints.gridx = 1;
2570		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2571		- bigThree.add(cameraPanel, aWindowConstraints);
2572		- aWindowConstraints.weightx = 0;
2573		- aWindowConstraints.gridx = 4;
2574		- aWindowConstraints.gridwidth = 1;
2575		- // aConstraints.gridheight = 3;
2576		- aConstraints.fill = GridBagConstraints.VERTICAL;
2577		- bigThree.add(XYZPanel, aWindowConstraints);
2578		- bigThree.revalidate();
	3717	+
	3718	+ if (CameraPane.FULLSCREEN)
	3719	+ fullscreenLayout = radio.layout;
	3720	+
	3721	+// bigThree.remove(scenePanel);
	3722	+// bigThree.remove(centralPanel);
	3723	+// bigThree.remove(XYZPanel);
	3724	+// aWindowConstraints.gridx = 0;
	3725	+// aWindowConstraints.gridy = 0;
	3726	+// aWindowConstraints.gridwidth = 1;
	3727	+// // aConstraints.gridheight = 3;
	3728	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3729	+// aWindowConstraints.weightx = 0;
	3730	+// aWindowConstraints.weighty = 1;
	3731	+// //bigThree.add(jtp, aWindowConstraints);
	3732	+// aWindowConstraints.weightx = 1;
	3733	+// aWindowConstraints.gridwidth = 3;
	3734	+// // aConstraints.gridheight = 3;
	3735	+// aWindowConstraints.gridx = 1;
	3736	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3737	+// bigThree.add(centralPanel, aWindowConstraints);
	3738	+// aWindowConstraints.weightx = 0;
	3739	+// aWindowConstraints.gridx = 4;
	3740	+// aWindowConstraints.gridwidth = 1;
	3741	+// // aConstraints.gridheight = 3;
	3742	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	3743	+// bigThree.add(XYZPanel, aWindowConstraints);
	3744	+// bigThree.validate();
	3745	+// scenePanel.setVisible(false);
	3746	+// centralPanel.setVisible(true);
	3747	+// XYZPanel.setVisible(true);
	3748	+ bigThree.ClearUI();
	3749	+ bigThree.add(scenePanel);
	3750	+ bigThree.add(centralPanel);
	3751	+ bigThree.FlushUI();
	3752	+
	3753	+ cameraView.requestFocusInWindow();
2579	3754	} else
2580		- if (event.getSource() == fourButton)
	3755	+ if (source == fourButton)
2581	3756	{
2582	3757	radio.layout = fourButton;
2583		- bigThree.remove(jtp);
2584		- bigThree.remove(cameraPanel);
2585		- bigThree.remove(XYZPanel);
2586		- aWindowConstraints.gridx = 0;
2587		- aWindowConstraints.gridy = 0;
2588		- aWindowConstraints.gridwidth = 1;
2589		- // aWindowConstraints.gridheight = 3;
2590		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2591		- aWindowConstraints.weightx = 1;
2592		- aWindowConstraints.weighty = 1;
2593		- bigThree.add(jtp, aWindowConstraints);
2594		- aWindowConstraints.weightx = 1;
2595		- aWindowConstraints.gridwidth = 3;
2596		- // aConstraints.gridheight = 3;
2597		- aWindowConstraints.gridx = 1;
2598		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2599		- //bigThree.add(cameraPanel, aWindowConstraints);
2600		- aWindowConstraints.weightx = 0;
2601		- aWindowConstraints.gridx = 4;
2602		- aWindowConstraints.gridwidth = 1;
2603		- // aWindowConstraints.gridheight = 3;
2604		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2605		- //bigThree.add(XYZPanel, aWindowConstraints);
2606		- bigThree.revalidate();
	3758	+
	3759	+ if (CameraPane.FULLSCREEN)
	3760	+ fullscreenLayout = radio.layout;
	3761	+
	3762	+// bigThree.remove(scenePanel);
	3763	+// bigThree.remove(centralPanel);
	3764	+// bigThree.remove(XYZPanel);
	3765	+// aWindowConstraints.gridx = 0;
	3766	+// aWindowConstraints.gridy = 0;
	3767	+// aWindowConstraints.gridwidth = 1;
	3768	+// // aWindowConstraints.gridheight = 3;
	3769	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3770	+// aWindowConstraints.weightx = 1;
	3771	+// aWindowConstraints.weighty = 1;
	3772	+// bigThree.add(scenePanel, aWindowConstraints);
	3773	+// aWindowConstraints.weightx = 1;
	3774	+// aWindowConstraints.gridwidth = 3;
	3775	+// // aConstraints.gridheight = 3;
	3776	+// aWindowConstraints.gridx = 1;
	3777	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3778	+// //bigThree.add(cameraPanel, aWindowConstraints);
	3779	+// aWindowConstraints.weightx = 0;
	3780	+// aWindowConstraints.gridx = 4;
	3781	+// aWindowConstraints.gridwidth = 1;
	3782	+// // aWindowConstraints.gridheight = 3;
	3783	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3784	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3785	+// bigThree.validate();
	3786	+// scenePanel.setVisible(true);
	3787	+// centralPanel.setVisible(false);
	3788	+// XYZPanel.setVisible(false);
	3789	+ bigThree.ClearUI();
	3790	+ bigThree.add(scenePanel);
	3791	+ bigThree.FlushUI();
	3792	+
	3793	+ cameraView.requestFocusInWindow();
2607	3794	} else
2608		- if (event.getSource() == sixButton)
	3795	+ if (source == sixButton)
2609	3796	{
2610	3797	radio.layout = sixButton;
2611		- bigThree.remove(jtp);
2612		- bigThree.remove(cameraPanel);
2613		- bigThree.remove(XYZPanel);
2614		- aWindowConstraints.gridx = 0;
2615		- aWindowConstraints.gridy = 0;
2616		- aWindowConstraints.gridwidth = 1;
2617		- // aConstraints.gridheight = 3;
2618		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2619		- aWindowConstraints.weightx = 0;
2620		- aWindowConstraints.weighty = 1;
2621		- bigThree.add(jtp, aWindowConstraints);
2622		- aWindowConstraints.weightx = 1;
2623		- aWindowConstraints.gridwidth = 3;
2624		- // aWindowConstraints.gridheight = 3;
2625		- aWindowConstraints.gridx = 1;
2626		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2627		- bigThree.add(cameraPanel, aWindowConstraints);
2628		- aWindowConstraints.weightx = 0;
2629		- aWindowConstraints.gridx = 4;
2630		- aWindowConstraints.gridwidth = 1;
2631		- // aWindowConstraints.gridheight = 3;
2632		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2633		- //bigThree.add(XYZPanel, aConstraints);
2634		- bigThree.revalidate();
	3798	+
	3799	+ if (CameraPane.FULLSCREEN)
	3800	+ fullscreenLayout = radio.layout;
	3801	+
	3802	+// bigThree.remove(scenePanel);
	3803	+// bigThree.remove(centralPanel);
	3804	+// bigThree.remove(XYZPanel);
	3805	+// aWindowConstraints.gridx = 0;
	3806	+// aWindowConstraints.gridy = 0;
	3807	+// aWindowConstraints.gridwidth = 1;
	3808	+// // aConstraints.gridheight = 3;
	3809	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3810	+// aWindowConstraints.weightx = 0;
	3811	+// aWindowConstraints.weighty = 1;
	3812	+// bigThree.add(scenePanel, aWindowConstraints);
	3813	+// aWindowConstraints.weightx = 1;
	3814	+// aWindowConstraints.gridwidth = 3;
	3815	+// // aWindowConstraints.gridheight = 3;
	3816	+// aWindowConstraints.gridx = 1;
	3817	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3818	+// bigThree.add(centralPanel, aWindowConstraints);
	3819	+// aWindowConstraints.weightx = 0;
	3820	+// aWindowConstraints.gridx = 4;
	3821	+// aWindowConstraints.gridwidth = 1;
	3822	+// // aWindowConstraints.gridheight = 3;
	3823	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3824	+// //bigThree.add(XYZPanel, aConstraints);
	3825	+// bigThree.validate();
	3826	+// scenePanel.setVisible(true);
	3827	+// centralPanel.setVisible(true);
	3828	+// XYZPanel.setVisible(false);
	3829	+ bigThree.ClearUI();
	3830	+ bigThree.add(centralPanel);
	3831	+ bigThree.add(scenePanel);
	3832	+ bigThree.FlushUI();
	3833	+
	3834	+ cameraView.requestFocusInWindow();
2635	3835	} else
2636		- if (event.getSource() == sevenButton)
	3836	+ if (source == sevenButton)
2637	3837	{
2638	3838	radio.layout = sevenButton;
2639		- bigThree.remove(jtp);
2640		- bigThree.remove(cameraPanel);
2641		- bigThree.remove(XYZPanel);
2642		- aWindowConstraints.gridx = 0;
2643		- aWindowConstraints.gridy = 0;
2644		- aWindowConstraints.gridwidth = 1;
2645		- // aWindowConstraints.gridheight = 3;
2646		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2647		- aWindowConstraints.weightx = 0;
2648		- aWindowConstraints.weighty = 1;
2649		- bigThree.add(jtp, aWindowConstraints);
2650		- aWindowConstraints.weightx = 1;
2651		- aWindowConstraints.gridwidth = 3;
2652		- // aWindowConstraints.gridheight = 3;
2653		- aWindowConstraints.gridx = 1;
2654		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2655		- bigThree.add(cameraPanel, aWindowConstraints);
2656		- aWindowConstraints.weightx = 0;
2657		- aWindowConstraints.gridx = 4;
2658		- aWindowConstraints.gridwidth = 1;
2659		- // aConstraints.gridheight = 3;
2660		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2661		- bigThree.add(XYZPanel, aWindowConstraints);
2662		- bigThree.revalidate();
	3839	+
	3840	+ if (CameraPane.FULLSCREEN)
	3841	+ fullscreenLayout = radio.layout;
	3842	+
	3843	+// bigThree.remove(scenePanel);
	3844	+// bigThree.remove(centralPanel);
	3845	+// bigThree.remove(XYZPanel);
	3846	+// aWindowConstraints.gridx = 0;
	3847	+// aWindowConstraints.gridy = 0;
	3848	+// aWindowConstraints.gridwidth = 1;
	3849	+// // aWindowConstraints.gridheight = 3;
	3850	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3851	+// aWindowConstraints.weightx = 0;
	3852	+// aWindowConstraints.weighty = 1;
	3853	+// bigThree.add(scenePanel, aWindowConstraints);
	3854	+// aWindowConstraints.weightx = 1;
	3855	+// aWindowConstraints.gridwidth = 3;
	3856	+// // aWindowConstraints.gridheight = 3;
	3857	+// aWindowConstraints.gridx = 1;
	3858	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3859	+// bigThree.add(centralPanel, aWindowConstraints);
	3860	+// aWindowConstraints.weightx = 0;
	3861	+// aWindowConstraints.gridx = 4;
	3862	+// aWindowConstraints.gridwidth = 1;
	3863	+// // aConstraints.gridheight = 3;
	3864	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3865	+// bigThree.add(XYZPanel, aWindowConstraints);
	3866	+// bigThree.validate();
	3867	+// scenePanel.setVisible(true);
	3868	+// centralPanel.setVisible(true);
	3869	+// XYZPanel.setVisible(true);
	3870	+ bigThree.ClearUI();
	3871	+ bigThree.add(scenePanel);
	3872	+ bigThree.add(centralPanel);
	3873	+ bigThree.add(XYZPanel);
	3874	+ bigThree.FlushUI();
	3875	+
	3876	+ cameraView.requestFocusInWindow();
2663	3877	} else
2664		- if (event.getSource() == rootButton)
	3878	+ if (source == rootButton)
2665	3879	{
2666	3880	Object3D obj;
2667	3881	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2671,66 +3885,85 @@
2671	3885	EditObject(obj);
2672	3886	}
2673	3887
	3888	+ cameraView.requestFocusInWindow();
2674	3889	refreshContents(true);
2675	3890	} else
2676		- if (event.getSource() == closeButton)
	3891	+ if (source == closeButton)
2677	3892	{
2678	3893	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2679	3894	cRadio ab;
2680	3895	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2681	3896	{
2682	3897	ab = (cRadio)e.nextElement();
2683		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3898	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2684	3899	{
	3900	+ // Patch to avoid bug with transparency.
	3901	+ if (!ab.hadMaterial)
	3902	+ {
	3903	+ ab.object.material = null;
	3904	+ }
	3905	+
2685	3906	buttonGroup.remove(ab);
2686	3907	radioPanel.remove(ab);
2687	3908
2688		- ab.GetObject().editWindow = null;
	3909	+ //ab.GetObject().editWindow = null;
	3910	+ ab.GetObject().manipWindow = null;
2689	3911	// ab.GetObject().objectUI = null; // ?????????
2690	3912
2691	3913	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2692	3914	break;
2693	3915	}
2694	3916	}
	3917	+
	3918	+ cameraView.requestFocusInWindow();
2695	3919	refreshContents(true);
2696	3920	} else
2697		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3921	+ if (source == editItem \|\| source == editButton)
2698	3922	{
	3923	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3924	+ {
	3925	+ Object3D child = (Object3D)e.nextElement();
	3926	+ child.pinned = true;
	3927	+ }
	3928	+
2699	3929	EditSelection(false);
2700	3930	} else
2701		- if (event.getSource() == uneditButton)
	3931	+ if (source == uneditButton)
2702	3932	{
2703	3933	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2704	3934	{
2705	3935	Object3D child = (Object3D)e.nextElement();
2706	3936	if(child.editWindow != null)
2707		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3937	+ child.pinned = false;
2708	3938	child.CloseUI();
2709	3939	listUI.remove(child);
	3940	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2710	3941
2711		- child.editWindow = null; // ???????????
	3942	+ //child.editWindow = null; // ???????????
2712	3943	}
2713		- objEditor.ctrlPanel.revalidate();
	3944	+ objEditor.ctrlPanel.FlushUI();
2714	3945	//objEditor.jTree.clearSelection();
2715	3946	//objEditor.ResetSliders();
2716	3947	refreshContents(true);
2717	3948	} else
2718		- if (event.getSource() == clearPanelButton)
	3949	+ if (source == clearPanelButton)
2719	3950	{
2720	3951	assert(copy == group);
2721	3952	//copy.ClearUI();
2722	3953	for (Object3D obj : listUI)
2723	3954	{
	3955	+ obj.pinned = false;
2724	3956	obj.CloseUI();
2725	3957	}
2726	3958	listUI.clear();
	3959	+ SetPinStates(group.selection.size() > 0);
2727	3960	refreshContents(true);
2728	3961	} else
2729		- if (event.getSource() == allParamsButton)
	3962	+ if (source == allParamsButton)
2730	3963	{
2731	3964	assert(copy == group);
2732	3965
2733		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3966	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2734	3967
2735	3968	for (Object3D obj : listUI)
2736	3969	{
..	..	@@ -2747,19 +3980,19 @@
2747	3980
2748	3981	refreshContents(true);
2749	3982	} else
2750		- if (event.getSource() == unselectButton)
	3983	+ if (source == unselectButton)
2751	3984	{
2752	3985	objEditor.jTree.clearSelection();
2753		- // ?? oct 2012 GraphreeD.clipboard.clear();
	3986	+ // ?? oct 2012 GrafreeD.clipboard.clear();
2754	3987	objEditor.ResetSliders();
2755	3988	refreshContents(true);
2756	3989	} else
2757		- if(event.getSource() instanceof cRadio)
	3990	+ if(source instanceof cRadio)
2758	3991	{
2759	3992	group.parent = keepparent;
2760	3993	group.attributes = 0;
2761	3994	//group.editWindow = null;
2762		- /cRadio/ radio = (cRadio)event.getSource();
	3995	+ /cRadio/ radio = (cRadio)source;
2763	3996	Object3D obj = radio.GetObject();
2764	3997	System.out.println("Edit " + obj);
2765	3998	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2779,7 +4012,10 @@
2779	4012	}
2780	4013
2781	4014	copy = group;
2782		- //CameraPane.theRenderer.object = group;
	4015	+
	4016	+ SetUndoStates();
	4017	+
	4018	+ //Globals.theRenderer.object = group;
2783	4019	if(!useclient)
2784	4020	{
2785	4021	cameraView.renderCamera = radio.camera;
..	..	@@ -2788,25 +4024,55 @@
2788	4024	cameraView.cameras[cameraView.cameracount] = radio.camera;
2789	4025	cameraView.targetLookAt.set(radio.camera.lookAt);
2790	4026	cameraView.object = group;
2791		- cameraView.lighttouched = true;
	4027	+ //cameraView.lighttouched = true;
	4028	+ Globals.lighttouched = true;
2792	4029	topView.object = group;
2793	4030	frontView.object = group;
2794	4031	sideView.object = group;
2795	4032	}
2796		- group.editWindow = this;
	4033	+
	4034	+// fix "+" issue
	4035	+ //group.editWindow = this;
	4036	+ group.manipWindow = this;
	4037	+
2797	4038	/*
2798	4039	currentLayout = radio.layout;
2799	4040	if (currentLayout == null)
2800	4041	currentLayout = sevenButton;
2801	4042	*/
2802	4043	radio.layout.doClick();
	4044	+
	4045	+ ClearUnpinned();
	4046	+
	4047	+ //Grafreed.Assert(group != null);
	4048	+ //Grafreed.Assert(group.selection != null);
	4049	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4050	+ if (group.selection == null \|\| group.selection.size() == 1)
	4051	+ EditSelection(false);
2803	4052	keepparent = group.parent;
2804	4053	// PARENT = NULL or not???
2805	4054	//group.parent = null; // ROOT
2806	4055	//group.attributes = -1;
2807	4056	ResetModel();
	4057	+
	4058	+ cameraView.requestFocusInWindow();
2808	4059	refreshContents(true);
2809		- }
	4060	+ } else if (event.getSource() == editCameraItem)
	4061	+ {
	4062	+ cameraView.ProtectCamera();
	4063	+ cameraView.requestFocusInWindow();
	4064	+ cameraView.repaint();
	4065	+ return;
	4066	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	4067	+ {
	4068	+ cameraView.RevertCamera();
	4069	+ cameraView.requestFocusInWindow();
	4070	+ cameraView.repaint();
	4071	+ return;
	4072	+ // } else if (event.getSource() == textureButton)
	4073	+ // {
	4074	+ // return; // true;
	4075	+ }
2810	4076	else
2811	4077	{
2812	4078	//return super.action(event, arg);
..	..	@@ -2815,7 +4081,6 @@
2815	4081	}
2816	4082
2817	4083	boolean useclient = false;
2818		- cRadio radio;
2819	4084
2820	4085	void ToggleRoot()
2821	4086	{
..	..	@@ -2824,7 +4089,7 @@
2824	4089	if (useclient)
2825	4090	{
2826	4091	cameraView.object = client;
2827		- cameraView.lighttouched = true;
	4092	+ Globals.lighttouched = true;
2828	4093	//topView.object = client;
2829	4094	//frontView.object = client;
2830	4095	//sideView.object = client;
..	..	@@ -2832,7 +4097,7 @@
2832	4097	else
2833	4098	{
2834	4099	cameraView.object = group;
2835		- cameraView.lighttouched = true;
	4100	+ Globals.lighttouched = true;
2836	4101	//topView.object = group;
2837	4102	//frontView.object = group;
2838	4103	//sideView.object = group;
..	..	@@ -2867,6 +4132,28 @@
2867	4132	refreshContents();
2868	4133	}
2869	4134
	4135	+ void TransformChildren()
	4136	+ {
	4137	+ Object3D obj;
	4138	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4139	+ {
	4140	+ obj = (Object3D)e.nextElement();
	4141	+ obj.KeepTextureMatrices();
	4142	+ obj.TransformChildren();
	4143	+ obj.RestoreTextureMatrices();
	4144	+
	4145	+// if (obj.parent == null)
	4146	+// {
	4147	+// System.out.println("NULL PARENT!");
	4148	+// new Exception().printStackTrace();
	4149	+// }
	4150	+// else
	4151	+// TouchTransform(obj);
	4152	+// //obj.parent.Touch();
	4153	+ }
	4154	+
	4155	+ refreshContents();
	4156	+ }
2870	4157
2871	4158	void ResetTransform()
2872	4159	{
..	..	@@ -2979,7 +4266,7 @@
2979	4266	refreshContents();
2980	4267	}
2981	4268
2982		- void ResetCentroid()
	4269	+ void ResetCentroid(boolean full)
2983	4270	{
2984	4271	Object3D obj;
2985	4272	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2994,12 +4281,16 @@
2994	4281	LA.matIdentity(Object3D.mat);
2995	4282	obj.getBounds(minima, maxima, false);
2996	4283	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
2997		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	4284	+ if (full)
	4285	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
2998	4286	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
2999	4287	obj.TransformMesh(Object3D.mat);
	4288	+
3000	4289	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3001		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	4290	+ if (full)
	4291	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3002	4292	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	4293	+
3003	4294	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3004	4295	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3005	4296	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3028,7 +4319,8 @@
3028	4319
3029	4320	int size = obj.MemorySize();
3030	4321
3031		- System.err.println((size/1024) + " KB is the size of " + obj);
	4322	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4323	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3032	4324	}
3033	4325	}
3034	4326	catch (Exception e)
..	..	@@ -3065,9 +4357,9 @@
3065	4357	obj = (Object3D)e.nextElement();
3066	4358
3067	4359	System.out.println("Object is: " + obj);
3068		- GraphreeD.AnalyzeObject(obj);
	4360	+ Grafreed.AnalyzeObject(obj);
3069	4361	System.out.println("Boundary rep: " + obj.bRep);
3070		- GraphreeD.AnalyzeObject(obj.bRep);
	4362	+ Grafreed.AnalyzeObject(obj.bRep);
3071	4363
3072	4364	// System.err.println((size/1024) + " KB is the size of " + obj);
3073	4365	}
..	..	@@ -3109,6 +4401,20 @@
3109	4401	void GenNormals(boolean crease)
3110	4402	{
3111	4403	group.GenNormalsS(crease);
	4404	+
	4405	+ refreshContents();
	4406	+ }
	4407	+
	4408	+ void GenNormalsMESH()
	4409	+ {
	4410	+ group.GenNormalsMeshS();
	4411	+
	4412	+ refreshContents();
	4413	+ }
	4414	+
	4415	+ void GenNormalsMINE()
	4416	+ {
	4417	+ group.selection.GenNormalsMINE();
3112	4418
3113	4419	refreshContents();
3114	4420	}
..	..	@@ -3157,104 +4463,259 @@
3157	4463
3158	4464	//Object3D buffer;
3159	4465	cVector temp = new cVector();
3160		- BoundaryRep temprep;
3161		- Object3D nodes;
3162		- Vector<Vertex> vertices;
3163		-
3164		- public void Vertex(Object3D node, Vertex v)
3165		- {
3166		- vertices.add(v);
3167		- nodes.addElement(node);
3168		-
3169		- if (temprep.GetCache(v) != null)
3170		- {
3171		- temprep.Remove(v);
3172		- }
3173		- else
3174		- {
3175		- temprep.Remember(v);
3176		- }
3177		- }
3178		-
3179		- public void Face(Object3D node, Face f)
3180		- {
3181		-
3182		- }
3183		-
	4466	+// BoundaryRep temprep;
	4467	+// Object3D nodes;
	4468	+// Vector<Vertex> vertices;
	4469	+//
	4470	+// cGroup buffer;
	4471	+//
	4472	+// public void Vertex(Object3D node, Vertex v)
	4473	+// {
	4474	+//// vertices.add(v);
	4475	+//// nodes.addElement(node);
	4476	+////
	4477	+//// if (temprep.GetCache(v) != null)
	4478	+//// {
	4479	+//// temprep.Remove(v);
	4480	+//// } else
	4481	+//// {
	4482	+//// temprep.Remember(v);
	4483	+//// }
	4484	+//
	4485	+// //Object3D node = nodes.get(index);
	4486	+// temp.set(v); // vertices.get(index)); // temprep.GetVertex(k));
	4487	+// // System.out.println("temp = " + temp.x + ", " + temp.y + ", " + temp.z);
	4488	+//
	4489	+// LA.xformPos(temp, node.GlobalTransformInv(), temp);
	4490	+//
	4491	+// // System.out.println("tem+ = " + temp.x + ", " + temp.y + ", " + temp.z);
	4492	+//
	4493	+// cGroup g = new cGroup();
	4494	+//
	4495	+// if (g.toParent == null)
	4496	+// {
	4497	+// g.toParent = LA.newMatrix();
	4498	+// g.fromParent = LA.newMatrix();
	4499	+// }
	4500	+// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
	4501	+// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
	4502	+//
	4503	+// g.add(GrafreeD.clipboard);
	4504	+//
	4505	+// buffer.add(g);
	4506	+// }
	4507	+//
	4508	+// public void Face(Object3D node, Face f)
	4509	+// {
	4510	+//
	4511	+// }
	4512	+//
	4513	+// void ParseVerticesOld() // ??
	4514	+// {
	4515	+// //if (group.selection.size() != 1)
	4516	+// // return;
	4517	+//
	4518	+// temprep = new BoundaryRep();
	4519	+// nodes = new Object3D();
	4520	+// vertices = new Vector<Vertex>();
	4521	+//
	4522	+// boolean epsequal = GrafreeD.epsequal;
	4523	+// GrafreeD.epsequal = true;
	4524	+//
	4525	+// for (int i=0; i<group.selection.size(); i++)
	4526	+// {
	4527	+// Object3D buffer = new cGroup(group.selection.get(i).name + "+");
	4528	+//
	4529	+// group.selection.get(i).Parse(
	4530	+//this );
	4531	+//
	4532	+// int repsize = temprep.VertexCount();
	4533	+// int tablesize = temprep.vertextable.size();
	4534	+// int nodesize = nodes.size();
	4535	+//
	4536	+// assert(vertices.size() == nodes.size());
	4537	+//
	4538	+// temprep.vertextable.elements();
	4539	+//
	4540	+// java.util.Set<java.util.Map.Entry<Vertex,Vertex>> set = temprep.vertextable.entrySet();
	4541	+//
	4542	+// for (java.util.Map.Entry<Vertex,Vertex> entry : set)
	4543	+// {
	4544	+// cGroup g = new cGroup();
	4545	+//
	4546	+// int index = vertices.indexOf(entry.getValue()); // temprep.vertextable.(k));
	4547	+//
	4548	+// Object3D node = nodes.get(index);
	4549	+// temp.set(vertices.get(index)); // temprep.GetVertex(k));
	4550	+// // System.out.println("temp = " + temp.x + ", " + temp.y + ", " + temp.z);
	4551	+//
	4552	+// LA.xformPos(temp, node.GlobalTransformInv(), temp);
	4553	+//
	4554	+// // System.out.println("tem+ = " + temp.x + ", " + temp.y + ", " + temp.z);
	4555	+//
	4556	+// if (g.toParent == null)
	4557	+// {
	4558	+// g.toParent = LA.newMatrix();
	4559	+// g.fromParent = LA.newMatrix();
	4560	+// }
	4561	+// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
	4562	+// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
	4563	+//
	4564	+// g.add(GrafreeD.clipboard);
	4565	+//
	4566	+// buffer.add(g);
	4567	+// }
	4568	+//
	4569	+// makeSomething(buffer, i==group.selection.size()-1);
	4570	+// }
	4571	+//
	4572	+// GrafreeD.epsequal = epsequal;
	4573	+//
	4574	+// //buffer = null;
	4575	+// temprep = null;
	4576	+// nodes = null;
	4577	+//
	4578	+// refreshContents();
	4579	+// }
	4580	+
3184	4581	void ParseVertices()
3185	4582	{
3186		- //if (group.selection.size() != 1)
3187		- // return;
3188		-
3189		- temprep = new BoundaryRep();
3190		- nodes = new Object3D();
3191		- vertices = new Vector<Vertex>();
3192		-
3193		- boolean epsequal = GraphreeD.epsequal;
3194		- GraphreeD.epsequal = true;
	4583	+ boolean epsequal = Grafreed.epsequal;
	4584	+ Grafreed.epsequal = true;
3195	4585
3196	4586	for (int i=0; i<group.selection.size(); i++)
3197	4587	{
3198		- Object3D buffer = new cGroup(group.selection.get(i).name + "+");
	4588	+ final cGroup buffer = new cGroup(group.selection.get(i).name + "+");
3199	4589
3200		- group.selection.get(i).Parse(this);
3201		-
3202		- int repsize = temprep.VertexCount();
3203		- int tablesize = temprep.vertextable.size();
3204		- int nodesize = nodes.size();
	4590	+ group.selection.get(i).Parse(
	4591	+
	4592	+ new iParse()
	4593	+ {
	4594	+ public void Vertex(Object3D node, Vertex v)
	4595	+ {
	4596	+ temp.set(v);
	4597	+ LA.xformPos(temp, node.GlobalTransformInv(), temp);
3205	4598
3206		- assert(vertices.size() == nodes.size());
3207		-
3208		- temprep.vertextable.elements();
3209		-
3210		- java.util.Set<java.util.Map.Entry<Vertex,Vertex>> set = temprep.vertextable.entrySet();
	4599	+ cGroup g = new cGroup();
3211	4600
3212		- for (java.util.Map.Entry<Vertex,Vertex> entry : set)
3213		- {
3214		- cGroup g = new cGroup();
	4601	+ if (g.toParent == null)
	4602	+ {
	4603	+ g.toParent = LA.newMatrix();
	4604	+ g.fromParent = LA.newMatrix();
	4605	+ }
	4606	+ LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
	4607	+ LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3215	4608
3216		- int index = vertices.indexOf(entry.getValue()); // temprep.vertextable.(k));
3217		- Object3D node = nodes.get(index);
3218		- temp.set(vertices.get(index)); // temprep.GetVertex(k));
3219		- // System.out.println("temp = " + temp.x + ", " + temp.y + ", " + temp.z);
	4609	+ g.add(Grafreed.clipboard);
3220	4610
3221		- LA.xformPos(temp, node.GlobalTransformInv(), temp);
3222		-
3223		- // System.out.println("tem+ = " + temp.x + ", " + temp.y + ", " + temp.z);
3224		-
3225		- if (g.toParent == null)
3226		- {
3227		- g.toParent = LA.newMatrix();
3228		- g.fromParent = LA.newMatrix();
3229		- }
3230		- LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3231		- LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
	4611	+ buffer.add(g);
	4612	+ }
3232	4613
3233		- g.add(GraphreeD.clipboard);
	4614	+ public void Face(Object3D node, Face f)
	4615	+ {
3234	4616
3235		- buffer.add(g);
3236		- }
	4617	+ }
	4618	+ }
	4619	+ );
3237	4620
3238	4621	makeSomething(buffer, i==group.selection.size()-1);
3239	4622	}
3240	4623
3241		- GraphreeD.epsequal = epsequal;
3242		-
3243		- //buffer = null;
3244		- temprep = null;
3245		- nodes = null;
	4624	+ Grafreed.epsequal = epsequal;
3246	4625
3247	4626	refreshContents();
3248	4627	}
3249		-
	4628	+
	4629	+ void TextureVertices()
	4630	+ {
	4631	+ for (int i=0; i<group.selection.size(); i++)
	4632	+ {
	4633	+ group.selection.get(i).Parse(
	4634	+ new iParse()
	4635	+ {
	4636	+ public void Vertex(Object3D node, Vertex v)
	4637	+ {
	4638	+ cTexture tex = node.GetTextures();
	4639	+ String pigment = Object3D.GetPigment(tex);
	4640	+ //String bump = Object3D.GetBump(tex);
	4641	+
	4642	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4643	+
	4644	+ try
	4645	+ {
	4646	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
	4647	+ }
	4648	+ catch (Exception e)
	4649	+ {
	4650	+ System.err.println("FAIL: " + node);
	4651	+ }
	4652	+
	4653	+ double s = v.s;
	4654	+
	4655	+ if (s == 1)
	4656	+ s = 0;
	4657	+
	4658	+ double t = v.t;
	4659	+
	4660	+ if (t == 1)
	4661	+ t = 0;
	4662	+
	4663	+ int indexs = (int) (texturedata.getWidth() * s);
	4664	+ int indext = (int) (texturedata.getHeight() * t);
	4665	+
	4666	+ int index = indext * texturedata.getWidth() + indexs;
	4667	+
	4668	+ java.nio.ByteBuffer bytebuf = (java.nio.ByteBuffer)texturedata.getBuffer();
	4669	+
	4670	+ int slide = bytebuf.capacity() / texturedata.getWidth() / texturedata.getHeight();
	4671	+
	4672	+ float scale = bytebuf.get(index*slide) & 0xFF;
	4673	+ scale += bytebuf.get(index*slide+1) & 0xFF;
	4674	+ scale += bytebuf.get(index*slide+2) & 0xFF;
	4675	+ scale /= 3;
	4676	+
	4677	+ scale /= 0xFF;
	4678	+ // c'est quoi ca? scale /= 4;
	4679	+
	4680	+ //v.AO = scale;
	4681	+
	4682	+ v.x += v.norm.x * scale;
	4683	+ v.y += v.norm.y * scale;
	4684	+ v.z += v.norm.z * scale;
	4685	+ }
	4686	+
	4687	+ public void Face(Object3D node, Face f)
	4688	+ {
	4689	+ }
	4690	+ }
	4691	+ );
	4692	+ }
	4693	+
	4694	+ refreshContents();
	4695	+ }
	4696	+
3250	4697	void Align()
3251	4698	{
	4699	+ if (group.selection.size() == 0)
	4700	+ return;
	4701	+
	4702	+ cVector bbmin = new cVector();
	4703	+ cVector bbmax = new cVector();
	4704	+
	4705	+ group.selection.get(0).getBounds(bbmin, bbmax, true);
	4706	+
	4707	+ double dx = bbmax.x - bbmin.x;
	4708	+ double dy = bbmax.y - bbmin.y;
	4709	+ double dz = bbmax.z - bbmin.z;
	4710	+
	4711	+ double scale = Math.sqrt(dxdx + dydy + dz*dz);
	4712	+
3252	4713	for (int i=0; i<group.selection.size(); i++)
3253	4714	{
3254	4715	Object3D obj = group.selection.get(i);
3255	4716
3256		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3257		- LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
	4717	+ LA.matTranslate(obj.toParent, i * scale, 0, 0);
	4718	+ LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3258	4719	}
3259	4720
3260	4721	refreshContents();
..	..	@@ -3267,7 +4728,7 @@
3267	4728	// ref.SaveSupports();
3268	4729	// Object3D par = ref.parent;
3269	4730	// ref.parent = null;
3270		-// Object3D lowres = (Object3D) GraphreeD.clone(ref);
	4731	+// Object3D lowres = (Object3D) GrafreeD.clone(ref);
3271	4732	// ref.parent = par;
3272	4733	// ref.RestoreSupports();
3273	4734
..	..	@@ -3275,11 +4736,11 @@
3275	4736
3276	4737	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3277	4738
3278		- boolean random = CameraPane.RANDOM;
3279		- CameraPane.RANDOM = false; // parse all random nodes
	4739	+ boolean random = CameraPane.SWITCH;
	4740	+ CameraPane.SWITCH = false; // parse all random nodes
3280	4741	lowres.linkVerticesThis(null);
3281	4742	lowres.linkVerticesThis(sn);
3282		- CameraPane.RANDOM = random;
	4743	+ CameraPane.SWITCH = random;
3283	4744
3284	4745	System.err.flush();
3285	4746
..	..	@@ -3297,7 +4758,7 @@
3297	4758	// lowres.SaveSupports();
3298	4759	// par = lowres.parent;
3299	4760	// lowres.parent = null;
3300		-// Object3D newlow = (Object3D) GraphreeD.clone(lowres);
	4761	+// Object3D newlow = (Object3D) GrafreeD.clone(lowres);
3301	4762	Object3D newlow = CloneObject(lowres, false);
3302	4763	newlow.name = sn.switchobject.get(i).name;
3303	4764	System.out.println(" pose#" + i + " = " + newlow);
..	..	@@ -3319,7 +4780,7 @@
3319	4780	return;
3320	4781
3321	4782	Object3D poses = group.selection.get(0);
3322		- Object3D ref = GraphreeD.clipboard.get(0);
	4783	+ Object3D ref = Grafreed.clipboard.get(0);
3323	4784
3324	4785	Object3D newgroup = new Object3D("Po:" + poses.name);
3325	4786
..	..	@@ -3488,7 +4949,7 @@
3488	4949	group.selection.RelinkToSupport(); // july 2014
3489	4950	System.out.println("DONE.");
3490	4951	refreshContents();
3491		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	4952	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3492	4953	}
3493	4954
3494	4955	void ReduceMesh(boolean reduction34)
..	..	@@ -3513,20 +4974,20 @@
3513	4974
3514	4975	void ClipMesh()
3515	4976	{
3516		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	4977	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3517	4978	{
3518		- Object3D content = GraphreeD.clipboard.get(0);
	4979	+ Object3D content = Grafreed.clipboard.get(0);
3519	4980
3520	4981	if (content instanceof cGroup && ((cGroup)content).transientlink )
3521	4982	content = ((cGroup)content).get(0);
3522	4983
3523	4984	// for (int i=0; i<group.selection.size(); i++)
3524	4985	// {
3525		-// group.selection.get(i).ClipMesh(GraphreeD.clipboard);
	4986	+// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3526	4987	// }
3527		- group.selection.ClipMesh(GraphreeD.clipboard);
	4988	+ group.selection.ClipMesh(Grafreed.clipboard);
3528	4989	}
3529		-// group.selection.ClipMesh(GraphreeD.clipboard);
	4990	+// group.selection.ClipMesh(GrafreeD.clipboard);
3530	4991	System.out.println("DONE.");
3531	4992	refreshContents();
3532	4993	}
..	..	@@ -3571,6 +5032,18 @@
3571	5032	void MarkLeaves(boolean hide)
3572	5033	{
3573	5034	group.selection.MarkLeaves(hide);
	5035	+ refreshContents();
	5036	+ }
	5037	+
	5038	+ void RewindLeaves(boolean hide)
	5039	+ {
	5040	+ group.selection.RewindLeaves(hide);
	5041	+ refreshContents();
	5042	+ }
	5043	+
	5044	+ void RandomLeaves(boolean hide)
	5045	+ {
	5046	+ group.selection.RandomLeaves(hide);
3574	5047	refreshContents();
3575	5048	}
3576	5049
..	..	@@ -3645,28 +5118,25 @@
3645	5118	// }
3646	5119	// }
3647	5120
3648		- static boolean allparams = true;
3649		-
3650		- static Vector<Object3D> listUI = new Vector<Object3D>();
3651		-
3652	5121	void EditSelection(boolean newWindow)
3653	5122	{
	5123	+ if (group.selection == null)
	5124	+ {
	5125	+ EditElement(group, newWindow); // ? new
	5126	+ return;
	5127	+ }
	5128	+
3654	5129	// aConstraints.gridy = 0;
3655	5130	for (int i=0; i<group.selection.size(); i++)
3656	5131	{
3657	5132	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
3658	5133	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3659		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5134	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3660	5135
3661	5136	Object3D elem = (Object3D)group.selection.elementAt(i);
3662		- if(elem != group)
	5137	+ if(elem != group \|\| !newWindow)
3663	5138	{
3664		- // if (!(elem instanceof Composite))
3665		- // newWindow = false;
3666		- listUI.add(elem);
3667		- elem.openEditWindow(this, newWindow); //, false);
3668		- System.out.println("edit : " + elem);
3669		- elem.editWindow.refreshContents(true); // ? new
	5139	+ EditElement(elem, newWindow); // ? new
3670	5140	}
3671	5141	}
3672	5142	}
..	..	@@ -3729,9 +5199,7 @@
3729	5199
3730	5200	freezemodel = false;
3731	5201	}
3732		-
3733		- boolean flashIt = true;
3734		-
	5202	+
3735	5203	public void valueChanged(TreeSelectionEvent e)
3736	5204	//public boolean handleEvent(Event event)
3737	5205	{
..	..	@@ -3741,7 +5209,8 @@
3741	5209	//new Exception().printStackTrace();
3742	5210
3743	5211	freezemodel = true;
3744		-
	5212	+ ClearUnpinned();
	5213	+
3745	5214	/**/
3746	5215	//switch (event.id)
3747	5216	{
..	..	@@ -3749,7 +5218,6 @@
3749	5218	//case 702: // Event.LIST_DESELECT
3750	5219	group.deselectAll();
3751	5220	TreePath tps[] = objEditor.jTree.getSelectionPaths();
3752		- objEditor.ClearInfo(); // .GetMaterial());
3753	5221	if (tps != null)
3754	5222	{
3755	5223	for (int i=0; i < tps.length; i++)
..	..	@@ -3758,33 +5226,39 @@
3758	5226
3759	5227	//if (child.parent != null)
3760	5228	//child.parent.addSelectee(child);
	5229	+ objEditor.SetMaterial(child);
3761	5230	group.addSelectee(child);
3762		- objEditor.SetMaterial(child); // .GetMaterial());
3763		- objEditor.AddInfo(child, this, true); // .GetMaterial());
3764		- System.err.println("info : " + child.GetPath());
3765	5231	}
3766	5232	}
3767		- else
3768		- {
3769		- objEditor.SetMaterial(group); // .GetMaterial());
3770		- objEditor.AddInfo(group, this, true); // .GetMaterial());
3771		- System.err.println("info : " + group.GetPath());
3772		- }
	5233	+// else
	5234	+// {
	5235	+// objEditor.SetMaterial(group); // .GetMaterial());
	5236	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	5237	+// System.err.println("info : " + group.GetPath());
	5238	+// }
3773	5239
3774		- objEditor.SetText(); // jan 2014
3775		-
3776		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	5240	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
3777	5241	CameraPane.flash = true;
3778	5242
3779		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5243	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
3780	5244	// a camera
3781	5245	{
3782		- CameraPane.camerachangeframe = 0; // don't refuse it
3783		- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
3784		- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
3785		- // CameraPane.theRenderer.eyeCamera = CameraPane.theRenderer.manipCamera;
	5246	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5247	+ {
	5248	+ CameraPane.camerachangeframe = 0; // don't refuse it
	5249	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5250	+ }
	5251	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	5252	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
3786	5253	}
3787	5254
	5255	+ if (tps != null && tps.length == 1)
	5256	+ {
	5257	+ EditSelection(false);
	5258	+ }
	5259	+
	5260	+ SetPinStates(tps != null && tps.length > 0);
	5261	+
3788	5262	refreshContents();
3789	5263	//return true;
3790	5264	}
..	..	@@ -3793,6 +5267,37 @@
3793	5267
3794	5268	freezemodel = false;
3795	5269	}
	5270	+
	5271	+ void SetPinStates(boolean enabled)
	5272	+ {
	5273	+ editButton.setEnabled(enabled);
	5274	+ uneditButton.setEnabled(enabled);
	5275	+ //unselectButton.setEnabled(enabled);
	5276	+ flashSelectionButton.setEnabled(enabled);
	5277	+
	5278	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5279	+ }
	5280	+
	5281	+ void refreshContents(boolean cp)
	5282	+ {
	5283	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5284	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5285	+ {
	5286	+ objEditor.ClearInfo(); // .GetMaterial());
	5287	+
	5288	+ for (int i=0; i < group.selection.Size(); i++)
	5289	+ {
	5290	+ Object3D child = (Object3D) group.selection.get(i);
	5291	+
	5292	+ objEditor.AddInfo(child, this, true);
	5293	+ System.err.println("info : " + child.GetPath());
	5294	+ }
	5295	+
	5296	+ objEditor.SetText(); // jan 2014
	5297	+ }
	5298	+
	5299	+ super.refreshContents(cp);
	5300	+ }
3796	5301
3797	5302	void linkSomething(Object3D thing)
3798	5303	{
..	..	@@ -3864,16 +5369,19 @@
3864	5369	{
3865	5370	if (group.selection.isEmpty())
3866	5371	return;
3867		- GraphreeD.clipboardIsTempGroup = false;
	5372	+
	5373	+ Grafreed.clipboardIsTempGroup = false;
3868	5374	Composite tGroup = null;
3869	5375	if (group.selection.size() > 0) // 1)
3870	5376	{
3871	5377	tGroup = new cGroup();
3872		- GraphreeD.clipboardIsTempGroup = true;
	5378	+ Grafreed.clipboardIsTempGroup = true;
3873	5379	}
3874	5380
3875	5381	if (cut)
3876	5382	{
	5383	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5384	+// Save();
3877	5385	//int indices[] = jList.getSelectedIndices();
3878	5386	//for (int i = indices.length - 1; i >= 0; i--)
3879	5387	//jList.remove(indices[i]);
..	..	@@ -3909,16 +5417,16 @@
3909	5417	//System.out.println("cut " + child);
3910	5418	//System.out.println("parent = " + child.parent);
3911	5419	// tmp.addChild(child);
3912		- if (GraphreeD.clipboardIsTempGroup)
	5420	+ if (Grafreed.clipboardIsTempGroup)
3913	5421	tGroup.add/Child/(tmp);
3914	5422	else
3915		- GraphreeD.clipboard = tmp;
	5423	+ Grafreed.clipboard = tmp;
3916	5424	}
3917	5425	else
3918		- if (GraphreeD.clipboardIsTempGroup)
	5426	+ if (Grafreed.clipboardIsTempGroup)
3919	5427	tGroup.add/Child/(child);
3920	5428	else
3921		- GraphreeD.clipboard = child;
	5429	+ Grafreed.clipboard = child;
3922	5430	}
3923	5431
3924	5432	//ResetModel();
..	..	@@ -3950,21 +5458,23 @@
3950	5458	//System.out.println("cut " + elem);
3951	5459	//System.out.println("parent = " + elem.parent);
3952	5460	// tmp.addChild(elem);
3953		- if (GraphreeD.clipboardIsTempGroup)
	5461	+ if (Grafreed.clipboardIsTempGroup)
3954	5462	tGroup.add/Child/(tmp);
3955	5463	else
3956		- GraphreeD.clipboard = tmp;
	5464	+ Grafreed.clipboard = tmp;
3957	5465	}
3958	5466	else
3959		- if (GraphreeD.clipboardIsTempGroup)
	5467	+ if (Grafreed.clipboardIsTempGroup)
3960	5468	tGroup.add/Child/(child);
3961	5469	else
3962		- GraphreeD.clipboard = child;
	5470	+ Grafreed.clipboard = child;
3963	5471	}
3964	5472
3965	5473	}
3966		- if (GraphreeD.clipboardIsTempGroup)
3967		- GraphreeD.clipboard = tGroup;
	5474	+
	5475	+ if (Grafreed.clipboardIsTempGroup)
	5476	+ Grafreed.clipboard = tGroup;
	5477	+
3968	5478	if (cut)
3969	5479	{
3970	5480	ResetModel();
..	..	@@ -3974,11 +5484,15 @@
3974	5484
3975	5485	void paste(boolean expand)
3976	5486	{
3977		- // if (GraphreeD.clipboard == null)
	5487	+ if (Globals.REPLACEONMAKE)
	5488	+ Save();
	5489	+ boolean keep = Globals.REPLACEONMAKE;
	5490	+ Globals.REPLACEONMAKE = false;
	5491	+ // if (GrafreeD.clipboard == null)
3978	5492	// return;
3979	5493	boolean first = true;
3980	5494
3981		- if (GraphreeD.clipboardIsTempGroup)
	5495	+ if (Grafreed.clipboardIsTempGroup)
3982	5496	{
3983	5497	Composite temp;
3984	5498
..	..	@@ -3989,7 +5503,7 @@
3989	5503	temp = (Composite)Applet3D.clipboard.deepCopy();
3990	5504	*/
3991	5505	Object3D elem;
3992		- for (Enumeration e = /temp.children/GraphreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5506	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
3993	5507	{
3994	5508	Object3D child = (Object3D)e.nextElement();
3995	5509
..	..	@@ -4003,7 +5517,7 @@
4003	5517	else
4004	5518	elem = child.deepCopy(); // ?
4005	5519	child.parent = keepparent;
4006		- //if (GraphreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
	5520	+ //if (GrafreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
4007	5521	// elem = elem.get(0);
4008	5522	makeSomething(elem, true); // ?? first);
4009	5523	//group.addChild(elem);
..	..	@@ -4023,23 +5537,24 @@
4023	5537	//Object3D cb = Applet3D.clipboard;
4024	5538	//temp.addChild(cb);
4025	5539	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4026		- assert(GraphreeD.clipboard.parent == null);
4027		- Object3D /Composite/ keepparent = GraphreeD.clipboard.get(0).parent;
4028		- GraphreeD.clipboard.get(0).parent = null; // Avoid copy?
4029		- if (LA.isIdentity(GraphreeD.clipboard.toParent))
4030		- makeSomething(expand?GraphreeD.clipboard.get(0).copyExpand():GraphreeD.clipboard.get(0).deepCopy());
	5540	+ assert(Grafreed.clipboard.parent == null);
	5541	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5542	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5543	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5544	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4031	5545	else
4032		- makeSomething(expand?GraphreeD.clipboard.copyExpand():GraphreeD.clipboard.deepCopy());
4033		- GraphreeD.clipboard.get(0).parent = keepparent;
	5546	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5547	+ Grafreed.clipboard.get(0).parent = keepparent;
4034	5548	}
4035	5549
	5550	+ Globals.REPLACEONMAKE = keep;
4036	5551	ResetModel();
4037	5552	refreshContents();
4038	5553	}
4039	5554
4040		- void pasteInto(boolean copyit)
	5555	+ void pasteInto(boolean copyit, boolean clone)
4041	5556	{
4042		-// if (GraphreeD.clipboard == null)
	5557	+// if (GrafreeD.clipboard == null)
4043	5558	// return;
4044	5559
4045	5560	if (group.selection.size() != 1)
..	..	@@ -4066,15 +5581,22 @@
4066	5581	if (copyit)
4067	5582	{
4068	5583	// paste(false);
4069		- CloneClipboard(false); // sept 2014
	5584	+ if (clone)
	5585	+ {
	5586	+ CloneClipboard(false); // sept 2014
	5587	+ }
	5588	+ else
	5589	+ {
	5590	+ paste(false);
	5591	+ }
4070	5592	}
4071	5593	else
4072	5594	{
4073	5595	boolean first = true;
4074	5596
4075		- if (GraphreeD.clipboardIsTempGroup)
	5597	+ if (Grafreed.clipboardIsTempGroup)
4076	5598	{
4077		- Composite temp = (Composite)GraphreeD.clipboard;
	5599	+ Composite temp = (Composite)Grafreed.clipboard;
4078	5600	Object3D copy;
4079	5601	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4080	5602	{
..	..	@@ -4084,7 +5606,7 @@
4084	5606	}
4085	5607	} else
4086	5608	{
4087		- linkSomething(GraphreeD.clipboard); //.get(0));
	5609	+ linkSomething(Grafreed.clipboard); //.get(0));
4088	5610	}
4089	5611	}
4090	5612	}
..	..	@@ -4161,6 +5683,10 @@
4161	5683
4162	5684	void group(Object3D csg, boolean grab)
4163	5685	{
	5686	+ if (Globals.REPLACEONMAKE)
	5687	+ Save();
	5688	+ boolean keep = Globals.REPLACEONMAKE;
	5689	+ Globals.REPLACEONMAKE = false;
4164	5690	if (//false) // why??
4165	5691	!group.selection.isEmpty())
4166	5692	{
..	..	@@ -4274,8 +5800,34 @@
4274	5800	//node.add(csg);
4275	5801	//makeSomething(node);
4276	5802	makeSomething(csg);
	5803	+ Globals.REPLACEONMAKE = keep;
4277	5804	}
4278	5805
	5806	+ void Ungroup(Object3D g)
	5807	+ {
	5808	+ if (Globals.REPLACEONMAKE)
	5809	+ Save();
	5810	+ boolean keep = Globals.REPLACEONMAKE;
	5811	+ Globals.REPLACEONMAKE = false;
	5812	+ if (g instanceof HiddenObject)
	5813	+ {
	5814	+ HiddenObject h = (HiddenObject) g;
	5815	+
	5816	+ for (int i=0; i<h.ActualSize(); i++)
	5817	+ {
	5818	+ objEditor.makeSomething(h.get(i), false);
	5819	+ }
	5820	+ }
	5821	+ else
	5822	+ {
	5823	+ for (int i=0; i<g.Size(); i++)
	5824	+ {
	5825	+ objEditor.makeSomething(g.get(i), false);
	5826	+ }
	5827	+ }
	5828	+ Globals.REPLACEONMAKE = keep;
	5829	+ }
	5830	+
4279	5831	void ungroup()
4280	5832	{
4281	5833	/*
..	..	@@ -4469,21 +6021,6 @@
4469	6021	}
4470	6022	*/
4471	6023
4472		- void ImportGFD()
4473		- {
4474		- FileDialog browser = new FileDialog(objEditor.frame, "Import GraphreeD", FileDialog.LOAD);
4475		- browser.show();
4476		- String filename = browser.getFile();
4477		- if (filename != null && filename.length() > 0)
4478		- {
4479		- String fullname = browser.getDirectory() + filename;
4480		-
4481		- //Object3D readobj =
4482		- objEditor.ReadGFD(fullname, objEditor);
4483		- //makeSomething(readobj);
4484		- }
4485		- }
4486		-
4487	6024	/*
4488	6025	public void Callback(Object obj)
4489	6026	{
..	..	@@ -4507,26 +6044,9 @@
4507	6044	}
4508	6045	*/
4509	6046
4510		- void ImportVRMLX3D()
4511		- {
4512		- if (GraphreeD.standAlone)
4513		- {
4514		- /**/
4515		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4516		- browser.show();
4517		- String filename = browser.getFile();
4518		- if (filename != null && filename.length() > 0)
4519		- {
4520		- String fullname = browser.getDirectory() + filename;
4521		- LoadVRMLX3D(fullname);
4522		- }
4523		- /**/
4524		- }
4525		- }
4526		-
4527	6047	String GetFile(String dialogName)
4528	6048	{
4529		- if (GraphreeD.standAlone)
	6049	+ if (Grafreed.standAlone)
4530	6050	{
4531	6051	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4532	6052	browser.show();
..	..	@@ -4590,10 +6110,48 @@
4590	6110	cButton flashSelectionButton;
4591	6111	cButton editButton;
4592	6112	cButton uneditButton;
	6113	+ JCheckBox allParamsButton;
4593	6114	cButton clearpanelButton;
4594		- cButton allParamsButton;
4595	6115	cButton unselectButton;
4596	6116
	6117	+ cButton restoreCameraButton;
	6118	+
	6119	+ cButton oneStepButton;
	6120	+
	6121	+ cButton groupButton;
	6122	+ cButton ungroupButton;
	6123	+ cButton compositeButton;
	6124	+ cButton switchButton;
	6125	+ cButton loopButton;
	6126	+ cButton textureButton;
	6127	+
	6128	+ cButton skybox1Button;
	6129	+ cButton skybox2Button;
	6130	+ cButton skybox3Button;
	6131	+ cButton skybox4Button;
	6132	+ cButton skybox5Button;
	6133	+ cButton skybox6Button;
	6134	+ cButton skybox7Button;
	6135	+
	6136	+ cButton skybox11Button;
	6137	+ cButton skybox12Button;
	6138	+ cButton skybox13Button;
	6139	+ cButton skybox14Button;
	6140	+ cButton skybox15Button;
	6141	+ cButton skybox16Button;
	6142	+ cButton skybox17Button;
	6143	+
	6144	+ cButton gridButton;
	6145	+ cButton boxButton;
	6146	+ cButton sphereButton;
	6147	+ cButton coneButton;
	6148	+ cButton torusButton;
	6149	+ cButton superButton;
	6150	+ cButton kleinButton;
	6151	+ cButton particlesButton;
	6152	+ cButton overlayButton;
	6153	+ cButton lightButton;
	6154	+
4597	6155	cButton screenfitButton;
4598	6156	cButton screenfitpointButton;
4599	6157	cButton snapobjectButton;
..	..	@@ -4605,14 +6163,6 @@
4605	6163
4606	6164	cButton setsupportButton;
4607	6165
4608		- cButton twoButton;
4609		- cButton sixButton;
4610		- cButton threeButton;
4611		- cButton sevenButton;
4612		- cButton fourButton; // full panel
4613		- cButton oneButton; // full XYZ
4614		- //cButton currentLayout;
4615		-
4616	6166	//
4617	6167	//Composite
4618	6168	Object3D // to do !!
..	..	@@ -4622,9 +6172,11 @@
4622	6172	//JTree jTree;
4623	6173	private MenuItem lookAtItem;
4624	6174	private MenuItem lookFromItem;
4625		- private MenuItem switchItem;
	6175	+ private MenuItem switchViewItem;
4626	6176	private MenuItem cutItem;
4627		- private MenuItem duplicateItem;
	6177	+ private MenuItem undoItem;
	6178	+ private MenuItem redoItem;
	6179	+ private JMenuItem duplicateItem;
4628	6180	private MenuItem cloneItem;
4629	6181	private MenuItem cloneSupportItem;
4630	6182	private MenuItem overwriteGeoItem;
..	..	@@ -4635,8 +6187,9 @@
4635	6187	private MenuItem resetsupportItem;
4636	6188	private MenuItem resetreferencesItem;
4637	6189	private MenuItem linkverticesItem;
	6190	+ private MenuItem relinkverticesItem;
4638	6191	private MenuItem setMasterItem;
4639		- private MenuItem resetMeshItem;
	6192	+ private MenuItem resetAllItem;
4640	6193	private MenuItem stepAllItem;
4641	6194	private MenuItem revertMeshItem;
4642	6195	private MenuItem poseMeshItem;
..	..	@@ -4647,14 +6200,17 @@
4647	6200	private MenuItem mergeGeometriesItem;
4648	6201	private MenuItem copyItem;
4649	6202	private MenuItem pasteItem;
	6203	+ private MenuItem pasteIntoItem;
4650	6204	private MenuItem pasteLinkItem;
4651	6205	private MenuItem pasteCloneItem;
4652	6206	private MenuItem pasteExpandItem;
4653		- private MenuItem clearItem;
	6207	+ private MenuItem deleteItem;
4654	6208	private MenuItem clearAllItem;
4655	6209	private MenuItem genUVItem;
	6210	+ private MenuItem genNormalsMESHItem;
4656	6211	private MenuItem genNormalsCADItem;
4657	6212	private MenuItem genNormalsORGANItem;
	6213	+ private MenuItem genNormalsMINEItem;
4658	6214	private MenuItem stripifyItem;
4659	6215	private MenuItem unstripifyItem;
4660	6216	private MenuItem trimItem;
..	..	@@ -4683,6 +6239,10 @@
4683	6239	private MenuItem showleavesItem;
4684	6240	private MenuItem markleavesItem;
4685	6241	private MenuItem unmarkleavesItem;
	6242	+ private MenuItem rewindleavesItem;
	6243	+ private MenuItem unrewindleavesItem;
	6244	+ private MenuItem randomleavesItem;
	6245	+ private MenuItem unrandomleavesItem;
4686	6246
4687	6247	private MenuItem flipVItem;
4688	6248	private MenuItem unflipVItem;
..	..	@@ -4694,14 +6254,17 @@
4694	6254	private MenuItem panoTexturesItem;
4695	6255
4696	6256	private MenuItem resetCentroidItem;
4697		- private MenuItem transformgeometryItem;
	6257	+ private MenuItem resetCentroidXZItem;
4698	6258	private MenuItem resetTransformItem;
	6259	+ private MenuItem transformGeometryItem;
	6260	+ private MenuItem transformChildrenItem;
	6261	+ private MenuItem hideItem;
4699	6262	private MenuItem grabItem;
4700	6263	private MenuItem backItem;
4701	6264	private MenuItem frontItem;
4702	6265	private MenuItem cameraItem;
4703	6266	private MenuItem compositeItem;
4704		- private MenuItem randomItem;
	6267	+ private MenuItem switchItem;
4705	6268	private MenuItem physicsItem;
4706	6269	private MenuItem frameselectorItem;
4707	6270	private MenuItem scriptNodeItem;
..	..	@@ -4716,6 +6279,7 @@
4716	6279
4717	6280	private MenuItem resetParentItem;
4718	6281	private MenuItem repairParentItem;
	6282	+ private MenuItem repairShadowItem;
4719	6283	private MenuItem sortbysizeItem;
4720	6284	private MenuItem sortbynameItem;
4721	6285
..	..	@@ -4724,20 +6288,25 @@
4724	6288	private MenuItem attachBumpItem;
4725	6289	private MenuItem detachBumpItem;
4726	6290	private MenuItem pigmentBumpItem;
	6291	+ private MenuItem embedTexturesItem;
	6292	+ private MenuItem deEmbedTexturesItem;
4727	6293
4728	6294	private MenuItem particleItem;
4729	6295	private MenuItem ragdollItem;
4730	6296	private MenuItem ragdoll2Item;
	6297	+ private MenuItem heightFieldItem;
	6298	+ private MenuItem textureFieldItem;
4731	6299	private MenuItem gridItem;
4732	6300	private MenuItem rectoidItem;
4733	6301	private MenuItem ellipsoidItem;
4734	6302	private MenuItem coneItem;
4735	6303	private MenuItem torusItem;
4736	6304	private MenuItem superItem;
	6305	+ private MenuItem kleinItem;
4737	6306	private MenuItem blobItem;
4738	6307	private MenuItem latheItem;
4739	6308	private MenuItem bezierItem;
4740		- private MenuItem checkerItem;
	6309	+ private MenuItem overlayItem;
4741	6310	private MenuItem meshItem;
4742	6311	// private MenuItem meshGroupItem;
4743	6312	private MenuItem springItem;
..	..	@@ -4746,6 +6315,7 @@
4746	6315	private MenuItem csgItem;
4747	6316	private MenuItem templateItem;
4748	6317	private MenuItem textureItem;
	6318	+ private MenuItem billboardItem;
4749	6319	private MenuItem shadowXItem;
4750	6320	private MenuItem shadowYItem;
4751	6321	private MenuItem shadowZItem;
..	..	@@ -4758,11 +6328,6 @@
4758	6328	private MenuItem doubleItem;
4759	6329	private MenuItem tripleItem;
4760	6330
4761		- private MenuItem importGFDItem;
4762		- private MenuItem importVRMLX3DItem;
4763		- private MenuItem import3DSItem;
4764		- private MenuItem importOBJItem;
4765		-
4766	6331	private MenuItem computeAOItem;
4767	6332	private MenuItem recompileItem;
4768	6333	private MenuItem editScriptItem;
..	..	@@ -4772,4 +6337,8 @@
4772	6337	private MenuItem analyzeItem;
4773	6338	private MenuItem dumpItem;
4774	6339	//boolean freezemodel = false;
	6340	+
	6341	+ Menu cameraMenu;
	6342	+ MenuItem editCameraItem;
	6343	+ MenuItem restoreCameraItem;
4775	6344	}