~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,14 @@
59	415	this.copy = this.group = group;
60	416	//selectees = this.group.selectees;
61	417
	418	+ if (copy.versionlist == null)
	419	+ {
	420	+ copy.versionlist = new Object3D[100];
	421	+ copy.versionindex = -1;
	422	+
	423	+ Save(true);
	424	+ }
	425	+
62	426	if(ui)
63	427	SetupUI(objEditor);
64	428	}
..	..	@@ -73,16 +437,28 @@
73	437	this.copy = this.group = copy;
74	438	//selectees = this.group.selectees;
75	439
76		- SetupMenu2(objEditor);
	440	+ SetupMenu2(this); //objEditor);
77	441	SetupUI2(objEditor);
78	442	objEditor.SetupUI(true);
79	443	SetupViews(objEditor);
80	444
81	445	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	446	+
	447	+ if (copy.versionlist == null)
	448	+ {
	449	+ copy.versionlist = new Object3D[100];
	450	+ copy.versionindex = -1;
	451	+
	452	+ Save(true);
	453	+ }
82	454	}
83	455
84	456	void CloneSelection(boolean supports)
85	457	{
	458	+ if (Globals.REPLACEONMAKE)
	459	+ Save();
	460	+ boolean keep = Globals.REPLACEONMAKE;
	461	+ Globals.REPLACEONMAKE = false;
86	462	// Object3D keep = GrafreeD.clipboard;
87	463	//Object3D obj;
88	464	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -93,18 +469,19 @@
93	469
94	470	makeSomething(clone, i==group.selection.size()-1);
95	471	}
	472	+ Globals.REPLACEONMAKE = keep;
96	473	}
97	474
98	475	void CloneClipboard(boolean supports)
99	476	{
100		- assert(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));
	477	+ assert(Grafreed.clipboard.parent == null);
	478	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	479	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	480	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	481	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
105	482	else
106		- makeSomething(CloneObject(GrafreeD.clipboard, false));
107		- GrafreeD.clipboard.get(0).parent = keepparent;
	483	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	484	+ Grafreed.clipboard.get(0).parent = keepparent;
108	485	}
109	486
110	487	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -118,7 +495,7 @@
118	495	// obj.support = null;
119	496	if (!supports)
120	497	obj.SaveSupports();
121		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	498	+ Object3D clone = (Object3D)Grafreed.clone(obj);
122	499	obj.parent = parent;
123	500	// obj.support = support;
124	501	// clone.support = support; // aout 2013
..	..	@@ -147,58 +524,153 @@
147	524
148	525	//JTextField nameField;
149	526
150		- void SetupMenu2(ObjEditor oe)
	527	+ void SetupMenu2(GroupEditor oe)
151	528	{
152		- oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
153		- //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
154		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
155		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
156		- oe.cameraMenu.add("-");
157		- openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
158		- openWindowItem.addActionListener(this);
159		- editLeafItem.addActionListener(this);
160		- lookAtItem.addActionListener(this);
161		- //lookFromItem.addActinoListener(this);
162		- //switchItem.addActionListener(this);
	529	+ oe.jTree = new cTree();
	530	+
163	531	Menu menu;
164	532	oe.menuBar.add(menu = new Menu("Edit"));
165	533	//editItem = menu.add(new MenuItem("Edit"));
166	534	//editItem.addActionListener(this);
167		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	535	+
	536	+// undoItem = menu.add(new MenuItem("Undo"));
	537	+// undoItem.addActionListener(this);
	538	+// redoItem = menu.add(new MenuItem("Redo"));
	539	+// redoItem.addActionListener(this);
	540	+// menu.add("-");
	541	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
168	542	duplicateItem.addActionListener(this);
169		- menu.add("-");
170		- cloneItem = menu.add(new MenuItem("Clone"));
	543	+
	544	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
171	545	cloneItem.addActionListener(this);
	546	+ //if (Globals.ADVANCED)
	547	+ {
172	548	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
173	549	cloneSupportItem.addActionListener(this);
	550	+ }
	551	+ oe.jTree.popup.addSeparator();
174	552	menu.add("-");
175		- cutItem = menu.add(new MenuItem("Cut"));
	553	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
176	554	cutItem.addActionListener(this);
177		- copyItem = menu.add(new MenuItem("Copy"));
	555	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
178	556	copyItem.addActionListener(this);
179	557	pasteItem = menu.add(new MenuItem("Paste"));
180	558	pasteItem.addActionListener(this);
181		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	559	+
	560	+ oe.jTree.popup.addSeparator();
	561	+ //menu.add("-");
	562	+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
	563	+ pasteIntoItem.addActionListener(this);
	564	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
182	565	pasteLinkItem.addActionListener(this);
183		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	566	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
184	567	pasteCloneItem.addActionListener(this);
185		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	568	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
186	569	// pasteExpandItem.addActionListener(this);
187		- clearItem = menu.add(new MenuItem("Clear"));
188		- clearItem.addActionListener(this);
	570	+ //menu.add("-");
	571	+ oe.jTree.popup.addSeparator();
	572	+
	573	+ if (Globals.ADVANCED)
	574	+ {
	575	+ // Deletes the cameras...
189	576	clearAllItem = menu.add(new MenuItem("Clear All"));
190	577	clearAllItem.addActionListener(this);
	578	+ }
	579	+
	580	+ menuBar.add(cameraMenu = new Menu("View"));
	581	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	582	+ //zBufferItem.addActionListener(this);
	583	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	584	+ //normalLensItem.addActionListener(this);
	585	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	586	+ restoreCameraItem.addActionListener(this);
	587	+
	588	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	589	+// toggleFullScreenItem.addItemListener(this);
	590	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	591	+// cameraMenu.add("-");
	592	+//
	593	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	594	+// toggleTextureItem.addItemListener(this);
	595	+// toggleTextureItem.setState(CameraPane.textureon);
	596	+//
	597	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	598	+// toggleSwitchItem.addItemListener(this);
	599	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	600	+
	601	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	602	+ toggleHandleItem.addItemListener(this);
	603	+ toggleHandleItem.setState(CameraPane.HANDLES);
	604	+
	605	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	606	+ togglePaintItem.addItemListener(this);
	607	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	608	+
	609	+ if (Globals.ADVANCED)
	610	+ {
	611	+ cameraMenu.add("-");
	612	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	613	+ toggleLiveItem.addItemListener(this);
	614	+ toggleLiveItem.setState(Globals.isLIVE());
191	615
	616	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	617	+ stepItem.addActionListener(this);
	618	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	619	+ // toggleDLItem.addItemListener(this);
	620	+ // toggleDLItem.setState(false);
	621	+
	622	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	623	+ toggleRenderItem.addItemListener(this);
	624	+ toggleRenderItem.setState(!CameraPane.frozen);
	625	+
	626	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	627	+ toggleDebugItem.addItemListener(this);
	628	+ toggleDebugItem.setState(Globals.DEBUG);
	629	+
	630	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	631	+ toggleFrustumItem.addItemListener(this);
	632	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	633	+
	634	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	635	+ toggleFootContactItem.addItemListener(this);
	636	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	637	+
	638	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	639	+ toggleTimelineItem.addItemListener(this);
	640	+ }
	641	+
	642	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	643	+// toggleRootItem.addItemListener(this);
	644	+// toggleRootItem.setState(false);
	645	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	646	+// animationItem.addItemListener(this);
	647	+// animationItem.setState(CameraPane.ANIMATION);
	648	+ cameraMenu.add("-");
	649	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	650	+ editCameraItem.addActionListener(this);
	651	+
	652	+ if (Globals.ADVANCED)
	653	+ {
	654	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	655	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	656	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	657	+ oe.cameraMenu.add("-");
	658	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	659	+ openWindowItem.addActionListener(this);
	660	+ lookAtItem.addActionListener(this);
	661	+ //lookFromItem.addActinoListener(this);
	662	+ //switchViewItem.addActionListener(this);
	663	+ }
	664	+
192	665	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);
	666	+ if (Globals.ADVANCED)
	667	+ {
197	668	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
198	669	revertMeshItem.addActionListener(this);
199	670	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
200	671	resetreferencesItem.addActionListener(this);
201	672	menu.add("-");
	673	+ }
202	674	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
203	675	overwriteGeoItem.addActionListener(this);
204	676	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -210,79 +682,111 @@
210	682	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211	683	overwriteUVItem.addActionListener(this);
212	684	menu.add("-");
	685	+ if (Globals.ADVANCED)
	686	+ {
213	687	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214	688	generateMeshItem.addActionListener(this);
215	689	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216	690	poseMeshItem.addActionListener(this);
217	691	menu.add("-");
	692	+ }
218	693	resetsupportItem = menu.add(new MenuItem("Reset support"));
219	694	resetsupportItem.addActionListener(this);
220	695	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	696	linkverticesItem.addActionListener(this);
222	697	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
223	698	relinkverticesItem.addActionListener(this);
	699	+
	700	+ if (Globals.ADVANCED)
	701	+ {
224	702	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
225	703	setMasterItem.addActionListener(this);
	704	+ }
226	705
227		- oe.menuBar.add(menu = new Menu("Group"));
228		- grabItem = menu.add(new MenuItem("Grab"));
229		- grabItem.addActionListener(this);
	706	+ oe.menuBar.add(menu = new Menu("Order"));
	707	+
230	708	backItem = menu.add(new MenuItem("Back"));
231	709	backItem.addActionListener(this);
232	710	frontItem = menu.add(new MenuItem("Front"));
233	711	frontItem.addActionListener(this);
234		- compositeItem = menu.add(new MenuItem("Composite"));
235		- compositeItem.addActionListener(this);
236		- hideItem = menu.add(new MenuItem("Hide"));
	712	+// compositeItem = menu.add(new MenuItem("Composite"));
	713	+// compositeItem.addActionListener(this);
	714	+
	715	+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
	716	+ grabItem.addActionListener(this);
	717	+
	718	+ if (Globals.ADVANCED)
	719	+ {
	720	+ hideItem = menu.add(new MenuItem("Hidden Group"));
237	721	hideItem.addActionListener(this);
238		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	722	+ }
	723	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
239	724	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);
	725	+
	726	+ oe.jTree.popup.addSeparator();
	727	+
	728	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	729	+ deleteItem.addActionListener(this);
	730	+
	731	+// menu.add("-");
	732	+//
	733	+// switchItem = menu.add(new MenuItem("Switch node"));
	734	+// switchItem.addActionListener(this);
	735	+ if (Globals.ADVANCED)
	736	+ {
247	737	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
248	738	switchGeoItem.addActionListener(this);
249	739	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
250	740	switchTransfoItem.addActionListener(this);
251		- morphItem = menu.add(new MenuItem("Morph"));
	741	+ morphItem = menu.add(new MenuItem("Morph Group"));
252	742	morphItem.addActionListener(this);
	743	+
	744	+ menu.add("-");
	745	+ physicsItem = menu.add(new MenuItem("Physics"));
	746	+ physicsItem.addActionListener(this);
	747	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	748	+ frameselectorItem.addActionListener(this);
253	749	scriptNodeItem = menu.add(new MenuItem("Script Node"));
254	750	scriptNodeItem.addActionListener(this);
255		- cameraItem = menu.add(new MenuItem("Camera"));
256		- cameraItem.addActionListener(this);
	751	+ }
257	752
258	753	oe.menuBar.add(menu = new Menu("Object"));
259		- textureItem = menu.add(new MenuItem("Texture"));
260		- textureItem.addActionListener(this);
	754	+// textureItem = menu.add(new MenuItem("Texture"));
	755	+// textureItem.addActionListener(this);
261	756	billboardItem = menu.add(new MenuItem("Billboard"));
262	757	billboardItem.addActionListener(this);
263	758	csgItem = menu.add(new MenuItem("CSG"));
264	759	csgItem.addActionListener(this);
265		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	760	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
266	761	shadowXItem.addActionListener(this);
267		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	762	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
268	763	shadowYItem.addActionListener(this);
269		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	764	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
270	765	shadowZItem.addActionListener(this);
	766	+ attributeItem = menu.add(new MenuItem("Attribute"));
	767	+ attributeItem.addActionListener(this);
	768	+
	769	+ if (Globals.ADVANCED)
	770	+ {
	771	+ menu.add("-");
271	772	linkerItem = menu.add(new MenuItem("Linker"));
272	773	linkerItem.addActionListener(this);
273	774	templateItem = menu.add(new MenuItem("Template"));
274	775	templateItem.addActionListener(this);
275		- attributeItem = menu.add(new MenuItem("Attribute"));
276		- attributeItem.addActionListener(this);
277	776	pointflowItem = menu.add(new MenuItem("Point Flow"));
278	777	pointflowItem.addActionListener(this);
	778	+ }
279	779	menu.add("-");
280	780	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
281	781	resetTransformItem.addActionListener(this);
282	782	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
283	783	resetCentroidItem.addActionListener(this);
284		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
285		- transformgeometryItem.addActionListener(this);
	784	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	785	+ resetCentroidXZItem.addActionListener(this);
	786	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	787	+ transformGeometryItem.addActionListener(this);
	788	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	789	+ transformChildrenItem.addActionListener(this);
286	790
287	791	oe.menuBar.add(menu = new Menu("Geometry"));
288	792	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -293,8 +797,11 @@
293	797	genNormalsCADItem.addActionListener(this);
294	798	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
295	799	genNormalsMESHItem.addActionListener(this);
296		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	800	+ if (Globals.ADVANCED)
	801	+ {
	802	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
297	803	genNormalsMINEItem.addActionListener(this);
	804	+ }
