~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -12,9 +12,11 @@
12	12	import com.jme.math.Vector3f;
13	13	import com.jme.renderer.ColorRGBA;
14	14
	15	+import grafeme.ui.*;
15	16	//import buoy.widget.BFileChooser;
16	17
17	18	class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
	19	+ Grafreed.iResourceCallBack,
18	20	ObjectUI,
19	21	Runnable,
20	22	ActionListener,
..	..	@@ -22,6 +24,360 @@
22	24	DragGestureListener, DragSourceListener, DropTargetListener,
23	25	ItemListener // ListSelectionListener
24	26	{
	27	+
	28	+ public void AddSkyboxButton(String f, String s, cGridBag row)
	29	+ {
	30	+ cButton skyboxButton;
	31	+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
	32	+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
	33	+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
	34	+ skyboxButton.setToolTipText(s.equals("") ? "No background" : s);
	35	+ skyboxButton.addActionListener(new ActionListener()
	36	+ {
	37	+ @Override
	38	+ public void actionPerformed(ActionEvent e)
	39	+ {
	40	+ ChangeSkybox(path);
	41	+ }
	42	+ });
	43	+ }
	44	+
	45	+ public void AddTextureButton(String f, String c, final String t, int count, cGridBag row)
	46	+ {
	47	+ cButton textureButton;
	48	+ final String path = "textures/" + f + "/" + c + "/"; // + t;
	49	+ row.add(textureButton = GetButton(path + "icons/" + t, !Grafreed.NIMBUSLAF));
	50	+ textureButton.setToolTipText(c + count);
	51	+ textureButton.addActionListener(new ActionListener()
	52	+ {
	53	+ @Override
	54	+ public void actionPerformed(ActionEvent e)
	55	+ {
	56	+ ChangeTexture(path + t);
	57	+ }
	58	+ });
	59	+ }
	60	+
	61	+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
	62	+ {
	63	+ cGridBag tab0 = new cGridBag().setVertical(true);
	64	+
	65	+ tab0.setName("Urban");
	66	+ skyboxpanel.add(tab0);
	67	+
	68	+ cGridBag row0 = new cGridBag();
	69	+ cGridBag row1 = new cGridBag();
	70	+ cGridBag row2 = new cGridBag();
	71	+ cGridBag row3 = new cGridBag();
	72	+ cGridBag row4 = new cGridBag();
	73	+ cGridBag row5 = new cGridBag();
	74	+ cGridBag row6 = new cGridBag();
	75	+
	76	+ AddSkyboxButton("default", "", row0);
	77	+ //AddSkyboxButton("default", "cornell", row0);
	78	+ AddSkyboxButton("penguins", "dust", row0);
	79	+ AddSkyboxButton("penguins", "tropic", row0);
	80	+ AddSkyboxButton("penguins", "yonder", row0);
	81	+
	82	+ AddSkyboxButton("default", "uffizi", row1);
	83	+ AddSkyboxButton("bridge", "Bridge", row1);
	84	+ AddSkyboxButton("bridge", "Bridge2", row1);
	85	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	86	+
	87	+ AddSkyboxButton("urban", "Parliament", row2);
	88	+ AddSkyboxButton("urban", "Roundabout", row2);
	89	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	90	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	91	+
	92	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	93	+ AddSkyboxButton("urban", "UnionSquare", row3);
	94	+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
	95	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	96	+
	97	+ AddSkyboxButton("park", "Buddha", row4);
	98	+ AddSkyboxButton("park", "CNTower2", row4);
	99	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	100	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	101	+
	102	+ AddSkyboxButton("park", "Park", row5);
	103	+ AddSkyboxButton("park", "Pond", row5);
	104	+ AddSkyboxButton("park", "Skansen", row5);
	105	+ AddSkyboxButton("park", "Skansen2", row5);
	106	+
	107	+ AddSkyboxButton("park", "Skansen3", row6);
	108	+ AddSkyboxButton("park", "Skansen4", row6);
	109	+ AddSkyboxButton("park", "Skansen5", row6);
	110	+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
	111	+
	112	+ tab0.add(row0);
	113	+ tab0.add(row1);
	114	+ tab0.add(row2);
	115	+ tab0.add(row3);
	116	+ tab0.add(row4);
	117	+ tab0.add(row5);
	118	+ tab0.add(row6);
	119	+
	120	+ for (int i=5; --i>=0;)
	121	+ {
	122	+ //oe.toolboxPanel.Return();
	123	+ //tab0.add(new cGridBag());
	124	+ }
	125	+ }
	126	+
	127	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	128	+ {
	129	+ cGridBag tab0 = new cGridBag().setVertical(true);
	130	+
	131	+ tab0.setName("Nature");
	132	+ skyboxpanel.add(tab0);
	133	+
	134	+ cGridBag row0 = new cGridBag();
	135	+ cGridBag row1 = new cGridBag();
	136	+ cGridBag row2 = new cGridBag();
	137	+ cGridBag row3 = new cGridBag();
	138	+ cGridBag row4 = new cGridBag();
	139	+ cGridBag row5 = new cGridBag();
	140	+ cGridBag row6 = new cGridBag();
	141	+
	142	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	143	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	144	+ AddSkyboxButton("beach", "PalmTrees", row0);
	145	+ AddSkyboxButton("beach", "Tenerife", row0);
	146	+
	147	+ AddSkyboxButton("beach", "Tenerife2", row1);
	148	+ AddSkyboxButton("beach", "Tenerife3", row1);
	149	+ AddSkyboxButton("field", "FishPond", row1);
	150	+ AddSkyboxButton("field", "Footballfield", row1);
	151	+
	152	+ AddSkyboxButton("field", "Meadow", row2);
	153	+ AddSkyboxButton("field", "Sorsele", row2);
	154	+ AddSkyboxButton("field", "Sorsele2", row2);
	155	+ AddSkyboxButton("field", "Sorsele3", row2);
	156	+
	157	+ AddSkyboxButton("forest", "Brudslojan", row3);
	158	+ AddSkyboxButton("forest", "Langholmen2", row3);
	159	+ AddSkyboxButton("forest", "Plants", row3);
	160	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	161	+
	162	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	163	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	164	+ AddSkyboxButton("mountain", "Teide", row4);
	165	+ AddSkyboxButton("park", "Tantolunden4", row4);
	166	+
	167	+ AddSkyboxButton("park", "Stairs", row5);
	168	+ AddSkyboxButton("default", "skycube", row6);
	169	+ AddSkyboxButton("rocky", "Langholmen", row5);
	170	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	171	+
	172	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	173	+ AddSkyboxButton("default", "CloudyHills", row6);
	174	+ AddSkyboxButton("daz", "Autumn", row6);
	175	+ AddSkyboxButton("daz", "MountainTrail", row6);
	176	+ /*
	177	+Autumn
	178	+Greenlands
	179	+MountainTrail
	180	+Oasis
	181	+TheRock
	182	+TopOfTheWorld
	183	+Winter
	184	+ */
	185	+
	186	+ tab0.add(row0);
	187	+ tab0.add(row1);
	188	+ tab0.add(row2);
	189	+ tab0.add(row3);
	190	+ tab0.add(row4);
	191	+ tab0.add(row5);
	192	+ tab0.add(row6);
	193	+
	194	+ for (int i=5; --i>=0;)
	195	+ {
	196	+ //oe.toolboxPanel.Return();
	197	+ //tab0.add(new cGridBag());
	198	+ }
	199	+ }
	200	+
	201	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	202	+ {
	203	+ cGridBag tab0 = new cGridBag().setVertical(true);
	204	+
	205	+ tab0.setName("Night");
	206	+ skyboxpanel.add(tab0);
	207	+
	208	+ cGridBag row0 = new cGridBag();
	209	+ cGridBag row1 = new cGridBag();
	210	+ cGridBag row2 = new cGridBag();
	211	+ cGridBag row3 = new cGridBag();
	212	+ cGridBag row4 = new cGridBag();
	213	+ cGridBag row5 = new cGridBag();
	214	+ cGridBag row6 = new cGridBag();
	215	+
	216	+ AddSkyboxButton("night", "NightPath", row0);
	217	+ AddSkyboxButton("night", "PondNight", row0);
	218	+ AddSkyboxButton("night", "Powerlines", row0);
	219	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	220	+
	221	+ AddSkyboxButton("urban", "CNTower", row1);
	222	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	223	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	224	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
	225	+
	226	+ AddSkyboxButton("penguins", "kenon_star", row2);
	227	+ AddSkyboxButton("persson", "corona", row2);
	228	+ AddSkyboxButton("persson", "spaceskybox", row2);
	229	+ AddSkyboxButton("indoors", "Vasa", row2);
	230	+
	231	+ AddSkyboxButton("winter", "Backyard", row3);
	232	+ AddSkyboxButton("winter", "Creek", row3);
	233	+ AddSkyboxButton("winter", "FootballField3", row3);
	234	+ AddSkyboxButton("winter", "Forest", row3);
	235	+
	236	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	237	+ AddSkyboxButton("winter", "House", row4);
	238	+ AddSkyboxButton("winter", "IceLake", row4);
	239	+ AddSkyboxButton("winter", "IceRiver", row4);
	240	+
	241	+ AddSkyboxButton("winter", "Park3", row5);
	242	+ AddSkyboxButton("winter", "PondWinter", row5);
	243	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	244	+ AddSkyboxButton("winter", "Vindelalven", row5);
	245	+
	246	+ AddSkyboxButton("daz", "TheRock", row6);
	247	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	248	+ AddSkyboxButton("daz", "Winter", row6);
	249	+ AddSkyboxButton("mountain", "Ryfjallet", row6);
	250	+
	251	+ tab0.add(row0);
	252	+ tab0.add(row1);
	253	+ tab0.add(row2);
	254	+ tab0.add(row3);
	255	+ tab0.add(row4);
	256	+ tab0.add(row5);
	257	+ tab0.add(row6);
	258	+
	259	+ for (int i=5; --i>=0;)
	260	+ {
	261	+ //oe.toolboxPanel.Return();
	262	+ //tab0.add(new cGridBag());
	263	+ }
	264	+ }
	265	+
	266	+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
	267	+ {
	268	+ cGridBag tab0 = new cGridBag().setVertical(true);
	269	+
	270	+ tab0.setName("Others");
	271	+ skyboxpanel.add(tab0);
	272	+
	273	+ cGridBag row0 = new cGridBag();
	274	+ cGridBag row1 = new cGridBag();
	275	+ cGridBag row2 = new cGridBag();
	276	+ cGridBag row3 = new cGridBag();
	277	+ cGridBag row4 = new cGridBag();
	278	+ cGridBag row5 = new cGridBag();
	279	+ cGridBag row6 = new cGridBag();
	280	+
	281	+ AddSkyboxButton("mayhem", "afterrain", row0);
	282	+ AddSkyboxButton("mayhem", "aqua4", row0);
	283	+ AddSkyboxButton("mayhem", "aqua9", row0);
	284	+ AddSkyboxButton("mayhem", "flame", row0);
	285	+
	286	+ AddSkyboxButton("mayhem", "h2s", row1);
	287	+ AddSkyboxButton("mayhem", "prehistoric", row1);
	288	+ AddSkyboxButton("mayhem", "scorched", row1);
	289	+ AddSkyboxButton("penguins", "desertdawn", row1);
	290	+
	291	+ AddSkyboxButton("persson", "Citadella", row2);
	292	+ AddSkyboxButton("persson", "Citadella2", row2);
	293	+ AddSkyboxButton("persson", "clouds1", row2);
	294	+ AddSkyboxButton("penguins", "wrath", row2);
	295	+
	296	+ AddSkyboxButton("persson", "FishermansBastion", row3);
	297	+ AddSkyboxButton("persson", "HeroesSquare", row3);
	298	+ AddSkyboxButton("indoors", "DallasW", row3);
	299	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
	300	+
	301	+ AddSkyboxButton("persson", "LancellottiChapel", row4);
	302	+ AddSkyboxButton("persson", "PereaBeach1", row4);
	303	+ AddSkyboxButton("persson", "PereaBeach2", row4);
	304	+ AddSkyboxButton("persson", "redeclipse", row4);
	305	+
	306	+ AddSkyboxButton("daz", "Greenlands", row5);
	307	+ AddSkyboxButton("daz", "Oasis", row5);
	308	+ AddSkyboxButton("elyvisions", "arch3", row5);
	309	+ AddSkyboxButton("elyvisions", "calm_sea", row5);
	310	+
	311	+ AddSkyboxButton("elyvisions", "rainbow", row6);
	312	+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
	313	+ AddSkyboxButton("elyvisions", "heaven", row6);
	314	+ AddSkyboxButton("elyvisions", "hot", row6);
	315	+
	316	+ tab0.add(row0);
	317	+ tab0.add(row1);
	318	+ tab0.add(row2);
	319	+ tab0.add(row3);
	320	+ tab0.add(row4);
	321	+ tab0.add(row5);
	322	+ tab0.add(row6);
	323	+
	324	+ for (int i=5; --i>=0;)
	325	+ {
	326	+ //oe.toolboxPanel.Return();
	327	+ //tab0.add(new cGridBag());
	328	+ }
	329	+ }
	330	+
	331	+ public void ChangeSkybox(String skybox)
	332	+ {
	333	+ if (skybox.endsWith("/"))
	334	+ {
	335	+ group.skyboxname = null;
	336	+ group.skyboxext = null;
	337	+ cameraView.repaint();
	338	+ }
	339	+ else
	340	+ {
	341	+ //cameraView.envyoff = false;
	342	+ group.skyboxname = skybox;
	343	+ group.skyboxext = "jpg";
	344	+ cameraView.repaint();
	345	+ }
	346	+ }
	347	+
	348	+ public void CreateSkyboxPanel(cGridBag skyboxPanel)
	349	+ {
	350	+ JTabbedPane skyboxpane = new JTabbedPane();
	351	+
	352	+ AddSkyboxTab0(skyboxpane);
	353	+ AddSkyboxTab1(skyboxpane);
	354	+ AddSkyboxTab2(skyboxpane);
	355	+ AddSkyboxTab3(skyboxpane);
	356	+
	357	+ skyboxPanel.add(skyboxpane);
	358	+ }
	359	+
	360	+ public void ChangeTexture(String texture)
	361	+ {
	362	+ for (int i=0; i<group.selection.size(); i++)
	363	+ {
	364	+ Object3D obj = group.selection.get(i);
	365	+ obj.SetPigmentTexture("@" + texture);
	366	+ }
	367	+
	368	+ refreshContents();
	369	+ }
	370	+
	371	+ public void Show3DView()
	372	+ {
	373	+ // bug
	374	+ //gridPanel.setDividerLocation(1.0);
	375	+ //bigPanel.setDividerLocation(0.0);
	376	+ bigThree.ClearUI();
	377	+ bigThree.add(centralPanel);
	378	+ bigThree.FlushUI();
	379	+ }
	380	+
25	381	//ObjEditor objEditor;
26	382	public void closeUI2()
27	383	{
..	..	@@ -59,6 +415,16 @@
59	415	this.copy = this.group = group;
60	416	//selectees = this.group.selectees;
61	417
	418	+ assert(false);
	419	+
	420	+ if (copy.versionlist == null)
	421	+ {
	422	+ copy.versionlist = new Object3D[100];
	423	+ copy.versionindex = -1;
	424	+
	425	+ //Save(true);
	426	+ }
	427	+
62	428	if(ui)
63	429	SetupUI(objEditor);
64	430	}
..	..	@@ -73,16 +439,28 @@
73	439	this.copy = this.group = copy;
74	440	//selectees = this.group.selectees;
75	441
76		- SetupMenu2(objEditor);
	442	+ SetupMenu2(this); //objEditor);
77	443	SetupUI2(objEditor);
78	444	objEditor.SetupUI(true);
79	445	SetupViews(objEditor);
80	446
81	447	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	448	+
	449	+ if (copy.versionlist == null)
	450	+ {
	451	+ copy.versionlist = new Object3D[100];
	452	+ copy.versionindex = -1;
	453	+
	454	+ //Save(true);
	455	+ }
82	456	}
83	457
84	458	void CloneSelection(boolean supports)
85	459	{
	460	+ if (Globals.REPLACEONMAKE)
	461	+ Save();
	462	+ boolean keep = Globals.REPLACEONMAKE;
	463	+ Globals.REPLACEONMAKE = false;
86	464	// Object3D keep = GrafreeD.clipboard;
87	465	//Object3D obj;
88	466	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -93,18 +471,19 @@
93	471
94	472	makeSomething(clone, i==group.selection.size()-1);
95	473	}
	474	+ Globals.REPLACEONMAKE = keep;
