~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -23,6 +23,237 @@
23	23	DragGestureListener, DragSourceListener, DropTargetListener,
24	24	ItemListener // ListSelectionListener
25	25	{
	26	+
	27	+ public void AddSkyboxButton(String f, String s, cGridBag row)
	28	+ {
	29	+ cButton skyboxButton;
	30	+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
	31	+ //row.add(skyboxButton = GetButton(path + "/" + s + ".jpg", !Grafreed.NIMBUSLAF));
	32	+ row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
	33	+ skyboxButton.setToolTipText(s);
	34	+ skyboxButton.addActionListener(new ActionListener()
	35	+ {
	36	+ @Override
	37	+ public void actionPerformed(ActionEvent e)
	38	+ {
	39	+ ChangeSkybox(path);
	40	+ }
	41	+ });
	42	+ }
	43	+
	44	+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
	45	+ {
	46	+ cGridBag tab0 = new cGridBag().setVertical(true);
	47	+
	48	+ tab0.setName("Urban");
	49	+ skyboxpanel.add(tab0);
	50	+
	51	+ cGridBag row0 = new cGridBag();
	52	+ cGridBag row1 = new cGridBag();
	53	+ cGridBag row2 = new cGridBag();
	54	+ cGridBag row3 = new cGridBag();
	55	+ cGridBag row4 = new cGridBag();
	56	+ cGridBag row5 = new cGridBag();
	57	+ cGridBag row6 = new cGridBag();
	58	+
	59	+ AddSkyboxButton("default", "rgb", row0);
	60	+ AddSkyboxButton("default", "cornell", row0);
	61	+ AddSkyboxButton("default", "uffizi", row0);
	62	+ AddSkyboxButton("default", "CloudyHills", row0);
	63	+
	64	+ AddSkyboxButton("default", "skycube", row1);
	65	+ AddSkyboxButton("bridge", "Bridge", row1);
	66	+ AddSkyboxButton("bridge", "Bridge2", row1);
	67	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	68	+
	69	+ AddSkyboxButton("urban", "Parliament", row2);
	70	+ AddSkyboxButton("urban", "Roundabout", row2);
	71	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	72	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	73	+
	74	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	75	+ AddSkyboxButton("urban", "UnionSquare", row3);
	76	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	77	+ AddSkyboxButton("park", "Buddha", row3);
	78	+
	79	+ AddSkyboxButton("park", "CNTower2", row4);
	80	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	81	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	82	+ AddSkyboxButton("park", "Park", row4);
	83	+
	84	+ AddSkyboxButton("park", "Pond", row5);
	85	+ AddSkyboxButton("park", "Skansen", row5);
	86	+ AddSkyboxButton("park", "Skansen2", row5);
	87	+ AddSkyboxButton("park", "Skansen3", row5);
	88	+
	89	+ AddSkyboxButton("park", "Skansen4", row6);
	90	+ AddSkyboxButton("park", "Skansen5", row6);
	91	+ AddSkyboxButton("park", "Stairs", row6);
	92	+ AddSkyboxButton("park", "Tantolunden4", row6);
	93	+
	94	+ tab0.add(row0);
	95	+ tab0.add(row1);
	96	+ tab0.add(row2);
	97	+ tab0.add(row3);
	98	+ tab0.add(row4);
	99	+ tab0.add(row5);
	100	+ tab0.add(row6);
	101	+
	102	+ for (int i=5; --i>=0;)
	103	+ {
	104	+ //oe.toolboxPanel.Return();
	105	+ //tab0.add(new cGridBag());
	106	+ }
	107	+ }
	108	+
	109	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	110	+ {
	111	+ cGridBag tab0 = new cGridBag().setVertical(true);
	112	+
	113	+ tab0.setName("Nature");
	114	+ skyboxpanel.add(tab0);
	115	+
	116	+ cGridBag row0 = new cGridBag();
	117	+ cGridBag row1 = new cGridBag();
	118	+ cGridBag row2 = new cGridBag();
	119	+ cGridBag row3 = new cGridBag();
	120	+ cGridBag row4 = new cGridBag();
	121	+ cGridBag row5 = new cGridBag();
	122	+ cGridBag row6 = new cGridBag();
	123	+
	124	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	125	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	126	+ AddSkyboxButton("beach", "PalmTrees", row0);
	127	+ AddSkyboxButton("beach", "Tenerife", row0);
	128	+
	129	+ AddSkyboxButton("beach", "Tenerife2", row1);
	130	+ AddSkyboxButton("beach", "Tenerife3", row1);
	131	+ AddSkyboxButton("field", "FishPond", row1);
	132	+ AddSkyboxButton("field", "Footballfield", row1);
	133	+
	134	+ AddSkyboxButton("field", "Meadow", row2);
	135	+ AddSkyboxButton("field", "Sorsele", row2);
	136	+ AddSkyboxButton("field", "Sorsele2", row2);
	137	+ AddSkyboxButton("field", "Sorsele3", row2);
	138	+
	139	+ AddSkyboxButton("forest", "Brudslojan", row3);
	140	+ AddSkyboxButton("forest", "Langholmen2", row3);
	141	+ AddSkyboxButton("forest", "Plants", row3);
	142	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	143	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	144	+
	145	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	146	+ AddSkyboxButton("mountain", "Ryfjallet", row4);
	147	+ AddSkyboxButton("mountain", "Teide", row4);
	148	+
	149	+ AddSkyboxButton("rocky", "Langholmen", row5);
	150	+ AddSkyboxButton("rocky", "Riddarfjarden", row5);
	151	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	152	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	153	+ /*
	154	+Kastellholmen
	155	+Langholmen
	156	+Riddarfjarden
	157	+Skinnarviksberget
	158	+Tanto
	159	+Tantolunden2
	160	+Tantolunden6
	161	+ */
	162	+
	163	+ tab0.add(row0);
	164	+ tab0.add(row1);
	165	+ tab0.add(row2);
	166	+ tab0.add(row3);
	167	+ tab0.add(row4);
	168	+ tab0.add(row5);
	169	+ tab0.add(row6);
	170	+
	171	+ for (int i=5; --i>=0;)
	172	+ {
	173	+ //oe.toolboxPanel.Return();
	174	+ //tab0.add(new cGridBag());
	175	+ }
	176	+ }
	177	+
	178	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	179	+ {
	180	+ cGridBag tab0 = new cGridBag().setVertical(true);
	181	+
	182	+ tab0.setName("Night");
	183	+ skyboxpanel.add(tab0);
	184	+
	185	+ cGridBag row0 = new cGridBag();
	186	+ cGridBag row1 = new cGridBag();
	187	+ cGridBag row2 = new cGridBag();
	188	+ cGridBag row3 = new cGridBag();
	189	+ cGridBag row4 = new cGridBag();
	190	+ cGridBag row5 = new cGridBag();
	191	+ cGridBag row6 = new cGridBag();
	192	+
	193	+ AddSkyboxButton("night", "NightPath", row0);
	194	+ AddSkyboxButton("night", "PondNight", row0);
	195	+ AddSkyboxButton("night", "Powerlines", row0);
	196	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	197	+
	198	+ AddSkyboxButton("urban", "CNTower", row1);
	199	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	200	+ AddSkyboxButton("indoors", "DallasW", row1);
	201	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row1);
	202	+
	203	+ AddSkyboxButton("indoors", "Vasa", row2);
	204	+ AddSkyboxButton("winter", "Backyard", row2);
	205	+ AddSkyboxButton("winter", "Creek", row2);
	206	+ AddSkyboxButton("winter", "FootballField3", row2);
	207	+
	208	+ AddSkyboxButton("winter", "Forest", row3);
	209	+ AddSkyboxButton("winter", "HornstullsStrand2", row3);
	210	+ AddSkyboxButton("winter", "House", row3);
	211	+ AddSkyboxButton("winter", "IceLake", row3);
	212	+
	213	+ AddSkyboxButton("winter", "IceRiver", row4);
	214	+ AddSkyboxButton("winter", "Park3", row4);
	215	+ AddSkyboxButton("winter", "PondWinter", row4);
	216	+
	217	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	218	+ AddSkyboxButton("winter", "Vindelalven", row5);
	219	+ /*
	220	+Backyard
	221	+Creek
	222	+FootballField3
	223	+Forest
	224	+HornstullsStrand2
	225	+House
	226	+IceLake
	227	+IceRiver
	228	+Park3
	229	+PondWinter
	230	+Tantolunden5
	231	+Vindelalven *
	232	+ */
	233	+
	234	+ tab0.add(row0);
	235	+ tab0.add(row1);
	236	+ tab0.add(row2);
	237	+ tab0.add(row3);
	238	+ tab0.add(row4);
	239	+ tab0.add(row5);
	240	+ tab0.add(row6);
	241	+
	242	+ for (int i=5; --i>=0;)
	243	+ {
	244	+ //oe.toolboxPanel.Return();
	245	+ //tab0.add(new cGridBag());
	246	+ }
	247	+ }
	248	+
	249	+ public void ChangeSkybox(String name)
	250	+ {
	251	+ cameraView.envyoff = false;
	252	+ cameraView.skyboxname = name;
	253	+ cameraView.skyboxext = "jpg";
	254	+ cameraView.repaint();
	255	+ }
	256	+
26	257	//ObjEditor objEditor;
27	258	public void closeUI2()
28	259	{
..	..	@@ -60,6 +291,12 @@
60	291	this.copy = this.group = group;
61	292	//selectees = this.group.selectees;
62	293
	294	+ if (copy.versions == null)
	295	+ {
	296	+ copy.versions = new byte[100][];
	297	+ copy.versionindex = -1;
	298	+ }
	299	+
63	300	if(ui)
64	301	SetupUI(objEditor);
65	302	}
..	..	@@ -74,16 +311,28 @@
74	311	this.copy = this.group = copy;
75	312	//selectees = this.group.selectees;
76	313
77		- SetupMenu2(objEditor);
	314	+ SetupMenu2(this); //objEditor);
78	315	SetupUI2(objEditor);
79	316	objEditor.SetupUI(true);
80	317	SetupViews(objEditor);
81	318
82	319	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	320	+
	321	+ if (copy.versions == null)
	322	+ {
	323	+ copy.versions = new byte[100][];
	324	+ copy.versionindex = -1;
	325	+
	326	+ Save(true);
	327	+ }
83	328	}
84	329
85	330	void CloneSelection(boolean supports)
86	331	{
	332	+ if (Globals.REPLACEONMAKE)
	333	+ Save();
	334	+ boolean keep = Globals.REPLACEONMAKE;
	335	+ Globals.REPLACEONMAKE = false;
87	336	// Object3D keep = GrafreeD.clipboard;
88	337	//Object3D obj;
89	338	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,18 +343,19 @@
94	343
95	344	makeSomething(clone, i==group.selection.size()-1);
96	345	}
	346	+ Globals.REPLACEONMAKE = keep;
97	347	}
98	348
99	349	void CloneClipboard(boolean supports)
100	350	{
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));
	351	+ assert(Grafreed.clipboard.parent == null);
	352	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	353	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	354	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	355	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
106	356	else
107		- makeSomething(CloneObject(GrafreeD.clipboard, false));
108		- GrafreeD.clipboard.get(0).parent = keepparent;
	357	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	358	+ Grafreed.clipboard.get(0).parent = keepparent;
109	359	}
110	360
111	361	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -119,7 +369,7 @@
119	369	// obj.support = null;
120	370	if (!supports)
121	371	obj.SaveSupports();
122		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	372	+ Object3D clone = (Object3D)Grafreed.clone(obj);
123	373	obj.parent = parent;
124	374	// obj.support = support;
125	375	// clone.support = support; // aout 2013
..	..	@@ -148,28 +398,21 @@
148	398
149	399	//JTextField nameField;
150	400
151		- void SetupMenu2(ObjEditor oe)
	401	+ void SetupMenu2(GroupEditor oe)
