~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,40 +401,37 @@
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);
	420	+ cloneItem = menu.add(new MenuItem("Clone"));
	421	+ cloneItem.addActionListener(this);
	422	+ if (Globals.ADVANCED)
	423	+ {
	424	+ cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
	425	+ cloneSupportItem.addActionListener(this);
	426	+ }
	427	+ menu.add("-");
174	428	cutItem = menu.add(new MenuItem("Cut"));
175	429	cutItem.addActionListener(this);
176	430	copyItem = menu.add(new MenuItem("Copy"));
177	431	copyItem.addActionListener(this);
178	432	pasteItem = menu.add(new MenuItem("Paste"));
179	433	pasteItem.addActionListener(this);
180		- menu.add("-");
181		- cloneItem = menu.add(new MenuItem("Clone"));
182		- cloneItem.addActionListener(this);
183		- cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
184		- cloneSupportItem.addActionListener(this);
	434	+
185	435	menu.add("-");
186	436	pasteIntoItem = menu.add(new MenuItem("Paste into"));
187	437	pasteIntoItem.addActionListener(this);
..	..	@@ -192,8 +442,8 @@
192	442	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
193	443	// pasteExpandItem.addActionListener(this);
194	444	menu.add("-");
195		- clearItem = menu.add(new MenuItem("Clear"));
196		- clearItem.addActionListener(this);
	445	+ deleteItem = menu.add(new MenuItem("Delete"));
	446	+ deleteItem.addActionListener(this);
197	447
198	448	if (Globals.ADVANCED)
199	449	{
..	..	@@ -201,14 +451,97 @@
201	451	clearAllItem = menu.add(new MenuItem("Clear All"));
202	452	clearAllItem.addActionListener(this);
203	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());
204	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	+
205	542	oe.menuBar.add(menu = new Menu("Setting"));
206	543	if (Globals.ADVANCED)
207	544	{
208		- resetMeshItem = menu.add(new MenuItem("Reset All"));
209		- resetMeshItem.addActionListener(this);
210		- stepAllItem = menu.add(new MenuItem("Step All"));
211		- stepAllItem.addActionListener(this);
212	545	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
213	546	revertMeshItem.addActionListener(this);
214	547	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
..	..	@@ -248,21 +581,29 @@
248	581	}
249	582
250	583	oe.menuBar.add(menu = new Menu("Group"));
251		- grabItem = menu.add(new MenuItem("Grab"));
252		- grabItem.addActionListener(this);
	584	+// grabItem = menu.add(new MenuItem("Grab"));
	585	+// grabItem.addActionListener(this);
253	586	backItem = menu.add(new MenuItem("Back"));
254	587	backItem.addActionListener(this);
255	588	frontItem = menu.add(new MenuItem("Front"));
256	589	frontItem.addActionListener(this);
257		- compositeItem = menu.add(new MenuItem("Composite"));
258		- compositeItem.addActionListener(this);
	590	+// compositeItem = menu.add(new MenuItem("Composite"));
	591	+// compositeItem.addActionListener(this);
	592	+
	593	+ if (Globals.ADVANCED)
	594	+ {
259	595	hideItem = menu.add(new MenuItem("Hidden Group"));
260	596	hideItem.addActionListener(this);
	597	+ }
261	598	ungroupItem = menu.add(new MenuItem("Ungroup"));
262	599	ungroupItem.addActionListener(this);
263		- menu.add("-");
264		- randomItem = menu.add(new MenuItem("Switch node"));
265		- 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	+ {
266	607	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
267	608	switchGeoItem.addActionListener(this);
268	609	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -270,49 +611,52 @@
270	611	morphItem = menu.add(new MenuItem("Morph Group"));
271	612	morphItem.addActionListener(this);
272	613
273		- if (Globals.ADVANCED)
274		- {
	614	+ menu.add("-");
275	615	physicsItem = menu.add(new MenuItem("Physics"));
276	616	physicsItem.addActionListener(this);
277	617	frameselectorItem = menu.add(new MenuItem("Frame Selector"));
278	618	frameselectorItem.addActionListener(this);
279	619	scriptNodeItem = menu.add(new MenuItem("Script Node"));
280	620	scriptNodeItem.addActionListener(this);
281		- cameraItem = menu.add(new MenuItem("Camera"));
282		- cameraItem.addActionListener(this);
283	621	}
284	622
285	623	oe.menuBar.add(menu = new Menu("Object"));
286		- textureItem = menu.add(new MenuItem("Texture"));
287		- textureItem.addActionListener(this);
	624	+// textureItem = menu.add(new MenuItem("Texture"));
	625	+// textureItem.addActionListener(this);
288	626	billboardItem = menu.add(new MenuItem("Billboard"));
289	627	billboardItem.addActionListener(this);
290	628	csgItem = menu.add(new MenuItem("CSG"));
291	629	csgItem.addActionListener(this);
292		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	630	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
293	631	shadowXItem.addActionListener(this);
294		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	632	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
295	633	shadowYItem.addActionListener(this);
296		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	634	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
297	635	shadowZItem.addActionListener(this);
298		- if (Globals.ADVANCED)
299		- {
300		- linkerItem = menu.add(new MenuItem("Linker"));
301		- linkerItem.addActionListener(this);
302	636	attributeItem = menu.add(new MenuItem("Attribute"));
303	637	attributeItem.addActionListener(this);
	638	+
	639	+ if (Globals.ADVANCED)
	640	+ {
	641	+ menu.add("-");
	642	+ linkerItem = menu.add(new MenuItem("Linker"));
	643	+ linkerItem.addActionListener(this);
304	644	templateItem = menu.add(new MenuItem("Template"));
305	645	templateItem.addActionListener(this);
306	646	pointflowItem = menu.add(new MenuItem("Point Flow"));
307	647	pointflowItem.addActionListener(this);
308		- menu.add("-");
309	648	}
	649	+ menu.add("-");
310	650	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
311	651	resetTransformItem.addActionListener(this);
312	652	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
313	653	resetCentroidItem.addActionListener(this);
314		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
315		- 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);
316	660
317	661	oe.menuBar.add(menu = new Menu("Geometry"));
318	662	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -325,7 +669,7 @@
325	669	genNormalsMESHItem.addActionListener(this);
326	670	if (Globals.ADVANCED)
327	671	{
328		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	672	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
329	673	genNormalsMINEItem.addActionListener(this);
330	674	}
331	675	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -361,6 +705,10 @@
361	705	oe.menuBar.add(menu = new Menu("Attributes"));
362	706	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
363	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);
364	712	menu.add("-");
365	713	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
366	714	liveleavesItem.addActionListener(this);
..	..	@@ -381,6 +729,14 @@
381	729	markleavesItem.addActionListener(this);
382	730	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
383	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);
384	740	menu.add("-");
385	741	flipVItem = menu.add(new MenuItem("Flip V"));
386	742	flipVItem.addActionListener(this);
..	..	@@ -406,47 +762,56 @@
406	762	attachBumpItem.addActionListener(this);
407	763	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
408	764	pigmentBumpItem.addActionListener(this);
	765	+ //embedTexturesItem
409	766	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
410	767	detachPigmentItem.addActionListener(this);
411	768	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
412	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);
413	774	menu.add("-");
414	775	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
415	776	sortbysizeItem.addActionListener(this);
416	777	sortbynameItem = menu.add(new MenuItem("Sort by name"));
417	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);
418	784	if (Globals.ADVANCED)
419	785	{
420		- menu.add("-");
	786	+ // Pretty much the same as duplicate and clone.
421	787	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
422	788	extractGeometriesItem.addActionListener(this);
423	789	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
424	790	cloneGeometriesItem.addActionListener(this);
425		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
426		- shareGeometriesItem.addActionListener(this);
427		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
428		- mergeGeometriesItem.addActionListener(this);
429	791	}
430	792
431	793	oe.menuBar.add(menu = new Menu("Insert"));
432	794	buildCreateMenu(menu);
433	795
434		- oe.menuBar.add(menu = new Menu("Include"));
435		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
436		- importGFDItem.addActionListener(this);
437		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
438		- importVRMLX3DItem.addActionListener(this);
439		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
440		- importOBJItem.addActionListener(this);
441		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
442		- import3DSItem.addActionListener(this);
443		-
444	796	oe.menuBar.add(menu = new Menu("Tools"));
445	797	buildToolsMenu(menu);
446	798	}
447	799
	800	+
448	801	void SetupUI2(ObjEditor oe)
449	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	+
450	815	//new Exception().printStackTrace();
451	816
452	817	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -475,97 +840,237 @@
475	840	oe.radioPanel.add(dummyButton);
476	841	oe.buttonGroup.add(dummyButton);
477	842	*/
	843	+ cGridBag copyOptionsPanel = new cGridBag();
	844	+
	845	+ copyOptionsPanel.preferredHeight = 2;
	846	+
