~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,30 +401,29 @@
148	401
149	402	//JTextField nameField;
150	403
151		- void SetupMenu2(ObjEditor oe)
	404	+ void SetupMenu2(GroupEditor oe)
152	405	{
153		- oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
154		- //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
155		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
156		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
157		- oe.cameraMenu.add("-");
158		- openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
159		- openWindowItem.addActionListener(this);
160		- editLeafItem.addActionListener(this);
161		- lookAtItem.addActionListener(this);
162		- //lookFromItem.addActinoListener(this);
163		- //switchItem.addActionListener(this);
	406	+ oe.jTree = new cTree();
	407	+
164	408	Menu menu;
165	409	oe.menuBar.add(menu = new Menu("Edit"));
166	410	//editItem = menu.add(new MenuItem("Edit"));
167	411	//editItem.addActionListener(this);
168		- 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"));
169	419	duplicateItem.addActionListener(this);
170		- menu.add("-");
171	420	cloneItem = menu.add(new MenuItem("Clone"));
172	421	cloneItem.addActionListener(this);
	422	+ if (Globals.ADVANCED)
	423	+ {
173	424	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
174	425	cloneSupportItem.addActionListener(this);
	426	+ }
175	427	menu.add("-");
176	428	cutItem = menu.add(new MenuItem("Cut"));
177	429	cutItem.addActionListener(this);
..	..	@@ -179,27 +431,123 @@
179	431	copyItem.addActionListener(this);
180	432	pasteItem = menu.add(new MenuItem("Paste"));
181	433	pasteItem.addActionListener(this);
	434	+
	435	+ menu.add("-");
	436	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	437	+ pasteIntoItem.addActionListener(this);
182	438	pasteLinkItem = menu.add(new MenuItem("Paste link"));
183	439	pasteLinkItem.addActionListener(this);
184	440	pasteCloneItem = menu.add(new MenuItem("Paste clone"));
185	441	pasteCloneItem.addActionListener(this);
186	442	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
187	443	// pasteExpandItem.addActionListener(this);
188		- clearItem = menu.add(new MenuItem("Clear"));
189		- clearItem.addActionListener(this);
	444	+ menu.add("-");
	445	+ deleteItem = menu.add(new MenuItem("Delete"));
	446	+ deleteItem.addActionListener(this);
	447	+
	448	+ if (Globals.ADVANCED)
	449	+ {
	450	+ // Deletes the cameras...
190	451	clearAllItem = menu.add(new MenuItem("Clear All"));
191	452	clearAllItem.addActionListener(this);
	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());
192	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	+
193	542	oe.menuBar.add(menu = new Menu("Setting"));
194		- resetMeshItem = menu.add(new MenuItem("Reset All"));
195		- resetMeshItem.addActionListener(this);
196		- stepAllItem = menu.add(new MenuItem("Step All"));
197		- stepAllItem.addActionListener(this);
	543	+ if (Globals.ADVANCED)
	544	+ {
198	545	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
199	546	revertMeshItem.addActionListener(this);
200	547	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
201	548	resetreferencesItem.addActionListener(this);
202	549	menu.add("-");
	550	+ }
203	551	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
204	552	overwriteGeoItem.addActionListener(this);
205	553	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -211,79 +559,104 @@
211	559	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
212	560	overwriteUVItem.addActionListener(this);
213	561	menu.add("-");
	562	+ if (Globals.ADVANCED)
	563	+ {
214	564	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
215	565	generateMeshItem.addActionListener(this);
216	566	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
217	567	poseMeshItem.addActionListener(this);
218	568	menu.add("-");
	569	+ }
219	570	resetsupportItem = menu.add(new MenuItem("Reset support"));
220	571	resetsupportItem.addActionListener(this);
221	572	linkverticesItem = menu.add(new MenuItem("Link to Support"));
222	573	linkverticesItem.addActionListener(this);
223	574	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
224	575	relinkverticesItem.addActionListener(this);
	576	+
	577	+ if (Globals.ADVANCED)
	578	+ {
225	579	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
226	580	setMasterItem.addActionListener(this);
	581	+ }
227	582
228	583	oe.menuBar.add(menu = new Menu("Group"));
229		- grabItem = menu.add(new MenuItem("Grab"));
230		- grabItem.addActionListener(this);
	584	+// grabItem = menu.add(new MenuItem("Grab"));
	585	+// grabItem.addActionListener(this);
231	586	backItem = menu.add(new MenuItem("Back"));
232	587	backItem.addActionListener(this);
233	588	frontItem = menu.add(new MenuItem("Front"));
234	589	frontItem.addActionListener(this);
235		- compositeItem = menu.add(new MenuItem("Composite"));
236		- compositeItem.addActionListener(this);
237		- hideItem = menu.add(new MenuItem("Hide"));
	590	+// compositeItem = menu.add(new MenuItem("Composite"));
	591	+// compositeItem.addActionListener(this);
	592	+
	593	+ if (Globals.ADVANCED)
	594	+ {
	595	+ hideItem = menu.add(new MenuItem("Hidden Group"));
238	596	hideItem.addActionListener(this);
	597	+ }
239	598	ungroupItem = menu.add(new MenuItem("Ungroup"));
240	599	ungroupItem.addActionListener(this);
241		- menu.add("-");
242		- randomItem = menu.add(new MenuItem("Random"));
243		- randomItem.addActionListener(this);
244		- physicsItem = menu.add(new MenuItem("Physics"));
245		- physicsItem.addActionListener(this);
246		- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
247		- frameselectorItem.addActionListener(this);
	600	+
	601	+// menu.add("-");
	602	+//
	603	+// switchItem = menu.add(new MenuItem("Switch node"));
	604	+// switchItem.addActionListener(this);
	605	+ if (Globals.ADVANCED)
	606	+ {
248	607	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
249	608	switchGeoItem.addActionListener(this);
250	609	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
251	610	switchTransfoItem.addActionListener(this);
252		- morphItem = menu.add(new MenuItem("Morph"));
	611	+ morphItem = menu.add(new MenuItem("Morph Group"));
253	612	morphItem.addActionListener(this);
	613	+
	614	+ menu.add("-");
	615	+ physicsItem = menu.add(new MenuItem("Physics"));
	616	+ physicsItem.addActionListener(this);
	617	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	618	+ frameselectorItem.addActionListener(this);
254	619	scriptNodeItem = menu.add(new MenuItem("Script Node"));
255	620	scriptNodeItem.addActionListener(this);
256		- cameraItem = menu.add(new MenuItem("Camera"));
257		- cameraItem.addActionListener(this);
	621	+ }
258	622
259	623	oe.menuBar.add(menu = new Menu("Object"));
260		- textureItem = menu.add(new MenuItem("Texture"));
261		- textureItem.addActionListener(this);
	624	+// textureItem = menu.add(new MenuItem("Texture"));
	625	+// textureItem.addActionListener(this);
262	626	billboardItem = menu.add(new MenuItem("Billboard"));
263	627	billboardItem.addActionListener(this);
264	628	csgItem = menu.add(new MenuItem("CSG"));
265	629	csgItem.addActionListener(this);
266		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	630	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
267	631	shadowXItem.addActionListener(this);
268		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	632	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
269	633	shadowYItem.addActionListener(this);
270		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	634	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
271	635	shadowZItem.addActionListener(this);
	636	+ attributeItem = menu.add(new MenuItem("Attribute"));
	637	+ attributeItem.addActionListener(this);
	638	+
	639	+ if (Globals.ADVANCED)
	640	+ {
	641	+ menu.add("-");
272	642	linkerItem = menu.add(new MenuItem("Linker"));
273	643	linkerItem.addActionListener(this);
274	644	templateItem = menu.add(new MenuItem("Template"));
275	645	templateItem.addActionListener(this);
276		- attributeItem = menu.add(new MenuItem("Attribute"));
277		- attributeItem.addActionListener(this);
278	646	pointflowItem = menu.add(new MenuItem("Point Flow"));
279	647	pointflowItem.addActionListener(this);
	648	+ }
280	649	menu.add("-");
281	650	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
282	651	resetTransformItem.addActionListener(this);
283	652	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
284	653	resetCentroidItem.addActionListener(this);
285		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
286		- 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);
287	660
288	661	oe.menuBar.add(menu = new Menu("Geometry"));
289	662	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -294,8 +667,11 @@
294	667	genNormalsCADItem.addActionListener(this);
295	668	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
296	669	genNormalsMESHItem.addActionListener(this);
297		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	670	+ if (Globals.ADVANCED)
	671	+ {
	672	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
298	673	genNormalsMINEItem.addActionListener(this);
	674	+ }
299	675	stripifyItem = menu.add(new MenuItem("Stripify"));
300	676	stripifyItem.addActionListener(this);
301	677	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -317,23 +693,34 @@
317	693	reduce34MeshItem.addActionListener(this);
318	694	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
319	695	increaseMeshItem.addActionListener(this);
320		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
321		- smoothMeshItem.addActionListener(this);
322	696	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
323	697	clipMeshItem.addActionListener(this);
	698	+
	699	+ if (Globals.ADVANCED)
	700	+ {
	701	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	702	+ smoothMeshItem.addActionListener(this);
	703	+ }
324	704
325	705	oe.menuBar.add(menu = new Menu("Attributes"));
326	706	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
327	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);
328	712	menu.add("-");
329	713	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
330	714	liveleavesItem.addActionListener(this);
331	715	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
332	716	unliveleavesItem.addActionListener(this);
	717	+ if (Globals.ADVANCED)
	718	+ {
333	719	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
334	720	supportleavesItem.addActionListener(this);
335	721	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
336	722	unsupportleavesItem.addActionListener(this);
	723	+ }
337	724	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
338	725	hideleavesItem.addActionListener(this);
339	726	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -342,6 +729,14 @@
342	729	markleavesItem.addActionListener(this);
343	730	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
344	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);
345	740	menu.add("-");
346	741	flipVItem = menu.add(new MenuItem("Flip V"));
347	742	flipVItem.addActionListener(this);
..	..	@@ -367,45 +762,56 @@
367	762	attachBumpItem.addActionListener(this);
368	763	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
369	764	pigmentBumpItem.addActionListener(this);
	765	+ //embedTexturesItem
