~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -74,7 +74,7 @@
74	74	this.copy = this.group = copy;
75	75	//selectees = this.group.selectees;
76	76
77		- SetupMenu2(objEditor);
	77	+ SetupMenu2(this); //objEditor);
78	78	SetupUI2(objEditor);
79	79	objEditor.SetupUI(true);
80	80	SetupViews(objEditor);
..	..	@@ -98,14 +98,14 @@
98	98
99	99	void CloneClipboard(boolean supports)
100	100	{
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));
	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));
106	106	else
107		- makeSomething(CloneObject(GrafreeD.clipboard, false));
108		- GrafreeD.clipboard.get(0).parent = keepparent;
	107	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	108	+ Grafreed.clipboard.get(0).parent = keepparent;
109	109	}
110	110
111	111	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -119,7 +119,7 @@
119	119	// obj.support = null;
120	120	if (!supports)
121	121	obj.SaveSupports();
122		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	122	+ Object3D clone = (Object3D)Grafreed.clone(obj);
123	123	obj.parent = parent;
124	124	// obj.support = support;
125	125	// clone.support = support; // aout 2013
..	..	@@ -148,8 +148,130 @@
148	148
149	149	//JTextField nameField;
150	150
151		- void SetupMenu2(ObjEditor oe)
	151	+ void SetupMenu2(GroupEditor oe)
152	152	{
	153	+ Menu menu;
	154	+ oe.menuBar.add(menu = new Menu("Edit"));
	155	+ //editItem = menu.add(new MenuItem("Edit"));
	156	+ //editItem.addActionListener(this);
	157	+
	158	+// undoItem = menu.add(new MenuItem("Undo"));
	159	+// undoItem.addActionListener(this);
	160	+// redoItem = menu.add(new MenuItem("Redo"));
	161	+// redoItem.addActionListener(this);
	162	+// menu.add("-");
	163	+ duplicateItem = menu.add(new MenuItem("Duplicate"));
	164	+ duplicateItem.addActionListener(this);
	165	+ cloneItem = menu.add(new MenuItem("Clone"));
	166	+ cloneItem.addActionListener(this);
	167	+ if (Globals.ADVANCED)
	168	+ {
	169	+ cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
	170	+ cloneSupportItem.addActionListener(this);
	171	+ }
	172	+ menu.add("-");
	173	+ cutItem = menu.add(new MenuItem("Cut"));
	174	+ cutItem.addActionListener(this);
	175	+ copyItem = menu.add(new MenuItem("Copy"));
	176	+ copyItem.addActionListener(this);
	177	+ pasteItem = menu.add(new MenuItem("Paste"));
	178	+ pasteItem.addActionListener(this);
	179	+ menu.add("-");
	180	+
	181	+ menu.add("-");
	182	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	183	+ pasteIntoItem.addActionListener(this);
	184	+ pasteLinkItem = menu.add(new MenuItem("Paste link"));
	185	+ pasteLinkItem.addActionListener(this);
	186	+ pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	187	+ pasteCloneItem.addActionListener(this);
	188	+// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	189	+// pasteExpandItem.addActionListener(this);
	190	+ menu.add("-");
	191	+ clearItem = menu.add(new MenuItem("Clear"));
	192	+ clearItem.addActionListener(this);
	193	+
	194	+ if (Globals.ADVANCED)
	195	+ {
	196	+ // Deletes the cameras...
	197	+ clearAllItem = menu.add(new MenuItem("Clear All"));
	198	+ clearAllItem.addActionListener(this);
	199	+ }
	200	+
	201	+ menuBar.add(cameraMenu = new Menu("View"));
	202	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	203	+ //zBufferItem.addActionListener(this);
	204	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	205	+ //normalLensItem.addActionListener(this);
	206	+ cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
	207	+ revertCameraItem.addActionListener(this);
	208	+
	209	+ cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	210	+ toggleFullScreenItem.addItemListener(this);
	211	+ toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	212	+ cameraMenu.add("-");
	213	+
	214	+ cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	215	+ toggleTextureItem.addItemListener(this);
	216	+ toggleTextureItem.setState(CameraPane.textureon);
	217	+
	218	+ cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	219	+ toggleSwitchItem.addItemListener(this);
	220	+ toggleSwitchItem.setState(CameraPane.SWITCH);
	221	+
	222	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	223	+ toggleHandleItem.addItemListener(this);
	224	+ toggleHandleItem.setState(CameraPane.HANDLES);
	225	+
	226	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	227	+ togglePaintItem.addItemListener(this);
	228	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	229	+
	230	+ if (Globals.ADVANCED)
	231	+ {
	232	+ cameraMenu.add("-");
	233	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	234	+ toggleLiveItem.addItemListener(this);
	235	+ toggleLiveItem.setState(Globals.isLIVE());
	236	+
	237	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	238	+ stepItem.addActionListener(this);
	239	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	240	+ // toggleDLItem.addItemListener(this);
	241	+ // toggleDLItem.setState(false);
	242	+
	243	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	244	+ toggleRenderItem.addItemListener(this);
	245	+ toggleRenderItem.setState(!CameraPane.frozen);
	246	+
	247	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	248	+ toggleDebugItem.addItemListener(this);
	249	+ toggleDebugItem.setState(Globals.DEBUG);
	250	+
	251	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	252	+ toggleFrustumItem.addItemListener(this);
	253	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	254	+
	255	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	256	+ toggleFootContactItem.addItemListener(this);
	257	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	258	+
	259	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	260	+ toggleTimelineItem.addItemListener(this);
	261	+ }
	262	+
	263	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	264	+// toggleRootItem.addItemListener(this);
	265	+// toggleRootItem.setState(false);
	266	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	267	+// animationItem.addItemListener(this);
	268	+// animationItem.setState(CameraPane.ANIMATION);
	269	+ cameraMenu.add("-");
	270	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	271	+ editCameraItem.addActionListener(this);
	272	+
	273	+ if (Globals.ADVANCED)
	274	+ {
153	275	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
154	276	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
155	277	//cameraMenu.add(switchItem = new MenuItem("Reverse View"));
..	..	@@ -161,45 +283,17 @@
161	283	lookAtItem.addActionListener(this);
162	284	//lookFromItem.addActinoListener(this);
163	285	//switchItem.addActionListener(this);
164		- Menu menu;
165		- oe.menuBar.add(menu = new Menu("Edit"));
166		- //editItem = menu.add(new MenuItem("Edit"));
167		- //editItem.addActionListener(this);
168		- duplicateItem = menu.add(new MenuItem("Duplicate"));
169		- duplicateItem.addActionListener(this);
170		- menu.add("-");
171		- cloneItem = menu.add(new MenuItem("Clone"));
172		- cloneItem.addActionListener(this);
173		- cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
174		- cloneSupportItem.addActionListener(this);
175		- menu.add("-");
176		- cutItem = menu.add(new MenuItem("Cut"));
177		- cutItem.addActionListener(this);
178		- copyItem = menu.add(new MenuItem("Copy"));
179		- copyItem.addActionListener(this);
180		- pasteItem = menu.add(new MenuItem("Paste"));
181		- pasteItem.addActionListener(this);
182		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
183		- pasteLinkItem.addActionListener(this);
184		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
185		- pasteCloneItem.addActionListener(this);
186		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
187		-// pasteExpandItem.addActionListener(this);
188		- clearItem = menu.add(new MenuItem("Clear"));
189		- clearItem.addActionListener(this);
190		- clearAllItem = menu.add(new MenuItem("Clear All"));
191		- clearAllItem.addActionListener(this);
192		-
	286	+ }
	287	+
193	288	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);
	289	+ if (Globals.ADVANCED)
	290	+ {
198	291	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
199	292	revertMeshItem.addActionListener(this);
200	293	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
201	294	resetreferencesItem.addActionListener(this);
202	295	menu.add("-");
	296	+ }