298	805	stripifyItem = menu.add(new MenuItem("Stripify"));
299	806	stripifyItem.addActionListener(this);
300	807	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -316,23 +823,34 @@
316	823	reduce34MeshItem.addActionListener(this);
317	824	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
318	825	increaseMeshItem.addActionListener(this);
319		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
320		- smoothMeshItem.addActionListener(this);
321	826	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
322	827	clipMeshItem.addActionListener(this);
	828	+
	829	+ if (Globals.ADVANCED)
	830	+ {
	831	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	832	+ smoothMeshItem.addActionListener(this);
	833	+ }
323	834
324	835	oe.menuBar.add(menu = new Menu("Attributes"));
325	836	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
326	837	clearMaterialsItem.addActionListener(this);
	838	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	839	+ resetAllItem.addActionListener(this);
	840	+ stepAllItem = menu.add(new MenuItem("Step All"));
	841	+ stepAllItem.addActionListener(this);
327	842	menu.add("-");
328	843	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
329	844	liveleavesItem.addActionListener(this);
330	845	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
331	846	unliveleavesItem.addActionListener(this);
	847	+ if (Globals.ADVANCED)
	848	+ {
332	849	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
333	850	supportleavesItem.addActionListener(this);
334	851	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
335	852	unsupportleavesItem.addActionListener(this);
	853	+ }
336	854	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
337	855	hideleavesItem.addActionListener(this);
338	856	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -341,6 +859,14 @@
341	859	markleavesItem.addActionListener(this);
342	860	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
343	861	unmarkleavesItem.addActionListener(this);
	862	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	863	+ rewindleavesItem.addActionListener(this);
	864	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	865	+ unrewindleavesItem.addActionListener(this);
	866	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	867	+ randomleavesItem.addActionListener(this);
	868	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	869	+ unrandomleavesItem.addActionListener(this);
344	870	menu.add("-");
345	871	flipVItem = menu.add(new MenuItem("Flip V"));
346	872	flipVItem.addActionListener(this);
..	..	@@ -366,53 +892,130 @@
366	892	attachBumpItem.addActionListener(this);
367	893	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
368	894	pigmentBumpItem.addActionListener(this);
	895	+ //embedTexturesItem
369	896	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
370	897	detachPigmentItem.addActionListener(this);
371	898	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
372	899	detachBumpItem.addActionListener(this);
	900	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	901	+ embedTexturesItem.addActionListener(this);
	902	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	903	+ deEmbedTexturesItem.addActionListener(this);
373	904	menu.add("-");
374	905	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
375	906	sortbysizeItem.addActionListener(this);
376	907	sortbynameItem = menu.add(new MenuItem("Sort by name"));
377	908	sortbynameItem.addActionListener(this);
378	909	menu.add("-");
	910	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	911	+ shareGeometriesItem.addActionListener(this);
	912	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	913	+ mergeGeometriesItem.addActionListener(this);
	914	+ menu.add("-");
	915	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	916	+ editLeafItem.addActionListener(this);
	917	+ if (Globals.ADVANCED)
	918	+ {
	919	+ // Pretty much the same as duplicate and clone.
379	920	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
380	921	extractGeometriesItem.addActionListener(this);
381	922	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
382	923	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);
	924	+ }
387	925
388	926	oe.menuBar.add(menu = new Menu("Insert"));
389	927	buildCreateMenu(menu);
390	928
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	929	oe.menuBar.add(menu = new Menu("Tools"));
403	930	buildToolsMenu(menu);
404	931	}
405	932
	933	+ JTabbedPane resourcecontainer;
	934	+ cGridBag currenttab;
	935	+ //boolean added; // patch for jar
	936	+
	937	+ int tabcount = 0;
	938	+ int colcount = 0;
	939	+ int rowcount = 0;
	940	+ int texturecount = 0;
	941	+
	942	+ int columns = 5;
	943	+ int rows = 7;
	944	+
	945	+ public void ResourceCallBack(String[] path)
	946	+ {
	947	+// for (int i = 0; i < path.length; i++)
	948	+// System.out.print(path[i] + "/");
	949	+// System.out.println();
	950	+
	951	+ if (//rowcount == 0 \|\|
	952	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	953	+ {
	954	+ currenttab = new cGridBag();
	955	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	956	+ currenttab.setName(tabname);
	957	+ //added = false;
	958	+ resourcecontainer.add(currenttab);
	959	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	960	+ rowcount = 1;
	961	+ colcount = 0;
	962	+ texturecount = 0;
	963	+ }
	964	+
	965	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	966	+ {
	967	+ //if (!added)
	968	+ {
	969	+ //added = true;
	970	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	971	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	972	+ }
	973	+
	974	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	975	+
	976	+ if (++colcount >= columns)
	977	+ {
	978	+ colcount = 0;
	979	+ currenttab.Return();
	980	+
	981	+ if (rowcount++ >= rows)
	982	+ {
	983	+ rowcount = 0;
	984	+ }
	985	+ }
	986	+ }
	987	+ else
	988	+ {
	989	+// if (!path[path.length-1].equals("icons"))
	990	+// resourcecontainer.Return();
	991	+ }
	992	+ }
	993	+
	994	+ void CreateTexturePanel(cGridBag container)
	995	+ {
	996	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	997	+ container.add(resourcecontainer);
	998	+
	999	+ Grafreed.ParseResources("textures", this);
	1000	+ }
	1001	+
406	1002	void SetupUI2(ObjEditor oe)
407	1003	{
	1004	+ // June 2019
	1005	+ if (oe == null)
	1006	+ {
	1007	+ //super.SetupUI2(this);
	1008	+ //return;
	1009	+ }
	1010	+
	1011	+ if (copy != group)
	1012	+ {
	1013	+ //super.SetupUI2(this);
	1014	+ }
	1015	+
408	1016	//new Exception().printStackTrace();
409	1017
410	1018	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	1019	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
417	1020
418	1021	oe.buttonGroup = new ButtonGroup();
..	..	@@ -433,110 +1036,263 @@
433	1036	oe.radioPanel.add(dummyButton);
434	1037	oe.buttonGroup.add(dummyButton);
435	1038	*/
436		- aConstraints.gridy += 1;
	1039	+ cGridBag copyOptionsPanel = new cGridBag();
	1040	+
	1041	+ copyOptionsPanel.preferredHeight = 2;
437	1042
438	1043	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
439	1044
440		- oe.aConstraints.gridwidth = 1;
441		- oe.aConstraints.gridx = 0;
	1045	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1046	+ //minButton.setToolTipText("Minimize window");
	1047	+ //minButton.addActionListener(this);
442	1048
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);
	1049	+ if (Globals.ADVANCED)
	1050	+ {
	1051	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1052	+// maxButton.setToolTipText("Maximize window");
	1053	+// maxButton.addActionListener(this);
	1054	+ }
	1055	+
	1056	+ cButton gcButton;
	1057	+
	1058	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1059	+// gcButton.setToolTipText("Garbage collect");
	1060	+// gcButton.addActionListener(new ActionListener()
	1061	+// {
	1062	+// public void actionPerformed(ActionEvent e)
	1063	+// {
	1064	+// System.gc();
	1065	+// }
	1066	+// });
	1067	+
	1068	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1069	+ collapseButton.setToolTipText("Collapse toolbar");
	1070	+ collapseButton.addActionListener(this);
	1071	+
	1072	+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/empty.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1073	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1074	+ maximize3DButton.addActionListener(this);
	1075	+
	1076	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1077	+ twoButton.setToolTipText("Show 3D view only");
	1078	+ twoButton.addActionListener(this);
	1079	+ this.fullscreenLayout = twoButton;
	1080	+
	1081	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1082	+ threeButton.setToolTipText("Show controls and 3D view");
	1083	+ threeButton.addActionListener(this);
	1084	+ if (Globals.ADVANCED)
	1085	+ {
	1086	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1087	+ sixButton.setToolTipText("Show 3D view and controls");
	1088	+ sixButton.addActionListener(this);
	1089	+ }
	1090	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1091	+// sevenButton.setToolTipText("3-column layout");
	1092	+// sevenButton.addActionListener(this);
	1093	+ //
	1094	+
	1095	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1096	+ fullButton.setToolTipText("Full-screen window");
	1097	+ fullButton.addActionListener(this);
	1098	+
	1099	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
454	1100	screenfitButton.setToolTipText("Screen fit");
455	1101	screenfitButton.addActionListener(this);
456		- oe.aConstraints.gridx += 1;
	1102	+
	1103	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1104	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1105	+ restoreCameraButton.addActionListener(this);
	1106	+
	1107	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1108	+ saveVersionButton.setToolTipText("Duplicate current version");
	1109	+ saveVersionButton.addActionListener(this);
	1110	+
	1111	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1112	+ deleteVersionButton.setToolTipText("Delete current version");
	1113	+ deleteVersionButton.addActionListener(this);
	1114	+
	1115	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1116	+ previousVersionButton.setToolTipText("Previous version");
	1117	+ previousVersionButton.addActionListener(this);
	1118	+ previousVersionButton.setEnabled(false);
	1119	+
	1120	+ cGridBag updown = new cGridBag().setVertical(true);
	1121	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1122	+ restoreButton.setToolTipText("Undo (restore current version)");
	1123	+ restoreButton.addActionListener(this);
	1124	+ //restoreButton.setEnabled(false);
	1125	+
	1126	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1127	+ replaceButton.setToolTipText("Save (replace current version)");
	1128	+ replaceButton.addActionListener(this);
	1129	+ //replaceButton.setEnabled(false);
	1130	+
	1131	+ copyOptionsPanel.add(updown);
	1132	+
	1133	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1134	+ nextVersionButton.setToolTipText("Next version");
	1135	+ nextVersionButton.addActionListener(this);
	1136	+ nextVersionButton.setEnabled(false);
	1137	+
	1138	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1139	+ oneStepButton.setToolTipText("Animate one step forward");
	1140	+ oneStepButton.addActionListener(this);
	1141	+
	1142	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1143	+ liveCB.setToolTipText("Enable animation");
	1144	+ liveCB.addItemListener(this);
	1145	+
	1146	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	1147	+ fastCB.setToolTipText("Fast mode");
	1148	+ fastCB.addItemListener(this);
	1149	+
	1150	+ //oe.toolboxPanel.Return();
	1151	+
	1152	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1153	+// trackCB.setToolTipText("Enable tracking");
	1154	+// trackCB.addItemListener(this);
	1155	+
457	1156	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
458	1157	// 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	1158
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);
	1159	+ if (Globals.ADVANCED)
	1160	+ {
	1161	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1162	+ snapobjectButton.addActionListener(this);
	1163	+ snapobjectButton.setToolTipText("Snap Object");
	1164	+
	1165	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
485	1166	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		- //
	1167	+ fourButton.setToolTipText("Show control panel only");
	1168	+ }
497	1169
498		- oe.toolbarPanel.add(rootButton = new cButton(" o o o ")); //, oe.aConstraints);
499		- rootButton.setToolTipText("Edit object in new tab");
	1170	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	1171	+
	1172	+
	1173	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1174	+ rootButton.setToolTipText("Open selection in new tab");
500	1175	rootButton.addActionListener(this);
501		- oe.aConstraints.gridx += 1;
502		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	1176	+
	1177	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
503	1178	closeButton.setToolTipText("Close tab");
504	1179	closeButton.addActionListener(this);
505	1180	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
506	1181	//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	1182
516		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	1183	+ cGridBag row1 = new cGridBag();
	1184	+
	1185	+ // INSERT
	1186	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1187	+ gridButton.setToolTipText("Create ground");
	1188	+ gridButton.addActionListener(this);
	1189	+
	1190	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1191	+ boxButton.setToolTipText("Create box");
	1192	+ boxButton.addActionListener(this);
	1193	+
	1194	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1195	+ superButton.setToolTipText("Create superellipsoid");
	1196	+ superButton.addActionListener(this);
	1197	+
	1198	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1199	+ sphereButton.setToolTipText("Create sphere");
	1200	+ sphereButton.addActionListener(this);
	1201	+
	1202	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1203	+ coneButton.setToolTipText("Create cone");
	1204	+ coneButton.addActionListener(this);
	1205	+
	1206	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1207	+ torusButton.setToolTipText("Create torus");
	1208	+ torusButton.addActionListener(this);
	1209	+
	1210	+ if (Globals.ADVANCED)
	1211	+ {
	1212	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1213	+ kleinButton.setToolTipText("Create Klein bottle");
	1214	+ kleinButton.addActionListener(this);
	1215	+ }
	1216	+
	1217	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1218	+ particlesButton.setToolTipText("Create particle system");
	1219	+ particlesButton.addActionListener(this);
	1220	+
	1221	+ oe.toolboxPanel.add(row1);
	1222	+
	1223	+ cGridBag row2 = new cGridBag();
	1224	+
	1225	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1226	+ groupButton.setToolTipText("Create group");
	1227	+ groupButton.addActionListener(this);
	1228	+
	1229	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1230	+ compositeButton.setToolTipText("Create composite");
	1231	+ compositeButton.addActionListener(this);
	1232	+
	1233	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1234	+ switchButton.setToolTipText("Create item switcher");
	1235	+ switchButton.addActionListener(this);
	1236	+
	1237	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1238	+ loopButton.setToolTipText("Create loop");
	1239	+ loopButton.addActionListener(this);
	1240	+
	1241	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1242	+ textureButton.setToolTipText("Create texture");
	1243	+ textureButton.addActionListener(this);
	1244	+
	1245	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1246	+ overlayButton.setToolTipText("Create overlay");
	1247	+ overlayButton.addActionListener(this);
	1248	+
	1249	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1250	+ lightButton.setToolTipText("Create light");
	1251	+ lightButton.addActionListener(this);
	1252	+
	1253	+ oe.toolboxPanel.add(row2);
	1254	+
	1255	+ cGridBag textures = new cGridBag();
	1256	+
	1257	+ CreateTexturePanel(textures);
	1258	+
	1259	+ oe.toolboxPanel.add(textures);
	1260	+
	1261	+ textures.preferredHeight = 100;
	1262	+
	1263	+ CreateSkyboxPanel(oe.skyboxPanel);
	1264	+
	1265	+ // EDIT panel
	1266	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1267	+ editButton.setToolTipText("Pin selection controls");
	1268	+ editButton.addActionListener(this);
	1269	+
	1270	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1271	+ uneditButton.setToolTipText("Unpin and remove selection controls");
