~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", !Globals.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, !Globals.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(JTabbedPane.LEFT);
	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,31 +825,50 @@
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"));
339	859	showleavesItem.addActionListener(this);
340		- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
	860	+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
341	861	markleavesItem.addActionListener(this);
342		- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
	862	+ unmarkleavesItem = menu.add(new MenuItem("Unanim 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") \|\| path[2].toLowerCase().endsWith(".png")))
	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,269 @@
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 versionManagerPanel = new cGridBag();
	1042	+
	1043	+ versionManagerPanel.preferredHeight = 4;
439	1044
440		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.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", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1071	+ collapseButton.setToolTipText("Collapse toolbar");
	1072	+ collapseButton.addActionListener(this);
	1073	+
	1074	+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1075	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1076	+ maximize3DButton.addActionListener(this);
	1077	+
	1078	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.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", !Globals.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", !Globals.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", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1098	+ fullButton.setToolTipText("Full-screen window");
	1099	+ fullButton.addActionListener(this);
	1100	+
	1101	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1102	+ screenfitButton.setToolTipText("Screen fit");
	1103	+ screenfitButton.addActionListener(this);
	1104	+
	1105	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1106	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1107	+ restoreCameraButton.addActionListener(this);
	1108	+
	1109	+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1110	+ saveVersionButton.setToolTipText("Duplicate current version");
	1111	+ saveVersionButton.addActionListener(this);
	1112	+
	1113	+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1114	+ deleteVersionButton.setToolTipText("Delete current version");
	1115	+ deleteVersionButton.addActionListener(this);
	1116	+ deleteVersionButton.setEnabled(false);
	1117	+
	1118	+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.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", !Globals.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", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1130	+ replaceButton.setToolTipText("Save (replace current version)");
	1131	+ replaceButton.addActionListener(this);
	1132	+ replaceButton.setEnabled(false);
	1133	+
	1134	+ versionManagerPanel.add(updown);
	1135	+
	1136	+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.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", !Globals.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", Globals.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+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1165	+ snapobjectButton.addActionListener(this);
	1166	+ snapobjectButton.setToolTipText("Snap Object");
	1167	+
	1168	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.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", !Globals.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", !Globals.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", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1190	+ gridButton.setToolTipText("Create ground");
	1191	+ gridButton.addActionListener(this);
	1192	+
	1193	+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1194	+ boxButton.setToolTipText("Create box");
	1195	+ boxButton.addActionListener(this);
	1196	+
	1197	+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1198	+ superButton.setToolTipText("Create superellipsoid");
	1199	+ superButton.addActionListener(this);
	1200	+
	1201	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1202	+ sphereButton.setToolTipText("Create sphere");
	1203	+ sphereButton.addActionListener(this);
	1204	+
	1205	+ row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1206	+ coneButton.setToolTipText("Create cone");
	1207	+ coneButton.addActionListener(this);
	1208	+
	1209	+ row1.add(torusButton = GetButton("icons/torus.png", !Globals.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", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1216	+ kleinButton.setToolTipText("Create Klein bottle");
	1217	+ kleinButton.addActionListener(this);
	1218	+ }
	1219	+
	1220	+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.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", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1229	+ groupButton.setToolTipText("Create group");
	1230	+ groupButton.addActionListener(this);
	1231	+
	1232	+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1233	+ compositeButton.setToolTipText("Create composite");
	1234	+ compositeButton.addActionListener(this);
	1235	+
	1236	+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1237	+ switchButton.setToolTipText("Create item switcher");
	1238	+ switchButton.addActionListener(this);
	1239	+
	1240	+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1241	+ loopButton.setToolTipText("Create loop");
	1242	+ loopButton.addActionListener(this);
	1243	+
	1244	+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1245	+ textureButton.setToolTipText("Create texture");
	1246	+ textureButton.addActionListener(this);
	1247	+
	1248	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1249	+ overlayButton.setToolTipText("Create overlay");
	1250	+ overlayButton.addActionListener(this);
	1251	+
	1252	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.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	+ int tabCount = resourcecontainer.getTabCount();
	1263	+
	1264	+ if (tabCount > 0)
	1265	+ resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
	1266	+
	1267	+ oe.toolboxPanel.add(textures);
	1268	+
	1269	+ textures.preferredHeight = 100;
	1270	+
	1271	+ CreateSkyboxPanel(oe.skyboxPanel);
	1272	+
	1273	+ // EDIT panel
	1274	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1275	+ editButton.setToolTipText("Pin selection controls");
	1276	+ editButton.addActionListener(this);
	1277	+
	1278	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1279	+ uneditButton.setToolTipText("Unpin and remove selection controls");
560	1280	uneditButton.addActionListener(this);
561	1281
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);
	1282	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1283	+ allParamsButton.setToolTipText("Show all controls");
574	1284	allParamsButton.addActionListener(this);
575	1285
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);
	1286	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1287	+ clearPanelButton.setToolTipText("Clear all controls");
	1288	+ clearPanelButton.addActionListener(this);
582	1289
	1290	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1291	+ //unselectButton.setToolTipText("Unselect");
	1292	+ //unselectButton.addActionListener(this);
	1293	+
	1294	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1295	+ flashSelectionButton.setToolTipText("Highlight selection");
	1296	+ flashSelectionButton.addActionListener(this);
	1297	+
	1298	+ editCommandsPanel.preferredHeight = 1;
	1299	+
	1300	+ SetPinStates(false);
	1301	+// oe.treePanel.add(commandsPanel);
	1302	+// oe.treePanel.Return();
	1303	+
583	1304	// oe.aConstraints.gridx += 1;
584	1305	// oe.aConstraints.weighty = 0;
585	1306	// oe.aConstraints.gridwidth = 1;
..	..	@@ -591,47 +1312,34 @@
591	1312	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
592	1313	// gcButton.addActionListener(this);
593	1314
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;
	1315	+ cGridBag jSPPanel = new cGridBag();
	1316	+
	1317	+ jSPPanel.preferredHeight = 20;
	1318	+
	1319	+ JScrollPane jSP;
605	1320	//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);
	1321	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
607	1322	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	1323
	1324	+ oe.treePanel.add(jSPPanel);
	1325	+ oe.treePanel.Return();
	1326	+
	1327	+ oe.treePanel.add(versionManagerPanel);
	1328	+ oe.treePanel.Return();
	1329	+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1330	+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
	1331	+ versionSliderPane.preferredHeight = 3;
	1332	+
	1333	+// mainPanel.setDividerLocation(0.1); //1.0);
	1334	+ mainPanel.setResizeWeight(0.4);
	1335	+
628	1336	//jList.addListSelectionListener(this);
629	1337	oe.jTree.addTreeSelectionListener(this);
630	1338	//jTree.setRootVisible(false);
631	1339	//jTree.setEditable(true);
632	1340	oe.jTree.setDragEnabled(true);
633	1341	//jTree.setPreferredSize(new Dimension(10,10));
634		- jSP.setPreferredSize(new Dimension(100,200));
	1342	+ //jSP.setPreferredSize(new Dimension(100,200));
635	1343
636	1344	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
637	1345
..	..	@@ -643,47 +1351,204 @@
643	1351	dgr.addDragGestureListener(this);
644	1352	}catch(Exception e) {}
645	1353	*/
646		- radio.layout = sevenButton;
	1354	+ radio.layout = threeButton; // sixButton;
647	1355	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
648	1356	}
	1357	+
	1358	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	1359	+ {
	1360	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1361	+ colorCB.setToolTipText("Copy color when dropped");
	1362	+ colorCB.addItemListener(this);
	1363	+
	1364	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1365	+ materialCB.setToolTipText("Copy material when dropped");
	1366	+ materialCB.addItemListener(this);
	1367	+
	1368	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1369	+ textureCB.setToolTipText("Copy texture when dropped");
	1370	+ textureCB.addItemListener(this);
	1371	+
	1372	+ panel.Return();
	1373	+
	1374	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	1375	+ boxCB.setToolTipText("Display bounding boxes");
	1376	+ boxCB.addItemListener(this);
	1377	+
	1378	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	1379	+ zoomBoxCB.setToolTipText("Display only for wheel");
	1380	+ zoomBoxCB.addItemListener(this);
	1381	+
	1382	+ if (true) // Globals.ADVANCED)
	1383	+ {
	1384	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1385	+// supportCB.setToolTipText("Enable rigging");
	1386	+// supportCB.addItemListener(this);
	1387	+
	1388	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1389	+ freezeCB.setToolTipText("Fast moving camera");
	1390	+ freezeCB.addItemListener(this);
	1391	+
	1392	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	1393	+ // localCB.addItemListener(this);
	1394	+
	1395	+ panel.Return();
	1396	+
	1397	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	1398	+ crowdCB.setToolTipText("Used for crowds");
	1399	+ crowdCB.addItemListener(this);
	1400	+
	1401	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	1402	+ smoothCB.setToolTipText("Snapping delay");
	1403	+ smoothCB.addItemListener(this);
	1404	+
	1405	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1406	+// slowCB.setToolTipText("Smooth interpolation");
	1407	+// slowCB.addItemListener(this);
	1408	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1409	+ minshaderCB.setToolTipText("Minimal fast shader");
	1410	+ minshaderCB.addItemListener(this);
	1411	+
	1412	+// constraints.gridy += 1;
	1413	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	1414	+// speakerMocapCB.addItemListener(this);
	1415	+
	1416	+ panel.Return();
	1417	+
	1418	+ if (false)
	1419	+ {
	1420	+ // handled in scripts
	1421	+ //constraints.gridy += 1;
	1422	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	1423	+ speakerCameraCB.addItemListener(this);
	1424	+
	1425	+ //constraints.gridy += 1;
	1426	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	1427	+ speakerFocusCB.addItemListener(this);
	1428	+
	1429	+ //constraints.gridy += 1;
	1430	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	1431	+ smoothfocusCB.addItemListener(this);
	1432	+ panel.Return();
	1433	+ }
	1434	+
	1435	+//constraints.gridx += 1;
	1436	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	1437	+// debugCB.addItemListener(this);
	1438	+
	1439	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1440	+ trackCB.setToolTipText("Enable tracking target");
	1441	+ trackCB.addItemListener(this);
	1442	+
	1443	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1444	+ oeilCB.setToolTipText("Move camera when tracking");
	1445	+ oeilCB.addItemListener(this);
	1446	+
	1447	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1448	+ shadowCB.setToolTipText("When live compute shadows");
	1449	+ shadowCB.addItemListener(this);
	1450	+
	1451	+ panel.Return();
	1452	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1453	+ toggleTextureCB.setToolTipText("Load textures");
	1454	+ toggleTextureCB.addItemListener(this);
	1455	+
	1456	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1457	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1458	+ toggleSwitchCB.addItemListener(this);
	1459	+
	1460	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1461	+ autokeepCB.setToolTipText("On structure change");
	1462	+ autokeepCB.addItemListener(this);
	1463	+
	1464	+ panel.Return();
	1465	+ if (Globals.ADVANCED)
	1466	+ {
	1467	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	1468	+ lookAtCB.setToolTipText("Look-at target");
	1469	+ lookAtCB.addItemListener(this);
	1470	+ }
	1471	+
	1472	+ }
	1473	+
	1474	+ cGridBag fill = new cGridBag();
	1475	+ fill.preferredHeight = 200;
	1476	+ cGridBag fill2 = new cGridBag();
	1477	+ fill2.preferredHeight = 200;
	1478	+ cGridBag fill3 = new cGridBag();
	1479	+ fill3.preferredHeight = 200;
	1480	+
	1481	+ panel.add(fill);
	1482	+ panel.add(fill2);
	1483	+ panel.add(fill3);
	1484	+
	1485	+ }
649	1486
650	1487	void EditObject(Object3D obj)
651	1488	{
	1489	+ assert(obj instanceof Composite);
	1490	+
	1491	+// if (obj.versionlist == null)
	1492	+// {
	1493	+// obj.versionlist = new Object3D[100];
	1494	+// obj.versionindex = -1;
	1495	+// }
	1496	+
652	1497	cRadio radioButton = new cRadio(obj.name);
	1498	+
	1499	+ // June 2019. Patch to avoid bug with transparency.
	1500	+ radioButton.hadMaterial = obj.material != null;
	1501	+ if (!radioButton.hadMaterial)
	1502	+ {
	1503	+ obj.material = new cMaterial();
	1504	+ }
	1505	+
653	1506	radioButton.SetObject(obj);
654		- radioButton.layout = sevenButton;
	1507	+ radioButton.layout = threeButton; // sixButton;
655	1508	radioButton.SetCamera(cameraView.renderCamera, false);
656	1509	radioButton.addActionListener(this);
657	1510	radioPanel.add(radioButton);
658	1511	buttonGroup.add(radioButton);
659	1512	radioButton.doClick();
660	1513	}
	1514	+
661	1515	void SetupViews(ObjEditor oe)
662	1516	{
	1517	+ theFrame = this;
	1518	+
663	1519	oe.SetupViews();
664	1520
	1521	+ if (Globals.DEBUG)
665	1522	System.out.println("SetupViews");
666	1523	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
667	1524	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
668	1525	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
669	1526	}
670	1527
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;
	1528	+ cToggleButton liveCB;
	1529	+ cCheckBox supportCB;
	1530	+ cCheckBox localCB;
	1531	+ cCheckBox crowdCB;
	1532	+ cCheckBox smoothCB;
	1533	+ cCheckBox minshaderCB;
	1534	+
	1535	+ cToggleButton fastCB;
	1536	+ cCheckBox slowCB;
	1537	+ cCheckBox boxCB;
	1538	+ cCheckBox zoomBoxCB;
	1539	+ cCheckBox freezeCB;
	1540	+ //cToggleButton trackCB;
	1541	+ cCheckBox trackCB;
	1542	+ cCheckBox smoothfocusCB;
681	1543	// JCheckBox speakerMocapCB;
682		- JCheckBox speakerCameraCB;
683		- JCheckBox speakerFocusCB;
684		- JCheckBox debugCB;
685		- JCheckBox oeilCB;
686		- JCheckBox lookAtCB;
	1544	+ cCheckBox speakerCameraCB;
	1545	+ cCheckBox speakerFocusCB;
	1546	+ cCheckBox debugCB;
	1547	+
	1548	+ cCheckBox oeilCB;
	1549	+ cCheckBox shadowCB;
	1550	+ cCheckBox autokeepCB;
	1551	+ cCheckBox lookAtCB;
687	1552
688	1553	// static int COLOR = 1;
689	1554	// static int MATERIAL = 2;
..	..	@@ -691,9 +1556,9 @@
691	1556
692	1557	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
693	1558
694		- JCheckBox colorCB;
695		- JCheckBox materialCB;
696		- JCheckBox textureCB;
	1559	+ cCheckBox colorCB;
	1560	+ cCheckBox materialCB;
	1561	+ cCheckBox textureCB;
