~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)
..	..	@@ -115,11 +483,16 @@
115	483
116	484	Object3D parent = obj.parent;
117	485	obj.parent = null;
	486	+
118	487	// Object3D support = obj.support;
119	488	// obj.support = null;
120	489	if (!supports)
121	490	obj.SaveSupports();
122		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	491	+
	492	+ Object3D clone = (Object3D)Grafreed.clone(obj);
	493	+
	494	+ clone.ResetUUIDs();
	495	+
123	496	obj.parent = parent;
124	497	// obj.support = support;
125	498	// clone.support = support; // aout 2013
..	..	@@ -148,58 +521,155 @@
148	521
149	522	//JTextField nameField;
150	523
151		- void SetupMenu2(ObjEditor oe)
	524	+ void SetupMenu2(GroupEditor oe)
152	525	{
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);
	526	+ oe.jTree = new cTree();
	527	+
164	528	Menu menu;
165	529	oe.menuBar.add(menu = new Menu("Edit"));
166	530	//editItem = menu.add(new MenuItem("Edit"));
167	531	//editItem.addActionListener(this);
168		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	532	+
	533	+// undoItem = menu.add(new MenuItem("Undo"));
	534	+// undoItem.addActionListener(this);
	535	+// redoItem = menu.add(new MenuItem("Redo"));
	536	+// redoItem.addActionListener(this);
	537	+// menu.add("-");
	538	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
169	539	duplicateItem.addActionListener(this);
170		- menu.add("-");
171		- cloneItem = menu.add(new MenuItem("Clone"));
	540	+
	541	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
172	542	cloneItem.addActionListener(this);
	543	+ //if (Globals.ADVANCED)
	544	+ {
173	545	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
174	546	cloneSupportItem.addActionListener(this);
	547	+ }
	548	+ oe.jTree.popup.addSeparator();
175	549	menu.add("-");
176		- cutItem = menu.add(new MenuItem("Cut"));
	550	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
177	551	cutItem.addActionListener(this);
178		- copyItem = menu.add(new MenuItem("Copy"));
	552	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
179	553	copyItem.addActionListener(this);
180	554	pasteItem = menu.add(new MenuItem("Paste"));
181	555	pasteItem.addActionListener(this);
182		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	556	+
	557	+ oe.jTree.popup.addSeparator();
	558	+ //menu.add("-");
	559	+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
	560	+ pasteIntoItem.addActionListener(this);
	561	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
183	562	pasteLinkItem.addActionListener(this);
184		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	563	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
185	564	pasteCloneItem.addActionListener(this);
186		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
187		-// pasteExpandItem.addActionListener(this);
188		- clearItem = menu.add(new MenuItem("Clear"));
189		- clearItem.addActionListener(this);
	565	+// CRASH
	566	+ pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
	567	+//
	568	+ pasteExpandItem.addActionListener(this);
	569	+ //menu.add("-");
	570	+ oe.jTree.popup.addSeparator();
	571	+
	572	+ if (Globals.ADVANCED)
	573	+ {
	574	+ // Deletes the cameras...
190	575	clearAllItem = menu.add(new MenuItem("Clear All"));
191	576	clearAllItem.addActionListener(this);
	577	+ }
	578	+
	579	+ menuBar.add(cameraMenu = new Menu("View"));
	580	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	581	+ //zBufferItem.addActionListener(this);
	582	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	583	+ //normalLensItem.addActionListener(this);
	584	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	585	+ restoreCameraItem.addActionListener(this);
	586	+
	587	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	588	+// toggleFullScreenItem.addItemListener(this);
	589	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	590	+// cameraMenu.add("-");
	591	+//
	592	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	593	+// toggleTextureItem.addItemListener(this);
	594	+// toggleTextureItem.setState(CameraPane.textureon);
	595	+//
	596	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	597	+// toggleSwitchItem.addItemListener(this);
	598	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	599	+
	600	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	601	+ toggleHandleItem.addItemListener(this);
	602	+ toggleHandleItem.setState(CameraPane.HANDLES);
	603	+
	604	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	605	+ togglePaintItem.addItemListener(this);
	606	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	607	+
	608	+ if (Globals.ADVANCED)
	609	+ {
	610	+ cameraMenu.add("-");
	611	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	612	+ toggleLiveItem.addItemListener(this);
	613	+ toggleLiveItem.setState(Globals.isLIVE());
192	614
	615	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	616	+ stepItem.addActionListener(this);
	617	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	618	+ // toggleDLItem.addItemListener(this);
	619	+ // toggleDLItem.setState(false);
	620	+
	621	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	622	+ toggleRenderItem.addItemListener(this);
	623	+ toggleRenderItem.setState(!CameraPane.frozen);
	624	+
	625	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	626	+ toggleDebugItem.addItemListener(this);
	627	+ toggleDebugItem.setState(Globals.DEBUG);
	628	+
	629	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	630	+ toggleFrustumItem.addItemListener(this);
	631	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	632	+
	633	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	634	+ toggleFootContactItem.addItemListener(this);
	635	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	636	+
	637	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	638	+ toggleTimelineItem.addItemListener(this);
	639	+ }
	640	+
	641	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	642	+// toggleRootItem.addItemListener(this);
	643	+// toggleRootItem.setState(false);
	644	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	645	+// animationItem.addItemListener(this);
	646	+// animationItem.setState(CameraPane.ANIMATION);
	647	+ cameraMenu.add("-");
	648	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	649	+ editCameraItem.addActionListener(this);
	650	+
	651	+ if (Globals.ADVANCED)
	652	+ {
	653	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	654	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	655	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	656	+ oe.cameraMenu.add("-");
	657	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	658	+ openWindowItem.addActionListener(this);
	659	+ lookAtItem.addActionListener(this);
	660	+ //lookFromItem.addActinoListener(this);
	661	+ //switchViewItem.addActionListener(this);
	662	+ }
	663	+
193	664	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);
	665	+ if (Globals.ADVANCED)
	666	+ {
198	667	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
199	668	revertMeshItem.addActionListener(this);
200	669	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
201	670	resetreferencesItem.addActionListener(this);
202	671	menu.add("-");
	672	+ }
203	673	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
204	674	overwriteGeoItem.addActionListener(this);
205	675	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -211,79 +681,118 @@
211	681	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
212	682	overwriteUVItem.addActionListener(this);
213	683	menu.add("-");
	684	+ if (Globals.ADVANCED)
	685	+ {
214	686	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
215	687	generateMeshItem.addActionListener(this);
216	688	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
217	689	poseMeshItem.addActionListener(this);
218	690	menu.add("-");
	691	+ }
219	692	resetsupportItem = menu.add(new MenuItem("Reset support"));
220	693	resetsupportItem.addActionListener(this);
221	694	linkverticesItem = menu.add(new MenuItem("Link to Support"));
222	695	linkverticesItem.addActionListener(this);
223	696	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
224	697	relinkverticesItem.addActionListener(this);
	698	+
	699	+ if (Globals.ADVANCED)
	700	+ {
225	701	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
226	702	setMasterItem.addActionListener(this);
	703	+ }
227	704
228		- oe.menuBar.add(menu = new Menu("Group"));
229		- grabItem = menu.add(new MenuItem("Grab"));
230		- grabItem.addActionListener(this);
	705	+ oe.menuBar.add(menu = new Menu("Order"));
	706	+
231	707	backItem = menu.add(new MenuItem("Back"));
232	708	backItem.addActionListener(this);
233	709	frontItem = menu.add(new MenuItem("Front"));
234	710	frontItem.addActionListener(this);
235		- compositeItem = menu.add(new MenuItem("Composite"));
236		- compositeItem.addActionListener(this);
237		- hideItem = menu.add(new MenuItem("Hide"));
	711	+// compositeItem = menu.add(new MenuItem("Composite"));
	712	+// compositeItem.addActionListener(this);
	713	+
	714	+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
	715	+ grabItem.addActionListener(this);
	716	+
	717	+ if (Globals.ADVANCED)
	718	+ {
	719	+ hideItem = menu.add(new MenuItem("Hidden Group"));
238	720	hideItem.addActionListener(this);
239		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	721	+ }
	722	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
240	723	ungroupItem.addActionListener(this);
241		- menu.add("-");
242		- randomItem = menu.add(new MenuItem("Random"));
243		- randomItem.addActionListener(this);
244		- physicsItem = menu.add(new MenuItem("Physics"));
245		- physicsItem.addActionListener(this);
246		- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
247		- frameselectorItem.addActionListener(this);
	724	+
	725	+ oe.jTree.popup.addSeparator();
	726	+
	727	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	728	+ deleteItem.addActionListener(this);
	729	+
	730	+// menu.add("-");
	731	+//
	732	+// switchItem = menu.add(new MenuItem("Switch node"));
	733	+// switchItem.addActionListener(this);
	734	+ if (Globals.ADVANCED)
	735	+ {
248	736	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
249	737	switchGeoItem.addActionListener(this);
250	738	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
251	739	switchTransfoItem.addActionListener(this);
252		- morphItem = menu.add(new MenuItem("Morph"));
	740	+ morphItem = menu.add(new MenuItem("Morph Group"));
253	741	morphItem.addActionListener(this);
	742	+
	743	+ menu.add("-");
	744	+ physicsItem = menu.add(new MenuItem("Physics"));
	745	+ physicsItem.addActionListener(this);
	746	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	747	+ frameselectorItem.addActionListener(this);
254	748	scriptNodeItem = menu.add(new MenuItem("Script Node"));
255	749	scriptNodeItem.addActionListener(this);
256		- cameraItem = menu.add(new MenuItem("Camera"));
257		- cameraItem.addActionListener(this);
	750	+ }
258	751
259	752	oe.menuBar.add(menu = new Menu("Object"));
260		- textureItem = menu.add(new MenuItem("Texture"));
261		- textureItem.addActionListener(this);
	753	+// textureItem = menu.add(new MenuItem("Texture"));
	754	+// textureItem.addActionListener(this);
262	755	billboardItem = menu.add(new MenuItem("Billboard"));
263	756	billboardItem.addActionListener(this);
264	757	csgItem = menu.add(new MenuItem("CSG"));
265	758	csgItem.addActionListener(this);
266		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	759	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
267	760	shadowXItem.addActionListener(this);
268		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	761	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
269	762	shadowYItem.addActionListener(this);
270		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	763	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
271	764	shadowZItem.addActionListener(this);
	765	+
	766	+ attributeItem = menu.add(new MenuItem("Attribute"));
	767	+ attributeItem.addActionListener(this);
	768	+ if (Globals.ADVANCED)
	769	+ {
	770	+ menu.add("-");
272	771	linkerItem = menu.add(new MenuItem("Linker"));
273	772	linkerItem.addActionListener(this);
274	773	templateItem = menu.add(new MenuItem("Template"));
275	774	templateItem.addActionListener(this);
276		- attributeItem = menu.add(new MenuItem("Attribute"));
277		- attributeItem.addActionListener(this);
278	775	pointflowItem = menu.add(new MenuItem("Point Flow"));
279	776	pointflowItem.addActionListener(this);
	777	+ }
	778	+ menu.add("-");
	779	+ textureRatioRItem = menu.add(new MenuItem("Texture Ratio Red"));
	780	+ textureRatioRItem.addActionListener(this);
	781	+ textureRatioGItem = menu.add(new MenuItem("Texture Ratio Green"));
	782	+ textureRatioGItem.addActionListener(this);
	783	+ textureRatioBItem = menu.add(new MenuItem("Texture Ratio Blue"));
	784	+ textureRatioBItem.addActionListener(this);
280	785	menu.add("-");
281	786	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
282	787	resetTransformItem.addActionListener(this);
283	788	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
284	789	resetCentroidItem.addActionListener(this);
285		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
286		- transformgeometryItem.addActionListener(this);
	790	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XZ"));
	791	+ resetCentroidXZItem.addActionListener(this);
	792	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	793	+ transformGeometryItem.addActionListener(this);
	794	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	795	+ transformChildrenItem.addActionListener(this);
287	796
288	797	oe.menuBar.add(menu = new Menu("Geometry"));
289	798	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -294,8 +803,11 @@
294	803	genNormalsCADItem.addActionListener(this);
295	804	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
296	805	genNormalsMESHItem.addActionListener(this);
297		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	806	+ //if (Globals.ADVANCED)
	807	+ {
	808	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
298	809	genNormalsMINEItem.addActionListener(this);
	810	+ }
299	811	stripifyItem = menu.add(new MenuItem("Stripify"));
300	812	stripifyItem.addActionListener(this);
301	813	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -317,31 +829,52 @@
317	829	reduce34MeshItem.addActionListener(this);
318	830	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
319	831	increaseMeshItem.addActionListener(this);
320		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
321		- smoothMeshItem.addActionListener(this);
322	832	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
323	833	clipMeshItem.addActionListener(this);
	834	+
	835	+ if (Globals.ADVANCED)
	836	+ {
	837	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	838	+ smoothMeshItem.addActionListener(this);
	839	+ }
324	840
325	841	oe.menuBar.add(menu = new Menu("Attributes"));
	842	+ clearVersionsItem = menu.add(new MenuItem("Clear Versions"));
	843	+ clearVersionsItem.addActionListener(this);
326	844	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
327	845	clearMaterialsItem.addActionListener(this);
	846	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	847	+ resetAllItem.addActionListener(this);
	848	+ stepAllItem = menu.add(new MenuItem("Step All"));
	849	+ stepAllItem.addActionListener(this);
328	850	menu.add("-");
329	851	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
330	852	liveleavesItem.addActionListener(this);
331	853	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
332	854	unliveleavesItem.addActionListener(this);
	855	+ if (Globals.ADVANCED)
	856	+ {
333	857	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
334	858	supportleavesItem.addActionListener(this);
335	859	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
336	860	unsupportleavesItem.addActionListener(this);
	861	+ }
337	862	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
338	863	hideleavesItem.addActionListener(this);
339	864	showleavesItem = menu.add(new MenuItem("Show Leaves"));
340	865	showleavesItem.addActionListener(this);
341		- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
	866	+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
342	867	markleavesItem.addActionListener(this);
343		- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
	868	+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
344	869	unmarkleavesItem.addActionListener(this);
	870	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	871	+ rewindleavesItem.addActionListener(this);
	872	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	873	+ unrewindleavesItem.addActionListener(this);
	874	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	875	+ randomleavesItem.addActionListener(this);
	876	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	877	+ unrandomleavesItem.addActionListener(this);
345	878	menu.add("-");
346	879	flipVItem = menu.add(new MenuItem("Flip V"));
347	880	flipVItem.addActionListener(this);
..	..	@@ -367,53 +900,140 @@
367	900	attachBumpItem.addActionListener(this);
368	901	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
369	902	pigmentBumpItem.addActionListener(this);
	903	+ //embedTexturesItem
370	904	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
371	905	detachPigmentItem.addActionListener(this);
372	906	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
373	907	detachBumpItem.addActionListener(this);
	908	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	909	+ embedTexturesItem.addActionListener(this);
	910	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	911	+ deEmbedTexturesItem.addActionListener(this);
374	912	menu.add("-");
375	913	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
376	914	sortbysizeItem.addActionListener(this);
377	915	sortbynameItem = menu.add(new MenuItem("Sort by name"));
378	916	sortbynameItem.addActionListener(this);
379	917	menu.add("-");
	918	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	919	+ shareGeometriesItem.addActionListener(this);
	920	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	921	+ mergeGeometriesItem.addActionListener(this);
	922	+ menu.add("-");
	923	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	924	+ editLeafItem.addActionListener(this);
	925	+ if (Globals.ADVANCED)
	926	+ {
	927	+ // Pretty much the same as duplicate and clone.
380	928	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
381	929	extractGeometriesItem.addActionListener(this);
382	930	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
383	931	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);
	932	+ }