96	475	}
97	476
98	477	void CloneClipboard(boolean supports)
99	478	{
100		- assert(GrafreeD.clipboard.parent == null);
101		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
102		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
103		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
104		- makeSomething(CloneObject(GrafreeD.clipboard.get(0), false));
	479	+ assert(Grafreed.clipboard.parent == null);
	480	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	481	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	482	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	483	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
105	484	else
106		- makeSomething(CloneObject(GrafreeD.clipboard, false));
107		- GrafreeD.clipboard.get(0).parent = keepparent;
	485	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	486	+ Grafreed.clipboard.get(0).parent = keepparent;
108	487	}
109	488
110	489	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -118,7 +497,7 @@
118	497	// obj.support = null;
119	498	if (!supports)
120	499	obj.SaveSupports();
121		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	500	+ Object3D clone = (Object3D)Grafreed.clone(obj);
122	501	obj.parent = parent;
123	502	// obj.support = support;
124	503	// clone.support = support; // aout 2013
..	..	@@ -147,58 +526,153 @@
147	526
148	527	//JTextField nameField;
149	528
150		- void SetupMenu2(ObjEditor oe)
	529	+ void SetupMenu2(GroupEditor oe)
151	530	{
152		- oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
153		- //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
154		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
155		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
156		- oe.cameraMenu.add("-");
157		- openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
158		- openWindowItem.addActionListener(this);
159		- editLeafItem.addActionListener(this);
160		- lookAtItem.addActionListener(this);
161		- //lookFromItem.addActinoListener(this);
162		- //switchItem.addActionListener(this);
	531	+ oe.jTree = new cTree();
	532	+
163	533	Menu menu;
164	534	oe.menuBar.add(menu = new Menu("Edit"));
165	535	//editItem = menu.add(new MenuItem("Edit"));
166	536	//editItem.addActionListener(this);
167		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	537	+
	538	+// undoItem = menu.add(new MenuItem("Undo"));
	539	+// undoItem.addActionListener(this);
	540	+// redoItem = menu.add(new MenuItem("Redo"));
	541	+// redoItem.addActionListener(this);
	542	+// menu.add("-");
	543	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
168	544	duplicateItem.addActionListener(this);
169		- menu.add("-");
170		- cloneItem = menu.add(new MenuItem("Clone"));
	545	+
	546	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
171	547	cloneItem.addActionListener(this);
	548	+ //if (Globals.ADVANCED)
	549	+ {
172	550	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
173	551	cloneSupportItem.addActionListener(this);
	552	+ }
	553	+ oe.jTree.popup.addSeparator();
174	554	menu.add("-");
175		- cutItem = menu.add(new MenuItem("Cut"));
	555	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
176	556	cutItem.addActionListener(this);
177		- copyItem = menu.add(new MenuItem("Copy"));
	557	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
178	558	copyItem.addActionListener(this);
179	559	pasteItem = menu.add(new MenuItem("Paste"));
180	560	pasteItem.addActionListener(this);
181		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	561	+
	562	+ oe.jTree.popup.addSeparator();
	563	+ //menu.add("-");
	564	+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
	565	+ pasteIntoItem.addActionListener(this);
	566	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
182	567	pasteLinkItem.addActionListener(this);
183		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	568	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
184	569	pasteCloneItem.addActionListener(this);
185		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	570	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
186	571	// pasteExpandItem.addActionListener(this);
187		- clearItem = menu.add(new MenuItem("Clear"));
188		- clearItem.addActionListener(this);
	572	+ //menu.add("-");
	573	+ oe.jTree.popup.addSeparator();
	574	+
	575	+ if (Globals.ADVANCED)
	576	+ {
	577	+ // Deletes the cameras...
189	578	clearAllItem = menu.add(new MenuItem("Clear All"));
190	579	clearAllItem.addActionListener(this);
	580	+ }
	581	+
	582	+ menuBar.add(cameraMenu = new Menu("View"));
	583	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	584	+ //zBufferItem.addActionListener(this);
	585	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	586	+ //normalLensItem.addActionListener(this);
	587	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	588	+ restoreCameraItem.addActionListener(this);
	589	+
	590	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	591	+// toggleFullScreenItem.addItemListener(this);
	592	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	593	+// cameraMenu.add("-");
	594	+//
	595	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	596	+// toggleTextureItem.addItemListener(this);
	597	+// toggleTextureItem.setState(CameraPane.textureon);
	598	+//
	599	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	600	+// toggleSwitchItem.addItemListener(this);
	601	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	602	+
	603	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	604	+ toggleHandleItem.addItemListener(this);
	605	+ toggleHandleItem.setState(CameraPane.HANDLES);
	606	+
	607	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	608	+ togglePaintItem.addItemListener(this);
	609	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	610	+
	611	+ if (Globals.ADVANCED)
	612	+ {
	613	+ cameraMenu.add("-");
	614	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	615	+ toggleLiveItem.addItemListener(this);
	616	+ toggleLiveItem.setState(Globals.isLIVE());
191	617
	618	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	619	+ stepItem.addActionListener(this);
	620	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	621	+ // toggleDLItem.addItemListener(this);
	622	+ // toggleDLItem.setState(false);
	623	+
	624	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	625	+ toggleRenderItem.addItemListener(this);
	626	+ toggleRenderItem.setState(!CameraPane.frozen);
	627	+
	628	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	629	+ toggleDebugItem.addItemListener(this);
	630	+ toggleDebugItem.setState(Globals.DEBUG);
	631	+
	632	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	633	+ toggleFrustumItem.addItemListener(this);
	634	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	635	+
	636	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	637	+ toggleFootContactItem.addItemListener(this);
	638	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	639	+
	640	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	641	+ toggleTimelineItem.addItemListener(this);
	642	+ }
	643	+
	644	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	645	+// toggleRootItem.addItemListener(this);
	646	+// toggleRootItem.setState(false);
	647	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	648	+// animationItem.addItemListener(this);
	649	+// animationItem.setState(CameraPane.ANIMATION);
	650	+ cameraMenu.add("-");
	651	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	652	+ editCameraItem.addActionListener(this);
	653	+
	654	+ if (Globals.ADVANCED)
	655	+ {
	656	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	657	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	658	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	659	+ oe.cameraMenu.add("-");
	660	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	661	+ openWindowItem.addActionListener(this);
	662	+ lookAtItem.addActionListener(this);
	663	+ //lookFromItem.addActinoListener(this);
	664	+ //switchViewItem.addActionListener(this);
	665	+ }
	666	+
192	667	oe.menuBar.add(menu = new Menu("Setting"));
193		- resetMeshItem = menu.add(new MenuItem("Reset All"));
194		- resetMeshItem.addActionListener(this);
195		- stepAllItem = menu.add(new MenuItem("Step All"));
196		- stepAllItem.addActionListener(this);
	668	+ if (Globals.ADVANCED)
	669	+ {
197	670	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
198	671	revertMeshItem.addActionListener(this);
199	672	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
200	673	resetreferencesItem.addActionListener(this);
201	674	menu.add("-");
	675	+ }
202	676	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
203	677	overwriteGeoItem.addActionListener(this);
204	678	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -210,79 +684,111 @@
210	684	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211	685	overwriteUVItem.addActionListener(this);
212	686	menu.add("-");
	687	+ if (Globals.ADVANCED)
	688	+ {
213	689	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214	690	generateMeshItem.addActionListener(this);
215	691	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216	692	poseMeshItem.addActionListener(this);
217	693	menu.add("-");
	694	+ }
218	695	resetsupportItem = menu.add(new MenuItem("Reset support"));
219	696	resetsupportItem.addActionListener(this);
220	697	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	698	linkverticesItem.addActionListener(this);
222	699	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
223	700	relinkverticesItem.addActionListener(this);
	701	+
	702	+ if (Globals.ADVANCED)
	703	+ {
224	704	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
225	705	setMasterItem.addActionListener(this);
	706	+ }
226	707
227		- oe.menuBar.add(menu = new Menu("Group"));
228		- grabItem = menu.add(new MenuItem("Grab"));
229		- grabItem.addActionListener(this);
	708	+ oe.menuBar.add(menu = new Menu("Order"));
	709	+
230	710	backItem = menu.add(new MenuItem("Back"));
231	711	backItem.addActionListener(this);
232	712	frontItem = menu.add(new MenuItem("Front"));
233	713	frontItem.addActionListener(this);
234		- compositeItem = menu.add(new MenuItem("Composite"));
235		- compositeItem.addActionListener(this);
236		- hideItem = menu.add(new MenuItem("Hide"));
	714	+// compositeItem = menu.add(new MenuItem("Composite"));
	715	+// compositeItem.addActionListener(this);
	716	+
	717	+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
	718	+ grabItem.addActionListener(this);
	719	+
	720	+ if (Globals.ADVANCED)
	721	+ {
	722	+ hideItem = menu.add(new MenuItem("Hidden Group"));
237	723	hideItem.addActionListener(this);
238		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	724	+ }
	725	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
239	726	ungroupItem.addActionListener(this);
240		- menu.add("-");
241		- randomItem = menu.add(new MenuItem("Random"));
242		- randomItem.addActionListener(this);
243		- physicsItem = menu.add(new MenuItem("Physics"));
244		- physicsItem.addActionListener(this);
245		- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
246		- frameselectorItem.addActionListener(this);
	727	+
	728	+ oe.jTree.popup.addSeparator();
	729	+
	730	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	731	+ deleteItem.addActionListener(this);
	732	+
	733	+// menu.add("-");
	734	+//
	735	+// switchItem = menu.add(new MenuItem("Switch node"));
	736	+// switchItem.addActionListener(this);
	737	+ if (Globals.ADVANCED)
	738	+ {
247	739	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
248	740	switchGeoItem.addActionListener(this);
249	741	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
250	742	switchTransfoItem.addActionListener(this);
251		- morphItem = menu.add(new MenuItem("Morph"));
	743	+ morphItem = menu.add(new MenuItem("Morph Group"));
252	744	morphItem.addActionListener(this);
	745	+
	746	+ menu.add("-");
	747	+ physicsItem = menu.add(new MenuItem("Physics"));
	748	+ physicsItem.addActionListener(this);
	749	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	750	+ frameselectorItem.addActionListener(this);
253	751	scriptNodeItem = menu.add(new MenuItem("Script Node"));
254	752	scriptNodeItem.addActionListener(this);
255		- cameraItem = menu.add(new MenuItem("Camera"));
256		- cameraItem.addActionListener(this);
	753	+ }
257	754
258	755	oe.menuBar.add(menu = new Menu("Object"));
259		- textureItem = menu.add(new MenuItem("Texture"));
260		- textureItem.addActionListener(this);
	756	+// textureItem = menu.add(new MenuItem("Texture"));
	757	+// textureItem.addActionListener(this);
261	758	billboardItem = menu.add(new MenuItem("Billboard"));
262	759	billboardItem.addActionListener(this);
263	760	csgItem = menu.add(new MenuItem("CSG"));
264	761	csgItem.addActionListener(this);
265		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	762	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
266	763	shadowXItem.addActionListener(this);
267		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	764	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
268	765	shadowYItem.addActionListener(this);
269		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	766	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
270	767	shadowZItem.addActionListener(this);
	768	+ attributeItem = menu.add(new MenuItem("Attribute"));
	769	+ attributeItem.addActionListener(this);
	770	+
	771	+ if (Globals.ADVANCED)
	772	+ {
	773	+ menu.add("-");
271	774	linkerItem = menu.add(new MenuItem("Linker"));
272	775	linkerItem.addActionListener(this);
273	776	templateItem = menu.add(new MenuItem("Template"));
274	777	templateItem.addActionListener(this);
275		- attributeItem = menu.add(new MenuItem("Attribute"));
276		- attributeItem.addActionListener(this);
277	778	pointflowItem = menu.add(new MenuItem("Point Flow"));
278	779	pointflowItem.addActionListener(this);
	780	+ }
279	781	menu.add("-");
280	782	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
281	783	resetTransformItem.addActionListener(this);
282	784	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
283	785	resetCentroidItem.addActionListener(this);
284		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
285		- transformgeometryItem.addActionListener(this);
	786	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	787	+ resetCentroidXZItem.addActionListener(this);
	788	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	789	+ transformGeometryItem.addActionListener(this);
	790	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	791	+ transformChildrenItem.addActionListener(this);
286	792
287	793	oe.menuBar.add(menu = new Menu("Geometry"));
288	794	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -293,8 +799,11 @@
293	799	genNormalsCADItem.addActionListener(this);
294	800	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
295	801	genNormalsMESHItem.addActionListener(this);
296		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	802	+ if (Globals.ADVANCED)
	803	+ {
	804	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
297	805	genNormalsMINEItem.addActionListener(this);
	806	+ }
298	807	stripifyItem = menu.add(new MenuItem("Stripify"));
299	808	stripifyItem.addActionListener(this);
300	809	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -316,23 +825,34 @@
316	825	reduce34MeshItem.addActionListener(this);
317	826	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
318	827	increaseMeshItem.addActionListener(this);
319		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
320		- smoothMeshItem.addActionListener(this);
321	828	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
322	829	clipMeshItem.addActionListener(this);
	830	+
	831	+ if (Globals.ADVANCED)
	832	+ {
	833	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	834	+ smoothMeshItem.addActionListener(this);
	835	+ }
323	836
324	837	oe.menuBar.add(menu = new Menu("Attributes"));
325	838	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
326	839	clearMaterialsItem.addActionListener(this);
	840	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	841	+ resetAllItem.addActionListener(this);
	842	+ stepAllItem = menu.add(new MenuItem("Step All"));
	843	+ stepAllItem.addActionListener(this);
327	844	menu.add("-");
328	845	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
329	846	liveleavesItem.addActionListener(this);
330	847	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
331	848	unliveleavesItem.addActionListener(this);
	849	+ if (Globals.ADVANCED)
	850	+ {
332	851	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
333	852	supportleavesItem.addActionListener(this);
334	853	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
335	854	unsupportleavesItem.addActionListener(this);
	855	+ }
336	856	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
337	857	hideleavesItem.addActionListener(this);
338	858	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -341,6 +861,14 @@
341	861	markleavesItem.addActionListener(this);
342	862	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
343	863	unmarkleavesItem.addActionListener(this);
	864	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	865	+ rewindleavesItem.addActionListener(this);
	866	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	867	+ unrewindleavesItem.addActionListener(this);
	868	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	869	+ randomleavesItem.addActionListener(this);
	870	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	871	+ unrandomleavesItem.addActionListener(this);
344	872	menu.add("-");
345	873	flipVItem = menu.add(new MenuItem("Flip V"));
346	874	flipVItem.addActionListener(this);
..	..	@@ -366,53 +894,130 @@
366	894	attachBumpItem.addActionListener(this);
367	895	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
368	896	pigmentBumpItem.addActionListener(this);
	897	+ //embedTexturesItem
369	898	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
370	899	detachPigmentItem.addActionListener(this);
371	900	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
372	901	detachBumpItem.addActionListener(this);
	902	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	903	+ embedTexturesItem.addActionListener(this);
	904	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	905	+ deEmbedTexturesItem.addActionListener(this);
373	906	menu.add("-");
374	907	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
375	908	sortbysizeItem.addActionListener(this);
376	909	sortbynameItem = menu.add(new MenuItem("Sort by name"));
377	910	sortbynameItem.addActionListener(this);
378	911	menu.add("-");
	912	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	913	+ shareGeometriesItem.addActionListener(this);
	914	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	915	+ mergeGeometriesItem.addActionListener(this);
	916	+ menu.add("-");
	917	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	918	+ editLeafItem.addActionListener(this);
	919	+ if (Globals.ADVANCED)
	920	+ {
	921	+ // Pretty much the same as duplicate and clone.
379	922	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
380	923	extractGeometriesItem.addActionListener(this);
381	924	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
382	925	cloneGeometriesItem.addActionListener(this);
383		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
384		- shareGeometriesItem.addActionListener(this);
385		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
386		- mergeGeometriesItem.addActionListener(this);
	926	+ }
387	927
388	928	oe.menuBar.add(menu = new Menu("Insert"));
389	929	buildCreateMenu(menu);
390	930
391		-
392		- oe.menuBar.add(menu = new Menu("Include"));
393		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
394		- importGFDItem.addActionListener(this);
395		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
396		- importVRMLX3DItem.addActionListener(this);
397		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
398		- importOBJItem.addActionListener(this);
399		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
400		- import3DSItem.addActionListener(this);
401		-
402	931	oe.menuBar.add(menu = new Menu("Tools"));
403	932	buildToolsMenu(menu);
404	933	}
405	934
	935	+ JTabbedPane resourcecontainer;
	936	+ cGridBag currenttab;
	937	+ //boolean added; // patch for jar
	938	+
	939	+ int tabcount = 0;
	940	+ int colcount = 0;
	941	+ int rowcount = 0;
	942	+ int texturecount = 0;
	943	+
	944	+ int columns = 5;
	945	+ int rows = 7;
	946	+
	947	+ public void ResourceCallBack(String[] path)
	948	+ {
	949	+// for (int i = 0; i < path.length; i++)
	950	+// System.out.print(path[i] + "/");
	951	+// System.out.println();
	952	+
	953	+ if (//rowcount == 0 \|\|
	954	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	955	+ {
	956	+ currenttab = new cGridBag();
	957	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	958	+ currenttab.setName(tabname);
	959	+ //added = false;
	960	+ resourcecontainer.add(currenttab);
	961	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	962	+ rowcount = 1;
	963	+ colcount = 0;
	964	+ texturecount = 0;
	965	+ }
	966	+
	967	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	968	+ {
	969	+ //if (!added)
	970	+ {
	971	+ //added = true;
	972	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	973	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	974	+ }
	975	+
	976	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	977	+
	978	+ if (++colcount >= columns)
	979	+ {
	980	+ colcount = 0;
	981	+ currenttab.Return();
	982	+
	983	+ if (rowcount++ >= rows)
	984	+ {
	985	+ rowcount = 0;
	986	+ }
	987	+ }
	988	+ }
	989	+ else
	990	+ {
	991	+// if (!path[path.length-1].equals("icons"))
	992	+// resourcecontainer.Return();
	993	+ }
	994	+ }
	995	+
	996	+ void CreateTexturePanel(cGridBag container)
	997	+ {
	998	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	999	+ container.add(resourcecontainer);
	1000	+
	1001	+ Grafreed.ParseResources("textures", this);
	1002	+ }
	1003	+
406	1004	void SetupUI2(ObjEditor oe)
407	1005	{
	1006	+ // June 2019
	1007	+ if (oe == null)
	1008	+ {
	1009	+ //super.SetupUI2(this);
	1010	+ //return;
	1011	+ }
	1012	+
	1013	+ if (copy != group)
	1014	+ {
	1015	+ //super.SetupUI2(this);
	1016	+ }
	1017	+
408	1018	//new Exception().printStackTrace();
409	1019
410	1020	oe.radioPanel = new JPanel(new GridBagLayout());
411		- oe.aConstraints.weightx = 1;
412		- oe.aConstraints.weighty = 0;
413		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
414		- oe.aConstraints.gridwidth = 100;
415		- oe.aConstraints.gridheight = 1;
416	1021	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
417	1022
418	1023	oe.buttonGroup = new ButtonGroup();
..	..	@@ -433,110 +1038,266 @@
433	1038	oe.radioPanel.add(dummyButton);
434	1039	oe.buttonGroup.add(dummyButton);
435	1040	*/
436		- aConstraints.gridy += 1;
	1041	+ cGridBag copyOptionsPanel = new cGridBag();
	1042	+
	1043	+ copyOptionsPanel.preferredHeight = 2;
437	1044
438	1045	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
439	1046
440		- oe.aConstraints.gridwidth = 1;
441		- oe.aConstraints.gridx = 0;
	1047	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1048	+ //minButton.setToolTipText("Minimize window");
	1049	+ //minButton.addActionListener(this);
442	1050
443		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
444		- liveCB.setToolTipText("Enabled animation");
445		- liveCB.addItemListener(this);
446		-
447		- oe.aConstraints.gridx += 1;
448		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK), oe.aConstraints);
449		- trackCB.setToolTipText("Enable tracking");
450		- trackCB.addItemListener(this);
451		-
452		- oe.aConstraints.gridx += 1;
453		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	1051	+ if (Globals.ADVANCED)
	1052	+ {
	1053	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1054	+// maxButton.setToolTipText("Maximize window");
	1055	+// maxButton.addActionListener(this);
	1056	+ }
	1057	+
	1058	+ cButton gcButton;
	1059	+
	1060	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1061	+// gcButton.setToolTipText("Garbage collect");
	1062	+// gcButton.addActionListener(new ActionListener()
	1063	+// {
	1064	+// public void actionPerformed(ActionEvent e)
	1065	+// {
	1066	+// System.gc();
	1067	+// }
	1068	+// });
	1069	+
	1070	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1071	+ collapseButton.setToolTipText("Collapse toolbar");
	1072	+ collapseButton.addActionListener(this);
	1073	+
	1074	+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/empty.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1075	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1076	+ maximize3DButton.addActionListener(this);
	1077	+
	1078	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1079	+ twoButton.setToolTipText("Show 3D view only");
	1080	+ twoButton.addActionListener(this);
	1081	+ this.fullscreenLayout = twoButton;
	1082	+
	1083	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1084	+ threeButton.setToolTipText("Show controls and 3D view");
	1085	+ threeButton.addActionListener(this);
	1086	+ if (Globals.ADVANCED)
	1087	+ {
	1088	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1089	+ sixButton.setToolTipText("Show 3D view and controls");
	1090	+ sixButton.addActionListener(this);
	1091	+ }
	1092	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1093	+// sevenButton.setToolTipText("3-column layout");
	1094	+// sevenButton.addActionListener(this);
	1095	+ //
	1096	+
	1097	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1098	+ fullButton.setToolTipText("Full-screen window");
	1099	+ fullButton.addActionListener(this);
	1100	+
	1101	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
