~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,360 @@
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	+
	371	+ public void Show3DView()
	372	+ {
	373	+ // bug
	374	+ //gridPanel.setDividerLocation(1.0);
	375	+ //bigPanel.setDividerLocation(0.0);
	376	+ bigThree.ClearUI();
	377	+ bigThree.add(centralPanel);
	378	+ bigThree.FlushUI();
	379	+ }
	380	+
26	381	//ObjEditor objEditor;
27	382	public void closeUI2()
28	383	{
..	..	@@ -60,6 +415,16 @@
60	415	this.copy = this.group = group;
61	416	//selectees = this.group.selectees;
62	417
	418	+ assert(false);
	419	+
	420	+ if (copy.versionlist == null)
	421	+ {
	422	+ copy.versionlist = new Object3D[100];
	423	+ copy.versionindex = -1;
	424	+
	425	+ //Save(true);
	426	+ }
	427	+
63	428	if(ui)
64	429	SetupUI(objEditor);
65	430	}
..	..	@@ -74,16 +439,28 @@
74	439	this.copy = this.group = copy;
75	440	//selectees = this.group.selectees;
76	441
77		- SetupMenu2(objEditor);
	442	+ SetupMenu2(this); //objEditor);
78	443	SetupUI2(objEditor);
79	444	objEditor.SetupUI(true);
80	445	SetupViews(objEditor);
81	446
82	447	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	448	+
	449	+ if (copy.versionlist == null)
	450	+ {
	451	+ copy.versionlist = new Object3D[100];
	452	+ copy.versionindex = -1;
	453	+
	454	+ //Save(true);
	455	+ }
83	456	}
84	457
85	458	void CloneSelection(boolean supports)
86	459	{
	460	+ if (Globals.REPLACEONMAKE)
	461	+ Save();
	462	+ boolean keep = Globals.REPLACEONMAKE;
	463	+ Globals.REPLACEONMAKE = false;
87	464	// Object3D keep = GrafreeD.clipboard;
88	465	//Object3D obj;
89	466	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,18 +471,19 @@
94	471
95	472	makeSomething(clone, i==group.selection.size()-1);
96	473	}
	474	+ Globals.REPLACEONMAKE = keep;
97	475	}
98	476
99	477	void CloneClipboard(boolean supports)
100	478	{
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));
	479	+ assert(Grafreed.clipboard.parent == null);
	480	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	481	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	482	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	483	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
106	484	else
107		- makeSomething(CloneObject(GrafreeD.clipboard, false));
108		- GrafreeD.clipboard.get(0).parent = keepparent;
	485	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	486	+ Grafreed.clipboard.get(0).parent = keepparent;
109	487	}
110	488
111	489	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -119,7 +497,7 @@
119	497	// obj.support = null;
120	498	if (!supports)
121	499	obj.SaveSupports();
122		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	500	+ Object3D clone = (Object3D)Grafreed.clone(obj);
123	501	obj.parent = parent;
124	502	// obj.support = support;
125	503	// clone.support = support; // aout 2013
..	..	@@ -148,57 +526,51 @@
148	526
149	527	//JTextField nameField;
150	528
151		- void SetupMenu2(ObjEditor oe)
	529	+ void SetupMenu2(GroupEditor oe)
