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