~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,350 @@
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", !Globals.NIMBUSLAF));
	33	+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
	34	+ skyboxButton.setToolTipText(s.equals("") ? "No background" : s);
	35	+ skyboxButton.addActionListener(new ActionListener()
	36	+ {
	37	+ @Override
	38	+ public void actionPerformed(ActionEvent e)
	39	+ {
	40	+ ChangeSkybox(path);
	41	+ }
	42	+ });
	43	+ }
	44	+
	45	+ public void AddTextureButton(String f, String c, final String t, int count, cGridBag row)
	46	+ {
	47	+ cButton textureButton;
	48	+ final String path = "textures/" + f + "/" + c + "/"; // + t;
	49	+ row.add(textureButton = GetButton(path + "icons/" + t, !Globals.NIMBUSLAF));
	50	+ textureButton.setToolTipText(c + count);
	51	+ textureButton.addActionListener(new ActionListener()
	52	+ {
	53	+ @Override
	54	+ public void actionPerformed(ActionEvent e)
	55	+ {
	56	+ ChangeTexture(path + t);
	57	+ }
	58	+ });
	59	+ }
	60	+
	61	+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
	62	+ {
	63	+ cGridBag tab0 = new cGridBag().setVertical(true);
	64	+
	65	+ tab0.setName("Urban");
	66	+ skyboxpanel.add(tab0);
	67	+
	68	+ cGridBag row0 = new cGridBag();
	69	+ cGridBag row1 = new cGridBag();
	70	+ cGridBag row2 = new cGridBag();
	71	+ cGridBag row3 = new cGridBag();
	72	+ cGridBag row4 = new cGridBag();
	73	+ cGridBag row5 = new cGridBag();
	74	+ cGridBag row6 = new cGridBag();
	75	+
	76	+ AddSkyboxButton("default", "", row0);
	77	+ //AddSkyboxButton("default", "cornell", row0);
	78	+ AddSkyboxButton("penguins", "dust", row0);
	79	+ AddSkyboxButton("penguins", "tropic", row0);
	80	+ AddSkyboxButton("penguins", "yonder", row0);
	81	+
	82	+ AddSkyboxButton("default", "uffizi", row1);
	83	+ AddSkyboxButton("bridge", "Bridge", row1);
	84	+ AddSkyboxButton("bridge", "Bridge2", row1);
	85	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	86	+
	87	+ AddSkyboxButton("urban", "Parliament", row2);
	88	+ AddSkyboxButton("urban", "Roundabout", row2);
	89	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	90	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	91	+
	92	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	93	+ AddSkyboxButton("urban", "UnionSquare", row3);
	94	+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
	95	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	96	+
	97	+ AddSkyboxButton("park", "Buddha", row4);
	98	+ AddSkyboxButton("park", "CNTower2", row4);
	99	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	100	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	101	+
	102	+ AddSkyboxButton("park", "Park", row5);
	103	+ AddSkyboxButton("park", "Pond", row5);
	104	+ AddSkyboxButton("park", "Skansen", row5);
	105	+ AddSkyboxButton("park", "Skansen2", row5);
	106	+
	107	+ AddSkyboxButton("park", "Skansen3", row6);
	108	+ AddSkyboxButton("park", "Skansen4", row6);
	109	+ AddSkyboxButton("park", "Skansen5", row6);
	110	+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
	111	+
	112	+ tab0.add(row0);
	113	+ tab0.add(row1);
	114	+ tab0.add(row2);
	115	+ tab0.add(row3);
	116	+ tab0.add(row4);
	117	+ tab0.add(row5);
	118	+ tab0.add(row6);
	119	+
	120	+ for (int i=5; --i>=0;)
	121	+ {
	122	+ //oe.toolboxPanel.Return();
	123	+ //tab0.add(new cGridBag());
	124	+ }
	125	+ }
	126	+
	127	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	128	+ {
	129	+ cGridBag tab0 = new cGridBag().setVertical(true);
	130	+
	131	+ tab0.setName("Nature");
	132	+ skyboxpanel.add(tab0);
	133	+
	134	+ cGridBag row0 = new cGridBag();
	135	+ cGridBag row1 = new cGridBag();
	136	+ cGridBag row2 = new cGridBag();
	137	+ cGridBag row3 = new cGridBag();
	138	+ cGridBag row4 = new cGridBag();
	139	+ cGridBag row5 = new cGridBag();
	140	+ cGridBag row6 = new cGridBag();
	141	+
	142	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	143	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	144	+ AddSkyboxButton("beach", "PalmTrees", row0);
	145	+ AddSkyboxButton("beach", "Tenerife", row0);
	146	+
	147	+ AddSkyboxButton("beach", "Tenerife2", row1);
	148	+ AddSkyboxButton("beach", "Tenerife3", row1);
	149	+ AddSkyboxButton("field", "FishPond", row1);
	150	+ AddSkyboxButton("field", "Footballfield", row1);
	151	+
	152	+ AddSkyboxButton("field", "Meadow", row2);
	153	+ AddSkyboxButton("field", "Sorsele", row2);
	154	+ AddSkyboxButton("field", "Sorsele2", row2);
	155	+ AddSkyboxButton("field", "Sorsele3", row2);
	156	+
	157	+ AddSkyboxButton("forest", "Brudslojan", row3);
	158	+ AddSkyboxButton("forest", "Langholmen2", row3);
	159	+ AddSkyboxButton("forest", "Plants", row3);
	160	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	161	+
	162	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	163	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	164	+ AddSkyboxButton("mountain", "Teide", row4);
	165	+ AddSkyboxButton("park", "Tantolunden4", row4);
	166	+
	167	+ AddSkyboxButton("park", "Stairs", row5);
	168	+ AddSkyboxButton("default", "skycube", row6);
	169	+ AddSkyboxButton("rocky", "Langholmen", row5);
	170	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	171	+
	172	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	173	+ AddSkyboxButton("default", "CloudyHills", row6);
	174	+ AddSkyboxButton("daz", "Autumn", row6);
	175	+ AddSkyboxButton("daz", "MountainTrail", row6);
	176	+ /*
	177	+Autumn
	178	+Greenlands
	179	+MountainTrail
	180	+Oasis
	181	+TheRock
	182	+TopOfTheWorld
	183	+Winter
	184	+ */
	185	+
	186	+ tab0.add(row0);
	187	+ tab0.add(row1);
	188	+ tab0.add(row2);
	189	+ tab0.add(row3);
	190	+ tab0.add(row4);
	191	+ tab0.add(row5);
	192	+ tab0.add(row6);
	193	+
	194	+ for (int i=5; --i>=0;)
	195	+ {
	196	+ //oe.toolboxPanel.Return();
	197	+ //tab0.add(new cGridBag());
	198	+ }
	199	+ }
	200	+
	201	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	202	+ {
	203	+ cGridBag tab0 = new cGridBag().setVertical(true);
	204	+
	205	+ tab0.setName("Night");
	206	+ skyboxpanel.add(tab0);
	207	+
	208	+ cGridBag row0 = new cGridBag();
	209	+ cGridBag row1 = new cGridBag();
	210	+ cGridBag row2 = new cGridBag();
	211	+ cGridBag row3 = new cGridBag();
	212	+ cGridBag row4 = new cGridBag();
	213	+ cGridBag row5 = new cGridBag();
	214	+ cGridBag row6 = new cGridBag();
	215	+
	216	+ AddSkyboxButton("night", "NightPath", row0);
	217	+ AddSkyboxButton("night", "PondNight", row0);
	218	+ AddSkyboxButton("night", "Powerlines", row0);
	219	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	220	+
	221	+ AddSkyboxButton("urban", "CNTower", row1);
	222	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	223	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	224	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
	225	+
	226	+ AddSkyboxButton("penguins", "kenon_star", row2);
	227	+ AddSkyboxButton("persson", "corona", row2);
	228	+ AddSkyboxButton("persson", "spaceskybox", row2);
	229	+ AddSkyboxButton("indoors", "Vasa", row2);
	230	+
	231	+ AddSkyboxButton("winter", "Backyard", row3);
	232	+ AddSkyboxButton("winter", "Creek", row3);
	233	+ AddSkyboxButton("winter", "FootballField3", row3);
	234	+ AddSkyboxButton("winter", "Forest", row3);
	235	+
	236	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	237	+ AddSkyboxButton("winter", "House", row4);
	238	+ AddSkyboxButton("winter", "IceLake", row4);
	239	+ AddSkyboxButton("winter", "IceRiver", row4);
	240	+
	241	+ AddSkyboxButton("winter", "Park3", row5);
	242	+ AddSkyboxButton("winter", "PondWinter", row5);
	243	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	244	+ AddSkyboxButton("winter", "Vindelalven", row5);
	245	+
	246	+ AddSkyboxButton("daz", "TheRock", row6);
	247	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	248	+ AddSkyboxButton("daz", "Winter", row6);
	249	+ AddSkyboxButton("mountain", "Ryfjallet", row6);
	250	+
	251	+ tab0.add(row0);
	252	+ tab0.add(row1);
	253	+ tab0.add(row2);
	254	+ tab0.add(row3);
	255	+ tab0.add(row4);
	256	+ tab0.add(row5);
	257	+ tab0.add(row6);
	258	+
	259	+ for (int i=5; --i>=0;)
	260	+ {
	261	+ //oe.toolboxPanel.Return();
	262	+ //tab0.add(new cGridBag());
	263	+ }
	264	+ }
	265	+
	266	+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
	267	+ {
	268	+ cGridBag tab0 = new cGridBag().setVertical(true);
	269	+
	270	+ tab0.setName("Others");
	271	+ skyboxpanel.add(tab0);
	272	+
	273	+ cGridBag row0 = new cGridBag();
	274	+ cGridBag row1 = new cGridBag();
	275	+ cGridBag row2 = new cGridBag();
	276	+ cGridBag row3 = new cGridBag();
	277	+ cGridBag row4 = new cGridBag();
	278	+ cGridBag row5 = new cGridBag();
	279	+ cGridBag row6 = new cGridBag();
	280	+
	281	+ AddSkyboxButton("mayhem", "afterrain", row0);
	282	+ AddSkyboxButton("mayhem", "aqua4", row0);
	283	+ AddSkyboxButton("mayhem", "aqua9", row0);
	284	+ AddSkyboxButton("mayhem", "flame", row0);
	285	+
	286	+ AddSkyboxButton("mayhem", "h2s", row1);
	287	+ AddSkyboxButton("mayhem", "prehistoric", row1);
	288	+ AddSkyboxButton("mayhem", "scorched", row1);
	289	+ AddSkyboxButton("penguins", "desertdawn", row1);
	290	+
	291	+ AddSkyboxButton("persson", "Citadella", row2);
	292	+ AddSkyboxButton("persson", "Citadella2", row2);
	293	+ AddSkyboxButton("persson", "clouds1", row2);
	294	+ AddSkyboxButton("penguins", "wrath", row2);
	295	+
	296	+ AddSkyboxButton("persson", "FishermansBastion", row3);
	297	+ AddSkyboxButton("persson", "HeroesSquare", row3);
	298	+ AddSkyboxButton("indoors", "DallasW", row3);
	299	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
	300	+
	301	+ AddSkyboxButton("persson", "LancellottiChapel", row4);
	302	+ AddSkyboxButton("persson", "PereaBeach1", row4);
	303	+ AddSkyboxButton("persson", "PereaBeach2", row4);
	304	+ AddSkyboxButton("persson", "redeclipse", row4);
	305	+
	306	+ AddSkyboxButton("daz", "Greenlands", row5);
	307	+ AddSkyboxButton("daz", "Oasis", row5);
	308	+ AddSkyboxButton("elyvisions", "arch3", row5);
	309	+ AddSkyboxButton("elyvisions", "calm_sea", row5);
	310	+
	311	+ AddSkyboxButton("elyvisions", "rainbow", row6);
	312	+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
	313	+ AddSkyboxButton("elyvisions", "heaven", row6);
	314	+ AddSkyboxButton("elyvisions", "hot", row6);
	315	+
	316	+ tab0.add(row0);
	317	+ tab0.add(row1);
	318	+ tab0.add(row2);
	319	+ tab0.add(row3);
	320	+ tab0.add(row4);
	321	+ tab0.add(row5);
	322	+ tab0.add(row6);
	323	+
	324	+ for (int i=5; --i>=0;)
	325	+ {
	326	+ //oe.toolboxPanel.Return();
	327	+ //tab0.add(new cGridBag());
	328	+ }
	329	+ }
	330	+
	331	+ public void ChangeSkybox(String skybox)
	332	+ {
	333	+ if (skybox.endsWith("/"))
	334	+ {
	335	+ group.skyboxname = null;
	336	+ group.skyboxext = null;
	337	+ cameraView.repaint();
	338	+ }
	339	+ else
	340	+ {
	341	+ //cameraView.envyoff = false;
	342	+ group.skyboxname = skybox;
	343	+ group.skyboxext = "jpg";
	344	+ cameraView.repaint();
	345	+ }
	346	+ }
	347	+
	348	+ public void CreateSkyboxPanel(cGridBag skyboxPanel)
	349	+ {
	350	+ JTabbedPane skyboxpane = new JTabbedPane(JTabbedPane.LEFT);
	351	+
	352	+ AddSkyboxTab0(skyboxpane);
	353	+ AddSkyboxTab1(skyboxpane);
	354	+ AddSkyboxTab2(skyboxpane);
	355	+ AddSkyboxTab3(skyboxpane);
	356	+
	357	+ skyboxPanel.add(skyboxpane);
	358	+ }
	359	+
	360	+ public void ChangeTexture(String texture)
	361	+ {
	362	+ for (int i=0; i<group.selection.size(); i++)
	363	+ {
	364	+ Object3D obj = group.selection.get(i);
	365	+ obj.SetPigmentTexture("@" + texture);
	366	+ }
	367	+
	368	+ refreshContents();
	369	+ }
	370	+
26	371	//ObjEditor objEditor;
27	372	public void closeUI2()
28	373	{
..	..	@@ -60,6 +405,16 @@
60	405	this.copy = this.group = group;
61	406	//selectees = this.group.selectees;
62	407
	408	+ assert(false);
	409	+
	410	+// if (copy.versionlist == null)
	411	+// {
	412	+// copy.versionlist = new Object3D[100];
	413	+// copy.versionindex = -1;
	414	+//
	415	+// //Save(true);
	416	+// }
	417	+
63	418	if(ui)
64	419	SetupUI(objEditor);
65	420	}
..	..	@@ -74,16 +429,28 @@
74	429	this.copy = this.group = copy;
75	430	//selectees = this.group.selectees;
76	431
77		- SetupMenu2(objEditor);
	432	+ SetupMenu2(this); //objEditor);
78	433	SetupUI2(objEditor);
79	434	objEditor.SetupUI(true);
80	435	SetupViews(objEditor);
81	436
82	437	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	438	+
	439	+// if (copy.versionlist == null)
	440	+// {
	441	+// copy.versionlist = new Object3D[100];
	442	+// copy.versionindex = -1;
	443	+//
	444	+// //Save(true);
	445	+// }
83	446	}
84	447
85	448	void CloneSelection(boolean supports)
86	449	{
	450	+ if (Globals.REPLACEONMAKE)
	451	+ Save();
	452	+ boolean keep = Globals.REPLACEONMAKE;
	453	+ Globals.REPLACEONMAKE = false;
87	454	// Object3D keep = GrafreeD.clipboard;
88	455	//Object3D obj;
89	456	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,18 +461,19 @@
94	461
95	462	makeSomething(clone, i==group.selection.size()-1);
96	463	}
	464	+ Globals.REPLACEONMAKE = keep;
97	465	}
98	466
99	467	void CloneClipboard(boolean supports)
100	468	{
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));
	469	+ assert(Grafreed.clipboard.parent == null);
	470	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	471	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	472	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	473	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
106	474	else
107		- makeSomething(CloneObject(GrafreeD.clipboard, false));
108		- GrafreeD.clipboard.get(0).parent = keepparent;
	475	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	476	+ Grafreed.clipboard.get(0).parent = keepparent;
109	477	}
110	478
111	479	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -119,7 +487,7 @@
119	487	// obj.support = null;
120	488	if (!supports)
121	489	obj.SaveSupports();
122		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	490	+ Object3D clone = (Object3D)Grafreed.clone(obj);
123	491	obj.parent = parent;
124	492	// obj.support = support;
125	493	// clone.support = support; // aout 2013
..	..	@@ -148,58 +516,153 @@
148	516
149	517	//JTextField nameField;
150	518
151		- void SetupMenu2(ObjEditor oe)
	519	+ void SetupMenu2(GroupEditor oe)