454	1102	screenfitButton.setToolTipText("Screen fit");
455	1103	screenfitButton.addActionListener(this);
456		- oe.aConstraints.gridx += 1;
	1104	+
	1105	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1106	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1107	+ restoreCameraButton.addActionListener(this);
	1108	+
	1109	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1110	+ saveVersionButton.setToolTipText("Duplicate current version");
	1111	+ saveVersionButton.addActionListener(this);
	1112	+
	1113	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1114	+ deleteVersionButton.setToolTipText("Delete current version");
	1115	+ deleteVersionButton.addActionListener(this);
	1116	+ deleteVersionButton.setEnabled(false);
	1117	+
	1118	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1119	+ previousVersionButton.setToolTipText("Previous version");
	1120	+ previousVersionButton.addActionListener(this);
	1121	+ previousVersionButton.setEnabled(false);
	1122	+
	1123	+ cGridBag updown = new cGridBag().setVertical(true);
	1124	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1125	+ restoreButton.setToolTipText("Undo (restore current version)");
	1126	+ restoreButton.addActionListener(this);
	1127	+ restoreButton.setEnabled(false);
	1128	+
	1129	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1130	+ replaceButton.setToolTipText("Save (replace current version)");
	1131	+ replaceButton.addActionListener(this);
	1132	+ replaceButton.setEnabled(false);
	1133	+
	1134	+ copyOptionsPanel.add(updown);
	1135	+
	1136	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1137	+ nextVersionButton.setToolTipText("Next version");
	1138	+ nextVersionButton.addActionListener(this);
	1139	+ nextVersionButton.setEnabled(false);
	1140	+
	1141	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1142	+ oneStepButton.setToolTipText("Animate one step forward");
	1143	+ oneStepButton.addActionListener(this);
	1144	+
	1145	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1146	+ liveCB.setToolTipText("Enable animation");
	1147	+ liveCB.addItemListener(this);
	1148	+
	1149	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	1150	+ fastCB.setToolTipText("Fast mode");
	1151	+ fastCB.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);
	1158	+
457	1159	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
458	1160	// screenfitpointButton.addActionListener(this);
459		-// oe.aConstraints.gridx += 1;
460		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
461		- snapobjectButton.addActionListener(this);
462		- snapobjectButton.setToolTipText("Snap Object");
463		- oe.aConstraints.gridx += 1;
464	1161
465		- //aConstraints.gridx = 0;
466		- //aConstraints.gridy += 1;
467		- oe.aConstraints.weighty = 0;
468		- oe.aConstraints.gridwidth = 1;
469		-
470		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
471		- flashSelectionButton.setToolTipText("Show selection");
472		- flashSelectionButton.addActionListener(this);
473		-
474		- oe.toolbarPanel.add(new cButton(" ", false));
475		-
476		- oe.aConstraints.gridx += 1;
477		- oe.aConstraints.weighty = 0;
478		- oe.aConstraints.gridwidth = 1;
479		-
480		- //
481		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
482		- twoButton.setToolTipText("Show center view only");
483		- twoButton.addActionListener(this);
484		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	1162	+ if (Globals.ADVANCED)
	1163	+ {
	1164	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1165	+ snapobjectButton.addActionListener(this);
	1166	+ snapobjectButton.setToolTipText("Snap Object");
	1167	+
	1168	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
485	1169	fourButton.addActionListener(this);
486		- fourButton.setToolTipText("Show left panel only");
487		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
488		- sixButton.setToolTipText("2-column layout left");
489		- sixButton.addActionListener(this);
490		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
491		- threeButton.setToolTipText("2-column layout right");
492		- threeButton.addActionListener(this);
493		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
494		- sevenButton.setToolTipText("3-column layout");
495		- sevenButton.addActionListener(this);
496		- //
	1170	+ fourButton.setToolTipText("Show control panel only");
	1171	+ }
497	1172
498		- oe.toolbarPanel.add(rootButton = new cButton(" o o o ")); //, oe.aConstraints);
499		- rootButton.setToolTipText("Edit object in new tab");
	1173	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	1174	+
	1175	+
	1176	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1177	+ rootButton.setToolTipText("Open selection in new tab");
500	1178	rootButton.addActionListener(this);
501		- oe.aConstraints.gridx += 1;
502		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	1179	+
	1180	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
503	1181	closeButton.setToolTipText("Close tab");
504	1182	closeButton.addActionListener(this);
505	1183	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
506	1184	//clearButton.addActionListener(this);
507		- oe.aConstraints.gridx += 1;
508		-
509		- oe.aConstraints.gridx = 1; //
510		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
511		- editButton.addActionListener(this);
512		- oe.aConstraints.gridx += 1;
513		- oe.aConstraints.weighty = 0;
514		- oe.aConstraints.gridwidth = 1;
515	1185
516		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	1186	+ cGridBag row1 = new cGridBag();
	1187	+
	1188	+ // INSERT
	1189	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1190	+ gridButton.setToolTipText("Create ground");
	1191	+ gridButton.addActionListener(this);
	1192	+
	1193	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1194	+ boxButton.setToolTipText("Create box");
	1195	+ boxButton.addActionListener(this);
	1196	+
	1197	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1198	+ superButton.setToolTipText("Create superellipsoid");
	1199	+ superButton.addActionListener(this);
	1200	+
	1201	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1202	+ sphereButton.setToolTipText("Create sphere");
	1203	+ sphereButton.addActionListener(this);
	1204	+
	1205	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1206	+ coneButton.setToolTipText("Create cone");
	1207	+ coneButton.addActionListener(this);
	1208	+
	1209	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1210	+ torusButton.setToolTipText("Create torus");
	1211	+ torusButton.addActionListener(this);
	1212	+
	1213	+ if (Globals.ADVANCED)
	1214	+ {
	1215	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1216	+ kleinButton.setToolTipText("Create Klein bottle");
	1217	+ kleinButton.addActionListener(this);
	1218	+ }
	1219	+
	1220	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1221	+ particlesButton.setToolTipText("Create particle system");
	1222	+ particlesButton.addActionListener(this);
	1223	+
	1224	+ oe.toolboxPanel.add(row1);
	1225	+
	1226	+ cGridBag row2 = new cGridBag();
	1227	+
	1228	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1229	+ groupButton.setToolTipText("Create group");
	1230	+ groupButton.addActionListener(this);
	1231	+
	1232	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1233	+ compositeButton.setToolTipText("Create composite");
	1234	+ compositeButton.addActionListener(this);
	1235	+
	1236	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1237	+ switchButton.setToolTipText("Create item switcher");
	1238	+ switchButton.addActionListener(this);
	1239	+
	1240	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1241	+ loopButton.setToolTipText("Create loop");
	1242	+ loopButton.addActionListener(this);
	1243	+
	1244	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1245	+ textureButton.setToolTipText("Create texture");
	1246	+ textureButton.addActionListener(this);
	1247	+
	1248	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1249	+ overlayButton.setToolTipText("Create overlay");
	1250	+ overlayButton.addActionListener(this);
	1251	+
	1252	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1253	+ lightButton.setToolTipText("Create light");
	1254	+ lightButton.addActionListener(this);
	1255	+
	1256	+ oe.toolboxPanel.add(row2);
	1257	+
	1258	+ cGridBag textures = new cGridBag();
	1259	+
	1260	+ CreateTexturePanel(textures);
	1261	+
	1262	+ resourcecontainer.setSelectedIndex((int)(Math.random() * resourcecontainer.getTabCount()));
	1263	+
	1264	+ oe.toolboxPanel.add(textures);
	1265	+
	1266	+ textures.preferredHeight = 100;
	1267	+
	1268	+ CreateSkyboxPanel(oe.skyboxPanel);
	1269	+
	1270	+ // EDIT panel
	1271	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1272	+ editButton.setToolTipText("Pin selection controls");
	1273	+ editButton.addActionListener(this);
	1274	+
	1275	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1276	+ uneditButton.setToolTipText("Unpin and remove selection controls");
517	1277	uneditButton.addActionListener(this);
518	1278
519		- oe.aConstraints.gridx += 1;
520		- oe.aConstraints.weighty = 0;
521		- oe.aConstraints.gridwidth = 1;
522		-
523		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
524		- clearPanelButton.addActionListener(this);
525		-
526		- oe.aConstraints.gridx += 1;
527		- oe.aConstraints.weighty = 0;
528		- oe.aConstraints.gridwidth = 1;
529		-
530		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	1279	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1280	+ allParamsButton.setToolTipText("Show all controls");
531	1281	allParamsButton.addActionListener(this);
532	1282
533		- oe.aConstraints.gridx += 1;
534		- oe.aConstraints.weighty = 0;
535		- oe.aConstraints.gridwidth = 1;
536		-
537		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
538		- unselectButton.addActionListener(this);
	1283	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1284	+ clearPanelButton.setToolTipText("Clear all controls");
	1285	+ clearPanelButton.addActionListener(this);
539	1286
	1287	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1288	+ //unselectButton.setToolTipText("Unselect");
	1289	+ //unselectButton.addActionListener(this);
	1290	+
	1291	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1292	+ flashSelectionButton.setToolTipText("Highlight selection");
	1293	+ flashSelectionButton.addActionListener(this);
	1294	+
	1295	+ editCommandsPanel.preferredHeight = 1;
	1296	+
	1297	+ SetPinStates(false);
	1298	+// oe.treePanel.add(commandsPanel);
	1299	+// oe.treePanel.Return();
	1300	+
540	1301	// oe.aConstraints.gridx += 1;
541	1302	// oe.aConstraints.weighty = 0;
542	1303	// oe.aConstraints.gridwidth = 1;
..	..	@@ -548,47 +1309,32 @@
548	1309	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
549	1310	// gcButton.addActionListener(this);
550	1311
551		- oe.aConstraints.gridx = 0;
552		- oe.aConstraints.gridy += 1;
553		-
554		- //ctrlPanel.add(objList = new List(5, true));
555		- oe.aConstraints.gridwidth = 100;
556		- // oe.aConstraints.gridheight = 100;
557		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
558		- oe.aConstraints.gridheight = 1;
559		- oe.aConstraints.weighty = 0.5;
560		- oe.aConstraints.gridx = 0;
561		- JScrollPane jSP;
	1312	+ cGridBag jSPPanel = new cGridBag();
	1313	+
	1314	+ JScrollPane jSP;
562	1315	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
563		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	1316	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
564	1317	ResetModel();
565		- oe.aConstraints.weighty = 0.5;
566		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
567		- oe.aConstraints.gridy += 1;
568		- oe.aConstraints.gridwidth = 1;
569		-
570		- oe.aConstraints.weighty = 0;
571		- oe.aConstraints.gridwidth = 2;
572		-
573		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
574		- colorCB.addItemListener(this);
575		- oe.aConstraints.gridx += 2;
576		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
577		- materialCB.addItemListener(this);
578		- oe.aConstraints.gridx += 2;
579		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
580		- textureCB.addItemListener(this);
581		-
582		- oe.aConstraints.gridx = 0;
583		- oe.aConstraints.gridy += 1;
584	1318
	1319	+ oe.treePanel.add(jSPPanel);
	1320	+ oe.treePanel.Return();
	1321	+
	1322	+ oe.treePanel.add(copyOptionsPanel);
	1323	+ oe.treePanel.Return();
	1324	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1325	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1326	+ sliderPane.preferredHeight = 1;
	1327	+
	1328	+// mainPanel.setDividerLocation(0.1); //1.0);
	1329	+ mainPanel.setResizeWeight(0.4);
	1330	+
585	1331	//jList.addListSelectionListener(this);
586	1332	oe.jTree.addTreeSelectionListener(this);
587	1333	//jTree.setRootVisible(false);
588	1334	//jTree.setEditable(true);
589	1335	oe.jTree.setDragEnabled(true);
590	1336	//jTree.setPreferredSize(new Dimension(10,10));
591		- jSP.setPreferredSize(new Dimension(100,200));
	1337	+ //jSP.setPreferredSize(new Dimension(100,200));
592	1338
593	1339	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
594	1340
..	..	@@ -600,122 +1346,204 @@
600	1346	dgr.addDragGestureListener(this);
601	1347	}catch(Exception e) {}
602	1348	*/
603		- radio.layout = sevenButton;
	1349	+ radio.layout = threeButton; // sixButton;
