~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -16,6 +16,7 @@
16	16	//import buoy.widget.BFileChooser;
17	17
18	18	class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
	19	+ Grafreed.iResourceCallBack,
19	20	ObjectUI,
20	21	Runnable,
21	22	ActionListener,
..	..	@@ -23,6 +24,351 @@
23	24	DragGestureListener, DragSourceListener, DropTargetListener,
24	25	ItemListener // ListSelectionListener
25	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);
	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", "rgb", 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	+ //cameraView.envyoff = false;
	334	+ group.skyboxname = skybox;
	335	+ group.skyboxext = "jpg";
	336	+ cameraView.repaint();
	337	+ }
	338	+
	339	+ public void CreateSkyboxPanel(cGridBag skyboxPanel)
	340	+ {
	341	+ JTabbedPane skyboxpane = new JTabbedPane();
	342	+
	343	+ AddSkyboxTab0(skyboxpane);
	344	+ AddSkyboxTab1(skyboxpane);
	345	+ AddSkyboxTab2(skyboxpane);
	346	+ AddSkyboxTab3(skyboxpane);
	347	+
	348	+ skyboxPanel.add(skyboxpane);
	349	+ }
	350	+
	351	+ public void ChangeTexture(String texture)
	352	+ {
	353	+ for (int i=0; i<group.selection.size(); i++)
	354	+ {
	355	+ Object3D obj = group.selection.get(i);
	356	+ obj.SetPigmentTexture("@" + texture);
	357	+ }
	358	+
	359	+ refreshContents();
	360	+ }
	361	+
	362	+ public void Show3DView()
	363	+ {
	364	+ // bug
	365	+ //gridPanel.setDividerLocation(1.0);
	366	+ //bigPanel.setDividerLocation(0.0);
	367	+ bigThree.ClearUI();
	368	+ bigThree.add(centralPanel);
	369	+ bigThree.FlushUI();
	370	+ }
	371	+
26	372	//ObjEditor objEditor;
27	373	public void closeUI2()
28	374	{
..	..	@@ -60,6 +406,14 @@
60	406	this.copy = this.group = group;
61	407	//selectees = this.group.selectees;
62	408
	409	+ if (copy.versionlist == null)
	410	+ {
	411	+ copy.versionlist = new Object3D[100];
	412	+ copy.versionindex = -1;
	413	+
	414	+ Save(true);
	415	+ }
	416	+
63	417	if(ui)
64	418	SetupUI(objEditor);
65	419	}
..	..	@@ -74,16 +428,28 @@
74	428	this.copy = this.group = copy;
75	429	//selectees = this.group.selectees;
76	430
77		- SetupMenu2(objEditor);
	431	+ SetupMenu2(this); //objEditor);
78	432	SetupUI2(objEditor);
79	433	objEditor.SetupUI(true);
80	434	SetupViews(objEditor);
81	435
82	436	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	437	+
	438	+ if (copy.versionlist == null)
	439	+ {
	440	+ copy.versionlist = new Object3D[100];
	441	+ copy.versionindex = -1;
	442	+
	443	+ Save(true);
	444	+ }
83	445	}
84	446
85	447	void CloneSelection(boolean supports)
86	448	{
	449	+ if (Globals.REPLACEONMAKE)
	450	+ Save();
	451	+ boolean keep = Globals.REPLACEONMAKE;
	452	+ Globals.REPLACEONMAKE = false;
87	453	// Object3D keep = GrafreeD.clipboard;
88	454	//Object3D obj;
89	455	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,18 +460,19 @@
94	460
95	461	makeSomething(clone, i==group.selection.size()-1);
96	462	}
	463	+ Globals.REPLACEONMAKE = keep;
97	464	}
98	465
99	466	void CloneClipboard(boolean supports)
100	467	{
101		- assert(GrafreeD.clipboard.parent == null);
102		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
103		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
104		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
105		- makeSomething(CloneObject(GrafreeD.clipboard.get(0), false));
	468	+ assert(Grafreed.clipboard.parent == null);
	469	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	470	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	471	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	472	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
106	473	else
107		- makeSomething(CloneObject(GrafreeD.clipboard, false));
108		- GrafreeD.clipboard.get(0).parent = keepparent;
	474	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	475	+ Grafreed.clipboard.get(0).parent = keepparent;
109	476	}
110	477
111	478	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -119,7 +486,7 @@
119	486	// obj.support = null;
120	487	if (!supports)
121	488	obj.SaveSupports();
122		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	489	+ Object3D clone = (Object3D)Grafreed.clone(obj);
123	490	obj.parent = parent;
124	491	// obj.support = support;
125	492	// clone.support = support; // aout 2013
..	..	@@ -148,28 +515,21 @@
148	515
149	516	//JTextField nameField;
150	517
151		- void SetupMenu2(ObjEditor oe)
	518	+ void SetupMenu2(GroupEditor oe)