370	766	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
371	767	detachPigmentItem.addActionListener(this);
372	768	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
373	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);
374	774	menu.add("-");
375	775	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
376	776	sortbysizeItem.addActionListener(this);
377	777	sortbynameItem = menu.add(new MenuItem("Sort by name"));
378	778	sortbynameItem.addActionListener(this);
379	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);
	784	+ if (Globals.ADVANCED)
	785	+ {
	786	+ // Pretty much the same as duplicate and clone.
380	787	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
381	788	extractGeometriesItem.addActionListener(this);
382	789	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
383	790	cloneGeometriesItem.addActionListener(this);
384		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
385		- shareGeometriesItem.addActionListener(this);
386		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
387		- mergeGeometriesItem.addActionListener(this);
	791	+ }
388	792
389	793	oe.menuBar.add(menu = new Menu("Insert"));
390	794	buildCreateMenu(menu);
391	795
392		-
393		- oe.menuBar.add(menu = new Menu("Include"));
394		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
395		- importGFDItem.addActionListener(this);
396		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
397		- importVRMLX3DItem.addActionListener(this);
398		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
399		- importOBJItem.addActionListener(this);
400		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
401		- import3DSItem.addActionListener(this);
402		-
403	796	oe.menuBar.add(menu = new Menu("Tools"));
404	797	buildToolsMenu(menu);
405	798	}
406	799
	800	+
407	801	void SetupUI2(ObjEditor oe)
408	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	+
409	815	//new Exception().printStackTrace();
410	816
411	817	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -434,96 +840,237 @@
434	840	oe.radioPanel.add(dummyButton);
435	841	oe.buttonGroup.add(dummyButton);
436	842	*/
	843	+ cGridBag copyOptionsPanel = new cGridBag();
	844	+
	845	+ copyOptionsPanel.preferredHeight = 2;
	846	+
437	847	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
438	848
439		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
440		- liveCB.setToolTipText("Enabled animation");
441		- liveCB.addItemListener(this);
442		-
443		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
444		- fastCB.setToolTipText("Fast mode");
445		- fastCB.addItemListener(this);
446		-
447		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
448		- trackCB.setToolTipText("Enable tracking");
449		- trackCB.addItemListener(this);
450		-
451		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	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);
452	865	screenfitButton.setToolTipText("Screen fit");
453	866	screenfitButton.addActionListener(this);
454	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");
	901	+ liveCB.addItemListener(this);
	902	+
	903	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	904	+ oneStepButton.setToolTipText("Animate one step forward");
	905	+ oneStepButton.addActionListener(this);
	906	+
	907	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	908	+ fastCB.setToolTipText("Fast mode");
	909	+ fastCB.addItemListener(this);
	910	+
	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);
	916	+
455	917	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
456	918	// screenfitpointButton.addActionListener(this);
457		-// oe.aConstraints.gridx += 1;
458		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
459		- snapobjectButton.addActionListener(this);
460		- snapobjectButton.setToolTipText("Snap Object");
461		- oe.aConstraints.gridx += 1;
462	919
463		- //aConstraints.gridx = 0;
464		- //aConstraints.gridy += 1;
465		- oe.aConstraints.weighty = 0;
466		- oe.aConstraints.gridwidth = 1;
467		-
468		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
469		- flashSelectionButton.setToolTipText("Show selection");
470		- flashSelectionButton.addActionListener(this);
471		-
472		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
473		-
474		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
475		- twoButton.setToolTipText("Show center view only");
476		- twoButton.addActionListener(this);
477		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	920	+ if (Globals.ADVANCED)
	921	+ {
	922	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	923	+ snapobjectButton.addActionListener(this);
	924	+ snapobjectButton.setToolTipText("Snap Object");
	925	+
	926	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
478	927	fourButton.addActionListener(this);
479		- fourButton.setToolTipText("Show left panel only");
480		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
481		- sixButton.setToolTipText("2-column layout left");
482		- sixButton.addActionListener(this);
483		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
484		- threeButton.setToolTipText("2-column layout right");
	928	+ fourButton.setToolTipText("Show control panel only");
	929	+ }
	930	+
	931	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	932	+
	933	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	934	+ twoButton.setToolTipText("Show 3D view only");
	935	+ twoButton.addActionListener(this);
	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");
485	940	threeButton.addActionListener(this);
486		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
487		- sevenButton.setToolTipText("3-column layout");
488		- 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);
489	947	//
490	948
491		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
492		- 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");
493	951	rootButton.addActionListener(this);
494	952
495		- 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);
496	954	closeButton.setToolTipText("Close tab");
497	955	closeButton.addActionListener(this);
498	956	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
499	957	//clearButton.addActionListener(this);
500		-
501		- cGridBag commandsPanel = new cGridBag();
	958	+
	959	+ cGridBag row1 = new cGridBag();
502	960
503		- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
504		- 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");
505	1047	editButton.addActionListener(this);
506	1048
507		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
508		- uneditButton.setToolTipText("Unedit selection");
	1049	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1050	+ uneditButton.setToolTipText("Remove selection controls");
509	1051	uneditButton.addActionListener(this);
510	1052
511		- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1053	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1054	+ allParamsButton.setToolTipText("Show all controle");
	1055	+ allParamsButton.addActionListener(this);
	1056	+
	1057	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
512	1058	clearPanelButton.setToolTipText("Clear edit panel");
513	1059	clearPanelButton.addActionListener(this);
514	1060
515		- commandsPanel.add(allParamsButton = new cButton("A", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
516		- allParamsButton.setToolTipText("All params??");
517		- allParamsButton.addActionListener(this);
518		-
519		- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1061	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
520	1062	unselectButton.setToolTipText("Unselect");
521	1063	unselectButton.addActionListener(this);
522	1064
523		- 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);
524	1068
525		- oe.treePanel.add(commandsPanel);
526		- oe.treePanel.Return();
	1069	+ editCommandsPanel.preferredHeight = 1;
	1070	+
	1071	+ SetPinStates(false);
	1072	+// oe.treePanel.add(commandsPanel);
	1073	+// oe.treePanel.Return();
527	1074
528	1075	// oe.aConstraints.gridx += 1;
529	1076	// oe.aConstraints.weighty = 0;
..	..	@@ -540,32 +1087,20 @@
540	1087
541	1088	JScrollPane jSP;
542	1089	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
543		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1090	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
544	1091	ResetModel();
545	1092
546	1093	oe.treePanel.add(jSPPanel);
547	1094	oe.treePanel.Return();
548	1095
549		- cGridBag copyOptionsPanel = new cGridBag();
550		-
551		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
552		- colorCB.setToolTipText("Copy color when dropped");
553		- colorCB.addItemListener(this);
554		-
555		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
556		- materialCB.setToolTipText("Copy material when dropped");
557		- materialCB.addItemListener(this);
558		-
559		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
560		- textureCB.setToolTipText("Copy texture when dropped");
561		- textureCB.addItemListener(this);
562		-
563		- copyOptionsPanel.preferredHeight = 1;
564	1096	oe.treePanel.add(copyOptionsPanel);
565	1097	oe.treePanel.Return();
	1098	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1099	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1100	+ sliderPane.preferredHeight = 1;
566	1101
567		-// mainPanel.setDividerLocation(0.5); //1.0);
568		-// mainPanel.setResizeWeight(0.5);
	1102	+// mainPanel.setDividerLocation(0.1); //1.0);
	1103	+ mainPanel.setResizeWeight(0.4);
569	1104
570	1105	//jList.addListSelectionListener(this);
571	1106	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -573,7 +1108,7 @@
573	1108	//jTree.setEditable(true);
574	1109	oe.jTree.setDragEnabled(true);
575	1110	//jTree.setPreferredSize(new Dimension(10,10));
576		- jSP.setPreferredSize(new Dimension(100,200));
	1111	+ //jSP.setPreferredSize(new Dimension(100,200));
577	1112
578	1113	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
579	1114
..	..	@@ -585,19 +1120,49 @@
585	1120	dgr.addDragGestureListener(this);
586	1121	}catch(Exception e) {}
587	1122	*/
588		- radio.layout = sevenButton;
	1123	+ radio.layout = sixButton; // sevenButton;
589	1124	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
590	1125	}
591	1126
592	1127	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
593	1128	{
594		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
595		- supportCB.setToolTipText("Enabled rigging");
596		- supportCB.addItemListener(this);
	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	+
	1143	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	1144	+ boxCB.setToolTipText("Display bounding boxes");
	1145	+ boxCB.addItemListener(this);
	1146	+
	1147	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	1148	+ zoomBoxCB.setToolTipText("Display only for wheel");
	1149	+ zoomBoxCB.addItemListener(this);
	1150	+
	1151	+ if (true) // Globals.ADVANCED)
	1152	+ {
	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);
597	1160
598	1161	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
599	1162	// localCB.addItemListener(this);
600	1163
	1164	+ panel.Return();
	1165	+
601	1166	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
602	1167	crowdCB.setToolTipText("Used for crowds");
603	1168	crowdCB.addItemListener(this);
..	..	@@ -610,18 +1175,12 @@
610	1175	slowCB.setToolTipText("Smooth interpolation");
611	1176	slowCB.addItemListener(this);
612	1177
613		- panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
614		- boxCB.setToolTipText("Display bounding boxes");
615		- boxCB.addItemListener(this);
616		-
617		- panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
618		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
619		- zoomBoxCB.addItemListener(this);
620		-
621	1178	// constraints.gridy += 1;
622	1179	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
623	1180	// speakerMocapCB.addItemListener(this);
624	1181
	1182	+ panel.Return();
	1183	+
625	1184	if (false)
626	1185	{
627	1186	// handled in scripts
..	..	@@ -636,40 +1195,85 @@
636	1195	//constraints.gridy += 1;
637	1196	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
638	1197	smoothfocusCB.addItemListener(this);
	1198	+ panel.Return();
639	1199	}
640	1200
641	1201	//constraints.gridx += 1;
642	1202	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
643	1203	// debugCB.addItemListener(this);
644	1204
	1205	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1206	+ trackCB.setToolTipText("Enable tracking target");
	1207	+ trackCB.addItemListener(this);
	1208	+
645	1209	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1210	+ oeilCB.setToolTipText("Move camera when tracking");
646	1211	oeilCB.addItemListener(this);
647	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	+ {
648	1233	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
649	1234	lookAtCB.setToolTipText("Look-at target");
650	1235	lookAtCB.addItemListener(this);
	1236	+ }
	1237	+
	1238	+ }