517	1272	uneditButton.addActionListener(this);
518	1273
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);
	1274	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1275	+ allParamsButton.setToolTipText("Show all controls");
531	1276	allParamsButton.addActionListener(this);
532	1277
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);
	1278	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1279	+ clearPanelButton.setToolTipText("Clear all controls");
	1280	+ clearPanelButton.addActionListener(this);
539	1281
	1282	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1283	+ //unselectButton.setToolTipText("Unselect");
	1284	+ //unselectButton.addActionListener(this);
	1285	+
	1286	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1287	+ flashSelectionButton.setToolTipText("Highlight selection");
	1288	+ flashSelectionButton.addActionListener(this);
	1289	+
	1290	+ editCommandsPanel.preferredHeight = 1;
	1291	+
	1292	+ SetPinStates(false);
	1293	+// oe.treePanel.add(commandsPanel);
	1294	+// oe.treePanel.Return();
	1295	+
540	1296	// oe.aConstraints.gridx += 1;
541	1297	// oe.aConstraints.weighty = 0;
542	1298	// oe.aConstraints.gridwidth = 1;
..	..	@@ -548,47 +1304,32 @@
548	1304	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
549	1305	// gcButton.addActionListener(this);
550	1306
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;
	1307	+ cGridBag jSPPanel = new cGridBag();
	1308	+
	1309	+ JScrollPane jSP;
562	1310	//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);
	1311	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
564	1312	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	1313
	1314	+ oe.treePanel.add(jSPPanel);
	1315	+ oe.treePanel.Return();
	1316	+
	1317	+ oe.treePanel.add(copyOptionsPanel);
	1318	+ oe.treePanel.Return();
	1319	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1320	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1321	+ sliderPane.preferredHeight = 1;
	1322	+
	1323	+// mainPanel.setDividerLocation(0.1); //1.0);
	1324	+ mainPanel.setResizeWeight(0.4);
	1325	+
585	1326	//jList.addListSelectionListener(this);
586	1327	oe.jTree.addTreeSelectionListener(this);
587	1328	//jTree.setRootVisible(false);
588	1329	//jTree.setEditable(true);
589	1330	oe.jTree.setDragEnabled(true);
590	1331	//jTree.setPreferredSize(new Dimension(10,10));
591		- jSP.setPreferredSize(new Dimension(100,200));
	1332	+ //jSP.setPreferredSize(new Dimension(100,200));
592	1333
593	1334	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
594	1335
..	..	@@ -600,122 +1341,204 @@
600	1341	dgr.addDragGestureListener(this);
601	1342	}catch(Exception e) {}
602	1343	*/
603		- radio.layout = sevenButton;
	1344	+ radio.layout = threeButton; // sixButton;
604	1345	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
605	1346	}
606	1347
607		- void AddOptions(JPanel panel, GridBagConstraints constraints)
	1348	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
608	1349	{
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);
	1350	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1351	+ colorCB.setToolTipText("Copy color when dropped");
	1352	+ colorCB.addItemListener(this);
618	1353
619		- // constraints.gridy += 1;
	1354	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1355	+ materialCB.setToolTipText("Copy material when dropped");
	1356	+ materialCB.addItemListener(this);
	1357	+
	1358	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1359	+ textureCB.setToolTipText("Copy texture when dropped");
	1360	+ textureCB.addItemListener(this);
	1361	+
	1362	+ panel.Return();
	1363	+
	1364	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	1365	+ boxCB.setToolTipText("Display bounding boxes");
	1366	+ boxCB.addItemListener(this);
	1367	+
	1368	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	1369	+ zoomBoxCB.setToolTipText("Display only for wheel");
	1370	+ zoomBoxCB.addItemListener(this);
	1371	+
	1372	+ if (true) // Globals.ADVANCED)
	1373	+ {
	1374	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1375	+// supportCB.setToolTipText("Enable rigging");
	1376	+// supportCB.addItemListener(this);
	1377	+
	1378	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1379	+ freezeCB.setToolTipText("Fast moving camera");
	1380	+ freezeCB.addItemListener(this);
	1381	+
620	1382	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
621	1383	// localCB.addItemListener(this);
622	1384
623		- constraints.gridy += 1;
624		- panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD), constraints);
	1385	+ panel.Return();
	1386	+
	1387	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
625	1388	crowdCB.setToolTipText("Used for crowds");
626	1389	crowdCB.addItemListener(this);
627	1390
628		- constraints.gridy += 1;
629		- panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), constraints);
	1391	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
630	1392	smoothCB.setToolTipText("Snapping delay");
631	1393	smoothCB.addItemListener(this);
632	1394
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		-
	1395	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1396	+// slowCB.setToolTipText("Smooth interpolation");
	1397	+// slowCB.addItemListener(this);
	1398	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1399	+ minshaderCB.setToolTipText("Minimal fast shader");
	1400	+ minshaderCB.addItemListener(this);
	1401	+
646	1402	// constraints.gridy += 1;
647	1403	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
648	1404	// speakerMocapCB.addItemListener(this);
649	1405
	1406	+ panel.Return();
	1407	+
650	1408	if (false)
651	1409	{
652	1410	// handled in scripts
653		- constraints.gridy += 1;
654		- panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), constraints);
	1411	+ //constraints.gridy += 1;
	1412	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
655	1413	speakerCameraCB.addItemListener(this);
656	1414
657		- constraints.gridy += 1;
658		- panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), constraints);
	1415	+ //constraints.gridy += 1;
	1416	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
659	1417	speakerFocusCB.addItemListener(this);
660	1418
661		- constraints.gridy += 1;
662		- panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), constraints);
	1419	+ //constraints.gridy += 1;
	1420	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
663	1421	smoothfocusCB.addItemListener(this);
	1422	+ panel.Return();
664	1423	}
665	1424
666	1425	//constraints.gridx += 1;
667	1426	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
668	1427	// debugCB.addItemListener(this);
669	1428
670		- constraints.gridy += 1;
671		- panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL), constraints);
	1429	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1430	+ trackCB.setToolTipText("Enable tracking target");
	1431	+ trackCB.addItemListener(this);
	1432	+
	1433	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1434	+ oeilCB.setToolTipText("Move camera when tracking");
672	1435	oeilCB.addItemListener(this);
673	1436
674		- constraints.gridy += 1;
675		- panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT), constraints);
	1437	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1438	+ shadowCB.setToolTipText("When live compute shadows");
	1439	+ shadowCB.addItemListener(this);
	1440	+
	1441	+ panel.Return();
	1442	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1443	+ toggleTextureCB.setToolTipText("Load textures");
	1444	+ toggleTextureCB.addItemListener(this);
	1445	+
	1446	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1447	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1448	+ toggleSwitchCB.addItemListener(this);
	1449	+
	1450	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1451	+ autokeepCB.setToolTipText("On structure change");
	1452	+ autokeepCB.addItemListener(this);
	1453	+
	1454	+ panel.Return();
	1455	+ if (Globals.ADVANCED)
	1456	+ {
	1457	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
676	1458	lookAtCB.setToolTipText("Look-at target");
677	1459	lookAtCB.addItemListener(this);
	1460	+ }
	1461	+
	1462	+ }
	1463	+
	1464	+ cGridBag fill = new cGridBag();
	1465	+ fill.preferredHeight = 200;
	1466	+ cGridBag fill2 = new cGridBag();
	1467	+ fill2.preferredHeight = 200;
	1468	+ cGridBag fill3 = new cGridBag();
	1469	+ fill3.preferredHeight = 200;
	1470	+
	1471	+ panel.add(fill);
	1472	+ panel.add(fill2);
	1473	+ panel.add(fill3);
678	1474
679	1475	}
680	1476
681	1477	void EditObject(Object3D obj)
682	1478	{
	1479	+ assert(obj instanceof Composite);
	1480	+
	1481	+// if (obj.versionlist == null)
	1482	+// {
	1483	+// obj.versionlist = new Object3D[100];
	1484	+// obj.versionindex = -1;
	1485	+// }
	1486	+
683	1487	cRadio radioButton = new cRadio(obj.name);
	1488	+
	1489	+ // June 2019. Patch to avoid bug with transparency.
	1490	+ radioButton.hadMaterial = obj.material != null;
	1491	+ if (!radioButton.hadMaterial)
	1492	+ {
	1493	+ obj.material = new cMaterial();
	1494	+ }
	1495	+
684	1496	radioButton.SetObject(obj);
685		- radioButton.layout = sevenButton;
	1497	+ radioButton.layout = threeButton; // sixButton;
686	1498	radioButton.SetCamera(cameraView.renderCamera, false);
687	1499	radioButton.addActionListener(this);
688	1500	radioPanel.add(radioButton);
689	1501	buttonGroup.add(radioButton);
690	1502	radioButton.doClick();
691	1503	}
	1504	+
692	1505	void SetupViews(ObjEditor oe)
693	1506	{
	1507	+ theFrame = this;
	1508	+
694	1509	oe.SetupViews();
695	1510
	1511	+ if (Globals.DEBUG)
696	1512	System.out.println("SetupViews");
697	1513	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
698	1514	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
699	1515	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
700	1516	}
701	1517
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;
	1518	+ cToggleButton liveCB;
	1519	+ cCheckBox supportCB;
	1520	+ cCheckBox localCB;
	1521	+ cCheckBox crowdCB;
	1522	+ cCheckBox smoothCB;
	1523	+ cCheckBox minshaderCB;
	1524	+
	1525	+ cToggleButton fastCB;
	1526	+ cCheckBox slowCB;
	1527	+ cCheckBox boxCB;
	1528	+ cCheckBox zoomBoxCB;
	1529	+ cCheckBox freezeCB;
	1530	+ //cToggleButton trackCB;
	1531	+ cCheckBox trackCB;
	1532	+ cCheckBox smoothfocusCB;
713	1533	// JCheckBox speakerMocapCB;
714		- JCheckBox speakerCameraCB;
715		- JCheckBox speakerFocusCB;
716		- JCheckBox debugCB;
717		- JCheckBox oeilCB;
718		- JCheckBox lookAtCB;
	1534	+ cCheckBox speakerCameraCB;
	1535	+ cCheckBox speakerFocusCB;
	1536	+ cCheckBox debugCB;
	1537	+
	1538	+ cCheckBox oeilCB;
	1539	+ cCheckBox shadowCB;
	1540	+ cCheckBox autokeepCB;
	1541	+ cCheckBox lookAtCB;
719	1542
720	1543	// static int COLOR = 1;
721	1544	// static int MATERIAL = 2;
..	..	@@ -723,9 +1546,9 @@
723	1546
724	1547	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
725	1548
726		- JCheckBox colorCB;
727		- JCheckBox materialCB;
728		- JCheckBox textureCB;
	1549	+ cCheckBox colorCB;
	1550	+ cCheckBox materialCB;
	1551	+ cCheckBox textureCB;
