~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,351 @@
22	24	DragGestureListener, DragSourceListener, DropTargetListener,
23	25	ItemListener // ListSelectionListener
24	26	{
	27	+
	28	+ public void AddSkyboxButton(String f, String s, cGridBag row)
	29	+ {
	30	+ cButton skyboxButton;
	31	+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
	32	+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
	33	+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
	34	+ skyboxButton.setToolTipText(s);
	35	+ skyboxButton.addActionListener(new ActionListener()
	36	+ {
	37	+ @Override
	38	+ public void actionPerformed(ActionEvent e)
	39	+ {
	40	+ ChangeSkybox(path);
	41	+ }
	42	+ });
	43	+ }
	44	+
	45	+ public void AddTextureButton(String f, String c, final String t, int count, cGridBag row)
	46	+ {
	47	+ cButton textureButton;
	48	+ final String path = "textures/" + f + "/" + c + "/"; // + t;
	49	+ row.add(textureButton = GetButton(path + "icons/" + t, !Grafreed.NIMBUSLAF));
	50	+ textureButton.setToolTipText(c + count);
	51	+ textureButton.addActionListener(new ActionListener()
	52	+ {
	53	+ @Override
	54	+ public void actionPerformed(ActionEvent e)
	55	+ {
	56	+ ChangeTexture(path + t);
	57	+ }
	58	+ });
	59	+ }
	60	+
	61	+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
	62	+ {
	63	+ cGridBag tab0 = new cGridBag().setVertical(true);
	64	+
	65	+ tab0.setName("Urban");
	66	+ skyboxpanel.add(tab0);
	67	+
	68	+ cGridBag row0 = new cGridBag();
	69	+ cGridBag row1 = new cGridBag();
	70	+ cGridBag row2 = new cGridBag();
	71	+ cGridBag row3 = new cGridBag();
	72	+ cGridBag row4 = new cGridBag();
	73	+ cGridBag row5 = new cGridBag();
	74	+ cGridBag row6 = new cGridBag();
	75	+
	76	+ AddSkyboxButton("default", "rgb", row0);
	77	+ //AddSkyboxButton("default", "cornell", row0);
	78	+ AddSkyboxButton("penguins", "dust", row0);
	79	+ AddSkyboxButton("penguins", "tropic", row0);
	80	+ AddSkyboxButton("penguins", "yonder", row0);
	81	+
	82	+ AddSkyboxButton("default", "uffizi", row1);
	83	+ AddSkyboxButton("bridge", "Bridge", row1);
	84	+ AddSkyboxButton("bridge", "Bridge2", row1);
	85	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	86	+
	87	+ AddSkyboxButton("urban", "Parliament", row2);
	88	+ AddSkyboxButton("urban", "Roundabout", row2);
	89	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	90	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	91	+
	92	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	93	+ AddSkyboxButton("urban", "UnionSquare", row3);
	94	+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
	95	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	96	+
	97	+ AddSkyboxButton("park", "Buddha", row4);
	98	+ AddSkyboxButton("park", "CNTower2", row4);
	99	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	100	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	101	+
	102	+ AddSkyboxButton("park", "Park", row5);
	103	+ AddSkyboxButton("park", "Pond", row5);
	104	+ AddSkyboxButton("park", "Skansen", row5);
	105	+ AddSkyboxButton("park", "Skansen2", row5);
	106	+
	107	+ AddSkyboxButton("park", "Skansen3", row6);
	108	+ AddSkyboxButton("park", "Skansen4", row6);
	109	+ AddSkyboxButton("park", "Skansen5", row6);
	110	+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
	111	+
	112	+ tab0.add(row0);
	113	+ tab0.add(row1);
	114	+ tab0.add(row2);
	115	+ tab0.add(row3);
	116	+ tab0.add(row4);
	117	+ tab0.add(row5);
	118	+ tab0.add(row6);
	119	+
	120	+ for (int i=5; --i>=0;)
	121	+ {
	122	+ //oe.toolboxPanel.Return();
	123	+ //tab0.add(new cGridBag());
	124	+ }
	125	+ }
	126	+
	127	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	128	+ {
	129	+ cGridBag tab0 = new cGridBag().setVertical(true);
	130	+
	131	+ tab0.setName("Nature");
	132	+ skyboxpanel.add(tab0);
	133	+
	134	+ cGridBag row0 = new cGridBag();
	135	+ cGridBag row1 = new cGridBag();
	136	+ cGridBag row2 = new cGridBag();
	137	+ cGridBag row3 = new cGridBag();
	138	+ cGridBag row4 = new cGridBag();
	139	+ cGridBag row5 = new cGridBag();
	140	+ cGridBag row6 = new cGridBag();
	141	+
	142	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	143	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	144	+ AddSkyboxButton("beach", "PalmTrees", row0);
	145	+ AddSkyboxButton("beach", "Tenerife", row0);
	146	+
	147	+ AddSkyboxButton("beach", "Tenerife2", row1);
	148	+ AddSkyboxButton("beach", "Tenerife3", row1);
	149	+ AddSkyboxButton("field", "FishPond", row1);
	150	+ AddSkyboxButton("field", "Footballfield", row1);
	151	+
	152	+ AddSkyboxButton("field", "Meadow", row2);
	153	+ AddSkyboxButton("field", "Sorsele", row2);
	154	+ AddSkyboxButton("field", "Sorsele2", row2);
	155	+ AddSkyboxButton("field", "Sorsele3", row2);
	156	+
	157	+ AddSkyboxButton("forest", "Brudslojan", row3);
	158	+ AddSkyboxButton("forest", "Langholmen2", row3);
	159	+ AddSkyboxButton("forest", "Plants", row3);
	160	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	161	+
	162	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	163	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	164	+ AddSkyboxButton("mountain", "Teide", row4);
	165	+ AddSkyboxButton("park", "Tantolunden4", row4);
	166	+
	167	+ AddSkyboxButton("park", "Stairs", row5);
	168	+ AddSkyboxButton("default", "skycube", row6);
	169	+ AddSkyboxButton("rocky", "Langholmen", row5);
	170	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	171	+
	172	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	173	+ AddSkyboxButton("default", "CloudyHills", row6);
	174	+ AddSkyboxButton("daz", "Autumn", row6);
	175	+ AddSkyboxButton("daz", "MountainTrail", row6);
	176	+ /*
	177	+Autumn
	178	+Greenlands
	179	+MountainTrail
	180	+Oasis
	181	+TheRock
	182	+TopOfTheWorld
	183	+Winter
	184	+ */
	185	+
	186	+ tab0.add(row0);
	187	+ tab0.add(row1);
	188	+ tab0.add(row2);
	189	+ tab0.add(row3);
	190	+ tab0.add(row4);
	191	+ tab0.add(row5);
	192	+ tab0.add(row6);
	193	+
	194	+ for (int i=5; --i>=0;)
	195	+ {
	196	+ //oe.toolboxPanel.Return();
	197	+ //tab0.add(new cGridBag());
	198	+ }
	199	+ }
	200	+
	201	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	202	+ {
	203	+ cGridBag tab0 = new cGridBag().setVertical(true);
	204	+
	205	+ tab0.setName("Night");
	206	+ skyboxpanel.add(tab0);
	207	+
	208	+ cGridBag row0 = new cGridBag();
	209	+ cGridBag row1 = new cGridBag();
	210	+ cGridBag row2 = new cGridBag();
	211	+ cGridBag row3 = new cGridBag();
	212	+ cGridBag row4 = new cGridBag();
	213	+ cGridBag row5 = new cGridBag();
	214	+ cGridBag row6 = new cGridBag();
	215	+
	216	+ AddSkyboxButton("night", "NightPath", row0);
	217	+ AddSkyboxButton("night", "PondNight", row0);
	218	+ AddSkyboxButton("night", "Powerlines", row0);
	219	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	220	+
	221	+ AddSkyboxButton("urban", "CNTower", row1);
	222	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	223	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	224	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
	225	+
	226	+ AddSkyboxButton("penguins", "kenon_star", row2);
	227	+ AddSkyboxButton("persson", "corona", row2);
	228	+ AddSkyboxButton("persson", "spaceskybox", row2);
	229	+ AddSkyboxButton("indoors", "Vasa", row2);
	230	+
	231	+ AddSkyboxButton("winter", "Backyard", row3);
	232	+ AddSkyboxButton("winter", "Creek", row3);
	233	+ AddSkyboxButton("winter", "FootballField3", row3);
	234	+ AddSkyboxButton("winter", "Forest", row3);
	235	+
	236	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	237	+ AddSkyboxButton("winter", "House", row4);
	238	+ AddSkyboxButton("winter", "IceLake", row4);
	239	+ AddSkyboxButton("winter", "IceRiver", row4);
	240	+
	241	+ AddSkyboxButton("winter", "Park3", row5);
	242	+ AddSkyboxButton("winter", "PondWinter", row5);
	243	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	244	+ AddSkyboxButton("winter", "Vindelalven", row5);
	245	+
	246	+ AddSkyboxButton("daz", "TheRock", row6);
	247	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	248	+ AddSkyboxButton("daz", "Winter", row6);
	249	+ AddSkyboxButton("mountain", "Ryfjallet", row6);
	250	+
	251	+ tab0.add(row0);
	252	+ tab0.add(row1);
	253	+ tab0.add(row2);
	254	+ tab0.add(row3);
	255	+ tab0.add(row4);
	256	+ tab0.add(row5);
	257	+ tab0.add(row6);
	258	+
	259	+ for (int i=5; --i>=0;)
	260	+ {
	261	+ //oe.toolboxPanel.Return();
	262	+ //tab0.add(new cGridBag());
	263	+ }
	264	+ }
	265	+
	266	+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
	267	+ {
	268	+ cGridBag tab0 = new cGridBag().setVertical(true);
	269	+
	270	+ tab0.setName("Others");
	271	+ skyboxpanel.add(tab0);
	272	+
	273	+ cGridBag row0 = new cGridBag();
	274	+ cGridBag row1 = new cGridBag();
	275	+ cGridBag row2 = new cGridBag();
	276	+ cGridBag row3 = new cGridBag();
	277	+ cGridBag row4 = new cGridBag();
	278	+ cGridBag row5 = new cGridBag();
	279	+ cGridBag row6 = new cGridBag();
	280	+
	281	+ AddSkyboxButton("mayhem", "afterrain", row0);
	282	+ AddSkyboxButton("mayhem", "aqua4", row0);
	283	+ AddSkyboxButton("mayhem", "aqua9", row0);
	284	+ AddSkyboxButton("mayhem", "flame", row0);
	285	+
	286	+ AddSkyboxButton("mayhem", "h2s", row1);
	287	+ AddSkyboxButton("mayhem", "prehistoric", row1);
	288	+ AddSkyboxButton("mayhem", "scorched", row1);
	289	+ AddSkyboxButton("penguins", "desertdawn", row1);
	290	+
	291	+ AddSkyboxButton("persson", "Citadella", row2);
	292	+ AddSkyboxButton("persson", "Citadella2", row2);
	293	+ AddSkyboxButton("persson", "clouds1", row2);
	294	+ AddSkyboxButton("penguins", "wrath", row2);
	295	+
	296	+ AddSkyboxButton("persson", "FishermansBastion", row3);
	297	+ AddSkyboxButton("persson", "HeroesSquare", row3);
	298	+ AddSkyboxButton("indoors", "DallasW", row3);
	299	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
	300	+
	301	+ AddSkyboxButton("persson", "LancellottiChapel", row4);
	302	+ AddSkyboxButton("persson", "PereaBeach1", row4);
	303	+ AddSkyboxButton("persson", "PereaBeach2", row4);
	304	+ AddSkyboxButton("persson", "redeclipse", row4);
	305	+
	306	+ AddSkyboxButton("daz", "Greenlands", row5);
	307	+ AddSkyboxButton("daz", "Oasis", row5);
	308	+ AddSkyboxButton("elyvisions", "arch3", row5);
	309	+ AddSkyboxButton("elyvisions", "calm_sea", row5);
	310	+
	311	+ AddSkyboxButton("elyvisions", "rainbow", row6);
	312	+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
	313	+ AddSkyboxButton("elyvisions", "heaven", row6);
	314	+ AddSkyboxButton("elyvisions", "hot", row6);
	315	+
	316	+ tab0.add(row0);
	317	+ tab0.add(row1);
	318	+ tab0.add(row2);
	319	+ tab0.add(row3);
	320	+ tab0.add(row4);
	321	+ tab0.add(row5);
	322	+ tab0.add(row6);
	323	+
	324	+ for (int i=5; --i>=0;)
	325	+ {
	326	+ //oe.toolboxPanel.Return();
	327	+ //tab0.add(new cGridBag());
	328	+ }
	329	+ }
	330	+
	331	+ public void ChangeSkybox(String skybox)
	332	+ {
	333	+ //cameraView.envyoff = false;
	334	+ group.skyboxname = skybox;
	335	+ group.skyboxext = "jpg";
	336	+ cameraView.repaint();
	337	+ }
	338	+
	339	+ public void CreateSkyboxPanel(cGridBag skyboxPanel)
	340	+ {
	341	+ JTabbedPane skyboxpane = new JTabbedPane();
	342	+
	343	+ AddSkyboxTab0(skyboxpane);
	344	+ AddSkyboxTab1(skyboxpane);
	345	+ AddSkyboxTab2(skyboxpane);
	346	+ AddSkyboxTab3(skyboxpane);
	347	+
	348	+ skyboxPanel.add(skyboxpane);
	349	+ }
	350	+
	351	+ public void ChangeTexture(String texture)
	352	+ {
	353	+ for (int i=0; i<group.selection.size(); i++)
	354	+ {
	355	+ Object3D obj = group.selection.get(i);
	356	+ obj.SetPigmentTexture("@" + texture);
	357	+ }
	358	+
	359	+ refreshContents();
	360	+ }
	361	+
	362	+ public void Show3DView()
	363	+ {
	364	+ // bug
	365	+ //gridPanel.setDividerLocation(1.0);
	366	+ //bigPanel.setDividerLocation(0.0);
	367	+ bigThree.ClearUI();
	368	+ bigThree.add(centralPanel);
	369	+ bigThree.FlushUI();
	370	+ }
	371	+
25	372	//ObjEditor objEditor;
26	373	public void closeUI2()
27	374	{
..	..	@@ -59,6 +406,14 @@
59	406	this.copy = this.group = group;
60	407	//selectees = this.group.selectees;
61	408
	409	+ if (copy.versionlist == null)
	410	+ {
	411	+ copy.versionlist = new Object3D[100];
	412	+ copy.versionindex = -1;
	413	+
	414	+ Save(true);
	415	+ }
	416	+
62	417	if(ui)
63	418	SetupUI(objEditor);
64	419	}
..	..	@@ -73,17 +428,29 @@
73	428	this.copy = this.group = copy;
74	429	//selectees = this.group.selectees;
75	430
76		- SetupMenu2(objEditor);
	431	+ SetupMenu2(this); //objEditor);
77	432	SetupUI2(objEditor);
78	433	objEditor.SetupUI(true);
79	434	SetupViews(objEditor);
80	435
81	436	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	437	+
	438	+ if (copy.versionlist == null)
	439	+ {
	440	+ copy.versionlist = new Object3D[100];
	441	+ copy.versionindex = -1;
	442	+
	443	+ Save(true);
	444	+ }
82	445	}
83	446
84	447	void CloneSelection(boolean supports)
85	448	{
86		- // Object3D keep = GraphreeD.clipboard;
	449	+ if (Globals.REPLACEONMAKE)
	450	+ Save();
	451	+ boolean keep = Globals.REPLACEONMAKE;
	452	+ Globals.REPLACEONMAKE = false;
	453	+ // Object3D keep = GrafreeD.clipboard;
87	454	//Object3D obj;
88	455	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
89	456	{
..	..	@@ -93,18 +460,19 @@
93	460
94	461	makeSomething(clone, i==group.selection.size()-1);
95	462	}
	463	+ Globals.REPLACEONMAKE = keep;
96	464	}
97	465
98	466	void CloneClipboard(boolean supports)
99	467	{
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));
	468	+ assert(Grafreed.clipboard.parent == null);
	469	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	470	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	471	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	472	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
105	473	else
106		- makeSomething(CloneObject(GraphreeD.clipboard, false));
107		- GraphreeD.clipboard.get(0).parent = keepparent;
	474	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	475	+ Grafreed.clipboard.get(0).parent = keepparent;
108	476	}
109	477
110	478	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -118,7 +486,7 @@
118	486	// obj.support = null;
119	487	if (!supports)
120	488	obj.SaveSupports();
121		- Object3D clone = (Object3D)GraphreeD.clone(obj);
	489	+ Object3D clone = (Object3D)Grafreed.clone(obj);
122	490	obj.parent = parent;
123	491	// obj.support = support;
124	492	// clone.support = support; // aout 2013
..	..	@@ -147,30 +515,29 @@
147	515
148	516	//JTextField nameField;
149	517
150		- void SetupMenu2(ObjEditor oe)
	518	+ void SetupMenu2(GroupEditor oe)
151	519	{
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);
	520	+ oe.jTree = new cTree();
	521	+
163	522	Menu menu;
164	523	oe.menuBar.add(menu = new Menu("Edit"));
165	524	//editItem = menu.add(new MenuItem("Edit"));
166	525	//editItem.addActionListener(this);
167		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	526	+
	527	+// undoItem = menu.add(new MenuItem("Undo"));
	528	+// undoItem.addActionListener(this);
	529	+// redoItem = menu.add(new MenuItem("Redo"));
	530	+// redoItem.addActionListener(this);
	531	+// menu.add("-");
	532	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
168	533	duplicateItem.addActionListener(this);
169		- menu.add("-");
170	534	cloneItem = menu.add(new MenuItem("Clone"));
171	535	cloneItem.addActionListener(this);
	536	+ if (Globals.ADVANCED)
	537	+ {
172	538	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
173	539	cloneSupportItem.addActionListener(this);
	540	+ }
174	541	menu.add("-");
175	542	cutItem = menu.add(new MenuItem("Cut"));
176	543	cutItem.addActionListener(this);
..	..	@@ -178,26 +545,121 @@
178	545	copyItem.addActionListener(this);
179	546	pasteItem = menu.add(new MenuItem("Paste"));
180	547	pasteItem.addActionListener(this);
	548	+
	549	+ menu.add("-");
	550	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	551	+ pasteIntoItem.addActionListener(this);
181	552	pasteLinkItem = menu.add(new MenuItem("Paste link"));
182	553	pasteLinkItem.addActionListener(this);
183	554	pasteCloneItem = menu.add(new MenuItem("Paste clone"));
184	555	pasteCloneItem.addActionListener(this);
185	556	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
186	557	// pasteExpandItem.addActionListener(this);
187		- clearItem = menu.add(new MenuItem("Clear"));
188		- clearItem.addActionListener(this);
	558	+ menu.add("-");
	559	+ deleteItem = menu.add(new MenuItem("Delete"));
	560	+ deleteItem.addActionListener(this);
	561	+
	562	+ if (Globals.ADVANCED)
	563	+ {
	564	+ // Deletes the cameras...
189	565	clearAllItem = menu.add(new MenuItem("Clear All"));
190	566	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);
	567	+ }
	568	+
	569	+ menuBar.add(cameraMenu = new Menu("View"));
	570	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	571	+ //zBufferItem.addActionListener(this);
	572	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	573	+ //normalLensItem.addActionListener(this);
	574	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	575	+ restoreCameraItem.addActionListener(this);
	576	+
	577	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	578	+// toggleFullScreenItem.addItemListener(this);
	579	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	580	+// cameraMenu.add("-");
	581	+//
	582	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	583	+// toggleTextureItem.addItemListener(this);
	584	+// toggleTextureItem.setState(CameraPane.textureon);
	585	+//
	586	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	587	+// toggleSwitchItem.addItemListener(this);
	588	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	589	+
	590	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	591	+ toggleHandleItem.addItemListener(this);
	592	+ toggleHandleItem.setState(CameraPane.HANDLES);
	593	+
	594	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	595	+ togglePaintItem.addItemListener(this);
	596	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	597	+
	598	+ if (Globals.ADVANCED)
	599	+ {
	600	+ cameraMenu.add("-");
	601	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	602	+ toggleLiveItem.addItemListener(this);
	603	+ toggleLiveItem.setState(Globals.isLIVE());
	604	+
	605	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	606	+ stepItem.addActionListener(this);
	607	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	608	+ // toggleDLItem.addItemListener(this);
	609	+ // toggleDLItem.setState(false);
	610	+
	611	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	612	+ toggleRenderItem.addItemListener(this);
	613	+ toggleRenderItem.setState(!CameraPane.frozen);
	614	+
	615	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	616	+ toggleDebugItem.addItemListener(this);
	617	+ toggleDebugItem.setState(Globals.DEBUG);
	618	+
	619	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	620	+ toggleFrustumItem.addItemListener(this);
	621	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	622	+
	623	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	624	+ toggleFootContactItem.addItemListener(this);
	625	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	626	+
	627	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	628	+ toggleTimelineItem.addItemListener(this);
	629	+ }
	630	+
	631	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	632	+// toggleRootItem.addItemListener(this);
	633	+// toggleRootItem.setState(false);
	634	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	635	+// animationItem.addItemListener(this);
	636	+// animationItem.setState(CameraPane.ANIMATION);
	637	+ cameraMenu.add("-");
	638	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	639	+ editCameraItem.addActionListener(this);
	640	+
	641	+ if (Globals.ADVANCED)
	642	+ {
	643	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	644	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	645	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	646	+ oe.cameraMenu.add("-");
	647	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	648	+ openWindowItem.addActionListener(this);
	649	+ lookAtItem.addActionListener(this);
	650	+ //lookFromItem.addActinoListener(this);
	651	+ //switchViewItem.addActionListener(this);
	652	+ }
	653	+
	654	+ oe.menuBar.add(menu = new Menu("Setting"));
	655	+ if (Globals.ADVANCED)
	656	+ {
196	657	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
197	658	revertMeshItem.addActionListener(this);
198	659	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
199	660	resetreferencesItem.addActionListener(this);
200	661	menu.add("-");
	662	+ }
