~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	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,16 @@
59	415	this.copy = this.group = group;
60	416	//selectees = this.group.selectees;
61	417
	418	+ assert(false);
	419	+
	420	+ if (copy.versionlist == null)
	421	+ {
	422	+ copy.versionlist = new Object3D[100];
	423	+ copy.versionindex = -1;
	424	+
	425	+ //Save(true);
	426	+ }
	427	+
62	428	if(ui)
63	429	SetupUI(objEditor);
64	430	}
..	..	@@ -73,16 +439,28 @@
73	439	this.copy = this.group = copy;
74	440	//selectees = this.group.selectees;
75	441
76		- SetupMenu2(objEditor);
	442	+ SetupMenu2(this); //objEditor);
77	443	SetupUI2(objEditor);
78	444	objEditor.SetupUI(true);
79	445	SetupViews(objEditor);
80	446
81	447	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	448	+
	449	+ if (copy.versionlist == null)
	450	+ {
	451	+ copy.versionlist = new Object3D[100];
	452	+ copy.versionindex = -1;
	453	+
	454	+ //Save(true);
	455	+ }
82	456	}
83	457
84	458	void CloneSelection(boolean supports)
85	459	{
	460	+ if (Globals.REPLACEONMAKE)
	461	+ Save();
	462	+ boolean keep = Globals.REPLACEONMAKE;
	463	+ Globals.REPLACEONMAKE = false;
86	464	// Object3D keep = GrafreeD.clipboard;
87	465	//Object3D obj;
88	466	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -93,18 +471,19 @@
93	471
94	472	makeSomething(clone, i==group.selection.size()-1);
95	473	}
	474	+ Globals.REPLACEONMAKE = keep;
96	475	}
97	476
98	477	void CloneClipboard(boolean supports)
99	478	{
100		- assert(GrafreeD.clipboard.parent == null);
101		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
102		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
103		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
104		- makeSomething(CloneObject(GrafreeD.clipboard.get(0), false));
	479	+ assert(Grafreed.clipboard.parent == null);
	480	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	481	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	482	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	483	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
105	484	else
106		- makeSomething(CloneObject(GrafreeD.clipboard, false));
107		- GrafreeD.clipboard.get(0).parent = keepparent;
	485	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	486	+ Grafreed.clipboard.get(0).parent = keepparent;
108	487	}
109	488
110	489	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -118,7 +497,7 @@
118	497	// obj.support = null;
119	498	if (!supports)
120	499	obj.SaveSupports();
121		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	500	+ Object3D clone = (Object3D)Grafreed.clone(obj);
122	501	obj.parent = parent;
123	502	// obj.support = support;
124	503	// clone.support = support; // aout 2013
..	..	@@ -147,58 +526,153 @@
147	526
148	527	//JTextField nameField;
149	528
150		- void SetupMenu2(ObjEditor oe)
	529	+ void SetupMenu2(GroupEditor oe)
151	530	{
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);
	531	+ oe.jTree = new cTree();
	532	+
163	533	Menu menu;
164	534	oe.menuBar.add(menu = new Menu("Edit"));
165	535	//editItem = menu.add(new MenuItem("Edit"));
166	536	//editItem.addActionListener(this);
167		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	537	+
	538	+// undoItem = menu.add(new MenuItem("Undo"));
	539	+// undoItem.addActionListener(this);
	540	+// redoItem = menu.add(new MenuItem("Redo"));
	541	+// redoItem.addActionListener(this);
	542	+// menu.add("-");
	543	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
168	544	duplicateItem.addActionListener(this);
169		- menu.add("-");
170		- cloneItem = menu.add(new MenuItem("Clone"));
	545	+
	546	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
171	547	cloneItem.addActionListener(this);
	548	+ //if (Globals.ADVANCED)
	549	+ {
172	550	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
173	551	cloneSupportItem.addActionListener(this);
	552	+ }
	553	+ oe.jTree.popup.addSeparator();
174	554	menu.add("-");
175		- cutItem = menu.add(new MenuItem("Cut"));
	555	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
176	556	cutItem.addActionListener(this);
177		- copyItem = menu.add(new MenuItem("Copy"));
	557	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
178	558	copyItem.addActionListener(this);
179	559	pasteItem = menu.add(new MenuItem("Paste"));
180	560	pasteItem.addActionListener(this);
181		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	561	+
	562	+ oe.jTree.popup.addSeparator();
	563	+ //menu.add("-");
	564	+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
	565	+ pasteIntoItem.addActionListener(this);
	566	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
182	567	pasteLinkItem.addActionListener(this);
183		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	568	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
184	569	pasteCloneItem.addActionListener(this);
185		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	570	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
186	571	// pasteExpandItem.addActionListener(this);
187		- clearItem = menu.add(new MenuItem("Clear"));
188		- clearItem.addActionListener(this);
	572	+ //menu.add("-");
	573	+ oe.jTree.popup.addSeparator();
	574	+
	575	+ if (Globals.ADVANCED)
	576	+ {
	577	+ // Deletes the cameras...
189	578	clearAllItem = menu.add(new MenuItem("Clear All"));
190	579	clearAllItem.addActionListener(this);
	580	+ }
	581	+
	582	+ menuBar.add(cameraMenu = new Menu("View"));
	583	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	584	+ //zBufferItem.addActionListener(this);
	585	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	586	+ //normalLensItem.addActionListener(this);
	587	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	588	+ restoreCameraItem.addActionListener(this);
	589	+
	590	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	591	+// toggleFullScreenItem.addItemListener(this);
	592	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	593	+// cameraMenu.add("-");
	594	+//
	595	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	596	+// toggleTextureItem.addItemListener(this);
	597	+// toggleTextureItem.setState(CameraPane.textureon);
	598	+//
	599	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	600	+// toggleSwitchItem.addItemListener(this);
	601	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	602	+
	603	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	604	+ toggleHandleItem.addItemListener(this);
	605	+ toggleHandleItem.setState(CameraPane.HANDLES);
	606	+
	607	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	608	+ togglePaintItem.addItemListener(this);
	609	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	610	+
	611	+ if (Globals.ADVANCED)
	612	+ {
	613	+ cameraMenu.add("-");
	614	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	615	+ toggleLiveItem.addItemListener(this);
	616	+ toggleLiveItem.setState(Globals.isLIVE());
191	617
	618	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	619	+ stepItem.addActionListener(this);
	620	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	621	+ // toggleDLItem.addItemListener(this);
	622	+ // toggleDLItem.setState(false);
	623	+
	624	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	625	+ toggleRenderItem.addItemListener(this);
	626	+ toggleRenderItem.setState(!CameraPane.frozen);
	627	+
	628	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	629	+ toggleDebugItem.addItemListener(this);
	630	+ toggleDebugItem.setState(Globals.DEBUG);
	631	+
	632	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	633	+ toggleFrustumItem.addItemListener(this);
	634	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	635	+
	636	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	637	+ toggleFootContactItem.addItemListener(this);
	638	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	639	+
	640	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	641	+ toggleTimelineItem.addItemListener(this);
	642	+ }
	643	+
	644	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	645	+// toggleRootItem.addItemListener(this);
	646	+// toggleRootItem.setState(false);
	647	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	648	+// animationItem.addItemListener(this);
	649	+// animationItem.setState(CameraPane.ANIMATION);
	650	+ cameraMenu.add("-");
	651	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	652	+ editCameraItem.addActionListener(this);
	653	+
	654	+ if (Globals.ADVANCED)
	655	+ {
	656	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	657	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	658	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	659	+ oe.cameraMenu.add("-");
	660	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	661	+ openWindowItem.addActionListener(this);
	662	+ lookAtItem.addActionListener(this);
	663	+ //lookFromItem.addActinoListener(this);
	664	+ //switchViewItem.addActionListener(this);
	665	+ }
	666	+
192	667	oe.menuBar.add(menu = new Menu("Setting"));
193		- resetMeshItem = menu.add(new MenuItem("Reset All"));
194		- resetMeshItem.addActionListener(this);
195		- stepAllItem = menu.add(new MenuItem("Step All"));
196		- stepAllItem.addActionListener(this);
	668	+ if (Globals.ADVANCED)
	669	+ {
197	670	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
198	671	revertMeshItem.addActionListener(this);
199	672	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
200	673	resetreferencesItem.addActionListener(this);
201	674	menu.add("-");
	675	+ }
202	676	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
203	677	overwriteGeoItem.addActionListener(this);
204	678	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -210,79 +684,111 @@
210	684	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211	685	overwriteUVItem.addActionListener(this);
212	686	menu.add("-");
	687	+ if (Globals.ADVANCED)
	688	+ {
213	689	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214	690	generateMeshItem.addActionListener(this);
215	691	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216	692	poseMeshItem.addActionListener(this);
217	693	menu.add("-");
	694	+ }
218	695	resetsupportItem = menu.add(new MenuItem("Reset support"));
219	696	resetsupportItem.addActionListener(this);
220	697	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	698	linkverticesItem.addActionListener(this);
222	699	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
223	700	relinkverticesItem.addActionListener(this);
	701	+
	702	+ if (Globals.ADVANCED)
	703	+ {
224	704	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
225	705	setMasterItem.addActionListener(this);
	706	+ }
226	707
227		- oe.menuBar.add(menu = new Menu("Group"));
228		- grabItem = menu.add(new MenuItem("Grab"));
229		- grabItem.addActionListener(this);
	708	+ oe.menuBar.add(menu = new Menu("Order"));
	709	+
230	710	backItem = menu.add(new MenuItem("Back"));
231	711	backItem.addActionListener(this);
232	712	frontItem = menu.add(new MenuItem("Front"));
233	713	frontItem.addActionListener(this);
234		- compositeItem = menu.add(new MenuItem("Composite"));
235		- compositeItem.addActionListener(this);
236		- hideItem = menu.add(new MenuItem("Hide"));
	714	+// compositeItem = menu.add(new MenuItem("Composite"));
	715	+// compositeItem.addActionListener(this);
	716	+
	717	+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
	718	+ grabItem.addActionListener(this);
	719	+
	720	+ if (Globals.ADVANCED)
	721	+ {
	722	+ hideItem = menu.add(new MenuItem("Hidden Group"));
237	723	hideItem.addActionListener(this);
238		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	724	+ }
	725	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
239	726	ungroupItem.addActionListener(this);
240		- menu.add("-");
241		- randomItem = menu.add(new MenuItem("Random"));
242		- randomItem.addActionListener(this);
243		- physicsItem = menu.add(new MenuItem("Physics"));
244		- physicsItem.addActionListener(this);
245		- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
246		- frameselectorItem.addActionListener(this);
	727	+
	728	+ oe.jTree.popup.addSeparator();
	729	+
	730	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	731	+ deleteItem.addActionListener(this);
	732	+
	733	+// menu.add("-");
	734	+//
	735	+// switchItem = menu.add(new MenuItem("Switch node"));
	736	+// switchItem.addActionListener(this);
	737	+ if (Globals.ADVANCED)
	738	+ {
247	739	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
248	740	switchGeoItem.addActionListener(this);
249	741	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
250	742	switchTransfoItem.addActionListener(this);
251		- morphItem = menu.add(new MenuItem("Morph"));
	743	+ morphItem = menu.add(new MenuItem("Morph Group"));
252	744	morphItem.addActionListener(this);
	745	+
	746	+ menu.add("-");
	747	+ physicsItem = menu.add(new MenuItem("Physics"));
	748	+ physicsItem.addActionListener(this);
	749	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	750	+ frameselectorItem.addActionListener(this);
253	751	scriptNodeItem = menu.add(new MenuItem("Script Node"));
254	752	scriptNodeItem.addActionListener(this);
255		- cameraItem = menu.add(new MenuItem("Camera"));
256		- cameraItem.addActionListener(this);
	753	+ }
257	754
258	755	oe.menuBar.add(menu = new Menu("Object"));
259		- textureItem = menu.add(new MenuItem("Texture"));
260		- textureItem.addActionListener(this);
	756	+// textureItem = menu.add(new MenuItem("Texture"));
	757	+// textureItem.addActionListener(this);
261	758	billboardItem = menu.add(new MenuItem("Billboard"));
262	759	billboardItem.addActionListener(this);
263	760	csgItem = menu.add(new MenuItem("CSG"));
264	761	csgItem.addActionListener(this);
265		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	762	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
266	763	shadowXItem.addActionListener(this);
267		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	764	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
268	765	shadowYItem.addActionListener(this);
269		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	766	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
270	767	shadowZItem.addActionListener(this);
	768	+ attributeItem = menu.add(new MenuItem("Attribute"));
	769	+ attributeItem.addActionListener(this);
	770	+
	771	+ if (Globals.ADVANCED)
	772	+ {
	773	+ menu.add("-");
271	774	linkerItem = menu.add(new MenuItem("Linker"));
272	775	linkerItem.addActionListener(this);
273	776	templateItem = menu.add(new MenuItem("Template"));
274	777	templateItem.addActionListener(this);
275		- attributeItem = menu.add(new MenuItem("Attribute"));
276		- attributeItem.addActionListener(this);
277	778	pointflowItem = menu.add(new MenuItem("Point Flow"));
278	779	pointflowItem.addActionListener(this);
	780	+ }
279	781	menu.add("-");
280	782	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
281	783	resetTransformItem.addActionListener(this);
282	784	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
283	785	resetCentroidItem.addActionListener(this);
284		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
285		- transformgeometryItem.addActionListener(this);
	786	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	787	+ resetCentroidXZItem.addActionListener(this);
	788	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	789	+ transformGeometryItem.addActionListener(this);
	790	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	791	+ transformChildrenItem.addActionListener(this);
286	792
287	793	oe.menuBar.add(menu = new Menu("Geometry"));
288	794	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -293,8 +799,11 @@
293	799	genNormalsCADItem.addActionListener(this);
294	800	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
295	801	genNormalsMESHItem.addActionListener(this);
296		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	802	+ if (Globals.ADVANCED)
	803	+ {
	804	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
297	805	genNormalsMINEItem.addActionListener(this);
	806	+ }
298	807	stripifyItem = menu.add(new MenuItem("Stripify"));
299	808	stripifyItem.addActionListener(this);
300	809	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -316,23 +825,34 @@
316	825	reduce34MeshItem.addActionListener(this);
317	826	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
318	827	increaseMeshItem.addActionListener(this);
319		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
320		- smoothMeshItem.addActionListener(this);
321	828	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
322	829	clipMeshItem.addActionListener(this);
	830	+
	831	+ if (Globals.ADVANCED)
	832	+ {
	833	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	834	+ smoothMeshItem.addActionListener(this);
	835	+ }
323	836
324	837	oe.menuBar.add(menu = new Menu("Attributes"));
325	838	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
326	839	clearMaterialsItem.addActionListener(this);
	840	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	841	+ resetAllItem.addActionListener(this);
	842	+ stepAllItem = menu.add(new MenuItem("Step All"));
	843	+ stepAllItem.addActionListener(this);
327	844	menu.add("-");
328	845	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
329	846	liveleavesItem.addActionListener(this);
330	847	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
331	848	unliveleavesItem.addActionListener(this);
	849	+ if (Globals.ADVANCED)
	850	+ {
332	851	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
333	852	supportleavesItem.addActionListener(this);
334	853	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
335	854	unsupportleavesItem.addActionListener(this);
	855	+ }
336	856	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
337	857	hideleavesItem.addActionListener(this);
338	858	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -341,6 +861,14 @@
341	861	markleavesItem.addActionListener(this);
342	862	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
343	863	unmarkleavesItem.addActionListener(this);
	864	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	865	+ rewindleavesItem.addActionListener(this);
	866	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	867	+ unrewindleavesItem.addActionListener(this);
	868	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	869	+ randomleavesItem.addActionListener(this);
	870	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	871	+ unrandomleavesItem.addActionListener(this);
344	872	menu.add("-");
345	873	flipVItem = menu.add(new MenuItem("Flip V"));
346	874	flipVItem.addActionListener(this);
..	..	@@ -366,53 +894,130 @@
366	894	attachBumpItem.addActionListener(this);
367	895	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
368	896	pigmentBumpItem.addActionListener(this);
	897	+ //embedTexturesItem
369	898	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
370	899	detachPigmentItem.addActionListener(this);
371	900	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
372	901	detachBumpItem.addActionListener(this);
	902	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	903	+ embedTexturesItem.addActionListener(this);
	904	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	905	+ deEmbedTexturesItem.addActionListener(this);
373	906	menu.add("-");
374	907	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
375	908	sortbysizeItem.addActionListener(this);
376	909	sortbynameItem = menu.add(new MenuItem("Sort by name"));
377	910	sortbynameItem.addActionListener(this);
378	911	menu.add("-");
	912	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	913	+ shareGeometriesItem.addActionListener(this);
	914	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	915	+ mergeGeometriesItem.addActionListener(this);
	916	+ menu.add("-");
	917	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	918	+ editLeafItem.addActionListener(this);
	919	+ if (Globals.ADVANCED)
	920	+ {
	921	+ // Pretty much the same as duplicate and clone.
379	922	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
380	923	extractGeometriesItem.addActionListener(this);
381	924	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
382	925	cloneGeometriesItem.addActionListener(this);
383		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
384		- shareGeometriesItem.addActionListener(this);
385		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
386		- mergeGeometriesItem.addActionListener(this);
	926	+ }