478	847	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
479	848
480		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
481		- 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");
482	901	liveCB.addItemListener(this);
483	902
484		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	903	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
485	904	oneStepButton.setToolTipText("Animate one step forward");
486	905	oneStepButton.addActionListener(this);
487	906
488		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	907	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
489	908	fastCB.setToolTipText("Fast mode");
490	909	fastCB.addItemListener(this);
491	910
492		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
493		- trackCB.setToolTipText("Enable tracking");
494		- trackCB.addItemListener(this);
495		-
496		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
497		- screenfitButton.setToolTipText("Screen fit");
498		- 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);
499	916
500	917	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
501	918	// screenfitpointButton.addActionListener(this);
502	919
503	920	if (Globals.ADVANCED)
504	921	{
505		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	922	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
506	923	snapobjectButton.addActionListener(this);
507	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");
508	929	}
509	930
510		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
511		- flashSelectionButton.setToolTipText("Show selection");
512		- flashSelectionButton.addActionListener(this);
	931	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
513	932
514		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
515		-
516		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
517		- 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");
518	935	twoButton.addActionListener(this);
519		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
520		- fourButton.addActionListener(this);
521		- fourButton.setToolTipText("Show left panel only");
522		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
523		- sixButton.setToolTipText("2-column layout left");
524		- sixButton.addActionListener(this);
525		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
526		- 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");
527	940	threeButton.addActionListener(this);
528		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
529		- sevenButton.setToolTipText("3-column layout");
530		- 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);
531	947	//
532	948
533		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
534		- 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");
535	951	rootButton.addActionListener(this);
536	952
537		- 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);
538	954	closeButton.setToolTipText("Close tab");
539	955	closeButton.addActionListener(this);
540	956	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
541	957	//clearButton.addActionListener(this);
542		-
543		- cGridBag commandsPanel = new cGridBag();
	958	+
	959	+ cGridBag row1 = new cGridBag();
544	960
545		- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
546		- 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");
547	1047	editButton.addActionListener(this);
548	1048
549		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
550		- uneditButton.setToolTipText("Unedit selection");
	1049	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1050	+ uneditButton.setToolTipText("Remove selection controls");
551	1051	uneditButton.addActionListener(this);
552	1052
553		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
554		- allParamsButton.setToolTipText("Edit all params");
	1053	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1054	+ allParamsButton.setToolTipText("Show all controle");
555	1055	allParamsButton.addActionListener(this);
556	1056
557		- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1057	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
558	1058	clearPanelButton.setToolTipText("Clear edit panel");
559	1059	clearPanelButton.addActionListener(this);
560	1060
561		- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1061	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
562	1062	unselectButton.setToolTipText("Unselect");
563	1063	unselectButton.addActionListener(this);
564	1064
565		- 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);
566	1068
567		- oe.treePanel.add(commandsPanel);
568		- oe.treePanel.Return();
	1069	+ editCommandsPanel.preferredHeight = 1;
	1070	+
	1071	+ SetPinStates(false);
	1072	+// oe.treePanel.add(commandsPanel);
	1073	+// oe.treePanel.Return();
569	1074
570	1075	// oe.aConstraints.gridx += 1;
571	1076	// oe.aConstraints.weighty = 0;
..	..	@@ -582,32 +1087,20 @@
582	1087
583	1088	JScrollPane jSP;
584	1089	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
585		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1090	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
586	1091	ResetModel();
587	1092
588	1093	oe.treePanel.add(jSPPanel);
589	1094	oe.treePanel.Return();
590	1095
591		- cGridBag copyOptionsPanel = new cGridBag();
592		-
593		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
594		- colorCB.setToolTipText("Copy color when dropped");
595		- colorCB.addItemListener(this);
596		-
597		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
598		- materialCB.setToolTipText("Copy material when dropped");
599		- materialCB.addItemListener(this);
600		-
601		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
602		- textureCB.setToolTipText("Copy texture when dropped");
603		- textureCB.addItemListener(this);
604		-
605		- copyOptionsPanel.preferredHeight = 1;
606	1096	oe.treePanel.add(copyOptionsPanel);
607	1097	oe.treePanel.Return();
	1098	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1099	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1100	+ sliderPane.preferredHeight = 1;
608	1101
609		-// mainPanel.setDividerLocation(0.5); //1.0);
610		-// mainPanel.setResizeWeight(0.5);
	1102	+// mainPanel.setDividerLocation(0.1); //1.0);
	1103	+ mainPanel.setResizeWeight(0.4);
611	1104
612	1105	//jList.addListSelectionListener(this);
613	1106	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -615,7 +1108,7 @@
615	1108	//jTree.setEditable(true);
616	1109	oe.jTree.setDragEnabled(true);
617	1110	//jTree.setPreferredSize(new Dimension(10,10));
618		- jSP.setPreferredSize(new Dimension(100,200));
	1111	+ //jSP.setPreferredSize(new Dimension(100,200));
619	1112
620	1113	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
621	1114
..	..	@@ -627,29 +1120,49 @@
627	1120	dgr.addDragGestureListener(this);
628	1121	}catch(Exception e) {}
629	1122	*/
630		- radio.layout = sevenButton;
	1123	+ radio.layout = sixButton; // sevenButton;
631	1124	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
632	1125	}
633	1126
634	1127	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
635	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	+
636	1143	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
637	1144	boxCB.setToolTipText("Display bounding boxes");
638	1145	boxCB.addItemListener(this);
639	1146
640	1147	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
641		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1148	+ zoomBoxCB.setToolTipText("Display only for wheel");
642	1149	zoomBoxCB.addItemListener(this);
643	1150
644		- if (Globals.ADVANCED)
	1151	+ if (true) // Globals.ADVANCED)
645	1152	{
646		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
647		- supportCB.setToolTipText("Enable rigging");
648		- 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);
649	1160
650	1161	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
651	1162	// localCB.addItemListener(this);
652	1163
	1164	+ panel.Return();
	1165	+
653	1166	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
654	1167	crowdCB.setToolTipText("Used for crowds");
655	1168	crowdCB.addItemListener(this);
..	..	@@ -666,6 +1179,8 @@
666	1179	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
667	1180	// speakerMocapCB.addItemListener(this);
668	1181
	1182	+ panel.Return();
	1183	+
669	1184	if (false)
670	1185	{
671	1186	// handled in scripts
..	..	@@ -680,42 +1195,85 @@
680	1195	//constraints.gridy += 1;
681	1196	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
682	1197	smoothfocusCB.addItemListener(this);
	1198	+ panel.Return();
683	1199	}
684	1200
685	1201	//constraints.gridx += 1;
686	1202	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
687	1203	// debugCB.addItemListener(this);
688	1204
	1205	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1206	+ trackCB.setToolTipText("Enable tracking target");
	1207	+ trackCB.addItemListener(this);
	1208	+
689	1209	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1210	+ oeilCB.setToolTipText("Move camera when tracking");
690	1211	oeilCB.addItemListener(this);
691	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	+ {
692	1233	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
693	1234	lookAtCB.setToolTipText("Look-at target");
694	1235	lookAtCB.addItemListener(this);
	1236	+ }
695	1237
696	1238	}
697	1239
698	1240	cGridBag fill = new cGridBag();
699		-
700	1241	fill.preferredHeight = 200;
	1242	+ cGridBag fill2 = new cGridBag();
	1243	+ fill2.preferredHeight = 200;
	1244	+ cGridBag fill3 = new cGridBag();
	1245	+ fill3.preferredHeight = 200;
701	1246
702	1247	panel.add(fill);
	1248	+ panel.add(fill2);
	1249	+ panel.add(fill3);
703	1250
704	1251	}
705	1252
706	1253	void EditObject(Object3D obj)
707	1254	{
708	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	+
709	1264	radioButton.SetObject(obj);
710		- radioButton.layout = sevenButton;
	1265	+ radioButton.layout = sixButton; // sevenButton;
711	1266	radioButton.SetCamera(cameraView.renderCamera, false);
712	1267	radioButton.addActionListener(this);
713	1268	radioPanel.add(radioButton);
714	1269	buttonGroup.add(radioButton);
715	1270	radioButton.doClick();
716	1271	}
	1272	+