729	1552
730	1553	public void itemStateChanged(ItemEvent e)
731	1554	{
..	..	@@ -753,6 +1576,7 @@
753	1576	} else if(e.getSource() == liveCB)
754	1577	{
755	1578	cameraView.ToggleLive();
	1579	+ refreshContents(false);
756	1580	}
757	1581	else if(e.getSource() == supportCB)
758	1582	{
..	..	@@ -768,6 +1592,12 @@
768	1592	{
769	1593	cameraView.ToggleInertia();
770	1594	cameraView.repaint();
	1595	+ }
	1596	+ else if(e.getSource() == minshaderCB)
	1597	+ {
	1598	+ Globals.MINSHADER ^= true;
	1599	+ cameraView.programInitialized = false;
	1600	+ cameraView.repaint();
771	1601	}
772	1602	else if(e.getSource() == localCB)
773	1603	{
..	..	@@ -817,6 +1647,18 @@
817	1647	{
818	1648	cameraView.ToggleOeil();
819	1649	}
	1650	+ else if(e.getSource() == shadowCB)
	1651	+ {
	1652	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1653	+ }
	1654	+ else if(e.getSource() == freezeCB)
	1655	+ {
	1656	+ Globals.FREEZEONMOVE ^= true;
	1657	+ }
	1658	+ else if(e.getSource() == autokeepCB)
	1659	+ {
	1660	+ Globals.REPLACEONMAKE ^= true;
	1661	+ }
820	1662	else if(e.getSource() == lookAtCB)
821	1663	{
822	1664	cameraView.ToggleLookAt();
..	..	@@ -833,7 +1675,8 @@
833	1675
834	1676	/**/
835	1677	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
836		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1678	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1679	+ TreePath path = objEditor.jTree.getSelectionPath();
837	1680	if ((path == null) \|\| (path.getPathCount() <= 1)) {
838	1681	// We can't move the root node or an empty selection
839	1682	return;
..	..	@@ -896,8 +1739,6 @@
896	1739	}
897	1740	}
898	1741
899		- String string = (String) object;
900		-
901	1742	System.out.println("Transfer = " + object + "; drop : " + target);
902	1743	// if( object instanceof java.io.File[])
903	1744	// {
..	..	@@ -905,7 +1746,11 @@
905	1746	// objEditor.DropFile((java.io.File[]) object, true);
906	1747	// return;
907	1748	// }
908		- if (string.charAt(0) == '/')
	1749	+
	1750	+ String string = object.toString();
	1751	+
	1752	+ // File path for Mac and Windows
	1753	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
909	1754	{
910	1755	// file(s)
911	1756	String[] names = string.split("\n");
..	..	@@ -932,7 +1777,7 @@
932	1777
933	1778	flashIt = false;
934	1779	CameraPane pane = (CameraPane) target;
935		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1780	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
936	1781	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
937	1782
938	1783	if (group.selection.size() == 1)
..	..	@@ -948,23 +1793,33 @@
948	1793
949	1794	assert target == objEditor.jTree;
950	1795	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1796	+ Object3D destinationLeaf;
951	1797	try {
952		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1798	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
953	1799	} catch (Exception e) {
954	1800	System.out.println("destinationPath : " + destinationPath);
955	1801	return;
956	1802	}
957	1803
958		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1804	+ for (int i=group.selection.size(); --i>=0;)
959	1805	{
	1806	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1807	+
	1808	+ // Cannot move into itself
	1809	+ if (child == destinationLeaf)
	1810	+ return;
	1811	+ }
	1812	+
	1813	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1814	+// {
960	1815	loadClipboard(true);
961	1816	objEditor.jTree.setSelectionPath(destinationPath);
962		- pasteInto(false);
963		- } else {
964		- loadClipboard(false);
965		- objEditor.jTree.setSelectionPath(destinationPath);
966		- pasteInto(false); // true); // ???
967		- }
	1817	+ pasteInto(false, false);
	1818	+// } else {
	1819	+// loadClipboard(false);
	1820	+// objEditor.jTree.setSelectionPath(destinationPath);
	1821	+// pasteInto(false, false); // true); // ???
	1822	+// }
968	1823	}
969	1824	public void dropActionChanged(DropTargetDragEvent dtde)
970	1825	// Called if the user has modified the current drop gesture
..	..	@@ -1020,7 +1875,12 @@
1020	1875	TreePath path;
1021	1876
1022	1877	public TransferableTreePath(TreePath tp) {
1023		- path = tp;
	1878	+ Object[] objs = new Object[tp.getPathCount()];
	1879	+ for (int i=0; i<objs.length; i++)
	1880	+ {
	1881	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1882	+ }
	1883	+ path = new TreePath(objs);
1024	1884	}
1025	1885
1026	1886	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1069,85 +1929,107 @@
1069	1929	{
1070	1930	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1071	1931	//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);
	1932	+// gridItem = menu.add(new MenuItem("Grid"));
	1933	+// gridItem.addActionListener(this);
	1934	+// rectoidItem = menu.add(new MenuItem("Box"));
	1935	+// rectoidItem.addActionListener(this);
	1936	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1937	+// ellipsoidItem.addActionListener(this);
	1938	+// coneItem = menu.add(new MenuItem("Cone"));
	1939	+// coneItem.addActionListener(this);
	1940	+// torusItem = menu.add(new MenuItem("Torus"));
	1941	+// torusItem.addActionListener(this);
	1942	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1943	+// superItem.addActionListener(this);
	1944	+
	1945	+ cameraItem = menu.add(new MenuItem("Camera"));
	1946	+ cameraItem.addActionListener(this);
	1947	+
	1948	+ if (!Globals.ADVANCED)
	1949	+ {
1084	1950	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1085	1951	kleinItem.addActionListener(this);
1086		- particleItem = menu.add(new MenuItem("Particle system"));
1087		- particleItem.addActionListener(this);
	1952	+ }
	1953	+
	1954	+// particleItem = menu.add(new MenuItem("Particle system"));
	1955	+// particleItem.addActionListener(this);
	1956	+ if (Globals.ADVANCED)
	1957	+ {
1088	1958	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1089	1959	ragdollItem.addActionListener(this);
1090	1960	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1091	1961	ragdoll2Item.addActionListener(this);
	1962	+ }
1092	1963	menu.add("-");
1093		- meshItem = menu.add(new MenuItem("Mesh"));
	1964	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1094	1965	meshItem.addActionListener(this);
1095	1966	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1096	1967	// meshGroupItem.addActionListener(this);
	1968	+ if (Globals.ADVANCED)
	1969	+ {
1097	1970	springItem = menu.add(new MenuItem("Spring"));
1098	1971	springItem.addActionListener(this);
1099	1972	flagItem = menu.add(new MenuItem("Flag"));
1100	1973	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	1974	blobItem = menu.add(new MenuItem("Blob"));
1106	1975	blobItem.addActionListener(this);
1107	1976	latheItem = menu.add(new MenuItem("Lathe"));
1108	1977	latheItem.addActionListener(this);
1109		- lightItem = menu.add(new MenuItem("Light"));
1110		- lightItem.addActionListener(this);
	1978	+ }
	1979	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1980	+ bezierItem.addActionListener(this);
	1981	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1982	+// overlayItem.addActionListener(this);
	1983	+// lightItem = menu.add(new MenuItem("Light"));
	1984	+// lightItem.addActionListener(this);
1111	1985	menu.add("-");
1112	1986	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1113	1987	//superLoopItem.addActionListener(this);
1114		- loopItem = menu.add(new MenuItem("Loop"));
1115		- loopItem.addActionListener(this);
	1988	+// loopItem = menu.add(new MenuItem("Loop"));
	1989	+// loopItem.addActionListener(this);
1116	1990	doubleItem = menu.add(new MenuItem("Fork"));
1117	1991	doubleItem.addActionListener(this);
	1992	+ if (Globals.ADVANCED)
	1993	+ {
1118	1994	tripleItem = menu.add(new MenuItem("Trident"));
1119	1995	tripleItem.addActionListener(this);
	1996	+ }
1120	1997	}
1121	1998
1122	1999	void buildToolsMenu(Menu menu)
1123	2000	{
1124	2001	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1125	2002	animationItem.addItemListener(this);
1126		- animationItem.setState(CameraPane.ANIMATION);
	2003	+ animationItem.setState(Globals.ANIMATION);
	2004	+
	2005	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	2006	+ archiveItem.addActionListener(this);
1127	2007
1128	2008	menu.add("-");
1129	2009	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1130	2010	parseverticesItem.addActionListener(this);
1131	2011	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1132	2012	textureFieldItem.addActionListener(this);
1133		- alignItem = menu.add(new MenuItem("Align"));
	2013	+ alignItem = menu.add(new MenuItem("Align Objects"));
1134	2014	alignItem.addActionListener(this);
1135		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1136		- mirrorItem.addActionListener(this);
1137	2015	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1138	2016	reduceMorphItem.addActionListener(this);
1139	2017	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1140	2018	reduce34MorphItem.addActionListener(this);
1141		-
1142		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1143		- computeAOItem.addActionListener(this);
1144	2019	menu.add("-");
1145		-
1146	2020	menu.add(memoryItem = new MenuItem("Memory Usage"));
1147	2021	memoryItem.addActionListener(this);
	2022	+ menu.add(computeAOItem = new MenuItem("Compute AO"));
	2023	+ computeAOItem.addActionListener(this);
	2024	+
	2025	+ if (Globals.ADVANCED)
	2026	+ {
	2027	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	2028	+ mirrorItem.addActionListener(this);
	2029	+ menu.add("-");
1148	2030	menu.add(analyzeItem = new MenuItem("Analyze"));
1149	2031	analyzeItem.addActionListener(this);
1150		- menu.add(dumpItem = new MenuItem("Dump"));
	2032	+ menu.add(dumpItem = new MenuItem("Print"));
1151	2033	dumpItem.addActionListener(this);
1152	2034	// menu.add(pathItem = new MenuItem("From-to path"));
1153	2035	// pathItem.addActionListener(this);
..	..	@@ -1165,6 +2047,7 @@
1165	2047	menu.add("-");
1166	2048	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1167	2049	editScriptItem.addActionListener(this);
	2050	+ }
1168	2051	}
1169	2052
1170	2053	void ScreenFit()
..	..	@@ -1287,9 +2170,38 @@
1287	2170	shadow.material = new cMaterial(obj.material);
1288	2171	shadow.material.diffuse = 0.0001f;
1289	2172	shadow.material.specular = 0.0001f;
	2173	+ shadow.material.opacity = 0.75f;
	2174	+
	2175	+ AllocProjectedVertices(shadow);
	2176	+
	2177	+ shadow.projectedVertices[1].x = 300;
1290	2178
1291	2179	makeSomething(shadow);
1292	2180	}
	2181	+
	2182	+ private void ClearUnpinned()
	2183	+ {
	2184	+ //for (Object3D obj : listUI)
	2185	+ for (int i=listUI.size(); --i>=0;)
	2186	+ {
	2187	+ Object3D obj = listUI.elementAt(i);
	2188	+ if (!obj.pinned)
	2189	+ {
	2190	+ obj.CloseUI();
	2191	+ listUI.remove(i);
	2192	+ }
	2193	+ }
	2194	+ }
	2195	+
	2196	+ private void EditElement(Object3D elem, boolean newWindow)
	2197	+ {
	2198	+ // if (!(elem instanceof Composite))
	2199	+ // newWindow = false;
	2200	+ listUI.add(elem);
	2201	+ elem.openEditWindow(this, newWindow); //, false);
	2202	+ System.out.println("edit : " + elem);
	2203	+ elem.editWindow.refreshContents(true); // ? new
	2204	+ }