152	520	{
153		- oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
154		- //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
155		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
156		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
157		- oe.cameraMenu.add("-");
158		- openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
159		- openWindowItem.addActionListener(this);
160		- editLeafItem.addActionListener(this);
161		- lookAtItem.addActionListener(this);
162		- //lookFromItem.addActinoListener(this);
163		- //switchItem.addActionListener(this);
	521	+ oe.jTree = new cTree();
	522	+
164	523	Menu menu;
165	524	oe.menuBar.add(menu = new Menu("Edit"));
166	525	//editItem = menu.add(new MenuItem("Edit"));
167	526	//editItem.addActionListener(this);
168		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	527	+
	528	+// undoItem = menu.add(new MenuItem("Undo"));
	529	+// undoItem.addActionListener(this);
	530	+// redoItem = menu.add(new MenuItem("Redo"));
	531	+// redoItem.addActionListener(this);
	532	+// menu.add("-");
	533	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
169	534	duplicateItem.addActionListener(this);
170		- menu.add("-");
171		- cloneItem = menu.add(new MenuItem("Clone"));
	535	+
	536	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
172	537	cloneItem.addActionListener(this);
	538	+ //if (Globals.ADVANCED)
	539	+ {
173	540	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
174	541	cloneSupportItem.addActionListener(this);
	542	+ }
	543	+ oe.jTree.popup.addSeparator();
175	544	menu.add("-");
176		- cutItem = menu.add(new MenuItem("Cut"));
	545	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
177	546	cutItem.addActionListener(this);
178		- copyItem = menu.add(new MenuItem("Copy"));
	547	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
179	548	copyItem.addActionListener(this);
180	549	pasteItem = menu.add(new MenuItem("Paste"));
181	550	pasteItem.addActionListener(this);
182		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	551	+
	552	+ oe.jTree.popup.addSeparator();
	553	+ //menu.add("-");
	554	+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
	555	+ pasteIntoItem.addActionListener(this);
	556	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
183	557	pasteLinkItem.addActionListener(this);
184		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	558	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
185	559	pasteCloneItem.addActionListener(this);
186		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	560	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
187	561	// pasteExpandItem.addActionListener(this);
188		- clearItem = menu.add(new MenuItem("Clear"));
189		- clearItem.addActionListener(this);
	562	+ //menu.add("-");
	563	+ oe.jTree.popup.addSeparator();
	564	+
	565	+ if (Globals.ADVANCED)
	566	+ {
	567	+ // Deletes the cameras...
190	568	clearAllItem = menu.add(new MenuItem("Clear All"));
191	569	clearAllItem.addActionListener(this);
	570	+ }
	571	+
	572	+ menuBar.add(cameraMenu = new Menu("View"));
	573	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	574	+ //zBufferItem.addActionListener(this);
	575	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	576	+ //normalLensItem.addActionListener(this);
	577	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	578	+ restoreCameraItem.addActionListener(this);
	579	+
	580	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	581	+// toggleFullScreenItem.addItemListener(this);
	582	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	583	+// cameraMenu.add("-");
	584	+//
	585	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	586	+// toggleTextureItem.addItemListener(this);
	587	+// toggleTextureItem.setState(CameraPane.textureon);
	588	+//
	589	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	590	+// toggleSwitchItem.addItemListener(this);
	591	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	592	+
	593	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	594	+ toggleHandleItem.addItemListener(this);
	595	+ toggleHandleItem.setState(CameraPane.HANDLES);
	596	+
	597	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	598	+ togglePaintItem.addItemListener(this);
	599	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	600	+
	601	+ if (Globals.ADVANCED)
	602	+ {
	603	+ cameraMenu.add("-");
	604	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	605	+ toggleLiveItem.addItemListener(this);
	606	+ toggleLiveItem.setState(Globals.isLIVE());
192	607
	608	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	609	+ stepItem.addActionListener(this);
	610	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	611	+ // toggleDLItem.addItemListener(this);
	612	+ // toggleDLItem.setState(false);
	613	+
	614	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	615	+ toggleRenderItem.addItemListener(this);
	616	+ toggleRenderItem.setState(!CameraPane.frozen);
	617	+
	618	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	619	+ toggleDebugItem.addItemListener(this);
	620	+ toggleDebugItem.setState(Globals.DEBUG);
	621	+
	622	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	623	+ toggleFrustumItem.addItemListener(this);
	624	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	625	+
	626	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	627	+ toggleFootContactItem.addItemListener(this);
	628	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	629	+
	630	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	631	+ toggleTimelineItem.addItemListener(this);
	632	+ }
	633	+
	634	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	635	+// toggleRootItem.addItemListener(this);
	636	+// toggleRootItem.setState(false);
	637	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	638	+// animationItem.addItemListener(this);
	639	+// animationItem.setState(CameraPane.ANIMATION);
	640	+ cameraMenu.add("-");
	641	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	642	+ editCameraItem.addActionListener(this);
	643	+
	644	+ if (Globals.ADVANCED)
	645	+ {
	646	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	647	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	648	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	649	+ oe.cameraMenu.add("-");
	650	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	651	+ openWindowItem.addActionListener(this);
	652	+ lookAtItem.addActionListener(this);
	653	+ //lookFromItem.addActinoListener(this);
	654	+ //switchViewItem.addActionListener(this);
	655	+ }
	656	+
193	657	oe.menuBar.add(menu = new Menu("Setting"));
194		- resetMeshItem = menu.add(new MenuItem("Reset All"));
195		- resetMeshItem.addActionListener(this);
196		- stepAllItem = menu.add(new MenuItem("Step All"));
197		- stepAllItem.addActionListener(this);
	658	+ if (Globals.ADVANCED)
	659	+ {
198	660	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
199	661	revertMeshItem.addActionListener(this);
200	662	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
201	663	resetreferencesItem.addActionListener(this);
202	664	menu.add("-");
	665	+ }
203	666	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
204	667	overwriteGeoItem.addActionListener(this);
205	668	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -211,79 +674,118 @@
211	674	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
212	675	overwriteUVItem.addActionListener(this);
213	676	menu.add("-");
	677	+ if (Globals.ADVANCED)
	678	+ {
214	679	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
215	680	generateMeshItem.addActionListener(this);
216	681	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
217	682	poseMeshItem.addActionListener(this);
218	683	menu.add("-");
	684	+ }
219	685	resetsupportItem = menu.add(new MenuItem("Reset support"));
220	686	resetsupportItem.addActionListener(this);
221	687	linkverticesItem = menu.add(new MenuItem("Link to Support"));
222	688	linkverticesItem.addActionListener(this);
223	689	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
224	690	relinkverticesItem.addActionListener(this);
	691	+
	692	+ if (Globals.ADVANCED)
	693	+ {
225	694	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
226	695	setMasterItem.addActionListener(this);
	696	+ }
227	697
228		- oe.menuBar.add(menu = new Menu("Group"));
229		- grabItem = menu.add(new MenuItem("Grab"));
230		- grabItem.addActionListener(this);
	698	+ oe.menuBar.add(menu = new Menu("Order"));
	699	+
231	700	backItem = menu.add(new MenuItem("Back"));
232	701	backItem.addActionListener(this);
233	702	frontItem = menu.add(new MenuItem("Front"));
234	703	frontItem.addActionListener(this);
235		- compositeItem = menu.add(new MenuItem("Composite"));
236		- compositeItem.addActionListener(this);
237		- hideItem = menu.add(new MenuItem("Hide"));
	704	+// compositeItem = menu.add(new MenuItem("Composite"));
	705	+// compositeItem.addActionListener(this);
	706	+
	707	+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
	708	+ grabItem.addActionListener(this);
	709	+
	710	+ if (Globals.ADVANCED)
	711	+ {
	712	+ hideItem = menu.add(new MenuItem("Hidden Group"));
238	713	hideItem.addActionListener(this);
239		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	714	+ }
	715	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
240	716	ungroupItem.addActionListener(this);
241		- menu.add("-");
242		- randomItem = menu.add(new MenuItem("Switch node"));
243		- randomItem.addActionListener(this);
	717	+
	718	+ oe.jTree.popup.addSeparator();
	719	+
	720	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	721	+ deleteItem.addActionListener(this);
	722	+
	723	+// menu.add("-");
	724	+//
	725	+// switchItem = menu.add(new MenuItem("Switch node"));
	726	+// switchItem.addActionListener(this);
	727	+ if (Globals.ADVANCED)
	728	+ {
244	729	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
245	730	switchGeoItem.addActionListener(this);
246	731	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
247	732	switchTransfoItem.addActionListener(this);
	733	+ morphItem = menu.add(new MenuItem("Morph Group"));
	734	+ morphItem.addActionListener(this);
	735	+
	736	+ menu.add("-");
248	737	physicsItem = menu.add(new MenuItem("Physics"));
249	738	physicsItem.addActionListener(this);
250	739	frameselectorItem = menu.add(new MenuItem("Frame Selector"));
251	740	frameselectorItem.addActionListener(this);
252		- morphItem = menu.add(new MenuItem("Morph"));
253		- morphItem.addActionListener(this);
254	741	scriptNodeItem = menu.add(new MenuItem("Script Node"));
255	742	scriptNodeItem.addActionListener(this);
256		- cameraItem = menu.add(new MenuItem("Camera"));
257		- cameraItem.addActionListener(this);
	743	+ }
258	744
259	745	oe.menuBar.add(menu = new Menu("Object"));
260		- textureItem = menu.add(new MenuItem("Texture"));
261		- textureItem.addActionListener(this);
	746	+// textureItem = menu.add(new MenuItem("Texture"));
	747	+// textureItem.addActionListener(this);
262	748	billboardItem = menu.add(new MenuItem("Billboard"));
263	749	billboardItem.addActionListener(this);
264	750	csgItem = menu.add(new MenuItem("CSG"));
265	751	csgItem.addActionListener(this);
266		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	752	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
267	753	shadowXItem.addActionListener(this);
268		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	754	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
269	755	shadowYItem.addActionListener(this);
270		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	756	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
271	757	shadowZItem.addActionListener(this);
	758	+
	759	+ attributeItem = menu.add(new MenuItem("Attribute"));
	760	+ attributeItem.addActionListener(this);
	761	+ if (Globals.ADVANCED)
	762	+ {
	763	+ menu.add("-");
272	764	linkerItem = menu.add(new MenuItem("Linker"));
273	765	linkerItem.addActionListener(this);
274	766	templateItem = menu.add(new MenuItem("Template"));
275	767	templateItem.addActionListener(this);
276		- attributeItem = menu.add(new MenuItem("Attribute"));
277		- attributeItem.addActionListener(this);
278	768	pointflowItem = menu.add(new MenuItem("Point Flow"));
279	769	pointflowItem.addActionListener(this);
	770	+ }
	771	+ menu.add("-");
	772	+ textureRatioRItem = menu.add(new MenuItem("Texture Ratio Red"));
	773	+ textureRatioRItem.addActionListener(this);
	774	+ textureRatioGItem = menu.add(new MenuItem("Texture Ratio Green"));
	775	+ textureRatioGItem.addActionListener(this);
	776	+ textureRatioBItem = menu.add(new MenuItem("Texture Ratio Blue"));
	777	+ textureRatioBItem.addActionListener(this);
280	778	menu.add("-");
281	779	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
282	780	resetTransformItem.addActionListener(this);
283	781	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
284	782	resetCentroidItem.addActionListener(this);
285		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
286		- transformgeometryItem.addActionListener(this);
	783	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XZ"));
	784	+ resetCentroidXZItem.addActionListener(this);
	785	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	786	+ transformGeometryItem.addActionListener(this);
	787	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	788	+ transformChildrenItem.addActionListener(this);
287	789
288	790	oe.menuBar.add(menu = new Menu("Geometry"));
289	791	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -294,8 +796,11 @@
294	796	genNormalsCADItem.addActionListener(this);
295	797	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
296	798	genNormalsMESHItem.addActionListener(this);
297		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	799	+ if (Globals.ADVANCED)
	800	+ {
	801	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
298	802	genNormalsMINEItem.addActionListener(this);
	803	+ }
299	804	stripifyItem = menu.add(new MenuItem("Stripify"));
300	805	stripifyItem.addActionListener(this);
301	806	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -317,31 +822,52 @@
317	822	reduce34MeshItem.addActionListener(this);
318	823	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
319	824	increaseMeshItem.addActionListener(this);
320		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
321		- smoothMeshItem.addActionListener(this);
322	825	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
323	826	clipMeshItem.addActionListener(this);
	827	+
	828	+ if (Globals.ADVANCED)
	829	+ {
	830	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	831	+ smoothMeshItem.addActionListener(this);
	832	+ }
324	833
325	834	oe.menuBar.add(menu = new Menu("Attributes"));
	835	+ clearVersionsItem = menu.add(new MenuItem("Clear Versions"));
	836	+ clearVersionsItem.addActionListener(this);
326	837	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
327	838	clearMaterialsItem.addActionListener(this);
	839	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	840	+ resetAllItem.addActionListener(this);
	841	+ stepAllItem = menu.add(new MenuItem("Step All"));
	842	+ stepAllItem.addActionListener(this);
328	843	menu.add("-");
329	844	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
330	845	liveleavesItem.addActionListener(this);
331	846	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
332	847	unliveleavesItem.addActionListener(this);
	848	+ if (Globals.ADVANCED)
	849	+ {
333	850	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
334	851	supportleavesItem.addActionListener(this);
335	852	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
336	853	unsupportleavesItem.addActionListener(this);
	854	+ }
337	855	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
338	856	hideleavesItem.addActionListener(this);
339	857	showleavesItem = menu.add(new MenuItem("Show Leaves"));
340	858	showleavesItem.addActionListener(this);
341		- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
	859	+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
342	860	markleavesItem.addActionListener(this);
343		- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
	861	+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
344	862	unmarkleavesItem.addActionListener(this);
	863	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	864	+ rewindleavesItem.addActionListener(this);
	865	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	866	+ unrewindleavesItem.addActionListener(this);
	867	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	868	+ randomleavesItem.addActionListener(this);
	869	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	870	+ unrandomleavesItem.addActionListener(this);
345	871	menu.add("-");
346	872	flipVItem = menu.add(new MenuItem("Flip V"));
347	873	flipVItem.addActionListener(this);
..	..	@@ -367,53 +893,135 @@
367	893	attachBumpItem.addActionListener(this);
368	894	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
369	895	pigmentBumpItem.addActionListener(this);
	896	+ //embedTexturesItem
370	897	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
371	898	detachPigmentItem.addActionListener(this);
372	899	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
373	900	detachBumpItem.addActionListener(this);
	901	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	902	+ embedTexturesItem.addActionListener(this);
	903	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	904	+ deEmbedTexturesItem.addActionListener(this);
374	905	menu.add("-");
375	906	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
376	907	sortbysizeItem.addActionListener(this);
377	908	sortbynameItem = menu.add(new MenuItem("Sort by name"));
378	909	sortbynameItem.addActionListener(this);
379	910	menu.add("-");
	911	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	912	+ shareGeometriesItem.addActionListener(this);
	913	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	914	+ mergeGeometriesItem.addActionListener(this);
	915	+ menu.add("-");
	916	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	917	+ editLeafItem.addActionListener(this);
	918	+ if (Globals.ADVANCED)
	919	+ {
	920	+ // Pretty much the same as duplicate and clone.
380	921	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
381	922	extractGeometriesItem.addActionListener(this);
382	923	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
383	924	cloneGeometriesItem.addActionListener(this);
384		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
385		- shareGeometriesItem.addActionListener(this);
386		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
387		- mergeGeometriesItem.addActionListener(this);
	925	+ }
388	926
389	927	oe.menuBar.add(menu = new Menu("Insert"));
390	928	buildCreateMenu(menu);
391	929
392		-
393		- oe.menuBar.add(menu = new Menu("Include"));
394		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
395		- importGFDItem.addActionListener(this);
396		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
397		- importVRMLX3DItem.addActionListener(this);
398		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
399		- importOBJItem.addActionListener(this);
400		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
401		- import3DSItem.addActionListener(this);
402		-
403	930	oe.menuBar.add(menu = new Menu("Tools"));
404	931	buildToolsMenu(menu);
405	932	}
406	933
	934	+ JTabbedPane resourcecontainer;
	935	+ cGridBag currenttab;
	936	+ //boolean added; // patch for jar
	937	+
	938	+ int totalcount = 0;
	939	+
	940	+ int tabcount = 0;
	941	+ int colcount = 0;
	942	+ int rowcount = 0;
	943	+ int texturecount = 0;
	944	+
	945	+ int columns = 5;
	946	+ int rows = 7;
	947	+
	948	+ public void ResourceCallBack(String[] path)
	949	+ {
	950	+// for (int i = 0; i < path.length; i++)
	951	+// System.out.print(path[i] + "/");
	952	+// System.out.println();
	953	+
	954	+ if (//rowcount == 0 \|\|
	955	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	956	+ {
	957	+ currenttab = new cGridBag();
	958	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	959	+ currenttab.setName(tabname);
	960	+ //added = false;
	961	+ resourcecontainer.add(currenttab);
	962	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	963	+ rowcount = 1;
	964	+ colcount = 0;
	965	+ texturecount = 0;
	966	+ }
	967	+
	968	+ if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") \|\| path[2].toLowerCase().endsWith(".png")))
	969	+ {
	970	+ //if (!added)
	971	+ {
	972	+ //added = true;
	973	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	974	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	975	+ }
	976	+
	977	+ AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
	978	+ totalcount++;
	979	+
	980	+ if (++colcount >= columns)
	981	+ {
	982	+ colcount = 0;
	983	+ currenttab.Return();
	984	+
	985	+ if (rowcount++ >= rows)
	986	+ {
	987	+ rowcount = 0;
	988	+ }
	989	+ }
	990	+ }
	991	+ else
	992	+ {
	993	+// if (!path[path.length-1].equals("icons"))
	994	+// resourcecontainer.Return();
	995	+ }
	996	+ }
	997	+
	998	+ void CreateTexturePanel(cGridBag container)
	999	+ {
	1000	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	1001	+ container.add(resourcecontainer);
	1002	+
	1003	+ Grafreed.ParseResources("textures", this);
	1004	+
	1005	+ // 935. System.out.println("Total = " + totalcount);
	1006	+ }
	1007	+
407	1008	void SetupUI2(ObjEditor oe)
408	1009	{
	1010	+ // June 2019
	1011	+ if (oe == null)
	1012	+ {
	1013	+ //super.SetupUI2(this);
	1014	+ //return;
	1015	+ }
	1016	+
	1017	+ if (copy != group)
	1018	+ {
	1019	+ //super.SetupUI2(this);
	1020	+ }
	1021	+
409	1022	//new Exception().printStackTrace();
410	1023
411	1024	oe.radioPanel = new JPanel(new GridBagLayout());
412		- oe.aConstraints.weightx = 1;
413		- oe.aConstraints.weighty = 0;
414		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
415		- oe.aConstraints.gridwidth = 100;
416		- oe.aConstraints.gridheight = 1;
417	1025	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
418	1026
419	1027	oe.buttonGroup = new ButtonGroup();
..	..	@@ -434,93 +1042,268 @@
434	1042	oe.radioPanel.add(dummyButton);
435	1043	oe.buttonGroup.add(dummyButton);
436	1044	*/
	1045	+ cGridBag versionManagerPanel = new cGridBag();
	1046	+
	1047	+ versionManagerPanel.preferredHeight = 4;
	1048	+
437	1049	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
438	1050
439		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
440		- liveCB.setToolTipText("Enabled animation");
	1051	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1052	+ //minButton.setToolTipText("Minimize window");
	1053	+ //minButton.addActionListener(this);
	1054	+
	1055	+ if (Globals.ADVANCED)
	1056	+ {
	1057	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1058	+// maxButton.setToolTipText("Maximize window");
	1059	+// maxButton.addActionListener(this);
	1060	+ }
	1061	+
	1062	+ cButton gcButton;
	1063	+
	1064	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1065	+// gcButton.setToolTipText("Garbage collect");
	1066	+// gcButton.addActionListener(new ActionListener()
	1067	+// {
	1068	+// public void actionPerformed(ActionEvent e)
	1069	+// {
	1070	+// System.gc();
	1071	+// }
	1072	+// });
	1073	+
	1074	+ oe.toolbarPanel.add(fullScreenButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1075	+ fullScreenButton.setToolTipText("Full-screen window");
	1076	+ fullScreenButton.addActionListener(this);
	1077	+
	1078	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1079	+ collapseButton.setToolTipText("Collapse toolbar");
	1080	+ collapseButton.addActionListener(this);
	1081	+
	1082	+// oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1083	+// maximize3DButton.setToolTipText("Maximize 3D view");
	1084	+// maximize3DButton.addActionListener(this);
	1085	+
	1086	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1087	+ twoButton.setToolTipText("Show 3D view only");
	1088	+ twoButton.addActionListener(this);
	1089	+ this.fullscreenLayout = twoButton;
	1090	+
	1091	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1092	+ threeButton.setToolTipText("Show controls and 3D view");
	1093	+ threeButton.addActionListener(this);
	1094	+ if (Globals.ADVANCED)
	1095	+ {
	1096	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1097	+ sixButton.setToolTipText("Show 3D view and controls");
	1098	+ sixButton.addActionListener(this);
	1099	+ }
	1100	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1101	+// sevenButton.setToolTipText("3-column layout");
	1102	+// sevenButton.addActionListener(this);
	1103	+ //
	1104	+
	1105	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1106	+ screenfitButton.setToolTipText("Screen fit");
	1107	+ screenfitButton.addActionListener(this);
	1108	+
	1109	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1110	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1111	+ restoreCameraButton.addActionListener(this);
	1112	+
	1113	+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1114	+ saveVersionButton.setToolTipText("Duplicate current version");
	1115	+ saveVersionButton.addActionListener(this);
	1116	+
	1117	+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1118	+ deleteVersionButton.setToolTipText("Delete current version");
	1119	+ deleteVersionButton.addActionListener(this);
	1120	+ deleteVersionButton.setEnabled(false);
	1121	+
	1122	+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1123	+ previousVersionButton.setToolTipText("Previous version");
	1124	+ previousVersionButton.addActionListener(this);
	1125	+ previousVersionButton.setEnabled(false);
	1126	+
	1127	+ cGridBag updown = new cGridBag().setVertical(true);
	1128	+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1129	+ restoreButton.setToolTipText("Undo (restore current version)");
	1130	+ restoreButton.addActionListener(this);
	1131	+ restoreButton.setEnabled(false);
	1132	+
	1133	+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1134	+ replaceButton.setToolTipText("Save (replace current version)");
	1135	+ replaceButton.addActionListener(this);
	1136	+ replaceButton.setEnabled(false);
	1137	+
	1138	+ versionManagerPanel.add(updown);
	1139	+
	1140	+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1141	+ nextVersionButton.setToolTipText("Next version");
	1142	+ nextVersionButton.addActionListener(this);
	1143	+ nextVersionButton.setEnabled(false);
	1144	+
	1145	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1146	+ oneStepButton.setToolTipText("Animate one step forward");
	1147	+ oneStepButton.addActionListener(this);
	1148	+
	1149	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1150	+ liveCB.setToolTipText("Enable animation");
441	1151	liveCB.addItemListener(this);
442	1152
443		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	1153	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
444	1154	fastCB.setToolTipText("Fast mode");
445	1155	fastCB.addItemListener(this);
446	1156
447		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
448		- trackCB.setToolTipText("Enable tracking");
449		- trackCB.addItemListener(this);
450		-
451		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
452		- screenfitButton.setToolTipText("Screen fit");
453		- screenfitButton.addActionListener(this);
	1157	+ //oe.toolboxPanel.Return();
	1158	+
	1159	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1160	+// trackCB.setToolTipText("Enable tracking");
	1161	+// trackCB.addItemListener(this);
454	1162
455	1163	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
456	1164	// screenfitpointButton.addActionListener(this);
457	1165
458	1166	if (Globals.ADVANCED)
459	1167	{
460		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1168	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
461	1169	snapobjectButton.addActionListener(this);
462	1170	snapobjectButton.setToolTipText("Snap Object");
	1171	+
	1172	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1173	+ fourButton.addActionListener(this);
	1174	+ fourButton.setToolTipText("Show control panel only");
463	1175	}
464	1176
465		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
466		- flashSelectionButton.setToolTipText("Show selection");
467		- flashSelectionButton.addActionListener(this);
	1177	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
468	1178
469		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
470		-
471		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
472		- twoButton.setToolTipText("Show center view only");
473		- twoButton.addActionListener(this);
474		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
475		- fourButton.addActionListener(this);
476		- fourButton.setToolTipText("Show left panel only");
477		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
478		- sixButton.setToolTipText("2-column layout left");
479		- sixButton.addActionListener(this);
480		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
481		- threeButton.setToolTipText("2-column layout right");
482		- threeButton.addActionListener(this);
483		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
484		- sevenButton.setToolTipText("3-column layout");
485		- sevenButton.addActionListener(this);
486		- //
487	1179
488		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
489		- rootButton.setToolTipText("Edit selection in new tab");
	1180	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1181	+ rootButton.setToolTipText("Open selection in new tab");
490	1182	rootButton.addActionListener(this);
491	1183
492		- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1184	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
493	1185	closeButton.setToolTipText("Close tab");
494	1186	closeButton.addActionListener(this);
495	1187	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
496	1188	//clearButton.addActionListener(this);
497		-
498		- cGridBag commandsPanel = new cGridBag();
	1189	+
	1190	+ cGridBag row1 = new cGridBag();
499	1191
500		- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
501		- editButton.setToolTipText("Edit selection");
	1192	+ // INSERT
	1193	+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1194	+ gridButton.setToolTipText("Create ground");
	1195	+ gridButton.addActionListener(this);
	1196	+
	1197	+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1198	+ boxButton.setToolTipText("Create box");
	1199	+ boxButton.addActionListener(this);
	1200	+
	1201	+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1202	+ superButton.setToolTipText("Create superellipsoid");
	1203	+ superButton.addActionListener(this);
	1204	+
	1205	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1206	+ sphereButton.setToolTipText("Create sphere");
	1207	+ sphereButton.addActionListener(this);
	1208	+
	1209	+ row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1210	+ coneButton.setToolTipText("Create cone");
	1211	+ coneButton.addActionListener(this);
	1212	+
	1213	+ row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1214	+ torusButton.setToolTipText("Create torus");
	1215	+ torusButton.addActionListener(this);
	1216	+
	1217	+ if (false) //Globals.ADVANCED)
	1218	+ {
	1219	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1220	+ kleinButton.setToolTipText("Create Klein bottle");
	1221	+ kleinButton.addActionListener(this);
	1222	+ }
	1223	+
	1224	+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1225	+ particlesButton.setToolTipText("Create particle system");
	1226	+ particlesButton.addActionListener(this);
	1227	+
	1228	+ oe.toolboxPanel.add(row1);
	1229	+
	1230	+ cGridBag row2 = new cGridBag();
	1231	+
	1232	+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1233	+ groupButton.setToolTipText("Create group");
	1234	+ groupButton.addActionListener(this);
	1235	+
	1236	+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1237	+ compositeButton.setToolTipText("Create composite");
	1238	+ compositeButton.addActionListener(this);
	1239	+
	1240	+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1241	+ switchButton.setToolTipText("Create item switcher");
	1242	+ switchButton.addActionListener(this);
	1243	+
	1244	+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1245	+ loopButton.setToolTipText("Create loop");
	1246	+ loopButton.addActionListener(this);
	1247	+
	1248	+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1249	+ textureButton.setToolTipText("Create texture");
	1250	+ textureButton.addActionListener(this);
	1251	+
	1252	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1253	+ overlayButton.setToolTipText("Create overlay");
	1254	+ overlayButton.addActionListener(this);
	1255	+
	1256	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1257	+ lightButton.setToolTipText("Create light");
	1258	+ lightButton.addActionListener(this);
	1259	+
	1260	+ oe.toolboxPanel.add(row2);
	1261	+
	1262	+ cGridBag textures = new cGridBag();
	1263	+
	1264	+ CreateTexturePanel(textures);
	1265	+
	1266	+ int tabCount = resourcecontainer.getTabCount();
	1267	+
	1268	+ if (tabCount > 0)
	1269	+ resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
	1270	+
	1271	+ oe.toolboxPanel.add(textures);
	1272	+
	1273	+ textures.preferredHeight = 100;
	1274	+
	1275	+ CreateSkyboxPanel(oe.skyboxPanel);
	1276	+
	1277	+ // EDIT panel
	1278	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1279	+ editButton.setToolTipText("Pin selection controls");
502	1280	editButton.addActionListener(this);
503	1281
504		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
505		- uneditButton.setToolTipText("Unedit selection");
	1282	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1283	+ uneditButton.setToolTipText("Unpin and remove selection controls");
506	1284	uneditButton.addActionListener(this);
507	1285
508		- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
509		- clearPanelButton.setToolTipText("Clear edit panel");
510		- clearPanelButton.addActionListener(this);
511		-
512		- commandsPanel.add(allParamsButton = new cButton("A", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
513		- allParamsButton.setToolTipText("All params??");
	1286	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1287	+ allParamsButton.setToolTipText("Show all controls");
514	1288	allParamsButton.addActionListener(this);
515	1289
516		- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
517		- unselectButton.setToolTipText("Unselect");
518		- unselectButton.addActionListener(this);
	1290	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1291	+ clearPanelButton.setToolTipText("Clear all controls");
	1292	+ clearPanelButton.addActionListener(this);
519	1293
520		- commandsPanel.preferredHeight = 1;
	1294	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1295	+ //unselectButton.setToolTipText("Unselect");
	1296	+ //unselectButton.addActionListener(this);
	1297	+
	1298	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1299	+ flashSelectionButton.setToolTipText("Highlight selection");
	1300	+ flashSelectionButton.addActionListener(this);
521	1301
522		- oe.treePanel.add(commandsPanel);
523		- oe.treePanel.Return();
	1302	+ editCommandsPanel.preferredHeight = 1;
	1303	+
	1304	+ SetPinStates(false);
	1305	+// oe.treePanel.add(commandsPanel);
	1306	+// oe.treePanel.Return();
524	1307
525	1308	// oe.aConstraints.gridx += 1;
526	1309	// oe.aConstraints.weighty = 0;
..	..	@@ -535,34 +1318,24 @@
535	1318
536	1319	cGridBag jSPPanel = new cGridBag();
537	1320
	1321	+ jSPPanel.preferredHeight = 20;
	1322	+
538	1323	JScrollPane jSP;
539	1324	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
540		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1325	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
541	1326	ResetModel();
542	1327
543	1328	oe.treePanel.add(jSPPanel);
544	1329	oe.treePanel.Return();
545	1330
546		- cGridBag copyOptionsPanel = new cGridBag();
547		-
548		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
549		- colorCB.setToolTipText("Copy color when dropped");
550		- colorCB.addItemListener(this);
551		-
552		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
553		- materialCB.setToolTipText("Copy material when dropped");
554		- materialCB.addItemListener(this);
555		-
556		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
557		- textureCB.setToolTipText("Copy texture when dropped");
558		- textureCB.addItemListener(this);
559		-
560		- copyOptionsPanel.preferredHeight = 1;
561		- oe.treePanel.add(copyOptionsPanel);
	1331	+ oe.treePanel.add(versionManagerPanel);
562	1332	oe.treePanel.Return();
	1333	+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1334	+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
	1335	+ versionSliderPane.preferredHeight = 3;
563	1336
564		-// mainPanel.setDividerLocation(0.5); //1.0);
565		-// mainPanel.setResizeWeight(0.5);
	1337	+// mainPanel.setDividerLocation(0.1); //1.0);
	1338	+ mainPanel.setResizeWeight(0.4);
566	1339
567	1340	//jList.addListSelectionListener(this);
568	1341	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -570,7 +1343,7 @@
570	1343	//jTree.setEditable(true);
571	1344	oe.jTree.setDragEnabled(true);
572	1345	//jTree.setPreferredSize(new Dimension(10,10));
573		- jSP.setPreferredSize(new Dimension(100,200));
	1346	+ //jSP.setPreferredSize(new Dimension(100,200));
574	1347
575	1348	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
576	1349
..	..	@@ -582,19 +1355,49 @@
582	1355	dgr.addDragGestureListener(this);
583	1356	}catch(Exception e) {}
584	1357	*/
585		- radio.layout = sevenButton;
	1358	+ radio.layout = threeButton; // sixButton;
586	1359	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
587	1360	}
588	1361
589	1362	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
590	1363	{
591		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
592		- supportCB.setToolTipText("Enabled rigging");
593		- supportCB.addItemListener(this);
	1364	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1365	+ colorCB.setToolTipText("Copy color when dropped");
	1366	+ colorCB.addItemListener(this);
	1367	+
	1368	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1369	+ materialCB.setToolTipText("Copy material when dropped");
	1370	+ materialCB.addItemListener(this);
	1371	+
	1372	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1373	+ textureCB.setToolTipText("Copy texture when dropped");
	1374	+ textureCB.addItemListener(this);
	1375	+
	1376	+ panel.Return();
	1377	+
	1378	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	1379	+ boxCB.setToolTipText("Display bounding boxes");
	1380	+ boxCB.addItemListener(this);
	1381	+
	1382	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	1383	+ zoomBoxCB.setToolTipText("Display only for wheel");
	1384	+ zoomBoxCB.addItemListener(this);
	1385	+
	1386	+ if (true) // Globals.ADVANCED)
	1387	+ {
	1388	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1389	+// supportCB.setToolTipText("Enable rigging");
	1390	+// supportCB.addItemListener(this);
	1391	+
	1392	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1393	+ freezeCB.setToolTipText("Fast moving camera");
	1394	+ freezeCB.addItemListener(this);
594	1395
595	1396	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
596	1397	// localCB.addItemListener(this);
597	1398
	1399	+ panel.Return();
	1400	+
598	1401	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
599	1402	crowdCB.setToolTipText("Used for crowds");
600	1403	crowdCB.addItemListener(this);
..	..	@@ -603,22 +1406,19 @@
603	1406	smoothCB.setToolTipText("Snapping delay");
604	1407	smoothCB.addItemListener(this);
605	1408
606		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
607		- slowCB.setToolTipText("Smooth interpolation");
608		- slowCB.addItemListener(this);
	1409	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1410	+// slowCB.setToolTipText("Smooth interpolation");
	1411	+// slowCB.addItemListener(this);
	1412	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1413	+ minshaderCB.setToolTipText("Minimal fast shader");
	1414	+ minshaderCB.addItemListener(this);
609	1415
610		- panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
611		- boxCB.setToolTipText("Display bounding boxes");
612		- boxCB.addItemListener(this);
613		-
614		- panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
615		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
616		- zoomBoxCB.addItemListener(this);
617		-
618	1416	// constraints.gridy += 1;
619	1417	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
620	1418	// speakerMocapCB.addItemListener(this);
621	1419
	1420	+ panel.Return();
	1421	+
622	1422	if (false)
623	1423	{
624	1424	// handled in scripts
..	..	@@ -633,65 +1433,126 @@
633	1433	//constraints.gridy += 1;
634	1434	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
635	1435	smoothfocusCB.addItemListener(this);
	1436	+ panel.Return();
636	1437	}
637	1438
638	1439	//constraints.gridx += 1;
639	1440	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
640	1441	// debugCB.addItemListener(this);
641	1442
	1443	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1444	+ trackCB.setToolTipText("Enable tracking target");
	1445	+ trackCB.addItemListener(this);
	1446	+
642	1447	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1448	+ oeilCB.setToolTipText("Move camera when tracking");
643	1449	oeilCB.addItemListener(this);
644	1450
	1451	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1452	+ shadowCB.setToolTipText("When live compute shadows");
	1453	+ shadowCB.addItemListener(this);
	1454	+
	1455	+ panel.Return();
	1456	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1457	+ toggleTextureCB.setToolTipText("Load textures");
	1458	+ toggleTextureCB.addItemListener(this);
	1459	+
	1460	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1461	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1462	+ toggleSwitchCB.addItemListener(this);
	1463	+
	1464	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1465	+ autokeepCB.setToolTipText("On structure change");
	1466	+ autokeepCB.addItemListener(this);
	1467	+
	1468	+ panel.Return();
	1469	+ if (Globals.ADVANCED)
	1470	+ {
645	1471	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
646	1472	lookAtCB.setToolTipText("Look-at target");
647	1473	lookAtCB.addItemListener(this);
	1474	+ }
	1475	+
	1476	+ }
648	1477
649	1478	cGridBag fill = new cGridBag();
650		-
651	1479	fill.preferredHeight = 200;
	1480	+ cGridBag fill2 = new cGridBag();
	1481	+ fill2.preferredHeight = 200;
	1482	+ cGridBag fill3 = new cGridBag();
	1483	+ fill3.preferredHeight = 200;
652	1484
653	1485	panel.add(fill);
	1486	+ panel.add(fill2);
	1487	+ panel.add(fill3);
654	1488
655	1489	}
656	1490
657	1491	void EditObject(Object3D obj)
658	1492	{
	1493	+ //assert(obj instanceof Composite);
	1494	+
	1495	+// if (obj.versionlist == null)
	1496	+// {
	1497	+// obj.versionlist = new Object3D[100];
	1498	+// obj.versionindex = -1;
	1499	+// }
	1500	+
659	1501	cRadio radioButton = new cRadio(obj.name);
	1502	+
	1503	+ // June 2019. Patch to avoid bug with transparency.
	1504	+ radioButton.hadMaterial = obj.material != null;
	1505	+ if (!radioButton.hadMaterial)
	1506	+ {
	1507	+ obj.material = new cMaterial();
	1508	+ }
	1509	+
660	1510	radioButton.SetObject(obj);
661		- radioButton.layout = sevenButton;
	1511	+ radioButton.layout = threeButton; // sixButton;
662	1512	radioButton.SetCamera(cameraView.renderCamera, false);
663	1513	radioButton.addActionListener(this);
664	1514	radioPanel.add(radioButton);
665	1515	buttonGroup.add(radioButton);
666	1516	radioButton.doClick();
667	1517	}
	1518	+
668	1519	void SetupViews(ObjEditor oe)
669	1520	{
	1521	+ theFrame = this;
	1522	+
670	1523	oe.SetupViews();
671	1524
	1525	+ if (Globals.DEBUG)
672	1526	System.out.println("SetupViews");
673	1527	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
674	1528	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
675	1529	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
676	1530	}
677	1531
678		- JCheckBox liveCB;
679		- JCheckBox supportCB;
680		- JCheckBox localCB;
681		- JCheckBox crowdCB;
682		- JCheckBox smoothCB;
683		- JCheckBox fastCB;
684		- JCheckBox slowCB;
685		- JCheckBox boxCB;
686		- JCheckBox zoomBoxCB;
687		- JCheckBox trackCB;
688		- JCheckBox smoothfocusCB;
	1532	+ cToggleButton liveCB;
	1533	+ cCheckBox supportCB;
	1534	+ cCheckBox localCB;
	1535	+ cCheckBox crowdCB;
	1536	+ cCheckBox smoothCB;
	1537	+ cCheckBox minshaderCB;
	1538	+
	1539	+ cToggleButton fastCB;
	1540	+ cCheckBox slowCB;
	1541	+ cCheckBox boxCB;
	1542	+ cCheckBox zoomBoxCB;
	1543	+ cCheckBox freezeCB;
	1544	+ //cToggleButton trackCB;
	1545	+ cCheckBox trackCB;
	1546	+ cCheckBox smoothfocusCB;
689	1547	// JCheckBox speakerMocapCB;
690		- JCheckBox speakerCameraCB;
691		- JCheckBox speakerFocusCB;
692		- JCheckBox debugCB;
693		- JCheckBox oeilCB;
694		- JCheckBox lookAtCB;
	1548	+ cCheckBox speakerCameraCB;
	1549	+ cCheckBox speakerFocusCB;
	1550	+ cCheckBox debugCB;
	1551	+
	1552	+ cCheckBox oeilCB;
	1553	+ cCheckBox shadowCB;
	1554	+ cCheckBox autokeepCB;
	1555	+ cCheckBox lookAtCB;
695	1556
696	1557	// static int COLOR = 1;
697	1558	// static int MATERIAL = 2;
..	..	@@ -699,9 +1560,9 @@
699	1560
700	1561	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
701	1562
702		- JCheckBox colorCB;
703		- JCheckBox materialCB;
704		- JCheckBox textureCB;
	1563	+ cCheckBox colorCB;
	1564	+ cCheckBox materialCB;
	1565	+ cCheckBox textureCB;
705	1566
706	1567	public void itemStateChanged(ItemEvent e)
707	1568	{
..	..	@@ -729,6 +1590,7 @@
729	1590	} else if(e.getSource() == liveCB)
730	1591	{
731	1592	cameraView.ToggleLive();
	1593	+ refreshContents(false);
732	1594	}
733	1595	else if(e.getSource() == supportCB)
734	1596	{
..	..	@@ -744,6 +1606,12 @@
744	1606	{
745	1607	cameraView.ToggleInertia();
746	1608	cameraView.repaint();
	1609	+ }
	1610	+ else if(e.getSource() == minshaderCB)
	1611	+ {
	1612	+ Globals.MINSHADER ^= true;
	1613	+ cameraView.programInitialized = false;
	1614	+ cameraView.repaint();
747	1615	}
748	1616	else if(e.getSource() == localCB)
749	1617	{
..	..	@@ -793,6 +1661,18 @@
793	1661	{
794	1662	cameraView.ToggleOeil();
795	1663	}
	1664	+ else if(e.getSource() == shadowCB)
	1665	+ {
	1666	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1667	+ }
	1668	+ else if(e.getSource() == freezeCB)
	1669	+ {
	1670	+ Globals.FREEZEONMOVE ^= true;
	1671	+ }
	1672	+ else if(e.getSource() == autokeepCB)
	1673	+ {
	1674	+ Globals.REPLACEONMAKE ^= true;
	1675	+ }
796	1676	else if(e.getSource() == lookAtCB)
797	1677	{
798	1678	cameraView.ToggleLookAt();
..	..	@@ -809,7 +1689,8 @@
809	1689
810	1690	/**/
811	1691	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
812		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1692	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1693	+ TreePath path = objEditor.jTree.getSelectionPath();
813	1694	if ((path == null) \|\| (path.getPathCount() <= 1)) {
814	1695	// We can't move the root node or an empty selection
815	1696	return;
..	..	@@ -872,8 +1753,6 @@
872	1753	}
873	1754	}
874	1755
875		- String string = (String) object;
876		-
877	1756	System.out.println("Transfer = " + object + "; drop : " + target);
878	1757	// if( object instanceof java.io.File[])
879	1758	// {
..	..	@@ -881,7 +1760,11 @@
881	1760	// objEditor.DropFile((java.io.File[]) object, true);
882	1761	// return;
883	1762	// }
884		- if (string.charAt(0) == '/')
	1763	+
	1764	+ String string = object.toString();
	1765	+
	1766	+ // File path for Mac and Windows
	1767	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
885	1768	{
886	1769	// file(s)
887	1770	String[] names = string.split("\n");
..	..	@@ -908,7 +1791,7 @@
908	1791
909	1792	flashIt = false;
910	1793	CameraPane pane = (CameraPane) target;
911		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1794	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
912	1795	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
913	1796
914	1797	if (group.selection.size() == 1)
..	..	@@ -924,23 +1807,33 @@
924	1807
925	1808	assert target == objEditor.jTree;
926	1809	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1810	+ Object3D destinationLeaf;
927	1811	try {
928		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1812	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
929	1813	} catch (Exception e) {
930	1814	System.out.println("destinationPath : " + destinationPath);
931	1815	return;
932	1816	}
933	1817
934		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1818	+ for (int i=group.selection.size(); --i>=0;)
935	1819	{
	1820	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1821	+
	1822	+ // Cannot move into itself
	1823	+ if (child == destinationLeaf)
	1824	+ return;
	1825	+ }
	1826	+
	1827	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1828	+// {
936	1829	loadClipboard(true);
937	1830	objEditor.jTree.setSelectionPath(destinationPath);
938		- pasteInto(false);
939		- } else {
940		- loadClipboard(false);
941		- objEditor.jTree.setSelectionPath(destinationPath);
942		- pasteInto(false); // true); // ???
943		- }
	1831	+ pasteInto(false, false);
	1832	+// } else {
	1833	+// loadClipboard(false);
	1834	+// objEditor.jTree.setSelectionPath(destinationPath);
	1835	+// pasteInto(false, false); // true); // ???
	1836	+// }
944	1837	}
945	1838	public void dropActionChanged(DropTargetDragEvent dtde)
946	1839	// Called if the user has modified the current drop gesture
..	..	@@ -996,7 +1889,12 @@
996	1889	TreePath path;
997	1890
998	1891	public TransferableTreePath(TreePath tp) {
999		- path = tp;
	1892	+ Object[] objs = new Object[tp.getPathCount()];
	1893	+ for (int i=0; i<objs.length; i++)
	1894	+ {
	1895	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1896	+ }
	1897	+ path = new TreePath(objs);
1000	1898	}
1001	1899
1002	1900	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1045,54 +1943,71 @@
1045	1943	{
1046	1944	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1047	1945	//heightFieldItem.addActionListener(this);
1048		- gridItem = menu.add(new MenuItem("Grid"));
1049		- gridItem.addActionListener(this);
1050		- rectoidItem = menu.add(new MenuItem("Box"));
1051		- rectoidItem.addActionListener(this);
1052		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1053		- ellipsoidItem.addActionListener(this);
1054		- coneItem = menu.add(new MenuItem("Cone"));
1055		- coneItem.addActionListener(this);
1056		- torusItem = menu.add(new MenuItem("Torus"));
1057		- torusItem.addActionListener(this);
1058		- superItem = menu.add(new MenuItem("Superellipsoid"));
1059		- superItem.addActionListener(this);
	1946	+// gridItem = menu.add(new MenuItem("Grid"));
	1947	+// gridItem.addActionListener(this);
	1948	+// rectoidItem = menu.add(new MenuItem("Box"));
	1949	+// rectoidItem.addActionListener(this);
	1950	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1951	+// ellipsoidItem.addActionListener(this);
	1952	+// coneItem = menu.add(new MenuItem("Cone"));
	1953	+// coneItem.addActionListener(this);
	1954	+// torusItem = menu.add(new MenuItem("Torus"));
	1955	+// torusItem.addActionListener(this);
	1956	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1957	+// superItem.addActionListener(this);
	1958	+
	1959	+ cameraItem = menu.add(new MenuItem("Camera"));
	1960	+ cameraItem.addActionListener(this);
	1961	+
	1962	+ if (!Globals.ADVANCED)
	1963	+ {
1060	1964	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1061	1965	kleinItem.addActionListener(this);
1062		- particleItem = menu.add(new MenuItem("Particle system"));
1063		- particleItem.addActionListener(this);
	1966	+ }
	1967	+
	1968	+// particleItem = menu.add(new MenuItem("Particle system"));
	1969	+// particleItem.addActionListener(this);
	1970	+ if (Globals.ADVANCED)
	1971	+ {
1064	1972	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1065	1973	ragdollItem.addActionListener(this);
1066	1974	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1067	1975	ragdoll2Item.addActionListener(this);
	1976	+ }
1068	1977	menu.add("-");
1069		- meshItem = menu.add(new MenuItem("Mesh"));
	1978	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1070	1979	meshItem.addActionListener(this);
1071	1980	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1072	1981	// meshGroupItem.addActionListener(this);
	1982	+ if (Globals.ADVANCED)
	1983	+ {
1073	1984	springItem = menu.add(new MenuItem("Spring"));
1074	1985	springItem.addActionListener(this);
1075	1986	flagItem = menu.add(new MenuItem("Flag"));
1076	1987	flagItem.addActionListener(this);
1077		- bezierItem = menu.add(new MenuItem("Patch"));
1078		- bezierItem.addActionListener(this);
1079		- checkerItem = menu.add(new MenuItem("Checker"));
1080		- checkerItem.addActionListener(this);
1081	1988	blobItem = menu.add(new MenuItem("Blob"));
1082	1989	blobItem.addActionListener(this);
1083	1990	latheItem = menu.add(new MenuItem("Lathe"));
1084	1991	latheItem.addActionListener(this);
1085		- lightItem = menu.add(new MenuItem("Light"));
1086		- lightItem.addActionListener(this);
	1992	+ }
	1993	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1994	+ bezierItem.addActionListener(this);
	1995	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1996	+// overlayItem.addActionListener(this);
	1997	+// lightItem = menu.add(new MenuItem("Light"));
	1998	+// lightItem.addActionListener(this);
1087	1999	menu.add("-");
1088	2000	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1089	2001	//superLoopItem.addActionListener(this);
1090		- loopItem = menu.add(new MenuItem("Loop"));
1091		- loopItem.addActionListener(this);
	2002	+// loopItem = menu.add(new MenuItem("Loop"));
	2003	+// loopItem.addActionListener(this);
1092	2004	doubleItem = menu.add(new MenuItem("Fork"));
1093	2005	doubleItem.addActionListener(this);
	2006	+ if (Globals.ADVANCED)
	2007	+ {
1094	2008	tripleItem = menu.add(new MenuItem("Trident"));
1095	2009	tripleItem.addActionListener(this);
	2010	+ }
1096	2011	}
1097	2012
1098	2013	void buildToolsMenu(Menu menu)
..	..	@@ -1101,29 +2016,34 @@
1101	2016	animationItem.addItemListener(this);
1102	2017	animationItem.setState(Globals.ANIMATION);
1103	2018
	2019	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	2020	+ archiveItem.addActionListener(this);
	2021	+
1104	2022	menu.add("-");
1105	2023	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1106	2024	parseverticesItem.addActionListener(this);
1107	2025	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1108	2026	textureFieldItem.addActionListener(this);
1109		- alignItem = menu.add(new MenuItem("Align"));
	2027	+ alignItem = menu.add(new MenuItem("Align Objects"));
1110	2028	alignItem.addActionListener(this);
1111		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1112		- mirrorItem.addActionListener(this);
1113	2029	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1114	2030	reduceMorphItem.addActionListener(this);
1115	2031	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1116	2032	reduce34MorphItem.addActionListener(this);
1117		-
1118		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1119		- computeAOItem.addActionListener(this);
1120	2033	menu.add("-");
1121		-
1122	2034	menu.add(memoryItem = new MenuItem("Memory Usage"));
1123	2035	memoryItem.addActionListener(this);
	2036	+ menu.add(computeAOItem = new MenuItem("Compute AO"));
	2037	+ computeAOItem.addActionListener(this);
	2038	+
	2039	+ if (Globals.ADVANCED)
	2040	+ {
	2041	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	2042	+ mirrorItem.addActionListener(this);
	2043	+ menu.add("-");
1124	2044	menu.add(analyzeItem = new MenuItem("Analyze"));
1125	2045	analyzeItem.addActionListener(this);
1126		- menu.add(dumpItem = new MenuItem("Dump"));
	2046	+ menu.add(dumpItem = new MenuItem("Print"));
1127	2047	dumpItem.addActionListener(this);
1128	2048	// menu.add(pathItem = new MenuItem("From-to path"));
1129	2049	// pathItem.addActionListener(this);
..	..	@@ -1141,6 +2061,7 @@
1141	2061	menu.add("-");
1142	2062	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1143	2063	editScriptItem.addActionListener(this);
	2064	+ }
1144	2065	}
1145	2066
1146	2067	void ScreenFit()
..	..	@@ -1205,24 +2126,24 @@
1205	2126	switch(axis)
1206	2127	{
1207	2128	case 0 :
1208		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1209		- vert2.x = minima.x; vert2.y = maxima.y; vert2.z = minima.z;
1210		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1211		- vert4.x = minima.x; vert4.y = maxima.y; vert4.z = maxima.z;
	2129	+ vert1.x = minima.x + 0.001f; vert1.y = minima.y; vert1.z = minima.z;
	2130	+ vert2.x = minima.x + 0.001f; vert2.y = maxima.y; vert2.z = minima.z;
	2131	+ vert3.x = minima.x + 0.001f; vert3.y = minima.y; vert3.z = maxima.z;
	2132	+ vert4.x = minima.x + 0.001f; vert4.y = maxima.y; vert4.z = maxima.z;
1212	2133	norm = cVector.X;
1213	2134	break;
1214	2135	case 1 :
1215		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1216		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1217		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1218		- vert4.x = maxima.x; vert4.y = minima.y; vert4.z = maxima.z;
	2136	+ vert1.x = minima.x; vert1.y = minima.y + 0.001f; vert1.z = minima.z;
	2137	+ vert2.x = maxima.x; vert2.y = minima.y + 0.001f; vert2.z = minima.z;
	2138	+ vert3.x = minima.x; vert3.y = minima.y + 0.001f; vert3.z = maxima.z;
	2139	+ vert4.x = maxima.x; vert4.y = minima.y + 0.001f; vert4.z = maxima.z;
1219	2140	norm = cVector.Y;
1220	2141	break;
1221	2142	case 2 :
1222		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1223		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1224		- vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z;
1225		- vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z;
	2143	+ vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z + 0.001f;
	2144	+ vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z + 0.001f;
	2145	+ vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z + 0.001f;
	2146	+ vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z + 0.001f;
1226	2147	norm = cVector.Z;
1227	2148	break;
1228	2149	}
..	..	@@ -1263,9 +2184,38 @@
1263	2184	shadow.material = new cMaterial(obj.material);
1264	2185	shadow.material.diffuse = 0.0001f;
1265	2186	shadow.material.specular = 0.0001f;
	2187	+ shadow.material.opacity = 0.75f;
	2188	+
	2189	+ AllocProjectedVertices(shadow);
	2190	+
	2191	+ shadow.projectedVertices[1].x = 300;
1266	2192
1267	2193	makeSomething(shadow);
1268	2194	}
	2195	+
	2196	+ private void ClearUnpinned()
	2197	+ {
	2198	+ //for (Object3D obj : listUI)
	2199	+ for (int i=listUI.size(); --i>=0;)
	2200	+ {
	2201	+ Object3D obj = listUI.elementAt(i);
	2202	+ if (!obj.pinned)
	2203	+ {
	2204	+ obj.CloseUI();
	2205	+ listUI.remove(i);
	2206	+ }
	2207	+ }
	2208	+ }
	2209	+
	2210	+ private void EditElement(Object3D elem, boolean newWindow)
	2211	+ {
	2212	+ // if (!(elem instanceof Composite))
	2213	+ // newWindow = false;
	2214	+ listUI.add(elem);
	2215	+ elem.openEditWindow(this, newWindow); //, false);
	2216	+ System.out.println("edit : " + elem);
	2217	+ elem.editWindow.refreshContents(true); // ? new
	2218	+ }
1269	2219
1270	2220	/**
1271	2221	* applyExample
..	..	@@ -1469,9 +2419,9 @@
1469	2419
1470	2420	void Overwrite(int mask)
1471	2421	{
1472		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2422	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1473	2423	{
1474		- Object3D content = GrafreeD.clipboard.get(0);
	2424	+ Object3D content = Grafreed.clipboard.get(0);
1475	2425
1476	2426	if (content instanceof cGroup && ((cGroup)content).transientlink )
1477	2427	content = ((cGroup)content).get(0);
..	..	@@ -1510,7 +2460,7 @@
1510	2460	{
1511	2461	ScreenFit();
1512	2462	} else
1513		- if (source == switchItem)
	2463	+ if (source == switchViewItem)
1514	2464	{
1515	2465	cVector v1 = new cVector();
1516	2466	cVector v2 = new cVector();
..	..	@@ -1519,11 +2469,11 @@
1519	2469	objEditor.cameraView.renderCamera.setAim(v2, v1);
1520	2470	objEditor.cameraView.repaint();
1521	2471	} else
1522		- if (source == rectoidItem)
	2472	+ if (source == rectoidItem \|\| source == boxButton)
1523	2473	{
1524	2474	makeSomething(new Box());
1525	2475	} else
1526		- if (source == particleItem)
	2476	+ if (source == particleItem \|\| source == particlesButton)
1527	2477	{
1528	2478	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1529	2479	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1602,27 +2552,27 @@
1602	2552
1603	2553	makeSomething(obj);
1604	2554	} else
1605		- if (source == gridItem)
	2555	+ if (source == gridItem \|\| source == gridButton)
1606	2556	{
1607	2557	makeSomething(new Grid());
1608	2558	} else
1609		- if (source == ellipsoidItem)
	2559	+ if (source == ellipsoidItem \|\| source == sphereButton)
1610	2560	{
1611	2561	makeSomething(new Sphere());
1612	2562	} else
1613		- if (source == coneItem)
	2563	+ if (source == coneItem \|\| source == coneButton)
1614	2564	{
1615	2565	makeSomething(new Cone());
1616	2566	} else
1617		- if (source == torusItem)
	2567	+ if (source == torusItem \|\| source == torusButton)
1618	2568	{
1619	2569	makeSomething(new Torus());
1620	2570	} else
1621		- if (source == superItem)
	2571	+ if (source == superItem \|\| source == superButton)
1622	2572	{
1623	2573	makeSomething(new Superellipsoid());
1624	2574	} else
1625		- if (source == kleinItem)
	2575	+ if (source == kleinItem \|\| source == kleinButton)
1626	2576	{
1627	2577	makeSomething(new Klein());
1628	2578	} else
..	..	@@ -1642,7 +2592,7 @@
1642	2592	{
1643	2593	makeSomething(new BezierSurface());
1644	2594	} else
1645		- if (source == checkerItem)
	2595	+ if (source == overlayItem \|\| source == overlayButton)
1646	2596	{
1647	2597	/*
1648	2598	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1690,10 +2640,27 @@
1690	2640	s.setup();
1691	2641	makeSomething(s);
1692	2642	} else
1693		- if (source == lightItem)
	2643	+ if (source == lightItem \|\| source == lightButton)
1694	2644	{
1695	2645	makeSomething(new Light());
1696	2646	} else
	2647	+// if (source == skybox1Button \|\|
	2648	+// source == skybox2Button \|\|
	2649	+// source == skybox3Button \|\|
	2650	+// source == skybox4Button \|\|
	2651	+// source == skybox5Button \|\|
	2652	+// source == skybox6Button \|\|
	2653	+// source == skybox7Button \|\|
	2654	+// source == skybox11Button \|\|
	2655	+// source == skybox12Button \|\|
	2656	+// source == skybox13Button \|\|
	2657	+// source == skybox14Button \|\|
	2658	+// source == skybox15Button \|\|
	2659	+// source == skybox16Button \|\|
	2660	+// source == skybox17Button)
	2661	+// {
	2662	+// ChangeSkybox(source);
	2663	+// } else
1697	2664	if (source == csgItem)
1698	2665	{
1699	2666	group(new CSG());
..	..	@@ -1740,30 +2707,38 @@
1740	2707
1741	2708	group(g);
1742	2709	} else
1743		- if (source == loopItem)
	2710	+ if (source == loopItem \|\| source == loopButton)
1744	2711	{
	2712	+ if (!group.selection.isEmpty())
	2713	+ {
1745	2714	Composite csg = new GroupLeaf();
1746		- csg.count = 5;
1747	2715	group(csg);
1748		- Composite child = new cGroup();
	2716	+ csg.count = 5;
	2717	+ Composite child = new cGroup("Branch");
1749	2718	csg.addChild(child);
1750	2719	child.addChild(csg);
	2720	+ }
1751	2721	} else
1752	2722	if (source == doubleItem)
1753	2723	{
1754		- Composite csg = new GroupLeaf();
1755		- csg.count = 5;
	2724	+ if (!group.selection.isEmpty())
	2725	+ {
	2726	+ Composite csg = new GroupLeaf("Fork");
1756	2727	group(csg);
1757		- Composite child = new cGroup();
	2728	+ csg.count = 5;
	2729	+ Composite child = new cGroup("Branch A");
1758	2730	csg.addChild(child);
1759	2731	child.addChild(csg);
1760		- child = new cGroup();
	2732	+ child = new cGroup("Branch B");
1761	2733	csg.addChild(child);
1762	2734	child.addChild(csg);
	2735	+ }
1763	2736	} else
1764	2737	if (source == tripleItem)
1765	2738	{
1766		- Composite csg = new GroupLeaf();
	2739	+ if (!group.selection.isEmpty())
	2740	+ {
	2741	+ Composite csg = new GroupLeaf("Trident");
1767	2742	csg.count = 4;
1768	2743	group(csg);
1769	2744	Composite child = new cGroup();
..	..	@@ -1775,28 +2750,12 @@
1775	2750	child = new cGroup();
1776	2751	csg.addChild(child);
1777	2752	child.addChild(csg);
1778		- } else
1779		-
1780		- if (source == importGFDItem)
1781		- {
1782		- ImportGFD();
1783		- } else
1784		- if (source == importVRMLX3DItem)
1785		- {
1786		- ImportVRMLX3D();
1787		- } else
1788		- if (source == import3DSItem)
1789		- {
1790		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1791		- } else
1792		- if (source == importOBJItem)
1793		- {
1794		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	2753	+ }
1795	2754	} else
1796	2755	if (source == computeAOItem)
1797	2756	{
1798	2757	Globals.drawMode = CameraPane.OCCLUSION;
1799		- Globals.theRenderer.repaint();
	2758	+ cameraView.repaint();
1800	2759	} else
1801	2760	if (source == recompileItem)
1802	2761	{
..	..	@@ -1811,7 +2770,7 @@
1811	2770	if (source == invariantsItem)
1812	2771	{
1813	2772	System.out.println("Invariants:");
1814		- GrafreeD.grafreeD.universe.invariants();
	2773	+ Grafreed.grafreed.universe.invariants();
1815	2774	} else
1816	2775	if (source == memoryItem)
1817	2776	{
..	..	@@ -1830,19 +2789,80 @@
1830	2789	{
1831	2790	DumpObject();
1832	2791	} else
	2792	+ if (source == minButton)
	2793	+ {
	2794	+ Minimize();
	2795	+ } else
	2796	+ if (source == maxButton)
	2797	+ {
	2798	+ Maximize();
	2799	+ } else
	2800	+ if (source == fullScreenButton)
	2801	+ {
	2802	+ ToggleFullScreen();
	2803	+ } else
	2804	+ if (source == collapseButton)
	2805	+ {
	2806	+ this.expandedLayout = radio.layout;
	2807	+ CollapseToolbar();
	2808	+ } else
	2809	+// if (source == maximize3DButton)
	2810	+// {
	2811	+// this.expandedLayout = radio.layout;
	2812	+// radio.layout = twoButton;
	2813	+// CollapseToolbar();
	2814	+// Show3DView();
	2815	+// } else
	2816	+ if (source == previousVersionButton)
	2817	+ {
	2818	+ // Go to previous version
	2819	+ //if (!Undo())
	2820	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2821	+ PreviousVersion();
	2822	+ } else
	2823	+ if (source == restoreButton)
	2824	+ {
	2825	+ // Restore current version
	2826	+ Restore();
	2827	+ //restoreButton.setEnabled(false);
	2828	+ } else
	2829	+ if (source == replaceButton)
	2830	+ {
	2831	+ // Overwrite current version
	2832	+ Replace();
	2833	+ //replaceButton.setEnabled(false);
	2834	+ } else
	2835	+ if (source == nextVersionButton)
	2836	+ {
	2837	+ // Go to next version
	2838	+ NextVersion();
	2839	+ } else
	2840	+ if (source == saveVersionButton)
	2841	+ {
	2842	+ // Save a new version
	2843	+ if (!Save(true))
	2844	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2845	+ } else
	2846	+ if (source == deleteVersionButton)
	2847	+ {
	2848	+ // Delete a new version
	2849	+ DeleteVersion();
	2850	+ } else
	2851	+ if (source == oneStepButton)
	2852	+ {
	2853	+ Globals.ONESTEP = true;
	2854	+ cameraView.repaint();
	2855	+ } else
1833	2856	if (source == screenfitButton)
1834	2857	{
1835		- //Reload(lastConverter, lastFilename, true);
1836	2858	ScreenFit();
1837	2859	} else
1838	2860	if (source == screenfitpointButton)
1839	2861	{
1840		- //Reload(lastConverter, lastFilename, true);
1841	2862	ScreenFitPoint();
1842	2863	} else
1843	2864	if (source == snapobjectButton)
1844	2865	{
1845		- //Reload(lastConverter, lastFilename, true);
1846	2866	SnapObject();
1847	2867	} else
1848	2868	// if (event.getSource() == recompileButton)
..	..	@@ -1879,12 +2899,20 @@
1879	2899	{
1880	2900	loadClipboard(true);
1881	2901	} else
	2902	+ if (source == undoItem)
	2903	+ {
	2904	+ PreviousVersion();
	2905	+ } else
	2906	+ if (source == redoItem)
	2907	+ {
	2908	+ NextVersion();
	2909	+ } else
1882	2910	if (source == duplicateItem)
1883	2911	{
1884		- Object3D keep = GrafreeD.clipboard;
	2912	+ Object3D keep = Grafreed.clipboard;
1885	2913	loadClipboard(false);
1886	2914	paste(false);
1887		- GrafreeD.clipboard = keep;
	2915	+ Grafreed.clipboard = keep;
1888	2916	} else
1889	2917	if (source == cloneItem)
1890	2918	{
..	..	@@ -1902,13 +2930,17 @@
1902	2930	{
1903	2931	paste(false);
1904	2932	} else
	2933	+ if (source == pasteIntoItem)
	2934	+ {
	2935	+ pasteInto(true, false);
	2936	+ } else
1905	2937	if (source == pasteLinkItem)
1906	2938	{
1907		- pasteInto(false);
	2939	+ pasteInto(false, false);
1908	2940	} else
1909	2941	if (source == pasteCloneItem)
1910	2942	{
1911		- pasteInto(true);
	2943	+ pasteInto(true, true);
1912	2944	} else
1913	2945	if (source == pasteExpandItem)
1914	2946	{
..	..	@@ -2100,9 +3132,9 @@
2100	3132	// group.selection.get(0).setMasterThis(content); // should be identity
2101	3133	// refreshContents();
2102	3134	// }
2103		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	3135	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2104	3136	{
2105		- Object3D content = GrafreeD.clipboard.get(0);
	3137	+ Object3D content = Grafreed.clipboard.get(0);
2106	3138
2107	3139	if (content instanceof cGroup && ((cGroup)content).transientlink )
2108	3140	content = ((cGroup)content).get(0);
..	..	@@ -2110,11 +3142,11 @@
2110	3142	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2111	3143	for (int i=0; i<group.selection.size(); i++)
2112	3144	{
2113		- boolean random = CameraPane.RANDOM;
2114		- CameraPane.RANDOM = false; // parse all random nodes
	3145	+ boolean random = CameraPane.SWITCH;
	3146	+ CameraPane.SWITCH = false; // parse all random nodes
2115	3147	group.selection.get(i).linkVerticesThis(content);
2116	3148	// group.selection.get(i).setMasterThis(content); // should be identity
2117		- CameraPane.RANDOM = random;
	3149	+ CameraPane.SWITCH = random;
2118	3150	}
2119	3151	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2120	3152	refreshContents();
..	..	@@ -2124,20 +3156,20 @@
2124	3156	{
2125	3157	for (int i=0; i<group.selection.size(); i++)
2126	3158	{
2127		- boolean random = CameraPane.RANDOM;
2128		- CameraPane.RANDOM = false; // parse all random nodes
	3159	+ boolean random = CameraPane.SWITCH;
	3160	+ CameraPane.SWITCH = false; // parse all random nodes
2129	3161	group.selection.get(i).linkVerticesThis(null);
2130		- CameraPane.RANDOM = random;
	3162	+ CameraPane.SWITCH = random;
2131	3163	}
2132	3164
2133	3165	refreshContents();
2134	3166	} else
2135	3167	if (source == relinkverticesItem)
2136	3168	{
2137		- boolean random = CameraPane.RANDOM;
2138		- CameraPane.RANDOM = false; // parse all random nodes
	3169	+ boolean random = CameraPane.SWITCH;
	3170	+ CameraPane.SWITCH = false; // parse all random nodes
2139	3171	group.selection.RelinkToSupport();
2140		- CameraPane.RANDOM = random;
	3172	+ CameraPane.SWITCH = random;
2141	3173
2142	3174	refreshContents();
2143	3175	} else
..	..	@@ -2152,9 +3184,9 @@
2152	3184	} else
2153	3185	if (source == setMasterItem)
2154	3186	{
2155		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	3187	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2156	3188	{
2157		- Object3D content = GrafreeD.clipboard.get(0);
	3189	+ Object3D content = Grafreed.clipboard.get(0);
2158	3190
2159	3191	if (content instanceof cGroup && ((cGroup)content).transientlink )
2160	3192	content = ((cGroup)content).get(0);
..	..	@@ -2167,9 +3199,9 @@
2167	3199	{
2168	3200	if (group.selection.size() == 1)
2169	3201	{
2170		- if (GrafreeD.clipboard.size() == 1)
	3202	+ if (Grafreed.clipboard.size() == 1)
2171	3203	{
2172		- Object3D content = GrafreeD.clipboard.get(0);
	3204	+ Object3D content = Grafreed.clipboard.get(0);
2173	3205
2174	3206	if (content instanceof cGroup && ((cGroup)content).transientlink )
2175	3207	content = ((cGroup)content).get(0);
..	..	@@ -2186,7 +3218,7 @@
2186	3218	{
2187	3219	RevertMeshes();
2188	3220	} else
2189		- if (source == resetMeshItem)
	3221	+ if (source == resetAllItem)
2190	3222	{
2191	3223	ResetAll();
2192	3224	} else
..	..	@@ -2194,7 +3226,7 @@
2194	3226	{
2195	3227	StepAll();
2196	3228	} else
2197		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3229	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2198	3230	{
2199	3231	//int indices[] = jList.getSelectedIndices();
2200	3232	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2206,9 +3238,9 @@
2206	3238	{
2207	3239	ClearSelection(true);
2208	3240	} else
2209		- if (source == grabItem)
	3241	+ if (source == grabItem \|\| source == groupButton)
2210	3242	{
2211		- group(new cGroup(), true);
	3243	+ group(new cGroup(), false); // true);
2212	3244	} else
2213	3245	if (source == hideItem)
2214	3246	{
..	..	@@ -2226,11 +3258,11 @@
2226	3258	{
2227	3259	makeSomething(new Camera());
2228	3260	} else
2229		- if (source == compositeItem)
	3261	+ if (source == compositeItem \|\| source == compositeButton)
2230	3262	{
2231	3263	group(new Composite());
2232	3264	} else
2233		- if (source == randomItem)
	3265	+ if (source == switchItem \|\| source == switchButton)
2234	3266	{
2235	3267	RandomNode random = new RandomNode();
2236	3268	group(random);
..	..	@@ -2332,7 +3364,7 @@
2332	3364	{
2333	3365	group(new cLinker());
2334	3366	} else
2335		- if (source == textureItem)
	3367	+ if (source == textureItem \|\| source == textureButton)
2336	3368	{
2337	3369	group(new TextureNode());
2338	3370	} else
..	..	@@ -2352,17 +3384,42 @@
2352	3384	{
2353	3385	CastShadow(2);
2354	3386	} else
2355		- if (source == ungroupItem)
	3387	+ if (source == ungroupItem \|\| source == ungroupButton)
2356	3388	{
2357		- //ungroup();
	3389	+ boolean canUngroup = true;
	3390	+
2358	3391	for (int i=0; i<group.selection.size(); i++)
2359	3392	{
2360		- Ungroup(group.selection.get(i));
	3393	+ Object3D selectedItem = group.selection.get(i);
	3394	+
	3395	+ if (selectedItem.Size() == 0)
	3396	+ {
	3397	+ // Cannot ungroup leaves
	3398	+ canUngroup = false;
	3399	+ break;
	3400	+ }
	3401	+
	3402	+ if (selectedItem == group)
	3403	+ {
	3404	+ // Cannot ungroup root
	3405	+ canUngroup = false;
	3406	+ break;
	3407	+ }
2361	3408	}
2362	3409
2363		- ClearSelection(false);
2364		-
2365		- refreshContents();
	3410	+ if (canUngroup)
	3411	+ {
	3412	+ for (int i=0; i<group.selection.size(); i++)
	3413	+ {
	3414	+ Object3D selectedItem = group.selection.get(i);
	3415	+
	3416	+ Ungroup(selectedItem);
	3417	+ }
	3418	+
	3419	+ ClearSelection(false);
	3420	+
	3421	+ refreshContents();
	3422	+ }
2366	3423	} else
2367	3424	if (source == genUVItem)
2368	3425	{
..	..	@@ -2374,7 +3431,7 @@
2374	3431	} else
2375	3432	if (source == genNormalsMESHItem)
2376	3433	{
2377		- GenNormals(true); // TODO
	3434	+ GenNormalsMESH();
2378	3435	} else
2379	3436	if (source == genNormalsORGANItem)
2380	3437	{
..	..	@@ -2408,6 +3465,10 @@
2408	3465	{
2409	3466	ClearMaterials();
2410	3467	} else
	3468	+ if (source == clearVersionsItem)
	3469	+ {
	3470	+ ClearVersions();
	3471	+ } else
2411	3472	if (source == liveleavesItem)
2412	3473	{
2413	3474	LiveLeaves(true);
..	..	@@ -2439,6 +3500,22 @@
2439	3500	if (source == unmarkleavesItem)
2440	3501	{
2441	3502	MarkLeaves(false);
	3503	+ } else
	3504	+ if (source == rewindleavesItem)
	3505	+ {
	3506	+ RewindLeaves(true);
	3507	+ } else
	3508	+ if (source == unrewindleavesItem)
	3509	+ {
	3510	+ RewindLeaves(false);
	3511	+ } else
	3512	+ if (source == randomleavesItem)
	3513	+ {
	3514	+ RandomLeaves(true);
	3515	+ } else
	3516	+ if (source == unrandomleavesItem)
	3517	+ {
	3518	+ RandomLeaves(false);
2442	3519	} else
2443	3520	if (source == flipVItem)
2444	3521	{
..	..	@@ -2524,9 +3601,25 @@
2524	3601	{
2525	3602	SmoothMesh();
2526	3603	} else
2527		- if (source == transformgeometryItem)
	3604	+ if (source == transformGeometryItem)
2528	3605	{
2529	3606	TransformGeometry();
	3607	+ } else
	3608	+ if (source == transformChildrenItem)
	3609	+ {
	3610	+ TransformChildren();
	3611	+ } else
	3612	+ if (source == textureRatioRItem)
	3613	+ {
	3614	+ TextureRatio(0);
	3615	+ } else
	3616	+ if (source == textureRatioGItem)
	3617	+ {
	3618	+ TextureRatio(1);
	3619	+ } else
	3620	+ if (source == textureRatioBItem)
	3621	+ {
	3622	+ TextureRatio(2);
2530	3623	} else
2531	3624	if (source == resetTransformItem)
2532	3625	{
..	..	@@ -2534,7 +3627,11 @@
2534	3627	} else
2535	3628	if (source == resetCentroidItem)
2536	3629	{
2537		- ResetCentroid();
	3630	+ ResetCentroid(true);
	3631	+ } else
	3632	+ if (source == resetCentroidXZItem)
	3633	+ {
	3634	+ ResetCentroid(false);
2538	3635	} else
2539	3636	if (source == resetParentItem)
2540	3637	{
..	..	@@ -2639,7 +3736,7 @@
2639	3736	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2640	3737	{
2641	3738	obj = (Object3D)e.nextElement();
2642		- obj.SetBumpTexture(null);
	3739	+ obj.ResetBumpTexture();
2643	3740	}
2644	3741
2645	3742	refreshContents();
..	..	@@ -2655,6 +3752,31 @@
2655	3752
2656	3753	refreshContents();
2657	3754	} else
	3755	+ if (source == embedTexturesItem)
	3756	+ {
	3757	+ Object3D obj;
	3758	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3759	+ {
	3760	+ obj = (Object3D)e.nextElement();
	3761	+ obj.EmbedTextures(true);
	3762	+ }
	3763	+
	3764	+ refreshContents();
	3765	+ } else
	3766	+ if (source == deEmbedTexturesItem)
	3767	+ {
	3768	+ Object3D obj;
	3769	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3770	+ {
	3771	+ obj = (Object3D)e.nextElement();
	3772	+ obj.EmbedTextures(false);
	3773	+ }
	3774	+
	3775	+ CameraPane.texturepigment.clear();
	3776	+ CameraPane.texturebump.clear();
	3777	+
	3778	+ refreshContents();
	3779	+ } else
2658	3780	if (source == flashSelectionButton)
2659	3781	{
2660	3782	CameraPane.flash = true;
..	..	@@ -2666,42 +3788,36 @@
2666	3788	if (source == twoButton)
2667	3789	{
2668	3790	radio.layout = twoButton;
2669		- // bug
2670		- //gridPanel.setDividerLocation(1.0);
2671		- //bigPanel.setDividerLocation(0.0);
2672		-// bigThree.remove(scenePanel);
2673		-// bigThree.remove(centralPanel);
2674		-// bigThree.remove(XYZPanel);
2675		-// aWindowConstraints.gridx = 0;
2676		-// aWindowConstraints.gridy = 0;
2677		-// aWindowConstraints.gridwidth = 1;
2678		-// // aConstraints.gridheight = 3;
2679		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2680		-// aWindowConstraints.weightx = 0;
2681		-// aWindowConstraints.weighty = 1;
2682		-// //bigThree.add(jtp, aWindowConstraints);
2683		-// aWindowConstraints.weightx = 1;
2684		-// aWindowConstraints.gridwidth = 3;
2685		-// // aConstraints.gridheight = 3;
2686		-// aWindowConstraints.gridx = 1;
2687		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
2688		-// bigThree.add(centralPanel, aWindowConstraints);
2689		-// aWindowConstraints.weightx = 0;
2690		-// aWindowConstraints.gridx = 4;
2691		-// aWindowConstraints.gridwidth = 1;
2692		-// // aConstraints.gridheight = 3;
2693		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2694		-// //bigThree.add(XYZPanel, aWindowConstraints);
2695		-// scenePanel.setVisible(false);
2696		-// centralPanel.setVisible(true);
2697		-// XYZPanel.setVisible(false);
2698		- bigThree.ClearUI();
2699		- bigThree.add(centralPanel);
2700		- bigThree.FlushUI();
	3791	+
	3792	+ if (CameraPane.FULLSCREEN)
	3793	+ fullscreenLayout = radio.layout;
	3794	+
	3795	+ Show3DView();
	3796	+
	3797	+ cameraView.requestFocusInWindow();
	3798	+
	3799	+// refreshContents(true);
	3800	+//
	3801	+// try
	3802	+// {
	3803	+// java.awt.Robot bot = new java.awt.Robot();
	3804	+// int mask = InputEvent.BUTTON1_MASK;
	3805	+// bot.mouseMove(100, 100);
	3806	+// bot.mousePress(mask);
	3807	+// bot.mouseRelease(mask);
	3808	+// }
	3809	+// catch (Exception e)
	3810	+// {
	3811	+//
	3812	+// }
	3813	+
2701	3814	} else
2702	3815	if (source == threeButton)
2703	3816	{
2704	3817	radio.layout = threeButton;
	3818	+
	3819	+ if (CameraPane.FULLSCREEN)
	3820	+ fullscreenLayout = radio.layout;
2705	3821
2706	3822	// bigThree.remove(scenePanel);
2707	3823	// bigThree.remove(centralPanel);
..	..	@@ -2731,13 +3847,18 @@
2731	3847	// centralPanel.setVisible(true);
2732	3848	// XYZPanel.setVisible(true);
2733	3849	bigThree.ClearUI();
	3850	+ bigThree.add(scenePanel);
2734	3851	bigThree.add(centralPanel);
2735		- bigThree.add(XYZPanel);
2736	3852	bigThree.FlushUI();
	3853	+
	3854	+ cameraView.requestFocusInWindow();
2737	3855	} else
2738	3856	if (source == fourButton)
2739	3857	{
2740	3858	radio.layout = fourButton;
	3859	+
	3860	+ if (CameraPane.FULLSCREEN)
	3861	+ fullscreenLayout = radio.layout;
2741	3862
2742	3863	// bigThree.remove(scenePanel);
2743	3864	// bigThree.remove(centralPanel);
..	..	@@ -2769,10 +3890,15 @@
2769	3890	bigThree.ClearUI();
2770	3891	bigThree.add(scenePanel);
2771	3892	bigThree.FlushUI();
	3893	+
	3894	+ cameraView.requestFocusInWindow();
2772	3895	} else
2773	3896	if (source == sixButton)
2774	3897	{
2775	3898	radio.layout = sixButton;
	3899	+
	3900	+ if (CameraPane.FULLSCREEN)
	3901	+ fullscreenLayout = radio.layout;
2776	3902
2777	3903	// bigThree.remove(scenePanel);
2778	3904	// bigThree.remove(centralPanel);
..	..	@@ -2802,13 +3928,18 @@
2802	3928	// centralPanel.setVisible(true);
2803	3929	// XYZPanel.setVisible(false);
2804	3930	bigThree.ClearUI();
2805		- bigThree.add(scenePanel);
2806	3931	bigThree.add(centralPanel);
	3932	+ bigThree.add(scenePanel);
2807	3933	bigThree.FlushUI();
	3934	+
	3935	+ cameraView.requestFocusInWindow();
2808	3936	} else
2809	3937	if (source == sevenButton)
2810	3938	{
2811	3939	radio.layout = sevenButton;
	3940	+
	3941	+ if (CameraPane.FULLSCREEN)
	3942	+ fullscreenLayout = radio.layout;
2812	3943
2813	3944	// bigThree.remove(scenePanel);
2814	3945	// bigThree.remove(centralPanel);
..	..	@@ -2842,9 +3973,12 @@
2842	3973	bigThree.add(centralPanel);
2843	3974	bigThree.add(XYZPanel);
2844	3975	bigThree.FlushUI();
	3976	+
	3977	+ cameraView.requestFocusInWindow();
2845	3978	} else
2846	3979	if (source == rootButton)
2847	3980	{
	3981	+ Replace();
2848	3982	Object3D obj;
2849	3983	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2850	3984	{
..	..	@@ -2853,31 +3987,50 @@
2853	3987	EditObject(obj);
2854	3988	}
2855	3989
	3990	+ cameraView.requestFocusInWindow();
2856	3991	refreshContents(true);
2857	3992	} else
2858	3993	if (source == closeButton)
2859	3994	{
2860	3995	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	3996	+ if (copy.versionlist != null)
	3997	+ Replace();
	3998	+
2861	3999	cRadio ab;
2862	4000	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2863	4001	{
2864	4002	ab = (cRadio)e.nextElement();
2865		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	4003	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2866	4004	{
	4005	+ // Patch to avoid bug with transparency.
	4006	+ if (!ab.hadMaterial)
	4007	+ {
	4008	+ ab.object.material = null;
	4009	+ }
	4010	+
2867	4011	buttonGroup.remove(ab);
2868	4012	radioPanel.remove(ab);
2869	4013
2870		- ab.GetObject().editWindow = null;
	4014	+ //ab.GetObject().editWindow = null;
	4015	+ ab.GetObject().manipWindow = null;
2871	4016	// ab.GetObject().objectUI = null; // ?????????
2872	4017
2873	4018	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2874	4019	break;
2875	4020	}
2876	4021	}
	4022	+
	4023	+ cameraView.requestFocusInWindow();
2877	4024	refreshContents(true);
2878	4025	} else
2879	4026	if (source == editItem \|\| source == editButton)
2880	4027	{
	4028	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4029	+ {
	4030	+ Object3D child = (Object3D)e.nextElement();
	4031	+ child.pinned = true;
	4032	+ }
	4033	+
2881	4034	EditSelection(false);
2882	4035	} else
2883	4036	if (source == uneditButton)
..	..	@@ -2886,13 +4039,14 @@
2886	4039	{
2887	4040	Object3D child = (Object3D)e.nextElement();
2888	4041	if(child.editWindow != null)
2889		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4042	+ child.pinned = false;
2890	4043	child.CloseUI();
2891	4044	listUI.remove(child);
	4045	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2892	4046
2893		- child.editWindow = null; // ???????????
	4047	+ //child.editWindow = null; // ???????????
2894	4048	}
2895		- objEditor.ctrlPanel.validate();
	4049	+ objEditor.ctrlPanel.FlushUI();
2896	4050	//objEditor.jTree.clearSelection();
2897	4051	//objEditor.ResetSliders();
2898	4052	refreshContents(true);
..	..	@@ -2903,16 +4057,18 @@
2903	4057	//copy.ClearUI();
2904	4058	for (Object3D obj : listUI)
2905	4059	{
	4060	+ obj.pinned = false;
2906	4061	obj.CloseUI();
2907	4062	}
2908	4063	listUI.clear();
	4064	+ SetPinStates(group.selection.size() > 0);
2909	4065	refreshContents(true);
2910	4066	} else
2911	4067	if (source == allParamsButton)
2912	4068	{
2913	4069	assert(copy == group);
2914	4070
2915		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4071	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2916	4072
2917	4073	for (Object3D obj : listUI)
2918	4074	{
..	..	@@ -2938,6 +4094,9 @@
2938	4094	} else
2939	4095	if(source instanceof cRadio)
2940	4096	{
	4097	+ if (copy.versionlist != null)
	4098	+ Replace();
	4099	+
2941	4100	group.parent = keepparent;
2942	4101	group.attributes = 0;
2943	4102	//group.editWindow = null;
..	..	@@ -2961,6 +4120,7 @@
2961	4120	}
2962	4121
2963	4122	copy = group;
	4123	+
2964	4124	//Globals.theRenderer.object = group;
2965	4125	if(!useclient)
2966	4126	{
..	..	@@ -2976,20 +4136,75 @@
2976	4136	frontView.object = group;
2977	4137	sideView.object = group;
2978	4138	}
2979		- group.editWindow = this;
	4139	+
	4140	+// fix "+" issue
	4141	+ //group.editWindow = this;
	4142	+ group.manipWindow = this;
	4143	+
2980	4144	/*
2981	4145	currentLayout = radio.layout;
2982	4146	if (currentLayout == null)
2983	4147	currentLayout = sevenButton;
2984	4148	*/
2985	4149	radio.layout.doClick();
	4150	+
	4151	+ //assert(copy instanceof Composite);
	4152	+
	4153	+ if (copy.versionlist == null)
	4154	+ {
	4155	+ copy.versionindex = -1;
	4156	+
	4157	+ // Cannot work with loops
	4158	+ // To fix this issue, we first mark all nodes above the root,
	4159	+ // and check if any of these nodes are reachable below the root.
	4160	+ Grafreed.grafreed.universe.TagObjects(copy, true);
	4161	+
	4162	+ if (copy instanceof Composite && !copy.HasTags())
	4163	+ {
	4164	+ if (copy.versionlist == null)
	4165	+ copy.versionlist = new Object3D[100];
	4166	+
	4167	+ //Save(true);
	4168	+ }
	4169	+ else
	4170	+ copy.versionindex = -2;
	4171	+
	4172	+ Grafreed.grafreed.universe.TagObjects(copy, false);
	4173	+ }
	4174	+
	4175	+ SetVersionStates();
	4176	+
	4177	+ ClearUnpinned();
	4178	+
	4179	+ //Grafreed.Assert(group != null);
	4180	+ //Grafreed.Assert(group.selection != null);
	4181	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4182	+ if (group.selection == null \|\| group.selection.size() == 1)
	4183	+ EditSelection(false);
2986	4184	keepparent = group.parent;
2987	4185	// PARENT = NULL or not???
2988	4186	//group.parent = null; // ROOT
2989	4187	//group.attributes = -1;
2990	4188	ResetModel();
	4189	+
	4190	+ cameraView.requestFocusInWindow();
2991	4191	refreshContents(true);
2992		- }
	4192	+ } else if (event.getSource() == editCameraItem)
	4193	+ {
	4194	+ cameraView.ProtectCamera();
	4195	+ cameraView.requestFocusInWindow();
	4196	+ cameraView.repaint();
	4197	+ return;
	4198	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	4199	+ {
	4200	+ cameraView.RevertCamera();
	4201	+ cameraView.requestFocusInWindow();
	4202	+ cameraView.repaint();
	4203	+ return;
	4204	+ // } else if (event.getSource() == textureButton)
	4205	+ // {
	4206	+ // return; // true;
	4207	+ }
2993	4208	else
2994	4209	{
2995	4210	//return super.action(event, arg);
..	..	@@ -2998,7 +4213,6 @@
2998	4213	}
2999	4214
3000	4215	boolean useclient = false;
3001		- cRadio radio;
3002	4216
3003	4217	void ToggleRoot()
3004	4218	{
..	..	@@ -3050,6 +4264,40 @@
3050	4264	refreshContents();
3051	4265	}
3052	4266
	4267	+ void TransformChildren()
	4268	+ {
	4269	+ Object3D obj;
	4270	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4271	+ {
	4272	+ obj = (Object3D)e.nextElement();
	4273	+ obj.KeepTextureMatrices();
	4274	+ obj.TransformChildren();
	4275	+ obj.RestoreTextureMatrices();
	4276	+
	4277	+// if (obj.parent == null)
	4278	+// {
	4279	+// System.out.println("NULL PARENT!");
	4280	+// new Exception().printStackTrace();
	4281	+// }
	4282	+// else
	4283	+// TouchTransform(obj);
	4284	+// //obj.parent.Touch();
	4285	+ }
	4286	+
	4287	+ refreshContents();
	4288	+ }
	4289	+
	4290	+ void TextureRatio(int axis)
	4291	+ {
	4292	+ Object3D obj;
	4293	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4294	+ {
	4295	+ obj = (Object3D)e.nextElement();
	4296	+ obj.TextureRatio(axis);
	4297	+ }
	4298	+
	4299	+ refreshContents();
	4300	+ }
3053	4301
3054	4302	void ResetTransform()
3055	4303	{
..	..	@@ -3066,42 +4314,8 @@
3066	4314	if (obj.toParent == null)
3067	4315	continue;
3068	4316
3069		- if (mask == -1)
3070		- {
3071		- if (obj instanceof Camera) // jan 2014
3072		- {
3073		- LA.matIdentity(obj.toParent);
3074		- LA.matIdentity(obj.fromParent);
3075		- }
3076		- else
3077		- {
3078		- obj.toParent = null; // jan 2014 LA.matIdentity(obj.toParent);
3079		- obj.fromParent = null; // LA.matIdentity(obj.fromParent);
3080		- }
3081		- TouchTransform(obj);
3082		- continue;
3083		- }
3084		- if ((mask&2) != 0) // Scale
3085		- {
3086		- obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
3087		- obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
3088		- obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
3089		- obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
3090		- obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
3091		- obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
3092		- }
3093		- if ((mask&4) != 0) // Rotation
3094		- {
3095		- // ?
3096		- }
3097		- if ((mask&1) != 0) // Translation
3098		- {
3099		- if (obj.toParent != null)
3100		- {
3101		- obj.toParent[3][0] = obj.toParent[3][1] = obj.toParent[3][2] = 0;
3102		- obj.fromParent[3][0] = obj.fromParent[3][1] = obj.fromParent[3][2] = 0;
3103		- }
3104		- }
	4317	+ obj.ResetTransform(mask);
	4318	+
3105	4319	if (obj.parent == null)
3106	4320	{
3107	4321	System.out.println("NULL PARENT!");
..	..	@@ -3162,7 +4376,7 @@
3162	4376	refreshContents();
3163	4377	}
3164	4378
3165		- void ResetCentroid()
	4379	+ void ResetCentroid(boolean full)
3166	4380	{
3167	4381	Object3D obj;
3168	4382	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3177,12 +4391,16 @@
3177	4391	LA.matIdentity(Object3D.mat);
3178	4392	obj.getBounds(minima, maxima, false);
3179	4393	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3180		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	4394	+ if (full)
	4395	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3181	4396	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3182	4397	obj.TransformMesh(Object3D.mat);
	4398	+
3183	4399	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3184		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	4400	+ if (full)
	4401	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3185	4402	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	4403	+
3186	4404	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3187	4405	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3188	4406	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3211,7 +4429,8 @@
3211	4429
3212	4430	int size = obj.MemorySize();
3213	4431
3214		- System.err.println((size/1024) + " KB is the size of " + obj);
	4432	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4433	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3215	4434	}
3216	4435	}
3217	4436	catch (Exception e)
..	..	@@ -3248,9 +4467,9 @@
3248	4467	obj = (Object3D)e.nextElement();
3249	4468
3250	4469	System.out.println("Object is: " + obj);
3251		- GrafreeD.AnalyzeObject(obj);
	4470	+ Grafreed.AnalyzeObject(obj);
3252	4471	System.out.println("Boundary rep: " + obj.bRep);
3253		- GrafreeD.AnalyzeObject(obj.bRep);
	4472	+ Grafreed.AnalyzeObject(obj.bRep);
3254	4473
3255	4474	// System.err.println((size/1024) + " KB is the size of " + obj);
3256	4475	}
..	..	@@ -3292,6 +4511,13 @@
3292	4511	void GenNormals(boolean crease)
3293	4512	{
3294	4513	group.GenNormalsS(crease);
	4514	+
	4515	+ refreshContents();
	4516	+ }
	4517	+
	4518	+ void GenNormalsMESH()
	4519	+ {
	4520	+ group.GenNormalsMeshS();
3295	4521
3296	4522	refreshContents();
3297	4523	}
..	..	@@ -3464,8 +4690,8 @@
3464	4690
3465	4691	void ParseVertices()
3466	4692	{
3467		- boolean epsequal = GrafreeD.epsequal;
3468		- GrafreeD.epsequal = true;
	4693	+ boolean epsequal = Grafreed.epsequal;
	4694	+ Grafreed.epsequal = true;
3469	4695
3470	4696	for (int i=0; i<group.selection.size(); i++)
3471	4697	{
..	..	@@ -3490,7 +4716,7 @@
3490	4716	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3491	4717	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3492	4718
3493		- g.add(GrafreeD.clipboard);
	4719	+ g.add(Grafreed.clipboard);
3494	4720
3495	4721	buffer.add(g);
3496	4722	}
..	..	@@ -3505,7 +4731,7 @@
3505	4731	makeSomething(buffer, i==group.selection.size()-1);
3506	4732	}
3507	4733
3508		- GrafreeD.epsequal = epsequal;
	4734	+ Grafreed.epsequal = epsequal;