651	1239
652	1240	cGridBag fill = new cGridBag();
653		-
654	1241	fill.preferredHeight = 200;
	1242	+ cGridBag fill2 = new cGridBag();
	1243	+ fill2.preferredHeight = 200;
	1244	+ cGridBag fill3 = new cGridBag();
	1245	+ fill3.preferredHeight = 200;
655	1246
656	1247	panel.add(fill);
	1248	+ panel.add(fill2);
	1249	+ panel.add(fill3);
657	1250
658	1251	}
659	1252
660	1253	void EditObject(Object3D obj)
661	1254	{
662	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	+
663	1264	radioButton.SetObject(obj);
664		- radioButton.layout = sevenButton;
	1265	+ radioButton.layout = sixButton; // sevenButton;
665	1266	radioButton.SetCamera(cameraView.renderCamera, false);
666	1267	radioButton.addActionListener(this);
667	1268	radioPanel.add(radioButton);
668	1269	buttonGroup.add(radioButton);
669	1270	radioButton.doClick();
670	1271	}
	1272	+
671	1273	void SetupViews(ObjEditor oe)
672	1274	{
	1275	+ theFrame = this;
	1276	+
673	1277	oe.SetupViews();
674	1278
675	1279	System.out.println("SetupViews");
..	..	@@ -678,23 +1282,28 @@
678	1282	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
679	1283	}
680	1284
681		- JCheckBox liveCB;
682		- JCheckBox supportCB;
683		- JCheckBox localCB;
684		- JCheckBox crowdCB;
685		- JCheckBox smoothCB;
686		- JCheckBox fastCB;
687		- JCheckBox slowCB;
688		- JCheckBox boxCB;
689		- JCheckBox zoomBoxCB;
690		- JCheckBox trackCB;
691		- 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;
692	1298	// JCheckBox speakerMocapCB;
693		- JCheckBox speakerCameraCB;
694		- JCheckBox speakerFocusCB;
695		- JCheckBox debugCB;
696		- JCheckBox oeilCB;
697		- JCheckBox lookAtCB;
	1299	+ cCheckBox speakerCameraCB;
	1300	+ cCheckBox speakerFocusCB;
	1301	+ cCheckBox debugCB;
	1302	+
	1303	+ cCheckBox oeilCB;
	1304	+ cCheckBox shadowCB;
	1305	+ cCheckBox autokeepCB;
	1306	+ cCheckBox lookAtCB;
698	1307
699	1308	// static int COLOR = 1;
700	1309	// static int MATERIAL = 2;
..	..	@@ -702,9 +1311,9 @@
702	1311
703	1312	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
704	1313
705		- JCheckBox colorCB;
706		- JCheckBox materialCB;
707		- JCheckBox textureCB;
	1314	+ cCheckBox colorCB;
	1315	+ cCheckBox materialCB;
	1316	+ cCheckBox textureCB;
708	1317
709	1318	public void itemStateChanged(ItemEvent e)
710	1319	{
..	..	@@ -732,6 +1341,7 @@
732	1341	} else if(e.getSource() == liveCB)
733	1342	{
734	1343	cameraView.ToggleLive();
	1344	+ refreshContents(false);
735	1345	}
736	1346	else if(e.getSource() == supportCB)
737	1347	{
..	..	@@ -796,6 +1406,18 @@
796	1406	{
797	1407	cameraView.ToggleOeil();
798	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	+ }
799	1421	else if(e.getSource() == lookAtCB)
800	1422	{
801	1423	cameraView.ToggleLookAt();
..	..	@@ -812,7 +1434,8 @@
812	1434
813	1435	/**/
814	1436	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
815		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1437	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1438	+ TreePath path = objEditor.jTree.getSelectionPath();
816	1439	if ((path == null) \|\| (path.getPathCount() <= 1)) {
817	1440	// We can't move the root node or an empty selection
818	1441	return;
..	..	@@ -875,8 +1498,6 @@
875	1498	}
876	1499	}
877	1500
878		- String string = (String) object;
879		-
880	1501	System.out.println("Transfer = " + object + "; drop : " + target);
881	1502	// if( object instanceof java.io.File[])
882	1503	// {
..	..	@@ -884,7 +1505,11 @@
884	1505	// objEditor.DropFile((java.io.File[]) object, true);
885	1506	// return;
886	1507	// }
887		- 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) == ':')
888	1513	{
889	1514	// file(s)
890	1515	String[] names = string.split("\n");
..	..	@@ -911,7 +1536,7 @@
911	1536
912	1537	flashIt = false;
913	1538	CameraPane pane = (CameraPane) target;
914		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1539	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
915	1540	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
916	1541
917	1542	if (group.selection.size() == 1)
..	..	@@ -927,23 +1552,33 @@
927	1552
928	1553	assert target == objEditor.jTree;
929	1554	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1555	+ Object3D destinationLeaf;
930	1556	try {
931		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1557	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
932	1558	} catch (Exception e) {
933	1559	System.out.println("destinationPath : " + destinationPath);
934	1560	return;
935	1561	}
936	1562
937		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1563	+ for (int i=group.selection.size(); --i>=0;)
938	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	+// {
939	1574	loadClipboard(true);
940	1575	objEditor.jTree.setSelectionPath(destinationPath);
941		- pasteInto(false);
942		- } else {
943		- loadClipboard(false);
944		- objEditor.jTree.setSelectionPath(destinationPath);
945		- pasteInto(false); // true); // ???
946		- }
	1576	+ pasteInto(false, false);
	1577	+// } else {
	1578	+// loadClipboard(false);
	1579	+// objEditor.jTree.setSelectionPath(destinationPath);
	1580	+// pasteInto(false, false); // true); // ???
	1581	+// }
947	1582	}
948	1583	public void dropActionChanged(DropTargetDragEvent dtde)
949	1584	// Called if the user has modified the current drop gesture
..	..	@@ -1048,54 +1683,71 @@
1048	1683	{
1049	1684	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1050	1685	//heightFieldItem.addActionListener(this);
1051		- gridItem = menu.add(new MenuItem("Grid"));
1052		- gridItem.addActionListener(this);
1053		- rectoidItem = menu.add(new MenuItem("Box"));
1054		- rectoidItem.addActionListener(this);
1055		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1056		- ellipsoidItem.addActionListener(this);
1057		- coneItem = menu.add(new MenuItem("Cone"));
1058		- coneItem.addActionListener(this);
1059		- torusItem = menu.add(new MenuItem("Torus"));
1060		- torusItem.addActionListener(this);
1061		- superItem = menu.add(new MenuItem("Superellipsoid"));
1062		- 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	+ {
1063	1704	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1064	1705	kleinItem.addActionListener(this);
1065		- particleItem = menu.add(new MenuItem("Particle system"));
1066		- particleItem.addActionListener(this);
	1706	+ }
	1707	+
	1708	+// particleItem = menu.add(new MenuItem("Particle system"));
	1709	+// particleItem.addActionListener(this);
	1710	+ if (Globals.ADVANCED)
	1711	+ {
1067	1712	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1068	1713	ragdollItem.addActionListener(this);
1069	1714	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1070	1715	ragdoll2Item.addActionListener(this);
	1716	+ }
1071	1717	menu.add("-");
1072		- meshItem = menu.add(new MenuItem("Mesh"));
	1718	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1073	1719	meshItem.addActionListener(this);
1074	1720	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1075	1721	// meshGroupItem.addActionListener(this);
	1722	+ if (Globals.ADVANCED)
	1723	+ {
1076	1724	springItem = menu.add(new MenuItem("Spring"));
1077	1725	springItem.addActionListener(this);
1078	1726	flagItem = menu.add(new MenuItem("Flag"));
1079	1727	flagItem.addActionListener(this);
1080		- bezierItem = menu.add(new MenuItem("Patch"));
1081		- bezierItem.addActionListener(this);
1082		- checkerItem = menu.add(new MenuItem("Checker"));
1083		- checkerItem.addActionListener(this);
1084	1728	blobItem = menu.add(new MenuItem("Blob"));
1085	1729	blobItem.addActionListener(this);
1086	1730	latheItem = menu.add(new MenuItem("Lathe"));
1087	1731	latheItem.addActionListener(this);
1088		- lightItem = menu.add(new MenuItem("Light"));
1089		- lightItem.addActionListener(this);
	1732	+ }
	1733	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1734	+ bezierItem.addActionListener(this);
	1735	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1736	+// overlayItem.addActionListener(this);
	1737	+// lightItem = menu.add(new MenuItem("Light"));
	1738	+// lightItem.addActionListener(this);
1090	1739	menu.add("-");
1091	1740	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1092	1741	//superLoopItem.addActionListener(this);
1093		- loopItem = menu.add(new MenuItem("Loop"));
1094		- loopItem.addActionListener(this);
	1742	+// loopItem = menu.add(new MenuItem("Loop"));
	1743	+// loopItem.addActionListener(this);
1095	1744	doubleItem = menu.add(new MenuItem("Fork"));
1096	1745	doubleItem.addActionListener(this);
	1746	+ if (Globals.ADVANCED)
	1747	+ {
1097	1748	tripleItem = menu.add(new MenuItem("Trident"));
1098	1749	tripleItem.addActionListener(this);
	1750	+ }
1099	1751	}
1100	1752
1101	1753	void buildToolsMenu(Menu menu)
..	..	@@ -1104,29 +1756,34 @@
1104	1756	animationItem.addItemListener(this);
1105	1757	animationItem.setState(Globals.ANIMATION);
1106	1758
	1759	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1760	+ archiveItem.addActionListener(this);
	1761	+
1107	1762	menu.add("-");
1108	1763	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1109	1764	parseverticesItem.addActionListener(this);
1110	1765	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1111	1766	textureFieldItem.addActionListener(this);
1112		- alignItem = menu.add(new MenuItem("Align"));
	1767	+ alignItem = menu.add(new MenuItem("Align Objects"));