697	1562
698	1563	public void itemStateChanged(ItemEvent e)
699	1564	{
..	..	@@ -721,6 +1586,7 @@
721	1586	} else if(e.getSource() == liveCB)
722	1587	{
723	1588	cameraView.ToggleLive();
	1589	+ refreshContents(false);
724	1590	}
725	1591	else if(e.getSource() == supportCB)
726	1592	{
..	..	@@ -736,6 +1602,12 @@
736	1602	{
737	1603	cameraView.ToggleInertia();
738	1604	cameraView.repaint();
	1605	+ }
	1606	+ else if(e.getSource() == minshaderCB)
	1607	+ {
	1608	+ Globals.MINSHADER ^= true;
	1609	+ cameraView.programInitialized = false;
	1610	+ cameraView.repaint();
739	1611	}
740	1612	else if(e.getSource() == localCB)
741	1613	{
..	..	@@ -755,6 +1627,10 @@
755	1627	Recompile();
756	1628	cameraView.repaint();
757	1629	// refreshContents();
	1630	+ }
	1631	+ else if(e.getSource() == zoomBoxCB)
	1632	+ {
	1633	+ cameraView.ToggleZoomBoxMode();
758	1634	}
759	1635	else if(e.getSource() == smoothfocusCB)
760	1636	{
..	..	@@ -781,6 +1657,18 @@
781	1657	{
782	1658	cameraView.ToggleOeil();
783	1659	}
	1660	+ else if(e.getSource() == shadowCB)
	1661	+ {
	1662	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1663	+ }
	1664	+ else if(e.getSource() == freezeCB)
	1665	+ {
	1666	+ Globals.FREEZEONMOVE ^= true;
	1667	+ }
	1668	+ else if(e.getSource() == autokeepCB)
	1669	+ {
	1670	+ Globals.REPLACEONMAKE ^= true;
	1671	+ }
784	1672	else if(e.getSource() == lookAtCB)
785	1673	{
786	1674	cameraView.ToggleLookAt();
..	..	@@ -797,7 +1685,8 @@
797	1685
798	1686	/**/
799	1687	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
800		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1688	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1689	+ TreePath path = objEditor.jTree.getSelectionPath();
801	1690	if ((path == null) \|\| (path.getPathCount() <= 1)) {
802	1691	// We can't move the root node or an empty selection
803	1692	return;
..	..	@@ -860,8 +1749,6 @@
860	1749	}
861	1750	}
862	1751
863		- String string = (String) object;
864		-
865	1752	System.out.println("Transfer = " + object + "; drop : " + target);
866	1753	// if( object instanceof java.io.File[])
867	1754	// {
..	..	@@ -869,7 +1756,11 @@
869	1756	// objEditor.DropFile((java.io.File[]) object, true);
870	1757	// return;
871	1758	// }
872		- if (string.charAt(0) == '/')
	1759	+
	1760	+ String string = object.toString();
	1761	+
	1762	+ // File path for Mac and Windows
	1763	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
873	1764	{
874	1765	// file(s)
875	1766	String[] names = string.split("\n");
..	..	@@ -896,7 +1787,7 @@
896	1787
897	1788	flashIt = false;
898	1789	CameraPane pane = (CameraPane) target;
899		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1790	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
900	1791	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
901	1792
902	1793	if (group.selection.size() == 1)
..	..	@@ -912,23 +1803,33 @@
912	1803
913	1804	assert target == objEditor.jTree;
914	1805	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1806	+ Object3D destinationLeaf;
915	1807	try {
916		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1808	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
917	1809	} catch (Exception e) {
918	1810	System.out.println("destinationPath : " + destinationPath);
919	1811	return;
920	1812	}
921	1813
922		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1814	+ for (int i=group.selection.size(); --i>=0;)
923	1815	{
	1816	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1817	+
	1818	+ // Cannot move into itself
	1819	+ if (child == destinationLeaf)
	1820	+ return;
	1821	+ }
	1822	+
	1823	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1824	+// {
924	1825	loadClipboard(true);
925	1826	objEditor.jTree.setSelectionPath(destinationPath);
926		- pasteInto(false);
927		- } else {
928		- loadClipboard(false);
929		- objEditor.jTree.setSelectionPath(destinationPath);
930		- pasteInto(false); // true); // ???
931		- }
	1827	+ pasteInto(false, false);
	1828	+// } else {
	1829	+// loadClipboard(false);
	1830	+// objEditor.jTree.setSelectionPath(destinationPath);
	1831	+// pasteInto(false, false); // true); // ???
	1832	+// }
932	1833	}
933	1834	public void dropActionChanged(DropTargetDragEvent dtde)
934	1835	// Called if the user has modified the current drop gesture
..	..	@@ -984,7 +1885,12 @@
984	1885	TreePath path;
985	1886
986	1887	public TransferableTreePath(TreePath tp) {
987		- path = tp;
	1888	+ Object[] objs = new Object[tp.getPathCount()];
	1889	+ for (int i=0; i<objs.length; i++)
	1890	+ {
	1891	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1892	+ }
	1893	+ path = new TreePath(objs);
988	1894	}
989	1895
990	1896	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1033,85 +1939,107 @@
1033	1939	{
1034	1940	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1035	1941	//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);
	1942	+// gridItem = menu.add(new MenuItem("Grid"));
	1943	+// gridItem.addActionListener(this);
	1944	+// rectoidItem = menu.add(new MenuItem("Box"));
	1945	+// rectoidItem.addActionListener(this);
	1946	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1947	+// ellipsoidItem.addActionListener(this);
	1948	+// coneItem = menu.add(new MenuItem("Cone"));
	1949	+// coneItem.addActionListener(this);
	1950	+// torusItem = menu.add(new MenuItem("Torus"));
	1951	+// torusItem.addActionListener(this);
	1952	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1953	+// superItem.addActionListener(this);
	1954	+
	1955	+ cameraItem = menu.add(new MenuItem("Camera"));
	1956	+ cameraItem.addActionListener(this);
	1957	+
	1958	+ if (!Globals.ADVANCED)
	1959	+ {
1048	1960	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1049	1961	kleinItem.addActionListener(this);
1050		- particleItem = menu.add(new MenuItem("Particle system"));
1051		- particleItem.addActionListener(this);
	1962	+ }
	1963	+
	1964	+// particleItem = menu.add(new MenuItem("Particle system"));
	1965	+// particleItem.addActionListener(this);
	1966	+ if (Globals.ADVANCED)
	1967	+ {
1052	1968	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1053	1969	ragdollItem.addActionListener(this);
1054	1970	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1055	1971	ragdoll2Item.addActionListener(this);
	1972	+ }
1056	1973	menu.add("-");
1057		- meshItem = menu.add(new MenuItem("Mesh"));
	1974	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1058	1975	meshItem.addActionListener(this);
1059	1976	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1060	1977	// meshGroupItem.addActionListener(this);
	1978	+ if (Globals.ADVANCED)
	1979	+ {
1061	1980	springItem = menu.add(new MenuItem("Spring"));
1062	1981	springItem.addActionListener(this);
1063	1982	flagItem = menu.add(new MenuItem("Flag"));
1064	1983	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	1984	blobItem = menu.add(new MenuItem("Blob"));
1070	1985	blobItem.addActionListener(this);
1071	1986	latheItem = menu.add(new MenuItem("Lathe"));
1072	1987	latheItem.addActionListener(this);
1073		- lightItem = menu.add(new MenuItem("Light"));
1074		- lightItem.addActionListener(this);
	1988	+ }
	1989	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1990	+ bezierItem.addActionListener(this);
	1991	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1992	+// overlayItem.addActionListener(this);
	1993	+// lightItem = menu.add(new MenuItem("Light"));
	1994	+// lightItem.addActionListener(this);
1075	1995	menu.add("-");
1076	1996	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1077	1997	//superLoopItem.addActionListener(this);
1078		- loopItem = menu.add(new MenuItem("Loop"));
1079		- loopItem.addActionListener(this);
	1998	+// loopItem = menu.add(new MenuItem("Loop"));
	1999	+// loopItem.addActionListener(this);
1080	2000	doubleItem = menu.add(new MenuItem("Fork"));
1081	2001	doubleItem.addActionListener(this);
	2002	+ if (Globals.ADVANCED)
	2003	+ {
1082	2004	tripleItem = menu.add(new MenuItem("Trident"));
1083	2005	tripleItem.addActionListener(this);
	2006	+ }
1084	2007	}
1085	2008
1086	2009	void buildToolsMenu(Menu menu)
1087	2010	{
1088	2011	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1089	2012	animationItem.addItemListener(this);
1090		- animationItem.setState(CameraPane.ANIMATION);
	2013	+ animationItem.setState(Globals.ANIMATION);
	2014	+
	2015	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	2016	+ archiveItem.addActionListener(this);
1091	2017
1092	2018	menu.add("-");
1093	2019	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1094	2020	parseverticesItem.addActionListener(this);
1095	2021	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1096	2022	textureFieldItem.addActionListener(this);
1097		- alignItem = menu.add(new MenuItem("Align"));
	2023	+ alignItem = menu.add(new MenuItem("Align Objects"));
1098	2024	alignItem.addActionListener(this);
1099		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1100		- mirrorItem.addActionListener(this);
1101	2025	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1102	2026	reduceMorphItem.addActionListener(this);
1103	2027	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1104	2028	reduce34MorphItem.addActionListener(this);
1105		-
1106		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1107		- computeAOItem.addActionListener(this);
1108	2029	menu.add("-");
1109		-
1110	2030	menu.add(memoryItem = new MenuItem("Memory Usage"));
1111	2031	memoryItem.addActionListener(this);
	2032	+ menu.add(computeAOItem = new MenuItem("Compute AO"));
	2033	+ computeAOItem.addActionListener(this);
	2034	+
	2035	+ if (Globals.ADVANCED)
	2036	+ {
	2037	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	2038	+ mirrorItem.addActionListener(this);
	2039	+ menu.add("-");
1112	2040	menu.add(analyzeItem = new MenuItem("Analyze"));
1113	2041	analyzeItem.addActionListener(this);
1114		- menu.add(dumpItem = new MenuItem("Dump"));
	2042	+ menu.add(dumpItem = new MenuItem("Print"));
1115	2043	dumpItem.addActionListener(this);
1116	2044	// menu.add(pathItem = new MenuItem("From-to path"));
1117	2045	// pathItem.addActionListener(this);
..	..	@@ -1129,6 +2057,7 @@
1129	2057	menu.add("-");
1130	2058	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1131	2059	editScriptItem.addActionListener(this);
	2060	+ }
1132	2061	}
1133	2062
1134	2063	void ScreenFit()
..	..	@@ -1251,9 +2180,38 @@
1251	2180	shadow.material = new cMaterial(obj.material);
1252	2181	shadow.material.diffuse = 0.0001f;
1253	2182	shadow.material.specular = 0.0001f;
	2183	+ shadow.material.opacity = 0.75f;
	2184	+
	2185	+ AllocProjectedVertices(shadow);
	2186	+
	2187	+ shadow.projectedVertices[1].x = 300;
1254	2188
1255	2189	makeSomething(shadow);
1256	2190	}
	2191	+
	2192	+ private void ClearUnpinned()
	2193	+ {
	2194	+ //for (Object3D obj : listUI)
	2195	+ for (int i=listUI.size(); --i>=0;)
	2196	+ {
	2197	+ Object3D obj = listUI.elementAt(i);
	2198	+ if (!obj.pinned)
	2199	+ {
	2200	+ obj.CloseUI();
	2201	+ listUI.remove(i);
	2202	+ }
	2203	+ }
	2204	+ }
	2205	+
	2206	+ private void EditElement(Object3D elem, boolean newWindow)
	2207	+ {
	2208	+ // if (!(elem instanceof Composite))
	2209	+ // newWindow = false;
	2210	+ listUI.add(elem);
	2211	+ elem.openEditWindow(this, newWindow); //, false);
	2212	+ System.out.println("edit : " + elem);
	2213	+ elem.editWindow.refreshContents(true); // ? new
	2214	+ }
1257	2215
1258	2216	/**
1259	2217	* applyExample
..	..	@@ -1457,9 +2415,9 @@
1457	2415
1458	2416	void Overwrite(int mask)
1459	2417	{
1460		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2418	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1461	2419	{
1462		- Object3D content = GrafreeD.clipboard.get(0);
	2420	+ Object3D content = Grafreed.clipboard.get(0);
1463	2421
1464	2422	if (content instanceof cGroup && ((cGroup)content).transientlink )
1465	2423	content = ((cGroup)content).get(0);
..	..	@@ -1482,6 +2440,7 @@
1482	2440	//
1483	2441	public void actionPerformed(ActionEvent event) // , Object arg)
1484	2442	{
	2443	+ Object source = event.getSource();
1485	2444	/*
1486	2445	if (event.getSource() == nameField)
1487	2446	{
..	..	@@ -1493,11 +2452,11 @@
1493	2452	}
1494	2453	else
1495	2454	*/
1496		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	2455	+ if (source == lookAtItem \|\| source == lookFromItem)
1497	2456	{
1498	2457	ScreenFit();
1499	2458	} else
1500		- if (event.getSource() == switchItem)
	2459	+ if (source == switchViewItem)
1501	2460	{
1502	2461	cVector v1 = new cVector();
1503	2462	cVector v2 = new cVector();
..	..	@@ -1506,11 +2465,11 @@
1506	2465	objEditor.cameraView.renderCamera.setAim(v2, v1);
1507	2466	objEditor.cameraView.repaint();
1508	2467	} else
1509		- if (event.getSource() == rectoidItem)
	2468	+ if (source == rectoidItem \|\| source == boxButton)
1510	2469	{
1511	2470	makeSomething(new Box());
1512	2471	} else
1513		- if (event.getSource() == particleItem)
	2472	+ if (source == particleItem \|\| source == particlesButton)
1514	2473	{
1515	2474	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1516	2475	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1531,9 +2490,9 @@
1531	2490	applyExample(particleGeom, "SMOKE");
1532	2491	makeSomething(particleGeom);
1533	2492	} else
1534		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	2493	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1535	2494	{
1536		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	2495	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1537	2496
1538	2497	ragdoll.toParent = LA.newMatrix();
1539	2498	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1551,7 +2510,7 @@
1551	2510	} else
1552	2511	/*
1553	2512	*/
1554		- if (event.getSource() == heightFieldItem)
	2513	+ if (source == heightFieldItem)
1555	2514	{
1556	2515	Object3D obj = new Object3D();
1557	2516
..	..	@@ -1589,31 +2548,31 @@
1589	2548
1590	2549	makeSomething(obj);
1591	2550	} else
1592		- if (event.getSource() == gridItem)
	2551	+ if (source == gridItem \|\| source == gridButton)
1593	2552	{
1594	2553	makeSomething(new Grid());
1595	2554	} else
1596		- if (event.getSource() == ellipsoidItem)
	2555	+ if (source == ellipsoidItem \|\| source == sphereButton)
1597	2556	{
1598	2557	makeSomething(new Sphere());
1599	2558	} else
1600		- if (event.getSource() == coneItem)
	2559	+ if (source == coneItem \|\| source == coneButton)
1601	2560	{
1602	2561	makeSomething(new Cone());
1603	2562	} else
1604		- if (event.getSource() == torusItem)
	2563	+ if (source == torusItem \|\| source == torusButton)
1605	2564	{
1606	2565	makeSomething(new Torus());
1607	2566	} else
1608		- if (event.getSource() == superItem)
	2567	+ if (source == superItem \|\| source == superButton)
1609	2568	{
1610	2569	makeSomething(new Superellipsoid());
1611	2570	} else
1612		- if (event.getSource() == kleinItem)
	2571	+ if (source == kleinItem \|\| source == kleinButton)
1613	2572	{
1614	2573	makeSomething(new Klein());
1615	2574	} else
1616		- if (event.getSource() == blobItem)
	2575	+ if (source == blobItem)
1617	2576	{
1618	2577	Blob blob = new Blob();
1619	2578	BlobComponent comp = new BlobComponent();
..	..	@@ -1621,15 +2580,15 @@
1621	2580	//blob.retile();
1622	2581	makeSomething(blob);
1623	2582	} else
1624		- if (event.getSource() == latheItem)
	2583	+ if (source == latheItem)