604	1350	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
605	1351	}
606	1352
607		- void AddOptions(JPanel panel, GridBagConstraints constraints)
	1353	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
608	1354	{
609		- constraints.gridx = 0;
610		- constraints.gridy = 0;
611		- panel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), constraints);
612		- fastCB.setToolTipText("Fast mode");
613		- fastCB.addItemListener(this);
614		- constraints.gridy += 1;
615		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), constraints);
616		- supportCB.setToolTipText("Enabled rigging");
617		- supportCB.addItemListener(this);
	1355	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1356	+ colorCB.setToolTipText("Copy color when dropped");
	1357	+ colorCB.addItemListener(this);
618	1358
619		- // constraints.gridy += 1;
	1359	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1360	+ materialCB.setToolTipText("Copy material when dropped");
	1361	+ materialCB.addItemListener(this);
	1362	+
	1363	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1364	+ textureCB.setToolTipText("Copy texture when dropped");
	1365	+ textureCB.addItemListener(this);
	1366	+
	1367	+ panel.Return();
	1368	+
	1369	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	1370	+ boxCB.setToolTipText("Display bounding boxes");
	1371	+ boxCB.addItemListener(this);
	1372	+
	1373	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	1374	+ zoomBoxCB.setToolTipText("Display only for wheel");
	1375	+ zoomBoxCB.addItemListener(this);
	1376	+
	1377	+ if (true) // Globals.ADVANCED)
	1378	+ {
	1379	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1380	+// supportCB.setToolTipText("Enable rigging");
	1381	+// supportCB.addItemListener(this);
	1382	+
	1383	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1384	+ freezeCB.setToolTipText("Fast moving camera");
	1385	+ freezeCB.addItemListener(this);
	1386	+
620	1387	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
621	1388	// localCB.addItemListener(this);
622	1389
623		- constraints.gridy += 1;
624		- panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD), constraints);
	1390	+ panel.Return();
	1391	+
	1392	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
625	1393	crowdCB.setToolTipText("Used for crowds");
626	1394	crowdCB.addItemListener(this);
627	1395
628		- constraints.gridy += 1;
629		- panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), constraints);
	1396	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
630	1397	smoothCB.setToolTipText("Snapping delay");
631	1398	smoothCB.addItemListener(this);
632	1399
633		- constraints.gridy += 1;
634		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), constraints);
635		- slowCB.setToolTipText("Smooth interpolation");
636		- slowCB.addItemListener(this);
637		- constraints.gridy += 1;
638		- panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE), constraints);
639		- boxCB.setToolTipText("Display bounding boxes");
640		- boxCB.addItemListener(this);
641		- constraints.gridy += 1;
642		- panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE), constraints);
643		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
644		- zoomBoxCB.addItemListener(this);
645		-
	1400	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1401	+// slowCB.setToolTipText("Smooth interpolation");
	1402	+// slowCB.addItemListener(this);
	1403	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1404	+ minshaderCB.setToolTipText("Minimal fast shader");
	1405	+ minshaderCB.addItemListener(this);
	1406	+
646	1407	// constraints.gridy += 1;
647	1408	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
648	1409	// speakerMocapCB.addItemListener(this);
649	1410
	1411	+ panel.Return();
	1412	+
650	1413	if (false)
651	1414	{
652	1415	// handled in scripts
653		- constraints.gridy += 1;
654		- panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), constraints);
	1416	+ //constraints.gridy += 1;
	1417	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
655	1418	speakerCameraCB.addItemListener(this);
656	1419
657		- constraints.gridy += 1;
658		- panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), constraints);
	1420	+ //constraints.gridy += 1;
	1421	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
659	1422	speakerFocusCB.addItemListener(this);
660	1423
661		- constraints.gridy += 1;
662		- panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), constraints);
	1424	+ //constraints.gridy += 1;
	1425	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
663	1426	smoothfocusCB.addItemListener(this);
	1427	+ panel.Return();
664	1428	}
665	1429
666	1430	//constraints.gridx += 1;
667	1431	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
668	1432	// debugCB.addItemListener(this);
669	1433
670		- constraints.gridy += 1;
671		- panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL), constraints);
	1434	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1435	+ trackCB.setToolTipText("Enable tracking target");
	1436	+ trackCB.addItemListener(this);
	1437	+
	1438	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1439	+ oeilCB.setToolTipText("Move camera when tracking");
672	1440	oeilCB.addItemListener(this);
673	1441
674		- constraints.gridy += 1;
675		- panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT), constraints);
	1442	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1443	+ shadowCB.setToolTipText("When live compute shadows");
	1444	+ shadowCB.addItemListener(this);
	1445	+
	1446	+ panel.Return();
	1447	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1448	+ toggleTextureCB.setToolTipText("Load textures");
	1449	+ toggleTextureCB.addItemListener(this);
	1450	+
	1451	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1452	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1453	+ toggleSwitchCB.addItemListener(this);
	1454	+
	1455	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1456	+ autokeepCB.setToolTipText("On structure change");
	1457	+ autokeepCB.addItemListener(this);
	1458	+
	1459	+ panel.Return();
	1460	+ if (Globals.ADVANCED)
	1461	+ {
	1462	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
676	1463	lookAtCB.setToolTipText("Look-at target");
677	1464	lookAtCB.addItemListener(this);
	1465	+ }
	1466	+
	1467	+ }
	1468	+
	1469	+ cGridBag fill = new cGridBag();
	1470	+ fill.preferredHeight = 200;
	1471	+ cGridBag fill2 = new cGridBag();
	1472	+ fill2.preferredHeight = 200;
	1473	+ cGridBag fill3 = new cGridBag();
	1474	+ fill3.preferredHeight = 200;
	1475	+
	1476	+ panel.add(fill);
	1477	+ panel.add(fill2);
	1478	+ panel.add(fill3);
678	1479
679	1480	}
680	1481
681	1482	void EditObject(Object3D obj)
682	1483	{
	1484	+ assert(obj instanceof Composite);
	1485	+
	1486	+// if (obj.versionlist == null)
	1487	+// {
	1488	+// obj.versionlist = new Object3D[100];
	1489	+// obj.versionindex = -1;
	1490	+// }
	1491	+
683	1492	cRadio radioButton = new cRadio(obj.name);
	1493	+
	1494	+ // June 2019. Patch to avoid bug with transparency.
	1495	+ radioButton.hadMaterial = obj.material != null;
	1496	+ if (!radioButton.hadMaterial)
	1497	+ {
	1498	+ obj.material = new cMaterial();
	1499	+ }
	1500	+
684	1501	radioButton.SetObject(obj);
685		- radioButton.layout = sevenButton;
	1502	+ radioButton.layout = threeButton; // sixButton;
686	1503	radioButton.SetCamera(cameraView.renderCamera, false);
687	1504	radioButton.addActionListener(this);
688	1505	radioPanel.add(radioButton);
689	1506	buttonGroup.add(radioButton);
690	1507	radioButton.doClick();
691	1508	}
	1509	+
692	1510	void SetupViews(ObjEditor oe)
693	1511	{
	1512	+ theFrame = this;
	1513	+
694	1514	oe.SetupViews();
695	1515
	1516	+ if (Globals.DEBUG)
696	1517	System.out.println("SetupViews");
697	1518	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
698	1519	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
699	1520	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
700	1521	}
701	1522
702		- JCheckBox liveCB;
703		- JCheckBox supportCB;
704		- JCheckBox localCB;
705		- JCheckBox crowdCB;
706		- JCheckBox smoothCB;
707		- JCheckBox fastCB;
708		- JCheckBox slowCB;
709		- JCheckBox boxCB;
710		- JCheckBox zoomBoxCB;
711		- JCheckBox trackCB;
712		- JCheckBox smoothfocusCB;
	1523	+ cToggleButton liveCB;
	1524	+ cCheckBox supportCB;
	1525	+ cCheckBox localCB;
	1526	+ cCheckBox crowdCB;
	1527	+ cCheckBox smoothCB;
	1528	+ cCheckBox minshaderCB;
	1529	+
	1530	+ cToggleButton fastCB;
	1531	+ cCheckBox slowCB;
	1532	+ cCheckBox boxCB;
	1533	+ cCheckBox zoomBoxCB;
	1534	+ cCheckBox freezeCB;
	1535	+ //cToggleButton trackCB;
	1536	+ cCheckBox trackCB;
	1537	+ cCheckBox smoothfocusCB;
713	1538	// JCheckBox speakerMocapCB;
714		- JCheckBox speakerCameraCB;
715		- JCheckBox speakerFocusCB;
716		- JCheckBox debugCB;
717		- JCheckBox oeilCB;
718		- JCheckBox lookAtCB;
	1539	+ cCheckBox speakerCameraCB;
	1540	+ cCheckBox speakerFocusCB;
	1541	+ cCheckBox debugCB;
	1542	+
	1543	+ cCheckBox oeilCB;
	1544	+ cCheckBox shadowCB;
	1545	+ cCheckBox autokeepCB;
	1546	+ cCheckBox lookAtCB;
719	1547
720	1548	// static int COLOR = 1;
721	1549	// static int MATERIAL = 2;
..	..	@@ -723,9 +1551,9 @@
723	1551
724	1552	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
725	1553
726		- JCheckBox colorCB;
727		- JCheckBox materialCB;
728		- JCheckBox textureCB;
	1554	+ cCheckBox colorCB;
	1555	+ cCheckBox materialCB;
	1556	+ cCheckBox textureCB;
729	1557
730	1558	public void itemStateChanged(ItemEvent e)
731	1559	{
..	..	@@ -753,6 +1581,7 @@
753	1581	} else if(e.getSource() == liveCB)
754	1582	{
755	1583	cameraView.ToggleLive();
	1584	+ refreshContents(false);
756	1585	}
757	1586	else if(e.getSource() == supportCB)
758	1587	{
..	..	@@ -768,6 +1597,12 @@
768	1597	{
769	1598	cameraView.ToggleInertia();
770	1599	cameraView.repaint();
	1600	+ }
	1601	+ else if(e.getSource() == minshaderCB)
	1602	+ {
	1603	+ Globals.MINSHADER ^= true;
	1604	+ cameraView.programInitialized = false;
	1605	+ cameraView.repaint();
771	1606	}
772	1607	else if(e.getSource() == localCB)
773	1608	{
..	..	@@ -817,6 +1652,18 @@
817	1652	{
818	1653	cameraView.ToggleOeil();
819	1654	}
	1655	+ else if(e.getSource() == shadowCB)
	1656	+ {
	1657	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1658	+ }
	1659	+ else if(e.getSource() == freezeCB)
	1660	+ {
	1661	+ Globals.FREEZEONMOVE ^= true;
	1662	+ }
	1663	+ else if(e.getSource() == autokeepCB)
	1664	+ {
	1665	+ Globals.REPLACEONMAKE ^= true;
	1666	+ }
820	1667	else if(e.getSource() == lookAtCB)
821	1668	{
822	1669	cameraView.ToggleLookAt();
..	..	@@ -833,7 +1680,8 @@
833	1680
834	1681	/**/
835	1682	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
836		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1683	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1684	+ TreePath path = objEditor.jTree.getSelectionPath();
837	1685	if ((path == null) \|\| (path.getPathCount() <= 1)) {
838	1686	// We can't move the root node or an empty selection
839	1687	return;
..	..	@@ -896,8 +1744,6 @@
896	1744	}
897	1745	}
898	1746
899		- String string = (String) object;
900		-
901	1747	System.out.println("Transfer = " + object + "; drop : " + target);
902	1748	// if( object instanceof java.io.File[])
903	1749	// {
..	..	@@ -905,7 +1751,11 @@
905	1751	// objEditor.DropFile((java.io.File[]) object, true);
906	1752	// return;
907	1753	// }
908		- if (string.charAt(0) == '/')
	1754	+
	1755	+ String string = object.toString();
	1756	+
	1757	+ // File path for Mac and Windows
	1758	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
909	1759	{
910	1760	// file(s)
911	1761	String[] names = string.split("\n");
..	..	@@ -932,7 +1782,7 @@
932	1782
933	1783	flashIt = false;
934	1784	CameraPane pane = (CameraPane) target;
935		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1785	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
936	1786	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
937	1787
938	1788	if (group.selection.size() == 1)
..	..	@@ -948,23 +1798,33 @@
948	1798
949	1799	assert target == objEditor.jTree;
950	1800	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1801	+ Object3D destinationLeaf;
951	1802	try {
952		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1803	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
953	1804	} catch (Exception e) {
954	1805	System.out.println("destinationPath : " + destinationPath);
955	1806	return;
956	1807	}
957	1808
958		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1809	+ for (int i=group.selection.size(); --i>=0;)
959	1810	{
	1811	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1812	+
	1813	+ // Cannot move into itself
	1814	+ if (child == destinationLeaf)
	1815	+ return;
	1816	+ }
	1817	+
	1818	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1819	+// {
960	1820	loadClipboard(true);
961	1821	objEditor.jTree.setSelectionPath(destinationPath);
962		- pasteInto(false);
963		- } else {
964		- loadClipboard(false);
965		- objEditor.jTree.setSelectionPath(destinationPath);
966		- pasteInto(false); // true); // ???
967		- }
	1822	+ pasteInto(false, false);
	1823	+// } else {
	1824	+// loadClipboard(false);
	1825	+// objEditor.jTree.setSelectionPath(destinationPath);
	1826	+// pasteInto(false, false); // true); // ???
	1827	+// }
968	1828	}
969	1829	public void dropActionChanged(DropTargetDragEvent dtde)
970	1830	// Called if the user has modified the current drop gesture
..	..	@@ -1020,7 +1880,12 @@
1020	1880	TreePath path;
1021	1881
1022	1882	public TransferableTreePath(TreePath tp) {
1023		- path = tp;
	1883	+ Object[] objs = new Object[tp.getPathCount()];
	1884	+ for (int i=0; i<objs.length; i++)
	1885	+ {
	1886	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1887	+ }
	1888	+ path = new TreePath(objs);
1024	1889	}
1025	1890
1026	1891	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1069,85 +1934,107 @@
1069	1934	{
1070	1935	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1071	1936	//heightFieldItem.addActionListener(this);
1072		- gridItem = menu.add(new MenuItem("Grid"));
1073		- gridItem.addActionListener(this);
1074		- rectoidItem = menu.add(new MenuItem("Box"));
1075		- rectoidItem.addActionListener(this);
1076		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1077		- ellipsoidItem.addActionListener(this);
1078		- coneItem = menu.add(new MenuItem("Cone"));
1079		- coneItem.addActionListener(this);
1080		- torusItem = menu.add(new MenuItem("Torus"));
1081		- torusItem.addActionListener(this);
1082		- superItem = menu.add(new MenuItem("Superellipsoid"));
1083		- superItem.addActionListener(this);
	1937	+// gridItem = menu.add(new MenuItem("Grid"));
	1938	+// gridItem.addActionListener(this);
	1939	+// rectoidItem = menu.add(new MenuItem("Box"));
	1940	+// rectoidItem.addActionListener(this);
	1941	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1942	+// ellipsoidItem.addActionListener(this);
	1943	+// coneItem = menu.add(new MenuItem("Cone"));
	1944	+// coneItem.addActionListener(this);
	1945	+// torusItem = menu.add(new MenuItem("Torus"));
	1946	+// torusItem.addActionListener(this);
	1947	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1948	+// superItem.addActionListener(this);
	1949	+
	1950	+ cameraItem = menu.add(new MenuItem("Camera"));
	1951	+ cameraItem.addActionListener(this);
	1952	+
	1953	+ if (!Globals.ADVANCED)
	1954	+ {
1084	1955	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1085	1956	kleinItem.addActionListener(this);
1086		- particleItem = menu.add(new MenuItem("Particle system"));
1087		- particleItem.addActionListener(this);
	1957	+ }
	1958	+
	1959	+// particleItem = menu.add(new MenuItem("Particle system"));
	1960	+// particleItem.addActionListener(this);
	1961	+ if (Globals.ADVANCED)
	1962	+ {
1088	1963	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1089	1964	ragdollItem.addActionListener(this);
1090	1965	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1091	1966	ragdoll2Item.addActionListener(this);
	1967	+ }
1092	1968	menu.add("-");
1093		- meshItem = menu.add(new MenuItem("Mesh"));
	1969	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1094	1970	meshItem.addActionListener(this);
1095	1971	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1096	1972	// meshGroupItem.addActionListener(this);
	1973	+ if (Globals.ADVANCED)
	1974	+ {
1097	1975	springItem = menu.add(new MenuItem("Spring"));
1098	1976	springItem.addActionListener(this);
1099	1977	flagItem = menu.add(new MenuItem("Flag"));
1100	1978	flagItem.addActionListener(this);
1101		- bezierItem = menu.add(new MenuItem("Patch"));
1102		- bezierItem.addActionListener(this);
1103		- checkerItem = menu.add(new MenuItem("Checker"));
1104		- checkerItem.addActionListener(this);
1105	1979	blobItem = menu.add(new MenuItem("Blob"));
1106	1980	blobItem.addActionListener(this);
1107	1981	latheItem = menu.add(new MenuItem("Lathe"));
1108	1982	latheItem.addActionListener(this);
1109		- lightItem = menu.add(new MenuItem("Light"));
1110		- lightItem.addActionListener(this);
	1983	+ }
	1984	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1985	+ bezierItem.addActionListener(this);
	1986	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1987	+// overlayItem.addActionListener(this);
	1988	+// lightItem = menu.add(new MenuItem("Light"));
	1989	+// lightItem.addActionListener(this);
1111	1990	menu.add("-");
1112	1991	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1113	1992	//superLoopItem.addActionListener(this);
1114		- loopItem = menu.add(new MenuItem("Loop"));
1115		- loopItem.addActionListener(this);
	1993	+// loopItem = menu.add(new MenuItem("Loop"));
	1994	+// loopItem.addActionListener(this);
1116	1995	doubleItem = menu.add(new MenuItem("Fork"));
1117	1996	doubleItem.addActionListener(this);
	1997	+ if (Globals.ADVANCED)
	1998	+ {
1118	1999	tripleItem = menu.add(new MenuItem("Trident"));
1119	2000	tripleItem.addActionListener(this);
	2001	+ }
1120	2002	}
1121	2003
1122	2004	void buildToolsMenu(Menu menu)
1123	2005	{
1124	2006	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1125	2007	animationItem.addItemListener(this);
1126		- animationItem.setState(CameraPane.ANIMATION);
	2008	+ animationItem.setState(Globals.ANIMATION);
	2009	+
	2010	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	2011	+ archiveItem.addActionListener(this);
1127	2012
1128	2013	menu.add("-");
1129	2014	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1130	2015	parseverticesItem.addActionListener(this);
1131	2016	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1132	2017	textureFieldItem.addActionListener(this);
1133		- alignItem = menu.add(new MenuItem("Align"));
	2018	+ alignItem = menu.add(new MenuItem("Align Objects"));
1134	2019	alignItem.addActionListener(this);
1135		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1136		- mirrorItem.addActionListener(this);
1137	2020	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1138	2021	reduceMorphItem.addActionListener(this);
1139	2022	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1140	2023	reduce34MorphItem.addActionListener(this);
1141		-
1142		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1143		- computeAOItem.addActionListener(this);
1144	2024	menu.add("-");
1145		-
1146	2025	menu.add(memoryItem = new MenuItem("Memory Usage"));
1147	2026	memoryItem.addActionListener(this);
	2027	+ menu.add(computeAOItem = new MenuItem("Compute AO"));
	2028	+ computeAOItem.addActionListener(this);
	2029	+
	2030	+ if (Globals.ADVANCED)
	2031	+ {
	2032	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	2033	+ mirrorItem.addActionListener(this);
	2034	+ menu.add("-");
1148	2035	menu.add(analyzeItem = new MenuItem("Analyze"));
1149	2036	analyzeItem.addActionListener(this);
1150		- menu.add(dumpItem = new MenuItem("Dump"));
	2037	+ menu.add(dumpItem = new MenuItem("Print"));
1151	2038	dumpItem.addActionListener(this);
1152	2039	// menu.add(pathItem = new MenuItem("From-to path"));
1153	2040	// pathItem.addActionListener(this);
..	..	@@ -1165,6 +2052,7 @@
1165	2052	menu.add("-");
1166	2053	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1167	2054	editScriptItem.addActionListener(this);
	2055	+ }
1168	2056	}
1169	2057
1170	2058	void ScreenFit()
..	..	@@ -1287,9 +2175,38 @@
1287	2175	shadow.material = new cMaterial(obj.material);
1288	2176	shadow.material.diffuse = 0.0001f;
1289	2177	shadow.material.specular = 0.0001f;
	2178	+ shadow.material.opacity = 0.75f;
	2179	+
	2180	+ AllocProjectedVertices(shadow);
	2181	+
	2182	+ shadow.projectedVertices[1].x = 300;
1290	2183
1291	2184	makeSomething(shadow);
1292	2185	}
	2186	+
	2187	+ private void ClearUnpinned()
	2188	+ {
	2189	+ //for (Object3D obj : listUI)
	2190	+ for (int i=listUI.size(); --i>=0;)
	2191	+ {
	2192	+ Object3D obj = listUI.elementAt(i);
	2193	+ if (!obj.pinned)
	2194	+ {
	2195	+ obj.CloseUI();
	2196	+ listUI.remove(i);
	2197	+ }
	2198	+ }
	2199	+ }
	2200	+
	2201	+ private void EditElement(Object3D elem, boolean newWindow)
	2202	+ {
	2203	+ // if (!(elem instanceof Composite))
	2204	+ // newWindow = false;
	2205	+ listUI.add(elem);
	2206	+ elem.openEditWindow(this, newWindow); //, false);
	2207	+ System.out.println("edit : " + elem);
	2208	+ elem.editWindow.refreshContents(true); // ? new
	2209	+ }