152	402	{
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		-
	403	+ oe.jTree = new cTree();
	404	+
168	405	Menu menu;
169	406	oe.menuBar.add(menu = new Menu("Edit"));
170	407	//editItem = menu.add(new MenuItem("Edit"));
171	408	//editItem.addActionListener(this);
172		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	409	+
	410	+// undoItem = menu.add(new MenuItem("Undo"));
	411	+// undoItem.addActionListener(this);
	412	+// redoItem = menu.add(new MenuItem("Redo"));
	413	+// redoItem.addActionListener(this);
	414	+// menu.add("-");
	415	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
173	416	duplicateItem.addActionListener(this);
174	417	cloneItem = menu.add(new MenuItem("Clone"));
175	418	cloneItem.addActionListener(this);
..	..	@@ -185,7 +428,6 @@
185	428	copyItem.addActionListener(this);
186	429	pasteItem = menu.add(new MenuItem("Paste"));
187	430	pasteItem.addActionListener(this);
188		- menu.add("-");
189	431
190	432	menu.add("-");
191	433	pasteIntoItem = menu.add(new MenuItem("Paste into"));
..	..	@@ -197,8 +439,8 @@
197	439	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
198	440	// pasteExpandItem.addActionListener(this);
199	441	menu.add("-");
200		- clearItem = menu.add(new MenuItem("Clear"));
201		- clearItem.addActionListener(this);
	442	+ deleteItem = menu.add(new MenuItem("Delete"));
	443	+ deleteItem.addActionListener(this);
202	444
203	445	if (Globals.ADVANCED)
204	446	{
..	..	@@ -206,14 +448,97 @@
206	448	clearAllItem = menu.add(new MenuItem("Clear All"));
207	449	clearAllItem.addActionListener(this);
208	450	}
	451	+
	452	+ menuBar.add(cameraMenu = new Menu("View"));
	453	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	454	+ //zBufferItem.addActionListener(this);
	455	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	456	+ //normalLensItem.addActionListener(this);
	457	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	458	+ restoreCameraItem.addActionListener(this);
	459	+
	460	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	461	+// toggleFullScreenItem.addItemListener(this);
	462	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	463	+// cameraMenu.add("-");
	464	+//
	465	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	466	+// toggleTextureItem.addItemListener(this);
	467	+// toggleTextureItem.setState(CameraPane.textureon);
	468	+//
	469	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	470	+// toggleSwitchItem.addItemListener(this);
	471	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	472	+
	473	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	474	+ toggleHandleItem.addItemListener(this);
	475	+ toggleHandleItem.setState(CameraPane.HANDLES);
	476	+
	477	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	478	+ togglePaintItem.addItemListener(this);
	479	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	480	+
	481	+ if (Globals.ADVANCED)
	482	+ {
	483	+ cameraMenu.add("-");
	484	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	485	+ toggleLiveItem.addItemListener(this);
	486	+ toggleLiveItem.setState(Globals.isLIVE());
209	487
	488	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	489	+ stepItem.addActionListener(this);
	490	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	491	+ // toggleDLItem.addItemListener(this);
	492	+ // toggleDLItem.setState(false);
	493	+
	494	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	495	+ toggleRenderItem.addItemListener(this);
	496	+ toggleRenderItem.setState(!CameraPane.frozen);
	497	+
	498	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	499	+ toggleDebugItem.addItemListener(this);
	500	+ toggleDebugItem.setState(Globals.DEBUG);
	501	+
	502	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	503	+ toggleFrustumItem.addItemListener(this);
	504	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	505	+
	506	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	507	+ toggleFootContactItem.addItemListener(this);
	508	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	509	+
	510	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	511	+ toggleTimelineItem.addItemListener(this);
	512	+ }
	513	+
	514	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	515	+// toggleRootItem.addItemListener(this);
	516	+// toggleRootItem.setState(false);
	517	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	518	+// animationItem.addItemListener(this);
	519	+// animationItem.setState(CameraPane.ANIMATION);
	520	+ cameraMenu.add("-");
	521	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	522	+ editCameraItem.addActionListener(this);
	523	+
	524	+ if (Globals.ADVANCED)
	525	+ {
	526	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	527	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	528	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	529	+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	530	+ oe.cameraMenu.add("-");
	531	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	532	+ openWindowItem.addActionListener(this);
	533	+ editLeafItem.addActionListener(this);
	534	+ lookAtItem.addActionListener(this);
	535	+ //lookFromItem.addActinoListener(this);
	536	+ //switchViewItem.addActionListener(this);
	537	+ }
	538	+
210	539	oe.menuBar.add(menu = new Menu("Setting"));
211	540	if (Globals.ADVANCED)
212	541	{
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	542	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
218	543	revertMeshItem.addActionListener(this);
219	544	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
..	..	@@ -253,21 +578,29 @@
253	578	}
254	579
255	580	oe.menuBar.add(menu = new Menu("Group"));
256		- grabItem = menu.add(new MenuItem("Grab"));
257		- grabItem.addActionListener(this);
	581	+// grabItem = menu.add(new MenuItem("Grab"));
	582	+// grabItem.addActionListener(this);
258	583	backItem = menu.add(new MenuItem("Back"));
259	584	backItem.addActionListener(this);
260	585	frontItem = menu.add(new MenuItem("Front"));
261	586	frontItem.addActionListener(this);
262		- compositeItem = menu.add(new MenuItem("Composite"));
263		- compositeItem.addActionListener(this);
	587	+// compositeItem = menu.add(new MenuItem("Composite"));
	588	+// compositeItem.addActionListener(this);
	589	+
	590	+ if (Globals.ADVANCED)
	591	+ {
264	592	hideItem = menu.add(new MenuItem("Hidden Group"));
265	593	hideItem.addActionListener(this);
	594	+ }
266	595	ungroupItem = menu.add(new MenuItem("Ungroup"));
267	596	ungroupItem.addActionListener(this);
268		- menu.add("-");
269		- randomItem = menu.add(new MenuItem("Switch node"));
270		- randomItem.addActionListener(this);
	597	+
	598	+// menu.add("-");
	599	+//
	600	+// switchItem = menu.add(new MenuItem("Switch node"));
	601	+// switchItem.addActionListener(this);
	602	+ if (Globals.ADVANCED)
	603	+ {
271	604	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
272	605	switchGeoItem.addActionListener(this);
273	606	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -275,8 +608,6 @@
275	608	morphItem = menu.add(new MenuItem("Morph Group"));
276	609	morphItem.addActionListener(this);
277	610
278		- if (Globals.ADVANCED)
279		- {
280	611	menu.add("-");
281	612	physicsItem = menu.add(new MenuItem("Physics"));
282	613	physicsItem.addActionListener(this);
..	..	@@ -284,30 +615,29 @@
284	615	frameselectorItem.addActionListener(this);
285	616	scriptNodeItem = menu.add(new MenuItem("Script Node"));
286	617	scriptNodeItem.addActionListener(this);
287		- cameraItem = menu.add(new MenuItem("Camera"));
288		- cameraItem.addActionListener(this);
289	618	}
290	619
291	620	oe.menuBar.add(menu = new Menu("Object"));
292		- textureItem = menu.add(new MenuItem("Texture"));
293		- textureItem.addActionListener(this);
	621	+// textureItem = menu.add(new MenuItem("Texture"));
	622	+// textureItem.addActionListener(this);
294	623	billboardItem = menu.add(new MenuItem("Billboard"));
295	624	billboardItem.addActionListener(this);
296	625	csgItem = menu.add(new MenuItem("CSG"));
297	626	csgItem.addActionListener(this);
298		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	627	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
299	628	shadowXItem.addActionListener(this);
300		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	629	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
301	630	shadowYItem.addActionListener(this);
302		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	631	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
303	632	shadowZItem.addActionListener(this);
	633	+ attributeItem = menu.add(new MenuItem("Attribute"));
	634	+ attributeItem.addActionListener(this);
	635	+
304	636	if (Globals.ADVANCED)
305	637	{
306	638	menu.add("-");
307	639	linkerItem = menu.add(new MenuItem("Linker"));
308	640	linkerItem.addActionListener(this);
309		- attributeItem = menu.add(new MenuItem("Attribute"));
310		- attributeItem.addActionListener(this);
311	641	templateItem = menu.add(new MenuItem("Template"));
312	642	templateItem.addActionListener(this);
313	643	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -318,8 +648,12 @@
318	648	resetTransformItem.addActionListener(this);
319	649	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
320	650	resetCentroidItem.addActionListener(this);
321		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
322		- transformgeometryItem.addActionListener(this);
	651	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	652	+ resetCentroidXZItem.addActionListener(this);
	653	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	654	+ transformGeometryItem.addActionListener(this);
	655	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	656	+ transformChildrenItem.addActionListener(this);
323	657
324	658	oe.menuBar.add(menu = new Menu("Geometry"));
325	659	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -332,7 +666,7 @@
332	666	genNormalsMESHItem.addActionListener(this);
333	667	if (Globals.ADVANCED)
334	668	{
335		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	669	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
336	670	genNormalsMINEItem.addActionListener(this);
337	671	}
338	672	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -368,6 +702,10 @@
368	702	oe.menuBar.add(menu = new Menu("Attributes"));
369	703	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
370	704	clearMaterialsItem.addActionListener(this);
	705	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	706	+ resetAllItem.addActionListener(this);
	707	+ stepAllItem = menu.add(new MenuItem("Step All"));
	708	+ stepAllItem.addActionListener(this);
371	709	menu.add("-");
372	710	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
373	711	liveleavesItem.addActionListener(this);
..	..	@@ -388,6 +726,14 @@
388	726	markleavesItem.addActionListener(this);
389	727	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
390	728	unmarkleavesItem.addActionListener(this);
	729	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	730	+ rewindleavesItem.addActionListener(this);
	731	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	732	+ unrewindleavesItem.addActionListener(this);
	733	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	734	+ randomleavesItem.addActionListener(this);
	735	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	736	+ unrandomleavesItem.addActionListener(this);
391	737	menu.add("-");
392	738	flipVItem = menu.add(new MenuItem("Flip V"));
393	739	flipVItem.addActionListener(this);
..	..	@@ -413,50 +759,56 @@
413	759	attachBumpItem.addActionListener(this);
414	760	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
415	761	pigmentBumpItem.addActionListener(this);
	762	+ //embedTexturesItem
416	763	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
417	764	detachPigmentItem.addActionListener(this);
418	765	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
419	766	detachBumpItem.addActionListener(this);
	767	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	768	+ embedTexturesItem.addActionListener(this);
	769	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	770	+ deEmbedTexturesItem.addActionListener(this);
420	771	menu.add("-");
421	772	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
422	773	sortbysizeItem.addActionListener(this);
423	774	sortbynameItem = menu.add(new MenuItem("Sort by name"));
424	775	sortbynameItem.addActionListener(this);
	776	+ menu.add("-");
	777	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	778	+ shareGeometriesItem.addActionListener(this);
	779	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	780	+ mergeGeometriesItem.addActionListener(this);
425	781	if (Globals.ADVANCED)
426	782	{
427		- menu.add("-");
	783	+ // Pretty much the same as duplicate and clone.
428	784	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
429	785	extractGeometriesItem.addActionListener(this);
430	786	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
431	787	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	788	}
437	789
438	790	oe.menuBar.add(menu = new Menu("Insert"));
439	791	buildCreateMenu(menu);
440	792
441		- oe.menuBar.add(menu = new Menu("Include"));
442		- importOBJItem = menu.add(new MenuItem("OBJ file..."));
443		- importOBJItem.addActionListener(this);
444		- menu.add("-");
445		- import3DSItem = menu.add(new MenuItem("3DS file..."));
446		- import3DSItem.addActionListener(this);
447		- menu.add("-");
448		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
449		- importVRMLX3DItem.addActionListener(this);
450		- menu.add("-");
451		- importGFDItem = menu.add(new MenuItem("GrafreeD file..."));
452		- importGFDItem.addActionListener(this);
453		-
454	793	oe.menuBar.add(menu = new Menu("Tools"));
455	794	buildToolsMenu(menu);
456	795	}
457	796
	797	+
458	798	void SetupUI2(ObjEditor oe)
459	799	{
	800	+ // June 2019
	801	+ if (oe == null)
	802	+ {
	803	+ //super.SetupUI2(this);
	804	+ //return;
	805	+ }
	806	+
	807	+ if (copy != group)
	808	+ {
	809	+ //super.SetupUI2(this);
	810	+ }
	811	+
460	812	//new Exception().printStackTrace();
461	813
462	814	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -485,97 +837,237 @@
485	837	oe.radioPanel.add(dummyButton);
486	838	oe.buttonGroup.add(dummyButton);
487	839	*/
	840	+ cGridBag copyOptionsPanel = new cGridBag();
	841	+
	842	+ copyOptionsPanel.preferredHeight = 2;
	843	+
488	844	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
489	845
490		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
491		- liveCB.setToolTipText("Enabled animation");
	846	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	847	+ //minButton.setToolTipText("Minimize window");
	848	+ //minButton.addActionListener(this);
	849	+
	850	+ if (Globals.ADVANCED)
	851	+ {
	852	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	853	+ maxButton.setToolTipText("Maximize window");
	854	+ maxButton.addActionListener(this);
	855	+ }
	856	+
	857	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	858	+ fullButton.setToolTipText("Full-screen window");
	859	+ fullButton.addActionListener(this);
	860	+
	861	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	862	+ screenfitButton.setToolTipText("Screen fit");
	863	+ screenfitButton.addActionListener(this);
	864	+
	865	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	866	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	867	+ restoreCameraButton.addActionListener(this);
	868	+
	869	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	870	+ saveButton.setToolTipText("New version");
	871	+ saveButton.addActionListener(this);
	872	+
	873	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	874	+ undoButton.setToolTipText("Previous version");
	875	+ undoButton.addActionListener(this);
	876	+ undoButton.setEnabled(false);
	877	+
	878	+ cGridBag updown = new cGridBag().setVertical(true);
	879	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	880	+ restoreButton.setToolTipText("Restore current");
	881	+ restoreButton.addActionListener(this);
	882	+ restoreButton.setEnabled(false);
	883	+
	884	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	885	+ replaceButton.setToolTipText("Replace current");
	886	+ replaceButton.addActionListener(this);
	887	+ replaceButton.setEnabled(false);
	888	+
	889	+ copyOptionsPanel.add(updown);
	890	+
	891	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	892	+ redoButton.setToolTipText("Next version");
	893	+ redoButton.addActionListener(this);
	894	+ redoButton.setEnabled(false);
	895	+
	896	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	897	+ liveCB.setToolTipText("Enable animation");
492	898	liveCB.addItemListener(this);
493	899
494		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	900	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
495	901	oneStepButton.setToolTipText("Animate one step forward");
496	902	oneStepButton.addActionListener(this);
497	903
498		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	904	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
499	905	fastCB.setToolTipText("Fast mode");
500	906	fastCB.addItemListener(this);
501	907
502		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
503		- trackCB.setToolTipText("Enable tracking");
504		- trackCB.addItemListener(this);
505		-
506		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
507		- screenfitButton.setToolTipText("Screen fit");
508		- screenfitButton.addActionListener(this);
	908	+ //oe.toolboxPanel.Return();
	909	+
	910	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	911	+// trackCB.setToolTipText("Enable tracking");
	912	+// trackCB.addItemListener(this);
509	913
510	914	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
511	915	// screenfitpointButton.addActionListener(this);
512	916
513	917	if (Globals.ADVANCED)
514	918	{
515		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	919	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
516	920	snapobjectButton.addActionListener(this);
517	921	snapobjectButton.setToolTipText("Snap Object");
	922	+
	923	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	924	+ fourButton.addActionListener(this);
	925	+ fourButton.setToolTipText("Show control panel only");
518	926	}
519	927
520		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
521		- flashSelectionButton.setToolTipText("Show selection");
522		- flashSelectionButton.addActionListener(this);
	928	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
523	929
524		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
525		-
526		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
527		- twoButton.setToolTipText("Show center view only");
	930	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	931	+ twoButton.setToolTipText("Show 3D view only");
528	932	twoButton.addActionListener(this);
529		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
530		- fourButton.addActionListener(this);
531		- fourButton.setToolTipText("Show left panel only");
532		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
533		- sixButton.setToolTipText("2-column layout left");
534		- sixButton.addActionListener(this);
535		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
536		- threeButton.setToolTipText("2-column layout right");
	933	+ this.fullscreenLayout = twoButton;
	934	+
	935	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	936	+ threeButton.setToolTipText("Show controls and 3D view");
537	937	threeButton.addActionListener(this);
538		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
539		- sevenButton.setToolTipText("3-column layout");
540		- sevenButton.addActionListener(this);
	938	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	939	+ sixButton.setToolTipText("Show 3D view and controls");
	940	+ sixButton.addActionListener(this);
	941	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	942	+// sevenButton.setToolTipText("3-column layout");
	943	+// sevenButton.addActionListener(this);
541	944	//
542	945
543		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
544		- rootButton.setToolTipText("Edit selection in new tab");
	946	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	947	+ rootButton.setToolTipText("Open selection in new tab");
545	948	rootButton.addActionListener(this);
546	949
547		- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	950	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
548	951	closeButton.setToolTipText("Close tab");
549	952	closeButton.addActionListener(this);
550	953	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
551	954	//clearButton.addActionListener(this);
552		-
553		- cGridBag commandsPanel = new cGridBag();
	955	+
	956	+ cGridBag row1 = new cGridBag();
554	957
555		- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
556		- editButton.setToolTipText("Edit selection");
	958	+ // INSERT
	959	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	960	+ gridButton.setToolTipText("Create grid");
	961	+ gridButton.addActionListener(this);
	962	+
	963	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	964	+ boxButton.setToolTipText("Create box");
	965	+ boxButton.addActionListener(this);
	966	+
	967	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	968	+ sphereButton.setToolTipText("Create sphere");
	969	+ sphereButton.addActionListener(this);
	970	+
	971	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	972	+ coneButton.setToolTipText("Create cone");
	973	+ coneButton.addActionListener(this);
	974	+
	975	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	976	+ torusButton.setToolTipText("Create torus");
	977	+ torusButton.addActionListener(this);
	978	+
	979	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	980	+ superButton.setToolTipText("Create superellipsoid");
	981	+ superButton.addActionListener(this);
	982	+
	983	+ if (Globals.ADVANCED)
	984	+ {
	985	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	986	+ kleinButton.setToolTipText("Create Klein bottle");
	987	+ kleinButton.addActionListener(this);
	988	+ }
	989	+
	990	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	991	+ particlesButton.setToolTipText("Create particle system");
	992	+ particlesButton.addActionListener(this);
	993	+
	994	+ oe.toolboxPanel.add(row1);
	995	+
	996	+ cGridBag row2 = new cGridBag();
	997	+
	998	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	999	+ groupButton.setToolTipText("Create group");
	1000	+ groupButton.addActionListener(this);
	1001	+
	1002	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1003	+ compositeButton.setToolTipText("Create composite");
	1004	+ compositeButton.addActionListener(this);
	1005	+
	1006	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1007	+ switchButton.setToolTipText("Create item switcher");
	1008	+ switchButton.addActionListener(this);
	1009	+
	1010	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1011	+ loopButton.setToolTipText("Create loop");
	1012	+ loopButton.addActionListener(this);
	1013	+
	1014	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1015	+ textureButton.setToolTipText("Create texture");
	1016	+ textureButton.addActionListener(this);
	1017	+
	1018	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1019	+ overlayButton.setToolTipText("Create overlay");
	1020	+ overlayButton.addActionListener(this);
	1021	+
	1022	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1023	+ lightButton.setToolTipText("Create light");
	1024	+ lightButton.addActionListener(this);
	1025	+
	1026	+ oe.toolboxPanel.add(row2);
	1027	+
	1028	+ // ENVYMAPS
	1029	+ cGridBag skyboxpane = new cGridBag();
	1030	+ skyboxpane.preferredHeight = 100;
	1031	+
	1032	+ oe.toolboxPanel.add(skyboxpane);
	1033	+
	1034	+ JTabbedPane skyboxpanel = new JTabbedPane();
	1035	+ skyboxpane.add(skyboxpanel);
	1036	+
	1037	+ AddSkyboxTab0(skyboxpanel);
	1038	+ AddSkyboxTab1(skyboxpanel);
	1039	+ AddSkyboxTab2(skyboxpanel);
	1040	+
	1041	+ // EDIT panel
	1042	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1043	+ editButton.setToolTipText("Pin selection controls");
557	1044	editButton.addActionListener(this);
558	1045
559		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
560		- uneditButton.setToolTipText("Unedit selection");
	1046	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1047	+ uneditButton.setToolTipText("Remove selection controls");
561	1048	uneditButton.addActionListener(this);
562	1049
563		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
564		- allParamsButton.setToolTipText("Edit all params");
	1050	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1051	+ allParamsButton.setToolTipText("Show all controle");
565	1052	allParamsButton.addActionListener(this);
566	1053
567		- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1054	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
568	1055	clearPanelButton.setToolTipText("Clear edit panel");
569	1056	clearPanelButton.addActionListener(this);
570	1057
571		- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1058	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
572	1059	unselectButton.setToolTipText("Unselect");
573	1060	unselectButton.addActionListener(this);
574	1061
575		- commandsPanel.preferredHeight = 1;
	1062	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1063	+ flashSelectionButton.setToolTipText("Highlight selection");
	1064	+ flashSelectionButton.addActionListener(this);
576	1065
577		- oe.treePanel.add(commandsPanel);
578		- oe.treePanel.Return();
	1066	+ editCommandsPanel.preferredHeight = 1;
	1067	+
	1068	+ SetPinStates(false);
	1069	+// oe.treePanel.add(commandsPanel);
	1070	+// oe.treePanel.Return();
579	1071
580	1072	// oe.aConstraints.gridx += 1;
581	1073	// oe.aConstraints.weighty = 0;
..	..	@@ -592,32 +1084,20 @@
592	1084
593	1085	JScrollPane jSP;
594	1086	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
595		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1087	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
596	1088	ResetModel();
597	1089
598	1090	oe.treePanel.add(jSPPanel);
599	1091	oe.treePanel.Return();
600	1092
601		- cGridBag copyOptionsPanel = new cGridBag();
602		-
603		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
604		- colorCB.setToolTipText("Copy color when dropped");
605		- colorCB.addItemListener(this);
606		-
607		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
608		- materialCB.setToolTipText("Copy material when dropped");
609		- materialCB.addItemListener(this);
610		-
611		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
612		- textureCB.setToolTipText("Copy texture when dropped");
613		- textureCB.addItemListener(this);
614		-
615		- copyOptionsPanel.preferredHeight = 1;
616	1093	oe.treePanel.add(copyOptionsPanel);
617	1094	oe.treePanel.Return();
	1095	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1096	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1097	+ sliderPane.preferredHeight = 1;
618	1098
619		-// mainPanel.setDividerLocation(0.5); //1.0);
620		-// mainPanel.setResizeWeight(0.5);
	1099	+// mainPanel.setDividerLocation(0.1); //1.0);
	1100	+ mainPanel.setResizeWeight(0.4);
621	1101
622	1102	//jList.addListSelectionListener(this);
623	1103	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -625,7 +1105,7 @@
625	1105	//jTree.setEditable(true);
626	1106	oe.jTree.setDragEnabled(true);
627	1107	//jTree.setPreferredSize(new Dimension(10,10));
628		- jSP.setPreferredSize(new Dimension(100,200));
	1108	+ //jSP.setPreferredSize(new Dimension(100,200));
629	1109
630	1110	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
631	1111
..	..	@@ -637,29 +1117,49 @@
637	1117	dgr.addDragGestureListener(this);
638	1118	}catch(Exception e) {}
639	1119	*/
640		- radio.layout = sevenButton;
	1120	+ radio.layout = sixButton; // sevenButton;
641	1121	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
642	1122	}
643	1123
644	1124	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
645	1125	{
	1126	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1127	+ colorCB.setToolTipText("Copy color when dropped");
	1128	+ colorCB.addItemListener(this);
	1129	+
	1130	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1131	+ materialCB.setToolTipText("Copy material when dropped");
	1132	+ materialCB.addItemListener(this);
	1133	+
	1134	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1135	+ textureCB.setToolTipText("Copy texture when dropped");
	1136	+ textureCB.addItemListener(this);
	1137	+
	1138	+ panel.Return();
	1139	+
646	1140	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
647	1141	boxCB.setToolTipText("Display bounding boxes");
648	1142	boxCB.addItemListener(this);
649	1143
650	1144	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
651		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1145	+ zoomBoxCB.setToolTipText("Display only for wheel");
652	1146	zoomBoxCB.addItemListener(this);
653	1147
654		- if (Globals.ADVANCED)
	1148	+ if (true) // Globals.ADVANCED)
655	1149	{
656		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
657		- supportCB.setToolTipText("Enable rigging");
658		- supportCB.addItemListener(this);
	1150	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1151	+// supportCB.setToolTipText("Enable rigging");
	1152	+// supportCB.addItemListener(this);
	1153	+
	1154	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1155	+ freezeCB.setToolTipText("Fast moving camera");
	1156	+ freezeCB.addItemListener(this);
659	1157
660	1158	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
661	1159	// localCB.addItemListener(this);
662	1160
	1161	+ panel.Return();
	1162	+
663	1163	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
664	1164	crowdCB.setToolTipText("Used for crowds");
665	1165	crowdCB.addItemListener(this);
..	..	@@ -676,6 +1176,8 @@
676	1176	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
677	1177	// speakerMocapCB.addItemListener(this);
678	1178
	1179	+ panel.Return();
	1180	+
679	1181	if (false)
680	1182	{
681	1183	// handled in scripts
..	..	@@ -690,42 +1192,85 @@
690	1192	//constraints.gridy += 1;
691	1193	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
692	1194	smoothfocusCB.addItemListener(this);
	1195	+ panel.Return();
693	1196	}
694	1197
695	1198	//constraints.gridx += 1;
696	1199	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
697	1200	// debugCB.addItemListener(this);
698	1201
	1202	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1203	+ trackCB.setToolTipText("Enable tracking target");
	1204	+ trackCB.addItemListener(this);
	1205	+
699	1206	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1207	+ oeilCB.setToolTipText("Move camera when tracking");
700	1208	oeilCB.addItemListener(this);
701	1209
	1210	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1211	+ shadowCB.setToolTipText("When live compute shadows");
	1212	+ shadowCB.addItemListener(this);
	1213	+
	1214	+ panel.Return();
	1215	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1216	+ toggleTextureCB.setToolTipText("Load textures");
	1217	+ toggleTextureCB.addItemListener(this);
	1218	+
	1219	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1220	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1221	+ toggleSwitchCB.addItemListener(this);
	1222	+
	1223	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1224	+ autokeepCB.setToolTipText("On structure change");
	1225	+ autokeepCB.addItemListener(this);
	1226	+
	1227	+ panel.Return();
	1228	+ if (Globals.ADVANCED)
	1229	+ {
702	1230	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
703	1231	lookAtCB.setToolTipText("Look-at target");
704	1232	lookAtCB.addItemListener(this);
	1233	+ }
705	1234
706	1235	}
707	1236
708	1237	cGridBag fill = new cGridBag();
709		-
710	1238	fill.preferredHeight = 200;
	1239	+ cGridBag fill2 = new cGridBag();
	1240	+ fill2.preferredHeight = 200;
	1241	+ cGridBag fill3 = new cGridBag();
	1242	+ fill3.preferredHeight = 200;
711	1243
712	1244	panel.add(fill);
	1245	+ panel.add(fill2);
	1246	+ panel.add(fill3);
713	1247
714	1248	}
715	1249
716	1250	void EditObject(Object3D obj)
717	1251	{
718	1252	cRadio radioButton = new cRadio(obj.name);
	1253	+
	1254	+ // June 2019. Patch to avoid bug with transparency.
	1255	+ radioButton.hadMaterial = obj.material != null;
	1256	+ if (!radioButton.hadMaterial)
	1257	+ {
	1258	+ obj.material = new cMaterial();
	1259	+ }
	1260	+
719	1261	radioButton.SetObject(obj);
720		- radioButton.layout = sevenButton;
	1262	+ radioButton.layout = sixButton; // sevenButton;
721	1263	radioButton.SetCamera(cameraView.renderCamera, false);
722	1264	radioButton.addActionListener(this);
723	1265	radioPanel.add(radioButton);
724	1266	buttonGroup.add(radioButton);
725	1267	radioButton.doClick();
726	1268	}
	1269	+
727	1270	void SetupViews(ObjEditor oe)
728	1271	{
	1272	+ theFrame = this;
	1273	+
729	1274	oe.SetupViews();
730	1275
731	1276	System.out.println("SetupViews");
..	..	@@ -734,23 +1279,28 @@
734	1279	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
735	1280	}
736	1281
737		- JCheckBox liveCB;
738		- JCheckBox supportCB;
739		- JCheckBox localCB;
740		- JCheckBox crowdCB;
741		- JCheckBox smoothCB;
742		- JCheckBox fastCB;
743		- JCheckBox slowCB;
744		- JCheckBox boxCB;
745		- JCheckBox zoomBoxCB;
746		- JCheckBox trackCB;
747		- JCheckBox smoothfocusCB;
	1282	+ cToggleButton liveCB;
	1283	+ cCheckBox supportCB;
	1284	+ cCheckBox localCB;
	1285	+ cCheckBox crowdCB;
	1286	+ cCheckBox smoothCB;
	1287	+ cToggleButton fastCB;
	1288	+ cCheckBox slowCB;
	1289	+ cCheckBox boxCB;
	1290	+ cCheckBox zoomBoxCB;
	1291	+ cCheckBox freezeCB;
	1292	+ //cToggleButton trackCB;
	1293	+ cCheckBox trackCB;
	1294	+ cCheckBox smoothfocusCB;
748	1295	// JCheckBox speakerMocapCB;
749		- JCheckBox speakerCameraCB;
750		- JCheckBox speakerFocusCB;
751		- JCheckBox debugCB;
752		- JCheckBox oeilCB;
753		- JCheckBox lookAtCB;
	1296	+ cCheckBox speakerCameraCB;
	1297	+ cCheckBox speakerFocusCB;
	1298	+ cCheckBox debugCB;
	1299	+
	1300	+ cCheckBox oeilCB;
	1301	+ cCheckBox shadowCB;
	1302	+ cCheckBox autokeepCB;
	1303	+ cCheckBox lookAtCB;
754	1304
755	1305	// static int COLOR = 1;
756	1306	// static int MATERIAL = 2;
..	..	@@ -758,9 +1308,9 @@
758	1308
759	1309	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
760	1310
761		- JCheckBox colorCB;
762		- JCheckBox materialCB;
763		- JCheckBox textureCB;
	1311	+ cCheckBox colorCB;
	1312	+ cCheckBox materialCB;
	1313	+ cCheckBox textureCB;
764	1314
765	1315	public void itemStateChanged(ItemEvent e)
766	1316	{
..	..	@@ -788,6 +1338,7 @@
788	1338	} else if(e.getSource() == liveCB)
789	1339	{
790	1340	cameraView.ToggleLive();
	1341	+ refreshContents(false);
791	1342	}
792	1343	else if(e.getSource() == supportCB)
793	1344	{
..	..	@@ -852,6 +1403,18 @@
852	1403	{
853	1404	cameraView.ToggleOeil();
854	1405	}
	1406	+ else if(e.getSource() == shadowCB)
	1407	+ {
	1408	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1409	+ }
	1410	+ else if(e.getSource() == freezeCB)
	1411	+ {
	1412	+ Globals.FREEZEONMOVE ^= true;
	1413	+ }
	1414	+ else if(e.getSource() == autokeepCB)
	1415	+ {
	1416	+ Globals.REPLACEONMAKE ^= true;
	1417	+ }
855	1418	else if(e.getSource() == lookAtCB)
856	1419	{
857	1420	cameraView.ToggleLookAt();
..	..	@@ -868,7 +1431,8 @@
868	1431
869	1432	/**/
870	1433	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
871		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1434	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1435	+ TreePath path = objEditor.jTree.getSelectionPath();
872	1436	if ((path == null) \|\| (path.getPathCount() <= 1)) {
873	1437	// We can't move the root node or an empty selection
874	1438	return;
..	..	@@ -931,8 +1495,6 @@
931	1495	}
932	1496	}
933	1497
934		- String string = (String) object;
935		-
936	1498	System.out.println("Transfer = " + object + "; drop : " + target);
937	1499	// if( object instanceof java.io.File[])
938	1500	// {
..	..	@@ -940,7 +1502,11 @@
940	1502	// objEditor.DropFile((java.io.File[]) object, true);
941	1503	// return;
942	1504	// }
943		- if (string.charAt(0) == '/')
	1505	+
	1506	+ String string = object.toString();
	1507	+
	1508	+ // File path for Mac and Windows
	1509	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
944	1510	{
945	1511	// file(s)
946	1512	String[] names = string.split("\n");
..	..	@@ -967,7 +1533,7 @@
967	1533
968	1534	flashIt = false;
969	1535	CameraPane pane = (CameraPane) target;
970		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1536	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
971	1537	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
972	1538
973	1539	if (group.selection.size() == 1)
..	..	@@ -983,23 +1549,33 @@
983	1549
984	1550	assert target == objEditor.jTree;
985	1551	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1552	+ Object3D destinationLeaf;
986	1553	try {
987		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1554	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
988	1555	} catch (Exception e) {
989	1556	System.out.println("destinationPath : " + destinationPath);
990	1557	return;
991	1558	}
992	1559
993		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1560	+ for (int i=group.selection.size(); --i>=0;)
994	1561	{
	1562	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1563	+
	1564	+ // Cannot move into itself
	1565	+ if (child == destinationLeaf)
	1566	+ return;
	1567	+ }
	1568	+
	1569	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1570	+// {
995	1571	loadClipboard(true);
996	1572	objEditor.jTree.setSelectionPath(destinationPath);
997	1573	pasteInto(false, false);
998		- } else {
999		- loadClipboard(false);
1000		- objEditor.jTree.setSelectionPath(destinationPath);
1001		- pasteInto(false, false); // true); // ???
1002		- }
	1574	+// } else {
	1575	+// loadClipboard(false);
	1576	+// objEditor.jTree.setSelectionPath(destinationPath);
	1577	+// pasteInto(false, false); // true); // ???
	1578	+// }
1003	1579	}
1004	1580	public void dropActionChanged(DropTargetDragEvent dtde)
1005	1581	// Called if the user has modified the current drop gesture
..	..	@@ -1104,22 +1680,30 @@
1104	1680	{
1105	1681	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1106	1682	//heightFieldItem.addActionListener(this);
1107		- gridItem = menu.add(new MenuItem("Grid"));
1108		- gridItem.addActionListener(this);
1109		- rectoidItem = menu.add(new MenuItem("Box"));
1110		- rectoidItem.addActionListener(this);
1111		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1112		- ellipsoidItem.addActionListener(this);
1113		- coneItem = menu.add(new MenuItem("Cone"));
1114		- coneItem.addActionListener(this);
1115		- torusItem = menu.add(new MenuItem("Torus"));
1116		- torusItem.addActionListener(this);
1117		- superItem = menu.add(new MenuItem("Superellipsoid"));
1118		- superItem.addActionListener(this);
	1683	+// gridItem = menu.add(new MenuItem("Grid"));
	1684	+// gridItem.addActionListener(this);
	1685	+// rectoidItem = menu.add(new MenuItem("Box"));
	1686	+// rectoidItem.addActionListener(this);
	1687	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1688	+// ellipsoidItem.addActionListener(this);
	1689	+// coneItem = menu.add(new MenuItem("Cone"));
	1690	+// coneItem.addActionListener(this);
	1691	+// torusItem = menu.add(new MenuItem("Torus"));
	1692	+// torusItem.addActionListener(this);
	1693	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1694	+// superItem.addActionListener(this);
	1695	+
	1696	+ cameraItem = menu.add(new MenuItem("Camera"));
	1697	+ cameraItem.addActionListener(this);
	1698	+
	1699	+ if (!Globals.ADVANCED)
	1700	+ {
1119	1701	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1120	1702	kleinItem.addActionListener(this);
1121		- particleItem = menu.add(new MenuItem("Particle system"));
1122		- particleItem.addActionListener(this);
	1703	+ }
	1704	+
	1705	+// particleItem = menu.add(new MenuItem("Particle system"));
	1706	+// particleItem.addActionListener(this);
1123	1707	if (Globals.ADVANCED)
1124	1708	{
1125	1709	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1145,15 +1729,15 @@
1145	1729	}
1146	1730	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1147	1731	bezierItem.addActionListener(this);
1148		- overlayItem = menu.add(new MenuItem("Overlay"));
1149		- overlayItem.addActionListener(this);
1150		- lightItem = menu.add(new MenuItem("Light"));
1151		- lightItem.addActionListener(this);
	1732	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1733	+// overlayItem.addActionListener(this);
	1734	+// lightItem = menu.add(new MenuItem("Light"));
	1735	+// lightItem.addActionListener(this);
1152	1736	menu.add("-");
1153	1737	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1154	1738	//superLoopItem.addActionListener(this);
1155		- loopItem = menu.add(new MenuItem("Loop"));
1156		- loopItem.addActionListener(this);
	1739	+// loopItem = menu.add(new MenuItem("Loop"));
	1740	+// loopItem.addActionListener(this);
1157	1741	doubleItem = menu.add(new MenuItem("Fork"));
1158	1742	doubleItem.addActionListener(this);
1159	1743	if (Globals.ADVANCED)
..	..	@@ -1169,6 +1753,9 @@
1169	1753	animationItem.addItemListener(this);
1170	1754	animationItem.setState(Globals.ANIMATION);
1171	1755
	1756	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1757	+ archiveItem.addActionListener(this);
	1758	+
1172	1759	menu.add("-");
1173	1760	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1174	1761	parseverticesItem.addActionListener(this);
..	..	@@ -1181,6 +1768,8 @@
1181	1768	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1182	1769	reduce34MorphItem.addActionListener(this);
1183	1770	menu.add("-");
	1771	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1772	+ memoryItem.addActionListener(this);
1184	1773	menu.add(computeAOItem = new MenuItem("Compute AO"));
1185	1774	computeAOItem.addActionListener(this);
1186	1775
..	..	@@ -1189,11 +1778,9 @@
1189	1778	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1190	1779	mirrorItem.addActionListener(this);
1191	1780	menu.add("-");
1192		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1193		- memoryItem.addActionListener(this);
1194	1781	menu.add(analyzeItem = new MenuItem("Analyze"));
1195	1782	analyzeItem.addActionListener(this);
1196		- menu.add(dumpItem = new MenuItem("Dump"));
	1783	+ menu.add(dumpItem = new MenuItem("Print"));
1197	1784	dumpItem.addActionListener(this);
1198	1785	// menu.add(pathItem = new MenuItem("From-to path"));
1199	1786	// pathItem.addActionListener(this);
..	..	@@ -1334,9 +1921,34 @@
1334	1921	shadow.material = new cMaterial(obj.material);
1335	1922	shadow.material.diffuse = 0.0001f;
1336	1923	shadow.material.specular = 0.0001f;
	1924	+ //shadow.projectedVertices[1].x = 300;
1337	1925
1338	1926	makeSomething(shadow);
1339	1927	}
	1928	+
	1929	+ private void ClearUnpinned()
	1930	+ {
	1931	+ //for (Object3D obj : listUI)
	1932	+ for (int i=listUI.size(); --i>=0;)
	1933	+ {
	1934	+ Object3D obj = listUI.elementAt(i);
	1935	+ if (!obj.pinned)
	1936	+ {
	1937	+ obj.CloseUI();
	1938	+ listUI.remove(i);
	1939	+ }
	1940	+ }
	1941	+ }
	1942	+
	1943	+ private void EditElement(Object3D elem, boolean newWindow)
	1944	+ {
	1945	+ // if (!(elem instanceof Composite))
	1946	+ // newWindow = false;
	1947	+ listUI.add(elem);
	1948	+ elem.openEditWindow(this, newWindow); //, false);
	1949	+ System.out.println("edit : " + elem);
	1950	+ elem.editWindow.refreshContents(true); // ? new
	1951	+ }
1340	1952
1341	1953	/**
1342	1954	* applyExample
..	..	@@ -1540,9 +2152,9 @@
1540	2152
1541	2153	void Overwrite(int mask)
1542	2154	{
1543		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2155	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1544	2156	{
1545		- Object3D content = GrafreeD.clipboard.get(0);
	2157	+ Object3D content = Grafreed.clipboard.get(0);
1546	2158
1547	2159	if (content instanceof cGroup && ((cGroup)content).transientlink )
1548	2160	content = ((cGroup)content).get(0);
..	..	@@ -1581,7 +2193,7 @@
1581	2193	{
1582	2194	ScreenFit();
1583	2195	} else
1584		- if (source == switchItem)
	2196	+ if (source == switchViewItem)
1585	2197	{
1586	2198	cVector v1 = new cVector();
1587	2199	cVector v2 = new cVector();
..	..	@@ -1590,11 +2202,11 @@
1590	2202	objEditor.cameraView.renderCamera.setAim(v2, v1);
1591	2203	objEditor.cameraView.repaint();
1592	2204	} else
1593		- if (source == rectoidItem)
	2205	+ if (source == rectoidItem \|\| source == boxButton)
1594	2206	{
1595	2207	makeSomething(new Box());
1596	2208	} else
1597		- if (source == particleItem)
	2209	+ if (source == particleItem \|\| source == particlesButton)
1598	2210	{
1599	2211	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1600	2212	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1673,27 +2285,27 @@
1673	2285
1674	2286	makeSomething(obj);
1675	2287	} else
1676		- if (source == gridItem)
	2288	+ if (source == gridItem \|\| source == gridButton)
1677	2289	{
1678	2290	makeSomething(new Grid());
1679	2291	} else
1680		- if (source == ellipsoidItem)
	2292	+ if (source == ellipsoidItem \|\| source == sphereButton)
1681	2293	{
1682	2294	makeSomething(new Sphere());
1683	2295	} else
1684		- if (source == coneItem)
	2296	+ if (source == coneItem \|\| source == coneButton)
1685	2297	{
1686	2298	makeSomething(new Cone());
1687	2299	} else
1688		- if (source == torusItem)
	2300	+ if (source == torusItem \|\| source == torusButton)
1689	2301	{
1690	2302	makeSomething(new Torus());
1691	2303	} else
1692		- if (source == superItem)
	2304	+ if (source == superItem \|\| source == superButton)
1693	2305	{
1694	2306	makeSomething(new Superellipsoid());
1695	2307	} else
1696		- if (source == kleinItem)
	2308	+ if (source == kleinItem \|\| source == kleinButton)
1697	2309	{
1698	2310	makeSomething(new Klein());
1699	2311	} else
..	..	@@ -1713,7 +2325,7 @@
1713	2325	{
1714	2326	makeSomething(new BezierSurface());
1715	2327	} else
1716		- if (source == overlayItem)
	2328	+ if (source == overlayItem \|\| source == overlayButton)
1717	2329	{
1718	2330	/*
1719	2331	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1761,10 +2373,27 @@
1761	2373	s.setup();
1762	2374	makeSomething(s);
1763	2375	} else
1764		- if (source == lightItem)
	2376	+ if (source == lightItem \|\| source == lightButton)
1765	2377	{
1766	2378	makeSomething(new Light());
1767	2379	} else
	2380	+// if (source == skybox1Button \|\|
	2381	+// source == skybox2Button \|\|
	2382	+// source == skybox3Button \|\|
	2383	+// source == skybox4Button \|\|
	2384	+// source == skybox5Button \|\|
	2385	+// source == skybox6Button \|\|
	2386	+// source == skybox7Button \|\|
	2387	+// source == skybox11Button \|\|
	2388	+// source == skybox12Button \|\|
	2389	+// source == skybox13Button \|\|
	2390	+// source == skybox14Button \|\|
	2391	+// source == skybox15Button \|\|
	2392	+// source == skybox16Button \|\|
	2393	+// source == skybox17Button)
	2394	+// {
	2395	+// ChangeSkybox(source);
	2396	+// } else
1768	2397	if (source == csgItem)
1769	2398	{
1770	2399	group(new CSG());
..	..	@@ -1811,30 +2440,30 @@
1811	2440
1812	2441	group(g);
1813	2442	} else
1814		- if (source == loopItem)
	2443	+ if (source == loopItem \|\| source == loopButton)
1815	2444	{
1816	2445	Composite csg = new GroupLeaf();
1817	2446	csg.count = 5;
1818	2447	group(csg);
1819		- Composite child = new cGroup();
	2448	+ Composite child = new cGroup("Branch");
1820	2449	csg.addChild(child);
1821	2450	child.addChild(csg);
1822	2451	} else
1823	2452	if (source == doubleItem)
1824	2453	{
1825		- Composite csg = new GroupLeaf();
	2454	+ Composite csg = new GroupLeaf("Fork");
1826	2455	csg.count = 5;
1827	2456	group(csg);
1828		- Composite child = new cGroup();
	2457	+ Composite child = new cGroup("Branch A");
1829	2458	csg.addChild(child);
1830	2459	child.addChild(csg);
1831		- child = new cGroup();
	2460	+ child = new cGroup("Branch B");
1832	2461	csg.addChild(child);
1833	2462	child.addChild(csg);
1834	2463	} else
1835	2464	if (source == tripleItem)
1836	2465	{
1837		- Composite csg = new GroupLeaf();
	2466	+ Composite csg = new GroupLeaf("Trident");
1838	2467	csg.count = 4;
1839	2468	group(csg);
1840	2469	Composite child = new cGroup();
..	..	@@ -1847,35 +2476,10 @@
1847	2476	csg.addChild(child);
1848	2477	child.addChild(csg);
1849	2478	} else
1850		-
1851		- if (source == importGFDItem)
1852		- {
1853		- ImportGFD();
1854		- } else
1855		- if (source == importVRMLX3DItem)
1856		- {
1857		- ImportVRMLX3D();
1858		- } else
1859		- if (source == import3DSItem)
1860		- {
1861		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1862		- } else
1863		- if (source == importOBJItem)
1864		- {
1865		- //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1866		- FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
1867		- browser.setVisible(true);
1868		- String filename = browser.getFile();
1869		- if (filename != null && filename.length() > 0)
1870		- {
1871		- String fullname = browser.getDirectory() + filename;
1872		- makeSomething(ReadOBJ(fullname), true);
1873		- }
1874		- } else
1875	2479	if (source == computeAOItem)
1876	2480	{
1877	2481	Globals.drawMode = CameraPane.OCCLUSION;
1878		- Globals.theRenderer.repaint();
	2482	+ cameraView.repaint();
1879	2483	} else
1880	2484	if (source == recompileItem)
1881	2485	{
..	..	@@ -1890,7 +2494,7 @@
1890	2494	if (source == invariantsItem)
1891	2495	{
1892	2496	System.out.println("Invariants:");
1893		- GrafreeD.grafreeD.universe.invariants();
	2497	+ Grafreed.grafreeD.universe.invariants();
1894	2498	} else
1895	2499	if (source == memoryItem)
1896	2500	{
..	..	@@ -1909,6 +2513,46 @@
1909	2513	{
1910	2514	DumpObject();
1911	2515	} else
	2516	+ if (source == minButton)
	2517	+ {
	2518	+ Minimize();
	2519	+ } else
	2520	+ if (source == maxButton)
	2521	+ {
	2522	+ Maximize();
	2523	+ } else
	2524	+ if (source == fullButton)
	2525	+ {
	2526	+ ToggleFullScreen();
	2527	+ } else
	2528	+ if (source == undoButton)
	2529	+ {
	2530	+ // Go to previous version
	2531	+ //if (!Undo())
	2532	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2533	+ Undo();
	2534	+ } else
	2535	+ if (source == restoreButton)
	2536	+ {
	2537	+ // Restore current version
	2538	+ Restore();
	2539	+ } else
	2540	+ if (source == replaceButton)
	2541	+ {
	2542	+ // Overwrite current version
	2543	+ Replace();
	2544	+ } else
	2545	+ if (source == redoButton)
	2546	+ {
	2547	+ // Go to next version
	2548	+ Redo();
	2549	+ } else
	2550	+ if (source == saveButton)
	2551	+ {
	2552	+ // Save a new version
	2553	+ if (!Save(true))
	2554	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2555	+ } else
1912	2556	if (source == oneStepButton)
1913	2557	{
1914	2558	Globals.ONESTEP = true;
..	..	@@ -1916,17 +2560,14 @@
1916	2560	} else
1917	2561	if (source == screenfitButton)
1918	2562	{
1919		- //Reload(lastConverter, lastFilename, true);
1920	2563	ScreenFit();
1921	2564	} else
1922	2565	if (source == screenfitpointButton)
1923	2566	{
1924		- //Reload(lastConverter, lastFilename, true);
1925	2567	ScreenFitPoint();
1926	2568	} else
1927	2569	if (source == snapobjectButton)
1928	2570	{
1929		- //Reload(lastConverter, lastFilename, true);
1930	2571	SnapObject();
1931	2572	} else
1932	2573	// if (event.getSource() == recompileButton)
..	..	@@ -1963,12 +2604,20 @@
1963	2604	{
1964	2605	loadClipboard(true);
1965	2606	} else
	2607	+ if (source == undoItem)
	2608	+ {
	2609	+ Undo();
	2610	+ } else
	2611	+ if (source == redoItem)
	2612	+ {
	2613	+ Redo();
	2614	+ } else
1966	2615	if (source == duplicateItem)
1967	2616	{
1968		- Object3D keep = GrafreeD.clipboard;
	2617	+ Object3D keep = Grafreed.clipboard;
1969	2618	loadClipboard(false);
1970	2619	paste(false);
1971		- GrafreeD.clipboard = keep;
	2620	+ Grafreed.clipboard = keep;
1972	2621	} else
1973	2622	if (source == cloneItem)
1974	2623	{
..	..	@@ -2188,9 +2837,9 @@
2188	2837	// group.selection.get(0).setMasterThis(content); // should be identity
2189	2838	// refreshContents();
2190	2839	// }
2191		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2840	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2192	2841	{
2193		- Object3D content = GrafreeD.clipboard.get(0);
	2842	+ Object3D content = Grafreed.clipboard.get(0);
2194	2843
2195	2844	if (content instanceof cGroup && ((cGroup)content).transientlink )
2196	2845	content = ((cGroup)content).get(0);
..	..	@@ -2240,9 +2889,9 @@
2240	2889	} else
2241	2890	if (source == setMasterItem)
2242	2891	{
2243		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2892	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2244	2893	{
2245		- Object3D content = GrafreeD.clipboard.get(0);
	2894	+ Object3D content = Grafreed.clipboard.get(0);
2246	2895
2247	2896	if (content instanceof cGroup && ((cGroup)content).transientlink )
2248	2897	content = ((cGroup)content).get(0);
..	..	@@ -2255,9 +2904,9 @@
2255	2904	{
2256	2905	if (group.selection.size() == 1)
2257	2906	{
2258		- if (GrafreeD.clipboard.size() == 1)
	2907	+ if (Grafreed.clipboard.size() == 1)
2259	2908	{
2260		- Object3D content = GrafreeD.clipboard.get(0);
	2909	+ Object3D content = Grafreed.clipboard.get(0);
2261	2910
2262	2911	if (content instanceof cGroup && ((cGroup)content).transientlink )
2263	2912	content = ((cGroup)content).get(0);
..	..	@@ -2274,7 +2923,7 @@
2274	2923	{
2275	2924	RevertMeshes();
2276	2925	} else
2277		- if (source == resetMeshItem)
	2926	+ if (source == resetAllItem)
2278	2927	{
2279	2928	ResetAll();
2280	2929	} else
..	..	@@ -2282,7 +2931,7 @@
2282	2931	{
2283	2932	StepAll();
2284	2933	} else
2285		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	2934	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2286	2935	{
2287	2936	//int indices[] = jList.getSelectedIndices();
2288	2937	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2294,9 +2943,9 @@
2294	2943	{
2295	2944	ClearSelection(true);
2296	2945	} else
2297		- if (source == grabItem)
	2946	+ if (source == grabItem \|\| source == groupButton)
2298	2947	{
2299		- group(new cGroup(), true);
	2948	+ group(new cGroup(), false); // true);
2300	2949	} else
2301	2950	if (source == hideItem)
2302	2951	{
..	..	@@ -2314,11 +2963,11 @@
2314	2963	{
2315	2964	makeSomething(new Camera());
2316	2965	} else
2317		- if (source == compositeItem)
	2966	+ if (source == compositeItem \|\| source == compositeButton)
2318	2967	{
2319	2968	group(new Composite());
2320	2969	} else
2321		- if (source == randomItem)
	2970	+ if (source == switchItem \|\| source == switchButton)
2322	2971	{
2323	2972	RandomNode random = new RandomNode();
2324	2973	group(random);
..	..	@@ -2420,7 +3069,7 @@
2420	3069	{
2421	3070	group(new cLinker());
2422	3071	} else
2423		- if (source == textureItem)
	3072	+ if (source == textureItem \|\| source == textureButton)
2424	3073	{
2425	3074	group(new TextureNode());
2426	3075	} else
..	..	@@ -2440,17 +3089,30 @@
2440	3089	{
2441	3090	CastShadow(2);
2442	3091	} else
2443		- if (source == ungroupItem)
	3092	+ if (source == ungroupItem \|\| source == ungroupButton)
2444	3093	{
2445		- //ungroup();
	3094	+ boolean hasRoot = false;
	3095	+
2446	3096	for (int i=0; i<group.selection.size(); i++)
2447	3097	{
2448		- Ungroup(group.selection.get(i));
	3098	+ if (group.selection.get(i) == group)
	3099	+ {
	3100	+ hasRoot = true;
	3101	+ break;
	3102	+ }
2449	3103	}
2450	3104
2451		- ClearSelection(false);
2452		-
2453		- refreshContents();
	3105	+ if (!hasRoot)
	3106	+ {
	3107	+ for (int i=0; i<group.selection.size(); i++)
	3108	+ {
	3109	+ Ungroup(group.selection.get(i));
	3110	+ }
	3111	+
	3112	+ ClearSelection(false);
	3113	+
	3114	+ refreshContents();
	3115	+ }
2454	3116	} else
2455	3117	if (source == genUVItem)
2456	3118	{
..	..	@@ -2462,7 +3124,7 @@
2462	3124	} else
2463	3125	if (source == genNormalsMESHItem)
2464	3126	{
2465		- GenNormals(true); // TODO
	3127	+ GenNormalsMESH();
2466	3128	} else
2467	3129	if (source == genNormalsORGANItem)
2468	3130	{
..	..	@@ -2527,6 +3189,22 @@
2527	3189	if (source == unmarkleavesItem)
2528	3190	{
2529	3191	MarkLeaves(false);
	3192	+ } else
	3193	+ if (source == rewindleavesItem)
	3194	+ {
	3195	+ RewindLeaves(true);
	3196	+ } else
	3197	+ if (source == unrewindleavesItem)
	3198	+ {
	3199	+ RewindLeaves(false);
	3200	+ } else
	3201	+ if (source == randomleavesItem)
	3202	+ {
	3203	+ RandomLeaves(true);
	3204	+ } else
	3205	+ if (source == unrandomleavesItem)
	3206	+ {
	3207	+ RandomLeaves(false);
2530	3208	} else
2531	3209	if (source == flipVItem)
2532	3210	{
..	..	@@ -2612,9 +3290,13 @@
2612	3290	{
2613	3291	SmoothMesh();
2614	3292	} else
2615		- if (source == transformgeometryItem)
	3293	+ if (source == transformGeometryItem)
2616	3294	{
2617	3295	TransformGeometry();
	3296	+ } else
	3297	+ if (source == transformChildrenItem)
	3298	+ {
	3299	+ TransformChildren();
2618	3300	} else
2619	3301	if (source == resetTransformItem)
2620	3302	{
..	..	@@ -2622,7 +3304,11 @@
2622	3304	} else
2623	3305	if (source == resetCentroidItem)
2624	3306	{
2625		- ResetCentroid();
	3307	+ ResetCentroid(true);
	3308	+ } else
	3309	+ if (source == resetCentroidXZItem)
	3310	+ {
	3311	+ ResetCentroid(false);
2626	3312	} else
2627	3313	if (source == resetParentItem)
2628	3314	{
..	..	@@ -2727,7 +3413,7 @@
2727	3413	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2728	3414	{
2729	3415	obj = (Object3D)e.nextElement();
2730		- obj.SetBumpTexture(null);
	3416	+ obj.ResetBumpTexture();
2731	3417	}
2732	3418
2733	3419	refreshContents();
..	..	@@ -2743,6 +3429,31 @@
2743	3429
2744	3430	refreshContents();
2745	3431	} else
	3432	+ if (source == embedTexturesItem)
	3433	+ {
	3434	+ Object3D obj;
	3435	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3436	+ {
	3437	+ obj = (Object3D)e.nextElement();
	3438	+ obj.EmbedTextures(true);
	3439	+ }
	3440	+
	3441	+ refreshContents();
	3442	+ } else
	3443	+ if (source == deEmbedTexturesItem)
	3444	+ {
	3445	+ Object3D obj;
	3446	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3447	+ {
	3448	+ obj = (Object3D)e.nextElement();
	3449	+ obj.EmbedTextures(false);
	3450	+ }
	3451	+
	3452	+ CameraPane.texturepigment.clear();
	3453	+ CameraPane.texturebump.clear();
	3454	+
	3455	+ refreshContents();
	3456	+ } else
2746	3457	if (source == flashSelectionButton)
2747	3458	{
2748	3459	CameraPane.flash = true;
..	..	@@ -2754,6 +3465,10 @@
2754	3465	if (source == twoButton)
2755	3466	{
2756	3467	radio.layout = twoButton;
	3468	+
	3469	+ if (CameraPane.FULLSCREEN)
	3470	+ fullscreenLayout = radio.layout;
	3471	+
2757	3472	// bug
2758	3473	//gridPanel.setDividerLocation(1.0);
2759	3474	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2786,10 +3501,31 @@
2786	3501	bigThree.ClearUI();
2787	3502	bigThree.add(centralPanel);
2788	3503	bigThree.FlushUI();
	3504	+
	3505	+ cameraView.requestFocusInWindow();
	3506	+
	3507	+// refreshContents(true);
	3508	+//
	3509	+// try
	3510	+// {
	3511	+// java.awt.Robot bot = new java.awt.Robot();
	3512	+// int mask = InputEvent.BUTTON1_MASK;
	3513	+// bot.mouseMove(100, 100);
	3514	+// bot.mousePress(mask);
	3515	+// bot.mouseRelease(mask);
	3516	+// }
	3517	+// catch (Exception e)
	3518	+// {
	3519	+//
	3520	+// }
	3521	+
2789	3522	} else
2790	3523	if (source == threeButton)
2791	3524	{
2792	3525	radio.layout = threeButton;
	3526	+
	3527	+ if (CameraPane.FULLSCREEN)
	3528	+ fullscreenLayout = radio.layout;
2793	3529
2794	3530	// bigThree.remove(scenePanel);
2795	3531	// bigThree.remove(centralPanel);
..	..	@@ -2819,13 +3555,18 @@
2819	3555	// centralPanel.setVisible(true);
2820	3556	// XYZPanel.setVisible(true);
2821	3557	bigThree.ClearUI();
	3558	+ bigThree.add(scenePanel);
2822	3559	bigThree.add(centralPanel);
2823		- bigThree.add(XYZPanel);
2824	3560	bigThree.FlushUI();
	3561	+
	3562	+ cameraView.requestFocusInWindow();
2825	3563	} else
2826	3564	if (source == fourButton)
2827	3565	{
2828	3566	radio.layout = fourButton;
	3567	+
	3568	+ if (CameraPane.FULLSCREEN)
	3569	+ fullscreenLayout = radio.layout;
2829	3570
2830	3571	// bigThree.remove(scenePanel);
2831	3572	// bigThree.remove(centralPanel);
..	..	@@ -2857,10 +3598,15 @@
2857	3598	bigThree.ClearUI();
2858	3599	bigThree.add(scenePanel);
2859	3600	bigThree.FlushUI();
	3601	+
	3602	+ cameraView.requestFocusInWindow();
2860	3603	} else
2861	3604	if (source == sixButton)
2862	3605	{
2863	3606	radio.layout = sixButton;
	3607	+
	3608	+ if (CameraPane.FULLSCREEN)
	3609	+ fullscreenLayout = radio.layout;
2864	3610
2865	3611	// bigThree.remove(scenePanel);
2866	3612	// bigThree.remove(centralPanel);
..	..	@@ -2890,13 +3636,18 @@
2890	3636	// centralPanel.setVisible(true);
2891	3637	// XYZPanel.setVisible(false);
2892	3638	bigThree.ClearUI();
2893		- bigThree.add(scenePanel);
2894	3639	bigThree.add(centralPanel);
	3640	+ bigThree.add(scenePanel);
2895	3641	bigThree.FlushUI();
	3642	+
	3643	+ cameraView.requestFocusInWindow();
2896	3644	} else
2897	3645	if (source == sevenButton)
2898	3646	{
2899	3647	radio.layout = sevenButton;
	3648	+
	3649	+ if (CameraPane.FULLSCREEN)
	3650	+ fullscreenLayout = radio.layout;
2900	3651
2901	3652	// bigThree.remove(scenePanel);
2902	3653	// bigThree.remove(centralPanel);
..	..	@@ -2930,6 +3681,8 @@
2930	3681	bigThree.add(centralPanel);
2931	3682	bigThree.add(XYZPanel);
2932	3683	bigThree.FlushUI();
	3684	+
	3685	+ cameraView.requestFocusInWindow();
2933	3686	} else
2934	3687	if (source == rootButton)
2935	3688	{
..	..	@@ -2941,6 +3694,7 @@
2941	3694	EditObject(obj);
2942	3695	}
2943	3696
	3697	+ cameraView.requestFocusInWindow();
2944	3698	refreshContents(true);
2945	3699	} else
2946	3700	if (source == closeButton)
..	..	@@ -2950,22 +3704,37 @@
2950	3704	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2951	3705	{
2952	3706	ab = (cRadio)e.nextElement();
2953		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3707	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2954	3708	{
	3709	+ // Patch to avoid bug with transparency.
	3710	+ if (!ab.hadMaterial)
	3711	+ {
	3712	+ ab.object.material = null;
	3713	+ }
	3714	+
2955	3715	buttonGroup.remove(ab);
2956	3716	radioPanel.remove(ab);
2957	3717
2958		- ab.GetObject().editWindow = null;
	3718	+ //ab.GetObject().editWindow = null;
	3719	+ ab.GetObject().manipWindow = null;
2959	3720	// ab.GetObject().objectUI = null; // ?????????
2960	3721
2961	3722	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2962	3723	break;
2963	3724	}
2964	3725	}
	3726	+
	3727	+ cameraView.requestFocusInWindow();
2965	3728	refreshContents(true);
2966	3729	} else
2967	3730	if (source == editItem \|\| source == editButton)
2968	3731	{
	3732	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3733	+ {
	3734	+ Object3D child = (Object3D)e.nextElement();
	3735	+ child.pinned = true;
	3736	+ }
	3737	+
2969	3738	EditSelection(false);
2970	3739	} else
2971	3740	if (source == uneditButton)
..	..	@@ -2975,10 +3744,11 @@
2975	3744	Object3D child = (Object3D)e.nextElement();
2976	3745	if(child.editWindow != null)
2977	3746	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3747	+ child.pinned = false;
2978	3748	child.CloseUI();
2979	3749	listUI.remove(child);
2980	3750
2981		- child.editWindow = null; // ???????????
	3751	+ //child.editWindow = null; // ???????????
2982	3752	}
2983	3753	objEditor.ctrlPanel.FlushUI();
2984	3754	//objEditor.jTree.clearSelection();
..	..	@@ -2991,6 +3761,7 @@
2991	3761	//copy.ClearUI();
2992	3762	for (Object3D obj : listUI)
2993	3763	{
	3764	+ obj.pinned = false;
2994	3765	obj.CloseUI();
2995	3766	}
2996	3767	listUI.clear();
..	..	@@ -3000,7 +3771,7 @@
3000	3771	{
3001	3772	assert(copy == group);
3002	3773
3003		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3774	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3004	3775
3005	3776	for (Object3D obj : listUI)
3006	3777	{
..	..	@@ -3049,6 +3820,9 @@
3049	3820	}
3050	3821
3051	3822	copy = group;
	3823	+
	3824	+ SetUndoStates();
	3825	+
3052	3826	//Globals.theRenderer.object = group;
3053	3827	if(!useclient)
3054	3828	{
..	..	@@ -3064,20 +3838,46 @@
3064	3838	frontView.object = group;
3065	3839	sideView.object = group;
3066	3840	}
3067		- group.editWindow = this;
	3841	+
	3842	+// fix "+" issue
	3843	+ //group.editWindow = this;
	3844	+ group.manipWindow = this;
	3845	+
3068	3846	/*
3069	3847	currentLayout = radio.layout;
3070	3848	if (currentLayout == null)
3071	3849	currentLayout = sevenButton;
3072	3850	*/
3073	3851	radio.layout.doClick();
	3852	+
	3853	+ ClearUnpinned();
	3854	+ //Grafreed.Assert(group != null);
	3855	+ //Grafreed.Assert(group.selection != null);
	3856	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	3857	+ if (group.selection == null \|\| group.selection.size() == 1)
	3858	+ EditSelection(false);
3074	3859	keepparent = group.parent;
3075	3860	// PARENT = NULL or not???
3076	3861	//group.parent = null; // ROOT
3077	3862	//group.attributes = -1;
3078	3863	ResetModel();
	3864	+
	3865	+ cameraView.requestFocusInWindow();
3079	3866	refreshContents(true);
3080		- }
	3867	+ } else if (event.getSource() == editCameraItem)
	3868	+ {
	3869	+ cameraView.ProtectCamera();
	3870	+ cameraView.repaint();
	3871	+ return;
	3872	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3873	+ {
	3874	+ cameraView.RevertCamera();
	3875	+ cameraView.repaint();
	3876	+ return;
	3877	+ // } else if (event.getSource() == textureButton)
	3878	+ // {
	3879	+ // return; // true;
	3880	+ }
3081	3881	else
3082	3882	{
3083	3883	//return super.action(event, arg);
..	..	@@ -3086,7 +3886,6 @@
3086	3886	}
3087	3887
3088	3888	boolean useclient = false;
3089		- cRadio radio;
3090	3889
3091	3890	void ToggleRoot()
3092	3891	{
..	..	@@ -3138,6 +3937,28 @@
3138	3937	refreshContents();
3139	3938	}
3140	3939
	3940	+ void TransformChildren()
	3941	+ {
	3942	+ Object3D obj;
	3943	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3944	+ {
	3945	+ obj = (Object3D)e.nextElement();
	3946	+ obj.KeepTextureMatrices();
	3947	+ obj.TransformChildren();
	3948	+ obj.RestoreTextureMatrices();
	3949	+
	3950	+// if (obj.parent == null)
	3951	+// {
	3952	+// System.out.println("NULL PARENT!");
	3953	+// new Exception().printStackTrace();
	3954	+// }
	3955	+// else
	3956	+// TouchTransform(obj);
	3957	+// //obj.parent.Touch();
	3958	+ }
	3959	+
	3960	+ refreshContents();
	3961	+ }
3141	3962
3142	3963	void ResetTransform()
3143	3964	{
..	..	@@ -3250,7 +4071,7 @@
3250	4071	refreshContents();
3251	4072	}
3252	4073
3253		- void ResetCentroid()
	4074	+ void ResetCentroid(boolean full)
3254	4075	{
3255	4076	Object3D obj;
3256	4077	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3265,12 +4086,16 @@
3265	4086	LA.matIdentity(Object3D.mat);
3266	4087	obj.getBounds(minima, maxima, false);
3267	4088	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3268		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	4089	+ if (full)
	4090	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3269	4091	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3270	4092	obj.TransformMesh(Object3D.mat);
	4093	+
3271	4094	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3272		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	4095	+ if (full)
	4096	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3273	4097	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	4098	+
3274	4099	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3275	4100	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3276	4101	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3299,7 +4124,8 @@
3299	4124
3300	4125	int size = obj.MemorySize();
3301	4126
3302		- System.err.println((size/1024) + " KB is the size of " + obj);
	4127	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4128	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3303	4129	}
3304	4130	}
3305	4131	catch (Exception e)
..	..	@@ -3336,9 +4162,9 @@
3336	4162	obj = (Object3D)e.nextElement();
3337	4163
3338	4164	System.out.println("Object is: " + obj);
3339		- GrafreeD.AnalyzeObject(obj);
	4165	+ Grafreed.AnalyzeObject(obj);