152	530	{
153		- if (Globals.ADVANCED)
154		- {
155		- oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
156		- //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
157		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
158		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
159		- oe.cameraMenu.add("-");
160		- openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
161		- openWindowItem.addActionListener(this);
162		- editLeafItem.addActionListener(this);
163		- lookAtItem.addActionListener(this);
164		- //lookFromItem.addActinoListener(this);
165		- //switchItem.addActionListener(this);
166		- }
167		-
	531	+ oe.jTree = new cTree();
	532	+
168	533	Menu menu;
169	534	oe.menuBar.add(menu = new Menu("Edit"));
170	535	//editItem = menu.add(new MenuItem("Edit"));
171	536	//editItem.addActionListener(this);
172		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	537	+
	538	+// undoItem = menu.add(new MenuItem("Undo"));
	539	+// undoItem.addActionListener(this);
	540	+// redoItem = menu.add(new MenuItem("Redo"));
	541	+// redoItem.addActionListener(this);
	542	+// menu.add("-");
	543	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
173	544	duplicateItem.addActionListener(this);
174		- cloneItem = menu.add(new MenuItem("Clone"));
	545	+
	546	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
175	547	cloneItem.addActionListener(this);
176		- if (Globals.ADVANCED)
	548	+ //if (Globals.ADVANCED)
177	549	{
178	550	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
179	551	cloneSupportItem.addActionListener(this);
180	552	}
	553	+ oe.jTree.popup.addSeparator();
181	554	menu.add("-");
182		- cutItem = menu.add(new MenuItem("Cut"));
	555	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
183	556	cutItem.addActionListener(this);
184		- copyItem = menu.add(new MenuItem("Copy"));
	557	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
185	558	copyItem.addActionListener(this);
186	559	pasteItem = menu.add(new MenuItem("Paste"));
187	560	pasteItem.addActionListener(this);
188		- menu.add("-");
189	561
190		- menu.add("-");
191		- pasteIntoItem = menu.add(new MenuItem("Paste into"));
	562	+ oe.jTree.popup.addSeparator();
	563	+ //menu.add("-");
	564	+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
192	565	pasteIntoItem.addActionListener(this);
193		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	566	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
194	567	pasteLinkItem.addActionListener(this);
195		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	568	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
196	569	pasteCloneItem.addActionListener(this);
197		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	570	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
198	571	// pasteExpandItem.addActionListener(this);
199		- menu.add("-");
200		- clearItem = menu.add(new MenuItem("Clear"));
201		- clearItem.addActionListener(this);
	572	+ //menu.add("-");
	573	+ oe.jTree.popup.addSeparator();
202	574
203	575	if (Globals.ADVANCED)
204	576	{
..	..	@@ -206,14 +578,95 @@
206	578	clearAllItem = menu.add(new MenuItem("Clear All"));
207	579	clearAllItem.addActionListener(this);
208	580	}
	581	+
	582	+ menuBar.add(cameraMenu = new Menu("View"));
	583	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	584	+ //zBufferItem.addActionListener(this);
	585	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	586	+ //normalLensItem.addActionListener(this);
	587	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	588	+ restoreCameraItem.addActionListener(this);
	589	+
	590	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	591	+// toggleFullScreenItem.addItemListener(this);
	592	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	593	+// cameraMenu.add("-");
	594	+//
	595	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	596	+// toggleTextureItem.addItemListener(this);
	597	+// toggleTextureItem.setState(CameraPane.textureon);
	598	+//
	599	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	600	+// toggleSwitchItem.addItemListener(this);
	601	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	602	+
	603	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	604	+ toggleHandleItem.addItemListener(this);
	605	+ toggleHandleItem.setState(CameraPane.HANDLES);
	606	+
	607	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	608	+ togglePaintItem.addItemListener(this);
	609	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	610	+
	611	+ if (Globals.ADVANCED)
	612	+ {
	613	+ cameraMenu.add("-");
	614	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	615	+ toggleLiveItem.addItemListener(this);
	616	+ toggleLiveItem.setState(Globals.isLIVE());
209	617
	618	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	619	+ stepItem.addActionListener(this);
	620	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	621	+ // toggleDLItem.addItemListener(this);
	622	+ // toggleDLItem.setState(false);
	623	+
	624	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	625	+ toggleRenderItem.addItemListener(this);
	626	+ toggleRenderItem.setState(!CameraPane.frozen);
	627	+
	628	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	629	+ toggleDebugItem.addItemListener(this);
	630	+ toggleDebugItem.setState(Globals.DEBUG);
	631	+
	632	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	633	+ toggleFrustumItem.addItemListener(this);
	634	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	635	+
	636	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	637	+ toggleFootContactItem.addItemListener(this);
	638	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	639	+
	640	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	641	+ toggleTimelineItem.addItemListener(this);
	642	+ }
	643	+
	644	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	645	+// toggleRootItem.addItemListener(this);
	646	+// toggleRootItem.setState(false);
	647	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	648	+// animationItem.addItemListener(this);
	649	+// animationItem.setState(CameraPane.ANIMATION);
	650	+ cameraMenu.add("-");
	651	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	652	+ editCameraItem.addActionListener(this);
	653	+
	654	+ if (Globals.ADVANCED)
	655	+ {
	656	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	657	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	658	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	659	+ oe.cameraMenu.add("-");
	660	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	661	+ openWindowItem.addActionListener(this);
	662	+ lookAtItem.addActionListener(this);
	663	+ //lookFromItem.addActinoListener(this);
	664	+ //switchViewItem.addActionListener(this);
	665	+ }
	666	+
210	667	oe.menuBar.add(menu = new Menu("Setting"));
211	668	if (Globals.ADVANCED)
212	669	{
213		- resetMeshItem = menu.add(new MenuItem("Reset All"));
214		- resetMeshItem.addActionListener(this);
215		- stepAllItem = menu.add(new MenuItem("Step All"));
216		- stepAllItem.addActionListener(this);
217	670	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
218	671	revertMeshItem.addActionListener(this);
219	672	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
..	..	@@ -252,22 +705,37 @@
252	705	setMasterItem.addActionListener(this);
253	706	}
254	707
255		- oe.menuBar.add(menu = new Menu("Group"));
256		- grabItem = menu.add(new MenuItem("Grab"));
257		- grabItem.addActionListener(this);
	708	+ oe.menuBar.add(menu = new Menu("Order"));
	709	+
258	710	backItem = menu.add(new MenuItem("Back"));
259	711	backItem.addActionListener(this);
260	712	frontItem = menu.add(new MenuItem("Front"));
261	713	frontItem.addActionListener(this);
262		- compositeItem = menu.add(new MenuItem("Composite"));
263		- compositeItem.addActionListener(this);
	714	+// compositeItem = menu.add(new MenuItem("Composite"));
	715	+// compositeItem.addActionListener(this);
	716	+
	717	+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
	718	+ grabItem.addActionListener(this);
	719	+
	720	+ if (Globals.ADVANCED)
	721	+ {
264	722	hideItem = menu.add(new MenuItem("Hidden Group"));
265	723	hideItem.addActionListener(this);
266		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	724	+ }
	725	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
267	726	ungroupItem.addActionListener(this);
268		- menu.add("-");
269		- randomItem = menu.add(new MenuItem("Switch node"));
270		- randomItem.addActionListener(this);
	727	+
	728	+ oe.jTree.popup.addSeparator();
	729	+
	730	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	731	+ deleteItem.addActionListener(this);
	732	+
	733	+// menu.add("-");
	734	+//
	735	+// switchItem = menu.add(new MenuItem("Switch node"));
	736	+// switchItem.addActionListener(this);
	737	+ if (Globals.ADVANCED)
	738	+ {
271	739	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
272	740	switchGeoItem.addActionListener(this);
273	741	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -275,8 +743,6 @@
275	743	morphItem = menu.add(new MenuItem("Morph Group"));
276	744	morphItem.addActionListener(this);
277	745
278		- if (Globals.ADVANCED)
279		- {
280	746	menu.add("-");
281	747	physicsItem = menu.add(new MenuItem("Physics"));
282	748	physicsItem.addActionListener(this);
..	..	@@ -284,30 +750,29 @@
284	750	frameselectorItem.addActionListener(this);
285	751	scriptNodeItem = menu.add(new MenuItem("Script Node"));
286	752	scriptNodeItem.addActionListener(this);
287		- cameraItem = menu.add(new MenuItem("Camera"));
288		- cameraItem.addActionListener(this);
289	753	}
290	754
291	755	oe.menuBar.add(menu = new Menu("Object"));
292		- textureItem = menu.add(new MenuItem("Texture"));
293		- textureItem.addActionListener(this);
	756	+// textureItem = menu.add(new MenuItem("Texture"));
	757	+// textureItem.addActionListener(this);
294	758	billboardItem = menu.add(new MenuItem("Billboard"));
295	759	billboardItem.addActionListener(this);
296	760	csgItem = menu.add(new MenuItem("CSG"));
297	761	csgItem.addActionListener(this);
298		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	762	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
299	763	shadowXItem.addActionListener(this);
300		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	764	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
301	765	shadowYItem.addActionListener(this);
302		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	766	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
303	767	shadowZItem.addActionListener(this);
	768	+ attributeItem = menu.add(new MenuItem("Attribute"));
	769	+ attributeItem.addActionListener(this);
	770	+
304	771	if (Globals.ADVANCED)
305	772	{
306	773	menu.add("-");
307	774	linkerItem = menu.add(new MenuItem("Linker"));
308	775	linkerItem.addActionListener(this);
309		- attributeItem = menu.add(new MenuItem("Attribute"));
310		- attributeItem.addActionListener(this);
311	776	templateItem = menu.add(new MenuItem("Template"));
312	777	templateItem.addActionListener(this);
313	778	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -318,8 +783,12 @@
318	783	resetTransformItem.addActionListener(this);
319	784	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
320	785	resetCentroidItem.addActionListener(this);
321		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
322		- transformgeometryItem.addActionListener(this);
	786	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	787	+ resetCentroidXZItem.addActionListener(this);
	788	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	789	+ transformGeometryItem.addActionListener(this);
	790	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	791	+ transformChildrenItem.addActionListener(this);
323	792
324	793	oe.menuBar.add(menu = new Menu("Geometry"));
325	794	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -332,7 +801,7 @@
332	801	genNormalsMESHItem.addActionListener(this);
333	802	if (Globals.ADVANCED)
334	803	{
335		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	804	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
336	805	genNormalsMINEItem.addActionListener(this);
337	806	}
338	807	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -368,6 +837,10 @@
368	837	oe.menuBar.add(menu = new Menu("Attributes"));
369	838	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
370	839	clearMaterialsItem.addActionListener(this);
	840	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	841	+ resetAllItem.addActionListener(this);
	842	+ stepAllItem = menu.add(new MenuItem("Step All"));
	843	+ stepAllItem.addActionListener(this);
371	844	menu.add("-");
372	845	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
373	846	liveleavesItem.addActionListener(this);
..	..	@@ -384,10 +857,18 @@
384	857	hideleavesItem.addActionListener(this);
385	858	showleavesItem = menu.add(new MenuItem("Show Leaves"));
386	859	showleavesItem.addActionListener(this);
387		- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
	860	+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
388	861	markleavesItem.addActionListener(this);
389		- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
	862	+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
390	863	unmarkleavesItem.addActionListener(this);
	864	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	865	+ rewindleavesItem.addActionListener(this);
	866	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	867	+ unrewindleavesItem.addActionListener(this);
	868	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	869	+ randomleavesItem.addActionListener(this);
	870	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	871	+ unrandomleavesItem.addActionListener(this);
391	872	menu.add("-");
392	873	flipVItem = menu.add(new MenuItem("Flip V"));
393	874	flipVItem.addActionListener(this);
..	..	@@ -413,55 +894,130 @@
413	894	attachBumpItem.addActionListener(this);
414	895	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
415	896	pigmentBumpItem.addActionListener(this);
	897	+ //embedTexturesItem
416	898	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
417	899	detachPigmentItem.addActionListener(this);
418	900	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
419	901	detachBumpItem.addActionListener(this);
	902	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	903	+ embedTexturesItem.addActionListener(this);
	904	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	905	+ deEmbedTexturesItem.addActionListener(this);
420	906	menu.add("-");
421	907	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
422	908	sortbysizeItem.addActionListener(this);
423	909	sortbynameItem = menu.add(new MenuItem("Sort by name"));
424	910	sortbynameItem.addActionListener(this);
	911	+ menu.add("-");
	912	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	913	+ shareGeometriesItem.addActionListener(this);
	914	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	915	+ mergeGeometriesItem.addActionListener(this);
	916	+ menu.add("-");
	917	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	918	+ editLeafItem.addActionListener(this);
425	919	if (Globals.ADVANCED)
426	920	{
427		- menu.add("-");
	921	+ // Pretty much the same as duplicate and clone.
428	922	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
429	923	extractGeometriesItem.addActionListener(this);
430	924	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
431	925	cloneGeometriesItem.addActionListener(this);
432		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
433		- shareGeometriesItem.addActionListener(this);
434		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
435		- mergeGeometriesItem.addActionListener(this);
436	926	}
437	927
438	928	oe.menuBar.add(menu = new Menu("Insert"));
439	929	buildCreateMenu(menu);
440	930
441		- oe.menuBar.add(menu = new Menu("Include"));
442		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
443		- importGFDItem.addActionListener(this);
444		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
445		- importVRMLX3DItem.addActionListener(this);
446		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
447		- importOBJItem.addActionListener(this);
448		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
449		- import3DSItem.addActionListener(this);
450		-
451	931	oe.menuBar.add(menu = new Menu("Tools"));
452	932	buildToolsMenu(menu);
453	933	}
454	934
	935	+ JTabbedPane resourcecontainer;
	936	+ cGridBag currenttab;
	937	+ //boolean added; // patch for jar
	938	+
	939	+ int tabcount = 0;
	940	+ int colcount = 0;
	941	+ int rowcount = 0;
	942	+ int texturecount = 0;
	943	+
	944	+ int columns = 5;
	945	+ int rows = 7;
	946	+
	947	+ public void ResourceCallBack(String[] path)
	948	+ {
	949	+// for (int i = 0; i < path.length; i++)
	950	+// System.out.print(path[i] + "/");
	951	+// System.out.println();
	952	+
	953	+ if (//rowcount == 0 \|\|
	954	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	955	+ {
	956	+ currenttab = new cGridBag();
	957	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	958	+ currenttab.setName(tabname);
	959	+ //added = false;
	960	+ resourcecontainer.add(currenttab);
	961	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	962	+ rowcount = 1;
	963	+ colcount = 0;
	964	+ texturecount = 0;
	965	+ }
	966	+
	967	+ if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") \|\| path[2].toLowerCase().endsWith(".png")))
	968	+ {
	969	+ //if (!added)
	970	+ {
	971	+ //added = true;
	972	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	973	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	974	+ }
	975	+
	976	+ AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
	977	+
	978	+ if (++colcount >= columns)
	979	+ {
	980	+ colcount = 0;
	981	+ currenttab.Return();
	982	+
	983	+ if (rowcount++ >= rows)
	984	+ {
	985	+ rowcount = 0;
	986	+ }
	987	+ }
	988	+ }
	989	+ else
	990	+ {
	991	+// if (!path[path.length-1].equals("icons"))
	992	+// resourcecontainer.Return();
	993	+ }
	994	+ }
	995	+
	996	+ void CreateTexturePanel(cGridBag container)
	997	+ {
	998	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	999	+ container.add(resourcecontainer);
	1000	+
	1001	+ Grafreed.ParseResources("textures", this);
	1002	+ }
	1003	+
455	1004	void SetupUI2(ObjEditor oe)
456	1005	{
	1006	+ // June 2019
	1007	+ if (oe == null)
	1008	+ {
	1009	+ //super.SetupUI2(this);
	1010	+ //return;
	1011	+ }
	1012	+
	1013	+ if (copy != group)
	1014	+ {
	1015	+ //super.SetupUI2(this);
	1016	+ }
	1017	+
457	1018	//new Exception().printStackTrace();
458	1019
459	1020	oe.radioPanel = new JPanel(new GridBagLayout());
460		- oe.aConstraints.weightx = 1;
461		- oe.aConstraints.weighty = 0;
462		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
463		- oe.aConstraints.gridwidth = 100;
464		- oe.aConstraints.gridheight = 1;
465	1021	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
466	1022
467	1023	oe.buttonGroup = new ButtonGroup();
..	..	@@ -482,97 +1038,268 @@
482	1038	oe.radioPanel.add(dummyButton);
483	1039	oe.buttonGroup.add(dummyButton);
484	1040	*/
	1041	+ cGridBag versionManagerPanel = new cGridBag();
	1042	+
	1043	+ versionManagerPanel.preferredHeight = 4;
	1044	+
485	1045	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
486	1046
487		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
488		- liveCB.setToolTipText("Enabled animation");
489		- liveCB.addItemListener(this);
	1047	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1048	+ //minButton.setToolTipText("Minimize window");
	1049	+ //minButton.addActionListener(this);
	1050	+
	1051	+ if (Globals.ADVANCED)
	1052	+ {
	1053	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1054	+// maxButton.setToolTipText("Maximize window");
	1055	+// maxButton.addActionListener(this);
	1056	+ }
	1057	+
	1058	+ cButton gcButton;
	1059	+
	1060	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1061	+// gcButton.setToolTipText("Garbage collect");
	1062	+// gcButton.addActionListener(new ActionListener()
	1063	+// {
	1064	+// public void actionPerformed(ActionEvent e)
	1065	+// {
	1066	+// System.gc();
	1067	+// }
	1068	+// });
	1069	+
	1070	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1071	+ collapseButton.setToolTipText("Collapse toolbar");
	1072	+ collapseButton.addActionListener(this);
	1073	+
	1074	+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1075	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1076	+ maximize3DButton.addActionListener(this);
	1077	+
	1078	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1079	+ twoButton.setToolTipText("Show 3D view only");
	1080	+ twoButton.addActionListener(this);
	1081	+ this.fullscreenLayout = twoButton;
	1082	+
	1083	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1084	+ threeButton.setToolTipText("Show controls and 3D view");
	1085	+ threeButton.addActionListener(this);
	1086	+ if (Globals.ADVANCED)
	1087	+ {
	1088	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1089	+ sixButton.setToolTipText("Show 3D view and controls");
	1090	+ sixButton.addActionListener(this);
	1091	+ }
	1092	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1093	+// sevenButton.setToolTipText("3-column layout");
	1094	+// sevenButton.addActionListener(this);
	1095	+ //
	1096	+
	1097	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1098	+ fullButton.setToolTipText("Full-screen window");
	1099	+ fullButton.addActionListener(this);
	1100	+
	1101	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1102	+ screenfitButton.setToolTipText("Screen fit");
	1103	+ screenfitButton.addActionListener(this);
490	1104
491		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1105	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1106	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1107	+ restoreCameraButton.addActionListener(this);
	1108	+
	1109	+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1110	+ saveVersionButton.setToolTipText("Duplicate current version");
	1111	+ saveVersionButton.addActionListener(this);
	1112	+
	1113	+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1114	+ deleteVersionButton.setToolTipText("Delete current version");
	1115	+ deleteVersionButton.addActionListener(this);
	1116	+ deleteVersionButton.setEnabled(false);
	1117	+
	1118	+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1119	+ previousVersionButton.setToolTipText("Previous version");
	1120	+ previousVersionButton.addActionListener(this);
	1121	+ previousVersionButton.setEnabled(false);
	1122	+
	1123	+ cGridBag updown = new cGridBag().setVertical(true);
	1124	+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1125	+ restoreButton.setToolTipText("Undo (restore current version)");
	1126	+ restoreButton.addActionListener(this);
	1127	+ restoreButton.setEnabled(false);
	1128	+
	1129	+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1130	+ replaceButton.setToolTipText("Save (replace current version)");
	1131	+ replaceButton.addActionListener(this);
	1132	+ replaceButton.setEnabled(false);
	1133	+
	1134	+ versionManagerPanel.add(updown);
	1135	+
	1136	+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1137	+ nextVersionButton.setToolTipText("Next version");
	1138	+ nextVersionButton.addActionListener(this);
	1139	+ nextVersionButton.setEnabled(false);
	1140	+
	1141	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
492	1142	oneStepButton.setToolTipText("Animate one step forward");
493	1143	oneStepButton.addActionListener(this);
494	1144
495		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	1145	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1146	+ liveCB.setToolTipText("Enable animation");
	1147	+ liveCB.addItemListener(this);
	1148	+
	1149	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
496	1150	fastCB.setToolTipText("Fast mode");
497	1151	fastCB.addItemListener(this);
498	1152
499		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
500		- trackCB.setToolTipText("Enable tracking");
501		- trackCB.addItemListener(this);
502		-
503		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
504		- screenfitButton.setToolTipText("Screen fit");
505		- screenfitButton.addActionListener(this);
	1153	+ //oe.toolboxPanel.Return();
	1154	+
	1155	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1156	+// trackCB.setToolTipText("Enable tracking");
	1157	+// trackCB.addItemListener(this);
506	1158
507	1159	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
508	1160	// screenfitpointButton.addActionListener(this);
509	1161
510	1162	if (Globals.ADVANCED)
511	1163	{
512		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1164	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
513	1165	snapobjectButton.addActionListener(this);
514	1166	snapobjectButton.setToolTipText("Snap Object");
	1167	+
	1168	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1169	+ fourButton.addActionListener(this);
	1170	+ fourButton.setToolTipText("Show control panel only");
515	1171	}
516	1172
517		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
518		- flashSelectionButton.setToolTipText("Show selection");
519		- flashSelectionButton.addActionListener(this);
	1173	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
520	1174
521		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
522		-
523		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
524		- twoButton.setToolTipText("Show center view only");
525		- twoButton.addActionListener(this);
526		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
527		- fourButton.addActionListener(this);
528		- fourButton.setToolTipText("Show left panel only");
529		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
530		- sixButton.setToolTipText("2-column layout left");
531		- sixButton.addActionListener(this);
532		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
533		- threeButton.setToolTipText("2-column layout right");
534		- threeButton.addActionListener(this);
535		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
536		- sevenButton.setToolTipText("3-column layout");
537		- sevenButton.addActionListener(this);
538		- //
539	1175
540		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
541		- rootButton.setToolTipText("Edit selection in new tab");
	1176	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1177	+ rootButton.setToolTipText("Open selection in new tab");
542	1178	rootButton.addActionListener(this);
543	1179
544		- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1180	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
545	1181	closeButton.setToolTipText("Close tab");
546	1182	closeButton.addActionListener(this);
547	1183	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
548	1184	//clearButton.addActionListener(this);
549		-
550		- cGridBag commandsPanel = new cGridBag();
	1185	+
	1186	+ cGridBag row1 = new cGridBag();
551	1187
552		- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
553		- editButton.setToolTipText("Edit selection");
	1188	+ // INSERT
	1189	+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1190	+ gridButton.setToolTipText("Create ground");
	1191	+ gridButton.addActionListener(this);
	1192	+
	1193	+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1194	+ boxButton.setToolTipText("Create box");
	1195	+ boxButton.addActionListener(this);
	1196	+
	1197	+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1198	+ superButton.setToolTipText("Create superellipsoid");
	1199	+ superButton.addActionListener(this);
	1200	+
	1201	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1202	+ sphereButton.setToolTipText("Create sphere");
	1203	+ sphereButton.addActionListener(this);
	1204	+
	1205	+ row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1206	+ coneButton.setToolTipText("Create cone");
	1207	+ coneButton.addActionListener(this);
	1208	+
	1209	+ row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1210	+ torusButton.setToolTipText("Create torus");
	1211	+ torusButton.addActionListener(this);
	1212	+
	1213	+ if (Globals.ADVANCED)
	1214	+ {
	1215	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1216	+ kleinButton.setToolTipText("Create Klein bottle");
	1217	+ kleinButton.addActionListener(this);
	1218	+ }
	1219	+
	1220	+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1221	+ particlesButton.setToolTipText("Create particle system");
	1222	+ particlesButton.addActionListener(this);
	1223	+
	1224	+ oe.toolboxPanel.add(row1);
	1225	+
	1226	+ cGridBag row2 = new cGridBag();
	1227	+
	1228	+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1229	+ groupButton.setToolTipText("Create group");
	1230	+ groupButton.addActionListener(this);
	1231	+
	1232	+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1233	+ compositeButton.setToolTipText("Create composite");
	1234	+ compositeButton.addActionListener(this);
	1235	+
	1236	+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1237	+ switchButton.setToolTipText("Create item switcher");
	1238	+ switchButton.addActionListener(this);
	1239	+
	1240	+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1241	+ loopButton.setToolTipText("Create loop");
	1242	+ loopButton.addActionListener(this);
	1243	+
	1244	+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1245	+ textureButton.setToolTipText("Create texture");
	1246	+ textureButton.addActionListener(this);
	1247	+
	1248	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1249	+ overlayButton.setToolTipText("Create overlay");
	1250	+ overlayButton.addActionListener(this);
	1251	+
	1252	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1253	+ lightButton.setToolTipText("Create light");
	1254	+ lightButton.addActionListener(this);
	1255	+
	1256	+ oe.toolboxPanel.add(row2);
	1257	+
	1258	+ cGridBag textures = new cGridBag();
	1259	+
	1260	+ CreateTexturePanel(textures);
	1261	+
	1262	+ int tabCount = resourcecontainer.getTabCount();
	1263	+
	1264	+ if (tabCount > 0)
	1265	+ resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
	1266	+
	1267	+ oe.toolboxPanel.add(textures);
	1268	+
	1269	+ textures.preferredHeight = 100;
	1270	+
	1271	+ CreateSkyboxPanel(oe.skyboxPanel);
	1272	+
	1273	+ // EDIT panel
	1274	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1275	+ editButton.setToolTipText("Pin selection controls");
554	1276	editButton.addActionListener(this);
555	1277
556		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
557		- uneditButton.setToolTipText("Unedit selection");
	1278	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1279	+ uneditButton.setToolTipText("Unpin and remove selection controls");
558	1280	uneditButton.addActionListener(this);
559	1281
560		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
561		- allParamsButton.setToolTipText("Edit all params");
	1282	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1283	+ allParamsButton.setToolTipText("Show all controls");
562	1284	allParamsButton.addActionListener(this);
563	1285
564		- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
565		- clearPanelButton.setToolTipText("Clear edit panel");
	1286	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1287	+ clearPanelButton.setToolTipText("Clear all controls");
566	1288	clearPanelButton.addActionListener(this);
567	1289
568		- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
569		- unselectButton.setToolTipText("Unselect");
570		- unselectButton.addActionListener(this);
	1290	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1291	+ //unselectButton.setToolTipText("Unselect");
	1292	+ //unselectButton.addActionListener(this);
571	1293
572		- commandsPanel.preferredHeight = 1;
	1294	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1295	+ flashSelectionButton.setToolTipText("Highlight selection");
	1296	+ flashSelectionButton.addActionListener(this);
573	1297
574		- oe.treePanel.add(commandsPanel);
575		- oe.treePanel.Return();
	1298	+ editCommandsPanel.preferredHeight = 1;
	1299	+
	1300	+ SetPinStates(false);
	1301	+// oe.treePanel.add(commandsPanel);
	1302	+// oe.treePanel.Return();
576	1303
577	1304	// oe.aConstraints.gridx += 1;
578	1305	// oe.aConstraints.weighty = 0;
..	..	@@ -587,34 +1314,24 @@
587	1314
588	1315	cGridBag jSPPanel = new cGridBag();
589	1316
	1317	+ jSPPanel.preferredHeight = 20;
	1318	+
590	1319	JScrollPane jSP;
591	1320	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
592		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1321	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
593	1322	ResetModel();
594	1323
595	1324	oe.treePanel.add(jSPPanel);
596	1325	oe.treePanel.Return();
597	1326
598		- cGridBag copyOptionsPanel = new cGridBag();
599		-
600		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
601		- colorCB.setToolTipText("Copy color when dropped");
602		- colorCB.addItemListener(this);
603		-
604		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
605		- materialCB.setToolTipText("Copy material when dropped");
606		- materialCB.addItemListener(this);
607		-
608		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
609		- textureCB.setToolTipText("Copy texture when dropped");
610		- textureCB.addItemListener(this);
611		-
612		- copyOptionsPanel.preferredHeight = 1;
613		- oe.treePanel.add(copyOptionsPanel);
	1327	+ oe.treePanel.add(versionManagerPanel);
614	1328	oe.treePanel.Return();
	1329	+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1330	+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
	1331	+ versionSliderPane.preferredHeight = 3;
615	1332
616		-// mainPanel.setDividerLocation(0.5); //1.0);
617		-// mainPanel.setResizeWeight(0.5);
	1333	+// mainPanel.setDividerLocation(0.1); //1.0);
	1334	+ mainPanel.setResizeWeight(0.4);
618	1335
619	1336	//jList.addListSelectionListener(this);
620	1337	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -622,7 +1339,7 @@
622	1339	//jTree.setEditable(true);
623	1340	oe.jTree.setDragEnabled(true);
624	1341	//jTree.setPreferredSize(new Dimension(10,10));
625		- jSP.setPreferredSize(new Dimension(100,200));
	1342	+ //jSP.setPreferredSize(new Dimension(100,200));
626	1343
627	1344	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
628	1345
..	..	@@ -634,29 +1351,49 @@
634	1351	dgr.addDragGestureListener(this);
635	1352	}catch(Exception e) {}
636	1353	*/
637		- radio.layout = sevenButton;
	1354	+ radio.layout = threeButton; // sixButton;
638	1355	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
639	1356	}
640	1357
641	1358	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
642	1359	{
	1360	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1361	+ colorCB.setToolTipText("Copy color when dropped");
	1362	+ colorCB.addItemListener(this);
	1363	+
	1364	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1365	+ materialCB.setToolTipText("Copy material when dropped");
	1366	+ materialCB.addItemListener(this);
	1367	+
	1368	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1369	+ textureCB.setToolTipText("Copy texture when dropped");
	1370	+ textureCB.addItemListener(this);
	1371	+
	1372	+ panel.Return();
	1373	+
643	1374	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
644	1375	boxCB.setToolTipText("Display bounding boxes");
645	1376	boxCB.addItemListener(this);
646	1377
647	1378	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
648		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1379	+ zoomBoxCB.setToolTipText("Display only for wheel");
649	1380	zoomBoxCB.addItemListener(this);
650	1381
651		- if (Globals.ADVANCED)
	1382	+ if (true) // Globals.ADVANCED)
652	1383	{
653		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
654		- supportCB.setToolTipText("Enable rigging");
655		- supportCB.addItemListener(this);
	1384	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1385	+// supportCB.setToolTipText("Enable rigging");
	1386	+// supportCB.addItemListener(this);
	1387	+
	1388	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1389	+ freezeCB.setToolTipText("Fast moving camera");
	1390	+ freezeCB.addItemListener(this);
656	1391
657	1392	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
658	1393	// localCB.addItemListener(this);
659	1394
	1395	+ panel.Return();
	1396	+
660	1397	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
661	1398	crowdCB.setToolTipText("Used for crowds");
662	1399	crowdCB.addItemListener(this);
..	..	@@ -665,14 +1402,19 @@
665	1402	smoothCB.setToolTipText("Snapping delay");
666	1403	smoothCB.addItemListener(this);
667	1404
668		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
669		- slowCB.setToolTipText("Smooth interpolation");
670		- slowCB.addItemListener(this);
	1405	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1406	+// slowCB.setToolTipText("Smooth interpolation");
	1407	+// slowCB.addItemListener(this);
	1408	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1409	+ minshaderCB.setToolTipText("Minimal fast shader");
	1410	+ minshaderCB.addItemListener(this);
671	1411
672	1412	// constraints.gridy += 1;
673	1413	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
674	1414	// speakerMocapCB.addItemListener(this);
675	1415
	1416	+ panel.Return();
	1417	+
676	1418	if (false)
677	1419	{
678	1420	// handled in scripts
..	..	@@ -687,67 +1429,126 @@
687	1429	//constraints.gridy += 1;
688	1430	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
689	1431	smoothfocusCB.addItemListener(this);
	1432	+ panel.Return();
690	1433	}
691	1434
692	1435	//constraints.gridx += 1;
693	1436	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
694	1437	// debugCB.addItemListener(this);
695	1438
	1439	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1440	+ trackCB.setToolTipText("Enable tracking target");
	1441	+ trackCB.addItemListener(this);
	1442	+
696	1443	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1444	+ oeilCB.setToolTipText("Move camera when tracking");
697	1445	oeilCB.addItemListener(this);
698	1446
	1447	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1448	+ shadowCB.setToolTipText("When live compute shadows");
	1449	+ shadowCB.addItemListener(this);
	1450	+
	1451	+ panel.Return();
	1452	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1453	+ toggleTextureCB.setToolTipText("Load textures");
	1454	+ toggleTextureCB.addItemListener(this);
	1455	+
	1456	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1457	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1458	+ toggleSwitchCB.addItemListener(this);
	1459	+
	1460	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1461	+ autokeepCB.setToolTipText("On structure change");
	1462	+ autokeepCB.addItemListener(this);
	1463	+
	1464	+ panel.Return();
	1465	+ if (Globals.ADVANCED)
	1466	+ {
699	1467	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
700	1468	lookAtCB.setToolTipText("Look-at target");
701	1469	lookAtCB.addItemListener(this);
	1470	+ }
702	1471
703	1472	}
704	1473
705	1474	cGridBag fill = new cGridBag();
706		-
707	1475	fill.preferredHeight = 200;
	1476	+ cGridBag fill2 = new cGridBag();
	1477	+ fill2.preferredHeight = 200;
	1478	+ cGridBag fill3 = new cGridBag();
	1479	+ fill3.preferredHeight = 200;
708	1480
709	1481	panel.add(fill);
	1482	+ panel.add(fill2);
	1483	+ panel.add(fill3);
710	1484
711	1485	}
712	1486
713	1487	void EditObject(Object3D obj)
714	1488	{
	1489	+ assert(obj instanceof Composite);
	1490	+
	1491	+// if (obj.versionlist == null)
	1492	+// {
	1493	+// obj.versionlist = new Object3D[100];
	1494	+// obj.versionindex = -1;
	1495	+// }
	1496	+
715	1497	cRadio radioButton = new cRadio(obj.name);
	1498	+
	1499	+ // June 2019. Patch to avoid bug with transparency.
	1500	+ radioButton.hadMaterial = obj.material != null;
	1501	+ if (!radioButton.hadMaterial)
	1502	+ {
	1503	+ obj.material = new cMaterial();
	1504	+ }
	1505	+
716	1506	radioButton.SetObject(obj);
717		- radioButton.layout = sevenButton;
	1507	+ radioButton.layout = threeButton; // sixButton;
718	1508	radioButton.SetCamera(cameraView.renderCamera, false);
719	1509	radioButton.addActionListener(this);
720	1510	radioPanel.add(radioButton);
721	1511	buttonGroup.add(radioButton);
722	1512	radioButton.doClick();
723	1513	}
	1514	+
724	1515	void SetupViews(ObjEditor oe)
725	1516	{
	1517	+ theFrame = this;
	1518	+
726	1519	oe.SetupViews();
727	1520
	1521	+ if (Globals.DEBUG)
728	1522	System.out.println("SetupViews");
729	1523	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
730	1524	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
731	1525	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
732	1526	}
733	1527
734		- JCheckBox liveCB;
735		- JCheckBox supportCB;
736		- JCheckBox localCB;
737		- JCheckBox crowdCB;
738		- JCheckBox smoothCB;
739		- JCheckBox fastCB;
740		- JCheckBox slowCB;
741		- JCheckBox boxCB;
742		- JCheckBox zoomBoxCB;
743		- JCheckBox trackCB;
744		- JCheckBox smoothfocusCB;
	1528	+ cToggleButton liveCB;
	1529	+ cCheckBox supportCB;
	1530	+ cCheckBox localCB;
	1531	+ cCheckBox crowdCB;
	1532	+ cCheckBox smoothCB;
	1533	+ cCheckBox minshaderCB;
	1534	+
	1535	+ cToggleButton fastCB;
	1536	+ cCheckBox slowCB;
	1537	+ cCheckBox boxCB;
	1538	+ cCheckBox zoomBoxCB;
	1539	+ cCheckBox freezeCB;
	1540	+ //cToggleButton trackCB;
	1541	+ cCheckBox trackCB;
	1542	+ cCheckBox smoothfocusCB;
745	1543	// JCheckBox speakerMocapCB;
746		- JCheckBox speakerCameraCB;
747		- JCheckBox speakerFocusCB;
748		- JCheckBox debugCB;
749		- JCheckBox oeilCB;
750		- JCheckBox lookAtCB;
	1544	+ cCheckBox speakerCameraCB;
	1545	+ cCheckBox speakerFocusCB;
	1546	+ cCheckBox debugCB;
	1547	+
	1548	+ cCheckBox oeilCB;
	1549	+ cCheckBox shadowCB;
	1550	+ cCheckBox autokeepCB;
	1551	+ cCheckBox lookAtCB;
751	1552
752	1553	// static int COLOR = 1;
753	1554	// static int MATERIAL = 2;
..	..	@@ -755,9 +1556,9 @@
755	1556
756	1557	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
757	1558
758		- JCheckBox colorCB;
759		- JCheckBox materialCB;
760		- JCheckBox textureCB;
	1559	+ cCheckBox colorCB;
	1560	+ cCheckBox materialCB;
	1561	+ cCheckBox textureCB;
761	1562
762	1563	public void itemStateChanged(ItemEvent e)
763	1564	{
..	..	@@ -785,6 +1586,7 @@
785	1586	} else if(e.getSource() == liveCB)
786	1587	{
787	1588	cameraView.ToggleLive();
	1589	+ refreshContents(false);
788	1590	}
789	1591	else if(e.getSource() == supportCB)
790	1592	{
..	..	@@ -800,6 +1602,12 @@
800	1602	{
801	1603	cameraView.ToggleInertia();
802	1604	cameraView.repaint();
	1605	+ }
	1606	+ else if(e.getSource() == minshaderCB)
	1607	+ {
	1608	+ Globals.MINSHADER ^= true;
	1609	+ cameraView.programInitialized = false;
	1610	+ cameraView.repaint();
803	1611	}
804	1612	else if(e.getSource() == localCB)
805	1613	{
..	..	@@ -849,6 +1657,18 @@
849	1657	{
850	1658	cameraView.ToggleOeil();
851	1659	}
	1660	+ else if(e.getSource() == shadowCB)
	1661	+ {
	1662	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1663	+ }
	1664	+ else if(e.getSource() == freezeCB)
	1665	+ {
	1666	+ Globals.FREEZEONMOVE ^= true;
	1667	+ }
	1668	+ else if(e.getSource() == autokeepCB)
	1669	+ {
	1670	+ Globals.REPLACEONMAKE ^= true;
	1671	+ }
852	1672	else if(e.getSource() == lookAtCB)
853	1673	{
854	1674	cameraView.ToggleLookAt();
..	..	@@ -865,7 +1685,8 @@
865	1685
866	1686	/**/
867	1687	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
868		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1688	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1689	+ TreePath path = objEditor.jTree.getSelectionPath();
869	1690	if ((path == null) \|\| (path.getPathCount() <= 1)) {
870	1691	// We can't move the root node or an empty selection
871	1692	return;
..	..	@@ -928,8 +1749,6 @@
928	1749	}
929	1750	}
930	1751
931		- String string = (String) object;
932		-
933	1752	System.out.println("Transfer = " + object + "; drop : " + target);
934	1753	// if( object instanceof java.io.File[])
935	1754	// {
..	..	@@ -937,7 +1756,11 @@
937	1756	// objEditor.DropFile((java.io.File[]) object, true);
938	1757	// return;
939	1758	// }
940		- if (string.charAt(0) == '/')
	1759	+
	1760	+ String string = object.toString();
	1761	+
	1762	+ // File path for Mac and Windows
	1763	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
941	1764	{
942	1765	// file(s)
943	1766	String[] names = string.split("\n");
..	..	@@ -964,7 +1787,7 @@
964	1787
965	1788	flashIt = false;
966	1789	CameraPane pane = (CameraPane) target;
967		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1790	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
968	1791	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
969	1792
970	1793	if (group.selection.size() == 1)
..	..	@@ -980,23 +1803,33 @@
980	1803
981	1804	assert target == objEditor.jTree;
982	1805	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1806	+ Object3D destinationLeaf;
983	1807	try {
984		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1808	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
985	1809	} catch (Exception e) {
986	1810	System.out.println("destinationPath : " + destinationPath);
987	1811	return;
988	1812	}
989	1813
990		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1814	+ for (int i=group.selection.size(); --i>=0;)
991	1815	{
	1816	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1817	+
	1818	+ // Cannot move into itself
	1819	+ if (child == destinationLeaf)
	1820	+ return;
	1821	+ }
	1822	+
	1823	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1824	+// {
992	1825	loadClipboard(true);
993	1826	objEditor.jTree.setSelectionPath(destinationPath);
994	1827	pasteInto(false, false);
995		- } else {
996		- loadClipboard(false);
997		- objEditor.jTree.setSelectionPath(destinationPath);
998		- pasteInto(false, false); // true); // ???
999		- }
	1828	+// } else {
	1829	+// loadClipboard(false);
	1830	+// objEditor.jTree.setSelectionPath(destinationPath);
	1831	+// pasteInto(false, false); // true); // ???
	1832	+// }
1000	1833	}
1001	1834	public void dropActionChanged(DropTargetDragEvent dtde)
1002	1835	// Called if the user has modified the current drop gesture
..	..	@@ -1052,7 +1885,12 @@
1052	1885	TreePath path;
1053	1886
1054	1887	public TransferableTreePath(TreePath tp) {
1055		- path = tp;
	1888	+ Object[] objs = new Object[tp.getPathCount()];
	1889	+ for (int i=0; i<objs.length; i++)
	1890	+ {
	1891	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1892	+ }
	1893	+ path = new TreePath(objs);
1056	1894	}
1057	1895
1058	1896	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1101,22 +1939,30 @@
1101	1939	{
1102	1940	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1103	1941	//heightFieldItem.addActionListener(this);
1104		- gridItem = menu.add(new MenuItem("Grid"));
1105		- gridItem.addActionListener(this);
1106		- rectoidItem = menu.add(new MenuItem("Box"));
1107		- rectoidItem.addActionListener(this);
1108		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1109		- ellipsoidItem.addActionListener(this);
1110		- coneItem = menu.add(new MenuItem("Cone"));
1111		- coneItem.addActionListener(this);
1112		- torusItem = menu.add(new MenuItem("Torus"));
1113		- torusItem.addActionListener(this);
1114		- superItem = menu.add(new MenuItem("Superellipsoid"));
1115		- superItem.addActionListener(this);
	1942	+// gridItem = menu.add(new MenuItem("Grid"));
	1943	+// gridItem.addActionListener(this);
	1944	+// rectoidItem = menu.add(new MenuItem("Box"));
	1945	+// rectoidItem.addActionListener(this);
	1946	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1947	+// ellipsoidItem.addActionListener(this);
	1948	+// coneItem = menu.add(new MenuItem("Cone"));
	1949	+// coneItem.addActionListener(this);
	1950	+// torusItem = menu.add(new MenuItem("Torus"));
	1951	+// torusItem.addActionListener(this);
	1952	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1953	+// superItem.addActionListener(this);
	1954	+
	1955	+ cameraItem = menu.add(new MenuItem("Camera"));
	1956	+ cameraItem.addActionListener(this);
	1957	+
	1958	+ if (!Globals.ADVANCED)
	1959	+ {
1116	1960	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1117	1961	kleinItem.addActionListener(this);
1118		- particleItem = menu.add(new MenuItem("Particle system"));
1119		- particleItem.addActionListener(this);
	1962	+ }
	1963	+
	1964	+// particleItem = menu.add(new MenuItem("Particle system"));
	1965	+// particleItem.addActionListener(this);
1120	1966	if (Globals.ADVANCED)
1121	1967	{
1122	1968	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1142,15 +1988,15 @@
1142	1988	}
1143	1989	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1144	1990	bezierItem.addActionListener(this);
1145		- overlayItem = menu.add(new MenuItem("Overlay"));
1146		- overlayItem.addActionListener(this);
1147		- lightItem = menu.add(new MenuItem("Light"));
1148		- lightItem.addActionListener(this);
	1991	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1992	+// overlayItem.addActionListener(this);
	1993	+// lightItem = menu.add(new MenuItem("Light"));
	1994	+// lightItem.addActionListener(this);
1149	1995	menu.add("-");
1150	1996	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1151	1997	//superLoopItem.addActionListener(this);
1152		- loopItem = menu.add(new MenuItem("Loop"));
1153		- loopItem.addActionListener(this);
	1998	+// loopItem = menu.add(new MenuItem("Loop"));
	1999	+// loopItem.addActionListener(this);
1154	2000	doubleItem = menu.add(new MenuItem("Fork"));
1155	2001	doubleItem.addActionListener(this);
1156	2002	if (Globals.ADVANCED)
..	..	@@ -1166,6 +2012,9 @@
1166	2012	animationItem.addItemListener(this);
1167	2013	animationItem.setState(Globals.ANIMATION);
1168	2014
	2015	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	2016	+ archiveItem.addActionListener(this);
	2017	+
1169	2018	menu.add("-");
1170	2019	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1171	2020	parseverticesItem.addActionListener(this);
..	..	@@ -1178,6 +2027,8 @@
1178	2027	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1179	2028	reduce34MorphItem.addActionListener(this);
1180	2029	menu.add("-");
	2030	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	2031	+ memoryItem.addActionListener(this);
1181	2032	menu.add(computeAOItem = new MenuItem("Compute AO"));
1182	2033	computeAOItem.addActionListener(this);
1183	2034
..	..	@@ -1186,11 +2037,9 @@
1186	2037	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1187	2038	mirrorItem.addActionListener(this);
1188	2039	menu.add("-");
1189		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1190		- memoryItem.addActionListener(this);
1191	2040	menu.add(analyzeItem = new MenuItem("Analyze"));
1192	2041	analyzeItem.addActionListener(this);
1193		- menu.add(dumpItem = new MenuItem("Dump"));
	2042	+ menu.add(dumpItem = new MenuItem("Print"));
1194	2043	dumpItem.addActionListener(this);
1195	2044	// menu.add(pathItem = new MenuItem("From-to path"));
1196	2045	// pathItem.addActionListener(this);
..	..	@@ -1331,9 +2180,38 @@
1331	2180	shadow.material = new cMaterial(obj.material);
1332	2181	shadow.material.diffuse = 0.0001f;
1333	2182	shadow.material.specular = 0.0001f;
	2183	+ shadow.material.opacity = 0.75f;
	2184	+
	2185	+ AllocProjectedVertices(shadow);
	2186	+
	2187	+ shadow.projectedVertices[1].x = 300;
1334	2188
1335	2189	makeSomething(shadow);
1336	2190	}
	2191	+
	2192	+ private void ClearUnpinned()
	2193	+ {
	2194	+ //for (Object3D obj : listUI)
	2195	+ for (int i=listUI.size(); --i>=0;)
	2196	+ {
	2197	+ Object3D obj = listUI.elementAt(i);
	2198	+ if (!obj.pinned)
	2199	+ {
	2200	+ obj.CloseUI();
	2201	+ listUI.remove(i);
	2202	+ }
	2203	+ }
	2204	+ }
	2205	+
	2206	+ private void EditElement(Object3D elem, boolean newWindow)
	2207	+ {
	2208	+ // if (!(elem instanceof Composite))
	2209	+ // newWindow = false;
	2210	+ listUI.add(elem);
	2211	+ elem.openEditWindow(this, newWindow); //, false);
	2212	+ System.out.println("edit : " + elem);
	2213	+ elem.editWindow.refreshContents(true); // ? new
	2214	+ }
1337	2215
1338	2216	/**
1339	2217	* applyExample
..	..	@@ -1537,9 +2415,9 @@
1537	2415
1538	2416	void Overwrite(int mask)
1539	2417	{
1540		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2418	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1541	2419	{
1542		- Object3D content = GrafreeD.clipboard.get(0);
	2420	+ Object3D content = Grafreed.clipboard.get(0);
1543	2421
1544	2422	if (content instanceof cGroup && ((cGroup)content).transientlink )
1545	2423	content = ((cGroup)content).get(0);
..	..	@@ -1578,7 +2456,7 @@
1578	2456	{
1579	2457	ScreenFit();
1580	2458	} else
1581		- if (source == switchItem)
	2459	+ if (source == switchViewItem)
1582	2460	{
1583	2461	cVector v1 = new cVector();
1584	2462	cVector v2 = new cVector();
..	..	@@ -1587,11 +2465,11 @@
1587	2465	objEditor.cameraView.renderCamera.setAim(v2, v1);
1588	2466	objEditor.cameraView.repaint();
1589	2467	} else
1590		- if (source == rectoidItem)
	2468	+ if (source == rectoidItem \|\| source == boxButton)
1591	2469	{
1592	2470	makeSomething(new Box());
1593	2471	} else
1594		- if (source == particleItem)
	2472	+ if (source == particleItem \|\| source == particlesButton)
1595	2473	{
1596	2474	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1597	2475	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1670,27 +2548,27 @@
1670	2548
1671	2549	makeSomething(obj);
1672	2550	} else
1673		- if (source == gridItem)
	2551	+ if (source == gridItem \|\| source == gridButton)
1674	2552	{
1675	2553	makeSomething(new Grid());
1676	2554	} else
1677		- if (source == ellipsoidItem)
	2555	+ if (source == ellipsoidItem \|\| source == sphereButton)
1678	2556	{
1679	2557	makeSomething(new Sphere());
1680	2558	} else
1681		- if (source == coneItem)
	2559	+ if (source == coneItem \|\| source == coneButton)
1682	2560	{
1683	2561	makeSomething(new Cone());
1684	2562	} else
1685		- if (source == torusItem)
	2563	+ if (source == torusItem \|\| source == torusButton)
1686	2564	{
1687	2565	makeSomething(new Torus());
1688	2566	} else
1689		- if (source == superItem)
	2567	+ if (source == superItem \|\| source == superButton)
1690	2568	{
1691	2569	makeSomething(new Superellipsoid());
1692	2570	} else
1693		- if (source == kleinItem)
	2571	+ if (source == kleinItem \|\| source == kleinButton)
1694	2572	{
1695	2573	makeSomething(new Klein());
1696	2574	} else
..	..	@@ -1710,7 +2588,7 @@
1710	2588	{
1711	2589	makeSomething(new BezierSurface());
1712	2590	} else
1713		- if (source == overlayItem)
	2591	+ if (source == overlayItem \|\| source == overlayButton)
1714	2592	{
1715	2593	/*
1716	2594	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1758,10 +2636,27 @@
1758	2636	s.setup();
1759	2637	makeSomething(s);
1760	2638	} else
1761		- if (source == lightItem)
	2639	+ if (source == lightItem \|\| source == lightButton)
1762	2640	{
1763	2641	makeSomething(new Light());
1764	2642	} else
	2643	+// if (source == skybox1Button \|\|
	2644	+// source == skybox2Button \|\|
	2645	+// source == skybox3Button \|\|
	2646	+// source == skybox4Button \|\|
	2647	+// source == skybox5Button \|\|
	2648	+// source == skybox6Button \|\|
	2649	+// source == skybox7Button \|\|
	2650	+// source == skybox11Button \|\|
	2651	+// source == skybox12Button \|\|
	2652	+// source == skybox13Button \|\|
	2653	+// source == skybox14Button \|\|
	2654	+// source == skybox15Button \|\|
	2655	+// source == skybox16Button \|\|
	2656	+// source == skybox17Button)
	2657	+// {
	2658	+// ChangeSkybox(source);
	2659	+// } else
1765	2660	if (source == csgItem)
1766	2661	{
1767	2662	group(new CSG());
..	..	@@ -1808,30 +2703,38 @@
1808	2703
1809	2704	group(g);
1810	2705	} else
1811		- if (source == loopItem)
	2706	+ if (source == loopItem \|\| source == loopButton)
1812	2707	{
	2708	+ if (!group.selection.isEmpty())
	2709	+ {
1813	2710	Composite csg = new GroupLeaf();
1814	2711	csg.count = 5;
1815		- group(csg);
1816		- Composite child = new cGroup();
	2712	+ Composite child = new cGroup("Branch");
1817	2713	csg.addChild(child);
1818	2714	child.addChild(csg);
	2715	+ group(csg);
	2716	+ }
1819	2717	} else
1820	2718	if (source == doubleItem)
1821	2719	{
1822		- Composite csg = new GroupLeaf();
	2720	+ if (!group.selection.isEmpty())
	2721	+ {
	2722	+ Composite csg = new GroupLeaf("Fork");
1823	2723	csg.count = 5;
	2724	+ Composite child = new cGroup("Branch A");
	2725	+ csg.addChild(child);
	2726	+ child.addChild(csg);
	2727	+ child = new cGroup("Branch B");
	2728	+ csg.addChild(child);
	2729	+ child.addChild(csg);
1824	2730	group(csg);
1825		- Composite child = new cGroup();
1826		- csg.addChild(child);
1827		- child.addChild(csg);
1828		- child = new cGroup();
1829		- csg.addChild(child);
1830		- child.addChild(csg);
	2731	+ }
1831	2732	} else
1832	2733	if (source == tripleItem)
1833	2734	{
1834		- Composite csg = new GroupLeaf();
	2735	+ if (!group.selection.isEmpty())
	2736	+ {
	2737	+ Composite csg = new GroupLeaf("Trident");
1835	2738	csg.count = 4;
1836	2739	group(csg);
1837	2740	Composite child = new cGroup();
..	..	@@ -1843,28 +2746,12 @@
1843	2746	child = new cGroup();
1844	2747	csg.addChild(child);
1845	2748	child.addChild(csg);
1846		- } else
1847		-
1848		- if (source == importGFDItem)
1849		- {
1850		- ImportGFD();
1851		- } else
1852		- if (source == importVRMLX3DItem)
1853		- {
1854		- ImportVRMLX3D();
1855		- } else
1856		- if (source == import3DSItem)
1857		- {
1858		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1859		- } else
1860		- if (source == importOBJItem)
1861		- {
1862		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	2749	+ }
1863	2750	} else
1864	2751	if (source == computeAOItem)
1865	2752	{
1866	2753	Globals.drawMode = CameraPane.OCCLUSION;
1867		- Globals.theRenderer.repaint();
	2754	+ cameraView.repaint();
1868	2755	} else
1869	2756	if (source == recompileItem)
1870	2757	{
..	..	@@ -1879,7 +2766,7 @@
1879	2766	if (source == invariantsItem)
1880	2767	{
1881	2768	System.out.println("Invariants:");
1882		- GrafreeD.grafreeD.universe.invariants();
	2769	+ Grafreed.grafreed.universe.invariants();
1883	2770	} else
1884	2771	if (source == memoryItem)
1885	2772	{
..	..	@@ -1898,6 +2785,65 @@
1898	2785	{
1899	2786	DumpObject();
1900	2787	} else
	2788	+ if (source == minButton)
	2789	+ {
	2790	+ Minimize();
	2791	+ } else
	2792	+ if (source == maxButton)
	2793	+ {
	2794	+ Maximize();
	2795	+ } else
	2796	+ if (source == fullButton)
	2797	+ {
	2798	+ ToggleFullScreen();
	2799	+ } else
	2800	+ if (source == collapseButton)
	2801	+ {
	2802	+ this.expandedLayout = radio.layout;
	2803	+ CollapseToolbar();
	2804	+ } else
	2805	+ if (source == maximize3DButton)
	2806	+ {
	2807	+ this.expandedLayout = radio.layout;
	2808	+ radio.layout = twoButton;
	2809	+ Show3DView();
	2810	+ CollapseToolbar();
	2811	+ } else
	2812	+ if (source == previousVersionButton)
	2813	+ {
	2814	+ // Go to previous version
	2815	+ //if (!Undo())
	2816	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2817	+ PreviousVersion();
	2818	+ } else
	2819	+ if (source == restoreButton)
	2820	+ {
	2821	+ // Restore current version
	2822	+ Restore();
	2823	+ //restoreButton.setEnabled(false);
	2824	+ } else
	2825	+ if (source == replaceButton)
	2826	+ {
	2827	+ // Overwrite current version
	2828	+ Replace();
	2829	+ //replaceButton.setEnabled(false);
	2830	+ } else
	2831	+ if (source == nextVersionButton)
	2832	+ {
	2833	+ // Go to next version
	2834	+ NextVersion();
	2835	+ } else
	2836	+ if (source == saveVersionButton)
	2837	+ {
	2838	+ // Save a new version
	2839	+ if (!Save(true))
	2840	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2841	+ } else
	2842	+ if (source == deleteVersionButton)
	2843	+ {
	2844	+ // Delete a new version
	2845	+ DeleteVersion();
	2846	+ } else
1901	2847	if (source == oneStepButton)
1902	2848	{
1903	2849	Globals.ONESTEP = true;
..	..	@@ -1905,17 +2851,14 @@
1905	2851	} else
1906	2852	if (source == screenfitButton)
1907	2853	{
1908		- //Reload(lastConverter, lastFilename, true);
1909	2854	ScreenFit();
1910	2855	} else
1911	2856	if (source == screenfitpointButton)
1912	2857	{
1913		- //Reload(lastConverter, lastFilename, true);
1914	2858	ScreenFitPoint();
1915	2859	} else
1916	2860	if (source == snapobjectButton)
1917	2861	{
1918		- //Reload(lastConverter, lastFilename, true);
1919	2862	SnapObject();
1920	2863	} else
1921	2864	// if (event.getSource() == recompileButton)
..	..	@@ -1952,12 +2895,20 @@
1952	2895	{
1953	2896	loadClipboard(true);
1954	2897	} else
	2898	+ if (source == undoItem)
	2899	+ {
	2900	+ PreviousVersion();
	2901	+ } else
	2902	+ if (source == redoItem)
	2903	+ {
	2904	+ NextVersion();
	2905	+ } else
1955	2906	if (source == duplicateItem)
1956	2907	{
1957		- Object3D keep = GrafreeD.clipboard;
	2908	+ Object3D keep = Grafreed.clipboard;
1958	2909	loadClipboard(false);
1959	2910	paste(false);
1960		- GrafreeD.clipboard = keep;
	2911	+ Grafreed.clipboard = keep;
1961	2912	} else
1962	2913	if (source == cloneItem)
1963	2914	{
..	..	@@ -2177,9 +3128,9 @@
2177	3128	// group.selection.get(0).setMasterThis(content); // should be identity
2178	3129	// refreshContents();
2179	3130	// }
2180		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	3131	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2181	3132	{
2182		- Object3D content = GrafreeD.clipboard.get(0);
	3133	+ Object3D content = Grafreed.clipboard.get(0);
2183	3134
2184	3135	if (content instanceof cGroup && ((cGroup)content).transientlink )
2185	3136	content = ((cGroup)content).get(0);
..	..	@@ -2229,9 +3180,9 @@
2229	3180	} else
2230	3181	if (source == setMasterItem)
2231	3182	{
2232		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	3183	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2233	3184	{
2234		- Object3D content = GrafreeD.clipboard.get(0);
	3185	+ Object3D content = Grafreed.clipboard.get(0);
2235	3186
2236	3187	if (content instanceof cGroup && ((cGroup)content).transientlink )
2237	3188	content = ((cGroup)content).get(0);
..	..	@@ -2244,9 +3195,9 @@
2244	3195	{
2245	3196	if (group.selection.size() == 1)
2246	3197	{
2247		- if (GrafreeD.clipboard.size() == 1)
	3198	+ if (Grafreed.clipboard.size() == 1)
2248	3199	{
2249		- Object3D content = GrafreeD.clipboard.get(0);
	3200	+ Object3D content = Grafreed.clipboard.get(0);
2250	3201
2251	3202	if (content instanceof cGroup && ((cGroup)content).transientlink )
2252	3203	content = ((cGroup)content).get(0);
..	..	@@ -2263,7 +3214,7 @@
2263	3214	{
2264	3215	RevertMeshes();
2265	3216	} else
2266		- if (source == resetMeshItem)
	3217	+ if (source == resetAllItem)
2267	3218	{
2268	3219	ResetAll();
2269	3220	} else
..	..	@@ -2271,7 +3222,7 @@
2271	3222	{
2272	3223	StepAll();
2273	3224	} else
2274		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3225	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2275	3226	{
2276	3227	//int indices[] = jList.getSelectedIndices();
2277	3228	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2283,9 +3234,9 @@
2283	3234	{
2284	3235	ClearSelection(true);
2285	3236	} else
2286		- if (source == grabItem)
	3237	+ if (source == grabItem \|\| source == groupButton)
2287	3238	{
2288		- group(new cGroup(), true);
	3239	+ group(new cGroup(), false); // true);
2289	3240	} else
2290	3241	if (source == hideItem)
2291	3242	{
..	..	@@ -2303,11 +3254,11 @@
2303	3254	{
2304	3255	makeSomething(new Camera());
2305	3256	} else
2306		- if (source == compositeItem)
	3257	+ if (source == compositeItem \|\| source == compositeButton)
2307	3258	{
2308	3259	group(new Composite());
2309	3260	} else
2310		- if (source == randomItem)
	3261	+ if (source == switchItem \|\| source == switchButton)
2311	3262	{
2312	3263	RandomNode random = new RandomNode();
2313	3264	group(random);
..	..	@@ -2409,7 +3360,7 @@
2409	3360	{
2410	3361	group(new cLinker());
2411	3362	} else
2412		- if (source == textureItem)
	3363	+ if (source == textureItem \|\| source == textureButton)
2413	3364	{
2414	3365	group(new TextureNode());
2415	3366	} else
..	..	@@ -2429,17 +3380,42 @@
2429	3380	{
2430	3381	CastShadow(2);
2431	3382	} else
2432		- if (source == ungroupItem)
	3383	+ if (source == ungroupItem \|\| source == ungroupButton)
2433	3384	{
2434		- //ungroup();
	3385	+ boolean canUngroup = true;
	3386	+
2435	3387	for (int i=0; i<group.selection.size(); i++)
2436	3388	{
2437		- Ungroup(group.selection.get(i));
	3389	+ Object3D selectedItem = group.selection.get(i);
	3390	+
	3391	+ if (selectedItem.Size() == 0)
	3392	+ {
	3393	+ // Cannot ungroup leaves
	3394	+ canUngroup = false;
	3395	+ break;
	3396	+ }
	3397	+
	3398	+ if (selectedItem == group)
	3399	+ {
	3400	+ // Cannot ungroup root
	3401	+ canUngroup = false;
	3402	+ break;
	3403	+ }
2438	3404	}
2439	3405
2440		- ClearSelection(false);
2441		-
2442		- refreshContents();
	3406	+ if (canUngroup)
	3407	+ {
	3408	+ for (int i=0; i<group.selection.size(); i++)
	3409	+ {
	3410	+ Object3D selectedItem = group.selection.get(i);
	3411	+
	3412	+ Ungroup(selectedItem);
	3413	+ }
	3414	+
	3415	+ ClearSelection(false);
	3416	+
	3417	+ refreshContents();
	3418	+ }
2443	3419	} else
2444	3420	if (source == genUVItem)
2445	3421	{
..	..	@@ -2451,7 +3427,7 @@
2451	3427	} else
2452	3428	if (source == genNormalsMESHItem)
2453	3429	{
2454		- GenNormals(true); // TODO
	3430	+ GenNormalsMESH();
2455	3431	} else
2456	3432	if (source == genNormalsORGANItem)
2457	3433	{
..	..	@@ -2516,6 +3492,22 @@
2516	3492	if (source == unmarkleavesItem)
2517	3493	{
2518	3494	MarkLeaves(false);
	3495	+ } else
	3496	+ if (source == rewindleavesItem)
	3497	+ {
	3498	+ RewindLeaves(true);
	3499	+ } else
	3500	+ if (source == unrewindleavesItem)
	3501	+ {
	3502	+ RewindLeaves(false);
	3503	+ } else
	3504	+ if (source == randomleavesItem)
	3505	+ {
	3506	+ RandomLeaves(true);
	3507	+ } else
	3508	+ if (source == unrandomleavesItem)
	3509	+ {
	3510	+ RandomLeaves(false);
2519	3511	} else
2520	3512	if (source == flipVItem)
2521	3513	{
..	..	@@ -2601,9 +3593,13 @@
2601	3593	{
2602	3594	SmoothMesh();
2603	3595	} else
2604		- if (source == transformgeometryItem)
	3596	+ if (source == transformGeometryItem)
2605	3597	{
2606	3598	TransformGeometry();
	3599	+ } else
	3600	+ if (source == transformChildrenItem)
	3601	+ {
	3602	+ TransformChildren();
2607	3603	} else
2608	3604	if (source == resetTransformItem)
2609	3605	{
..	..	@@ -2611,7 +3607,11 @@
2611	3607	} else
2612	3608	if (source == resetCentroidItem)
2613	3609	{
2614		- ResetCentroid();
	3610	+ ResetCentroid(true);
	3611	+ } else
	3612	+ if (source == resetCentroidXZItem)
	3613	+ {
	3614	+ ResetCentroid(false);
2615	3615	} else
2616	3616	if (source == resetParentItem)
2617	3617	{
..	..	@@ -2716,7 +3716,7 @@
2716	3716	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2717	3717	{
2718	3718	obj = (Object3D)e.nextElement();
2719		- obj.SetBumpTexture(null);
	3719	+ obj.ResetBumpTexture();
2720	3720	}
2721	3721
2722	3722	refreshContents();
..	..	@@ -2732,6 +3732,31 @@
2732	3732
2733	3733	refreshContents();
2734	3734	} else
	3735	+ if (source == embedTexturesItem)
	3736	+ {
	3737	+ Object3D obj;
	3738	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3739	+ {
	3740	+ obj = (Object3D)e.nextElement();
	3741	+ obj.EmbedTextures(true);
	3742	+ }
	3743	+
	3744	+ refreshContents();
	3745	+ } else
	3746	+ if (source == deEmbedTexturesItem)
	3747	+ {
	3748	+ Object3D obj;
	3749	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3750	+ {
	3751	+ obj = (Object3D)e.nextElement();
	3752	+ obj.EmbedTextures(false);
	3753	+ }
	3754	+
	3755	+ CameraPane.texturepigment.clear();
	3756	+ CameraPane.texturebump.clear();
	3757	+
	3758	+ refreshContents();
	3759	+ } else
2735	3760	if (source == flashSelectionButton)
2736	3761	{
2737	3762	CameraPane.flash = true;
..	..	@@ -2743,42 +3768,36 @@
2743	3768	if (source == twoButton)
2744	3769	{
2745	3770	radio.layout = twoButton;
2746		- // bug
2747		- //gridPanel.setDividerLocation(1.0);
2748		- //bigPanel.setDividerLocation(0.0);
2749		-// bigThree.remove(scenePanel);
2750		-// bigThree.remove(centralPanel);
2751		-// bigThree.remove(XYZPanel);
2752		-// aWindowConstraints.gridx = 0;
2753		-// aWindowConstraints.gridy = 0;
2754		-// aWindowConstraints.gridwidth = 1;
2755		-// // aConstraints.gridheight = 3;
2756		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2757		-// aWindowConstraints.weightx = 0;
2758		-// aWindowConstraints.weighty = 1;
2759		-// //bigThree.add(jtp, aWindowConstraints);
2760		-// aWindowConstraints.weightx = 1;
2761		-// aWindowConstraints.gridwidth = 3;
2762		-// // aConstraints.gridheight = 3;
2763		-// aWindowConstraints.gridx = 1;
2764		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
2765		-// bigThree.add(centralPanel, aWindowConstraints);
2766		-// aWindowConstraints.weightx = 0;
2767		-// aWindowConstraints.gridx = 4;
2768		-// aWindowConstraints.gridwidth = 1;
2769		-// // aConstraints.gridheight = 3;
2770		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2771		-// //bigThree.add(XYZPanel, aWindowConstraints);
2772		-// scenePanel.setVisible(false);
2773		-// centralPanel.setVisible(true);
2774		-// XYZPanel.setVisible(false);
2775		- bigThree.ClearUI();
2776		- bigThree.add(centralPanel);
2777		- bigThree.FlushUI();
	3771	+
	3772	+ if (CameraPane.FULLSCREEN)
	3773	+ fullscreenLayout = radio.layout;
	3774	+
	3775	+ Show3DView();
	3776	+
	3777	+ cameraView.requestFocusInWindow();
	3778	+
	3779	+// refreshContents(true);
	3780	+//
	3781	+// try
	3782	+// {
	3783	+// java.awt.Robot bot = new java.awt.Robot();
	3784	+// int mask = InputEvent.BUTTON1_MASK;
	3785	+// bot.mouseMove(100, 100);
	3786	+// bot.mousePress(mask);
	3787	+// bot.mouseRelease(mask);
	3788	+// }
	3789	+// catch (Exception e)
	3790	+// {
	3791	+//
	3792	+// }
	3793	+
2778	3794	} else
2779	3795	if (source == threeButton)
2780	3796	{
2781	3797	radio.layout = threeButton;
	3798	+
	3799	+ if (CameraPane.FULLSCREEN)
	3800	+ fullscreenLayout = radio.layout;
2782	3801
2783	3802	// bigThree.remove(scenePanel);
2784	3803	// bigThree.remove(centralPanel);
..	..	@@ -2808,13 +3827,18 @@
2808	3827	// centralPanel.setVisible(true);
2809	3828	// XYZPanel.setVisible(true);
2810	3829	bigThree.ClearUI();
	3830	+ bigThree.add(scenePanel);
2811	3831	bigThree.add(centralPanel);
2812		- bigThree.add(XYZPanel);
2813	3832	bigThree.FlushUI();
	3833	+
	3834	+ cameraView.requestFocusInWindow();
2814	3835	} else
2815	3836	if (source == fourButton)
2816	3837	{
2817	3838	radio.layout = fourButton;
	3839	+
	3840	+ if (CameraPane.FULLSCREEN)
	3841	+ fullscreenLayout = radio.layout;
2818	3842
2819	3843	// bigThree.remove(scenePanel);
2820	3844	// bigThree.remove(centralPanel);
..	..	@@ -2846,10 +3870,15 @@
2846	3870	bigThree.ClearUI();
2847	3871	bigThree.add(scenePanel);
2848	3872	bigThree.FlushUI();
	3873	+
	3874	+ cameraView.requestFocusInWindow();
2849	3875	} else
2850	3876	if (source == sixButton)
2851	3877	{
2852	3878	radio.layout = sixButton;
	3879	+
	3880	+ if (CameraPane.FULLSCREEN)
	3881	+ fullscreenLayout = radio.layout;
2853	3882
2854	3883	// bigThree.remove(scenePanel);
2855	3884	// bigThree.remove(centralPanel);
..	..	@@ -2879,13 +3908,18 @@
2879	3908	// centralPanel.setVisible(true);
2880	3909	// XYZPanel.setVisible(false);
2881	3910	bigThree.ClearUI();
2882		- bigThree.add(scenePanel);
2883	3911	bigThree.add(centralPanel);
	3912	+ bigThree.add(scenePanel);
2884	3913	bigThree.FlushUI();
	3914	+
	3915	+ cameraView.requestFocusInWindow();
2885	3916	} else
2886	3917	if (source == sevenButton)
2887	3918	{
2888	3919	radio.layout = sevenButton;
	3920	+
	3921	+ if (CameraPane.FULLSCREEN)
	3922	+ fullscreenLayout = radio.layout;
2889	3923
2890	3924	// bigThree.remove(scenePanel);
2891	3925	// bigThree.remove(centralPanel);
..	..	@@ -2919,9 +3953,12 @@
2919	3953	bigThree.add(centralPanel);
2920	3954	bigThree.add(XYZPanel);
2921	3955	bigThree.FlushUI();
	3956	+
	3957	+ cameraView.requestFocusInWindow();
2922	3958	} else
2923	3959	if (source == rootButton)
2924	3960	{
	3961	+ Replace();
2925	3962	Object3D obj;
2926	3963	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2927	3964	{
..	..	@@ -2930,31 +3967,49 @@
2930	3967	EditObject(obj);
2931	3968	}
2932	3969
	3970	+ cameraView.requestFocusInWindow();
2933	3971	refreshContents(true);
2934	3972	} else
2935	3973	if (source == closeButton)
2936	3974	{
2937	3975	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	3976	+ Replace();
	3977	+
2938	3978	cRadio ab;
2939	3979	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2940	3980	{
2941	3981	ab = (cRadio)e.nextElement();
2942		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3982	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2943	3983	{
	3984	+ // Patch to avoid bug with transparency.
	3985	+ if (!ab.hadMaterial)
	3986	+ {
	3987	+ ab.object.material = null;
	3988	+ }
	3989	+
2944	3990	buttonGroup.remove(ab);
2945	3991	radioPanel.remove(ab);
2946	3992
2947		- ab.GetObject().editWindow = null;
	3993	+ //ab.GetObject().editWindow = null;
	3994	+ ab.GetObject().manipWindow = null;
2948	3995	// ab.GetObject().objectUI = null; // ?????????
2949	3996
2950	3997	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2951	3998	break;
2952	3999	}
2953	4000	}
	4001	+
	4002	+ cameraView.requestFocusInWindow();
2954	4003	refreshContents(true);
2955	4004	} else
2956	4005	if (source == editItem \|\| source == editButton)
2957	4006	{
	4007	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4008	+ {
	4009	+ Object3D child = (Object3D)e.nextElement();
	4010	+ child.pinned = true;
	4011	+ }
	4012	+
2958	4013	EditSelection(false);
2959	4014	} else
2960	4015	if (source == uneditButton)
..	..	@@ -2963,11 +4018,12 @@
2963	4018	{
2964	4019	Object3D child = (Object3D)e.nextElement();
2965	4020	if(child.editWindow != null)
2966		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4021	+ child.pinned = false;
2967	4022	child.CloseUI();
2968	4023	listUI.remove(child);
	4024	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2969	4025
2970		- child.editWindow = null; // ???????????
	4026	+ //child.editWindow = null; // ???????????
2971	4027	}
2972	4028	objEditor.ctrlPanel.FlushUI();
2973	4029	//objEditor.jTree.clearSelection();
..	..	@@ -2980,16 +4036,18 @@
2980	4036	//copy.ClearUI();
2981	4037	for (Object3D obj : listUI)
2982	4038	{
	4039	+ obj.pinned = false;
2983	4040	obj.CloseUI();
2984	4041	}
2985	4042	listUI.clear();
	4043	+ SetPinStates(group.selection.size() > 0);
2986	4044	refreshContents(true);
2987	4045	} else
2988	4046	if (source == allParamsButton)
2989	4047	{
2990	4048	assert(copy == group);
2991	4049
2992		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4050	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2993	4051
2994	4052	for (Object3D obj : listUI)
2995	4053	{
..	..	@@ -3015,6 +4073,8 @@
3015	4073	} else
3016	4074	if(source instanceof cRadio)
3017	4075	{
	4076	+ Replace();
	4077	+
3018	4078	group.parent = keepparent;
3019	4079	group.attributes = 0;
3020	4080	//group.editWindow = null;
..	..	@@ -3038,6 +4098,7 @@
3038	4098	}
3039	4099
3040	4100	copy = group;
	4101	+
3041	4102	//Globals.theRenderer.object = group;
3042	4103	if(!useclient)
3043	4104	{
..	..	@@ -3053,20 +4114,72 @@
3053	4114	frontView.object = group;
3054	4115	sideView.object = group;
3055	4116	}
3056		- group.editWindow = this;
	4117	+
	4118	+// fix "+" issue
	4119	+ //group.editWindow = this;
	4120	+ group.manipWindow = this;
	4121	+
3057	4122	/*
3058	4123	currentLayout = radio.layout;
3059	4124	if (currentLayout == null)
3060	4125	currentLayout = sevenButton;
3061	4126	*/
3062	4127	radio.layout.doClick();
	4128	+
	4129	+ assert(copy instanceof Composite);
	4130	+
	4131	+ if (copy.versionlist == null)
	4132	+ {
	4133	+ copy.versionindex = -1;
	4134	+
	4135	+ // Cannot work with loops
	4136	+ // To fix this issue, we first mark all nodes above the root,
	4137	+ // and check if any of these nodes are reachable below the root.
	4138	+ Grafreed.grafreed.universe.TagObjects(copy, true);
	4139	+
	4140	+ if (!copy.HasTags())
	4141	+ {
	4142	+ copy.versionlist = new Object3D[100];
	4143	+
	4144	+ Save(true);
	4145	+ }
	4146	+
	4147	+ Grafreed.grafreed.universe.TagObjects(copy, false);
	4148	+ }
	4149	+
	4150	+ SetVersionStates();
	4151	+
	4152	+ ClearUnpinned();
	4153	+
	4154	+ //Grafreed.Assert(group != null);
	4155	+ //Grafreed.Assert(group.selection != null);
	4156	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4157	+ if (group.selection == null \|\| group.selection.size() == 1)
	4158	+ EditSelection(false);
3063	4159	keepparent = group.parent;
3064	4160	// PARENT = NULL or not???
3065	4161	//group.parent = null; // ROOT
3066	4162	//group.attributes = -1;
3067	4163	ResetModel();
	4164	+
	4165	+ cameraView.requestFocusInWindow();
3068	4166	refreshContents(true);
3069		- }
	4167	+ } else if (event.getSource() == editCameraItem)
	4168	+ {
	4169	+ cameraView.ProtectCamera();
	4170	+ cameraView.requestFocusInWindow();
	4171	+ cameraView.repaint();
	4172	+ return;
	4173	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	4174	+ {
	4175	+ cameraView.RevertCamera();
	4176	+ cameraView.requestFocusInWindow();
	4177	+ cameraView.repaint();
	4178	+ return;
	4179	+ // } else if (event.getSource() == textureButton)
	4180	+ // {
	4181	+ // return; // true;
	4182	+ }
3070	4183	else
3071	4184	{
3072	4185	//return super.action(event, arg);
..	..	@@ -3075,7 +4188,6 @@
3075	4188	}
3076	4189
3077	4190	boolean useclient = false;
3078		- cRadio radio;
3079	4191
3080	4192	void ToggleRoot()
3081	4193	{
..	..	@@ -3127,6 +4239,28 @@
3127	4239	refreshContents();
3128	4240	}
3129	4241
	4242	+ void TransformChildren()
	4243	+ {
	4244	+ Object3D obj;
	4245	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4246	+ {
	4247	+ obj = (Object3D)e.nextElement();
	4248	+ obj.KeepTextureMatrices();
	4249	+ obj.TransformChildren();
	4250	+ obj.RestoreTextureMatrices();
	4251	+
	4252	+// if (obj.parent == null)
	4253	+// {
	4254	+// System.out.println("NULL PARENT!");
	4255	+// new Exception().printStackTrace();
	4256	+// }
	4257	+// else
	4258	+// TouchTransform(obj);
	4259	+// //obj.parent.Touch();
	4260	+ }
	4261	+
	4262	+ refreshContents();
	4263	+ }
3130	4264
3131	4265	void ResetTransform()
3132	4266	{
..	..	@@ -3158,7 +4292,7 @@
3158	4292	TouchTransform(obj);
3159	4293	continue;
3160	4294	}
3161		- if ((mask&2) != 0) // Scale
	4295	+ if ((mask&2) != 0) // Scale/rotation
3162	4296	{
3163	4297	obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
3164	4298	obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
..	..	@@ -3166,10 +4300,6 @@
3166	4300	obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
3167	4301	obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
3168	4302	obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
3169		- }
3170		- if ((mask&4) != 0) // Rotation
3171		- {
3172		- // ?
3173	4303	}
3174	4304	if ((mask&1) != 0) // Translation
3175	4305	{
..	..	@@ -3239,7 +4369,7 @@
3239	4369	refreshContents();
3240	4370	}
3241	4371
3242		- void ResetCentroid()
	4372	+ void ResetCentroid(boolean full)
3243	4373	{
3244	4374	Object3D obj;
3245	4375	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3254,12 +4384,16 @@
3254	4384	LA.matIdentity(Object3D.mat);
3255	4385	obj.getBounds(minima, maxima, false);
3256	4386	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3257		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	4387	+ if (full)
	4388	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3258	4389	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3259	4390	obj.TransformMesh(Object3D.mat);
	4391	+
3260	4392	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3261		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	4393	+ if (full)
	4394	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3262	4395	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	4396	+
3263	4397	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3264	4398	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3265	4399	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3288,7 +4422,8 @@
3288	4422
3289	4423	int size = obj.MemorySize();
3290	4424
3291		- System.err.println((size/1024) + " KB is the size of " + obj);
	4425	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4426	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3292	4427	}
3293	4428	}
3294	4429	catch (Exception e)
..	..	@@ -3325,9 +4460,9 @@
3325	4460	obj = (Object3D)e.nextElement();
3326	4461
3327	4462	System.out.println("Object is: " + obj);
3328		- GrafreeD.AnalyzeObject(obj);
	4463	+ Grafreed.AnalyzeObject(obj);
3329	4464	System.out.println("Boundary rep: " + obj.bRep);
3330		- GrafreeD.AnalyzeObject(obj.bRep);
	4465	+ Grafreed.AnalyzeObject(obj.bRep);
3331	4466
3332	4467	// System.err.println((size/1024) + " KB is the size of " + obj);
3333	4468	}
..	..	@@ -3369,6 +4504,13 @@
3369	4504	void GenNormals(boolean crease)
3370	4505	{
3371	4506	group.GenNormalsS(crease);
	4507	+
	4508	+ refreshContents();
	4509	+ }
	4510	+
	4511	+ void GenNormalsMESH()
	4512	+ {
	4513	+ group.GenNormalsMeshS();
3372	4514
3373	4515	refreshContents();
3374	4516	}
..	..	@@ -3541,8 +4683,8 @@
3541	4683
3542	4684	void ParseVertices()
3543	4685	{
3544		- boolean epsequal = GrafreeD.epsequal;
3545		- GrafreeD.epsequal = true;
	4686	+ boolean epsequal = Grafreed.epsequal;
	4687	+ Grafreed.epsequal = true;
3546	4688
3547	4689	for (int i=0; i<group.selection.size(); i++)
3548	4690	{
..	..	@@ -3567,7 +4709,7 @@
3567	4709	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3568	4710	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3569	4711
3570		- g.add(GrafreeD.clipboard);
	4712	+ g.add(Grafreed.clipboard);
3571	4713
3572	4714	buffer.add(g);
3573	4715	}
..	..	@@ -3582,7 +4724,7 @@
3582	4724	makeSomething(buffer, i==group.selection.size()-1);
3583	4725	}
3584	4726
3585		- GrafreeD.epsequal = epsequal;
	4727	+ Grafreed.epsequal = epsequal;