1293	2210
1294	2211	/**
1295	2212	* applyExample
..	..	@@ -1493,9 +2410,9 @@
1493	2410
1494	2411	void Overwrite(int mask)
1495	2412	{
1496		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2413	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1497	2414	{
1498		- Object3D content = GrafreeD.clipboard.get(0);
	2415	+ Object3D content = Grafreed.clipboard.get(0);
1499	2416
1500	2417	if (content instanceof cGroup && ((cGroup)content).transientlink )
1501	2418	content = ((cGroup)content).get(0);
..	..	@@ -1534,7 +2451,7 @@
1534	2451	{
1535	2452	ScreenFit();
1536	2453	} else
1537		- if (source == switchItem)
	2454	+ if (source == switchViewItem)
1538	2455	{
1539	2456	cVector v1 = new cVector();
1540	2457	cVector v2 = new cVector();
..	..	@@ -1543,11 +2460,11 @@
1543	2460	objEditor.cameraView.renderCamera.setAim(v2, v1);
1544	2461	objEditor.cameraView.repaint();
1545	2462	} else
1546		- if (source == rectoidItem)
	2463	+ if (source == rectoidItem \|\| source == boxButton)
1547	2464	{
1548	2465	makeSomething(new Box());
1549	2466	} else
1550		- if (source == particleItem)
	2467	+ if (source == particleItem \|\| source == particlesButton)
1551	2468	{
1552	2469	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1553	2470	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1626,27 +2543,27 @@
1626	2543
1627	2544	makeSomething(obj);
1628	2545	} else
1629		- if (source == gridItem)
	2546	+ if (source == gridItem \|\| source == gridButton)
1630	2547	{
1631	2548	makeSomething(new Grid());
1632	2549	} else
1633		- if (source == ellipsoidItem)
	2550	+ if (source == ellipsoidItem \|\| source == sphereButton)
1634	2551	{
1635	2552	makeSomething(new Sphere());
1636	2553	} else
1637		- if (source == coneItem)
	2554	+ if (source == coneItem \|\| source == coneButton)
1638	2555	{
1639	2556	makeSomething(new Cone());
1640	2557	} else
1641		- if (source == torusItem)
	2558	+ if (source == torusItem \|\| source == torusButton)
1642	2559	{
1643	2560	makeSomething(new Torus());
1644	2561	} else
1645		- if (source == superItem)
	2562	+ if (source == superItem \|\| source == superButton)
1646	2563	{
1647	2564	makeSomething(new Superellipsoid());
1648	2565	} else
1649		- if (source == kleinItem)
	2566	+ if (source == kleinItem \|\| source == kleinButton)
1650	2567	{
1651	2568	makeSomething(new Klein());
1652	2569	} else
..	..	@@ -1666,7 +2583,7 @@
1666	2583	{
1667	2584	makeSomething(new BezierSurface());
1668	2585	} else
1669		- if (source == checkerItem)
	2586	+ if (source == overlayItem \|\| source == overlayButton)
1670	2587	{
1671	2588	/*
1672	2589	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1714,10 +2631,27 @@
1714	2631	s.setup();
1715	2632	makeSomething(s);
1716	2633	} else
1717		- if (source == lightItem)
	2634	+ if (source == lightItem \|\| source == lightButton)
1718	2635	{
1719	2636	makeSomething(new Light());
1720	2637	} else
	2638	+// if (source == skybox1Button \|\|
	2639	+// source == skybox2Button \|\|
	2640	+// source == skybox3Button \|\|
	2641	+// source == skybox4Button \|\|
	2642	+// source == skybox5Button \|\|
	2643	+// source == skybox6Button \|\|
	2644	+// source == skybox7Button \|\|
	2645	+// source == skybox11Button \|\|
	2646	+// source == skybox12Button \|\|
	2647	+// source == skybox13Button \|\|
	2648	+// source == skybox14Button \|\|
	2649	+// source == skybox15Button \|\|
	2650	+// source == skybox16Button \|\|
	2651	+// source == skybox17Button)
	2652	+// {
	2653	+// ChangeSkybox(source);
	2654	+// } else
1721	2655	if (source == csgItem)
1722	2656	{
1723	2657	group(new CSG());
..	..	@@ -1764,30 +2698,38 @@
1764	2698
1765	2699	group(g);
1766	2700	} else
1767		- if (source == loopItem)
	2701	+ if (source == loopItem \|\| source == loopButton)
1768	2702	{
	2703	+ if (!group.selection.isEmpty())
	2704	+ {
1769	2705	Composite csg = new GroupLeaf();
1770	2706	csg.count = 5;
1771		- group(csg);
1772		- Composite child = new cGroup();
	2707	+ Composite child = new cGroup("Branch");
1773	2708	csg.addChild(child);
1774	2709	child.addChild(csg);
	2710	+ group(csg);
	2711	+ }
1775	2712	} else
1776	2713	if (source == doubleItem)
1777	2714	{
1778		- Composite csg = new GroupLeaf();
	2715	+ if (!group.selection.isEmpty())
	2716	+ {
	2717	+ Composite csg = new GroupLeaf("Fork");
1779	2718	csg.count = 5;
	2719	+ Composite child = new cGroup("Branch A");
	2720	+ csg.addChild(child);
	2721	+ child.addChild(csg);
	2722	+ child = new cGroup("Branch B");
	2723	+ csg.addChild(child);
	2724	+ child.addChild(csg);
1780	2725	group(csg);
1781		- Composite child = new cGroup();
1782		- csg.addChild(child);
1783		- child.addChild(csg);
1784		- child = new cGroup();
1785		- csg.addChild(child);
1786		- child.addChild(csg);
	2726	+ }
1787	2727	} else
1788	2728	if (source == tripleItem)
1789	2729	{
1790		- Composite csg = new GroupLeaf();
	2730	+ if (!group.selection.isEmpty())
	2731	+ {
	2732	+ Composite csg = new GroupLeaf("Trident");
1791	2733	csg.count = 4;
1792	2734	group(csg);
1793	2735	Composite child = new cGroup();
..	..	@@ -1799,28 +2741,12 @@
1799	2741	child = new cGroup();
1800	2742	csg.addChild(child);
1801	2743	child.addChild(csg);
1802		- } else
1803		-
1804		- if (source == importGFDItem)
1805		- {
1806		- ImportGFD();
1807		- } else
1808		- if (source == importVRMLX3DItem)
1809		- {
1810		- ImportVRMLX3D();
1811		- } else
1812		- if (source == import3DSItem)
1813		- {
1814		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1815		- } else
1816		- if (source == importOBJItem)
1817		- {
1818		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	2744	+ }
1819	2745	} else
1820	2746	if (source == computeAOItem)
1821	2747	{
1822	2748	Globals.drawMode = CameraPane.OCCLUSION;
1823		- Globals.theRenderer.repaint();
	2749	+ cameraView.repaint();
1824	2750	} else
1825	2751	if (source == recompileItem)
1826	2752	{
..	..	@@ -1835,7 +2761,7 @@
1835	2761	if (source == invariantsItem)
1836	2762	{
1837	2763	System.out.println("Invariants:");
1838		- GrafreeD.grafreeD.universe.invariants();
	2764	+ Grafreed.grafreed.universe.invariants();
1839	2765	} else
1840	2766	if (source == memoryItem)
1841	2767	{
..	..	@@ -1854,19 +2780,80 @@
1854	2780	{
1855	2781	DumpObject();
1856	2782	} else
	2783	+ if (source == minButton)
	2784	+ {
	2785	+ Minimize();
	2786	+ } else
	2787	+ if (source == maxButton)
	2788	+ {
	2789	+ Maximize();
	2790	+ } else
	2791	+ if (source == fullButton)
	2792	+ {
	2793	+ ToggleFullScreen();
	2794	+ } else
	2795	+ if (source == collapseButton)
	2796	+ {
	2797	+ this.expandedLayout = radio.layout;
	2798	+ CollapseToolbar();
	2799	+ } else
	2800	+ if (source == maximize3DButton)
	2801	+ {
	2802	+ this.expandedLayout = radio.layout;
	2803	+ radio.layout = twoButton;
	2804	+ Show3DView();
	2805	+ CollapseToolbar();
	2806	+ } else
	2807	+ if (source == previousVersionButton)
	2808	+ {
	2809	+ // Go to previous version
	2810	+ //if (!Undo())
	2811	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2812	+ PreviousVersion();
	2813	+ } else
	2814	+ if (source == restoreButton)
	2815	+ {
	2816	+ // Restore current version
	2817	+ Restore();
	2818	+ //restoreButton.setEnabled(false);
	2819	+ } else
	2820	+ if (source == replaceButton)
	2821	+ {
	2822	+ // Overwrite current version
	2823	+ Replace();
	2824	+ //replaceButton.setEnabled(false);
	2825	+ } else
	2826	+ if (source == nextVersionButton)
	2827	+ {
	2828	+ // Go to next version
	2829	+ NextVersion();
	2830	+ } else
	2831	+ if (source == saveVersionButton)
	2832	+ {
	2833	+ // Save a new version
	2834	+ if (!Save(true))
	2835	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2836	+ } else
	2837	+ if (source == deleteVersionButton)
	2838	+ {
	2839	+ // Delete a new version
	2840	+ DeleteVersion();
	2841	+ } else
	2842	+ if (source == oneStepButton)
	2843	+ {
	2844	+ Globals.ONESTEP = true;
	2845	+ cameraView.repaint();
	2846	+ } else
1857	2847	if (source == screenfitButton)
1858	2848	{
1859		- //Reload(lastConverter, lastFilename, true);
1860	2849	ScreenFit();
1861	2850	} else
1862	2851	if (source == screenfitpointButton)
1863	2852	{
1864		- //Reload(lastConverter, lastFilename, true);
1865	2853	ScreenFitPoint();
1866	2854	} else
1867	2855	if (source == snapobjectButton)
1868	2856	{
1869		- //Reload(lastConverter, lastFilename, true);
1870	2857	SnapObject();
1871	2858	} else
1872	2859	// if (event.getSource() == recompileButton)
..	..	@@ -1903,12 +2890,20 @@
1903	2890	{
1904	2891	loadClipboard(true);
1905	2892	} else
	2893	+ if (source == undoItem)
	2894	+ {
	2895	+ PreviousVersion();
	2896	+ } else
	2897	+ if (source == redoItem)
	2898	+ {
	2899	+ NextVersion();
	2900	+ } else
1906	2901	if (source == duplicateItem)
1907	2902	{
1908		- Object3D keep = GrafreeD.clipboard;
	2903	+ Object3D keep = Grafreed.clipboard;
1909	2904	loadClipboard(false);
1910	2905	paste(false);
1911		- GrafreeD.clipboard = keep;
	2906	+ Grafreed.clipboard = keep;
1912	2907	} else
1913	2908	if (source == cloneItem)
1914	2909	{
..	..	@@ -1926,13 +2921,17 @@
1926	2921	{
1927	2922	paste(false);
1928	2923	} else
	2924	+ if (source == pasteIntoItem)
	2925	+ {
	2926	+ pasteInto(true, false);
	2927	+ } else
1929	2928	if (source == pasteLinkItem)
1930	2929	{
1931		- pasteInto(false);
	2930	+ pasteInto(false, false);
1932	2931	} else
1933	2932	if (source == pasteCloneItem)
1934	2933	{
1935		- pasteInto(true);
	2934	+ pasteInto(true, true);
1936	2935	} else
1937	2936	if (source == pasteExpandItem)
1938	2937	{
..	..	@@ -2124,9 +3123,9 @@
2124	3123	// group.selection.get(0).setMasterThis(content); // should be identity
2125	3124	// refreshContents();
2126	3125	// }
2127		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	3126	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2128	3127	{
2129		- Object3D content = GrafreeD.clipboard.get(0);
	3128	+ Object3D content = Grafreed.clipboard.get(0);
2130	3129
2131	3130	if (content instanceof cGroup && ((cGroup)content).transientlink )
2132	3131	content = ((cGroup)content).get(0);
..	..	@@ -2134,11 +3133,11 @@
2134	3133	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2135	3134	for (int i=0; i<group.selection.size(); i++)
2136	3135	{
2137		- boolean random = CameraPane.RANDOM;
2138		- CameraPane.RANDOM = false; // parse all random nodes
	3136	+ boolean random = CameraPane.SWITCH;
	3137	+ CameraPane.SWITCH = false; // parse all random nodes
2139	3138	group.selection.get(i).linkVerticesThis(content);
2140	3139	// group.selection.get(i).setMasterThis(content); // should be identity
2141		- CameraPane.RANDOM = random;
	3140	+ CameraPane.SWITCH = random;
2142	3141	}
2143	3142	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2144	3143	refreshContents();
..	..	@@ -2148,20 +3147,20 @@
2148	3147	{
2149	3148	for (int i=0; i<group.selection.size(); i++)
2150	3149	{
2151		- boolean random = CameraPane.RANDOM;
2152		- CameraPane.RANDOM = false; // parse all random nodes
	3150	+ boolean random = CameraPane.SWITCH;
	3151	+ CameraPane.SWITCH = false; // parse all random nodes
2153	3152	group.selection.get(i).linkVerticesThis(null);
2154		- CameraPane.RANDOM = random;
	3153	+ CameraPane.SWITCH = random;
2155	3154	}
2156	3155
2157	3156	refreshContents();
2158	3157	} else
2159	3158	if (source == relinkverticesItem)
2160	3159	{
2161		- boolean random = CameraPane.RANDOM;
2162		- CameraPane.RANDOM = false; // parse all random nodes
	3160	+ boolean random = CameraPane.SWITCH;
	3161	+ CameraPane.SWITCH = false; // parse all random nodes
2163	3162	group.selection.RelinkToSupport();
2164		- CameraPane.RANDOM = random;
	3163	+ CameraPane.SWITCH = random;
2165	3164
2166	3165	refreshContents();
2167	3166	} else
..	..	@@ -2176,9 +3175,9 @@
2176	3175	} else
2177	3176	if (source == setMasterItem)
2178	3177	{
2179		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	3178	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2180	3179	{
2181		- Object3D content = GrafreeD.clipboard.get(0);
	3180	+ Object3D content = Grafreed.clipboard.get(0);
2182	3181
2183	3182	if (content instanceof cGroup && ((cGroup)content).transientlink )
2184	3183	content = ((cGroup)content).get(0);
..	..	@@ -2191,9 +3190,9 @@
2191	3190	{
2192	3191	if (group.selection.size() == 1)
2193	3192	{
2194		- if (GrafreeD.clipboard.size() == 1)
	3193	+ if (Grafreed.clipboard.size() == 1)
2195	3194	{
2196		- Object3D content = GrafreeD.clipboard.get(0);
	3195	+ Object3D content = Grafreed.clipboard.get(0);
2197	3196
2198	3197	if (content instanceof cGroup && ((cGroup)content).transientlink )
2199	3198	content = ((cGroup)content).get(0);
..	..	@@ -2210,7 +3209,7 @@
2210	3209	{
2211	3210	RevertMeshes();
2212	3211	} else
2213		- if (source == resetMeshItem)
	3212	+ if (source == resetAllItem)
2214	3213	{
2215	3214	ResetAll();
2216	3215	} else
..	..	@@ -2218,7 +3217,7 @@
2218	3217	{
2219	3218	StepAll();
2220	3219	} else
2221		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3220	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2222	3221	{
2223	3222	//int indices[] = jList.getSelectedIndices();
2224	3223	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2230,9 +3229,9 @@
2230	3229	{
2231	3230	ClearSelection(true);
2232	3231	} else
2233		- if (source == grabItem)
	3232	+ if (source == grabItem \|\| source == groupButton)
2234	3233	{
2235		- group(new cGroup(), true);
	3234	+ group(new cGroup(), false); // true);
2236	3235	} else
2237	3236	if (source == hideItem)
2238	3237	{
..	..	@@ -2250,16 +3249,16 @@
2250	3249	{
2251	3250	makeSomething(new Camera());
2252	3251	} else
2253		- if (source == compositeItem)
	3252	+ if (source == compositeItem \|\| source == compositeButton)
2254	3253	{
2255	3254	group(new Composite());
2256	3255	} else
2257		- if (source == randomItem)
	3256	+ if (source == switchItem \|\| source == switchButton)
2258	3257	{
2259	3258	RandomNode random = new RandomNode();
2260	3259	group(random);
2261	3260	if (random.size() > 0)
2262		- random.name = random.get(0).name + "Rnd";
	3261	+ random.name = random.get(0).name + "Switch";
2263	3262	} else
2264	3263	if (source == physicsItem)
2265	3264	{
..	..	@@ -2356,7 +3355,7 @@
2356	3355	{
2357	3356	group(new cLinker());
2358	3357	} else
2359		- if (source == textureItem)
	3358	+ if (source == textureItem \|\| source == textureButton)
2360	3359	{
2361	3360	group(new TextureNode());
2362	3361	} else
..	..	@@ -2376,17 +3375,42 @@
2376	3375	{
2377	3376	CastShadow(2);
2378	3377	} else
2379		- if (source == ungroupItem)
	3378	+ if (source == ungroupItem \|\| source == ungroupButton)
2380	3379	{
2381		- //ungroup();
	3380	+ boolean canUngroup = true;
	3381	+
2382	3382	for (int i=0; i<group.selection.size(); i++)
2383	3383	{
2384		- Ungroup(group.selection.get(i));
	3384	+ Object3D selectedItem = group.selection.get(i);
	3385	+
	3386	+ if (selectedItem.Size() == 0)
	3387	+ {
	3388	+ // Cannot ungroup leaves
	3389	+ canUngroup = false;
	3390	+ break;
	3391	+ }
	3392	+
	3393	+ if (selectedItem == group)
	3394	+ {
	3395	+ // Cannot ungroup root
	3396	+ canUngroup = false;
	3397	+ break;
	3398	+ }
2385	3399	}
2386	3400
2387		- ClearSelection(false);
2388		-
2389		- refreshContents();
	3401	+ if (canUngroup)
	3402	+ {
	3403	+ for (int i=0; i<group.selection.size(); i++)
	3404	+ {
	3405	+ Object3D selectedItem = group.selection.get(i);
	3406	+
	3407	+ Ungroup(selectedItem);
	3408	+ }
	3409	+
	3410	+ ClearSelection(false);
	3411	+
	3412	+ refreshContents();
	3413	+ }
2390	3414	} else
2391	3415	if (source == genUVItem)
2392	3416	{
..	..	@@ -2398,7 +3422,7 @@
2398	3422	} else
2399	3423	if (source == genNormalsMESHItem)
2400	3424	{
2401		- GenNormals(true); // TODO
	3425	+ GenNormalsMESH();
2402	3426	} else
2403	3427	if (source == genNormalsORGANItem)
2404	3428	{
..	..	@@ -2463,6 +3487,22 @@
2463	3487	if (source == unmarkleavesItem)
2464	3488	{
2465	3489	MarkLeaves(false);
	3490	+ } else
	3491	+ if (source == rewindleavesItem)
	3492	+ {
	3493	+ RewindLeaves(true);
	3494	+ } else
	3495	+ if (source == unrewindleavesItem)
	3496	+ {
	3497	+ RewindLeaves(false);
	3498	+ } else
	3499	+ if (source == randomleavesItem)
	3500	+ {
	3501	+ RandomLeaves(true);
	3502	+ } else
	3503	+ if (source == unrandomleavesItem)
	3504	+ {
	3505	+ RandomLeaves(false);
2466	3506	} else
2467	3507	if (source == flipVItem)
2468	3508	{
..	..	@@ -2548,9 +3588,13 @@
2548	3588	{
2549	3589	SmoothMesh();
2550	3590	} else
2551		- if (source == transformgeometryItem)
	3591	+ if (source == transformGeometryItem)
2552	3592	{
2553	3593	TransformGeometry();
	3594	+ } else
	3595	+ if (source == transformChildrenItem)
	3596	+ {
	3597	+ TransformChildren();
2554	3598	} else
2555	3599	if (source == resetTransformItem)
2556	3600	{
..	..	@@ -2558,7 +3602,11 @@
2558	3602	} else
2559	3603	if (source == resetCentroidItem)
2560	3604	{
2561		- ResetCentroid();
	3605	+ ResetCentroid(true);
	3606	+ } else
	3607	+ if (source == resetCentroidXZItem)
	3608	+ {
	3609	+ ResetCentroid(false);
2562	3610	} else
2563	3611	if (source == resetParentItem)
2564	3612	{
..	..	@@ -2663,7 +3711,7 @@
2663	3711	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2664	3712	{
2665	3713	obj = (Object3D)e.nextElement();
2666		- obj.SetBumpTexture(null);
	3714	+ obj.ResetBumpTexture();
2667	3715	}
2668	3716
2669	3717	refreshContents();
..	..	@@ -2679,6 +3727,31 @@
2679	3727
2680	3728	refreshContents();
2681	3729	} else
	3730	+ if (source == embedTexturesItem)
	3731	+ {
	3732	+ Object3D obj;
	3733	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3734	+ {
	3735	+ obj = (Object3D)e.nextElement();
	3736	+ obj.EmbedTextures(true);
	3737	+ }
	3738	+
	3739	+ refreshContents();
	3740	+ } else
	3741	+ if (source == deEmbedTexturesItem)
	3742	+ {
	3743	+ Object3D obj;
	3744	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3745	+ {
	3746	+ obj = (Object3D)e.nextElement();
	3747	+ obj.EmbedTextures(false);
	3748	+ }
	3749	+
	3750	+ CameraPane.texturepigment.clear();
	3751	+ CameraPane.texturebump.clear();
	3752	+
	3753	+ refreshContents();
	3754	+ } else
2682	3755	if (source == flashSelectionButton)
2683	3756	{
2684	3757	CameraPane.flash = true;
..	..	@@ -2690,42 +3763,36 @@
2690	3763	if (source == twoButton)
2691	3764	{
2692	3765	radio.layout = twoButton;
2693		- // bug
2694		- //gridPanel.setDividerLocation(1.0);
2695		- //bigPanel.setDividerLocation(0.0);
2696		-// bigThree.remove(scenePanel);
2697		-// bigThree.remove(centralPanel);
2698		-// bigThree.remove(XYZPanel);
2699		-// aWindowConstraints.gridx = 0;
2700		-// aWindowConstraints.gridy = 0;
2701		-// aWindowConstraints.gridwidth = 1;
2702		-// // aConstraints.gridheight = 3;
2703		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2704		-// aWindowConstraints.weightx = 0;
2705		-// aWindowConstraints.weighty = 1;
2706		-// //bigThree.add(jtp, aWindowConstraints);
2707		-// aWindowConstraints.weightx = 1;
2708		-// aWindowConstraints.gridwidth = 3;
2709		-// // aConstraints.gridheight = 3;
2710		-// aWindowConstraints.gridx = 1;
2711		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
2712		-// bigThree.add(centralPanel, aWindowConstraints);
2713		-// aWindowConstraints.weightx = 0;
2714		-// aWindowConstraints.gridx = 4;
2715		-// aWindowConstraints.gridwidth = 1;
2716		-// // aConstraints.gridheight = 3;
2717		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2718		-// //bigThree.add(XYZPanel, aWindowConstraints);
2719		-// scenePanel.setVisible(false);
2720		-// centralPanel.setVisible(true);
2721		-// XYZPanel.setVisible(false);
2722		- bigThree.ClearUI();
2723		- bigThree.add(centralPanel);
2724		- bigThree.FlushUI();
	3766	+
	3767	+ if (CameraPane.FULLSCREEN)
	3768	+ fullscreenLayout = radio.layout;
	3769	+
	3770	+ Show3DView();
	3771	+
	3772	+ cameraView.requestFocusInWindow();
	3773	+
	3774	+// refreshContents(true);
	3775	+//
	3776	+// try
	3777	+// {
	3778	+// java.awt.Robot bot = new java.awt.Robot();
	3779	+// int mask = InputEvent.BUTTON1_MASK;
	3780	+// bot.mouseMove(100, 100);
	3781	+// bot.mousePress(mask);
	3782	+// bot.mouseRelease(mask);
	3783	+// }
	3784	+// catch (Exception e)
	3785	+// {
	3786	+//
	3787	+// }
	3788	+
2725	3789	} else
2726	3790	if (source == threeButton)
2727	3791	{
2728	3792	radio.layout = threeButton;
	3793	+
	3794	+ if (CameraPane.FULLSCREEN)
	3795	+ fullscreenLayout = radio.layout;
2729	3796
2730	3797	// bigThree.remove(scenePanel);
2731	3798	// bigThree.remove(centralPanel);
..	..	@@ -2755,13 +3822,18 @@
2755	3822	// centralPanel.setVisible(true);
2756	3823	// XYZPanel.setVisible(true);
2757	3824	bigThree.ClearUI();
	3825	+ bigThree.add(scenePanel);
2758	3826	bigThree.add(centralPanel);
2759		- bigThree.add(XYZPanel);
2760	3827	bigThree.FlushUI();
	3828	+
	3829	+ cameraView.requestFocusInWindow();
2761	3830	} else
2762	3831	if (source == fourButton)
2763	3832	{
2764	3833	radio.layout = fourButton;
	3834	+
	3835	+ if (CameraPane.FULLSCREEN)
	3836	+ fullscreenLayout = radio.layout;
2765	3837
2766	3838	// bigThree.remove(scenePanel);
2767	3839	// bigThree.remove(centralPanel);
..	..	@@ -2793,10 +3865,15 @@
2793	3865	bigThree.ClearUI();
2794	3866	bigThree.add(scenePanel);
2795	3867	bigThree.FlushUI();
	3868	+
	3869	+ cameraView.requestFocusInWindow();
2796	3870	} else
2797	3871	if (source == sixButton)
2798	3872	{
2799	3873	radio.layout = sixButton;
	3874	+
	3875	+ if (CameraPane.FULLSCREEN)
	3876	+ fullscreenLayout = radio.layout;
2800	3877
2801	3878	// bigThree.remove(scenePanel);
2802	3879	// bigThree.remove(centralPanel);
..	..	@@ -2826,13 +3903,18 @@
2826	3903	// centralPanel.setVisible(true);
2827	3904	// XYZPanel.setVisible(false);
2828	3905	bigThree.ClearUI();
2829		- bigThree.add(scenePanel);
2830	3906	bigThree.add(centralPanel);
	3907	+ bigThree.add(scenePanel);
2831	3908	bigThree.FlushUI();
	3909	+
	3910	+ cameraView.requestFocusInWindow();
2832	3911	} else
2833	3912	if (source == sevenButton)
2834	3913	{
2835	3914	radio.layout = sevenButton;
	3915	+
	3916	+ if (CameraPane.FULLSCREEN)
	3917	+ fullscreenLayout = radio.layout;
2836	3918
2837	3919	// bigThree.remove(scenePanel);
2838	3920	// bigThree.remove(centralPanel);
..	..	@@ -2866,9 +3948,12 @@
2866	3948	bigThree.add(centralPanel);
2867	3949	bigThree.add(XYZPanel);
2868	3950	bigThree.FlushUI();
	3951	+
	3952	+ cameraView.requestFocusInWindow();
2869	3953	} else
2870	3954	if (source == rootButton)
2871	3955	{
	3956	+ Replace();
2872	3957	Object3D obj;
2873	3958	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2874	3959	{
..	..	@@ -2877,6 +3962,7 @@
2877	3962	EditObject(obj);
2878	3963	}
2879	3964
	3965	+ cameraView.requestFocusInWindow();
2880	3966	refreshContents(true);
2881	3967	} else
2882	3968	if (source == closeButton)
..	..	@@ -2886,22 +3972,37 @@
2886	3972	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2887	3973	{
2888	3974	ab = (cRadio)e.nextElement();
2889		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3975	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2890	3976	{
	3977	+ // Patch to avoid bug with transparency.
	3978	+ if (!ab.hadMaterial)
	3979	+ {
	3980	+ ab.object.material = null;
	3981	+ }
	3982	+
2891	3983	buttonGroup.remove(ab);
2892	3984	radioPanel.remove(ab);
2893	3985
2894		- ab.GetObject().editWindow = null;
	3986	+ //ab.GetObject().editWindow = null;
	3987	+ ab.GetObject().manipWindow = null;
2895	3988	// ab.GetObject().objectUI = null; // ?????????
2896	3989
2897	3990	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2898	3991	break;
2899	3992	}
2900	3993	}
	3994	+
	3995	+ cameraView.requestFocusInWindow();
2901	3996	refreshContents(true);
2902	3997	} else
2903	3998	if (source == editItem \|\| source == editButton)
2904	3999	{
	4000	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4001	+ {
	4002	+ Object3D child = (Object3D)e.nextElement();
	4003	+ child.pinned = true;
	4004	+ }
	4005	+
2905	4006	EditSelection(false);
2906	4007	} else
2907	4008	if (source == uneditButton)
..	..	@@ -2910,13 +4011,14 @@
2910	4011	{
2911	4012	Object3D child = (Object3D)e.nextElement();
2912	4013	if(child.editWindow != null)
2913		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4014	+ child.pinned = false;
2914	4015	child.CloseUI();
2915	4016	listUI.remove(child);
	4017	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2916	4018
2917		- child.editWindow = null; // ???????????
	4019	+ //child.editWindow = null; // ???????????
2918	4020	}
2919		- objEditor.ctrlPanel.revalidate();
	4021	+ objEditor.ctrlPanel.FlushUI();
2920	4022	//objEditor.jTree.clearSelection();
2921	4023	//objEditor.ResetSliders();
2922	4024	refreshContents(true);
..	..	@@ -2927,16 +4029,18 @@
2927	4029	//copy.ClearUI();
2928	4030	for (Object3D obj : listUI)
2929	4031	{
	4032	+ obj.pinned = false;
2930	4033	obj.CloseUI();
2931	4034	}
2932	4035	listUI.clear();
	4036	+ SetPinStates(group.selection.size() > 0);
2933	4037	refreshContents(true);
2934	4038	} else
2935	4039	if (source == allParamsButton)
2936	4040	{
2937	4041	assert(copy == group);
2938	4042
2939		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4043	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2940	4044
2941	4045	for (Object3D obj : listUI)
2942	4046	{
..	..	@@ -2985,6 +4089,7 @@
2985	4089	}
2986	4090
2987	4091	copy = group;
	4092	+
2988	4093	//Globals.theRenderer.object = group;
2989	4094	if(!useclient)
2990	4095	{
..	..	@@ -3000,20 +4105,64 @@
3000	4105	frontView.object = group;
3001	4106	sideView.object = group;
3002	4107	}
3003		- group.editWindow = this;
	4108	+
	4109	+// fix "+" issue
	4110	+ //group.editWindow = this;
	4111	+ group.manipWindow = this;
	4112	+
3004	4113	/*
3005	4114	currentLayout = radio.layout;
3006	4115	if (currentLayout == null)
3007	4116	currentLayout = sevenButton;
3008	4117	*/
3009	4118	radio.layout.doClick();
	4119	+
	4120	+ assert(copy instanceof Composite);
	4121	+
	4122	+ if (copy.versionlist == null)
	4123	+ {
	4124	+ copy.versionlist = new Object3D[100];
	4125	+ copy.versionindex = -1;
	4126	+
	4127	+ // Cannot work with loops
	4128	+ // To fix this issue, first mark all nodes above the root,
	4129	+ // and check if any of these nodes are reachable below the root.
	4130	+ //Save(true);
	4131	+ }
	4132	+
	4133	+ SetVersionStates();
	4134	+
	4135	+ ClearUnpinned();
	4136	+
	4137	+ //Grafreed.Assert(group != null);
	4138	+ //Grafreed.Assert(group.selection != null);
	4139	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4140	+ if (group.selection == null \|\| group.selection.size() == 1)
	4141	+ EditSelection(false);