1625	2584	{
1626	2585	makeSomething(new Lathe());
1627	2586	} else
1628		- if (event.getSource() == bezierItem)
	2587	+ if (source == bezierItem)
1629	2588	{
1630	2589	makeSomething(new BezierSurface());
1631	2590	} else
1632		- if (event.getSource() == checkerItem)
	2591	+ if (source == overlayItem \|\| source == overlayButton)
1633	2592	{
1634	2593	/*
1635	2594	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1644,7 +2603,7 @@
1644	2603	*/
1645	2604	makeSomething(new Checker());
1646	2605	} else
1647		- if (event.getSource() == meshItem)
	2606	+ if (source == meshItem)
1648	2607	{
1649	2608	Object3D itemtomake = new Object3D();
1650	2609	Object3D child;
..	..	@@ -1665,35 +2624,52 @@
1665	2624	makeSomething(child);
1666	2625	}
1667	2626	} else
1668		- if (event.getSource() == springItem)
	2627	+ if (source == springItem)
1669	2628	{
1670	2629	cSpring s = new cSpring();
1671	2630	s.setup();
1672	2631	makeSomething(s);
1673	2632	} else
1674		- if (event.getSource() == flagItem)
	2633	+ if (source == flagItem)
1675	2634	{
1676	2635	cSpring s = new cFlag();
1677	2636	s.setup();
1678	2637	makeSomething(s);
1679	2638	} else
1680		- if (event.getSource() == lightItem)
	2639	+ if (source == lightItem \|\| source == lightButton)
1681	2640	{
1682	2641	makeSomething(new Light());
1683	2642	} else
1684		- if (event.getSource() == csgItem)
	2643	+// if (source == skybox1Button \|\|
	2644	+// source == skybox2Button \|\|
	2645	+// source == skybox3Button \|\|
	2646	+// source == skybox4Button \|\|
	2647	+// source == skybox5Button \|\|
	2648	+// source == skybox6Button \|\|
	2649	+// source == skybox7Button \|\|
	2650	+// source == skybox11Button \|\|
	2651	+// source == skybox12Button \|\|
	2652	+// source == skybox13Button \|\|
	2653	+// source == skybox14Button \|\|
	2654	+// source == skybox15Button \|\|
	2655	+// source == skybox16Button \|\|
	2656	+// source == skybox17Button)
	2657	+// {
	2658	+// ChangeSkybox(source);
	2659	+// } else
	2660	+ if (source == csgItem)
1685	2661	{
1686	2662	group(new CSG());
1687	2663	} else
1688		- if (event.getSource() == templateItem)
	2664	+ if (source == templateItem)
1689	2665	{
1690	2666	group(new cTemplate());
1691	2667	} else
1692		- if (event.getSource() == attributeItem)
	2668	+ if (source == attributeItem)
1693	2669	{
1694	2670	makeSomething(new Attribute());
1695	2671	} else
1696		- if (event.getSource() == pointflowItem)
	2672	+ if (source == pointflowItem)
1697	2673	{
1698	2674	makeSomething(new PointFlow());
1699	2675	} else
..	..	@@ -1705,7 +2681,7 @@
1705	2681	} else
1706	2682	*/
1707	2683
1708		- if (event.getSource() == superLoopItem)
	2684	+ if (source == superLoopItem)
1709	2685	{
1710	2686	Composite g = new cGroup();
1711	2687	for (int i=0; i<15; i++)
..	..	@@ -1727,30 +2703,38 @@
1727	2703
1728	2704	group(g);
1729	2705	} else
1730		- if (event.getSource() == loopItem)
	2706	+ if (source == loopItem \|\| source == loopButton)
1731	2707	{
	2708	+ if (!group.selection.isEmpty())
	2709	+ {
1732	2710	Composite csg = new GroupLeaf();
1733	2711	csg.count = 5;
1734		- group(csg);
1735		- Composite child = new cGroup();
	2712	+ Composite child = new cGroup("Branch");
1736	2713	csg.addChild(child);
1737	2714	child.addChild(csg);
	2715	+ group(csg);
	2716	+ }
1738	2717	} else
1739		- if (event.getSource() == doubleItem)
	2718	+ if (source == doubleItem)
1740	2719	{
1741		- Composite csg = new GroupLeaf();
	2720	+ if (!group.selection.isEmpty())
	2721	+ {
	2722	+ Composite csg = new GroupLeaf("Fork");
1742	2723	csg.count = 5;
	2724	+ Composite child = new cGroup("Branch A");
	2725	+ csg.addChild(child);
	2726	+ child.addChild(csg);
	2727	+ child = new cGroup("Branch B");
	2728	+ csg.addChild(child);
	2729	+ child.addChild(csg);
1743	2730	group(csg);
1744		- Composite child = new cGroup();
1745		- csg.addChild(child);
1746		- child.addChild(csg);
1747		- child = new cGroup();
1748		- csg.addChild(child);
1749		- child.addChild(csg);
	2731	+ }
1750	2732	} else
1751		- if (event.getSource() == tripleItem)
	2733	+ if (source == tripleItem)
1752	2734	{
1753		- Composite csg = new GroupLeaf();
	2735	+ if (!group.selection.isEmpty())
	2736	+ {
	2737	+ Composite csg = new GroupLeaf("Trident");
1754	2738	csg.count = 4;
1755	2739	group(csg);
1756	2740	Composite child = new cGroup();
..	..	@@ -1762,74 +2746,119 @@
1762	2746	child = new cGroup();
1763	2747	csg.addChild(child);
1764	2748	child.addChild(csg);
	2749	+ }
1765	2750	} else
1766		-
1767		- if (event.getSource() == importGFDItem)
1768		- {
1769		- ImportGFD();
1770		- } else
1771		- if (event.getSource() == importVRMLX3DItem)
1772		- {
1773		- ImportVRMLX3D();
1774		- } else
1775		- if (event.getSource() == import3DSItem)
1776		- {
1777		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1778		- } else
1779		- if (event.getSource() == importOBJItem)
1780		- {
1781		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1782		- } else
1783		- if (event.getSource() == computeAOItem)
	2751	+ if (source == computeAOItem)
1784	2752	{
1785	2753	Globals.drawMode = CameraPane.OCCLUSION;
1786		- Globals.theRenderer.repaint();
	2754	+ cameraView.repaint();
1787	2755	} else
1788		- if (event.getSource() == recompileItem)
	2756	+ if (source == recompileItem)
1789	2757	{
1790	2758	Recompile();
1791	2759	refreshContents();
1792	2760	} else
1793		- if (event.getSource() == editScriptItem)
	2761	+ if (source == editScriptItem)
1794	2762	{
1795	2763	OpenDialog();
1796	2764	refreshContents();
1797	2765	} else
1798		- if (event.getSource() == invariantsItem)
	2766	+ if (source == invariantsItem)
1799	2767	{
1800	2768	System.out.println("Invariants:");
1801		- GrafreeD.grafreeD.universe.invariants();
	2769	+ Grafreed.grafreed.universe.invariants();
1802	2770	} else
1803		- if (event.getSource() == memoryItem)
	2771	+ if (source == memoryItem)
1804	2772	{
1805	2773	//System.out.println("Invariants:");
1806	2774	PrintMemory();
1807	2775	} else
1808		- if (event.getSource() == pathItem)
	2776	+ if (source == pathItem)
1809	2777	{
1810	2778	PrintPath();
1811	2779	} else
1812		- if (event.getSource() == analyzeItem)
	2780	+ if (source == analyzeItem)
1813	2781	{
1814	2782	AnalyzeObject();
1815	2783	} else
1816		- if (event.getSource() == dumpItem)
	2784	+ if (source == dumpItem)
1817	2785	{
1818	2786	DumpObject();
1819	2787	} else
1820		- if (event.getSource() == screenfitButton)
	2788	+ if (source == minButton)
1821	2789	{
1822		- //Reload(lastConverter, lastFilename, true);
	2790	+ Minimize();
	2791	+ } else
	2792	+ if (source == maxButton)
	2793	+ {
	2794	+ Maximize();
	2795	+ } else
	2796	+ if (source == fullButton)
	2797	+ {
	2798	+ ToggleFullScreen();
	2799	+ } else
	2800	+ if (source == collapseButton)
	2801	+ {
	2802	+ this.expandedLayout = radio.layout;
	2803	+ CollapseToolbar();
	2804	+ } else
	2805	+ if (source == maximize3DButton)
	2806	+ {
	2807	+ this.expandedLayout = radio.layout;
	2808	+ radio.layout = twoButton;
	2809	+ Show3DView();
	2810	+ CollapseToolbar();
	2811	+ } else
	2812	+ if (source == previousVersionButton)
	2813	+ {
	2814	+ // Go to previous version
	2815	+ //if (!Undo())
	2816	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2817	+ PreviousVersion();
	2818	+ } else
	2819	+ if (source == restoreButton)
	2820	+ {
	2821	+ // Restore current version
	2822	+ Restore();
	2823	+ //restoreButton.setEnabled(false);
	2824	+ } else
	2825	+ if (source == replaceButton)
	2826	+ {
	2827	+ // Overwrite current version
	2828	+ Replace();
	2829	+ //replaceButton.setEnabled(false);
	2830	+ } else
	2831	+ if (source == nextVersionButton)
	2832	+ {
	2833	+ // Go to next version
	2834	+ NextVersion();
	2835	+ } else
	2836	+ if (source == saveVersionButton)
	2837	+ {
	2838	+ // Save a new version
	2839	+ if (!Save(true))
	2840	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2841	+ } else
	2842	+ if (source == deleteVersionButton)
	2843	+ {
	2844	+ // Delete a new version
	2845	+ DeleteVersion();
	2846	+ } else
	2847	+ if (source == oneStepButton)
	2848	+ {
	2849	+ Globals.ONESTEP = true;
	2850	+ cameraView.repaint();
	2851	+ } else
	2852	+ if (source == screenfitButton)
	2853	+ {
1823	2854	ScreenFit();
1824	2855	} else
1825		- if (event.getSource() == screenfitpointButton)
	2856	+ if (source == screenfitpointButton)
1826	2857	{
1827		- //Reload(lastConverter, lastFilename, true);
1828	2858	ScreenFitPoint();
1829	2859	} else
1830		- if (event.getSource() == snapobjectButton)
	2860	+ if (source == snapobjectButton)
1831	2861	{
1832		- //Reload(lastConverter, lastFilename, true);
1833	2862	SnapObject();
1834	2863	} else
1835	2864	// if (event.getSource() == recompileButton)
..	..	@@ -1838,13 +2867,13 @@
1838	2867	// Recompile();
1839	2868	// refreshContents();
1840	2869	// } else
1841		- if (event.getSource() == gcButton)
	2870	+ if (source == gcButton)
1842	2871	{
1843	2872	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1844	2873	System.gc();
1845	2874	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1846	2875	} else
1847		- if (event.getSource() == editLeafItem)
	2876	+ if (source == editLeafItem)
1848	2877	{
1849	2878	Object3D obj;
1850	2879	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1858,62 +2887,74 @@
1858	2887	}
1859	2888	refreshContents(true);
1860	2889	} else
1861		- if (event.getSource() == openWindowItem)
	2890	+ if (source == openWindowItem)
1862	2891	{
1863	2892	EditSelection(true);
1864	2893	} else
1865		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2894	+ if (source == cutItem \|\| source == clearButton)
1866	2895	{
1867	2896	loadClipboard(true);
1868	2897	} else
1869		- if (event.getSource() == duplicateItem)
	2898	+ if (source == undoItem)
1870	2899	{
1871		- Object3D keep = GrafreeD.clipboard;
	2900	+ PreviousVersion();
	2901	+ } else
	2902	+ if (source == redoItem)
	2903	+ {
	2904	+ NextVersion();
	2905	+ } else
	2906	+ if (source == duplicateItem)
	2907	+ {
	2908	+ Object3D keep = Grafreed.clipboard;
1872	2909	loadClipboard(false);
1873	2910	paste(false);
1874		- GrafreeD.clipboard = keep;
	2911	+ Grafreed.clipboard = keep;
1875	2912	} else
1876		- if (event.getSource() == cloneItem)
	2913	+ if (source == cloneItem)
1877	2914	{
1878	2915	CloneSelection(false);
1879	2916	} else
1880		- if (event.getSource() == cloneSupportItem)
	2917	+ if (source == cloneSupportItem)
1881	2918	{
1882	2919	CloneSelection(true);
1883	2920	} else
1884		- if (event.getSource() == copyItem)
	2921	+ if (source == copyItem)
1885	2922	{
1886	2923	loadClipboard(false);
1887	2924	} else
1888		- if (event.getSource() == pasteItem)
	2925	+ if (source == pasteItem)
1889	2926	{
1890	2927	paste(false);
1891	2928	} else
1892		- if (event.getSource() == pasteLinkItem)
	2929	+ if (source == pasteIntoItem)
1893	2930	{
1894		- pasteInto(false);
	2931	+ pasteInto(true, false);
1895	2932	} else
1896		- if (event.getSource() == pasteCloneItem)
	2933	+ if (source == pasteLinkItem)
1897	2934	{
1898		- pasteInto(true);
	2935	+ pasteInto(false, false);
1899	2936	} else
1900		- if (event.getSource() == pasteExpandItem)
	2937	+ if (source == pasteCloneItem)
	2938	+ {
	2939	+ pasteInto(true, true);
	2940	+ } else
	2941	+ if (source == pasteExpandItem)
1901	2942	{
1902	2943	paste(true);
1903	2944	} else
1904		- if (event.getSource() == synchronizeItem)
	2945	+ if (source == synchronizeItem)
1905	2946	{
1906	2947	Overwrite(Object3D.TRANSFORM);
1907	2948	} else
1908		- if (event.getSource() == overwriteNameItem)
	2949	+ if (source == overwriteNameItem)
1909	2950	{
1910	2951	Overwrite(Object3D.NAME);
1911	2952	} else
1912		- if (event.getSource() == overwriteUVItem)
	2953	+ if (source == overwriteUVItem)
1913	2954	{
1914	2955	Overwrite(Object3D.UV);
1915	2956	} else
1916		- if (event.getSource() == overwriteMatItem)
	2957	+ if (source == overwriteMatItem)