388	933
389	934	oe.menuBar.add(menu = new Menu("Insert"));
390	935	buildCreateMenu(menu);
391	936
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	937	oe.menuBar.add(menu = new Menu("Tools"));
404	938	buildToolsMenu(menu);
405	939	}
406	940
	941	+ JTabbedPane resourcecontainer;
	942	+ cGridBag currenttab;
	943	+ //boolean added; // patch for jar
	944	+
	945	+ int totalcount = 0;
	946	+
	947	+ int tabcount = 0;
	948	+ int colcount = 0;
	949	+ int rowcount = 0;
	950	+ int texturecount = 0;
	951	+
	952	+ int columns = 5;
	953	+ int rows = 7;
	954	+
	955	+ public void ResourceCallBack(String[] path)
	956	+ {
	957	+// for (int i = 0; i < path.length; i++)
	958	+// System.out.print(path[i] + "/");
	959	+// System.out.println();
	960	+
	961	+ if (//rowcount == 0 \|\|
	962	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	963	+ {
	964	+ currenttab = new cGridBag();
	965	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	966	+ currenttab.setName(tabname);
	967	+ //added = false;
	968	+ resourcecontainer.add(currenttab);
	969	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture " + tabname);
	970	+ rowcount = 1;
	971	+ colcount = 0;
	972	+ texturecount = 0;
	973	+ }
	974	+
	975	+ if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") \|\| path[2].toLowerCase().endsWith(".png")))
	976	+ {
	977	+ //if (!added)
	978	+ {
	979	+ //added = true;
	980	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	981	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	982	+ }
	983	+
	984	+ columns = 5;
	985	+
	986	+ if (path[0].contains("D&R") \|\| path[0].contains("Paint"))
	987	+ columns = 4;
	988	+
	989	+ AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
	990	+ totalcount++;
	991	+
	992	+ if (++colcount >= columns)
	993	+ {
	994	+ colcount = 0;
	995	+ currenttab.Return();
	996	+
	997	+ if (rowcount++ >= rows)
	998	+ {
	999	+ rowcount = 0;
	1000	+ }
	1001	+ }
	1002	+ }
	1003	+ else
	1004	+ {
	1005	+// if (!path[path.length-1].equals("icons"))
	1006	+// resourcecontainer.Return();
	1007	+ }
	1008	+ }
	1009	+
	1010	+ void CreateTexturePanel(cGridBag container)
	1011	+ {
	1012	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	1013	+ container.add(resourcecontainer);
	1014	+
	1015	+ Grafreed.ParseResources("textures", this);
	1016	+
	1017	+ // 935. System.out.println("Total = " + totalcount);
	1018	+ }
	1019	+
407	1020	void SetupUI2(ObjEditor oe)
408	1021	{
	1022	+ // June 2019
	1023	+ if (oe == null)
	1024	+ {
	1025	+ //super.SetupUI2(this);
	1026	+ //return;
	1027	+ }
	1028	+
	1029	+ if (copy != group)
	1030	+ {
	1031	+ //super.SetupUI2(this);
	1032	+ }
	1033	+
409	1034	//new Exception().printStackTrace();
410	1035
411	1036	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	1037	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
418	1038
419	1039	oe.buttonGroup = new ButtonGroup();
..	..	@@ -434,98 +1054,271 @@
434	1054	oe.radioPanel.add(dummyButton);
435	1055	oe.buttonGroup.add(dummyButton);
436	1056	*/
	1057	+ cGridBag versionManagerPanel = new cGridBag();
	1058	+
	1059	+ versionManagerPanel.preferredHeight = 4;
	1060	+
437	1061	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
438	1062
439		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
440		- liveCB.setToolTipText("Enabled animation");
441		- liveCB.addItemListener(this);
442		-
443		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK), oe.aConstraints);
444		- trackCB.setToolTipText("Enable tracking");
445		- trackCB.addItemListener(this);
446		-
447		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1063	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1064	+ //minButton.setToolTipText("Minimize window");
	1065	+ //minButton.addActionListener(this);
	1066	+
	1067	+ if (Globals.ADVANCED)
	1068	+ {
	1069	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1070	+// maxButton.setToolTipText("Maximize window");
	1071	+// maxButton.addActionListener(this);
	1072	+ }
	1073	+
	1074	+ cButton gcButton;
	1075	+
	1076	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1077	+// gcButton.setToolTipText("Garbage collect");
	1078	+// gcButton.addActionListener(new ActionListener()
	1079	+// {
	1080	+// public void actionPerformed(ActionEvent e)
	1081	+// {
	1082	+// System.gc();
	1083	+// }
	1084	+// });
	1085	+
	1086	+ oe.toolbarPanel.add(fullScreenButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1087	+ fullScreenButton.setToolTipText("Full-screen window");
	1088	+ fullScreenButton.addActionListener(this);
	1089	+
	1090	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1091	+ collapseButton.setToolTipText("Collapse toolbar");
	1092	+ collapseButton.addActionListener(this);
	1093	+
	1094	+// oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1095	+// maximize3DButton.setToolTipText("Maximize 3D view");
	1096	+// maximize3DButton.addActionListener(this);
	1097	+
	1098	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1099	+ twoButton.setToolTipText("Show 3D view only");
	1100	+ twoButton.addActionListener(this);
	1101	+ this.fullscreenLayout = twoButton;
	1102	+
	1103	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1104	+ threeButton.setToolTipText("Show controls and 3D view");
	1105	+ threeButton.addActionListener(this);
	1106	+ if (Globals.ADVANCED)
	1107	+ {
	1108	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1109	+ sixButton.setToolTipText("Show 3D view and controls");
	1110	+ sixButton.addActionListener(this);
	1111	+ }
	1112	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1113	+// sevenButton.setToolTipText("3-column layout");
	1114	+// sevenButton.addActionListener(this);
	1115	+ //
	1116	+
	1117	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
448	1118	screenfitButton.setToolTipText("Screen fit");
449	1119	screenfitButton.addActionListener(this);
450	1120
	1121	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1122	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1123	+ restoreCameraButton.addActionListener(this);
	1124	+
	1125	+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1126	+ saveVersionButton.setToolTipText("Duplicate current version");
	1127	+ saveVersionButton.addActionListener(this);
	1128	+
	1129	+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1130	+ deleteVersionButton.setToolTipText("Delete current version");
	1131	+ deleteVersionButton.addActionListener(this);
	1132	+ deleteVersionButton.setEnabled(false);
	1133	+
	1134	+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1135	+ previousVersionButton.setToolTipText("Previous version");
	1136	+ previousVersionButton.addActionListener(this);
	1137	+ previousVersionButton.setEnabled(false);
	1138	+
	1139	+ cGridBag updown = new cGridBag().setVertical(true);
	1140	+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1141	+ restoreButton.setToolTipText("Undo (restore current version)");
	1142	+ restoreButton.addActionListener(this);
	1143	+ restoreButton.setEnabled(false);
	1144	+
	1145	+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1146	+ replaceButton.setToolTipText("Save (replace current version)");
	1147	+ replaceButton.addActionListener(this);
	1148	+ replaceButton.setEnabled(false);
	1149	+
	1150	+ versionManagerPanel.add(updown);
	1151	+
	1152	+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1153	+ nextVersionButton.setToolTipText("Next version");
	1154	+ nextVersionButton.addActionListener(this);
	1155	+ nextVersionButton.setEnabled(false);
	1156	+
	1157	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1158	+ oneStepButton.setToolTipText("Animate one step forward");
	1159	+ oneStepButton.addActionListener(this);
	1160	+
	1161	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1162	+ liveCB.setToolTipText("Enable animation");
	1163	+ liveCB.addItemListener(this);
	1164	+
	1165	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	1166	+ fastCB.setToolTipText("Fast mode");
	1167	+ fastCB.addItemListener(this);
	1168	+
	1169	+ //oe.toolboxPanel.Return();
	1170	+
	1171	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1172	+// trackCB.setToolTipText("Enable tracking");
	1173	+// trackCB.addItemListener(this);
	1174	+
451	1175	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
452	1176	// screenfitpointButton.addActionListener(this);
453		-// oe.aConstraints.gridx += 1;
454		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
455		- snapobjectButton.addActionListener(this);
456		- snapobjectButton.setToolTipText("Snap Object");
457		- oe.aConstraints.gridx += 1;
458	1177
459		- //aConstraints.gridx = 0;
460		- //aConstraints.gridy += 1;
461		- oe.aConstraints.weighty = 0;
462		- oe.aConstraints.gridwidth = 1;
463		-
464		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
465		- flashSelectionButton.setToolTipText("Show selection");
466		- flashSelectionButton.addActionListener(this);
467		-
468		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
469		-
470		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
471		- twoButton.setToolTipText("Show center view only");
472		- twoButton.addActionListener(this);
473		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1178	+ if (Globals.ADVANCED)
	1179	+ {
	1180	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1181	+ snapobjectButton.addActionListener(this);
	1182	+ snapobjectButton.setToolTipText("Snap Object");
	1183	+
	1184	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
474	1185	fourButton.addActionListener(this);
475		- fourButton.setToolTipText("Show left panel only");
476		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
477		- sixButton.setToolTipText("2-column layout left");
478		- sixButton.addActionListener(this);
479		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
480		- threeButton.setToolTipText("2-column layout right");
481		- threeButton.addActionListener(this);
482		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
483		- sevenButton.setToolTipText("3-column layout");
484		- sevenButton.addActionListener(this);
485		- //
	1186	+ fourButton.setToolTipText("Show control panel only");
	1187	+ }
486	1188
487		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
488		- rootButton.setToolTipText("Edit object in new tab");
	1189	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	1190	+
	1191	+
	1192	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1193	+ rootButton.setToolTipText("Open selection in new tab");
489	1194	rootButton.addActionListener(this);
490		- oe.aConstraints.gridx += 1;
491		- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1195	+
	1196	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
492	1197	closeButton.setToolTipText("Close tab");
493	1198	closeButton.addActionListener(this);
494	1199	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
495	1200	//clearButton.addActionListener(this);
496		- oe.aConstraints.gridx += 1;
497		-
498		- oe.aConstraints.gridx = 1; //
499		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
500		- editButton.addActionListener(this);
501		- oe.aConstraints.gridx += 1;
502		- oe.aConstraints.weighty = 0;
503		- oe.aConstraints.gridwidth = 1;
504	1201
505		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	1202	+ cGridBag row1 = new cGridBag();
	1203	+ row1.preferredHeight = 8;
	1204	+
	1205	+ // INSERT
	1206	+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1207	+ gridButton.setToolTipText("Create ground");
	1208	+ gridButton.addActionListener(this);
	1209	+
	1210	+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1211	+ boxButton.setToolTipText("Create box");
	1212	+ boxButton.addActionListener(this);
	1213	+
	1214	+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1215	+ superButton.setToolTipText("Create superellipsoid");
	1216	+ superButton.addActionListener(this);
	1217	+
	1218	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1219	+ sphereButton.setToolTipText("Create sphere");
	1220	+ sphereButton.addActionListener(this);
	1221	+
	1222	+ row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1223	+ coneButton.setToolTipText("Create cone");
	1224	+ coneButton.addActionListener(this);
	1225	+
	1226	+ row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1227	+ torusButton.setToolTipText("Create torus");
	1228	+ torusButton.addActionListener(this);
	1229	+
	1230	+ if (false) //Globals.ADVANCED)
	1231	+ {
	1232	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1233	+ kleinButton.setToolTipText("Create Klein bottle");
	1234	+ kleinButton.addActionListener(this);
	1235	+ }
	1236	+
	1237	+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1238	+ particlesButton.setToolTipText("Create particle system");
	1239	+ particlesButton.addActionListener(this);
	1240	+
	1241	+ oe.toolboxPanel.add(row1);
	1242	+
	1243	+ cGridBag row2 = new cGridBag();
	1244	+ row2.preferredHeight = 8;
	1245	+
	1246	+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1247	+ groupButton.setToolTipText("Create group");
	1248	+ groupButton.addActionListener(this);
	1249	+
	1250	+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1251	+ compositeButton.setToolTipText("Create composite");
	1252	+ compositeButton.addActionListener(this);
	1253	+
	1254	+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1255	+ switchButton.setToolTipText("Create item switcher");
	1256	+ switchButton.addActionListener(this);
	1257	+
	1258	+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1259	+ loopButton.setToolTipText("Create loop");
	1260	+ loopButton.addActionListener(this);
	1261	+
	1262	+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1263	+ textureButton.setToolTipText("Create texture");
	1264	+ textureButton.addActionListener(this);
	1265	+
	1266	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1267	+ overlayButton.setToolTipText("Create overlay");
	1268	+ overlayButton.addActionListener(this);
	1269	+
	1270	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1271	+ lightButton.setToolTipText("Create light");
	1272	+ lightButton.addActionListener(this);
	1273	+
	1274	+ oe.toolboxPanel.add(row2);
	1275	+
	1276	+ cGridBag textures = new cGridBag();
	1277	+
	1278	+ CreateTexturePanel(textures);
	1279	+
	1280	+ int tabCount = resourcecontainer.getTabCount();
	1281	+
	1282	+ if (tabCount > 0)
	1283	+ resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
	1284	+
	1285	+ oe.toolboxPanel.add(textures);
	1286	+
	1287	+ textures.preferredHeight = 100;
	1288	+
	1289	+ CreateSkyboxPanel(oe.skyboxPanel);
	1290	+
	1291	+ // EDIT panel
	1292	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1293	+ editButton.setToolTipText("Pin selection controls");
	1294	+ editButton.addActionListener(this);
	1295	+
	1296	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1297	+ uneditButton.setToolTipText("Unpin and remove selection controls");
506	1298	uneditButton.addActionListener(this);
507	1299
508		- oe.aConstraints.gridx += 1;
509		- oe.aConstraints.weighty = 0;
510		- oe.aConstraints.gridwidth = 1;
511		-
512		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
513		- clearPanelButton.addActionListener(this);
514		-
515		- oe.aConstraints.gridx += 1;
516		- oe.aConstraints.weighty = 0;
517		- oe.aConstraints.gridwidth = 1;
518		-
519		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	1300	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1301	+ allParamsButton.setToolTipText("Show all controls");
520	1302	allParamsButton.addActionListener(this);
521	1303
522		- oe.aConstraints.gridx += 1;
523		- oe.aConstraints.weighty = 0;
524		- oe.aConstraints.gridwidth = 1;
525		-
526		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
527		- unselectButton.addActionListener(this);
	1304	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1305	+ clearPanelButton.setToolTipText("Clear all controls");
	1306	+ clearPanelButton.addActionListener(this);
528	1307
	1308	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1309	+ //unselectButton.setToolTipText("Unselect");
	1310	+ //unselectButton.addActionListener(this);
	1311	+
	1312	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1313	+ flashSelectionButton.setToolTipText("Highlight selection");
	1314	+ flashSelectionButton.addActionListener(this);
	1315	+
	1316	+ editCommandsPanel.preferredHeight = 1;
	1317	+
	1318	+ SetPinStates(false);
	1319	+// oe.treePanel.add(commandsPanel);
	1320	+// oe.treePanel.Return();
	1321	+
529	1322	// oe.aConstraints.gridx += 1;
530	1323	// oe.aConstraints.weighty = 0;
531	1324	// oe.aConstraints.gridwidth = 1;
..	..	@@ -537,47 +1330,35 @@
537	1330	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
538	1331	// gcButton.addActionListener(this);
539	1332
540		- oe.aConstraints.gridx = 0;
541		- oe.aConstraints.gridy += 1;
542		-
543		- //ctrlPanel.add(objList = new List(5, true));
544		- oe.aConstraints.gridwidth = 100;
545		- // oe.aConstraints.gridheight = 100;
546		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
547		- oe.aConstraints.gridheight = 1;
548		- oe.aConstraints.weighty = 0.5;
549		- oe.aConstraints.gridx = 0;
550		- JScrollPane jSP;
	1333	+ cGridBag jSPPanel = new cGridBag();
	1334	+
	1335	+ jSPPanel.preferredHeight = 20;
	1336	+
	1337	+ JScrollPane jSP;
551	1338	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
552		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	1339	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
553	1340	ResetModel();
554		- oe.aConstraints.weighty = 0.5;
555		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
556		- oe.aConstraints.gridy += 1;
557		- oe.aConstraints.gridwidth = 1;
558		-
559		- oe.aConstraints.weighty = 0;
560		- oe.aConstraints.gridwidth = 2;
561		-
562		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
563		- colorCB.addItemListener(this);
564		- oe.aConstraints.gridx += 2;
565		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
566		- materialCB.addItemListener(this);
567		- oe.aConstraints.gridx += 2;
568		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
569		- textureCB.addItemListener(this);
570		-
571		- oe.aConstraints.gridx = 0;
572		- oe.aConstraints.gridy += 1;
573	1341
	1342	+ oe.treePanel.add(jSPPanel);
	1343	+ oe.treePanel.Return();
	1344	+
	1345	+ oe.treePanel.add(versionManagerPanel);
	1346	+ oe.treePanel.Return();
	1347	+
	1348	+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1349	+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
	1350	+ versionSliderPane.preferredHeight = 3;
	1351	+
	1352	+// mainPanel.setDividerLocation(0.1); //1.0);
	1353	+ mainPanel.setResizeWeight(0.4);
	1354	+
574	1355	//jList.addListSelectionListener(this);
575	1356	oe.jTree.addTreeSelectionListener(this);
576	1357	//jTree.setRootVisible(false);
577	1358	//jTree.setEditable(true);
578	1359	oe.jTree.setDragEnabled(true);
579	1360	//jTree.setPreferredSize(new Dimension(10,10));
580		- jSP.setPreferredSize(new Dimension(100,200));
	1361	+ //jSP.setPreferredSize(new Dimension(100,200));
581	1362
582	1363	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
583	1364
..	..	@@ -589,122 +1370,203 @@
589	1370	dgr.addDragGestureListener(this);
590	1371	}catch(Exception e) {}
591	1372	*/
592		- radio.layout = sevenButton;
	1373	+ radio.layout = threeButton; // sixButton;