152	519	{
153		- if (Globals.ADVANCED)
154		- {
155		- oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
156		- //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
157		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
158		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
159		- oe.cameraMenu.add("-");
160		- openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
161		- openWindowItem.addActionListener(this);
162		- editLeafItem.addActionListener(this);
163		- lookAtItem.addActionListener(this);
164		- //lookFromItem.addActinoListener(this);
165		- //switchItem.addActionListener(this);
166		- }
167		-
	520	+ oe.jTree = new cTree();
	521	+
168	522	Menu menu;
169	523	oe.menuBar.add(menu = new Menu("Edit"));
170	524	//editItem = menu.add(new MenuItem("Edit"));
171	525	//editItem.addActionListener(this);
172		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	526	+
	527	+// undoItem = menu.add(new MenuItem("Undo"));
	528	+// undoItem.addActionListener(this);
	529	+// redoItem = menu.add(new MenuItem("Redo"));
	530	+// redoItem.addActionListener(this);
	531	+// menu.add("-");
	532	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
173	533	duplicateItem.addActionListener(this);
174	534	cloneItem = menu.add(new MenuItem("Clone"));
175	535	cloneItem.addActionListener(this);
..	..	@@ -185,7 +545,6 @@
185	545	copyItem.addActionListener(this);
186	546	pasteItem = menu.add(new MenuItem("Paste"));
187	547	pasteItem.addActionListener(this);
188		- menu.add("-");
189	548
190	549	menu.add("-");
191	550	pasteIntoItem = menu.add(new MenuItem("Paste into"));
..	..	@@ -197,8 +556,8 @@
197	556	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
198	557	// pasteExpandItem.addActionListener(this);
199	558	menu.add("-");
200		- clearItem = menu.add(new MenuItem("Clear"));
201		- clearItem.addActionListener(this);
	559	+ deleteItem = menu.add(new MenuItem("Delete"));
	560	+ deleteItem.addActionListener(this);
202	561
203	562	if (Globals.ADVANCED)
204	563	{
..	..	@@ -206,14 +565,95 @@
206	565	clearAllItem = menu.add(new MenuItem("Clear All"));
207	566	clearAllItem.addActionListener(this);
208	567	}
	568	+
	569	+ menuBar.add(cameraMenu = new Menu("View"));
	570	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	571	+ //zBufferItem.addActionListener(this);
	572	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	573	+ //normalLensItem.addActionListener(this);
	574	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	575	+ restoreCameraItem.addActionListener(this);
	576	+
	577	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	578	+// toggleFullScreenItem.addItemListener(this);
	579	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	580	+// cameraMenu.add("-");
	581	+//
	582	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	583	+// toggleTextureItem.addItemListener(this);
	584	+// toggleTextureItem.setState(CameraPane.textureon);
	585	+//
	586	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	587	+// toggleSwitchItem.addItemListener(this);
	588	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	589	+
	590	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	591	+ toggleHandleItem.addItemListener(this);
	592	+ toggleHandleItem.setState(CameraPane.HANDLES);
	593	+
	594	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	595	+ togglePaintItem.addItemListener(this);
	596	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	597	+
	598	+ if (Globals.ADVANCED)
	599	+ {
	600	+ cameraMenu.add("-");
	601	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	602	+ toggleLiveItem.addItemListener(this);
	603	+ toggleLiveItem.setState(Globals.isLIVE());
209	604
	605	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	606	+ stepItem.addActionListener(this);
	607	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	608	+ // toggleDLItem.addItemListener(this);
	609	+ // toggleDLItem.setState(false);
	610	+
	611	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	612	+ toggleRenderItem.addItemListener(this);
	613	+ toggleRenderItem.setState(!CameraPane.frozen);
	614	+
	615	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	616	+ toggleDebugItem.addItemListener(this);
	617	+ toggleDebugItem.setState(Globals.DEBUG);
	618	+
	619	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	620	+ toggleFrustumItem.addItemListener(this);
	621	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	622	+
	623	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	624	+ toggleFootContactItem.addItemListener(this);
	625	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	626	+
	627	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	628	+ toggleTimelineItem.addItemListener(this);
	629	+ }
	630	+
	631	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	632	+// toggleRootItem.addItemListener(this);
	633	+// toggleRootItem.setState(false);
	634	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	635	+// animationItem.addItemListener(this);
	636	+// animationItem.setState(CameraPane.ANIMATION);
	637	+ cameraMenu.add("-");
	638	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	639	+ editCameraItem.addActionListener(this);
	640	+
	641	+ if (Globals.ADVANCED)
	642	+ {
	643	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	644	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	645	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	646	+ oe.cameraMenu.add("-");
	647	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	648	+ openWindowItem.addActionListener(this);
	649	+ lookAtItem.addActionListener(this);
	650	+ //lookFromItem.addActinoListener(this);
	651	+ //switchViewItem.addActionListener(this);
	652	+ }
	653	+
210	654	oe.menuBar.add(menu = new Menu("Setting"));
211	655	if (Globals.ADVANCED)
212	656	{
213		- resetMeshItem = menu.add(new MenuItem("Reset All"));
214		- resetMeshItem.addActionListener(this);
215		- stepAllItem = menu.add(new MenuItem("Step All"));
216		- stepAllItem.addActionListener(this);
217	657	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
218	658	revertMeshItem.addActionListener(this);
219	659	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
..	..	@@ -253,21 +693,29 @@
253	693	}
254	694
255	695	oe.menuBar.add(menu = new Menu("Group"));
256		- grabItem = menu.add(new MenuItem("Grab"));
257		- grabItem.addActionListener(this);
	696	+// grabItem = menu.add(new MenuItem("Grab"));
	697	+// grabItem.addActionListener(this);
258	698	backItem = menu.add(new MenuItem("Back"));
259	699	backItem.addActionListener(this);
260	700	frontItem = menu.add(new MenuItem("Front"));
261	701	frontItem.addActionListener(this);
262		- compositeItem = menu.add(new MenuItem("Composite"));
263		- compositeItem.addActionListener(this);
	702	+// compositeItem = menu.add(new MenuItem("Composite"));
	703	+// compositeItem.addActionListener(this);
	704	+
	705	+ if (Globals.ADVANCED)
	706	+ {
264	707	hideItem = menu.add(new MenuItem("Hidden Group"));
265	708	hideItem.addActionListener(this);
	709	+ }
266	710	ungroupItem = menu.add(new MenuItem("Ungroup"));
267	711	ungroupItem.addActionListener(this);
268		- menu.add("-");
269		- randomItem = menu.add(new MenuItem("Switch node"));
270		- randomItem.addActionListener(this);
	712	+
	713	+// menu.add("-");
	714	+//
	715	+// switchItem = menu.add(new MenuItem("Switch node"));
	716	+// switchItem.addActionListener(this);
	717	+ if (Globals.ADVANCED)
	718	+ {
271	719	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
272	720	switchGeoItem.addActionListener(this);
273	721	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -275,8 +723,6 @@
275	723	morphItem = menu.add(new MenuItem("Morph Group"));
276	724	morphItem.addActionListener(this);
277	725
278		- if (Globals.ADVANCED)
279		- {
280	726	menu.add("-");
281	727	physicsItem = menu.add(new MenuItem("Physics"));
282	728	physicsItem.addActionListener(this);
..	..	@@ -284,30 +730,29 @@
284	730	frameselectorItem.addActionListener(this);
285	731	scriptNodeItem = menu.add(new MenuItem("Script Node"));
286	732	scriptNodeItem.addActionListener(this);
287		- cameraItem = menu.add(new MenuItem("Camera"));
288		- cameraItem.addActionListener(this);
289	733	}
290	734
291	735	oe.menuBar.add(menu = new Menu("Object"));
292		- textureItem = menu.add(new MenuItem("Texture"));
293		- textureItem.addActionListener(this);
	736	+// textureItem = menu.add(new MenuItem("Texture"));
	737	+// textureItem.addActionListener(this);
294	738	billboardItem = menu.add(new MenuItem("Billboard"));
295	739	billboardItem.addActionListener(this);
296	740	csgItem = menu.add(new MenuItem("CSG"));
297	741	csgItem.addActionListener(this);
298		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	742	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
299	743	shadowXItem.addActionListener(this);
300		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	744	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
301	745	shadowYItem.addActionListener(this);
302		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	746	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
303	747	shadowZItem.addActionListener(this);
	748	+ attributeItem = menu.add(new MenuItem("Attribute"));
	749	+ attributeItem.addActionListener(this);
	750	+
304	751	if (Globals.ADVANCED)
305	752	{
306	753	menu.add("-");
307	754	linkerItem = menu.add(new MenuItem("Linker"));
308	755	linkerItem.addActionListener(this);
309		- attributeItem = menu.add(new MenuItem("Attribute"));
310		- attributeItem.addActionListener(this);
311	756	templateItem = menu.add(new MenuItem("Template"));
312	757	templateItem.addActionListener(this);
313	758	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -318,8 +763,12 @@
318	763	resetTransformItem.addActionListener(this);
319	764	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
320	765	resetCentroidItem.addActionListener(this);
321		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
322		- transformgeometryItem.addActionListener(this);
	766	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	767	+ resetCentroidXZItem.addActionListener(this);
	768	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	769	+ transformGeometryItem.addActionListener(this);
	770	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	771	+ transformChildrenItem.addActionListener(this);
323	772
324	773	oe.menuBar.add(menu = new Menu("Geometry"));
325	774	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -332,7 +781,7 @@
332	781	genNormalsMESHItem.addActionListener(this);
333	782	if (Globals.ADVANCED)
334	783	{
335		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	784	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
336	785	genNormalsMINEItem.addActionListener(this);
337	786	}
338	787	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -368,6 +817,10 @@
368	817	oe.menuBar.add(menu = new Menu("Attributes"));
369	818	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
370	819	clearMaterialsItem.addActionListener(this);
	820	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	821	+ resetAllItem.addActionListener(this);
	822	+ stepAllItem = menu.add(new MenuItem("Step All"));
	823	+ stepAllItem.addActionListener(this);
371	824	menu.add("-");
372	825	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
373	826	liveleavesItem.addActionListener(this);
..	..	@@ -388,6 +841,14 @@
388	841	markleavesItem.addActionListener(this);
389	842	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
390	843	unmarkleavesItem.addActionListener(this);
	844	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	845	+ rewindleavesItem.addActionListener(this);
	846	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	847	+ unrewindleavesItem.addActionListener(this);
	848	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	849	+ randomleavesItem.addActionListener(this);
	850	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	851	+ unrandomleavesItem.addActionListener(this);
391	852	menu.add("-");
392	853	flipVItem = menu.add(new MenuItem("Flip V"));
393	854	flipVItem.addActionListener(this);
..	..	@@ -413,55 +874,129 @@
413	874	attachBumpItem.addActionListener(this);
414	875	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
415	876	pigmentBumpItem.addActionListener(this);
	877	+ //embedTexturesItem
416	878	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
417	879	detachPigmentItem.addActionListener(this);
418	880	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
419	881	detachBumpItem.addActionListener(this);
	882	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	883	+ embedTexturesItem.addActionListener(this);
	884	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	885	+ deEmbedTexturesItem.addActionListener(this);
420	886	menu.add("-");
421	887	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
422	888	sortbysizeItem.addActionListener(this);
423	889	sortbynameItem = menu.add(new MenuItem("Sort by name"));
424	890	sortbynameItem.addActionListener(this);
	891	+ menu.add("-");
	892	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	893	+ shareGeometriesItem.addActionListener(this);
	894	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	895	+ mergeGeometriesItem.addActionListener(this);
	896	+ menu.add("-");
	897	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	898	+ editLeafItem.addActionListener(this);
425	899	if (Globals.ADVANCED)
426	900	{
427		- menu.add("-");
	901	+ // Pretty much the same as duplicate and clone.
428	902	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
429	903	extractGeometriesItem.addActionListener(this);
430	904	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
431	905	cloneGeometriesItem.addActionListener(this);
432		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
433		- shareGeometriesItem.addActionListener(this);
434		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
435		- mergeGeometriesItem.addActionListener(this);
436	906	}
437	907
438	908	oe.menuBar.add(menu = new Menu("Insert"));
439	909	buildCreateMenu(menu);
440	910
441		- oe.menuBar.add(menu = new Menu("Include"));
442		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
443		- importGFDItem.addActionListener(this);
444		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
445		- importVRMLX3DItem.addActionListener(this);
446		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
447		- importOBJItem.addActionListener(this);
448		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
449		- import3DSItem.addActionListener(this);
450		-
451	911	oe.menuBar.add(menu = new Menu("Tools"));
452	912	buildToolsMenu(menu);
453	913	}
454	914
	915	+ JTabbedPane resourcecontainer;
	916	+ cGridBag currenttab;
	917	+ boolean added; // patch for jar
	918	+
	919	+ int tabcount = 0;
	920	+ int colcount = 0;
	921	+ int rowcount = 0;
	922	+ int texturecount = 0;
	923	+
	924	+ int columns = 5;
	925	+ int rows = 7;
	926	+
	927	+ public void ResourceCallBack(String[] path)
	928	+ {
	929	+// for (int i = 0; i < path.length; i++)
	930	+// System.out.print(path[i] + "/");
	931	+// System.out.println();
	932	+
	933	+ if (//rowcount == 0 \|\|
	934	+ path.length == 1)
	935	+ {
	936	+ currenttab = new cGridBag();
	937	+ added = false;
	938	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	939	+ currenttab.setName(tabname);
	940	+ rowcount = 1;
	941	+ colcount = 0;
	942	+ texturecount = 0;
	943	+ }
	944	+
	945	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	946	+ {
	947	+ if (!added)
	948	+ {
	949	+ added = true;
	950	+ resourcecontainer.add(currenttab);
	951	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	952	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	953	+ }
	954	+
	955	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	956	+
	957	+ if (++colcount >= columns)
	958	+ {
	959	+ colcount = 0;
	960	+ currenttab.Return();
	961	+
	962	+ if (rowcount++ >= rows)
	963	+ {
	964	+ rowcount = 0;
	965	+ }
	966	+ }
	967	+ }
	968	+ else
	969	+ {
	970	+// if (!path[path.length-1].equals("icons"))
	971	+// resourcecontainer.Return();
	972	+ }
	973	+ }
	974	+
	975	+ void CreateTexturePanel(cGridBag container)
	976	+ {
	977	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	978	+ container.add(resourcecontainer);
	979	+
	980	+ Grafreed.ParseResources("textures", this);
	981	+ }
	982	+
455	983	void SetupUI2(ObjEditor oe)
456	984	{
	985	+ // June 2019
	986	+ if (oe == null)
	987	+ {
	988	+ //super.SetupUI2(this);
	989	+ //return;
	990	+ }
	991	+
	992	+ if (copy != group)
	993	+ {
	994	+ //super.SetupUI2(this);
	995	+ }
	996	+
457	997	//new Exception().printStackTrace();
458	998
459	999	oe.radioPanel = new JPanel(new GridBagLayout());
460		- oe.aConstraints.weightx = 1;
461		- oe.aConstraints.weighty = 0;
462		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
463		- oe.aConstraints.gridwidth = 100;
464		- oe.aConstraints.gridheight = 1;
465	1000	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
466	1001
467	1002	oe.buttonGroup = new ButtonGroup();
..	..	@@ -482,97 +1017,262 @@
482	1017	oe.radioPanel.add(dummyButton);
483	1018	oe.buttonGroup.add(dummyButton);
484	1019	*/
	1020	+ cGridBag copyOptionsPanel = new cGridBag();
	1021	+
	1022	+ copyOptionsPanel.preferredHeight = 2;
	1023	+
485	1024	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
486	1025
487		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
488		- liveCB.setToolTipText("Enabled animation");
489		- liveCB.addItemListener(this);
	1026	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1027	+ //minButton.setToolTipText("Minimize window");
	1028	+ //minButton.addActionListener(this);
	1029	+
	1030	+ if (Globals.ADVANCED)
	1031	+ {
	1032	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1033	+// maxButton.setToolTipText("Maximize window");
	1034	+// maxButton.addActionListener(this);
	1035	+ }
	1036	+
	1037	+// cButton gcButton;
	1038	+//
	1039	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1040	+// gcButton.setToolTipText("Garbage collect");
	1041	+// gcButton.addActionListener(new ActionListener()
	1042	+// {
	1043	+// public void actionPerformed(ActionEvent e)
	1044	+// {
	1045	+// System.gc();
	1046	+// }
	1047	+// });
	1048	+
	1049	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1050	+ collapseButton.setToolTipText("Collapse toolbar");
	1051	+ collapseButton.addActionListener(this);
	1052	+
	1053	+ oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1054	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1055	+ maximize3DButton.addActionListener(this);
	1056	+
	1057	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1058	+ twoButton.setToolTipText("Show 3D view only");
	1059	+ twoButton.addActionListener(this);
	1060	+ this.fullscreenLayout = twoButton;
	1061	+
	1062	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1063	+ threeButton.setToolTipText("Show controls and 3D view");
	1064	+ threeButton.addActionListener(this);
	1065	+ if (Globals.ADVANCED)
	1066	+ {
	1067	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1068	+ sixButton.setToolTipText("Show 3D view and controls");
	1069	+ sixButton.addActionListener(this);
	1070	+ }
	1071	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1072	+// sevenButton.setToolTipText("3-column layout");
	1073	+// sevenButton.addActionListener(this);
	1074	+ //
	1075	+
	1076	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1077	+ fullButton.setToolTipText("Full-screen window");
	1078	+ fullButton.addActionListener(this);
	1079	+
	1080	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1081	+ screenfitButton.setToolTipText("Screen fit");
	1082	+ screenfitButton.addActionListener(this);
490	1083
491		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1084	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1085	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1086	+ restoreCameraButton.addActionListener(this);
	1087	+
	1088	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1089	+ saveVersionButton.setToolTipText("Duplicate current version");
	1090	+ saveVersionButton.addActionListener(this);
	1091	+
	1092	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1093	+ deleteVersionButton.setToolTipText("Delete current version");
	1094	+ deleteVersionButton.addActionListener(this);
	1095	+
	1096	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1097	+ previousVersionButton.setToolTipText("Previous version");
	1098	+ previousVersionButton.addActionListener(this);
	1099	+ previousVersionButton.setEnabled(false);
	1100	+
	1101	+ cGridBag updown = new cGridBag().setVertical(true);
	1102	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1103	+ restoreButton.setToolTipText("Undo (restore current version)");
	1104	+ restoreButton.addActionListener(this);
	1105	+ //restoreButton.setEnabled(false);
	1106	+
	1107	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1108	+ replaceButton.setToolTipText("Save (replace current version)");
	1109	+ replaceButton.addActionListener(this);
	1110	+ //replaceButton.setEnabled(false);
	1111	+
	1112	+ copyOptionsPanel.add(updown);
	1113	+
	1114	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1115	+ nextVersionButton.setToolTipText("Next version");
	1116	+ nextVersionButton.addActionListener(this);
	1117	+ nextVersionButton.setEnabled(false);
	1118	+
	1119	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
492	1120	oneStepButton.setToolTipText("Animate one step forward");
493	1121	oneStepButton.addActionListener(this);
494	1122
495		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	1123	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1124	+ liveCB.setToolTipText("Enable animation");
	1125	+ liveCB.addItemListener(this);
	1126	+
	1127	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
496	1128	fastCB.setToolTipText("Fast mode");
497	1129	fastCB.addItemListener(this);
498	1130
499		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
500		- trackCB.setToolTipText("Enable tracking");
501		- trackCB.addItemListener(this);
502		-
503		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
504		- screenfitButton.setToolTipText("Screen fit");
505		- screenfitButton.addActionListener(this);
	1131	+ //oe.toolboxPanel.Return();
	1132	+
	1133	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1134	+// trackCB.setToolTipText("Enable tracking");
	1135	+// trackCB.addItemListener(this);
506	1136
507	1137	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
508	1138	// screenfitpointButton.addActionListener(this);
509	1139
510	1140	if (Globals.ADVANCED)
511	1141	{
512		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1142	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
513	1143	snapobjectButton.addActionListener(this);
514	1144	snapobjectButton.setToolTipText("Snap Object");
	1145	+
	1146	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1147	+ fourButton.addActionListener(this);
	1148	+ fourButton.setToolTipText("Show control panel only");
515	1149	}
516	1150
517		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
518		- flashSelectionButton.setToolTipText("Show selection");
519		- flashSelectionButton.addActionListener(this);
	1151	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
520	1152
521		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
522		-
523		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
524		- twoButton.setToolTipText("Show center view only");
525		- twoButton.addActionListener(this);
526		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
527		- fourButton.addActionListener(this);
528		- fourButton.setToolTipText("Show left panel only");
529		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
530		- sixButton.setToolTipText("2-column layout left");
531		- sixButton.addActionListener(this);
532		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
533		- threeButton.setToolTipText("2-column layout right");
534		- threeButton.addActionListener(this);
535		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
536		- sevenButton.setToolTipText("3-column layout");
537		- sevenButton.addActionListener(this);
538		- //
539	1153
540		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
541		- rootButton.setToolTipText("Edit selection in new tab");
	1154	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1155	+ rootButton.setToolTipText("Open selection in new tab");
542	1156	rootButton.addActionListener(this);
543	1157
544		- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1158	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
545	1159	closeButton.setToolTipText("Close tab");
546	1160	closeButton.addActionListener(this);
547	1161	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
548	1162	//clearButton.addActionListener(this);
549		-
550		- cGridBag commandsPanel = new cGridBag();
	1163	+
	1164	+ cGridBag row1 = new cGridBag();
551	1165
552		- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
553		- editButton.setToolTipText("Edit selection");
	1166	+ // INSERT
	1167	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1168	+ gridButton.setToolTipText("Create ground");
	1169	+ gridButton.addActionListener(this);
	1170	+
	1171	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1172	+ boxButton.setToolTipText("Create box");
	1173	+ boxButton.addActionListener(this);
	1174	+
	1175	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1176	+ sphereButton.setToolTipText("Create sphere");
	1177	+ sphereButton.addActionListener(this);
	1178	+
	1179	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1180	+ coneButton.setToolTipText("Create cone");
	1181	+ coneButton.addActionListener(this);
	1182	+
	1183	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1184	+ torusButton.setToolTipText("Create torus");
	1185	+ torusButton.addActionListener(this);
	1186	+
	1187	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1188	+ superButton.setToolTipText("Create superellipsoid");
	1189	+ superButton.addActionListener(this);
	1190	+
	1191	+ if (Globals.ADVANCED)
	1192	+ {
	1193	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1194	+ kleinButton.setToolTipText("Create Klein bottle");
	1195	+ kleinButton.addActionListener(this);
	1196	+ }
	1197	+
	1198	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1199	+ particlesButton.setToolTipText("Create particle system");
	1200	+ particlesButton.addActionListener(this);
	1201	+
	1202	+ oe.toolboxPanel.add(row1);
	1203	+
	1204	+ cGridBag row2 = new cGridBag();
	1205	+
	1206	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1207	+ groupButton.setToolTipText("Create group");
	1208	+ groupButton.addActionListener(this);
	1209	+
	1210	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1211	+ compositeButton.setToolTipText("Create composite");
	1212	+ compositeButton.addActionListener(this);
	1213	+
	1214	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1215	+ switchButton.setToolTipText("Create item switcher");
	1216	+ switchButton.addActionListener(this);
	1217	+
	1218	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1219	+ loopButton.setToolTipText("Create loop");
	1220	+ loopButton.addActionListener(this);
	1221	+
	1222	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1223	+ textureButton.setToolTipText("Create texture");
	1224	+ textureButton.addActionListener(this);
	1225	+
	1226	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1227	+ overlayButton.setToolTipText("Create overlay");
	1228	+ overlayButton.addActionListener(this);
	1229	+
	1230	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1231	+ lightButton.setToolTipText("Create light");
	1232	+ lightButton.addActionListener(this);
	1233	+
	1234	+ oe.toolboxPanel.add(row2);
	1235	+
	1236	+ cGridBag textures = new cGridBag();
	1237	+
	1238	+ CreateTexturePanel(textures);
	1239	+
	1240	+ oe.toolboxPanel.add(textures);
	1241	+
	1242	+ textures.preferredHeight = 100;
	1243	+
	1244	+ CreateSkyboxPanel(oe.skyboxPanel);
	1245	+
	1246	+ // EDIT panel
	1247	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1248	+ editButton.setToolTipText("Pin selection controls");
554	1249	editButton.addActionListener(this);
555	1250
556		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
557		- uneditButton.setToolTipText("Unedit selection");
	1251	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1252	+ uneditButton.setToolTipText("Unpin and remove selection controls");
558	1253	uneditButton.addActionListener(this);
559	1254
560		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
561		- allParamsButton.setToolTipText("Edit all params");
	1255	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1256	+ allParamsButton.setToolTipText("Show all controls");
562	1257	allParamsButton.addActionListener(this);
563	1258
564		- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
565		- clearPanelButton.setToolTipText("Clear edit panel");
	1259	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1260	+ clearPanelButton.setToolTipText("Clear all controls");
566	1261	clearPanelButton.addActionListener(this);
567	1262
568		- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
569		- unselectButton.setToolTipText("Unselect");
570		- unselectButton.addActionListener(this);
	1263	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1264	+ //unselectButton.setToolTipText("Unselect");
	1265	+ //unselectButton.addActionListener(this);
571	1266
572		- commandsPanel.preferredHeight = 1;
	1267	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1268	+ flashSelectionButton.setToolTipText("Highlight selection");
	1269	+ flashSelectionButton.addActionListener(this);
573	1270
574		- oe.treePanel.add(commandsPanel);
575		- oe.treePanel.Return();
	1271	+ editCommandsPanel.preferredHeight = 1;
	1272	+
	1273	+ SetPinStates(false);
	1274	+// oe.treePanel.add(commandsPanel);
	1275	+// oe.treePanel.Return();
576	1276
577	1277	// oe.aConstraints.gridx += 1;
578	1278	// oe.aConstraints.weighty = 0;
..	..	@@ -589,32 +1289,20 @@
589	1289
590	1290	JScrollPane jSP;
591	1291	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
592		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1292	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
593	1293	ResetModel();
594	1294
595	1295	oe.treePanel.add(jSPPanel);
596	1296	oe.treePanel.Return();
597	1297
598		- cGridBag copyOptionsPanel = new cGridBag();
599		-
600		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
601		- colorCB.setToolTipText("Copy color when dropped");
602		- colorCB.addItemListener(this);
603		-
604		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
605		- materialCB.setToolTipText("Copy material when dropped");
606		- materialCB.addItemListener(this);
607		-
608		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
609		- textureCB.setToolTipText("Copy texture when dropped");
610		- textureCB.addItemListener(this);
611		-
612		- copyOptionsPanel.preferredHeight = 1;
613	1298	oe.treePanel.add(copyOptionsPanel);
614	1299	oe.treePanel.Return();
	1300	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1301	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1302	+ sliderPane.preferredHeight = 1;
615	1303
616		-// mainPanel.setDividerLocation(0.5); //1.0);
617		-// mainPanel.setResizeWeight(0.5);
	1304	+// mainPanel.setDividerLocation(0.1); //1.0);
	1305	+ mainPanel.setResizeWeight(0.4);
618	1306
619	1307	//jList.addListSelectionListener(this);
620	1308	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -622,7 +1310,7 @@
622	1310	//jTree.setEditable(true);
623	1311	oe.jTree.setDragEnabled(true);
624	1312	//jTree.setPreferredSize(new Dimension(10,10));
625		- jSP.setPreferredSize(new Dimension(100,200));
	1313	+ //jSP.setPreferredSize(new Dimension(100,200));
626	1314
627	1315	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
628	1316
..	..	@@ -634,29 +1322,49 @@
634	1322	dgr.addDragGestureListener(this);
635	1323	}catch(Exception e) {}
636	1324	*/
637		- radio.layout = sevenButton;
	1325	+ radio.layout = threeButton; // sixButton;
638	1326	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
639	1327	}
640	1328
641	1329	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
642	1330	{
	1331	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1332	+ colorCB.setToolTipText("Copy color when dropped");
	1333	+ colorCB.addItemListener(this);
	1334	+
	1335	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1336	+ materialCB.setToolTipText("Copy material when dropped");
	1337	+ materialCB.addItemListener(this);
	1338	+
	1339	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1340	+ textureCB.setToolTipText("Copy texture when dropped");
	1341	+ textureCB.addItemListener(this);
	1342	+
	1343	+ panel.Return();
	1344	+
643	1345	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
644	1346	boxCB.setToolTipText("Display bounding boxes");
645	1347	boxCB.addItemListener(this);
646	1348
647	1349	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
648		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1350	+ zoomBoxCB.setToolTipText("Display only for wheel");
649	1351	zoomBoxCB.addItemListener(this);
650	1352
651		- if (Globals.ADVANCED)
	1353	+ if (true) // Globals.ADVANCED)
652	1354	{
653		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
654		- supportCB.setToolTipText("Enable rigging");
655		- supportCB.addItemListener(this);
	1355	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1356	+// supportCB.setToolTipText("Enable rigging");
	1357	+// supportCB.addItemListener(this);
	1358	+
	1359	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1360	+ freezeCB.setToolTipText("Fast moving camera");
	1361	+ freezeCB.addItemListener(this);
656	1362
657	1363	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
658	1364	// localCB.addItemListener(this);
659	1365
	1366	+ panel.Return();
	1367	+
660	1368	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
661	1369	crowdCB.setToolTipText("Used for crowds");
662	1370	crowdCB.addItemListener(this);
..	..	@@ -665,14 +1373,19 @@
665	1373	smoothCB.setToolTipText("Snapping delay");
666	1374	smoothCB.addItemListener(this);
667	1375
668		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
669		- slowCB.setToolTipText("Smooth interpolation");
670		- slowCB.addItemListener(this);
	1376	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1377	+// slowCB.setToolTipText("Smooth interpolation");
	1378	+// slowCB.addItemListener(this);
	1379	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1380	+ minshaderCB.setToolTipText("Minimal fast shader");
	1381	+ minshaderCB.addItemListener(this);
671	1382
672	1383	// constraints.gridy += 1;
673	1384	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
674	1385	// speakerMocapCB.addItemListener(this);
675	1386
	1387	+ panel.Return();
	1388	+
676	1389	if (false)
677	1390	{
678	1391	// handled in scripts
..	..	@@ -687,42 +1400,93 @@
687	1400	//constraints.gridy += 1;
688	1401	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
689	1402	smoothfocusCB.addItemListener(this);
	1403	+ panel.Return();
690	1404	}
691	1405
692	1406	//constraints.gridx += 1;
693	1407	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
694	1408	// debugCB.addItemListener(this);
695	1409
	1410	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1411	+ trackCB.setToolTipText("Enable tracking target");
	1412	+ trackCB.addItemListener(this);
	1413	+
696	1414	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1415	+ oeilCB.setToolTipText("Move camera when tracking");
697	1416	oeilCB.addItemListener(this);
698	1417
	1418	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1419	+ shadowCB.setToolTipText("When live compute shadows");
	1420	+ shadowCB.addItemListener(this);
	1421	+
	1422	+ panel.Return();
	1423	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1424	+ toggleTextureCB.setToolTipText("Load textures");
	1425	+ toggleTextureCB.addItemListener(this);
	1426	+
	1427	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1428	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1429	+ toggleSwitchCB.addItemListener(this);
	1430	+
	1431	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1432	+ autokeepCB.setToolTipText("On structure change");
	1433	+ autokeepCB.addItemListener(this);
	1434	+
	1435	+ panel.Return();
	1436	+ if (Globals.ADVANCED)
	1437	+ {
699	1438	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
700	1439	lookAtCB.setToolTipText("Look-at target");
701	1440	lookAtCB.addItemListener(this);
	1441	+ }
702	1442
703	1443	}
704	1444
705	1445	cGridBag fill = new cGridBag();
706		-
707	1446	fill.preferredHeight = 200;
	1447	+ cGridBag fill2 = new cGridBag();
	1448	+ fill2.preferredHeight = 200;
	1449	+ cGridBag fill3 = new cGridBag();
	1450	+ fill3.preferredHeight = 200;
708	1451
709	1452	panel.add(fill);
	1453	+ panel.add(fill2);
	1454	+ panel.add(fill3);
710	1455
711	1456	}
712	1457
713	1458	void EditObject(Object3D obj)
714	1459	{
	1460	+ assert(obj instanceof Composite);
	1461	+
	1462	+ if (obj.versionlist == null)
	1463	+ {
	1464	+ obj.versionlist = new Object3D[100];
	1465	+ obj.versionindex = -1;
	1466	+ }
	1467	+
715	1468	cRadio radioButton = new cRadio(obj.name);
	1469	+
	1470	+ // June 2019. Patch to avoid bug with transparency.
	1471	+ radioButton.hadMaterial = obj.material != null;
	1472	+ if (!radioButton.hadMaterial)
	1473	+ {
	1474	+ obj.material = new cMaterial();
	1475	+ }
	1476	+
716	1477	radioButton.SetObject(obj);
717		- radioButton.layout = sevenButton;
	1478	+ radioButton.layout = threeButton; // sixButton;
718	1479	radioButton.SetCamera(cameraView.renderCamera, false);
719	1480	radioButton.addActionListener(this);
720	1481	radioPanel.add(radioButton);
721	1482	buttonGroup.add(radioButton);
722	1483	radioButton.doClick();
723	1484	}
	1485	+
724	1486	void SetupViews(ObjEditor oe)
725	1487	{
	1488	+ theFrame = this;
	1489	+
726	1490	oe.SetupViews();
727	1491
728	1492	System.out.println("SetupViews");
..	..	@@ -731,23 +1495,30 @@
731	1495	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
732	1496	}
733	1497
734		- JCheckBox liveCB;
735		- JCheckBox supportCB;
736		- JCheckBox localCB;
737		- JCheckBox crowdCB;
738		- JCheckBox smoothCB;
739		- JCheckBox fastCB;
740		- JCheckBox slowCB;
741		- JCheckBox boxCB;
742		- JCheckBox zoomBoxCB;
743		- JCheckBox trackCB;
744		- JCheckBox smoothfocusCB;
	1498	+ cToggleButton liveCB;
	1499	+ cCheckBox supportCB;
	1500	+ cCheckBox localCB;
	1501	+ cCheckBox crowdCB;
	1502	+ cCheckBox smoothCB;
	1503	+ cCheckBox minshaderCB;
	1504	+
	1505	+ cToggleButton fastCB;
	1506	+ cCheckBox slowCB;
	1507	+ cCheckBox boxCB;
	1508	+ cCheckBox zoomBoxCB;
	1509	+ cCheckBox freezeCB;
	1510	+ //cToggleButton trackCB;
	1511	+ cCheckBox trackCB;
	1512	+ cCheckBox smoothfocusCB;
745	1513	// JCheckBox speakerMocapCB;
746		- JCheckBox speakerCameraCB;
747		- JCheckBox speakerFocusCB;
748		- JCheckBox debugCB;
749		- JCheckBox oeilCB;
750		- JCheckBox lookAtCB;
	1514	+ cCheckBox speakerCameraCB;
	1515	+ cCheckBox speakerFocusCB;
	1516	+ cCheckBox debugCB;
	1517	+
	1518	+ cCheckBox oeilCB;
	1519	+ cCheckBox shadowCB;
	1520	+ cCheckBox autokeepCB;
	1521	+ cCheckBox lookAtCB;
751	1522
752	1523	// static int COLOR = 1;
753	1524	// static int MATERIAL = 2;
..	..	@@ -755,9 +1526,9 @@
755	1526
756	1527	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
757	1528
758		- JCheckBox colorCB;
759		- JCheckBox materialCB;
760		- JCheckBox textureCB;
	1529	+ cCheckBox colorCB;
	1530	+ cCheckBox materialCB;
	1531	+ cCheckBox textureCB;
761	1532
762	1533	public void itemStateChanged(ItemEvent e)
763	1534	{
..	..	@@ -785,6 +1556,7 @@
785	1556	} else if(e.getSource() == liveCB)
786	1557	{
787	1558	cameraView.ToggleLive();
	1559	+ refreshContents(false);
788	1560	}
789	1561	else if(e.getSource() == supportCB)
790	1562	{
..	..	@@ -800,6 +1572,12 @@
800	1572	{
801	1573	cameraView.ToggleInertia();
802	1574	cameraView.repaint();
	1575	+ }
	1576	+ else if(e.getSource() == minshaderCB)
	1577	+ {
	1578	+ Globals.MINSHADER ^= true;
	1579	+ cameraView.programInitialized = false;
	1580	+ cameraView.repaint();
803	1581	}
804	1582	else if(e.getSource() == localCB)
805	1583	{
..	..	@@ -849,6 +1627,18 @@
849	1627	{
850	1628	cameraView.ToggleOeil();
851	1629	}
	1630	+ else if(e.getSource() == shadowCB)
	1631	+ {
	1632	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1633	+ }
	1634	+ else if(e.getSource() == freezeCB)
	1635	+ {
	1636	+ Globals.FREEZEONMOVE ^= true;
	1637	+ }
	1638	+ else if(e.getSource() == autokeepCB)
	1639	+ {
	1640	+ Globals.REPLACEONMAKE ^= true;
	1641	+ }
852	1642	else if(e.getSource() == lookAtCB)
853	1643	{
854	1644	cameraView.ToggleLookAt();
..	..	@@ -865,7 +1655,8 @@
865	1655
866	1656	/**/
867	1657	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
868		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1658	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1659	+ TreePath path = objEditor.jTree.getSelectionPath();
869	1660	if ((path == null) \|\| (path.getPathCount() <= 1)) {
870	1661	// We can't move the root node or an empty selection
871	1662	return;
..	..	@@ -928,8 +1719,6 @@
928	1719	}
929	1720	}
930	1721
931		- String string = (String) object;
932		-
933	1722	System.out.println("Transfer = " + object + "; drop : " + target);
934	1723	// if( object instanceof java.io.File[])
935	1724	// {
..	..	@@ -937,7 +1726,11 @@
937	1726	// objEditor.DropFile((java.io.File[]) object, true);
938	1727	// return;
939	1728	// }
940		- if (string.charAt(0) == '/')
	1729	+
	1730	+ String string = object.toString();
	1731	+
	1732	+ // File path for Mac and Windows
	1733	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
941	1734	{
942	1735	// file(s)
943	1736	String[] names = string.split("\n");
..	..	@@ -964,7 +1757,7 @@
964	1757
965	1758	flashIt = false;
966	1759	CameraPane pane = (CameraPane) target;
967		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1760	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
968	1761	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
969	1762
970	1763	if (group.selection.size() == 1)
..	..	@@ -980,23 +1773,33 @@
980	1773
981	1774	assert target == objEditor.jTree;
982	1775	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1776	+ Object3D destinationLeaf;
983	1777	try {
984		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1778	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
985	1779	} catch (Exception e) {
986	1780	System.out.println("destinationPath : " + destinationPath);
987	1781	return;
988	1782	}
989	1783
990		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1784	+ for (int i=group.selection.size(); --i>=0;)
991	1785	{
	1786	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1787	+
	1788	+ // Cannot move into itself
	1789	+ if (child == destinationLeaf)
	1790	+ return;
	1791	+ }
	1792	+
	1793	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1794	+// {
992	1795	loadClipboard(true);
993	1796	objEditor.jTree.setSelectionPath(destinationPath);
994	1797	pasteInto(false, false);
995		- } else {
996		- loadClipboard(false);
997		- objEditor.jTree.setSelectionPath(destinationPath);
998		- pasteInto(false, false); // true); // ???
999		- }
	1798	+// } else {
	1799	+// loadClipboard(false);
	1800	+// objEditor.jTree.setSelectionPath(destinationPath);
	1801	+// pasteInto(false, false); // true); // ???
	1802	+// }
1000	1803	}
1001	1804	public void dropActionChanged(DropTargetDragEvent dtde)
1002	1805	// Called if the user has modified the current drop gesture
..	..	@@ -1052,7 +1855,12 @@
1052	1855	TreePath path;
1053	1856
1054	1857	public TransferableTreePath(TreePath tp) {
1055		- path = tp;
	1858	+ Object[] objs = new Object[tp.getPathCount()];
	1859	+ for (int i=0; i<objs.length; i++)
	1860	+ {
	1861	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1862	+ }
	1863	+ path = new TreePath(objs);
1056	1864	}
1057	1865
1058	1866	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1101,22 +1909,30 @@
1101	1909	{
1102	1910	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1103	1911	//heightFieldItem.addActionListener(this);
1104		- gridItem = menu.add(new MenuItem("Grid"));
1105		- gridItem.addActionListener(this);
1106		- rectoidItem = menu.add(new MenuItem("Box"));
1107		- rectoidItem.addActionListener(this);
1108		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1109		- ellipsoidItem.addActionListener(this);
1110		- coneItem = menu.add(new MenuItem("Cone"));
1111		- coneItem.addActionListener(this);
1112		- torusItem = menu.add(new MenuItem("Torus"));
1113		- torusItem.addActionListener(this);
1114		- superItem = menu.add(new MenuItem("Superellipsoid"));
1115		- superItem.addActionListener(this);
	1912	+// gridItem = menu.add(new MenuItem("Grid"));
	1913	+// gridItem.addActionListener(this);
	1914	+// rectoidItem = menu.add(new MenuItem("Box"));
	1915	+// rectoidItem.addActionListener(this);
	1916	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1917	+// ellipsoidItem.addActionListener(this);
	1918	+// coneItem = menu.add(new MenuItem("Cone"));
	1919	+// coneItem.addActionListener(this);
	1920	+// torusItem = menu.add(new MenuItem("Torus"));
	1921	+// torusItem.addActionListener(this);
	1922	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1923	+// superItem.addActionListener(this);
	1924	+
	1925	+ cameraItem = menu.add(new MenuItem("Camera"));
	1926	+ cameraItem.addActionListener(this);
	1927	+
	1928	+ if (!Globals.ADVANCED)
	1929	+ {
1116	1930	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1117	1931	kleinItem.addActionListener(this);
1118		- particleItem = menu.add(new MenuItem("Particle system"));
1119		- particleItem.addActionListener(this);
	1932	+ }
	1933	+
	1934	+// particleItem = menu.add(new MenuItem("Particle system"));
	1935	+// particleItem.addActionListener(this);
1120	1936	if (Globals.ADVANCED)
1121	1937	{
1122	1938	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1142,15 +1958,15 @@
1142	1958	}
1143	1959	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1144	1960	bezierItem.addActionListener(this);
1145		- overlayItem = menu.add(new MenuItem("Overlay"));
1146		- overlayItem.addActionListener(this);
1147		- lightItem = menu.add(new MenuItem("Light"));
1148		- lightItem.addActionListener(this);
	1961	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1962	+// overlayItem.addActionListener(this);
	1963	+// lightItem = menu.add(new MenuItem("Light"));
	1964	+// lightItem.addActionListener(this);
1149	1965	menu.add("-");
1150	1966	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1151	1967	//superLoopItem.addActionListener(this);
1152		- loopItem = menu.add(new MenuItem("Loop"));
1153		- loopItem.addActionListener(this);
	1968	+// loopItem = menu.add(new MenuItem("Loop"));
	1969	+// loopItem.addActionListener(this);
1154	1970	doubleItem = menu.add(new MenuItem("Fork"));
1155	1971	doubleItem.addActionListener(this);
1156	1972	if (Globals.ADVANCED)
..	..	@@ -1166,6 +1982,9 @@
1166	1982	animationItem.addItemListener(this);
1167	1983	animationItem.setState(Globals.ANIMATION);
1168	1984
	1985	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1986	+ archiveItem.addActionListener(this);
	1987	+
1169	1988	menu.add("-");
1170	1989	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1171	1990	parseverticesItem.addActionListener(this);
..	..	@@ -1178,6 +1997,8 @@
1178	1997	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1179	1998	reduce34MorphItem.addActionListener(this);
1180	1999	menu.add("-");
	2000	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	2001	+ memoryItem.addActionListener(this);
1181	2002	menu.add(computeAOItem = new MenuItem("Compute AO"));
1182	2003	computeAOItem.addActionListener(this);
1183	2004
..	..	@@ -1186,11 +2007,9 @@
1186	2007	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1187	2008	mirrorItem.addActionListener(this);
1188	2009	menu.add("-");
1189		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1190		- memoryItem.addActionListener(this);
1191	2010	menu.add(analyzeItem = new MenuItem("Analyze"));
1192	2011	analyzeItem.addActionListener(this);
1193		- menu.add(dumpItem = new MenuItem("Dump"));
	2012	+ menu.add(dumpItem = new MenuItem("Print"));
1194	2013	dumpItem.addActionListener(this);
1195	2014	// menu.add(pathItem = new MenuItem("From-to path"));
1196	2015	// pathItem.addActionListener(this);
..	..	@@ -1331,9 +2150,34 @@
1331	2150	shadow.material = new cMaterial(obj.material);
1332	2151	shadow.material.diffuse = 0.0001f;
1333	2152	shadow.material.specular = 0.0001f;
	2153	+ //shadow.projectedVertices[1].x = 300;
1334	2154
1335	2155	makeSomething(shadow);
1336	2156	}
	2157	+
	2158	+ private void ClearUnpinned()
	2159	+ {
	2160	+ //for (Object3D obj : listUI)
	2161	+ for (int i=listUI.size(); --i>=0;)
	2162	+ {
	2163	+ Object3D obj = listUI.elementAt(i);
	2164	+ if (!obj.pinned)
	2165	+ {
	2166	+ obj.CloseUI();
	2167	+ listUI.remove(i);
	2168	+ }
	2169	+ }
	2170	+ }
	2171	+
	2172	+ private void EditElement(Object3D elem, boolean newWindow)
	2173	+ {
	2174	+ // if (!(elem instanceof Composite))
	2175	+ // newWindow = false;
	2176	+ listUI.add(elem);
	2177	+ elem.openEditWindow(this, newWindow); //, false);
	2178	+ System.out.println("edit : " + elem);
	2179	+ elem.editWindow.refreshContents(true); // ? new
	2180	+ }
1337	2181
1338	2182	/**
1339	2183	* applyExample
..	..	@@ -1537,9 +2381,9 @@
1537	2381
1538	2382	void Overwrite(int mask)
1539	2383	{
1540		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2384	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1541	2385	{
1542		- Object3D content = GrafreeD.clipboard.get(0);
	2386	+ Object3D content = Grafreed.clipboard.get(0);
1543	2387
1544	2388	if (content instanceof cGroup && ((cGroup)content).transientlink )
1545	2389	content = ((cGroup)content).get(0);
..	..	@@ -1578,7 +2422,7 @@
1578	2422	{
1579	2423	ScreenFit();
1580	2424	} else
1581		- if (source == switchItem)
	2425	+ if (source == switchViewItem)
1582	2426	{
1583	2427	cVector v1 = new cVector();
1584	2428	cVector v2 = new cVector();
..	..	@@ -1587,11 +2431,11 @@
1587	2431	objEditor.cameraView.renderCamera.setAim(v2, v1);
1588	2432	objEditor.cameraView.repaint();
1589	2433	} else
1590		- if (source == rectoidItem)
	2434	+ if (source == rectoidItem \|\| source == boxButton)
1591	2435	{
1592	2436	makeSomething(new Box());
1593	2437	} else
1594		- if (source == particleItem)
	2438	+ if (source == particleItem \|\| source == particlesButton)
1595	2439	{
1596	2440	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1597	2441	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1670,27 +2514,27 @@
1670	2514
1671	2515	makeSomething(obj);
1672	2516	} else
1673		- if (source == gridItem)
	2517	+ if (source == gridItem \|\| source == gridButton)
1674	2518	{
1675	2519	makeSomething(new Grid());
1676	2520	} else
1677		- if (source == ellipsoidItem)
	2521	+ if (source == ellipsoidItem \|\| source == sphereButton)
1678	2522	{
1679	2523	makeSomething(new Sphere());
1680	2524	} else
1681		- if (source == coneItem)
	2525	+ if (source == coneItem \|\| source == coneButton)
1682	2526	{
1683	2527	makeSomething(new Cone());
1684	2528	} else
1685		- if (source == torusItem)
	2529	+ if (source == torusItem \|\| source == torusButton)
1686	2530	{
1687	2531	makeSomething(new Torus());
1688	2532	} else
1689		- if (source == superItem)
	2533	+ if (source == superItem \|\| source == superButton)
1690	2534	{
1691	2535	makeSomething(new Superellipsoid());
1692	2536	} else
1693		- if (source == kleinItem)
	2537	+ if (source == kleinItem \|\| source == kleinButton)
1694	2538	{
1695	2539	makeSomething(new Klein());
1696	2540	} else
..	..	@@ -1710,7 +2554,7 @@
1710	2554	{
1711	2555	makeSomething(new BezierSurface());
1712	2556	} else
1713		- if (source == overlayItem)
	2557	+ if (source == overlayItem \|\| source == overlayButton)
1714	2558	{
1715	2559	/*
1716	2560	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1758,10 +2602,27 @@
1758	2602	s.setup();
1759	2603	makeSomething(s);
1760	2604	} else
1761		- if (source == lightItem)
	2605	+ if (source == lightItem \|\| source == lightButton)
1762	2606	{
1763	2607	makeSomething(new Light());
1764	2608	} else
	2609	+// if (source == skybox1Button \|\|
	2610	+// source == skybox2Button \|\|
	2611	+// source == skybox3Button \|\|
	2612	+// source == skybox4Button \|\|
	2613	+// source == skybox5Button \|\|
	2614	+// source == skybox6Button \|\|
	2615	+// source == skybox7Button \|\|
	2616	+// source == skybox11Button \|\|
	2617	+// source == skybox12Button \|\|
	2618	+// source == skybox13Button \|\|
	2619	+// source == skybox14Button \|\|
	2620	+// source == skybox15Button \|\|
	2621	+// source == skybox16Button \|\|
	2622	+// source == skybox17Button)
	2623	+// {
	2624	+// ChangeSkybox(source);
	2625	+// } else
1765	2626	if (source == csgItem)
1766	2627	{
1767	2628	group(new CSG());
..	..	@@ -1808,30 +2669,30 @@
1808	2669
1809	2670	group(g);
1810	2671	} else
1811		- if (source == loopItem)
	2672	+ if (source == loopItem \|\| source == loopButton)
1812	2673	{
1813	2674	Composite csg = new GroupLeaf();
1814	2675	csg.count = 5;
1815	2676	group(csg);
1816		- Composite child = new cGroup();
	2677	+ Composite child = new cGroup("Branch");
1817	2678	csg.addChild(child);
1818	2679	child.addChild(csg);
1819	2680	} else
1820	2681	if (source == doubleItem)
1821	2682	{
1822		- Composite csg = new GroupLeaf();
	2683	+ Composite csg = new GroupLeaf("Fork");
1823	2684	csg.count = 5;
1824	2685	group(csg);
1825		- Composite child = new cGroup();
	2686	+ Composite child = new cGroup("Branch A");
1826	2687	csg.addChild(child);
1827	2688	child.addChild(csg);
1828		- child = new cGroup();
	2689	+ child = new cGroup("Branch B");
1829	2690	csg.addChild(child);
1830	2691	child.addChild(csg);
1831	2692	} else
1832	2693	if (source == tripleItem)
1833	2694	{
1834		- Composite csg = new GroupLeaf();
	2695	+ Composite csg = new GroupLeaf("Trident");
1835	2696	csg.count = 4;
1836	2697	group(csg);
1837	2698	Composite child = new cGroup();
..	..	@@ -1844,27 +2705,10 @@
1844	2705	csg.addChild(child);
1845	2706	child.addChild(csg);
1846	2707	} else
1847		-
1848		- if (source == importGFDItem)
1849		- {
1850		- ImportGFD();
1851		- } else
1852		- if (source == importVRMLX3DItem)
1853		- {
1854		- ImportVRMLX3D();
1855		- } else
1856		- if (source == import3DSItem)
1857		- {
1858		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1859		- } else
1860		- if (source == importOBJItem)
1861		- {
1862		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1863		- } else
1864	2708	if (source == computeAOItem)
1865	2709	{
1866	2710	Globals.drawMode = CameraPane.OCCLUSION;
1867		- Globals.theRenderer.repaint();
	2711	+ cameraView.repaint();
1868	2712	} else
1869	2713	if (source == recompileItem)
1870	2714	{
..	..	@@ -1879,7 +2723,7 @@
1879	2723	if (source == invariantsItem)
1880	2724	{
1881	2725	System.out.println("Invariants:");
1882		- GrafreeD.grafreeD.universe.invariants();
	2726	+ Grafreed.grafreed.universe.invariants();
1883	2727	} else
1884	2728	if (source == memoryItem)
1885	2729	{
..	..	@@ -1898,6 +2742,65 @@
1898	2742	{
1899	2743	DumpObject();
1900	2744	} else
	2745	+ if (source == minButton)
	2746	+ {
	2747	+ Minimize();
	2748	+ } else
	2749	+ if (source == maxButton)
	2750	+ {
	2751	+ Maximize();
	2752	+ } else
	2753	+ if (source == fullButton)
	2754	+ {
	2755	+ ToggleFullScreen();
	2756	+ } else
	2757	+ if (source == collapseButton)
	2758	+ {
	2759	+ this.expandedLayout = radio.layout;
	2760	+ CollapseToolbar();
	2761	+ } else
	2762	+ if (source == maximize3DButton)
	2763	+ {
	2764	+ this.expandedLayout = radio.layout;
	2765	+ radio.layout = twoButton;
	2766	+ Show3DView();
	2767	+ CollapseToolbar();
	2768	+ } else
	2769	+ if (source == previousVersionButton)
	2770	+ {
	2771	+ // Go to previous version
	2772	+ //if (!Undo())
	2773	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2774	+ PreviousVersion();
	2775	+ } else
	2776	+ if (source == restoreButton)
	2777	+ {
	2778	+ // Restore current version
	2779	+ Restore();
	2780	+ //restoreButton.setEnabled(false);
	2781	+ } else
	2782	+ if (source == replaceButton)
	2783	+ {
	2784	+ // Overwrite current version
	2785	+ Replace();
	2786	+ //replaceButton.setEnabled(false);
	2787	+ } else
	2788	+ if (source == nextVersionButton)
	2789	+ {
	2790	+ // Go to next version
	2791	+ NextVersion();
	2792	+ } else
	2793	+ if (source == saveVersionButton)
	2794	+ {
	2795	+ // Save a new version
	2796	+ if (!Save(true))
	2797	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2798	+ } else
	2799	+ if (source == deleteVersionButton)
	2800	+ {
	2801	+ // Delete a new version
	2802	+ DeleteVersion();
	2803	+ } else
1901	2804	if (source == oneStepButton)
1902	2805	{
1903	2806	Globals.ONESTEP = true;
..	..	@@ -1905,17 +2808,14 @@
1905	2808	} else
1906	2809	if (source == screenfitButton)
1907	2810	{
1908		- //Reload(lastConverter, lastFilename, true);
1909	2811	ScreenFit();
1910	2812	} else
1911	2813	if (source == screenfitpointButton)
1912	2814	{
1913		- //Reload(lastConverter, lastFilename, true);
1914	2815	ScreenFitPoint();
1915	2816	} else
1916	2817	if (source == snapobjectButton)
1917	2818	{
1918		- //Reload(lastConverter, lastFilename, true);
1919	2819	SnapObject();
1920	2820	} else
1921	2821	// if (event.getSource() == recompileButton)
..	..	@@ -1952,12 +2852,20 @@
1952	2852	{
1953	2853	loadClipboard(true);
1954	2854	} else
	2855	+ if (source == undoItem)
	2856	+ {
	2857	+ PreviousVersion();
	2858	+ } else
	2859	+ if (source == redoItem)
	2860	+ {
	2861	+ NextVersion();
	2862	+ } else
1955	2863	if (source == duplicateItem)
1956	2864	{
1957		- Object3D keep = GrafreeD.clipboard;
	2865	+ Object3D keep = Grafreed.clipboard;
1958	2866	loadClipboard(false);
1959	2867	paste(false);
1960		- GrafreeD.clipboard = keep;
	2868	+ Grafreed.clipboard = keep;
1961	2869	} else
1962	2870	if (source == cloneItem)
1963	2871	{
..	..	@@ -2177,9 +3085,9 @@
2177	3085	// group.selection.get(0).setMasterThis(content); // should be identity
2178	3086	// refreshContents();
2179	3087	// }
2180		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	3088	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2181	3089	{
2182		- Object3D content = GrafreeD.clipboard.get(0);
	3090	+ Object3D content = Grafreed.clipboard.get(0);
2183	3091
2184	3092	if (content instanceof cGroup && ((cGroup)content).transientlink )
2185	3093	content = ((cGroup)content).get(0);
..	..	@@ -2229,9 +3137,9 @@
2229	3137	} else
2230	3138	if (source == setMasterItem)
2231	3139	{
2232		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	3140	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2233	3141	{
2234		- Object3D content = GrafreeD.clipboard.get(0);
	3142	+ Object3D content = Grafreed.clipboard.get(0);
2235	3143
2236	3144	if (content instanceof cGroup && ((cGroup)content).transientlink )
2237	3145	content = ((cGroup)content).get(0);
..	..	@@ -2244,9 +3152,9 @@
2244	3152	{
2245	3153	if (group.selection.size() == 1)
2246	3154	{
2247		- if (GrafreeD.clipboard.size() == 1)
	3155	+ if (Grafreed.clipboard.size() == 1)
2248	3156	{
2249		- Object3D content = GrafreeD.clipboard.get(0);
	3157	+ Object3D content = Grafreed.clipboard.get(0);
2250	3158
2251	3159	if (content instanceof cGroup && ((cGroup)content).transientlink )
2252	3160	content = ((cGroup)content).get(0);
..	..	@@ -2263,7 +3171,7 @@
2263	3171	{
2264	3172	RevertMeshes();
2265	3173	} else
2266		- if (source == resetMeshItem)
	3174	+ if (source == resetAllItem)
2267	3175	{
2268	3176	ResetAll();
2269	3177	} else
..	..	@@ -2271,7 +3179,7 @@
2271	3179	{
2272	3180	StepAll();
2273	3181	} else
2274		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3182	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2275	3183	{
2276	3184	//int indices[] = jList.getSelectedIndices();
2277	3185	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2283,9 +3191,9 @@
2283	3191	{
2284	3192	ClearSelection(true);
2285	3193	} else
2286		- if (source == grabItem)
	3194	+ if (source == grabItem \|\| source == groupButton)
2287	3195	{
2288		- group(new cGroup(), true);
	3196	+ group(new cGroup(), false); // true);
2289	3197	} else
2290	3198	if (source == hideItem)
2291	3199	{
..	..	@@ -2303,11 +3211,11 @@
2303	3211	{
2304	3212	makeSomething(new Camera());
2305	3213	} else
2306		- if (source == compositeItem)
	3214	+ if (source == compositeItem \|\| source == compositeButton)
2307	3215	{
2308	3216	group(new Composite());
2309	3217	} else
2310		- if (source == randomItem)
	3218	+ if (source == switchItem \|\| source == switchButton)
2311	3219	{
2312	3220	RandomNode random = new RandomNode();
2313	3221	group(random);
..	..	@@ -2409,7 +3317,7 @@
2409	3317	{
2410	3318	group(new cLinker());
2411	3319	} else
2412		- if (source == textureItem)
	3320	+ if (source == textureItem \|\| source == textureButton)
2413	3321	{
2414	3322	group(new TextureNode());
2415	3323	} else
..	..	@@ -2429,17 +3337,30 @@
2429	3337	{
2430	3338	CastShadow(2);
2431	3339	} else
2432		- if (source == ungroupItem)
	3340	+ if (source == ungroupItem \|\| source == ungroupButton)
2433	3341	{
2434		- //ungroup();
	3342	+ boolean hasRoot = false;
	3343	+
2435	3344	for (int i=0; i<group.selection.size(); i++)
2436	3345	{
2437		- Ungroup(group.selection.get(i));
	3346	+ if (group.selection.get(i) == group)
	3347	+ {
	3348	+ hasRoot = true;
	3349	+ break;
	3350	+ }
2438	3351	}
2439	3352
2440		- ClearSelection(false);
2441		-
2442		- refreshContents();
	3353	+ if (!hasRoot)
	3354	+ {
	3355	+ for (int i=0; i<group.selection.size(); i++)
	3356	+ {
	3357	+ Ungroup(group.selection.get(i));
	3358	+ }
	3359	+
	3360	+ ClearSelection(false);
	3361	+
	3362	+ refreshContents();
	3363	+ }
2443	3364	} else
2444	3365	if (source == genUVItem)
2445	3366	{
..	..	@@ -2451,7 +3372,7 @@
2451	3372	} else
2452	3373	if (source == genNormalsMESHItem)
2453	3374	{
2454		- GenNormals(true); // TODO
	3375	+ GenNormalsMESH();
2455	3376	} else
2456	3377	if (source == genNormalsORGANItem)
2457	3378	{
..	..	@@ -2516,6 +3437,22 @@
2516	3437	if (source == unmarkleavesItem)
2517	3438	{
2518	3439	MarkLeaves(false);
	3440	+ } else
	3441	+ if (source == rewindleavesItem)
	3442	+ {
	3443	+ RewindLeaves(true);
	3444	+ } else
	3445	+ if (source == unrewindleavesItem)
	3446	+ {
	3447	+ RewindLeaves(false);
	3448	+ } else
	3449	+ if (source == randomleavesItem)
	3450	+ {
	3451	+ RandomLeaves(true);
	3452	+ } else
	3453	+ if (source == unrandomleavesItem)
	3454	+ {
	3455	+ RandomLeaves(false);
2519	3456	} else
2520	3457	if (source == flipVItem)
2521	3458	{
..	..	@@ -2601,9 +3538,13 @@
2601	3538	{
2602	3539	SmoothMesh();
2603	3540	} else
2604		- if (source == transformgeometryItem)
	3541	+ if (source == transformGeometryItem)
2605	3542	{
2606	3543	TransformGeometry();
	3544	+ } else
	3545	+ if (source == transformChildrenItem)
	3546	+ {
	3547	+ TransformChildren();
2607	3548	} else
2608	3549	if (source == resetTransformItem)
2609	3550	{
..	..	@@ -2611,7 +3552,11 @@
2611	3552	} else
2612	3553	if (source == resetCentroidItem)
2613	3554	{
2614		- ResetCentroid();
	3555	+ ResetCentroid(true);
	3556	+ } else
	3557	+ if (source == resetCentroidXZItem)
	3558	+ {
	3559	+ ResetCentroid(false);
2615	3560	} else
2616	3561	if (source == resetParentItem)
2617	3562	{
..	..	@@ -2716,7 +3661,7 @@
2716	3661	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2717	3662	{
2718	3663	obj = (Object3D)e.nextElement();
2719		- obj.SetBumpTexture(null);
	3664	+ obj.ResetBumpTexture();
2720	3665	}
2721	3666
2722	3667	refreshContents();
..	..	@@ -2732,6 +3677,31 @@
2732	3677
2733	3678	refreshContents();
2734	3679	} else
	3680	+ if (source == embedTexturesItem)
	3681	+ {
	3682	+ Object3D obj;
	3683	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3684	+ {
	3685	+ obj = (Object3D)e.nextElement();
	3686	+ obj.EmbedTextures(true);
	3687	+ }
	3688	+
	3689	+ refreshContents();
	3690	+ } else
	3691	+ if (source == deEmbedTexturesItem)
	3692	+ {
	3693	+ Object3D obj;
	3694	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3695	+ {
	3696	+ obj = (Object3D)e.nextElement();
	3697	+ obj.EmbedTextures(false);
	3698	+ }
	3699	+
	3700	+ CameraPane.texturepigment.clear();
	3701	+ CameraPane.texturebump.clear();
	3702	+
	3703	+ refreshContents();
	3704	+ } else
2735	3705	if (source == flashSelectionButton)
2736	3706	{
2737	3707	CameraPane.flash = true;
..	..	@@ -2743,42 +3713,36 @@
2743	3713	if (source == twoButton)
2744	3714	{
2745	3715	radio.layout = twoButton;
2746		- // bug
2747		- //gridPanel.setDividerLocation(1.0);
2748		- //bigPanel.setDividerLocation(0.0);
2749		-// bigThree.remove(scenePanel);
2750		-// bigThree.remove(centralPanel);
2751		-// bigThree.remove(XYZPanel);
2752		-// aWindowConstraints.gridx = 0;
2753		-// aWindowConstraints.gridy = 0;
2754		-// aWindowConstraints.gridwidth = 1;
2755		-// // aConstraints.gridheight = 3;
2756		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2757		-// aWindowConstraints.weightx = 0;
2758		-// aWindowConstraints.weighty = 1;
2759		-// //bigThree.add(jtp, aWindowConstraints);
2760		-// aWindowConstraints.weightx = 1;
2761		-// aWindowConstraints.gridwidth = 3;
2762		-// // aConstraints.gridheight = 3;
2763		-// aWindowConstraints.gridx = 1;
2764		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
2765		-// bigThree.add(centralPanel, aWindowConstraints);
2766		-// aWindowConstraints.weightx = 0;
2767		-// aWindowConstraints.gridx = 4;
2768		-// aWindowConstraints.gridwidth = 1;
2769		-// // aConstraints.gridheight = 3;
2770		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2771		-// //bigThree.add(XYZPanel, aWindowConstraints);
2772		-// scenePanel.setVisible(false);
2773		-// centralPanel.setVisible(true);
2774		-// XYZPanel.setVisible(false);
2775		- bigThree.ClearUI();
2776		- bigThree.add(centralPanel);
2777		- bigThree.FlushUI();
	3716	+
	3717	+ if (CameraPane.FULLSCREEN)
	3718	+ fullscreenLayout = radio.layout;
	3719	+
	3720	+ Show3DView();
	3721	+
	3722	+ cameraView.requestFocusInWindow();
	3723	+
	3724	+// refreshContents(true);
	3725	+//
	3726	+// try
	3727	+// {
	3728	+// java.awt.Robot bot = new java.awt.Robot();
	3729	+// int mask = InputEvent.BUTTON1_MASK;
	3730	+// bot.mouseMove(100, 100);
	3731	+// bot.mousePress(mask);
	3732	+// bot.mouseRelease(mask);
	3733	+// }
	3734	+// catch (Exception e)
	3735	+// {
	3736	+//
	3737	+// }
	3738	+
2778	3739	} else
2779	3740	if (source == threeButton)
2780	3741	{
2781	3742	radio.layout = threeButton;
	3743	+
	3744	+ if (CameraPane.FULLSCREEN)
	3745	+ fullscreenLayout = radio.layout;
2782	3746
2783	3747	// bigThree.remove(scenePanel);
2784	3748	// bigThree.remove(centralPanel);
..	..	@@ -2808,13 +3772,18 @@
2808	3772	// centralPanel.setVisible(true);
2809	3773	// XYZPanel.setVisible(true);
2810	3774	bigThree.ClearUI();
	3775	+ bigThree.add(scenePanel);
2811	3776	bigThree.add(centralPanel);
2812		- bigThree.add(XYZPanel);
2813	3777	bigThree.FlushUI();
	3778	+
	3779	+ cameraView.requestFocusInWindow();
2814	3780	} else
2815	3781	if (source == fourButton)
2816	3782	{
2817	3783	radio.layout = fourButton;
	3784	+
	3785	+ if (CameraPane.FULLSCREEN)
	3786	+ fullscreenLayout = radio.layout;
2818	3787
2819	3788	// bigThree.remove(scenePanel);
2820	3789	// bigThree.remove(centralPanel);
..	..	@@ -2846,10 +3815,15 @@
2846	3815	bigThree.ClearUI();
2847	3816	bigThree.add(scenePanel);
2848	3817	bigThree.FlushUI();
	3818	+
	3819	+ cameraView.requestFocusInWindow();
2849	3820	} else
2850	3821	if (source == sixButton)
2851	3822	{
2852	3823	radio.layout = sixButton;
	3824	+
	3825	+ if (CameraPane.FULLSCREEN)
	3826	+ fullscreenLayout = radio.layout;
2853	3827
2854	3828	// bigThree.remove(scenePanel);
2855	3829	// bigThree.remove(centralPanel);
..	..	@@ -2879,13 +3853,18 @@
2879	3853	// centralPanel.setVisible(true);
2880	3854	// XYZPanel.setVisible(false);
2881	3855	bigThree.ClearUI();
2882		- bigThree.add(scenePanel);
2883	3856	bigThree.add(centralPanel);
	3857	+ bigThree.add(scenePanel);
2884	3858	bigThree.FlushUI();
	3859	+
	3860	+ cameraView.requestFocusInWindow();
2885	3861	} else
2886	3862	if (source == sevenButton)
2887	3863	{
2888	3864	radio.layout = sevenButton;
	3865	+
	3866	+ if (CameraPane.FULLSCREEN)
	3867	+ fullscreenLayout = radio.layout;
2889	3868
2890	3869	// bigThree.remove(scenePanel);
2891	3870	// bigThree.remove(centralPanel);
..	..	@@ -2919,9 +3898,12 @@
2919	3898	bigThree.add(centralPanel);
2920	3899	bigThree.add(XYZPanel);
2921	3900	bigThree.FlushUI();
	3901	+
	3902	+ cameraView.requestFocusInWindow();
2922	3903	} else
2923	3904	if (source == rootButton)
2924	3905	{
	3906	+ Replace();
2925	3907	Object3D obj;
2926	3908	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2927	3909	{
..	..	@@ -2930,6 +3912,7 @@
2930	3912	EditObject(obj);
2931	3913	}
2932	3914
	3915	+ cameraView.requestFocusInWindow();
2933	3916	refreshContents(true);
2934	3917	} else
2935	3918	if (source == closeButton)
..	..	@@ -2939,22 +3922,37 @@
2939	3922	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2940	3923	{
2941	3924	ab = (cRadio)e.nextElement();
2942		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3925	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2943	3926	{
	3927	+ // Patch to avoid bug with transparency.
	3928	+ if (!ab.hadMaterial)
	3929	+ {
	3930	+ ab.object.material = null;
	3931	+ }
	3932	+
2944	3933	buttonGroup.remove(ab);
2945	3934	radioPanel.remove(ab);
2946	3935
2947		- ab.GetObject().editWindow = null;
	3936	+ //ab.GetObject().editWindow = null;
	3937	+ ab.GetObject().manipWindow = null;
2948	3938	// ab.GetObject().objectUI = null; // ?????????
2949	3939
2950	3940	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2951	3941	break;
2952	3942	}
2953	3943	}
	3944	+
	3945	+ cameraView.requestFocusInWindow();
2954	3946	refreshContents(true);
2955	3947	} else
2956	3948	if (source == editItem \|\| source == editButton)
2957	3949	{
	3950	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3951	+ {
	3952	+ Object3D child = (Object3D)e.nextElement();
	3953	+ child.pinned = true;
	3954	+ }
	3955	+
2958	3956	EditSelection(false);
2959	3957	} else
2960	3958	if (source == uneditButton)
..	..	@@ -2963,11 +3961,12 @@
2963	3961	{
2964	3962	Object3D child = (Object3D)e.nextElement();
2965	3963	if(child.editWindow != null)
2966		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3964	+ child.pinned = false;
2967	3965	child.CloseUI();
2968	3966	listUI.remove(child);
	3967	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2969	3968
2970		- child.editWindow = null; // ???????????
	3969	+ //child.editWindow = null; // ???????????
2971	3970	}
2972	3971	objEditor.ctrlPanel.FlushUI();
2973	3972	//objEditor.jTree.clearSelection();
..	..	@@ -2980,16 +3979,18 @@
2980	3979	//copy.ClearUI();
2981	3980	for (Object3D obj : listUI)
2982	3981	{
	3982	+ obj.pinned = false;
2983	3983	obj.CloseUI();
2984	3984	}
2985	3985	listUI.clear();
	3986	+ SetPinStates(group.selection.size() > 0);
2986	3987	refreshContents(true);
2987	3988	} else
2988	3989	if (source == allParamsButton)
2989	3990	{
2990	3991	assert(copy == group);
2991	3992
2992		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3993	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2993	3994
2994	3995	for (Object3D obj : listUI)
2995	3996	{
..	..	@@ -3038,6 +4039,7 @@
3038	4039	}
3039	4040
3040	4041	copy = group;
	4042	+
3041	4043	//Globals.theRenderer.object = group;
3042	4044	if(!useclient)
3043	4045	{
..	..	@@ -3053,20 +4055,51 @@
3053	4055	frontView.object = group;
3054	4056	sideView.object = group;
3055	4057	}
3056		- group.editWindow = this;
	4058	+
	4059	+// fix "+" issue
	4060	+ //group.editWindow = this;
	4061	+ group.manipWindow = this;
	4062	+
3057	4063	/*
3058	4064	currentLayout = radio.layout;
3059	4065	if (currentLayout == null)
3060	4066	currentLayout = sevenButton;
3061	4067	*/
3062	4068	radio.layout.doClick();
	4069	+
	4070	+ SetUndoStates();
	4071	+
	4072	+ ClearUnpinned();
	4073	+
	4074	+ //Grafreed.Assert(group != null);
	4075	+ //Grafreed.Assert(group.selection != null);
	4076	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4077	+ if (group.selection == null \|\| group.selection.size() == 1)
	4078	+ EditSelection(false);
3063	4079	keepparent = group.parent;
3064	4080	// PARENT = NULL or not???
3065	4081	//group.parent = null; // ROOT
3066	4082	//group.attributes = -1;
3067	4083	ResetModel();
	4084	+
	4085	+ cameraView.requestFocusInWindow();
3068	4086	refreshContents(true);
3069		- }
	4087	+ } else if (event.getSource() == editCameraItem)
	4088	+ {
	4089	+ cameraView.ProtectCamera();
	4090	+ cameraView.requestFocusInWindow();
	4091	+ cameraView.repaint();
	4092	+ return;
	4093	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	4094	+ {
	4095	+ cameraView.RevertCamera();
	4096	+ cameraView.requestFocusInWindow();
	4097	+ cameraView.repaint();
	4098	+ return;
	4099	+ // } else if (event.getSource() == textureButton)
	4100	+ // {
	4101	+ // return; // true;
	4102	+ }
3070	4103	else
3071	4104	{
3072	4105	//return super.action(event, arg);
..	..	@@ -3075,7 +4108,6 @@
3075	4108	}
3076	4109
3077	4110	boolean useclient = false;
3078		- cRadio radio;
3079	4111
3080	4112	void ToggleRoot()
3081	4113	{
..	..	@@ -3127,6 +4159,28 @@
3127	4159	refreshContents();
3128	4160	}
3129	4161
	4162	+ void TransformChildren()
	4163	+ {
	4164	+ Object3D obj;
	4165	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4166	+ {
	4167	+ obj = (Object3D)e.nextElement();
	4168	+ obj.KeepTextureMatrices();
	4169	+ obj.TransformChildren();
	4170	+ obj.RestoreTextureMatrices();
	4171	+
	4172	+// if (obj.parent == null)
	4173	+// {
	4174	+// System.out.println("NULL PARENT!");
	4175	+// new Exception().printStackTrace();
	4176	+// }
	4177	+// else
	4178	+// TouchTransform(obj);
	4179	+// //obj.parent.Touch();
	4180	+ }
	4181	+
	4182	+ refreshContents();
	4183	+ }
3130	4184
3131	4185	void ResetTransform()
3132	4186	{
..	..	@@ -3239,7 +4293,7 @@
3239	4293	refreshContents();
3240	4294	}
3241	4295
3242		- void ResetCentroid()
	4296	+ void ResetCentroid(boolean full)
3243	4297	{
3244	4298	Object3D obj;
3245	4299	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3254,12 +4308,16 @@
3254	4308	LA.matIdentity(Object3D.mat);
3255	4309	obj.getBounds(minima, maxima, false);
3256	4310	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3257		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	4311	+ if (full)
	4312	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3258	4313	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3259	4314	obj.TransformMesh(Object3D.mat);
	4315	+
3260	4316	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3261		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	4317	+ if (full)
	4318	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3262	4319	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	4320	+
3263	4321	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3264	4322	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3265	4323	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3288,7 +4346,8 @@
3288	4346
3289	4347	int size = obj.MemorySize();
3290	4348
3291		- System.err.println((size/1024) + " KB is the size of " + obj);
	4349	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4350	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3292	4351	}
3293	4352	}
3294	4353	catch (Exception e)
..	..	@@ -3325,9 +4384,9 @@
3325	4384	obj = (Object3D)e.nextElement();
3326	4385
3327	4386	System.out.println("Object is: " + obj);
3328		- GrafreeD.AnalyzeObject(obj);
	4387	+ Grafreed.AnalyzeObject(obj);