3586	4728
3587	4729	refreshContents();
3588	4730	}
..	..	@@ -3600,7 +4742,16 @@
3600	4742	String pigment = Object3D.GetPigment(tex);
3601	4743	//String bump = Object3D.GetBump(tex);
3602	4744
3603		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4745	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4746	+
	4747	+ try
	4748	+ {
	4749	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
	4750	+ }
	4751	+ catch (Exception e)
	4752	+ {
	4753	+ System.err.println("FAIL: " + node);
	4754	+ }
3604	4755
3605	4756	double s = v.s;
3606	4757
..	..	@@ -3732,7 +4883,7 @@
3732	4883	return;
3733	4884
3734	4885	Object3D poses = group.selection.get(0);
3735		- Object3D ref = GrafreeD.clipboard.get(0);
	4886	+ Object3D ref = Grafreed.clipboard.get(0);
3736	4887
3737	4888	Object3D newgroup = new Object3D("Po:" + poses.name);
3738	4889
..	..	@@ -3926,9 +5077,9 @@
3926	5077
3927	5078	void ClipMesh()
3928	5079	{
3929		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	5080	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3930	5081	{
3931		- Object3D content = GrafreeD.clipboard.get(0);
	5082	+ Object3D content = Grafreed.clipboard.get(0);
3932	5083
3933	5084	if (content instanceof cGroup && ((cGroup)content).transientlink )
3934	5085	content = ((cGroup)content).get(0);
..	..	@@ -3937,7 +5088,7 @@
3937	5088	// {
3938	5089	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3939	5090	// }
3940		- group.selection.ClipMesh(GrafreeD.clipboard);
	5091	+ group.selection.ClipMesh(Grafreed.clipboard);
3941	5092	}
3942	5093	// group.selection.ClipMesh(GrafreeD.clipboard);
3943	5094	System.out.println("DONE.");
..	..	@@ -3984,6 +5135,18 @@
3984	5135	void MarkLeaves(boolean hide)
3985	5136	{
3986	5137	group.selection.MarkLeaves(hide);
	5138	+ refreshContents();
	5139	+ }
	5140	+
	5141	+ void RewindLeaves(boolean hide)
	5142	+ {
	5143	+ group.selection.RewindLeaves(hide);
	5144	+ refreshContents();
	5145	+ }
	5146	+
	5147	+ void RandomLeaves(boolean hide)
	5148	+ {
	5149	+ group.selection.RandomLeaves(hide);
3987	5150	refreshContents();
3988	5151	}
3989	5152
..	..	@@ -4058,28 +5221,25 @@
4058	5221	// }
4059	5222	// }
4060	5223
4061		- static boolean allparams = true;
4062		-
4063		- static Vector<Object3D> listUI = new Vector<Object3D>();
4064		-
4065	5224	void EditSelection(boolean newWindow)
4066	5225	{
	5226	+ if (group.selection == null)
	5227	+ {
	5228	+ EditElement(group, newWindow); // ? new
	5229	+ return;
	5230	+ }
	5231	+
4067	5232	// aConstraints.gridy = 0;
4068	5233	for (int i=0; i<group.selection.size(); i++)
4069	5234	{
4070	5235	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4071	5236	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4072		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5237	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4073	5238
4074	5239	Object3D elem = (Object3D)group.selection.elementAt(i);
4075		- if(elem != group)
	5240	+ if(elem != group \|\| !newWindow)
4076	5241	{
4077		- // if (!(elem instanceof Composite))
4078		- // newWindow = false;
4079		- listUI.add(elem);
4080		- elem.openEditWindow(this, newWindow); //, false);
4081		- System.out.println("edit : " + elem);
4082		- elem.editWindow.refreshContents(true); // ? new
	5242	+ EditElement(elem, newWindow); // ? new
4083	5243	}
4084	5244	}
4085	5245	}
..	..	@@ -4142,9 +5302,7 @@
4142	5302
4143	5303	freezemodel = false;
4144	5304	}
4145		-
4146		- boolean flashIt = true;
4147		-
	5305	+