3509	4735
3510	4736	refreshContents();
3511	4737	}
..	..	@@ -3523,7 +4749,16 @@
3523	4749	String pigment = Object3D.GetPigment(tex);
3524	4750	//String bump = Object3D.GetBump(tex);
3525	4751
3526		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4752	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4753	+
	4754	+ try
	4755	+ {
	4756	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
	4757	+ }
	4758	+ catch (Exception e)
	4759	+ {
	4760	+ System.err.println("FAIL: " + node);
	4761	+ }
3527	4762
3528	4763	double s = v.s;
3529	4764
..	..	@@ -3589,6 +4824,12 @@
3589	4824	{
3590	4825	Object3D obj = group.selection.get(i);
3591	4826
	4827	+ if (obj.toParent == null)
	4828	+ {
	4829	+ obj.toParent = LA.newMatrix();
	4830	+ obj.fromParent = LA.newMatrix();
	4831	+ }
	4832	+
3592	4833	LA.matTranslate(obj.toParent, i * scale, 0, 0);
3593	4834	LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3594	4835	}
..	..	@@ -3611,11 +4852,11 @@
3611	4852
3612	4853	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3613	4854
3614		- boolean random = CameraPane.RANDOM;
3615		- CameraPane.RANDOM = false; // parse all random nodes
	4855	+ boolean random = CameraPane.SWITCH;
	4856	+ CameraPane.SWITCH = false; // parse all random nodes