593	1374	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
594	1375	}
595	1376
596	1377	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
597	1378	{
598		- //constraints.gridx = 0;
599		- //constraints.gridy = 0;
600		- panel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
601		- fastCB.setToolTipText("Fast mode");
602		- fastCB.addItemListener(this);
603		- //constraints.gridy += 1;
604		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
605		- supportCB.setToolTipText("Enabled rigging");
606		- supportCB.addItemListener(this);
	1379	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1380	+ colorCB.setToolTipText("Copy color when dropped");
	1381	+ colorCB.addItemListener(this);
607	1382
608		- // constraints.gridy += 1;
	1383	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1384	+ materialCB.setToolTipText("Copy material when dropped");
	1385	+ materialCB.addItemListener(this);
	1386	+
	1387	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1388	+ textureCB.setToolTipText("Copy texture when dropped");
	1389	+ textureCB.addItemListener(this);
	1390	+
	1391	+ panel.Return();
	1392	+
	1393	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	1394	+ boxCB.setToolTipText("Display bounding boxes");
	1395	+ boxCB.addItemListener(this);
	1396	+
	1397	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	1398	+ zoomBoxCB.setToolTipText("Display only for wheel");
	1399	+ zoomBoxCB.addItemListener(this);
	1400	+
	1401	+ if (true) // Globals.ADVANCED)
	1402	+ {
	1403	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1404	+// supportCB.setToolTipText("Enable rigging");
	1405	+// supportCB.addItemListener(this);
	1406	+
	1407	+ panel.add(freezeCB = new cCheckBox("Fast cam", Globals.FREEZEONMOVE)); //, constraints);
	1408	+ freezeCB.setToolTipText("Fast moving camera");
	1409	+ freezeCB.addItemListener(this);
	1410	+
609	1411	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
610	1412	// localCB.addItemListener(this);
611	1413
612		- //constraints.gridy += 1;
	1414	+ panel.Return();
	1415	+
	1416	+ if (Globals.ADVANCED)
	1417	+ {
613	1418	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
614	1419	crowdCB.setToolTipText("Used for crowds");
615	1420	crowdCB.addItemListener(this);
	1421	+ }
616	1422
617		- //constraints.gridy += 1;
618	1423	panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
619	1424	smoothCB.setToolTipText("Snapping delay");
620	1425	smoothCB.addItemListener(this);
621	1426
622		- //constraints.gridy += 1;
623		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
624		- slowCB.setToolTipText("Smooth interpolation");
625		- slowCB.addItemListener(this);
626		- //constraints.gridy += 1;
627		- panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
628		- boxCB.setToolTipText("Display bounding boxes");
629		- boxCB.addItemListener(this);
630		- //constraints.gridy += 1;
631		- panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
632		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
633		- zoomBoxCB.addItemListener(this);
634		-
635		-// constraints.gridy += 1;
	1427	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1428	+// slowCB.setToolTipText("Smooth interpolation");
	1429	+// slowCB.addItemListener(this);
	1430	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1431	+ minshaderCB.setToolTipText("Minimal fast shader");
	1432	+ minshaderCB.addItemListener(this);
	1433	+
636	1434	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
637	1435	// speakerMocapCB.addItemListener(this);
638	1436
639	1437	if (false)
640	1438	{
641	1439	// handled in scripts
642		- //constraints.gridy += 1;
643	1440	panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
644	1441	speakerCameraCB.addItemListener(this);
645	1442
646		- //constraints.gridy += 1;
647	1443	panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
648	1444	speakerFocusCB.addItemListener(this);
649	1445
650		- //constraints.gridy += 1;
651		- panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
652		- smoothfocusCB.addItemListener(this);
	1446	+ panel.Return();
653	1447	}
654	1448
655		-//constraints.gridx += 1;
	1449	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	1450	+ smoothfocusCB.addItemListener(this);
	1451	+
	1452	+ panel.Return();
	1453	+
656	1454	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
657	1455	// debugCB.addItemListener(this);
658	1456
659		- //constraints.gridy += 1;
	1457	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1458	+ trackCB.setToolTipText("Enable tracking target");
	1459	+ trackCB.addItemListener(this);
	1460	+
660	1461	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1462	+ oeilCB.setToolTipText("Move camera when tracking");
661	1463	oeilCB.addItemListener(this);
662	1464
663		- //constraints.gridy += 1;
	1465	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1466	+ shadowCB.setToolTipText("When live compute shadows");
	1467	+ shadowCB.addItemListener(this);
	1468	+
	1469	+ panel.Return();
	1470	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1471	+ toggleTextureCB.setToolTipText("Load textures");
	1472	+ toggleTextureCB.addItemListener(this);
	1473	+
	1474	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1475	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1476	+ toggleSwitchCB.addItemListener(this);
	1477	+
	1478	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1479	+ autokeepCB.setToolTipText("On structure change");
	1480	+ autokeepCB.addItemListener(this);
	1481	+
	1482	+ panel.Return();
	1483	+ if (Globals.ADVANCED)
	1484	+ {
664	1485	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
665	1486	lookAtCB.setToolTipText("Look-at target");
666	1487	lookAtCB.addItemListener(this);
	1488	+ }
	1489	+
	1490	+ }
	1491	+
	1492	+ cGridBag fill = new cGridBag();
	1493	+ fill.preferredHeight = 200;
	1494	+ cGridBag fill2 = new cGridBag();
	1495	+ fill2.preferredHeight = 200;
	1496	+ cGridBag fill3 = new cGridBag();
	1497	+ fill3.preferredHeight = 200;
	1498	+
	1499	+ panel.add(fill);
	1500	+ panel.add(fill2);
	1501	+ panel.add(fill3);
667	1502
668	1503	}
669	1504
670	1505	void EditObject(Object3D obj)
671	1506	{
	1507	+ //assert(obj instanceof Composite);
	1508	+
	1509	+// if (obj.versionlist == null)
	1510	+// {
	1511	+// obj.versionlist = new Object3D[100];
	1512	+// obj.versionindex = -1;
	1513	+// }
	1514	+
672	1515	cRadio radioButton = new cRadio(obj.name);
	1516	+
	1517	+ // June 2019. Patch to avoid bug with transparency.
	1518	+ radioButton.hadMaterial = obj.material != null;
	1519	+ if (!radioButton.hadMaterial)
	1520	+ {
	1521	+ obj.material = new cMaterial();
	1522	+ }
	1523	+
673	1524	radioButton.SetObject(obj);
674		- radioButton.layout = sevenButton;
	1525	+ radioButton.layout = threeButton; // sixButton;
675	1526	radioButton.SetCamera(cameraView.renderCamera, false);
676	1527	radioButton.addActionListener(this);
677	1528	radioPanel.add(radioButton);
678	1529	buttonGroup.add(radioButton);
679	1530	radioButton.doClick();
680	1531	}
	1532	+
681	1533	void SetupViews(ObjEditor oe)
682	1534	{
	1535	+ theFrame = this;
	1536	+
683	1537	oe.SetupViews();
684	1538
	1539	+ if (Globals.DEBUG)
685	1540	System.out.println("SetupViews");
686	1541	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
687	1542	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
688	1543	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
689	1544	}
690	1545
691		- JCheckBox liveCB;
692		- JCheckBox supportCB;
693		- JCheckBox localCB;
694		- JCheckBox crowdCB;
695		- JCheckBox smoothCB;
696		- JCheckBox fastCB;
697		- JCheckBox slowCB;
698		- JCheckBox boxCB;
699		- JCheckBox zoomBoxCB;
700		- JCheckBox trackCB;
701		- JCheckBox smoothfocusCB;
	1546	+ cToggleButton liveCB;
	1547	+ cCheckBox supportCB;
	1548	+ cCheckBox localCB;
	1549	+ cCheckBox crowdCB;
	1550	+ cCheckBox smoothCB;
	1551	+ cCheckBox minshaderCB;
	1552	+
	1553	+ cToggleButton fastCB;
	1554	+ cCheckBox slowCB;
	1555	+ cCheckBox boxCB;
	1556	+ cCheckBox zoomBoxCB;
	1557	+ cCheckBox freezeCB;
	1558	+ //cToggleButton trackCB;
	1559	+ cCheckBox trackCB;
	1560	+ cCheckBox smoothfocusCB;
702	1561	// JCheckBox speakerMocapCB;
703		- JCheckBox speakerCameraCB;
704		- JCheckBox speakerFocusCB;
705		- JCheckBox debugCB;
706		- JCheckBox oeilCB;
707		- JCheckBox lookAtCB;
	1562	+ cCheckBox speakerCameraCB;
	1563	+ cCheckBox speakerFocusCB;
	1564	+ cCheckBox debugCB;
	1565	+
	1566	+ cCheckBox oeilCB;
	1567	+ cCheckBox shadowCB;
	1568	+ cCheckBox autokeepCB;
	1569	+ cCheckBox lookAtCB;
708	1570
709	1571	// static int COLOR = 1;
710	1572	// static int MATERIAL = 2;
..	..	@@ -712,9 +1574,9 @@
712	1574
713	1575	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
714	1576
715		- JCheckBox colorCB;
716		- JCheckBox materialCB;
717		- JCheckBox textureCB;
	1577	+ cCheckBox colorCB;
	1578	+ cCheckBox materialCB;
	1579	+ cCheckBox textureCB;
