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