4148	5306	public void valueChanged(TreeSelectionEvent e)
4149	5307	//public boolean handleEvent(Event event)
4150	5308	{
..	..	@@ -4154,7 +5312,8 @@
4154	5312	//new Exception().printStackTrace();
4155	5313
4156	5314	freezemodel = true;
4157		-
	5315	+ ClearUnpinned();
	5316	+
4158	5317	/**/
4159	5318	//switch (event.id)
4160	5319	{
..	..	@@ -4162,7 +5321,6 @@
4162	5321	//case 702: // Event.LIST_DESELECT
4163	5322	group.deselectAll();
4164	5323	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4165		- objEditor.ClearInfo(); // .GetMaterial());
4166	5324	if (tps != null)
4167	5325	{
4168	5326	for (int i=0; i < tps.length; i++)
..	..	@@ -4171,10 +5329,8 @@
4171	5329
4172	5330	//if (child.parent != null)
4173	5331	//child.parent.addSelectee(child);
	5332	+ objEditor.SetMaterial(child);
4174	5333	group.addSelectee(child);
4175		- objEditor.SetMaterial(child); // .GetMaterial());
4176		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4177		- System.err.println("info : " + child.GetPath());
4178	5334	}
4179	5335	}
4180	5336	// else
..	..	@@ -4184,20 +5340,28 @@
4184	5340	// System.err.println("info : " + group.GetPath());
4185	5341	// }
4186	5342
4187		- objEditor.SetText(); // jan 2014
4188		-
4189		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	5343	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4190	5344	CameraPane.flash = true;
4191	5345
4192		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5346	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4193	5347	// a camera
4194	5348	{
4195		- CameraPane.camerachangeframe = 0; // don't refuse it
4196		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5349	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5350	+ {
	5351	+ CameraPane.camerachangeframe = 0; // don't refuse it
	5352	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5353	+ }
4197	5354	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4198	5355	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4199	5356	}
4200	5357
	5358	+ if (tps != null && tps.length == 1)
	5359	+ {
	5360	+ EditSelection(false);
	5361	+ }
	5362	+
	5363	+ SetPinStates(tps != null && tps.length > 0);
	5364	+
4201	5365	refreshContents();
4202	5366	//return true;
4203	5367	}
..	..	@@ -4206,6 +5370,53 @@
4206	5370
4207	5371	freezemodel = false;
4208	5372	}
	5373	+
	5374	+ void SetPinStates(boolean enabled)
	5375	+ {
	5376	+ editButton.setEnabled(enabled);
	5377	+ uneditButton.setEnabled(enabled);
	5378	+ //unselectButton.setEnabled(enabled);
	5379	+ flashSelectionButton.setEnabled(enabled);
	5380	+
	5381	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5382	+
	5383	+ boolean allComposites = true;
	5384	+
	5385	+ if (group.selection != null)
	5386	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5387	+ {
	5388	+ Object next = e.nextElement();
	5389	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5390	+ {
	5391	+ allComposites = false;
	5392	+ break;
	5393	+ }
	5394	+ }
	5395	+
	5396	+ rootButton.setEnabled(allComposites);
	5397	+ }
	5398	+
	5399	+ void refreshContents(boolean cp)
	5400	+ {
	5401	+ if (Globals.ADVANCED)
	5402	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5403	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5404	+ {
	5405	+ objEditor.ClearInfo(); // .GetMaterial());
	5406	+
	5407	+ for (int i=0; i < group.selection.Size(); i++)
	5408	+ {
	5409	+ Object3D child = (Object3D) group.selection.get(i);
	5410	+
	5411	+ objEditor.AddInfo(child, this, true);
	5412	+// System.err.println("info : " + child.GetPath());
	5413	+ }
	5414	+
	5415	+ objEditor.SetText(); // jan 2014
	5416	+ }
	5417	+
	5418	+ super.refreshContents(cp);
	5419	+ }