718	1580
719	1581	public void itemStateChanged(ItemEvent e)
720	1582	{
..	..	@@ -742,6 +1604,7 @@
742	1604	} else if(e.getSource() == liveCB)
743	1605	{
744	1606	cameraView.ToggleLive();
	1607	+ refreshContents(false);
745	1608	}
746	1609	else if(e.getSource() == supportCB)
747	1610	{
..	..	@@ -757,6 +1620,12 @@
757	1620	{
758	1621	cameraView.ToggleInertia();
759	1622	cameraView.repaint();
	1623	+ }
	1624	+ else if(e.getSource() == minshaderCB)
	1625	+ {
	1626	+ Globals.MINSHADER ^= true;
	1627	+ cameraView.programInitialized = false;
	1628	+ cameraView.repaint();
760	1629	}
761	1630	else if(e.getSource() == localCB)
762	1631	{
..	..	@@ -806,6 +1675,18 @@
806	1675	{
807	1676	cameraView.ToggleOeil();
808	1677	}
	1678	+ else if(e.getSource() == shadowCB)
	1679	+ {
	1680	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1681	+ }
	1682	+ else if(e.getSource() == freezeCB)
	1683	+ {
	1684	+ Globals.FREEZEONMOVE ^= true;
	1685	+ }
	1686	+ else if(e.getSource() == autokeepCB)
	1687	+ {
	1688	+ Globals.REPLACEONMAKE ^= true;
	1689	+ }
809	1690	else if(e.getSource() == lookAtCB)
810	1691	{
811	1692	cameraView.ToggleLookAt();
..	..	@@ -822,7 +1703,8 @@
822	1703
823	1704	/**/
824	1705	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
825		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1706	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1707	+ TreePath path = objEditor.jTree.getSelectionPath();
826	1708	if ((path == null) \|\| (path.getPathCount() <= 1)) {
827	1709	// We can't move the root node or an empty selection
828	1710	return;
..	..	@@ -885,8 +1767,6 @@
885	1767	}
886	1768	}
887	1769
888		- String string = (String) object;
889		-
890	1770	System.out.println("Transfer = " + object + "; drop : " + target);
891	1771	// if( object instanceof java.io.File[])
892	1772	// {
..	..	@@ -894,7 +1774,11 @@
894	1774	// objEditor.DropFile((java.io.File[]) object, true);
895	1775	// return;
896	1776	// }
897		- if (string.charAt(0) == '/')
	1777	+
	1778	+ String string = object.toString();
	1779	+
	1780	+ // File path for Mac and Windows
	1781	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
898	1782	{
899	1783	// file(s)
900	1784	String[] names = string.split("\n");
..	..	@@ -921,7 +1805,7 @@
921	1805
922	1806	flashIt = false;
923	1807	CameraPane pane = (CameraPane) target;
924		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1808	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
925	1809	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
926	1810
927	1811	if (group.selection.size() == 1)
..	..	@@ -937,23 +1821,33 @@
937	1821
938	1822	assert target == objEditor.jTree;
939	1823	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1824	+ Object3D destinationLeaf;
940	1825	try {
941		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1826	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
942	1827	} catch (Exception e) {
943	1828	System.out.println("destinationPath : " + destinationPath);
944	1829	return;
945	1830	}
946	1831
947		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1832	+ for (int i=group.selection.size(); --i>=0;)
948	1833	{
	1834	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1835	+
	1836	+ // Cannot move into itself
	1837	+ if (child == destinationLeaf)
	1838	+ return;
	1839	+ }
	1840	+
	1841	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1842	+// {
949	1843	loadClipboard(true);
950	1844	objEditor.jTree.setSelectionPath(destinationPath);
951		- pasteInto(false);
952		- } else {
953		- loadClipboard(false);
954		- objEditor.jTree.setSelectionPath(destinationPath);
955		- pasteInto(false); // true); // ???
956		- }
	1845	+ pasteInto(false, false);
	1846	+// } else {
	1847	+// loadClipboard(false);
	1848	+// objEditor.jTree.setSelectionPath(destinationPath);
	1849	+// pasteInto(false, false); // true); // ???
	1850	+// }
957	1851	}
958	1852	public void dropActionChanged(DropTargetDragEvent dtde)
959	1853	// Called if the user has modified the current drop gesture
..	..	@@ -1009,7 +1903,12 @@
1009	1903	TreePath path;
1010	1904
1011	1905	public TransferableTreePath(TreePath tp) {
1012		- path = tp;
	1906	+ Object[] objs = new Object[tp.getPathCount()];
	1907	+ for (int i=0; i<objs.length; i++)
	1908	+ {
	1909	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1910	+ }
	1911	+ path = new TreePath(objs);
1013	1912	}
1014	1913
1015	1914	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1058,85 +1957,107 @@
1058	1957	{
1059	1958	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1060	1959	//heightFieldItem.addActionListener(this);
1061		- gridItem = menu.add(new MenuItem("Grid"));
1062		- gridItem.addActionListener(this);
1063		- rectoidItem = menu.add(new MenuItem("Box"));
1064		- rectoidItem.addActionListener(this);
1065		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1066		- ellipsoidItem.addActionListener(this);
1067		- coneItem = menu.add(new MenuItem("Cone"));
1068		- coneItem.addActionListener(this);
1069		- torusItem = menu.add(new MenuItem("Torus"));
1070		- torusItem.addActionListener(this);
1071		- superItem = menu.add(new MenuItem("Superellipsoid"));
1072		- superItem.addActionListener(this);
	1960	+// gridItem = menu.add(new MenuItem("Grid"));
	1961	+// gridItem.addActionListener(this);
	1962	+// rectoidItem = menu.add(new MenuItem("Box"));
	1963	+// rectoidItem.addActionListener(this);
	1964	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1965	+// ellipsoidItem.addActionListener(this);
	1966	+// coneItem = menu.add(new MenuItem("Cone"));
	1967	+// coneItem.addActionListener(this);
	1968	+// torusItem = menu.add(new MenuItem("Torus"));
	1969	+// torusItem.addActionListener(this);
	1970	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1971	+// superItem.addActionListener(this);
	1972	+
	1973	+ cameraItem = menu.add(new MenuItem("Camera"));
	1974	+ cameraItem.addActionListener(this);
	1975	+
	1976	+ if (!Globals.ADVANCED)
	1977	+ {
1073	1978	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1074	1979	kleinItem.addActionListener(this);
1075		- particleItem = menu.add(new MenuItem("Particle system"));
1076		- particleItem.addActionListener(this);
	1980	+ }
	1981	+
	1982	+// particleItem = menu.add(new MenuItem("Particle system"));
	1983	+// particleItem.addActionListener(this);
	1984	+ if (Globals.ADVANCED)
	1985	+ {
1077	1986	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1078	1987	ragdollItem.addActionListener(this);
1079	1988	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1080	1989	ragdoll2Item.addActionListener(this);
	1990	+ }
1081	1991	menu.add("-");
1082		- meshItem = menu.add(new MenuItem("Mesh"));
	1992	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1083	1993	meshItem.addActionListener(this);
1084	1994	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1085	1995	// meshGroupItem.addActionListener(this);
	1996	+ if (Globals.ADVANCED)
	1997	+ {
1086	1998	springItem = menu.add(new MenuItem("Spring"));
1087	1999	springItem.addActionListener(this);
1088	2000	flagItem = menu.add(new MenuItem("Flag"));
1089	2001	flagItem.addActionListener(this);
1090		- bezierItem = menu.add(new MenuItem("Patch"));
1091		- bezierItem.addActionListener(this);
1092		- checkerItem = menu.add(new MenuItem("Checker"));
1093		- checkerItem.addActionListener(this);
1094	2002	blobItem = menu.add(new MenuItem("Blob"));
1095	2003	blobItem.addActionListener(this);
1096	2004	latheItem = menu.add(new MenuItem("Lathe"));
1097	2005	latheItem.addActionListener(this);
1098		- lightItem = menu.add(new MenuItem("Light"));
1099		- lightItem.addActionListener(this);
	2006	+ }
	2007	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	2008	+ bezierItem.addActionListener(this);
	2009	+// overlayItem = menu.add(new MenuItem("Overlay"));
	2010	+// overlayItem.addActionListener(this);
	2011	+// lightItem = menu.add(new MenuItem("Light"));
	2012	+// lightItem.addActionListener(this);
1100	2013	menu.add("-");
1101	2014	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1102	2015	//superLoopItem.addActionListener(this);
1103		- loopItem = menu.add(new MenuItem("Loop"));
1104		- loopItem.addActionListener(this);
	2016	+// loopItem = menu.add(new MenuItem("Loop"));
	2017	+// loopItem.addActionListener(this);
1105	2018	doubleItem = menu.add(new MenuItem("Fork"));
1106	2019	doubleItem.addActionListener(this);
	2020	+ if (Globals.ADVANCED)
	2021	+ {
1107	2022	tripleItem = menu.add(new MenuItem("Trident"));
1108	2023	tripleItem.addActionListener(this);
	2024	+ }
1109	2025	}
1110	2026
1111	2027	void buildToolsMenu(Menu menu)
1112	2028	{
1113	2029	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1114	2030	animationItem.addItemListener(this);
1115		- animationItem.setState(CameraPane.ANIMATION);
	2031	+ animationItem.setState(Globals.ANIMATION);
	2032	+
	2033	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	2034	+ archiveItem.addActionListener(this);
1116	2035
1117	2036	menu.add("-");
1118	2037	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1119	2038	parseverticesItem.addActionListener(this);
1120	2039	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1121	2040	textureFieldItem.addActionListener(this);
1122		- alignItem = menu.add(new MenuItem("Align"));
	2041	+ alignItem = menu.add(new MenuItem("Align Objects"));
1123	2042	alignItem.addActionListener(this);
1124		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1125		- mirrorItem.addActionListener(this);
1126	2043	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1127	2044	reduceMorphItem.addActionListener(this);
1128	2045	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1129	2046	reduce34MorphItem.addActionListener(this);
1130		-
1131		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1132		- computeAOItem.addActionListener(this);
1133	2047	menu.add("-");
1134		-
1135	2048	menu.add(memoryItem = new MenuItem("Memory Usage"));
1136	2049	memoryItem.addActionListener(this);
	2050	+ menu.add(computeAOItem = new MenuItem("Compute AO"));
	2051	+ computeAOItem.addActionListener(this);
	2052	+
	2053	+ if (Globals.ADVANCED)
	2054	+ {
	2055	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	2056	+ mirrorItem.addActionListener(this);
	2057	+ menu.add("-");
1137	2058	menu.add(analyzeItem = new MenuItem("Analyze"));
1138	2059	analyzeItem.addActionListener(this);
1139		- menu.add(dumpItem = new MenuItem("Dump"));
	2060	+ menu.add(dumpItem = new MenuItem("Print"));
1140	2061	dumpItem.addActionListener(this);
1141	2062	// menu.add(pathItem = new MenuItem("From-to path"));
1142	2063	// pathItem.addActionListener(this);
..	..	@@ -1155,6 +2076,7 @@
1155	2076	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1156	2077	editScriptItem.addActionListener(this);
1157	2078	}
	2079	+ }
1158	2080
1159	2081	void ScreenFit()
1160	2082	{
..	..	@@ -1167,7 +2089,7 @@
1167	2089	Object3D obj = (Object3D)group.selection.elementAt(0);
1168	2090	objEditor.ScreenFit(obj, false);
1169	2091
1170		- cameraView.pingthread.StepToTarget(true);
	2092	+ cameraView.pingthread.StepToTarget(); //true);
1171	2093	refreshContents();
1172	2094	}
1173	2095
..	..	@@ -1204,7 +2126,7 @@
1204	2126	obj.parent.TransformToWorld(maxima); //, maxima);
1205	2127	}
1206	2128
1207		- Object3D shadow = new Object3D("Shadow " + obj.name);
	2129	+ Object3D shadow = new Object3D("Shadow" + obj.name);
1208	2130
1209	2131	shadow.toParent = LA.newMatrix();
1210	2132	shadow.fromParent = LA.newMatrix();
..	..	@@ -1218,24 +2140,24 @@
1218	2140	switch(axis)
1219	2141	{
1220	2142	case 0 :
1221		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1222		- vert2.x = minima.x; vert2.y = maxima.y; vert2.z = minima.z;
1223		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1224		- vert4.x = minima.x; vert4.y = maxima.y; vert4.z = maxima.z;
	2143	+ vert1.x = minima.x + 0.001f; vert1.y = minima.y; vert1.z = minima.z;
	2144	+ vert2.x = minima.x + 0.001f; vert2.y = maxima.y; vert2.z = minima.z;
	2145	+ vert3.x = minima.x + 0.001f; vert3.y = minima.y; vert3.z = maxima.z;
	2146	+ vert4.x = minima.x + 0.001f; vert4.y = maxima.y; vert4.z = maxima.z;
1225	2147	norm = cVector.X;
1226	2148	break;
1227	2149	case 1 :
1228		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1229		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1230		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1231		- vert4.x = maxima.x; vert4.y = minima.y; vert4.z = maxima.z;
	2150	+ vert1.x = minima.x; vert1.y = minima.y + 0.001f; vert1.z = minima.z;
	2151	+ vert2.x = maxima.x; vert2.y = minima.y + 0.001f; vert2.z = minima.z;
	2152	+ vert3.x = minima.x; vert3.y = minima.y + 0.001f; vert3.z = maxima.z;
	2153	+ vert4.x = maxima.x; vert4.y = minima.y + 0.001f; vert4.z = maxima.z;
1232	2154	norm = cVector.Y;
1233	2155	break;
1234	2156	case 2 :
1235		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1236		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1237		- vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z;
1238		- vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z;
	2157	+ vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z + 0.001f;
	2158	+ vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z + 0.001f;
	2159	+ vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z + 0.001f;
	2160	+ vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z + 0.001f;
1239	2161	norm = cVector.Z;
1240	2162	break;
1241	2163	}
..	..	@@ -1276,9 +2198,38 @@
1276	2198	shadow.material = new cMaterial(obj.material);
1277	2199	shadow.material.diffuse = 0.0001f;
1278	2200	shadow.material.specular = 0.0001f;
	2201	+ shadow.material.opacity = 0.75f;
	2202	+
	2203	+ AllocProjectedVertices(shadow);
	2204	+
	2205	+ shadow.projectedVertices[1].x = 300;
1279	2206
1280	2207	makeSomething(shadow);
1281	2208	}
	2209	+
	2210	+ private void ClearUnpinned()
	2211	+ {
	2212	+ //for (Object3D obj : listUI)
	2213	+ for (int i=listUI.size(); --i>=0;)
	2214	+ {
	2215	+ Object3D obj = listUI.elementAt(i);
	2216	+ if (!obj.pinned)
	2217	+ {
	2218	+ obj.CloseUI();
	2219	+ listUI.remove(i);
	2220	+ }
	2221	+ }
	2222	+ }
	2223	+
	2224	+ private void EditElement(Object3D elem, boolean newWindow)
	2225	+ {
	2226	+ // if (!(elem instanceof Composite))
	2227	+ // newWindow = false;
	2228	+ listUI.add(elem);
	2229	+ elem.openEditWindow(this, newWindow); //, false);
	2230	+ System.out.println("edit : " + elem);
	2231	+ elem.editWindow.refreshContents(true); // ? new
	2232	+ }