717	1273	void SetupViews(ObjEditor oe)
718	1274	{
	1275	+ theFrame = this;
	1276	+
719	1277	oe.SetupViews();
720	1278
721	1279	System.out.println("SetupViews");
..	..	@@ -724,23 +1282,28 @@
724	1282	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
725	1283	}
726	1284
727		- JCheckBox liveCB;
728		- JCheckBox supportCB;
729		- JCheckBox localCB;
730		- JCheckBox crowdCB;
731		- JCheckBox smoothCB;
732		- JCheckBox fastCB;
733		- JCheckBox slowCB;
734		- JCheckBox boxCB;
735		- JCheckBox zoomBoxCB;
736		- JCheckBox trackCB;
737		- 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;
738	1298	// JCheckBox speakerMocapCB;
739		- JCheckBox speakerCameraCB;
740		- JCheckBox speakerFocusCB;
741		- JCheckBox debugCB;
742		- JCheckBox oeilCB;
743		- JCheckBox lookAtCB;
	1299	+ cCheckBox speakerCameraCB;
	1300	+ cCheckBox speakerFocusCB;
	1301	+ cCheckBox debugCB;
	1302	+
	1303	+ cCheckBox oeilCB;
	1304	+ cCheckBox shadowCB;
	1305	+ cCheckBox autokeepCB;
	1306	+ cCheckBox lookAtCB;
744	1307
745	1308	// static int COLOR = 1;
746	1309	// static int MATERIAL = 2;
..	..	@@ -748,9 +1311,9 @@
748	1311
749	1312	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
750	1313
751		- JCheckBox colorCB;
752		- JCheckBox materialCB;
753		- JCheckBox textureCB;
	1314	+ cCheckBox colorCB;
	1315	+ cCheckBox materialCB;
	1316	+ cCheckBox textureCB;
754	1317
755	1318	public void itemStateChanged(ItemEvent e)
756	1319	{
..	..	@@ -778,6 +1341,7 @@
778	1341	} else if(e.getSource() == liveCB)
779	1342	{
780	1343	cameraView.ToggleLive();
	1344	+ refreshContents(false);
781	1345	}
782	1346	else if(e.getSource() == supportCB)
783	1347	{
..	..	@@ -842,6 +1406,18 @@
842	1406	{
843	1407	cameraView.ToggleOeil();
844	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	+ }
845	1421	else if(e.getSource() == lookAtCB)
846	1422	{
847	1423	cameraView.ToggleLookAt();
..	..	@@ -858,7 +1434,8 @@
858	1434
859	1435	/**/
860	1436	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
861		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1437	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1438	+ TreePath path = objEditor.jTree.getSelectionPath();
862	1439	if ((path == null) \|\| (path.getPathCount() <= 1)) {
863	1440	// We can't move the root node or an empty selection
864	1441	return;
..	..	@@ -921,8 +1498,6 @@
921	1498	}
922	1499	}
923	1500
924		- String string = (String) object;
925		-
926	1501	System.out.println("Transfer = " + object + "; drop : " + target);
927	1502	// if( object instanceof java.io.File[])
928	1503	// {
..	..	@@ -930,7 +1505,11 @@
930	1505	// objEditor.DropFile((java.io.File[]) object, true);
931	1506	// return;
932	1507	// }
933		- 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) == ':')
934	1513	{
935	1514	// file(s)
936	1515	String[] names = string.split("\n");
..	..	@@ -957,7 +1536,7 @@
957	1536
958	1537	flashIt = false;
959	1538	CameraPane pane = (CameraPane) target;
960		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1539	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
961	1540	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
962	1541
963	1542	if (group.selection.size() == 1)
..	..	@@ -973,23 +1552,33 @@
973	1552
974	1553	assert target == objEditor.jTree;
975	1554	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1555	+ Object3D destinationLeaf;
976	1556	try {
977		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1557	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
978	1558	} catch (Exception e) {
979	1559	System.out.println("destinationPath : " + destinationPath);
980	1560	return;
981	1561	}
982	1562
983		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1563	+ for (int i=group.selection.size(); --i>=0;)
984	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	+// {
985	1574	loadClipboard(true);
986	1575	objEditor.jTree.setSelectionPath(destinationPath);
987	1576	pasteInto(false, false);
988		- } else {
989		- loadClipboard(false);
990		- objEditor.jTree.setSelectionPath(destinationPath);
991		- pasteInto(false, false); // true); // ???
992		- }
	1577	+// } else {
	1578	+// loadClipboard(false);
	1579	+// objEditor.jTree.setSelectionPath(destinationPath);
	1580	+// pasteInto(false, false); // true); // ???
	1581	+// }
993	1582	}
994	1583	public void dropActionChanged(DropTargetDragEvent dtde)
995	1584	// Called if the user has modified the current drop gesture
..	..	@@ -1094,22 +1683,30 @@
1094	1683	{
1095	1684	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1096	1685	//heightFieldItem.addActionListener(this);
1097		- gridItem = menu.add(new MenuItem("Grid"));
1098		- gridItem.addActionListener(this);
1099		- rectoidItem = menu.add(new MenuItem("Box"));
1100		- rectoidItem.addActionListener(this);
1101		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1102		- ellipsoidItem.addActionListener(this);
1103		- coneItem = menu.add(new MenuItem("Cone"));
1104		- coneItem.addActionListener(this);
1105		- torusItem = menu.add(new MenuItem("Torus"));
1106		- torusItem.addActionListener(this);
1107		- superItem = menu.add(new MenuItem("Superellipsoid"));
1108		- 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	+ {
1109	1704	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1110	1705	kleinItem.addActionListener(this);
1111		- particleItem = menu.add(new MenuItem("Particle system"));
1112		- particleItem.addActionListener(this);
	1706	+ }
	1707	+
	1708	+// particleItem = menu.add(new MenuItem("Particle system"));
	1709	+// particleItem.addActionListener(this);
1113	1710	if (Globals.ADVANCED)
1114	1711	{
1115	1712	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1135,15 +1732,15 @@
1135	1732	}
1136	1733	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1137	1734	bezierItem.addActionListener(this);
1138		- overlayItem = menu.add(new MenuItem("Overlay"));
1139		- overlayItem.addActionListener(this);
1140		- lightItem = menu.add(new MenuItem("Light"));
1141		- 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);
1142	1739	menu.add("-");
1143	1740	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1144	1741	//superLoopItem.addActionListener(this);
1145		- loopItem = menu.add(new MenuItem("Loop"));
1146		- loopItem.addActionListener(this);
	1742	+// loopItem = menu.add(new MenuItem("Loop"));
	1743	+// loopItem.addActionListener(this);
1147	1744	doubleItem = menu.add(new MenuItem("Fork"));
1148	1745	doubleItem.addActionListener(this);
1149	1746	if (Globals.ADVANCED)
..	..	@@ -1159,18 +1756,23 @@
1159	1756	animationItem.addItemListener(this);
1160	1757	animationItem.setState(Globals.ANIMATION);
1161	1758
	1759	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1760	+ archiveItem.addActionListener(this);
	1761	+
1162	1762	menu.add("-");
1163	1763	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1164	1764	parseverticesItem.addActionListener(this);
1165	1765	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1166	1766	textureFieldItem.addActionListener(this);
1167		- alignItem = menu.add(new MenuItem("Align Object"));
	1767	+ alignItem = menu.add(new MenuItem("Align Objects"));
1168	1768	alignItem.addActionListener(this);
1169	1769	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1170	1770	reduceMorphItem.addActionListener(this);
1171	1771	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1172	1772	reduce34MorphItem.addActionListener(this);
1173		-
	1773	+ menu.add("-");
	1774	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1775	+ memoryItem.addActionListener(this);
1174	1776	menu.add(computeAOItem = new MenuItem("Compute AO"));
1175	1777	computeAOItem.addActionListener(this);
1176	1778
..	..	@@ -1179,11 +1781,9 @@
1179	1781	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1180	1782	mirrorItem.addActionListener(this);
1181	1783	menu.add("-");
1182		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1183		- memoryItem.addActionListener(this);
1184	1784	menu.add(analyzeItem = new MenuItem("Analyze"));
1185	1785	analyzeItem.addActionListener(this);
1186		- menu.add(dumpItem = new MenuItem("Dump"));
	1786	+ menu.add(dumpItem = new MenuItem("Print"));
1187	1787	dumpItem.addActionListener(this);
1188	1788	// menu.add(pathItem = new MenuItem("From-to path"));
1189	1789	// pathItem.addActionListener(this);
..	..	@@ -1324,9 +1924,34 @@
1324	1924	shadow.material = new cMaterial(obj.material);
1325	1925	shadow.material.diffuse = 0.0001f;
1326	1926	shadow.material.specular = 0.0001f;
	1927	+ //shadow.projectedVertices[1].x = 300;