3329	4388	System.out.println("Boundary rep: " + obj.bRep);
3330		- GrafreeD.AnalyzeObject(obj.bRep);
	4389	+ Grafreed.AnalyzeObject(obj.bRep);
3331	4390
3332	4391	// System.err.println((size/1024) + " KB is the size of " + obj);
3333	4392	}
..	..	@@ -3369,6 +4428,13 @@
3369	4428	void GenNormals(boolean crease)
3370	4429	{
3371	4430	group.GenNormalsS(crease);
	4431	+
	4432	+ refreshContents();
	4433	+ }
	4434	+
	4435	+ void GenNormalsMESH()
	4436	+ {
	4437	+ group.GenNormalsMeshS();
3372	4438
3373	4439	refreshContents();
3374	4440	}
..	..	@@ -3541,8 +4607,8 @@
3541	4607
3542	4608	void ParseVertices()
3543	4609	{
3544		- boolean epsequal = GrafreeD.epsequal;
3545		- GrafreeD.epsequal = true;
	4610	+ boolean epsequal = Grafreed.epsequal;
	4611	+ Grafreed.epsequal = true;
3546	4612
3547	4613	for (int i=0; i<group.selection.size(); i++)
3548	4614	{
..	..	@@ -3567,7 +4633,7 @@
3567	4633	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3568	4634	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3569	4635
3570		- g.add(GrafreeD.clipboard);
	4636	+ g.add(Grafreed.clipboard);
3571	4637
3572	4638	buffer.add(g);
3573	4639	}
..	..	@@ -3582,7 +4648,7 @@
3582	4648	makeSomething(buffer, i==group.selection.size()-1);
3583	4649	}
3584	4650
3585		- GrafreeD.epsequal = epsequal;
	4651	+ Grafreed.epsequal = epsequal;