3616	4857	lowres.linkVerticesThis(null);
3617	4858	lowres.linkVerticesThis(sn);
3618		- CameraPane.RANDOM = random;
	4859	+ CameraPane.SWITCH = random;
3619	4860
3620	4861	System.err.flush();
3621	4862
..	..	@@ -3655,7 +4896,7 @@
3655	4896	return;
3656	4897
3657	4898	Object3D poses = group.selection.get(0);
3658		- Object3D ref = GrafreeD.clipboard.get(0);
	4899	+ Object3D ref = Grafreed.clipboard.get(0);
3659	4900
3660	4901	Object3D newgroup = new Object3D("Po:" + poses.name);
3661	4902
..	..	@@ -3849,9 +5090,9 @@
3849	5090
3850	5091	void ClipMesh()
3851	5092	{
3852		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	5093	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3853	5094	{
3854		- Object3D content = GrafreeD.clipboard.get(0);
	5095	+ Object3D content = Grafreed.clipboard.get(0);
3855	5096
3856	5097	if (content instanceof cGroup && ((cGroup)content).transientlink )
3857	5098	content = ((cGroup)content).get(0);
..	..	@@ -3860,7 +5101,7 @@
3860	5101	// {
3861	5102	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3862	5103	// }
3863		- group.selection.ClipMesh(GrafreeD.clipboard);
	5104	+ group.selection.ClipMesh(Grafreed.clipboard);
3864	5105	}
3865	5106	// group.selection.ClipMesh(GrafreeD.clipboard);
3866	5107	System.out.println("DONE.");
..	..	@@ -3877,6 +5118,12 @@
3877	5118	void ClearMaterials()
3878	5119	{
3879	5120	group.selection.ClearMaterials();
	5121	+ refreshContents();
	5122	+ }
	5123	+
	5124	+ void ClearVersions()
	5125	+ {
	5126	+ group.selection.ClearVersions();
3880	5127	refreshContents();
3881	5128	}
3882	5129
..	..	@@ -3907,6 +5154,18 @@
3907	5154	void MarkLeaves(boolean hide)
3908	5155	{
3909	5156	group.selection.MarkLeaves(hide);
	5157	+ refreshContents();
	5158	+ }
	5159	+
	5160	+ void RewindLeaves(boolean hide)
	5161	+ {
	5162	+ group.selection.RewindLeaves(hide);
	5163	+ refreshContents();
	5164	+ }
	5165	+
	5166	+ void RandomLeaves(boolean hide)
	5167	+ {
	5168	+ group.selection.RandomLeaves(hide);
3910	5169	refreshContents();
3911	5170	}
3912	5171
..	..	@@ -3981,28 +5240,25 @@
3981	5240	// }
3982	5241	// }
3983	5242
3984		- static boolean allparams = true;
3985		-
3986		- static Vector<Object3D> listUI = new Vector<Object3D>();
3987		-
3988	5243	void EditSelection(boolean newWindow)
3989	5244	{
	5245	+ if (group.selection == null)
	5246	+ {
	5247	+ EditElement(group, newWindow); // ? new
	5248	+ return;
	5249	+ }
	5250	+
3990	5251	// aConstraints.gridy = 0;
3991	5252	for (int i=0; i<group.selection.size(); i++)
3992	5253	{
3993	5254	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
3994	5255	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3995		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5256	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3996	5257
3997	5258	Object3D elem = (Object3D)group.selection.elementAt(i);
3998		- if(elem != group)
	5259	+ if(elem != group \|\| !newWindow)
3999	5260	{
4000		- // if (!(elem instanceof Composite))
4001		- // newWindow = false;
4002		- listUI.add(elem);
4003		- elem.openEditWindow(this, newWindow); //, false);
4004		- System.out.println("edit : " + elem);
4005		- elem.editWindow.refreshContents(true); // ? new
	5261	+ EditElement(elem, newWindow); // ? new
4006	5262	}
4007	5263	}
4008	5264	}
..	..	@@ -4065,9 +5321,7 @@
4065	5321
4066	5322	freezemodel = false;
4067	5323	}
4068		-
4069		- boolean flashIt = true;
4070		-
	5324	+