1113	1768	alignItem.addActionListener(this);
1114		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1115		- mirrorItem.addActionListener(this);
1116	1769	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1117	1770	reduceMorphItem.addActionListener(this);
1118	1771	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1119	1772	reduce34MorphItem.addActionListener(this);
1120		-
1121		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1122		- computeAOItem.addActionListener(this);
1123	1773	menu.add("-");
1124		-
1125	1774	menu.add(memoryItem = new MenuItem("Memory Usage"));
1126	1775	memoryItem.addActionListener(this);
	1776	+ menu.add(computeAOItem = new MenuItem("Compute AO"));
	1777	+ computeAOItem.addActionListener(this);
	1778	+
	1779	+ if (Globals.ADVANCED)
	1780	+ {
	1781	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1782	+ mirrorItem.addActionListener(this);
	1783	+ menu.add("-");
1127	1784	menu.add(analyzeItem = new MenuItem("Analyze"));
1128	1785	analyzeItem.addActionListener(this);
1129		- menu.add(dumpItem = new MenuItem("Dump"));
	1786	+ menu.add(dumpItem = new MenuItem("Print"));
1130	1787	dumpItem.addActionListener(this);
1131	1788	// menu.add(pathItem = new MenuItem("From-to path"));
1132	1789	// pathItem.addActionListener(this);
..	..	@@ -1144,6 +1801,7 @@
1144	1801	menu.add("-");
1145	1802	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1146	1803	editScriptItem.addActionListener(this);
	1804	+ }
1147	1805	}
1148	1806
1149	1807	void ScreenFit()
..	..	@@ -1266,9 +1924,34 @@
1266	1924	shadow.material = new cMaterial(obj.material);
1267	1925	shadow.material.diffuse = 0.0001f;
1268	1926	shadow.material.specular = 0.0001f;
	1927	+ //shadow.projectedVertices[1].x = 300;