3586	4652
3587	4653	refreshContents();
3588	4654	}
..	..	@@ -3600,7 +4666,16 @@
3600	4666	String pigment = Object3D.GetPigment(tex);
3601	4667	//String bump = Object3D.GetBump(tex);
3602	4668
3603		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4669	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4670	+
	4671	+ try
	4672	+ {
	4673	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
	4674	+ }
	4675	+ catch (Exception e)
	4676	+ {
	4677	+ System.err.println("FAIL: " + node);
	4678	+ }
3604	4679
3605	4680	double s = v.s;
3606	4681
..	..	@@ -3732,7 +4807,7 @@
3732	4807	return;
3733	4808
3734	4809	Object3D poses = group.selection.get(0);
3735		- Object3D ref = GrafreeD.clipboard.get(0);
	4810	+ Object3D ref = Grafreed.clipboard.get(0);
3736	4811
3737	4812	Object3D newgroup = new Object3D("Po:" + poses.name);
3738	4813
..	..	@@ -3926,9 +5001,9 @@
3926	5001
3927	5002	void ClipMesh()
3928	5003	{
3929		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	5004	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3930	5005	{
3931		- Object3D content = GrafreeD.clipboard.get(0);
	5006	+ Object3D content = Grafreed.clipboard.get(0);
3932	5007
3933	5008	if (content instanceof cGroup && ((cGroup)content).transientlink )
3934	5009	content = ((cGroup)content).get(0);
..	..	@@ -3937,7 +5012,7 @@
3937	5012	// {
3938	5013	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3939	5014	// }
3940		- group.selection.ClipMesh(GrafreeD.clipboard);
	5015	+ group.selection.ClipMesh(Grafreed.clipboard);
3941	5016	}
3942	5017	// group.selection.ClipMesh(GrafreeD.clipboard);
3943	5018	System.out.println("DONE.");
..	..	@@ -3984,6 +5059,18 @@
3984	5059	void MarkLeaves(boolean hide)
3985	5060	{
3986	5061	group.selection.MarkLeaves(hide);
	5062	+ refreshContents();
	5063	+ }
	5064	+
	5065	+ void RewindLeaves(boolean hide)
	5066	+ {
	5067	+ group.selection.RewindLeaves(hide);
	5068	+ refreshContents();
	5069	+ }
	5070	+
	5071	+ void RandomLeaves(boolean hide)
	5072	+ {
	5073	+ group.selection.RandomLeaves(hide);
3987	5074	refreshContents();
3988	5075	}
3989	5076
..	..	@@ -4058,28 +5145,25 @@
4058	5145	// }
4059	5146	// }
4060	5147
4061		- static boolean allparams = true;
4062		-
4063		- static Vector<Object3D> listUI = new Vector<Object3D>();
4064		-
4065	5148	void EditSelection(boolean newWindow)
4066	5149	{
	5150	+ if (group.selection == null)
	5151	+ {
	5152	+ EditElement(group, newWindow); // ? new
	5153	+ return;
	5154	+ }
	5155	+
4067	5156	// aConstraints.gridy = 0;
4068	5157	for (int i=0; i<group.selection.size(); i++)
4069	5158	{
4070	5159	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4071	5160	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4072		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5161	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4073	5162
4074	5163	Object3D elem = (Object3D)group.selection.elementAt(i);
4075		- if(elem != group)
	5164	+ if(elem != group \|\| !newWindow)
4076	5165	{
4077		- // if (!(elem instanceof Composite))
4078		- // newWindow = false;
4079		- listUI.add(elem);
4080		- elem.openEditWindow(this, newWindow); //, false);
4081		- System.out.println("edit : " + elem);
4082		- elem.editWindow.refreshContents(true); // ? new
	5166	+ EditElement(elem, newWindow); // ? new
4083	5167	}
4084	5168	}
4085	5169	}
..	..	@@ -4142,9 +5226,7 @@
4142	5226
4143	5227	freezemodel = false;
4144	5228	}
4145		-
4146		- boolean flashIt = true;
4147		-
	5229	+