3340	4166	System.out.println("Boundary rep: " + obj.bRep);
3341		- GrafreeD.AnalyzeObject(obj.bRep);
	4167	+ Grafreed.AnalyzeObject(obj.bRep);
3342	4168
3343	4169	// System.err.println((size/1024) + " KB is the size of " + obj);
3344	4170	}
..	..	@@ -3380,6 +4206,13 @@
3380	4206	void GenNormals(boolean crease)
3381	4207	{
3382	4208	group.GenNormalsS(crease);
	4209	+
	4210	+ refreshContents();
	4211	+ }
	4212	+
	4213	+ void GenNormalsMESH()
	4214	+ {
	4215	+ group.GenNormalsMeshS();
3383	4216
3384	4217	refreshContents();
3385	4218	}
..	..	@@ -3552,8 +4385,8 @@
3552	4385
3553	4386	void ParseVertices()
3554	4387	{
3555		- boolean epsequal = GrafreeD.epsequal;
3556		- GrafreeD.epsequal = true;
	4388	+ boolean epsequal = Grafreed.epsequal;
	4389	+ Grafreed.epsequal = true;
3557	4390
3558	4391	for (int i=0; i<group.selection.size(); i++)
3559	4392	{
..	..	@@ -3578,7 +4411,7 @@
3578	4411	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3579	4412	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3580	4413
3581		- g.add(GrafreeD.clipboard);
	4414	+ g.add(Grafreed.clipboard);
3582	4415
3583	4416	buffer.add(g);
3584	4417	}
..	..	@@ -3593,7 +4426,7 @@
3593	4426	makeSomething(buffer, i==group.selection.size()-1);
3594	4427	}
3595	4428
3596		- GrafreeD.epsequal = epsequal;
	4429	+ Grafreed.epsequal = epsequal;