201	663	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
202	664	overwriteGeoItem.addActionListener(this);
203	665	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -209,72 +671,104 @@
209	671	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
210	672	overwriteUVItem.addActionListener(this);
211	673	menu.add("-");
	674	+ if (Globals.ADVANCED)
	675	+ {
212	676	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
213	677	generateMeshItem.addActionListener(this);
214	678	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
215	679	poseMeshItem.addActionListener(this);
216	680	menu.add("-");
	681	+ }
217	682	resetsupportItem = menu.add(new MenuItem("Reset support"));
218	683	resetsupportItem.addActionListener(this);
219	684	linkverticesItem = menu.add(new MenuItem("Link to Support"));
220	685	linkverticesItem.addActionListener(this);
	686	+ relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
	687	+ relinkverticesItem.addActionListener(this);
	688	+
	689	+ if (Globals.ADVANCED)
	690	+ {
221	691	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
222	692	setMasterItem.addActionListener(this);
	693	+ }
223	694
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);
	695	+ oe.menuBar.add(menu = new Menu("Group"));
	696	+// grabItem = menu.add(new MenuItem("Grab"));
	697	+// grabItem.addActionListener(this);
229	698	backItem = menu.add(new MenuItem("Back"));
230	699	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);
	700	+ frontItem = menu.add(new MenuItem("Front"));
	701	+ frontItem.addActionListener(this);
	702	+// compositeItem = menu.add(new MenuItem("Composite"));
	703	+// compositeItem.addActionListener(this);
	704	+
	705	+ if (Globals.ADVANCED)
	706	+ {
	707	+ hideItem = menu.add(new MenuItem("Hidden Group"));
	708	+ hideItem.addActionListener(this);
	709	+ }
	710	+ ungroupItem = menu.add(new MenuItem("Ungroup"));
	711	+ ungroupItem.addActionListener(this);
	712	+
	713	+// menu.add("-");
	714	+//
	715	+// switchItem = menu.add(new MenuItem("Switch node"));
	716	+// switchItem.addActionListener(this);
	717	+ if (Globals.ADVANCED)
	718	+ {
240	719	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
241	720	switchGeoItem.addActionListener(this);
242	721	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
243	722	switchTransfoItem.addActionListener(this);
244		- morphItem = menu.add(new MenuItem("Morph"));
	723	+ morphItem = menu.add(new MenuItem("Morph Group"));
245	724	morphItem.addActionListener(this);
	725	+
	726	+ menu.add("-");
	727	+ physicsItem = menu.add(new MenuItem("Physics"));
	728	+ physicsItem.addActionListener(this);
	729	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	730	+ frameselectorItem.addActionListener(this);
246	731	scriptNodeItem = menu.add(new MenuItem("Script Node"));
247	732	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);
	733	+ }
	734	+
	735	+ oe.menuBar.add(menu = new Menu("Object"));
	736	+// textureItem = menu.add(new MenuItem("Texture"));
	737	+// textureItem.addActionListener(this);
	738	+ billboardItem = menu.add(new MenuItem("Billboard"));
	739	+ billboardItem.addActionListener(this);
253	740	csgItem = menu.add(new MenuItem("CSG"));
254	741	csgItem.addActionListener(this);
255		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	742	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
256	743	shadowXItem.addActionListener(this);
257		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	744	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
258	745	shadowYItem.addActionListener(this);
259		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	746	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
260	747	shadowZItem.addActionListener(this);
	748	+ attributeItem = menu.add(new MenuItem("Attribute"));
	749	+ attributeItem.addActionListener(this);
	750	+
	751	+ if (Globals.ADVANCED)
	752	+ {
	753	+ menu.add("-");
261	754	linkerItem = menu.add(new MenuItem("Linker"));
262	755	linkerItem.addActionListener(this);
263	756	templateItem = menu.add(new MenuItem("Template"));
264	757	templateItem.addActionListener(this);
265		- attributeItem = menu.add(new MenuItem("Attribute"));
266		- attributeItem.addActionListener(this);
267	758	pointflowItem = menu.add(new MenuItem("Point Flow"));
268	759	pointflowItem.addActionListener(this);
	760	+ }
269	761	menu.add("-");
270		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
271		- transformgeometryItem.addActionListener(this);
272	762	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
273	763	resetTransformItem.addActionListener(this);
274	764	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
275	765	resetCentroidItem.addActionListener(this);
276		- ungroupItem = menu.add(new MenuItem("Ungroup"));
277		- ungroupItem.addActionListener(this);
	766	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	767	+ resetCentroidXZItem.addActionListener(this);
	768	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	769	+ transformGeometryItem.addActionListener(this);
	770	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	771	+ transformChildrenItem.addActionListener(this);
278	772
279	773	oe.menuBar.add(menu = new Menu("Geometry"));
280	774	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -283,6 +777,13 @@
283	777	genNormalsORGANItem.addActionListener(this);
284	778	genNormalsCADItem = menu.add(new MenuItem("CAD Normals"));
285	779	genNormalsCADItem.addActionListener(this);
	780	+ genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
	781	+ genNormalsMESHItem.addActionListener(this);
	782	+ if (Globals.ADVANCED)
	783	+ {
	784	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
	785	+ genNormalsMINEItem.addActionListener(this);
	786	+ }
286	787	stripifyItem = menu.add(new MenuItem("Stripify"));
287	788	stripifyItem.addActionListener(this);
288	789	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -292,8 +793,6 @@
292	793	untrimItem = menu.add(new MenuItem("Untrim"));
293	794	untrimItem.addActionListener(this);
294	795	menu.add("-");
295		- clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
296		- clearMaterialsItem.addActionListener(this);
297	796	clearColorsItem = menu.add(new MenuItem("Clear AO"));
298	797	clearColorsItem.addActionListener(this);
299	798	reverseNormalsItem = menu.add(new MenuItem("Reverse Normals"));
..	..	@@ -306,19 +805,34 @@
306	805	reduce34MeshItem.addActionListener(this);
307	806	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
308	807	increaseMeshItem.addActionListener(this);
309		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
310		- smoothMeshItem.addActionListener(this);
311	808	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
312	809	clipMeshItem.addActionListener(this);
	810	+
	811	+ if (Globals.ADVANCED)
	812	+ {
	813	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	814	+ smoothMeshItem.addActionListener(this);
	815	+ }
	816	+
	817	+ oe.menuBar.add(menu = new Menu("Attributes"));
	818	+ clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
	819	+ clearMaterialsItem.addActionListener(this);
	820	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	821	+ resetAllItem.addActionListener(this);
	822	+ stepAllItem = menu.add(new MenuItem("Step All"));
	823	+ stepAllItem.addActionListener(this);
313	824	menu.add("-");
314	825	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
315	826	liveleavesItem.addActionListener(this);
316	827	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
317	828	unliveleavesItem.addActionListener(this);
	829	+ if (Globals.ADVANCED)
	830	+ {
318	831	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
319	832	supportleavesItem.addActionListener(this);
320	833	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
321	834	unsupportleavesItem.addActionListener(this);
	835	+ }
322	836	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
323	837	hideleavesItem.addActionListener(this);
324	838	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -327,32 +841,31 @@
327	841	markleavesItem.addActionListener(this);
328	842	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
329	843	unmarkleavesItem.addActionListener(this);
	844	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	845	+ rewindleavesItem.addActionListener(this);
	846	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	847	+ unrewindleavesItem.addActionListener(this);
	848	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	849	+ randomleavesItem.addActionListener(this);
	850	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	851	+ unrandomleavesItem.addActionListener(this);
330	852	menu.add("-");
331	853	flipVItem = menu.add(new MenuItem("Flip V"));
332	854	flipVItem.addActionListener(this);
333	855	unflipVItem = menu.add(new MenuItem("Unflip V"));
334	856	unflipVItem.addActionListener(this);
335		- lowTexturesItem = menu.add(new MenuItem("Low Texture"));
	857	+ lowTexturesItem = menu.add(new MenuItem("Low Texture (256)"));
336	858	lowTexturesItem.addActionListener(this);
337		- normalTexturesItem = menu.add(new MenuItem("Normal Texture"));
	859	+ normalTexturesItem = menu.add(new MenuItem("Normal Texture (512)"));
338	860	normalTexturesItem.addActionListener(this);
339		- highTexturesItem = menu.add(new MenuItem("High Texture"));
	861	+ highTexturesItem = menu.add(new MenuItem("High Texture (1024)"));
340	862	highTexturesItem.addActionListener(this);
341		- veryhighTexturesItem = menu.add(new MenuItem("Very high Texture"));
	863	+ veryhighTexturesItem = menu.add(new MenuItem("Very high Texture (2048)"));
342	864	veryhighTexturesItem.addActionListener(this);
343		- maxTexturesItem = menu.add(new MenuItem("Max Texture"));
	865	+ maxTexturesItem = menu.add(new MenuItem("Max Texture (4096)"));
344	866	maxTexturesItem.addActionListener(this);
345		- panoTexturesItem = menu.add(new MenuItem("Panoramic Texture"));
	867	+ panoTexturesItem = menu.add(new MenuItem("Panoramic Texture (8192)"));
346	868	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	869
357	870	oe.menuBar.add(menu = new Menu("Selection"));
358	871	attachPigmentItem = menu.add(new MenuItem("Attach Pigment..."));
..	..	@@ -361,31 +874,129 @@
361	874	attachBumpItem.addActionListener(this);
362	875	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
363	876	pigmentBumpItem.addActionListener(this);
	877	+ //embedTexturesItem
364	878	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
365	879	detachPigmentItem.addActionListener(this);
366	880	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
367	881	detachBumpItem.addActionListener(this);
	882	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	883	+ embedTexturesItem.addActionListener(this);
	884	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	885	+ deEmbedTexturesItem.addActionListener(this);
368	886	menu.add("-");
369	887	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
370	888	sortbysizeItem.addActionListener(this);
371	889	sortbynameItem = menu.add(new MenuItem("Sort by name"));
372	890	sortbynameItem.addActionListener(this);
	891	+ menu.add("-");
	892	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	893	+ shareGeometriesItem.addActionListener(this);
	894	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	895	+ mergeGeometriesItem.addActionListener(this);
	896	+ menu.add("-");
	897	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	898	+ editLeafItem.addActionListener(this);
	899	+ if (Globals.ADVANCED)
	900	+ {
	901	+ // Pretty much the same as duplicate and clone.
	902	+ extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
	903	+ extractGeometriesItem.addActionListener(this);
	904	+ cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
	905	+ cloneGeometriesItem.addActionListener(this);
	906	+ }
	907	+
373	908	oe.menuBar.add(menu = new Menu("Insert"));
374	909	buildCreateMenu(menu);
375		- oe.menuBar.add(menu = new Menu("Tools"));
	910	+
	911	+ oe.menuBar.add(menu = new Menu("Tools"));
376	912	buildToolsMenu(menu);
377	913	}
378	914
	915	+ JTabbedPane resourcecontainer;
	916	+ cGridBag currenttab;
	917	+ boolean added; // patch for jar
	918	+
	919	+ int tabcount = 0;
	920	+ int colcount = 0;
	921	+ int rowcount = 0;
	922	+ int texturecount = 0;
	923	+
	924	+ int columns = 5;
	925	+ int rows = 7;
	926	+
	927	+ public void ResourceCallBack(String[] path)
	928	+ {
	929	+// for (int i = 0; i < path.length; i++)
	930	+// System.out.print(path[i] + "/");
	931	+// System.out.println();
	932	+
	933	+ if (//rowcount == 0 \|\|
	934	+ path.length == 1)
	935	+ {
	936	+ currenttab = new cGridBag();
	937	+ added = false;
	938	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	939	+ currenttab.setName(tabname);
	940	+ rowcount = 1;
	941	+ colcount = 0;
	942	+ texturecount = 0;
	943	+ }
	944	+
	945	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	946	+ {
	947	+ if (!added)
	948	+ {
	949	+ added = true;
	950	+ resourcecontainer.add(currenttab);
	951	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	952	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	953	+ }
	954	+
	955	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	956	+
	957	+ if (++colcount >= columns)
	958	+ {
	959	+ colcount = 0;
	960	+ currenttab.Return();
	961	+
	962	+ if (rowcount++ >= rows)
	963	+ {
	964	+ rowcount = 0;
	965	+ }
	966	+ }
	967	+ }
	968	+ else
	969	+ {
	970	+// if (!path[path.length-1].equals("icons"))
	971	+// resourcecontainer.Return();
	972	+ }
	973	+ }
	974	+
	975	+ void CreateTexturePanel(cGridBag container)
	976	+ {
	977	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	978	+ container.add(resourcecontainer);
	979	+
	980	+ Grafreed.ParseResources("textures", this);
	981	+ }
	982	+
379	983	void SetupUI2(ObjEditor oe)
380	984	{
	985	+ // June 2019
	986	+ if (oe == null)
	987	+ {
	988	+ //super.SetupUI2(this);
	989	+ //return;
	990	+ }
	991	+
	992	+ if (copy != group)
	993	+ {
	994	+ //super.SetupUI2(this);
	995	+ }
	996	+
381	997	//new Exception().printStackTrace();
382	998
383	999	oe.radioPanel = new JPanel(new GridBagLayout());
384		- oe.aConstraints.weightx = 1;
385		- oe.aConstraints.weighty = 0;
386		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
387		- oe.aConstraints.gridwidth = 100;
388		- oe.aConstraints.gridheight = 1;
389	1000	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
390	1001
391	1002	oe.buttonGroup = new ButtonGroup();
..	..	@@ -406,150 +1017,263 @@
406	1017	oe.radioPanel.add(dummyButton);
407	1018	oe.buttonGroup.add(dummyButton);
408	1019	*/
409		- aConstraints.gridy += 1;
410		- oe.aConstraints.gridwidth = 1;
411		- oe.aConstraints.gridx = 0;
	1020	+ cGridBag copyOptionsPanel = new cGridBag();
	1021	+
	1022	+ copyOptionsPanel.preferredHeight = 2;
412	1023
413		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
	1024	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
	1025	+
	1026	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1027	+ //minButton.setToolTipText("Minimize window");
	1028	+ //minButton.addActionListener(this);
	1029	+
	1030	+ if (Globals.ADVANCED)
	1031	+ {
	1032	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1033	+// maxButton.setToolTipText("Maximize window");
	1034	+// maxButton.addActionListener(this);
	1035	+ }
	1036	+
	1037	+// cButton gcButton;
	1038	+//
	1039	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1040	+// gcButton.setToolTipText("Garbage collect");
	1041	+// gcButton.addActionListener(new ActionListener()
	1042	+// {
	1043	+// public void actionPerformed(ActionEvent e)
	1044	+// {
	1045	+// System.gc();
	1046	+// }
	1047	+// });
	1048	+
	1049	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1050	+ collapseButton.setToolTipText("Collapse toolbar");
	1051	+ collapseButton.addActionListener(this);
	1052	+
	1053	+ oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1054	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1055	+ maximize3DButton.addActionListener(this);
	1056	+
	1057	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1058	+ twoButton.setToolTipText("Show 3D view only");
	1059	+ twoButton.addActionListener(this);
	1060	+ this.fullscreenLayout = twoButton;
	1061	+
	1062	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1063	+ threeButton.setToolTipText("Show controls and 3D view");
	1064	+ threeButton.addActionListener(this);
	1065	+ if (Globals.ADVANCED)
	1066	+ {
	1067	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1068	+ sixButton.setToolTipText("Show 3D view and controls");
	1069	+ sixButton.addActionListener(this);
	1070	+ }
	1071	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1072	+// sevenButton.setToolTipText("3-column layout");
	1073	+// sevenButton.addActionListener(this);
	1074	+ //
	1075	+
	1076	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1077	+ fullButton.setToolTipText("Full-screen window");
	1078	+ fullButton.addActionListener(this);
	1079	+
	1080	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1081	+ screenfitButton.setToolTipText("Screen fit");
	1082	+ screenfitButton.addActionListener(this);
	1083	+
	1084	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1085	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1086	+ restoreCameraButton.addActionListener(this);
	1087	+
	1088	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1089	+ saveVersionButton.setToolTipText("Duplicate current version");
	1090	+ saveVersionButton.addActionListener(this);
	1091	+
	1092	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1093	+ deleteVersionButton.setToolTipText("Delete current version");
	1094	+ deleteVersionButton.addActionListener(this);
	1095	+
	1096	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1097	+ previousVersionButton.setToolTipText("Previous version");
	1098	+ previousVersionButton.addActionListener(this);
	1099	+ previousVersionButton.setEnabled(false);
	1100	+
	1101	+ cGridBag updown = new cGridBag().setVertical(true);
	1102	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1103	+ restoreButton.setToolTipText("Undo (restore current version)");
	1104	+ restoreButton.addActionListener(this);
	1105	+ //restoreButton.setEnabled(false);
	1106	+
	1107	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1108	+ replaceButton.setToolTipText("Save (replace current version)");
	1109	+ replaceButton.addActionListener(this);
	1110	+ //replaceButton.setEnabled(false);
	1111	+
	1112	+ copyOptionsPanel.add(updown);
	1113	+
	1114	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1115	+ nextVersionButton.setToolTipText("Next version");
	1116	+ nextVersionButton.addActionListener(this);
	1117	+ nextVersionButton.setEnabled(false);
	1118	+
	1119	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1120	+ oneStepButton.setToolTipText("Animate one step forward");
	1121	+ oneStepButton.addActionListener(this);
	1122	+
	1123	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1124	+ liveCB.setToolTipText("Enable animation");
414	1125	liveCB.addItemListener(this);
415	1126
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);
	1127	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	1128	+ fastCB.setToolTipText("Fast mode");
434	1129	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);
	1130	+
	1131	+ //oe.toolboxPanel.Return();
	1132	+
	1133	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1134	+// trackCB.setToolTipText("Enable tracking");
	1135	+// trackCB.addItemListener(this);
441	1136
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	1137	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
483	1138	// 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	1139
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);
	1140	+ if (Globals.ADVANCED)
	1141	+ {
	1142	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1143	+ snapobjectButton.addActionListener(this);
	1144	+ snapobjectButton.setToolTipText("Snap Object");
	1145	+
	1146	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
504	1147	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);
508		- threeButton.addActionListener(this);
509		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
510		- sevenButton.addActionListener(this);
511		- //
	1148	+ fourButton.setToolTipText("Show control panel only");
	1149	+ }
512	1150
513		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	1151	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	1152	+
	1153	+
	1154	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1155	+ rootButton.setToolTipText("Open selection in new tab");
514	1156	rootButton.addActionListener(this);
515		- oe.aConstraints.gridx += 1;
516		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	1157	+
	1158	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1159	+ closeButton.setToolTipText("Close tab");