1327	1928
1328	1929	makeSomething(shadow);
1329	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	+ }
1330	1955
1331	1956	/**
1332	1957	* applyExample
..	..	@@ -1530,9 +2155,9 @@
1530	2155
1531	2156	void Overwrite(int mask)
1532	2157	{
1533		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2158	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1534	2159	{
1535		- Object3D content = GrafreeD.clipboard.get(0);
	2160	+ Object3D content = Grafreed.clipboard.get(0);
1536	2161
1537	2162	if (content instanceof cGroup && ((cGroup)content).transientlink )
1538	2163	content = ((cGroup)content).get(0);
..	..	@@ -1571,7 +2196,7 @@
1571	2196	{
1572	2197	ScreenFit();
1573	2198	} else
1574		- if (source == switchItem)
	2199	+ if (source == switchViewItem)
1575	2200	{
1576	2201	cVector v1 = new cVector();
1577	2202	cVector v2 = new cVector();
..	..	@@ -1580,11 +2205,11 @@
1580	2205	objEditor.cameraView.renderCamera.setAim(v2, v1);
1581	2206	objEditor.cameraView.repaint();
1582	2207	} else
1583		- if (source == rectoidItem)
	2208	+ if (source == rectoidItem \|\| source == boxButton)
1584	2209	{
1585	2210	makeSomething(new Box());
1586	2211	} else
1587		- if (source == particleItem)
	2212	+ if (source == particleItem \|\| source == particlesButton)
1588	2213	{
1589	2214	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1590	2215	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1663,27 +2288,27 @@
1663	2288
1664	2289	makeSomething(obj);
1665	2290	} else
1666		- if (source == gridItem)
	2291	+ if (source == gridItem \|\| source == gridButton)
1667	2292	{
1668	2293	makeSomething(new Grid());
1669	2294	} else
1670		- if (source == ellipsoidItem)
	2295	+ if (source == ellipsoidItem \|\| source == sphereButton)
1671	2296	{
1672	2297	makeSomething(new Sphere());
1673	2298	} else
1674		- if (source == coneItem)
	2299	+ if (source == coneItem \|\| source == coneButton)
1675	2300	{
1676	2301	makeSomething(new Cone());
1677	2302	} else
1678		- if (source == torusItem)
	2303	+ if (source == torusItem \|\| source == torusButton)
1679	2304	{
1680	2305	makeSomething(new Torus());
1681	2306	} else
1682		- if (source == superItem)
	2307	+ if (source == superItem \|\| source == superButton)
1683	2308	{
1684	2309	makeSomething(new Superellipsoid());
1685	2310	} else
1686		- if (source == kleinItem)
	2311	+ if (source == kleinItem \|\| source == kleinButton)
1687	2312	{
1688	2313	makeSomething(new Klein());
1689	2314	} else
..	..	@@ -1703,7 +2328,7 @@
1703	2328	{
1704	2329	makeSomething(new BezierSurface());
1705	2330	} else
1706		- if (source == overlayItem)
	2331	+ if (source == overlayItem \|\| source == overlayButton)
1707	2332	{
1708	2333	/*
1709	2334	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1751,10 +2376,27 @@
1751	2376	s.setup();
1752	2377	makeSomething(s);
1753	2378	} else
1754		- if (source == lightItem)
	2379	+ if (source == lightItem \|\| source == lightButton)
1755	2380	{
1756	2381	makeSomething(new Light());
1757	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
1758	2400	if (source == csgItem)
1759	2401	{
1760	2402	group(new CSG());
..	..	@@ -1801,30 +2443,30 @@
1801	2443
1802	2444	group(g);
1803	2445	} else
1804		- if (source == loopItem)
	2446	+ if (source == loopItem \|\| source == loopButton)
1805	2447	{
1806	2448	Composite csg = new GroupLeaf();
1807	2449	csg.count = 5;
1808	2450	group(csg);
1809		- Composite child = new cGroup();
	2451	+ Composite child = new cGroup("Branch");
1810	2452	csg.addChild(child);
1811	2453	child.addChild(csg);
1812	2454	} else
1813	2455	if (source == doubleItem)
1814	2456	{
1815		- Composite csg = new GroupLeaf();
	2457	+ Composite csg = new GroupLeaf("Fork");
1816	2458	csg.count = 5;
1817	2459	group(csg);
1818		- Composite child = new cGroup();
	2460	+ Composite child = new cGroup("Branch A");
1819	2461	csg.addChild(child);
1820	2462	child.addChild(csg);
1821		- child = new cGroup();
	2463	+ child = new cGroup("Branch B");
1822	2464	csg.addChild(child);
1823	2465	child.addChild(csg);
1824	2466	} else
1825	2467	if (source == tripleItem)
1826	2468	{
1827		- Composite csg = new GroupLeaf();
	2469	+ Composite csg = new GroupLeaf("Trident");
1828	2470	csg.count = 4;
1829	2471	group(csg);
1830	2472	Composite child = new cGroup();
..	..	@@ -1837,27 +2479,10 @@
1837	2479	csg.addChild(child);
1838	2480	child.addChild(csg);
1839	2481	} else
1840		-
1841		- if (source == importGFDItem)
1842		- {
1843		- ImportGFD();
1844		- } else
1845		- if (source == importVRMLX3DItem)
1846		- {
1847		- ImportVRMLX3D();
1848		- } else
1849		- if (source == import3DSItem)
1850		- {
1851		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1852		- } else
1853		- if (source == importOBJItem)
1854		- {
1855		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1856		- } else
1857	2482	if (source == computeAOItem)
1858	2483	{
1859	2484	Globals.drawMode = CameraPane.OCCLUSION;
1860		- Globals.theRenderer.repaint();
	2485	+ cameraView.repaint();
1861	2486	} else
1862	2487	if (source == recompileItem)
1863	2488	{
..	..	@@ -1872,7 +2497,7 @@
1872	2497	if (source == invariantsItem)
1873	2498	{
1874	2499	System.out.println("Invariants:");
1875		- GrafreeD.grafreeD.universe.invariants();
	2500	+ Grafreed.grafreeD.universe.invariants();
1876	2501	} else
1877	2502	if (source == memoryItem)
1878	2503	{
..	..	@@ -1891,6 +2516,46 @@
1891	2516	{
1892	2517	DumpObject();
1893	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
1894	2559	if (source == oneStepButton)
1895	2560	{
1896	2561	Globals.ONESTEP = true;
..	..	@@ -1898,17 +2563,14 @@
1898	2563	} else
1899	2564	if (source == screenfitButton)
1900	2565	{
1901		- //Reload(lastConverter, lastFilename, true);
1902	2566	ScreenFit();
1903	2567	} else
1904	2568	if (source == screenfitpointButton)
1905	2569	{
1906		- //Reload(lastConverter, lastFilename, true);
1907	2570	ScreenFitPoint();
1908	2571	} else
1909	2572	if (source == snapobjectButton)
1910	2573	{
1911		- //Reload(lastConverter, lastFilename, true);
1912	2574	SnapObject();
1913	2575	} else
1914	2576	// if (event.getSource() == recompileButton)
..	..	@@ -1945,12 +2607,20 @@
1945	2607	{
1946	2608	loadClipboard(true);
1947	2609	} else
	2610	+ if (source == undoItem)
	2611	+ {
	2612	+ Undo();
	2613	+ } else
	2614	+ if (source == redoItem)
	2615	+ {
	2616	+ Redo();
	2617	+ } else
1948	2618	if (source == duplicateItem)
1949	2619	{
1950		- Object3D keep = GrafreeD.clipboard;
	2620	+ Object3D keep = Grafreed.clipboard;
1951	2621	loadClipboard(false);
1952	2622	paste(false);
1953		- GrafreeD.clipboard = keep;
	2623	+ Grafreed.clipboard = keep;
1954	2624	} else
1955	2625	if (source == cloneItem)
1956	2626	{
..	..	@@ -2170,9 +2840,9 @@
2170	2840	// group.selection.get(0).setMasterThis(content); // should be identity
2171	2841	// refreshContents();
2172	2842	// }
2173		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2843	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2174	2844	{
2175		- Object3D content = GrafreeD.clipboard.get(0);
	2845	+ Object3D content = Grafreed.clipboard.get(0);
2176	2846
2177	2847	if (content instanceof cGroup && ((cGroup)content).transientlink )
2178	2848	content = ((cGroup)content).get(0);
..	..	@@ -2222,9 +2892,9 @@
2222	2892	} else
2223	2893	if (source == setMasterItem)
2224	2894	{
2225		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2895	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2226	2896	{
2227		- Object3D content = GrafreeD.clipboard.get(0);
	2897	+ Object3D content = Grafreed.clipboard.get(0);
2228	2898
2229	2899	if (content instanceof cGroup && ((cGroup)content).transientlink )
2230	2900	content = ((cGroup)content).get(0);
..	..	@@ -2237,9 +2907,9 @@
2237	2907	{
2238	2908	if (group.selection.size() == 1)
2239	2909	{
2240		- if (GrafreeD.clipboard.size() == 1)
	2910	+ if (Grafreed.clipboard.size() == 1)
2241	2911	{
2242		- Object3D content = GrafreeD.clipboard.get(0);
	2912	+ Object3D content = Grafreed.clipboard.get(0);
2243	2913
2244	2914	if (content instanceof cGroup && ((cGroup)content).transientlink )
2245	2915	content = ((cGroup)content).get(0);
..	..	@@ -2256,7 +2926,7 @@
2256	2926	{
2257	2927	RevertMeshes();
2258	2928	} else
2259		- if (source == resetMeshItem)
	2929	+ if (source == resetAllItem)
2260	2930	{
2261	2931	ResetAll();
2262	2932	} else
..	..	@@ -2264,7 +2934,7 @@
2264	2934	{
2265	2935	StepAll();
2266	2936	} else
2267		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	2937	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2268	2938	{
2269	2939	//int indices[] = jList.getSelectedIndices();
2270	2940	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2276,9 +2946,9 @@
2276	2946	{
2277	2947	ClearSelection(true);
2278	2948	} else
2279		- if (source == grabItem)
	2949	+ if (source == grabItem \|\| source == groupButton)
2280	2950	{
2281		- group(new cGroup(), true);
	2951	+ group(new cGroup(), false); // true);
2282	2952	} else
2283	2953	if (source == hideItem)
2284	2954	{
..	..	@@ -2296,11 +2966,11 @@
2296	2966	{
2297	2967	makeSomething(new Camera());
2298	2968	} else
2299		- if (source == compositeItem)
	2969	+ if (source == compositeItem \|\| source == compositeButton)
2300	2970	{
2301	2971	group(new Composite());
2302	2972	} else
2303		- if (source == randomItem)
	2973	+ if (source == switchItem \|\| source == switchButton)
2304	2974	{
2305	2975	RandomNode random = new RandomNode();
2306	2976	group(random);
..	..	@@ -2402,7 +3072,7 @@
2402	3072	{
2403	3073	group(new cLinker());
2404	3074	} else
2405		- if (source == textureItem)
	3075	+ if (source == textureItem \|\| source == textureButton)
2406	3076	{
2407	3077	group(new TextureNode());
2408	3078	} else
..	..	@@ -2422,17 +3092,30 @@
2422	3092	{
2423	3093	CastShadow(2);
2424	3094	} else
2425		- if (source == ungroupItem)
	3095	+ if (source == ungroupItem \|\| source == ungroupButton)
2426	3096	{
2427		- //ungroup();
	3097	+ boolean hasRoot = false;
	3098	+
2428	3099	for (int i=0; i<group.selection.size(); i++)
2429	3100	{
2430		- Ungroup(group.selection.get(i));
	3101	+ if (group.selection.get(i) == group)
	3102	+ {
	3103	+ hasRoot = true;
	3104	+ break;
	3105	+ }
2431	3106	}
2432	3107
2433		- ClearSelection(false);
2434		-
2435		- 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	+ }
2436	3119	} else
2437	3120	if (source == genUVItem)
2438	3121	{
..	..	@@ -2444,7 +3127,7 @@
2444	3127	} else
2445	3128	if (source == genNormalsMESHItem)
2446	3129	{
2447		- GenNormals(true); // TODO
	3130	+ GenNormalsMESH();
2448	3131	} else
2449	3132	if (source == genNormalsORGANItem)
2450	3133	{
..	..	@@ -2509,6 +3192,22 @@
2509	3192	if (source == unmarkleavesItem)
2510	3193	{
2511	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);
2512	3211	} else
2513	3212	if (source == flipVItem)
2514	3213	{
..	..	@@ -2594,9 +3293,13 @@
2594	3293	{
2595	3294	SmoothMesh();
2596	3295	} else
2597		- if (source == transformgeometryItem)
	3296	+ if (source == transformGeometryItem)
2598	3297	{
2599	3298	TransformGeometry();
	3299	+ } else
	3300	+ if (source == transformChildrenItem)
	3301	+ {
	3302	+ TransformChildren();
2600	3303	} else
2601	3304	if (source == resetTransformItem)
2602	3305	{
..	..	@@ -2604,7 +3307,11 @@
2604	3307	} else
2605	3308	if (source == resetCentroidItem)
2606	3309	{
2607		- ResetCentroid();
	3310	+ ResetCentroid(true);
	3311	+ } else
	3312	+ if (source == resetCentroidXZItem)
	3313	+ {
	3314	+ ResetCentroid(false);
2608	3315	} else
2609	3316	if (source == resetParentItem)
2610	3317	{
..	..	@@ -2709,7 +3416,7 @@
2709	3416	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2710	3417	{
2711	3418	obj = (Object3D)e.nextElement();
2712		- obj.SetBumpTexture(null);
	3419	+ obj.ResetBumpTexture();
2713	3420	}
2714	3421
2715	3422	refreshContents();
..	..	@@ -2725,6 +3432,31 @@
2725	3432
2726	3433	refreshContents();
2727	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
2728	3460	if (source == flashSelectionButton)
2729	3461	{
2730	3462	CameraPane.flash = true;
..	..	@@ -2736,6 +3468,10 @@
2736	3468	if (source == twoButton)
2737	3469	{
2738	3470	radio.layout = twoButton;
	3471	+
	3472	+ if (CameraPane.FULLSCREEN)
	3473	+ fullscreenLayout = radio.layout;
	3474	+
2739	3475	// bug
2740	3476	//gridPanel.setDividerLocation(1.0);
2741	3477	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2768,10 +3504,31 @@
2768	3504	bigThree.ClearUI();
2769	3505	bigThree.add(centralPanel);
2770	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	+
2771	3525	} else
2772	3526	if (source == threeButton)
2773	3527	{
2774	3528	radio.layout = threeButton;
	3529	+
	3530	+ if (CameraPane.FULLSCREEN)
	3531	+ fullscreenLayout = radio.layout;
2775	3532
2776	3533	// bigThree.remove(scenePanel);
2777	3534	// bigThree.remove(centralPanel);
..	..	@@ -2801,13 +3558,18 @@
2801	3558	// centralPanel.setVisible(true);
2802	3559	// XYZPanel.setVisible(true);
2803	3560	bigThree.ClearUI();
	3561	+ bigThree.add(scenePanel);
2804	3562	bigThree.add(centralPanel);
2805		- bigThree.add(XYZPanel);
2806	3563	bigThree.FlushUI();
	3564	+
	3565	+ cameraView.requestFocusInWindow();
2807	3566	} else
2808	3567	if (source == fourButton)
2809	3568	{
2810	3569	radio.layout = fourButton;
	3570	+
	3571	+ if (CameraPane.FULLSCREEN)
	3572	+ fullscreenLayout = radio.layout;
2811	3573
2812	3574	// bigThree.remove(scenePanel);
2813	3575	// bigThree.remove(centralPanel);
..	..	@@ -2839,10 +3601,15 @@
2839	3601	bigThree.ClearUI();
2840	3602	bigThree.add(scenePanel);
2841	3603	bigThree.FlushUI();
	3604	+
	3605	+ cameraView.requestFocusInWindow();
2842	3606	} else
2843	3607	if (source == sixButton)
2844	3608	{
2845	3609	radio.layout = sixButton;
	3610	+
	3611	+ if (CameraPane.FULLSCREEN)
	3612	+ fullscreenLayout = radio.layout;
2846	3613
2847	3614	// bigThree.remove(scenePanel);
2848	3615	// bigThree.remove(centralPanel);
..	..	@@ -2872,13 +3639,18 @@
2872	3639	// centralPanel.setVisible(true);
2873	3640	// XYZPanel.setVisible(false);
2874	3641	bigThree.ClearUI();
2875		- bigThree.add(scenePanel);
2876	3642	bigThree.add(centralPanel);
	3643	+ bigThree.add(scenePanel);
2877	3644	bigThree.FlushUI();
	3645	+
	3646	+ cameraView.requestFocusInWindow();
2878	3647	} else
2879	3648	if (source == sevenButton)
2880	3649	{
2881	3650	radio.layout = sevenButton;
	3651	+
	3652	+ if (CameraPane.FULLSCREEN)
	3653	+ fullscreenLayout = radio.layout;
2882	3654
2883	3655	// bigThree.remove(scenePanel);
2884	3656	// bigThree.remove(centralPanel);
..	..	@@ -2912,6 +3684,8 @@
2912	3684	bigThree.add(centralPanel);
2913	3685	bigThree.add(XYZPanel);
2914	3686	bigThree.FlushUI();
	3687	+
	3688	+ cameraView.requestFocusInWindow();
2915	3689	} else
2916	3690	if (source == rootButton)
2917	3691	{
..	..	@@ -2923,6 +3697,7 @@
2923	3697	EditObject(obj);
2924	3698	}
2925	3699
	3700	+ cameraView.requestFocusInWindow();
2926	3701	refreshContents(true);
2927	3702	} else
2928	3703	if (source == closeButton)
..	..	@@ -2932,22 +3707,37 @@
2932	3707	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2933	3708	{
2934	3709	ab = (cRadio)e.nextElement();
2935		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3710	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2936	3711	{
	3712	+ // Patch to avoid bug with transparency.
	3713	+ if (!ab.hadMaterial)
	3714	+ {
	3715	+ ab.object.material = null;
	3716	+ }
	3717	+
2937	3718	buttonGroup.remove(ab);
2938	3719	radioPanel.remove(ab);
2939	3720
2940		- ab.GetObject().editWindow = null;
	3721	+ //ab.GetObject().editWindow = null;
	3722	+ ab.GetObject().manipWindow = null;
2941	3723	// ab.GetObject().objectUI = null; // ?????????
2942	3724
2943	3725	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2944	3726	break;
2945	3727	}
2946	3728	}
	3729	+
	3730	+ cameraView.requestFocusInWindow();
2947	3731	refreshContents(true);
2948	3732	} else
2949	3733	if (source == editItem \|\| source == editButton)
2950	3734	{
	3735	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3736	+ {
	3737	+ Object3D child = (Object3D)e.nextElement();
	3738	+ child.pinned = true;
	3739	+ }
	3740	+
2951	3741	EditSelection(false);
2952	3742	} else
2953	3743	if (source == uneditButton)
..	..	@@ -2957,10 +3747,11 @@
2957	3747	Object3D child = (Object3D)e.nextElement();
2958	3748	if(child.editWindow != null)
2959	3749	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3750	+ child.pinned = false;
2960	3751	child.CloseUI();
2961	3752	listUI.remove(child);
2962	3753
2963		- child.editWindow = null; // ???????????
	3754	+ //child.editWindow = null; // ???????????
2964	3755	}
2965	3756	objEditor.ctrlPanel.FlushUI();
2966	3757	//objEditor.jTree.clearSelection();
..	..	@@ -2973,6 +3764,7 @@
2973	3764	//copy.ClearUI();
2974	3765	for (Object3D obj : listUI)
2975	3766	{
	3767	+ obj.pinned = false;
2976	3768	obj.CloseUI();
2977	3769	}
2978	3770	listUI.clear();
..	..	@@ -2982,7 +3774,7 @@
2982	3774	{
2983	3775	assert(copy == group);
2984	3776
2985		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3777	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2986	3778
2987	3779	for (Object3D obj : listUI)
2988	3780	{
..	..	@@ -3031,6 +3823,9 @@
3031	3823	}
3032	3824
3033	3825	copy = group;
	3826	+
	3827	+ SetUndoStates();
	3828	+
3034	3829	//Globals.theRenderer.object = group;
3035	3830	if(!useclient)
3036	3831	{
..	..	@@ -3046,20 +3841,46 @@
3046	3841	frontView.object = group;
3047	3842	sideView.object = group;
3048	3843	}
3049		- group.editWindow = this;
	3844	+
	3845	+// fix "+" issue
	3846	+ //group.editWindow = this;
	3847	+ group.manipWindow = this;
	3848	+
3050	3849	/*
3051	3850	currentLayout = radio.layout;
3052	3851	if (currentLayout == null)
3053	3852	currentLayout = sevenButton;
3054	3853	*/
3055	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);
3056	3862	keepparent = group.parent;
3057	3863	// PARENT = NULL or not???
3058	3864	//group.parent = null; // ROOT
3059	3865	//group.attributes = -1;
3060	3866	ResetModel();
	3867	+
	3868	+ cameraView.requestFocusInWindow();