203	297	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
204	298	overwriteGeoItem.addActionListener(this);
205	299	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -211,19 +305,26 @@
211	305	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
212	306	overwriteUVItem.addActionListener(this);
213	307	menu.add("-");
	308	+ if (Globals.ADVANCED)
	309	+ {
214	310	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
215	311	generateMeshItem.addActionListener(this);
216	312	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
217	313	poseMeshItem.addActionListener(this);
218	314	menu.add("-");
	315	+ }
219	316	resetsupportItem = menu.add(new MenuItem("Reset support"));
220	317	resetsupportItem.addActionListener(this);
221	318	linkverticesItem = menu.add(new MenuItem("Link to Support"));
222	319	linkverticesItem.addActionListener(this);
223	320	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
224	321	relinkverticesItem.addActionListener(this);
	322	+
	323	+ if (Globals.ADVANCED)
	324	+ {
225	325	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
226	326	setMasterItem.addActionListener(this);
	327	+ }
227	328
228	329	oe.menuBar.add(menu = new Menu("Group"));
229	330	grabItem = menu.add(new MenuItem("Grab"));
..	..	@@ -234,27 +335,32 @@
234	335	frontItem.addActionListener(this);
235	336	compositeItem = menu.add(new MenuItem("Composite"));
236	337	compositeItem.addActionListener(this);
237		- hideItem = menu.add(new MenuItem("Hide"));
	338	+ hideItem = menu.add(new MenuItem("Hidden Group"));
238	339	hideItem.addActionListener(this);
239	340	ungroupItem = menu.add(new MenuItem("Ungroup"));
240	341	ungroupItem.addActionListener(this);
241	342	menu.add("-");
242		- randomItem = menu.add(new MenuItem("Random"));
	343	+ randomItem = menu.add(new MenuItem("Switch node"));
243	344	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);
248	345	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
249	346	switchGeoItem.addActionListener(this);
250	347	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
251	348	switchTransfoItem.addActionListener(this);
252		- morphItem = menu.add(new MenuItem("Morph"));
	349	+ morphItem = menu.add(new MenuItem("Morph Group"));
253	350	morphItem.addActionListener(this);
	351	+
	352	+ if (Globals.ADVANCED)
	353	+ {
	354	+ menu.add("-");
	355	+ physicsItem = menu.add(new MenuItem("Physics"));
	356	+ physicsItem.addActionListener(this);
	357	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	358	+ frameselectorItem.addActionListener(this);
254	359	scriptNodeItem = menu.add(new MenuItem("Script Node"));
255	360	scriptNodeItem.addActionListener(this);
256	361	cameraItem = menu.add(new MenuItem("Camera"));
257	362	cameraItem.addActionListener(this);
	363	+ }
258	364
259	365	oe.menuBar.add(menu = new Menu("Object"));
260	366	textureItem = menu.add(new MenuItem("Texture"));
..	..	@@ -269,21 +375,29 @@
269	375	shadowYItem.addActionListener(this);
270	376	shadowZItem = menu.add(new MenuItem("Shadow Z"));
271	377	shadowZItem.addActionListener(this);
	378	+ if (Globals.ADVANCED)
	379	+ {
	380	+ menu.add("-");
272	381	linkerItem = menu.add(new MenuItem("Linker"));
273	382	linkerItem.addActionListener(this);
274		- templateItem = menu.add(new MenuItem("Template"));
275		- templateItem.addActionListener(this);
276	383	attributeItem = menu.add(new MenuItem("Attribute"));
277	384	attributeItem.addActionListener(this);
	385	+ templateItem = menu.add(new MenuItem("Template"));
	386	+ templateItem.addActionListener(this);
278	387	pointflowItem = menu.add(new MenuItem("Point Flow"));
279	388	pointflowItem.addActionListener(this);
	389	+ }
280	390	menu.add("-");
281	391	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
282	392	resetTransformItem.addActionListener(this);
283	393	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
284	394	resetCentroidItem.addActionListener(this);
285		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
286		- transformgeometryItem.addActionListener(this);
	395	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	396	+ resetCentroidXZItem.addActionListener(this);
	397	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	398	+ transformGeometryItem.addActionListener(this);
	399	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	400	+ transformChildrenItem.addActionListener(this);
287	401
288	402	oe.menuBar.add(menu = new Menu("Geometry"));
289	403	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -294,8 +408,11 @@
294	408	genNormalsCADItem.addActionListener(this);
295	409	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
296	410	genNormalsMESHItem.addActionListener(this);
	411	+ if (Globals.ADVANCED)
	412	+ {
297	413	genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
298	414	genNormalsMINEItem.addActionListener(this);
	415	+ }
299	416	stripifyItem = menu.add(new MenuItem("Stripify"));
300	417	stripifyItem.addActionListener(this);
301	418	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -317,23 +434,34 @@
317	434	reduce34MeshItem.addActionListener(this);
318	435	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
319	436	increaseMeshItem.addActionListener(this);
320		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
321		- smoothMeshItem.addActionListener(this);
322	437	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
323	438	clipMeshItem.addActionListener(this);
	439	+
	440	+ if (Globals.ADVANCED)
	441	+ {
	442	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	443	+ smoothMeshItem.addActionListener(this);
	444	+ }
324	445
325	446	oe.menuBar.add(menu = new Menu("Attributes"));
326	447	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
327	448	clearMaterialsItem.addActionListener(this);
	449	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	450	+ resetAllItem.addActionListener(this);
	451	+ stepAllItem = menu.add(new MenuItem("Step All"));
	452	+ stepAllItem.addActionListener(this);
328	453	menu.add("-");
329	454	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
330	455	liveleavesItem.addActionListener(this);
331	456	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
332	457	unliveleavesItem.addActionListener(this);
	458	+ if (Globals.ADVANCED)
	459	+ {
333	460	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
334	461	supportleavesItem.addActionListener(this);
335	462	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
336	463	unsupportleavesItem.addActionListener(this);
	464	+ }
337	465	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
338	466	hideleavesItem.addActionListener(this);
339	467	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -342,6 +470,14 @@
342	470	markleavesItem.addActionListener(this);
343	471	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
344	472	unmarkleavesItem.addActionListener(this);
	473	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	474	+ rewindleavesItem.addActionListener(this);
	475	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	476	+ unrewindleavesItem.addActionListener(this);
	477	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	478	+ randomleavesItem.addActionListener(this);
	479	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	480	+ unrandomleavesItem.addActionListener(this);
345	481	menu.add("-");
346	482	flipVItem = menu.add(new MenuItem("Flip V"));
347	483	flipVItem.addActionListener(this);
..	..	@@ -377,35 +513,40 @@
377	513	sortbynameItem = menu.add(new MenuItem("Sort by name"));
378	514	sortbynameItem.addActionListener(this);
379	515	menu.add("-");
	516	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	517	+ shareGeometriesItem.addActionListener(this);
	518	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	519	+ mergeGeometriesItem.addActionListener(this);
	520	+ if (Globals.ADVANCED)
	521	+ {
	522	+ // Pretty much the same as duplicate and clone.
380	523	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
381	524	extractGeometriesItem.addActionListener(this);
382	525	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
383	526	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);
	527	+ }