4148	5230	public void valueChanged(TreeSelectionEvent e)
4149	5231	//public boolean handleEvent(Event event)
4150	5232	{
..	..	@@ -4154,7 +5236,8 @@
4154	5236	//new Exception().printStackTrace();
4155	5237
4156	5238	freezemodel = true;
4157		-
	5239	+ ClearUnpinned();
	5240	+
4158	5241	/**/
4159	5242	//switch (event.id)
4160	5243	{
..	..	@@ -4162,7 +5245,6 @@
4162	5245	//case 702: // Event.LIST_DESELECT
4163	5246	group.deselectAll();
4164	5247	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4165		- objEditor.ClearInfo(); // .GetMaterial());
4166	5248	if (tps != null)
4167	5249	{
4168	5250	for (int i=0; i < tps.length; i++)
..	..	@@ -4171,10 +5253,8 @@
4171	5253
4172	5254	//if (child.parent != null)
4173	5255	//child.parent.addSelectee(child);
	5256	+ objEditor.SetMaterial(child);
4174	5257	group.addSelectee(child);
4175		- objEditor.SetMaterial(child); // .GetMaterial());
4176		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4177		- System.err.println("info : " + child.GetPath());
4178	5258	}
4179	5259	}
4180	5260	// else
..	..	@@ -4184,20 +5264,28 @@
4184	5264	// System.err.println("info : " + group.GetPath());
4185	5265	// }
4186	5266
4187		- objEditor.SetText(); // jan 2014
4188		-
4189		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	5267	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4190	5268	CameraPane.flash = true;
4191	5269
4192		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5270	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4193	5271	// a camera
4194	5272	{
4195		- CameraPane.camerachangeframe = 0; // don't refuse it
4196		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5273	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5274	+ {
	5275	+ CameraPane.camerachangeframe = 0; // don't refuse it
	5276	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5277	+ }
4197	5278	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4198	5279	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4199	5280	}
4200	5281
	5282	+ if (tps != null && tps.length == 1)
	5283	+ {
	5284	+ EditSelection(false);
	5285	+ }
	5286	+
	5287	+ SetPinStates(tps != null && tps.length > 0);
	5288	+
4201	5289	refreshContents();
4202	5290	//return true;
4203	5291	}
..	..	@@ -4206,6 +5294,50 @@
4206	5294
4207	5295	freezemodel = false;
4208	5296	}
	5297	+
	5298	+ void SetPinStates(boolean enabled)
	5299	+ {
	5300	+ editButton.setEnabled(enabled);
	5301	+ uneditButton.setEnabled(enabled);
	5302	+ //unselectButton.setEnabled(enabled);
	5303	+ flashSelectionButton.setEnabled(enabled);
	5304	+
	5305	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5306	+
	5307	+ boolean allComposites = true;
	5308	+
	5309	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5310	+ {
	5311	+ if (!(e.nextElement() instanceof Composite))
	5312	+ {
	5313	+ allComposites = false;
	5314	+ break;
	5315	+ }
	5316	+ }
	5317	+
	5318	+ rootButton.setEnabled(allComposites);
	5319	+ }
	5320	+
	5321	+ void refreshContents(boolean cp)
	5322	+ {
	5323	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5324	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5325	+ {
	5326	+ objEditor.ClearInfo(); // .GetMaterial());
	5327	+
	5328	+ for (int i=0; i < group.selection.Size(); i++)
	5329	+ {
	5330	+ Object3D child = (Object3D) group.selection.get(i);
	5331	+
	5332	+ objEditor.AddInfo(child, this, true);
	5333	+// System.err.println("info : " + child.GetPath());
	5334	+ }
	5335	+
	5336	+ objEditor.SetText(); // jan 2014
	5337	+ }
	5338	+
	5339	+ super.refreshContents(cp);
	5340	+ }