1293	2205
1294	2206	/**
1295	2207	* applyExample
..	..	@@ -1493,9 +2405,9 @@
1493	2405
1494	2406	void Overwrite(int mask)
1495	2407	{
1496		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2408	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1497	2409	{
1498		- Object3D content = GrafreeD.clipboard.get(0);
	2410	+ Object3D content = Grafreed.clipboard.get(0);
1499	2411
1500	2412	if (content instanceof cGroup && ((cGroup)content).transientlink )
1501	2413	content = ((cGroup)content).get(0);
..	..	@@ -1534,7 +2446,7 @@
1534	2446	{
1535	2447	ScreenFit();
1536	2448	} else
1537		- if (source == switchItem)
	2449	+ if (source == switchViewItem)
1538	2450	{
1539	2451	cVector v1 = new cVector();
1540	2452	cVector v2 = new cVector();
..	..	@@ -1543,11 +2455,11 @@
1543	2455	objEditor.cameraView.renderCamera.setAim(v2, v1);
1544	2456	objEditor.cameraView.repaint();
1545	2457	} else
1546		- if (source == rectoidItem)
	2458	+ if (source == rectoidItem \|\| source == boxButton)
1547	2459	{
1548	2460	makeSomething(new Box());
1549	2461	} else
1550		- if (source == particleItem)
	2462	+ if (source == particleItem \|\| source == particlesButton)
1551	2463	{
1552	2464	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1553	2465	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1626,27 +2538,27 @@
1626	2538
1627	2539	makeSomething(obj);
1628	2540	} else
1629		- if (source == gridItem)
	2541	+ if (source == gridItem \|\| source == gridButton)
1630	2542	{
1631	2543	makeSomething(new Grid());
1632	2544	} else
1633		- if (source == ellipsoidItem)
	2545	+ if (source == ellipsoidItem \|\| source == sphereButton)
1634	2546	{
1635	2547	makeSomething(new Sphere());
1636	2548	} else
1637		- if (source == coneItem)
	2549	+ if (source == coneItem \|\| source == coneButton)
1638	2550	{
1639	2551	makeSomething(new Cone());
1640	2552	} else
1641		- if (source == torusItem)
	2553	+ if (source == torusItem \|\| source == torusButton)
1642	2554	{
1643	2555	makeSomething(new Torus());
1644	2556	} else
1645		- if (source == superItem)
	2557	+ if (source == superItem \|\| source == superButton)
1646	2558	{
1647	2559	makeSomething(new Superellipsoid());
1648	2560	} else
1649		- if (source == kleinItem)
	2561	+ if (source == kleinItem \|\| source == kleinButton)
1650	2562	{
1651	2563	makeSomething(new Klein());
1652	2564	} else
..	..	@@ -1666,7 +2578,7 @@
1666	2578	{
1667	2579	makeSomething(new BezierSurface());
1668	2580	} else
1669		- if (source == checkerItem)
	2581	+ if (source == overlayItem \|\| source == overlayButton)
1670	2582	{
1671	2583	/*
1672	2584	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1714,10 +2626,27 @@
1714	2626	s.setup();
1715	2627	makeSomething(s);
1716	2628	} else
1717		- if (source == lightItem)
	2629	+ if (source == lightItem \|\| source == lightButton)
1718	2630	{
1719	2631	makeSomething(new Light());
1720	2632	} else
	2633	+// if (source == skybox1Button \|\|
	2634	+// source == skybox2Button \|\|
	2635	+// source == skybox3Button \|\|
	2636	+// source == skybox4Button \|\|
	2637	+// source == skybox5Button \|\|
	2638	+// source == skybox6Button \|\|
	2639	+// source == skybox7Button \|\|
	2640	+// source == skybox11Button \|\|
	2641	+// source == skybox12Button \|\|
	2642	+// source == skybox13Button \|\|
	2643	+// source == skybox14Button \|\|
	2644	+// source == skybox15Button \|\|
	2645	+// source == skybox16Button \|\|
	2646	+// source == skybox17Button)
	2647	+// {
	2648	+// ChangeSkybox(source);
	2649	+// } else
1721	2650	if (source == csgItem)
1722	2651	{
1723	2652	group(new CSG());
..	..	@@ -1764,30 +2693,38 @@
1764	2693
1765	2694	group(g);
1766	2695	} else
1767		- if (source == loopItem)
	2696	+ if (source == loopItem \|\| source == loopButton)
1768	2697	{
	2698	+ if (!group.selection.isEmpty())
	2699	+ {
1769	2700	Composite csg = new GroupLeaf();
1770	2701	csg.count = 5;
1771		- group(csg);
1772		- Composite child = new cGroup();
	2702	+ Composite child = new cGroup("Branch");
1773	2703	csg.addChild(child);
1774	2704	child.addChild(csg);
	2705	+ group(csg);
	2706	+ }
1775	2707	} else
1776	2708	if (source == doubleItem)
1777	2709	{
1778		- Composite csg = new GroupLeaf();
	2710	+ if (!group.selection.isEmpty())
	2711	+ {
	2712	+ Composite csg = new GroupLeaf("Fork");
1779	2713	csg.count = 5;
	2714	+ Composite child = new cGroup("Branch A");
	2715	+ csg.addChild(child);
	2716	+ child.addChild(csg);
	2717	+ child = new cGroup("Branch B");
	2718	+ csg.addChild(child);
	2719	+ child.addChild(csg);
1780	2720	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);
	2721	+ }
1787	2722	} else
1788	2723	if (source == tripleItem)
1789	2724	{
1790		- Composite csg = new GroupLeaf();
	2725	+ if (!group.selection.isEmpty())
	2726	+ {
	2727	+ Composite csg = new GroupLeaf("Trident");
1791	2728	csg.count = 4;
1792	2729	group(csg);
1793	2730	Composite child = new cGroup();
..	..	@@ -1799,28 +2736,12 @@
1799	2736	child = new cGroup();
1800	2737	csg.addChild(child);
1801	2738	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");
	2739	+ }
1819	2740	} else
1820	2741	if (source == computeAOItem)
1821	2742	{
1822	2743	Globals.drawMode = CameraPane.OCCLUSION;
1823		- Globals.theRenderer.repaint();
	2744	+ cameraView.repaint();
1824	2745	} else
1825	2746	if (source == recompileItem)
1826	2747	{
..	..	@@ -1835,7 +2756,7 @@
1835	2756	if (source == invariantsItem)
1836	2757	{
1837	2758	System.out.println("Invariants:");
1838		- GrafreeD.grafreeD.universe.invariants();
	2759	+ Grafreed.grafreed.universe.invariants();
1839	2760	} else
1840	2761	if (source == memoryItem)
1841	2762	{
..	..	@@ -1854,19 +2775,80 @@
1854	2775	{
1855	2776	DumpObject();
1856	2777	} else
	2778	+ if (source == minButton)
	2779	+ {
	2780	+ Minimize();
	2781	+ } else
	2782	+ if (source == maxButton)
	2783	+ {
	2784	+ Maximize();
	2785	+ } else
	2786	+ if (source == fullButton)
	2787	+ {
	2788	+ ToggleFullScreen();
	2789	+ } else
	2790	+ if (source == collapseButton)
	2791	+ {
	2792	+ this.expandedLayout = radio.layout;
	2793	+ CollapseToolbar();
	2794	+ } else
	2795	+ if (source == maximize3DButton)
	2796	+ {
	2797	+ this.expandedLayout = radio.layout;
	2798	+ radio.layout = twoButton;
	2799	+ Show3DView();
	2800	+ CollapseToolbar();
	2801	+ } else
	2802	+ if (source == previousVersionButton)
	2803	+ {
	2804	+ // Go to previous version
	2805	+ //if (!Undo())
	2806	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2807	+ PreviousVersion();
	2808	+ } else
	2809	+ if (source == restoreButton)
	2810	+ {
	2811	+ // Restore current version
	2812	+ Restore();
	2813	+ //restoreButton.setEnabled(false);
	2814	+ } else
	2815	+ if (source == replaceButton)
	2816	+ {
	2817	+ // Overwrite current version
	2818	+ Replace();
	2819	+ //replaceButton.setEnabled(false);
	2820	+ } else
	2821	+ if (source == nextVersionButton)
	2822	+ {
	2823	+ // Go to next version
	2824	+ NextVersion();
	2825	+ } else
	2826	+ if (source == saveVersionButton)
	2827	+ {
	2828	+ // Save a new version
	2829	+ if (!Save(true))
	2830	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2831	+ } else
	2832	+ if (source == deleteVersionButton)
	2833	+ {
	2834	+ // Delete a new version
	2835	+ DeleteVersion();
	2836	+ } else
	2837	+ if (source == oneStepButton)
	2838	+ {
	2839	+ Globals.ONESTEP = true;
	2840	+ cameraView.repaint();
	2841	+ } else
1857	2842	if (source == screenfitButton)
1858	2843	{
1859		- //Reload(lastConverter, lastFilename, true);
1860	2844	ScreenFit();
1861	2845	} else
1862	2846	if (source == screenfitpointButton)
1863	2847	{
1864		- //Reload(lastConverter, lastFilename, true);
1865	2848	ScreenFitPoint();
1866	2849	} else
1867	2850	if (source == snapobjectButton)
1868	2851	{
1869		- //Reload(lastConverter, lastFilename, true);
1870	2852	SnapObject();
1871	2853	} else
1872	2854	// if (event.getSource() == recompileButton)
..	..	@@ -1903,12 +2885,20 @@
1903	2885	{
1904	2886	loadClipboard(true);
1905	2887	} else
	2888	+ if (source == undoItem)
	2889	+ {
	2890	+ PreviousVersion();
	2891	+ } else
	2892	+ if (source == redoItem)
	2893	+ {
	2894	+ NextVersion();
	2895	+ } else
1906	2896	if (source == duplicateItem)
1907	2897	{
1908		- Object3D keep = GrafreeD.clipboard;
	2898	+ Object3D keep = Grafreed.clipboard;
1909	2899	loadClipboard(false);
1910	2900	paste(false);
1911		- GrafreeD.clipboard = keep;
	2901	+ Grafreed.clipboard = keep;
1912	2902	} else
1913	2903	if (source == cloneItem)
1914	2904	{
..	..	@@ -1926,13 +2916,17 @@
1926	2916	{
1927	2917	paste(false);
1928	2918	} else
	2919	+ if (source == pasteIntoItem)
	2920	+ {
	2921	+ pasteInto(true, false);
	2922	+ } else
1929	2923	if (source == pasteLinkItem)
1930	2924	{
1931		- pasteInto(false);
	2925	+ pasteInto(false, false);
1932	2926	} else
1933	2927	if (source == pasteCloneItem)
1934	2928	{
1935		- pasteInto(true);
	2929	+ pasteInto(true, true);
1936	2930	} else
1937	2931	if (source == pasteExpandItem)
1938	2932	{
..	..	@@ -2124,9 +3118,9 @@
2124	3118	// group.selection.get(0).setMasterThis(content); // should be identity
2125	3119	// refreshContents();
2126	3120	// }
2127		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	3121	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2128	3122	{
2129		- Object3D content = GrafreeD.clipboard.get(0);
	3123	+ Object3D content = Grafreed.clipboard.get(0);
2130	3124
2131	3125	if (content instanceof cGroup && ((cGroup)content).transientlink )
2132	3126	content = ((cGroup)content).get(0);
..	..	@@ -2134,11 +3128,11 @@
2134	3128	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2135	3129	for (int i=0; i<group.selection.size(); i++)
2136	3130	{
2137		- boolean random = CameraPane.RANDOM;
2138		- CameraPane.RANDOM = false; // parse all random nodes
	3131	+ boolean random = CameraPane.SWITCH;
	3132	+ CameraPane.SWITCH = false; // parse all random nodes
2139	3133	group.selection.get(i).linkVerticesThis(content);
2140	3134	// group.selection.get(i).setMasterThis(content); // should be identity
2141		- CameraPane.RANDOM = random;
	3135	+ CameraPane.SWITCH = random;
2142	3136	}
2143	3137	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2144	3138	refreshContents();
..	..	@@ -2148,20 +3142,20 @@
2148	3142	{
2149	3143	for (int i=0; i<group.selection.size(); i++)
2150	3144	{
2151		- boolean random = CameraPane.RANDOM;
2152		- CameraPane.RANDOM = false; // parse all random nodes
	3145	+ boolean random = CameraPane.SWITCH;
	3146	+ CameraPane.SWITCH = false; // parse all random nodes
2153	3147	group.selection.get(i).linkVerticesThis(null);
2154		- CameraPane.RANDOM = random;
	3148	+ CameraPane.SWITCH = random;
2155	3149	}
2156	3150
2157	3151	refreshContents();
2158	3152	} else
2159	3153	if (source == relinkverticesItem)
2160	3154	{
2161		- boolean random = CameraPane.RANDOM;
2162		- CameraPane.RANDOM = false; // parse all random nodes
	3155	+ boolean random = CameraPane.SWITCH;
	3156	+ CameraPane.SWITCH = false; // parse all random nodes
2163	3157	group.selection.RelinkToSupport();
2164		- CameraPane.RANDOM = random;
	3158	+ CameraPane.SWITCH = random;
2165	3159
2166	3160	refreshContents();
2167	3161	} else
..	..	@@ -2176,9 +3170,9 @@
2176	3170	} else
2177	3171	if (source == setMasterItem)
2178	3172	{
2179		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	3173	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2180	3174	{
2181		- Object3D content = GrafreeD.clipboard.get(0);
	3175	+ Object3D content = Grafreed.clipboard.get(0);
2182	3176
2183	3177	if (content instanceof cGroup && ((cGroup)content).transientlink )
2184	3178	content = ((cGroup)content).get(0);
..	..	@@ -2191,9 +3185,9 @@
2191	3185	{
2192	3186	if (group.selection.size() == 1)
2193	3187	{
2194		- if (GrafreeD.clipboard.size() == 1)
	3188	+ if (Grafreed.clipboard.size() == 1)
2195	3189	{
2196		- Object3D content = GrafreeD.clipboard.get(0);
	3190	+ Object3D content = Grafreed.clipboard.get(0);
2197	3191
2198	3192	if (content instanceof cGroup && ((cGroup)content).transientlink )
2199	3193	content = ((cGroup)content).get(0);
..	..	@@ -2210,7 +3204,7 @@
2210	3204	{
2211	3205	RevertMeshes();
2212	3206	} else
2213		- if (source == resetMeshItem)
	3207	+ if (source == resetAllItem)
2214	3208	{
2215	3209	ResetAll();
2216	3210	} else
..	..	@@ -2218,7 +3212,7 @@
2218	3212	{
2219	3213	StepAll();
2220	3214	} else
2221		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3215	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2222	3216	{
2223	3217	//int indices[] = jList.getSelectedIndices();
2224	3218	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2230,9 +3224,9 @@
2230	3224	{
2231	3225	ClearSelection(true);
2232	3226	} else
2233		- if (source == grabItem)
	3227	+ if (source == grabItem \|\| source == groupButton)
2234	3228	{
2235		- group(new cGroup(), true);
	3229	+ group(new cGroup(), false); // true);
2236	3230	} else
2237	3231	if (source == hideItem)
2238	3232	{
..	..	@@ -2250,16 +3244,16 @@
2250	3244	{
2251	3245	makeSomething(new Camera());
2252	3246	} else
2253		- if (source == compositeItem)
	3247	+ if (source == compositeItem \|\| source == compositeButton)
2254	3248	{
2255	3249	group(new Composite());
2256	3250	} else
2257		- if (source == randomItem)
	3251	+ if (source == switchItem \|\| source == switchButton)
2258	3252	{
2259	3253	RandomNode random = new RandomNode();
2260	3254	group(random);
2261	3255	if (random.size() > 0)
2262		- random.name = random.get(0).name + "Rnd";
	3256	+ random.name = random.get(0).name + "Switch";
2263	3257	} else
2264	3258	if (source == physicsItem)
2265	3259	{
..	..	@@ -2356,7 +3350,7 @@
2356	3350	{
2357	3351	group(new cLinker());
2358	3352	} else
2359		- if (source == textureItem)
	3353	+ if (source == textureItem \|\| source == textureButton)
2360	3354	{
2361	3355	group(new TextureNode());
2362	3356	} else
..	..	@@ -2376,17 +3370,42 @@
2376	3370	{
2377	3371	CastShadow(2);
2378	3372	} else
2379		- if (source == ungroupItem)
	3373	+ if (source == ungroupItem \|\| source == ungroupButton)
2380	3374	{
2381		- //ungroup();
	3375	+ boolean canUngroup = true;
	3376	+
2382	3377	for (int i=0; i<group.selection.size(); i++)
2383	3378	{
2384		- Ungroup(group.selection.get(i));
	3379	+ Object3D selectedItem = group.selection.get(i);
	3380	+
	3381	+ if (selectedItem.Size() == 0)
	3382	+ {
	3383	+ // Cannot ungroup leaves
	3384	+ canUngroup = false;
	3385	+ break;
	3386	+ }
	3387	+
	3388	+ if (selectedItem == group)
	3389	+ {
	3390	+ // Cannot ungroup root
	3391	+ canUngroup = false;
	3392	+ break;
	3393	+ }
2385	3394	}
2386	3395
2387		- ClearSelection(false);
2388		-
2389		- refreshContents();
	3396	+ if (canUngroup)
	3397	+ {
	3398	+ for (int i=0; i<group.selection.size(); i++)
	3399	+ {
	3400	+ Object3D selectedItem = group.selection.get(i);
	3401	+
	3402	+ Ungroup(selectedItem);
	3403	+ }
	3404	+
	3405	+ ClearSelection(false);
	3406	+
	3407	+ refreshContents();
	3408	+ }
2390	3409	} else
2391	3410	if (source == genUVItem)
2392	3411	{
..	..	@@ -2398,7 +3417,7 @@
2398	3417	} else
2399	3418	if (source == genNormalsMESHItem)
2400	3419	{
2401		- GenNormals(true); // TODO
	3420	+ GenNormalsMESH();
2402	3421	} else
2403	3422	if (source == genNormalsORGANItem)
2404	3423	{
..	..	@@ -2463,6 +3482,22 @@
2463	3482	if (source == unmarkleavesItem)
2464	3483	{
2465	3484	MarkLeaves(false);
	3485	+ } else
	3486	+ if (source == rewindleavesItem)
	3487	+ {
	3488	+ RewindLeaves(true);
	3489	+ } else
	3490	+ if (source == unrewindleavesItem)
	3491	+ {
	3492	+ RewindLeaves(false);
	3493	+ } else
	3494	+ if (source == randomleavesItem)
	3495	+ {
	3496	+ RandomLeaves(true);
	3497	+ } else
	3498	+ if (source == unrandomleavesItem)
	3499	+ {
	3500	+ RandomLeaves(false);
2466	3501	} else
2467	3502	if (source == flipVItem)
2468	3503	{
..	..	@@ -2548,9 +3583,13 @@
2548	3583	{
2549	3584	SmoothMesh();
2550	3585	} else
2551		- if (source == transformgeometryItem)
	3586	+ if (source == transformGeometryItem)
2552	3587	{
2553	3588	TransformGeometry();
	3589	+ } else
	3590	+ if (source == transformChildrenItem)
	3591	+ {
	3592	+ TransformChildren();
2554	3593	} else
2555	3594	if (source == resetTransformItem)
2556	3595	{
..	..	@@ -2558,7 +3597,11 @@
2558	3597	} else
2559	3598	if (source == resetCentroidItem)
2560	3599	{
2561		- ResetCentroid();
	3600	+ ResetCentroid(true);
	3601	+ } else
	3602	+ if (source == resetCentroidXZItem)
	3603	+ {
	3604	+ ResetCentroid(false);
2562	3605	} else
2563	3606	if (source == resetParentItem)
2564	3607	{
..	..	@@ -2663,7 +3706,7 @@
2663	3706	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2664	3707	{
2665	3708	obj = (Object3D)e.nextElement();
2666		- obj.SetBumpTexture(null);
	3709	+ obj.ResetBumpTexture();
2667	3710	}
2668	3711
2669	3712	refreshContents();
..	..	@@ -2679,6 +3722,31 @@
2679	3722
2680	3723	refreshContents();
2681	3724	} else
	3725	+ if (source == embedTexturesItem)
	3726	+ {
	3727	+ Object3D obj;
	3728	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3729	+ {
	3730	+ obj = (Object3D)e.nextElement();
	3731	+ obj.EmbedTextures(true);
	3732	+ }
	3733	+
	3734	+ refreshContents();
	3735	+ } else
	3736	+ if (source == deEmbedTexturesItem)
	3737	+ {
	3738	+ Object3D obj;
	3739	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3740	+ {
	3741	+ obj = (Object3D)e.nextElement();
	3742	+ obj.EmbedTextures(false);
	3743	+ }
	3744	+
	3745	+ CameraPane.texturepigment.clear();
	3746	+ CameraPane.texturebump.clear();
	3747	+
	3748	+ refreshContents();
	3749	+ } else
2682	3750	if (source == flashSelectionButton)
2683	3751	{
2684	3752	CameraPane.flash = true;
..	..	@@ -2690,42 +3758,36 @@
2690	3758	if (source == twoButton)
2691	3759	{
2692	3760	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();
	3761	+
	3762	+ if (CameraPane.FULLSCREEN)
	3763	+ fullscreenLayout = radio.layout;
	3764	+
	3765	+ Show3DView();
	3766	+
	3767	+ cameraView.requestFocusInWindow();
	3768	+
	3769	+// refreshContents(true);
	3770	+//
	3771	+// try
	3772	+// {
	3773	+// java.awt.Robot bot = new java.awt.Robot();
	3774	+// int mask = InputEvent.BUTTON1_MASK;
	3775	+// bot.mouseMove(100, 100);
	3776	+// bot.mousePress(mask);
	3777	+// bot.mouseRelease(mask);
	3778	+// }
	3779	+// catch (Exception e)
	3780	+// {
	3781	+//
	3782	+// }
	3783	+
2725	3784	} else
2726	3785	if (source == threeButton)
2727	3786	{
2728	3787	radio.layout = threeButton;
	3788	+
	3789	+ if (CameraPane.FULLSCREEN)
	3790	+ fullscreenLayout = radio.layout;
2729	3791
2730	3792	// bigThree.remove(scenePanel);
2731	3793	// bigThree.remove(centralPanel);
..	..	@@ -2755,13 +3817,18 @@
2755	3817	// centralPanel.setVisible(true);
2756	3818	// XYZPanel.setVisible(true);
2757	3819	bigThree.ClearUI();
	3820	+ bigThree.add(scenePanel);
2758	3821	bigThree.add(centralPanel);
2759		- bigThree.add(XYZPanel);
2760	3822	bigThree.FlushUI();
	3823	+
	3824	+ cameraView.requestFocusInWindow();
2761	3825	} else
2762	3826	if (source == fourButton)
2763	3827	{
2764	3828	radio.layout = fourButton;
	3829	+
	3830	+ if (CameraPane.FULLSCREEN)
	3831	+ fullscreenLayout = radio.layout;
2765	3832
2766	3833	// bigThree.remove(scenePanel);
2767	3834	// bigThree.remove(centralPanel);
..	..	@@ -2793,10 +3860,15 @@
2793	3860	bigThree.ClearUI();
2794	3861	bigThree.add(scenePanel);
2795	3862	bigThree.FlushUI();
	3863	+
	3864	+ cameraView.requestFocusInWindow();
2796	3865	} else
2797	3866	if (source == sixButton)
2798	3867	{
2799	3868	radio.layout = sixButton;
	3869	+
	3870	+ if (CameraPane.FULLSCREEN)
	3871	+ fullscreenLayout = radio.layout;
2800	3872
2801	3873	// bigThree.remove(scenePanel);
2802	3874	// bigThree.remove(centralPanel);
..	..	@@ -2826,13 +3898,18 @@
2826	3898	// centralPanel.setVisible(true);
2827	3899	// XYZPanel.setVisible(false);
2828	3900	bigThree.ClearUI();
2829		- bigThree.add(scenePanel);
2830	3901	bigThree.add(centralPanel);
	3902	+ bigThree.add(scenePanel);
2831	3903	bigThree.FlushUI();
	3904	+
	3905	+ cameraView.requestFocusInWindow();
2832	3906	} else
2833	3907	if (source == sevenButton)
2834	3908	{
2835	3909	radio.layout = sevenButton;
	3910	+
	3911	+ if (CameraPane.FULLSCREEN)
	3912	+ fullscreenLayout = radio.layout;
2836	3913
2837	3914	// bigThree.remove(scenePanel);
2838	3915	// bigThree.remove(centralPanel);
..	..	@@ -2866,9 +3943,12 @@
2866	3943	bigThree.add(centralPanel);
2867	3944	bigThree.add(XYZPanel);
2868	3945	bigThree.FlushUI();
	3946	+
	3947	+ cameraView.requestFocusInWindow();
2869	3948	} else
2870	3949	if (source == rootButton)
2871	3950	{
	3951	+ Replace();
2872	3952	Object3D obj;
2873	3953	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2874	3954	{
..	..	@@ -2877,6 +3957,7 @@
2877	3957	EditObject(obj);
2878	3958	}
2879	3959
	3960	+ cameraView.requestFocusInWindow();
2880	3961	refreshContents(true);
2881	3962	} else
2882	3963	if (source == closeButton)
..	..	@@ -2886,22 +3967,37 @@
2886	3967	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2887	3968	{
2888	3969	ab = (cRadio)e.nextElement();
2889		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3970	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2890	3971	{
	3972	+ // Patch to avoid bug with transparency.
	3973	+ if (!ab.hadMaterial)
	3974	+ {
	3975	+ ab.object.material = null;
	3976	+ }
	3977	+
2891	3978	buttonGroup.remove(ab);
2892	3979	radioPanel.remove(ab);
2893	3980
2894		- ab.GetObject().editWindow = null;
	3981	+ //ab.GetObject().editWindow = null;
	3982	+ ab.GetObject().manipWindow = null;
2895	3983	// ab.GetObject().objectUI = null; // ?????????
2896	3984
2897	3985	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2898	3986	break;
2899	3987	}
2900	3988	}
	3989	+
	3990	+ cameraView.requestFocusInWindow();
2901	3991	refreshContents(true);
2902	3992	} else
2903	3993	if (source == editItem \|\| source == editButton)
2904	3994	{
	3995	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3996	+ {
	3997	+ Object3D child = (Object3D)e.nextElement();
	3998	+ child.pinned = true;
	3999	+ }
	4000	+
2905	4001	EditSelection(false);
2906	4002	} else
2907	4003	if (source == uneditButton)
..	..	@@ -2910,13 +4006,14 @@
2910	4006	{
2911	4007	Object3D child = (Object3D)e.nextElement();
2912	4008	if(child.editWindow != null)
2913		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4009	+ child.pinned = false;
2914	4010	child.CloseUI();
2915	4011	listUI.remove(child);
	4012	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2916	4013
2917		- child.editWindow = null; // ???????????
	4014	+ //child.editWindow = null; // ???????????
2918	4015	}
2919		- objEditor.ctrlPanel.revalidate();
	4016	+ objEditor.ctrlPanel.FlushUI();
2920	4017	//objEditor.jTree.clearSelection();
2921	4018	//objEditor.ResetSliders();
2922	4019	refreshContents(true);
..	..	@@ -2927,16 +4024,18 @@
2927	4024	//copy.ClearUI();
2928	4025	for (Object3D obj : listUI)
2929	4026	{
	4027	+ obj.pinned = false;
2930	4028	obj.CloseUI();
2931	4029	}
2932	4030	listUI.clear();
	4031	+ SetPinStates(group.selection.size() > 0);
2933	4032	refreshContents(true);
2934	4033	} else
2935	4034	if (source == allParamsButton)
2936	4035	{
2937	4036	assert(copy == group);
2938	4037
2939		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4038	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2940	4039
2941	4040	for (Object3D obj : listUI)
2942	4041	{
..	..	@@ -2985,6 +4084,7 @@
2985	4084	}
2986	4085
2987	4086	copy = group;
	4087	+
2988	4088	//Globals.theRenderer.object = group;
2989	4089	if(!useclient)
2990	4090	{
..	..	@@ -3000,20 +4100,64 @@
3000	4100	frontView.object = group;
3001	4101	sideView.object = group;
3002	4102	}
3003		- group.editWindow = this;
	4103	+
	4104	+// fix "+" issue
	4105	+ //group.editWindow = this;
	4106	+ group.manipWindow = this;
	4107	+
3004	4108	/*
3005	4109	currentLayout = radio.layout;
3006	4110	if (currentLayout == null)
3007	4111	currentLayout = sevenButton;
3008	4112	*/
3009	4113	radio.layout.doClick();
	4114	+
	4115	+ assert(copy instanceof Composite);
	4116	+
	4117	+ if (copy.versionlist == null)
	4118	+ {
	4119	+ copy.versionlist = new Object3D[100];
	4120	+ copy.versionindex = -1;
	4121	+
	4122	+ // Cannot work with loops
	4123	+ // To fix this issue, first mark all nodes above the root,
	4124	+ // and check if any of these nodes are reachable below the root.
	4125	+ //Save(true);
	4126	+ }
	4127	+
	4128	+ SetVersionStates();
	4129	+
	4130	+ ClearUnpinned();
	4131	+
	4132	+ //Grafreed.Assert(group != null);
	4133	+ //Grafreed.Assert(group.selection != null);
	4134	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4135	+ if (group.selection == null \|\| group.selection.size() == 1)
	4136	+ EditSelection(false);