388	528
389	529	oe.menuBar.add(menu = new Menu("Insert"));
390	530	buildCreateMenu(menu);
391	531
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	532	oe.menuBar.add(menu = new Menu("Tools"));
404	533	buildToolsMenu(menu);
405	534	}
406	535
407	536	void SetupUI2(ObjEditor oe)
408	537	{
	538	+ // June 2019
	539	+ if (oe == null)
	540	+ {
	541	+ //super.SetupUI2(this);
	542	+ //return;
	543	+ }
	544	+
	545	+ if (copy != group)
	546	+ {
	547	+ //super.SetupUI2(this);
	548	+ }
	549	+
409	550	//new Exception().printStackTrace();
410	551
411	552	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -436,63 +577,88 @@
436	577	*/
437	578	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
438	579
	580	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	581	+ //minButton.setToolTipText("Minimize window");
	582	+ //minButton.addActionListener(this);
	583	+
	584	+ oe.toolbarPanel.add(maxButton = new cButton("\u271A", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	585	+ maxButton.setToolTipText("Maximize window");
	586	+ maxButton.addActionListener(this);
	587	+
	588	+ oe.toolbarPanel.add(fullButton = new cButton("\u2b1c", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	589	+ fullButton.setToolTipText("Full-screen window");
	590	+ fullButton.addActionListener(this);
	591	+
	592	+ oe.toolbarPanel.add(undoButton = new cButton("\u21a9", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	593	+ undoButton.setToolTipText("Undo changes");
	594	+ undoButton.addActionListener(this);
	595	+
	596	+ oe.toolbarPanel.add(redoButton = new cButton("\u21aa", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	597	+ redoButton.setToolTipText("Redo changes");
	598	+ redoButton.addActionListener(this);
	599	+
	600	+ oe.toolbarPanel.add(saveButton = new cButton("\u21e3", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	601	+ saveButton.setToolTipText("Save changes");
	602	+ saveButton.addActionListener(this);
	603	+
439	604	oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
440		- liveCB.setToolTipText("Enabled animation");
	605	+ liveCB.setToolTipText("Enable animation");
441	606	liveCB.addItemListener(this);
442	607
	608	+ oe.toolbarPanel.add(oneStepButton = new cButton("\u29f4", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	609	+ oneStepButton.setToolTipText("Animate one step forward");
	610	+ oneStepButton.addActionListener(this);
	611	+
443	612	oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
444	613	fastCB.setToolTipText("Fast mode");
445	614	fastCB.addItemListener(this);
446	615
447		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	616	+ oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK)); //, oe.aConstraints);
448	617	trackCB.setToolTipText("Enable tracking");
449	618	trackCB.addItemListener(this);
450	619
451		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	620	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
452	621	screenfitButton.setToolTipText("Screen fit");
453	622	screenfitButton.addActionListener(this);
454	623
455	624	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
456	625	// 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	626
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);
	627	+ if (Globals.ADVANCED)
	628	+ {
	629	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	630	+ snapobjectButton.addActionListener(this);
	631	+ snapobjectButton.setToolTipText("Snap Object");
	632	+ }
	633	+
	634	+ oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
469	635	flashSelectionButton.setToolTipText("Show selection");
470	636	flashSelectionButton.addActionListener(this);
471	637
472	638	oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
473	639
474		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	640	+ oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
475	641	twoButton.setToolTipText("Show center view only");
476	642	twoButton.addActionListener(this);
477		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	643	+ oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
478	644	fourButton.addActionListener(this);
479	645	fourButton.setToolTipText("Show left panel only");
480		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	646	+ oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
481	647	sixButton.setToolTipText("2-column layout left");
482	648	sixButton.addActionListener(this);
483		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	649	+ oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
484	650	threeButton.setToolTipText("2-column layout right");
485	651	threeButton.addActionListener(this);
486		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	652	+ oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
487	653	sevenButton.setToolTipText("3-column layout");
488	654	sevenButton.addActionListener(this);
489	655	//
490	656
491		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	657	+ oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
492	658	rootButton.setToolTipText("Edit selection in new tab");
493	659	rootButton.addActionListener(this);
494	660
495		- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	661	+ oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
496	662	closeButton.setToolTipText("Close tab");
497	663	closeButton.addActionListener(this);
498	664	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
..	..	@@ -500,23 +666,23 @@
500	666
501	667	cGridBag commandsPanel = new cGridBag();
502	668
503		- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	669	+ commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
504	670	editButton.setToolTipText("Edit selection");
505	671	editButton.addActionListener(this);
506	672
507		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	673	+ commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
508	674	uneditButton.setToolTipText("Unedit selection");
509	675	uneditButton.addActionListener(this);
510	676
511		- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	677	+ commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	678	+ allParamsButton.setToolTipText("Edit all params");
	679	+ allParamsButton.addActionListener(this);
	680	+
	681	+ commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
512	682	clearPanelButton.setToolTipText("Clear edit panel");
513	683	clearPanelButton.addActionListener(this);
514	684
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);
	685	+ commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
520	686	unselectButton.setToolTipText("Unselect");
521	687	unselectButton.addActionListener(this);
522	688
..	..	@@ -591,8 +757,18 @@
591	757
592	758	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
593	759	{
	760	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	761	+ boxCB.setToolTipText("Display bounding boxes");
	762	+ boxCB.addItemListener(this);
	763	+
	764	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	765	+ zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	766	+ zoomBoxCB.addItemListener(this);
	767	+
	768	+ if (true) // Globals.ADVANCED)
	769	+ {
594	770	panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
595		- supportCB.setToolTipText("Enabled rigging");
	771	+ supportCB.setToolTipText("Enable rigging");
596	772	supportCB.addItemListener(this);
597	773
598	774	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
..	..	@@ -610,14 +786,6 @@
610	786	slowCB.setToolTipText("Smooth interpolation");
611	787	slowCB.addItemListener(this);
612	788
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	789	// constraints.gridy += 1;
622	790	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
623	791	// speakerMocapCB.addItemListener(this);
..	..	@@ -648,6 +816,8 @@
648	816	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
649	817	lookAtCB.setToolTipText("Look-at target");
650	818	lookAtCB.addItemListener(this);
	819	+
	820	+ }
651	821
652	822	cGridBag fill = new cGridBag();
653	823
..	..	@@ -668,8 +838,11 @@
668	838	buttonGroup.add(radioButton);
669	839	radioButton.doClick();
670	840	}
	841	+
671	842	void SetupViews(ObjEditor oe)
672	843	{
	844	+ theFrame = this;
	845	+
673	846	oe.SetupViews();
674	847
675	848	System.out.println("SetupViews");
..	..	@@ -732,6 +905,7 @@
732	905	} else if(e.getSource() == liveCB)
733	906	{
734	907	cameraView.ToggleLive();
	908	+ refreshContents(false);
735	909	}
736	910	else if(e.getSource() == supportCB)
737	911	{
..	..	@@ -884,7 +1058,9 @@
884	1058	// objEditor.DropFile((java.io.File[]) object, true);
885	1059	// return;
886	1060	// }
887		- if (string.charAt(0) == '/')
	1061	+
	1062	+ // File path for Mac and Windows
	1063	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
888	1064	{
889	1065	// file(s)
890	1066	String[] names = string.split("\n");
..	..	@@ -911,7 +1087,7 @@
911	1087
912	1088	flashIt = false;
913	1089	CameraPane pane = (CameraPane) target;
914		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1090	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
915	1091	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
916	1092
917	1093	if (group.selection.size() == 1)
..	..	@@ -938,11 +1114,11 @@
938	1114	{
939	1115	loadClipboard(true);
940	1116	objEditor.jTree.setSelectionPath(destinationPath);
941		- pasteInto(false);
	1117	+ pasteInto(false, false);
942	1118	} else {
943	1119	loadClipboard(false);
944	1120	objEditor.jTree.setSelectionPath(destinationPath);
945		- pasteInto(false); // true); // ???
	1121	+ pasteInto(false, false); // true); // ???
946	1122	}
947	1123	}
948	1124	public void dropActionChanged(DropTargetDragEvent dtde)
..	..	@@ -1064,27 +1240,33 @@
1064	1240	kleinItem.addActionListener(this);
1065	1241	particleItem = menu.add(new MenuItem("Particle system"));
1066	1242	particleItem.addActionListener(this);
	1243	+ if (Globals.ADVANCED)
	1244	+ {
1067	1245	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1068	1246	ragdollItem.addActionListener(this);
1069	1247	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1070	1248	ragdoll2Item.addActionListener(this);
	1249	+ }
1071	1250	menu.add("-");
1072		- meshItem = menu.add(new MenuItem("Mesh"));
	1251	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1073	1252	meshItem.addActionListener(this);
1074	1253	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1075	1254	// meshGroupItem.addActionListener(this);
	1255	+ if (Globals.ADVANCED)
	1256	+ {
1076	1257	springItem = menu.add(new MenuItem("Spring"));
1077	1258	springItem.addActionListener(this);
1078	1259	flagItem = menu.add(new MenuItem("Flag"));
1079	1260	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	1261	blobItem = menu.add(new MenuItem("Blob"));
1085	1262	blobItem.addActionListener(this);
1086	1263	latheItem = menu.add(new MenuItem("Lathe"));
1087	1264	latheItem.addActionListener(this);
	1265	+ }
	1266	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1267	+ bezierItem.addActionListener(this);
	1268	+ overlayItem = menu.add(new MenuItem("Overlay"));
	1269	+ overlayItem.addActionListener(this);
1088	1270	lightItem = menu.add(new MenuItem("Light"));
1089	1271	lightItem.addActionListener(this);
1090	1272	menu.add("-");
..	..	@@ -1094,8 +1276,11 @@
1094	1276	loopItem.addActionListener(this);
1095	1277	doubleItem = menu.add(new MenuItem("Fork"));
1096	1278	doubleItem.addActionListener(this);
	1279	+ if (Globals.ADVANCED)
	1280	+ {
1097	1281	tripleItem = menu.add(new MenuItem("Trident"));
1098	1282	tripleItem.addActionListener(this);
	1283	+ }
1099	1284	}
1100	1285
1101	1286	void buildToolsMenu(Menu menu)
..	..	@@ -1109,24 +1294,26 @@
1109	1294	parseverticesItem.addActionListener(this);
1110	1295	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1111	1296	textureFieldItem.addActionListener(this);
1112		- alignItem = menu.add(new MenuItem("Align"));
	1297	+ alignItem = menu.add(new MenuItem("Align Objects"));
1113	1298	alignItem.addActionListener(this);
1114		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1115		- mirrorItem.addActionListener(this);
1116	1299	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1117	1300	reduceMorphItem.addActionListener(this);
1118	1301	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1119	1302	reduce34MorphItem.addActionListener(this);
1120		-
	1303	+ menu.add("-");
1121	1304	menu.add(computeAOItem = new MenuItem("Compute AO"));
1122	1305	computeAOItem.addActionListener(this);
1123		- menu.add("-");
1124	1306
	1307	+ if (Globals.ADVANCED)
	1308	+ {
	1309	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1310	+ mirrorItem.addActionListener(this);
	1311	+ menu.add("-");
1125	1312	menu.add(memoryItem = new MenuItem("Memory Usage"));
1126	1313	memoryItem.addActionListener(this);
1127	1314	menu.add(analyzeItem = new MenuItem("Analyze"));
1128	1315	analyzeItem.addActionListener(this);
1129		- menu.add(dumpItem = new MenuItem("Dump"));
	1316	+ menu.add(dumpItem = new MenuItem("Print"));
1130	1317	dumpItem.addActionListener(this);
1131	1318	// menu.add(pathItem = new MenuItem("From-to path"));
1132	1319	// pathItem.addActionListener(this);
..	..	@@ -1144,6 +1331,7 @@
1144	1331	menu.add("-");
1145	1332	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1146	1333	editScriptItem.addActionListener(this);
	1334	+ }
1147	1335	}
1148	1336
1149	1337	void ScreenFit()
..	..	@@ -1472,9 +1660,9 @@
1472	1660
1473	1661	void Overwrite(int mask)
1474	1662	{
1475		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1663	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1476	1664	{
1477		- Object3D content = GrafreeD.clipboard.get(0);
	1665	+ Object3D content = Grafreed.clipboard.get(0);
1478	1666
1479	1667	if (content instanceof cGroup && ((cGroup)content).transientlink )
1480	1668	content = ((cGroup)content).get(0);
..	..	@@ -1645,7 +1833,7 @@
1645	1833	{
1646	1834	makeSomething(new BezierSurface());
1647	1835	} else
1648		- if (source == checkerItem)
	1836	+ if (source == overlayItem)
1649	1837	{
1650	1838	/*
1651	1839	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1779,23 +1967,6 @@
1779	1967	csg.addChild(child);
1780	1968	child.addChild(csg);
1781	1969	} 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	1970	if (source == computeAOItem)
1800	1971	{
1801	1972	Globals.drawMode = CameraPane.OCCLUSION;
..	..	@@ -1814,7 +1985,7 @@
1814	1985	if (source == invariantsItem)
1815	1986	{
1816	1987	System.out.println("Invariants:");
1817		- GrafreeD.grafreeD.universe.invariants();
	1988	+ Grafreed.grafreeD.universe.invariants();
1818	1989	} else
1819	1990	if (source == memoryItem)
1820	1991	{
..	..	@@ -1832,6 +2003,35 @@
1832	2003	if (source == dumpItem)
1833	2004	{
1834	2005	DumpObject();
	2006	+ } else
	2007	+ if (source == minButton)
	2008	+ {
	2009	+ Minimize();
	2010	+ } else
	2011	+ if (source == maxButton)
	2012	+ {
	2013	+ Maximize();
	2014	+ } else
	2015	+ if (source == fullButton)
	2016	+ {
	2017	+ ToggleFullScreen();
	2018	+ } else
	2019	+ if (source == undoButton)
	2020	+ {
	2021	+ Undo();
	2022	+ } else
	2023	+ if (source == redoButton)
	2024	+ {
	2025	+ Redo();
	2026	+ } else
	2027	+ if (source == saveButton)
	2028	+ {
	2029	+ Save();
	2030	+ } else
	2031	+ if (source == oneStepButton)
	2032	+ {
	2033	+ Globals.ONESTEP = true;
	2034	+ cameraView.repaint();
1835	2035	} else
1836	2036	if (source == screenfitButton)
1837	2037	{
..	..	@@ -1882,12 +2082,20 @@
1882	2082	{
1883	2083	loadClipboard(true);
1884	2084	} else
	2085	+ if (source == undoItem)
	2086	+ {
	2087	+ Undo();
	2088	+ } else
	2089	+ if (source == redoItem)
	2090	+ {
	2091	+ Redo();
	2092	+ } else
1885	2093	if (source == duplicateItem)
1886	2094	{
1887		- Object3D keep = GrafreeD.clipboard;
	2095	+ Object3D keep = Grafreed.clipboard;
1888	2096	loadClipboard(false);
1889	2097	paste(false);
1890		- GrafreeD.clipboard = keep;
	2098	+ Grafreed.clipboard = keep;
1891	2099	} else
1892	2100	if (source == cloneItem)
1893	2101	{
..	..	@@ -1905,13 +2113,17 @@
1905	2113	{
1906	2114	paste(false);
1907	2115	} else
	2116	+ if (source == pasteIntoItem)
	2117	+ {
	2118	+ pasteInto(true, false);
	2119	+ } else
1908	2120	if (source == pasteLinkItem)
1909	2121	{
1910		- pasteInto(false);
	2122	+ pasteInto(false, false);
1911	2123	} else
1912	2124	if (source == pasteCloneItem)
1913	2125	{
1914		- pasteInto(true);
	2126	+ pasteInto(true, true);
1915	2127	} else
1916	2128	if (source == pasteExpandItem)
1917	2129	{
..	..	@@ -2103,9 +2315,9 @@
2103	2315	// group.selection.get(0).setMasterThis(content); // should be identity
2104	2316	// refreshContents();
2105	2317	// }
2106		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2318	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2107	2319	{
2108		- Object3D content = GrafreeD.clipboard.get(0);
	2320	+ Object3D content = Grafreed.clipboard.get(0);
2109	2321
2110	2322	if (content instanceof cGroup && ((cGroup)content).transientlink )
2111	2323	content = ((cGroup)content).get(0);
..	..	@@ -2113,11 +2325,11 @@
2113	2325	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2114	2326	for (int i=0; i<group.selection.size(); i++)
2115	2327	{
2116		- boolean random = CameraPane.RANDOM;
2117		- CameraPane.RANDOM = false; // parse all random nodes
	2328	+ boolean random = CameraPane.SWITCH;
	2329	+ CameraPane.SWITCH = false; // parse all random nodes
2118	2330	group.selection.get(i).linkVerticesThis(content);
2119	2331	// group.selection.get(i).setMasterThis(content); // should be identity
2120		- CameraPane.RANDOM = random;
	2332	+ CameraPane.SWITCH = random;
2121	2333	}
2122	2334	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2123	2335	refreshContents();
..	..	@@ -2127,20 +2339,20 @@
2127	2339	{
2128	2340	for (int i=0; i<group.selection.size(); i++)
2129	2341	{
2130		- boolean random = CameraPane.RANDOM;
2131		- CameraPane.RANDOM = false; // parse all random nodes
	2342	+ boolean random = CameraPane.SWITCH;
	2343	+ CameraPane.SWITCH = false; // parse all random nodes
2132	2344	group.selection.get(i).linkVerticesThis(null);
2133		- CameraPane.RANDOM = random;
	2345	+ CameraPane.SWITCH = random;
2134	2346	}
2135	2347
2136	2348	refreshContents();
2137	2349	} else
2138	2350	if (source == relinkverticesItem)
2139	2351	{
2140		- boolean random = CameraPane.RANDOM;
2141		- CameraPane.RANDOM = false; // parse all random nodes
	2352	+ boolean random = CameraPane.SWITCH;
	2353	+ CameraPane.SWITCH = false; // parse all random nodes
2142	2354	group.selection.RelinkToSupport();
2143		- CameraPane.RANDOM = random;
	2355	+ CameraPane.SWITCH = random;
2144	2356
2145	2357	refreshContents();
2146	2358	} else
..	..	@@ -2155,9 +2367,9 @@
2155	2367	} else
2156	2368	if (source == setMasterItem)
2157	2369	{
2158		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2370	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2159	2371	{
2160		- Object3D content = GrafreeD.clipboard.get(0);
	2372	+ Object3D content = Grafreed.clipboard.get(0);
2161	2373
2162	2374	if (content instanceof cGroup && ((cGroup)content).transientlink )
2163	2375	content = ((cGroup)content).get(0);
..	..	@@ -2170,9 +2382,9 @@
2170	2382	{
2171	2383	if (group.selection.size() == 1)
2172	2384	{
2173		- if (GrafreeD.clipboard.size() == 1)
	2385	+ if (Grafreed.clipboard.size() == 1)
2174	2386	{
2175		- Object3D content = GrafreeD.clipboard.get(0);
	2387	+ Object3D content = Grafreed.clipboard.get(0);
2176	2388
2177	2389	if (content instanceof cGroup && ((cGroup)content).transientlink )
2178	2390	content = ((cGroup)content).get(0);
..	..	@@ -2189,7 +2401,7 @@
2189	2401	{
2190	2402	RevertMeshes();
2191	2403	} else
2192		- if (source == resetMeshItem)
	2404	+ if (source == resetAllItem)
2193	2405	{
2194	2406	ResetAll();
2195	2407	} else
..	..	@@ -2238,7 +2450,7 @@
2238	2450	RandomNode random = new RandomNode();
2239	2451	group(random);
2240	2452	if (random.size() > 0)
2241		- random.name = random.get(0).name + "Rnd";
	2453	+ random.name = random.get(0).name + "Switch";
2242	2454	} else
2243	2455	if (source == physicsItem)
2244	2456	{
..	..	@@ -2377,7 +2589,7 @@
2377	2589	} else
2378	2590	if (source == genNormalsMESHItem)
2379	2591	{
2380		- GenNormals(true); // TODO
	2592	+ GenNormalsMESH();
2381	2593	} else
2382	2594	if (source == genNormalsORGANItem)
2383	2595	{
..	..	@@ -2442,6 +2654,22 @@
2442	2654	if (source == unmarkleavesItem)
2443	2655	{
2444	2656	MarkLeaves(false);
	2657	+ } else
	2658	+ if (source == rewindleavesItem)
	2659	+ {
	2660	+ RewindLeaves(true);
	2661	+ } else
	2662	+ if (source == unrewindleavesItem)
	2663	+ {
	2664	+ RewindLeaves(false);
	2665	+ } else
	2666	+ if (source == randomleavesItem)
	2667	+ {
	2668	+ RandomLeaves(true);
	2669	+ } else
	2670	+ if (source == unrandomleavesItem)
	2671	+ {
	2672	+ RandomLeaves(false);
2445	2673	} else
2446	2674	if (source == flipVItem)
2447	2675	{
..	..	@@ -2527,9 +2755,13 @@
2527	2755	{
2528	2756	SmoothMesh();
2529	2757	} else
2530		- if (source == transformgeometryItem)
	2758	+ if (source == transformGeometryItem)
2531	2759	{
2532	2760	TransformGeometry();
	2761	+ } else
	2762	+ if (source == transformChildrenItem)
	2763	+ {
	2764	+ TransformChildren();
2533	2765	} else
2534	2766	if (source == resetTransformItem)
2535	2767	{
..	..	@@ -2537,7 +2769,11 @@
2537	2769	} else
2538	2770	if (source == resetCentroidItem)
2539	2771	{
2540		- ResetCentroid();
	2772	+ ResetCentroid(true);
	2773	+ } else
	2774	+ if (source == resetCentroidXZItem)
	2775	+ {
	2776	+ ResetCentroid(false);
2541	2777	} else
2542	2778	if (source == resetParentItem)
2543	2779	{
..	..	@@ -2701,6 +2937,24 @@
2701	2937	bigThree.ClearUI();
2702	2938	bigThree.add(centralPanel);
2703	2939	bigThree.FlushUI();
	2940	+
	2941	+ cameraView.requestFocusInWindow();
	2942	+
	2943	+// refreshContents(true);
	2944	+//
	2945	+// try
	2946	+// {
	2947	+// java.awt.Robot bot = new java.awt.Robot();
	2948	+// int mask = InputEvent.BUTTON1_MASK;
	2949	+// bot.mouseMove(100, 100);
	2950	+// bot.mousePress(mask);
	2951	+// bot.mouseRelease(mask);
	2952	+// }
	2953	+// catch (Exception e)
	2954	+// {
	2955	+//
	2956	+// }
	2957	+
2704	2958	} else
2705	2959	if (source == threeButton)
2706	2960	{
..	..	@@ -2737,6 +2991,8 @@
2737	2991	bigThree.add(centralPanel);
2738	2992	bigThree.add(XYZPanel);
2739	2993	bigThree.FlushUI();
	2994	+
	2995	+ cameraView.requestFocusInWindow();
2740	2996	} else
2741	2997	if (source == fourButton)
2742	2998	{
..	..	@@ -2772,6 +3028,8 @@
2772	3028	bigThree.ClearUI();
2773	3029	bigThree.add(scenePanel);
2774	3030	bigThree.FlushUI();
	3031	+
	3032	+ cameraView.requestFocusInWindow();
2775	3033	} else
2776	3034	if (source == sixButton)
2777	3035	{
..	..	@@ -2808,6 +3066,8 @@
2808	3066	bigThree.add(scenePanel);
2809	3067	bigThree.add(centralPanel);
2810	3068	bigThree.FlushUI();
	3069	+
	3070	+ cameraView.requestFocusInWindow();
2811	3071	} else
2812	3072	if (source == sevenButton)
2813	3073	{
..	..	@@ -2845,6 +3105,8 @@
2845	3105	bigThree.add(centralPanel);
2846	3106	bigThree.add(XYZPanel);
2847	3107	bigThree.FlushUI();
	3108	+
	3109	+ cameraView.requestFocusInWindow();
2848	3110	} else
2849	3111	if (source == rootButton)
2850	3112	{
..	..	@@ -2856,6 +3118,7 @@
2856	3118	EditObject(obj);
2857	3119	}
2858	3120
	3121	+ cameraView.requestFocusInWindow();
2859	3122	refreshContents(true);
2860	3123	} else
2861	3124	if (source == closeButton)
..	..	@@ -2877,6 +3140,8 @@
2877	3140	break;
2878	3141	}
2879	3142	}
	3143	+
	3144	+ cameraView.requestFocusInWindow();
2880	3145	refreshContents(true);
2881	3146	} else
2882	3147	if (source == editItem \|\| source == editButton)
..	..	@@ -2893,9 +3158,9 @@
2893	3158	child.CloseUI();
2894	3159	listUI.remove(child);
2895	3160
2896		- child.editWindow = null; // ???????????
	3161	+ //child.editWindow = null; // ???????????
2897	3162	}
2898		- objEditor.ctrlPanel.validate();
	3163	+ objEditor.ctrlPanel.FlushUI();
2899	3164	//objEditor.jTree.clearSelection();
2900	3165	//objEditor.ResetSliders();
2901	3166	refreshContents(true);
..	..	@@ -2979,7 +3244,10 @@
2979	3244	frontView.object = group;
2980	3245	sideView.object = group;
2981	3246	}
2982		- group.editWindow = this;
	3247	+
	3248	+// fix "+" issue
	3249	+ //group.editWindow = this;
	3250	+
2983	3251	/*
2984	3252	currentLayout = radio.layout;
2985	3253	if (currentLayout == null)
..	..	@@ -2991,8 +3259,23 @@
2991	3259	//group.parent = null; // ROOT
2992	3260	//group.attributes = -1;
2993	3261	ResetModel();
	3262	+
	3263	+ cameraView.requestFocusInWindow();
2994	3264	refreshContents(true);
2995		- }
	3265	+ } else if (event.getSource() == editCameraItem)
	3266	+ {
	3267	+ cameraView.ProtectCamera();
	3268	+ cameraView.repaint();
	3269	+ return;
	3270	+ } else if (event.getSource() == revertCameraItem)
	3271	+ {
	3272	+ cameraView.RevertCamera();
	3273	+ cameraView.repaint();
	3274	+ return;
	3275	+ // } else if (event.getSource() == textureButton)
	3276	+ // {
	3277	+ // return; // true;
	3278	+ }
2996	3279	else
2997	3280	{
2998	3281	//return super.action(event, arg);
..	..	@@ -3001,7 +3284,6 @@
3001	3284	}
3002	3285
3003	3286	boolean useclient = false;
3004		- cRadio radio;
3005	3287
3006	3288	void ToggleRoot()
3007	3289	{
..	..	@@ -3053,6 +3335,28 @@
3053	3335	refreshContents();
3054	3336	}
3055	3337
	3338	+ void TransformChildren()
	3339	+ {
	3340	+ Object3D obj;
	3341	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3342	+ {
	3343	+ obj = (Object3D)e.nextElement();
	3344	+ obj.KeepTextureMatrices();
	3345	+ obj.TransformChildren();
	3346	+ obj.RestoreTextureMatrices();
	3347	+
	3348	+// if (obj.parent == null)
	3349	+// {
	3350	+// System.out.println("NULL PARENT!");
	3351	+// new Exception().printStackTrace();
	3352	+// }
	3353	+// else
	3354	+// TouchTransform(obj);
	3355	+// //obj.parent.Touch();
	3356	+ }
	3357	+
	3358	+ refreshContents();
	3359	+ }
3056	3360
3057	3361	void ResetTransform()
3058	3362	{
..	..	@@ -3165,7 +3469,7 @@
3165	3469	refreshContents();
3166	3470	}
3167	3471
3168		- void ResetCentroid()
	3472	+ void ResetCentroid(boolean full)
3169	3473	{
3170	3474	Object3D obj;
3171	3475	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3180,12 +3484,16 @@
3180	3484	LA.matIdentity(Object3D.mat);
3181	3485	obj.getBounds(minima, maxima, false);
3182	3486	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3183		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3487	+ if (full)
	3488	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3184	3489	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3185	3490	obj.TransformMesh(Object3D.mat);
	3491	+
3186	3492	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3187		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3493	+ if (full)
	3494	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3188	3495	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3496	+
3189	3497	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3190	3498	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3191	3499	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3214,7 +3522,8 @@
3214	3522
3215	3523	int size = obj.MemorySize();
3216	3524
3217		- System.err.println((size/1024) + " KB is the size of " + obj);
	3525	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3526	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3218	3527	}
3219	3528	}
3220	3529	catch (Exception e)
..	..	@@ -3251,9 +3560,9 @@
3251	3560	obj = (Object3D)e.nextElement();
3252	3561
3253	3562	System.out.println("Object is: " + obj);
3254		- GrafreeD.AnalyzeObject(obj);
	3563	+ Grafreed.AnalyzeObject(obj);
3255	3564	System.out.println("Boundary rep: " + obj.bRep);
3256		- GrafreeD.AnalyzeObject(obj.bRep);
	3565	+ Grafreed.AnalyzeObject(obj.bRep);
3257	3566
3258	3567	// System.err.println((size/1024) + " KB is the size of " + obj);
3259	3568	}
..	..	@@ -3295,6 +3604,13 @@
3295	3604	void GenNormals(boolean crease)
3296	3605	{
3297	3606	group.GenNormalsS(crease);
	3607	+
	3608	+ refreshContents();
	3609	+ }
	3610	+
	3611	+ void GenNormalsMESH()
	3612	+ {
	3613	+ group.GenNormalsMeshS();
3298	3614
3299	3615	refreshContents();
3300	3616	}
..	..	@@ -3467,8 +3783,8 @@
3467	3783
3468	3784	void ParseVertices()
3469	3785	{
3470		- boolean epsequal = GrafreeD.epsequal;
3471		- GrafreeD.epsequal = true;
	3786	+ boolean epsequal = Grafreed.epsequal;
	3787	+ Grafreed.epsequal = true;
3472	3788
3473	3789	for (int i=0; i<group.selection.size(); i++)
3474	3790	{
..	..	@@ -3493,7 +3809,7 @@
3493	3809	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3494	3810	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3495	3811
3496		- g.add(GrafreeD.clipboard);
	3812	+ g.add(Grafreed.clipboard);
3497	3813
3498	3814	buffer.add(g);
3499	3815	}
..	..	@@ -3508,7 +3824,7 @@
3508	3824	makeSomething(buffer, i==group.selection.size()-1);
3509	3825	}
3510	3826
3511		- GrafreeD.epsequal = epsequal;
	3827	+ Grafreed.epsequal = epsequal;
3512	3828
3513	3829	refreshContents();
3514	3830	}
..	..	@@ -3526,7 +3842,16 @@
3526	3842	String pigment = Object3D.GetPigment(tex);
3527	3843	//String bump = Object3D.GetBump(tex);
3528	3844
3529		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3845	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	3846	+
	3847	+ try
	3848	+ {
	3849	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3850	+ }
	3851	+ catch (Exception e)
	3852	+ {
	3853	+ System.err.println("FAIL: " + node);
	3854	+ }
3530	3855
3531	3856	double s = v.s;
3532	3857
..	..	@@ -3614,11 +3939,11 @@
3614	3939
3615	3940	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3616	3941
3617		- boolean random = CameraPane.RANDOM;
3618		- CameraPane.RANDOM = false; // parse all random nodes
	3942	+ boolean random = CameraPane.SWITCH;
	3943	+ CameraPane.SWITCH = false; // parse all random nodes
3619	3944	lowres.linkVerticesThis(null);
3620	3945	lowres.linkVerticesThis(sn);
3621		- CameraPane.RANDOM = random;
	3946	+ CameraPane.SWITCH = random;
3622	3947
3623	3948	System.err.flush();
3624	3949
..	..	@@ -3658,7 +3983,7 @@
3658	3983	return;
3659	3984
3660	3985	Object3D poses = group.selection.get(0);
3661		- Object3D ref = GrafreeD.clipboard.get(0);
	3986	+ Object3D ref = Grafreed.clipboard.get(0);
3662	3987
3663	3988	Object3D newgroup = new Object3D("Po:" + poses.name);
3664	3989
..	..	@@ -3852,9 +4177,9 @@
3852	4177
3853	4178	void ClipMesh()
3854	4179	{
3855		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4180	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3856	4181	{
3857		- Object3D content = GrafreeD.clipboard.get(0);
	4182	+ Object3D content = Grafreed.clipboard.get(0);
3858	4183
3859	4184	if (content instanceof cGroup && ((cGroup)content).transientlink )
3860	4185	content = ((cGroup)content).get(0);
..	..	@@ -3863,7 +4188,7 @@
3863	4188	// {
3864	4189	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3865	4190	// }
3866		- group.selection.ClipMesh(GrafreeD.clipboard);
	4191	+ group.selection.ClipMesh(Grafreed.clipboard);
3867	4192	}
3868	4193	// group.selection.ClipMesh(GrafreeD.clipboard);
3869	4194	System.out.println("DONE.");
..	..	@@ -3910,6 +4235,18 @@
3910	4235	void MarkLeaves(boolean hide)
3911	4236	{
3912	4237	group.selection.MarkLeaves(hide);
	4238	+ refreshContents();
	4239	+ }
	4240	+
	4241	+ void RewindLeaves(boolean hide)
	4242	+ {
	4243	+ group.selection.RewindLeaves(hide);
	4244	+ refreshContents();
	4245	+ }
	4246	+
	4247	+ void RandomLeaves(boolean hide)
	4248	+ {
	4249	+ group.selection.RandomLeaves(hide);
3913	4250	refreshContents();
3914	4251	}
3915	4252
..	..	@@ -3998,7 +4335,7 @@
3998	4335	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3999	4336
4000	4337	Object3D elem = (Object3D)group.selection.elementAt(i);
4001		- if(elem != group)
	4338	+ if(elem != group \|\| !newWindow)
4002	4339	{
4003	4340	// if (!(elem instanceof Composite))
4004	4341	// newWindow = false;
..	..	@@ -4088,7 +4425,6 @@
4088	4425	//case 702: // Event.LIST_DESELECT
4089	4426	group.deselectAll();
4090	4427	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4091		- objEditor.ClearInfo(); // .GetMaterial());
4092	4428	if (tps != null)
4093	4429	{
4094	4430	for (int i=0; i < tps.length; i++)
..	..	@@ -4097,10 +4433,8 @@
4097	4433
4098	4434	//if (child.parent != null)
4099	4435	//child.parent.addSelectee(child);
	4436	+ objEditor.SetMaterial(child);
4100	4437	group.addSelectee(child);
4101		- objEditor.SetMaterial(child); // .GetMaterial());
4102		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4103		- System.err.println("info : " + child.GetPath());
4104	4438	}
4105	4439	}
4106	4440	// else
..	..	@@ -4110,16 +4444,17 @@
4110	4444	// System.err.println("info : " + group.GetPath());
4111	4445	// }
4112	4446
4113		- objEditor.SetText(); // jan 2014
4114		-
4115		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4447	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4116	4448	CameraPane.flash = true;
4117	4449
4118		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4450	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4119	4451	// a camera
4120	4452	{
4121		- CameraPane.camerachangeframe = 0; // don't refuse it
4122		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4453	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4454	+ {
	4455	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4456	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4457	+ }
4123	4458	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4124	4459	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4125	4460	}
..	..	@@ -4132,6 +4467,26 @@
4132	4467
4133	4468	freezemodel = false;
4134	4469	}
	4470	+
	4471	+ void refreshContents(boolean cp)
	4472	+ {
	4473	+ if (!Globals.MOUSEDRAGGED)
	4474	+ {
	4475	+ objEditor.ClearInfo(); // .GetMaterial());
	4476	+
	4477	+ for (int i=0; i < group.selection.Size(); i++)
	4478	+ {
	4479	+ Object3D child = (Object3D) group.selection.get(i);
	4480	+
	4481	+ objEditor.AddInfo(child, this, true);
	4482	+ System.err.println("info : " + child.GetPath());
	4483	+ }
	4484	+
	4485	+ objEditor.SetText(); // jan 2014
	4486	+ }
	4487	+
	4488	+ super.refreshContents(cp);
	4489	+ }
4135	4490
4136	4491	void linkSomething(Object3D thing)
4137	4492	{
..	..	@@ -4203,16 +4558,18 @@
4203	4558	{
4204	4559	if (group.selection.isEmpty())
4205	4560	return;
4206		- GrafreeD.clipboardIsTempGroup = false;
	4561	+
	4562	+ Grafreed.clipboardIsTempGroup = false;
4207	4563	Composite tGroup = null;
4208	4564	if (group.selection.size() > 0) // 1)
4209	4565	{
4210	4566	tGroup = new cGroup();
4211		- GrafreeD.clipboardIsTempGroup = true;
	4567	+ Grafreed.clipboardIsTempGroup = true;
4212	4568	}
4213	4569
4214	4570	if (cut)
4215	4571	{
	4572	+ Save();
4216	4573	//int indices[] = jList.getSelectedIndices();
4217	4574	//for (int i = indices.length - 1; i >= 0; i--)
4218	4575	//jList.remove(indices[i]);
..	..	@@ -4248,16 +4605,16 @@
4248	4605	//System.out.println("cut " + child);
4249	4606	//System.out.println("parent = " + child.parent);
4250	4607	// tmp.addChild(child);
4251		- if (GrafreeD.clipboardIsTempGroup)
	4608	+ if (Grafreed.clipboardIsTempGroup)
4252	4609	tGroup.add/Child/(tmp);
4253	4610	else
4254		- GrafreeD.clipboard = tmp;
	4611	+ Grafreed.clipboard = tmp;
4255	4612	}
4256	4613	else
4257		- if (GrafreeD.clipboardIsTempGroup)
	4614	+ if (Grafreed.clipboardIsTempGroup)
4258	4615	tGroup.add/Child/(child);
4259	4616	else
4260		- GrafreeD.clipboard = child;
	4617	+ Grafreed.clipboard = child;
4261	4618	}
4262	4619
4263	4620	//ResetModel();
..	..	@@ -4289,21 +4646,23 @@
4289	4646	//System.out.println("cut " + elem);
4290	4647	//System.out.println("parent = " + elem.parent);
4291	4648	// tmp.addChild(elem);
4292		- if (GrafreeD.clipboardIsTempGroup)
	4649	+ if (Grafreed.clipboardIsTempGroup)
4293	4650	tGroup.add/Child/(tmp);
4294	4651	else
4295		- GrafreeD.clipboard = tmp;
	4652	+ Grafreed.clipboard = tmp;
4296	4653	}
4297	4654	else
4298		- if (GrafreeD.clipboardIsTempGroup)
	4655	+ if (Grafreed.clipboardIsTempGroup)
4299	4656	tGroup.add/Child/(child);
4300	4657	else
4301		- GrafreeD.clipboard = child;
	4658	+ Grafreed.clipboard = child;
4302	4659	}
4303	4660
4304	4661	}
4305		- if (GrafreeD.clipboardIsTempGroup)
4306		- GrafreeD.clipboard = tGroup;
	4662	+
	4663	+ if (Grafreed.clipboardIsTempGroup)
	4664	+ Grafreed.clipboard = tGroup;
	4665	+
4307	4666	if (cut)
4308	4667	{
4309	4668	ResetModel();
..	..	@@ -4317,7 +4676,7 @@
4317	4676	// return;
4318	4677	boolean first = true;
4319	4678
4320		- if (GrafreeD.clipboardIsTempGroup)
	4679	+ if (Grafreed.clipboardIsTempGroup)
4321	4680	{
4322	4681	Composite temp;
4323	4682
..	..	@@ -4328,7 +4687,7 @@
4328	4687	temp = (Composite)Applet3D.clipboard.deepCopy();
4329	4688	*/
4330	4689	Object3D elem;
4331		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4690	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4332	4691	{
4333	4692	Object3D child = (Object3D)e.nextElement();
4334	4693
..	..	@@ -4362,21 +4721,21 @@
4362	4721	//Object3D cb = Applet3D.clipboard;
4363	4722	//temp.addChild(cb);
4364	4723	//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());
	4724	+ assert(Grafreed.clipboard.parent == null);
	4725	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4726	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4727	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4728	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4370	4729	else
4371		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4372		- GrafreeD.clipboard.get(0).parent = keepparent;
	4730	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4731	+ Grafreed.clipboard.get(0).parent = keepparent;
4373	4732	}
4374	4733
4375	4734	ResetModel();
4376	4735	refreshContents();
4377	4736	}
4378	4737
4379		- void pasteInto(boolean copyit)
	4738	+ void pasteInto(boolean copyit, boolean clone)
4380	4739	{
4381	4740	// if (GrafreeD.clipboard == null)
4382	4741	// return;
..	..	@@ -4405,15 +4764,22 @@
4405	4764	if (copyit)
4406	4765	{
4407	4766	// paste(false);
4408		- CloneClipboard(false); // sept 2014
	4767	+ if (clone)
	4768	+ {
	4769	+ CloneClipboard(false); // sept 2014
	4770	+ }
	4771	+ else
	4772	+ {
	4773	+ paste(false);
	4774	+ }
4409	4775	}
4410	4776	else
4411	4777	{
4412	4778	boolean first = true;
4413	4779
4414		- if (GrafreeD.clipboardIsTempGroup)
	4780	+ if (Grafreed.clipboardIsTempGroup)
4415	4781	{
4416		- Composite temp = (Composite)GrafreeD.clipboard;
	4782	+ Composite temp = (Composite)Grafreed.clipboard;
4417	4783	Object3D copy;
4418	4784	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4419	4785	{
..	..	@@ -4423,7 +4789,7 @@
4423	4789	}
4424	4790	} else
4425	4791	{
4426		- linkSomething(GrafreeD.clipboard); //.get(0));
	4792	+ linkSomething(Grafreed.clipboard); //.get(0));
4427	4793	}
4428	4794	}
4429	4795	}
..	..	@@ -4828,21 +5194,6 @@
4828	5194	}
4829	5195	*/
4830	5196
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	5197	/*
4847	5198	public void Callback(Object obj)
4848	5199	{
..	..	@@ -4866,26 +5217,9 @@
4866	5217	}
4867	5218	*/
4868	5219
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	5220	String GetFile(String dialogName)
4887	5221	{
4888		- if (GrafreeD.standAlone)
	5222	+ if (Grafreed.standAlone)
4889	5223	{
4890	5224	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4891	5225	browser.show();
..	..	@@ -4949,10 +5283,18 @@
4949	5283	cButton flashSelectionButton;
4950	5284	cButton editButton;
4951	5285	cButton uneditButton;
	5286	+ JCheckBox allParamsButton;
4952	5287	cButton clearpanelButton;
4953		- cButton allParamsButton;
4954	5288	cButton unselectButton;
4955	5289
	5290	+ cButton minButton;
	5291	+ cButton maxButton;
	5292	+ cButton fullButton;
	5293	+ cButton undoButton;
	5294	+ cButton redoButton;
	5295	+ cButton saveButton;
	5296	+ cButton oneStepButton;
	5297	+
4956	5298	cButton screenfitButton;
4957	5299	cButton screenfitpointButton;
4958	5300	cButton snapobjectButton;
..	..	@@ -4963,14 +5305,6 @@
4963	5305	cButton closeButton;
4964	5306
4965	5307	cButton setsupportButton;
4966		-
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	5308
4975	5309	//
4976	5310	//Composite
..	..	@@ -4983,6 +5317,8 @@
4983	5317	private MenuItem lookFromItem;
4984	5318	private MenuItem switchItem;
4985	5319	private MenuItem cutItem;
	5320	+ private MenuItem undoItem;
	5321	+ private MenuItem redoItem;
4986	5322	private MenuItem duplicateItem;
4987	5323	private MenuItem cloneItem;
4988	5324	private MenuItem cloneSupportItem;
..	..	@@ -4996,7 +5332,7 @@
4996	5332	private MenuItem linkverticesItem;
4997	5333	private MenuItem relinkverticesItem;
4998	5334	private MenuItem setMasterItem;
4999		- private MenuItem resetMeshItem;
	5335	+ private MenuItem resetAllItem;
5000	5336	private MenuItem stepAllItem;
5001	5337	private MenuItem revertMeshItem;
5002	5338	private MenuItem poseMeshItem;
..	..	@@ -5007,6 +5343,7 @@
5007	5343	private MenuItem mergeGeometriesItem;
5008	5344	private MenuItem copyItem;
5009	5345	private MenuItem pasteItem;
	5346	+ private MenuItem pasteIntoItem;
5010	5347	private MenuItem pasteLinkItem;
5011	5348	private MenuItem pasteCloneItem;
5012	5349	private MenuItem pasteExpandItem;
..	..	@@ -5045,6 +5382,10 @@
5045	5382	private MenuItem showleavesItem;
5046	5383	private MenuItem markleavesItem;
5047	5384	private MenuItem unmarkleavesItem;
	5385	+ private MenuItem rewindleavesItem;
	5386	+ private MenuItem unrewindleavesItem;
	5387	+ private MenuItem randomleavesItem;
	5388	+ private MenuItem unrandomleavesItem;
5048	5389
5049	5390	private MenuItem flipVItem;
5050	5391	private MenuItem unflipVItem;
..	..	@@ -5056,8 +5397,10 @@
5056	5397	private MenuItem panoTexturesItem;
5057	5398
5058	5399	private MenuItem resetCentroidItem;
5059		- private MenuItem transformgeometryItem;
	5400	+ private MenuItem resetCentroidXZItem;
5060	5401	private MenuItem resetTransformItem;
	5402	+ private MenuItem transformGeometryItem;
	5403	+ private MenuItem transformChildrenItem;
5061	5404	private MenuItem hideItem;
5062	5405	private MenuItem grabItem;
5063	5406	private MenuItem backItem;
..	..	@@ -5104,7 +5447,7 @@
5104	5447	private MenuItem blobItem;
5105	5448	private MenuItem latheItem;
5106	5449	private MenuItem bezierItem;
5107		- private MenuItem checkerItem;
	5450	+ private MenuItem overlayItem;
5108	5451	private MenuItem meshItem;
5109	5452	// private MenuItem meshGroupItem;
5110	5453	private MenuItem springItem;
..	..	@@ -5126,11 +5469,6 @@
5126	5469	private MenuItem doubleItem;
5127	5470	private MenuItem tripleItem;
5128	5471
5129		- private MenuItem importGFDItem;
5130		- private MenuItem importVRMLX3DItem;
5131		- private MenuItem import3DSItem;
5132		- private MenuItem importOBJItem;
5133		-
5134	5472	private MenuItem computeAOItem;
5135	5473	private MenuItem recompileItem;
5136	5474	private MenuItem editScriptItem;
..	..	@@ -5140,4 +5478,8 @@
5140	5478	private MenuItem analyzeItem;
5141	5479	private MenuItem dumpItem;
5142	5480	//boolean freezemodel = false;
	5481	+
	5482	+ Menu cameraMenu;
	5483	+ MenuItem editCameraItem;
	5484	+ MenuItem revertCameraItem;
5143	5485	}