~nbriere/GrafreeD.git - Noware Git Repository

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