1282	2233
1283	2234	/**
1284	2235	* applyExample
..	..	@@ -1482,9 +2433,9 @@
1482	2433
1483	2434	void Overwrite(int mask)
1484	2435	{
1485		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2436	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1486	2437	{
1487		- Object3D content = GrafreeD.clipboard.get(0);
	2438	+ Object3D content = Grafreed.clipboard.get(0);
1488	2439
1489	2440	if (content instanceof cGroup && ((cGroup)content).transientlink )
1490	2441	content = ((cGroup)content).get(0);
..	..	@@ -1523,7 +2474,7 @@
1523	2474	{
1524	2475	ScreenFit();
1525	2476	} else
1526		- if (source == switchItem)
	2477	+ if (source == switchViewItem)
1527	2478	{
1528	2479	cVector v1 = new cVector();
1529	2480	cVector v2 = new cVector();
..	..	@@ -1532,11 +2483,11 @@
1532	2483	objEditor.cameraView.renderCamera.setAim(v2, v1);
1533	2484	objEditor.cameraView.repaint();
1534	2485	} else
1535		- if (source == rectoidItem)
	2486	+ if (source == rectoidItem \|\| source == boxButton)
1536	2487	{
1537	2488	makeSomething(new Box());
1538	2489	} else
1539		- if (source == particleItem)
	2490	+ if (source == particleItem \|\| source == particlesButton)
1540	2491	{
1541	2492	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1542	2493	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1615,27 +2566,27 @@
1615	2566
1616	2567	makeSomething(obj);
1617	2568	} else
1618		- if (source == gridItem)
	2569	+ if (source == gridItem \|\| source == gridButton)
1619	2570	{
1620	2571	makeSomething(new Grid());
1621	2572	} else
1622		- if (source == ellipsoidItem)
	2573	+ if (source == ellipsoidItem \|\| source == sphereButton)
1623	2574	{
1624	2575	makeSomething(new Sphere());
1625	2576	} else
1626		- if (source == coneItem)
	2577	+ if (source == coneItem \|\| source == coneButton)
1627	2578	{
1628	2579	makeSomething(new Cone());
1629	2580	} else
1630		- if (source == torusItem)
	2581	+ if (source == torusItem \|\| source == torusButton)
1631	2582	{
1632	2583	makeSomething(new Torus());
1633	2584	} else
1634		- if (source == superItem)
	2585	+ if (source == superItem \|\| source == superButton)
1635	2586	{
1636	2587	makeSomething(new Superellipsoid());
1637	2588	} else
1638		- if (source == kleinItem)
	2589	+ if (source == kleinItem \|\| source == kleinButton)
1639	2590	{
1640	2591	makeSomething(new Klein());
1641	2592	} else
..	..	@@ -1655,7 +2606,7 @@
1655	2606	{
1656	2607	makeSomething(new BezierSurface());
1657	2608	} else
1658		- if (source == checkerItem)
	2609	+ if (source == overlayItem \|\| source == overlayButton)
1659	2610	{
1660	2611	/*
1661	2612	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1703,10 +2654,27 @@
1703	2654	s.setup();
1704	2655	makeSomething(s);
1705	2656	} else
1706		- if (source == lightItem)
	2657	+ if (source == lightItem \|\| source == lightButton)
1707	2658	{
1708	2659	makeSomething(new Light());
1709	2660	} else
	2661	+// if (source == skybox1Button \|\|
	2662	+// source == skybox2Button \|\|
	2663	+// source == skybox3Button \|\|
	2664	+// source == skybox4Button \|\|
	2665	+// source == skybox5Button \|\|
	2666	+// source == skybox6Button \|\|
	2667	+// source == skybox7Button \|\|
	2668	+// source == skybox11Button \|\|
	2669	+// source == skybox12Button \|\|
	2670	+// source == skybox13Button \|\|
	2671	+// source == skybox14Button \|\|
	2672	+// source == skybox15Button \|\|
	2673	+// source == skybox16Button \|\|
	2674	+// source == skybox17Button)
	2675	+// {
	2676	+// ChangeSkybox(source);
	2677	+// } else
1710	2678	if (source == csgItem)
1711	2679	{
1712	2680	group(new CSG());
..	..	@@ -1753,30 +2721,38 @@
1753	2721
1754	2722	group(g);
1755	2723	} else
1756		- if (source == loopItem)
	2724	+ if (source == loopItem \|\| source == loopButton)
1757	2725	{
	2726	+ if (!group.selection.isEmpty())
	2727	+ {
1758	2728	Composite csg = new GroupLeaf();
1759		- csg.count = 5;
1760	2729	group(csg);
1761		- Composite child = new cGroup();
	2730	+ csg.count = 5;
	2731	+ Composite child = new cGroup("Branch");
1762	2732	csg.addChild(child);
1763	2733	child.addChild(csg);
	2734	+ }
1764	2735	} else
1765	2736	if (source == doubleItem)
1766	2737	{
1767		- Composite csg = new GroupLeaf();
1768		- csg.count = 5;
	2738	+ if (!group.selection.isEmpty())
	2739	+ {
	2740	+ Composite csg = new GroupLeaf("Fork");
1769	2741	group(csg);
1770		- Composite child = new cGroup();
	2742	+ csg.count = 5;
	2743	+ Composite child = new cGroup("Branch A");
1771	2744	csg.addChild(child);
1772	2745	child.addChild(csg);
1773		- child = new cGroup();
	2746	+ child = new cGroup("Branch B");
1774	2747	csg.addChild(child);
1775	2748	child.addChild(csg);
	2749	+ }
1776	2750	} else
1777	2751	if (source == tripleItem)
1778	2752	{
1779		- Composite csg = new GroupLeaf();
	2753	+ if (!group.selection.isEmpty())
	2754	+ {
	2755	+ Composite csg = new GroupLeaf("Trident");
1780	2756	csg.count = 4;
1781	2757	group(csg);
1782	2758	Composite child = new cGroup();
..	..	@@ -1788,28 +2764,12 @@
1788	2764	child = new cGroup();
1789	2765	csg.addChild(child);
1790	2766	child.addChild(csg);
1791		- } else
1792		-
1793		- if (source == importGFDItem)
1794		- {
1795		- ImportGFD();
1796		- } else
1797		- if (source == importVRMLX3DItem)
1798		- {
1799		- ImportVRMLX3D();
1800		- } else
1801		- if (source == import3DSItem)
1802		- {
1803		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1804		- } else
1805		- if (source == importOBJItem)
1806		- {
1807		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	2767	+ }
1808	2768	} else
1809	2769	if (source == computeAOItem)
1810	2770	{
1811	2771	Globals.drawMode = CameraPane.OCCLUSION;
1812		- Globals.theRenderer.repaint();
	2772	+ cameraView.repaint();
1813	2773	} else
1814	2774	if (source == recompileItem)
1815	2775	{
..	..	@@ -1824,7 +2784,7 @@
1824	2784	if (source == invariantsItem)
1825	2785	{
1826	2786	System.out.println("Invariants:");
1827		- GrafreeD.grafreeD.universe.invariants();
	2787	+ Grafreed.grafreed.universe.invariants();
1828	2788	} else
1829	2789	if (source == memoryItem)
1830	2790	{
..	..	@@ -1843,19 +2803,80 @@
1843	2803	{
1844	2804	DumpObject();
1845	2805	} else
	2806	+ if (source == minButton)
	2807	+ {
	2808	+ Minimize();
	2809	+ } else
	2810	+ if (source == maxButton)
	2811	+ {
	2812	+ Maximize();
	2813	+ } else
	2814	+ if (source == fullScreenButton)
	2815	+ {
	2816	+ ToggleFullScreen();
	2817	+ } else
	2818	+ if (source == collapseButton)
	2819	+ {
	2820	+ this.expandedLayout = radio.layout;
	2821	+ CollapseToolbar();
	2822	+ } else
	2823	+// if (source == maximize3DButton)
	2824	+// {
	2825	+// this.expandedLayout = radio.layout;
	2826	+// radio.layout = twoButton;
	2827	+// CollapseToolbar();
	2828	+// Show3DView();
	2829	+// } else
	2830	+ if (source == previousVersionButton)
	2831	+ {
	2832	+ // Go to previous version
	2833	+ //if (!Undo())
	2834	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2835	+ PreviousVersion();
	2836	+ } else
	2837	+ if (source == restoreButton)
	2838	+ {
	2839	+ // Restore current version
	2840	+ Restore();
	2841	+ //restoreButton.setEnabled(false);
	2842	+ } else
	2843	+ if (source == replaceButton)
	2844	+ {
	2845	+ // Overwrite current version
	2846	+ Replace();
	2847	+ //replaceButton.setEnabled(false);
	2848	+ } else
	2849	+ if (source == nextVersionButton)
	2850	+ {
	2851	+ // Go to next version
	2852	+ NextVersion();
	2853	+ } else
	2854	+ if (source == saveVersionButton)
	2855	+ {
	2856	+ // Save a new version
	2857	+ if (!DuplicateVersion()) //true))
	2858	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2859	+ } else
	2860	+ if (source == deleteVersionButton)
	2861	+ {
	2862	+ // Delete a new version
	2863	+ DeleteVersion();
	2864	+ } else
	2865	+ if (source == oneStepButton)
	2866	+ {
	2867	+ Globals.ONESTEP = true;
	2868	+ cameraView.repaint();
	2869	+ } else
1846	2870	if (source == screenfitButton)
1847	2871	{
1848		- //Reload(lastConverter, lastFilename, true);
1849	2872	ScreenFit();
1850	2873	} else
1851	2874	if (source == screenfitpointButton)
1852	2875	{
1853		- //Reload(lastConverter, lastFilename, true);
1854	2876	ScreenFitPoint();
1855	2877	} else
1856	2878	if (source == snapobjectButton)
1857	2879	{
1858		- //Reload(lastConverter, lastFilename, true);
1859	2880	SnapObject();
1860	2881	} else
1861	2882	// if (event.getSource() == recompileButton)
..	..	@@ -1892,12 +2913,20 @@
1892	2913	{
1893	2914	loadClipboard(true);
1894	2915	} else
	2916	+ if (source == undoItem)
	2917	+ {
	2918	+ PreviousVersion();
	2919	+ } else
	2920	+ if (source == redoItem)
	2921	+ {
	2922	+ NextVersion();
	2923	+ } else
1895	2924	if (source == duplicateItem)
1896	2925	{
1897		- Object3D keep = GrafreeD.clipboard;
	2926	+ Object3D keep = Grafreed.clipboard;
1898	2927	loadClipboard(false);
1899	2928	paste(false);
1900		- GrafreeD.clipboard = keep;
	2929	+ Grafreed.clipboard = keep;
1901	2930	} else
1902	2931	if (source == cloneItem)
1903	2932	{
..	..	@@ -1915,13 +2944,17 @@
1915	2944	{
1916	2945	paste(false);
1917	2946	} else
	2947	+ if (source == pasteIntoItem)
	2948	+ {
	2949	+ pasteInto(true, false);
	2950	+ } else
1918	2951	if (source == pasteLinkItem)
1919	2952	{
1920		- pasteInto(false);
	2953	+ pasteInto(false, false);
1921	2954	} else
1922	2955	if (source == pasteCloneItem)
1923	2956	{
1924		- pasteInto(true);
	2957	+ pasteInto(true, true);
1925	2958	} else
1926	2959	if (source == pasteExpandItem)
1927	2960	{
..	..	@@ -2113,9 +3146,9 @@
2113	3146	// group.selection.get(0).setMasterThis(content); // should be identity
2114	3147	// refreshContents();
2115	3148	// }
2116		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	3149	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2117	3150	{
2118		- Object3D content = GrafreeD.clipboard.get(0);
	3151	+ Object3D content = Grafreed.clipboard.get(0);
2119	3152
2120	3153	if (content instanceof cGroup && ((cGroup)content).transientlink )
2121	3154	content = ((cGroup)content).get(0);
..	..	@@ -2123,11 +3156,11 @@
2123	3156	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2124	3157	for (int i=0; i<group.selection.size(); i++)
2125	3158	{
2126		- boolean random = CameraPane.RANDOM;
2127		- CameraPane.RANDOM = false; // parse all random nodes
	3159	+ boolean random = CameraPane.SWITCH;
	3160	+ CameraPane.SWITCH = false; // parse all random nodes
2128	3161	group.selection.get(i).linkVerticesThis(content);
2129	3162	// group.selection.get(i).setMasterThis(content); // should be identity
2130		- CameraPane.RANDOM = random;
	3163	+ CameraPane.SWITCH = random;
2131	3164	}
2132	3165	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2133	3166	refreshContents();
..	..	@@ -2137,20 +3170,20 @@
2137	3170	{
2138	3171	for (int i=0; i<group.selection.size(); i++)
2139	3172	{
2140		- boolean random = CameraPane.RANDOM;
2141		- CameraPane.RANDOM = false; // parse all random nodes
	3173	+ boolean random = CameraPane.SWITCH;
	3174	+ CameraPane.SWITCH = false; // parse all random nodes
2142	3175	group.selection.get(i).linkVerticesThis(null);
2143		- CameraPane.RANDOM = random;
	3176	+ CameraPane.SWITCH = random;
2144	3177	}
2145	3178
2146	3179	refreshContents();
2147	3180	} else
2148	3181	if (source == relinkverticesItem)
2149	3182	{
2150		- boolean random = CameraPane.RANDOM;
2151		- CameraPane.RANDOM = false; // parse all random nodes
	3183	+ boolean random = CameraPane.SWITCH;
	3184	+ CameraPane.SWITCH = false; // parse all random nodes
2152	3185	group.selection.RelinkToSupport();
2153		- CameraPane.RANDOM = random;
	3186	+ CameraPane.SWITCH = random;
2154	3187
2155	3188	refreshContents();
2156	3189	} else
..	..	@@ -2165,9 +3198,9 @@
2165	3198	} else
2166	3199	if (source == setMasterItem)
2167	3200	{
2168		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	3201	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2169	3202	{
2170		- Object3D content = GrafreeD.clipboard.get(0);
	3203	+ Object3D content = Grafreed.clipboard.get(0);
2171	3204
2172	3205	if (content instanceof cGroup && ((cGroup)content).transientlink )
2173	3206	content = ((cGroup)content).get(0);
..	..	@@ -2180,9 +3213,9 @@
2180	3213	{
2181	3214	if (group.selection.size() == 1)
2182	3215	{
2183		- if (GrafreeD.clipboard.size() == 1)
	3216	+ if (Grafreed.clipboard.size() == 1)
2184	3217	{
2185		- Object3D content = GrafreeD.clipboard.get(0);
	3218	+ Object3D content = Grafreed.clipboard.get(0);
2186	3219
2187	3220	if (content instanceof cGroup && ((cGroup)content).transientlink )
2188	3221	content = ((cGroup)content).get(0);
..	..	@@ -2199,7 +3232,7 @@
2199	3232	{
2200	3233	RevertMeshes();
2201	3234	} else
2202		- if (source == resetMeshItem)
	3235	+ if (source == resetAllItem)
2203	3236	{
2204	3237	ResetAll();
2205	3238	} else
..	..	@@ -2207,7 +3240,7 @@
2207	3240	{
2208	3241	StepAll();
2209	3242	} else
2210		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3243	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2211	3244	{
2212	3245	//int indices[] = jList.getSelectedIndices();
2213	3246	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2219,9 +3252,9 @@
2219	3252	{
2220	3253	ClearSelection(true);
2221	3254	} else
2222		- if (source == grabItem)
	3255	+ if (source == grabItem \|\| source == groupButton)
2223	3256	{
2224		- group(new cGroup(), true);
	3257	+ group(new cGroup(), false); // true);
2225	3258	} else
2226	3259	if (source == hideItem)
2227	3260	{
..	..	@@ -2239,16 +3272,16 @@
2239	3272	{
2240	3273	makeSomething(new Camera());
2241	3274	} else
2242		- if (source == compositeItem)
	3275	+ if (source == compositeItem \|\| source == compositeButton)
2243	3276	{
2244	3277	group(new Composite());
2245	3278	} else
2246		- if (source == randomItem)
	3279	+ if (source == switchItem \|\| source == switchButton)
2247	3280	{
2248	3281	RandomNode random = new RandomNode();
2249	3282	group(random);
2250	3283	if (random.size() > 0)
2251		- random.name = random.get(0).name + "Rnd";
	3284	+ random.name = random.get(0).name + "Switch";
2252	3285	} else
2253	3286	if (source == physicsItem)
2254	3287	{
..	..	@@ -2345,7 +3378,7 @@
2345	3378	{
2346	3379	group(new cLinker());
2347	3380	} else
2348		- if (source == textureItem)
	3381	+ if (source == textureItem \|\| source == textureButton)
2349	3382	{
2350	3383	group(new TextureNode());
2351	3384	} else
..	..	@@ -2365,17 +3398,42 @@
2365	3398	{
2366	3399	CastShadow(2);
2367	3400	} else
2368		- if (source == ungroupItem)
	3401	+ if (source == ungroupItem \|\| source == ungroupButton)
2369	3402	{
2370		- //ungroup();
	3403	+ boolean canUngroup = true;
	3404	+
2371	3405	for (int i=0; i<group.selection.size(); i++)
2372	3406	{
2373		- Ungroup(group.selection.get(i));
	3407	+ Object3D selectedItem = group.selection.get(i);
	3408	+
	3409	+ if (selectedItem.Size() == 0)
	3410	+ {
	3411	+ // Cannot ungroup leaves
	3412	+ canUngroup = false;
	3413	+ break;
	3414	+ }
	3415	+
	3416	+ if (selectedItem == group)
	3417	+ {
	3418	+ // Cannot ungroup root
	3419	+ canUngroup = false;
	3420	+ break;
	3421	+ }
2374	3422	}
2375	3423
2376		- ClearSelection(false);
2377		-
2378		- refreshContents();
	3424	+ if (canUngroup)
	3425	+ {
	3426	+ for (int i=0; i<group.selection.size(); i++)
	3427	+ {
	3428	+ Object3D selectedItem = group.selection.get(i);
	3429	+
	3430	+ Ungroup(selectedItem);
	3431	+ }
	3432	+
	3433	+ ClearSelection(false);
	3434	+
	3435	+ refreshContents();
	3436	+ }
2379	3437	} else
2380	3438	if (source == genUVItem)
2381	3439	{
..	..	@@ -2387,7 +3445,7 @@
2387	3445	} else
2388	3446	if (source == genNormalsMESHItem)
2389	3447	{
2390		- GenNormals(true); // TODO
	3448	+ GenNormalsMESH();
2391	3449	} else
2392	3450	if (source == genNormalsORGANItem)
2393	3451	{
..	..	@@ -2421,6 +3479,10 @@
2421	3479	{
2422	3480	ClearMaterials();
2423	3481	} else
	3482	+ if (source == clearVersionsItem)
	3483	+ {
	3484	+ ClearVersions();
	3485	+ } else
2424	3486	if (source == liveleavesItem)
2425	3487	{
2426	3488	LiveLeaves(true);
..	..	@@ -2452,6 +3514,22 @@
2452	3514	if (source == unmarkleavesItem)
2453	3515	{
2454	3516	MarkLeaves(false);
	3517	+ } else
	3518	+ if (source == rewindleavesItem)
	3519	+ {
	3520	+ RewindLeaves(true);
	3521	+ } else
	3522	+ if (source == unrewindleavesItem)
	3523	+ {
	3524	+ RewindLeaves(false);
	3525	+ } else
	3526	+ if (source == randomleavesItem)
	3527	+ {
	3528	+ RandomLeaves(true);
	3529	+ } else
	3530	+ if (source == unrandomleavesItem)
	3531	+ {
	3532	+ RandomLeaves(false);
2455	3533	} else
2456	3534	if (source == flipVItem)
2457	3535	{
..	..	@@ -2537,9 +3615,25 @@
2537	3615	{
2538	3616	SmoothMesh();
2539	3617	} else
2540		- if (source == transformgeometryItem)
	3618	+ if (source == transformGeometryItem)
2541	3619	{
2542	3620	TransformGeometry();
	3621	+ } else
	3622	+ if (source == transformChildrenItem)
	3623	+ {
	3624	+ TransformChildren();
	3625	+ } else
	3626	+ if (source == textureRatioRItem)
	3627	+ {
	3628	+ TextureRatio(0);
	3629	+ } else
	3630	+ if (source == textureRatioGItem)
	3631	+ {
	3632	+ TextureRatio(1);
	3633	+ } else
	3634	+ if (source == textureRatioBItem)
	3635	+ {
	3636	+ TextureRatio(2);
2543	3637	} else
2544	3638	if (source == resetTransformItem)
2545	3639	{
..	..	@@ -2547,7 +3641,11 @@
2547	3641	} else
2548	3642	if (source == resetCentroidItem)
2549	3643	{
2550		- ResetCentroid();
	3644	+ ResetCentroid(true);
	3645	+ } else
	3646	+ if (source == resetCentroidXZItem)
	3647	+ {
	3648	+ ResetCentroid(false);
2551	3649	} else
2552	3650	if (source == resetParentItem)
2553	3651	{
..	..	@@ -2652,7 +3750,7 @@
2652	3750	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2653	3751	{
2654	3752	obj = (Object3D)e.nextElement();
2655		- obj.SetBumpTexture(null);
	3753	+ obj.ResetBumpTexture();
2656	3754	}
2657	3755
2658	3756	refreshContents();
..	..	@@ -2668,6 +3766,31 @@
2668	3766
2669	3767	refreshContents();
2670	3768	} else
	3769	+ if (source == embedTexturesItem)
	3770	+ {
	3771	+ Object3D obj;
	3772	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3773	+ {
	3774	+ obj = (Object3D)e.nextElement();
	3775	+ obj.EmbedTextures(true);
	3776	+ }
	3777	+
	3778	+ refreshContents();
	3779	+ } else
	3780	+ if (source == deEmbedTexturesItem)
	3781	+ {
	3782	+ Object3D obj;
	3783	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3784	+ {
	3785	+ obj = (Object3D)e.nextElement();
	3786	+ obj.EmbedTextures(false);
	3787	+ }
	3788	+
	3789	+ CameraPane.texturepigment.clear();
	3790	+ CameraPane.texturebump.clear();
	3791	+
	3792	+ refreshContents();
	3793	+ } else
2671	3794	if (source == flashSelectionButton)
2672	3795	{
2673	3796	CameraPane.flash = true;
..	..	@@ -2679,42 +3802,36 @@
2679	3802	if (source == twoButton)
2680	3803	{
2681	3804	radio.layout = twoButton;
2682		- // bug
2683		- //gridPanel.setDividerLocation(1.0);
2684		- //bigPanel.setDividerLocation(0.0);
2685		-// bigThree.remove(scenePanel);
2686		-// bigThree.remove(centralPanel);
2687		-// bigThree.remove(XYZPanel);
2688		-// aWindowConstraints.gridx = 0;
2689		-// aWindowConstraints.gridy = 0;
2690		-// aWindowConstraints.gridwidth = 1;
2691		-// // aConstraints.gridheight = 3;
2692		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2693		-// aWindowConstraints.weightx = 0;
2694		-// aWindowConstraints.weighty = 1;
2695		-// //bigThree.add(jtp, aWindowConstraints);
2696		-// aWindowConstraints.weightx = 1;
2697		-// aWindowConstraints.gridwidth = 3;
2698		-// // aConstraints.gridheight = 3;
2699		-// aWindowConstraints.gridx = 1;
2700		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
2701		-// bigThree.add(centralPanel, aWindowConstraints);
2702		-// aWindowConstraints.weightx = 0;
2703		-// aWindowConstraints.gridx = 4;
2704		-// aWindowConstraints.gridwidth = 1;
2705		-// // aConstraints.gridheight = 3;
2706		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2707		-// //bigThree.add(XYZPanel, aWindowConstraints);
2708		-// scenePanel.setVisible(false);
2709		-// centralPanel.setVisible(true);
2710		-// XYZPanel.setVisible(false);
2711		- bigThree.ClearUI();
2712		- bigThree.add(centralPanel);
2713		- bigThree.FlushUI();
	3805	+
	3806	+ if (CameraPane.FULLSCREEN)
	3807	+ fullscreenLayout = radio.layout;
	3808	+
	3809	+ Show3DView();
	3810	+
	3811	+ cameraView.requestFocusInWindow();
	3812	+
	3813	+// refreshContents(true);
	3814	+//
	3815	+// try
	3816	+// {
	3817	+// java.awt.Robot bot = new java.awt.Robot();
	3818	+// int mask = InputEvent.BUTTON1_MASK;
	3819	+// bot.mouseMove(100, 100);
	3820	+// bot.mousePress(mask);
	3821	+// bot.mouseRelease(mask);
	3822	+// }
	3823	+// catch (Exception e)
	3824	+// {
	3825	+//
	3826	+// }
	3827	+
2714	3828	} else
2715	3829	if (source == threeButton)
2716	3830	{
2717	3831	radio.layout = threeButton;
	3832	+
	3833	+ if (CameraPane.FULLSCREEN)
	3834	+ fullscreenLayout = radio.layout;
2718	3835
2719	3836	// bigThree.remove(scenePanel);
2720	3837	// bigThree.remove(centralPanel);
..	..	@@ -2744,13 +3861,18 @@
2744	3861	// centralPanel.setVisible(true);
2745	3862	// XYZPanel.setVisible(true);
2746	3863	bigThree.ClearUI();
	3864	+ bigThree.add(scenePanel);
2747	3865	bigThree.add(centralPanel);
2748		- bigThree.add(XYZPanel);
2749	3866	bigThree.FlushUI();
	3867	+
	3868	+ cameraView.requestFocusInWindow();
2750	3869	} else
2751	3870	if (source == fourButton)
2752	3871	{
2753	3872	radio.layout = fourButton;
	3873	+
	3874	+ if (CameraPane.FULLSCREEN)
	3875	+ fullscreenLayout = radio.layout;
2754	3876
2755	3877	// bigThree.remove(scenePanel);
2756	3878	// bigThree.remove(centralPanel);
..	..	@@ -2782,10 +3904,15 @@
2782	3904	bigThree.ClearUI();
2783	3905	bigThree.add(scenePanel);
2784	3906	bigThree.FlushUI();
	3907	+
	3908	+ cameraView.requestFocusInWindow();
2785	3909	} else
2786	3910	if (source == sixButton)
2787	3911	{
2788	3912	radio.layout = sixButton;
	3913	+
	3914	+ if (CameraPane.FULLSCREEN)
	3915	+ fullscreenLayout = radio.layout;
2789	3916
2790	3917	// bigThree.remove(scenePanel);
2791	3918	// bigThree.remove(centralPanel);
..	..	@@ -2815,13 +3942,18 @@
2815	3942	// centralPanel.setVisible(true);
2816	3943	// XYZPanel.setVisible(false);
2817	3944	bigThree.ClearUI();
2818		- bigThree.add(scenePanel);
2819	3945	bigThree.add(centralPanel);
	3946	+ bigThree.add(scenePanel);
2820	3947	bigThree.FlushUI();
	3948	+
	3949	+ cameraView.requestFocusInWindow();
2821	3950	} else
2822	3951	if (source == sevenButton)
2823	3952	{
2824	3953	radio.layout = sevenButton;
	3954	+
	3955	+ if (CameraPane.FULLSCREEN)
	3956	+ fullscreenLayout = radio.layout;
2825	3957
2826	3958	// bigThree.remove(scenePanel);
2827	3959	// bigThree.remove(centralPanel);
..	..	@@ -2855,9 +3987,12 @@
2855	3987	bigThree.add(centralPanel);
2856	3988	bigThree.add(XYZPanel);
2857	3989	bigThree.FlushUI();
	3990	+
	3991	+ cameraView.requestFocusInWindow();
2858	3992	} else
2859	3993	if (source == rootButton)
2860	3994	{
	3995	+ Replace();
2861	3996	Object3D obj;
2862	3997	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2863	3998	{
..	..	@@ -2866,31 +4001,50 @@
2866	4001	EditObject(obj);
2867	4002	}
2868	4003
	4004	+ cameraView.requestFocusInWindow();
2869	4005	refreshContents(true);
2870	4006	} else
2871	4007	if (source == closeButton)
2872	4008	{
2873	4009	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	4010	+ if (copy.versionlist != null)
	4011	+ Replace();
	4012	+
2874	4013	cRadio ab;
2875	4014	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2876	4015	{
2877	4016	ab = (cRadio)e.nextElement();
2878		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	4017	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2879	4018	{
	4019	+ // Patch to avoid bug with transparency.
	4020	+ if (!ab.hadMaterial)
	4021	+ {
	4022	+ ab.object.material = null;
	4023	+ }
	4024	+
2880	4025	buttonGroup.remove(ab);
2881	4026	radioPanel.remove(ab);
2882	4027
2883		- ab.GetObject().editWindow = null;
	4028	+ //ab.GetObject().editWindow = null;
	4029	+ ab.GetObject().manipWindow = null;
2884	4030	// ab.GetObject().objectUI = null; // ?????????
2885	4031
2886	4032	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2887	4033	break;
2888	4034	}
2889	4035	}
	4036	+
	4037	+ cameraView.requestFocusInWindow();
2890	4038	refreshContents(true);
2891	4039	} else
2892	4040	if (source == editItem \|\| source == editButton)
2893	4041	{
	4042	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4043	+ {
	4044	+ Object3D child = (Object3D)e.nextElement();
	4045	+ child.pinned = true;
	4046	+ }
	4047	+
2894	4048	EditSelection(false);
2895	4049	} else
2896	4050	if (source == uneditButton)
..	..	@@ -2899,13 +4053,14 @@
2899	4053	{
2900	4054	Object3D child = (Object3D)e.nextElement();
2901	4055	if(child.editWindow != null)
2902		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4056	+ child.pinned = false;
2903	4057	child.CloseUI();
2904	4058	listUI.remove(child);
	4059	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2905	4060
2906		- child.editWindow = null; // ???????????
	4061	+ //child.editWindow = null; // ???????????
2907	4062	}
2908		- objEditor.ctrlPanel.validate();
	4063	+ objEditor.ctrlPanel.FlushUI();
2909	4064	//objEditor.jTree.clearSelection();
2910	4065	//objEditor.ResetSliders();
2911	4066	refreshContents(true);
..	..	@@ -2916,16 +4071,18 @@
2916	4071	//copy.ClearUI();
2917	4072	for (Object3D obj : listUI)
2918	4073	{
	4074	+ obj.pinned = false;
2919	4075	obj.CloseUI();
2920	4076	}
2921	4077	listUI.clear();
	4078	+ SetPinStates(group.selection.size() > 0);
2922	4079	refreshContents(true);
2923	4080	} else
2924	4081	if (source == allParamsButton)
2925	4082	{
2926	4083	assert(copy == group);
2927	4084
2928		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4085	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2929	4086
2930	4087	for (Object3D obj : listUI)
2931	4088	{
..	..	@@ -2951,6 +4108,9 @@
2951	4108	} else
2952	4109	if(source instanceof cRadio)
2953	4110	{
	4111	+ if (copy.versionlist != null)
	4112	+ Replace();
	4113	+
2954	4114	group.parent = keepparent;
2955	4115	group.attributes = 0;
2956	4116	//group.editWindow = null;
..	..	@@ -2974,6 +4134,7 @@
2974	4134	}
2975	4135
2976	4136	copy = group;
	4137	+
2977	4138	//Globals.theRenderer.object = group;
2978	4139	if(!useclient)
2979	4140	{
..	..	@@ -2989,20 +4150,75 @@
2989	4150	frontView.object = group;
2990	4151	sideView.object = group;
2991	4152	}
2992		- group.editWindow = this;
	4153	+
	4154	+// fix "+" issue
	4155	+ //group.editWindow = this;
	4156	+ group.manipWindow = this;
	4157	+
2993	4158	/*
2994	4159	currentLayout = radio.layout;
2995	4160	if (currentLayout == null)
2996	4161	currentLayout = sevenButton;
2997	4162	*/
2998	4163	radio.layout.doClick();
	4164	+
	4165	+ //assert(copy instanceof Composite);
	4166	+
	4167	+ if (copy.versionlist == null)
	4168	+ {
	4169	+ copy.versionindex = -1;
	4170	+
	4171	+ // Cannot work with loops
	4172	+ // To fix this issue, we first mark all nodes above the root,
	4173	+ // and check if any of these nodes are reachable below the root.
	4174	+ Grafreed.grafreed.universe.TagObjects(copy, true);
	4175	+
	4176	+ if (copy instanceof Composite && !copy.HasTags())
	4177	+ {
	4178	+ if (copy.versionlist == null)
	4179	+ copy.versionlist = new Object3D[100];
	4180	+
	4181	+ //Save(true);
	4182	+ }
	4183	+ else
	4184	+ copy.versionindex = -2;
	4185	+
	4186	+ Grafreed.grafreed.universe.TagObjects(copy, false);
	4187	+ }
	4188	+
	4189	+ SetVersionStates();
	4190	+
	4191	+ ClearUnpinned();
	4192	+
	4193	+ //Grafreed.Assert(group != null);
	4194	+ //Grafreed.Assert(group.selection != null);
	4195	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4196	+ if (group.selection == null \|\| group.selection.size() == 1)
	4197	+ EditSelection(false);