1917	2958	{
1918	2959	/* july 2015
1919	2960	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1933,7 +2974,7 @@
1933	2974
1934	2975	Overwrite(dropAttributes);
1935	2976	}
1936		- if (event.getSource() == overwriteGeoItem)
	2977	+ if (source == overwriteGeoItem)
1937	2978	{
1938	2979	Overwrite(Object3D.GEOMETRY);
1939	2980	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1950,7 +2991,7 @@
1950	2991	// refreshContents();
1951	2992	// }
1952	2993	} else
1953		- if (event.getSource() == generateMeshItem)
	2994	+ if (source == generateMeshItem)
1954	2995	{
1955	2996	//if (group.selection.size() == 1)
1956	2997	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1961,7 +3002,7 @@
1961	3002	ResetModel();
1962	3003	refreshContents();
1963	3004	} else
1964		- if (event.getSource() == extractGeometriesItem)
	3005	+ if (source == extractGeometriesItem)
1965	3006	{
1966	3007	boolean one = false;
1967	3008
..	..	@@ -1988,7 +3029,7 @@
1988	3029	ResetModel();
1989	3030	refreshContents();
1990	3031	} else
1991		- if (event.getSource() == cloneGeometriesItem)
	3032	+ if (source == cloneGeometriesItem)
1992	3033	{
1993	3034	boolean one = false;
1994	3035
..	..	@@ -2014,7 +3055,7 @@
2014	3055	ResetModel();
2015	3056	refreshContents();
2016	3057	} else
2017		- if (event.getSource() == shareGeometriesItem)
	3058	+ if (source == shareGeometriesItem)
2018	3059	{
2019	3060	boolean one = false;
2020	3061
..	..	@@ -2044,7 +3085,7 @@
2044	3085	refreshContents();
2045	3086	}
2046	3087	} else
2047		- if (event.getSource() == mergeGeometriesItem)
	3088	+ if (source == mergeGeometriesItem)
2048	3089	{
2049	3090	boolean one = false;
2050	3091
..	..	@@ -2074,7 +3115,7 @@
2074	3115	ResetModel();
2075	3116	refreshContents();
2076	3117	} else
2077		- if (event.getSource() == linkverticesItem)
	3118	+ if (source == linkverticesItem)
2078	3119	{
2079	3120	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2080	3121	// {
..	..	@@ -2087,9 +3128,9 @@
2087	3128	// group.selection.get(0).setMasterThis(content); // should be identity
2088	3129	// refreshContents();
2089	3130	// }
2090		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	3131	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2091	3132	{
2092		- Object3D content = GrafreeD.clipboard.get(0);
	3133	+ Object3D content = Grafreed.clipboard.get(0);
2093	3134
2094	3135	if (content instanceof cGroup && ((cGroup)content).transientlink )
2095	3136	content = ((cGroup)content).get(0);
..	..	@@ -2097,38 +3138,38 @@
2097	3138	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2098	3139	for (int i=0; i<group.selection.size(); i++)
2099	3140	{
2100		- boolean random = CameraPane.RANDOM;
2101		- CameraPane.RANDOM = false; // parse all random nodes
	3141	+ boolean random = CameraPane.SWITCH;
	3142	+ CameraPane.SWITCH = false; // parse all random nodes
2102	3143	group.selection.get(i).linkVerticesThis(content);
2103	3144	// group.selection.get(i).setMasterThis(content); // should be identity
2104		- CameraPane.RANDOM = random;
	3145	+ CameraPane.SWITCH = random;
2105	3146	}
2106	3147	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2107	3148	refreshContents();
2108	3149	}
2109	3150	} else
2110		- if (event.getSource() == resetsupportItem)
	3151	+ if (source == resetsupportItem)
2111	3152	{
2112	3153	for (int i=0; i<group.selection.size(); i++)
2113	3154	{
2114		- boolean random = CameraPane.RANDOM;
2115		- CameraPane.RANDOM = false; // parse all random nodes
	3155	+ boolean random = CameraPane.SWITCH;
	3156	+ CameraPane.SWITCH = false; // parse all random nodes
2116	3157	group.selection.get(i).linkVerticesThis(null);
2117		- CameraPane.RANDOM = random;
	3158	+ CameraPane.SWITCH = random;
2118	3159	}
2119	3160
2120	3161	refreshContents();
2121	3162	} else
2122		- if (event.getSource() == relinkverticesItem)
	3163	+ if (source == relinkverticesItem)
2123	3164	{
2124		- boolean random = CameraPane.RANDOM;
2125		- CameraPane.RANDOM = false; // parse all random nodes
	3165	+ boolean random = CameraPane.SWITCH;
	3166	+ CameraPane.SWITCH = false; // parse all random nodes
2126	3167	group.selection.RelinkToSupport();
2127		- CameraPane.RANDOM = random;
	3168	+ CameraPane.SWITCH = random;
2128	3169
2129	3170	refreshContents();
2130	3171	} else
2131		- if (event.getSource() == resetreferencesItem)
	3172	+ if (source == resetreferencesItem)
2132	3173	{
2133	3174	for (int i=0; i<group.selection.size(); i++)
2134	3175	{
..	..	@@ -2137,11 +3178,11 @@
2137	3178
2138	3179	refreshContents();
2139	3180	} else
2140		- if (event.getSource() == setMasterItem)
	3181	+ if (source == setMasterItem)
2141	3182	{
2142		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	3183	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2143	3184	{
2144		- Object3D content = GrafreeD.clipboard.get(0);
	3185	+ Object3D content = Grafreed.clipboard.get(0);
2145	3186
2146	3187	if (content instanceof cGroup && ((cGroup)content).transientlink )
2147	3188	content = ((cGroup)content).get(0);
..	..	@@ -2150,13 +3191,13 @@
2150	3191	refreshContents();
2151	3192	}
2152	3193	} else
2153		- if (event.getSource() == poseMeshItem)
	3194	+ if (source == poseMeshItem)
2154	3195	{
2155	3196	if (group.selection.size() == 1)
2156	3197	{
2157		- if (GrafreeD.clipboard.size() == 1)
	3198	+ if (Grafreed.clipboard.size() == 1)
2158	3199	{
2159		- Object3D content = GrafreeD.clipboard.get(0);
	3200	+ Object3D content = Grafreed.clipboard.get(0);
2160	3201
2161	3202	if (content instanceof cGroup && ((cGroup)content).transientlink )
2162	3203	content = ((cGroup)content).get(0);
..	..	@@ -2169,19 +3210,19 @@
2169	3210	}
2170	3211
2171	3212	} else
2172		- if (event.getSource() == revertMeshItem)
	3213	+ if (source == revertMeshItem)
2173	3214	{
2174	3215	RevertMeshes();
2175	3216	} else
2176		- if (event.getSource() == resetMeshItem)
	3217	+ if (source == resetAllItem)
2177	3218	{
2178	3219	ResetAll();
2179	3220	} else
2180		- if (event.getSource() == stepAllItem)
	3221	+ if (source == stepAllItem)
2181	3222	{
2182	3223	StepAll();
2183	3224	} else
2184		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	3225	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2185	3226	{
2186	3227	//int indices[] = jList.getSelectedIndices();
2187	3228	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2189,46 +3230,46 @@
2189	3230
2190	3231	ClearSelection(false);
2191	3232	} else
2192		- if (event.getSource() == clearAllItem)
	3233	+ if (source == clearAllItem)
2193	3234	{
2194	3235	ClearSelection(true);
2195	3236	} else
2196		- if (event.getSource() == grabItem)
	3237	+ if (source == grabItem \|\| source == groupButton)
2197	3238	{
2198		- group(new cGroup(), true);
	3239	+ group(new cGroup(), false); // true);
2199	3240	} else
2200		- if (event.getSource() == hideItem)
	3241	+ if (source == hideItem)
2201	3242	{
2202	3243	group(new HiddenObject());
2203	3244	} else
2204		- if (event.getSource() == frontItem)
	3245	+ if (source == frontItem)
2205	3246	{
2206	3247	front();
2207	3248	} else
2208		- if (event.getSource() == backItem)
	3249	+ if (source == backItem)
2209	3250	{
2210	3251	back();
2211	3252	} else
2212		- if (event.getSource() == cameraItem)
	3253	+ if (source == cameraItem)
2213	3254	{
2214	3255	makeSomething(new Camera());
2215	3256	} else
2216		- if (event.getSource() == compositeItem)
	3257	+ if (source == compositeItem \|\| source == compositeButton)
2217	3258	{
2218	3259	group(new Composite());
2219	3260	} else
2220		- if (event.getSource() == randomItem)
	3261	+ if (source == switchItem \|\| source == switchButton)
2221	3262	{
2222	3263	RandomNode random = new RandomNode();
2223	3264	group(random);
2224	3265	if (random.size() > 0)
2225		- random.name = random.get(0).name + "Rnd";
	3266	+ random.name = random.get(0).name + "Switch";
2226	3267	} else
2227		- if (event.getSource() == physicsItem)
	3268	+ if (source == physicsItem)
2228	3269	{
2229	3270	group(new PhysicsNode());
2230	3271	} else
2231		- if (event.getSource() == frameselectorItem)
	3272	+ if (source == frameselectorItem)
2232	3273	{
2233	3274	for (int i=0; i<group.selection.size(); i++)
2234	3275	{
..	..	@@ -2240,7 +3281,7 @@
2240	3281	ResetModel();
2241	3282	refreshContents();
2242	3283	} else
2243		- if (event.getSource() == switchGeoItem)
	3284	+ if (source == switchGeoItem)
2244	3285	{
2245	3286	for (int i=0; i<group.selection.size(); i++)
2246	3287	{
..	..	@@ -2252,7 +3293,7 @@
2252	3293	ResetModel();
2253	3294	refreshContents();
2254	3295	} else
2255		- if (event.getSource() == switchTransfoItem)
	3296	+ if (source == switchTransfoItem)
2256	3297	{
2257	3298	for (int i=0; i<group.selection.size(); i++)
2258	3299	{
..	..	@@ -2264,7 +3305,7 @@
2264	3305	ResetModel();
2265	3306	refreshContents();
2266	3307	} else
2267		- if (event.getSource() == morphItem)
	3308	+ if (source == morphItem)
2268	3309	{
2269	3310	for (int i=0; i<group.selection.size(); i++)
2270	3311	{
..	..	@@ -2276,7 +3317,7 @@
2276	3317	ResetModel();
2277	3318	refreshContents();
2278	3319	} else
2279		- if (event.getSource() == scriptNodeItem)
	3320	+ if (source == scriptNodeItem)
2280	3321	{
2281	3322	boolean atleastone = false;
2282	3323
..	..	@@ -2315,215 +3356,264 @@
2315	3356	}
2316	3357	}
2317	3358	} else
2318		- if (event.getSource() == linkerItem)
	3359	+ if (source == linkerItem)
2319	3360	{
2320	3361	group(new cLinker());
2321	3362	} else
2322		- if (event.getSource() == textureItem)
	3363	+ if (source == textureItem \|\| source == textureButton)
2323	3364	{
2324	3365	group(new TextureNode());
2325	3366	} else
2326		- if (event.getSource() == billboardItem)
	3367	+ if (source == billboardItem)
2327	3368	{
2328	3369	group(new BillboardNode());
2329	3370	} else
2330		- if (event.getSource() == shadowXItem)
	3371	+ if (source == shadowXItem)
2331	3372	{
2332	3373	CastShadow(0);
2333	3374	} else
2334		- if (event.getSource() == shadowYItem)
	3375	+ if (source == shadowYItem)
2335	3376	{
2336	3377	CastShadow(1);
2337	3378	} else
2338		- if (event.getSource() == shadowZItem)
	3379	+ if (source == shadowZItem)
2339	3380	{
2340	3381	CastShadow(2);
2341	3382	} else
2342		- if (event.getSource() == ungroupItem)
	3383	+ if (source == ungroupItem \|\| source == ungroupButton)
2343	3384	{
2344		- //ungroup();
	3385	+ boolean canUngroup = true;
	3386	+
2345	3387	for (int i=0; i<group.selection.size(); i++)
2346	3388	{
2347		- Ungroup(group.selection.get(i));
	3389	+ Object3D selectedItem = group.selection.get(i);
	3390	+
	3391	+ if (selectedItem.Size() == 0)
	3392	+ {
	3393	+ // Cannot ungroup leaves
	3394	+ canUngroup = false;
	3395	+ break;
	3396	+ }
	3397	+
	3398	+ if (selectedItem == group)
	3399	+ {
	3400	+ // Cannot ungroup root
	3401	+ canUngroup = false;
	3402	+ break;
	3403	+ }
2348	3404	}
2349	3405
2350		- ClearSelection(false);
2351		-
2352		- refreshContents();
	3406	+ if (canUngroup)
	3407	+ {
	3408	+ for (int i=0; i<group.selection.size(); i++)
	3409	+ {
	3410	+ Object3D selectedItem = group.selection.get(i);
	3411	+
	3412	+ Ungroup(selectedItem);
	3413	+ }
	3414	+
	3415	+ ClearSelection(false);
	3416	+
	3417	+ refreshContents();
	3418	+ }
2353	3419	} else
2354		- if (event.getSource() == genUVItem)
	3420	+ if (source == genUVItem)
2355	3421	{
2356	3422	GenUV();
2357	3423	} else
2358		- if (event.getSource() == genNormalsCADItem)
	3424	+ if (source == genNormalsCADItem)
2359	3425	{
2360	3426	GenNormals(true);
2361	3427	} else
2362		- if (event.getSource() == genNormalsMESHItem)
	3428	+ if (source == genNormalsMESHItem)
2363	3429	{
2364		- GenNormals(true); // TODO
	3430	+ GenNormalsMESH();
2365	3431	} else
2366		- if (event.getSource() == genNormalsORGANItem)
	3432	+ if (source == genNormalsORGANItem)
2367	3433	{
2368	3434	GenNormals(false);
2369	3435	} else
2370		- if (event.getSource() == genNormalsMINEItem)
	3436	+ if (source == genNormalsMINEItem)
2371	3437	{
2372	3438	GenNormalsMINE();
2373	3439	} else
2374		- if (event.getSource() == stripifyItem)
	3440	+ if (source == stripifyItem)
2375	3441	{
2376	3442	Stripify();
2377	3443	} else
2378		- if (event.getSource() == unstripifyItem)
	3444	+ if (source == unstripifyItem)
2379	3445	{
2380	3446	Unstripify();
2381	3447	} else
2382		- if (event.getSource() == trimItem)
	3448	+ if (source == trimItem)
2383	3449	{
2384	3450	Trim();
2385	3451	} else
2386		- if (event.getSource() == untrimItem)
	3452	+ if (source == untrimItem)
2387	3453	{
2388	3454	Untrim();
2389	3455	} else
2390		- if (event.getSource() == clearColorsItem)
	3456	+ if (source == clearColorsItem)
2391	3457	{
2392	3458	ClearColors();
2393	3459	} else
2394		- if (event.getSource() == clearMaterialsItem)
	3460	+ if (source == clearMaterialsItem)
2395	3461	{
2396	3462	ClearMaterials();
2397	3463	} else
2398		- if (event.getSource() == liveleavesItem)
	3464	+ if (source == liveleavesItem)
2399	3465	{
2400	3466	LiveLeaves(true);
2401	3467	} else
2402		- if (event.getSource() == unliveleavesItem)
	3468	+ if (source == unliveleavesItem)
2403	3469	{
2404	3470	LiveLeaves(false);
2405	3471	} else
2406		- if (event.getSource() == supportleavesItem)
	3472	+ if (source == supportleavesItem)
2407	3473	{
2408	3474	SupportLeaves(true);
2409	3475	} else
2410		- if (event.getSource() == unsupportleavesItem)
	3476	+ if (source == unsupportleavesItem)
2411	3477	{
2412	3478	SupportLeaves(false);
2413	3479	} else
2414		- if (event.getSource() == hideleavesItem)
	3480	+ if (source == hideleavesItem)
2415	3481	{
2416	3482	HideLeaves(true);
2417	3483	} else
2418		- if (event.getSource() == showleavesItem)
	3484	+ if (source == showleavesItem)
2419	3485	{
2420	3486	HideLeaves(false);
2421	3487	} else
2422		- if (event.getSource() == markleavesItem)
	3488	+ if (source == markleavesItem)
2423	3489	{
2424	3490	MarkLeaves(true);
2425	3491	} else
2426		- if (event.getSource() == unmarkleavesItem)
	3492	+ if (source == unmarkleavesItem)
2427	3493	{
2428	3494	MarkLeaves(false);
2429	3495	} else
2430		- if (event.getSource() == flipVItem)
	3496	+ if (source == rewindleavesItem)
	3497	+ {
	3498	+ RewindLeaves(true);
	3499	+ } else
	3500	+ if (source == unrewindleavesItem)
	3501	+ {
	3502	+ RewindLeaves(false);
	3503	+ } else
	3504	+ if (source == randomleavesItem)
	3505	+ {
	3506	+ RandomLeaves(true);
	3507	+ } else
	3508	+ if (source == unrandomleavesItem)
	3509	+ {
	3510	+ RandomLeaves(false);
	3511	+ } else
	3512	+ if (source == flipVItem)
2431	3513	{
2432	3514	FlipV(true);
2433	3515	} else
2434		- if (event.getSource() == unflipVItem)
	3516	+ if (source == unflipVItem)
2435	3517	{
2436	3518	FlipV(false);
2437	3519	} else
2438		- if (event.getSource() == lowTexturesItem)
	3520	+ if (source == lowTexturesItem)
2439	3521	{
2440	3522	SetTexRes(0);
2441	3523	} else
2442		- if (event.getSource() == normalTexturesItem)
	3524	+ if (source == normalTexturesItem)
2443	3525	{
2444	3526	SetTexRes(1);
2445	3527	} else
2446		- if (event.getSource() == highTexturesItem)
	3528	+ if (source == highTexturesItem)
2447	3529	{
2448	3530	SetTexRes(2);
2449	3531	} else
2450		- if (event.getSource() == veryhighTexturesItem)
	3532	+ if (source == veryhighTexturesItem)
2451	3533	{
2452	3534	SetTexRes(3);
2453	3535	} else
2454		- if (event.getSource() == maxTexturesItem)
	3536	+ if (source == maxTexturesItem)
2455	3537	{
2456	3538	SetTexRes(4);
2457	3539	} else
2458		- if (event.getSource() == panoTexturesItem)
	3540	+ if (source == panoTexturesItem)
2459	3541	{
2460	3542	SetTexRes(5);
2461	3543	} else
2462		- if (event.getSource() == reverseNormalsItem)
	3544	+ if (source == reverseNormalsItem)
2463	3545	{
2464	3546	ReverseNormals();
2465	3547	} else
2466		- if (event.getSource() == parseverticesItem)
	3548	+ if (source == parseverticesItem)
2467	3549	{
2468	3550	ParseVertices();
2469	3551	} else
2470		- if (event.getSource() == textureFieldItem)
	3552	+ if (source == textureFieldItem)
2471	3553	{
2472	3554	TextureVertices();
2473	3555	} else
2474		- if (event.getSource() == alignItem)
	3556	+ if (source == alignItem)
2475	3557	{
2476	3558	Align();
2477	3559	} else
2478		- if (event.getSource() == mirrorItem)
	3560	+ if (source == mirrorItem)
2479	3561	{
2480	3562	MirrorPoses();
2481	3563	} else
2482		- if (event.getSource() == reduceMorphItem)
	3564	+ if (source == reduceMorphItem)
2483	3565	{
2484	3566	MeshReduction(false);
2485	3567	} else
2486		- if (event.getSource() == reduce34MorphItem)
	3568	+ if (source == reduce34MorphItem)
2487	3569	{
2488	3570	MeshReduction(true);
2489	3571	} else
2490		- if (event.getSource() == reverseTrianglesItem)
	3572	+ if (source == reverseTrianglesItem)
2491	3573	{
2492	3574	ReverseTriangles();
2493	3575	} else
2494		- if (event.getSource() == reduceMeshItem)
	3576	+ if (source == reduceMeshItem)
2495	3577	{
2496	3578	ReduceMesh(false);
2497	3579	} else
2498		- if (event.getSource() == reduce34MeshItem)
	3580	+ if (source == reduce34MeshItem)
2499	3581	{
2500	3582	ReduceMesh(true);
2501	3583	} else
2502		- if (event.getSource() == increaseMeshItem)
	3584	+ if (source == increaseMeshItem)
2503	3585	{
2504	3586	IncreaseMesh();
2505	3587	} else
2506		- if (event.getSource() == clipMeshItem)
	3588	+ if (source == clipMeshItem)
2507	3589	{
2508	3590	ClipMesh();
2509	3591	} else
2510		- if (event.getSource() == smoothMeshItem)
	3592	+ if (source == smoothMeshItem)
2511	3593	{
2512	3594	SmoothMesh();
2513	3595	} else
2514		- if (event.getSource() == transformgeometryItem)
	3596	+ if (source == transformGeometryItem)
2515	3597	{
2516	3598	TransformGeometry();
2517	3599	} else
2518		- if (event.getSource() == resetTransformItem)
	3600	+ if (source == transformChildrenItem)
	3601	+ {
	3602	+ TransformChildren();
	3603	+ } else
	3604	+ if (source == resetTransformItem)
2519	3605	{
2520	3606	ResetTransform();
2521	3607	} else
2522		- if (event.getSource() == resetCentroidItem)
	3608	+ if (source == resetCentroidItem)
2523	3609	{
2524		- ResetCentroid();
	3610	+ ResetCentroid(true);
2525	3611	} else
2526		- if (event.getSource() == resetParentItem)
	3612	+ if (source == resetCentroidXZItem)
	3613	+ {
	3614	+ ResetCentroid(false);
	3615	+ } else
	3616	+ if (source == resetParentItem)
2527	3617	{
2528	3618	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2529	3619	{
..	..	@@ -2533,7 +3623,7 @@
2533	3623
2534	3624	refreshContents();
2535	3625	} else
2536		- if (event.getSource() == repairParentItem)
	3626	+ if (source == repairParentItem)
2537	3627	{
2538	3628	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2539	3629	{
..	..	@@ -2547,7 +3637,7 @@
2547	3637
2548	3638	refreshContents();
2549	3639	} else
2550		- if (event.getSource() == repairShadowItem)
	3640	+ if (source == repairShadowItem)
2551	3641	{
2552	3642	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2553	3643	{
..	..	@@ -2561,7 +3651,7 @@
2561	3651
2562	3652	refreshContents();
2563	3653	} else
2564		- if (event.getSource() == sortbysizeItem)
	3654	+ if (source == sortbysizeItem)
2565	3655	{
2566	3656	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2567	3657	{
..	..	@@ -2573,7 +3663,7 @@
2573	3663	ResetModel();
2574	3664	refreshContents();
2575	3665	} else
2576		- if (event.getSource() == sortbynameItem)
	3666	+ if (source == sortbynameItem)
2577	3667	{
2578	3668	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2579	3669	{
..	..	@@ -2585,7 +3675,7 @@
2585	3675	ResetModel();
2586	3676	refreshContents();
2587	3677	} else
2588		- if (event.getSource() == attachPigmentItem)
	3678	+ if (source == attachPigmentItem)
2589	3679	{
2590	3680	String texture = GetFile("Attach pigment");
2591	3681	Object3D obj;
..	..	@@ -2597,7 +3687,7 @@
2597	3687
2598	3688	refreshContents();
2599	3689	} else
2600		- if (event.getSource() == detachPigmentItem)
	3690	+ if (source == detachPigmentItem)
2601	3691	{
2602	3692	Object3D obj;
2603	3693	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2608,7 +3698,7 @@
2608	3698
2609	3699	refreshContents();
2610	3700	} else
2611		- if (event.getSource() == attachBumpItem)
	3701	+ if (source == attachBumpItem)
2612	3702	{
2613	3703	String texture = GetFile("Attach bump");
2614	3704	Object3D obj;
..	..	@@ -2620,18 +3710,18 @@
2620	3710
2621	3711	refreshContents();
2622	3712	} else
2623		- if (event.getSource() == detachBumpItem)
	3713	+ if (source == detachBumpItem)
2624	3714	{
2625	3715	Object3D obj;
2626	3716	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2627	3717	{
2628	3718	obj = (Object3D)e.nextElement();
2629		- obj.SetBumpTexture(null);
	3719	+ obj.ResetBumpTexture();
2630	3720	}
2631	3721
2632	3722	refreshContents();
2633	3723	} else
2634		- if (event.getSource() == pigmentBumpItem)
	3724	+ if (source == pigmentBumpItem)
2635	3725	{
2636	3726	Object3D obj;
2637	3727	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2642,159 +3732,233 @@
2642	3732
2643	3733	refreshContents();
2644	3734	} else
2645		- if (event.getSource() == flashSelectionButton)
	3735	+ if (source == embedTexturesItem)
	3736	+ {
	3737	+ Object3D obj;
	3738	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3739	+ {
	3740	+ obj = (Object3D)e.nextElement();
	3741	+ obj.EmbedTextures(true);
	3742	+ }
	3743	+
	3744	+ refreshContents();
	3745	+ } else
	3746	+ if (source == deEmbedTexturesItem)
	3747	+ {
	3748	+ Object3D obj;
	3749	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3750	+ {
	3751	+ obj = (Object3D)e.nextElement();
	3752	+ obj.EmbedTextures(false);
	3753	+ }
	3754	+
	3755	+ CameraPane.texturepigment.clear();
	3756	+ CameraPane.texturebump.clear();
	3757	+
	3758	+ refreshContents();
	3759	+ } else
	3760	+ if (source == flashSelectionButton)
2646	3761	{
2647	3762	CameraPane.flash = true;
2648	3763	refreshContents();
2649	3764	} else
2650		- if (event.getSource() == oneButton)
	3765	+ if (source == oneButton)
2651	3766	{
2652	3767	} else
2653		- if (event.getSource() == twoButton)
	3768	+ if (source == twoButton)
2654	3769	{
2655	3770	radio.layout = twoButton;
2656		- // bug
2657		- //gridPanel.setDividerLocation(1.0);
2658		- //bigPanel.setDividerLocation(0.0);
2659		- bigThree.remove(scenePanel);
2660		- bigThree.remove(centralPanel);
2661		- bigThree.remove(XYZPanel);
2662		- aWindowConstraints.gridx = 0;
2663		- aWindowConstraints.gridy = 0;
2664		- aWindowConstraints.gridwidth = 1;
2665		- // aConstraints.gridheight = 3;
2666		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2667		- aWindowConstraints.weightx = 0;
2668		- aWindowConstraints.weighty = 1;
2669		- //bigThree.add(jtp, aWindowConstraints);
2670		- aWindowConstraints.weightx = 1;
2671		- aWindowConstraints.gridwidth = 3;
2672		- // aConstraints.gridheight = 3;
2673		- aWindowConstraints.gridx = 1;
2674		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2675		- bigThree.add(centralPanel, aWindowConstraints);
2676		- aWindowConstraints.weightx = 0;
2677		- aWindowConstraints.gridx = 4;
2678		- aWindowConstraints.gridwidth = 1;
2679		- // aConstraints.gridheight = 3;
2680		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2681		- //bigThree.add(XYZPanel, aWindowConstraints);
2682		- bigThree.revalidate();
	3771	+
	3772	+ if (CameraPane.FULLSCREEN)
	3773	+ fullscreenLayout = radio.layout;
	3774	+
	3775	+ Show3DView();
	3776	+
	3777	+ cameraView.requestFocusInWindow();
	3778	+
	3779	+// refreshContents(true);
	3780	+//
	3781	+// try
	3782	+// {
	3783	+// java.awt.Robot bot = new java.awt.Robot();
	3784	+// int mask = InputEvent.BUTTON1_MASK;
	3785	+// bot.mouseMove(100, 100);
	3786	+// bot.mousePress(mask);
	3787	+// bot.mouseRelease(mask);
	3788	+// }
	3789	+// catch (Exception e)
	3790	+// {
	3791	+//
	3792	+// }
	3793	+
2683	3794	} else
2684		- if (event.getSource() == threeButton)
	3795	+ if (source == threeButton)
2685	3796	{
2686	3797	radio.layout = threeButton;
2687		- bigThree.remove(scenePanel);
2688		- bigThree.remove(centralPanel);
2689		- bigThree.remove(XYZPanel);
2690		- aWindowConstraints.gridx = 0;
2691		- aWindowConstraints.gridy = 0;
2692		- aWindowConstraints.gridwidth = 1;
2693		- // aConstraints.gridheight = 3;
2694		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2695		- aWindowConstraints.weightx = 0;
2696		- aWindowConstraints.weighty = 1;
2697		- //bigThree.add(jtp, aWindowConstraints);
2698		- aWindowConstraints.weightx = 1;
2699		- aWindowConstraints.gridwidth = 3;
2700		- // aConstraints.gridheight = 3;
2701		- aWindowConstraints.gridx = 1;
2702		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2703		- bigThree.add(centralPanel, aWindowConstraints);
2704		- aWindowConstraints.weightx = 0;
2705		- aWindowConstraints.gridx = 4;
2706		- aWindowConstraints.gridwidth = 1;
2707		- // aConstraints.gridheight = 3;
2708		- aConstraints.fill = GridBagConstraints.VERTICAL;
2709		- bigThree.add(XYZPanel, aWindowConstraints);
2710		- bigThree.revalidate();
	3798	+
	3799	+ if (CameraPane.FULLSCREEN)
	3800	+ fullscreenLayout = radio.layout;
	3801	+
	3802	+// bigThree.remove(scenePanel);
	3803	+// bigThree.remove(centralPanel);
	3804	+// bigThree.remove(XYZPanel);
	3805	+// aWindowConstraints.gridx = 0;
	3806	+// aWindowConstraints.gridy = 0;
	3807	+// aWindowConstraints.gridwidth = 1;
	3808	+// // aConstraints.gridheight = 3;
	3809	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3810	+// aWindowConstraints.weightx = 0;
	3811	+// aWindowConstraints.weighty = 1;
	3812	+// //bigThree.add(jtp, aWindowConstraints);
	3813	+// aWindowConstraints.weightx = 1;
	3814	+// aWindowConstraints.gridwidth = 3;
	3815	+// // aConstraints.gridheight = 3;
	3816	+// aWindowConstraints.gridx = 1;
	3817	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3818	+// bigThree.add(centralPanel, aWindowConstraints);
	3819	+// aWindowConstraints.weightx = 0;
	3820	+// aWindowConstraints.gridx = 4;
	3821	+// aWindowConstraints.gridwidth = 1;
	3822	+// // aConstraints.gridheight = 3;
	3823	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	3824	+// bigThree.add(XYZPanel, aWindowConstraints);
	3825	+// bigThree.validate();
	3826	+// scenePanel.setVisible(false);
	3827	+// centralPanel.setVisible(true);
	3828	+// XYZPanel.setVisible(true);
	3829	+ bigThree.ClearUI();
	3830	+ bigThree.add(scenePanel);
	3831	+ bigThree.add(centralPanel);
	3832	+ bigThree.FlushUI();
	3833	+
	3834	+ cameraView.requestFocusInWindow();
2711	3835	} else
2712		- if (event.getSource() == fourButton)
	3836	+ if (source == fourButton)
2713	3837	{
2714	3838	radio.layout = fourButton;
2715		- bigThree.remove(scenePanel);
2716		- bigThree.remove(centralPanel);
2717		- bigThree.remove(XYZPanel);
2718		- aWindowConstraints.gridx = 0;
2719		- aWindowConstraints.gridy = 0;
2720		- aWindowConstraints.gridwidth = 1;
2721		- // aWindowConstraints.gridheight = 3;
2722		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2723		- aWindowConstraints.weightx = 1;
2724		- aWindowConstraints.weighty = 1;
2725		- bigThree.add(scenePanel, aWindowConstraints);
2726		- aWindowConstraints.weightx = 1;
2727		- aWindowConstraints.gridwidth = 3;
2728		- // aConstraints.gridheight = 3;
2729		- aWindowConstraints.gridx = 1;
2730		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2731		- //bigThree.add(cameraPanel, aWindowConstraints);
2732		- aWindowConstraints.weightx = 0;
2733		- aWindowConstraints.gridx = 4;
2734		- aWindowConstraints.gridwidth = 1;
2735		- // aWindowConstraints.gridheight = 3;
2736		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2737		- //bigThree.add(XYZPanel, aWindowConstraints);
2738		- bigThree.revalidate();
	3839	+
	3840	+ if (CameraPane.FULLSCREEN)
	3841	+ fullscreenLayout = radio.layout;
	3842	+
	3843	+// bigThree.remove(scenePanel);
	3844	+// bigThree.remove(centralPanel);
	3845	+// bigThree.remove(XYZPanel);
	3846	+// aWindowConstraints.gridx = 0;
	3847	+// aWindowConstraints.gridy = 0;
	3848	+// aWindowConstraints.gridwidth = 1;
	3849	+// // aWindowConstraints.gridheight = 3;
	3850	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3851	+// aWindowConstraints.weightx = 1;
	3852	+// aWindowConstraints.weighty = 1;
	3853	+// bigThree.add(scenePanel, aWindowConstraints);
	3854	+// aWindowConstraints.weightx = 1;
	3855	+// aWindowConstraints.gridwidth = 3;
	3856	+// // aConstraints.gridheight = 3;
	3857	+// aWindowConstraints.gridx = 1;
	3858	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3859	+// //bigThree.add(cameraPanel, aWindowConstraints);
	3860	+// aWindowConstraints.weightx = 0;
	3861	+// aWindowConstraints.gridx = 4;
	3862	+// aWindowConstraints.gridwidth = 1;
	3863	+// // aWindowConstraints.gridheight = 3;
	3864	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3865	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3866	+// bigThree.validate();
	3867	+// scenePanel.setVisible(true);
	3868	+// centralPanel.setVisible(false);
	3869	+// XYZPanel.setVisible(false);
	3870	+ bigThree.ClearUI();
	3871	+ bigThree.add(scenePanel);
	3872	+ bigThree.FlushUI();
	3873	+
	3874	+ cameraView.requestFocusInWindow();
2739	3875	} else
2740		- if (event.getSource() == sixButton)
	3876	+ if (source == sixButton)
2741	3877	{
2742	3878	radio.layout = sixButton;
2743		- bigThree.remove(scenePanel);
2744		- bigThree.remove(centralPanel);
2745		- bigThree.remove(XYZPanel);
2746		- aWindowConstraints.gridx = 0;
2747		- aWindowConstraints.gridy = 0;
2748		- aWindowConstraints.gridwidth = 1;
2749		- // aConstraints.gridheight = 3;
2750		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2751		- aWindowConstraints.weightx = 0;
2752		- aWindowConstraints.weighty = 1;
2753		- bigThree.add(scenePanel, aWindowConstraints);
2754		- aWindowConstraints.weightx = 1;
2755		- aWindowConstraints.gridwidth = 3;
2756		- // aWindowConstraints.gridheight = 3;
2757		- aWindowConstraints.gridx = 1;
2758		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2759		- bigThree.add(centralPanel, aWindowConstraints);
2760		- aWindowConstraints.weightx = 0;
2761		- aWindowConstraints.gridx = 4;
2762		- aWindowConstraints.gridwidth = 1;
2763		- // aWindowConstraints.gridheight = 3;
2764		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2765		- //bigThree.add(XYZPanel, aConstraints);
2766		- bigThree.revalidate();
	3879	+
	3880	+ if (CameraPane.FULLSCREEN)
	3881	+ fullscreenLayout = radio.layout;
	3882	+
	3883	+// bigThree.remove(scenePanel);
	3884	+// bigThree.remove(centralPanel);
	3885	+// bigThree.remove(XYZPanel);
	3886	+// aWindowConstraints.gridx = 0;
	3887	+// aWindowConstraints.gridy = 0;
	3888	+// aWindowConstraints.gridwidth = 1;
	3889	+// // aConstraints.gridheight = 3;
	3890	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3891	+// aWindowConstraints.weightx = 0;
	3892	+// aWindowConstraints.weighty = 1;
	3893	+// bigThree.add(scenePanel, aWindowConstraints);
	3894	+// aWindowConstraints.weightx = 1;
	3895	+// aWindowConstraints.gridwidth = 3;
	3896	+// // aWindowConstraints.gridheight = 3;
	3897	+// aWindowConstraints.gridx = 1;
	3898	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3899	+// bigThree.add(centralPanel, aWindowConstraints);
	3900	+// aWindowConstraints.weightx = 0;
	3901	+// aWindowConstraints.gridx = 4;
	3902	+// aWindowConstraints.gridwidth = 1;
	3903	+// // aWindowConstraints.gridheight = 3;
	3904	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3905	+// //bigThree.add(XYZPanel, aConstraints);
	3906	+// bigThree.validate();
	3907	+// scenePanel.setVisible(true);
	3908	+// centralPanel.setVisible(true);
	3909	+// XYZPanel.setVisible(false);
	3910	+ bigThree.ClearUI();
	3911	+ bigThree.add(centralPanel);
	3912	+ bigThree.add(scenePanel);
	3913	+ bigThree.FlushUI();
	3914	+
	3915	+ cameraView.requestFocusInWindow();
2767	3916	} else
2768		- if (event.getSource() == sevenButton)
	3917	+ if (source == sevenButton)
2769	3918	{
2770	3919	radio.layout = sevenButton;
2771		- bigThree.remove(scenePanel);
2772		- bigThree.remove(centralPanel);
2773		- bigThree.remove(XYZPanel);
2774		- aWindowConstraints.gridx = 0;
2775		- aWindowConstraints.gridy = 0;
2776		- aWindowConstraints.gridwidth = 1;
2777		- // aWindowConstraints.gridheight = 3;
2778		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2779		- aWindowConstraints.weightx = 0;
2780		- aWindowConstraints.weighty = 1;
2781		- bigThree.add(scenePanel, aWindowConstraints);
2782		- aWindowConstraints.weightx = 1;
2783		- aWindowConstraints.gridwidth = 3;
2784		- // aWindowConstraints.gridheight = 3;
2785		- aWindowConstraints.gridx = 1;
2786		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2787		- bigThree.add(centralPanel, aWindowConstraints);
2788		- aWindowConstraints.weightx = 0;
2789		- aWindowConstraints.gridx = 4;
2790		- aWindowConstraints.gridwidth = 1;
2791		- // aConstraints.gridheight = 3;
2792		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2793		- bigThree.add(XYZPanel, aWindowConstraints);
2794		- bigThree.revalidate();
	3920	+
	3921	+ if (CameraPane.FULLSCREEN)
	3922	+ fullscreenLayout = radio.layout;
	3923	+
	3924	+// bigThree.remove(scenePanel);
	3925	+// bigThree.remove(centralPanel);
	3926	+// bigThree.remove(XYZPanel);
	3927	+// aWindowConstraints.gridx = 0;
	3928	+// aWindowConstraints.gridy = 0;
	3929	+// aWindowConstraints.gridwidth = 1;
	3930	+// // aWindowConstraints.gridheight = 3;
	3931	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3932	+// aWindowConstraints.weightx = 0;
	3933	+// aWindowConstraints.weighty = 1;
	3934	+// bigThree.add(scenePanel, aWindowConstraints);
	3935	+// aWindowConstraints.weightx = 1;
	3936	+// aWindowConstraints.gridwidth = 3;
	3937	+// // aWindowConstraints.gridheight = 3;
	3938	+// aWindowConstraints.gridx = 1;
	3939	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3940	+// bigThree.add(centralPanel, aWindowConstraints);
	3941	+// aWindowConstraints.weightx = 0;
	3942	+// aWindowConstraints.gridx = 4;
	3943	+// aWindowConstraints.gridwidth = 1;
	3944	+// // aConstraints.gridheight = 3;
	3945	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3946	+// bigThree.add(XYZPanel, aWindowConstraints);
	3947	+// bigThree.validate();
	3948	+// scenePanel.setVisible(true);
	3949	+// centralPanel.setVisible(true);
	3950	+// XYZPanel.setVisible(true);
	3951	+ bigThree.ClearUI();
	3952	+ bigThree.add(scenePanel);
	3953	+ bigThree.add(centralPanel);
	3954	+ bigThree.add(XYZPanel);
	3955	+ bigThree.FlushUI();
	3956	+
	3957	+ cameraView.requestFocusInWindow();
2795	3958	} else
2796		- if (event.getSource() == rootButton)
	3959	+ if (source == rootButton)
2797	3960	{
	3961	+ Replace();
2798	3962	Object3D obj;
2799	3963	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2800	3964	{
..	..	@@ -2803,66 +3967,87 @@
2803	3967	EditObject(obj);
2804	3968	}
2805	3969
	3970	+ cameraView.requestFocusInWindow();
2806	3971	refreshContents(true);
2807	3972	} else
2808		- if (event.getSource() == closeButton)
	3973	+ if (source == closeButton)
2809	3974	{
2810	3975	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	3976	+ Replace();
	3977	+
2811	3978	cRadio ab;
2812	3979	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2813	3980	{
2814	3981	ab = (cRadio)e.nextElement();
2815		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3982	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2816	3983	{
	3984	+ // Patch to avoid bug with transparency.
	3985	+ if (!ab.hadMaterial)
	3986	+ {
	3987	+ ab.object.material = null;
	3988	+ }
	3989	+
2817	3990	buttonGroup.remove(ab);
2818	3991	radioPanel.remove(ab);
2819	3992
2820		- ab.GetObject().editWindow = null;
	3993	+ //ab.GetObject().editWindow = null;
	3994	+ ab.GetObject().manipWindow = null;
2821	3995	// ab.GetObject().objectUI = null; // ?????????
2822	3996
2823	3997	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2824	3998	break;
2825	3999	}
2826	4000	}
	4001	+
	4002	+ cameraView.requestFocusInWindow();
2827	4003	refreshContents(true);
2828	4004	} else
2829		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	4005	+ if (source == editItem \|\| source == editButton)
2830	4006	{
	4007	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4008	+ {
	4009	+ Object3D child = (Object3D)e.nextElement();
	4010	+ child.pinned = true;
	4011	+ }
	4012	+
2831	4013	EditSelection(false);
2832	4014	} else
2833		- if (event.getSource() == uneditButton)
	4015	+ if (source == uneditButton)
2834	4016	{
2835	4017	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2836	4018	{
2837	4019	Object3D child = (Object3D)e.nextElement();
2838	4020	if(child.editWindow != null)
2839		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4021	+ child.pinned = false;
2840	4022	child.CloseUI();
2841	4023	listUI.remove(child);
	4024	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2842	4025
2843		- child.editWindow = null; // ???????????
	4026	+ //child.editWindow = null; // ???????????
2844	4027	}
2845		- objEditor.ctrlPanel.revalidate();
	4028	+ objEditor.ctrlPanel.FlushUI();
2846	4029	//objEditor.jTree.clearSelection();
2847	4030	//objEditor.ResetSliders();
2848	4031	refreshContents(true);
2849	4032	} else
2850		- if (event.getSource() == clearPanelButton)
	4033	+ if (source == clearPanelButton)
2851	4034	{
2852	4035	assert(copy == group);
2853	4036	//copy.ClearUI();
2854	4037	for (Object3D obj : listUI)
2855	4038	{
	4039	+ obj.pinned = false;
2856	4040	obj.CloseUI();
2857	4041	}
2858	4042	listUI.clear();
	4043	+ SetPinStates(group.selection.size() > 0);
2859	4044	refreshContents(true);
2860	4045	} else
2861		- if (event.getSource() == allParamsButton)
	4046	+ if (source == allParamsButton)
2862	4047	{
2863	4048	assert(copy == group);
2864	4049
2865		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4050	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2866	4051
2867	4052	for (Object3D obj : listUI)
2868	4053	{
..	..	@@ -2879,19 +4064,21 @@
2879	4064
2880	4065	refreshContents(true);
2881	4066	} else
2882		- if (event.getSource() == unselectButton)
	4067	+ if (source == unselectButton)
2883	4068	{
2884	4069	objEditor.jTree.clearSelection();
2885	4070	// ?? oct 2012 GrafreeD.clipboard.clear();
2886	4071	objEditor.ResetSliders();
2887	4072	refreshContents(true);
2888	4073	} else
2889		- if(event.getSource() instanceof cRadio)
	4074	+ if(source instanceof cRadio)
2890	4075	{
	4076	+ Replace();
	4077	+
2891	4078	group.parent = keepparent;
2892	4079	group.attributes = 0;
2893	4080	//group.editWindow = null;
2894		- /cRadio/ radio = (cRadio)event.getSource();
	4081	+ /cRadio/ radio = (cRadio)source;
2895	4082	Object3D obj = radio.GetObject();
2896	4083	System.out.println("Edit " + obj);
2897	4084	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2911,6 +4098,7 @@
2911	4098	}
2912	4099
2913	4100	copy = group;
	4101	+
2914	4102	//Globals.theRenderer.object = group;
2915	4103	if(!useclient)
2916	4104	{
..	..	@@ -2926,20 +4114,72 @@
2926	4114	frontView.object = group;
2927	4115	sideView.object = group;
2928	4116	}
2929		- group.editWindow = this;
	4117	+
	4118	+// fix "+" issue
	4119	+ //group.editWindow = this;
	4120	+ group.manipWindow = this;
	4121	+
2930	4122	/*
2931	4123	currentLayout = radio.layout;
2932	4124	if (currentLayout == null)
2933	4125	currentLayout = sevenButton;
2934	4126	*/
2935	4127	radio.layout.doClick();
	4128	+
	4129	+ assert(copy instanceof Composite);
	4130	+
	4131	+ if (copy.versionlist == null)
	4132	+ {
	4133	+ copy.versionindex = -1;
	4134	+
	4135	+ // Cannot work with loops
	4136	+ // To fix this issue, we first mark all nodes above the root,
	4137	+ // and check if any of these nodes are reachable below the root.
	4138	+ Grafreed.grafreed.universe.TagObjects(copy, true);
	4139	+
	4140	+ if (!copy.HasTags())
	4141	+ {
	4142	+ copy.versionlist = new Object3D[100];
	4143	+
	4144	+ Save(true);
	4145	+ }
	4146	+
	4147	+ Grafreed.grafreed.universe.TagObjects(copy, false);
	4148	+ }
	4149	+
	4150	+ SetVersionStates();
	4151	+
	4152	+ ClearUnpinned();
	4153	+
	4154	+ //Grafreed.Assert(group != null);
	4155	+ //Grafreed.Assert(group.selection != null);
	4156	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4157	+ if (group.selection == null \|\| group.selection.size() == 1)
	4158	+ EditSelection(false);
2936	4159	keepparent = group.parent;
2937	4160	// PARENT = NULL or not???
2938	4161	//group.parent = null; // ROOT
2939	4162	//group.attributes = -1;
2940	4163	ResetModel();
	4164	+
	4165	+ cameraView.requestFocusInWindow();
2941	4166	refreshContents(true);
2942		- }
	4167	+ } else if (event.getSource() == editCameraItem)
	4168	+ {
	4169	+ cameraView.ProtectCamera();
	4170	+ cameraView.requestFocusInWindow();
	4171	+ cameraView.repaint();
	4172	+ return;
	4173	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	4174	+ {
	4175	+ cameraView.RevertCamera();
	4176	+ cameraView.requestFocusInWindow();
	4177	+ cameraView.repaint();
	4178	+ return;
	4179	+ // } else if (event.getSource() == textureButton)
	4180	+ // {
	4181	+ // return; // true;
	4182	+ }
2943	4183	else
2944	4184	{
2945	4185	//return super.action(event, arg);
..	..	@@ -2948,7 +4188,6 @@
2948	4188	}
2949	4189
2950	4190	boolean useclient = false;
2951		- cRadio radio;
2952	4191
2953	4192	void ToggleRoot()
2954	4193	{
..	..	@@ -3000,6 +4239,28 @@
3000	4239	refreshContents();
3001	4240	}
3002	4241
	4242	+ void TransformChildren()
	4243	+ {
	4244	+ Object3D obj;
	4245	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4246	+ {
	4247	+ obj = (Object3D)e.nextElement();
	4248	+ obj.KeepTextureMatrices();
	4249	+ obj.TransformChildren();
	4250	+ obj.RestoreTextureMatrices();
	4251	+
	4252	+// if (obj.parent == null)
	4253	+// {
	4254	+// System.out.println("NULL PARENT!");
	4255	+// new Exception().printStackTrace();
	4256	+// }
	4257	+// else
	4258	+// TouchTransform(obj);
	4259	+// //obj.parent.Touch();
	4260	+ }
	4261	+
	4262	+ refreshContents();
	4263	+ }
3003	4264
3004	4265	void ResetTransform()
3005	4266	{
..	..	@@ -3031,7 +4292,7 @@
3031	4292	TouchTransform(obj);
3032	4293	continue;
3033	4294	}
3034		- if ((mask&2) != 0) // Scale
	4295	+ if ((mask&2) != 0) // Scale/rotation
3035	4296	{
3036	4297	obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
3037	4298	obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
..	..	@@ -3039,10 +4300,6 @@
3039	4300	obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
3040	4301	obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
3041	4302	obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
3042		- }
3043		- if ((mask&4) != 0) // Rotation
3044		- {
3045		- // ?
3046	4303	}
3047	4304	if ((mask&1) != 0) // Translation
3048	4305	{
..	..	@@ -3112,7 +4369,7 @@
3112	4369	refreshContents();
3113	4370	}
3114	4371
3115		- void ResetCentroid()
	4372	+ void ResetCentroid(boolean full)
3116	4373	{
3117	4374	Object3D obj;
3118	4375	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3127,12 +4384,16 @@
3127	4384	LA.matIdentity(Object3D.mat);
3128	4385	obj.getBounds(minima, maxima, false);
3129	4386	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3130		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	4387	+ if (full)
	4388	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3131	4389	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3132	4390	obj.TransformMesh(Object3D.mat);
	4391	+
3133	4392	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3134		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	4393	+ if (full)
	4394	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3135	4395	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	4396	+
3136	4397	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3137	4398	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3138	4399	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3161,7 +4422,8 @@
3161	4422
3162	4423	int size = obj.MemorySize();
3163	4424
3164		- System.err.println((size/1024) + " KB is the size of " + obj);
	4425	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4426	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3165	4427	}
3166	4428	}
3167	4429	catch (Exception e)
..	..	@@ -3198,9 +4460,9 @@
3198	4460	obj = (Object3D)e.nextElement();
3199	4461
3200	4462	System.out.println("Object is: " + obj);
3201		- GrafreeD.AnalyzeObject(obj);
	4463	+ Grafreed.AnalyzeObject(obj);