3010	4142	keepparent = group.parent;
3011	4143	// PARENT = NULL or not???
3012	4144	//group.parent = null; // ROOT
3013	4145	//group.attributes = -1;
3014	4146	ResetModel();
	4147	+
	4148	+ cameraView.requestFocusInWindow();
3015	4149	refreshContents(true);
3016		- }
	4150	+ } else if (event.getSource() == editCameraItem)
	4151	+ {
	4152	+ cameraView.ProtectCamera();
	4153	+ cameraView.requestFocusInWindow();
	4154	+ cameraView.repaint();
	4155	+ return;
	4156	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	4157	+ {
	4158	+ cameraView.RevertCamera();
	4159	+ cameraView.requestFocusInWindow();
	4160	+ cameraView.repaint();
	4161	+ return;
	4162	+ // } else if (event.getSource() == textureButton)
	4163	+ // {
	4164	+ // return; // true;
	4165	+ }
3017	4166	else
3018	4167	{
3019	4168	//return super.action(event, arg);
..	..	@@ -3022,7 +4171,6 @@
3022	4171	}
3023	4172
3024	4173	boolean useclient = false;
3025		- cRadio radio;
3026	4174
3027	4175	void ToggleRoot()
3028	4176	{
..	..	@@ -3074,6 +4222,28 @@
3074	4222	refreshContents();
3075	4223	}
3076	4224
	4225	+ void TransformChildren()
	4226	+ {
	4227	+ Object3D obj;
	4228	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4229	+ {
	4230	+ obj = (Object3D)e.nextElement();
	4231	+ obj.KeepTextureMatrices();
	4232	+ obj.TransformChildren();
	4233	+ obj.RestoreTextureMatrices();
	4234	+
	4235	+// if (obj.parent == null)
	4236	+// {
	4237	+// System.out.println("NULL PARENT!");
	4238	+// new Exception().printStackTrace();
	4239	+// }
	4240	+// else
	4241	+// TouchTransform(obj);
	4242	+// //obj.parent.Touch();
	4243	+ }
	4244	+
	4245	+ refreshContents();
	4246	+ }
3077	4247
3078	4248	void ResetTransform()
3079	4249	{
..	..	@@ -3186,7 +4356,7 @@
3186	4356	refreshContents();
3187	4357	}
3188	4358
3189		- void ResetCentroid()
	4359	+ void ResetCentroid(boolean full)
3190	4360	{
3191	4361	Object3D obj;
3192	4362	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3201,12 +4371,16 @@
3201	4371	LA.matIdentity(Object3D.mat);
3202	4372	obj.getBounds(minima, maxima, false);
3203	4373	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3204		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	4374	+ if (full)
	4375	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3205	4376	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3206	4377	obj.TransformMesh(Object3D.mat);
	4378	+
3207	4379	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3208		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	4380	+ if (full)
	4381	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3209	4382	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	4383	+
3210	4384	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3211	4385	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3212	4386	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3235,7 +4409,8 @@
3235	4409
3236	4410	int size = obj.MemorySize();
3237	4411
3238		- System.err.println((size/1024) + " KB is the size of " + obj);
	4412	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4413	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3239	4414	}
3240	4415	}
3241	4416	catch (Exception e)
..	..	@@ -3272,9 +4447,9 @@
3272	4447	obj = (Object3D)e.nextElement();
3273	4448
3274	4449	System.out.println("Object is: " + obj);
3275		- GrafreeD.AnalyzeObject(obj);
	4450	+ Grafreed.AnalyzeObject(obj);