517	1160	closeButton.addActionListener(this);
518	1161	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
519	1162	//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	1163
529		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	1164	+ cGridBag row1 = new cGridBag();
	1165	+
	1166	+ // INSERT
	1167	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1168	+ gridButton.setToolTipText("Create ground");
	1169	+ gridButton.addActionListener(this);
	1170	+
	1171	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1172	+ boxButton.setToolTipText("Create box");
	1173	+ boxButton.addActionListener(this);
	1174	+
	1175	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1176	+ sphereButton.setToolTipText("Create sphere");
	1177	+ sphereButton.addActionListener(this);
	1178	+
	1179	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1180	+ coneButton.setToolTipText("Create cone");
	1181	+ coneButton.addActionListener(this);
	1182	+
	1183	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1184	+ torusButton.setToolTipText("Create torus");
	1185	+ torusButton.addActionListener(this);
	1186	+
	1187	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1188	+ superButton.setToolTipText("Create superellipsoid");
	1189	+ superButton.addActionListener(this);
	1190	+
	1191	+ if (Globals.ADVANCED)
	1192	+ {
	1193	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1194	+ kleinButton.setToolTipText("Create Klein bottle");
	1195	+ kleinButton.addActionListener(this);
	1196	+ }
	1197	+
	1198	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1199	+ particlesButton.setToolTipText("Create particle system");
	1200	+ particlesButton.addActionListener(this);
	1201	+
	1202	+ oe.toolboxPanel.add(row1);
	1203	+
	1204	+ cGridBag row2 = new cGridBag();
	1205	+
	1206	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1207	+ groupButton.setToolTipText("Create group");
	1208	+ groupButton.addActionListener(this);
	1209	+
	1210	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1211	+ compositeButton.setToolTipText("Create composite");
	1212	+ compositeButton.addActionListener(this);
	1213	+
	1214	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1215	+ switchButton.setToolTipText("Create item switcher");
	1216	+ switchButton.addActionListener(this);
	1217	+
	1218	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1219	+ loopButton.setToolTipText("Create loop");
	1220	+ loopButton.addActionListener(this);
	1221	+
	1222	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1223	+ textureButton.setToolTipText("Create texture");
	1224	+ textureButton.addActionListener(this);
	1225	+
	1226	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1227	+ overlayButton.setToolTipText("Create overlay");
	1228	+ overlayButton.addActionListener(this);
	1229	+
	1230	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1231	+ lightButton.setToolTipText("Create light");
	1232	+ lightButton.addActionListener(this);
	1233	+
	1234	+ oe.toolboxPanel.add(row2);
	1235	+
	1236	+ cGridBag textures = new cGridBag();
	1237	+
	1238	+ CreateTexturePanel(textures);
	1239	+
	1240	+ oe.toolboxPanel.add(textures);
	1241	+
	1242	+ textures.preferredHeight = 100;
	1243	+
	1244	+ CreateSkyboxPanel(oe.skyboxPanel);
	1245	+
	1246	+ // EDIT panel
	1247	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1248	+ editButton.setToolTipText("Pin selection controls");
	1249	+ editButton.addActionListener(this);
	1250	+
	1251	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1252	+ uneditButton.setToolTipText("Unpin and remove selection controls");
530	1253	uneditButton.addActionListener(this);
531	1254
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);
	1255	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1256	+ allParamsButton.setToolTipText("Show all controls");
544	1257	allParamsButton.addActionListener(this);
545	1258
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);
	1259	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1260	+ clearPanelButton.setToolTipText("Clear all controls");
	1261	+ clearPanelButton.addActionListener(this);
552	1262
	1263	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1264	+ //unselectButton.setToolTipText("Unselect");
	1265	+ //unselectButton.addActionListener(this);
	1266	+
	1267	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1268	+ flashSelectionButton.setToolTipText("Highlight selection");
	1269	+ flashSelectionButton.addActionListener(this);
	1270	+
	1271	+ editCommandsPanel.preferredHeight = 1;
	1272	+
	1273	+ SetPinStates(false);
	1274	+// oe.treePanel.add(commandsPanel);
	1275	+// oe.treePanel.Return();
	1276	+
553	1277	// oe.aConstraints.gridx += 1;
554	1278	// oe.aConstraints.weighty = 0;
555	1279	// oe.aConstraints.gridwidth = 1;
..	..	@@ -561,47 +1285,32 @@
561	1285	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
562	1286	// gcButton.addActionListener(this);
563	1287
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;
	1288	+ cGridBag jSPPanel = new cGridBag();
	1289	+
	1290	+ JScrollPane jSP;
575	1291	//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);
	1292	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
577	1293	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	1294
	1295	+ oe.treePanel.add(jSPPanel);
	1296	+ oe.treePanel.Return();
	1297	+
	1298	+ oe.treePanel.add(copyOptionsPanel);
	1299	+ oe.treePanel.Return();
	1300	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1301	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1302	+ sliderPane.preferredHeight = 1;
	1303	+
	1304	+// mainPanel.setDividerLocation(0.1); //1.0);
	1305	+ mainPanel.setResizeWeight(0.4);
	1306	+
598	1307	//jList.addListSelectionListener(this);
599	1308	oe.jTree.addTreeSelectionListener(this);
600	1309	//jTree.setRootVisible(false);
601	1310	//jTree.setEditable(true);
602	1311	oe.jTree.setDragEnabled(true);
603	1312	//jTree.setPreferredSize(new Dimension(10,10));
604		- jSP.setPreferredSize(new Dimension(100,200));
	1313	+ //jSP.setPreferredSize(new Dimension(100,200));
605	1314
606	1315	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
607	1316
..	..	@@ -613,23 +1322,171 @@
613	1322	dgr.addDragGestureListener(this);
614	1323	}catch(Exception e) {}
615	1324	*/
616		- radio.layout = sevenButton;
	1325	+ radio.layout = threeButton; // sixButton;
617	1326	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
618	1327	}
	1328	+
	1329	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	1330	+ {
	1331	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1332	+ colorCB.setToolTipText("Copy color when dropped");
	1333	+ colorCB.addItemListener(this);
	1334	+
	1335	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1336	+ materialCB.setToolTipText("Copy material when dropped");
	1337	+ materialCB.addItemListener(this);
	1338	+
	1339	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1340	+ textureCB.setToolTipText("Copy texture when dropped");
	1341	+ textureCB.addItemListener(this);
	1342	+
	1343	+ panel.Return();
	1344	+
	1345	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	1346	+ boxCB.setToolTipText("Display bounding boxes");
	1347	+ boxCB.addItemListener(this);
	1348	+
	1349	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	1350	+ zoomBoxCB.setToolTipText("Display only for wheel");
	1351	+ zoomBoxCB.addItemListener(this);
	1352	+
	1353	+ if (true) // Globals.ADVANCED)
	1354	+ {
	1355	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1356	+// supportCB.setToolTipText("Enable rigging");
	1357	+// supportCB.addItemListener(this);
	1358	+
	1359	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1360	+ freezeCB.setToolTipText("Fast moving camera");
	1361	+ freezeCB.addItemListener(this);
	1362	+
	1363	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	1364	+ // localCB.addItemListener(this);
	1365	+
	1366	+ panel.Return();
	1367	+
	1368	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	1369	+ crowdCB.setToolTipText("Used for crowds");
	1370	+ crowdCB.addItemListener(this);
	1371	+
	1372	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	1373	+ smoothCB.setToolTipText("Snapping delay");
	1374	+ smoothCB.addItemListener(this);
	1375	+
	1376	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1377	+// slowCB.setToolTipText("Smooth interpolation");
	1378	+// slowCB.addItemListener(this);
	1379	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1380	+ minshaderCB.setToolTipText("Minimal fast shader");
	1381	+ minshaderCB.addItemListener(this);
	1382	+
	1383	+// constraints.gridy += 1;
	1384	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	1385	+// speakerMocapCB.addItemListener(this);
	1386	+
	1387	+ panel.Return();
	1388	+
	1389	+ if (false)
	1390	+ {
	1391	+ // handled in scripts
	1392	+ //constraints.gridy += 1;
	1393	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	1394	+ speakerCameraCB.addItemListener(this);
	1395	+
	1396	+ //constraints.gridy += 1;
	1397	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	1398	+ speakerFocusCB.addItemListener(this);
	1399	+
	1400	+ //constraints.gridy += 1;
	1401	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	1402	+ smoothfocusCB.addItemListener(this);
	1403	+ panel.Return();
	1404	+ }
	1405	+
	1406	+//constraints.gridx += 1;
	1407	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	1408	+// debugCB.addItemListener(this);
	1409	+
	1410	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1411	+ trackCB.setToolTipText("Enable tracking target");
	1412	+ trackCB.addItemListener(this);
	1413	+
	1414	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1415	+ oeilCB.setToolTipText("Move camera when tracking");
	1416	+ oeilCB.addItemListener(this);
	1417	+
	1418	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1419	+ shadowCB.setToolTipText("When live compute shadows");
	1420	+ shadowCB.addItemListener(this);
	1421	+
	1422	+ panel.Return();
	1423	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1424	+ toggleTextureCB.setToolTipText("Load textures");
	1425	+ toggleTextureCB.addItemListener(this);
	1426	+
	1427	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1428	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1429	+ toggleSwitchCB.addItemListener(this);
	1430	+
	1431	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1432	+ autokeepCB.setToolTipText("On structure change");
	1433	+ autokeepCB.addItemListener(this);
	1434	+
	1435	+ panel.Return();
	1436	+ if (Globals.ADVANCED)
	1437	+ {
	1438	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	1439	+ lookAtCB.setToolTipText("Look-at target");
	1440	+ lookAtCB.addItemListener(this);
	1441	+ }
	1442	+
	1443	+ }
	1444	+
	1445	+ cGridBag fill = new cGridBag();
	1446	+ fill.preferredHeight = 200;
	1447	+ cGridBag fill2 = new cGridBag();
	1448	+ fill2.preferredHeight = 200;
	1449	+ cGridBag fill3 = new cGridBag();
	1450	+ fill3.preferredHeight = 200;
	1451	+
	1452	+ panel.add(fill);
	1453	+ panel.add(fill2);
	1454	+ panel.add(fill3);
	1455	+
	1456	+ }
619	1457
620	1458	void EditObject(Object3D obj)
621	1459	{
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();
	1460	+ assert(obj instanceof Composite);
	1461	+
	1462	+ if (obj.versionlist == null)
	1463	+ {
	1464	+ obj.versionlist = new Object3D[100];
	1465	+ obj.versionindex = -1;
	1466	+ }
	1467	+
	1468	+ cRadio radioButton = new cRadio(obj.name);
	1469	+
	1470	+ // June 2019. Patch to avoid bug with transparency.
	1471	+ radioButton.hadMaterial = obj.material != null;
	1472	+ if (!radioButton.hadMaterial)
	1473	+ {
	1474	+ obj.material = new cMaterial();
	1475	+ }
	1476	+
	1477	+ radioButton.SetObject(obj);
	1478	+ radioButton.layout = threeButton; // sixButton;
	1479	+ radioButton.SetCamera(cameraView.renderCamera, false);
	1480	+ radioButton.addActionListener(this);
	1481	+ radioPanel.add(radioButton);
	1482	+ buttonGroup.add(radioButton);
	1483	+ radioButton.doClick();
630	1484	}
	1485	+
631	1486	void SetupViews(ObjEditor oe)
632	1487	{
	1488	+ theFrame = this;
	1489	+
633	1490	oe.SetupViews();
634	1491
635	1492	System.out.println("SetupViews");
..	..	@@ -638,22 +1495,30 @@
638	1495	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
639	1496	}
640	1497
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;
	1498	+ cToggleButton liveCB;
	1499	+ cCheckBox supportCB;
	1500	+ cCheckBox localCB;
	1501	+ cCheckBox crowdCB;
	1502	+ cCheckBox smoothCB;
	1503	+ cCheckBox minshaderCB;
	1504	+
	1505	+ cToggleButton fastCB;
	1506	+ cCheckBox slowCB;
	1507	+ cCheckBox boxCB;
	1508	+ cCheckBox zoomBoxCB;
	1509	+ cCheckBox freezeCB;
	1510	+ //cToggleButton trackCB;
	1511	+ cCheckBox trackCB;
	1512	+ cCheckBox smoothfocusCB;
651	1513	// JCheckBox speakerMocapCB;
652		- JCheckBox speakerCameraCB;
653		- JCheckBox speakerFocusCB;
654		- JCheckBox debugCB;
655		- JCheckBox oeilCB;
656		- JCheckBox lookAtCB;
	1514	+ cCheckBox speakerCameraCB;
	1515	+ cCheckBox speakerFocusCB;
	1516	+ cCheckBox debugCB;
	1517	+
	1518	+ cCheckBox oeilCB;
	1519	+ cCheckBox shadowCB;
	1520	+ cCheckBox autokeepCB;
	1521	+ cCheckBox lookAtCB;
657	1522
658	1523	// static int COLOR = 1;
659	1524	// static int MATERIAL = 2;
..	..	@@ -661,9 +1526,9 @@
661	1526
662	1527	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
663	1528
664		- JCheckBox colorCB;
665		- JCheckBox materialCB;
666		- JCheckBox textureCB;
	1529	+ cCheckBox colorCB;
	1530	+ cCheckBox materialCB;
	1531	+ cCheckBox textureCB;
667	1532
668	1533	public void itemStateChanged(ItemEvent e)
669	1534	{
..	..	@@ -688,10 +1553,10 @@
688	1553	dropAttributes \|= Object3D.TEXTURE;
689	1554	else
690	1555	dropAttributes &= ~Object3D.TEXTURE;
691		- }
692		- else if(e.getSource() == liveCB)
	1556	+ } else if(e.getSource() == liveCB)
693	1557	{
694	1558	cameraView.ToggleLive();
	1559	+ refreshContents(false);
695	1560	}
696	1561	else if(e.getSource() == supportCB)
697	1562	{
..	..	@@ -707,6 +1572,12 @@
707	1572	{
708	1573	cameraView.ToggleInertia();
709	1574	cameraView.repaint();
	1575	+ }
	1576	+ else if(e.getSource() == minshaderCB)
	1577	+ {
	1578	+ Globals.MINSHADER ^= true;
	1579	+ cameraView.programInitialized = false;
	1580	+ cameraView.repaint();
710	1581	}
711	1582	else if(e.getSource() == localCB)
712	1583	{
..	..	@@ -726,6 +1597,10 @@
726	1597	Recompile();
727	1598	cameraView.repaint();
728	1599	// refreshContents();
	1600	+ }
	1601	+ else if(e.getSource() == zoomBoxCB)
	1602	+ {
	1603	+ cameraView.ToggleZoomBoxMode();
729	1604	}
730	1605	else if(e.getSource() == smoothfocusCB)
731	1606	{
..	..	@@ -752,6 +1627,18 @@
752	1627	{
753	1628	cameraView.ToggleOeil();
754	1629	}
	1630	+ else if(e.getSource() == shadowCB)
	1631	+ {
	1632	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1633	+ }
	1634	+ else if(e.getSource() == freezeCB)
	1635	+ {
	1636	+ Globals.FREEZEONMOVE ^= true;
	1637	+ }
	1638	+ else if(e.getSource() == autokeepCB)
	1639	+ {
	1640	+ Globals.REPLACEONMAKE ^= true;
	1641	+ }
755	1642	else if(e.getSource() == lookAtCB)
756	1643	{
757	1644	cameraView.ToggleLookAt();
..	..	@@ -768,7 +1655,8 @@
768	1655
769	1656	/**/
770	1657	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
771		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1658	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1659	+ TreePath path = objEditor.jTree.getSelectionPath();
772	1660	if ((path == null) \|\| (path.getPathCount() <= 1)) {
773	1661	// We can't move the root node or an empty selection
774	1662	return;
..	..	@@ -831,8 +1719,6 @@
831	1719	}
832	1720	}
833	1721
834		- String string = (String) object;
835		-
836	1722	System.out.println("Transfer = " + object + "; drop : " + target);
837	1723	// if( object instanceof java.io.File[])
838	1724	// {
..	..	@@ -840,7 +1726,11 @@
840	1726	// objEditor.DropFile((java.io.File[]) object, true);
841	1727	// return;
842	1728	// }
843		- if (string.charAt(0) == '/')
	1729	+
	1730	+ String string = object.toString();
	1731	+
	1732	+ // File path for Mac and Windows
	1733	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
844	1734	{
845	1735	// file(s)
846	1736	String[] names = string.split("\n");
..	..	@@ -867,7 +1757,7 @@
867	1757
868	1758	flashIt = false;
869	1759	CameraPane pane = (CameraPane) target;
870		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1760	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
871	1761	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
872	1762
873	1763	if (group.selection.size() == 1)
..	..	@@ -883,23 +1773,33 @@
883	1773
884	1774	assert target == objEditor.jTree;
885	1775	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1776	+ Object3D destinationLeaf;
886	1777	try {
887		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1778	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
888	1779	} catch (Exception e) {
889	1780	System.out.println("destinationPath : " + destinationPath);
890	1781	return;
891	1782	}
892	1783
893		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1784	+ for (int i=group.selection.size(); --i>=0;)
894	1785	{
	1786	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1787	+
	1788	+ // Cannot move into itself
	1789	+ if (child == destinationLeaf)
	1790	+ return;
	1791	+ }
	1792	+
	1793	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1794	+// {
895	1795	loadClipboard(true);
896	1796	objEditor.jTree.setSelectionPath(destinationPath);
897		- pasteInto(false);
898		- } else {
899		- loadClipboard(false);
900		- objEditor.jTree.setSelectionPath(destinationPath);
901		- pasteInto(false); // true); // ???
902		- }
	1797	+ pasteInto(false, false);
	1798	+// } else {
	1799	+// loadClipboard(false);
	1800	+// objEditor.jTree.setSelectionPath(destinationPath);
	1801	+// pasteInto(false, false); // true); // ???
	1802	+// }
903	1803	}
904	1804	public void dropActionChanged(DropTargetDragEvent dtde)
905	1805	// Called if the user has modified the current drop gesture
..	..	@@ -955,7 +1855,12 @@
955	1855	TreePath path;
956	1856
957	1857	public TransferableTreePath(TreePath tp) {
958		- path = tp;
	1858	+ Object[] objs = new Object[tp.getPathCount()];
	1859	+ for (int i=0; i<objs.length; i++)
	1860	+ {
	1861	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1862	+ }
	1863	+ path = new TreePath(objs);
959	1864	}
960	1865
961	1866	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1002,90 +1907,109 @@
1002	1907
1003	1908	void buildCreateMenu(Menu menu)
1004	1909	{
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);
	1910	+ //heightFieldItem = menu.add(new MenuItem("Height Field"));
	1911	+ //heightFieldItem.addActionListener(this);
	1912	+// gridItem = menu.add(new MenuItem("Grid"));
	1913	+// gridItem.addActionListener(this);
	1914	+// rectoidItem = menu.add(new MenuItem("Box"));
	1915	+// rectoidItem.addActionListener(this);
	1916	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1917	+// ellipsoidItem.addActionListener(this);
	1918	+// coneItem = menu.add(new MenuItem("Cone"));
	1919	+// coneItem.addActionListener(this);
	1920	+// torusItem = menu.add(new MenuItem("Torus"));
	1921	+// torusItem.addActionListener(this);
	1922	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1923	+// superItem.addActionListener(this);
	1924	+
	1925	+ cameraItem = menu.add(new MenuItem("Camera"));
	1926	+ cameraItem.addActionListener(this);
	1927	+
	1928	+ if (!Globals.ADVANCED)
	1929	+ {
	1930	+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
	1931	+ kleinItem.addActionListener(this);
	1932	+ }
	1933	+
	1934	+// particleItem = menu.add(new MenuItem("Particle system"));
	1935	+// particleItem.addActionListener(this);
	1936	+ if (Globals.ADVANCED)
	1937	+ {
1019	1938	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1020	1939	ragdollItem.addActionListener(this);
1021	1940	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1022	1941	ragdoll2Item.addActionListener(this);
	1942	+ }
1023	1943	menu.add("-");
1024		- meshItem = menu.add(new MenuItem("Mesh"));
	1944	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1025	1945	meshItem.addActionListener(this);
1026	1946	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1027	1947	// meshGroupItem.addActionListener(this);
	1948	+ if (Globals.ADVANCED)
	1949	+ {
1028	1950	springItem = menu.add(new MenuItem("Spring"));
1029	1951	springItem.addActionListener(this);
1030	1952	flagItem = menu.add(new MenuItem("Flag"));
1031	1953	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	1954	blobItem = menu.add(new MenuItem("Blob"));
1037	1955	blobItem.addActionListener(this);
1038	1956	latheItem = menu.add(new MenuItem("Lathe"));
1039	1957	latheItem.addActionListener(this);
1040		- lightItem = menu.add(new MenuItem("Light"));
1041		- lightItem.addActionListener(this);
	1958	+ }
	1959	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1960	+ bezierItem.addActionListener(this);
	1961	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1962	+// overlayItem.addActionListener(this);
	1963	+// lightItem = menu.add(new MenuItem("Light"));
	1964	+// lightItem.addActionListener(this);
1042	1965	menu.add("-");
1043	1966	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1044	1967	//superLoopItem.addActionListener(this);
1045		- loopItem = menu.add(new MenuItem("Loop"));
1046		- loopItem.addActionListener(this);
	1968	+// loopItem = menu.add(new MenuItem("Loop"));
	1969	+// loopItem.addActionListener(this);
1047	1970	doubleItem = menu.add(new MenuItem("Fork"));
1048	1971	doubleItem.addActionListener(this);
	1972	+ if (Globals.ADVANCED)
	1973	+ {
1049	1974	tripleItem = menu.add(new MenuItem("Trident"));
1050	1975	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);
	1976	+ }