4071	5325	public void valueChanged(TreeSelectionEvent e)
4072	5326	//public boolean handleEvent(Event event)
4073	5327	{
..	..	@@ -4077,7 +5331,8 @@
4077	5331	//new Exception().printStackTrace();
4078	5332
4079	5333	freezemodel = true;
4080		-
	5334	+ ClearUnpinned();
	5335	+
4081	5336	/**/
4082	5337	//switch (event.id)
4083	5338	{
..	..	@@ -4085,7 +5340,6 @@
4085	5340	//case 702: // Event.LIST_DESELECT
4086	5341	group.deselectAll();
4087	5342	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4088		- objEditor.ClearInfo(); // .GetMaterial());
4089	5343	if (tps != null)
4090	5344	{
4091	5345	for (int i=0; i < tps.length; i++)
..	..	@@ -4094,10 +5348,8 @@
4094	5348
4095	5349	//if (child.parent != null)
4096	5350	//child.parent.addSelectee(child);
	5351	+ objEditor.SetMaterial(child);
4097	5352	group.addSelectee(child);
4098		- objEditor.SetMaterial(child); // .GetMaterial());
4099		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4100		- System.err.println("info : " + child.GetPath());
4101	5353	}
4102	5354	}
4103	5355	// else
..	..	@@ -4107,20 +5359,28 @@
4107	5359	// System.err.println("info : " + group.GetPath());
4108	5360	// }
4109	5361
4110		- objEditor.SetText(); // jan 2014
4111		-
4112		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	5362	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4113	5363	CameraPane.flash = true;
4114	5364
4115		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5365	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4116	5366	// a camera
4117	5367	{
4118		- CameraPane.camerachangeframe = 0; // don't refuse it
4119		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5368	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crashes the camera because of invalid lightspace
	5369	+ {
	5370	+ CameraPane.camerachangeframe = 0; // don't refuse it
	5371	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5372	+ }
4120	5373	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4121	5374	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4122	5375	}
4123	5376
	5377	+ if (tps != null && tps.length == 1)
	5378	+ {
	5379	+ EditSelection(false);
	5380	+ }
	5381	+
	5382	+ SetPinStates(tps != null && tps.length > 0);
	5383	+
4124	5384	refreshContents();
4125	5385	//return true;
4126	5386	}
..	..	@@ -4129,6 +5389,53 @@
4129	5389
4130	5390	freezemodel = false;
4131	5391	}
	5392	+
	5393	+ void SetPinStates(boolean enabled)
	5394	+ {
	5395	+ editButton.setEnabled(enabled);
	5396	+ uneditButton.setEnabled(enabled);
	5397	+ //unselectButton.setEnabled(enabled);
	5398	+ flashSelectionButton.setEnabled(enabled);
	5399	+
	5400	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5401	+
	5402	+ boolean allComposites = true;
	5403	+
	5404	+ if (group.selection != null)
	5405	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5406	+ {
	5407	+ Object next = e.nextElement();
	5408	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5409	+ {
	5410	+ allComposites = false;
	5411	+ break;
	5412	+ }
	5413	+ }
	5414	+
	5415	+ rootButton.setEnabled(true); // allComposites);
	5416	+ }
	5417	+
	5418	+ void refreshContents(boolean cp)
	5419	+ {
	5420	+ if (Globals.SHOWINFO)
	5421	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5422	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5423	+ {
	5424	+ objEditor.ClearInfo(); // .GetMaterial());
	5425	+
	5426	+ for (int i=0; i < group.selection.Size(); i++)
	5427	+ {
	5428	+ Object3D child = (Object3D) group.selection.get(i);
	5429	+
	5430	+ objEditor.AddInfo(child, this, true);
	5431	+// System.err.println("info : " + child.GetPath());
	5432	+ }
	5433	+
	5434	+ objEditor.SetText(); // jan 2014
	5435	+ }
	5436	+
	5437	+ super.refreshContents(cp);
	5438	+ }