387	927
388	928	oe.menuBar.add(menu = new Menu("Insert"));
389	929	buildCreateMenu(menu);
390	930
391		-
392		- oe.menuBar.add(menu = new Menu("Include"));
393		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
394		- importGFDItem.addActionListener(this);
395		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
396		- importVRMLX3DItem.addActionListener(this);
397		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
398		- importOBJItem.addActionListener(this);
399		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
400		- import3DSItem.addActionListener(this);
401		-
402	931	oe.menuBar.add(menu = new Menu("Tools"));
403	932	buildToolsMenu(menu);
404	933	}
405	934
	935	+ JTabbedPane resourcecontainer;
	936	+ cGridBag currenttab;
	937	+ //boolean added; // patch for jar
	938	+
	939	+ int tabcount = 0;
	940	+ int colcount = 0;
	941	+ int rowcount = 0;
	942	+ int texturecount = 0;
	943	+
	944	+ int columns = 5;
	945	+ int rows = 7;
	946	+
	947	+ public void ResourceCallBack(String[] path)
	948	+ {
	949	+// for (int i = 0; i < path.length; i++)
	950	+// System.out.print(path[i] + "/");
	951	+// System.out.println();
	952	+
	953	+ if (//rowcount == 0 \|\|
	954	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	955	+ {
	956	+ currenttab = new cGridBag();
	957	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	958	+ currenttab.setName(tabname);
	959	+ //added = false;
	960	+ resourcecontainer.add(currenttab);
	961	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	962	+ rowcount = 1;
	963	+ colcount = 0;
	964	+ texturecount = 0;
	965	+ }
	966	+
	967	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	968	+ {
	969	+ //if (!added)
	970	+ {
	971	+ //added = true;
	972	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	973	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	974	+ }
	975	+
	976	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	977	+
	978	+ if (++colcount >= columns)
	979	+ {
	980	+ colcount = 0;
	981	+ currenttab.Return();
	982	+
	983	+ if (rowcount++ >= rows)
	984	+ {
	985	+ rowcount = 0;
	986	+ }
	987	+ }
	988	+ }
	989	+ else
	990	+ {
	991	+// if (!path[path.length-1].equals("icons"))
	992	+// resourcecontainer.Return();
	993	+ }
	994	+ }
	995	+
	996	+ void CreateTexturePanel(cGridBag container)
	997	+ {
	998	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	999	+ container.add(resourcecontainer);
	1000	+
	1001	+ Grafreed.ParseResources("textures", this);
	1002	+ }
	1003	+
406	1004	void SetupUI2(ObjEditor oe)
407	1005	{
	1006	+ // June 2019
	1007	+ if (oe == null)
	1008	+ {
	1009	+ //super.SetupUI2(this);
	1010	+ //return;
	1011	+ }
	1012	+
	1013	+ if (copy != group)
	1014	+ {
	1015	+ //super.SetupUI2(this);
	1016	+ }
	1017	+
408	1018	//new Exception().printStackTrace();
409	1019
410	1020	oe.radioPanel = new JPanel(new GridBagLayout());
411		- oe.aConstraints.weightx = 1;
412		- oe.aConstraints.weighty = 0;
413		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
414		- oe.aConstraints.gridwidth = 100;
415		- oe.aConstraints.gridheight = 1;
416	1021	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
417	1022
418	1023	oe.buttonGroup = new ButtonGroup();
..	..	@@ -433,153 +1038,266 @@
433	1038	oe.radioPanel.add(dummyButton);
434	1039	oe.buttonGroup.add(dummyButton);
435	1040	*/
436		- aConstraints.gridy += 1;
437		- oe.aConstraints.gridwidth = 1;
438		- oe.aConstraints.gridx = 0;
	1041	+ cGridBag copyOptionsPanel = new cGridBag();
	1042	+
	1043	+ copyOptionsPanel.preferredHeight = 3;
439	1044
440		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
	1045	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
	1046	+
	1047	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1048	+ //minButton.setToolTipText("Minimize window");
	1049	+ //minButton.addActionListener(this);
	1050	+
	1051	+ if (Globals.ADVANCED)
	1052	+ {
	1053	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1054	+// maxButton.setToolTipText("Maximize window");
	1055	+// maxButton.addActionListener(this);
	1056	+ }
	1057	+
	1058	+ cButton gcButton;
	1059	+
	1060	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1061	+// gcButton.setToolTipText("Garbage collect");
	1062	+// gcButton.addActionListener(new ActionListener()
	1063	+// {
	1064	+// public void actionPerformed(ActionEvent e)
	1065	+// {
	1066	+// System.gc();
	1067	+// }
	1068	+// });
	1069	+
	1070	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1071	+ collapseButton.setToolTipText("Collapse toolbar");
	1072	+ collapseButton.addActionListener(this);
	1073	+
	1074	+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/empty.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1075	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1076	+ maximize3DButton.addActionListener(this);
	1077	+
	1078	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1079	+ twoButton.setToolTipText("Show 3D view only");
	1080	+ twoButton.addActionListener(this);
	1081	+ this.fullscreenLayout = twoButton;
	1082	+
	1083	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1084	+ threeButton.setToolTipText("Show controls and 3D view");
	1085	+ threeButton.addActionListener(this);
	1086	+ if (Globals.ADVANCED)
	1087	+ {
	1088	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1089	+ sixButton.setToolTipText("Show 3D view and controls");
	1090	+ sixButton.addActionListener(this);
	1091	+ }
	1092	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1093	+// sevenButton.setToolTipText("3-column layout");
	1094	+// sevenButton.addActionListener(this);
	1095	+ //
	1096	+
	1097	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1098	+ fullButton.setToolTipText("Full-screen window");
	1099	+ fullButton.addActionListener(this);
	1100	+
	1101	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1102	+ screenfitButton.setToolTipText("Screen fit");
	1103	+ screenfitButton.addActionListener(this);
	1104	+
	1105	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1106	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1107	+ restoreCameraButton.addActionListener(this);
	1108	+
	1109	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1110	+ saveVersionButton.setToolTipText("Duplicate current version");
	1111	+ saveVersionButton.addActionListener(this);
	1112	+
	1113	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1114	+ deleteVersionButton.setToolTipText("Delete current version");
	1115	+ deleteVersionButton.addActionListener(this);
	1116	+ deleteVersionButton.setEnabled(false);
	1117	+
	1118	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1119	+ previousVersionButton.setToolTipText("Previous version");
	1120	+ previousVersionButton.addActionListener(this);
	1121	+ previousVersionButton.setEnabled(false);
	1122	+
	1123	+ cGridBag updown = new cGridBag().setVertical(true);
	1124	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1125	+ restoreButton.setToolTipText("Undo (restore current version)");
	1126	+ restoreButton.addActionListener(this);
	1127	+ restoreButton.setEnabled(false);
	1128	+
	1129	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1130	+ replaceButton.setToolTipText("Save (replace current version)");
	1131	+ replaceButton.addActionListener(this);
	1132	+ replaceButton.setEnabled(false);
	1133	+
	1134	+ copyOptionsPanel.add(updown);
	1135	+
	1136	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1137	+ nextVersionButton.setToolTipText("Next version");
	1138	+ nextVersionButton.addActionListener(this);
	1139	+ nextVersionButton.setEnabled(false);
	1140	+
	1141	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1142	+ oneStepButton.setToolTipText("Animate one step forward");
	1143	+ oneStepButton.addActionListener(this);
	1144	+
	1145	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1146	+ liveCB.setToolTipText("Enable animation");
441	1147	liveCB.addItemListener(this);
442	1148
443		- oe.aConstraints.gridx += 1;
444		- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
445		- supportCB.addItemListener(this);
446		-
447		- // oe.aConstraints.gridx += 1;
448		- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
449		- // localCB.addItemListener(this);
450		-
451		- oe.aConstraints.gridx += 1;
452		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", CameraPane.CROWD), oe.aConstraints);
453		- crowdCB.addItemListener(this);
454		-
455		- oe.aConstraints.gridx += 1;
456		- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
457		- smoothCB.addItemListener(this);
458		-
459		- oe.aConstraints.gridx += 1;
460		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
	1149	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	1150	+ fastCB.setToolTipText("Fast mode");
461	1151	fastCB.addItemListener(this);
462		- oe.aConstraints.gridx += 1;
463		- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
464		- slowCB.addItemListener(this);
465		- oe.aConstraints.gridx += 1;
466		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.FAST), oe.aConstraints);
467		- boxCB.addItemListener(this);
	1152	+
	1153	+ //oe.toolboxPanel.Return();
	1154	+
	1155	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1156	+// trackCB.setToolTipText("Enable tracking");
	1157	+// trackCB.addItemListener(this);
468	1158
469		-// oe.aConstraints.gridx += 1;
470		-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
471		-// speakerMocapCB.addItemListener(this);
472		-
473		- if (false)
474		- {
475		- // handled in scripts
476		- oe.aConstraints.gridx += 1;
477		- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
478		- speakerCameraCB.addItemListener(this);
479		-
480		- oe.aConstraints.gridx += 1;
481		- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
482		- speakerFocusCB.addItemListener(this);
483		-
484		- oe.aConstraints.gridx += 1;
485		- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
486		- smoothfocusCB.addItemListener(this);
487		- }
488		-
489		-//oe.aConstraints.gridx += 1;
490		-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
491		-// debugCB.addItemListener(this);
492		-
493		- oe.aConstraints.gridx += 1;
494		- oe.toolbarPanel.add(oeilCB = new cCheckBox("O", CameraPane.OEIL), oe.aConstraints);
495		- oeilCB.addItemListener(this);
496		-
497		- oe.aConstraints.gridx += 1;
498		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("T", CameraPane.LOOKAT), oe.aConstraints);
499		- lookAtCB.addItemListener(this);
500		-
501		- oe.aConstraints.gridx += 1;
502		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
503		- trackCB.addItemListener(this);
504		-
505		- oe.aConstraints.gridx += 1;
506		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
507		- screenfitButton.addActionListener(this);
508		- oe.aConstraints.gridx += 1;
509	1159	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
510	1160	// screenfitpointButton.addActionListener(this);
511		-// oe.aConstraints.gridx += 1;
512		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
513		- snapobjectButton.addActionListener(this);
514		- oe.aConstraints.gridx += 1;
515	1161
516		- //aConstraints.gridx = 0;
517		- //aConstraints.gridy += 1;
518		- oe.aConstraints.weighty = 0;
519		- oe.aConstraints.gridwidth = 1;
520		-
521		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
522		- flashSelectionButton.addActionListener(this);
523		-
524		- oe.toolbarPanel.add(new cButton(" ", false));
525		-
526		- oe.aConstraints.gridx += 1;
527		- oe.aConstraints.weighty = 0;
528		- oe.aConstraints.gridwidth = 1;
529		-
530		- //
531		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
532		- twoButton.addActionListener(this);
533		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	1162	+ if (Globals.ADVANCED)
	1163	+ {
	1164	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1165	+ snapobjectButton.addActionListener(this);
	1166	+ snapobjectButton.setToolTipText("Snap Object");
	1167	+
	1168	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
534	1169	fourButton.addActionListener(this);
535		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
536		- sixButton.addActionListener(this);
537		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
538		- threeButton.addActionListener(this);
539		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
540		- sevenButton.addActionListener(this);
541		- //
	1170	+ fourButton.setToolTipText("Show control panel only");
	1171	+ }
542	1172
543		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	1173	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	1174	+
	1175	+
	1176	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1177	+ rootButton.setToolTipText("Open selection in new tab");
544	1178	rootButton.addActionListener(this);
545		- oe.aConstraints.gridx += 1;
546		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	1179	+
	1180	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1181	+ closeButton.setToolTipText("Close tab");
547	1182	closeButton.addActionListener(this);
548	1183	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
549	1184	//clearButton.addActionListener(this);
550		- oe.aConstraints.gridx += 1;
551		-
552		- oe.aConstraints.gridx = 1; //
553		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
554		- editButton.addActionListener(this);
555		- oe.aConstraints.gridx += 1;
556		- oe.aConstraints.weighty = 0;
557		- oe.aConstraints.gridwidth = 1;
558	1185
559		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	1186	+ cGridBag row1 = new cGridBag();
	1187	+
	1188	+ // INSERT
	1189	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1190	+ gridButton.setToolTipText("Create ground");
	1191	+ gridButton.addActionListener(this);
	1192	+
	1193	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1194	+ boxButton.setToolTipText("Create box");
	1195	+ boxButton.addActionListener(this);
	1196	+
	1197	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1198	+ superButton.setToolTipText("Create superellipsoid");
	1199	+ superButton.addActionListener(this);
	1200	+
	1201	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1202	+ sphereButton.setToolTipText("Create sphere");
	1203	+ sphereButton.addActionListener(this);
	1204	+
	1205	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1206	+ coneButton.setToolTipText("Create cone");
	1207	+ coneButton.addActionListener(this);
	1208	+
	1209	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1210	+ torusButton.setToolTipText("Create torus");
	1211	+ torusButton.addActionListener(this);
	1212	+
	1213	+ if (Globals.ADVANCED)
	1214	+ {
	1215	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1216	+ kleinButton.setToolTipText("Create Klein bottle");
	1217	+ kleinButton.addActionListener(this);
	1218	+ }
	1219	+
	1220	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1221	+ particlesButton.setToolTipText("Create particle system");
	1222	+ particlesButton.addActionListener(this);
	1223	+
	1224	+ oe.toolboxPanel.add(row1);
	1225	+
	1226	+ cGridBag row2 = new cGridBag();
	1227	+
	1228	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1229	+ groupButton.setToolTipText("Create group");
	1230	+ groupButton.addActionListener(this);
	1231	+
	1232	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1233	+ compositeButton.setToolTipText("Create composite");
	1234	+ compositeButton.addActionListener(this);
	1235	+
	1236	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1237	+ switchButton.setToolTipText("Create item switcher");
	1238	+ switchButton.addActionListener(this);
	1239	+
	1240	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1241	+ loopButton.setToolTipText("Create loop");
	1242	+ loopButton.addActionListener(this);
	1243	+
	1244	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1245	+ textureButton.setToolTipText("Create texture");
	1246	+ textureButton.addActionListener(this);
	1247	+
	1248	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1249	+ overlayButton.setToolTipText("Create overlay");
	1250	+ overlayButton.addActionListener(this);
	1251	+
	1252	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1253	+ lightButton.setToolTipText("Create light");
	1254	+ lightButton.addActionListener(this);
	1255	+
	1256	+ oe.toolboxPanel.add(row2);
	1257	+
	1258	+ cGridBag textures = new cGridBag();
	1259	+
	1260	+ CreateTexturePanel(textures);
	1261	+
	1262	+ resourcecontainer.setSelectedIndex((int)(Math.random() * resourcecontainer.getTabCount()));
	1263	+
	1264	+ oe.toolboxPanel.add(textures);
	1265	+
	1266	+ textures.preferredHeight = 100;
	1267	+
	1268	+ CreateSkyboxPanel(oe.skyboxPanel);
	1269	+
	1270	+ // EDIT panel
	1271	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1272	+ editButton.setToolTipText("Pin selection controls");
	1273	+ editButton.addActionListener(this);
	1274	+
	1275	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1276	+ uneditButton.setToolTipText("Unpin and remove selection controls");
560	1277	uneditButton.addActionListener(this);
561	1278
562		- oe.aConstraints.gridx += 1;
563		- oe.aConstraints.weighty = 0;
564		- oe.aConstraints.gridwidth = 1;
565		-
566		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
567		- clearPanelButton.addActionListener(this);
568		-
569		- oe.aConstraints.gridx += 1;
570		- oe.aConstraints.weighty = 0;
571		- oe.aConstraints.gridwidth = 1;
572		-
573		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	1279	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1280	+ allParamsButton.setToolTipText("Show all controls");
574	1281	allParamsButton.addActionListener(this);
575	1282
576		- oe.aConstraints.gridx += 1;
577		- oe.aConstraints.weighty = 0;
578		- oe.aConstraints.gridwidth = 1;
579		-
580		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
581		- unselectButton.addActionListener(this);
	1283	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1284	+ clearPanelButton.setToolTipText("Clear all controls");
	1285	+ clearPanelButton.addActionListener(this);
582	1286
	1287	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1288	+ //unselectButton.setToolTipText("Unselect");
	1289	+ //unselectButton.addActionListener(this);
	1290	+
	1291	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1292	+ flashSelectionButton.setToolTipText("Highlight selection");
	1293	+ flashSelectionButton.addActionListener(this);
	1294	+
	1295	+ editCommandsPanel.preferredHeight = 1;
	1296	+
	1297	+ SetPinStates(false);
	1298	+// oe.treePanel.add(commandsPanel);
	1299	+// oe.treePanel.Return();
	1300	+
583	1301	// oe.aConstraints.gridx += 1;
584	1302	// oe.aConstraints.weighty = 0;
585	1303	// oe.aConstraints.gridwidth = 1;
..	..	@@ -591,47 +1309,32 @@
591	1309	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
592	1310	// gcButton.addActionListener(this);
593	1311
594		- oe.aConstraints.gridx = 0;
595		- oe.aConstraints.gridy += 1;
596		-
597		- //ctrlPanel.add(objList = new List(5, true));
598		- oe.aConstraints.gridwidth = 100;
599		- // oe.aConstraints.gridheight = 100;
600		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
601		- oe.aConstraints.gridheight = 1;
602		- oe.aConstraints.weighty = 0.5;
603		- oe.aConstraints.gridx = 0;
604		- JScrollPane jSP;
	1312	+ cGridBag jSPPanel = new cGridBag();
	1313	+
	1314	+ JScrollPane jSP;
605	1315	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
606		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	1316	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
607	1317	ResetModel();
608		- oe.aConstraints.weighty = 0.5;
609		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
610		- oe.aConstraints.gridy += 1;
611		- oe.aConstraints.gridwidth = 1;
612		-
613		- oe.aConstraints.weighty = 0;
614		- oe.aConstraints.gridwidth = 2;
615		-
616		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
617		- colorCB.addItemListener(this);
618		- oe.aConstraints.gridx += 2;
619		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
620		- materialCB.addItemListener(this);
621		- oe.aConstraints.gridx += 2;
622		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
623		- textureCB.addItemListener(this);
624		-
625		- oe.aConstraints.gridx = 0;
626		- oe.aConstraints.gridy += 1;
627	1318
	1319	+ oe.treePanel.add(jSPPanel);
	1320	+ oe.treePanel.Return();
	1321	+
	1322	+ oe.treePanel.add(copyOptionsPanel);
	1323	+ oe.treePanel.Return();
	1324	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1325	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1326	+ sliderPane.preferredHeight = 2;
	1327	+
	1328	+// mainPanel.setDividerLocation(0.1); //1.0);
	1329	+ mainPanel.setResizeWeight(0.4);
	1330	+
628	1331	//jList.addListSelectionListener(this);
629	1332	oe.jTree.addTreeSelectionListener(this);
630	1333	//jTree.setRootVisible(false);
631	1334	//jTree.setEditable(true);
632	1335	oe.jTree.setDragEnabled(true);
633	1336	//jTree.setPreferredSize(new Dimension(10,10));
634		- jSP.setPreferredSize(new Dimension(100,200));
	1337	+ //jSP.setPreferredSize(new Dimension(100,200));
635	1338
636	1339	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
637	1340
..	..	@@ -643,47 +1346,204 @@
643	1346	dgr.addDragGestureListener(this);
644	1347	}catch(Exception e) {}
645	1348	*/
646		- radio.layout = sevenButton;
	1349	+ radio.layout = threeButton; // sixButton;