1269	1928
1270	1929	makeSomething(shadow);
1271	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	+ }
1272	1955
1273	1956	/**
1274	1957	* applyExample
..	..	@@ -1472,9 +2155,9 @@
1472	2155
1473	2156	void Overwrite(int mask)
1474	2157	{
1475		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2158	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1476	2159	{
1477		- Object3D content = GrafreeD.clipboard.get(0);
	2160	+ Object3D content = Grafreed.clipboard.get(0);
1478	2161
1479	2162	if (content instanceof cGroup && ((cGroup)content).transientlink )
1480	2163	content = ((cGroup)content).get(0);
..	..	@@ -1513,7 +2196,7 @@
1513	2196	{
1514	2197	ScreenFit();
1515	2198	} else
1516		- if (source == switchItem)
	2199	+ if (source == switchViewItem)
1517	2200	{
1518	2201	cVector v1 = new cVector();
1519	2202	cVector v2 = new cVector();
..	..	@@ -1522,11 +2205,11 @@
1522	2205	objEditor.cameraView.renderCamera.setAim(v2, v1);
1523	2206	objEditor.cameraView.repaint();
1524	2207	} else
1525		- if (source == rectoidItem)
	2208	+ if (source == rectoidItem \|\| source == boxButton)
1526	2209	{
1527	2210	makeSomething(new Box());
1528	2211	} else
1529		- if (source == particleItem)
	2212	+ if (source == particleItem \|\| source == particlesButton)
1530	2213	{
1531	2214	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1532	2215	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1605,27 +2288,27 @@
1605	2288
1606	2289	makeSomething(obj);
1607	2290	} else
1608		- if (source == gridItem)
	2291	+ if (source == gridItem \|\| source == gridButton)
1609	2292	{
1610	2293	makeSomething(new Grid());
1611	2294	} else
1612		- if (source == ellipsoidItem)
	2295	+ if (source == ellipsoidItem \|\| source == sphereButton)
1613	2296	{
1614	2297	makeSomething(new Sphere());
1615	2298	} else
1616		- if (source == coneItem)
	2299	+ if (source == coneItem \|\| source == coneButton)
1617	2300	{
1618	2301	makeSomething(new Cone());
1619	2302	} else
1620		- if (source == torusItem)
	2303	+ if (source == torusItem \|\| source == torusButton)
1621	2304	{
1622	2305	makeSomething(new Torus());
1623	2306	} else
1624		- if (source == superItem)
	2307	+ if (source == superItem \|\| source == superButton)
1625	2308	{
1626	2309	makeSomething(new Superellipsoid());
1627	2310	} else
1628		- if (source == kleinItem)
	2311	+ if (source == kleinItem \|\| source == kleinButton)
1629	2312	{
1630	2313	makeSomething(new Klein());
1631	2314	} else
..	..	@@ -1645,7 +2328,7 @@
1645	2328	{
1646	2329	makeSomething(new BezierSurface());
1647	2330	} else
1648		- if (source == checkerItem)
	2331	+ if (source == overlayItem \|\| source == overlayButton)
1649	2332	{
1650	2333	/*
1651	2334	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1693,10 +2376,27 @@
1693	2376	s.setup();
1694	2377	makeSomething(s);
1695	2378	} else
1696		- if (source == lightItem)
	2379	+ if (source == lightItem \|\| source == lightButton)
1697	2380	{
1698	2381	makeSomething(new Light());
1699	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
1700	2400	if (source == csgItem)
1701	2401	{
1702	2402	group(new CSG());
..	..	@@ -1743,30 +2443,30 @@
1743	2443
1744	2444	group(g);
1745	2445	} else
1746		- if (source == loopItem)
	2446	+ if (source == loopItem \|\| source == loopButton)
1747	2447	{
1748	2448	Composite csg = new GroupLeaf();
1749	2449	csg.count = 5;
1750	2450	group(csg);
1751		- Composite child = new cGroup();
	2451	+ Composite child = new cGroup("Branch");
1752	2452	csg.addChild(child);
1753	2453	child.addChild(csg);
1754	2454	} else
1755	2455	if (source == doubleItem)
1756	2456	{
1757		- Composite csg = new GroupLeaf();
	2457	+ Composite csg = new GroupLeaf("Fork");
1758	2458	csg.count = 5;
1759	2459	group(csg);
1760		- Composite child = new cGroup();
	2460	+ Composite child = new cGroup("Branch A");
1761	2461	csg.addChild(child);
1762	2462	child.addChild(csg);
1763		- child = new cGroup();
	2463	+ child = new cGroup("Branch B");
1764	2464	csg.addChild(child);
1765	2465	child.addChild(csg);
1766	2466	} else
1767	2467	if (source == tripleItem)
1768	2468	{
1769		- Composite csg = new GroupLeaf();
	2469	+ Composite csg = new GroupLeaf("Trident");
1770	2470	csg.count = 4;
1771	2471	group(csg);
1772	2472	Composite child = new cGroup();
..	..	@@ -1779,27 +2479,10 @@
1779	2479	csg.addChild(child);
1780	2480	child.addChild(csg);
1781	2481	} else
1782		-
1783		- if (source == importGFDItem)
1784		- {
1785		- ImportGFD();
1786		- } else
1787		- if (source == importVRMLX3DItem)
1788		- {
1789		- ImportVRMLX3D();
1790		- } else
1791		- if (source == import3DSItem)
1792		- {
1793		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1794		- } else
1795		- if (source == importOBJItem)
1796		- {
1797		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1798		- } else
1799	2482	if (source == computeAOItem)
1800	2483	{
1801	2484	Globals.drawMode = CameraPane.OCCLUSION;
1802		- Globals.theRenderer.repaint();
	2485	+ cameraView.repaint();
1803	2486	} else
1804	2487	if (source == recompileItem)
1805	2488	{
..	..	@@ -1814,7 +2497,7 @@
1814	2497	if (source == invariantsItem)
1815	2498	{
1816	2499	System.out.println("Invariants:");
1817		- GrafreeD.grafreeD.universe.invariants();
	2500	+ Grafreed.grafreeD.universe.invariants();
1818	2501	} else
1819	2502	if (source == memoryItem)
1820	2503	{
..	..	@@ -1833,19 +2516,61 @@
1833	2516	{
1834	2517	DumpObject();
1835	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
	2559	+ if (source == oneStepButton)
	2560	+ {
	2561	+ Globals.ONESTEP = true;
	2562	+ cameraView.repaint();
	2563	+ } else
1836	2564	if (source == screenfitButton)
1837	2565	{
1838		- //Reload(lastConverter, lastFilename, true);
1839	2566	ScreenFit();
1840	2567	} else
1841	2568	if (source == screenfitpointButton)
1842	2569	{
1843		- //Reload(lastConverter, lastFilename, true);
1844	2570	ScreenFitPoint();
1845	2571	} else
1846	2572	if (source == snapobjectButton)
1847	2573	{
1848		- //Reload(lastConverter, lastFilename, true);
1849	2574	SnapObject();
1850	2575	} else
1851	2576	// if (event.getSource() == recompileButton)
..	..	@@ -1882,12 +2607,20 @@
1882	2607	{
1883	2608	loadClipboard(true);
1884	2609	} else
	2610	+ if (source == undoItem)
	2611	+ {
	2612	+ Undo();
	2613	+ } else
	2614	+ if (source == redoItem)
	2615	+ {
	2616	+ Redo();
	2617	+ } else
1885	2618	if (source == duplicateItem)
1886	2619	{
1887		- Object3D keep = GrafreeD.clipboard;
	2620	+ Object3D keep = Grafreed.clipboard;
1888	2621	loadClipboard(false);
1889	2622	paste(false);
1890		- GrafreeD.clipboard = keep;
	2623	+ Grafreed.clipboard = keep;
1891	2624	} else
1892	2625	if (source == cloneItem)
1893	2626	{
..	..	@@ -1905,13 +2638,17 @@
1905	2638	{
1906	2639	paste(false);
1907	2640	} else
	2641	+ if (source == pasteIntoItem)
	2642	+ {
	2643	+ pasteInto(true, false);
	2644	+ } else
1908	2645	if (source == pasteLinkItem)
1909	2646	{
1910		- pasteInto(false);
	2647	+ pasteInto(false, false);
1911	2648	} else
1912	2649	if (source == pasteCloneItem)
1913	2650	{
1914		- pasteInto(true);
	2651	+ pasteInto(true, true);
1915	2652	} else
1916	2653	if (source == pasteExpandItem)
1917	2654	{
..	..	@@ -2103,9 +2840,9 @@
2103	2840	// group.selection.get(0).setMasterThis(content); // should be identity
2104	2841	// refreshContents();
2105	2842	// }
2106		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2843	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2107	2844	{
2108		- Object3D content = GrafreeD.clipboard.get(0);
	2845	+ Object3D content = Grafreed.clipboard.get(0);
2109	2846
2110	2847	if (content instanceof cGroup && ((cGroup)content).transientlink )
2111	2848	content = ((cGroup)content).get(0);
..	..	@@ -2113,11 +2850,11 @@
2113	2850	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2114	2851	for (int i=0; i<group.selection.size(); i++)
2115	2852	{
2116		- boolean random = CameraPane.RANDOM;
2117		- CameraPane.RANDOM = false; // parse all random nodes
	2853	+ boolean random = CameraPane.SWITCH;
	2854	+ CameraPane.SWITCH = false; // parse all random nodes
2118	2855	group.selection.get(i).linkVerticesThis(content);
2119	2856	// group.selection.get(i).setMasterThis(content); // should be identity
2120		- CameraPane.RANDOM = random;
	2857	+ CameraPane.SWITCH = random;
2121	2858	}
2122	2859	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2123	2860	refreshContents();
..	..	@@ -2127,20 +2864,20 @@
2127	2864	{
2128	2865	for (int i=0; i<group.selection.size(); i++)
2129	2866	{
2130		- boolean random = CameraPane.RANDOM;
2131		- CameraPane.RANDOM = false; // parse all random nodes
	2867	+ boolean random = CameraPane.SWITCH;
	2868	+ CameraPane.SWITCH = false; // parse all random nodes
2132	2869	group.selection.get(i).linkVerticesThis(null);
2133		- CameraPane.RANDOM = random;
	2870	+ CameraPane.SWITCH = random;
2134	2871	}
2135	2872
2136	2873	refreshContents();
2137	2874	} else
2138	2875	if (source == relinkverticesItem)
2139	2876	{
2140		- boolean random = CameraPane.RANDOM;
2141		- CameraPane.RANDOM = false; // parse all random nodes
	2877	+ boolean random = CameraPane.SWITCH;
	2878	+ CameraPane.SWITCH = false; // parse all random nodes
2142	2879	group.selection.RelinkToSupport();
2143		- CameraPane.RANDOM = random;
	2880	+ CameraPane.SWITCH = random;
2144	2881
2145	2882	refreshContents();
2146	2883	} else
..	..	@@ -2155,9 +2892,9 @@
2155	2892	} else
2156	2893	if (source == setMasterItem)
2157	2894	{
2158		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2895	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2159	2896	{
2160		- Object3D content = GrafreeD.clipboard.get(0);
	2897	+ Object3D content = Grafreed.clipboard.get(0);
2161	2898
2162	2899	if (content instanceof cGroup && ((cGroup)content).transientlink )
2163	2900	content = ((cGroup)content).get(0);
..	..	@@ -2170,9 +2907,9 @@
2170	2907	{
2171	2908	if (group.selection.size() == 1)
2172	2909	{
2173		- if (GrafreeD.clipboard.size() == 1)
	2910	+ if (Grafreed.clipboard.size() == 1)
2174	2911	{
2175		- Object3D content = GrafreeD.clipboard.get(0);
	2912	+ Object3D content = Grafreed.clipboard.get(0);
2176	2913
2177	2914	if (content instanceof cGroup && ((cGroup)content).transientlink )
2178	2915	content = ((cGroup)content).get(0);
..	..	@@ -2189,7 +2926,7 @@
2189	2926	{
2190	2927	RevertMeshes();
2191	2928	} else
2192		- if (source == resetMeshItem)
	2929	+ if (source == resetAllItem)
2193	2930	{
2194	2931	ResetAll();
2195	2932	} else
..	..	@@ -2197,7 +2934,7 @@
2197	2934	{
2198	2935	StepAll();
2199	2936	} else
2200		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	2937	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2201	2938	{
2202	2939	//int indices[] = jList.getSelectedIndices();
2203	2940	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2209,9 +2946,9 @@
2209	2946	{
2210	2947	ClearSelection(true);
2211	2948	} else
2212		- if (source == grabItem)
	2949	+ if (source == grabItem \|\| source == groupButton)
2213	2950	{
2214		- group(new cGroup(), true);
	2951	+ group(new cGroup(), false); // true);
2215	2952	} else
2216	2953	if (source == hideItem)
2217	2954	{
..	..	@@ -2229,16 +2966,16 @@
2229	2966	{
2230	2967	makeSomething(new Camera());
2231	2968	} else
2232		- if (source == compositeItem)
	2969	+ if (source == compositeItem \|\| source == compositeButton)
2233	2970	{
2234	2971	group(new Composite());
2235	2972	} else
2236		- if (source == randomItem)
	2973	+ if (source == switchItem \|\| source == switchButton)
2237	2974	{
2238	2975	RandomNode random = new RandomNode();
2239	2976	group(random);
2240	2977	if (random.size() > 0)
2241		- random.name = random.get(0).name + "Rnd";
	2978	+ random.name = random.get(0).name + "Switch";
2242	2979	} else
2243	2980	if (source == physicsItem)
2244	2981	{
..	..	@@ -2335,7 +3072,7 @@
2335	3072	{
2336	3073	group(new cLinker());
2337	3074	} else
2338		- if (source == textureItem)
	3075	+ if (source == textureItem \|\| source == textureButton)
2339	3076	{
2340	3077	group(new TextureNode());
2341	3078	} else
..	..	@@ -2355,17 +3092,30 @@
2355	3092	{
2356	3093	CastShadow(2);
2357	3094	} else
2358		- if (source == ungroupItem)
	3095	+ if (source == ungroupItem \|\| source == ungroupButton)
2359	3096	{
2360		- //ungroup();
	3097	+ boolean hasRoot = false;
	3098	+
2361	3099	for (int i=0; i<group.selection.size(); i++)
2362	3100	{
2363		- Ungroup(group.selection.get(i));
	3101	+ if (group.selection.get(i) == group)
	3102	+ {
	3103	+ hasRoot = true;
	3104	+ break;
	3105	+ }
2364	3106	}
2365	3107
2366		- ClearSelection(false);
2367		-
2368		- 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	+ }
2369	3119	} else
2370	3120	if (source == genUVItem)
2371	3121	{
..	..	@@ -2377,7 +3127,7 @@
2377	3127	} else
2378	3128	if (source == genNormalsMESHItem)
2379	3129	{
2380		- GenNormals(true); // TODO
	3130	+ GenNormalsMESH();
2381	3131	} else
2382	3132	if (source == genNormalsORGANItem)
2383	3133	{
..	..	@@ -2442,6 +3192,22 @@
2442	3192	if (source == unmarkleavesItem)
2443	3193	{
2444	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);
2445	3211	} else
2446	3212	if (source == flipVItem)
2447	3213	{
..	..	@@ -2527,9 +3293,13 @@
2527	3293	{
2528	3294	SmoothMesh();
2529	3295	} else
2530		- if (source == transformgeometryItem)
	3296	+ if (source == transformGeometryItem)
2531	3297	{
2532	3298	TransformGeometry();
	3299	+ } else
	3300	+ if (source == transformChildrenItem)
	3301	+ {
	3302	+ TransformChildren();
2533	3303	} else
2534	3304	if (source == resetTransformItem)
2535	3305	{
..	..	@@ -2537,7 +3307,11 @@
2537	3307	} else
2538	3308	if (source == resetCentroidItem)
2539	3309	{
2540		- ResetCentroid();
	3310	+ ResetCentroid(true);
	3311	+ } else
	3312	+ if (source == resetCentroidXZItem)
	3313	+ {
	3314	+ ResetCentroid(false);
2541	3315	} else
2542	3316	if (source == resetParentItem)
2543	3317	{
..	..	@@ -2642,7 +3416,7 @@
2642	3416	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2643	3417	{
2644	3418	obj = (Object3D)e.nextElement();
2645		- obj.SetBumpTexture(null);
	3419	+ obj.ResetBumpTexture();
2646	3420	}
2647	3421
2648	3422	refreshContents();
..	..	@@ -2658,6 +3432,31 @@
2658	3432
2659	3433	refreshContents();
2660	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
2661	3460	if (source == flashSelectionButton)
2662	3461	{
2663	3462	CameraPane.flash = true;
..	..	@@ -2669,6 +3468,10 @@
2669	3468	if (source == twoButton)
2670	3469	{
2671	3470	radio.layout = twoButton;
	3471	+
	3472	+ if (CameraPane.FULLSCREEN)
	3473	+ fullscreenLayout = radio.layout;
	3474	+
2672	3475	// bug
2673	3476	//gridPanel.setDividerLocation(1.0);
2674	3477	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2701,10 +3504,31 @@
2701	3504	bigThree.ClearUI();
2702	3505	bigThree.add(centralPanel);
2703	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	+
2704	3525	} else
2705	3526	if (source == threeButton)
2706	3527	{
2707	3528	radio.layout = threeButton;
	3529	+
	3530	+ if (CameraPane.FULLSCREEN)
	3531	+ fullscreenLayout = radio.layout;
2708	3532
2709	3533	// bigThree.remove(scenePanel);
2710	3534	// bigThree.remove(centralPanel);
..	..	@@ -2734,13 +3558,18 @@
2734	3558	// centralPanel.setVisible(true);
2735	3559	// XYZPanel.setVisible(true);
2736	3560	bigThree.ClearUI();
	3561	+ bigThree.add(scenePanel);
2737	3562	bigThree.add(centralPanel);
2738		- bigThree.add(XYZPanel);
2739	3563	bigThree.FlushUI();
	3564	+
	3565	+ cameraView.requestFocusInWindow();
2740	3566	} else
2741	3567	if (source == fourButton)
2742	3568	{
2743	3569	radio.layout = fourButton;
	3570	+
	3571	+ if (CameraPane.FULLSCREEN)
	3572	+ fullscreenLayout = radio.layout;
2744	3573
2745	3574	// bigThree.remove(scenePanel);
2746	3575	// bigThree.remove(centralPanel);
..	..	@@ -2772,10 +3601,15 @@
2772	3601	bigThree.ClearUI();
2773	3602	bigThree.add(scenePanel);
2774	3603	bigThree.FlushUI();
	3604	+
	3605	+ cameraView.requestFocusInWindow();
2775	3606	} else
2776	3607	if (source == sixButton)
2777	3608	{
2778	3609	radio.layout = sixButton;
	3610	+
	3611	+ if (CameraPane.FULLSCREEN)
	3612	+ fullscreenLayout = radio.layout;
2779	3613
2780	3614	// bigThree.remove(scenePanel);
2781	3615	// bigThree.remove(centralPanel);
..	..	@@ -2805,13 +3639,18 @@
2805	3639	// centralPanel.setVisible(true);
2806	3640	// XYZPanel.setVisible(false);
2807	3641	bigThree.ClearUI();
2808		- bigThree.add(scenePanel);
2809	3642	bigThree.add(centralPanel);
	3643	+ bigThree.add(scenePanel);
2810	3644	bigThree.FlushUI();
	3645	+
	3646	+ cameraView.requestFocusInWindow();
2811	3647	} else
2812	3648	if (source == sevenButton)
2813	3649	{
2814	3650	radio.layout = sevenButton;
	3651	+
	3652	+ if (CameraPane.FULLSCREEN)
	3653	+ fullscreenLayout = radio.layout;
2815	3654
2816	3655	// bigThree.remove(scenePanel);
2817	3656	// bigThree.remove(centralPanel);
..	..	@@ -2845,6 +3684,8 @@
2845	3684	bigThree.add(centralPanel);
2846	3685	bigThree.add(XYZPanel);
2847	3686	bigThree.FlushUI();
	3687	+
	3688	+ cameraView.requestFocusInWindow();
2848	3689	} else
2849	3690	if (source == rootButton)
2850	3691	{
..	..	@@ -2856,6 +3697,7 @@
2856	3697	EditObject(obj);
2857	3698	}
2858	3699
	3700	+ cameraView.requestFocusInWindow();
2859	3701	refreshContents(true);
2860	3702	} else
2861	3703	if (source == closeButton)
..	..	@@ -2865,22 +3707,37 @@
2865	3707	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2866	3708	{
2867	3709	ab = (cRadio)e.nextElement();
2868		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3710	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2869	3711	{
	3712	+ // Patch to avoid bug with transparency.
	3713	+ if (!ab.hadMaterial)
	3714	+ {
	3715	+ ab.object.material = null;
	3716	+ }
	3717	+
2870	3718	buttonGroup.remove(ab);
2871	3719	radioPanel.remove(ab);
2872	3720
2873		- ab.GetObject().editWindow = null;
	3721	+ //ab.GetObject().editWindow = null;
	3722	+ ab.GetObject().manipWindow = null;
2874	3723	// ab.GetObject().objectUI = null; // ?????????
2875	3724
2876	3725	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2877	3726	break;
2878	3727	}
2879	3728	}
	3729	+
	3730	+ cameraView.requestFocusInWindow();
2880	3731	refreshContents(true);
2881	3732	} else
2882	3733	if (source == editItem \|\| source == editButton)
2883	3734	{
	3735	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3736	+ {
	3737	+ Object3D child = (Object3D)e.nextElement();
	3738	+ child.pinned = true;
	3739	+ }
	3740	+
2884	3741	EditSelection(false);
2885	3742	} else
2886	3743	if (source == uneditButton)
..	..	@@ -2890,12 +3747,13 @@
2890	3747	Object3D child = (Object3D)e.nextElement();
2891	3748	if(child.editWindow != null)
2892	3749	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3750	+ child.pinned = false;
2893	3751	child.CloseUI();
2894	3752	listUI.remove(child);
2895	3753
2896		- child.editWindow = null; // ???????????
	3754	+ //child.editWindow = null; // ???????????
2897	3755	}
2898		- objEditor.ctrlPanel.validate();
	3756	+ objEditor.ctrlPanel.FlushUI();
2899	3757	//objEditor.jTree.clearSelection();
2900	3758	//objEditor.ResetSliders();
2901	3759	refreshContents(true);
..	..	@@ -2906,6 +3764,7 @@
2906	3764	//copy.ClearUI();
2907	3765	for (Object3D obj : listUI)
2908	3766	{
	3767	+ obj.pinned = false;
2909	3768	obj.CloseUI();
2910	3769	}
2911	3770	listUI.clear();
..	..	@@ -2915,7 +3774,7 @@
2915	3774	{
2916	3775	assert(copy == group);
2917	3776
2918		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3777	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2919	3778
2920	3779	for (Object3D obj : listUI)
2921	3780	{
..	..	@@ -2964,6 +3823,9 @@
2964	3823	}
2965	3824
2966	3825	copy = group;
	3826	+
	3827	+ SetUndoStates();
	3828	+
2967	3829	//Globals.theRenderer.object = group;
2968	3830	if(!useclient)
2969	3831	{
..	..	@@ -2979,20 +3841,46 @@
2979	3841	frontView.object = group;
2980	3842	sideView.object = group;
2981	3843	}
2982		- group.editWindow = this;
	3844	+
	3845	+// fix "+" issue
	3846	+ //group.editWindow = this;
	3847	+ group.manipWindow = this;
	3848	+
2983	3849	/*
2984	3850	currentLayout = radio.layout;
2985	3851	if (currentLayout == null)
2986	3852	currentLayout = sevenButton;
2987	3853	*/
2988	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);
2989	3862	keepparent = group.parent;
2990	3863	// PARENT = NULL or not???
2991	3864	//group.parent = null; // ROOT
2992	3865	//group.attributes = -1;
2993	3866	ResetModel();
	3867	+
	3868	+ cameraView.requestFocusInWindow();