3010	4137	keepparent = group.parent;
3011	4138	// PARENT = NULL or not???
3012	4139	//group.parent = null; // ROOT
3013	4140	//group.attributes = -1;
3014	4141	ResetModel();
	4142	+
	4143	+ cameraView.requestFocusInWindow();
3015	4144	refreshContents(true);
3016		- }
	4145	+ } else if (event.getSource() == editCameraItem)
	4146	+ {
	4147	+ cameraView.ProtectCamera();
	4148	+ cameraView.requestFocusInWindow();
	4149	+ cameraView.repaint();
	4150	+ return;
	4151	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	4152	+ {
	4153	+ cameraView.RevertCamera();
	4154	+ cameraView.requestFocusInWindow();
	4155	+ cameraView.repaint();
	4156	+ return;
	4157	+ // } else if (event.getSource() == textureButton)
	4158	+ // {
	4159	+ // return; // true;
	4160	+ }
3017	4161	else
3018	4162	{
3019	4163	//return super.action(event, arg);
..	..	@@ -3022,7 +4166,6 @@
3022	4166	}
3023	4167
3024	4168	boolean useclient = false;
3025		- cRadio radio;
3026	4169
3027	4170	void ToggleRoot()
3028	4171	{
..	..	@@ -3074,6 +4217,28 @@
3074	4217	refreshContents();
3075	4218	}
3076	4219
	4220	+ void TransformChildren()
	4221	+ {
	4222	+ Object3D obj;
	4223	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4224	+ {
	4225	+ obj = (Object3D)e.nextElement();
	4226	+ obj.KeepTextureMatrices();
	4227	+ obj.TransformChildren();
	4228	+ obj.RestoreTextureMatrices();
	4229	+
	4230	+// if (obj.parent == null)
	4231	+// {
	4232	+// System.out.println("NULL PARENT!");
	4233	+// new Exception().printStackTrace();
	4234	+// }
	4235	+// else
	4236	+// TouchTransform(obj);
	4237	+// //obj.parent.Touch();
	4238	+ }
	4239	+
	4240	+ refreshContents();
	4241	+ }
3077	4242
3078	4243	void ResetTransform()
3079	4244	{
..	..	@@ -3186,7 +4351,7 @@
3186	4351	refreshContents();
3187	4352	}
3188	4353
3189		- void ResetCentroid()
	4354	+ void ResetCentroid(boolean full)
3190	4355	{
3191	4356	Object3D obj;
3192	4357	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3201,12 +4366,16 @@
3201	4366	LA.matIdentity(Object3D.mat);
3202	4367	obj.getBounds(minima, maxima, false);
3203	4368	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3204		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	4369	+ if (full)
	4370	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3205	4371	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3206	4372	obj.TransformMesh(Object3D.mat);
	4373	+
3207	4374	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3208		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	4375	+ if (full)
	4376	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3209	4377	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	4378	+
3210	4379	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3211	4380	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3212	4381	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3235,7 +4404,8 @@
3235	4404
3236	4405	int size = obj.MemorySize();
3237	4406
3238		- System.err.println((size/1024) + " KB is the size of " + obj);
	4407	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4408	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3239	4409	}
3240	4410	}
3241	4411	catch (Exception e)
..	..	@@ -3272,9 +4442,9 @@
3272	4442	obj = (Object3D)e.nextElement();
3273	4443
3274	4444	System.out.println("Object is: " + obj);
3275		- GrafreeD.AnalyzeObject(obj);
	4445	+ Grafreed.AnalyzeObject(obj);