647	1350	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
648	1351	}
	1352	+
	1353	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	1354	+ {
	1355	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1356	+ colorCB.setToolTipText("Copy color when dropped");
	1357	+ colorCB.addItemListener(this);
	1358	+
	1359	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1360	+ materialCB.setToolTipText("Copy material when dropped");
	1361	+ materialCB.addItemListener(this);
	1362	+
	1363	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1364	+ textureCB.setToolTipText("Copy texture when dropped");
	1365	+ textureCB.addItemListener(this);
	1366	+
	1367	+ panel.Return();
	1368	+
	1369	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	1370	+ boxCB.setToolTipText("Display bounding boxes");
	1371	+ boxCB.addItemListener(this);
	1372	+
	1373	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	1374	+ zoomBoxCB.setToolTipText("Display only for wheel");
	1375	+ zoomBoxCB.addItemListener(this);
	1376	+
	1377	+ if (true) // Globals.ADVANCED)
	1378	+ {
	1379	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1380	+// supportCB.setToolTipText("Enable rigging");
	1381	+// supportCB.addItemListener(this);
	1382	+
	1383	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1384	+ freezeCB.setToolTipText("Fast moving camera");
	1385	+ freezeCB.addItemListener(this);
	1386	+
	1387	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	1388	+ // localCB.addItemListener(this);
	1389	+
	1390	+ panel.Return();
	1391	+
	1392	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	1393	+ crowdCB.setToolTipText("Used for crowds");
	1394	+ crowdCB.addItemListener(this);
	1395	+
	1396	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	1397	+ smoothCB.setToolTipText("Snapping delay");
	1398	+ smoothCB.addItemListener(this);
	1399	+
	1400	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1401	+// slowCB.setToolTipText("Smooth interpolation");
	1402	+// slowCB.addItemListener(this);
	1403	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1404	+ minshaderCB.setToolTipText("Minimal fast shader");
	1405	+ minshaderCB.addItemListener(this);
	1406	+
	1407	+// constraints.gridy += 1;
	1408	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	1409	+// speakerMocapCB.addItemListener(this);
	1410	+
	1411	+ panel.Return();
	1412	+
	1413	+ if (false)
	1414	+ {
	1415	+ // handled in scripts
	1416	+ //constraints.gridy += 1;
	1417	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	1418	+ speakerCameraCB.addItemListener(this);
	1419	+
	1420	+ //constraints.gridy += 1;
	1421	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	1422	+ speakerFocusCB.addItemListener(this);
	1423	+
	1424	+ //constraints.gridy += 1;
	1425	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	1426	+ smoothfocusCB.addItemListener(this);
	1427	+ panel.Return();
	1428	+ }
	1429	+
	1430	+//constraints.gridx += 1;
	1431	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	1432	+// debugCB.addItemListener(this);
	1433	+
	1434	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1435	+ trackCB.setToolTipText("Enable tracking target");
	1436	+ trackCB.addItemListener(this);
	1437	+
	1438	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1439	+ oeilCB.setToolTipText("Move camera when tracking");
	1440	+ oeilCB.addItemListener(this);
	1441	+
	1442	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1443	+ shadowCB.setToolTipText("When live compute shadows");
	1444	+ shadowCB.addItemListener(this);
	1445	+
	1446	+ panel.Return();
	1447	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1448	+ toggleTextureCB.setToolTipText("Load textures");
	1449	+ toggleTextureCB.addItemListener(this);
	1450	+
	1451	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1452	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1453	+ toggleSwitchCB.addItemListener(this);
	1454	+
	1455	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1456	+ autokeepCB.setToolTipText("On structure change");
	1457	+ autokeepCB.addItemListener(this);
	1458	+
	1459	+ panel.Return();
	1460	+ if (Globals.ADVANCED)
	1461	+ {
	1462	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	1463	+ lookAtCB.setToolTipText("Look-at target");
	1464	+ lookAtCB.addItemListener(this);
	1465	+ }
	1466	+
	1467	+ }
	1468	+
	1469	+ cGridBag fill = new cGridBag();
	1470	+ fill.preferredHeight = 200;
	1471	+ cGridBag fill2 = new cGridBag();
	1472	+ fill2.preferredHeight = 200;
	1473	+ cGridBag fill3 = new cGridBag();
	1474	+ fill3.preferredHeight = 200;
	1475	+
	1476	+ panel.add(fill);
	1477	+ panel.add(fill2);
	1478	+ panel.add(fill3);
	1479	+
	1480	+ }
649	1481
650	1482	void EditObject(Object3D obj)
651	1483	{
	1484	+ assert(obj instanceof Composite);
	1485	+
	1486	+// if (obj.versionlist == null)
	1487	+// {
	1488	+// obj.versionlist = new Object3D[100];
	1489	+// obj.versionindex = -1;
	1490	+// }
	1491	+
652	1492	cRadio radioButton = new cRadio(obj.name);
	1493	+
	1494	+ // June 2019. Patch to avoid bug with transparency.
	1495	+ radioButton.hadMaterial = obj.material != null;
	1496	+ if (!radioButton.hadMaterial)
	1497	+ {
	1498	+ obj.material = new cMaterial();
	1499	+ }
	1500	+
653	1501	radioButton.SetObject(obj);
654		- radioButton.layout = sevenButton;
	1502	+ radioButton.layout = threeButton; // sixButton;
655	1503	radioButton.SetCamera(cameraView.renderCamera, false);
656	1504	radioButton.addActionListener(this);
657	1505	radioPanel.add(radioButton);
658	1506	buttonGroup.add(radioButton);
659	1507	radioButton.doClick();
660	1508	}
	1509	+
661	1510	void SetupViews(ObjEditor oe)
662	1511	{
	1512	+ theFrame = this;
	1513	+
663	1514	oe.SetupViews();
664	1515
	1516	+ if (Globals.DEBUG)
665	1517	System.out.println("SetupViews");
666	1518	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
667	1519	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
668	1520	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
669	1521	}
670	1522
671		- JCheckBox liveCB;
672		- JCheckBox supportCB;
673		- JCheckBox localCB;
674		- JCheckBox crowdCB;
675		- JCheckBox smoothCB;
676		- JCheckBox fastCB;
677		- JCheckBox slowCB;
678		- JCheckBox boxCB;
679		- JCheckBox trackCB;
680		- JCheckBox smoothfocusCB;
	1523	+ cToggleButton liveCB;
	1524	+ cCheckBox supportCB;
	1525	+ cCheckBox localCB;
	1526	+ cCheckBox crowdCB;
	1527	+ cCheckBox smoothCB;
	1528	+ cCheckBox minshaderCB;
	1529	+
	1530	+ cToggleButton fastCB;
	1531	+ cCheckBox slowCB;
	1532	+ cCheckBox boxCB;
	1533	+ cCheckBox zoomBoxCB;
	1534	+ cCheckBox freezeCB;
	1535	+ //cToggleButton trackCB;
	1536	+ cCheckBox trackCB;
	1537	+ cCheckBox smoothfocusCB;
681	1538	// JCheckBox speakerMocapCB;
682		- JCheckBox speakerCameraCB;
683		- JCheckBox speakerFocusCB;
684		- JCheckBox debugCB;
685		- JCheckBox oeilCB;
686		- JCheckBox lookAtCB;
	1539	+ cCheckBox speakerCameraCB;
	1540	+ cCheckBox speakerFocusCB;
	1541	+ cCheckBox debugCB;
	1542	+
	1543	+ cCheckBox oeilCB;
	1544	+ cCheckBox shadowCB;
	1545	+ cCheckBox autokeepCB;
	1546	+ cCheckBox lookAtCB;
687	1547
688	1548	// static int COLOR = 1;
689	1549	// static int MATERIAL = 2;
..	..	@@ -691,9 +1551,9 @@
691	1551
692	1552	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
693	1553
694		- JCheckBox colorCB;
695		- JCheckBox materialCB;
696		- JCheckBox textureCB;
	1554	+ cCheckBox colorCB;
	1555	+ cCheckBox materialCB;
	1556	+ cCheckBox textureCB;
697	1557
698	1558	public void itemStateChanged(ItemEvent e)
699	1559	{
..	..	@@ -721,6 +1581,7 @@
721	1581	} else if(e.getSource() == liveCB)
722	1582	{
723	1583	cameraView.ToggleLive();
	1584	+ refreshContents(false);
724	1585	}
725	1586	else if(e.getSource() == supportCB)
726	1587	{
..	..	@@ -736,6 +1597,12 @@
736	1597	{
737	1598	cameraView.ToggleInertia();
738	1599	cameraView.repaint();
	1600	+ }
	1601	+ else if(e.getSource() == minshaderCB)
	1602	+ {
	1603	+ Globals.MINSHADER ^= true;
	1604	+ cameraView.programInitialized = false;
	1605	+ cameraView.repaint();
739	1606	}
740	1607	else if(e.getSource() == localCB)
741	1608	{
..	..	@@ -755,6 +1622,10 @@
755	1622	Recompile();
756	1623	cameraView.repaint();
757	1624	// refreshContents();
	1625	+ }
	1626	+ else if(e.getSource() == zoomBoxCB)
	1627	+ {
	1628	+ cameraView.ToggleZoomBoxMode();
758	1629	}
759	1630	else if(e.getSource() == smoothfocusCB)
760	1631	{
..	..	@@ -781,6 +1652,18 @@
781	1652	{
782	1653	cameraView.ToggleOeil();
783	1654	}
	1655	+ else if(e.getSource() == shadowCB)
	1656	+ {
	1657	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1658	+ }
	1659	+ else if(e.getSource() == freezeCB)
	1660	+ {
	1661	+ Globals.FREEZEONMOVE ^= true;
	1662	+ }
	1663	+ else if(e.getSource() == autokeepCB)
	1664	+ {
	1665	+ Globals.REPLACEONMAKE ^= true;
	1666	+ }
784	1667	else if(e.getSource() == lookAtCB)
785	1668	{
786	1669	cameraView.ToggleLookAt();
..	..	@@ -797,7 +1680,8 @@
797	1680
798	1681	/**/
799	1682	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
800		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1683	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1684	+ TreePath path = objEditor.jTree.getSelectionPath();
801	1685	if ((path == null) \|\| (path.getPathCount() <= 1)) {
802	1686	// We can't move the root node or an empty selection
803	1687	return;
..	..	@@ -860,8 +1744,6 @@
860	1744	}
861	1745	}
862	1746
863		- String string = (String) object;
864		-
865	1747	System.out.println("Transfer = " + object + "; drop : " + target);
866	1748	// if( object instanceof java.io.File[])
867	1749	// {
..	..	@@ -869,7 +1751,11 @@
869	1751	// objEditor.DropFile((java.io.File[]) object, true);
870	1752	// return;
871	1753	// }
872		- if (string.charAt(0) == '/')
	1754	+
	1755	+ String string = object.toString();
	1756	+
	1757	+ // File path for Mac and Windows
	1758	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
873	1759	{
874	1760	// file(s)
875	1761	String[] names = string.split("\n");
..	..	@@ -896,7 +1782,7 @@
896	1782
897	1783	flashIt = false;
898	1784	CameraPane pane = (CameraPane) target;
899		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1785	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
900	1786	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
901	1787
902	1788	if (group.selection.size() == 1)
..	..	@@ -912,23 +1798,33 @@
912	1798
913	1799	assert target == objEditor.jTree;
914	1800	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1801	+ Object3D destinationLeaf;
915	1802	try {
916		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1803	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
917	1804	} catch (Exception e) {
918	1805	System.out.println("destinationPath : " + destinationPath);
919	1806	return;
920	1807	}
921	1808
922		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1809	+ for (int i=group.selection.size(); --i>=0;)
923	1810	{
	1811	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1812	+
	1813	+ // Cannot move into itself
	1814	+ if (child == destinationLeaf)
	1815	+ return;
	1816	+ }
	1817	+
	1818	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1819	+// {
924	1820	loadClipboard(true);
925	1821	objEditor.jTree.setSelectionPath(destinationPath);
926		- pasteInto(false);
927		- } else {
928		- loadClipboard(false);
929		- objEditor.jTree.setSelectionPath(destinationPath);
930		- pasteInto(false); // true); // ???
931		- }
	1822	+ pasteInto(false, false);
	1823	+// } else {
	1824	+// loadClipboard(false);
	1825	+// objEditor.jTree.setSelectionPath(destinationPath);
	1826	+// pasteInto(false, false); // true); // ???
	1827	+// }
932	1828	}
933	1829	public void dropActionChanged(DropTargetDragEvent dtde)
934	1830	// Called if the user has modified the current drop gesture
..	..	@@ -984,7 +1880,12 @@
984	1880	TreePath path;
985	1881
986	1882	public TransferableTreePath(TreePath tp) {
987		- path = tp;
	1883	+ Object[] objs = new Object[tp.getPathCount()];
	1884	+ for (int i=0; i<objs.length; i++)
	1885	+ {
	1886	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1887	+ }
	1888	+ path = new TreePath(objs);
988	1889	}
989	1890
990	1891	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1033,85 +1934,107 @@
1033	1934	{
1034	1935	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1035	1936	//heightFieldItem.addActionListener(this);
1036		- gridItem = menu.add(new MenuItem("Grid"));
1037		- gridItem.addActionListener(this);
1038		- rectoidItem = menu.add(new MenuItem("Box"));
1039		- rectoidItem.addActionListener(this);
1040		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1041		- ellipsoidItem.addActionListener(this);
1042		- coneItem = menu.add(new MenuItem("Cone"));
1043		- coneItem.addActionListener(this);
1044		- torusItem = menu.add(new MenuItem("Torus"));
1045		- torusItem.addActionListener(this);
1046		- superItem = menu.add(new MenuItem("Superellipsoid"));
1047		- superItem.addActionListener(this);
	1937	+// gridItem = menu.add(new MenuItem("Grid"));
	1938	+// gridItem.addActionListener(this);
	1939	+// rectoidItem = menu.add(new MenuItem("Box"));
	1940	+// rectoidItem.addActionListener(this);
	1941	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1942	+// ellipsoidItem.addActionListener(this);
	1943	+// coneItem = menu.add(new MenuItem("Cone"));
	1944	+// coneItem.addActionListener(this);
	1945	+// torusItem = menu.add(new MenuItem("Torus"));
	1946	+// torusItem.addActionListener(this);
	1947	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1948	+// superItem.addActionListener(this);
	1949	+
	1950	+ cameraItem = menu.add(new MenuItem("Camera"));
	1951	+ cameraItem.addActionListener(this);
	1952	+
	1953	+ if (!Globals.ADVANCED)
	1954	+ {
1048	1955	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1049	1956	kleinItem.addActionListener(this);
1050		- particleItem = menu.add(new MenuItem("Particle system"));
1051		- particleItem.addActionListener(this);
	1957	+ }
	1958	+
	1959	+// particleItem = menu.add(new MenuItem("Particle system"));
	1960	+// particleItem.addActionListener(this);
	1961	+ if (Globals.ADVANCED)
	1962	+ {
1052	1963	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1053	1964	ragdollItem.addActionListener(this);
1054	1965	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1055	1966	ragdoll2Item.addActionListener(this);
	1967	+ }
1056	1968	menu.add("-");
1057		- meshItem = menu.add(new MenuItem("Mesh"));
	1969	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1058	1970	meshItem.addActionListener(this);
1059	1971	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1060	1972	// meshGroupItem.addActionListener(this);
	1973	+ if (Globals.ADVANCED)
	1974	+ {
1061	1975	springItem = menu.add(new MenuItem("Spring"));
1062	1976	springItem.addActionListener(this);
1063	1977	flagItem = menu.add(new MenuItem("Flag"));
1064	1978	flagItem.addActionListener(this);
1065		- bezierItem = menu.add(new MenuItem("Patch"));
1066		- bezierItem.addActionListener(this);
1067		- checkerItem = menu.add(new MenuItem("Checker"));
1068		- checkerItem.addActionListener(this);
1069	1979	blobItem = menu.add(new MenuItem("Blob"));
1070	1980	blobItem.addActionListener(this);
1071	1981	latheItem = menu.add(new MenuItem("Lathe"));
1072	1982	latheItem.addActionListener(this);
1073		- lightItem = menu.add(new MenuItem("Light"));
1074		- lightItem.addActionListener(this);
	1983	+ }
	1984	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1985	+ bezierItem.addActionListener(this);
	1986	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1987	+// overlayItem.addActionListener(this);
	1988	+// lightItem = menu.add(new MenuItem("Light"));
	1989	+// lightItem.addActionListener(this);
1075	1990	menu.add("-");
1076	1991	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1077	1992	//superLoopItem.addActionListener(this);
1078		- loopItem = menu.add(new MenuItem("Loop"));
1079		- loopItem.addActionListener(this);
	1993	+// loopItem = menu.add(new MenuItem("Loop"));
	1994	+// loopItem.addActionListener(this);
1080	1995	doubleItem = menu.add(new MenuItem("Fork"));
1081	1996	doubleItem.addActionListener(this);
	1997	+ if (Globals.ADVANCED)
	1998	+ {
1082	1999	tripleItem = menu.add(new MenuItem("Trident"));
1083	2000	tripleItem.addActionListener(this);
	2001	+ }
1084	2002	}
1085	2003
1086	2004	void buildToolsMenu(Menu menu)
1087	2005	{
1088	2006	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1089	2007	animationItem.addItemListener(this);
1090		- animationItem.setState(CameraPane.ANIMATION);
	2008	+ animationItem.setState(Globals.ANIMATION);
	2009	+
	2010	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	2011	+ archiveItem.addActionListener(this);
1091	2012
1092	2013	menu.add("-");
1093	2014	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1094	2015	parseverticesItem.addActionListener(this);
1095	2016	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1096	2017	textureFieldItem.addActionListener(this);
1097		- alignItem = menu.add(new MenuItem("Align"));
	2018	+ alignItem = menu.add(new MenuItem("Align Objects"));
1098	2019	alignItem.addActionListener(this);
1099		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1100		- mirrorItem.addActionListener(this);
1101	2020	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1102	2021	reduceMorphItem.addActionListener(this);
1103	2022	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1104	2023	reduce34MorphItem.addActionListener(this);
1105		-
1106		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1107		- computeAOItem.addActionListener(this);
1108	2024	menu.add("-");
1109		-
1110	2025	menu.add(memoryItem = new MenuItem("Memory Usage"));
1111	2026	memoryItem.addActionListener(this);
	2027	+ menu.add(computeAOItem = new MenuItem("Compute AO"));
	2028	+ computeAOItem.addActionListener(this);
	2029	+
	2030	+ if (Globals.ADVANCED)
	2031	+ {
	2032	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	2033	+ mirrorItem.addActionListener(this);
	2034	+ menu.add("-");
1112	2035	menu.add(analyzeItem = new MenuItem("Analyze"));
1113	2036	analyzeItem.addActionListener(this);
1114		- menu.add(dumpItem = new MenuItem("Dump"));
	2037	+ menu.add(dumpItem = new MenuItem("Print"));
1115	2038	dumpItem.addActionListener(this);
1116	2039	// menu.add(pathItem = new MenuItem("From-to path"));
1117	2040	// pathItem.addActionListener(this);
..	..	@@ -1120,6 +2043,8 @@
1120	2043	resetParentItem.addActionListener(this);
1121	2044	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1122	2045	repairParentItem.addActionListener(this);
	2046	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	2047	+ repairShadowItem.addActionListener(this);
1123	2048	menu.add(invariantsItem = new MenuItem("Invariants"));
1124	2049	invariantsItem.addActionListener(this);
1125	2050	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1127,6 +2052,7 @@
1127	2052	menu.add("-");
1128	2053	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1129	2054	editScriptItem.addActionListener(this);
	2055	+ }
1130	2056	}
1131	2057
1132	2058	void ScreenFit()
..	..	@@ -1249,9 +2175,38 @@
1249	2175	shadow.material = new cMaterial(obj.material);
1250	2176	shadow.material.diffuse = 0.0001f;
1251	2177	shadow.material.specular = 0.0001f;
	2178	+ shadow.material.opacity = 0.75f;
	2179	+
	2180	+ AllocProjectedVertices(shadow);
	2181	+
	2182	+ shadow.projectedVertices[1].x = 300;
1252	2183
1253	2184	makeSomething(shadow);
1254	2185	}
	2186	+
	2187	+ private void ClearUnpinned()
	2188	+ {
	2189	+ //for (Object3D obj : listUI)
	2190	+ for (int i=listUI.size(); --i>=0;)
	2191	+ {
	2192	+ Object3D obj = listUI.elementAt(i);
	2193	+ if (!obj.pinned)
	2194	+ {
	2195	+ obj.CloseUI();
	2196	+ listUI.remove(i);
	2197	+ }
	2198	+ }
	2199	+ }
	2200	+
	2201	+ private void EditElement(Object3D elem, boolean newWindow)
	2202	+ {
	2203	+ // if (!(elem instanceof Composite))
	2204	+ // newWindow = false;
	2205	+ listUI.add(elem);
	2206	+ elem.openEditWindow(this, newWindow); //, false);
	2207	+ System.out.println("edit : " + elem);
	2208	+ elem.editWindow.refreshContents(true); // ? new
	2209	+ }