3202	4464	System.out.println("Boundary rep: " + obj.bRep);
3203		- GrafreeD.AnalyzeObject(obj.bRep);
	4465	+ Grafreed.AnalyzeObject(obj.bRep);
3204	4466
3205	4467	// System.err.println((size/1024) + " KB is the size of " + obj);
3206	4468	}
..	..	@@ -3242,6 +4504,13 @@
3242	4504	void GenNormals(boolean crease)
3243	4505	{
3244	4506	group.GenNormalsS(crease);
	4507	+
	4508	+ refreshContents();
	4509	+ }
	4510	+
	4511	+ void GenNormalsMESH()
	4512	+ {
	4513	+ group.GenNormalsMeshS();
3245	4514
3246	4515	refreshContents();
3247	4516	}
..	..	@@ -3414,8 +4683,8 @@
3414	4683
3415	4684	void ParseVertices()
3416	4685	{
3417		- boolean epsequal = GrafreeD.epsequal;
3418		- GrafreeD.epsequal = true;
	4686	+ boolean epsequal = Grafreed.epsequal;
	4687	+ Grafreed.epsequal = true;
3419	4688
3420	4689	for (int i=0; i<group.selection.size(); i++)
3421	4690	{
..	..	@@ -3440,7 +4709,7 @@
3440	4709	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3441	4710	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3442	4711
3443		- g.add(GrafreeD.clipboard);
	4712	+ g.add(Grafreed.clipboard);
3444	4713
3445	4714	buffer.add(g);
3446	4715	}
..	..	@@ -3455,7 +4724,7 @@
3455	4724	makeSomething(buffer, i==group.selection.size()-1);
3456	4725	}
3457	4726
3458		- GrafreeD.epsequal = epsequal;
	4727	+ Grafreed.epsequal = epsequal;