4209	5420
4210	5421	void linkSomething(Object3D thing)
4211	5422	{
..	..	@@ -4277,16 +5488,19 @@
4277	5488	{
4278	5489	if (group.selection.isEmpty())
4279	5490	return;
4280		- GrafreeD.clipboardIsTempGroup = false;
	5491	+
	5492	+ Grafreed.clipboardIsTempGroup = false;
4281	5493	Composite tGroup = null;
4282	5494	if (group.selection.size() > 0) // 1)
4283	5495	{
4284	5496	tGroup = new cGroup();
4285		- GrafreeD.clipboardIsTempGroup = true;
	5497	+ Grafreed.clipboardIsTempGroup = true;
4286	5498	}
4287	5499
4288	5500	if (cut)
4289	5501	{
	5502	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5503	+// Save();
4290	5504	//int indices[] = jList.getSelectedIndices();
4291	5505	//for (int i = indices.length - 1; i >= 0; i--)
4292	5506	//jList.remove(indices[i]);
..	..	@@ -4322,16 +5536,16 @@
4322	5536	//System.out.println("cut " + child);
4323	5537	//System.out.println("parent = " + child.parent);
4324	5538	// tmp.addChild(child);
4325		- if (GrafreeD.clipboardIsTempGroup)
	5539	+ if (Grafreed.clipboardIsTempGroup)
4326	5540	tGroup.add/Child/(tmp);
4327	5541	else
4328		- GrafreeD.clipboard = tmp;
	5542	+ Grafreed.clipboard = tmp;
4329	5543	}
4330	5544	else
4331		- if (GrafreeD.clipboardIsTempGroup)
	5545	+ if (Grafreed.clipboardIsTempGroup)
4332	5546	tGroup.add/Child/(child);
4333	5547	else
4334		- GrafreeD.clipboard = child;
	5548	+ Grafreed.clipboard = child;
4335	5549	}
4336	5550
4337	5551	//ResetModel();
..	..	@@ -4363,21 +5577,23 @@
4363	5577	//System.out.println("cut " + elem);
4364	5578	//System.out.println("parent = " + elem.parent);
4365	5579	// tmp.addChild(elem);
4366		- if (GrafreeD.clipboardIsTempGroup)
	5580	+ if (Grafreed.clipboardIsTempGroup)
4367	5581	tGroup.add/Child/(tmp);
4368	5582	else
4369		- GrafreeD.clipboard = tmp;
	5583	+ Grafreed.clipboard = tmp;
4370	5584	}
4371	5585	else
4372		- if (GrafreeD.clipboardIsTempGroup)
	5586	+ if (Grafreed.clipboardIsTempGroup)