1255	2210
1256	2211	/**
1257	2212	* applyExample
..	..	@@ -1455,9 +2410,9 @@
1455	2410
1456	2411	void Overwrite(int mask)
1457	2412	{
1458		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2413	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1459	2414	{
1460		- Object3D content = GrafreeD.clipboard.get(0);
	2415	+ Object3D content = Grafreed.clipboard.get(0);
1461	2416
1462	2417	if (content instanceof cGroup && ((cGroup)content).transientlink )
1463	2418	content = ((cGroup)content).get(0);
..	..	@@ -1480,6 +2435,7 @@
1480	2435	//
1481	2436	public void actionPerformed(ActionEvent event) // , Object arg)
1482	2437	{
	2438	+ Object source = event.getSource();
1483	2439	/*
1484	2440	if (event.getSource() == nameField)
1485	2441	{
..	..	@@ -1491,11 +2447,11 @@
1491	2447	}
1492	2448	else
1493	2449	*/
1494		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	2450	+ if (source == lookAtItem \|\| source == lookFromItem)
1495	2451	{
1496	2452	ScreenFit();
1497	2453	} else
1498		- if (event.getSource() == switchItem)
	2454	+ if (source == switchViewItem)
1499	2455	{
1500	2456	cVector v1 = new cVector();
1501	2457	cVector v2 = new cVector();
..	..	@@ -1504,11 +2460,11 @@
1504	2460	objEditor.cameraView.renderCamera.setAim(v2, v1);
1505	2461	objEditor.cameraView.repaint();
1506	2462	} else
1507		- if (event.getSource() == rectoidItem)
	2463	+ if (source == rectoidItem \|\| source == boxButton)
1508	2464	{
1509	2465	makeSomething(new Box());
1510	2466	} else
1511		- if (event.getSource() == particleItem)
	2467	+ if (source == particleItem \|\| source == particlesButton)
1512	2468	{
1513	2469	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1514	2470	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1529,9 +2485,9 @@
1529	2485	applyExample(particleGeom, "SMOKE");
1530	2486	makeSomething(particleGeom);
1531	2487	} else
1532		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	2488	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1533	2489	{
1534		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	2490	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1535	2491
1536	2492	ragdoll.toParent = LA.newMatrix();
1537	2493	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1549,7 +2505,7 @@
1549	2505	} else
1550	2506	/*
1551	2507	*/
1552		- if (event.getSource() == heightFieldItem)
	2508	+ if (source == heightFieldItem)
1553	2509	{
1554	2510	Object3D obj = new Object3D();
1555	2511
..	..	@@ -1587,31 +2543,31 @@
1587	2543
1588	2544	makeSomething(obj);
1589	2545	} else
1590		- if (event.getSource() == gridItem)
	2546	+ if (source == gridItem \|\| source == gridButton)
1591	2547	{
1592	2548	makeSomething(new Grid());
1593	2549	} else
1594		- if (event.getSource() == ellipsoidItem)
	2550	+ if (source == ellipsoidItem \|\| source == sphereButton)
1595	2551	{
1596	2552	makeSomething(new Sphere());
1597	2553	} else
1598		- if (event.getSource() == coneItem)
	2554	+ if (source == coneItem \|\| source == coneButton)
1599	2555	{
1600	2556	makeSomething(new Cone());
1601	2557	} else
1602		- if (event.getSource() == torusItem)
	2558	+ if (source == torusItem \|\| source == torusButton)
1603	2559	{
1604	2560	makeSomething(new Torus());
1605	2561	} else
1606		- if (event.getSource() == superItem)
	2562	+ if (source == superItem \|\| source == superButton)
1607	2563	{
1608	2564	makeSomething(new Superellipsoid());
1609	2565	} else
1610		- if (event.getSource() == kleinItem)
	2566	+ if (source == kleinItem \|\| source == kleinButton)
1611	2567	{
1612	2568	makeSomething(new Klein());
1613	2569	} else
1614		- if (event.getSource() == blobItem)
	2570	+ if (source == blobItem)
1615	2571	{
1616	2572	Blob blob = new Blob();
1617	2573	BlobComponent comp = new BlobComponent();
..	..	@@ -1619,15 +2575,15 @@
1619	2575	//blob.retile();
1620	2576	makeSomething(blob);
1621	2577	} else
1622		- if (event.getSource() == latheItem)
	2578	+ if (source == latheItem)
1623	2579	{
1624	2580	makeSomething(new Lathe());
1625	2581	} else
1626		- if (event.getSource() == bezierItem)
	2582	+ if (source == bezierItem)
1627	2583	{
1628	2584	makeSomething(new BezierSurface());
1629	2585	} else
1630		- if (event.getSource() == checkerItem)
	2586	+ if (source == overlayItem \|\| source == overlayButton)
1631	2587	{
1632	2588	/*
1633	2589	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1642,7 +2598,7 @@
1642	2598	*/
1643	2599	makeSomething(new Checker());
1644	2600	} else
1645		- if (event.getSource() == meshItem)
	2601	+ if (source == meshItem)
1646	2602	{
1647	2603	Object3D itemtomake = new Object3D();
1648	2604	Object3D child;
..	..	@@ -1663,35 +2619,52 @@
1663	2619	makeSomething(child);
1664	2620	}
1665	2621	} else
1666		- if (event.getSource() == springItem)
	2622	+ if (source == springItem)
1667	2623	{
1668	2624	cSpring s = new cSpring();
1669	2625	s.setup();
1670	2626	makeSomething(s);
1671	2627	} else
1672		- if (event.getSource() == flagItem)
	2628	+ if (source == flagItem)
1673	2629	{
1674	2630	cSpring s = new cFlag();
1675	2631	s.setup();
1676	2632	makeSomething(s);
1677	2633	} else
1678		- if (event.getSource() == lightItem)
	2634	+ if (source == lightItem \|\| source == lightButton)
1679	2635	{
1680	2636	makeSomething(new Light());
1681	2637	} else
1682		- if (event.getSource() == csgItem)
	2638	+// if (source == skybox1Button \|\|
	2639	+// source == skybox2Button \|\|
	2640	+// source == skybox3Button \|\|
	2641	+// source == skybox4Button \|\|
	2642	+// source == skybox5Button \|\|
	2643	+// source == skybox6Button \|\|
	2644	+// source == skybox7Button \|\|
	2645	+// source == skybox11Button \|\|
	2646	+// source == skybox12Button \|\|
	2647	+// source == skybox13Button \|\|
	2648	+// source == skybox14Button \|\|
	2649	+// source == skybox15Button \|\|
	2650	+// source == skybox16Button \|\|
	2651	+// source == skybox17Button)
	2652	+// {
	2653	+// ChangeSkybox(source);
	2654	+// } else
	2655	+ if (source == csgItem)
1683	2656	{
1684	2657	group(new CSG());
1685	2658	} else
1686		- if (event.getSource() == templateItem)
	2659	+ if (source == templateItem)
1687	2660	{
1688	2661	group(new cTemplate());
1689	2662	} else
1690		- if (event.getSource() == attributeItem)
	2663	+ if (source == attributeItem)
1691	2664	{
1692	2665	makeSomething(new Attribute());
1693	2666	} else
1694		- if (event.getSource() == pointflowItem)
	2667	+ if (source == pointflowItem)
1695	2668	{
1696	2669	makeSomething(new PointFlow());
1697	2670	} else
..	..	@@ -1703,7 +2676,7 @@
1703	2676	} else
1704	2677	*/
1705	2678
1706		- if (event.getSource() == superLoopItem)
	2679	+ if (source == superLoopItem)
1707	2680	{
1708	2681	Composite g = new cGroup();
1709	2682	for (int i=0; i<15; i++)
..	..	@@ -1725,30 +2698,38 @@
1725	2698
1726	2699	group(g);
1727	2700	} else
1728		- if (event.getSource() == loopItem)
	2701	+ if (source == loopItem \|\| source == loopButton)
1729	2702	{
	2703	+ if (!group.selection.isEmpty())
	2704	+ {
1730	2705	Composite csg = new GroupLeaf();
1731	2706	csg.count = 5;
1732		- group(csg);
1733		- Composite child = new cGroup();
	2707	+ Composite child = new cGroup("Branch");
1734	2708	csg.addChild(child);
1735	2709	child.addChild(csg);
	2710	+ group(csg);
	2711	+ }
1736	2712	} else
1737		- if (event.getSource() == doubleItem)
	2713	+ if (source == doubleItem)
1738	2714	{
1739		- Composite csg = new GroupLeaf();
	2715	+ if (!group.selection.isEmpty())
	2716	+ {
	2717	+ Composite csg = new GroupLeaf("Fork");
1740	2718	csg.count = 5;
	2719	+ Composite child = new cGroup("Branch A");
	2720	+ csg.addChild(child);
	2721	+ child.addChild(csg);
	2722	+ child = new cGroup("Branch B");
	2723	+ csg.addChild(child);
	2724	+ child.addChild(csg);
1741	2725	group(csg);
1742		- Composite child = new cGroup();
1743		- csg.addChild(child);
1744		- child.addChild(csg);
1745		- child = new cGroup();
1746		- csg.addChild(child);
1747		- child.addChild(csg);
	2726	+ }
1748	2727	} else
1749		- if (event.getSource() == tripleItem)
	2728	+ if (source == tripleItem)
1750	2729	{
1751		- Composite csg = new GroupLeaf();
	2730	+ if (!group.selection.isEmpty())
	2731	+ {
	2732	+ Composite csg = new GroupLeaf("Trident");
1752	2733	csg.count = 4;
1753	2734	group(csg);
1754	2735	Composite child = new cGroup();
..	..	@@ -1760,74 +2741,119 @@
1760	2741	child = new cGroup();
1761	2742	csg.addChild(child);
1762	2743	child.addChild(csg);
	2744	+ }
1763	2745	} else
1764		-
1765		- if (event.getSource() == importGFDItem)
	2746	+ if (source == computeAOItem)
1766	2747	{
1767		- ImportGFD();
	2748	+ Globals.drawMode = CameraPane.OCCLUSION;
	2749	+ cameraView.repaint();
1768	2750	} else
1769		- if (event.getSource() == importVRMLX3DItem)
1770		- {
1771		- ImportVRMLX3D();
1772		- } else
1773		- if (event.getSource() == import3DSItem)
1774		- {
1775		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1776		- } else
1777		- if (event.getSource() == importOBJItem)
1778		- {
1779		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1780		- } else
1781		- if (event.getSource() == computeAOItem)
1782		- {
1783		- CameraPane.drawMode = CameraPane.OCCLUSION;
1784		- CameraPane.theRenderer.repaint();
1785		- } else
1786		- if (event.getSource() == recompileItem)
	2751	+ if (source == recompileItem)
1787	2752	{
1788	2753	Recompile();
1789	2754	refreshContents();
1790	2755	} else
1791		- if (event.getSource() == editScriptItem)
	2756	+ if (source == editScriptItem)
1792	2757	{
1793	2758	OpenDialog();
1794	2759	refreshContents();
1795	2760	} else
1796		- if (event.getSource() == invariantsItem)
	2761	+ if (source == invariantsItem)
1797	2762	{
1798	2763	System.out.println("Invariants:");
1799		- GrafreeD.grafreeD.universe.invariants();
	2764	+ Grafreed.grafreed.universe.invariants();
1800	2765	} else
1801		- if (event.getSource() == memoryItem)
	2766	+ if (source == memoryItem)
1802	2767	{
1803	2768	//System.out.println("Invariants:");
1804	2769	PrintMemory();
1805	2770	} else
1806		- if (event.getSource() == pathItem)
	2771	+ if (source == pathItem)
1807	2772	{
1808	2773	PrintPath();
1809	2774	} else
1810		- if (event.getSource() == analyzeItem)
	2775	+ if (source == analyzeItem)
1811	2776	{
1812	2777	AnalyzeObject();
1813	2778	} else
1814		- if (event.getSource() == dumpItem)
	2779	+ if (source == dumpItem)
1815	2780	{
1816	2781	DumpObject();
1817	2782	} else
1818		- if (event.getSource() == screenfitButton)
	2783	+ if (source == minButton)
1819	2784	{
1820		- //Reload(lastConverter, lastFilename, true);
	2785	+ Minimize();
	2786	+ } else
	2787	+ if (source == maxButton)
	2788	+ {
	2789	+ Maximize();
	2790	+ } else
	2791	+ if (source == fullButton)
	2792	+ {
	2793	+ ToggleFullScreen();
	2794	+ } else
	2795	+ if (source == collapseButton)
	2796	+ {
	2797	+ this.expandedLayout = radio.layout;
	2798	+ CollapseToolbar();
	2799	+ } else
	2800	+ if (source == maximize3DButton)
	2801	+ {
	2802	+ this.expandedLayout = radio.layout;
	2803	+ radio.layout = twoButton;
	2804	+ Show3DView();
	2805	+ CollapseToolbar();
	2806	+ } else
	2807	+ if (source == previousVersionButton)
	2808	+ {
	2809	+ // Go to previous version
	2810	+ //if (!Undo())
	2811	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2812	+ PreviousVersion();
	2813	+ } else
	2814	+ if (source == restoreButton)
	2815	+ {
	2816	+ // Restore current version
	2817	+ Restore();
	2818	+ //restoreButton.setEnabled(false);
	2819	+ } else
	2820	+ if (source == replaceButton)
	2821	+ {
	2822	+ // Overwrite current version
	2823	+ Replace();
	2824	+ //replaceButton.setEnabled(false);
	2825	+ } else
	2826	+ if (source == nextVersionButton)
	2827	+ {
	2828	+ // Go to next version
	2829	+ NextVersion();
	2830	+ } else
	2831	+ if (source == saveVersionButton)
	2832	+ {
	2833	+ // Save a new version
	2834	+ if (!Save(true))
	2835	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2836	+ } else
	2837	+ if (source == deleteVersionButton)
	2838	+ {
	2839	+ // Delete a new version
	2840	+ DeleteVersion();
	2841	+ } else
	2842	+ if (source == oneStepButton)
	2843	+ {
	2844	+ Globals.ONESTEP = true;
	2845	+ cameraView.repaint();
	2846	+ } else
	2847	+ if (source == screenfitButton)
	2848	+ {
1821	2849	ScreenFit();
1822	2850	} else
1823		- if (event.getSource() == screenfitpointButton)
	2851	+ if (source == screenfitpointButton)
1824	2852	{
1825		- //Reload(lastConverter, lastFilename, true);
1826	2853	ScreenFitPoint();
1827	2854	} else
1828		- if (event.getSource() == snapobjectButton)
	2855	+ if (source == snapobjectButton)
1829	2856	{
1830		- //Reload(lastConverter, lastFilename, true);
1831	2857	SnapObject();
1832	2858	} else
1833	2859	// if (event.getSource() == recompileButton)
..	..	@@ -1836,13 +2862,13 @@
1836	2862	// Recompile();
1837	2863	// refreshContents();
1838	2864	// } else
1839		- if (event.getSource() == gcButton)
	2865	+ if (source == gcButton)
1840	2866	{
1841	2867	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1842	2868	System.gc();
1843	2869	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1844	2870	} else
1845		- if (event.getSource() == editLeafItem)
	2871	+ if (source == editLeafItem)
1846	2872	{
1847	2873	Object3D obj;
1848	2874	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1856,62 +2882,74 @@
1856	2882	}
1857	2883	refreshContents(true);
1858	2884	} else
1859		- if (event.getSource() == openWindowItem)
	2885	+ if (source == openWindowItem)
1860	2886	{
1861	2887	EditSelection(true);
1862	2888	} else
1863		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2889	+ if (source == cutItem \|\| source == clearButton)
1864	2890	{
1865	2891	loadClipboard(true);
1866	2892	} else
1867		- if (event.getSource() == duplicateItem)
	2893	+ if (source == undoItem)
1868	2894	{
1869		- Object3D keep = GrafreeD.clipboard;
	2895	+ PreviousVersion();
	2896	+ } else
	2897	+ if (source == redoItem)
	2898	+ {
	2899	+ NextVersion();
	2900	+ } else
	2901	+ if (source == duplicateItem)
	2902	+ {
	2903	+ Object3D keep = Grafreed.clipboard;
1870	2904	loadClipboard(false);
1871	2905	paste(false);
1872		- GrafreeD.clipboard = keep;
	2906	+ Grafreed.clipboard = keep;
1873	2907	} else
1874		- if (event.getSource() == cloneItem)
	2908	+ if (source == cloneItem)
1875	2909	{
1876	2910	CloneSelection(false);
1877	2911	} else
1878		- if (event.getSource() == cloneSupportItem)
	2912	+ if (source == cloneSupportItem)
1879	2913	{
1880	2914	CloneSelection(true);
1881	2915	} else
1882		- if (event.getSource() == copyItem)
	2916	+ if (source == copyItem)
1883	2917	{
1884	2918	loadClipboard(false);
1885	2919	} else
1886		- if (event.getSource() == pasteItem)
	2920	+ if (source == pasteItem)
1887	2921	{
1888	2922	paste(false);
1889	2923	} else
1890		- if (event.getSource() == pasteLinkItem)
	2924	+ if (source == pasteIntoItem)
1891	2925	{
1892		- pasteInto(false);
	2926	+ pasteInto(true, false);
1893	2927	} else
1894		- if (event.getSource() == pasteCloneItem)
	2928	+ if (source == pasteLinkItem)
1895	2929	{
1896		- pasteInto(true);
	2930	+ pasteInto(false, false);
1897	2931	} else
1898		- if (event.getSource() == pasteExpandItem)
	2932	+ if (source == pasteCloneItem)
	2933	+ {
	2934	+ pasteInto(true, true);
	2935	+ } else
	2936	+ if (source == pasteExpandItem)
1899	2937	{
1900	2938	paste(true);
1901	2939	} else
1902		- if (event.getSource() == synchronizeItem)
	2940	+ if (source == synchronizeItem)
1903	2941	{
1904	2942	Overwrite(Object3D.TRANSFORM);
1905	2943	} else
1906		- if (event.getSource() == overwriteNameItem)
	2944	+ if (source == overwriteNameItem)
1907	2945	{
1908	2946	Overwrite(Object3D.NAME);
1909	2947	} else
1910		- if (event.getSource() == overwriteUVItem)
	2948	+ if (source == overwriteUVItem)
1911	2949	{
1912	2950	Overwrite(Object3D.UV);
1913	2951	} else
1914		- if (event.getSource() == overwriteMatItem)
	2952	+ if (source == overwriteMatItem)