1060	1977	}
1061	1978
1062	1979	void buildToolsMenu(Menu menu)
1063	1980	{
1064	1981	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1065	1982	animationItem.addItemListener(this);
1066		- animationItem.setState(CameraPane.ANIMATION);
	1983	+ animationItem.setState(Globals.ANIMATION);
	1984	+
	1985	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1986	+ archiveItem.addActionListener(this);
1067	1987
1068	1988	menu.add("-");
1069	1989	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1070	1990	parseverticesItem.addActionListener(this);
1071		- alignItem = menu.add(new MenuItem("Align"));
	1991	+ textureFieldItem = menu.add(new MenuItem("Texture Field"));
	1992	+ textureFieldItem.addActionListener(this);
	1993	+ alignItem = menu.add(new MenuItem("Align Objects"));
1072	1994	alignItem.addActionListener(this);
1073		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1074		- mirrorItem.addActionListener(this);
1075	1995	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1076	1996	reduceMorphItem.addActionListener(this);
1077	1997	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1078	1998	reduce34MorphItem.addActionListener(this);
1079		-
1080		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1081		- computeAOItem.addActionListener(this);
1082	1999	menu.add("-");
1083		-
1084	2000	menu.add(memoryItem = new MenuItem("Memory Usage"));
1085	2001	memoryItem.addActionListener(this);
	2002	+ menu.add(computeAOItem = new MenuItem("Compute AO"));
	2003	+ computeAOItem.addActionListener(this);
	2004	+
	2005	+ if (Globals.ADVANCED)
	2006	+ {
	2007	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	2008	+ mirrorItem.addActionListener(this);
	2009	+ menu.add("-");
1086	2010	menu.add(analyzeItem = new MenuItem("Analyze"));
1087	2011	analyzeItem.addActionListener(this);
1088		- menu.add(dumpItem = new MenuItem("Dump"));
	2012	+ menu.add(dumpItem = new MenuItem("Print"));
1089	2013	dumpItem.addActionListener(this);
1090	2014	// menu.add(pathItem = new MenuItem("From-to path"));
1091	2015	// pathItem.addActionListener(this);
..	..	@@ -1094,6 +2018,8 @@
1094	2018	resetParentItem.addActionListener(this);
1095	2019	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1096	2020	repairParentItem.addActionListener(this);
	2021	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	2022	+ repairShadowItem.addActionListener(this);
1097	2023	menu.add(invariantsItem = new MenuItem("Invariants"));
1098	2024	invariantsItem.addActionListener(this);
1099	2025	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1101,6 +2027,7 @@
1101	2027	menu.add("-");
1102	2028	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1103	2029	editScriptItem.addActionListener(this);
	2030	+ }
1104	2031	}
1105	2032
1106	2033	void ScreenFit()
..	..	@@ -1223,9 +2150,34 @@
1223	2150	shadow.material = new cMaterial(obj.material);
1224	2151	shadow.material.diffuse = 0.0001f;
1225	2152	shadow.material.specular = 0.0001f;
	2153	+ //shadow.projectedVertices[1].x = 300;
1226	2154
1227	2155	makeSomething(shadow);
1228	2156	}
	2157	+
	2158	+ private void ClearUnpinned()
	2159	+ {
	2160	+ //for (Object3D obj : listUI)
	2161	+ for (int i=listUI.size(); --i>=0;)
	2162	+ {
	2163	+ Object3D obj = listUI.elementAt(i);
	2164	+ if (!obj.pinned)
	2165	+ {
	2166	+ obj.CloseUI();
	2167	+ listUI.remove(i);
	2168	+ }
	2169	+ }
	2170	+ }
	2171	+
	2172	+ private void EditElement(Object3D elem, boolean newWindow)
	2173	+ {
	2174	+ // if (!(elem instanceof Composite))
	2175	+ // newWindow = false;
	2176	+ listUI.add(elem);
	2177	+ elem.openEditWindow(this, newWindow); //, false);
	2178	+ System.out.println("edit : " + elem);
	2179	+ elem.editWindow.refreshContents(true); // ? new
	2180	+ }
1229	2181
1230	2182	/**
1231	2183	* applyExample
..	..	@@ -1429,9 +2381,9 @@
1429	2381
1430	2382	void Overwrite(int mask)
1431	2383	{
1432		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2384	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1433	2385	{
1434		- Object3D content = GraphreeD.clipboard.get(0);
	2386	+ Object3D content = Grafreed.clipboard.get(0);
1435	2387
1436	2388	if (content instanceof cGroup && ((cGroup)content).transientlink )
1437	2389	content = ((cGroup)content).get(0);
..	..	@@ -1454,6 +2406,7 @@
1454	2406	//
1455	2407	public void actionPerformed(ActionEvent event) // , Object arg)
1456	2408	{
	2409	+ Object source = event.getSource();
1457	2410	/*
1458	2411	if (event.getSource() == nameField)
1459	2412	{
..	..	@@ -1465,11 +2418,11 @@
1465	2418	}
1466	2419	else
1467	2420	*/
1468		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	2421	+ if (source == lookAtItem \|\| source == lookFromItem)
1469	2422	{
1470	2423	ScreenFit();
1471	2424	} else
1472		- if (event.getSource() == switchItem)
	2425	+ if (source == switchViewItem)
1473	2426	{
1474	2427	cVector v1 = new cVector();
1475	2428	cVector v2 = new cVector();
..	..	@@ -1478,11 +2431,11 @@
1478	2431	objEditor.cameraView.renderCamera.setAim(v2, v1);
1479	2432	objEditor.cameraView.repaint();
1480	2433	} else
1481		- if (event.getSource() == rectoidItem)
	2434	+ if (source == rectoidItem \|\| source == boxButton)
1482	2435	{
1483	2436	makeSomething(new Box());
1484	2437	} else
1485		- if (event.getSource() == particleItem)
	2438	+ if (source == particleItem \|\| source == particlesButton)
1486	2439	{
1487	2440	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1488	2441	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1503,9 +2456,9 @@
1503	2456	applyExample(particleGeom, "SMOKE");
1504	2457	makeSomething(particleGeom);
1505	2458	} else
1506		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	2459	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1507	2460	{
1508		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	2461	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1509	2462
1510	2463	ragdoll.toParent = LA.newMatrix();
1511	2464	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1521,27 +2474,71 @@
1521	2474	makeSomething(ragdoll);
1522	2475	//makeSomething(new VehicleDemo());
1523	2476	} else
1524		- if (event.getSource() == gridItem)
	2477	+ /*
	2478	+ */
	2479	+ if (source == heightFieldItem)
	2480	+ {
	2481	+ Object3D obj = new Object3D();
	2482	+
	2483	+ obj.CreateMaterial();
	2484	+ obj.bRep = new BoundaryRep();
	2485	+
	2486	+ obj.bRep.CreateMesh(new iHeightField()
	2487	+ {
	2488	+ public double f(double x, double y)
	2489	+ {
	2490	+ // The Mandelbrot set is represented by coloring
	2491	+ // each point (x,y) according to the number of
	2492	+ // iterations it takes before the while loop in
	2493	+ // this method ends. For points that are actually
	2494	+ // in the Mandelbrot set, or very close to it, the
	2495	+ // count will reach the maximum value, 80. These
	2496	+ // points will be colored purple. All other colors
	2497	+ // represent points that are definitely NOT in the set.
	2498	+ x -= 600;
	2499	+ y -= 500;
	2500	+ x /= 200;
	2501	+ y /= 200;
	2502	+ int count = 0;
	2503	+ double zx = x;
	2504	+ double zy = y;
	2505	+ while (count < 80 && Math.abs(x) < 100 && Math.abs(zy) < 100) {
	2506	+ double new_zx = zxzx - zyzy + x;
	2507	+ zy = 2zxzy + y;
	2508	+ zx = new_zx;
	2509	+ count++;
	2510	+ }
	2511	+ return count; // Math.sqrt(count);
	2512	+ }
	2513	+ }, 1000,1000);
	2514	+
	2515	+ makeSomething(obj);
	2516	+ } else
	2517	+ if (source == gridItem \|\| source == gridButton)
1525	2518	{
1526	2519	makeSomething(new Grid());
1527	2520	} else
1528		- if (event.getSource() == ellipsoidItem)
	2521	+ if (source == ellipsoidItem \|\| source == sphereButton)
1529	2522	{
1530	2523	makeSomething(new Sphere());
1531	2524	} else
1532		- if (event.getSource() == coneItem)
	2525	+ if (source == coneItem \|\| source == coneButton)
1533	2526	{
1534	2527	makeSomething(new Cone());
1535	2528	} else
1536		- if (event.getSource() == torusItem)
	2529	+ if (source == torusItem \|\| source == torusButton)
1537	2530	{
1538	2531	makeSomething(new Torus());
1539	2532	} else
1540		- if (event.getSource() == superItem)
	2533	+ if (source == superItem \|\| source == superButton)
1541	2534	{
1542	2535	makeSomething(new Superellipsoid());
1543	2536	} else
1544		- if (event.getSource() == blobItem)
	2537	+ if (source == kleinItem \|\| source == kleinButton)
	2538	+ {
	2539	+ makeSomething(new Klein());
	2540	+ } else
	2541	+ if (source == blobItem)
1545	2542	{
1546	2543	Blob blob = new Blob();
1547	2544	BlobComponent comp = new BlobComponent();
..	..	@@ -1549,15 +2546,15 @@
1549	2546	//blob.retile();
1550	2547	makeSomething(blob);
1551	2548	} else
1552		- if (event.getSource() == latheItem)
	2549	+ if (source == latheItem)
1553	2550	{
1554	2551	makeSomething(new Lathe());
1555	2552	} else
1556		- if (event.getSource() == bezierItem)
	2553	+ if (source == bezierItem)
1557	2554	{
1558	2555	makeSomething(new BezierSurface());
1559	2556	} else
1560		- if (event.getSource() == checkerItem)
	2557	+ if (source == overlayItem \|\| source == overlayButton)
1561	2558	{
1562	2559	/*
1563	2560	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1570,9 +2567,9 @@
1570	2567	LA.matConcat(obj.toParent, cameraView.renderCamera.fromParent, obj.toParent);
1571	2568	LA.matInvert(obj.toParent, obj.fromParent);
1572	2569	*/
1573		- makeSomething(new CheckerIG());
	2570	+ makeSomething(new Checker());
1574	2571	} else
1575		- if (event.getSource() == meshItem)
	2572	+ if (source == meshItem)
1576	2573	{
1577	2574	Object3D itemtomake = new Object3D();
1578	2575	Object3D child;
..	..	@@ -1593,35 +2590,52 @@
1593	2590	makeSomething(child);
1594	2591	}
1595	2592	} else
1596		- if (event.getSource() == springItem)
	2593	+ if (source == springItem)
1597	2594	{
1598	2595	cSpring s = new cSpring();
1599	2596	s.setup();
1600	2597	makeSomething(s);
1601	2598	} else
1602		- if (event.getSource() == flagItem)
	2599	+ if (source == flagItem)
1603	2600	{
1604	2601	cSpring s = new cFlag();
1605	2602	s.setup();
1606	2603	makeSomething(s);
1607	2604	} else
1608		- if (event.getSource() == lightItem)
	2605	+ if (source == lightItem \|\| source == lightButton)
1609	2606	{
1610	2607	makeSomething(new Light());
1611	2608	} else
1612		- if (event.getSource() == csgItem)
	2609	+// if (source == skybox1Button \|\|
	2610	+// source == skybox2Button \|\|
	2611	+// source == skybox3Button \|\|
	2612	+// source == skybox4Button \|\|
	2613	+// source == skybox5Button \|\|
	2614	+// source == skybox6Button \|\|
	2615	+// source == skybox7Button \|\|
	2616	+// source == skybox11Button \|\|
	2617	+// source == skybox12Button \|\|
	2618	+// source == skybox13Button \|\|
	2619	+// source == skybox14Button \|\|
	2620	+// source == skybox15Button \|\|
	2621	+// source == skybox16Button \|\|
	2622	+// source == skybox17Button)
	2623	+// {
	2624	+// ChangeSkybox(source);
	2625	+// } else
	2626	+ if (source == csgItem)
1613	2627	{
1614	2628	group(new CSG());
1615	2629	} else
1616		- if (event.getSource() == templateItem)
	2630	+ if (source == templateItem)
1617	2631	{
1618	2632	group(new cTemplate());
1619	2633	} else
1620		- if (event.getSource() == attributeItem)
	2634	+ if (source == attributeItem)
1621	2635	{
1622	2636	makeSomething(new Attribute());
1623	2637	} else
1624		- if (event.getSource() == pointflowItem)
	2638	+ if (source == pointflowItem)
1625	2639	{
1626	2640	makeSomething(new PointFlow());
1627	2641	} else
..	..	@@ -1633,7 +2647,7 @@
1633	2647	} else
1634	2648	*/
1635	2649
1636		- if (event.getSource() == superLoopItem)
	2650	+ if (source == superLoopItem)
1637	2651	{
1638	2652	Composite g = new cGroup();
1639	2653	for (int i=0; i<15; i++)
..	..	@@ -1655,30 +2669,30 @@
1655	2669
1656	2670	group(g);
1657	2671	} else
1658		- if (event.getSource() == loopItem)
	2672	+ if (source == loopItem \|\| source == loopButton)
1659	2673	{
1660	2674	Composite csg = new GroupLeaf();
1661	2675	csg.count = 5;
1662	2676	group(csg);
1663		- Composite child = new cGroup();
	2677	+ Composite child = new cGroup("Branch");
1664	2678	csg.addChild(child);
1665	2679	child.addChild(csg);
1666	2680	} else
1667		- if (event.getSource() == doubleItem)
	2681	+ if (source == doubleItem)
1668	2682	{
1669		- Composite csg = new GroupLeaf();
	2683	+ Composite csg = new GroupLeaf("Fork");
1670	2684	csg.count = 5;
1671	2685	group(csg);
1672		- Composite child = new cGroup();
	2686	+ Composite child = new cGroup("Branch A");
1673	2687	csg.addChild(child);
1674	2688	child.addChild(csg);
1675		- child = new cGroup();
	2689	+ child = new cGroup("Branch B");
1676	2690	csg.addChild(child);
1677	2691	child.addChild(csg);
1678	2692	} else
1679		- if (event.getSource() == tripleItem)
	2693	+ if (source == tripleItem)
1680	2694	{
1681		- Composite csg = new GroupLeaf();
	2695	+ Composite csg = new GroupLeaf("Trident");
1682	2696	csg.count = 4;
1683	2697	group(csg);
1684	2698	Composite child = new cGroup();
..	..	@@ -1691,73 +2705,117 @@
1691	2705	csg.addChild(child);
1692	2706	child.addChild(csg);
1693	2707	} else
1694		-
1695		- if (event.getSource() == importGFDItem)
	2708	+ if (source == computeAOItem)
1696	2709	{
1697		- ImportGFD();
	2710	+ Globals.drawMode = CameraPane.OCCLUSION;
	2711	+ cameraView.repaint();
1698	2712	} 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)
	2713	+ if (source == recompileItem)
1717	2714	{
1718	2715	Recompile();
1719	2716	refreshContents();
1720	2717	} else
1721		- if (event.getSource() == editScriptItem)
	2718	+ if (source == editScriptItem)
1722	2719	{
1723	2720	OpenDialog();
1724	2721	refreshContents();
1725	2722	} else
1726		- if (event.getSource() == invariantsItem)
	2723	+ if (source == invariantsItem)
1727	2724	{
1728	2725	System.out.println("Invariants:");
1729		- GraphreeD.theApplet3D.universe.invariants();
	2726	+ Grafreed.grafreed.universe.invariants();
1730	2727	} else
1731		- if (event.getSource() == memoryItem)
	2728	+ if (source == memoryItem)
1732	2729	{
1733	2730	//System.out.println("Invariants:");
1734	2731	PrintMemory();
1735	2732	} else
1736		- if (event.getSource() == pathItem)
	2733	+ if (source == pathItem)
1737	2734	{
1738	2735	PrintPath();
1739	2736	} else
1740		- if (event.getSource() == analyzeItem)
	2737	+ if (source == analyzeItem)
1741	2738	{
1742	2739	AnalyzeObject();
1743	2740	} else
1744		- if (event.getSource() == dumpItem)
	2741	+ if (source == dumpItem)
1745	2742	{
1746	2743	DumpObject();
1747	2744	} else
1748		- if (event.getSource() == screenfitButton)
	2745	+ if (source == minButton)
1749	2746	{
1750		- //Reload(lastConverter, lastFilename, true);
	2747	+ Minimize();
	2748	+ } else
	2749	+ if (source == maxButton)
	2750	+ {
	2751	+ Maximize();
	2752	+ } else
	2753	+ if (source == fullButton)
	2754	+ {
	2755	+ ToggleFullScreen();
	2756	+ } else
	2757	+ if (source == collapseButton)
	2758	+ {
	2759	+ this.expandedLayout = radio.layout;
	2760	+ CollapseToolbar();
	2761	+ } else
	2762	+ if (source == maximize3DButton)
	2763	+ {
	2764	+ this.expandedLayout = radio.layout;
	2765	+ radio.layout = twoButton;
	2766	+ Show3DView();
	2767	+ CollapseToolbar();
	2768	+ } else
	2769	+ if (source == previousVersionButton)
	2770	+ {
	2771	+ // Go to previous version
	2772	+ //if (!Undo())
	2773	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2774	+ PreviousVersion();
	2775	+ } else
	2776	+ if (source == restoreButton)
	2777	+ {
	2778	+ // Restore current version
	2779	+ Restore();
	2780	+ //restoreButton.setEnabled(false);
	2781	+ } else
	2782	+ if (source == replaceButton)
	2783	+ {
	2784	+ // Overwrite current version
	2785	+ Replace();
	2786	+ //replaceButton.setEnabled(false);
	2787	+ } else
	2788	+ if (source == nextVersionButton)
	2789	+ {
	2790	+ // Go to next version
	2791	+ NextVersion();
	2792	+ } else
	2793	+ if (source == saveVersionButton)
	2794	+ {
	2795	+ // Save a new version
	2796	+ if (!Save(true))
	2797	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2798	+ } else
	2799	+ if (source == deleteVersionButton)
	2800	+ {
	2801	+ // Delete a new version
	2802	+ DeleteVersion();
	2803	+ } else
	2804	+ if (source == oneStepButton)
	2805	+ {
	2806	+ Globals.ONESTEP = true;
	2807	+ cameraView.repaint();
	2808	+ } else
	2809	+ if (source == screenfitButton)
	2810	+ {
1751	2811	ScreenFit();
1752	2812	} else
1753		- if (event.getSource() == screenfitpointButton)
	2813	+ if (source == screenfitpointButton)
1754	2814	{
1755		- //Reload(lastConverter, lastFilename, true);
1756	2815	ScreenFitPoint();
1757	2816	} else
1758		- if (event.getSource() == snapobjectButton)
	2817	+ if (source == snapobjectButton)
1759	2818	{
1760		- //Reload(lastConverter, lastFilename, true);
1761	2819	SnapObject();
1762	2820	} else
1763	2821	// if (event.getSource() == recompileButton)
..	..	@@ -1766,13 +2824,13 @@
1766	2824	// Recompile();
1767	2825	// refreshContents();
1768	2826	// } else
1769		- if (event.getSource() == gcButton)
	2827	+ if (source == gcButton)
1770	2828	{
1771	2829	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1772	2830	System.gc();
1773	2831	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1774	2832	} else
1775		- if (event.getSource() == editLeafItem)
	2833	+ if (source == editLeafItem)
1776	2834	{
1777	2835	Object3D obj;
1778	2836	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1786,65 +2844,78 @@
1786	2844	}
1787	2845	refreshContents(true);
1788	2846	} else
1789		- if (event.getSource() == openWindowItem)
	2847	+ if (source == openWindowItem)
1790	2848	{
1791	2849	EditSelection(true);
1792	2850	} else
1793		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2851	+ if (source == cutItem \|\| source == clearButton)
1794	2852	{
1795	2853	loadClipboard(true);
1796	2854	} else
1797		- if (event.getSource() == duplicateItem)
	2855	+ if (source == undoItem)
1798	2856	{
1799		- Object3D keep = GraphreeD.clipboard;
	2857	+ PreviousVersion();
	2858	+ } else
	2859	+ if (source == redoItem)
	2860	+ {
	2861	+ NextVersion();
	2862	+ } else
	2863	+ if (source == duplicateItem)
	2864	+ {
	2865	+ Object3D keep = Grafreed.clipboard;
1800	2866	loadClipboard(false);
1801	2867	paste(false);
1802		- GraphreeD.clipboard = keep;
	2868	+ Grafreed.clipboard = keep;
1803	2869	} else
1804		- if (event.getSource() == cloneItem)
	2870	+ if (source == cloneItem)
1805	2871	{
1806	2872	CloneSelection(false);
1807	2873	} else
1808		- if (event.getSource() == cloneSupportItem)
	2874	+ if (source == cloneSupportItem)
1809	2875	{
1810	2876	CloneSelection(true);
1811	2877	} else
1812		- if (event.getSource() == copyItem)
	2878	+ if (source == copyItem)
1813	2879	{
1814	2880	loadClipboard(false);
1815	2881	} else
1816		- if (event.getSource() == pasteItem)
	2882	+ if (source == pasteItem)
1817	2883	{
1818	2884	paste(false);
1819	2885	} else
1820		- if (event.getSource() == pasteLinkItem)
	2886	+ if (source == pasteIntoItem)
1821	2887	{
1822		- pasteInto(false);
	2888	+ pasteInto(true, false);
1823	2889	} else
1824		- if (event.getSource() == pasteCloneItem)
	2890	+ if (source == pasteLinkItem)
1825	2891	{
1826		- pasteInto(true);
	2892	+ pasteInto(false, false);
1827	2893	} else
1828		- if (event.getSource() == pasteExpandItem)
	2894	+ if (source == pasteCloneItem)
	2895	+ {
	2896	+ pasteInto(true, true);
	2897	+ } else
	2898	+ if (source == pasteExpandItem)