4132	5439
4133	5440	void linkSomething(Object3D thing)
4134	5441	{
..	..	@@ -4200,16 +5507,19 @@
4200	5507	{
4201	5508	if (group.selection.isEmpty())
4202	5509	return;
4203		- GrafreeD.clipboardIsTempGroup = false;
	5510	+
	5511	+ Grafreed.clipboardIsTempGroup = false;
4204	5512	Composite tGroup = null;
4205	5513	if (group.selection.size() > 0) // 1)
4206	5514	{
4207	5515	tGroup = new cGroup();
4208		- GrafreeD.clipboardIsTempGroup = true;
	5516	+ Grafreed.clipboardIsTempGroup = true;
4209	5517	}
4210	5518
4211	5519	if (cut)
4212	5520	{
	5521	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5522	+// Save();
4213	5523	//int indices[] = jList.getSelectedIndices();
4214	5524	//for (int i = indices.length - 1; i >= 0; i--)
4215	5525	//jList.remove(indices[i]);
..	..	@@ -4245,16 +5555,16 @@
4245	5555	//System.out.println("cut " + child);
4246	5556	//System.out.println("parent = " + child.parent);
4247	5557	// tmp.addChild(child);
4248		- if (GrafreeD.clipboardIsTempGroup)
	5558	+ if (Grafreed.clipboardIsTempGroup)
4249	5559	tGroup.add/Child/(tmp);
4250	5560	else
4251		- GrafreeD.clipboard = tmp;
	5561	+ Grafreed.clipboard = tmp;
4252	5562	}
4253	5563	else
4254		- if (GrafreeD.clipboardIsTempGroup)
	5564	+ if (Grafreed.clipboardIsTempGroup)
4255	5565	tGroup.add/Child/(child);
4256	5566	else
4257		- GrafreeD.clipboard = child;
	5567	+ Grafreed.clipboard = child;
4258	5568	}
4259	5569
4260	5570	//ResetModel();
..	..	@@ -4286,21 +5596,23 @@
4286	5596	//System.out.println("cut " + elem);
4287	5597	//System.out.println("parent = " + elem.parent);
4288	5598	// tmp.addChild(elem);
4289		- if (GrafreeD.clipboardIsTempGroup)
	5599	+ if (Grafreed.clipboardIsTempGroup)
4290	5600	tGroup.add/Child/(tmp);
4291	5601	else
4292		- GrafreeD.clipboard = tmp;
	5602	+ Grafreed.clipboard = tmp;
4293	5603	}
4294	5604	else
4295		- if (GrafreeD.clipboardIsTempGroup)
	5605	+ if (Grafreed.clipboardIsTempGroup)