1915	2953	{
1916	2954	/* july 2015
1917	2955	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1931,7 +2969,7 @@
1931	2969
1932	2970	Overwrite(dropAttributes);
1933	2971	}
1934		- if (event.getSource() == overwriteGeoItem)
	2972	+ if (source == overwriteGeoItem)
1935	2973	{
1936	2974	Overwrite(Object3D.GEOMETRY);
1937	2975	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1948,7 +2986,7 @@
1948	2986	// refreshContents();
1949	2987	// }
1950	2988	} else
1951		- if (event.getSource() == generateMeshItem)
	2989	+ if (source == generateMeshItem)
1952	2990	{
1953	2991	//if (group.selection.size() == 1)
1954	2992	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1959,7 +2997,7 @@
1959	2997	ResetModel();
1960	2998	refreshContents();
1961	2999	} else
1962		- if (event.getSource() == extractGeometriesItem)
	3000	+ if (source == extractGeometriesItem)
1963	3001	{
1964	3002	boolean one = false;
1965	3003
..	..	@@ -1986,7 +3024,7 @@
1986	3024	ResetModel();
1987	3025	refreshContents();
1988	3026	} else
1989		- if (event.getSource() == cloneGeometriesItem)
	3027	+ if (source == cloneGeometriesItem)
1990	3028	{
1991	3029	boolean one = false;
1992	3030
..	..	@@ -2012,7 +3050,7 @@
2012	3050	ResetModel();
2013	3051	refreshContents();
2014	3052	} else
2015		- if (event.getSource() == shareGeometriesItem)
	3053	+ if (source == shareGeometriesItem)
2016	3054	{
2017	3055	boolean one = false;
2018	3056
..	..	@@ -2042,7 +3080,7 @@
2042	3080	refreshContents();
2043	3081	}
2044	3082	} else
2045		- if (event.getSource() == mergeGeometriesItem)
	3083	+ if (source == mergeGeometriesItem)
2046	3084	{
2047	3085	boolean one = false;
2048	3086
..	..	@@ -2072,7 +3110,7 @@
2072	3110	ResetModel();
2073	3111	refreshContents();
2074	3112	} else
2075		- if (event.getSource() == linkverticesItem)
	3113	+ if (source == linkverticesItem)
2076	3114	{
2077	3115	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2078	3116	// {
..	..	@@ -2085,48 +3123,48 @@
2085	3123	// group.selection.get(0).setMasterThis(content); // should be identity
2086	3124	// refreshContents();
2087	3125	// }
2088		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	3126	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2089	3127	{
2090		- Object3D content = GrafreeD.clipboard.get(0);
	3128	+ Object3D content = Grafreed.clipboard.get(0);
2091	3129
2092	3130	if (content instanceof cGroup && ((cGroup)content).transientlink )
2093	3131	content = ((cGroup)content).get(0);
2094	3132
2095		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	3133	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2096	3134	for (int i=0; i<group.selection.size(); i++)
2097	3135	{
2098		- boolean random = CameraPane.RANDOM;
2099		- CameraPane.RANDOM = false; // parse all random nodes
	3136	+ boolean random = CameraPane.SWITCH;
	3137	+ CameraPane.SWITCH = false; // parse all random nodes
2100	3138	group.selection.get(i).linkVerticesThis(content);
2101	3139	// group.selection.get(i).setMasterThis(content); // should be identity
2102		- CameraPane.RANDOM = random;
	3140	+ CameraPane.SWITCH = random;
2103	3141	}
2104		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	3142	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2105	3143	refreshContents();
2106	3144	}
2107	3145	} else
2108		- if (event.getSource() == resetsupportItem)
	3146	+ if (source == resetsupportItem)
2109	3147	{
2110	3148	for (int i=0; i<group.selection.size(); i++)
2111	3149	{
2112		- boolean random = CameraPane.RANDOM;
2113		- CameraPane.RANDOM = false; // parse all random nodes
	3150	+ boolean random = CameraPane.SWITCH;
	3151	+ CameraPane.SWITCH = false; // parse all random nodes
2114	3152	group.selection.get(i).linkVerticesThis(null);
2115		- CameraPane.RANDOM = random;
	3153	+ CameraPane.SWITCH = random;
2116	3154	}
2117	3155
2118	3156	refreshContents();
2119	3157	} else
2120		- if (event.getSource() == relinkverticesItem)
	3158	+ if (source == relinkverticesItem)
2121	3159	{
2122		- boolean random = CameraPane.RANDOM;
2123		- CameraPane.RANDOM = false; // parse all random nodes
	3160	+ boolean random = CameraPane.SWITCH;
	3161	+ CameraPane.SWITCH = false; // parse all random nodes
2124	3162	group.selection.RelinkToSupport();
2125		- CameraPane.RANDOM = random;
	3163	+ CameraPane.SWITCH = random;
2126	3164
2127	3165	refreshContents();
2128	3166	} else
2129		- if (event.getSource() == resetreferencesItem)
	3167	+ if (source == resetreferencesItem)
2130	3168	{
2131	3169	for (int i=0; i<group.selection.size(); i++)
2132	3170	{
..	..	@@ -2135,11 +3173,11 @@
2135	3173
2136	3174	refreshContents();
2137	3175	} else
2138		- if (event.getSource() == setMasterItem)
	3176	+ if (source == setMasterItem)
2139	3177	{
2140		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	3178	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2141	3179	{
2142		- Object3D content = GrafreeD.clipboard.get(0);
	3180	+ Object3D content = Grafreed.clipboard.get(0);
2143	3181
2144	3182	if (content instanceof cGroup && ((cGroup)content).transientlink )
2145	3183	content = ((cGroup)content).get(0);
..	..	@@ -2148,13 +3186,13 @@
2148	3186	refreshContents();
2149	3187	}
2150	3188	} else
2151		- if (event.getSource() == poseMeshItem)
	3189	+ if (source == poseMeshItem)
2152	3190	{
2153	3191	if (group.selection.size() == 1)
2154	3192	{
2155		- if (GrafreeD.clipboard.size() == 1)
	3193	+ if (Grafreed.clipboard.size() == 1)
2156	3194	{
2157		- Object3D content = GrafreeD.clipboard.get(0);
	3195	+ Object3D content = Grafreed.clipboard.get(0);
2158	3196
2159	3197	if (content instanceof cGroup && ((cGroup)content).transientlink )
2160	3198	content = ((cGroup)content).get(0);
..	..	@@ -2167,19 +3205,19 @@
2167	3205	}
2168	3206
2169	3207	} else
2170		- if (event.getSource() == revertMeshItem)
	3208	+ if (source == revertMeshItem)
2171	3209	{
2172	3210	RevertMeshes();
2173	3211	} else
2174		- if (event.getSource() == resetMeshItem)
	3212	+ if (source == resetAllItem)
2175	3213	{
2176	3214	ResetAll();
2177	3215	} else
2178		- if (event.getSource() == stepAllItem)
	3216	+ if (source == stepAllItem)
2179	3217	{
2180	3218	StepAll();
2181	3219	} else
2182		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	3220	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2183	3221	{
2184	3222	//int indices[] = jList.getSelectedIndices();
2185	3223	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2187,46 +3225,46 @@
2187	3225
2188	3226	ClearSelection(false);
2189	3227	} else
2190		- if (event.getSource() == clearAllItem)
	3228	+ if (source == clearAllItem)
2191	3229	{
2192	3230	ClearSelection(true);
2193	3231	} else
2194		- if (event.getSource() == grabItem)
	3232	+ if (source == grabItem \|\| source == groupButton)
2195	3233	{
2196		- group(new cGroup(), true);
	3234	+ group(new cGroup(), false); // true);
2197	3235	} else
2198		- if (event.getSource() == hideItem)
	3236	+ if (source == hideItem)
2199	3237	{
2200	3238	group(new HiddenObject());
2201	3239	} else
2202		- if (event.getSource() == frontItem)
	3240	+ if (source == frontItem)
2203	3241	{
2204	3242	front();
2205	3243	} else
2206		- if (event.getSource() == backItem)
	3244	+ if (source == backItem)
2207	3245	{
2208	3246	back();
2209	3247	} else
2210		- if (event.getSource() == cameraItem)
	3248	+ if (source == cameraItem)
2211	3249	{
2212	3250	makeSomething(new Camera());
2213	3251	} else
2214		- if (event.getSource() == compositeItem)
	3252	+ if (source == compositeItem \|\| source == compositeButton)
2215	3253	{
2216	3254	group(new Composite());
2217	3255	} else
2218		- if (event.getSource() == randomItem)
	3256	+ if (source == switchItem \|\| source == switchButton)
2219	3257	{
2220	3258	RandomNode random = new RandomNode();
2221	3259	group(random);
2222	3260	if (random.size() > 0)
2223		- random.name = random.get(0).name + "Rnd";
	3261	+ random.name = random.get(0).name + "Switch";
2224	3262	} else
2225		- if (event.getSource() == physicsItem)
	3263	+ if (source == physicsItem)
2226	3264	{
2227	3265	group(new PhysicsNode());
2228	3266	} else
2229		- if (event.getSource() == frameselectorItem)
	3267	+ if (source == frameselectorItem)
2230	3268	{
2231	3269	for (int i=0; i<group.selection.size(); i++)
2232	3270	{
..	..	@@ -2238,7 +3276,7 @@
2238	3276	ResetModel();
2239	3277	refreshContents();
2240	3278	} else
2241		- if (event.getSource() == switchGeoItem)
	3279	+ if (source == switchGeoItem)
2242	3280	{
2243	3281	for (int i=0; i<group.selection.size(); i++)
2244	3282	{
..	..	@@ -2250,7 +3288,7 @@
2250	3288	ResetModel();
2251	3289	refreshContents();
2252	3290	} else
2253		- if (event.getSource() == switchTransfoItem)
	3291	+ if (source == switchTransfoItem)
2254	3292	{
2255	3293	for (int i=0; i<group.selection.size(); i++)
2256	3294	{
..	..	@@ -2262,7 +3300,7 @@
2262	3300	ResetModel();
2263	3301	refreshContents();
2264	3302	} else
2265		- if (event.getSource() == morphItem)
	3303	+ if (source == morphItem)
2266	3304	{
2267	3305	for (int i=0; i<group.selection.size(); i++)
2268	3306	{
..	..	@@ -2274,7 +3312,7 @@
2274	3312	ResetModel();
2275	3313	refreshContents();
2276	3314	} else
2277		- if (event.getSource() == scriptNodeItem)
	3315	+ if (source == scriptNodeItem)
2278	3316	{
2279	3317	boolean atleastone = false;
2280	3318
..	..	@@ -2313,215 +3351,264 @@
2313	3351	}
2314	3352	}
2315	3353	} else
2316		- if (event.getSource() == linkerItem)
	3354	+ if (source == linkerItem)
2317	3355	{
2318	3356	group(new cLinker());
2319	3357	} else
2320		- if (event.getSource() == textureItem)
	3358	+ if (source == textureItem \|\| source == textureButton)
2321	3359	{
2322	3360	group(new TextureNode());
2323	3361	} else
2324		- if (event.getSource() == billboardItem)
	3362	+ if (source == billboardItem)
2325	3363	{
2326	3364	group(new BillboardNode());
2327	3365	} else
2328		- if (event.getSource() == shadowXItem)
	3366	+ if (source == shadowXItem)
2329	3367	{
2330	3368	CastShadow(0);
2331	3369	} else
2332		- if (event.getSource() == shadowYItem)
	3370	+ if (source == shadowYItem)
2333	3371	{
2334	3372	CastShadow(1);
2335	3373	} else
2336		- if (event.getSource() == shadowZItem)
	3374	+ if (source == shadowZItem)
2337	3375	{
2338	3376	CastShadow(2);
2339	3377	} else
2340		- if (event.getSource() == ungroupItem)
	3378	+ if (source == ungroupItem \|\| source == ungroupButton)
2341	3379	{
2342		- //ungroup();
	3380	+ boolean canUngroup = true;
	3381	+
2343	3382	for (int i=0; i<group.selection.size(); i++)
2344	3383	{
2345		- Ungroup(group.selection.get(i));
	3384	+ Object3D selectedItem = group.selection.get(i);
	3385	+
	3386	+ if (selectedItem.Size() == 0)
	3387	+ {
	3388	+ // Cannot ungroup leaves
	3389	+ canUngroup = false;
	3390	+ break;
	3391	+ }
	3392	+
	3393	+ if (selectedItem == group)
	3394	+ {
	3395	+ // Cannot ungroup root
	3396	+ canUngroup = false;
	3397	+ break;
	3398	+ }
2346	3399	}
2347	3400
2348		- ClearSelection(false);
2349		-
2350		- refreshContents();
	3401	+ if (canUngroup)
	3402	+ {
	3403	+ for (int i=0; i<group.selection.size(); i++)
	3404	+ {
	3405	+ Object3D selectedItem = group.selection.get(i);
	3406	+
	3407	+ Ungroup(selectedItem);
	3408	+ }
	3409	+
	3410	+ ClearSelection(false);
	3411	+
	3412	+ refreshContents();
	3413	+ }
2351	3414	} else
2352		- if (event.getSource() == genUVItem)
	3415	+ if (source == genUVItem)
2353	3416	{
2354	3417	GenUV();
2355	3418	} else
2356		- if (event.getSource() == genNormalsCADItem)
	3419	+ if (source == genNormalsCADItem)
2357	3420	{
2358	3421	GenNormals(true);
2359	3422	} else
2360		- if (event.getSource() == genNormalsMESHItem)
	3423	+ if (source == genNormalsMESHItem)
2361	3424	{
2362		- GenNormals(true); // TODO
	3425	+ GenNormalsMESH();
2363	3426	} else
2364		- if (event.getSource() == genNormalsORGANItem)
	3427	+ if (source == genNormalsORGANItem)
2365	3428	{
2366	3429	GenNormals(false);
2367	3430	} else
2368		- if (event.getSource() == genNormalsMINEItem)
	3431	+ if (source == genNormalsMINEItem)
2369	3432	{
2370	3433	GenNormalsMINE();
2371	3434	} else
2372		- if (event.getSource() == stripifyItem)
	3435	+ if (source == stripifyItem)
2373	3436	{
2374	3437	Stripify();
2375	3438	} else
2376		- if (event.getSource() == unstripifyItem)
	3439	+ if (source == unstripifyItem)
2377	3440	{
2378	3441	Unstripify();
2379	3442	} else
2380		- if (event.getSource() == trimItem)
	3443	+ if (source == trimItem)
2381	3444	{
2382	3445	Trim();
2383	3446	} else
2384		- if (event.getSource() == untrimItem)
	3447	+ if (source == untrimItem)
2385	3448	{
2386	3449	Untrim();
2387	3450	} else
2388		- if (event.getSource() == clearColorsItem)
	3451	+ if (source == clearColorsItem)
2389	3452	{
2390	3453	ClearColors();
2391	3454	} else
2392		- if (event.getSource() == clearMaterialsItem)
	3455	+ if (source == clearMaterialsItem)
2393	3456	{
2394	3457	ClearMaterials();
2395	3458	} else
2396		- if (event.getSource() == liveleavesItem)
	3459	+ if (source == liveleavesItem)
2397	3460	{
2398	3461	LiveLeaves(true);
2399	3462	} else
2400		- if (event.getSource() == unliveleavesItem)
	3463	+ if (source == unliveleavesItem)
2401	3464	{
2402	3465	LiveLeaves(false);
2403	3466	} else
2404		- if (event.getSource() == supportleavesItem)
	3467	+ if (source == supportleavesItem)
2405	3468	{
2406	3469	SupportLeaves(true);
2407	3470	} else
2408		- if (event.getSource() == unsupportleavesItem)
	3471	+ if (source == unsupportleavesItem)
2409	3472	{
2410	3473	SupportLeaves(false);
2411	3474	} else
2412		- if (event.getSource() == hideleavesItem)
	3475	+ if (source == hideleavesItem)
2413	3476	{
2414	3477	HideLeaves(true);
2415	3478	} else
2416		- if (event.getSource() == showleavesItem)
	3479	+ if (source == showleavesItem)
2417	3480	{
2418	3481	HideLeaves(false);
2419	3482	} else
2420		- if (event.getSource() == markleavesItem)
	3483	+ if (source == markleavesItem)
2421	3484	{
2422	3485	MarkLeaves(true);
2423	3486	} else
2424		- if (event.getSource() == unmarkleavesItem)
	3487	+ if (source == unmarkleavesItem)
2425	3488	{
2426	3489	MarkLeaves(false);
2427	3490	} else
2428		- if (event.getSource() == flipVItem)
	3491	+ if (source == rewindleavesItem)
	3492	+ {
	3493	+ RewindLeaves(true);
	3494	+ } else
	3495	+ if (source == unrewindleavesItem)
	3496	+ {
	3497	+ RewindLeaves(false);
	3498	+ } else
	3499	+ if (source == randomleavesItem)
	3500	+ {
	3501	+ RandomLeaves(true);
	3502	+ } else
	3503	+ if (source == unrandomleavesItem)
	3504	+ {
	3505	+ RandomLeaves(false);
	3506	+ } else
	3507	+ if (source == flipVItem)
2429	3508	{
2430	3509	FlipV(true);
2431	3510	} else
2432		- if (event.getSource() == unflipVItem)
	3511	+ if (source == unflipVItem)
2433	3512	{
2434	3513	FlipV(false);
2435	3514	} else
2436		- if (event.getSource() == lowTexturesItem)
	3515	+ if (source == lowTexturesItem)
2437	3516	{
2438	3517	SetTexRes(0);
2439	3518	} else
2440		- if (event.getSource() == normalTexturesItem)
	3519	+ if (source == normalTexturesItem)
2441	3520	{
2442	3521	SetTexRes(1);
2443	3522	} else
2444		- if (event.getSource() == highTexturesItem)
	3523	+ if (source == highTexturesItem)
2445	3524	{
2446	3525	SetTexRes(2);
2447	3526	} else
2448		- if (event.getSource() == veryhighTexturesItem)
	3527	+ if (source == veryhighTexturesItem)
2449	3528	{
2450	3529	SetTexRes(3);
2451	3530	} else
2452		- if (event.getSource() == maxTexturesItem)
	3531	+ if (source == maxTexturesItem)
2453	3532	{
2454	3533	SetTexRes(4);
2455	3534	} else
2456		- if (event.getSource() == panoTexturesItem)
	3535	+ if (source == panoTexturesItem)
2457	3536	{
2458	3537	SetTexRes(5);
2459	3538	} else
2460		- if (event.getSource() == reverseNormalsItem)
	3539	+ if (source == reverseNormalsItem)
2461	3540	{
2462	3541	ReverseNormals();
2463	3542	} else
2464		- if (event.getSource() == parseverticesItem)
	3543	+ if (source == parseverticesItem)
2465	3544	{
2466	3545	ParseVertices();
2467	3546	} else
2468		- if (event.getSource() == textureFieldItem)
	3547	+ if (source == textureFieldItem)
2469	3548	{
2470	3549	TextureVertices();
2471	3550	} else
2472		- if (event.getSource() == alignItem)
	3551	+ if (source == alignItem)
2473	3552	{
2474	3553	Align();
2475	3554	} else
2476		- if (event.getSource() == mirrorItem)
	3555	+ if (source == mirrorItem)
2477	3556	{
2478	3557	MirrorPoses();
2479	3558	} else
2480		- if (event.getSource() == reduceMorphItem)
	3559	+ if (source == reduceMorphItem)
2481	3560	{
2482	3561	MeshReduction(false);
2483	3562	} else
2484		- if (event.getSource() == reduce34MorphItem)
	3563	+ if (source == reduce34MorphItem)
2485	3564	{
2486	3565	MeshReduction(true);
2487	3566	} else
2488		- if (event.getSource() == reverseTrianglesItem)
	3567	+ if (source == reverseTrianglesItem)
2489	3568	{
2490	3569	ReverseTriangles();
2491	3570	} else
2492		- if (event.getSource() == reduceMeshItem)
	3571	+ if (source == reduceMeshItem)
2493	3572	{
2494	3573	ReduceMesh(false);
2495	3574	} else
2496		- if (event.getSource() == reduce34MeshItem)
	3575	+ if (source == reduce34MeshItem)
2497	3576	{
2498	3577	ReduceMesh(true);
2499	3578	} else
2500		- if (event.getSource() == increaseMeshItem)
	3579	+ if (source == increaseMeshItem)
2501	3580	{
2502	3581	IncreaseMesh();
2503	3582	} else
2504		- if (event.getSource() == clipMeshItem)
	3583	+ if (source == clipMeshItem)
2505	3584	{
2506	3585	ClipMesh();
2507	3586	} else
2508		- if (event.getSource() == smoothMeshItem)
	3587	+ if (source == smoothMeshItem)
2509	3588	{
2510	3589	SmoothMesh();
2511	3590	} else
2512		- if (event.getSource() == transformgeometryItem)
	3591	+ if (source == transformGeometryItem)
2513	3592	{
2514	3593	TransformGeometry();
2515	3594	} else
2516		- if (event.getSource() == resetTransformItem)
	3595	+ if (source == transformChildrenItem)
	3596	+ {
	3597	+ TransformChildren();
	3598	+ } else
	3599	+ if (source == resetTransformItem)
2517	3600	{
2518	3601	ResetTransform();
2519	3602	} else
2520		- if (event.getSource() == resetCentroidItem)
	3603	+ if (source == resetCentroidItem)
2521	3604	{
2522		- ResetCentroid();
	3605	+ ResetCentroid(true);
2523	3606	} else
2524		- if (event.getSource() == resetParentItem)
	3607	+ if (source == resetCentroidXZItem)
	3608	+ {
	3609	+ ResetCentroid(false);
	3610	+ } else
	3611	+ if (source == resetParentItem)
2525	3612	{
2526	3613	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2527	3614	{
..	..	@@ -2531,7 +3618,7 @@
2531	3618
2532	3619	refreshContents();
2533	3620	} else
2534		- if (event.getSource() == repairParentItem)
	3621	+ if (source == repairParentItem)
2535	3622	{
2536	3623	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2537	3624	{
..	..	@@ -2545,7 +3632,21 @@
2545	3632
2546	3633	refreshContents();
2547	3634	} else
2548		- if (event.getSource() == sortbysizeItem)
	3635	+ if (source == repairShadowItem)
	3636	+ {
	3637	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3638	+ {
	3639	+ Object3D obj = (Object3D)e.nextElement();
	3640	+ obj.RepairShadow();
	3641	+// for (int i=0; i<obj.size(); i++)
	3642	+// {
	3643	+// obj.get(i).parent = obj;
	3644	+// }
	3645	+ }
	3646	+
	3647	+ refreshContents();
	3648	+ } else
	3649	+ if (source == sortbysizeItem)
2549	3650	{
2550	3651	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2551	3652	{
..	..	@@ -2557,7 +3658,7 @@
2557	3658	ResetModel();
2558	3659	refreshContents();
2559	3660	} else
2560		- if (event.getSource() == sortbynameItem)
	3661	+ if (source == sortbynameItem)
2561	3662	{
2562	3663	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2563	3664	{
..	..	@@ -2569,7 +3670,7 @@
2569	3670	ResetModel();
2570	3671	refreshContents();
2571	3672	} else
2572		- if (event.getSource() == attachPigmentItem)
	3673	+ if (source == attachPigmentItem)
2573	3674	{
2574	3675	String texture = GetFile("Attach pigment");
2575	3676	Object3D obj;
..	..	@@ -2581,7 +3682,7 @@
2581	3682
2582	3683	refreshContents();
2583	3684	} else
2584		- if (event.getSource() == detachPigmentItem)
	3685	+ if (source == detachPigmentItem)
2585	3686	{
2586	3687	Object3D obj;
2587	3688	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2592,7 +3693,7 @@
2592	3693
2593	3694	refreshContents();
2594	3695	} else
2595		- if (event.getSource() == attachBumpItem)
	3696	+ if (source == attachBumpItem)
2596	3697	{
2597	3698	String texture = GetFile("Attach bump");
2598	3699	Object3D obj;
..	..	@@ -2604,18 +3705,18 @@
2604	3705
2605	3706	refreshContents();
2606	3707	} else
2607		- if (event.getSource() == detachBumpItem)
	3708	+ if (source == detachBumpItem)
2608	3709	{
2609	3710	Object3D obj;
2610	3711	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2611	3712	{
2612	3713	obj = (Object3D)e.nextElement();
2613		- obj.SetBumpTexture(null);
	3714	+ obj.ResetBumpTexture();
2614	3715	}
2615	3716
2616	3717	refreshContents();
2617	3718	} else
2618		- if (event.getSource() == pigmentBumpItem)
	3719	+ if (source == pigmentBumpItem)
2619	3720	{
2620	3721	Object3D obj;
2621	3722	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2626,159 +3727,233 @@
2626	3727
2627	3728	refreshContents();
2628	3729	} else
2629		- if (event.getSource() == flashSelectionButton)
	3730	+ if (source == embedTexturesItem)
	3731	+ {
	3732	+ Object3D obj;
	3733	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3734	+ {
	3735	+ obj = (Object3D)e.nextElement();
	3736	+ obj.EmbedTextures(true);
	3737	+ }
	3738	+
	3739	+ refreshContents();
	3740	+ } else
	3741	+ if (source == deEmbedTexturesItem)
	3742	+ {
	3743	+ Object3D obj;
	3744	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3745	+ {
	3746	+ obj = (Object3D)e.nextElement();
	3747	+ obj.EmbedTextures(false);
	3748	+ }
	3749	+
	3750	+ CameraPane.texturepigment.clear();
	3751	+ CameraPane.texturebump.clear();
	3752	+
	3753	+ refreshContents();
	3754	+ } else
	3755	+ if (source == flashSelectionButton)
2630	3756	{
2631	3757	CameraPane.flash = true;
2632	3758	refreshContents();
2633	3759	} else
2634		- if (event.getSource() == oneButton)
	3760	+ if (source == oneButton)
2635	3761	{
2636	3762	} else
2637		- if (event.getSource() == twoButton)
	3763	+ if (source == twoButton)
2638	3764	{
2639	3765	radio.layout = twoButton;
2640		- // bug
2641		- //gridPanel.setDividerLocation(1.0);
2642		- //bigPanel.setDividerLocation(0.0);
2643		- bigThree.remove(scenePanel);
2644		- bigThree.remove(centralPanel);
2645		- bigThree.remove(XYZPanel);
2646		- aWindowConstraints.gridx = 0;
2647		- aWindowConstraints.gridy = 0;
2648		- aWindowConstraints.gridwidth = 1;
2649		- // aConstraints.gridheight = 3;
2650		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2651		- aWindowConstraints.weightx = 0;
2652		- aWindowConstraints.weighty = 1;
2653		- //bigThree.add(jtp, aWindowConstraints);
2654		- aWindowConstraints.weightx = 1;
2655		- aWindowConstraints.gridwidth = 3;
2656		- // aConstraints.gridheight = 3;
2657		- aWindowConstraints.gridx = 1;
2658		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2659		- bigThree.add(centralPanel, aWindowConstraints);
2660		- aWindowConstraints.weightx = 0;
2661		- aWindowConstraints.gridx = 4;
2662		- aWindowConstraints.gridwidth = 1;
2663		- // aConstraints.gridheight = 3;
2664		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2665		- //bigThree.add(XYZPanel, aWindowConstraints);
2666		- bigThree.revalidate();
	3766	+
	3767	+ if (CameraPane.FULLSCREEN)
	3768	+ fullscreenLayout = radio.layout;
	3769	+
	3770	+ Show3DView();
	3771	+
	3772	+ cameraView.requestFocusInWindow();
	3773	+
	3774	+// refreshContents(true);
	3775	+//
	3776	+// try
	3777	+// {
	3778	+// java.awt.Robot bot = new java.awt.Robot();
	3779	+// int mask = InputEvent.BUTTON1_MASK;
	3780	+// bot.mouseMove(100, 100);
	3781	+// bot.mousePress(mask);
	3782	+// bot.mouseRelease(mask);
	3783	+// }
	3784	+// catch (Exception e)
	3785	+// {
	3786	+//
	3787	+// }
	3788	+
2667	3789	} else
2668		- if (event.getSource() == threeButton)
	3790	+ if (source == threeButton)
2669	3791	{
2670	3792	radio.layout = threeButton;
2671		- bigThree.remove(scenePanel);
2672		- bigThree.remove(centralPanel);
2673		- bigThree.remove(XYZPanel);
2674		- aWindowConstraints.gridx = 0;
2675		- aWindowConstraints.gridy = 0;
2676		- aWindowConstraints.gridwidth = 1;
2677		- // aConstraints.gridheight = 3;
2678		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2679		- aWindowConstraints.weightx = 0;
2680		- aWindowConstraints.weighty = 1;
2681		- //bigThree.add(jtp, aWindowConstraints);
2682		- aWindowConstraints.weightx = 1;
2683		- aWindowConstraints.gridwidth = 3;
2684		- // aConstraints.gridheight = 3;
2685		- aWindowConstraints.gridx = 1;
2686		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2687		- bigThree.add(centralPanel, aWindowConstraints);
2688		- aWindowConstraints.weightx = 0;
2689		- aWindowConstraints.gridx = 4;
2690		- aWindowConstraints.gridwidth = 1;
2691		- // aConstraints.gridheight = 3;
2692		- aConstraints.fill = GridBagConstraints.VERTICAL;
2693		- bigThree.add(XYZPanel, aWindowConstraints);
2694		- bigThree.revalidate();
	3793	+
	3794	+ if (CameraPane.FULLSCREEN)
	3795	+ fullscreenLayout = radio.layout;
	3796	+
	3797	+// bigThree.remove(scenePanel);
	3798	+// bigThree.remove(centralPanel);
	3799	+// bigThree.remove(XYZPanel);
	3800	+// aWindowConstraints.gridx = 0;
	3801	+// aWindowConstraints.gridy = 0;
	3802	+// aWindowConstraints.gridwidth = 1;
	3803	+// // aConstraints.gridheight = 3;
	3804	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3805	+// aWindowConstraints.weightx = 0;
	3806	+// aWindowConstraints.weighty = 1;
	3807	+// //bigThree.add(jtp, aWindowConstraints);
	3808	+// aWindowConstraints.weightx = 1;
	3809	+// aWindowConstraints.gridwidth = 3;
	3810	+// // aConstraints.gridheight = 3;
	3811	+// aWindowConstraints.gridx = 1;
	3812	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3813	+// bigThree.add(centralPanel, aWindowConstraints);
	3814	+// aWindowConstraints.weightx = 0;
	3815	+// aWindowConstraints.gridx = 4;
	3816	+// aWindowConstraints.gridwidth = 1;
	3817	+// // aConstraints.gridheight = 3;
	3818	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	3819	+// bigThree.add(XYZPanel, aWindowConstraints);
	3820	+// bigThree.validate();
	3821	+// scenePanel.setVisible(false);
	3822	+// centralPanel.setVisible(true);
	3823	+// XYZPanel.setVisible(true);
	3824	+ bigThree.ClearUI();
	3825	+ bigThree.add(scenePanel);
	3826	+ bigThree.add(centralPanel);
	3827	+ bigThree.FlushUI();
	3828	+
	3829	+ cameraView.requestFocusInWindow();
2695	3830	} else
2696		- if (event.getSource() == fourButton)
	3831	+ if (source == fourButton)
2697	3832	{
2698	3833	radio.layout = fourButton;
2699		- bigThree.remove(scenePanel);
2700		- bigThree.remove(centralPanel);
2701		- bigThree.remove(XYZPanel);
2702		- aWindowConstraints.gridx = 0;
2703		- aWindowConstraints.gridy = 0;
2704		- aWindowConstraints.gridwidth = 1;
2705		- // aWindowConstraints.gridheight = 3;
2706		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2707		- aWindowConstraints.weightx = 1;
2708		- aWindowConstraints.weighty = 1;
2709		- bigThree.add(scenePanel, aWindowConstraints);
2710		- aWindowConstraints.weightx = 1;
2711		- aWindowConstraints.gridwidth = 3;
2712		- // aConstraints.gridheight = 3;
2713		- aWindowConstraints.gridx = 1;
2714		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2715		- //bigThree.add(cameraPanel, aWindowConstraints);
2716		- aWindowConstraints.weightx = 0;
2717		- aWindowConstraints.gridx = 4;
2718		- aWindowConstraints.gridwidth = 1;
2719		- // aWindowConstraints.gridheight = 3;
2720		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2721		- //bigThree.add(XYZPanel, aWindowConstraints);
2722		- bigThree.revalidate();
	3834	+
	3835	+ if (CameraPane.FULLSCREEN)
	3836	+ fullscreenLayout = radio.layout;
	3837	+
	3838	+// bigThree.remove(scenePanel);
	3839	+// bigThree.remove(centralPanel);
	3840	+// bigThree.remove(XYZPanel);
	3841	+// aWindowConstraints.gridx = 0;
	3842	+// aWindowConstraints.gridy = 0;
	3843	+// aWindowConstraints.gridwidth = 1;
	3844	+// // aWindowConstraints.gridheight = 3;
	3845	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3846	+// aWindowConstraints.weightx = 1;
	3847	+// aWindowConstraints.weighty = 1;
	3848	+// bigThree.add(scenePanel, aWindowConstraints);
	3849	+// aWindowConstraints.weightx = 1;
	3850	+// aWindowConstraints.gridwidth = 3;
	3851	+// // aConstraints.gridheight = 3;
	3852	+// aWindowConstraints.gridx = 1;
	3853	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3854	+// //bigThree.add(cameraPanel, aWindowConstraints);
	3855	+// aWindowConstraints.weightx = 0;
	3856	+// aWindowConstraints.gridx = 4;
	3857	+// aWindowConstraints.gridwidth = 1;
	3858	+// // aWindowConstraints.gridheight = 3;
	3859	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3860	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3861	+// bigThree.validate();
	3862	+// scenePanel.setVisible(true);
	3863	+// centralPanel.setVisible(false);
	3864	+// XYZPanel.setVisible(false);
	3865	+ bigThree.ClearUI();
	3866	+ bigThree.add(scenePanel);
	3867	+ bigThree.FlushUI();
	3868	+
	3869	+ cameraView.requestFocusInWindow();
2723	3870	} else
2724		- if (event.getSource() == sixButton)
	3871	+ if (source == sixButton)
2725	3872	{
2726	3873	radio.layout = sixButton;
2727		- bigThree.remove(scenePanel);
2728		- bigThree.remove(centralPanel);
2729		- bigThree.remove(XYZPanel);
2730		- aWindowConstraints.gridx = 0;
2731		- aWindowConstraints.gridy = 0;
2732		- aWindowConstraints.gridwidth = 1;
2733		- // aConstraints.gridheight = 3;
2734		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2735		- aWindowConstraints.weightx = 0;
2736		- aWindowConstraints.weighty = 1;
2737		- bigThree.add(scenePanel, aWindowConstraints);
2738		- aWindowConstraints.weightx = 1;
2739		- aWindowConstraints.gridwidth = 3;
2740		- // aWindowConstraints.gridheight = 3;
2741		- aWindowConstraints.gridx = 1;
2742		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2743		- bigThree.add(centralPanel, aWindowConstraints);
2744		- aWindowConstraints.weightx = 0;
2745		- aWindowConstraints.gridx = 4;
2746		- aWindowConstraints.gridwidth = 1;
2747		- // aWindowConstraints.gridheight = 3;
2748		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2749		- //bigThree.add(XYZPanel, aConstraints);
2750		- bigThree.revalidate();
	3874	+
	3875	+ if (CameraPane.FULLSCREEN)
	3876	+ fullscreenLayout = radio.layout;
	3877	+
	3878	+// bigThree.remove(scenePanel);
	3879	+// bigThree.remove(centralPanel);
	3880	+// bigThree.remove(XYZPanel);
	3881	+// aWindowConstraints.gridx = 0;
	3882	+// aWindowConstraints.gridy = 0;
	3883	+// aWindowConstraints.gridwidth = 1;
	3884	+// // aConstraints.gridheight = 3;
	3885	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3886	+// aWindowConstraints.weightx = 0;
	3887	+// aWindowConstraints.weighty = 1;
	3888	+// bigThree.add(scenePanel, aWindowConstraints);
	3889	+// aWindowConstraints.weightx = 1;
	3890	+// aWindowConstraints.gridwidth = 3;
	3891	+// // aWindowConstraints.gridheight = 3;
	3892	+// aWindowConstraints.gridx = 1;
	3893	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3894	+// bigThree.add(centralPanel, aWindowConstraints);
	3895	+// aWindowConstraints.weightx = 0;
	3896	+// aWindowConstraints.gridx = 4;
	3897	+// aWindowConstraints.gridwidth = 1;
	3898	+// // aWindowConstraints.gridheight = 3;
	3899	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3900	+// //bigThree.add(XYZPanel, aConstraints);
	3901	+// bigThree.validate();
	3902	+// scenePanel.setVisible(true);
	3903	+// centralPanel.setVisible(true);
	3904	+// XYZPanel.setVisible(false);
	3905	+ bigThree.ClearUI();
	3906	+ bigThree.add(centralPanel);
	3907	+ bigThree.add(scenePanel);
	3908	+ bigThree.FlushUI();
	3909	+
	3910	+ cameraView.requestFocusInWindow();
2751	3911	} else
2752		- if (event.getSource() == sevenButton)
	3912	+ if (source == sevenButton)
2753	3913	{
2754	3914	radio.layout = sevenButton;
2755		- bigThree.remove(scenePanel);
2756		- bigThree.remove(centralPanel);
2757		- bigThree.remove(XYZPanel);
2758		- aWindowConstraints.gridx = 0;
2759		- aWindowConstraints.gridy = 0;
2760		- aWindowConstraints.gridwidth = 1;
2761		- // aWindowConstraints.gridheight = 3;
2762		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2763		- aWindowConstraints.weightx = 0;
2764		- aWindowConstraints.weighty = 1;
2765		- bigThree.add(scenePanel, aWindowConstraints);
2766		- aWindowConstraints.weightx = 1;
2767		- aWindowConstraints.gridwidth = 3;
2768		- // aWindowConstraints.gridheight = 3;
2769		- aWindowConstraints.gridx = 1;
2770		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2771		- bigThree.add(centralPanel, aWindowConstraints);
2772		- aWindowConstraints.weightx = 0;
2773		- aWindowConstraints.gridx = 4;
2774		- aWindowConstraints.gridwidth = 1;
2775		- // aConstraints.gridheight = 3;
2776		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2777		- bigThree.add(XYZPanel, aWindowConstraints);
2778		- bigThree.revalidate();
	3915	+
	3916	+ if (CameraPane.FULLSCREEN)
	3917	+ fullscreenLayout = radio.layout;
	3918	+
	3919	+// bigThree.remove(scenePanel);
	3920	+// bigThree.remove(centralPanel);
	3921	+// bigThree.remove(XYZPanel);
	3922	+// aWindowConstraints.gridx = 0;
	3923	+// aWindowConstraints.gridy = 0;
	3924	+// aWindowConstraints.gridwidth = 1;
	3925	+// // aWindowConstraints.gridheight = 3;
	3926	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3927	+// aWindowConstraints.weightx = 0;
	3928	+// aWindowConstraints.weighty = 1;
	3929	+// bigThree.add(scenePanel, aWindowConstraints);
	3930	+// aWindowConstraints.weightx = 1;
	3931	+// aWindowConstraints.gridwidth = 3;
	3932	+// // aWindowConstraints.gridheight = 3;
	3933	+// aWindowConstraints.gridx = 1;
	3934	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3935	+// bigThree.add(centralPanel, aWindowConstraints);
	3936	+// aWindowConstraints.weightx = 0;
	3937	+// aWindowConstraints.gridx = 4;
	3938	+// aWindowConstraints.gridwidth = 1;
	3939	+// // aConstraints.gridheight = 3;
	3940	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3941	+// bigThree.add(XYZPanel, aWindowConstraints);
	3942	+// bigThree.validate();
	3943	+// scenePanel.setVisible(true);
	3944	+// centralPanel.setVisible(true);
	3945	+// XYZPanel.setVisible(true);
	3946	+ bigThree.ClearUI();
	3947	+ bigThree.add(scenePanel);
	3948	+ bigThree.add(centralPanel);
	3949	+ bigThree.add(XYZPanel);
	3950	+ bigThree.FlushUI();
	3951	+
	3952	+ cameraView.requestFocusInWindow();
2779	3953	} else
2780		- if (event.getSource() == rootButton)
	3954	+ if (source == rootButton)
2781	3955	{
	3956	+ Replace();
2782	3957	Object3D obj;
2783	3958	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2784	3959	{
..	..	@@ -2787,66 +3962,85 @@
2787	3962	EditObject(obj);
2788	3963	}
2789	3964
	3965	+ cameraView.requestFocusInWindow();
2790	3966	refreshContents(true);
2791	3967	} else
2792		- if (event.getSource() == closeButton)
	3968	+ if (source == closeButton)
2793	3969	{
2794	3970	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2795	3971	cRadio ab;
2796	3972	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2797	3973	{
2798	3974	ab = (cRadio)e.nextElement();
2799		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3975	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2800	3976	{
	3977	+ // Patch to avoid bug with transparency.
	3978	+ if (!ab.hadMaterial)
	3979	+ {
	3980	+ ab.object.material = null;
	3981	+ }
	3982	+
2801	3983	buttonGroup.remove(ab);
2802	3984	radioPanel.remove(ab);
2803	3985
2804		- ab.GetObject().editWindow = null;
	3986	+ //ab.GetObject().editWindow = null;
	3987	+ ab.GetObject().manipWindow = null;
2805	3988	// ab.GetObject().objectUI = null; // ?????????
2806	3989
2807	3990	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2808	3991	break;
2809	3992	}
2810	3993	}
	3994	+
	3995	+ cameraView.requestFocusInWindow();
2811	3996	refreshContents(true);
2812	3997	} else
2813		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3998	+ if (source == editItem \|\| source == editButton)
2814	3999	{
	4000	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4001	+ {
	4002	+ Object3D child = (Object3D)e.nextElement();
	4003	+ child.pinned = true;
	4004	+ }
	4005	+
2815	4006	EditSelection(false);
2816	4007	} else
2817		- if (event.getSource() == uneditButton)
	4008	+ if (source == uneditButton)
2818	4009	{
2819	4010	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2820	4011	{
2821	4012	Object3D child = (Object3D)e.nextElement();
2822	4013	if(child.editWindow != null)
2823		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4014	+ child.pinned = false;
2824	4015	child.CloseUI();
2825	4016	listUI.remove(child);
	4017	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2826	4018
2827		- child.editWindow = null; // ???????????
	4019	+ //child.editWindow = null; // ???????????
2828	4020	}
2829		- objEditor.ctrlPanel.revalidate();
	4021	+ objEditor.ctrlPanel.FlushUI();
2830	4022	//objEditor.jTree.clearSelection();
2831	4023	//objEditor.ResetSliders();
2832	4024	refreshContents(true);
2833	4025	} else
2834		- if (event.getSource() == clearPanelButton)
	4026	+ if (source == clearPanelButton)
2835	4027	{
2836	4028	assert(copy == group);
2837	4029	//copy.ClearUI();
2838	4030	for (Object3D obj : listUI)
2839	4031	{
	4032	+ obj.pinned = false;
2840	4033	obj.CloseUI();
2841	4034	}
2842	4035	listUI.clear();
	4036	+ SetPinStates(group.selection.size() > 0);
2843	4037	refreshContents(true);
2844	4038	} else
2845		- if (event.getSource() == allParamsButton)
	4039	+ if (source == allParamsButton)
2846	4040	{
2847	4041	assert(copy == group);
2848	4042
2849		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4043	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2850	4044
2851	4045	for (Object3D obj : listUI)
2852	4046	{
..	..	@@ -2863,19 +4057,19 @@
2863	4057
2864	4058	refreshContents(true);
2865	4059	} else
2866		- if (event.getSource() == unselectButton)
	4060	+ if (source == unselectButton)
2867	4061	{
2868	4062	objEditor.jTree.clearSelection();
2869	4063	// ?? oct 2012 GrafreeD.clipboard.clear();
2870	4064	objEditor.ResetSliders();
2871	4065	refreshContents(true);
2872	4066	} else
2873		- if(event.getSource() instanceof cRadio)
	4067	+ if(source instanceof cRadio)
2874	4068	{
2875	4069	group.parent = keepparent;
2876	4070	group.attributes = 0;
2877	4071	//group.editWindow = null;
2878		- /cRadio/ radio = (cRadio)event.getSource();
	4072	+ /cRadio/ radio = (cRadio)source;
2879	4073	Object3D obj = radio.GetObject();
2880	4074	System.out.println("Edit " + obj);
2881	4075	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2895,7 +4089,8 @@
2895	4089	}
2896	4090
2897	4091	copy = group;
2898		- //CameraPane.theRenderer.object = group;
	4092	+
	4093	+ //Globals.theRenderer.object = group;
2899	4094	if(!useclient)
2900	4095	{
2901	4096	cameraView.renderCamera = radio.camera;
..	..	@@ -2904,25 +4099,70 @@
2904	4099	cameraView.cameras[cameraView.cameracount] = radio.camera;
2905	4100	cameraView.targetLookAt.set(radio.camera.lookAt);
2906	4101	cameraView.object = group;
2907		- cameraView.lighttouched = true;
	4102	+ //cameraView.lighttouched = true;
	4103	+ Globals.lighttouched = true;
2908	4104	topView.object = group;
2909	4105	frontView.object = group;
2910	4106	sideView.object = group;
2911	4107	}
2912		- group.editWindow = this;
	4108	+
	4109	+// fix "+" issue
	4110	+ //group.editWindow = this;
	4111	+ group.manipWindow = this;
	4112	+
2913	4113	/*
2914	4114	currentLayout = radio.layout;
2915	4115	if (currentLayout == null)
2916	4116	currentLayout = sevenButton;
2917	4117	*/
2918	4118	radio.layout.doClick();
	4119	+
	4120	+ assert(copy instanceof Composite);
	4121	+
	4122	+ if (copy.versionlist == null)
	4123	+ {
	4124	+ copy.versionlist = new Object3D[100];
	4125	+ copy.versionindex = -1;
	4126	+
	4127	+ // Cannot work with loops
	4128	+ // To fix this issue, first mark all nodes above the root,
	4129	+ // and check if any of these nodes are reachable below the root.
	4130	+ //Save(true);
	4131	+ }
	4132	+
	4133	+ SetVersionStates();
	4134	+
	4135	+ ClearUnpinned();
	4136	+
	4137	+ //Grafreed.Assert(group != null);
	4138	+ //Grafreed.Assert(group.selection != null);
	4139	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4140	+ if (group.selection == null \|\| group.selection.size() == 1)
	4141	+ EditSelection(false);
2919	4142	keepparent = group.parent;
2920	4143	// PARENT = NULL or not???
2921	4144	//group.parent = null; // ROOT
2922	4145	//group.attributes = -1;
2923	4146	ResetModel();
	4147	+
	4148	+ cameraView.requestFocusInWindow();
2924	4149	refreshContents(true);
2925		- }
	4150	+ } else if (event.getSource() == editCameraItem)
	4151	+ {
	4152	+ cameraView.ProtectCamera();
	4153	+ cameraView.requestFocusInWindow();
	4154	+ cameraView.repaint();
	4155	+ return;
	4156	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	4157	+ {
	4158	+ cameraView.RevertCamera();
	4159	+ cameraView.requestFocusInWindow();
	4160	+ cameraView.repaint();
	4161	+ return;
	4162	+ // } else if (event.getSource() == textureButton)
	4163	+ // {
	4164	+ // return; // true;
	4165	+ }
2926	4166	else
2927	4167	{
2928	4168	//return super.action(event, arg);
..	..	@@ -2931,7 +4171,6 @@
2931	4171	}
2932	4172
2933	4173	boolean useclient = false;
2934		- cRadio radio;
2935	4174
2936	4175	void ToggleRoot()
2937	4176	{
..	..	@@ -2940,7 +4179,7 @@
2940	4179	if (useclient)
2941	4180	{
2942	4181	cameraView.object = client;
2943		- cameraView.lighttouched = true;
	4182	+ Globals.lighttouched = true;
2944	4183	//topView.object = client;
2945	4184	//frontView.object = client;
2946	4185	//sideView.object = client;
..	..	@@ -2948,7 +4187,7 @@
2948	4187	else
2949	4188	{
2950	4189	cameraView.object = group;
2951		- cameraView.lighttouched = true;
	4190	+ Globals.lighttouched = true;
2952	4191	//topView.object = group;
2953	4192	//frontView.object = group;
2954	4193	//sideView.object = group;
..	..	@@ -2983,6 +4222,28 @@
2983	4222	refreshContents();
2984	4223	}
2985	4224
	4225	+ void TransformChildren()
	4226	+ {
	4227	+ Object3D obj;
	4228	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4229	+ {
	4230	+ obj = (Object3D)e.nextElement();
	4231	+ obj.KeepTextureMatrices();
	4232	+ obj.TransformChildren();
	4233	+ obj.RestoreTextureMatrices();
	4234	+
	4235	+// if (obj.parent == null)
	4236	+// {
	4237	+// System.out.println("NULL PARENT!");
	4238	+// new Exception().printStackTrace();
	4239	+// }
	4240	+// else
	4241	+// TouchTransform(obj);
	4242	+// //obj.parent.Touch();
	4243	+ }
	4244	+
	4245	+ refreshContents();
	4246	+ }
2986	4247
2987	4248	void ResetTransform()
2988	4249	{
..	..	@@ -3095,7 +4356,7 @@
3095	4356	refreshContents();
3096	4357	}
3097	4358
3098		- void ResetCentroid()
	4359	+ void ResetCentroid(boolean full)
3099	4360	{
3100	4361	Object3D obj;
3101	4362	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3110,12 +4371,16 @@
3110	4371	LA.matIdentity(Object3D.mat);
3111	4372	obj.getBounds(minima, maxima, false);
3112	4373	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3113		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	4374	+ if (full)
	4375	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3114	4376	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3115	4377	obj.TransformMesh(Object3D.mat);
	4378	+
3116	4379	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3117		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	4380	+ if (full)
	4381	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3118	4382	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	4383	+
3119	4384	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3120	4385	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3121	4386	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3144,7 +4409,8 @@
3144	4409
3145	4410	int size = obj.MemorySize();
3146	4411
3147		- System.err.println((size/1024) + " KB is the size of " + obj);
	4412	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4413	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3148	4414	}
3149	4415	}
3150	4416	catch (Exception e)
..	..	@@ -3181,9 +4447,9 @@
3181	4447	obj = (Object3D)e.nextElement();
3182	4448
3183	4449	System.out.println("Object is: " + obj);
3184		- GrafreeD.AnalyzeObject(obj);
	4450	+ Grafreed.AnalyzeObject(obj);
3185	4451	System.out.println("Boundary rep: " + obj.bRep);
3186		- GrafreeD.AnalyzeObject(obj.bRep);
	4452	+ Grafreed.AnalyzeObject(obj.bRep);
3187	4453
3188	4454	// System.err.println((size/1024) + " KB is the size of " + obj);
3189	4455	}
..	..	@@ -3225,6 +4491,13 @@
3225	4491	void GenNormals(boolean crease)
3226	4492	{
3227	4493	group.GenNormalsS(crease);
	4494	+
	4495	+ refreshContents();
	4496	+ }
	4497	+
	4498	+ void GenNormalsMESH()
	4499	+ {
	4500	+ group.GenNormalsMeshS();
3228	4501
3229	4502	refreshContents();
3230	4503	}
..	..	@@ -3397,8 +4670,8 @@
3397	4670
3398	4671	void ParseVertices()
3399	4672	{
3400		- boolean epsequal = GrafreeD.epsequal;
3401		- GrafreeD.epsequal = true;
	4673	+ boolean epsequal = Grafreed.epsequal;
	4674	+ Grafreed.epsequal = true;
3402	4675
3403	4676	for (int i=0; i<group.selection.size(); i++)
3404	4677	{
..	..	@@ -3423,7 +4696,7 @@
3423	4696	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3424	4697	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3425	4698
3426		- g.add(GrafreeD.clipboard);
	4699	+ g.add(Grafreed.clipboard);
3427	4700
3428	4701	buffer.add(g);
3429	4702	}
..	..	@@ -3438,7 +4711,7 @@
3438	4711	makeSomething(buffer, i==group.selection.size()-1);
3439	4712	}
3440	4713
3441		- GrafreeD.epsequal = epsequal;
	4714	+ Grafreed.epsequal = epsequal;
3442	4715
3443	4716	refreshContents();
3444	4717	}
..	..	@@ -3456,7 +4729,16 @@
3456	4729	String pigment = Object3D.GetPigment(tex);
3457	4730	//String bump = Object3D.GetBump(tex);
3458	4731
3459		- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
	4732	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4733	+
	4734	+ try
	4735	+ {
	4736	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
	4737	+ }
	4738	+ catch (Exception e)
	4739	+ {
	4740	+ System.err.println("FAIL: " + node);
	4741	+ }