1829	2899	{
1830	2900	paste(true);
1831	2901	} else
1832		- if (event.getSource() == synchronizeItem)
	2902	+ if (source == synchronizeItem)
1833	2903	{
1834	2904	Overwrite(Object3D.TRANSFORM);
1835	2905	} else
1836		- if (event.getSource() == overwriteNameItem)
	2906	+ if (source == overwriteNameItem)
1837	2907	{
1838	2908	Overwrite(Object3D.NAME);
1839	2909	} else
1840		- if (event.getSource() == overwriteUVItem)
	2910	+ if (source == overwriteUVItem)
1841	2911	{
1842	2912	Overwrite(Object3D.UV);
1843	2913	} else
1844		- if (event.getSource() == overwriteMatItem)
	2914	+ if (source == overwriteMatItem)
1845	2915	{
	2916	+ /* july 2015
1846	2917	if ((dropAttributes & Object3D.TEXTURE) == 0)
1847		- Overwrite(Object3D.MATERIAL);
	2918	+ Overwrite(Object3D.MATERIAL \| Object3D.COLOR);
1848	2919	else
1849	2920	{
1850	2921	if ((dropAttributes & Object3D.COLOR) == 0 && (dropAttributes & Object3D.MATERIAL) == 0)
..	..	@@ -1856,13 +2927,16 @@
1856	2927	Overwrite(Object3D.MATERIAL \| Object3D.TEXTURE);
1857	2928	}
1858	2929	}
	2930	+ */
	2931	+
	2932	+ Overwrite(dropAttributes);
1859	2933	}
1860		- if (event.getSource() == overwriteGeoItem)
	2934	+ if (source == overwriteGeoItem)
1861	2935	{
1862	2936	Overwrite(Object3D.GEOMETRY);
1863		-// if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2937	+// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
1864	2938	// {
1865		-// Object3D content = GraphreeD.clipboard.get(0);
	2939	+// Object3D content = GrafreeD.clipboard.get(0);
1866	2940	//
1867	2941	// if (content instanceof cGroup && ((cGroup)content).transientlink )
1868	2942	// content = ((cGroup)content).get(0);
..	..	@@ -1874,7 +2948,7 @@
1874	2948	// refreshContents();
1875	2949	// }
1876	2950	} else
1877		- if (event.getSource() == generateMeshItem)
	2951	+ if (source == generateMeshItem)
1878	2952	{
1879	2953	//if (group.selection.size() == 1)
1880	2954	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1885,7 +2959,7 @@
1885	2959	ResetModel();
1886	2960	refreshContents();
1887	2961	} else
1888		- if (event.getSource() == extractGeometriesItem)
	2962	+ if (source == extractGeometriesItem)
1889	2963	{
1890	2964	boolean one = false;
1891	2965
..	..	@@ -1912,7 +2986,7 @@
1912	2986	ResetModel();
1913	2987	refreshContents();
1914	2988	} else
1915		- if (event.getSource() == cloneGeometriesItem)
	2989	+ if (source == cloneGeometriesItem)
1916	2990	{
1917	2991	boolean one = false;
1918	2992
..	..	@@ -1938,32 +3012,37 @@
1938	3012	ResetModel();
1939	3013	refreshContents();
1940	3014	} else
1941		- if (event.getSource() == shareGeometriesItem)
	3015	+ if (source == shareGeometriesItem)
1942	3016	{
1943	3017	boolean one = false;
1944	3018
1945	3019	if (group.selection.size() == 1)
1946	3020	one = true;
1947	3021
	3022	+ Object3D merge = null;
	3023	+
1948	3024	Object3D content = new cGroup();
1949	3025
1950	3026	for (int i=0; i<group.selection.size(); i++)
1951	3027	{
1952		- Object3D sel = new Merge(group.selection.get(i));
	3028	+ merge = new Merge(group.selection.get(i));
1953	3029
1954	3030	if (one)
1955		- makeSomething(sel, false);
	3031	+ makeSomething(merge, false);
1956	3032	else
1957		- content.addChild(sel);
	3033	+ content.addChild(merge);
1958	3034	}
1959	3035
1960	3036	if (!one)
1961		- makeSomething(content, false);
1962		-
1963		- ResetModel();
1964		- refreshContents();
	3037	+ makeSomething(content, true);
	3038	+ else
	3039	+ {
	3040	+ ResetModel();
	3041	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	3042	+ refreshContents();
	3043	+ }
1965	3044	} else
1966		- if (event.getSource() == mergeGeometriesItem)
	3045	+ if (source == mergeGeometriesItem)
1967	3046	{
1968	3047	boolean one = false;
1969	3048
..	..	@@ -1993,11 +3072,11 @@
1993	3072	ResetModel();
1994	3073	refreshContents();
1995	3074	} else
1996		- if (event.getSource() == linkverticesItem)
	3075	+ if (source == linkverticesItem)
1997	3076	{
1998		-// if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	3077	+// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
1999	3078	// {
2000		-// Object3D content = GraphreeD.clipboard.get(0);
	3079	+// Object3D content = GrafreeD.clipboard.get(0);
2001	3080	//
2002	3081	// if (content instanceof cGroup && ((cGroup)content).transientlink )
2003	3082	// content = ((cGroup)content).get(0);
..	..	@@ -2006,39 +3085,48 @@
2006	3085	// group.selection.get(0).setMasterThis(content); // should be identity
2007	3086	// refreshContents();
2008	3087	// }
2009		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	3088	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2010	3089	{
2011		- Object3D content = GraphreeD.clipboard.get(0);
	3090	+ Object3D content = Grafreed.clipboard.get(0);
2012	3091
2013	3092	if (content instanceof cGroup && ((cGroup)content).transientlink )
2014	3093	content = ((cGroup)content).get(0);
2015	3094
2016		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	3095	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2017	3096	for (int i=0; i<group.selection.size(); i++)
2018	3097	{
2019		- boolean random = CameraPane.RANDOM;
2020		- CameraPane.RANDOM = false; // parse all random nodes
	3098	+ boolean random = CameraPane.SWITCH;
	3099	+ CameraPane.SWITCH = false; // parse all random nodes
2021	3100	group.selection.get(i).linkVerticesThis(content);
2022	3101	// group.selection.get(i).setMasterThis(content); // should be identity
2023		- CameraPane.RANDOM = random;
	3102	+ CameraPane.SWITCH = random;
2024	3103	}
2025		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	3104	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2026	3105	refreshContents();
2027	3106	}
2028	3107	} else
2029		- if (event.getSource() == resetsupportItem)
	3108	+ if (source == resetsupportItem)
2030	3109	{
2031	3110	for (int i=0; i<group.selection.size(); i++)
2032	3111	{
2033		- boolean random = CameraPane.RANDOM;
2034		- CameraPane.RANDOM = false; // parse all random nodes
	3112	+ boolean random = CameraPane.SWITCH;
	3113	+ CameraPane.SWITCH = false; // parse all random nodes
2035	3114	group.selection.get(i).linkVerticesThis(null);
2036		- CameraPane.RANDOM = random;
	3115	+ CameraPane.SWITCH = random;
2037	3116	}
2038	3117
2039	3118	refreshContents();
2040	3119	} else
2041		- if (event.getSource() == resetreferencesItem)
	3120	+ if (source == relinkverticesItem)
	3121	+ {
	3122	+ boolean random = CameraPane.SWITCH;
	3123	+ CameraPane.SWITCH = false; // parse all random nodes
	3124	+ group.selection.RelinkToSupport();
	3125	+ CameraPane.SWITCH = random;
	3126	+
	3127	+ refreshContents();
	3128	+ } else
	3129	+ if (source == resetreferencesItem)