3459	4728
3460	4729	refreshContents();
3461	4730	}
..	..	@@ -3473,7 +4742,16 @@
3473	4742	String pigment = Object3D.GetPigment(tex);
3474	4743	//String bump = Object3D.GetBump(tex);
3475	4744
3476		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4745	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4746	+
	4747	+ try
	4748	+ {
	4749	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
	4750	+ }
	4751	+ catch (Exception e)
	4752	+ {
	4753	+ System.err.println("FAIL: " + node);
	4754	+ }
3477	4755
3478	4756	double s = v.s;
3479	4757
..	..	@@ -3561,11 +4839,11 @@
3561	4839
3562	4840	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3563	4841
3564		- boolean random = CameraPane.RANDOM;
3565		- CameraPane.RANDOM = false; // parse all random nodes
	4842	+ boolean random = CameraPane.SWITCH;
	4843	+ CameraPane.SWITCH = false; // parse all random nodes
3566	4844	lowres.linkVerticesThis(null);
3567	4845	lowres.linkVerticesThis(sn);
3568		- CameraPane.RANDOM = random;
	4846	+ CameraPane.SWITCH = random;
3569	4847
3570	4848	System.err.flush();
3571	4849
..	..	@@ -3605,7 +4883,7 @@
3605	4883	return;
3606	4884
3607	4885	Object3D poses = group.selection.get(0);
3608		- Object3D ref = GrafreeD.clipboard.get(0);
	4886	+ Object3D ref = Grafreed.clipboard.get(0);