3460	4742
3461	4743	double s = v.s;
3462	4744
..	..	@@ -3544,11 +4826,11 @@
3544	4826
3545	4827	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3546	4828
3547		- boolean random = CameraPane.RANDOM;
3548		- CameraPane.RANDOM = false; // parse all random nodes
	4829	+ boolean random = CameraPane.SWITCH;
	4830	+ CameraPane.SWITCH = false; // parse all random nodes
3549	4831	lowres.linkVerticesThis(null);
3550	4832	lowres.linkVerticesThis(sn);
3551		- CameraPane.RANDOM = random;
	4833	+ CameraPane.SWITCH = random;
3552	4834
3553	4835	System.err.flush();
3554	4836
..	..	@@ -3588,7 +4870,7 @@
3588	4870	return;
3589	4871
3590	4872	Object3D poses = group.selection.get(0);
3591		- Object3D ref = GrafreeD.clipboard.get(0);
	4873	+ Object3D ref = Grafreed.clipboard.get(0);
3592	4874
3593	4875	Object3D newgroup = new Object3D("Po:" + poses.name);
3594	4876
..	..	@@ -3757,7 +5039,7 @@
3757	5039	group.selection.RelinkToSupport(); // july 2014
3758	5040	System.out.println("DONE.");
3759	5041	refreshContents();
3760		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	5042	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3761	5043	}
3762	5044
3763	5045	void ReduceMesh(boolean reduction34)
..	..	@@ -3782,9 +5064,9 @@
3782	5064
3783	5065	void ClipMesh()
3784	5066	{
3785		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	5067	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3786	5068	{
3787		- Object3D content = GrafreeD.clipboard.get(0);
	5069	+ Object3D content = Grafreed.clipboard.get(0);
3788	5070
3789	5071	if (content instanceof cGroup && ((cGroup)content).transientlink )
3790	5072	content = ((cGroup)content).get(0);
..	..	@@ -3793,7 +5075,7 @@
3793	5075	// {
3794	5076	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3795	5077	// }
3796		- group.selection.ClipMesh(GrafreeD.clipboard);
	5078	+ group.selection.ClipMesh(Grafreed.clipboard);
3797	5079	}
3798	5080	// group.selection.ClipMesh(GrafreeD.clipboard);
3799	5081	System.out.println("DONE.");
..	..	@@ -3840,6 +5122,18 @@
3840	5122	void MarkLeaves(boolean hide)
3841	5123	{
3842	5124	group.selection.MarkLeaves(hide);
	5125	+ refreshContents();
	5126	+ }
	5127	+
	5128	+ void RewindLeaves(boolean hide)
	5129	+ {
	5130	+ group.selection.RewindLeaves(hide);
	5131	+ refreshContents();
	5132	+ }
	5133	+
	5134	+ void RandomLeaves(boolean hide)
	5135	+ {
	5136	+ group.selection.RandomLeaves(hide);
3843	5137	refreshContents();
3844	5138	}
3845	5139
..	..	@@ -3914,28 +5208,25 @@
3914	5208	// }
3915	5209	// }
3916	5210
3917		- static boolean allparams = true;
3918		-
3919		- static Vector<Object3D> listUI = new Vector<Object3D>();
3920		-
3921	5211	void EditSelection(boolean newWindow)
3922	5212	{
	5213	+ if (group.selection == null)
	5214	+ {
	5215	+ EditElement(group, newWindow); // ? new
	5216	+ return;
	5217	+ }
	5218	+
3923	5219	// aConstraints.gridy = 0;
3924	5220	for (int i=0; i<group.selection.size(); i++)
3925	5221	{
3926	5222	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
3927	5223	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3928		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5224	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3929	5225
3930	5226	Object3D elem = (Object3D)group.selection.elementAt(i);
3931		- if(elem != group)
	5227	+ if(elem != group \|\| !newWindow)
3932	5228	{
3933		- // if (!(elem instanceof Composite))
3934		- // newWindow = false;
3935		- listUI.add(elem);
3936		- elem.openEditWindow(this, newWindow); //, false);
3937		- System.out.println("edit : " + elem);
3938		- elem.editWindow.refreshContents(true); // ? new
	5229	+ EditElement(elem, newWindow); // ? new
3939	5230	}
3940	5231	}
3941	5232	}
..	..	@@ -3998,9 +5289,7 @@
3998	5289
3999	5290	freezemodel = false;
4000	5291	}
4001		-
4002		- boolean flashIt = true;
4003		-
	5292	+