2994	3869	refreshContents(true);
2995		- }
	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	+ }
2996	3884	else
2997	3885	{
2998	3886	//return super.action(event, arg);
..	..	@@ -3001,7 +3889,6 @@
3001	3889	}
3002	3890
3003	3891	boolean useclient = false;
3004		- cRadio radio;
3005	3892
3006	3893	void ToggleRoot()
3007	3894	{
..	..	@@ -3053,6 +3940,28 @@
3053	3940	refreshContents();
3054	3941	}
3055	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	+ }
3056	3965
3057	3966	void ResetTransform()
3058	3967	{
..	..	@@ -3165,7 +4074,7 @@
3165	4074	refreshContents();
3166	4075	}
3167	4076
3168		- void ResetCentroid()
	4077	+ void ResetCentroid(boolean full)
3169	4078	{
3170	4079	Object3D obj;
3171	4080	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3180,12 +4089,16 @@
3180	4089	LA.matIdentity(Object3D.mat);
3181	4090	obj.getBounds(minima, maxima, false);
3182	4091	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3183		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	4092	+ if (full)
	4093	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3184	4094	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3185	4095	obj.TransformMesh(Object3D.mat);
	4096	+
3186	4097	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3187		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	4098	+ if (full)
	4099	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3188	4100	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	4101	+
3189	4102	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3190	4103	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3191	4104	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3214,7 +4127,8 @@
3214	4127
3215	4128	int size = obj.MemorySize();
3216	4129
3217		- 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)");
3218	4132	}
3219	4133	}
3220	4134	catch (Exception e)
..	..	@@ -3251,9 +4165,9 @@
3251	4165	obj = (Object3D)e.nextElement();
3252	4166
3253	4167	System.out.println("Object is: " + obj);
3254		- GrafreeD.AnalyzeObject(obj);
	4168	+ Grafreed.AnalyzeObject(obj);
3255	4169	System.out.println("Boundary rep: " + obj.bRep);
3256		- GrafreeD.AnalyzeObject(obj.bRep);
	4170	+ Grafreed.AnalyzeObject(obj.bRep);
3257	4171
3258	4172	// System.err.println((size/1024) + " KB is the size of " + obj);
3259	4173	}
..	..	@@ -3295,6 +4209,13 @@
3295	4209	void GenNormals(boolean crease)
3296	4210	{
3297	4211	group.GenNormalsS(crease);
	4212	+
	4213	+ refreshContents();
	4214	+ }
	4215	+
	4216	+ void GenNormalsMESH()
	4217	+ {
	4218	+ group.GenNormalsMeshS();
3298	4219
3299	4220	refreshContents();
3300	4221	}
..	..	@@ -3467,8 +4388,8 @@
3467	4388
3468	4389	void ParseVertices()
3469	4390	{
3470		- boolean epsequal = GrafreeD.epsequal;
3471		- GrafreeD.epsequal = true;
	4391	+ boolean epsequal = Grafreed.epsequal;
	4392	+ Grafreed.epsequal = true;
3472	4393
3473	4394	for (int i=0; i<group.selection.size(); i++)
3474	4395	{
..	..	@@ -3493,7 +4414,7 @@
3493	4414	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3494	4415	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3495	4416
3496		- g.add(GrafreeD.clipboard);
	4417	+ g.add(Grafreed.clipboard);
3497	4418
3498	4419	buffer.add(g);
3499	4420	}
..	..	@@ -3508,7 +4429,7 @@
3508	4429	makeSomething(buffer, i==group.selection.size()-1);
3509	4430	}
3510	4431
3511		- GrafreeD.epsequal = epsequal;
	4432	+ Grafreed.epsequal = epsequal;
3512	4433
3513	4434	refreshContents();
3514	4435	}
..	..	@@ -3526,7 +4447,16 @@
3526	4447	String pigment = Object3D.GetPigment(tex);
3527	4448	//String bump = Object3D.GetBump(tex);
3528	4449
3529		- 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	+ }
3530	4460
3531	4461	double s = v.s;
3532	4462
..	..	@@ -3614,11 +4544,11 @@
3614	4544
3615	4545	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3616	4546
3617		- boolean random = CameraPane.RANDOM;
3618		- CameraPane.RANDOM = false; // parse all random nodes
	4547	+ boolean random = CameraPane.SWITCH;
	4548	+ CameraPane.SWITCH = false; // parse all random nodes