2999	4198	keepparent = group.parent;
3000	4199	// PARENT = NULL or not???
3001	4200	//group.parent = null; // ROOT
3002	4201	//group.attributes = -1;
3003	4202	ResetModel();
	4203	+
	4204	+ cameraView.requestFocusInWindow();
3004	4205	refreshContents(true);
3005		- }
	4206	+ } else if (event.getSource() == editCameraItem)
	4207	+ {
	4208	+ cameraView.ProtectCamera();
	4209	+ cameraView.requestFocusInWindow();
	4210	+ cameraView.repaint();
	4211	+ return;
	4212	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	4213	+ {
	4214	+ cameraView.RevertCamera();
	4215	+ cameraView.requestFocusInWindow();
	4216	+ cameraView.repaint();
	4217	+ return;
	4218	+ // } else if (event.getSource() == textureButton)
	4219	+ // {
	4220	+ // return; // true;
	4221	+ }
3006	4222	else
3007	4223	{
3008	4224	//return super.action(event, arg);
..	..	@@ -3011,7 +4227,6 @@
3011	4227	}
3012	4228
3013	4229	boolean useclient = false;
3014		- cRadio radio;
3015	4230
3016	4231	void ToggleRoot()
3017	4232	{
..	..	@@ -3063,10 +4278,69 @@
3063	4278	refreshContents();
3064	4279	}
3065	4280
	4281	+ void TransformChildren()
	4282	+ {
	4283	+ Object3D obj;
	4284	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4285	+ {
	4286	+ obj = (Object3D)e.nextElement();
	4287	+ obj.KeepTextureMatrices();
	4288	+ obj.TransformChildren();
	4289	+ obj.RestoreTextureMatrices();
	4290	+
	4291	+// if (obj.parent == null)
	4292	+// {
	4293	+// System.out.println("NULL PARENT!");
	4294	+// new Exception().printStackTrace();
	4295	+// }
	4296	+// else
	4297	+// TouchTransform(obj);
	4298	+// //obj.parent.Touch();
	4299	+ }
	4300	+
	4301	+ refreshContents();
	4302	+ }
	4303	+
	4304	+ void TextureRatio(int axis)
	4305	+ {
	4306	+ Object3D obj;
	4307	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4308	+ {
	4309	+ obj = (Object3D)e.nextElement();
	4310	+ obj.TextureRatio(axis);
	4311	+ }
	4312	+
	4313	+ refreshContents();
	4314	+ }
3066	4315
3067	4316	void ResetTransform()
3068	4317	{
3069	4318	ResetTransform(-1);
	4319	+ }
	4320	+
	4321	+ void ScaleSelection(int scale)
	4322	+ {
	4323	+ Object3D obj;
	4324	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4325	+ {
	4326	+ obj = (Object3D)e.nextElement();
	4327	+
	4328	+ if (obj.toParent == null)
	4329	+ continue;
	4330	+
	4331	+ obj.Scale(scale);
	4332	+
	4333	+ if (obj.parent == null)
	4334	+ {
	4335	+ System.out.println("NULL PARENT!");
	4336	+ // new Exception().printStackTrace();
	4337	+ }
	4338	+ else
	4339	+ TouchTransform(obj);
	4340	+ //obj.parent.Touch();
	4341	+ }
	4342	+
	4343	+ refreshContents();
3070	4344	}
3071	4345
3072	4346	void ResetTransform(int mask)
..	..	@@ -3079,42 +4353,8 @@
3079	4353	if (obj.toParent == null)
3080	4354	continue;
3081	4355
3082		- if (mask == -1)
3083		- {
3084		- if (obj instanceof Camera) // jan 2014
3085		- {
3086		- LA.matIdentity(obj.toParent);
3087		- LA.matIdentity(obj.fromParent);
3088		- }
3089		- else
3090		- {
3091		- obj.toParent = null; // jan 2014 LA.matIdentity(obj.toParent);
3092		- obj.fromParent = null; // LA.matIdentity(obj.fromParent);
3093		- }
3094		- TouchTransform(obj);
3095		- continue;
3096		- }
3097		- if ((mask&2) != 0) // Scale
3098		- {
3099		- obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
3100		- obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
3101		- obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
3102		- obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
3103		- obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
3104		- obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
3105		- }
3106		- if ((mask&4) != 0) // Rotation
3107		- {
3108		- // ?
3109		- }
3110		- if ((mask&1) != 0) // Translation
3111		- {
3112		- if (obj.toParent != null)
3113		- {
3114		- obj.toParent[3][0] = obj.toParent[3][1] = obj.toParent[3][2] = 0;
3115		- obj.fromParent[3][0] = obj.fromParent[3][1] = obj.fromParent[3][2] = 0;
3116		- }
3117		- }
	4356	+ obj.ResetTransform(mask);
	4357	+
3118	4358	if (obj.parent == null)
3119	4359	{
3120	4360	System.out.println("NULL PARENT!");
..	..	@@ -3175,7 +4415,7 @@
3175	4415	refreshContents();
3176	4416	}
3177	4417
3178		- void ResetCentroid()
	4418	+ void ResetCentroid(boolean full)
3179	4419	{
3180	4420	Object3D obj;
3181	4421	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3190,12 +4430,16 @@
3190	4430	LA.matIdentity(Object3D.mat);
3191	4431	obj.getBounds(minima, maxima, false);
3192	4432	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3193		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	4433	+ if (full)
	4434	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3194	4435	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3195	4436	obj.TransformMesh(Object3D.mat);
	4437	+
3196	4438	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3197		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	4439	+ if (full)
	4440	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3198	4441	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	4442	+
3199	4443	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3200	4444	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3201	4445	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3224,7 +4468,8 @@
3224	4468
3225	4469	int size = obj.MemorySize();
3226	4470
3227		- System.err.println((size/1024) + " KB is the size of " + obj);
	4471	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4472	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3228	4473	}
3229	4474	}
3230	4475	catch (Exception e)
..	..	@@ -3261,9 +4506,9 @@
3261	4506	obj = (Object3D)e.nextElement();
3262	4507
3263	4508	System.out.println("Object is: " + obj);
3264		- GrafreeD.AnalyzeObject(obj);
	4509	+ Grafreed.AnalyzeObject(obj);