4004	5293	public void valueChanged(TreeSelectionEvent e)
4005	5294	//public boolean handleEvent(Event event)
4006	5295	{
..	..	@@ -4010,7 +5299,8 @@
4010	5299	//new Exception().printStackTrace();
4011	5300
4012	5301	freezemodel = true;
4013		-
	5302	+ ClearUnpinned();
	5303	+
4014	5304	/**/
4015	5305	//switch (event.id)
4016	5306	{
..	..	@@ -4018,7 +5308,6 @@
4018	5308	//case 702: // Event.LIST_DESELECT
4019	5309	group.deselectAll();
4020	5310	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4021		- objEditor.ClearInfo(); // .GetMaterial());
4022	5311	if (tps != null)
4023	5312	{
4024	5313	for (int i=0; i < tps.length; i++)
..	..	@@ -4027,33 +5316,39 @@
4027	5316
4028	5317	//if (child.parent != null)
4029	5318	//child.parent.addSelectee(child);
	5319	+ objEditor.SetMaterial(child);
4030	5320	group.addSelectee(child);
4031		- objEditor.SetMaterial(child); // .GetMaterial());
4032		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4033		- System.err.println("info : " + child.GetPath());
4034	5321	}
4035	5322	}
4036		- else
4037		- {
4038		- objEditor.SetMaterial(group); // .GetMaterial());
4039		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4040		- System.err.println("info : " + group.GetPath());
4041		- }
	5323	+// else
	5324	+// {
	5325	+// objEditor.SetMaterial(group); // .GetMaterial());
	5326	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	5327	+// System.err.println("info : " + group.GetPath());
	5328	+// }
4042	5329
4043		- objEditor.SetText(); // jan 2014
4044		-
4045		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	5330	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4046	5331	CameraPane.flash = true;
4047	5332
4048		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5333	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4049	5334	// a camera
4050	5335	{
4051		- CameraPane.camerachangeframe = 0; // don't refuse it
4052		- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
4053		- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
4054		- // CameraPane.theRenderer.eyeCamera = CameraPane.theRenderer.manipCamera;
	5336	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5337	+ {
	5338	+ CameraPane.camerachangeframe = 0; // don't refuse it
	5339	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5340	+ }
	5341	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	5342	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4055	5343	}
4056	5344
	5345	+ if (tps != null && tps.length == 1)
	5346	+ {
	5347	+ EditSelection(false);
	5348	+ }
	5349	+
	5350	+ SetPinStates(tps != null && tps.length > 0);
	5351	+
4057	5352	refreshContents();
4058	5353	//return true;
4059	5354	}
..	..	@@ -4062,6 +5357,52 @@
4062	5357
4063	5358	freezemodel = false;
4064	5359	}
	5360	+
	5361	+ void SetPinStates(boolean enabled)
	5362	+ {
	5363	+ editButton.setEnabled(enabled);
	5364	+ uneditButton.setEnabled(enabled);
	5365	+ //unselectButton.setEnabled(enabled);
	5366	+ flashSelectionButton.setEnabled(enabled);
	5367	+
	5368	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5369	+
	5370	+ boolean allComposites = true;
	5371	+
	5372	+ if (group.selection != null)
	5373	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5374	+ {
	5375	+ Object next = e.nextElement();
	5376	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5377	+ {
	5378	+ allComposites = false;
	5379	+ break;
	5380	+ }
	5381	+ }
	5382	+
	5383	+ rootButton.setEnabled(allComposites);
	5384	+ }
	5385	+
	5386	+ void refreshContents(boolean cp)
	5387	+ {
	5388	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5389	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5390	+ {
	5391	+ objEditor.ClearInfo(); // .GetMaterial());
	5392	+
	5393	+ for (int i=0; i < group.selection.Size(); i++)
	5394	+ {
	5395	+ Object3D child = (Object3D) group.selection.get(i);
	5396	+
	5397	+ objEditor.AddInfo(child, this, true);
	5398	+// System.err.println("info : " + child.GetPath());
	5399	+ }
	5400	+
	5401	+ objEditor.SetText(); // jan 2014
	5402	+ }
	5403	+
	5404	+ super.refreshContents(cp);
	5405	+ }