3619	4549	lowres.linkVerticesThis(null);
3620	4550	lowres.linkVerticesThis(sn);
3621		- CameraPane.RANDOM = random;
	4551	+ CameraPane.SWITCH = random;
3622	4552
3623	4553	System.err.flush();
3624	4554
..	..	@@ -3658,7 +4588,7 @@
3658	4588	return;
3659	4589
3660	4590	Object3D poses = group.selection.get(0);
3661		- Object3D ref = GrafreeD.clipboard.get(0);
	4591	+ Object3D ref = Grafreed.clipboard.get(0);
3662	4592
3663	4593	Object3D newgroup = new Object3D("Po:" + poses.name);
3664	4594
..	..	@@ -3852,9 +4782,9 @@
3852	4782
3853	4783	void ClipMesh()
3854	4784	{
3855		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4785	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3856	4786	{
3857		- Object3D content = GrafreeD.clipboard.get(0);
	4787	+ Object3D content = Grafreed.clipboard.get(0);
3858	4788
3859	4789	if (content instanceof cGroup && ((cGroup)content).transientlink )
3860	4790	content = ((cGroup)content).get(0);
..	..	@@ -3863,7 +4793,7 @@
3863	4793	// {
3864	4794	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3865	4795	// }
3866		- group.selection.ClipMesh(GrafreeD.clipboard);
	4796	+ group.selection.ClipMesh(Grafreed.clipboard);
3867	4797	}
3868	4798	// group.selection.ClipMesh(GrafreeD.clipboard);
3869	4799	System.out.println("DONE.");
..	..	@@ -3910,6 +4840,18 @@
3910	4840	void MarkLeaves(boolean hide)
3911	4841	{
3912	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);
3913	4855	refreshContents();
3914	4856	}
3915	4857
..	..	@@ -3984,28 +4926,25 @@
3984	4926	// }
3985	4927	// }
3986	4928
3987		- static boolean allparams = true;
3988		-
3989		- static Vector<Object3D> listUI = new Vector<Object3D>();
3990		-
3991	4929	void EditSelection(boolean newWindow)
3992	4930	{
	4931	+ if (group.selection == null)
	4932	+ {
	4933	+ EditElement(group, newWindow); // ? new
	4934	+ return;
	4935	+ }
	4936	+
3993	4937	// aConstraints.gridy = 0;
3994	4938	for (int i=0; i<group.selection.size(); i++)
3995	4939	{
3996	4940	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
3997	4941	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3998		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4942	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3999	4943
4000	4944	Object3D elem = (Object3D)group.selection.elementAt(i);
4001		- if(elem != group)
	4945	+ if(elem != group \|\| !newWindow)
4002	4946	{
4003		- // if (!(elem instanceof Composite))
4004		- // newWindow = false;
4005		- listUI.add(elem);
4006		- elem.openEditWindow(this, newWindow); //, false);
4007		- System.out.println("edit : " + elem);
4008		- elem.editWindow.refreshContents(true); // ? new
	4947	+ EditElement(elem, newWindow); // ? new
4009	4948	}
4010	4949	}
4011	4950	}
..	..	@@ -4080,7 +5019,8 @@
4080	5019	//new Exception().printStackTrace();
4081	5020
4082	5021	freezemodel = true;
4083		-
	5022	+ ClearUnpinned();
	5023	+
4084	5024	/**/
4085	5025	//switch (event.id)
4086	5026	{
..	..	@@ -4088,7 +5028,6 @@
4088	5028	//case 702: // Event.LIST_DESELECT
4089	5029	group.deselectAll();
4090	5030	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4091		- objEditor.ClearInfo(); // .GetMaterial());
4092	5031	if (tps != null)
4093	5032	{
4094	5033	for (int i=0; i < tps.length; i++)
..	..	@@ -4097,10 +5036,8 @@
4097	5036
4098	5037	//if (child.parent != null)
4099	5038	//child.parent.addSelectee(child);
	5039	+ objEditor.SetMaterial(child);
4100	5040	group.addSelectee(child);
4101		- objEditor.SetMaterial(child); // .GetMaterial());
4102		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4103		- System.err.println("info : " + child.GetPath());
4104	5041	}
4105	5042	}
4106	5043	// else
..	..	@@ -4110,20 +5047,28 @@
4110	5047	// System.err.println("info : " + group.GetPath());
4111	5048	// }
4112	5049
4113		- objEditor.SetText(); // jan 2014
4114		-
4115		- 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))
4116	5051	CameraPane.flash = true;
4117	5052
4118		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5053	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4119	5054	// a camera
4120	5055	{
4121		- CameraPane.camerachangeframe = 0; // don't refuse it
4122		- 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	+ }
4123	5061	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4124	5062	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4125	5063	}
4126	5064
	5065	+ if (tps != null && tps.length == 1)
	5066	+ {
	5067	+ EditSelection(false);
	5068	+ }
	5069	+
	5070	+ SetPinStates(tps != null && tps.length > 0);
	5071	+
4127	5072	refreshContents();
4128	5073	//return true;
4129	5074	}
..	..	@@ -4132,6 +5077,35 @@
4132	5077
4133	5078	freezemodel = false;
4134	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	+ }
4135	5109
4136	5110	void linkSomething(Object3D thing)
4137	5111	{
..	..	@@ -4203,16 +5177,19 @@
4203	5177	{
4204	5178	if (group.selection.isEmpty())
4205	5179	return;
4206		- GrafreeD.clipboardIsTempGroup = false;
	5180	+
	5181	+ Grafreed.clipboardIsTempGroup = false;
4207	5182	Composite tGroup = null;
4208	5183	if (group.selection.size() > 0) // 1)
4209	5184	{
4210	5185	tGroup = new cGroup();
4211		- GrafreeD.clipboardIsTempGroup = true;
	5186	+ Grafreed.clipboardIsTempGroup = true;
4212	5187	}
4213	5188
4214	5189	if (cut)
4215	5190	{
	5191	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5192	+// Save();
4216	5193	//int indices[] = jList.getSelectedIndices();
4217	5194	//for (int i = indices.length - 1; i >= 0; i--)
4218	5195	//jList.remove(indices[i]);
..	..	@@ -4248,16 +5225,16 @@
4248	5225	//System.out.println("cut " + child);
4249	5226	//System.out.println("parent = " + child.parent);
4250	5227	// tmp.addChild(child);
4251		- if (GrafreeD.clipboardIsTempGroup)
	5228	+ if (Grafreed.clipboardIsTempGroup)
4252	5229	tGroup.add/Child/(tmp);
4253	5230	else
4254		- GrafreeD.clipboard = tmp;
	5231	+ Grafreed.clipboard = tmp;
4255	5232	}
4256	5233	else
4257		- if (GrafreeD.clipboardIsTempGroup)
	5234	+ if (Grafreed.clipboardIsTempGroup)
4258	5235	tGroup.add/Child/(child);
4259	5236	else
4260		- GrafreeD.clipboard = child;
	5237	+ Grafreed.clipboard = child;
4261	5238	}
4262	5239
4263	5240	//ResetModel();
..	..	@@ -4289,21 +5266,23 @@
4289	5266	//System.out.println("cut " + elem);
4290	5267	//System.out.println("parent = " + elem.parent);
4291	5268	// tmp.addChild(elem);
4292		- if (GrafreeD.clipboardIsTempGroup)
	5269	+ if (Grafreed.clipboardIsTempGroup)
4293	5270	tGroup.add/Child/(tmp);
4294	5271	else
4295		- GrafreeD.clipboard = tmp;
	5272	+ Grafreed.clipboard = tmp;
4296	5273	}
4297	5274	else
4298		- if (GrafreeD.clipboardIsTempGroup)
	5275	+ if (Grafreed.clipboardIsTempGroup)
4299	5276	tGroup.add/Child/(child);
4300	5277	else
4301		- GrafreeD.clipboard = child;
	5278	+ Grafreed.clipboard = child;
4302	5279	}
4303	5280
4304	5281	}
4305		- if (GrafreeD.clipboardIsTempGroup)
4306		- GrafreeD.clipboard = tGroup;
	5282	+
	5283	+ if (Grafreed.clipboardIsTempGroup)
	5284	+ Grafreed.clipboard = tGroup;
	5285	+
4307	5286	if (cut)
4308	5287	{
4309	5288	ResetModel();
..	..	@@ -4313,11 +5292,15 @@
4313	5292
4314	5293	void paste(boolean expand)
4315	5294	{
	5295	+ if (Globals.REPLACEONMAKE)
	5296	+ Save();
	5297	+ boolean keep = Globals.REPLACEONMAKE;
	5298	+ Globals.REPLACEONMAKE = false;
4316	5299	// if (GrafreeD.clipboard == null)
4317	5300	// return;
4318	5301	boolean first = true;
4319	5302
4320		- if (GrafreeD.clipboardIsTempGroup)
	5303	+ if (Grafreed.clipboardIsTempGroup)
4321	5304	{
4322	5305	Composite temp;
4323	5306
..	..	@@ -4328,7 +5311,7 @@
4328	5311	temp = (Composite)Applet3D.clipboard.deepCopy();
4329	5312	*/
4330	5313	Object3D elem;
4331		- 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))
4332	5315	{
4333	5316	Object3D child = (Object3D)e.nextElement();
4334	5317
..	..	@@ -4362,21 +5345,22 @@
4362	5345	//Object3D cb = Applet3D.clipboard;
4363	5346	//temp.addChild(cb);
4364	5347	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4365		- assert(GrafreeD.clipboard.parent == null);
4366		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4367		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4368		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4369		- 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());
4370	5353	else
4371		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4372		- GrafreeD.clipboard.get(0).parent = keepparent;
	5354	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5355	+ Grafreed.clipboard.get(0).parent = keepparent;
4373	5356	}
4374	5357
	5358	+ Globals.REPLACEONMAKE = keep;
4375	5359	ResetModel();
4376	5360	refreshContents();
4377	5361	}
4378	5362
4379		- void pasteInto(boolean copyit)
	5363	+ void pasteInto(boolean copyit, boolean clone)