3597	4430
3598	4431	refreshContents();
3599	4432	}
..	..	@@ -3611,7 +4444,16 @@
3611	4444	String pigment = Object3D.GetPigment(tex);
3612	4445	//String bump = Object3D.GetBump(tex);
3613	4446
3614		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4447	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4448	+
	4449	+ try
	4450	+ {
	4451	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
	4452	+ }
	4453	+ catch (Exception e)
	4454	+ {
	4455	+ System.err.println("FAIL: " + node);
	4456	+ }
3615	4457
3616	4458	double s = v.s;
3617	4459
..	..	@@ -3743,7 +4585,7 @@
3743	4585	return;
3744	4586
3745	4587	Object3D poses = group.selection.get(0);
3746		- Object3D ref = GrafreeD.clipboard.get(0);
	4588	+ Object3D ref = Grafreed.clipboard.get(0);
3747	4589
3748	4590	Object3D newgroup = new Object3D("Po:" + poses.name);
3749	4591
..	..	@@ -3937,9 +4779,9 @@
3937	4779
3938	4780	void ClipMesh()
3939	4781	{
3940		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4782	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3941	4783	{
3942		- Object3D content = GrafreeD.clipboard.get(0);
	4784	+ Object3D content = Grafreed.clipboard.get(0);
3943	4785
3944	4786	if (content instanceof cGroup && ((cGroup)content).transientlink )
3945	4787	content = ((cGroup)content).get(0);
..	..	@@ -3948,7 +4790,7 @@
3948	4790	// {
3949	4791	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3950	4792	// }
3951		- group.selection.ClipMesh(GrafreeD.clipboard);
	4793	+ group.selection.ClipMesh(Grafreed.clipboard);
3952	4794	}
3953	4795	// group.selection.ClipMesh(GrafreeD.clipboard);
3954	4796	System.out.println("DONE.");
..	..	@@ -3995,6 +4837,18 @@
3995	4837	void MarkLeaves(boolean hide)
3996	4838	{
3997	4839	group.selection.MarkLeaves(hide);
	4840	+ refreshContents();
	4841	+ }
	4842	+
	4843	+ void RewindLeaves(boolean hide)
	4844	+ {
	4845	+ group.selection.RewindLeaves(hide);
	4846	+ refreshContents();
	4847	+ }
	4848	+
	4849	+ void RandomLeaves(boolean hide)
	4850	+ {
	4851	+ group.selection.RandomLeaves(hide);
3998	4852	refreshContents();
3999	4853	}
4000	4854
..	..	@@ -4069,28 +4923,25 @@
4069	4923	// }
4070	4924	// }
4071	4925
4072		- static boolean allparams = true;
4073		-
4074		- static Vector<Object3D> listUI = new Vector<Object3D>();
4075		-
4076	4926	void EditSelection(boolean newWindow)
4077	4927	{
	4928	+ if (group.selection == null)
	4929	+ {
	4930	+ EditElement(group, newWindow); // ? new
	4931	+ return;
	4932	+ }
	4933	+
4078	4934	// aConstraints.gridy = 0;
4079	4935	for (int i=0; i<group.selection.size(); i++)
4080	4936	{
4081	4937	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4082	4938	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4083		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4939	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4084	4940
4085	4941	Object3D elem = (Object3D)group.selection.elementAt(i);
4086		- if(elem != group)
	4942	+ if(elem != group \|\| !newWindow)
4087	4943	{
4088		- // if (!(elem instanceof Composite))
4089		- // newWindow = false;
4090		- listUI.add(elem);
4091		- elem.openEditWindow(this, newWindow); //, false);
4092		- System.out.println("edit : " + elem);
4093		- elem.editWindow.refreshContents(true); // ? new
	4944	+ EditElement(elem, newWindow); // ? new
4094	4945	}
4095	4946	}
4096	4947	}
..	..	@@ -4165,7 +5016,8 @@
4165	5016	//new Exception().printStackTrace();
4166	5017
4167	5018	freezemodel = true;
4168		-
	5019	+ ClearUnpinned();
	5020	+
4169	5021	/**/
4170	5022	//switch (event.id)
4171	5023	{
..	..	@@ -4173,7 +5025,6 @@
4173	5025	//case 702: // Event.LIST_DESELECT
4174	5026	group.deselectAll();
4175	5027	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4176		- objEditor.ClearInfo(); // .GetMaterial());
4177	5028	if (tps != null)
4178	5029	{
4179	5030	for (int i=0; i < tps.length; i++)
..	..	@@ -4182,10 +5033,8 @@
4182	5033
4183	5034	//if (child.parent != null)
4184	5035	//child.parent.addSelectee(child);
	5036	+ objEditor.SetMaterial(child);
4185	5037	group.addSelectee(child);
4186		- objEditor.SetMaterial(child); // .GetMaterial());
4187		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4188		- System.err.println("info : " + child.GetPath());
4189	5038	}
4190	5039	}
4191	5040	// else
..	..	@@ -4195,20 +5044,28 @@
4195	5044	// System.err.println("info : " + group.GetPath());
4196	5045	// }
4197	5046
4198		- objEditor.SetText(); // jan 2014
4199		-
4200		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	5047	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4201	5048	CameraPane.flash = true;
4202	5049
4203		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5050	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4204	5051	// a camera
4205	5052	{
4206		- CameraPane.camerachangeframe = 0; // don't refuse it
4207		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5053	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5054	+ {
	5055	+ CameraPane.camerachangeframe = 0; // don't refuse it
	5056	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5057	+ }
4208	5058	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4209	5059	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4210	5060	}
4211	5061
	5062	+ if (tps != null && tps.length == 1)
	5063	+ {
	5064	+ EditSelection(false);
	5065	+ }
	5066	+
	5067	+ SetPinStates(tps != null && tps.length > 0);
	5068	+
4212	5069	refreshContents();
4213	5070	//return true;
4214	5071	}
..	..	@@ -4217,6 +5074,35 @@
4217	5074
4218	5075	freezemodel = false;
4219	5076	}
	5077	+
	5078	+ void SetPinStates(boolean enabled)
	5079	+ {
	5080	+ editButton.setEnabled(enabled);
	5081	+ uneditButton.setEnabled(enabled);
	5082	+ unselectButton.setEnabled(enabled);
	5083	+ flashSelectionButton.setEnabled(enabled);
	5084	+ }
	5085	+
	5086	+ void refreshContents(boolean cp)
	5087	+ {
	5088	+ if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5089	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5090	+ {
	5091	+ objEditor.ClearInfo(); // .GetMaterial());
	5092	+
	5093	+ for (int i=0; i < group.selection.Size(); i++)
	5094	+ {
	5095	+ Object3D child = (Object3D) group.selection.get(i);
	5096	+
	5097	+ objEditor.AddInfo(child, this, true);
	5098	+ System.err.println("info : " + child.GetPath());
	5099	+ }
	5100	+
	5101	+ objEditor.SetText(); // jan 2014
	5102	+ }
	5103	+
	5104	+ super.refreshContents(cp);
	5105	+ }