2042	3130	{
2043	3131	for (int i=0; i<group.selection.size(); i++)
2044	3132	{
..	..	@@ -2047,11 +3135,11 @@
2047	3135
2048	3136	refreshContents();
2049	3137	} else
2050		- if (event.getSource() == setMasterItem)
	3138	+ if (source == setMasterItem)
2051	3139	{
2052		- if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	3140	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2053	3141	{
2054		- Object3D content = GraphreeD.clipboard.get(0);
	3142	+ Object3D content = Grafreed.clipboard.get(0);
2055	3143
2056	3144	if (content instanceof cGroup && ((cGroup)content).transientlink )
2057	3145	content = ((cGroup)content).get(0);
..	..	@@ -2060,13 +3148,13 @@
2060	3148	refreshContents();
2061	3149	}
2062	3150	} else
2063		- if (event.getSource() == poseMeshItem)
	3151	+ if (source == poseMeshItem)
2064	3152	{
2065	3153	if (group.selection.size() == 1)
2066	3154	{
2067		- if (GraphreeD.clipboard.size() == 1)
	3155	+ if (Grafreed.clipboard.size() == 1)
2068	3156	{
2069		- Object3D content = GraphreeD.clipboard.get(0);
	3157	+ Object3D content = Grafreed.clipboard.get(0);
2070	3158
2071	3159	if (content instanceof cGroup && ((cGroup)content).transientlink )
2072	3160	content = ((cGroup)content).get(0);
..	..	@@ -2079,19 +3167,19 @@
2079	3167	}
2080	3168
2081	3169	} else
2082		- if (event.getSource() == revertMeshItem)
	3170	+ if (source == revertMeshItem)
2083	3171	{
2084	3172	RevertMeshes();
2085	3173	} else
2086		- if (event.getSource() == resetMeshItem)
	3174	+ if (source == resetAllItem)
2087	3175	{
2088	3176	ResetAll();
2089	3177	} else
2090		- if (event.getSource() == stepAllItem)
	3178	+ if (source == stepAllItem)
2091	3179	{
2092	3180	StepAll();
2093	3181	} else
2094		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	3182	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2095	3183	{
2096	3184	//int indices[] = jList.getSelectedIndices();
2097	3185	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2099,42 +3187,46 @@
2099	3187
2100	3188	ClearSelection(false);
2101	3189	} else
2102		- if (event.getSource() == clearAllItem)
	3190	+ if (source == clearAllItem)
2103	3191	{
2104	3192	ClearSelection(true);
2105	3193	} else
2106		- if (event.getSource() == grabItem)
	3194	+ if (source == grabItem \|\| source == groupButton)
2107	3195	{
2108		- group(new cGroup(), true);
	3196	+ group(new cGroup(), false); // true);
2109	3197	} else
2110		- if (event.getSource() == frontItem)
	3198	+ if (source == hideItem)
	3199	+ {
	3200	+ group(new HiddenObject());
	3201	+ } else
	3202	+ if (source == frontItem)
2111	3203	{
2112	3204	front();
2113	3205	} else
2114		- if (event.getSource() == backItem)
	3206	+ if (source == backItem)
2115	3207	{
2116	3208	back();
2117	3209	} else
2118		- if (event.getSource() == cameraItem)
	3210	+ if (source == cameraItem)
2119	3211	{
2120	3212	makeSomething(new Camera());
2121	3213	} else
2122		- if (event.getSource() == compositeItem)
	3214	+ if (source == compositeItem \|\| source == compositeButton)
2123	3215	{
2124	3216	group(new Composite());
2125	3217	} else
2126		- if (event.getSource() == randomItem)
	3218	+ if (source == switchItem \|\| source == switchButton)
2127	3219	{
2128	3220	RandomNode random = new RandomNode();
2129	3221	group(random);
2130	3222	if (random.size() > 0)
2131		- random.name = random.get(0).name + "Rnd";
	3223	+ random.name = random.get(0).name + "Switch";
2132	3224	} else
2133		- if (event.getSource() == physicsItem)
	3225	+ if (source == physicsItem)
2134	3226	{
2135	3227	group(new PhysicsNode());
2136	3228	} else
2137		- if (event.getSource() == frameselectorItem)
	3229	+ if (source == frameselectorItem)
2138	3230	{
2139	3231	for (int i=0; i<group.selection.size(); i++)
2140	3232	{
..	..	@@ -2146,7 +3238,7 @@
2146	3238	ResetModel();
2147	3239	refreshContents();
2148	3240	} else
2149		- if (event.getSource() == switchGeoItem)
	3241	+ if (source == switchGeoItem)
2150	3242	{
2151	3243	for (int i=0; i<group.selection.size(); i++)
2152	3244	{
..	..	@@ -2158,7 +3250,7 @@
2158	3250	ResetModel();
2159	3251	refreshContents();
2160	3252	} else
2161		- if (event.getSource() == switchTransfoItem)
	3253	+ if (source == switchTransfoItem)
2162	3254	{
2163	3255	for (int i=0; i<group.selection.size(); i++)
2164	3256	{
..	..	@@ -2170,7 +3262,7 @@
2170	3262	ResetModel();
2171	3263	refreshContents();
2172	3264	} else
2173		- if (event.getSource() == morphItem)
	3265	+ if (source == morphItem)
2174	3266	{
2175	3267	for (int i=0; i<group.selection.size(); i++)
2176	3268	{
..	..	@@ -2182,7 +3274,7 @@
2182	3274	ResetModel();
2183	3275	refreshContents();
2184	3276	} else
2185		- if (event.getSource() == scriptNodeItem)
	3277	+ if (source == scriptNodeItem)
2186	3278	{
2187	3279	boolean atleastone = false;
2188	3280
..	..	@@ -2221,191 +3313,252 @@
2221	3313	}
2222	3314	}
2223	3315	} else
2224		- if (event.getSource() == linkerItem)
	3316	+ if (source == linkerItem)
2225	3317	{
2226	3318	group(new cLinker());
2227	3319	} else
2228		- if (event.getSource() == textureItem)
	3320	+ if (source == textureItem \|\| source == textureButton)
2229	3321	{
2230	3322	group(new TextureNode());
2231	3323	} else
2232		- if (event.getSource() == shadowXItem)
	3324	+ if (source == billboardItem)
	3325	+ {
	3326	+ group(new BillboardNode());
	3327	+ } else
	3328	+ if (source == shadowXItem)
2233	3329	{
2234	3330	CastShadow(0);
2235	3331	} else
2236		- if (event.getSource() == shadowYItem)
	3332	+ if (source == shadowYItem)
2237	3333	{
2238	3334	CastShadow(1);
2239	3335	} else
2240		- if (event.getSource() == shadowZItem)
	3336	+ if (source == shadowZItem)
2241	3337	{
2242	3338	CastShadow(2);
2243	3339	} else
2244		- if (event.getSource() == ungroupItem)
	3340	+ if (source == ungroupItem \|\| source == ungroupButton)
2245	3341	{
2246		- ungroup();
	3342	+ boolean hasRoot = false;
	3343	+
	3344	+ for (int i=0; i<group.selection.size(); i++)
	3345	+ {
	3346	+ if (group.selection.get(i) == group)
	3347	+ {
	3348	+ hasRoot = true;
	3349	+ break;
	3350	+ }
	3351	+ }
	3352	+
	3353	+ if (!hasRoot)
	3354	+ {
	3355	+ for (int i=0; i<group.selection.size(); i++)
	3356	+ {
	3357	+ Ungroup(group.selection.get(i));
	3358	+ }
	3359	+
	3360	+ ClearSelection(false);
	3361	+
	3362	+ refreshContents();
	3363	+ }
2247	3364	} else
2248		- if (event.getSource() == genUVItem)
	3365	+ if (source == genUVItem)
2249	3366	{
2250	3367	GenUV();
2251	3368	} else
2252		- if (event.getSource() == genNormalsCADItem)
	3369	+ if (source == genNormalsCADItem)
2253	3370	{
2254	3371	GenNormals(true);
2255	3372	} else
2256		- if (event.getSource() == genNormalsORGANItem)
	3373	+ if (source == genNormalsMESHItem)
	3374	+ {
	3375	+ GenNormalsMESH();
	3376	+ } else
	3377	+ if (source == genNormalsORGANItem)
2257	3378	{
2258	3379	GenNormals(false);
2259	3380	} else
2260		- if (event.getSource() == stripifyItem)
	3381	+ if (source == genNormalsMINEItem)
	3382	+ {
	3383	+ GenNormalsMINE();
	3384	+ } else
	3385	+ if (source == stripifyItem)
2261	3386	{
2262	3387	Stripify();
2263	3388	} else
2264		- if (event.getSource() == unstripifyItem)
	3389	+ if (source == unstripifyItem)
2265	3390	{
2266	3391	Unstripify();
2267	3392	} else
2268		- if (event.getSource() == trimItem)
	3393	+ if (source == trimItem)
2269	3394	{
2270	3395	Trim();
2271	3396	} else
2272		- if (event.getSource() == untrimItem)
	3397	+ if (source == untrimItem)
2273	3398	{
2274	3399	Untrim();
2275	3400	} else
2276		- if (event.getSource() == clearColorsItem)
	3401	+ if (source == clearColorsItem)
2277	3402	{
2278	3403	ClearColors();
2279	3404	} else
2280		- if (event.getSource() == clearMaterialsItem)
	3405	+ if (source == clearMaterialsItem)
2281	3406	{
2282	3407	ClearMaterials();
2283	3408	} else
2284		- if (event.getSource() == liveleavesItem)
	3409	+ if (source == liveleavesItem)
2285	3410	{
2286	3411	LiveLeaves(true);
2287	3412	} else
2288		- if (event.getSource() == unliveleavesItem)
	3413	+ if (source == unliveleavesItem)
2289	3414	{
2290	3415	LiveLeaves(false);
2291	3416	} else
2292		- if (event.getSource() == supportleavesItem)
	3417	+ if (source == supportleavesItem)
2293	3418	{
2294	3419	SupportLeaves(true);
2295	3420	} else
2296		- if (event.getSource() == unsupportleavesItem)
	3421	+ if (source == unsupportleavesItem)
2297	3422	{
2298	3423	SupportLeaves(false);
2299	3424	} else
2300		- if (event.getSource() == hideleavesItem)
	3425	+ if (source == hideleavesItem)
2301	3426	{
2302	3427	HideLeaves(true);
2303	3428	} else
2304		- if (event.getSource() == showleavesItem)
	3429	+ if (source == showleavesItem)
2305	3430	{
2306	3431	HideLeaves(false);
2307	3432	} else
2308		- if (event.getSource() == markleavesItem)
	3433	+ if (source == markleavesItem)
2309	3434	{
2310	3435	MarkLeaves(true);
2311	3436	} else
2312		- if (event.getSource() == unmarkleavesItem)
	3437	+ if (source == unmarkleavesItem)
2313	3438	{
2314	3439	MarkLeaves(false);
2315	3440	} else
2316		- if (event.getSource() == flipVItem)
	3441	+ if (source == rewindleavesItem)
	3442	+ {
	3443	+ RewindLeaves(true);
	3444	+ } else
	3445	+ if (source == unrewindleavesItem)
	3446	+ {
	3447	+ RewindLeaves(false);
	3448	+ } else
	3449	+ if (source == randomleavesItem)
	3450	+ {
	3451	+ RandomLeaves(true);
	3452	+ } else
	3453	+ if (source == unrandomleavesItem)
	3454	+ {
	3455	+ RandomLeaves(false);
	3456	+ } else
	3457	+ if (source == flipVItem)
2317	3458	{
2318	3459	FlipV(true);
2319	3460	} else
2320		- if (event.getSource() == unflipVItem)
	3461	+ if (source == unflipVItem)
2321	3462	{
2322	3463	FlipV(false);
2323	3464	} else
2324		- if (event.getSource() == lowTexturesItem)
	3465	+ if (source == lowTexturesItem)
2325	3466	{
2326	3467	SetTexRes(0);
2327	3468	} else
2328		- if (event.getSource() == normalTexturesItem)
	3469	+ if (source == normalTexturesItem)
2329	3470	{
2330	3471	SetTexRes(1);
2331	3472	} else
2332		- if (event.getSource() == highTexturesItem)
	3473	+ if (source == highTexturesItem)
2333	3474	{
2334	3475	SetTexRes(2);
2335	3476	} else
2336		- if (event.getSource() == veryhighTexturesItem)
	3477	+ if (source == veryhighTexturesItem)
2337	3478	{
2338	3479	SetTexRes(3);
2339	3480	} else
2340		- if (event.getSource() == maxTexturesItem)
	3481	+ if (source == maxTexturesItem)
2341	3482	{
2342	3483	SetTexRes(4);
2343	3484	} else
2344		- if (event.getSource() == panoTexturesItem)
	3485	+ if (source == panoTexturesItem)
2345	3486	{
2346	3487	SetTexRes(5);
2347	3488	} else
2348		- if (event.getSource() == reverseNormalsItem)
	3489	+ if (source == reverseNormalsItem)
2349	3490	{
2350	3491	ReverseNormals();
2351	3492	} else
2352		- if (event.getSource() == parseverticesItem)
	3493	+ if (source == parseverticesItem)
2353	3494	{
2354	3495	ParseVertices();
2355	3496	} else
2356		- if (event.getSource() == alignItem)
	3497	+ if (source == textureFieldItem)
	3498	+ {
	3499	+ TextureVertices();
	3500	+ } else
	3501	+ if (source == alignItem)
2357	3502	{
2358	3503	Align();
2359	3504	} else
2360		- if (event.getSource() == mirrorItem)
	3505	+ if (source == mirrorItem)
2361	3506	{
2362	3507	MirrorPoses();
2363	3508	} else
2364		- if (event.getSource() == reduceMorphItem)
	3509	+ if (source == reduceMorphItem)
2365	3510	{
2366	3511	MeshReduction(false);
2367	3512	} else
2368		- if (event.getSource() == reduce34MorphItem)
	3513	+ if (source == reduce34MorphItem)
2369	3514	{
2370	3515	MeshReduction(true);
2371	3516	} else
2372		- if (event.getSource() == reverseTrianglesItem)
	3517	+ if (source == reverseTrianglesItem)
2373	3518	{
2374	3519	ReverseTriangles();
2375	3520	} else
2376		- if (event.getSource() == reduceMeshItem)
	3521	+ if (source == reduceMeshItem)
2377	3522	{
2378	3523	ReduceMesh(false);
2379	3524	} else
2380		- if (event.getSource() == reduce34MeshItem)
	3525	+ if (source == reduce34MeshItem)
2381	3526	{
2382	3527	ReduceMesh(true);
2383	3528	} else
2384		- if (event.getSource() == increaseMeshItem)
	3529	+ if (source == increaseMeshItem)
2385	3530	{
2386	3531	IncreaseMesh();
2387	3532	} else
2388		- if (event.getSource() == clipMeshItem)
	3533	+ if (source == clipMeshItem)
2389	3534	{
2390	3535	ClipMesh();
2391	3536	} else
2392		- if (event.getSource() == smoothMeshItem)
	3537	+ if (source == smoothMeshItem)
2393	3538	{
2394	3539	SmoothMesh();
2395	3540	} else
2396		- if (event.getSource() == transformgeometryItem)
	3541	+ if (source == transformGeometryItem)
2397	3542	{
2398	3543	TransformGeometry();
2399	3544	} else
2400		- if (event.getSource() == resetTransformItem)
	3545	+ if (source == transformChildrenItem)
	3546	+ {
	3547	+ TransformChildren();
	3548	+ } else
	3549	+ if (source == resetTransformItem)
2401	3550	{
2402	3551	ResetTransform();
2403	3552	} else
2404		- if (event.getSource() == resetCentroidItem)
	3553	+ if (source == resetCentroidItem)
2405	3554	{
2406		- ResetCentroid();
	3555	+ ResetCentroid(true);
2407	3556	} else
2408		- if (event.getSource() == resetParentItem)
	3557	+ if (source == resetCentroidXZItem)
	3558	+ {
	3559	+ ResetCentroid(false);
	3560	+ } else
	3561	+ if (source == resetParentItem)
2409	3562	{
2410	3563	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2411	3564	{
..	..	@@ -2415,7 +3568,7 @@
2415	3568
2416	3569	refreshContents();
2417	3570	} else
2418		- if (event.getSource() == repairParentItem)
	3571	+ if (source == repairParentItem)
2419	3572	{
2420	3573	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2421	3574	{
..	..	@@ -2429,7 +3582,21 @@
2429	3582
2430	3583	refreshContents();
2431	3584	} else
2432		- if (event.getSource() == sortbysizeItem)
	3585	+ if (source == repairShadowItem)
	3586	+ {
	3587	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3588	+ {
	3589	+ Object3D obj = (Object3D)e.nextElement();
	3590	+ obj.RepairShadow();
	3591	+// for (int i=0; i<obj.size(); i++)
	3592	+// {
	3593	+// obj.get(i).parent = obj;
	3594	+// }
	3595	+ }
	3596	+
	3597	+ refreshContents();
	3598	+ } else
	3599	+ if (source == sortbysizeItem)
2433	3600	{
2434	3601	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2435	3602	{
..	..	@@ -2441,7 +3608,7 @@
2441	3608	ResetModel();
2442	3609	refreshContents();
2443	3610	} else
2444		- if (event.getSource() == sortbynameItem)
	3611	+ if (source == sortbynameItem)
2445	3612	{
2446	3613	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2447	3614	{
..	..	@@ -2453,7 +3620,7 @@
2453	3620	ResetModel();
2454	3621	refreshContents();
2455	3622	} else
2456		- if (event.getSource() == attachPigmentItem)
	3623	+ if (source == attachPigmentItem)
2457	3624	{
2458	3625	String texture = GetFile("Attach pigment");
2459	3626	Object3D obj;
..	..	@@ -2465,7 +3632,7 @@
2465	3632
2466	3633	refreshContents();
2467	3634	} else
2468		- if (event.getSource() == detachPigmentItem)
	3635	+ if (source == detachPigmentItem)
2469	3636	{
2470	3637	Object3D obj;
2471	3638	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2476,7 +3643,7 @@
2476	3643
2477	3644	refreshContents();
2478	3645	} else
2479		- if (event.getSource() == attachBumpItem)
	3646	+ if (source == attachBumpItem)
2480	3647	{
2481	3648	String texture = GetFile("Attach bump");
2482	3649	Object3D obj;
..	..	@@ -2488,18 +3655,18 @@
2488	3655
2489	3656	refreshContents();
2490	3657	} else
2491		- if (event.getSource() == detachBumpItem)
	3658	+ if (source == detachBumpItem)
2492	3659	{
2493	3660	Object3D obj;
2494	3661	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2495	3662	{
2496	3663	obj = (Object3D)e.nextElement();
2497		- obj.SetBumpTexture(null);
	3664	+ obj.ResetBumpTexture();
2498	3665	}
2499	3666
2500	3667	refreshContents();
2501	3668	} else
2502		- if (event.getSource() == pigmentBumpItem)
	3669	+ if (source == pigmentBumpItem)
2503	3670	{
2504	3671	Object3D obj;
2505	3672	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2510,159 +3677,233 @@
2510	3677
2511	3678	refreshContents();
2512	3679	} else
2513		- if (event.getSource() == flashSelectionButton)
	3680	+ if (source == embedTexturesItem)
	3681	+ {
	3682	+ Object3D obj;
	3683	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3684	+ {
	3685	+ obj = (Object3D)e.nextElement();
	3686	+ obj.EmbedTextures(true);
	3687	+ }
	3688	+
	3689	+ refreshContents();
	3690	+ } else
	3691	+ if (source == deEmbedTexturesItem)
	3692	+ {
	3693	+ Object3D obj;
	3694	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3695	+ {
	3696	+ obj = (Object3D)e.nextElement();
	3697	+ obj.EmbedTextures(false);
	3698	+ }
	3699	+
	3700	+ CameraPane.texturepigment.clear();
	3701	+ CameraPane.texturebump.clear();
	3702	+
	3703	+ refreshContents();
	3704	+ } else
	3705	+ if (source == flashSelectionButton)
2514	3706	{
2515	3707	CameraPane.flash = true;
2516	3708	refreshContents();
2517	3709	} else
2518		- if (event.getSource() == oneButton)
	3710	+ if (source == oneButton)
2519	3711	{
2520	3712	} else
2521		- if (event.getSource() == twoButton)
	3713	+ if (source == twoButton)
2522	3714	{
2523	3715	radio.layout = twoButton;
2524		- // bug
2525		- //gridPanel.setDividerLocation(1.0);
2526		- //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();
	3716	+
	3717	+ if (CameraPane.FULLSCREEN)
	3718	+ fullscreenLayout = radio.layout;
	3719	+
	3720	+ Show3DView();
	3721	+
	3722	+ cameraView.requestFocusInWindow();
	3723	+
	3724	+// refreshContents(true);
	3725	+//
	3726	+// try
	3727	+// {
	3728	+// java.awt.Robot bot = new java.awt.Robot();
	3729	+// int mask = InputEvent.BUTTON1_MASK;
	3730	+// bot.mouseMove(100, 100);
	3731	+// bot.mousePress(mask);
	3732	+// bot.mouseRelease(mask);
	3733	+// }
	3734	+// catch (Exception e)
	3735	+// {
	3736	+//
	3737	+// }
	3738	+
2551	3739	} else
2552		- if (event.getSource() == threeButton)
	3740	+ if (source == threeButton)
2553	3741	{
2554	3742	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();
	3743	+
	3744	+ if (CameraPane.FULLSCREEN)
	3745	+ fullscreenLayout = radio.layout;
	3746	+
	3747	+// bigThree.remove(scenePanel);
	3748	+// bigThree.remove(centralPanel);
	3749	+// bigThree.remove(XYZPanel);
	3750	+// aWindowConstraints.gridx = 0;
	3751	+// aWindowConstraints.gridy = 0;
	3752	+// aWindowConstraints.gridwidth = 1;
	3753	+// // aConstraints.gridheight = 3;
	3754	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3755	+// aWindowConstraints.weightx = 0;
	3756	+// aWindowConstraints.weighty = 1;
	3757	+// //bigThree.add(jtp, aWindowConstraints);
	3758	+// aWindowConstraints.weightx = 1;
	3759	+// aWindowConstraints.gridwidth = 3;
	3760	+// // aConstraints.gridheight = 3;
	3761	+// aWindowConstraints.gridx = 1;
	3762	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3763	+// bigThree.add(centralPanel, aWindowConstraints);
	3764	+// aWindowConstraints.weightx = 0;
	3765	+// aWindowConstraints.gridx = 4;
	3766	+// aWindowConstraints.gridwidth = 1;
	3767	+// // aConstraints.gridheight = 3;
	3768	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	3769	+// bigThree.add(XYZPanel, aWindowConstraints);
	3770	+// bigThree.validate();
	3771	+// scenePanel.setVisible(false);
	3772	+// centralPanel.setVisible(true);
	3773	+// XYZPanel.setVisible(true);
	3774	+ bigThree.ClearUI();
	3775	+ bigThree.add(scenePanel);
	3776	+ bigThree.add(centralPanel);
	3777	+ bigThree.FlushUI();
	3778	+
	3779	+ cameraView.requestFocusInWindow();
2579	3780	} else
2580		- if (event.getSource() == fourButton)
	3781	+ if (source == fourButton)
2581	3782	{
2582	3783	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();
	3784	+
	3785	+ if (CameraPane.FULLSCREEN)
	3786	+ fullscreenLayout = radio.layout;
	3787	+
	3788	+// bigThree.remove(scenePanel);
	3789	+// bigThree.remove(centralPanel);
	3790	+// bigThree.remove(XYZPanel);
	3791	+// aWindowConstraints.gridx = 0;
	3792	+// aWindowConstraints.gridy = 0;
	3793	+// aWindowConstraints.gridwidth = 1;
	3794	+// // aWindowConstraints.gridheight = 3;
	3795	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3796	+// aWindowConstraints.weightx = 1;
	3797	+// aWindowConstraints.weighty = 1;
	3798	+// bigThree.add(scenePanel, aWindowConstraints);
	3799	+// aWindowConstraints.weightx = 1;
	3800	+// aWindowConstraints.gridwidth = 3;
	3801	+// // aConstraints.gridheight = 3;
	3802	+// aWindowConstraints.gridx = 1;
	3803	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3804	+// //bigThree.add(cameraPanel, aWindowConstraints);
	3805	+// aWindowConstraints.weightx = 0;
	3806	+// aWindowConstraints.gridx = 4;
	3807	+// aWindowConstraints.gridwidth = 1;
	3808	+// // aWindowConstraints.gridheight = 3;
	3809	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3810	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3811	+// bigThree.validate();
	3812	+// scenePanel.setVisible(true);
	3813	+// centralPanel.setVisible(false);
	3814	+// XYZPanel.setVisible(false);
	3815	+ bigThree.ClearUI();
	3816	+ bigThree.add(scenePanel);
	3817	+ bigThree.FlushUI();
	3818	+
	3819	+ cameraView.requestFocusInWindow();
2607	3820	} else
2608		- if (event.getSource() == sixButton)
	3821	+ if (source == sixButton)
2609	3822	{
2610	3823	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();
	3824	+
	3825	+ if (CameraPane.FULLSCREEN)
	3826	+ fullscreenLayout = radio.layout;
	3827	+
	3828	+// bigThree.remove(scenePanel);
	3829	+// bigThree.remove(centralPanel);
	3830	+// bigThree.remove(XYZPanel);
	3831	+// aWindowConstraints.gridx = 0;
	3832	+// aWindowConstraints.gridy = 0;
	3833	+// aWindowConstraints.gridwidth = 1;
	3834	+// // aConstraints.gridheight = 3;
	3835	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3836	+// aWindowConstraints.weightx = 0;
	3837	+// aWindowConstraints.weighty = 1;
	3838	+// bigThree.add(scenePanel, aWindowConstraints);
	3839	+// aWindowConstraints.weightx = 1;
	3840	+// aWindowConstraints.gridwidth = 3;
	3841	+// // aWindowConstraints.gridheight = 3;
	3842	+// aWindowConstraints.gridx = 1;
	3843	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3844	+// bigThree.add(centralPanel, aWindowConstraints);
	3845	+// aWindowConstraints.weightx = 0;
	3846	+// aWindowConstraints.gridx = 4;
	3847	+// aWindowConstraints.gridwidth = 1;
	3848	+// // aWindowConstraints.gridheight = 3;
	3849	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3850	+// //bigThree.add(XYZPanel, aConstraints);
	3851	+// bigThree.validate();
	3852	+// scenePanel.setVisible(true);
	3853	+// centralPanel.setVisible(true);
	3854	+// XYZPanel.setVisible(false);
	3855	+ bigThree.ClearUI();
	3856	+ bigThree.add(centralPanel);
	3857	+ bigThree.add(scenePanel);
	3858	+ bigThree.FlushUI();
	3859	+
	3860	+ cameraView.requestFocusInWindow();
2635	3861	} else
2636		- if (event.getSource() == sevenButton)
	3862	+ if (source == sevenButton)
2637	3863	{
2638	3864	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();
	3865	+
	3866	+ if (CameraPane.FULLSCREEN)
	3867	+ fullscreenLayout = radio.layout;
	3868	+
	3869	+// bigThree.remove(scenePanel);
	3870	+// bigThree.remove(centralPanel);
	3871	+// bigThree.remove(XYZPanel);
	3872	+// aWindowConstraints.gridx = 0;
	3873	+// aWindowConstraints.gridy = 0;
	3874	+// aWindowConstraints.gridwidth = 1;
	3875	+// // aWindowConstraints.gridheight = 3;
	3876	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3877	+// aWindowConstraints.weightx = 0;
	3878	+// aWindowConstraints.weighty = 1;
	3879	+// bigThree.add(scenePanel, aWindowConstraints);
	3880	+// aWindowConstraints.weightx = 1;
	3881	+// aWindowConstraints.gridwidth = 3;
	3882	+// // aWindowConstraints.gridheight = 3;
	3883	+// aWindowConstraints.gridx = 1;
	3884	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3885	+// bigThree.add(centralPanel, aWindowConstraints);
	3886	+// aWindowConstraints.weightx = 0;
	3887	+// aWindowConstraints.gridx = 4;
	3888	+// aWindowConstraints.gridwidth = 1;
	3889	+// // aConstraints.gridheight = 3;
	3890	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3891	+// bigThree.add(XYZPanel, aWindowConstraints);
	3892	+// bigThree.validate();
	3893	+// scenePanel.setVisible(true);
	3894	+// centralPanel.setVisible(true);
	3895	+// XYZPanel.setVisible(true);
	3896	+ bigThree.ClearUI();
	3897	+ bigThree.add(scenePanel);
	3898	+ bigThree.add(centralPanel);
	3899	+ bigThree.add(XYZPanel);
	3900	+ bigThree.FlushUI();
	3901	+
	3902	+ cameraView.requestFocusInWindow();
2663	3903	} else
2664		- if (event.getSource() == rootButton)
	3904	+ if (source == rootButton)
2665	3905	{
	3906	+ Replace();
2666	3907	Object3D obj;
2667	3908	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2668	3909	{
..	..	@@ -2671,66 +3912,85 @@
2671	3912	EditObject(obj);
2672	3913	}
2673	3914
	3915	+ cameraView.requestFocusInWindow();
2674	3916	refreshContents(true);
2675	3917	} else
2676		- if (event.getSource() == closeButton)
	3918	+ if (source == closeButton)
2677	3919	{
2678	3920	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2679	3921	cRadio ab;
2680	3922	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2681	3923	{
2682	3924	ab = (cRadio)e.nextElement();
2683		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3925	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2684	3926	{
	3927	+ // Patch to avoid bug with transparency.
	3928	+ if (!ab.hadMaterial)
	3929	+ {
	3930	+ ab.object.material = null;
	3931	+ }
	3932	+
2685	3933	buttonGroup.remove(ab);
2686	3934	radioPanel.remove(ab);
2687	3935
2688		- ab.GetObject().editWindow = null;
	3936	+ //ab.GetObject().editWindow = null;
	3937	+ ab.GetObject().manipWindow = null;
2689	3938	// ab.GetObject().objectUI = null; // ?????????
2690	3939
2691	3940	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2692	3941	break;
2693	3942	}
2694	3943	}
	3944	+
	3945	+ cameraView.requestFocusInWindow();
2695	3946	refreshContents(true);
2696	3947	} else
2697		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3948	+ if (source == editItem \|\| source == editButton)
2698	3949	{
	3950	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3951	+ {
	3952	+ Object3D child = (Object3D)e.nextElement();
	3953	+ child.pinned = true;
	3954	+ }
	3955	+
2699	3956	EditSelection(false);
2700	3957	} else
2701		- if (event.getSource() == uneditButton)
	3958	+ if (source == uneditButton)
2702	3959	{
2703	3960	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2704	3961	{
2705	3962	Object3D child = (Object3D)e.nextElement();
2706	3963	if(child.editWindow != null)
2707		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3964	+ child.pinned = false;
2708	3965	child.CloseUI();
2709	3966	listUI.remove(child);
	3967	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2710	3968
2711		- child.editWindow = null; // ???????????
	3969	+ //child.editWindow = null; // ???????????
2712	3970	}
2713		- objEditor.ctrlPanel.revalidate();
	3971	+ objEditor.ctrlPanel.FlushUI();
2714	3972	//objEditor.jTree.clearSelection();
2715	3973	//objEditor.ResetSliders();
2716	3974	refreshContents(true);
2717	3975	} else
2718		- if (event.getSource() == clearPanelButton)
	3976	+ if (source == clearPanelButton)
2719	3977	{
2720	3978	assert(copy == group);
2721	3979	//copy.ClearUI();
2722	3980	for (Object3D obj : listUI)
2723	3981	{
	3982	+ obj.pinned = false;
2724	3983	obj.CloseUI();
2725	3984	}
2726	3985	listUI.clear();
	3986	+ SetPinStates(group.selection.size() > 0);
2727	3987	refreshContents(true);
2728	3988	} else
2729		- if (event.getSource() == allParamsButton)
	3989	+ if (source == allParamsButton)
2730	3990	{
2731	3991	assert(copy == group);
2732	3992
2733		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3993	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2734	3994
2735	3995	for (Object3D obj : listUI)
2736	3996	{
..	..	@@ -2747,19 +4007,19 @@
2747	4007
2748	4008	refreshContents(true);
2749	4009	} else
2750		- if (event.getSource() == unselectButton)
	4010	+ if (source == unselectButton)
2751	4011	{
2752	4012	objEditor.jTree.clearSelection();
2753		- // ?? oct 2012 GraphreeD.clipboard.clear();
	4013	+ // ?? oct 2012 GrafreeD.clipboard.clear();
2754	4014	objEditor.ResetSliders();
2755	4015	refreshContents(true);
2756	4016	} else
2757		- if(event.getSource() instanceof cRadio)
	4017	+ if(source instanceof cRadio)
2758	4018	{
2759	4019	group.parent = keepparent;
2760	4020	group.attributes = 0;
2761	4021	//group.editWindow = null;
2762		- /cRadio/ radio = (cRadio)event.getSource();
	4022	+ /cRadio/ radio = (cRadio)source;
2763	4023	Object3D obj = radio.GetObject();
2764	4024	System.out.println("Edit " + obj);
2765	4025	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2779,7 +4039,8 @@
2779	4039	}
2780	4040
2781	4041	copy = group;
2782		- //CameraPane.theRenderer.object = group;
	4042	+
	4043	+ //Globals.theRenderer.object = group;
2783	4044	if(!useclient)
2784	4045	{
2785	4046	cameraView.renderCamera = radio.camera;
..	..	@@ -2788,25 +4049,57 @@
2788	4049	cameraView.cameras[cameraView.cameracount] = radio.camera;
2789	4050	cameraView.targetLookAt.set(radio.camera.lookAt);
2790	4051	cameraView.object = group;
2791		- cameraView.lighttouched = true;
	4052	+ //cameraView.lighttouched = true;
	4053	+ Globals.lighttouched = true;
2792	4054	topView.object = group;
2793	4055	frontView.object = group;
2794	4056	sideView.object = group;
2795	4057	}
2796		- group.editWindow = this;
	4058	+
	4059	+// fix "+" issue
	4060	+ //group.editWindow = this;
	4061	+ group.manipWindow = this;
	4062	+
2797	4063	/*
2798	4064	currentLayout = radio.layout;
2799	4065	if (currentLayout == null)
2800	4066	currentLayout = sevenButton;
2801	4067	*/
2802	4068	radio.layout.doClick();
	4069	+
	4070	+ SetUndoStates();
	4071	+
	4072	+ ClearUnpinned();
	4073	+
	4074	+ //Grafreed.Assert(group != null);
	4075	+ //Grafreed.Assert(group.selection != null);
	4076	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4077	+ if (group.selection == null \|\| group.selection.size() == 1)
	4078	+ EditSelection(false);
2803	4079	keepparent = group.parent;
2804	4080	// PARENT = NULL or not???
2805	4081	//group.parent = null; // ROOT
2806	4082	//group.attributes = -1;
2807	4083	ResetModel();
	4084	+
	4085	+ cameraView.requestFocusInWindow();
2808	4086	refreshContents(true);
2809		- }
	4087	+ } else if (event.getSource() == editCameraItem)
	4088	+ {
	4089	+ cameraView.ProtectCamera();
	4090	+ cameraView.requestFocusInWindow();
	4091	+ cameraView.repaint();
	4092	+ return;
	4093	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	4094	+ {
	4095	+ cameraView.RevertCamera();
	4096	+ cameraView.requestFocusInWindow();
	4097	+ cameraView.repaint();
	4098	+ return;
	4099	+ // } else if (event.getSource() == textureButton)
	4100	+ // {
	4101	+ // return; // true;
	4102	+ }
2810	4103	else
2811	4104	{
2812	4105	//return super.action(event, arg);
..	..	@@ -2815,7 +4108,6 @@
2815	4108	}
2816	4109
2817	4110	boolean useclient = false;
2818		- cRadio radio;
2819	4111
2820	4112	void ToggleRoot()
2821	4113	{
..	..	@@ -2824,7 +4116,7 @@
2824	4116	if (useclient)
2825	4117	{
2826	4118	cameraView.object = client;
2827		- cameraView.lighttouched = true;
	4119	+ Globals.lighttouched = true;
2828	4120	//topView.object = client;
2829	4121	//frontView.object = client;
2830	4122	//sideView.object = client;
..	..	@@ -2832,7 +4124,7 @@
2832	4124	else
2833	4125	{
2834	4126	cameraView.object = group;
2835		- cameraView.lighttouched = true;
	4127	+ Globals.lighttouched = true;
2836	4128	//topView.object = group;
2837	4129	//frontView.object = group;
2838	4130	//sideView.object = group;
..	..	@@ -2867,6 +4159,28 @@
2867	4159	refreshContents();
2868	4160	}
2869	4161
	4162	+ void TransformChildren()
	4163	+ {
	4164	+ Object3D obj;
	4165	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4166	+ {
	4167	+ obj = (Object3D)e.nextElement();
	4168	+ obj.KeepTextureMatrices();
	4169	+ obj.TransformChildren();
	4170	+ obj.RestoreTextureMatrices();
	4171	+
	4172	+// if (obj.parent == null)
	4173	+// {
	4174	+// System.out.println("NULL PARENT!");
	4175	+// new Exception().printStackTrace();
	4176	+// }
	4177	+// else
	4178	+// TouchTransform(obj);
	4179	+// //obj.parent.Touch();
	4180	+ }
	4181	+
	4182	+ refreshContents();
	4183	+ }
2870	4184
2871	4185	void ResetTransform()
2872	4186	{
..	..	@@ -2979,7 +4293,7 @@
2979	4293	refreshContents();
2980	4294	}
2981	4295
2982		- void ResetCentroid()
	4296	+ void ResetCentroid(boolean full)
2983	4297	{
2984	4298	Object3D obj;
2985	4299	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2994,12 +4308,16 @@
2994	4308	LA.matIdentity(Object3D.mat);
2995	4309	obj.getBounds(minima, maxima, false);
2996	4310	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
2997		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	4311	+ if (full)
	4312	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
2998	4313	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
2999	4314	obj.TransformMesh(Object3D.mat);
	4315	+
3000	4316	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3001		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	4317	+ if (full)
	4318	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3002	4319	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	4320	+
3003	4321	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3004	4322	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3005	4323	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3028,7 +4346,8 @@
3028	4346
3029	4347	int size = obj.MemorySize();
3030	4348
3031		- System.err.println((size/1024) + " KB is the size of " + obj);
	4349	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4350	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3032	4351	}
3033	4352	}
3034	4353	catch (Exception e)
..	..	@@ -3065,9 +4384,9 @@
3065	4384	obj = (Object3D)e.nextElement();
3066	4385
3067	4386	System.out.println("Object is: " + obj);
3068		- GraphreeD.AnalyzeObject(obj);
	4387	+ Grafreed.AnalyzeObject(obj);
3069	4388	System.out.println("Boundary rep: " + obj.bRep);
3070		- GraphreeD.AnalyzeObject(obj.bRep);
	4389	+ Grafreed.AnalyzeObject(obj.bRep);
3071	4390
3072	4391	// System.err.println((size/1024) + " KB is the size of " + obj);
3073	4392	}
..	..	@@ -3109,6 +4428,20 @@
3109	4428	void GenNormals(boolean crease)
3110	4429	{
3111	4430	group.GenNormalsS(crease);
	4431	+
	4432	+ refreshContents();
	4433	+ }
	4434	+
	4435	+ void GenNormalsMESH()
	4436	+ {
	4437	+ group.GenNormalsMeshS();
	4438	+
	4439	+ refreshContents();
	4440	+ }
	4441	+
	4442	+ void GenNormalsMINE()
	4443	+ {
	4444	+ group.selection.GenNormalsMINE();
3112	4445
3113	4446	refreshContents();
3114	4447	}
..	..	@@ -3157,104 +4490,259 @@
3157	4490
3158	4491	//Object3D buffer;
3159	4492	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		-
	4493	+// BoundaryRep temprep;
	4494	+// Object3D nodes;
	4495	+// Vector<Vertex> vertices;
	4496	+//
	4497	+// cGroup buffer;
	4498	+//
	4499	+// public void Vertex(Object3D node, Vertex v)
	4500	+// {
	4501	+//// vertices.add(v);
	4502	+//// nodes.addElement(node);
	4503	+////
	4504	+//// if (temprep.GetCache(v) != null)
	4505	+//// {
	4506	+//// temprep.Remove(v);
	4507	+//// } else
	4508	+//// {
	4509	+//// temprep.Remember(v);
	4510	+//// }
	4511	+//
	4512	+// //Object3D node = nodes.get(index);
	4513	+// temp.set(v); // vertices.get(index)); // temprep.GetVertex(k));
	4514	+// // System.out.println("temp = " + temp.x + ", " + temp.y + ", " + temp.z);
	4515	+//
	4516	+// LA.xformPos(temp, node.GlobalTransformInv(), temp);
	4517	+//
	4518	+// // System.out.println("tem+ = " + temp.x + ", " + temp.y + ", " + temp.z);
	4519	+//
	4520	+// cGroup g = new cGroup();
	4521	+//
	4522	+// if (g.toParent == null)
	4523	+// {
	4524	+// g.toParent = LA.newMatrix();
	4525	+// g.fromParent = LA.newMatrix();
	4526	+// }
	4527	+// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
	4528	+// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
	4529	+//
	4530	+// g.add(GrafreeD.clipboard);
	4531	+//
	4532	+// buffer.add(g);
	4533	+// }
	4534	+//
	4535	+// public void Face(Object3D node, Face f)
	4536	+// {
	4537	+//
	4538	+// }
	4539	+//
	4540	+// void ParseVerticesOld() // ??
	4541	+// {
	4542	+// //if (group.selection.size() != 1)
	4543	+// // return;
	4544	+//
	4545	+// temprep = new BoundaryRep();
	4546	+// nodes = new Object3D();
	4547	+// vertices = new Vector<Vertex>();
	4548	+//
	4549	+// boolean epsequal = GrafreeD.epsequal;
	4550	+// GrafreeD.epsequal = true;
	4551	+//
	4552	+// for (int i=0; i<group.selection.size(); i++)
	4553	+// {
	4554	+// Object3D buffer = new cGroup(group.selection.get(i).name + "+");
	4555	+//
	4556	+// group.selection.get(i).Parse(
	4557	+//this );
	4558	+//
	4559	+// int repsize = temprep.VertexCount();
	4560	+// int tablesize = temprep.vertextable.size();
	4561	+// int nodesize = nodes.size();
	4562	+//
	4563	+// assert(vertices.size() == nodes.size());
	4564	+//
	4565	+// temprep.vertextable.elements();
	4566	+//
	4567	+// java.util.Set<java.util.Map.Entry<Vertex,Vertex>> set = temprep.vertextable.entrySet();
	4568	+//
	4569	+// for (java.util.Map.Entry<Vertex,Vertex> entry : set)
	4570	+// {
	4571	+// cGroup g = new cGroup();
	4572	+//
	4573	+// int index = vertices.indexOf(entry.getValue()); // temprep.vertextable.(k));
	4574	+//
	4575	+// Object3D node = nodes.get(index);
	4576	+// temp.set(vertices.get(index)); // temprep.GetVertex(k));
	4577	+// // System.out.println("temp = " + temp.x + ", " + temp.y + ", " + temp.z);
	4578	+//
	4579	+// LA.xformPos(temp, node.GlobalTransformInv(), temp);
	4580	+//
	4581	+// // System.out.println("tem+ = " + temp.x + ", " + temp.y + ", " + temp.z);
	4582	+//
	4583	+// if (g.toParent == null)
	4584	+// {
	4585	+// g.toParent = LA.newMatrix();
	4586	+// g.fromParent = LA.newMatrix();
	4587	+// }
	4588	+// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
	4589	+// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
	4590	+//
	4591	+// g.add(GrafreeD.clipboard);
	4592	+//
	4593	+// buffer.add(g);
	4594	+// }
	4595	+//
	4596	+// makeSomething(buffer, i==group.selection.size()-1);
	4597	+// }
	4598	+//
	4599	+// GrafreeD.epsequal = epsequal;
	4600	+//
	4601	+// //buffer = null;
	4602	+// temprep = null;
	4603	+// nodes = null;
	4604	+//
	4605	+// refreshContents();
	4606	+// }
	4607	+
3184	4608	void ParseVertices()
3185	4609	{
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;
	4610	+ boolean epsequal = Grafreed.epsequal;
	4611	+ Grafreed.epsequal = true;
3195	4612
3196	4613	for (int i=0; i<group.selection.size(); i++)
3197	4614	{
3198		- Object3D buffer = new cGroup(group.selection.get(i).name + "+");
	4615	+ final cGroup buffer = new cGroup(group.selection.get(i).name + "+");
3199	4616
3200		- group.selection.get(i).Parse(this);
3201		-
3202		- int repsize = temprep.VertexCount();
3203		- int tablesize = temprep.vertextable.size();
3204		- int nodesize = nodes.size();
	4617	+ group.selection.get(i).Parse(
	4618	+
	4619	+ new iParse()
	4620	+ {
	4621	+ public void Vertex(Object3D node, Vertex v)
	4622	+ {
	4623	+ temp.set(v);
	4624	+ LA.xformPos(temp, node.GlobalTransformInv(), temp);
3205	4625
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();
	4626	+ cGroup g = new cGroup();
3211	4627
3212		- for (java.util.Map.Entry<Vertex,Vertex> entry : set)
3213		- {
3214		- cGroup g = new cGroup();
	4628	+ if (g.toParent == null)
	4629	+ {
	4630	+ g.toParent = LA.newMatrix();
	4631	+ g.fromParent = LA.newMatrix();
	4632	+ }
	4633	+ LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
	4634	+ LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3215	4635
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);
	4636	+ g.add(Grafreed.clipboard);
3220	4637
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);
	4638	+ buffer.add(g);
	4639	+ }
3232	4640
3233		- g.add(GraphreeD.clipboard);
	4641	+ public void Face(Object3D node, Face f)
	4642	+ {
3234	4643
3235		- buffer.add(g);
3236		- }
	4644	+ }
	4645	+ }
	4646	+ );
3237	4647
3238	4648	makeSomething(buffer, i==group.selection.size()-1);
3239	4649	}
3240	4650
3241		- GraphreeD.epsequal = epsequal;
3242		-
3243		- //buffer = null;
3244		- temprep = null;
3245		- nodes = null;
	4651	+ Grafreed.epsequal = epsequal;
3246	4652
3247	4653	refreshContents();
3248	4654	}
3249		-
	4655	+
	4656	+ void TextureVertices()
	4657	+ {
	4658	+ for (int i=0; i<group.selection.size(); i++)
	4659	+ {
	4660	+ group.selection.get(i).Parse(
	4661	+ new iParse()
	4662	+ {
	4663	+ public void Vertex(Object3D node, Vertex v)
	4664	+ {
	4665	+ cTexture tex = node.GetTextures();
	4666	+ String pigment = Object3D.GetPigment(tex);
	4667	+ //String bump = Object3D.GetBump(tex);
	4668	+
	4669	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4670	+
	4671	+ try
	4672	+ {
	4673	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
	4674	+ }
	4675	+ catch (Exception e)
	4676	+ {
	4677	+ System.err.println("FAIL: " + node);
	4678	+ }
	4679	+
	4680	+ double s = v.s;
	4681	+
	4682	+ if (s == 1)
	4683	+ s = 0;
	4684	+
	4685	+ double t = v.t;
	4686	+
	4687	+ if (t == 1)
	4688	+ t = 0;
	4689	+
	4690	+ int indexs = (int) (texturedata.getWidth() * s);
	4691	+ int indext = (int) (texturedata.getHeight() * t);
	4692	+
	4693	+ int index = indext * texturedata.getWidth() + indexs;
	4694	+
	4695	+ java.nio.ByteBuffer bytebuf = (java.nio.ByteBuffer)texturedata.getBuffer();
	4696	+
	4697	+ int slide = bytebuf.capacity() / texturedata.getWidth() / texturedata.getHeight();
	4698	+
	4699	+ float scale = bytebuf.get(index*slide) & 0xFF;
	4700	+ scale += bytebuf.get(index*slide+1) & 0xFF;
	4701	+ scale += bytebuf.get(index*slide+2) & 0xFF;
	4702	+ scale /= 3;
	4703	+
	4704	+ scale /= 0xFF;
	4705	+ // c'est quoi ca? scale /= 4;
	4706	+
	4707	+ //v.AO = scale;
	4708	+
	4709	+ v.x += v.norm.x * scale;
	4710	+ v.y += v.norm.y * scale;
	4711	+ v.z += v.norm.z * scale;
	4712	+ }
	4713	+
	4714	+ public void Face(Object3D node, Face f)
	4715	+ {
	4716	+ }
	4717	+ }
	4718	+ );
	4719	+ }
	4720	+
	4721	+ refreshContents();
	4722	+ }
	4723	+
3250	4724	void Align()
3251	4725	{
	4726	+ if (group.selection.size() == 0)
	4727	+ return;
	4728	+
	4729	+ cVector bbmin = new cVector();
	4730	+ cVector bbmax = new cVector();
	4731	+
	4732	+ group.selection.get(0).getBounds(bbmin, bbmax, true);
	4733	+
	4734	+ double dx = bbmax.x - bbmin.x;
	4735	+ double dy = bbmax.y - bbmin.y;
	4736	+ double dz = bbmax.z - bbmin.z;
	4737	+
	4738	+ double scale = Math.sqrt(dxdx + dydy + dz*dz);
	4739	+
3252	4740	for (int i=0; i<group.selection.size(); i++)
3253	4741	{
3254	4742	Object3D obj = group.selection.get(i);
3255	4743
3256		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3257		- LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
	4744	+ LA.matTranslate(obj.toParent, i * scale, 0, 0);
	4745	+ LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3258	4746	}
3259	4747
3260	4748	refreshContents();
..	..	@@ -3267,7 +4755,7 @@
3267	4755	// ref.SaveSupports();
3268	4756	// Object3D par = ref.parent;
3269	4757	// ref.parent = null;
3270		-// Object3D lowres = (Object3D) GraphreeD.clone(ref);
	4758	+// Object3D lowres = (Object3D) GrafreeD.clone(ref);
3271	4759	// ref.parent = par;
3272	4760	// ref.RestoreSupports();
3273	4761
..	..	@@ -3275,11 +4763,11 @@
3275	4763
3276	4764	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3277	4765
3278		- boolean random = CameraPane.RANDOM;
3279		- CameraPane.RANDOM = false; // parse all random nodes
	4766	+ boolean random = CameraPane.SWITCH;
	4767	+ CameraPane.SWITCH = false; // parse all random nodes
3280	4768	lowres.linkVerticesThis(null);
3281	4769	lowres.linkVerticesThis(sn);
3282		- CameraPane.RANDOM = random;
	4770	+ CameraPane.SWITCH = random;
3283	4771
3284	4772	System.err.flush();
3285	4773
..	..	@@ -3297,7 +4785,7 @@
3297	4785	// lowres.SaveSupports();
3298	4786	// par = lowres.parent;
3299	4787	// lowres.parent = null;
3300		-// Object3D newlow = (Object3D) GraphreeD.clone(lowres);
	4788	+// Object3D newlow = (Object3D) GrafreeD.clone(lowres);
3301	4789	Object3D newlow = CloneObject(lowres, false);
3302	4790	newlow.name = sn.switchobject.get(i).name;
3303	4791	System.out.println(" pose#" + i + " = " + newlow);
..	..	@@ -3319,7 +4807,7 @@
3319	4807	return;
3320	4808
3321	4809	Object3D poses = group.selection.get(0);
3322		- Object3D ref = GraphreeD.clipboard.get(0);
	4810	+ Object3D ref = Grafreed.clipboard.get(0);
3323	4811
3324	4812	Object3D newgroup = new Object3D("Po:" + poses.name);
3325	4813
..	..	@@ -3488,7 +4976,7 @@
3488	4976	group.selection.RelinkToSupport(); // july 2014
3489	4977	System.out.println("DONE.");
3490	4978	refreshContents();
3491		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	4979	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3492	4980	}
3493	4981
3494	4982	void ReduceMesh(boolean reduction34)
..	..	@@ -3513,20 +5001,20 @@
3513	5001
3514	5002	void ClipMesh()
3515	5003	{
3516		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	5004	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3517	5005	{
3518		- Object3D content = GraphreeD.clipboard.get(0);
	5006	+ Object3D content = Grafreed.clipboard.get(0);
3519	5007
3520	5008	if (content instanceof cGroup && ((cGroup)content).transientlink )
3521	5009	content = ((cGroup)content).get(0);
3522	5010
3523	5011	// for (int i=0; i<group.selection.size(); i++)
3524	5012	// {
3525		-// group.selection.get(i).ClipMesh(GraphreeD.clipboard);
	5013	+// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3526	5014	// }
3527		- group.selection.ClipMesh(GraphreeD.clipboard);
	5015	+ group.selection.ClipMesh(Grafreed.clipboard);
3528	5016	}
3529		-// group.selection.ClipMesh(GraphreeD.clipboard);
	5017	+// group.selection.ClipMesh(GrafreeD.clipboard);
3530	5018	System.out.println("DONE.");
3531	5019	refreshContents();
3532	5020	}
..	..	@@ -3571,6 +5059,18 @@
3571	5059	void MarkLeaves(boolean hide)
3572	5060	{
3573	5061	group.selection.MarkLeaves(hide);
	5062	+ refreshContents();
	5063	+ }
	5064	+
	5065	+ void RewindLeaves(boolean hide)
	5066	+ {
	5067	+ group.selection.RewindLeaves(hide);
	5068	+ refreshContents();
	5069	+ }
	5070	+
	5071	+ void RandomLeaves(boolean hide)
	5072	+ {
	5073	+ group.selection.RandomLeaves(hide);
3574	5074	refreshContents();
3575	5075	}
3576	5076
..	..	@@ -3645,28 +5145,25 @@
3645	5145	// }
3646	5146	// }
3647	5147
3648		- static boolean allparams = true;
3649		-
3650		- static Vector<Object3D> listUI = new Vector<Object3D>();
3651		-
3652	5148	void EditSelection(boolean newWindow)
3653	5149	{
	5150	+ if (group.selection == null)
	5151	+ {
	5152	+ EditElement(group, newWindow); // ? new
	5153	+ return;
	5154	+ }
	5155	+
3654	5156	// aConstraints.gridy = 0;
3655	5157	for (int i=0; i<group.selection.size(); i++)
3656	5158	{
3657	5159	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
3658	5160	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3659		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5161	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3660	5162
3661	5163	Object3D elem = (Object3D)group.selection.elementAt(i);
3662		- if(elem != group)
	5164	+ if(elem != group \|\| !newWindow)
3663	5165	{
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
	5166	+ EditElement(elem, newWindow); // ? new
3670	5167	}
3671	5168	}
3672	5169	}
..	..	@@ -3729,9 +5226,7 @@
3729	5226
3730	5227	freezemodel = false;
3731	5228	}
3732		-
3733		- boolean flashIt = true;
3734		-
	5229	+
3735	5230	public void valueChanged(TreeSelectionEvent e)
3736	5231	//public boolean handleEvent(Event event)
3737	5232	{
..	..	@@ -3741,7 +5236,8 @@
3741	5236	//new Exception().printStackTrace();
3742	5237
3743	5238	freezemodel = true;
3744		-
	5239	+ ClearUnpinned();
	5240	+
3745	5241	/**/
3746	5242	//switch (event.id)
3747	5243	{
..	..	@@ -3749,7 +5245,6 @@
3749	5245	//case 702: // Event.LIST_DESELECT
3750	5246	group.deselectAll();
3751	5247	TreePath tps[] = objEditor.jTree.getSelectionPaths();
3752		- objEditor.ClearInfo(); // .GetMaterial());
3753	5248	if (tps != null)
3754	5249	{
3755	5250	for (int i=0; i < tps.length; i++)
..	..	@@ -3758,33 +5253,39 @@
3758	5253
3759	5254	//if (child.parent != null)
3760	5255	//child.parent.addSelectee(child);
	5256	+ objEditor.SetMaterial(child);
3761	5257	group.addSelectee(child);
3762		- objEditor.SetMaterial(child); // .GetMaterial());
3763		- objEditor.AddInfo(child, this, true); // .GetMaterial());
3764		- System.err.println("info : " + child.GetPath());
3765	5258	}
3766	5259	}
3767		- else
3768		- {
3769		- objEditor.SetMaterial(group); // .GetMaterial());
3770		- objEditor.AddInfo(group, this, true); // .GetMaterial());
3771		- System.err.println("info : " + group.GetPath());
3772		- }
	5260	+// else
	5261	+// {
	5262	+// objEditor.SetMaterial(group); // .GetMaterial());
	5263	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	5264	+// System.err.println("info : " + group.GetPath());
	5265	+// }
3773	5266
3774		- objEditor.SetText(); // jan 2014
3775		-
3776		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	5267	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
3777	5268	CameraPane.flash = true;
3778	5269
3779		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5270	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
3780	5271	// a camera
3781	5272	{
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;
	5273	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5274	+ {
	5275	+ CameraPane.camerachangeframe = 0; // don't refuse it
	5276	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5277	+ }
	5278	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	5279	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
3786	5280	}
3787	5281
	5282	+ if (tps != null && tps.length == 1)
	5283	+ {
	5284	+ EditSelection(false);
	5285	+ }
	5286	+
	5287	+ SetPinStates(tps != null && tps.length > 0);
	5288	+
3788	5289	refreshContents();
3789	5290	//return true;
3790	5291	}
..	..	@@ -3793,6 +5294,50 @@
3793	5294
3794	5295	freezemodel = false;
3795	5296	}
	5297	+
	5298	+ void SetPinStates(boolean enabled)
	5299	+ {
	5300	+ editButton.setEnabled(enabled);
	5301	+ uneditButton.setEnabled(enabled);
	5302	+ //unselectButton.setEnabled(enabled);
	5303	+ flashSelectionButton.setEnabled(enabled);
	5304	+
	5305	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5306	+
	5307	+ boolean allComposites = true;
	5308	+
	5309	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5310	+ {
	5311	+ if (!(e.nextElement() instanceof Composite))
	5312	+ {
	5313	+ allComposites = false;
	5314	+ break;
	5315	+ }
	5316	+ }
	5317	+
	5318	+ rootButton.setEnabled(allComposites);
	5319	+ }
	5320	+
	5321	+ void refreshContents(boolean cp)
	5322	+ {
	5323	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5324	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5325	+ {
	5326	+ objEditor.ClearInfo(); // .GetMaterial());
	5327	+
	5328	+ for (int i=0; i < group.selection.Size(); i++)
	5329	+ {
	5330	+ Object3D child = (Object3D) group.selection.get(i);
	5331	+
	5332	+ objEditor.AddInfo(child, this, true);
	5333	+// System.err.println("info : " + child.GetPath());
	5334	+ }
	5335	+
	5336	+ objEditor.SetText(); // jan 2014
	5337	+ }
	5338	+
	5339	+ super.refreshContents(cp);
	5340	+ }
3796	5341
3797	5342	void linkSomething(Object3D thing)
3798	5343	{
..	..	@@ -3864,16 +5409,19 @@
3864	5409	{
3865	5410	if (group.selection.isEmpty())
3866	5411	return;
3867		- GraphreeD.clipboardIsTempGroup = false;
	5412	+
	5413	+ Grafreed.clipboardIsTempGroup = false;
3868	5414	Composite tGroup = null;
3869	5415	if (group.selection.size() > 0) // 1)
3870	5416	{
3871	5417	tGroup = new cGroup();
3872		- GraphreeD.clipboardIsTempGroup = true;
	5418	+ Grafreed.clipboardIsTempGroup = true;
3873	5419	}
3874	5420
3875	5421	if (cut)
3876	5422	{
	5423	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5424	+// Save();
3877	5425	//int indices[] = jList.getSelectedIndices();
3878	5426	//for (int i = indices.length - 1; i >= 0; i--)
3879	5427	//jList.remove(indices[i]);
..	..	@@ -3909,16 +5457,16 @@
3909	5457	//System.out.println("cut " + child);
3910	5458	//System.out.println("parent = " + child.parent);
3911	5459	// tmp.addChild(child);
3912		- if (GraphreeD.clipboardIsTempGroup)
	5460	+ if (Grafreed.clipboardIsTempGroup)
3913	5461	tGroup.add/Child/(tmp);
3914	5462	else
3915		- GraphreeD.clipboard = tmp;
	5463	+ Grafreed.clipboard = tmp;
3916	5464	}
3917	5465	else
3918		- if (GraphreeD.clipboardIsTempGroup)
	5466	+ if (Grafreed.clipboardIsTempGroup)
3919	5467	tGroup.add/Child/(child);
3920	5468	else
3921		- GraphreeD.clipboard = child;
	5469	+ Grafreed.clipboard = child;
3922	5470	}
3923	5471
3924	5472	//ResetModel();
..	..	@@ -3950,21 +5498,23 @@
3950	5498	//System.out.println("cut " + elem);
3951	5499	//System.out.println("parent = " + elem.parent);
3952	5500	// tmp.addChild(elem);
3953		- if (GraphreeD.clipboardIsTempGroup)
	5501	+ if (Grafreed.clipboardIsTempGroup)
3954	5502	tGroup.add/Child/(tmp);
3955	5503	else
3956		- GraphreeD.clipboard = tmp;
	5504	+ Grafreed.clipboard = tmp;
3957	5505	}
3958	5506	else
3959		- if (GraphreeD.clipboardIsTempGroup)
	5507	+ if (Grafreed.clipboardIsTempGroup)
3960	5508	tGroup.add/Child/(child);
3961	5509	else
3962		- GraphreeD.clipboard = child;
	5510	+ Grafreed.clipboard = child;
3963	5511	}
3964	5512
3965	5513	}
3966		- if (GraphreeD.clipboardIsTempGroup)
3967		- GraphreeD.clipboard = tGroup;
	5514	+
	5515	+ if (Grafreed.clipboardIsTempGroup)
	5516	+ Grafreed.clipboard = tGroup;
	5517	+
3968	5518	if (cut)
3969	5519	{
3970	5520	ResetModel();
..	..	@@ -3974,11 +5524,15 @@
3974	5524
3975	5525	void paste(boolean expand)
3976	5526	{
3977		- // if (GraphreeD.clipboard == null)
	5527	+ if (Globals.REPLACEONMAKE)
	5528	+ Save();
	5529	+ boolean keep = Globals.REPLACEONMAKE;
	5530	+ Globals.REPLACEONMAKE = false;
	5531	+ // if (GrafreeD.clipboard == null)
3978	5532	// return;
3979	5533	boolean first = true;
3980	5534
3981		- if (GraphreeD.clipboardIsTempGroup)
	5535	+ if (Grafreed.clipboardIsTempGroup)
3982	5536	{
3983	5537	Composite temp;
3984	5538
..	..	@@ -3989,7 +5543,7 @@
3989	5543	temp = (Composite)Applet3D.clipboard.deepCopy();
3990	5544	*/
3991	5545	Object3D elem;
3992		- for (Enumeration e = /temp.children/GraphreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5546	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
3993	5547	{
3994	5548	Object3D child = (Object3D)e.nextElement();
3995	5549
..	..	@@ -4003,7 +5557,7 @@
4003	5557	else
4004	5558	elem = child.deepCopy(); // ?
4005	5559	child.parent = keepparent;
4006		- //if (GraphreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
	5560	+ //if (GrafreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
4007	5561	// elem = elem.get(0);
4008	5562	makeSomething(elem, true); // ?? first);
4009	5563	//group.addChild(elem);
..	..	@@ -4023,23 +5577,24 @@
4023	5577	//Object3D cb = Applet3D.clipboard;
4024	5578	//temp.addChild(cb);
4025	5579	//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());
	5580	+ assert(Grafreed.clipboard.parent == null);
	5581	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5582	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5583	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5584	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4031	5585	else
4032		- makeSomething(expand?GraphreeD.clipboard.copyExpand():GraphreeD.clipboard.deepCopy());
4033		- GraphreeD.clipboard.get(0).parent = keepparent;
	5586	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5587	+ Grafreed.clipboard.get(0).parent = keepparent;
4034	5588	}
4035	5589
	5590	+ Globals.REPLACEONMAKE = keep;
4036	5591	ResetModel();
4037	5592	refreshContents();
4038	5593	}
4039	5594
4040		- void pasteInto(boolean copyit)
	5595	+ void pasteInto(boolean copyit, boolean clone)
4041	5596	{
4042		-// if (GraphreeD.clipboard == null)
	5597	+// if (GrafreeD.clipboard == null)
4043	5598	// return;
4044	5599
4045	5600	if (group.selection.size() != 1)
..	..	@@ -4066,15 +5621,22 @@
4066	5621	if (copyit)
4067	5622	{
4068	5623	// paste(false);
4069		- CloneClipboard(false); // sept 2014
	5624	+ if (clone)
	5625	+ {
	5626	+ CloneClipboard(false); // sept 2014
	5627	+ }
	5628	+ else
	5629	+ {
	5630	+ paste(false);
	5631	+ }
4070	5632	}
4071	5633	else
4072	5634	{
4073	5635	boolean first = true;
4074	5636
4075		- if (GraphreeD.clipboardIsTempGroup)
	5637	+ if (Grafreed.clipboardIsTempGroup)
4076	5638	{
4077		- Composite temp = (Composite)GraphreeD.clipboard;
	5639	+ Composite temp = (Composite)Grafreed.clipboard;
4078	5640	Object3D copy;
4079	5641	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4080	5642	{
..	..	@@ -4084,7 +5646,7 @@
4084	5646	}
4085	5647	} else
4086	5648	{
4087		- linkSomething(GraphreeD.clipboard); //.get(0));
	5649	+ linkSomething(Grafreed.clipboard); //.get(0));
4088	5650	}
4089	5651	}
4090	5652	}
..	..	@@ -4161,6 +5723,10 @@
4161	5723
4162	5724	void group(Object3D csg, boolean grab)
4163	5725	{
	5726	+ if (Globals.REPLACEONMAKE)
	5727	+ Save();
	5728	+ boolean keep = Globals.REPLACEONMAKE;
	5729	+ Globals.REPLACEONMAKE = false;
4164	5730	if (//false) // why??
4165	5731	!group.selection.isEmpty())
4166	5732	{
..	..	@@ -4274,8 +5840,34 @@
4274	5840	//node.add(csg);
4275	5841	//makeSomething(node);
4276	5842	makeSomething(csg);
	5843	+ Globals.REPLACEONMAKE = keep;
4277	5844	}
4278	5845
	5846	+ void Ungroup(Object3D g)
	5847	+ {
	5848	+ if (Globals.REPLACEONMAKE)
	5849	+ Save();
	5850	+ boolean keep = Globals.REPLACEONMAKE;
	5851	+ Globals.REPLACEONMAKE = false;
	5852	+ if (g instanceof HiddenObject)
	5853	+ {
	5854	+ HiddenObject h = (HiddenObject) g;
	5855	+
	5856	+ for (int i=0; i<h.ActualSize(); i++)
	5857	+ {
	5858	+ objEditor.makeSomething(h.get(i), false);
	5859	+ }
	5860	+ }
	5861	+ else
	5862	+ {
	5863	+ for (int i=0; i<g.Size(); i++)
	5864	+ {
	5865	+ objEditor.makeSomething(g.get(i), false);
	5866	+ }
	5867	+ }
	5868	+ Globals.REPLACEONMAKE = keep;
	5869	+ }
	5870	+
4279	5871	void ungroup()
4280	5872	{
4281	5873	/*
..	..	@@ -4469,21 +6061,6 @@
4469	6061	}
4470	6062	*/
4471	6063
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	6064	/*
4488	6065	public void Callback(Object obj)
4489	6066	{
..	..	@@ -4507,26 +6084,9 @@
4507	6084	}
4508	6085	*/
4509	6086
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	6087	String GetFile(String dialogName)
4528	6088	{
4529		- if (GraphreeD.standAlone)
	6089	+ if (Grafreed.standAlone)
4530	6090	{
4531	6091	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4532	6092	browser.show();
..	..	@@ -4590,10 +6150,48 @@
4590	6150	cButton flashSelectionButton;
4591	6151	cButton editButton;
4592	6152	cButton uneditButton;
	6153	+ JCheckBox allParamsButton;
4593	6154	cButton clearpanelButton;
4594		- cButton allParamsButton;
4595	6155	cButton unselectButton;
4596	6156
	6157	+ cButton restoreCameraButton;
	6158	+
	6159	+ cButton oneStepButton;
	6160	+
	6161	+ cButton groupButton;
	6162	+ cButton ungroupButton;
	6163	+ cButton compositeButton;
	6164	+ cButton switchButton;
	6165	+ cButton loopButton;
	6166	+ cButton textureButton;
	6167	+
	6168	+ cButton skybox1Button;
	6169	+ cButton skybox2Button;
	6170	+ cButton skybox3Button;
	6171	+ cButton skybox4Button;
	6172	+ cButton skybox5Button;
	6173	+ cButton skybox6Button;
	6174	+ cButton skybox7Button;
	6175	+
	6176	+ cButton skybox11Button;
	6177	+ cButton skybox12Button;
	6178	+ cButton skybox13Button;
	6179	+ cButton skybox14Button;
	6180	+ cButton skybox15Button;
	6181	+ cButton skybox16Button;
	6182	+ cButton skybox17Button;
	6183	+
	6184	+ cButton gridButton;
	6185	+ cButton boxButton;
	6186	+ cButton sphereButton;
	6187	+ cButton coneButton;
	6188	+ cButton torusButton;
	6189	+ cButton superButton;
	6190	+ cButton kleinButton;
	6191	+ cButton particlesButton;
	6192	+ cButton overlayButton;
	6193	+ cButton lightButton;
	6194	+
4597	6195	cButton screenfitButton;
4598	6196	cButton screenfitpointButton;
4599	6197	cButton snapobjectButton;
..	..	@@ -4605,14 +6203,6 @@
4605	6203
4606	6204	cButton setsupportButton;
4607	6205
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	6206	//
4617	6207	//Composite
4618	6208	Object3D // to do !!
..	..	@@ -4622,9 +6212,11 @@
4622	6212	//JTree jTree;
4623	6213	private MenuItem lookAtItem;
4624	6214	private MenuItem lookFromItem;
4625		- private MenuItem switchItem;
	6215	+ private MenuItem switchViewItem;
4626	6216	private MenuItem cutItem;
4627		- private MenuItem duplicateItem;
	6217	+ private MenuItem undoItem;
	6218	+ private MenuItem redoItem;
	6219	+ private JMenuItem duplicateItem;
4628	6220	private MenuItem cloneItem;
4629	6221	private MenuItem cloneSupportItem;
4630	6222	private MenuItem overwriteGeoItem;
..	..	@@ -4635,8 +6227,9 @@
4635	6227	private MenuItem resetsupportItem;
4636	6228	private MenuItem resetreferencesItem;
4637	6229	private MenuItem linkverticesItem;
	6230	+ private MenuItem relinkverticesItem;
4638	6231	private MenuItem setMasterItem;
4639		- private MenuItem resetMeshItem;
	6232	+ private MenuItem resetAllItem;
4640	6233	private MenuItem stepAllItem;
4641	6234	private MenuItem revertMeshItem;
4642	6235	private MenuItem poseMeshItem;
..	..	@@ -4647,14 +6240,17 @@
4647	6240	private MenuItem mergeGeometriesItem;
4648	6241	private MenuItem copyItem;
4649	6242	private MenuItem pasteItem;
	6243	+ private MenuItem pasteIntoItem;
4650	6244	private MenuItem pasteLinkItem;
4651	6245	private MenuItem pasteCloneItem;
4652	6246	private MenuItem pasteExpandItem;
4653		- private MenuItem clearItem;
	6247	+ private MenuItem deleteItem;
4654	6248	private MenuItem clearAllItem;
4655	6249	private MenuItem genUVItem;
	6250	+ private MenuItem genNormalsMESHItem;
4656	6251	private MenuItem genNormalsCADItem;
4657	6252	private MenuItem genNormalsORGANItem;
	6253	+ private MenuItem genNormalsMINEItem;
4658	6254	private MenuItem stripifyItem;
4659	6255	private MenuItem unstripifyItem;
4660	6256	private MenuItem trimItem;
..	..	@@ -4683,6 +6279,10 @@
4683	6279	private MenuItem showleavesItem;
4684	6280	private MenuItem markleavesItem;
4685	6281	private MenuItem unmarkleavesItem;
	6282	+ private MenuItem rewindleavesItem;
	6283	+ private MenuItem unrewindleavesItem;
	6284	+ private MenuItem randomleavesItem;
	6285	+ private MenuItem unrandomleavesItem;
4686	6286
4687	6287	private MenuItem flipVItem;
4688	6288	private MenuItem unflipVItem;
..	..	@@ -4694,14 +6294,17 @@
4694	6294	private MenuItem panoTexturesItem;
4695	6295
4696	6296	private MenuItem resetCentroidItem;
4697		- private MenuItem transformgeometryItem;
	6297	+ private MenuItem resetCentroidXZItem;
4698	6298	private MenuItem resetTransformItem;
	6299	+ private MenuItem transformGeometryItem;
	6300	+ private MenuItem transformChildrenItem;
	6301	+ private MenuItem hideItem;
4699	6302	private MenuItem grabItem;
4700	6303	private MenuItem backItem;
4701	6304	private MenuItem frontItem;
4702	6305	private MenuItem cameraItem;
4703	6306	private MenuItem compositeItem;
4704		- private MenuItem randomItem;
	6307	+ private MenuItem switchItem;
4705	6308	private MenuItem physicsItem;
4706	6309	private MenuItem frameselectorItem;
4707	6310	private MenuItem scriptNodeItem;
..	..	@@ -4716,6 +6319,7 @@
4716	6319
4717	6320	private MenuItem resetParentItem;
4718	6321	private MenuItem repairParentItem;
	6322	+ private MenuItem repairShadowItem;
4719	6323	private MenuItem sortbysizeItem;
4720	6324	private MenuItem sortbynameItem;
4721	6325
..	..	@@ -4724,20 +6328,25 @@
4724	6328	private MenuItem attachBumpItem;
4725	6329	private MenuItem detachBumpItem;
4726	6330	private MenuItem pigmentBumpItem;
	6331	+ private MenuItem embedTexturesItem;
	6332	+ private MenuItem deEmbedTexturesItem;
4727	6333
4728	6334	private MenuItem particleItem;
4729	6335	private MenuItem ragdollItem;
4730	6336	private MenuItem ragdoll2Item;
	6337	+ private MenuItem heightFieldItem;
	6338	+ private MenuItem textureFieldItem;
4731	6339	private MenuItem gridItem;
4732	6340	private MenuItem rectoidItem;
4733	6341	private MenuItem ellipsoidItem;
4734	6342	private MenuItem coneItem;
4735	6343	private MenuItem torusItem;
4736	6344	private MenuItem superItem;
	6345	+ private MenuItem kleinItem;
4737	6346	private MenuItem blobItem;
4738	6347	private MenuItem latheItem;
4739	6348	private MenuItem bezierItem;
4740		- private MenuItem checkerItem;
	6349	+ private MenuItem overlayItem;
4741	6350	private MenuItem meshItem;
4742	6351	// private MenuItem meshGroupItem;
4743	6352	private MenuItem springItem;
..	..	@@ -4746,6 +6355,7 @@
4746	6355	private MenuItem csgItem;
4747	6356	private MenuItem templateItem;
4748	6357	private MenuItem textureItem;
	6358	+ private MenuItem billboardItem;
4749	6359	private MenuItem shadowXItem;
4750	6360	private MenuItem shadowYItem;
4751	6361	private MenuItem shadowZItem;
..	..	@@ -4758,11 +6368,6 @@
4758	6368	private MenuItem doubleItem;
4759	6369	private MenuItem tripleItem;
4760	6370
4761		- private MenuItem importGFDItem;
4762		- private MenuItem importVRMLX3DItem;
4763		- private MenuItem import3DSItem;
4764		- private MenuItem importOBJItem;
4765		-
4766	6371	private MenuItem computeAOItem;
4767	6372	private MenuItem recompileItem;
4768	6373	private MenuItem editScriptItem;
..	..	@@ -4772,4 +6377,8 @@
4772	6377	private MenuItem analyzeItem;
4773	6378	private MenuItem dumpItem;
4774	6379	//boolean freezemodel = false;
	6380	+
	6381	+ Menu cameraMenu;
	6382	+ MenuItem editCameraItem;
	6383	+ MenuItem restoreCameraItem;
4775	6384	}