3265	4510	System.out.println("Boundary rep: " + obj.bRep);
3266		- GrafreeD.AnalyzeObject(obj.bRep);
	4511	+ Grafreed.AnalyzeObject(obj.bRep);
3267	4512
3268	4513	// System.err.println((size/1024) + " KB is the size of " + obj);
3269	4514	}
..	..	@@ -3305,6 +4550,13 @@
3305	4550	void GenNormals(boolean crease)
3306	4551	{
3307	4552	group.GenNormalsS(crease);
	4553	+
	4554	+ refreshContents();
	4555	+ }
	4556	+
	4557	+ void GenNormalsMESH()
	4558	+ {
	4559	+ group.GenNormalsMeshS();
3308	4560
3309	4561	refreshContents();
3310	4562	}
..	..	@@ -3477,8 +4729,8 @@
3477	4729
3478	4730	void ParseVertices()
3479	4731	{
3480		- boolean epsequal = GrafreeD.epsequal;
3481		- GrafreeD.epsequal = true;
	4732	+ boolean epsequal = Grafreed.epsequal;
	4733	+ Grafreed.epsequal = true;
3482	4734
3483	4735	for (int i=0; i<group.selection.size(); i++)
3484	4736	{
..	..	@@ -3503,7 +4755,7 @@
3503	4755	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3504	4756	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3505	4757
3506		- g.add(GrafreeD.clipboard);
	4758	+ g.add(Grafreed.clipboard);
3507	4759
3508	4760	buffer.add(g);
3509	4761	}
..	..	@@ -3518,7 +4770,7 @@
3518	4770	makeSomething(buffer, i==group.selection.size()-1);
3519	4771	}
3520	4772
3521		- GrafreeD.epsequal = epsequal;
	4773	+ Grafreed.epsequal = epsequal;
3522	4774
3523	4775	refreshContents();
3524	4776	}
..	..	@@ -3536,7 +4788,16 @@
3536	4788	String pigment = Object3D.GetPigment(tex);
3537	4789	//String bump = Object3D.GetBump(tex);
3538	4790
3539		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4791	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4792	+
	4793	+ try
	4794	+ {
	4795	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
	4796	+ }
	4797	+ catch (Exception e)
	4798	+ {
	4799	+ System.err.println("FAIL: " + node);
	4800	+ }
3540	4801
3541	4802	double s = v.s;
3542	4803
..	..	@@ -3602,10 +4863,17 @@
3602	4863	{
3603	4864	Object3D obj = group.selection.get(i);
3604	4865
	4866	+ if (obj.toParent == null)
	4867	+ {
	4868	+ obj.toParent = LA.newMatrix();
	4869	+ obj.fromParent = LA.newMatrix();
	4870	+ }
	4871	+
3605	4872	LA.matTranslate(obj.toParent, i * scale, 0, 0);
3606	4873	LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3607	4874	}
3608	4875
	4876	+ Globals.lighttouched = true;
3609	4877	refreshContents();
3610	4878	}
3611	4879
..	..	@@ -3624,11 +4892,11 @@
3624	4892
3625	4893	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3626	4894
3627		- boolean random = CameraPane.RANDOM;
3628		- CameraPane.RANDOM = false; // parse all random nodes
	4895	+ boolean random = CameraPane.SWITCH;
	4896	+ CameraPane.SWITCH = false; // parse all random nodes
3629	4897	lowres.linkVerticesThis(null);
3630	4898	lowres.linkVerticesThis(sn);
3631		- CameraPane.RANDOM = random;
	4899	+ CameraPane.SWITCH = random;
3632	4900
3633	4901	System.err.flush();
3634	4902
..	..	@@ -3668,7 +4936,7 @@
3668	4936	return;
3669	4937
3670	4938	Object3D poses = group.selection.get(0);
3671		- Object3D ref = GrafreeD.clipboard.get(0);
	4939	+ Object3D ref = Grafreed.clipboard.get(0);
3672	4940
3673	4941	Object3D newgroup = new Object3D("Po:" + poses.name);
3674	4942
..	..	@@ -3862,9 +5130,9 @@
3862	5130
3863	5131	void ClipMesh()
3864	5132	{
3865		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	5133	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3866	5134	{
3867		- Object3D content = GrafreeD.clipboard.get(0);
	5135	+ Object3D content = Grafreed.clipboard.get(0);
3868	5136
3869	5137	if (content instanceof cGroup && ((cGroup)content).transientlink )
3870	5138	content = ((cGroup)content).get(0);
..	..	@@ -3873,7 +5141,7 @@
3873	5141	// {
3874	5142	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3875	5143	// }
3876		- group.selection.ClipMesh(GrafreeD.clipboard);
	5144	+ group.selection.ClipMesh(Grafreed.clipboard);
3877	5145	}
3878	5146	// group.selection.ClipMesh(GrafreeD.clipboard);
3879	5147	System.out.println("DONE.");
..	..	@@ -3890,6 +5158,12 @@
3890	5158	void ClearMaterials()
3891	5159	{
3892	5160	group.selection.ClearMaterials();
	5161	+ refreshContents();
	5162	+ }
	5163	+
	5164	+ void ClearVersions()
	5165	+ {
	5166	+ group.selection.ClearVersions();
3893	5167	refreshContents();
3894	5168	}
3895	5169
..	..	@@ -3920,6 +5194,18 @@
3920	5194	void MarkLeaves(boolean hide)
3921	5195	{
3922	5196	group.selection.MarkLeaves(hide);
	5197	+ refreshContents();
	5198	+ }
	5199	+
	5200	+ void RewindLeaves(boolean hide)
	5201	+ {
	5202	+ group.selection.RewindLeaves(hide);
	5203	+ refreshContents();
	5204	+ }
	5205	+
	5206	+ void RandomLeaves(boolean hide)
	5207	+ {
	5208	+ group.selection.RandomLeaves(hide);
3923	5209	refreshContents();
3924	5210	}
3925	5211
..	..	@@ -3994,28 +5280,25 @@
3994	5280	// }
3995	5281	// }
3996	5282
3997		- static boolean allparams = true;
3998		-
3999		- static Vector<Object3D> listUI = new Vector<Object3D>();
4000		-
4001	5283	void EditSelection(boolean newWindow)
4002	5284	{
	5285	+ if (group.selection == null)
	5286	+ {
	5287	+ EditElement(group, newWindow); // ? new
	5288	+ return;
	5289	+ }
	5290	+
4003	5291	// aConstraints.gridy = 0;
4004	5292	for (int i=0; i<group.selection.size(); i++)
4005	5293	{
4006	5294	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4007	5295	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4008		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5296	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4009	5297
4010	5298	Object3D elem = (Object3D)group.selection.elementAt(i);
4011		- if(elem != group)
	5299	+ if(elem != group \|\| !newWindow)
4012	5300	{
4013		- // if (!(elem instanceof Composite))
4014		- // newWindow = false;
4015		- listUI.add(elem);
4016		- elem.openEditWindow(this, newWindow); //, false);
4017		- System.out.println("edit : " + elem);
4018		- elem.editWindow.refreshContents(true); // ? new
	5301	+ EditElement(elem, newWindow); // ? new
4019	5302	}
4020	5303	}
4021	5304	}
..	..	@@ -4078,9 +5361,7 @@
4078	5361
4079	5362	freezemodel = false;
4080	5363	}
4081		-
4082		- boolean flashIt = true;
4083		-
	5364	+
4084	5365	public void valueChanged(TreeSelectionEvent e)
4085	5366	//public boolean handleEvent(Event event)
4086	5367	{
..	..	@@ -4090,7 +5371,8 @@
4090	5371	//new Exception().printStackTrace();
4091	5372
4092	5373	freezemodel = true;
4093		-
	5374	+ ClearUnpinned();
	5375	+
4094	5376	/**/
4095	5377	//switch (event.id)
4096	5378	{
..	..	@@ -4098,7 +5380,6 @@
4098	5380	//case 702: // Event.LIST_DESELECT
4099	5381	group.deselectAll();
4100	5382	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4101		- objEditor.ClearInfo(); // .GetMaterial());
4102	5383	if (tps != null)
4103	5384	{
4104	5385	for (int i=0; i < tps.length; i++)
..	..	@@ -4107,33 +5388,39 @@
4107	5388
4108	5389	//if (child.parent != null)
4109	5390	//child.parent.addSelectee(child);
	5391	+ objEditor.SetMaterial(child);
4110	5392	group.addSelectee(child);
4111		- objEditor.SetMaterial(child); // .GetMaterial());
4112		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4113		- System.err.println("info : " + child.GetPath());
4114	5393	}
4115	5394	}
4116		- else
4117		- {
4118		- objEditor.SetMaterial(group); // .GetMaterial());
4119		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4120		- System.err.println("info : " + group.GetPath());
4121		- }
	5395	+// else
	5396	+// {
	5397	+// objEditor.SetMaterial(group); // .GetMaterial());
	5398	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	5399	+// System.err.println("info : " + group.GetPath());
	5400	+// }
4122	5401
4123		- objEditor.SetText(); // jan 2014
4124		-
4125		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	5402	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4126	5403	CameraPane.flash = true;
4127	5404
4128		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5405	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4129	5406	// a camera
4130	5407	{
4131		- CameraPane.camerachangeframe = 0; // don't refuse it
4132		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5408	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crashes the camera because of invalid lightspace
	5409	+ {
	5410	+ CameraPane.camerachangeframe = 0; // don't refuse it
	5411	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent(), true);
	5412	+ }
4133	5413	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4134	5414	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4135	5415	}
4136	5416
	5417	+ if (tps != null && tps.length == 1)
	5418	+ {
	5419	+ EditSelection(false);
	5420	+ }
	5421	+
	5422	+ SetPinStates(tps != null && tps.length > 0);
	5423	+
4137	5424	refreshContents();
4138	5425	//return true;
4139	5426	}
..	..	@@ -4142,6 +5429,53 @@
4142	5429
4143	5430	freezemodel = false;
4144	5431	}
	5432	+
	5433	+ void SetPinStates(boolean enabled)
	5434	+ {
	5435	+ editButton.setEnabled(enabled);
	5436	+ uneditButton.setEnabled(enabled);
	5437	+ //unselectButton.setEnabled(enabled);
	5438	+ flashSelectionButton.setEnabled(enabled);
	5439	+
	5440	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5441	+
	5442	+ boolean allComposites = true;
	5443	+
	5444	+ if (group.selection != null)
	5445	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5446	+ {
	5447	+ Object next = e.nextElement();
	5448	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5449	+ {
	5450	+ allComposites = false;
	5451	+ break;
	5452	+ }
	5453	+ }
	5454	+
	5455	+ rootButton.setEnabled(true); // allComposites);
	5456	+ }
	5457	+
	5458	+ void refreshContents(boolean cp)
	5459	+ {
	5460	+ if (Globals.SHOWINFO)
	5461	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5462	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5463	+ {
	5464	+ objEditor.ClearInfo(); // .GetMaterial());
	5465	+
	5466	+ for (int i=0; i < group.selection.Size(); i++)
	5467	+ {
	5468	+ Object3D child = (Object3D) group.selection.get(i);
	5469	+
	5470	+ objEditor.AddInfo(child, this, true);
	5471	+// System.err.println("info : " + child.GetPath());
	5472	+ }
	5473	+
	5474	+ objEditor.SetText(); // jan 2014
	5475	+ }
	5476	+
	5477	+ super.refreshContents(cp);
	5478	+ }
4145	5479
4146	5480	void linkSomething(Object3D thing)
4147	5481	{
..	..	@@ -4213,16 +5547,19 @@
4213	5547	{
4214	5548	if (group.selection.isEmpty())
4215	5549	return;
4216		- GrafreeD.clipboardIsTempGroup = false;
	5550	+
	5551	+ Grafreed.clipboardIsTempGroup = false;
4217	5552	Composite tGroup = null;
4218	5553	if (group.selection.size() > 0) // 1)
4219	5554	{
4220	5555	tGroup = new cGroup();
4221		- GrafreeD.clipboardIsTempGroup = true;
	5556	+ Grafreed.clipboardIsTempGroup = true;
4222	5557	}
4223	5558
4224	5559	if (cut)
4225	5560	{
	5561	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5562	+// Save();
4226	5563	//int indices[] = jList.getSelectedIndices();
4227	5564	//for (int i = indices.length - 1; i >= 0; i--)
4228	5565	//jList.remove(indices[i]);
..	..	@@ -4258,16 +5595,16 @@
4258	5595	//System.out.println("cut " + child);
4259	5596	//System.out.println("parent = " + child.parent);
4260	5597	// tmp.addChild(child);
4261		- if (GrafreeD.clipboardIsTempGroup)
	5598	+ if (Grafreed.clipboardIsTempGroup)
4262	5599	tGroup.add/Child/(tmp);
4263	5600	else
4264		- GrafreeD.clipboard = tmp;
	5601	+ Grafreed.clipboard = tmp;
4265	5602	}
4266	5603	else
4267		- if (GrafreeD.clipboardIsTempGroup)
	5604	+ if (Grafreed.clipboardIsTempGroup)
4268	5605	tGroup.add/Child/(child);
4269	5606	else
4270		- GrafreeD.clipboard = child;
	5607	+ Grafreed.clipboard = child;
4271	5608	}
4272	5609
4273	5610	//ResetModel();
..	..	@@ -4299,21 +5636,23 @@
4299	5636	//System.out.println("cut " + elem);
4300	5637	//System.out.println("parent = " + elem.parent);
4301	5638	// tmp.addChild(elem);
4302		- if (GrafreeD.clipboardIsTempGroup)
	5639	+ if (Grafreed.clipboardIsTempGroup)
4303	5640	tGroup.add/Child/(tmp);
4304	5641	else
4305		- GrafreeD.clipboard = tmp;
	5642	+ Grafreed.clipboard = tmp;
4306	5643	}
4307	5644	else
4308		- if (GrafreeD.clipboardIsTempGroup)
	5645	+ if (Grafreed.clipboardIsTempGroup)