4220	5106
4221	5107	void linkSomething(Object3D thing)
4222	5108	{
..	..	@@ -4288,16 +5174,19 @@
4288	5174	{
4289	5175	if (group.selection.isEmpty())
4290	5176	return;
4291		- GrafreeD.clipboardIsTempGroup = false;
	5177	+
	5178	+ Grafreed.clipboardIsTempGroup = false;
4292	5179	Composite tGroup = null;
4293	5180	if (group.selection.size() > 0) // 1)
4294	5181	{
4295	5182	tGroup = new cGroup();
4296		- GrafreeD.clipboardIsTempGroup = true;
	5183	+ Grafreed.clipboardIsTempGroup = true;
4297	5184	}
4298	5185
4299	5186	if (cut)
4300	5187	{
	5188	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5189	+// Save();
4301	5190	//int indices[] = jList.getSelectedIndices();
4302	5191	//for (int i = indices.length - 1; i >= 0; i--)
4303	5192	//jList.remove(indices[i]);
..	..	@@ -4333,16 +5222,16 @@
4333	5222	//System.out.println("cut " + child);
4334	5223	//System.out.println("parent = " + child.parent);
4335	5224	// tmp.addChild(child);
4336		- if (GrafreeD.clipboardIsTempGroup)
	5225	+ if (Grafreed.clipboardIsTempGroup)
4337	5226	tGroup.add/Child/(tmp);
4338	5227	else
4339		- GrafreeD.clipboard = tmp;
	5228	+ Grafreed.clipboard = tmp;
4340	5229	}
4341	5230	else
4342		- if (GrafreeD.clipboardIsTempGroup)
	5231	+ if (Grafreed.clipboardIsTempGroup)
4343	5232	tGroup.add/Child/(child);
4344	5233	else
4345		- GrafreeD.clipboard = child;
	5234	+ Grafreed.clipboard = child;
4346	5235	}
4347	5236
4348	5237	//ResetModel();
..	..	@@ -4374,21 +5263,23 @@
4374	5263	//System.out.println("cut " + elem);
4375	5264	//System.out.println("parent = " + elem.parent);
4376	5265	// tmp.addChild(elem);
4377		- if (GrafreeD.clipboardIsTempGroup)
	5266	+ if (Grafreed.clipboardIsTempGroup)
4378	5267	tGroup.add/Child/(tmp);
4379	5268	else
4380		- GrafreeD.clipboard = tmp;
	5269	+ Grafreed.clipboard = tmp;
4381	5270	}
4382	5271	else
4383		- if (GrafreeD.clipboardIsTempGroup)
	5272	+ if (Grafreed.clipboardIsTempGroup)