3276	4446	System.out.println("Boundary rep: " + obj.bRep);
3277		- GrafreeD.AnalyzeObject(obj.bRep);
	4447	+ Grafreed.AnalyzeObject(obj.bRep);
3278	4448
3279	4449	// System.err.println((size/1024) + " KB is the size of " + obj);
3280	4450	}
..	..	@@ -3316,6 +4486,13 @@
3316	4486	void GenNormals(boolean crease)
3317	4487	{
3318	4488	group.GenNormalsS(crease);
	4489	+
	4490	+ refreshContents();
	4491	+ }
	4492	+
	4493	+ void GenNormalsMESH()
	4494	+ {
	4495	+ group.GenNormalsMeshS();
3319	4496
3320	4497	refreshContents();
3321	4498	}
..	..	@@ -3488,8 +4665,8 @@
3488	4665
3489	4666	void ParseVertices()
3490	4667	{
3491		- boolean epsequal = GrafreeD.epsequal;
3492		- GrafreeD.epsequal = true;
	4668	+ boolean epsequal = Grafreed.epsequal;
	4669	+ Grafreed.epsequal = true;
3493	4670
3494	4671	for (int i=0; i<group.selection.size(); i++)
3495	4672	{
..	..	@@ -3514,7 +4691,7 @@
3514	4691	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3515	4692	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3516	4693
3517		- g.add(GrafreeD.clipboard);
	4694	+ g.add(Grafreed.clipboard);
3518	4695
3519	4696	buffer.add(g);
3520	4697	}
..	..	@@ -3529,7 +4706,7 @@
3529	4706	makeSomething(buffer, i==group.selection.size()-1);
3530	4707	}
3531	4708
3532		- GrafreeD.epsequal = epsequal;
	4709	+ Grafreed.epsequal = epsequal;
3533	4710
3534	4711	refreshContents();
3535	4712	}
..	..	@@ -3547,7 +4724,16 @@
3547	4724	String pigment = Object3D.GetPigment(tex);
3548	4725	//String bump = Object3D.GetBump(tex);
3549	4726
3550		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4727	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4728	+
	4729	+ try
	4730	+ {
	4731	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
	4732	+ }
	4733	+ catch (Exception e)
	4734	+ {
	4735	+ System.err.println("FAIL: " + node);
	4736	+ }
3551	4737
3552	4738	double s = v.s;
3553	4739
..	..	@@ -3635,11 +4821,11 @@
3635	4821
3636	4822	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3637	4823
3638		- boolean random = CameraPane.RANDOM;
3639		- CameraPane.RANDOM = false; // parse all random nodes
	4824	+ boolean random = CameraPane.SWITCH;
	4825	+ CameraPane.SWITCH = false; // parse all random nodes
3640	4826	lowres.linkVerticesThis(null);
3641	4827	lowres.linkVerticesThis(sn);
3642		- CameraPane.RANDOM = random;
	4828	+ CameraPane.SWITCH = random;
3643	4829
3644	4830	System.err.flush();
3645	4831
..	..	@@ -3679,7 +4865,7 @@
3679	4865	return;
3680	4866
3681	4867	Object3D poses = group.selection.get(0);
3682		- Object3D ref = GrafreeD.clipboard.get(0);
	4868	+ Object3D ref = Grafreed.clipboard.get(0);
3683	4869
3684	4870	Object3D newgroup = new Object3D("Po:" + poses.name);
3685	4871
..	..	@@ -3873,9 +5059,9 @@
3873	5059
3874	5060	void ClipMesh()
3875	5061	{
3876		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	5062	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3877	5063	{
3878		- Object3D content = GrafreeD.clipboard.get(0);
	5064	+ Object3D content = Grafreed.clipboard.get(0);
3879	5065
3880	5066	if (content instanceof cGroup && ((cGroup)content).transientlink )
3881	5067	content = ((cGroup)content).get(0);
..	..	@@ -3884,7 +5070,7 @@
3884	5070	// {
3885	5071	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3886	5072	// }
3887		- group.selection.ClipMesh(GrafreeD.clipboard);
	5073	+ group.selection.ClipMesh(Grafreed.clipboard);
3888	5074	}
3889	5075	// group.selection.ClipMesh(GrafreeD.clipboard);
3890	5076	System.out.println("DONE.");
..	..	@@ -3931,6 +5117,18 @@
3931	5117	void MarkLeaves(boolean hide)
3932	5118	{
3933	5119	group.selection.MarkLeaves(hide);
	5120	+ refreshContents();
	5121	+ }
	5122	+
	5123	+ void RewindLeaves(boolean hide)
	5124	+ {
	5125	+ group.selection.RewindLeaves(hide);
	5126	+ refreshContents();
	5127	+ }
	5128	+
	5129	+ void RandomLeaves(boolean hide)
	5130	+ {
	5131	+ group.selection.RandomLeaves(hide);
3934	5132	refreshContents();
3935	5133	}
3936	5134
..	..	@@ -4005,28 +5203,25 @@
4005	5203	// }
4006	5204	// }
4007	5205
4008		- static boolean allparams = true;
4009		-
4010		- static Vector<Object3D> listUI = new Vector<Object3D>();
4011		-
4012	5206	void EditSelection(boolean newWindow)
4013	5207	{
	5208	+ if (group.selection == null)
	5209	+ {
	5210	+ EditElement(group, newWindow); // ? new
	5211	+ return;
	5212	+ }
	5213	+
4014	5214	// aConstraints.gridy = 0;
4015	5215	for (int i=0; i<group.selection.size(); i++)
4016	5216	{
4017	5217	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4018	5218	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4019		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5219	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4020	5220
4021	5221	Object3D elem = (Object3D)group.selection.elementAt(i);
4022		- if(elem != group)
	5222	+ if(elem != group \|\| !newWindow)
4023	5223	{
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
	5224	+ EditElement(elem, newWindow); // ? new
4030	5225	}
4031	5226	}
4032	5227	}
..	..	@@ -4089,9 +5284,7 @@
4089	5284
4090	5285	freezemodel = false;
4091	5286	}
4092		-
4093		- boolean flashIt = true;
4094		-
	5287	+
4095	5288	public void valueChanged(TreeSelectionEvent e)
4096	5289	//public boolean handleEvent(Event event)
4097	5290	{
..	..	@@ -4101,7 +5294,8 @@
4101	5294	//new Exception().printStackTrace();
4102	5295
4103	5296	freezemodel = true;
4104		-
	5297	+ ClearUnpinned();
	5298	+
4105	5299	/**/
4106	5300	//switch (event.id)
4107	5301	{
..	..	@@ -4109,7 +5303,6 @@
4109	5303	//case 702: // Event.LIST_DESELECT
4110	5304	group.deselectAll();
4111	5305	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4112		- objEditor.ClearInfo(); // .GetMaterial());
4113	5306	if (tps != null)
4114	5307	{
4115	5308	for (int i=0; i < tps.length; i++)
..	..	@@ -4118,33 +5311,39 @@
4118	5311
4119	5312	//if (child.parent != null)
4120	5313	//child.parent.addSelectee(child);
	5314	+ objEditor.SetMaterial(child);
4121	5315	group.addSelectee(child);
4122		- objEditor.SetMaterial(child); // .GetMaterial());
4123		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4124		- System.err.println("info : " + child.GetPath());
4125	5316	}
4126	5317	}
4127		- else
4128		- {
4129		- objEditor.SetMaterial(group); // .GetMaterial());
4130		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4131		- System.err.println("info : " + group.GetPath());
4132		- }
	5318	+// else
	5319	+// {
	5320	+// objEditor.SetMaterial(group); // .GetMaterial());
	5321	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	5322	+// System.err.println("info : " + group.GetPath());
	5323	+// }
4133	5324
4134		- objEditor.SetText(); // jan 2014
4135		-
4136		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	5325	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4137	5326	CameraPane.flash = true;
4138	5327
4139		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5328	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4140	5329	// a camera
4141	5330	{
4142		- CameraPane.camerachangeframe = 0; // don't refuse it
4143		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5331	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5332	+ {
	5333	+ CameraPane.camerachangeframe = 0; // don't refuse it
	5334	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5335	+ }
4144	5336	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4145	5337	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4146	5338	}
4147	5339
	5340	+ if (tps != null && tps.length == 1)
	5341	+ {
	5342	+ EditSelection(false);
	5343	+ }
	5344	+
	5345	+ SetPinStates(tps != null && tps.length > 0);
	5346	+
4148	5347	refreshContents();
4149	5348	//return true;
4150	5349	}
..	..	@@ -4153,6 +5352,52 @@
4153	5352
4154	5353	freezemodel = false;
4155	5354	}
	5355	+
	5356	+ void SetPinStates(boolean enabled)
	5357	+ {
	5358	+ editButton.setEnabled(enabled);
	5359	+ uneditButton.setEnabled(enabled);
	5360	+ //unselectButton.setEnabled(enabled);
	5361	+ flashSelectionButton.setEnabled(enabled);
	5362	+
	5363	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5364	+
	5365	+ boolean allComposites = true;
	5366	+
	5367	+ if (group.selection != null)
	5368	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5369	+ {
	5370	+ Object next = e.nextElement();
	5371	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5372	+ {
	5373	+ allComposites = false;
	5374	+ break;
	5375	+ }
	5376	+ }
	5377	+
	5378	+ rootButton.setEnabled(allComposites);
	5379	+ }
	5380	+
	5381	+ void refreshContents(boolean cp)
	5382	+ {
	5383	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5384	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5385	+ {
	5386	+ objEditor.ClearInfo(); // .GetMaterial());
	5387	+
	5388	+ for (int i=0; i < group.selection.Size(); i++)
	5389	+ {
	5390	+ Object3D child = (Object3D) group.selection.get(i);
	5391	+
	5392	+ objEditor.AddInfo(child, this, true);
	5393	+// System.err.println("info : " + child.GetPath());
	5394	+ }
	5395	+
	5396	+ objEditor.SetText(); // jan 2014
	5397	+ }
	5398	+
	5399	+ super.refreshContents(cp);
	5400	+ }
4156	5401
4157	5402	void linkSomething(Object3D thing)
4158	5403	{
..	..	@@ -4224,16 +5469,19 @@
4224	5469	{
4225	5470	if (group.selection.isEmpty())
4226	5471	return;
4227		- GrafreeD.clipboardIsTempGroup = false;
	5472	+
	5473	+ Grafreed.clipboardIsTempGroup = false;
4228	5474	Composite tGroup = null;
4229	5475	if (group.selection.size() > 0) // 1)
4230	5476	{
4231	5477	tGroup = new cGroup();
4232		- GrafreeD.clipboardIsTempGroup = true;
	5478	+ Grafreed.clipboardIsTempGroup = true;
4233	5479	}
4234	5480
4235	5481	if (cut)
4236	5482	{
	5483	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5484	+// Save();
4237	5485	//int indices[] = jList.getSelectedIndices();
4238	5486	//for (int i = indices.length - 1; i >= 0; i--)
4239	5487	//jList.remove(indices[i]);
..	..	@@ -4269,16 +5517,16 @@
4269	5517	//System.out.println("cut " + child);
4270	5518	//System.out.println("parent = " + child.parent);
4271	5519	// tmp.addChild(child);
4272		- if (GrafreeD.clipboardIsTempGroup)
	5520	+ if (Grafreed.clipboardIsTempGroup)
4273	5521	tGroup.add/Child/(tmp);
4274	5522	else
4275		- GrafreeD.clipboard = tmp;
	5523	+ Grafreed.clipboard = tmp;
4276	5524	}
4277	5525	else
4278		- if (GrafreeD.clipboardIsTempGroup)
	5526	+ if (Grafreed.clipboardIsTempGroup)
4279	5527	tGroup.add/Child/(child);
4280	5528	else
4281		- GrafreeD.clipboard = child;
	5529	+ Grafreed.clipboard = child;
4282	5530	}
4283	5531
4284	5532	//ResetModel();
..	..	@@ -4310,21 +5558,23 @@
4310	5558	//System.out.println("cut " + elem);
4311	5559	//System.out.println("parent = " + elem.parent);
4312	5560	// tmp.addChild(elem);
4313		- if (GrafreeD.clipboardIsTempGroup)
	5561	+ if (Grafreed.clipboardIsTempGroup)
4314	5562	tGroup.add/Child/(tmp);
4315	5563	else
4316		- GrafreeD.clipboard = tmp;
	5564	+ Grafreed.clipboard = tmp;
4317	5565	}
4318	5566	else
4319		- if (GrafreeD.clipboardIsTempGroup)
	5567	+ if (Grafreed.clipboardIsTempGroup)