4065	5406
4066	5407	void linkSomething(Object3D thing)
4067	5408	{
..	..	@@ -4133,16 +5474,19 @@
4133	5474	{
4134	5475	if (group.selection.isEmpty())
4135	5476	return;
4136		- GrafreeD.clipboardIsTempGroup = false;
	5477	+
	5478	+ Grafreed.clipboardIsTempGroup = false;
4137	5479	Composite tGroup = null;
4138	5480	if (group.selection.size() > 0) // 1)
4139	5481	{
4140	5482	tGroup = new cGroup();
4141		- GrafreeD.clipboardIsTempGroup = true;
	5483	+ Grafreed.clipboardIsTempGroup = true;
4142	5484	}
4143	5485
4144	5486	if (cut)
4145	5487	{
	5488	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5489	+// Save();
4146	5490	//int indices[] = jList.getSelectedIndices();
4147	5491	//for (int i = indices.length - 1; i >= 0; i--)
4148	5492	//jList.remove(indices[i]);
..	..	@@ -4178,16 +5522,16 @@
4178	5522	//System.out.println("cut " + child);
4179	5523	//System.out.println("parent = " + child.parent);
4180	5524	// tmp.addChild(child);
4181		- if (GrafreeD.clipboardIsTempGroup)
	5525	+ if (Grafreed.clipboardIsTempGroup)
4182	5526	tGroup.add/Child/(tmp);
4183	5527	else
4184		- GrafreeD.clipboard = tmp;
	5528	+ Grafreed.clipboard = tmp;
4185	5529	}
4186	5530	else
4187		- if (GrafreeD.clipboardIsTempGroup)
	5531	+ if (Grafreed.clipboardIsTempGroup)
4188	5532	tGroup.add/Child/(child);
4189	5533	else
4190		- GrafreeD.clipboard = child;
	5534	+ Grafreed.clipboard = child;
4191	5535	}
4192	5536
4193	5537	//ResetModel();
..	..	@@ -4219,21 +5563,23 @@
4219	5563	//System.out.println("cut " + elem);
4220	5564	//System.out.println("parent = " + elem.parent);
4221	5565	// tmp.addChild(elem);
4222		- if (GrafreeD.clipboardIsTempGroup)
	5566	+ if (Grafreed.clipboardIsTempGroup)
4223	5567	tGroup.add/Child/(tmp);
4224	5568	else
4225		- GrafreeD.clipboard = tmp;
	5569	+ Grafreed.clipboard = tmp;
4226	5570	}
4227	5571	else
4228		- if (GrafreeD.clipboardIsTempGroup)
	5572	+ if (Grafreed.clipboardIsTempGroup)
4229	5573	tGroup.add/Child/(child);
4230	5574	else
4231		- GrafreeD.clipboard = child;
	5575	+ Grafreed.clipboard = child;
4232	5576	}
4233	5577
4234	5578	}
4235		- if (GrafreeD.clipboardIsTempGroup)
4236		- GrafreeD.clipboard = tGroup;
	5579	+
	5580	+ if (Grafreed.clipboardIsTempGroup)
	5581	+ Grafreed.clipboard = tGroup;
	5582	+
4237	5583	if (cut)
4238	5584	{
4239	5585	ResetModel();
..	..	@@ -4243,11 +5589,15 @@
4243	5589
4244	5590	void paste(boolean expand)
4245	5591	{
	5592	+ if (Globals.REPLACEONMAKE)
	5593	+ Save();
	5594	+ boolean keep = Globals.REPLACEONMAKE;
	5595	+ Globals.REPLACEONMAKE = false;
4246	5596	// if (GrafreeD.clipboard == null)
4247	5597	// return;
4248	5598	boolean first = true;
4249	5599
4250		- if (GrafreeD.clipboardIsTempGroup)
	5600	+ if (Grafreed.clipboardIsTempGroup)
4251	5601	{
4252	5602	Composite temp;
4253	5603
..	..	@@ -4258,7 +5608,7 @@
4258	5608	temp = (Composite)Applet3D.clipboard.deepCopy();
4259	5609	*/
4260	5610	Object3D elem;
4261		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5611	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4262	5612	{
4263	5613	Object3D child = (Object3D)e.nextElement();
4264	5614
..	..	@@ -4292,21 +5642,22 @@
4292	5642	//Object3D cb = Applet3D.clipboard;
4293	5643	//temp.addChild(cb);
4294	5644	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4295		- assert(GrafreeD.clipboard.parent == null);
4296		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4297		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4298		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4299		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	5645	+ assert(Grafreed.clipboard.parent == null);
	5646	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5647	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5648	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5649	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4300	5650	else
4301		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4302		- GrafreeD.clipboard.get(0).parent = keepparent;
	5651	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5652	+ Grafreed.clipboard.get(0).parent = keepparent;
4303	5653	}
4304	5654
	5655	+ Globals.REPLACEONMAKE = keep;
4305	5656	ResetModel();
4306	5657	refreshContents();
4307	5658	}
4308	5659
4309		- void pasteInto(boolean copyit)
	5660	+ void pasteInto(boolean copyit, boolean clone)
4310	5661	{
4311	5662	// if (GrafreeD.clipboard == null)
4312	5663	// return;
..	..	@@ -4335,15 +5686,22 @@
4335	5686	if (copyit)
4336	5687	{
4337	5688	// paste(false);
4338		- CloneClipboard(false); // sept 2014
	5689	+ if (clone)
	5690	+ {
	5691	+ CloneClipboard(false); // sept 2014
	5692	+ }
	5693	+ else
	5694	+ {
	5695	+ paste(false);
	5696	+ }
4339	5697	}
4340	5698	else
4341	5699	{
4342	5700	boolean first = true;
4343	5701
4344		- if (GrafreeD.clipboardIsTempGroup)
	5702	+ if (Grafreed.clipboardIsTempGroup)
4345	5703	{
4346		- Composite temp = (Composite)GrafreeD.clipboard;
	5704	+ Composite temp = (Composite)Grafreed.clipboard;
4347	5705	Object3D copy;
4348	5706	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4349	5707	{
..	..	@@ -4353,7 +5711,7 @@
4353	5711	}
4354	5712	} else
4355	5713	{
4356		- linkSomething(GrafreeD.clipboard); //.get(0));
	5714	+ linkSomething(Grafreed.clipboard); //.get(0));
4357	5715	}
4358	5716	}
4359	5717	}
..	..	@@ -4430,6 +5788,10 @@
4430	5788
4431	5789	void group(Object3D csg, boolean grab)
4432	5790	{
	5791	+ if (Globals.REPLACEONMAKE)
	5792	+ Save();
	5793	+ boolean keep = Globals.REPLACEONMAKE;
	5794	+ Globals.REPLACEONMAKE = false;
4433	5795	if (//false) // why??
4434	5796	!group.selection.isEmpty())
4435	5797	{
..	..	@@ -4543,10 +5905,15 @@
4543	5905	//node.add(csg);
4544	5906	//makeSomething(node);
4545	5907	makeSomething(csg);
	5908	+ Globals.REPLACEONMAKE = keep;
4546	5909	}
4547	5910
4548	5911	void Ungroup(Object3D g)
4549	5912	{
	5913	+ if (Globals.REPLACEONMAKE)
	5914	+ Save();
	5915	+ boolean keep = Globals.REPLACEONMAKE;
	5916	+ Globals.REPLACEONMAKE = false;
4550	5917	if (g instanceof HiddenObject)
4551	5918	{
4552	5919	HiddenObject h = (HiddenObject) g;
..	..	@@ -4563,6 +5930,7 @@
4563	5930	objEditor.makeSomething(g.get(i), false);
4564	5931	}
4565	5932	}
	5933	+ Globals.REPLACEONMAKE = keep;
4566	5934	}
4567	5935
4568	5936	void ungroup()
..	..	@@ -4758,21 +6126,6 @@
4758	6126	}
4759	6127	*/
4760	6128
4761		- void ImportGFD()
4762		- {
4763		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4764		- browser.show();
4765		- String filename = browser.getFile();
4766		- if (filename != null && filename.length() > 0)
4767		- {
4768		- String fullname = browser.getDirectory() + filename;
4769		-
4770		- //Object3D readobj =
4771		- objEditor.ReadGFD(fullname, objEditor);
4772		- //makeSomething(readobj);
4773		- }
4774		- }
4775		-
4776	6129	/*
4777	6130	public void Callback(Object obj)
4778	6131	{
..	..	@@ -4796,26 +6149,9 @@
4796	6149	}
4797	6150	*/
4798	6151
4799		- void ImportVRMLX3D()
4800		- {
4801		- if (GrafreeD.standAlone)
4802		- {
4803		- /**/
4804		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4805		- browser.show();
4806		- String filename = browser.getFile();
4807		- if (filename != null && filename.length() > 0)
4808		- {
4809		- String fullname = browser.getDirectory() + filename;
4810		- LoadVRMLX3D(fullname);
4811		- }
4812		- /**/
4813		- }
4814		- }
4815		-
4816	6152	String GetFile(String dialogName)
4817	6153	{
4818		- if (GrafreeD.standAlone)
	6154	+ if (Grafreed.standAlone)
4819	6155	{
4820	6156	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4821	6157	browser.show();
..	..	@@ -4879,10 +6215,48 @@
4879	6215	cButton flashSelectionButton;
4880	6216	cButton editButton;
4881	6217	cButton uneditButton;
	6218	+ JCheckBox allParamsButton;
4882	6219	cButton clearpanelButton;
4883		- cButton allParamsButton;
4884	6220	cButton unselectButton;
4885	6221
	6222	+ cButton restoreCameraButton;
	6223	+
	6224	+ cButton oneStepButton;
	6225	+
	6226	+ cButton groupButton;
	6227	+ cButton ungroupButton;
	6228	+ cButton compositeButton;
	6229	+ cButton switchButton;
	6230	+ cButton loopButton;
	6231	+ cButton textureButton;
	6232	+
	6233	+ cButton skybox1Button;
	6234	+ cButton skybox2Button;
	6235	+ cButton skybox3Button;
	6236	+ cButton skybox4Button;
	6237	+ cButton skybox5Button;
	6238	+ cButton skybox6Button;
	6239	+ cButton skybox7Button;
	6240	+
	6241	+ cButton skybox11Button;
	6242	+ cButton skybox12Button;
	6243	+ cButton skybox13Button;
	6244	+ cButton skybox14Button;
	6245	+ cButton skybox15Button;
	6246	+ cButton skybox16Button;
	6247	+ cButton skybox17Button;
	6248	+
	6249	+ cButton gridButton;
	6250	+ cButton boxButton;
	6251	+ cButton sphereButton;
	6252	+ cButton coneButton;
	6253	+ cButton torusButton;
	6254	+ cButton superButton;
	6255	+ cButton kleinButton;
	6256	+ cButton particlesButton;
	6257	+ cButton overlayButton;
	6258	+ cButton lightButton;
	6259	+
4886	6260	cButton screenfitButton;
4887	6261	cButton screenfitpointButton;
4888	6262	cButton snapobjectButton;
..	..	@@ -4894,14 +6268,6 @@
4894	6268
4895	6269	cButton setsupportButton;
4896	6270
4897		- cButton twoButton;
4898		- cButton sixButton;
4899		- cButton threeButton;
4900		- cButton sevenButton;
4901		- cButton fourButton; // full panel
4902		- cButton oneButton; // full XYZ
4903		- //cButton currentLayout;
4904		-
4905	6271	//
4906	6272	//Composite
4907	6273	Object3D // to do !!
..	..	@@ -4911,10 +6277,12 @@
4911	6277	//JTree jTree;
4912	6278	private MenuItem lookAtItem;
4913	6279	private MenuItem lookFromItem;
4914		- private MenuItem switchItem;
4915		- private MenuItem cutItem;
4916		- private MenuItem duplicateItem;
4917		- private MenuItem cloneItem;
	6280	+ private MenuItem switchViewItem;
	6281	+ private JMenuItem cutItem;
	6282	+ private MenuItem undoItem;
	6283	+ private MenuItem redoItem;
	6284	+ private JMenuItem duplicateItem;
	6285	+ private JMenuItem cloneItem;
4918	6286	private MenuItem cloneSupportItem;
4919	6287	private MenuItem overwriteGeoItem;
4920	6288	private MenuItem overwriteMatItem;
..	..	@@ -4926,7 +6294,7 @@
4926	6294	private MenuItem linkverticesItem;
4927	6295	private MenuItem relinkverticesItem;
4928	6296	private MenuItem setMasterItem;
4929		- private MenuItem resetMeshItem;
	6297	+ private MenuItem resetAllItem;
4930	6298	private MenuItem stepAllItem;
4931	6299	private MenuItem revertMeshItem;
4932	6300	private MenuItem poseMeshItem;
..	..	@@ -4935,12 +6303,13 @@
4935	6303	private MenuItem cloneGeometriesItem;
4936	6304	private MenuItem shareGeometriesItem;
4937	6305	private MenuItem mergeGeometriesItem;
4938		- private MenuItem copyItem;
	6306	+ private JMenuItem copyItem;
4939	6307	private MenuItem pasteItem;
4940		- private MenuItem pasteLinkItem;
4941		- private MenuItem pasteCloneItem;
4942		- private MenuItem pasteExpandItem;
4943		- private MenuItem clearItem;
	6308	+ private JMenuItem pasteIntoItem;
	6309	+ private JMenuItem pasteLinkItem;
	6310	+ private JMenuItem pasteCloneItem;
	6311	+ private JMenuItem pasteExpandItem;
	6312	+ private JMenuItem deleteItem;
4944	6313	private MenuItem clearAllItem;
4945	6314	private MenuItem genUVItem;
4946	6315	private MenuItem genNormalsMESHItem;
..	..	@@ -4975,6 +6344,10 @@
4975	6344	private MenuItem showleavesItem;
4976	6345	private MenuItem markleavesItem;
4977	6346	private MenuItem unmarkleavesItem;
	6347	+ private MenuItem rewindleavesItem;
	6348	+ private MenuItem unrewindleavesItem;
	6349	+ private MenuItem randomleavesItem;
	6350	+ private MenuItem unrandomleavesItem;
4978	6351
4979	6352	private MenuItem flipVItem;
4980	6353	private MenuItem unflipVItem;
..	..	@@ -4986,15 +6359,17 @@
4986	6359	private MenuItem panoTexturesItem;
4987	6360
4988	6361	private MenuItem resetCentroidItem;
4989		- private MenuItem transformgeometryItem;
	6362	+ private MenuItem resetCentroidXZItem;
4990	6363	private MenuItem resetTransformItem;
	6364	+ private MenuItem transformGeometryItem;
	6365	+ private MenuItem transformChildrenItem;
4991	6366	private MenuItem hideItem;
4992		- private MenuItem grabItem;
	6367	+ private JMenuItem grabItem;
4993	6368	private MenuItem backItem;
4994	6369	private MenuItem frontItem;
4995	6370	private MenuItem cameraItem;
4996	6371	private MenuItem compositeItem;
4997		- private MenuItem randomItem;
	6372	+ private MenuItem switchItem;
4998	6373	private MenuItem physicsItem;
4999	6374	private MenuItem frameselectorItem;
5000	6375	private MenuItem scriptNodeItem;
..	..	@@ -5002,13 +6377,14 @@
5002	6377	private MenuItem switchTransfoItem;
5003	6378	private MenuItem morphItem;
5004	6379	private MenuItem linkerItem;
5005		- private MenuItem ungroupItem;
	6380	+ private JMenuItem ungroupItem;
5006	6381	private MenuItem editItem;
5007	6382	private MenuItem openWindowItem;
5008	6383	private MenuItem editLeafItem;
5009	6384
5010	6385	private MenuItem resetParentItem;
5011	6386	private MenuItem repairParentItem;
	6387	+ private MenuItem repairShadowItem;
5012	6388	private MenuItem sortbysizeItem;
5013	6389	private MenuItem sortbynameItem;
5014	6390
..	..	@@ -5017,6 +6393,8 @@
5017	6393	private MenuItem attachBumpItem;
5018	6394	private MenuItem detachBumpItem;
5019	6395	private MenuItem pigmentBumpItem;
	6396	+ private MenuItem embedTexturesItem;
	6397	+ private MenuItem deEmbedTexturesItem;
5020	6398
5021	6399	private MenuItem particleItem;
5022	6400	private MenuItem ragdollItem;
..	..	@@ -5033,7 +6411,7 @@
5033	6411	private MenuItem blobItem;
5034	6412	private MenuItem latheItem;
5035	6413	private MenuItem bezierItem;
5036		- private MenuItem checkerItem;
	6414	+ private MenuItem overlayItem;
5037	6415	private MenuItem meshItem;
5038	6416	// private MenuItem meshGroupItem;
5039	6417	private MenuItem springItem;
..	..	@@ -5055,11 +6433,6 @@
5055	6433	private MenuItem doubleItem;
5056	6434	private MenuItem tripleItem;
5057	6435
5058		- private MenuItem importGFDItem;
5059		- private MenuItem importVRMLX3DItem;
5060		- private MenuItem import3DSItem;
5061		- private MenuItem importOBJItem;
5062		-
5063	6436	private MenuItem computeAOItem;
5064	6437	private MenuItem recompileItem;
5065	6438	private MenuItem editScriptItem;
..	..	@@ -5069,4 +6442,8 @@
5069	6442	private MenuItem analyzeItem;
5070	6443	private MenuItem dumpItem;
5071	6444	//boolean freezemodel = false;
	6445	+
	6446	+ Menu cameraMenu;
	6447	+ MenuItem editCameraItem;
	6448	+ MenuItem restoreCameraItem;
5072	6449	}