3061	3869	refreshContents(true);
3062		- }
	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	+ }
3063	3884	else
3064	3885	{
3065	3886	//return super.action(event, arg);
..	..	@@ -3068,7 +3889,6 @@
3068	3889	}
3069	3890
3070	3891	boolean useclient = false;
3071		- cRadio radio;
3072	3892
3073	3893	void ToggleRoot()
3074	3894	{
..	..	@@ -3120,6 +3940,28 @@
3120	3940	refreshContents();
3121	3941	}
3122	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	+ }
3123	3965
3124	3966	void ResetTransform()
3125	3967	{
..	..	@@ -3232,7 +4074,7 @@
3232	4074	refreshContents();
3233	4075	}
3234	4076
3235		- void ResetCentroid()
	4077	+ void ResetCentroid(boolean full)
3236	4078	{
3237	4079	Object3D obj;
3238	4080	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3247,12 +4089,16 @@
3247	4089	LA.matIdentity(Object3D.mat);
3248	4090	obj.getBounds(minima, maxima, false);
3249	4091	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3250		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	4092	+ if (full)
	4093	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3251	4094	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3252	4095	obj.TransformMesh(Object3D.mat);
	4096	+
3253	4097	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3254		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	4098	+ if (full)
	4099	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3255	4100	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	4101	+
3256	4102	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3257	4103	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3258	4104	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3281,7 +4127,8 @@
3281	4127
3282	4128	int size = obj.MemorySize();
3283	4129
3284		- 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)");
3285	4132	}
3286	4133	}
3287	4134	catch (Exception e)
..	..	@@ -3318,9 +4165,9 @@
3318	4165	obj = (Object3D)e.nextElement();
3319	4166
3320	4167	System.out.println("Object is: " + obj);
3321		- GrafreeD.AnalyzeObject(obj);
	4168	+ Grafreed.AnalyzeObject(obj);