4209	5341
4210	5342	void linkSomething(Object3D thing)
4211	5343	{
..	..	@@ -4277,16 +5409,19 @@
4277	5409	{
4278	5410	if (group.selection.isEmpty())
4279	5411	return;
4280		- GrafreeD.clipboardIsTempGroup = false;
	5412	+
	5413	+ Grafreed.clipboardIsTempGroup = false;
4281	5414	Composite tGroup = null;
4282	5415	if (group.selection.size() > 0) // 1)
4283	5416	{
4284	5417	tGroup = new cGroup();
4285		- GrafreeD.clipboardIsTempGroup = true;
	5418	+ Grafreed.clipboardIsTempGroup = true;
4286	5419	}
4287	5420
4288	5421	if (cut)
4289	5422	{
	5423	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5424	+// Save();
4290	5425	//int indices[] = jList.getSelectedIndices();
4291	5426	//for (int i = indices.length - 1; i >= 0; i--)
4292	5427	//jList.remove(indices[i]);
..	..	@@ -4322,16 +5457,16 @@
4322	5457	//System.out.println("cut " + child);
4323	5458	//System.out.println("parent = " + child.parent);
4324	5459	// tmp.addChild(child);
4325		- if (GrafreeD.clipboardIsTempGroup)
	5460	+ if (Grafreed.clipboardIsTempGroup)
4326	5461	tGroup.add/Child/(tmp);
4327	5462	else
4328		- GrafreeD.clipboard = tmp;
	5463	+ Grafreed.clipboard = tmp;
4329	5464	}
4330	5465	else
4331		- if (GrafreeD.clipboardIsTempGroup)
	5466	+ if (Grafreed.clipboardIsTempGroup)
4332	5467	tGroup.add/Child/(child);
4333	5468	else
4334		- GrafreeD.clipboard = child;
	5469	+ Grafreed.clipboard = child;
4335	5470	}
4336	5471
4337	5472	//ResetModel();
..	..	@@ -4363,21 +5498,23 @@
4363	5498	//System.out.println("cut " + elem);
4364	5499	//System.out.println("parent = " + elem.parent);
4365	5500	// tmp.addChild(elem);
4366		- if (GrafreeD.clipboardIsTempGroup)
	5501	+ if (Grafreed.clipboardIsTempGroup)
4367	5502	tGroup.add/Child/(tmp);
4368	5503	else
4369		- GrafreeD.clipboard = tmp;
	5504	+ Grafreed.clipboard = tmp;
4370	5505	}
4371	5506	else
4372		- if (GrafreeD.clipboardIsTempGroup)
	5507	+ if (Grafreed.clipboardIsTempGroup)