3609	4887
3610	4888	Object3D newgroup = new Object3D("Po:" + poses.name);
3611	4889
..	..	@@ -3799,9 +5077,9 @@
3799	5077
3800	5078	void ClipMesh()
3801	5079	{
3802		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	5080	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3803	5081	{
3804		- Object3D content = GrafreeD.clipboard.get(0);
	5082	+ Object3D content = Grafreed.clipboard.get(0);
3805	5083
3806	5084	if (content instanceof cGroup && ((cGroup)content).transientlink )
3807	5085	content = ((cGroup)content).get(0);
..	..	@@ -3810,7 +5088,7 @@
3810	5088	// {
3811	5089	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3812	5090	// }
3813		- group.selection.ClipMesh(GrafreeD.clipboard);
	5091	+ group.selection.ClipMesh(Grafreed.clipboard);
3814	5092	}
3815	5093	// group.selection.ClipMesh(GrafreeD.clipboard);
3816	5094	System.out.println("DONE.");
..	..	@@ -3857,6 +5135,18 @@
3857	5135	void MarkLeaves(boolean hide)
3858	5136	{
3859	5137	group.selection.MarkLeaves(hide);
	5138	+ refreshContents();
	5139	+ }
	5140	+
	5141	+ void RewindLeaves(boolean hide)
	5142	+ {
	5143	+ group.selection.RewindLeaves(hide);
	5144	+ refreshContents();
	5145	+ }
	5146	+
	5147	+ void RandomLeaves(boolean hide)
	5148	+ {
	5149	+ group.selection.RandomLeaves(hide);
3860	5150	refreshContents();
3861	5151	}
3862	5152
..	..	@@ -3931,28 +5221,25 @@
3931	5221	// }
3932	5222	// }
3933	5223
3934		- static boolean allparams = true;
3935		-
3936		- static Vector<Object3D> listUI = new Vector<Object3D>();
3937		-
3938	5224	void EditSelection(boolean newWindow)
3939	5225	{
	5226	+ if (group.selection == null)
	5227	+ {
	5228	+ EditElement(group, newWindow); // ? new
	5229	+ return;
	5230	+ }
	5231	+
3940	5232	// aConstraints.gridy = 0;
3941	5233	for (int i=0; i<group.selection.size(); i++)
3942	5234	{
3943	5235	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
3944	5236	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3945		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5237	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3946	5238
3947	5239	Object3D elem = (Object3D)group.selection.elementAt(i);
3948		- if(elem != group)
	5240	+ if(elem != group \|\| !newWindow)
3949	5241	{
3950		- // if (!(elem instanceof Composite))
3951		- // newWindow = false;
3952		- listUI.add(elem);
3953		- elem.openEditWindow(this, newWindow); //, false);
3954		- System.out.println("edit : " + elem);
3955		- elem.editWindow.refreshContents(true); // ? new
	5242	+ EditElement(elem, newWindow); // ? new
3956	5243	}
3957	5244	}
3958	5245	}
..	..	@@ -4015,9 +5302,7 @@
4015	5302
4016	5303	freezemodel = false;
4017	5304	}
4018		-
4019		- boolean flashIt = true;
4020		-
	5305	+
4021	5306	public void valueChanged(TreeSelectionEvent e)
4022	5307	//public boolean handleEvent(Event event)
4023	5308	{
..	..	@@ -4027,7 +5312,8 @@
4027	5312	//new Exception().printStackTrace();
4028	5313
4029	5314	freezemodel = true;
4030		-
	5315	+ ClearUnpinned();
	5316	+
4031	5317	/**/
4032	5318	//switch (event.id)
4033	5319	{
..	..	@@ -4035,7 +5321,6 @@
4035	5321	//case 702: // Event.LIST_DESELECT
4036	5322	group.deselectAll();
4037	5323	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4038		- objEditor.ClearInfo(); // .GetMaterial());
4039	5324	if (tps != null)
4040	5325	{
4041	5326	for (int i=0; i < tps.length; i++)
..	..	@@ -4044,33 +5329,39 @@
4044	5329
4045	5330	//if (child.parent != null)
4046	5331	//child.parent.addSelectee(child);
	5332	+ objEditor.SetMaterial(child);
4047	5333	group.addSelectee(child);
4048		- objEditor.SetMaterial(child); // .GetMaterial());
4049		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4050		- System.err.println("info : " + child.GetPath());
4051	5334	}
4052	5335	}
4053		- else
4054		- {
4055		- objEditor.SetMaterial(group); // .GetMaterial());
4056		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4057		- System.err.println("info : " + group.GetPath());
4058		- }
	5336	+// else
	5337	+// {
	5338	+// objEditor.SetMaterial(group); // .GetMaterial());
	5339	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	5340	+// System.err.println("info : " + group.GetPath());
	5341	+// }
4059	5342
4060		- objEditor.SetText(); // jan 2014
4061		-
4062		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	5343	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4063	5344	CameraPane.flash = true;
4064	5345
4065		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5346	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4066	5347	// a camera
4067	5348	{
4068		- CameraPane.camerachangeframe = 0; // don't refuse it
4069		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5349	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5350	+ {
	5351	+ CameraPane.camerachangeframe = 0; // don't refuse it
	5352	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5353	+ }
4070	5354	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4071	5355	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4072	5356	}
4073	5357
	5358	+ if (tps != null && tps.length == 1)
	5359	+ {
	5360	+ EditSelection(false);
	5361	+ }
	5362	+
	5363	+ SetPinStates(tps != null && tps.length > 0);
	5364	+
4074	5365	refreshContents();
4075	5366	//return true;
4076	5367	}
..	..	@@ -4079,6 +5370,53 @@
4079	5370
4080	5371	freezemodel = false;
4081	5372	}
	5373	+
	5374	+ void SetPinStates(boolean enabled)
	5375	+ {
	5376	+ editButton.setEnabled(enabled);
	5377	+ uneditButton.setEnabled(enabled);
	5378	+ //unselectButton.setEnabled(enabled);
	5379	+ flashSelectionButton.setEnabled(enabled);
	5380	+
	5381	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5382	+
	5383	+ boolean allComposites = true;
	5384	+
	5385	+ if (group.selection != null)
	5386	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5387	+ {
	5388	+ Object next = e.nextElement();
	5389	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5390	+ {
	5391	+ allComposites = false;
	5392	+ break;
	5393	+ }
	5394	+ }
	5395	+
	5396	+ rootButton.setEnabled(allComposites);
	5397	+ }
	5398	+
	5399	+ void refreshContents(boolean cp)
	5400	+ {
	5401	+ if (Globals.ADVANCED)
	5402	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5403	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5404	+ {
	5405	+ objEditor.ClearInfo(); // .GetMaterial());
	5406	+
	5407	+ for (int i=0; i < group.selection.Size(); i++)
	5408	+ {
	5409	+ Object3D child = (Object3D) group.selection.get(i);
	5410	+
	5411	+ objEditor.AddInfo(child, this, true);
	5412	+// System.err.println("info : " + child.GetPath());
	5413	+ }
	5414	+
	5415	+ objEditor.SetText(); // jan 2014
	5416	+ }
	5417	+
	5418	+ super.refreshContents(cp);
	5419	+ }
4082	5420
4083	5421	void linkSomething(Object3D thing)
4084	5422	{
..	..	@@ -4150,16 +5488,19 @@
4150	5488	{
4151	5489	if (group.selection.isEmpty())
4152	5490	return;
4153		- GrafreeD.clipboardIsTempGroup = false;
	5491	+
	5492	+ Grafreed.clipboardIsTempGroup = false;
4154	5493	Composite tGroup = null;
4155	5494	if (group.selection.size() > 0) // 1)
4156	5495	{
4157	5496	tGroup = new cGroup();
4158		- GrafreeD.clipboardIsTempGroup = true;
	5497	+ Grafreed.clipboardIsTempGroup = true;
4159	5498	}
4160	5499
4161	5500	if (cut)
4162	5501	{
	5502	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5503	+// Save();
4163	5504	//int indices[] = jList.getSelectedIndices();
4164	5505	//for (int i = indices.length - 1; i >= 0; i--)
4165	5506	//jList.remove(indices[i]);
..	..	@@ -4195,16 +5536,16 @@
4195	5536	//System.out.println("cut " + child);
4196	5537	//System.out.println("parent = " + child.parent);
4197	5538	// tmp.addChild(child);
4198		- if (GrafreeD.clipboardIsTempGroup)
	5539	+ if (Grafreed.clipboardIsTempGroup)
4199	5540	tGroup.add/Child/(tmp);
4200	5541	else
4201		- GrafreeD.clipboard = tmp;
	5542	+ Grafreed.clipboard = tmp;
4202	5543	}
4203	5544	else
4204		- if (GrafreeD.clipboardIsTempGroup)
	5545	+ if (Grafreed.clipboardIsTempGroup)
4205	5546	tGroup.add/Child/(child);
4206	5547	else
4207		- GrafreeD.clipboard = child;
	5548	+ Grafreed.clipboard = child;
4208	5549	}
4209	5550
4210	5551	//ResetModel();
..	..	@@ -4236,21 +5577,23 @@
4236	5577	//System.out.println("cut " + elem);
4237	5578	//System.out.println("parent = " + elem.parent);
4238	5579	// tmp.addChild(elem);
4239		- if (GrafreeD.clipboardIsTempGroup)
	5580	+ if (Grafreed.clipboardIsTempGroup)
4240	5581	tGroup.add/Child/(tmp);
4241	5582	else
4242		- GrafreeD.clipboard = tmp;
	5583	+ Grafreed.clipboard = tmp;
4243	5584	}
4244	5585	else
4245		- if (GrafreeD.clipboardIsTempGroup)
	5586	+ if (Grafreed.clipboardIsTempGroup)