3322	4169	System.out.println("Boundary rep: " + obj.bRep);
3323		- GrafreeD.AnalyzeObject(obj.bRep);
	4170	+ Grafreed.AnalyzeObject(obj.bRep);
3324	4171
3325	4172	// System.err.println((size/1024) + " KB is the size of " + obj);
3326	4173	}
..	..	@@ -3362,6 +4209,13 @@
3362	4209	void GenNormals(boolean crease)
3363	4210	{
3364	4211	group.GenNormalsS(crease);
	4212	+
	4213	+ refreshContents();
	4214	+ }
	4215	+
	4216	+ void GenNormalsMESH()
	4217	+ {
	4218	+ group.GenNormalsMeshS();
3365	4219
3366	4220	refreshContents();
3367	4221	}
..	..	@@ -3534,8 +4388,8 @@
3534	4388
3535	4389	void ParseVertices()
3536	4390	{
3537		- boolean epsequal = GrafreeD.epsequal;
3538		- GrafreeD.epsequal = true;
	4391	+ boolean epsequal = Grafreed.epsequal;
	4392	+ Grafreed.epsequal = true;
3539	4393
3540	4394	for (int i=0; i<group.selection.size(); i++)
3541	4395	{
..	..	@@ -3560,7 +4414,7 @@
3560	4414	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3561	4415	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3562	4416
3563		- g.add(GrafreeD.clipboard);
	4417	+ g.add(Grafreed.clipboard);
3564	4418
3565	4419	buffer.add(g);
3566	4420	}
..	..	@@ -3575,7 +4429,7 @@
3575	4429	makeSomething(buffer, i==group.selection.size()-1);
3576	4430	}
3577	4431
3578		- GrafreeD.epsequal = epsequal;
	4432	+ Grafreed.epsequal = epsequal;
3579	4433
3580	4434	refreshContents();
3581	4435	}
..	..	@@ -3593,7 +4447,16 @@
3593	4447	String pigment = Object3D.GetPigment(tex);
3594	4448	//String bump = Object3D.GetBump(tex);
3595	4449
3596		- 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	+ }
3597	4460
3598	4461	double s = v.s;
3599	4462
..	..	@@ -3725,7 +4588,7 @@
3725	4588	return;
3726	4589
3727	4590	Object3D poses = group.selection.get(0);
3728		- Object3D ref = GrafreeD.clipboard.get(0);
	4591	+ Object3D ref = Grafreed.clipboard.get(0);