4384	5273	tGroup.add/Child/(child);
4385	5274	else
4386		- GrafreeD.clipboard = child;
	5275	+ Grafreed.clipboard = child;
4387	5276	}
4388	5277
4389	5278	}
4390		- if (GrafreeD.clipboardIsTempGroup)
4391		- GrafreeD.clipboard = tGroup;
	5279	+
	5280	+ if (Grafreed.clipboardIsTempGroup)
	5281	+ Grafreed.clipboard = tGroup;
	5282	+
4392	5283	if (cut)
4393	5284	{
4394	5285	ResetModel();
..	..	@@ -4398,11 +5289,15 @@
4398	5289
4399	5290	void paste(boolean expand)
4400	5291	{
	5292	+ if (Globals.REPLACEONMAKE)
	5293	+ Save();
	5294	+ boolean keep = Globals.REPLACEONMAKE;
	5295	+ Globals.REPLACEONMAKE = false;
4401	5296	// if (GrafreeD.clipboard == null)
4402	5297	// return;
4403	5298	boolean first = true;
4404	5299
4405		- if (GrafreeD.clipboardIsTempGroup)
	5300	+ if (Grafreed.clipboardIsTempGroup)
4406	5301	{
4407	5302	Composite temp;
4408	5303
..	..	@@ -4413,7 +5308,7 @@
4413	5308	temp = (Composite)Applet3D.clipboard.deepCopy();
4414	5309	*/
4415	5310	Object3D elem;
4416		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5311	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4417	5312	{
4418	5313	Object3D child = (Object3D)e.nextElement();
4419	5314
..	..	@@ -4447,16 +5342,17 @@
4447	5342	//Object3D cb = Applet3D.clipboard;
4448	5343	//temp.addChild(cb);
4449	5344	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4450		- assert(GrafreeD.clipboard.parent == null);
4451		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4452		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4453		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4454		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	5345	+ assert(Grafreed.clipboard.parent == null);
	5346	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5347	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5348	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5349	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4455	5350	else
4456		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4457		- GrafreeD.clipboard.get(0).parent = keepparent;
	5351	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5352	+ Grafreed.clipboard.get(0).parent = keepparent;
4458	5353	}
4459	5354
	5355	+ Globals.REPLACEONMAKE = keep;
4460	5356	ResetModel();
4461	5357	refreshContents();
4462	5358	}
..	..	@@ -4503,9 +5399,9 @@
4503	5399	{
4504	5400	boolean first = true;
4505	5401
4506		- if (GrafreeD.clipboardIsTempGroup)
	5402	+ if (Grafreed.clipboardIsTempGroup)
4507	5403	{
4508		- Composite temp = (Composite)GrafreeD.clipboard;
	5404	+ Composite temp = (Composite)Grafreed.clipboard;
4509	5405	Object3D copy;
4510	5406	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4511	5407	{
..	..	@@ -4515,7 +5411,7 @@
4515	5411	}
4516	5412	} else
4517	5413	{
4518		- linkSomething(GrafreeD.clipboard); //.get(0));
	5414	+ linkSomething(Grafreed.clipboard); //.get(0));
4519	5415	}
4520	5416	}
4521	5417	}
..	..	@@ -4592,6 +5488,10 @@
4592	5488
4593	5489	void group(Object3D csg, boolean grab)
4594	5490	{
	5491	+ if (Globals.REPLACEONMAKE)
	5492	+ Save();
	5493	+ boolean keep = Globals.REPLACEONMAKE;
	5494	+ Globals.REPLACEONMAKE = false;
4595	5495	if (//false) // why??
4596	5496	!group.selection.isEmpty())
4597	5497	{
..	..	@@ -4705,10 +5605,15 @@
4705	5605	//node.add(csg);
4706	5606	//makeSomething(node);
4707	5607	makeSomething(csg);
	5608	+ Globals.REPLACEONMAKE = keep;
4708	5609	}
4709	5610
4710	5611	void Ungroup(Object3D g)
4711	5612	{
	5613	+ if (Globals.REPLACEONMAKE)
	5614	+ Save();
	5615	+ boolean keep = Globals.REPLACEONMAKE;
	5616	+ Globals.REPLACEONMAKE = false;
4712	5617	if (g instanceof HiddenObject)
4713	5618	{
4714	5619	HiddenObject h = (HiddenObject) g;
..	..	@@ -4725,6 +5630,7 @@
4725	5630	objEditor.makeSomething(g.get(i), false);
4726	5631	}
4727	5632	}
	5633	+ Globals.REPLACEONMAKE = keep;
4728	5634	}
4729	5635
4730	5636	void ungroup()
..	..	@@ -4920,21 +5826,6 @@
4920	5826	}
4921	5827	*/
4922	5828
4923		- void ImportGFD()
4924		- {
4925		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4926		- browser.show();
4927		- String filename = browser.getFile();
4928		- if (filename != null && filename.length() > 0)
4929		- {
4930		- String fullname = browser.getDirectory() + filename;
4931		-
4932		- //Object3D readobj =
4933		- objEditor.ReadGFD(fullname, objEditor);
4934		- //makeSomething(readobj);
4935		- }
4936		- }
4937		-
4938	5829	/*
4939	5830	public void Callback(Object obj)
4940	5831	{
..	..	@@ -4958,26 +5849,9 @@
4958	5849	}
4959	5850	*/
4960	5851
4961		- void ImportVRMLX3D()
4962		- {
4963		- if (GrafreeD.standAlone)
4964		- {
4965		- /**/
4966		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4967		- browser.show();
4968		- String filename = browser.getFile();
4969		- if (filename != null && filename.length() > 0)
4970		- {
4971		- String fullname = browser.getDirectory() + filename;
4972		- LoadVRMLX3D(fullname);
4973		- }
4974		- /**/
4975		- }
4976		- }
4977		-
4978	5852	String GetFile(String dialogName)
4979	5853	{
4980		- if (GrafreeD.standAlone)
	5854	+ if (Grafreed.standAlone)
4981	5855	{
4982	5856	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4983	5857	browser.show();
..	..	@@ -5045,7 +5919,44 @@
5045	5919	cButton clearpanelButton;
5046	5920	cButton unselectButton;
5047	5921
	5922	+ cButton restoreCameraButton;
	5923	+
	5924	+ cButton saveButton;
5048	5925	cButton oneStepButton;
	5926	+
	5927	+ cButton groupButton;
	5928	+ cButton ungroupButton;
	5929	+ cButton compositeButton;
	5930	+ cButton switchButton;
	5931	+ cButton loopButton;
	5932	+ cButton textureButton;
	5933	+
	5934	+ cButton skybox1Button;
	5935	+ cButton skybox2Button;
	5936	+ cButton skybox3Button;
	5937	+ cButton skybox4Button;
	5938	+ cButton skybox5Button;
	5939	+ cButton skybox6Button;
	5940	+ cButton skybox7Button;
	5941	+
	5942	+ cButton skybox11Button;
	5943	+ cButton skybox12Button;
	5944	+ cButton skybox13Button;
	5945	+ cButton skybox14Button;
	5946	+ cButton skybox15Button;
	5947	+ cButton skybox16Button;
	5948	+ cButton skybox17Button;
	5949	+
	5950	+ cButton gridButton;
	5951	+ cButton boxButton;
	5952	+ cButton sphereButton;
	5953	+ cButton coneButton;
	5954	+ cButton torusButton;
	5955	+ cButton superButton;
	5956	+ cButton kleinButton;
	5957	+ cButton particlesButton;
	5958	+ cButton overlayButton;
	5959	+ cButton lightButton;
5049	5960
5050	5961	cButton screenfitButton;
5051	5962	cButton screenfitpointButton;
..	..	@@ -5058,14 +5969,6 @@
5058	5969
5059	5970	cButton setsupportButton;
5060	5971
5061		- cButton twoButton;
5062		- cButton sixButton;
5063		- cButton threeButton;
5064		- cButton sevenButton;
5065		- cButton fourButton; // full panel
5066		- cButton oneButton; // full XYZ
5067		- //cButton currentLayout;
5068		-
5069	5972	//
5070	5973	//Composite
5071	5974	Object3D // to do !!
..	..	@@ -5075,9 +5978,11 @@
5075	5978	//JTree jTree;
5076	5979	private MenuItem lookAtItem;
5077	5980	private MenuItem lookFromItem;
5078		- private MenuItem switchItem;
	5981	+ private MenuItem switchViewItem;
5079	5982	private MenuItem cutItem;
5080		- private MenuItem duplicateItem;
	5983	+ private MenuItem undoItem;
	5984	+ private MenuItem redoItem;
	5985	+ private JMenuItem duplicateItem;
5081	5986	private MenuItem cloneItem;
5082	5987	private MenuItem cloneSupportItem;
5083	5988	private MenuItem overwriteGeoItem;
..	..	@@ -5090,7 +5995,7 @@
5090	5995	private MenuItem linkverticesItem;
5091	5996	private MenuItem relinkverticesItem;
5092	5997	private MenuItem setMasterItem;
5093		- private MenuItem resetMeshItem;
	5998	+ private MenuItem resetAllItem;
5094	5999	private MenuItem stepAllItem;
5095	6000	private MenuItem revertMeshItem;
5096	6001	private MenuItem poseMeshItem;
..	..	@@ -5105,7 +6010,7 @@
5105	6010	private MenuItem pasteLinkItem;
5106	6011	private MenuItem pasteCloneItem;
5107	6012	private MenuItem pasteExpandItem;
5108		- private MenuItem clearItem;
	6013	+ private MenuItem deleteItem;
5109	6014	private MenuItem clearAllItem;
5110	6015	private MenuItem genUVItem;
5111	6016	private MenuItem genNormalsMESHItem;
..	..	@@ -5140,6 +6045,10 @@
5140	6045	private MenuItem showleavesItem;
5141	6046	private MenuItem markleavesItem;
5142	6047	private MenuItem unmarkleavesItem;
	6048	+ private MenuItem rewindleavesItem;
	6049	+ private MenuItem unrewindleavesItem;
	6050	+ private MenuItem randomleavesItem;
	6051	+ private MenuItem unrandomleavesItem;
5143	6052
5144	6053	private MenuItem flipVItem;
5145	6054	private MenuItem unflipVItem;
..	..	@@ -5151,15 +6060,17 @@
5151	6060	private MenuItem panoTexturesItem;
5152	6061
5153	6062	private MenuItem resetCentroidItem;
5154		- private MenuItem transformgeometryItem;
	6063	+ private MenuItem resetCentroidXZItem;
5155	6064	private MenuItem resetTransformItem;
	6065	+ private MenuItem transformGeometryItem;
	6066	+ private MenuItem transformChildrenItem;
5156	6067	private MenuItem hideItem;
5157	6068	private MenuItem grabItem;
5158	6069	private MenuItem backItem;
5159	6070	private MenuItem frontItem;
5160	6071	private MenuItem cameraItem;
5161	6072	private MenuItem compositeItem;
5162		- private MenuItem randomItem;
	6073	+ private MenuItem switchItem;
5163	6074	private MenuItem physicsItem;
5164	6075	private MenuItem frameselectorItem;
5165	6076	private MenuItem scriptNodeItem;
..	..	@@ -5183,6 +6094,8 @@
5183	6094	private MenuItem attachBumpItem;
5184	6095	private MenuItem detachBumpItem;
5185	6096	private MenuItem pigmentBumpItem;
	6097	+ private MenuItem embedTexturesItem;
	6098	+ private MenuItem deEmbedTexturesItem;
5186	6099
5187	6100	private MenuItem particleItem;
5188	6101	private MenuItem ragdollItem;
..	..	@@ -5221,11 +6134,6 @@
5221	6134	private MenuItem doubleItem;
5222	6135	private MenuItem tripleItem;
5223	6136
5224		- private MenuItem importGFDItem;
5225		- private MenuItem importVRMLX3DItem;
5226		- private MenuItem import3DSItem;
5227		- private MenuItem importOBJItem;
5228		-
5229	6137	private MenuItem computeAOItem;
5230	6138	private MenuItem recompileItem;
5231	6139	private MenuItem editScriptItem;
..	..	@@ -5235,4 +6143,8 @@
5235	6143	private MenuItem analyzeItem;
5236	6144	private MenuItem dumpItem;
5237	6145	//boolean freezemodel = false;
	6146	+
	6147	+ Menu cameraMenu;
	6148	+ MenuItem editCameraItem;
	6149	+ MenuItem restoreCameraItem;
5238	6150	}