4373	5508	tGroup.add/Child/(child);
4374	5509	else
4375		- GrafreeD.clipboard = child;
	5510	+ Grafreed.clipboard = child;
4376	5511	}
4377	5512
4378	5513	}
4379		- if (GrafreeD.clipboardIsTempGroup)
4380		- GrafreeD.clipboard = tGroup;
	5514	+
	5515	+ if (Grafreed.clipboardIsTempGroup)
	5516	+ Grafreed.clipboard = tGroup;
	5517	+
4381	5518	if (cut)
4382	5519	{
4383	5520	ResetModel();
..	..	@@ -4387,11 +5524,15 @@
4387	5524
4388	5525	void paste(boolean expand)
4389	5526	{
	5527	+ if (Globals.REPLACEONMAKE)
	5528	+ Save();
	5529	+ boolean keep = Globals.REPLACEONMAKE;
	5530	+ Globals.REPLACEONMAKE = false;
4390	5531	// if (GrafreeD.clipboard == null)
4391	5532	// return;
4392	5533	boolean first = true;
4393	5534
4394		- if (GrafreeD.clipboardIsTempGroup)
	5535	+ if (Grafreed.clipboardIsTempGroup)
4395	5536	{
4396	5537	Composite temp;
4397	5538
..	..	@@ -4402,7 +5543,7 @@
4402	5543	temp = (Composite)Applet3D.clipboard.deepCopy();
4403	5544	*/
4404	5545	Object3D elem;
4405		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5546	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4406	5547	{
4407	5548	Object3D child = (Object3D)e.nextElement();
4408	5549
..	..	@@ -4436,16 +5577,17 @@
4436	5577	//Object3D cb = Applet3D.clipboard;
4437	5578	//temp.addChild(cb);
4438	5579	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4439		- assert(GrafreeD.clipboard.parent == null);
4440		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4441		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4442		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4443		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	5580	+ assert(Grafreed.clipboard.parent == null);
	5581	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5582	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5583	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5584	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4444	5585	else
4445		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4446		- GrafreeD.clipboard.get(0).parent = keepparent;
	5586	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5587	+ Grafreed.clipboard.get(0).parent = keepparent;
4447	5588	}
4448	5589
	5590	+ Globals.REPLACEONMAKE = keep;
4449	5591	ResetModel();
4450	5592	refreshContents();
4451	5593	}
..	..	@@ -4492,9 +5634,9 @@
4492	5634	{
4493	5635	boolean first = true;
4494	5636
4495		- if (GrafreeD.clipboardIsTempGroup)
	5637	+ if (Grafreed.clipboardIsTempGroup)
4496	5638	{
4497		- Composite temp = (Composite)GrafreeD.clipboard;
	5639	+ Composite temp = (Composite)Grafreed.clipboard;
4498	5640	Object3D copy;
4499	5641	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4500	5642	{
..	..	@@ -4504,7 +5646,7 @@
4504	5646	}
4505	5647	} else
4506	5648	{
4507		- linkSomething(GrafreeD.clipboard); //.get(0));
	5649	+ linkSomething(Grafreed.clipboard); //.get(0));
4508	5650	}
4509	5651	}
4510	5652	}
..	..	@@ -4581,6 +5723,10 @@
4581	5723
4582	5724	void group(Object3D csg, boolean grab)
4583	5725	{
	5726	+ if (Globals.REPLACEONMAKE)
	5727	+ Save();
	5728	+ boolean keep = Globals.REPLACEONMAKE;
	5729	+ Globals.REPLACEONMAKE = false;
4584	5730	if (//false) // why??
4585	5731	!group.selection.isEmpty())
4586	5732	{
..	..	@@ -4694,10 +5840,15 @@
4694	5840	//node.add(csg);
4695	5841	//makeSomething(node);
4696	5842	makeSomething(csg);
	5843	+ Globals.REPLACEONMAKE = keep;
4697	5844	}
4698	5845
4699	5846	void Ungroup(Object3D g)
4700	5847	{
	5848	+ if (Globals.REPLACEONMAKE)
	5849	+ Save();
	5850	+ boolean keep = Globals.REPLACEONMAKE;
	5851	+ Globals.REPLACEONMAKE = false;
4701	5852	if (g instanceof HiddenObject)
4702	5853	{
4703	5854	HiddenObject h = (HiddenObject) g;
..	..	@@ -4714,6 +5865,7 @@
4714	5865	objEditor.makeSomething(g.get(i), false);
4715	5866	}
4716	5867	}
	5868	+ Globals.REPLACEONMAKE = keep;
4717	5869	}
4718	5870
4719	5871	void ungroup()
..	..	@@ -4909,21 +6061,6 @@
4909	6061	}
4910	6062	*/
4911	6063
4912		- void ImportGFD()
4913		- {
4914		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4915		- browser.show();
4916		- String filename = browser.getFile();
4917		- if (filename != null && filename.length() > 0)
4918		- {
4919		- String fullname = browser.getDirectory() + filename;
4920		-
4921		- //Object3D readobj =
4922		- objEditor.ReadGFD(fullname, objEditor);
4923		- //makeSomething(readobj);
4924		- }
4925		- }
4926		-
4927	6064	/*
4928	6065	public void Callback(Object obj)
4929	6066	{
..	..	@@ -4947,26 +6084,9 @@
4947	6084	}
4948	6085	*/
4949	6086
4950		- void ImportVRMLX3D()
4951		- {
4952		- if (GrafreeD.standAlone)
4953		- {
4954		- /**/
4955		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4956		- browser.show();
4957		- String filename = browser.getFile();
4958		- if (filename != null && filename.length() > 0)
4959		- {
4960		- String fullname = browser.getDirectory() + filename;
4961		- LoadVRMLX3D(fullname);
4962		- }
4963		- /**/
4964		- }
4965		- }
4966		-
4967	6087	String GetFile(String dialogName)
4968	6088	{
4969		- if (GrafreeD.standAlone)
	6089	+ if (Grafreed.standAlone)
4970	6090	{
4971	6091	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4972	6092	browser.show();
..	..	@@ -5034,7 +6154,43 @@
5034	6154	cButton clearpanelButton;
5035	6155	cButton unselectButton;
5036	6156
	6157	+ cButton restoreCameraButton;
	6158	+
5037	6159	cButton oneStepButton;
	6160	+
	6161	+ cButton groupButton;
	6162	+ cButton ungroupButton;
	6163	+ cButton compositeButton;
	6164	+ cButton switchButton;
	6165	+ cButton loopButton;
	6166	+ cButton textureButton;
	6167	+
	6168	+ cButton skybox1Button;
	6169	+ cButton skybox2Button;
	6170	+ cButton skybox3Button;
	6171	+ cButton skybox4Button;
	6172	+ cButton skybox5Button;
	6173	+ cButton skybox6Button;
	6174	+ cButton skybox7Button;
	6175	+
	6176	+ cButton skybox11Button;
	6177	+ cButton skybox12Button;
	6178	+ cButton skybox13Button;
	6179	+ cButton skybox14Button;
	6180	+ cButton skybox15Button;
	6181	+ cButton skybox16Button;
	6182	+ cButton skybox17Button;
	6183	+
	6184	+ cButton gridButton;
	6185	+ cButton boxButton;
	6186	+ cButton sphereButton;
	6187	+ cButton coneButton;
	6188	+ cButton torusButton;
	6189	+ cButton superButton;
	6190	+ cButton kleinButton;
	6191	+ cButton particlesButton;
	6192	+ cButton overlayButton;
	6193	+ cButton lightButton;
5038	6194
5039	6195	cButton screenfitButton;
5040	6196	cButton screenfitpointButton;
..	..	@@ -5047,14 +6203,6 @@
5047	6203
5048	6204	cButton setsupportButton;
5049	6205
5050		- cButton twoButton;
5051		- cButton sixButton;
5052		- cButton threeButton;
5053		- cButton sevenButton;
5054		- cButton fourButton; // full panel
5055		- cButton oneButton; // full XYZ
5056		- //cButton currentLayout;
5057		-
5058	6206	//
5059	6207	//Composite
5060	6208	Object3D // to do !!
..	..	@@ -5064,9 +6212,11 @@
5064	6212	//JTree jTree;
5065	6213	private MenuItem lookAtItem;
5066	6214	private MenuItem lookFromItem;
5067		- private MenuItem switchItem;
	6215	+ private MenuItem switchViewItem;
5068	6216	private MenuItem cutItem;
5069		- private MenuItem duplicateItem;
	6217	+ private MenuItem undoItem;
	6218	+ private MenuItem redoItem;
	6219	+ private JMenuItem duplicateItem;
5070	6220	private MenuItem cloneItem;
5071	6221	private MenuItem cloneSupportItem;
5072	6222	private MenuItem overwriteGeoItem;
..	..	@@ -5079,7 +6229,7 @@
5079	6229	private MenuItem linkverticesItem;
5080	6230	private MenuItem relinkverticesItem;
5081	6231	private MenuItem setMasterItem;
5082		- private MenuItem resetMeshItem;
	6232	+ private MenuItem resetAllItem;
5083	6233	private MenuItem stepAllItem;
5084	6234	private MenuItem revertMeshItem;
5085	6235	private MenuItem poseMeshItem;
..	..	@@ -5094,7 +6244,7 @@
5094	6244	private MenuItem pasteLinkItem;
5095	6245	private MenuItem pasteCloneItem;
5096	6246	private MenuItem pasteExpandItem;
5097		- private MenuItem clearItem;
	6247	+ private MenuItem deleteItem;
5098	6248	private MenuItem clearAllItem;
5099	6249	private MenuItem genUVItem;
5100	6250	private MenuItem genNormalsMESHItem;
..	..	@@ -5129,6 +6279,10 @@
5129	6279	private MenuItem showleavesItem;
5130	6280	private MenuItem markleavesItem;
5131	6281	private MenuItem unmarkleavesItem;
	6282	+ private MenuItem rewindleavesItem;
	6283	+ private MenuItem unrewindleavesItem;
	6284	+ private MenuItem randomleavesItem;
	6285	+ private MenuItem unrandomleavesItem;
5132	6286
5133	6287	private MenuItem flipVItem;
5134	6288	private MenuItem unflipVItem;
..	..	@@ -5140,15 +6294,17 @@
5140	6294	private MenuItem panoTexturesItem;
5141	6295
5142	6296	private MenuItem resetCentroidItem;
5143		- private MenuItem transformgeometryItem;
	6297	+ private MenuItem resetCentroidXZItem;
5144	6298	private MenuItem resetTransformItem;
	6299	+ private MenuItem transformGeometryItem;
	6300	+ private MenuItem transformChildrenItem;
5145	6301	private MenuItem hideItem;
5146	6302	private MenuItem grabItem;
5147	6303	private MenuItem backItem;
5148	6304	private MenuItem frontItem;
5149	6305	private MenuItem cameraItem;
5150	6306	private MenuItem compositeItem;
5151		- private MenuItem randomItem;
	6307	+ private MenuItem switchItem;
5152	6308	private MenuItem physicsItem;
5153	6309	private MenuItem frameselectorItem;
5154	6310	private MenuItem scriptNodeItem;
..	..	@@ -5172,6 +6328,8 @@
5172	6328	private MenuItem attachBumpItem;
5173	6329	private MenuItem detachBumpItem;
5174	6330	private MenuItem pigmentBumpItem;
	6331	+ private MenuItem embedTexturesItem;
	6332	+ private MenuItem deEmbedTexturesItem;
5175	6333
5176	6334	private MenuItem particleItem;
5177	6335	private MenuItem ragdollItem;
..	..	@@ -5210,11 +6368,6 @@
5210	6368	private MenuItem doubleItem;
5211	6369	private MenuItem tripleItem;
5212	6370
5213		- private MenuItem importGFDItem;
5214		- private MenuItem importVRMLX3DItem;
5215		- private MenuItem import3DSItem;
5216		- private MenuItem importOBJItem;
5217		-
5218	6371	private MenuItem computeAOItem;
5219	6372	private MenuItem recompileItem;
5220	6373	private MenuItem editScriptItem;
..	..	@@ -5224,4 +6377,8 @@
5224	6377	private MenuItem analyzeItem;
5225	6378	private MenuItem dumpItem;
5226	6379	//boolean freezemodel = false;
	6380	+
	6381	+ Menu cameraMenu;
	6382	+ MenuItem editCameraItem;
	6383	+ MenuItem restoreCameraItem;
5227	6384	}