3729	4592
3730	4593	Object3D newgroup = new Object3D("Po:" + poses.name);
3731	4594
..	..	@@ -3919,9 +4782,9 @@
3919	4782
3920	4783	void ClipMesh()
3921	4784	{
3922		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4785	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3923	4786	{
3924		- Object3D content = GrafreeD.clipboard.get(0);
	4787	+ Object3D content = Grafreed.clipboard.get(0);
3925	4788
3926	4789	if (content instanceof cGroup && ((cGroup)content).transientlink )
3927	4790	content = ((cGroup)content).get(0);
..	..	@@ -3930,7 +4793,7 @@
3930	4793	// {
3931	4794	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3932	4795	// }
3933		- group.selection.ClipMesh(GrafreeD.clipboard);
	4796	+ group.selection.ClipMesh(Grafreed.clipboard);
3934	4797	}
3935	4798	// group.selection.ClipMesh(GrafreeD.clipboard);
3936	4799	System.out.println("DONE.");
..	..	@@ -3977,6 +4840,18 @@
3977	4840	void MarkLeaves(boolean hide)
3978	4841	{
3979	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);
3980	4855	refreshContents();
3981	4856	}
3982	4857
..	..	@@ -4051,28 +4926,25 @@
4051	4926	// }
4052	4927	// }
4053	4928
4054		- static boolean allparams = true;
4055		-
4056		- static Vector<Object3D> listUI = new Vector<Object3D>();
4057		-
4058	4929	void EditSelection(boolean newWindow)
4059	4930	{
	4931	+ if (group.selection == null)
	4932	+ {
	4933	+ EditElement(group, newWindow); // ? new
	4934	+ return;
	4935	+ }
	4936	+
4060	4937	// aConstraints.gridy = 0;
4061	4938	for (int i=0; i<group.selection.size(); i++)
4062	4939	{
4063	4940	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4064	4941	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4065		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4942	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4066	4943
4067	4944	Object3D elem = (Object3D)group.selection.elementAt(i);
4068		- if(elem != group)
	4945	+ if(elem != group \|\| !newWindow)
4069	4946	{
4070		- // if (!(elem instanceof Composite))
4071		- // newWindow = false;
4072		- listUI.add(elem);
4073		- elem.openEditWindow(this, newWindow); //, false);
4074		- System.out.println("edit : " + elem);
4075		- elem.editWindow.refreshContents(true); // ? new
	4947	+ EditElement(elem, newWindow); // ? new
4076	4948	}
4077	4949	}
4078	4950	}
..	..	@@ -4147,7 +5019,8 @@
4147	5019	//new Exception().printStackTrace();
4148	5020
4149	5021	freezemodel = true;
4150		-
	5022	+ ClearUnpinned();
	5023	+
4151	5024	/**/
4152	5025	//switch (event.id)
4153	5026	{
..	..	@@ -4155,7 +5028,6 @@
4155	5028	//case 702: // Event.LIST_DESELECT
4156	5029	group.deselectAll();
4157	5030	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4158		- objEditor.ClearInfo(); // .GetMaterial());
4159	5031	if (tps != null)
4160	5032	{
4161	5033	for (int i=0; i < tps.length; i++)
..	..	@@ -4164,10 +5036,8 @@
4164	5036
4165	5037	//if (child.parent != null)
4166	5038	//child.parent.addSelectee(child);
	5039	+ objEditor.SetMaterial(child);
4167	5040	group.addSelectee(child);
4168		- objEditor.SetMaterial(child); // .GetMaterial());
4169		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4170		- System.err.println("info : " + child.GetPath());
4171	5041	}
4172	5042	}
4173	5043	// else
..	..	@@ -4177,20 +5047,28 @@
4177	5047	// System.err.println("info : " + group.GetPath());
4178	5048	// }
4179	5049
4180		- objEditor.SetText(); // jan 2014
4181		-
4182		- 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))
4183	5051	CameraPane.flash = true;
4184	5052
4185		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5053	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4186	5054	// a camera
4187	5055	{
4188		- CameraPane.camerachangeframe = 0; // don't refuse it
4189		- 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	+ }
4190	5061	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4191	5062	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4192	5063	}
4193	5064
	5065	+ if (tps != null && tps.length == 1)
	5066	+ {
	5067	+ EditSelection(false);
	5068	+ }
	5069	+
	5070	+ SetPinStates(tps != null && tps.length > 0);
	5071	+
4194	5072	refreshContents();
4195	5073	//return true;
4196	5074	}
..	..	@@ -4199,6 +5077,35 @@
4199	5077
4200	5078	freezemodel = false;
4201	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	+ }
4202	5109
4203	5110	void linkSomething(Object3D thing)
4204	5111	{
..	..	@@ -4270,16 +5177,19 @@
4270	5177	{
4271	5178	if (group.selection.isEmpty())
4272	5179	return;
4273		- GrafreeD.clipboardIsTempGroup = false;
	5180	+
	5181	+ Grafreed.clipboardIsTempGroup = false;
4274	5182	Composite tGroup = null;
4275	5183	if (group.selection.size() > 0) // 1)
4276	5184	{
4277	5185	tGroup = new cGroup();
4278		- GrafreeD.clipboardIsTempGroup = true;
	5186	+ Grafreed.clipboardIsTempGroup = true;
4279	5187	}
4280	5188
4281	5189	if (cut)
4282	5190	{
	5191	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5192	+// Save();
4283	5193	//int indices[] = jList.getSelectedIndices();
4284	5194	//for (int i = indices.length - 1; i >= 0; i--)
4285	5195	//jList.remove(indices[i]);
..	..	@@ -4315,16 +5225,16 @@
4315	5225	//System.out.println("cut " + child);
4316	5226	//System.out.println("parent = " + child.parent);
4317	5227	// tmp.addChild(child);
4318		- if (GrafreeD.clipboardIsTempGroup)
	5228	+ if (Grafreed.clipboardIsTempGroup)
4319	5229	tGroup.add/Child/(tmp);
4320	5230	else
4321		- GrafreeD.clipboard = tmp;
	5231	+ Grafreed.clipboard = tmp;
4322	5232	}
4323	5233	else
4324		- if (GrafreeD.clipboardIsTempGroup)
	5234	+ if (Grafreed.clipboardIsTempGroup)
4325	5235	tGroup.add/Child/(child);
4326	5236	else
4327		- GrafreeD.clipboard = child;
	5237	+ Grafreed.clipboard = child;
4328	5238	}
4329	5239
4330	5240	//ResetModel();
..	..	@@ -4356,21 +5266,23 @@
4356	5266	//System.out.println("cut " + elem);
4357	5267	//System.out.println("parent = " + elem.parent);
4358	5268	// tmp.addChild(elem);
4359		- if (GrafreeD.clipboardIsTempGroup)
	5269	+ if (Grafreed.clipboardIsTempGroup)
4360	5270	tGroup.add/Child/(tmp);
4361	5271	else
4362		- GrafreeD.clipboard = tmp;
	5272	+ Grafreed.clipboard = tmp;
4363	5273	}
4364	5274	else
4365		- if (GrafreeD.clipboardIsTempGroup)
	5275	+ if (Grafreed.clipboardIsTempGroup)
4366	5276	tGroup.add/Child/(child);
4367	5277	else
4368		- GrafreeD.clipboard = child;
	5278	+ Grafreed.clipboard = child;
4369	5279	}
4370	5280
4371	5281	}
4372		- if (GrafreeD.clipboardIsTempGroup)
4373		- GrafreeD.clipboard = tGroup;
	5282	+
	5283	+ if (Grafreed.clipboardIsTempGroup)
	5284	+ Grafreed.clipboard = tGroup;
	5285	+
4374	5286	if (cut)
4375	5287	{
4376	5288	ResetModel();
..	..	@@ -4380,11 +5292,15 @@
4380	5292
4381	5293	void paste(boolean expand)
4382	5294	{
	5295	+ if (Globals.REPLACEONMAKE)
	5296	+ Save();
	5297	+ boolean keep = Globals.REPLACEONMAKE;
	5298	+ Globals.REPLACEONMAKE = false;
4383	5299	// if (GrafreeD.clipboard == null)
4384	5300	// return;
4385	5301	boolean first = true;
4386	5302
4387		- if (GrafreeD.clipboardIsTempGroup)
	5303	+ if (Grafreed.clipboardIsTempGroup)
4388	5304	{
4389	5305	Composite temp;
4390	5306
..	..	@@ -4395,7 +5311,7 @@
4395	5311	temp = (Composite)Applet3D.clipboard.deepCopy();
4396	5312	*/
4397	5313	Object3D elem;
4398		- 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))
4399	5315	{
4400	5316	Object3D child = (Object3D)e.nextElement();
4401	5317
..	..	@@ -4429,16 +5345,17 @@
4429	5345	//Object3D cb = Applet3D.clipboard;
4430	5346	//temp.addChild(cb);
4431	5347	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4432		- assert(GrafreeD.clipboard.parent == null);
4433		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4434		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4435		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4436		- 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());
4437	5353	else
4438		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4439		- GrafreeD.clipboard.get(0).parent = keepparent;
	5354	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5355	+ Grafreed.clipboard.get(0).parent = keepparent;
4440	5356	}
4441	5357
	5358	+ Globals.REPLACEONMAKE = keep;