4320	5568	tGroup.add/Child/(child);
4321	5569	else
4322		- GrafreeD.clipboard = child;
	5570	+ Grafreed.clipboard = child;
4323	5571	}
4324	5572
4325	5573	}
4326		- if (GrafreeD.clipboardIsTempGroup)
4327		- GrafreeD.clipboard = tGroup;
	5574	+
	5575	+ if (Grafreed.clipboardIsTempGroup)
	5576	+ Grafreed.clipboard = tGroup;
	5577	+
4328	5578	if (cut)
4329	5579	{
4330	5580	ResetModel();
..	..	@@ -4334,11 +5584,15 @@
4334	5584
4335	5585	void paste(boolean expand)
4336	5586	{
	5587	+ if (Globals.REPLACEONMAKE)
	5588	+ Save();
	5589	+ boolean keep = Globals.REPLACEONMAKE;
	5590	+ Globals.REPLACEONMAKE = false;
4337	5591	// if (GrafreeD.clipboard == null)
4338	5592	// return;
4339	5593	boolean first = true;
4340	5594
4341		- if (GrafreeD.clipboardIsTempGroup)
	5595	+ if (Grafreed.clipboardIsTempGroup)
4342	5596	{
4343	5597	Composite temp;
4344	5598
..	..	@@ -4349,7 +5603,7 @@
4349	5603	temp = (Composite)Applet3D.clipboard.deepCopy();
4350	5604	*/
4351	5605	Object3D elem;
4352		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5606	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4353	5607	{
4354	5608	Object3D child = (Object3D)e.nextElement();
4355	5609
..	..	@@ -4383,21 +5637,22 @@
4383	5637	//Object3D cb = Applet3D.clipboard;
4384	5638	//temp.addChild(cb);
4385	5639	//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());
	5640	+ assert(Grafreed.clipboard.parent == null);
	5641	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5642	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5643	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5644	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4391	5645	else
4392		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4393		- GrafreeD.clipboard.get(0).parent = keepparent;
	5646	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5647	+ Grafreed.clipboard.get(0).parent = keepparent;
4394	5648	}
4395	5649
	5650	+ Globals.REPLACEONMAKE = keep;
4396	5651	ResetModel();
4397	5652	refreshContents();
4398	5653	}
4399	5654
4400		- void pasteInto(boolean copyit)
	5655	+ void pasteInto(boolean copyit, boolean clone)
4401	5656	{
4402	5657	// if (GrafreeD.clipboard == null)
4403	5658	// return;
..	..	@@ -4426,15 +5681,22 @@
4426	5681	if (copyit)
4427	5682	{
4428	5683	// paste(false);
4429		- CloneClipboard(false); // sept 2014
	5684	+ if (clone)
	5685	+ {
	5686	+ CloneClipboard(false); // sept 2014
	5687	+ }
	5688	+ else
	5689	+ {
	5690	+ paste(false);
	5691	+ }
4430	5692	}
4431	5693	else
4432	5694	{
4433	5695	boolean first = true;
4434	5696
4435		- if (GrafreeD.clipboardIsTempGroup)
	5697	+ if (Grafreed.clipboardIsTempGroup)
4436	5698	{
4437		- Composite temp = (Composite)GrafreeD.clipboard;
	5699	+ Composite temp = (Composite)Grafreed.clipboard;
4438	5700	Object3D copy;
4439	5701	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4440	5702	{
..	..	@@ -4444,7 +5706,7 @@
4444	5706	}
4445	5707	} else
4446	5708	{
4447		- linkSomething(GrafreeD.clipboard); //.get(0));
	5709	+ linkSomething(Grafreed.clipboard); //.get(0));
4448	5710	}
4449	5711	}
4450	5712	}
..	..	@@ -4521,6 +5783,10 @@
4521	5783
4522	5784	void group(Object3D csg, boolean grab)
4523	5785	{
	5786	+ if (Globals.REPLACEONMAKE)
	5787	+ Save();
	5788	+ boolean keep = Globals.REPLACEONMAKE;
	5789	+ Globals.REPLACEONMAKE = false;
4524	5790	if (//false) // why??
4525	5791	!group.selection.isEmpty())
4526	5792	{
..	..	@@ -4634,10 +5900,15 @@
4634	5900	//node.add(csg);
4635	5901	//makeSomething(node);
4636	5902	makeSomething(csg);
	5903	+ Globals.REPLACEONMAKE = keep;
4637	5904	}
4638	5905
4639	5906	void Ungroup(Object3D g)
4640	5907	{
	5908	+ if (Globals.REPLACEONMAKE)
	5909	+ Save();
	5910	+ boolean keep = Globals.REPLACEONMAKE;
	5911	+ Globals.REPLACEONMAKE = false;
4641	5912	if (g instanceof HiddenObject)
4642	5913	{
4643	5914	HiddenObject h = (HiddenObject) g;
..	..	@@ -4654,6 +5925,7 @@
4654	5925	objEditor.makeSomething(g.get(i), false);
4655	5926	}
4656	5927	}
	5928	+ Globals.REPLACEONMAKE = keep;
4657	5929	}
4658	5930
4659	5931	void ungroup()
..	..	@@ -4849,21 +6121,6 @@
4849	6121	}
4850	6122	*/
4851	6123
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	6124	/*
4868	6125	public void Callback(Object obj)
4869	6126	{
..	..	@@ -4887,26 +6144,9 @@
4887	6144	}
4888	6145	*/
4889	6146
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	6147	String GetFile(String dialogName)
4908	6148	{
4909		- if (GrafreeD.standAlone)
	6149	+ if (Grafreed.standAlone)
4910	6150	{
4911	6151	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4912	6152	browser.show();
..	..	@@ -4970,10 +6210,48 @@
4970	6210	cButton flashSelectionButton;
4971	6211	cButton editButton;
4972	6212	cButton uneditButton;
	6213	+ JCheckBox allParamsButton;
4973	6214	cButton clearpanelButton;
4974		- cButton allParamsButton;
4975	6215	cButton unselectButton;
4976	6216
	6217	+ cButton restoreCameraButton;
	6218	+
	6219	+ cButton oneStepButton;
	6220	+
	6221	+ cButton groupButton;
	6222	+ cButton ungroupButton;
	6223	+ cButton compositeButton;
	6224	+ cButton switchButton;
	6225	+ cButton loopButton;
	6226	+ cButton textureButton;
	6227	+
	6228	+ cButton skybox1Button;
	6229	+ cButton skybox2Button;
	6230	+ cButton skybox3Button;
	6231	+ cButton skybox4Button;
	6232	+ cButton skybox5Button;
	6233	+ cButton skybox6Button;
	6234	+ cButton skybox7Button;
	6235	+
	6236	+ cButton skybox11Button;
	6237	+ cButton skybox12Button;
	6238	+ cButton skybox13Button;
	6239	+ cButton skybox14Button;
	6240	+ cButton skybox15Button;
	6241	+ cButton skybox16Button;
	6242	+ cButton skybox17Button;
	6243	+
	6244	+ cButton gridButton;
	6245	+ cButton boxButton;
	6246	+ cButton sphereButton;
	6247	+ cButton coneButton;
	6248	+ cButton torusButton;
	6249	+ cButton superButton;
	6250	+ cButton kleinButton;
	6251	+ cButton particlesButton;
	6252	+ cButton overlayButton;
	6253	+ cButton lightButton;
	6254	+
4977	6255	cButton screenfitButton;
4978	6256	cButton screenfitpointButton;
4979	6257	cButton snapobjectButton;
..	..	@@ -4985,14 +6263,6 @@
4985	6263
4986	6264	cButton setsupportButton;
4987	6265
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	6266	//
4997	6267	//Composite
4998	6268	Object3D // to do !!
..	..	@@ -5002,10 +6272,12 @@
5002	6272	//JTree jTree;
5003	6273	private MenuItem lookAtItem;
5004	6274	private MenuItem lookFromItem;
5005		- private MenuItem switchItem;
5006		- private MenuItem cutItem;
5007		- private MenuItem duplicateItem;
5008		- private MenuItem cloneItem;
	6275	+ private MenuItem switchViewItem;
	6276	+ private JMenuItem cutItem;
	6277	+ private MenuItem undoItem;
	6278	+ private MenuItem redoItem;
	6279	+ private JMenuItem duplicateItem;
	6280	+ private JMenuItem cloneItem;
5009	6281	private MenuItem cloneSupportItem;
5010	6282	private MenuItem overwriteGeoItem;
5011	6283	private MenuItem overwriteMatItem;
..	..	@@ -5017,7 +6289,7 @@
5017	6289	private MenuItem linkverticesItem;
5018	6290	private MenuItem relinkverticesItem;
5019	6291	private MenuItem setMasterItem;
5020		- private MenuItem resetMeshItem;
	6292	+ private MenuItem resetAllItem;
5021	6293	private MenuItem stepAllItem;
5022	6294	private MenuItem revertMeshItem;
5023	6295	private MenuItem poseMeshItem;
..	..	@@ -5026,12 +6298,13 @@
5026	6298	private MenuItem cloneGeometriesItem;
5027	6299	private MenuItem shareGeometriesItem;
5028	6300	private MenuItem mergeGeometriesItem;
5029		- private MenuItem copyItem;
	6301	+ private JMenuItem copyItem;
5030	6302	private MenuItem pasteItem;
5031		- private MenuItem pasteLinkItem;
5032		- private MenuItem pasteCloneItem;
5033		- private MenuItem pasteExpandItem;
5034		- private MenuItem clearItem;
	6303	+ private JMenuItem pasteIntoItem;
	6304	+ private JMenuItem pasteLinkItem;
	6305	+ private JMenuItem pasteCloneItem;
	6306	+ private JMenuItem pasteExpandItem;
	6307	+ private JMenuItem deleteItem;
5035	6308	private MenuItem clearAllItem;
5036	6309	private MenuItem genUVItem;
5037	6310	private MenuItem genNormalsMESHItem;
..	..	@@ -5066,6 +6339,10 @@
5066	6339	private MenuItem showleavesItem;
5067	6340	private MenuItem markleavesItem;
5068	6341	private MenuItem unmarkleavesItem;
	6342	+ private MenuItem rewindleavesItem;
	6343	+ private MenuItem unrewindleavesItem;
	6344	+ private MenuItem randomleavesItem;
	6345	+ private MenuItem unrandomleavesItem;
5069	6346
5070	6347	private MenuItem flipVItem;
5071	6348	private MenuItem unflipVItem;
..	..	@@ -5077,15 +6354,17 @@
5077	6354	private MenuItem panoTexturesItem;
5078	6355
5079	6356	private MenuItem resetCentroidItem;
5080		- private MenuItem transformgeometryItem;
	6357	+ private MenuItem resetCentroidXZItem;
5081	6358	private MenuItem resetTransformItem;
	6359	+ private MenuItem transformGeometryItem;
	6360	+ private MenuItem transformChildrenItem;
5082	6361	private MenuItem hideItem;
5083		- private MenuItem grabItem;
	6362	+ private JMenuItem grabItem;
5084	6363	private MenuItem backItem;
5085	6364	private MenuItem frontItem;
5086	6365	private MenuItem cameraItem;
5087	6366	private MenuItem compositeItem;
5088		- private MenuItem randomItem;
	6367	+ private MenuItem switchItem;
5089	6368	private MenuItem physicsItem;
5090	6369	private MenuItem frameselectorItem;
5091	6370	private MenuItem scriptNodeItem;
..	..	@@ -5093,7 +6372,7 @@
5093	6372	private MenuItem switchTransfoItem;
5094	6373	private MenuItem morphItem;
5095	6374	private MenuItem linkerItem;
5096		- private MenuItem ungroupItem;
	6375	+ private JMenuItem ungroupItem;
5097	6376	private MenuItem editItem;
5098	6377	private MenuItem openWindowItem;
5099	6378	private MenuItem editLeafItem;
..	..	@@ -5109,6 +6388,8 @@
5109	6388	private MenuItem attachBumpItem;
5110	6389	private MenuItem detachBumpItem;
5111	6390	private MenuItem pigmentBumpItem;
	6391	+ private MenuItem embedTexturesItem;
	6392	+ private MenuItem deEmbedTexturesItem;
5112	6393
5113	6394	private MenuItem particleItem;
5114	6395	private MenuItem ragdollItem;
..	..	@@ -5125,7 +6406,7 @@
5125	6406	private MenuItem blobItem;
5126	6407	private MenuItem latheItem;
5127	6408	private MenuItem bezierItem;
5128		- private MenuItem checkerItem;
	6409	+ private MenuItem overlayItem;
5129	6410	private MenuItem meshItem;
5130	6411	// private MenuItem meshGroupItem;
5131	6412	private MenuItem springItem;
..	..	@@ -5147,11 +6428,6 @@
5147	6428	private MenuItem doubleItem;
5148	6429	private MenuItem tripleItem;
5149	6430
5150		- private MenuItem importGFDItem;
5151		- private MenuItem importVRMLX3DItem;
5152		- private MenuItem import3DSItem;
5153		- private MenuItem importOBJItem;
5154		-
5155	6431	private MenuItem computeAOItem;
5156	6432	private MenuItem recompileItem;
5157	6433	private MenuItem editScriptItem;
..	..	@@ -5161,4 +6437,8 @@
5161	6437	private MenuItem analyzeItem;
5162	6438	private MenuItem dumpItem;
5163	6439	//boolean freezemodel = false;
	6440	+
	6441	+ Menu cameraMenu;
	6442	+ MenuItem editCameraItem;
	6443	+ MenuItem restoreCameraItem;
5164	6444	}