4296	5606	tGroup.add/Child/(child);
4297	5607	else
4298		- GrafreeD.clipboard = child;
	5608	+ Grafreed.clipboard = child;
4299	5609	}
4300	5610
4301	5611	}
4302		- if (GrafreeD.clipboardIsTempGroup)
4303		- GrafreeD.clipboard = tGroup;
	5612	+
	5613	+ if (Grafreed.clipboardIsTempGroup)
	5614	+ Grafreed.clipboard = tGroup;
	5615	+
4304	5616	if (cut)
4305	5617	{
4306	5618	ResetModel();
..	..	@@ -4310,11 +5622,15 @@
4310	5622
4311	5623	void paste(boolean expand)
4312	5624	{
	5625	+ if (Globals.REPLACEONMAKE)
	5626	+ Save();
	5627	+ boolean keep = Globals.REPLACEONMAKE;
	5628	+ Globals.REPLACEONMAKE = false;
4313	5629	// if (GrafreeD.clipboard == null)
4314	5630	// return;
4315	5631	boolean first = true;
4316	5632
4317		- if (GrafreeD.clipboardIsTempGroup)
	5633	+ if (Grafreed.clipboardIsTempGroup)
4318	5634	{
4319	5635	Composite temp;
4320	5636
..	..	@@ -4325,7 +5641,7 @@
4325	5641	temp = (Composite)Applet3D.clipboard.deepCopy();
4326	5642	*/
4327	5643	Object3D elem;
4328		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5644	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4329	5645	{
4330	5646	Object3D child = (Object3D)e.nextElement();
4331	5647
..	..	@@ -4359,21 +5675,22 @@
4359	5675	//Object3D cb = Applet3D.clipboard;
4360	5676	//temp.addChild(cb);
4361	5677	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4362		- assert(GrafreeD.clipboard.parent == null);
4363		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4364		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4365		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4366		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	5678	+ assert(Grafreed.clipboard.parent == null);
	5679	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5680	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5681	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5682	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4367	5683	else
4368		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4369		- GrafreeD.clipboard.get(0).parent = keepparent;
	5684	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5685	+ Grafreed.clipboard.get(0).parent = keepparent;
4370	5686	}
4371	5687
	5688	+ Globals.REPLACEONMAKE = keep;
4372	5689	ResetModel();
4373	5690	refreshContents();
4374	5691	}
4375	5692
4376		- void pasteInto(boolean copyit)
	5693	+ void pasteInto(boolean copyit, boolean clone)
4377	5694	{
4378	5695	// if (GrafreeD.clipboard == null)
4379	5696	// return;
..	..	@@ -4402,15 +5719,22 @@
4402	5719	if (copyit)
4403	5720	{
4404	5721	// paste(false);
4405		- CloneClipboard(false); // sept 2014
	5722	+ if (clone)
	5723	+ {
	5724	+ CloneClipboard(false); // sept 2014
	5725	+ }
	5726	+ else
	5727	+ {
	5728	+ paste(false);
	5729	+ }
4406	5730	}
4407	5731	else
4408	5732	{
4409	5733	boolean first = true;
4410	5734
4411		- if (GrafreeD.clipboardIsTempGroup)
	5735	+ if (Grafreed.clipboardIsTempGroup)
4412	5736	{
4413		- Composite temp = (Composite)GrafreeD.clipboard;
	5737	+ Composite temp = (Composite)Grafreed.clipboard;
4414	5738	Object3D copy;
4415	5739	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4416	5740	{
..	..	@@ -4420,7 +5744,7 @@
4420	5744	}
4421	5745	} else
4422	5746	{
4423		- linkSomething(GrafreeD.clipboard); //.get(0));
	5747	+ linkSomething(Grafreed.clipboard); //.get(0));
4424	5748	}
4425	5749	}
4426	5750	}
..	..	@@ -4497,6 +5821,10 @@
4497	5821
4498	5822	void group(Object3D csg, boolean grab)
4499	5823	{
	5824	+ if (Globals.REPLACEONMAKE)
	5825	+ Save();
	5826	+ boolean keep = Globals.REPLACEONMAKE;
	5827	+ Globals.REPLACEONMAKE = false;
4500	5828	if (//false) // why??
4501	5829	!group.selection.isEmpty())
4502	5830	{
..	..	@@ -4610,10 +5938,15 @@
4610	5938	//node.add(csg);
4611	5939	//makeSomething(node);
4612	5940	makeSomething(csg);
	5941	+ Globals.REPLACEONMAKE = keep;
4613	5942	}
4614	5943
4615	5944	void Ungroup(Object3D g)
4616	5945	{
	5946	+ if (Globals.REPLACEONMAKE)
	5947	+ Save();
	5948	+ boolean keep = Globals.REPLACEONMAKE;
	5949	+ Globals.REPLACEONMAKE = false;
4617	5950	if (g instanceof HiddenObject)
4618	5951	{
4619	5952	HiddenObject h = (HiddenObject) g;
..	..	@@ -4630,6 +5963,7 @@
4630	5963	objEditor.makeSomething(g.get(i), false);
4631	5964	}
4632	5965	}
	5966	+ Globals.REPLACEONMAKE = keep;
4633	5967	}
4634	5968
4635	5969	void ungroup()
..	..	@@ -4825,21 +6159,6 @@
4825	6159	}
4826	6160	*/
4827	6161
4828		- void ImportGFD()
4829		- {
4830		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4831		- browser.show();
4832		- String filename = browser.getFile();
4833		- if (filename != null && filename.length() > 0)
4834		- {
4835		- String fullname = browser.getDirectory() + filename;
4836		-
4837		- //Object3D readobj =
4838		- objEditor.ReadGFD(fullname, objEditor);
4839		- //makeSomething(readobj);
4840		- }
4841		- }
4842		-
4843	6162	/*
4844	6163	public void Callback(Object obj)
4845	6164	{
..	..	@@ -4863,26 +6182,9 @@
4863	6182	}
4864	6183	*/
4865	6184
4866		- void ImportVRMLX3D()
4867		- {
4868		- if (GrafreeD.standAlone)
4869		- {
4870		- /**/
4871		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4872		- browser.show();
4873		- String filename = browser.getFile();
4874		- if (filename != null && filename.length() > 0)
4875		- {
4876		- String fullname = browser.getDirectory() + filename;
4877		- LoadVRMLX3D(fullname);
4878		- }
4879		- /**/
4880		- }
4881		- }
4882		-
4883	6185	String GetFile(String dialogName)
4884	6186	{
4885		- if (GrafreeD.standAlone)
	6187	+ if (Grafreed.standAlone)
4886	6188	{
4887	6189	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4888	6190	browser.show();
..	..	@@ -4946,10 +6248,48 @@
4946	6248	cButton flashSelectionButton;
4947	6249	cButton editButton;
4948	6250	cButton uneditButton;
	6251	+ JCheckBox allParamsButton;
4949	6252	cButton clearpanelButton;
4950		- cButton allParamsButton;
4951	6253	cButton unselectButton;
4952	6254
	6255	+ cButton restoreCameraButton;
	6256	+
	6257	+ cButton oneStepButton;
	6258	+
	6259	+ cButton groupButton;
	6260	+ cButton ungroupButton;
	6261	+ cButton compositeButton;
	6262	+ cButton switchButton;
	6263	+ cButton loopButton;
	6264	+ cButton textureButton;
	6265	+
	6266	+ cButton skybox1Button;
	6267	+ cButton skybox2Button;
	6268	+ cButton skybox3Button;
	6269	+ cButton skybox4Button;
	6270	+ cButton skybox5Button;
	6271	+ cButton skybox6Button;
	6272	+ cButton skybox7Button;
	6273	+
	6274	+ cButton skybox11Button;
	6275	+ cButton skybox12Button;
	6276	+ cButton skybox13Button;
	6277	+ cButton skybox14Button;
	6278	+ cButton skybox15Button;
	6279	+ cButton skybox16Button;
	6280	+ cButton skybox17Button;
	6281	+
	6282	+ cButton gridButton;
	6283	+ cButton boxButton;
	6284	+ cButton sphereButton;
	6285	+ cButton coneButton;
	6286	+ cButton torusButton;
	6287	+ cButton superButton;
	6288	+ cButton kleinButton;
	6289	+ cButton particlesButton;
	6290	+ cButton overlayButton;
	6291	+ cButton lightButton;
	6292	+
4953	6293	cButton screenfitButton;
4954	6294	cButton screenfitpointButton;
4955	6295	cButton snapobjectButton;
..	..	@@ -4961,14 +6301,6 @@
4961	6301
4962	6302	cButton setsupportButton;
4963	6303
4964		- cButton twoButton;
4965		- cButton sixButton;
4966		- cButton threeButton;
4967		- cButton sevenButton;
4968		- cButton fourButton; // full panel
4969		- cButton oneButton; // full XYZ
4970		- //cButton currentLayout;
4971		-
4972	6304	//
4973	6305	//Composite
4974	6306	Object3D // to do !!
..	..	@@ -4978,10 +6310,12 @@
4978	6310	//JTree jTree;
4979	6311	private MenuItem lookAtItem;
4980	6312	private MenuItem lookFromItem;
4981		- private MenuItem switchItem;
4982		- private MenuItem cutItem;
4983		- private MenuItem duplicateItem;
4984		- private MenuItem cloneItem;
	6313	+ private MenuItem switchViewItem;
	6314	+ private JMenuItem cutItem;
	6315	+ private MenuItem undoItem;
	6316	+ private MenuItem redoItem;
	6317	+ private JMenuItem duplicateItem;
	6318	+ private JMenuItem cloneItem;
4985	6319	private MenuItem cloneSupportItem;
4986	6320	private MenuItem overwriteGeoItem;
4987	6321	private MenuItem overwriteMatItem;
..	..	@@ -4993,7 +6327,7 @@
4993	6327	private MenuItem linkverticesItem;
4994	6328	private MenuItem relinkverticesItem;
4995	6329	private MenuItem setMasterItem;
4996		- private MenuItem resetMeshItem;
	6330	+ private MenuItem resetAllItem;
4997	6331	private MenuItem stepAllItem;
4998	6332	private MenuItem revertMeshItem;
4999	6333	private MenuItem poseMeshItem;
..	..	@@ -5002,12 +6336,13 @@
5002	6336	private MenuItem cloneGeometriesItem;
5003	6337	private MenuItem shareGeometriesItem;
5004	6338	private MenuItem mergeGeometriesItem;
5005		- private MenuItem copyItem;
	6339	+ private JMenuItem copyItem;
5006	6340	private MenuItem pasteItem;
5007		- private MenuItem pasteLinkItem;
5008		- private MenuItem pasteCloneItem;
5009		- private MenuItem pasteExpandItem;
5010		- private MenuItem clearItem;
	6341	+ private JMenuItem pasteIntoItem;
	6342	+ private JMenuItem pasteLinkItem;
	6343	+ private JMenuItem pasteCloneItem;
	6344	+ private JMenuItem pasteExpandItem;
	6345	+ private JMenuItem deleteItem;
5011	6346	private MenuItem clearAllItem;
5012	6347	private MenuItem genUVItem;
5013	6348	private MenuItem genNormalsMESHItem;
..	..	@@ -5033,6 +6368,7 @@
5033	6368	private MenuItem clipMeshItem;
5034	6369	private MenuItem smoothMeshItem;
5035	6370	private MenuItem clearMaterialsItem;
	6371	+ private MenuItem clearVersionsItem;
5036	6372
5037	6373	private MenuItem liveleavesItem;
5038	6374	private MenuItem unliveleavesItem;
..	..	@@ -5042,6 +6378,10 @@
5042	6378	private MenuItem showleavesItem;
5043	6379	private MenuItem markleavesItem;
5044	6380	private MenuItem unmarkleavesItem;
	6381	+ private MenuItem rewindleavesItem;
	6382	+ private MenuItem unrewindleavesItem;
	6383	+ private MenuItem randomleavesItem;
	6384	+ private MenuItem unrandomleavesItem;
5045	6385
5046	6386	private MenuItem flipVItem;
5047	6387	private MenuItem unflipVItem;
..	..	@@ -5052,16 +6392,21 @@
5052	6392	private MenuItem maxTexturesItem;
5053	6393	private MenuItem panoTexturesItem;
5054	6394
	6395	+ private MenuItem textureRatioRItem;
	6396	+ private MenuItem textureRatioGItem;
	6397	+ private MenuItem textureRatioBItem;
5055	6398	private MenuItem resetCentroidItem;
5056		- private MenuItem transformgeometryItem;
	6399	+ private MenuItem resetCentroidXZItem;
5057	6400	private MenuItem resetTransformItem;
	6401	+ private MenuItem transformGeometryItem;
	6402	+ private MenuItem transformChildrenItem;
5058	6403	private MenuItem hideItem;
5059		- private MenuItem grabItem;
	6404	+ private JMenuItem grabItem;
5060	6405	private MenuItem backItem;
5061	6406	private MenuItem frontItem;
5062	6407	private MenuItem cameraItem;
5063	6408	private MenuItem compositeItem;
5064		- private MenuItem randomItem;
	6409	+ private MenuItem switchItem;
5065	6410	private MenuItem physicsItem;
5066	6411	private MenuItem frameselectorItem;
5067	6412	private MenuItem scriptNodeItem;
..	..	@@ -5069,7 +6414,7 @@
5069	6414	private MenuItem switchTransfoItem;
5070	6415	private MenuItem morphItem;
5071	6416	private MenuItem linkerItem;
5072		- private MenuItem ungroupItem;
	6417	+ private JMenuItem ungroupItem;
5073	6418	private MenuItem editItem;
5074	6419	private MenuItem openWindowItem;
5075	6420	private MenuItem editLeafItem;
..	..	@@ -5085,6 +6430,8 @@
5085	6430	private MenuItem attachBumpItem;
5086	6431	private MenuItem detachBumpItem;
5087	6432	private MenuItem pigmentBumpItem;
	6433	+ private MenuItem embedTexturesItem;
	6434	+ private MenuItem deEmbedTexturesItem;
5088	6435
5089	6436	private MenuItem particleItem;
5090	6437	private MenuItem ragdollItem;
..	..	@@ -5101,7 +6448,7 @@
5101	6448	private MenuItem blobItem;
5102	6449	private MenuItem latheItem;
5103	6450	private MenuItem bezierItem;
5104		- private MenuItem checkerItem;
	6451	+ private MenuItem overlayItem;
5105	6452	private MenuItem meshItem;
5106	6453	// private MenuItem meshGroupItem;
5107	6454	private MenuItem springItem;
..	..	@@ -5123,11 +6470,6 @@
5123	6470	private MenuItem doubleItem;
5124	6471	private MenuItem tripleItem;
5125	6472
5126		- private MenuItem importGFDItem;
5127		- private MenuItem importVRMLX3DItem;
5128		- private MenuItem import3DSItem;
5129		- private MenuItem importOBJItem;
5130		-
5131	6473	private MenuItem computeAOItem;
5132	6474	private MenuItem recompileItem;
5133	6475	private MenuItem editScriptItem;
..	..	@@ -5137,4 +6479,8 @@
5137	6479	private MenuItem analyzeItem;
5138	6480	private MenuItem dumpItem;
5139	6481	//boolean freezemodel = false;
	6482	+
	6483	+ Menu cameraMenu;
	6484	+ MenuItem editCameraItem;
	6485	+ MenuItem restoreCameraItem;
5140	6486	}