4246	5587	tGroup.add/Child/(child);
4247	5588	else
4248		- GrafreeD.clipboard = child;
	5589	+ Grafreed.clipboard = child;
4249	5590	}
4250	5591
4251	5592	}
4252		- if (GrafreeD.clipboardIsTempGroup)
4253		- GrafreeD.clipboard = tGroup;
	5593	+
	5594	+ if (Grafreed.clipboardIsTempGroup)
	5595	+ Grafreed.clipboard = tGroup;
	5596	+
4254	5597	if (cut)
4255	5598	{
4256	5599	ResetModel();
..	..	@@ -4260,11 +5603,15 @@
4260	5603
4261	5604	void paste(boolean expand)
4262	5605	{
	5606	+ if (Globals.REPLACEONMAKE)
	5607	+ Save();
	5608	+ boolean keep = Globals.REPLACEONMAKE;
	5609	+ Globals.REPLACEONMAKE = false;
4263	5610	// if (GrafreeD.clipboard == null)
4264	5611	// return;
4265	5612	boolean first = true;
4266	5613
4267		- if (GrafreeD.clipboardIsTempGroup)
	5614	+ if (Grafreed.clipboardIsTempGroup)
4268	5615	{
4269	5616	Composite temp;
4270	5617
..	..	@@ -4275,7 +5622,7 @@
4275	5622	temp = (Composite)Applet3D.clipboard.deepCopy();
4276	5623	*/
4277	5624	Object3D elem;
4278		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5625	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4279	5626	{
4280	5627	Object3D child = (Object3D)e.nextElement();
4281	5628
..	..	@@ -4309,21 +5656,22 @@
4309	5656	//Object3D cb = Applet3D.clipboard;
4310	5657	//temp.addChild(cb);
4311	5658	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4312		- assert(GrafreeD.clipboard.parent == null);
4313		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4314		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4315		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4316		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	5659	+ assert(Grafreed.clipboard.parent == null);
	5660	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5661	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5662	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5663	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4317	5664	else
4318		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4319		- GrafreeD.clipboard.get(0).parent = keepparent;
	5665	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5666	+ Grafreed.clipboard.get(0).parent = keepparent;
4320	5667	}
4321	5668
	5669	+ Globals.REPLACEONMAKE = keep;
4322	5670	ResetModel();
4323	5671	refreshContents();
4324	5672	}
4325	5673
4326		- void pasteInto(boolean copyit)
	5674	+ void pasteInto(boolean copyit, boolean clone)
4327	5675	{
4328	5676	// if (GrafreeD.clipboard == null)
4329	5677	// return;
..	..	@@ -4352,15 +5700,22 @@
4352	5700	if (copyit)
4353	5701	{
4354	5702	// paste(false);
4355		- CloneClipboard(false); // sept 2014
	5703	+ if (clone)
	5704	+ {
	5705	+ CloneClipboard(false); // sept 2014
	5706	+ }
	5707	+ else
	5708	+ {
	5709	+ paste(false);
	5710	+ }
4356	5711	}
4357	5712	else
4358	5713	{
4359	5714	boolean first = true;
4360	5715
4361		- if (GrafreeD.clipboardIsTempGroup)
	5716	+ if (Grafreed.clipboardIsTempGroup)
4362	5717	{
4363		- Composite temp = (Composite)GrafreeD.clipboard;
	5718	+ Composite temp = (Composite)Grafreed.clipboard;
4364	5719	Object3D copy;
4365	5720	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4366	5721	{
..	..	@@ -4370,7 +5725,7 @@
4370	5725	}
4371	5726	} else
4372	5727	{
4373		- linkSomething(GrafreeD.clipboard); //.get(0));
	5728	+ linkSomething(Grafreed.clipboard); //.get(0));
4374	5729	}
4375	5730	}
4376	5731	}
..	..	@@ -4447,6 +5802,10 @@
4447	5802
4448	5803	void group(Object3D csg, boolean grab)
4449	5804	{
	5805	+ if (Globals.REPLACEONMAKE)
	5806	+ Save();
	5807	+ boolean keep = Globals.REPLACEONMAKE;
	5808	+ Globals.REPLACEONMAKE = false;
4450	5809	if (//false) // why??
4451	5810	!group.selection.isEmpty())
4452	5811	{
..	..	@@ -4560,10 +5919,15 @@
4560	5919	//node.add(csg);
4561	5920	//makeSomething(node);
4562	5921	makeSomething(csg);
	5922	+ Globals.REPLACEONMAKE = keep;
4563	5923	}
4564	5924
4565	5925	void Ungroup(Object3D g)
4566	5926	{
	5927	+ if (Globals.REPLACEONMAKE)
	5928	+ Save();
	5929	+ boolean keep = Globals.REPLACEONMAKE;
	5930	+ Globals.REPLACEONMAKE = false;
4567	5931	if (g instanceof HiddenObject)
4568	5932	{
4569	5933	HiddenObject h = (HiddenObject) g;
..	..	@@ -4580,6 +5944,7 @@
4580	5944	objEditor.makeSomething(g.get(i), false);
4581	5945	}
4582	5946	}
	5947	+ Globals.REPLACEONMAKE = keep;
4583	5948	}
4584	5949
4585	5950	void ungroup()
..	..	@@ -4775,21 +6140,6 @@
4775	6140	}
4776	6141	*/
4777	6142
4778		- void ImportGFD()
4779		- {
4780		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4781		- browser.show();
4782		- String filename = browser.getFile();
4783		- if (filename != null && filename.length() > 0)
4784		- {
4785		- String fullname = browser.getDirectory() + filename;
4786		-
4787		- //Object3D readobj =
4788		- objEditor.ReadGFD(fullname, objEditor);
4789		- //makeSomething(readobj);
4790		- }
4791		- }
4792		-
4793	6143	/*
4794	6144	public void Callback(Object obj)
4795	6145	{
..	..	@@ -4813,26 +6163,9 @@
4813	6163	}
4814	6164	*/
4815	6165
4816		- void ImportVRMLX3D()
4817		- {
4818		- if (GrafreeD.standAlone)
4819		- {
4820		- /**/
4821		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4822		- browser.show();
4823		- String filename = browser.getFile();
4824		- if (filename != null && filename.length() > 0)
4825		- {
4826		- String fullname = browser.getDirectory() + filename;
4827		- LoadVRMLX3D(fullname);
4828		- }
4829		- /**/
4830		- }
4831		- }
4832		-
4833	6166	String GetFile(String dialogName)
4834	6167	{
4835		- if (GrafreeD.standAlone)
	6168	+ if (Grafreed.standAlone)
4836	6169	{
4837	6170	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4838	6171	browser.show();
..	..	@@ -4896,10 +6229,48 @@
4896	6229	cButton flashSelectionButton;
4897	6230	cButton editButton;
4898	6231	cButton uneditButton;
	6232	+ JCheckBox allParamsButton;
4899	6233	cButton clearpanelButton;
4900		- cButton allParamsButton;
4901	6234	cButton unselectButton;
4902	6235
	6236	+ cButton restoreCameraButton;
	6237	+
	6238	+ cButton oneStepButton;
	6239	+
	6240	+ cButton groupButton;
	6241	+ cButton ungroupButton;
	6242	+ cButton compositeButton;
	6243	+ cButton switchButton;
	6244	+ cButton loopButton;
	6245	+ cButton textureButton;
	6246	+
	6247	+ cButton skybox1Button;
	6248	+ cButton skybox2Button;
	6249	+ cButton skybox3Button;
	6250	+ cButton skybox4Button;
	6251	+ cButton skybox5Button;
	6252	+ cButton skybox6Button;
	6253	+ cButton skybox7Button;
	6254	+
	6255	+ cButton skybox11Button;
	6256	+ cButton skybox12Button;
	6257	+ cButton skybox13Button;
	6258	+ cButton skybox14Button;
	6259	+ cButton skybox15Button;
	6260	+ cButton skybox16Button;
	6261	+ cButton skybox17Button;
	6262	+
	6263	+ cButton gridButton;
	6264	+ cButton boxButton;
	6265	+ cButton sphereButton;
	6266	+ cButton coneButton;
	6267	+ cButton torusButton;
	6268	+ cButton superButton;
	6269	+ cButton kleinButton;
	6270	+ cButton particlesButton;
	6271	+ cButton overlayButton;
	6272	+ cButton lightButton;
	6273	+
4903	6274	cButton screenfitButton;
4904	6275	cButton screenfitpointButton;
4905	6276	cButton snapobjectButton;
..	..	@@ -4911,14 +6282,6 @@
4911	6282
4912	6283	cButton setsupportButton;
4913	6284
4914		- cButton twoButton;
4915		- cButton sixButton;
4916		- cButton threeButton;
4917		- cButton sevenButton;
4918		- cButton fourButton; // full panel
4919		- cButton oneButton; // full XYZ
4920		- //cButton currentLayout;
4921		-
4922	6285	//
4923	6286	//Composite
4924	6287	Object3D // to do !!
..	..	@@ -4928,10 +6291,12 @@
4928	6291	//JTree jTree;
4929	6292	private MenuItem lookAtItem;
4930	6293	private MenuItem lookFromItem;
4931		- private MenuItem switchItem;
4932		- private MenuItem cutItem;
4933		- private MenuItem duplicateItem;
4934		- private MenuItem cloneItem;
	6294	+ private MenuItem switchViewItem;
	6295	+ private JMenuItem cutItem;
	6296	+ private MenuItem undoItem;
	6297	+ private MenuItem redoItem;
	6298	+ private JMenuItem duplicateItem;
	6299	+ private JMenuItem cloneItem;
4935	6300	private MenuItem cloneSupportItem;
4936	6301	private MenuItem overwriteGeoItem;
4937	6302	private MenuItem overwriteMatItem;
..	..	@@ -4943,7 +6308,7 @@
4943	6308	private MenuItem linkverticesItem;
4944	6309	private MenuItem relinkverticesItem;
4945	6310	private MenuItem setMasterItem;
4946		- private MenuItem resetMeshItem;
	6311	+ private MenuItem resetAllItem;
4947	6312	private MenuItem stepAllItem;
4948	6313	private MenuItem revertMeshItem;
4949	6314	private MenuItem poseMeshItem;
..	..	@@ -4952,12 +6317,13 @@
4952	6317	private MenuItem cloneGeometriesItem;
4953	6318	private MenuItem shareGeometriesItem;
4954	6319	private MenuItem mergeGeometriesItem;
4955		- private MenuItem copyItem;
	6320	+ private JMenuItem copyItem;
4956	6321	private MenuItem pasteItem;
4957		- private MenuItem pasteLinkItem;
4958		- private MenuItem pasteCloneItem;
4959		- private MenuItem pasteExpandItem;
4960		- private MenuItem clearItem;
	6322	+ private JMenuItem pasteIntoItem;
	6323	+ private JMenuItem pasteLinkItem;
	6324	+ private JMenuItem pasteCloneItem;
	6325	+ private JMenuItem pasteExpandItem;
	6326	+ private JMenuItem deleteItem;
4961	6327	private MenuItem clearAllItem;
4962	6328	private MenuItem genUVItem;
4963	6329	private MenuItem genNormalsMESHItem;
..	..	@@ -4992,6 +6358,10 @@
4992	6358	private MenuItem showleavesItem;
4993	6359	private MenuItem markleavesItem;
4994	6360	private MenuItem unmarkleavesItem;
	6361	+ private MenuItem rewindleavesItem;
	6362	+ private MenuItem unrewindleavesItem;
	6363	+ private MenuItem randomleavesItem;
	6364	+ private MenuItem unrandomleavesItem;
4995	6365
4996	6366	private MenuItem flipVItem;
4997	6367	private MenuItem unflipVItem;
..	..	@@ -5003,15 +6373,17 @@
5003	6373	private MenuItem panoTexturesItem;
5004	6374
5005	6375	private MenuItem resetCentroidItem;
5006		- private MenuItem transformgeometryItem;
	6376	+ private MenuItem resetCentroidXZItem;
5007	6377	private MenuItem resetTransformItem;
	6378	+ private MenuItem transformGeometryItem;
	6379	+ private MenuItem transformChildrenItem;
5008	6380	private MenuItem hideItem;
5009		- private MenuItem grabItem;
	6381	+ private JMenuItem grabItem;
5010	6382	private MenuItem backItem;
5011	6383	private MenuItem frontItem;
5012	6384	private MenuItem cameraItem;
5013	6385	private MenuItem compositeItem;
5014		- private MenuItem randomItem;
	6386	+ private MenuItem switchItem;
5015	6387	private MenuItem physicsItem;
5016	6388	private MenuItem frameselectorItem;
5017	6389	private MenuItem scriptNodeItem;
..	..	@@ -5019,7 +6391,7 @@
5019	6391	private MenuItem switchTransfoItem;
5020	6392	private MenuItem morphItem;
5021	6393	private MenuItem linkerItem;
5022		- private MenuItem ungroupItem;
	6394	+ private JMenuItem ungroupItem;
5023	6395	private MenuItem editItem;
5024	6396	private MenuItem openWindowItem;
5025	6397	private MenuItem editLeafItem;
..	..	@@ -5035,6 +6407,8 @@
5035	6407	private MenuItem attachBumpItem;
5036	6408	private MenuItem detachBumpItem;
5037	6409	private MenuItem pigmentBumpItem;
	6410	+ private MenuItem embedTexturesItem;
	6411	+ private MenuItem deEmbedTexturesItem;
5038	6412
5039	6413	private MenuItem particleItem;
5040	6414	private MenuItem ragdollItem;
..	..	@@ -5051,7 +6425,7 @@
5051	6425	private MenuItem blobItem;
5052	6426	private MenuItem latheItem;
5053	6427	private MenuItem bezierItem;
5054		- private MenuItem checkerItem;
	6428	+ private MenuItem overlayItem;
5055	6429	private MenuItem meshItem;
5056	6430	// private MenuItem meshGroupItem;
5057	6431	private MenuItem springItem;
..	..	@@ -5073,11 +6447,6 @@
5073	6447	private MenuItem doubleItem;
5074	6448	private MenuItem tripleItem;
5075	6449
5076		- private MenuItem importGFDItem;
5077		- private MenuItem importVRMLX3DItem;
5078		- private MenuItem import3DSItem;
5079		- private MenuItem importOBJItem;
5080		-
5081	6450	private MenuItem computeAOItem;
5082	6451	private MenuItem recompileItem;
5083	6452	private MenuItem editScriptItem;
..	..	@@ -5087,4 +6456,8 @@
5087	6456	private MenuItem analyzeItem;
5088	6457	private MenuItem dumpItem;
5089	6458	//boolean freezemodel = false;
	6459	+
	6460	+ Menu cameraMenu;
	6461	+ MenuItem editCameraItem;
	6462	+ MenuItem restoreCameraItem;
5090	6463	}