4373	5587	tGroup.add/Child/(child);
4374	5588	else
4375		- GrafreeD.clipboard = child;
	5589	+ Grafreed.clipboard = child;
4376	5590	}
4377	5591
4378	5592	}
4379		- if (GrafreeD.clipboardIsTempGroup)
4380		- GrafreeD.clipboard = tGroup;
	5593	+
	5594	+ if (Grafreed.clipboardIsTempGroup)
	5595	+ Grafreed.clipboard = tGroup;
	5596	+
4381	5597	if (cut)
4382	5598	{
4383	5599	ResetModel();
..	..	@@ -4387,11 +5603,15 @@
4387	5603
4388	5604	void paste(boolean expand)
4389	5605	{
	5606	+ if (Globals.REPLACEONMAKE)
	5607	+ Save();
	5608	+ boolean keep = Globals.REPLACEONMAKE;
	5609	+ Globals.REPLACEONMAKE = false;
4390	5610	// if (GrafreeD.clipboard == null)
4391	5611	// return;
4392	5612	boolean first = true;
4393	5613
4394		- if (GrafreeD.clipboardIsTempGroup)
	5614	+ if (Grafreed.clipboardIsTempGroup)
4395	5615	{
4396	5616	Composite temp;
4397	5617
..	..	@@ -4402,7 +5622,7 @@
4402	5622	temp = (Composite)Applet3D.clipboard.deepCopy();
4403	5623	*/
4404	5624	Object3D elem;
4405		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5625	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4406	5626	{
4407	5627	Object3D child = (Object3D)e.nextElement();
4408	5628
..	..	@@ -4436,16 +5656,17 @@
4436	5656	//Object3D cb = Applet3D.clipboard;
4437	5657	//temp.addChild(cb);
4438	5658	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4439		- assert(GrafreeD.clipboard.parent == null);
4440		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4441		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4442		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4443		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	5659	+ assert(Grafreed.clipboard.parent == null);
	5660	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5661	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5662	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5663	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4444	5664	else
4445		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4446		- GrafreeD.clipboard.get(0).parent = keepparent;
	5665	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5666	+ Grafreed.clipboard.get(0).parent = keepparent;
4447	5667	}
4448	5668
	5669	+ Globals.REPLACEONMAKE = keep;
4449	5670	ResetModel();
4450	5671	refreshContents();
4451	5672	}
..	..	@@ -4492,9 +5713,9 @@
4492	5713	{
4493	5714	boolean first = true;
4494	5715
4495		- if (GrafreeD.clipboardIsTempGroup)
	5716	+ if (Grafreed.clipboardIsTempGroup)
4496	5717	{
4497		- Composite temp = (Composite)GrafreeD.clipboard;
	5718	+ Composite temp = (Composite)Grafreed.clipboard;
4498	5719	Object3D copy;
4499	5720	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4500	5721	{
..	..	@@ -4504,7 +5725,7 @@
4504	5725	}
4505	5726	} else
4506	5727	{
4507		- linkSomething(GrafreeD.clipboard); //.get(0));
	5728	+ linkSomething(Grafreed.clipboard); //.get(0));
4508	5729	}
4509	5730	}
4510	5731	}
..	..	@@ -4581,6 +5802,10 @@
4581	5802
4582	5803	void group(Object3D csg, boolean grab)
4583	5804	{
	5805	+ if (Globals.REPLACEONMAKE)
	5806	+ Save();
	5807	+ boolean keep = Globals.REPLACEONMAKE;
	5808	+ Globals.REPLACEONMAKE = false;
4584	5809	if (//false) // why??
4585	5810	!group.selection.isEmpty())
4586	5811	{
..	..	@@ -4694,10 +5919,15 @@
4694	5919	//node.add(csg);
4695	5920	//makeSomething(node);
4696	5921	makeSomething(csg);
	5922	+ Globals.REPLACEONMAKE = keep;
4697	5923	}
4698	5924
4699	5925	void Ungroup(Object3D g)
4700	5926	{
	5927	+ if (Globals.REPLACEONMAKE)
	5928	+ Save();
	5929	+ boolean keep = Globals.REPLACEONMAKE;
	5930	+ Globals.REPLACEONMAKE = false;
4701	5931	if (g instanceof HiddenObject)
4702	5932	{
4703	5933	HiddenObject h = (HiddenObject) g;
..	..	@@ -4714,6 +5944,7 @@
4714	5944	objEditor.makeSomething(g.get(i), false);
4715	5945	}
4716	5946	}
	5947	+ Globals.REPLACEONMAKE = keep;
4717	5948	}
4718	5949
4719	5950	void ungroup()
..	..	@@ -4909,21 +6140,6 @@
4909	6140	}
4910	6141	*/
4911	6142
4912		- void ImportGFD()
4913		- {
4914		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4915		- browser.show();
4916		- String filename = browser.getFile();
4917		- if (filename != null && filename.length() > 0)
4918		- {
4919		- String fullname = browser.getDirectory() + filename;
4920		-
4921		- //Object3D readobj =
4922		- objEditor.ReadGFD(fullname, objEditor);
4923		- //makeSomething(readobj);
4924		- }
4925		- }
4926		-
4927	6143	/*
4928	6144	public void Callback(Object obj)
4929	6145	{
..	..	@@ -4947,26 +6163,9 @@
4947	6163	}
4948	6164	*/
4949	6165
4950		- void ImportVRMLX3D()
4951		- {
4952		- if (GrafreeD.standAlone)
4953		- {
4954		- /**/
4955		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4956		- browser.show();
4957		- String filename = browser.getFile();
4958		- if (filename != null && filename.length() > 0)
4959		- {
4960		- String fullname = browser.getDirectory() + filename;
4961		- LoadVRMLX3D(fullname);
4962		- }
4963		- /**/
4964		- }
4965		- }
4966		-
4967	6166	String GetFile(String dialogName)
4968	6167	{
4969		- if (GrafreeD.standAlone)
	6168	+ if (Grafreed.standAlone)
4970	6169	{
4971	6170	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4972	6171	browser.show();
..	..	@@ -5034,7 +6233,43 @@
5034	6233	cButton clearpanelButton;
5035	6234	cButton unselectButton;
5036	6235
	6236	+ cButton restoreCameraButton;
	6237	+
5037	6238	cButton oneStepButton;
	6239	+
	6240	+ cButton groupButton;
	6241	+ cButton ungroupButton;
	6242	+ cButton compositeButton;
	6243	+ cButton switchButton;
	6244	+ cButton loopButton;
	6245	+ cButton textureButton;
	6246	+
	6247	+ cButton skybox1Button;
	6248	+ cButton skybox2Button;
	6249	+ cButton skybox3Button;
	6250	+ cButton skybox4Button;
	6251	+ cButton skybox5Button;
	6252	+ cButton skybox6Button;
	6253	+ cButton skybox7Button;
	6254	+
	6255	+ cButton skybox11Button;
	6256	+ cButton skybox12Button;
	6257	+ cButton skybox13Button;
	6258	+ cButton skybox14Button;
	6259	+ cButton skybox15Button;
	6260	+ cButton skybox16Button;
	6261	+ cButton skybox17Button;
	6262	+
	6263	+ cButton gridButton;
	6264	+ cButton boxButton;
	6265	+ cButton sphereButton;
	6266	+ cButton coneButton;
	6267	+ cButton torusButton;
	6268	+ cButton superButton;
	6269	+ cButton kleinButton;
	6270	+ cButton particlesButton;
	6271	+ cButton overlayButton;
	6272	+ cButton lightButton;
5038	6273
5039	6274	cButton screenfitButton;
5040	6275	cButton screenfitpointButton;
..	..	@@ -5047,14 +6282,6 @@
5047	6282
5048	6283	cButton setsupportButton;
5049	6284
5050		- cButton twoButton;
5051		- cButton sixButton;
5052		- cButton threeButton;
5053		- cButton sevenButton;
5054		- cButton fourButton; // full panel
5055		- cButton oneButton; // full XYZ
5056		- //cButton currentLayout;
5057		-
5058	6285	//
5059	6286	//Composite
5060	6287	Object3D // to do !!
..	..	@@ -5064,10 +6291,12 @@
5064	6291	//JTree jTree;
5065	6292	private MenuItem lookAtItem;
5066	6293	private MenuItem lookFromItem;
5067		- private MenuItem switchItem;
5068		- private MenuItem cutItem;
5069		- private MenuItem duplicateItem;
5070		- private MenuItem cloneItem;
	6294	+ private MenuItem switchViewItem;
	6295	+ private JMenuItem cutItem;
	6296	+ private MenuItem undoItem;
	6297	+ private MenuItem redoItem;
	6298	+ private JMenuItem duplicateItem;
	6299	+ private JMenuItem cloneItem;
5071	6300	private MenuItem cloneSupportItem;
5072	6301	private MenuItem overwriteGeoItem;
5073	6302	private MenuItem overwriteMatItem;
..	..	@@ -5079,7 +6308,7 @@
5079	6308	private MenuItem linkverticesItem;
5080	6309	private MenuItem relinkverticesItem;
5081	6310	private MenuItem setMasterItem;
5082		- private MenuItem resetMeshItem;
	6311	+ private MenuItem resetAllItem;
5083	6312	private MenuItem stepAllItem;
5084	6313	private MenuItem revertMeshItem;
5085	6314	private MenuItem poseMeshItem;
..	..	@@ -5088,13 +6317,13 @@
5088	6317	private MenuItem cloneGeometriesItem;
5089	6318	private MenuItem shareGeometriesItem;
5090	6319	private MenuItem mergeGeometriesItem;
5091		- private MenuItem copyItem;
	6320	+ private JMenuItem copyItem;
5092	6321	private MenuItem pasteItem;
5093		- private MenuItem pasteIntoItem;
5094		- private MenuItem pasteLinkItem;
5095		- private MenuItem pasteCloneItem;
5096		- private MenuItem pasteExpandItem;
5097		- private MenuItem clearItem;
	6322	+ private JMenuItem pasteIntoItem;
	6323	+ private JMenuItem pasteLinkItem;
	6324	+ private JMenuItem pasteCloneItem;
	6325	+ private JMenuItem pasteExpandItem;
	6326	+ private JMenuItem deleteItem;
5098	6327	private MenuItem clearAllItem;
5099	6328	private MenuItem genUVItem;
5100	6329	private MenuItem genNormalsMESHItem;
..	..	@@ -5129,6 +6358,10 @@
5129	6358	private MenuItem showleavesItem;
5130	6359	private MenuItem markleavesItem;
5131	6360	private MenuItem unmarkleavesItem;
	6361	+ private MenuItem rewindleavesItem;
	6362	+ private MenuItem unrewindleavesItem;
	6363	+ private MenuItem randomleavesItem;
	6364	+ private MenuItem unrandomleavesItem;
5132	6365
5133	6366	private MenuItem flipVItem;
5134	6367	private MenuItem unflipVItem;
..	..	@@ -5140,15 +6373,17 @@
5140	6373	private MenuItem panoTexturesItem;
5141	6374
5142	6375	private MenuItem resetCentroidItem;
5143		- private MenuItem transformgeometryItem;
	6376	+ private MenuItem resetCentroidXZItem;
5144	6377	private MenuItem resetTransformItem;
	6378	+ private MenuItem transformGeometryItem;
	6379	+ private MenuItem transformChildrenItem;
5145	6380	private MenuItem hideItem;
5146		- private MenuItem grabItem;
	6381	+ private JMenuItem grabItem;
5147	6382	private MenuItem backItem;
5148	6383	private MenuItem frontItem;
5149	6384	private MenuItem cameraItem;
5150	6385	private MenuItem compositeItem;
5151		- private MenuItem randomItem;
	6386	+ private MenuItem switchItem;
5152	6387	private MenuItem physicsItem;
5153	6388	private MenuItem frameselectorItem;
5154	6389	private MenuItem scriptNodeItem;
..	..	@@ -5156,7 +6391,7 @@
5156	6391	private MenuItem switchTransfoItem;
5157	6392	private MenuItem morphItem;
5158	6393	private MenuItem linkerItem;
5159		- private MenuItem ungroupItem;
	6394	+ private JMenuItem ungroupItem;
5160	6395	private MenuItem editItem;
5161	6396	private MenuItem openWindowItem;
5162	6397	private MenuItem editLeafItem;
..	..	@@ -5172,6 +6407,8 @@
5172	6407	private MenuItem attachBumpItem;
5173	6408	private MenuItem detachBumpItem;
5174	6409	private MenuItem pigmentBumpItem;
	6410	+ private MenuItem embedTexturesItem;
	6411	+ private MenuItem deEmbedTexturesItem;
5175	6412
5176	6413	private MenuItem particleItem;
5177	6414	private MenuItem ragdollItem;
..	..	@@ -5210,11 +6447,6 @@
5210	6447	private MenuItem doubleItem;
5211	6448	private MenuItem tripleItem;
5212	6449
5213		- private MenuItem importGFDItem;
5214		- private MenuItem importVRMLX3DItem;
5215		- private MenuItem import3DSItem;
5216		- private MenuItem importOBJItem;
5217		-
5218	6450	private MenuItem computeAOItem;
5219	6451	private MenuItem recompileItem;
5220	6452	private MenuItem editScriptItem;
..	..	@@ -5224,4 +6456,8 @@
5224	6456	private MenuItem analyzeItem;
5225	6457	private MenuItem dumpItem;
5226	6458	//boolean freezemodel = false;
	6459	+
	6460	+ Menu cameraMenu;
	6461	+ MenuItem editCameraItem;
	6462	+ MenuItem restoreCameraItem;
5227	6463	}