3276	4451	System.out.println("Boundary rep: " + obj.bRep);
3277		- GrafreeD.AnalyzeObject(obj.bRep);
	4452	+ Grafreed.AnalyzeObject(obj.bRep);
3278	4453
3279	4454	// System.err.println((size/1024) + " KB is the size of " + obj);
3280	4455	}
..	..	@@ -3316,6 +4491,13 @@
3316	4491	void GenNormals(boolean crease)
3317	4492	{
3318	4493	group.GenNormalsS(crease);
	4494	+
	4495	+ refreshContents();
	4496	+ }
	4497	+
	4498	+ void GenNormalsMESH()
	4499	+ {
	4500	+ group.GenNormalsMeshS();
3319	4501
3320	4502	refreshContents();
3321	4503	}
..	..	@@ -3488,8 +4670,8 @@
3488	4670
3489	4671	void ParseVertices()
3490	4672	{
3491		- boolean epsequal = GrafreeD.epsequal;
3492		- GrafreeD.epsequal = true;
	4673	+ boolean epsequal = Grafreed.epsequal;
	4674	+ Grafreed.epsequal = true;
3493	4675
3494	4676	for (int i=0; i<group.selection.size(); i++)
3495	4677	{
..	..	@@ -3514,7 +4696,7 @@
3514	4696	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3515	4697	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3516	4698
3517		- g.add(GrafreeD.clipboard);
	4699	+ g.add(Grafreed.clipboard);
3518	4700
3519	4701	buffer.add(g);
3520	4702	}
..	..	@@ -3529,7 +4711,7 @@
3529	4711	makeSomething(buffer, i==group.selection.size()-1);
3530	4712	}
3531	4713
3532		- GrafreeD.epsequal = epsequal;
	4714	+ Grafreed.epsequal = epsequal;
3533	4715
3534	4716	refreshContents();
3535	4717	}
..	..	@@ -3547,7 +4729,16 @@
3547	4729	String pigment = Object3D.GetPigment(tex);
3548	4730	//String bump = Object3D.GetBump(tex);
3549	4731
3550		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4732	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4733	+
	4734	+ try
	4735	+ {
	4736	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
	4737	+ }
	4738	+ catch (Exception e)
	4739	+ {
	4740	+ System.err.println("FAIL: " + node);
	4741	+ }
3551	4742
3552	4743	double s = v.s;
3553	4744
..	..	@@ -3635,11 +4826,11 @@
3635	4826
3636	4827	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3637	4828
3638		- boolean random = CameraPane.RANDOM;
3639		- CameraPane.RANDOM = false; // parse all random nodes
	4829	+ boolean random = CameraPane.SWITCH;
	4830	+ CameraPane.SWITCH = false; // parse all random nodes
3640	4831	lowres.linkVerticesThis(null);
3641	4832	lowres.linkVerticesThis(sn);
3642		- CameraPane.RANDOM = random;
	4833	+ CameraPane.SWITCH = random;
3643	4834
3644	4835	System.err.flush();
3645	4836
..	..	@@ -3679,7 +4870,7 @@
3679	4870	return;
3680	4871
3681	4872	Object3D poses = group.selection.get(0);
3682		- Object3D ref = GrafreeD.clipboard.get(0);
	4873	+ Object3D ref = Grafreed.clipboard.get(0);
3683	4874
3684	4875	Object3D newgroup = new Object3D("Po:" + poses.name);
3685	4876
..	..	@@ -3873,9 +5064,9 @@
3873	5064
3874	5065	void ClipMesh()
3875	5066	{
3876		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	5067	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3877	5068	{
3878		- Object3D content = GrafreeD.clipboard.get(0);
	5069	+ Object3D content = Grafreed.clipboard.get(0);
3879	5070
3880	5071	if (content instanceof cGroup && ((cGroup)content).transientlink )
3881	5072	content = ((cGroup)content).get(0);
..	..	@@ -3884,7 +5075,7 @@
3884	5075	// {
3885	5076	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3886	5077	// }
3887		- group.selection.ClipMesh(GrafreeD.clipboard);
	5078	+ group.selection.ClipMesh(Grafreed.clipboard);
3888	5079	}
3889	5080	// group.selection.ClipMesh(GrafreeD.clipboard);
3890	5081	System.out.println("DONE.");
..	..	@@ -3931,6 +5122,18 @@
3931	5122	void MarkLeaves(boolean hide)
3932	5123	{
3933	5124	group.selection.MarkLeaves(hide);
	5125	+ refreshContents();
	5126	+ }
	5127	+
	5128	+ void RewindLeaves(boolean hide)
	5129	+ {
	5130	+ group.selection.RewindLeaves(hide);
	5131	+ refreshContents();
	5132	+ }
	5133	+
	5134	+ void RandomLeaves(boolean hide)
	5135	+ {
	5136	+ group.selection.RandomLeaves(hide);
3934	5137	refreshContents();
3935	5138	}
3936	5139
..	..	@@ -4005,28 +5208,25 @@
4005	5208	// }
4006	5209	// }
4007	5210
4008		- static boolean allparams = true;
4009		-
4010		- static Vector<Object3D> listUI = new Vector<Object3D>();
4011		-
4012	5211	void EditSelection(boolean newWindow)
4013	5212	{
	5213	+ if (group.selection == null)
	5214	+ {
	5215	+ EditElement(group, newWindow); // ? new
	5216	+ return;
	5217	+ }
	5218	+
4014	5219	// aConstraints.gridy = 0;
4015	5220	for (int i=0; i<group.selection.size(); i++)
4016	5221	{
4017	5222	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4018	5223	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4019		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5224	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4020	5225
4021	5226	Object3D elem = (Object3D)group.selection.elementAt(i);
4022		- if(elem != group)
	5227	+ if(elem != group \|\| !newWindow)
4023	5228	{
4024		- // if (!(elem instanceof Composite))
4025		- // newWindow = false;
4026		- listUI.add(elem);
4027		- elem.openEditWindow(this, newWindow); //, false);
4028		- System.out.println("edit : " + elem);
4029		- elem.editWindow.refreshContents(true); // ? new
	5229	+ EditElement(elem, newWindow); // ? new
4030	5230	}
4031	5231	}
4032	5232	}
..	..	@@ -4089,9 +5289,7 @@
4089	5289
4090	5290	freezemodel = false;
4091	5291	}
4092		-
4093		- boolean flashIt = true;
4094		-
	5292	+
4095	5293	public void valueChanged(TreeSelectionEvent e)
4096	5294	//public boolean handleEvent(Event event)
4097	5295	{
..	..	@@ -4101,7 +5299,8 @@
4101	5299	//new Exception().printStackTrace();
4102	5300
4103	5301	freezemodel = true;
4104		-
	5302	+ ClearUnpinned();
	5303	+
4105	5304	/**/
4106	5305	//switch (event.id)
4107	5306	{
..	..	@@ -4109,7 +5308,6 @@
4109	5308	//case 702: // Event.LIST_DESELECT
4110	5309	group.deselectAll();
4111	5310	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4112		- objEditor.ClearInfo(); // .GetMaterial());
4113	5311	if (tps != null)
4114	5312	{
4115	5313	for (int i=0; i < tps.length; i++)
..	..	@@ -4118,33 +5316,39 @@
4118	5316
4119	5317	//if (child.parent != null)
4120	5318	//child.parent.addSelectee(child);
	5319	+ objEditor.SetMaterial(child);
4121	5320	group.addSelectee(child);
4122		- objEditor.SetMaterial(child); // .GetMaterial());
4123		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4124		- System.err.println("info : " + child.GetPath());
4125	5321	}
4126	5322	}
4127		- else
4128		- {
4129		- objEditor.SetMaterial(group); // .GetMaterial());
4130		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4131		- System.err.println("info : " + group.GetPath());
4132		- }
	5323	+// else
	5324	+// {
	5325	+// objEditor.SetMaterial(group); // .GetMaterial());
	5326	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	5327	+// System.err.println("info : " + group.GetPath());
	5328	+// }
4133	5329
4134		- objEditor.SetText(); // jan 2014
4135		-
4136		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	5330	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4137	5331	CameraPane.flash = true;
4138	5332
4139		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5333	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4140	5334	// a camera
4141	5335	{
4142		- CameraPane.camerachangeframe = 0; // don't refuse it
4143		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5336	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5337	+ {
	5338	+ CameraPane.camerachangeframe = 0; // don't refuse it
	5339	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5340	+ }
4144	5341	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4145	5342	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4146	5343	}
4147	5344
	5345	+ if (tps != null && tps.length == 1)
	5346	+ {
	5347	+ EditSelection(false);
	5348	+ }
	5349	+
	5350	+ SetPinStates(tps != null && tps.length > 0);
	5351	+
4148	5352	refreshContents();
4149	5353	//return true;
4150	5354	}
..	..	@@ -4153,6 +5357,52 @@
4153	5357
4154	5358	freezemodel = false;
4155	5359	}
	5360	+
	5361	+ void SetPinStates(boolean enabled)
	5362	+ {
	5363	+ editButton.setEnabled(enabled);
	5364	+ uneditButton.setEnabled(enabled);
	5365	+ //unselectButton.setEnabled(enabled);
	5366	+ flashSelectionButton.setEnabled(enabled);
	5367	+
	5368	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5369	+
	5370	+ boolean allComposites = true;
	5371	+
	5372	+ if (group.selection != null)
	5373	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5374	+ {
	5375	+ Object next = e.nextElement();
	5376	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5377	+ {
	5378	+ allComposites = false;
	5379	+ break;
	5380	+ }
	5381	+ }
	5382	+
	5383	+ rootButton.setEnabled(allComposites);
	5384	+ }
	5385	+
	5386	+ void refreshContents(boolean cp)
	5387	+ {
	5388	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5389	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5390	+ {
	5391	+ objEditor.ClearInfo(); // .GetMaterial());
	5392	+
	5393	+ for (int i=0; i < group.selection.Size(); i++)
	5394	+ {
	5395	+ Object3D child = (Object3D) group.selection.get(i);
	5396	+
	5397	+ objEditor.AddInfo(child, this, true);
	5398	+// System.err.println("info : " + child.GetPath());
	5399	+ }
	5400	+
	5401	+ objEditor.SetText(); // jan 2014
	5402	+ }
	5403	+
	5404	+ super.refreshContents(cp);
	5405	+ }