4442	5359	ResetModel();
4443	5360	refreshContents();
4444	5361	}
..	..	@@ -4485,9 +5402,9 @@
4485	5402	{
4486	5403	boolean first = true;
4487	5404
4488		- if (GrafreeD.clipboardIsTempGroup)
	5405	+ if (Grafreed.clipboardIsTempGroup)
4489	5406	{
4490		- Composite temp = (Composite)GrafreeD.clipboard;
	5407	+ Composite temp = (Composite)Grafreed.clipboard;
4491	5408	Object3D copy;
4492	5409	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4493	5410	{
..	..	@@ -4497,7 +5414,7 @@
4497	5414	}
4498	5415	} else
4499	5416	{
4500		- linkSomething(GrafreeD.clipboard); //.get(0));
	5417	+ linkSomething(Grafreed.clipboard); //.get(0));
4501	5418	}
4502	5419	}
4503	5420	}
..	..	@@ -4574,6 +5491,10 @@
4574	5491
4575	5492	void group(Object3D csg, boolean grab)
4576	5493	{
	5494	+ if (Globals.REPLACEONMAKE)
	5495	+ Save();
	5496	+ boolean keep = Globals.REPLACEONMAKE;
	5497	+ Globals.REPLACEONMAKE = false;
4577	5498	if (//false) // why??
4578	5499	!group.selection.isEmpty())
4579	5500	{
..	..	@@ -4687,10 +5608,15 @@
4687	5608	//node.add(csg);
4688	5609	//makeSomething(node);
4689	5610	makeSomething(csg);
	5611	+ Globals.REPLACEONMAKE = keep;
4690	5612	}
4691	5613
4692	5614	void Ungroup(Object3D g)
4693	5615	{
	5616	+ if (Globals.REPLACEONMAKE)
	5617	+ Save();
	5618	+ boolean keep = Globals.REPLACEONMAKE;
	5619	+ Globals.REPLACEONMAKE = false;
4694	5620	if (g instanceof HiddenObject)
4695	5621	{
4696	5622	HiddenObject h = (HiddenObject) g;
..	..	@@ -4707,6 +5633,7 @@
4707	5633	objEditor.makeSomething(g.get(i), false);
4708	5634	}
4709	5635	}
	5636	+ Globals.REPLACEONMAKE = keep;
4710	5637	}
4711	5638
4712	5639	void ungroup()
..	..	@@ -4902,21 +5829,6 @@
4902	5829	}
4903	5830	*/
4904	5831
4905		- void ImportGFD()
4906		- {
4907		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4908		- browser.show();
4909		- String filename = browser.getFile();
4910		- if (filename != null && filename.length() > 0)
4911		- {
4912		- String fullname = browser.getDirectory() + filename;
4913		-
4914		- //Object3D readobj =
4915		- objEditor.ReadGFD(fullname, objEditor);
4916		- //makeSomething(readobj);
4917		- }
4918		- }
4919		-
4920	5832	/*
4921	5833	public void Callback(Object obj)
4922	5834	{
..	..	@@ -4940,26 +5852,9 @@
4940	5852	}
4941	5853	*/
4942	5854
4943		- void ImportVRMLX3D()
4944		- {
4945		- if (GrafreeD.standAlone)
4946		- {
4947		- /**/
4948		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4949		- browser.show();
4950		- String filename = browser.getFile();
4951		- if (filename != null && filename.length() > 0)
4952		- {
4953		- String fullname = browser.getDirectory() + filename;
4954		- LoadVRMLX3D(fullname);
4955		- }
4956		- /**/
4957		- }
4958		- }
4959		-
4960	5855	String GetFile(String dialogName)
4961	5856	{
4962		- if (GrafreeD.standAlone)
	5857	+ if (Grafreed.standAlone)
4963	5858	{
4964	5859	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4965	5860	browser.show();
..	..	@@ -5027,7 +5922,44 @@
5027	5922	cButton clearpanelButton;
5028	5923	cButton unselectButton;
5029	5924
	5925	+ cButton restoreCameraButton;
	5926	+
	5927	+ cButton saveButton;
5030	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;
5031	5963
5032	5964	cButton screenfitButton;
5033	5965	cButton screenfitpointButton;
..	..	@@ -5040,14 +5972,6 @@
5040	5972
5041	5973	cButton setsupportButton;
5042	5974
5043		- cButton twoButton;
5044		- cButton sixButton;
5045		- cButton threeButton;
5046		- cButton sevenButton;
5047		- cButton fourButton; // full panel
5048		- cButton oneButton; // full XYZ
5049		- //cButton currentLayout;
5050		-
5051	5975	//
5052	5976	//Composite
5053	5977	Object3D // to do !!
..	..	@@ -5057,9 +5981,11 @@
5057	5981	//JTree jTree;
5058	5982	private MenuItem lookAtItem;
5059	5983	private MenuItem lookFromItem;
5060		- private MenuItem switchItem;
	5984	+ private MenuItem switchViewItem;
5061	5985	private MenuItem cutItem;
5062		- private MenuItem duplicateItem;
	5986	+ private MenuItem undoItem;
	5987	+ private MenuItem redoItem;
	5988	+ private JMenuItem duplicateItem;
5063	5989	private MenuItem cloneItem;
5064	5990	private MenuItem cloneSupportItem;
5065	5991	private MenuItem overwriteGeoItem;
..	..	@@ -5072,7 +5998,7 @@
5072	5998	private MenuItem linkverticesItem;
5073	5999	private MenuItem relinkverticesItem;
5074	6000	private MenuItem setMasterItem;
5075		- private MenuItem resetMeshItem;
	6001	+ private MenuItem resetAllItem;
5076	6002	private MenuItem stepAllItem;
5077	6003	private MenuItem revertMeshItem;
5078	6004	private MenuItem poseMeshItem;
..	..	@@ -5087,7 +6013,7 @@
5087	6013	private MenuItem pasteLinkItem;
5088	6014	private MenuItem pasteCloneItem;
5089	6015	private MenuItem pasteExpandItem;
5090		- private MenuItem clearItem;
	6016	+ private MenuItem deleteItem;
5091	6017	private MenuItem clearAllItem;
5092	6018	private MenuItem genUVItem;
5093	6019	private MenuItem genNormalsMESHItem;
..	..	@@ -5122,6 +6048,10 @@
5122	6048	private MenuItem showleavesItem;
5123	6049	private MenuItem markleavesItem;
5124	6050	private MenuItem unmarkleavesItem;
	6051	+ private MenuItem rewindleavesItem;
	6052	+ private MenuItem unrewindleavesItem;
	6053	+ private MenuItem randomleavesItem;
	6054	+ private MenuItem unrandomleavesItem;
5125	6055
5126	6056	private MenuItem flipVItem;
5127	6057	private MenuItem unflipVItem;
..	..	@@ -5133,15 +6063,17 @@
5133	6063	private MenuItem panoTexturesItem;
5134	6064
5135	6065	private MenuItem resetCentroidItem;
5136		- private MenuItem transformgeometryItem;
	6066	+ private MenuItem resetCentroidXZItem;
5137	6067	private MenuItem resetTransformItem;
	6068	+ private MenuItem transformGeometryItem;
	6069	+ private MenuItem transformChildrenItem;
5138	6070	private MenuItem hideItem;
5139	6071	private MenuItem grabItem;
5140	6072	private MenuItem backItem;
5141	6073	private MenuItem frontItem;
5142	6074	private MenuItem cameraItem;
5143	6075	private MenuItem compositeItem;
5144		- private MenuItem randomItem;
	6076	+ private MenuItem switchItem;
5145	6077	private MenuItem physicsItem;
5146	6078	private MenuItem frameselectorItem;
5147	6079	private MenuItem scriptNodeItem;
..	..	@@ -5165,6 +6097,8 @@
5165	6097	private MenuItem attachBumpItem;
5166	6098	private MenuItem detachBumpItem;
5167	6099	private MenuItem pigmentBumpItem;
	6100	+ private MenuItem embedTexturesItem;
	6101	+ private MenuItem deEmbedTexturesItem;
5168	6102
5169	6103	private MenuItem particleItem;
5170	6104	private MenuItem ragdollItem;
..	..	@@ -5203,11 +6137,6 @@
5203	6137	private MenuItem doubleItem;
5204	6138	private MenuItem tripleItem;
5205	6139
5206		- private MenuItem importGFDItem;
5207		- private MenuItem importVRMLX3DItem;
5208		- private MenuItem import3DSItem;
5209		- private MenuItem importOBJItem;
5210		-
5211	6140	private MenuItem computeAOItem;
5212	6141	private MenuItem recompileItem;
5213	6142	private MenuItem editScriptItem;
..	..	@@ -5217,4 +6146,8 @@
5217	6146	private MenuItem analyzeItem;
5218	6147	private MenuItem dumpItem;
5219	6148	//boolean freezemodel = false;
	6149	+
	6150	+ Menu cameraMenu;
	6151	+ MenuItem editCameraItem;
	6152	+ MenuItem restoreCameraItem;
5220	6153	}