4309	5646	tGroup.add/Child/(child);
4310	5647	else
4311		- GrafreeD.clipboard = child;
	5648	+ Grafreed.clipboard = child;
4312	5649	}
4313	5650
4314	5651	}
4315		- if (GrafreeD.clipboardIsTempGroup)
4316		- GrafreeD.clipboard = tGroup;
	5652	+
	5653	+ if (Grafreed.clipboardIsTempGroup)
	5654	+ Grafreed.clipboard = tGroup;
	5655	+
4317	5656	if (cut)
4318	5657	{
4319	5658	ResetModel();
..	..	@@ -4323,11 +5662,15 @@
4323	5662
4324	5663	void paste(boolean expand)
4325	5664	{
	5665	+ if (Globals.REPLACEONMAKE)
	5666	+ Save();
	5667	+ boolean keep = Globals.REPLACEONMAKE;
	5668	+ Globals.REPLACEONMAKE = false;
4326	5669	// if (GrafreeD.clipboard == null)
4327	5670	// return;
4328	5671	boolean first = true;
4329	5672
4330		- if (GrafreeD.clipboardIsTempGroup)
	5673	+ if (Grafreed.clipboardIsTempGroup)
4331	5674	{
4332	5675	Composite temp;
4333	5676
..	..	@@ -4338,7 +5681,7 @@
4338	5681	temp = (Composite)Applet3D.clipboard.deepCopy();
4339	5682	*/
4340	5683	Object3D elem;
4341		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5684	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4342	5685	{
4343	5686	Object3D child = (Object3D)e.nextElement();
4344	5687
..	..	@@ -4372,21 +5715,22 @@
4372	5715	//Object3D cb = Applet3D.clipboard;
4373	5716	//temp.addChild(cb);
4374	5717	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4375		- assert(GrafreeD.clipboard.parent == null);
4376		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4377		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4378		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4379		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	5718	+ assert(Grafreed.clipboard.parent == null);
	5719	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5720	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5721	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5722	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4380	5723	else
4381		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4382		- GrafreeD.clipboard.get(0).parent = keepparent;
	5724	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5725	+ Grafreed.clipboard.get(0).parent = keepparent;
4383	5726	}
4384	5727
	5728	+ Globals.REPLACEONMAKE = keep;
4385	5729	ResetModel();
4386	5730	refreshContents();
4387	5731	}
4388	5732
4389		- void pasteInto(boolean copyit)
	5733	+ void pasteInto(boolean copyit, boolean clone)
4390	5734	{
4391	5735	// if (GrafreeD.clipboard == null)
4392	5736	// return;
..	..	@@ -4415,15 +5759,22 @@
4415	5759	if (copyit)
4416	5760	{
4417	5761	// paste(false);
4418		- CloneClipboard(false); // sept 2014
	5762	+ if (clone)
	5763	+ {
	5764	+ CloneClipboard(false); // sept 2014
	5765	+ }
	5766	+ else
	5767	+ {
	5768	+ paste(false);
	5769	+ }
4419	5770	}
4420	5771	else
4421	5772	{
4422	5773	boolean first = true;
4423	5774
4424		- if (GrafreeD.clipboardIsTempGroup)
	5775	+ if (Grafreed.clipboardIsTempGroup)
4425	5776	{
4426		- Composite temp = (Composite)GrafreeD.clipboard;
	5777	+ Composite temp = (Composite)Grafreed.clipboard;
4427	5778	Object3D copy;
4428	5779	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4429	5780	{
..	..	@@ -4433,7 +5784,7 @@
4433	5784	}
4434	5785	} else
4435	5786	{
4436		- linkSomething(GrafreeD.clipboard); //.get(0));
	5787	+ linkSomething(Grafreed.clipboard); //.get(0));
4437	5788	}
4438	5789	}
4439	5790	}
..	..	@@ -4510,6 +5861,10 @@
4510	5861
4511	5862	void group(Object3D csg, boolean grab)
4512	5863	{
	5864	+ if (Globals.REPLACEONMAKE)
	5865	+ Save();
	5866	+ boolean keep = Globals.REPLACEONMAKE;
	5867	+ Globals.REPLACEONMAKE = false;
4513	5868	if (//false) // why??
4514	5869	!group.selection.isEmpty())
4515	5870	{
..	..	@@ -4623,10 +5978,15 @@
4623	5978	//node.add(csg);
4624	5979	//makeSomething(node);
4625	5980	makeSomething(csg);
	5981	+ Globals.REPLACEONMAKE = keep;
4626	5982	}
4627	5983
4628	5984	void Ungroup(Object3D g)
4629	5985	{
	5986	+ if (Globals.REPLACEONMAKE)
	5987	+ Save();
	5988	+ boolean keep = Globals.REPLACEONMAKE;
	5989	+ Globals.REPLACEONMAKE = false;
4630	5990	if (g instanceof HiddenObject)
4631	5991	{
4632	5992	HiddenObject h = (HiddenObject) g;
..	..	@@ -4643,6 +6003,7 @@
4643	6003	objEditor.makeSomething(g.get(i), false);
4644	6004	}
4645	6005	}
	6006	+ Globals.REPLACEONMAKE = keep;
4646	6007	}
4647	6008
4648	6009	void ungroup()
..	..	@@ -4838,21 +6199,6 @@
4838	6199	}
4839	6200	*/
4840	6201
4841		- void ImportGFD()
4842		- {
4843		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4844		- browser.show();
4845		- String filename = browser.getFile();
4846		- if (filename != null && filename.length() > 0)
4847		- {
4848		- String fullname = browser.getDirectory() + filename;
4849		-
4850		- //Object3D readobj =
4851		- objEditor.ReadGFD(fullname, objEditor);
4852		- //makeSomething(readobj);
4853		- }
4854		- }
4855		-
4856	6202	/*
4857	6203	public void Callback(Object obj)
4858	6204	{
..	..	@@ -4876,26 +6222,9 @@
4876	6222	}
4877	6223	*/
4878	6224
4879		- void ImportVRMLX3D()
4880		- {
4881		- if (GrafreeD.standAlone)
4882		- {
4883		- /**/
4884		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4885		- browser.show();
4886		- String filename = browser.getFile();
4887		- if (filename != null && filename.length() > 0)
4888		- {
4889		- String fullname = browser.getDirectory() + filename;
4890		- LoadVRMLX3D(fullname);
4891		- }
4892		- /**/
4893		- }
4894		- }
4895		-
4896	6225	String GetFile(String dialogName)
4897	6226	{
4898		- if (GrafreeD.standAlone)
	6227	+ if (Grafreed.standAlone)
4899	6228	{
4900	6229	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4901	6230	browser.show();
..	..	@@ -4959,10 +6288,48 @@
4959	6288	cButton flashSelectionButton;
4960	6289	cButton editButton;
4961	6290	cButton uneditButton;
	6291	+ JCheckBox allParamsButton;
4962	6292	cButton clearpanelButton;
4963		- cButton allParamsButton;
4964	6293	cButton unselectButton;
4965	6294
	6295	+ cButton restoreCameraButton;
	6296	+
	6297	+ cButton oneStepButton;
	6298	+
	6299	+ cButton groupButton;
	6300	+ cButton ungroupButton;
	6301	+ cButton compositeButton;
	6302	+ cButton switchButton;
	6303	+ cButton loopButton;
	6304	+ cButton textureButton;
	6305	+
	6306	+ cButton skybox1Button;
	6307	+ cButton skybox2Button;
	6308	+ cButton skybox3Button;
	6309	+ cButton skybox4Button;
	6310	+ cButton skybox5Button;
	6311	+ cButton skybox6Button;
	6312	+ cButton skybox7Button;
	6313	+
	6314	+ cButton skybox11Button;
	6315	+ cButton skybox12Button;
	6316	+ cButton skybox13Button;
	6317	+ cButton skybox14Button;
	6318	+ cButton skybox15Button;
	6319	+ cButton skybox16Button;
	6320	+ cButton skybox17Button;
	6321	+
	6322	+ cButton gridButton;
	6323	+ cButton boxButton;
	6324	+ cButton sphereButton;
	6325	+ cButton coneButton;
	6326	+ cButton torusButton;
	6327	+ cButton superButton;
	6328	+ cButton kleinButton;
	6329	+ cButton particlesButton;
	6330	+ cButton overlayButton;
	6331	+ cButton lightButton;
	6332	+
4966	6333	cButton screenfitButton;
4967	6334	cButton screenfitpointButton;
4968	6335	cButton snapobjectButton;
..	..	@@ -4974,14 +6341,6 @@
4974	6341
4975	6342	cButton setsupportButton;
4976	6343
4977		- cButton twoButton;
4978		- cButton sixButton;
4979		- cButton threeButton;
4980		- cButton sevenButton;
4981		- cButton fourButton; // full panel
4982		- cButton oneButton; // full XYZ
4983		- //cButton currentLayout;
4984		-
4985	6344	//
4986	6345	//Composite
4987	6346	Object3D // to do !!
..	..	@@ -4991,10 +6350,12 @@
4991	6350	//JTree jTree;
4992	6351	private MenuItem lookAtItem;
4993	6352	private MenuItem lookFromItem;
4994		- private MenuItem switchItem;
4995		- private MenuItem cutItem;
4996		- private MenuItem duplicateItem;
4997		- private MenuItem cloneItem;
	6353	+ private MenuItem switchViewItem;
	6354	+ private JMenuItem cutItem;
	6355	+ private MenuItem undoItem;
	6356	+ private MenuItem redoItem;
	6357	+ private JMenuItem duplicateItem;
	6358	+ private JMenuItem cloneItem;
4998	6359	private MenuItem cloneSupportItem;
4999	6360	private MenuItem overwriteGeoItem;
5000	6361	private MenuItem overwriteMatItem;
..	..	@@ -5006,7 +6367,7 @@
5006	6367	private MenuItem linkverticesItem;
5007	6368	private MenuItem relinkverticesItem;
5008	6369	private MenuItem setMasterItem;
5009		- private MenuItem resetMeshItem;
	6370	+ private MenuItem resetAllItem;
5010	6371	private MenuItem stepAllItem;
5011	6372	private MenuItem revertMeshItem;
5012	6373	private MenuItem poseMeshItem;
..	..	@@ -5015,12 +6376,13 @@
5015	6376	private MenuItem cloneGeometriesItem;
5016	6377	private MenuItem shareGeometriesItem;
5017	6378	private MenuItem mergeGeometriesItem;
5018		- private MenuItem copyItem;
	6379	+ private JMenuItem copyItem;
5019	6380	private MenuItem pasteItem;
5020		- private MenuItem pasteLinkItem;
5021		- private MenuItem pasteCloneItem;
5022		- private MenuItem pasteExpandItem;
5023		- private MenuItem clearItem;
	6381	+ private JMenuItem pasteIntoItem;
	6382	+ private JMenuItem pasteLinkItem;
	6383	+ private JMenuItem pasteCloneItem;
	6384	+ private JMenuItem pasteExpandItem;
	6385	+ private JMenuItem deleteItem;
5024	6386	private MenuItem clearAllItem;
5025	6387	private MenuItem genUVItem;
5026	6388	private MenuItem genNormalsMESHItem;
..	..	@@ -5046,6 +6408,7 @@
5046	6408	private MenuItem clipMeshItem;
5047	6409	private MenuItem smoothMeshItem;
5048	6410	private MenuItem clearMaterialsItem;
	6411	+ private MenuItem clearVersionsItem;
5049	6412
5050	6413	private MenuItem liveleavesItem;
5051	6414	private MenuItem unliveleavesItem;
..	..	@@ -5055,6 +6418,10 @@
5055	6418	private MenuItem showleavesItem;
5056	6419	private MenuItem markleavesItem;
5057	6420	private MenuItem unmarkleavesItem;
	6421	+ private MenuItem rewindleavesItem;
	6422	+ private MenuItem unrewindleavesItem;
	6423	+ private MenuItem randomleavesItem;
	6424	+ private MenuItem unrandomleavesItem;
5058	6425
5059	6426	private MenuItem flipVItem;
5060	6427	private MenuItem unflipVItem;
..	..	@@ -5065,16 +6432,21 @@
5065	6432	private MenuItem maxTexturesItem;
5066	6433	private MenuItem panoTexturesItem;
5067	6434
	6435	+ private MenuItem textureRatioRItem;
	6436	+ private MenuItem textureRatioGItem;
	6437	+ private MenuItem textureRatioBItem;
5068	6438	private MenuItem resetCentroidItem;
5069		- private MenuItem transformgeometryItem;
	6439	+ private MenuItem resetCentroidXZItem;
5070	6440	private MenuItem resetTransformItem;
	6441	+ private MenuItem transformGeometryItem;
	6442	+ private MenuItem transformChildrenItem;
5071	6443	private MenuItem hideItem;
5072		- private MenuItem grabItem;
	6444	+ private JMenuItem grabItem;
5073	6445	private MenuItem backItem;
5074	6446	private MenuItem frontItem;
5075	6447	private MenuItem cameraItem;
5076	6448	private MenuItem compositeItem;
5077		- private MenuItem randomItem;
	6449	+ private MenuItem switchItem;
5078	6450	private MenuItem physicsItem;
5079	6451	private MenuItem frameselectorItem;
5080	6452	private MenuItem scriptNodeItem;
..	..	@@ -5082,7 +6454,7 @@
5082	6454	private MenuItem switchTransfoItem;
5083	6455	private MenuItem morphItem;
5084	6456	private MenuItem linkerItem;
5085		- private MenuItem ungroupItem;
	6457	+ private JMenuItem ungroupItem;
5086	6458	private MenuItem editItem;
5087	6459	private MenuItem openWindowItem;
5088	6460	private MenuItem editLeafItem;
..	..	@@ -5098,6 +6470,8 @@
5098	6470	private MenuItem attachBumpItem;
5099	6471	private MenuItem detachBumpItem;
5100	6472	private MenuItem pigmentBumpItem;
	6473	+ private MenuItem embedTexturesItem;
	6474	+ private MenuItem deEmbedTexturesItem;
5101	6475
5102	6476	private MenuItem particleItem;
5103	6477	private MenuItem ragdollItem;
..	..	@@ -5114,7 +6488,7 @@
5114	6488	private MenuItem blobItem;
5115	6489	private MenuItem latheItem;
5116	6490	private MenuItem bezierItem;
5117		- private MenuItem checkerItem;
	6491	+ private MenuItem overlayItem;
5118	6492	private MenuItem meshItem;
5119	6493	// private MenuItem meshGroupItem;
5120	6494	private MenuItem springItem;
..	..	@@ -5136,11 +6510,6 @@
5136	6510	private MenuItem doubleItem;
5137	6511	private MenuItem tripleItem;
5138	6512
5139		- private MenuItem importGFDItem;
5140		- private MenuItem importVRMLX3DItem;
5141		- private MenuItem import3DSItem;
5142		- private MenuItem importOBJItem;
5143		-
5144	6513	private MenuItem computeAOItem;
5145	6514	private MenuItem recompileItem;
5146	6515	private MenuItem editScriptItem;
..	..	@@ -5150,4 +6519,8 @@
5150	6519	private MenuItem analyzeItem;
5151	6520	private MenuItem dumpItem;
5152	6521	//boolean freezemodel = false;
	6522	+
	6523	+ Menu cameraMenu;
	6524	+ MenuItem editCameraItem;
	6525	+ MenuItem restoreCameraItem;
5153	6526	}