4156	5406
4157	5407	void linkSomething(Object3D thing)
4158	5408	{
..	..	@@ -4224,16 +5474,19 @@
4224	5474	{
4225	5475	if (group.selection.isEmpty())
4226	5476	return;
4227		- GrafreeD.clipboardIsTempGroup = false;
	5477	+
	5478	+ Grafreed.clipboardIsTempGroup = false;
4228	5479	Composite tGroup = null;
4229	5480	if (group.selection.size() > 0) // 1)
4230	5481	{
4231	5482	tGroup = new cGroup();
4232		- GrafreeD.clipboardIsTempGroup = true;
	5483	+ Grafreed.clipboardIsTempGroup = true;
4233	5484	}
4234	5485
4235	5486	if (cut)
4236	5487	{
	5488	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5489	+// Save();
4237	5490	//int indices[] = jList.getSelectedIndices();
4238	5491	//for (int i = indices.length - 1; i >= 0; i--)
4239	5492	//jList.remove(indices[i]);
..	..	@@ -4269,16 +5522,16 @@
4269	5522	//System.out.println("cut " + child);
4270	5523	//System.out.println("parent = " + child.parent);
4271	5524	// tmp.addChild(child);
4272		- if (GrafreeD.clipboardIsTempGroup)
	5525	+ if (Grafreed.clipboardIsTempGroup)
4273	5526	tGroup.add/Child/(tmp);
4274	5527	else
4275		- GrafreeD.clipboard = tmp;
	5528	+ Grafreed.clipboard = tmp;
4276	5529	}
4277	5530	else
4278		- if (GrafreeD.clipboardIsTempGroup)
	5531	+ if (Grafreed.clipboardIsTempGroup)
4279	5532	tGroup.add/Child/(child);
4280	5533	else
4281		- GrafreeD.clipboard = child;
	5534	+ Grafreed.clipboard = child;
4282	5535	}
4283	5536
4284	5537	//ResetModel();
..	..	@@ -4310,21 +5563,23 @@
4310	5563	//System.out.println("cut " + elem);
4311	5564	//System.out.println("parent = " + elem.parent);
4312	5565	// tmp.addChild(elem);
4313		- if (GrafreeD.clipboardIsTempGroup)
	5566	+ if (Grafreed.clipboardIsTempGroup)
4314	5567	tGroup.add/Child/(tmp);
4315	5568	else
4316		- GrafreeD.clipboard = tmp;
	5569	+ Grafreed.clipboard = tmp;
4317	5570	}
4318	5571	else
4319		- if (GrafreeD.clipboardIsTempGroup)
	5572	+ if (Grafreed.clipboardIsTempGroup)
4320	5573	tGroup.add/Child/(child);
4321	5574	else
4322		- GrafreeD.clipboard = child;
	5575	+ Grafreed.clipboard = child;
4323	5576	}
4324	5577
4325	5578	}
4326		- if (GrafreeD.clipboardIsTempGroup)
4327		- GrafreeD.clipboard = tGroup;
	5579	+
	5580	+ if (Grafreed.clipboardIsTempGroup)
	5581	+ Grafreed.clipboard = tGroup;
	5582	+
4328	5583	if (cut)
4329	5584	{
4330	5585	ResetModel();
..	..	@@ -4334,11 +5589,15 @@
4334	5589
4335	5590	void paste(boolean expand)
4336	5591	{
	5592	+ if (Globals.REPLACEONMAKE)
	5593	+ Save();
	5594	+ boolean keep = Globals.REPLACEONMAKE;
	5595	+ Globals.REPLACEONMAKE = false;
4337	5596	// if (GrafreeD.clipboard == null)
4338	5597	// return;
4339	5598	boolean first = true;
4340	5599
4341		- if (GrafreeD.clipboardIsTempGroup)
	5600	+ if (Grafreed.clipboardIsTempGroup)
4342	5601	{
4343	5602	Composite temp;
4344	5603
..	..	@@ -4349,7 +5608,7 @@
4349	5608	temp = (Composite)Applet3D.clipboard.deepCopy();
4350	5609	*/
4351	5610	Object3D elem;
4352		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5611	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4353	5612	{
4354	5613	Object3D child = (Object3D)e.nextElement();
4355	5614
..	..	@@ -4383,21 +5642,22 @@
4383	5642	//Object3D cb = Applet3D.clipboard;
4384	5643	//temp.addChild(cb);
4385	5644	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4386		- assert(GrafreeD.clipboard.parent == null);
4387		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4388		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4389		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4390		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	5645	+ assert(Grafreed.clipboard.parent == null);
	5646	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5647	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5648	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5649	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4391	5650	else
4392		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4393		- GrafreeD.clipboard.get(0).parent = keepparent;
	5651	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5652	+ Grafreed.clipboard.get(0).parent = keepparent;
4394	5653	}
4395	5654
	5655	+ Globals.REPLACEONMAKE = keep;
4396	5656	ResetModel();
4397	5657	refreshContents();
4398	5658	}
4399	5659
4400		- void pasteInto(boolean copyit)
	5660	+ void pasteInto(boolean copyit, boolean clone)
4401	5661	{
4402	5662	// if (GrafreeD.clipboard == null)
4403	5663	// return;
..	..	@@ -4426,15 +5686,22 @@
4426	5686	if (copyit)
4427	5687	{
4428	5688	// paste(false);
4429		- CloneClipboard(false); // sept 2014
	5689	+ if (clone)
	5690	+ {
	5691	+ CloneClipboard(false); // sept 2014
	5692	+ }
	5693	+ else
	5694	+ {
	5695	+ paste(false);
	5696	+ }
4430	5697	}
4431	5698	else
4432	5699	{
4433	5700	boolean first = true;
4434	5701
4435		- if (GrafreeD.clipboardIsTempGroup)
	5702	+ if (Grafreed.clipboardIsTempGroup)
4436	5703	{
4437		- Composite temp = (Composite)GrafreeD.clipboard;
	5704	+ Composite temp = (Composite)Grafreed.clipboard;
4438	5705	Object3D copy;
4439	5706	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4440	5707	{
..	..	@@ -4444,7 +5711,7 @@
4444	5711	}
4445	5712	} else
4446	5713	{
4447		- linkSomething(GrafreeD.clipboard); //.get(0));
	5714	+ linkSomething(Grafreed.clipboard); //.get(0));
4448	5715	}
4449	5716	}
4450	5717	}
..	..	@@ -4521,6 +5788,10 @@
4521	5788
4522	5789	void group(Object3D csg, boolean grab)
4523	5790	{
	5791	+ if (Globals.REPLACEONMAKE)
	5792	+ Save();
	5793	+ boolean keep = Globals.REPLACEONMAKE;
	5794	+ Globals.REPLACEONMAKE = false;
4524	5795	if (//false) // why??
4525	5796	!group.selection.isEmpty())
4526	5797	{
..	..	@@ -4634,10 +5905,15 @@
4634	5905	//node.add(csg);
4635	5906	//makeSomething(node);
4636	5907	makeSomething(csg);
	5908	+ Globals.REPLACEONMAKE = keep;
4637	5909	}
4638	5910
4639	5911	void Ungroup(Object3D g)
4640	5912	{
	5913	+ if (Globals.REPLACEONMAKE)
	5914	+ Save();
	5915	+ boolean keep = Globals.REPLACEONMAKE;
	5916	+ Globals.REPLACEONMAKE = false;
4641	5917	if (g instanceof HiddenObject)
4642	5918	{
4643	5919	HiddenObject h = (HiddenObject) g;
..	..	@@ -4654,6 +5930,7 @@
4654	5930	objEditor.makeSomething(g.get(i), false);
4655	5931	}
4656	5932	}
	5933	+ Globals.REPLACEONMAKE = keep;
4657	5934	}
4658	5935
4659	5936	void ungroup()
..	..	@@ -4849,21 +6126,6 @@
4849	6126	}
4850	6127	*/
4851	6128
4852		- void ImportGFD()
4853		- {
4854		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4855		- browser.show();
4856		- String filename = browser.getFile();
4857		- if (filename != null && filename.length() > 0)
4858		- {
4859		- String fullname = browser.getDirectory() + filename;
4860		-
4861		- //Object3D readobj =
4862		- objEditor.ReadGFD(fullname, objEditor);
4863		- //makeSomething(readobj);
4864		- }
4865		- }
4866		-
4867	6129	/*
4868	6130	public void Callback(Object obj)
4869	6131	{
..	..	@@ -4887,26 +6149,9 @@
4887	6149	}
4888	6150	*/
4889	6151
4890		- void ImportVRMLX3D()
4891		- {
4892		- if (GrafreeD.standAlone)
4893		- {
4894		- /**/
4895		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4896		- browser.show();
4897		- String filename = browser.getFile();
4898		- if (filename != null && filename.length() > 0)
4899		- {
4900		- String fullname = browser.getDirectory() + filename;
4901		- LoadVRMLX3D(fullname);
4902		- }
4903		- /**/
4904		- }
4905		- }
4906		-
4907	6152	String GetFile(String dialogName)
4908	6153	{
4909		- if (GrafreeD.standAlone)
	6154	+ if (Grafreed.standAlone)
4910	6155	{
4911	6156	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4912	6157	browser.show();
..	..	@@ -4970,10 +6215,48 @@
4970	6215	cButton flashSelectionButton;
4971	6216	cButton editButton;
4972	6217	cButton uneditButton;
	6218	+ JCheckBox allParamsButton;
4973	6219	cButton clearpanelButton;
4974		- cButton allParamsButton;
4975	6220	cButton unselectButton;
4976	6221
	6222	+ cButton restoreCameraButton;
	6223	+
	6224	+ cButton oneStepButton;
	6225	+
	6226	+ cButton groupButton;
	6227	+ cButton ungroupButton;
	6228	+ cButton compositeButton;
	6229	+ cButton switchButton;
	6230	+ cButton loopButton;
	6231	+ cButton textureButton;
	6232	+
	6233	+ cButton skybox1Button;
	6234	+ cButton skybox2Button;
	6235	+ cButton skybox3Button;
	6236	+ cButton skybox4Button;
	6237	+ cButton skybox5Button;
	6238	+ cButton skybox6Button;
	6239	+ cButton skybox7Button;
	6240	+
	6241	+ cButton skybox11Button;
	6242	+ cButton skybox12Button;
	6243	+ cButton skybox13Button;
	6244	+ cButton skybox14Button;
	6245	+ cButton skybox15Button;
	6246	+ cButton skybox16Button;
	6247	+ cButton skybox17Button;
	6248	+
	6249	+ cButton gridButton;
	6250	+ cButton boxButton;
	6251	+ cButton sphereButton;
	6252	+ cButton coneButton;
	6253	+ cButton torusButton;
	6254	+ cButton superButton;
	6255	+ cButton kleinButton;
	6256	+ cButton particlesButton;
	6257	+ cButton overlayButton;
	6258	+ cButton lightButton;
	6259	+
4977	6260	cButton screenfitButton;
4978	6261	cButton screenfitpointButton;
4979	6262	cButton snapobjectButton;
..	..	@@ -4985,14 +6268,6 @@
4985	6268
4986	6269	cButton setsupportButton;
4987	6270
4988		- cButton twoButton;
4989		- cButton sixButton;
4990		- cButton threeButton;
4991		- cButton sevenButton;
4992		- cButton fourButton; // full panel
4993		- cButton oneButton; // full XYZ
4994		- //cButton currentLayout;
4995		-
4996	6271	//
4997	6272	//Composite
4998	6273	Object3D // to do !!
..	..	@@ -5002,10 +6277,12 @@
5002	6277	//JTree jTree;
5003	6278	private MenuItem lookAtItem;
5004	6279	private MenuItem lookFromItem;
5005		- private MenuItem switchItem;
5006		- private MenuItem cutItem;
5007		- private MenuItem duplicateItem;
5008		- private MenuItem cloneItem;
	6280	+ private MenuItem switchViewItem;
	6281	+ private JMenuItem cutItem;
	6282	+ private MenuItem undoItem;
	6283	+ private MenuItem redoItem;
	6284	+ private JMenuItem duplicateItem;
	6285	+ private JMenuItem cloneItem;
5009	6286	private MenuItem cloneSupportItem;
5010	6287	private MenuItem overwriteGeoItem;
5011	6288	private MenuItem overwriteMatItem;
..	..	@@ -5017,7 +6294,7 @@
5017	6294	private MenuItem linkverticesItem;
5018	6295	private MenuItem relinkverticesItem;
5019	6296	private MenuItem setMasterItem;
5020		- private MenuItem resetMeshItem;
	6297	+ private MenuItem resetAllItem;
5021	6298	private MenuItem stepAllItem;
5022	6299	private MenuItem revertMeshItem;
5023	6300	private MenuItem poseMeshItem;
..	..	@@ -5026,12 +6303,13 @@
5026	6303	private MenuItem cloneGeometriesItem;
5027	6304	private MenuItem shareGeometriesItem;
5028	6305	private MenuItem mergeGeometriesItem;
5029		- private MenuItem copyItem;
	6306	+ private JMenuItem copyItem;
5030	6307	private MenuItem pasteItem;
5031		- private MenuItem pasteLinkItem;
5032		- private MenuItem pasteCloneItem;
5033		- private MenuItem pasteExpandItem;
5034		- private MenuItem clearItem;
	6308	+ private JMenuItem pasteIntoItem;
	6309	+ private JMenuItem pasteLinkItem;
	6310	+ private JMenuItem pasteCloneItem;
	6311	+ private JMenuItem pasteExpandItem;
	6312	+ private JMenuItem deleteItem;
5035	6313	private MenuItem clearAllItem;
5036	6314	private MenuItem genUVItem;
5037	6315	private MenuItem genNormalsMESHItem;
..	..	@@ -5066,6 +6344,10 @@
5066	6344	private MenuItem showleavesItem;
5067	6345	private MenuItem markleavesItem;
5068	6346	private MenuItem unmarkleavesItem;
	6347	+ private MenuItem rewindleavesItem;
	6348	+ private MenuItem unrewindleavesItem;
	6349	+ private MenuItem randomleavesItem;
	6350	+ private MenuItem unrandomleavesItem;
5069	6351
5070	6352	private MenuItem flipVItem;
5071	6353	private MenuItem unflipVItem;
..	..	@@ -5077,15 +6359,17 @@
5077	6359	private MenuItem panoTexturesItem;
5078	6360
5079	6361	private MenuItem resetCentroidItem;
5080		- private MenuItem transformgeometryItem;
	6362	+ private MenuItem resetCentroidXZItem;
5081	6363	private MenuItem resetTransformItem;
	6364	+ private MenuItem transformGeometryItem;
	6365	+ private MenuItem transformChildrenItem;
5082	6366	private MenuItem hideItem;
5083		- private MenuItem grabItem;
	6367	+ private JMenuItem grabItem;
5084	6368	private MenuItem backItem;
5085	6369	private MenuItem frontItem;
5086	6370	private MenuItem cameraItem;
5087	6371	private MenuItem compositeItem;
5088		- private MenuItem randomItem;
	6372	+ private MenuItem switchItem;
5089	6373	private MenuItem physicsItem;
5090	6374	private MenuItem frameselectorItem;
5091	6375	private MenuItem scriptNodeItem;
..	..	@@ -5093,7 +6377,7 @@
5093	6377	private MenuItem switchTransfoItem;
5094	6378	private MenuItem morphItem;
5095	6379	private MenuItem linkerItem;
5096		- private MenuItem ungroupItem;
	6380	+ private JMenuItem ungroupItem;
5097	6381	private MenuItem editItem;
5098	6382	private MenuItem openWindowItem;
5099	6383	private MenuItem editLeafItem;
..	..	@@ -5109,6 +6393,8 @@
5109	6393	private MenuItem attachBumpItem;
5110	6394	private MenuItem detachBumpItem;
5111	6395	private MenuItem pigmentBumpItem;
	6396	+ private MenuItem embedTexturesItem;
	6397	+ private MenuItem deEmbedTexturesItem;
5112	6398
5113	6399	private MenuItem particleItem;
5114	6400	private MenuItem ragdollItem;
..	..	@@ -5125,7 +6411,7 @@
5125	6411	private MenuItem blobItem;
5126	6412	private MenuItem latheItem;
5127	6413	private MenuItem bezierItem;
5128		- private MenuItem checkerItem;
	6414	+ private MenuItem overlayItem;
5129	6415	private MenuItem meshItem;
5130	6416	// private MenuItem meshGroupItem;
5131	6417	private MenuItem springItem;
..	..	@@ -5147,11 +6433,6 @@
5147	6433	private MenuItem doubleItem;
5148	6434	private MenuItem tripleItem;
5149	6435
5150		- private MenuItem importGFDItem;
5151		- private MenuItem importVRMLX3DItem;
5152		- private MenuItem import3DSItem;
5153		- private MenuItem importOBJItem;
5154		-
5155	6436	private MenuItem computeAOItem;
5156	6437	private MenuItem recompileItem;
5157	6438	private MenuItem editScriptItem;
..	..	@@ -5161,4 +6442,8 @@
5161	6442	private MenuItem analyzeItem;
5162	6443	private MenuItem dumpItem;
5163	6444	//boolean freezemodel = false;
	6445	+
	6446	+ Menu cameraMenu;
	6447	+ MenuItem editCameraItem;
	6448	+ MenuItem restoreCameraItem;
5164	6449	}