4380	5364	{
4381	5365	// if (GrafreeD.clipboard == null)
4382	5366	// return;
..	..	@@ -4405,15 +5389,22 @@
4405	5389	if (copyit)
4406	5390	{
4407	5391	// paste(false);
4408		- CloneClipboard(false); // sept 2014
	5392	+ if (clone)
	5393	+ {
	5394	+ CloneClipboard(false); // sept 2014
	5395	+ }
	5396	+ else
	5397	+ {
	5398	+ paste(false);
	5399	+ }
4409	5400	}
4410	5401	else
4411	5402	{
4412	5403	boolean first = true;
4413	5404
4414		- if (GrafreeD.clipboardIsTempGroup)
	5405	+ if (Grafreed.clipboardIsTempGroup)
4415	5406	{
4416		- Composite temp = (Composite)GrafreeD.clipboard;
	5407	+ Composite temp = (Composite)Grafreed.clipboard;
4417	5408	Object3D copy;
4418	5409	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4419	5410	{
..	..	@@ -4423,7 +5414,7 @@
4423	5414	}
4424	5415	} else
4425	5416	{
4426		- linkSomething(GrafreeD.clipboard); //.get(0));
	5417	+ linkSomething(Grafreed.clipboard); //.get(0));
4427	5418	}
4428	5419	}
4429	5420	}
..	..	@@ -4500,6 +5491,10 @@
4500	5491
4501	5492	void group(Object3D csg, boolean grab)
4502	5493	{
	5494	+ if (Globals.REPLACEONMAKE)
	5495	+ Save();
	5496	+ boolean keep = Globals.REPLACEONMAKE;
	5497	+ Globals.REPLACEONMAKE = false;
4503	5498	if (//false) // why??
4504	5499	!group.selection.isEmpty())
4505	5500	{
..	..	@@ -4613,10 +5608,15 @@
4613	5608	//node.add(csg);
4614	5609	//makeSomething(node);
4615	5610	makeSomething(csg);
	5611	+ Globals.REPLACEONMAKE = keep;
4616	5612	}
4617	5613
4618	5614	void Ungroup(Object3D g)
4619	5615	{
	5616	+ if (Globals.REPLACEONMAKE)
	5617	+ Save();
	5618	+ boolean keep = Globals.REPLACEONMAKE;
	5619	+ Globals.REPLACEONMAKE = false;
4620	5620	if (g instanceof HiddenObject)
4621	5621	{
4622	5622	HiddenObject h = (HiddenObject) g;
..	..	@@ -4633,6 +5633,7 @@
4633	5633	objEditor.makeSomething(g.get(i), false);
4634	5634	}
4635	5635	}
	5636	+ Globals.REPLACEONMAKE = keep;
4636	5637	}
4637	5638
4638	5639	void ungroup()
..	..	@@ -4828,21 +5829,6 @@
4828	5829	}
4829	5830	*/
4830	5831
4831		- void ImportGFD()
4832		- {
4833		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4834		- browser.show();
4835		- String filename = browser.getFile();
4836		- if (filename != null && filename.length() > 0)
4837		- {
4838		- String fullname = browser.getDirectory() + filename;
4839		-
4840		- //Object3D readobj =
4841		- objEditor.ReadGFD(fullname, objEditor);
4842		- //makeSomething(readobj);
4843		- }
4844		- }
4845		-
4846	5832	/*
4847	5833	public void Callback(Object obj)
4848	5834	{
..	..	@@ -4866,26 +5852,9 @@
4866	5852	}
4867	5853	*/
4868	5854
4869		- void ImportVRMLX3D()
4870		- {
4871		- if (GrafreeD.standAlone)
4872		- {
4873		- /**/
4874		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4875		- browser.show();
4876		- String filename = browser.getFile();
4877		- if (filename != null && filename.length() > 0)
4878		- {
4879		- String fullname = browser.getDirectory() + filename;
4880		- LoadVRMLX3D(fullname);
4881		- }
4882		- /**/
4883		- }
4884		- }
4885		-
4886	5855	String GetFile(String dialogName)
4887	5856	{
4888		- if (GrafreeD.standAlone)
	5857	+ if (Grafreed.standAlone)
4889	5858	{
4890	5859	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4891	5860	browser.show();
..	..	@@ -4949,10 +5918,49 @@
4949	5918	cButton flashSelectionButton;
4950	5919	cButton editButton;
4951	5920	cButton uneditButton;
	5921	+ JCheckBox allParamsButton;
4952	5922	cButton clearpanelButton;
4953		- cButton allParamsButton;
4954	5923	cButton unselectButton;
4955	5924
	5925	+ cButton restoreCameraButton;
	5926	+
	5927	+ cButton saveButton;
	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;
	5963	+
4956	5964	cButton screenfitButton;
4957	5965	cButton screenfitpointButton;
4958	5966	cButton snapobjectButton;
..	..	@@ -4964,14 +5972,6 @@
4964	5972
4965	5973	cButton setsupportButton;
4966	5974
4967		- cButton twoButton;
4968		- cButton sixButton;
4969		- cButton threeButton;
4970		- cButton sevenButton;
4971		- cButton fourButton; // full panel
4972		- cButton oneButton; // full XYZ
4973		- //cButton currentLayout;
4974		-
4975	5975	//
4976	5976	//Composite
4977	5977	Object3D // to do !!
..	..	@@ -4981,9 +5981,11 @@
4981	5981	//JTree jTree;
4982	5982	private MenuItem lookAtItem;
4983	5983	private MenuItem lookFromItem;
4984		- private MenuItem switchItem;
	5984	+ private MenuItem switchViewItem;
4985	5985	private MenuItem cutItem;
4986		- private MenuItem duplicateItem;
	5986	+ private MenuItem undoItem;
	5987	+ private MenuItem redoItem;
	5988	+ private JMenuItem duplicateItem;
4987	5989	private MenuItem cloneItem;
4988	5990	private MenuItem cloneSupportItem;
4989	5991	private MenuItem overwriteGeoItem;
..	..	@@ -4996,7 +5998,7 @@
4996	5998	private MenuItem linkverticesItem;
4997	5999	private MenuItem relinkverticesItem;
4998	6000	private MenuItem setMasterItem;
4999		- private MenuItem resetMeshItem;
	6001	+ private MenuItem resetAllItem;
5000	6002	private MenuItem stepAllItem;
5001	6003	private MenuItem revertMeshItem;
5002	6004	private MenuItem poseMeshItem;
..	..	@@ -5007,10 +6009,11 @@
5007	6009	private MenuItem mergeGeometriesItem;
5008	6010	private MenuItem copyItem;
5009	6011	private MenuItem pasteItem;
	6012	+ private MenuItem pasteIntoItem;
5010	6013	private MenuItem pasteLinkItem;
5011	6014	private MenuItem pasteCloneItem;
5012	6015	private MenuItem pasteExpandItem;
5013		- private MenuItem clearItem;
	6016	+ private MenuItem deleteItem;
5014	6017	private MenuItem clearAllItem;
5015	6018	private MenuItem genUVItem;
5016	6019	private MenuItem genNormalsMESHItem;
..	..	@@ -5045,6 +6048,10 @@
5045	6048	private MenuItem showleavesItem;
5046	6049	private MenuItem markleavesItem;
5047	6050	private MenuItem unmarkleavesItem;
	6051	+ private MenuItem rewindleavesItem;
	6052	+ private MenuItem unrewindleavesItem;
	6053	+ private MenuItem randomleavesItem;
	6054	+ private MenuItem unrandomleavesItem;
5048	6055
5049	6056	private MenuItem flipVItem;
5050	6057	private MenuItem unflipVItem;
..	..	@@ -5056,15 +6063,17 @@
5056	6063	private MenuItem panoTexturesItem;
5057	6064
5058	6065	private MenuItem resetCentroidItem;
5059		- private MenuItem transformgeometryItem;
	6066	+ private MenuItem resetCentroidXZItem;
5060	6067	private MenuItem resetTransformItem;
	6068	+ private MenuItem transformGeometryItem;
	6069	+ private MenuItem transformChildrenItem;
5061	6070	private MenuItem hideItem;
5062	6071	private MenuItem grabItem;
5063	6072	private MenuItem backItem;
5064	6073	private MenuItem frontItem;
5065	6074	private MenuItem cameraItem;
5066	6075	private MenuItem compositeItem;
5067		- private MenuItem randomItem;
	6076	+ private MenuItem switchItem;
5068	6077	private MenuItem physicsItem;
5069	6078	private MenuItem frameselectorItem;
5070	6079	private MenuItem scriptNodeItem;
..	..	@@ -5088,6 +6097,8 @@
5088	6097	private MenuItem attachBumpItem;
5089	6098	private MenuItem detachBumpItem;
5090	6099	private MenuItem pigmentBumpItem;
	6100	+ private MenuItem embedTexturesItem;
	6101	+ private MenuItem deEmbedTexturesItem;
5091	6102
5092	6103	private MenuItem particleItem;
5093	6104	private MenuItem ragdollItem;
..	..	@@ -5104,7 +6115,7 @@
5104	6115	private MenuItem blobItem;
5105	6116	private MenuItem latheItem;
5106	6117	private MenuItem bezierItem;
5107		- private MenuItem checkerItem;
	6118	+ private MenuItem overlayItem;
5108	6119	private MenuItem meshItem;
5109	6120	// private MenuItem meshGroupItem;
5110	6121	private MenuItem springItem;
..	..	@@ -5126,11 +6137,6 @@
5126	6137	private MenuItem doubleItem;
5127	6138	private MenuItem tripleItem;
5128	6139
5129		- private MenuItem importGFDItem;
5130		- private MenuItem importVRMLX3DItem;
5131		- private MenuItem import3DSItem;
5132		- private MenuItem importOBJItem;
5133		-
5134	6140	private MenuItem computeAOItem;
5135	6141	private MenuItem recompileItem;
5136	6142	private MenuItem editScriptItem;
..	..	@@ -5140,4 +6146,8 @@
5140	6146	private MenuItem analyzeItem;
5141	6147	private MenuItem dumpItem;
5142	6148	//boolean freezemodel = false;
	6149	+
	6150	+ Menu cameraMenu;
	6151	+ MenuItem editCameraItem;
	6152	+ MenuItem restoreCameraItem;
5143	6153	}