~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(CameraPane.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,29 +513,22 @@
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	}
..	..	@@ -436,10 +565,26 @@
436	565	*/
437	566	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
438	567
	568	+ oe.toolbarPanel.add(undoButton = new cButton("Undo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	569	+ undoButton.setToolTipText("Undo changes");
	570	+ undoButton.addActionListener(this);
	571	+
	572	+ oe.toolbarPanel.add(redoButton = new cButton("Redo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	573	+ redoButton.setToolTipText("Redo changes");
	574	+ redoButton.addActionListener(this);
	575	+
	576	+ oe.toolbarPanel.add(saveButton = new cButton("Save", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	577	+ saveButton.setToolTipText("Save changes");
	578	+ saveButton.addActionListener(this);
	579	+
439	580	oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
440		- liveCB.setToolTipText("Enabled animation");
	581	+ liveCB.setToolTipText("Enable animation");
441	582	liveCB.addItemListener(this);
442	583
	584	+ oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	585	+ oneStepButton.setToolTipText("Animate one step forward");
	586	+ oneStepButton.addActionListener(this);
	587	+
443	588	oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
444	589	fastCB.setToolTipText("Fast mode");
445	590	fastCB.addItemListener(this);
..	..	@@ -448,51 +593,48 @@
448	593	trackCB.setToolTipText("Enable tracking");
449	594	trackCB.addItemListener(this);
450	595
451		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	596	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
452	597	screenfitButton.setToolTipText("Screen fit");
453	598	screenfitButton.addActionListener(this);
454	599
455	600	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
456	601	// 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	602
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);
	603	+ if (Globals.ADVANCED)
	604	+ {
	605	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	606	+ snapobjectButton.addActionListener(this);
	607	+ snapobjectButton.setToolTipText("Snap Object");
	608	+ }
	609	+
	610	+ oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
469	611	flashSelectionButton.setToolTipText("Show selection");
470	612	flashSelectionButton.addActionListener(this);
471	613
472	614	oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
473	615
474		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	616	+ oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
475	617	twoButton.setToolTipText("Show center view only");
476	618	twoButton.addActionListener(this);
477		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	619	+ oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
478	620	fourButton.addActionListener(this);
479	621	fourButton.setToolTipText("Show left panel only");
480		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	622	+ oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
481	623	sixButton.setToolTipText("2-column layout left");
482	624	sixButton.addActionListener(this);
483		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	625	+ oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
484	626	threeButton.setToolTipText("2-column layout right");
485	627	threeButton.addActionListener(this);
486		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	628	+ oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
487	629	sevenButton.setToolTipText("3-column layout");
488	630	sevenButton.addActionListener(this);
489	631	//
490	632
491		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	633	+ oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
492	634	rootButton.setToolTipText("Edit selection in new tab");
493	635	rootButton.addActionListener(this);
494	636
495		- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	637	+ oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
496	638	closeButton.setToolTipText("Close tab");
497	639	closeButton.addActionListener(this);
498	640	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
..	..	@@ -500,23 +642,23 @@
500	642
501	643	cGridBag commandsPanel = new cGridBag();
502	644
503		- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	645	+ commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
504	646	editButton.setToolTipText("Edit selection");
505	647	editButton.addActionListener(this);
506	648
507		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	649	+ commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
508	650	uneditButton.setToolTipText("Unedit selection");
509	651	uneditButton.addActionListener(this);
510	652
511		- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	653	+ commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	654	+ allParamsButton.setToolTipText("Edit all params");
	655	+ allParamsButton.addActionListener(this);
	656	+
	657	+ commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
512	658	clearPanelButton.setToolTipText("Clear edit panel");
513	659	clearPanelButton.addActionListener(this);
514	660
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);
	661	+ commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
520	662	unselectButton.setToolTipText("Unselect");
521	663	unselectButton.addActionListener(this);
522	664
..	..	@@ -591,8 +733,18 @@
591	733
592	734	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
593	735	{
	736	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	737	+ boxCB.setToolTipText("Display bounding boxes");
	738	+ boxCB.addItemListener(this);
	739	+
	740	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	741	+ zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	742	+ zoomBoxCB.addItemListener(this);
	743	+
	744	+ if (true) // Globals.ADVANCED)
	745	+ {
594	746	panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
595		- supportCB.setToolTipText("Enabled rigging");
	747	+ supportCB.setToolTipText("Enable rigging");
596	748	supportCB.addItemListener(this);
597	749
598	750	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
..	..	@@ -610,14 +762,6 @@
610	762	slowCB.setToolTipText("Smooth interpolation");
611	763	slowCB.addItemListener(this);
612	764
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	765	// constraints.gridy += 1;
622	766	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
623	767	// speakerMocapCB.addItemListener(this);
..	..	@@ -648,6 +792,8 @@
648	792	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
649	793	lookAtCB.setToolTipText("Look-at target");
650	794	lookAtCB.addItemListener(this);
	795	+
	796	+ }
651	797
652	798	cGridBag fill = new cGridBag();
653	799
..	..	@@ -668,6 +814,7 @@
668	814	buttonGroup.add(radioButton);
669	815	radioButton.doClick();
670	816	}
	817	+
671	818	void SetupViews(ObjEditor oe)
672	819	{
673	820	oe.SetupViews();
..	..	@@ -732,6 +879,7 @@
732	879	} else if(e.getSource() == liveCB)
733	880	{
734	881	cameraView.ToggleLive();
	882	+ refreshContents(false);
735	883	}
736	884	else if(e.getSource() == supportCB)
737	885	{
..	..	@@ -884,7 +1032,9 @@
884	1032	// objEditor.DropFile((java.io.File[]) object, true);
885	1033	// return;
886	1034	// }
887		- if (string.charAt(0) == '/')
	1035	+
	1036	+ // File path for Mac and Windows
	1037	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
888	1038	{
889	1039	// file(s)
890	1040	String[] names = string.split("\n");
..	..	@@ -911,7 +1061,7 @@
911	1061
912	1062	flashIt = false;
913	1063	CameraPane pane = (CameraPane) target;
914		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1064	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
915	1065	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
916	1066
917	1067	if (group.selection.size() == 1)
..	..	@@ -938,11 +1088,11 @@
938	1088	{
939	1089	loadClipboard(true);
940	1090	objEditor.jTree.setSelectionPath(destinationPath);
941		- pasteInto(false);
	1091	+ pasteInto(false, false);
942	1092	} else {
943	1093	loadClipboard(false);
944	1094	objEditor.jTree.setSelectionPath(destinationPath);
945		- pasteInto(false); // true); // ???
	1095	+ pasteInto(false, false); // true); // ???
946	1096	}
947	1097	}
948	1098	public void dropActionChanged(DropTargetDragEvent dtde)
..	..	@@ -1064,27 +1214,33 @@
1064	1214	kleinItem.addActionListener(this);
1065	1215	particleItem = menu.add(new MenuItem("Particle system"));
1066	1216	particleItem.addActionListener(this);
	1217	+ if (Globals.ADVANCED)
	1218	+ {
1067	1219	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1068	1220	ragdollItem.addActionListener(this);
1069	1221	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1070	1222	ragdoll2Item.addActionListener(this);
	1223	+ }
1071	1224	menu.add("-");
1072		- meshItem = menu.add(new MenuItem("Mesh"));
	1225	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1073	1226	meshItem.addActionListener(this);
1074	1227	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1075	1228	// meshGroupItem.addActionListener(this);
	1229	+ if (Globals.ADVANCED)
	1230	+ {
1076	1231	springItem = menu.add(new MenuItem("Spring"));
1077	1232	springItem.addActionListener(this);
1078	1233	flagItem = menu.add(new MenuItem("Flag"));
1079	1234	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	1235	blobItem = menu.add(new MenuItem("Blob"));
1085	1236	blobItem.addActionListener(this);
1086	1237	latheItem = menu.add(new MenuItem("Lathe"));
1087	1238	latheItem.addActionListener(this);
	1239	+ }
	1240	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1241	+ bezierItem.addActionListener(this);
	1242	+ overlayItem = menu.add(new MenuItem("Overlay"));
	1243	+ overlayItem.addActionListener(this);
1088	1244	lightItem = menu.add(new MenuItem("Light"));
1089	1245	lightItem.addActionListener(this);
1090	1246	menu.add("-");
..	..	@@ -1094,8 +1250,11 @@
1094	1250	loopItem.addActionListener(this);
1095	1251	doubleItem = menu.add(new MenuItem("Fork"));
1096	1252	doubleItem.addActionListener(this);
	1253	+ if (Globals.ADVANCED)
	1254	+ {
1097	1255	tripleItem = menu.add(new MenuItem("Trident"));
1098	1256	tripleItem.addActionListener(this);
	1257	+ }
1099	1258	}
1100	1259
1101	1260	void buildToolsMenu(Menu menu)
..	..	@@ -1109,24 +1268,26 @@
1109	1268	parseverticesItem.addActionListener(this);
1110	1269	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1111	1270	textureFieldItem.addActionListener(this);
1112		- alignItem = menu.add(new MenuItem("Align"));
	1271	+ alignItem = menu.add(new MenuItem("Align Objects"));
1113	1272	alignItem.addActionListener(this);
1114		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1115		- mirrorItem.addActionListener(this);
1116	1273	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1117	1274	reduceMorphItem.addActionListener(this);
1118	1275	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1119	1276	reduce34MorphItem.addActionListener(this);
1120		-
	1277	+ menu.add("-");
1121	1278	menu.add(computeAOItem = new MenuItem("Compute AO"));
1122	1279	computeAOItem.addActionListener(this);
1123		- menu.add("-");
1124	1280
	1281	+ if (Globals.ADVANCED)
	1282	+ {
	1283	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1284	+ mirrorItem.addActionListener(this);
	1285	+ menu.add("-");
1125	1286	menu.add(memoryItem = new MenuItem("Memory Usage"));
1126	1287	memoryItem.addActionListener(this);
1127	1288	menu.add(analyzeItem = new MenuItem("Analyze"));
1128	1289	analyzeItem.addActionListener(this);
1129		- menu.add(dumpItem = new MenuItem("Dump"));
	1290	+ menu.add(dumpItem = new MenuItem("Print"));
1130	1291	dumpItem.addActionListener(this);
1131	1292	// menu.add(pathItem = new MenuItem("From-to path"));
1132	1293	// pathItem.addActionListener(this);
..	..	@@ -1144,6 +1305,7 @@
1144	1305	menu.add("-");
1145	1306	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1146	1307	editScriptItem.addActionListener(this);
	1308	+ }
1147	1309	}
1148	1310
1149	1311	void ScreenFit()
..	..	@@ -1472,9 +1634,9 @@
1472	1634
1473	1635	void Overwrite(int mask)
1474	1636	{
1475		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1637	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1476	1638	{
1477		- Object3D content = GrafreeD.clipboard.get(0);
	1639	+ Object3D content = Grafreed.clipboard.get(0);
1478	1640
1479	1641	if (content instanceof cGroup && ((cGroup)content).transientlink )
1480	1642	content = ((cGroup)content).get(0);
..	..	@@ -1645,7 +1807,7 @@
1645	1807	{
1646	1808	makeSomething(new BezierSurface());
1647	1809	} else
1648		- if (source == checkerItem)
	1810	+ if (source == overlayItem)
1649	1811	{
1650	1812	/*
1651	1813	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1779,23 +1941,6 @@
1779	1941	csg.addChild(child);
1780	1942	child.addChild(csg);
1781	1943	} 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	1944	if (source == computeAOItem)
1800	1945	{
1801	1946	Globals.drawMode = CameraPane.OCCLUSION;
..	..	@@ -1814,7 +1959,7 @@
1814	1959	if (source == invariantsItem)
1815	1960	{
1816	1961	System.out.println("Invariants:");
1817		- GrafreeD.grafreeD.universe.invariants();
	1962	+ Grafreed.grafreeD.universe.invariants();
1818	1963	} else
1819	1964	if (source == memoryItem)
1820	1965	{
..	..	@@ -1832,6 +1977,23 @@
1832	1977	if (source == dumpItem)
1833	1978	{
1834	1979	DumpObject();
	1980	+ } else
	1981	+ if (source == undoButton)
	1982	+ {
	1983	+ Undo();
	1984	+ } else
	1985	+ if (source == redoButton)
	1986	+ {
	1987	+ Redo();
	1988	+ } else
	1989	+ if (source == saveButton)
	1990	+ {
	1991	+ Save();
	1992	+ } else
	1993	+ if (source == oneStepButton)
	1994	+ {
	1995	+ Globals.ONESTEP = true;
	1996	+ cameraView.repaint();
1835	1997	} else
1836	1998	if (source == screenfitButton)
1837	1999	{
..	..	@@ -1882,12 +2044,20 @@
1882	2044	{
1883	2045	loadClipboard(true);
1884	2046	} else
	2047	+ if (source == undoItem)
	2048	+ {
	2049	+ Undo();
	2050	+ } else
	2051	+ if (source == redoItem)
	2052	+ {
	2053	+ Redo();
	2054	+ } else
1885	2055	if (source == duplicateItem)
1886	2056	{
1887		- Object3D keep = GrafreeD.clipboard;
	2057	+ Object3D keep = Grafreed.clipboard;
1888	2058	loadClipboard(false);
1889	2059	paste(false);
1890		- GrafreeD.clipboard = keep;
	2060	+ Grafreed.clipboard = keep;
1891	2061	} else
1892	2062	if (source == cloneItem)
1893	2063	{
..	..	@@ -1905,13 +2075,17 @@
1905	2075	{
1906	2076	paste(false);
1907	2077	} else
	2078	+ if (source == pasteIntoItem)
	2079	+ {
	2080	+ pasteInto(true, false);
	2081	+ } else
1908	2082	if (source == pasteLinkItem)
1909	2083	{
1910		- pasteInto(false);
	2084	+ pasteInto(false, false);
1911	2085	} else
1912	2086	if (source == pasteCloneItem)
1913	2087	{
1914		- pasteInto(true);
	2088	+ pasteInto(true, true);
1915	2089	} else
1916	2090	if (source == pasteExpandItem)
1917	2091	{
..	..	@@ -2103,9 +2277,9 @@
2103	2277	// group.selection.get(0).setMasterThis(content); // should be identity
2104	2278	// refreshContents();
2105	2279	// }
2106		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2280	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2107	2281	{
2108		- Object3D content = GrafreeD.clipboard.get(0);
	2282	+ Object3D content = Grafreed.clipboard.get(0);
2109	2283
2110	2284	if (content instanceof cGroup && ((cGroup)content).transientlink )
2111	2285	content = ((cGroup)content).get(0);
..	..	@@ -2113,11 +2287,11 @@
2113	2287	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2114	2288	for (int i=0; i<group.selection.size(); i++)
2115	2289	{
2116		- boolean random = CameraPane.RANDOM;
2117		- CameraPane.RANDOM = false; // parse all random nodes
	2290	+ boolean random = CameraPane.SWITCH;
	2291	+ CameraPane.SWITCH = false; // parse all random nodes
2118	2292	group.selection.get(i).linkVerticesThis(content);
2119	2293	// group.selection.get(i).setMasterThis(content); // should be identity
2120		- CameraPane.RANDOM = random;
	2294	+ CameraPane.SWITCH = random;
2121	2295	}
2122	2296	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2123	2297	refreshContents();
..	..	@@ -2127,20 +2301,20 @@
2127	2301	{
2128	2302	for (int i=0; i<group.selection.size(); i++)
2129	2303	{
2130		- boolean random = CameraPane.RANDOM;
2131		- CameraPane.RANDOM = false; // parse all random nodes
	2304	+ boolean random = CameraPane.SWITCH;
	2305	+ CameraPane.SWITCH = false; // parse all random nodes
2132	2306	group.selection.get(i).linkVerticesThis(null);
2133		- CameraPane.RANDOM = random;
	2307	+ CameraPane.SWITCH = random;
2134	2308	}
2135	2309
2136	2310	refreshContents();
2137	2311	} else
2138	2312	if (source == relinkverticesItem)
2139	2313	{
2140		- boolean random = CameraPane.RANDOM;
2141		- CameraPane.RANDOM = false; // parse all random nodes
	2314	+ boolean random = CameraPane.SWITCH;
	2315	+ CameraPane.SWITCH = false; // parse all random nodes
2142	2316	group.selection.RelinkToSupport();
2143		- CameraPane.RANDOM = random;
	2317	+ CameraPane.SWITCH = random;
2144	2318
2145	2319	refreshContents();
2146	2320	} else
..	..	@@ -2155,9 +2329,9 @@
2155	2329	} else
2156	2330	if (source == setMasterItem)
2157	2331	{
2158		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2332	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2159	2333	{
2160		- Object3D content = GrafreeD.clipboard.get(0);
	2334	+ Object3D content = Grafreed.clipboard.get(0);
2161	2335
2162	2336	if (content instanceof cGroup && ((cGroup)content).transientlink )
2163	2337	content = ((cGroup)content).get(0);
..	..	@@ -2170,9 +2344,9 @@
2170	2344	{
2171	2345	if (group.selection.size() == 1)
2172	2346	{
2173		- if (GrafreeD.clipboard.size() == 1)
	2347	+ if (Grafreed.clipboard.size() == 1)
2174	2348	{
2175		- Object3D content = GrafreeD.clipboard.get(0);
	2349	+ Object3D content = Grafreed.clipboard.get(0);
2176	2350
2177	2351	if (content instanceof cGroup && ((cGroup)content).transientlink )
2178	2352	content = ((cGroup)content).get(0);
..	..	@@ -2189,7 +2363,7 @@
2189	2363	{
2190	2364	RevertMeshes();
2191	2365	} else
2192		- if (source == resetMeshItem)
	2366	+ if (source == resetAllItem)
2193	2367	{
2194	2368	ResetAll();
2195	2369	} else
..	..	@@ -2238,7 +2412,7 @@
2238	2412	RandomNode random = new RandomNode();
2239	2413	group(random);
2240	2414	if (random.size() > 0)
2241		- random.name = random.get(0).name + "Rnd";
	2415	+ random.name = random.get(0).name + "Switch";
2242	2416	} else
2243	2417	if (source == physicsItem)
2244	2418	{
..	..	@@ -2377,7 +2551,7 @@
2377	2551	} else
2378	2552	if (source == genNormalsMESHItem)
2379	2553	{
2380		- GenNormals(true); // TODO
	2554	+ GenNormalsMESH();
2381	2555	} else
2382	2556	if (source == genNormalsORGANItem)
2383	2557	{
..	..	@@ -2442,6 +2616,22 @@
2442	2616	if (source == unmarkleavesItem)
2443	2617	{
2444	2618	MarkLeaves(false);
	2619	+ } else
	2620	+ if (source == rewindleavesItem)
	2621	+ {
	2622	+ RewindLeaves(true);
	2623	+ } else
	2624	+ if (source == unrewindleavesItem)
	2625	+ {
	2626	+ RewindLeaves(false);
	2627	+ } else
	2628	+ if (source == randomleavesItem)
	2629	+ {
	2630	+ RandomLeaves(true);
	2631	+ } else
	2632	+ if (source == unrandomleavesItem)
	2633	+ {
	2634	+ RandomLeaves(false);
2445	2635	} else
2446	2636	if (source == flipVItem)
2447	2637	{
..	..	@@ -2527,9 +2717,13 @@
2527	2717	{
2528	2718	SmoothMesh();
2529	2719	} else
2530		- if (source == transformgeometryItem)
	2720	+ if (source == transformGeometryItem)
2531	2721	{
2532	2722	TransformGeometry();
	2723	+ } else
	2724	+ if (source == transformChildrenItem)
	2725	+ {
	2726	+ TransformChildren();
2533	2727	} else
2534	2728	if (source == resetTransformItem)
2535	2729	{
..	..	@@ -2537,7 +2731,11 @@
2537	2731	} else
2538	2732	if (source == resetCentroidItem)
2539	2733	{
2540		- ResetCentroid();
	2734	+ ResetCentroid(true);
	2735	+ } else
	2736	+ if (source == resetCentroidXZItem)
	2737	+ {
	2738	+ ResetCentroid(false);
2541	2739	} else
2542	2740	if (source == resetParentItem)
2543	2741	{
..	..	@@ -2893,9 +3091,9 @@
2893	3091	child.CloseUI();
2894	3092	listUI.remove(child);
2895	3093
2896		- child.editWindow = null; // ???????????
	3094	+ //child.editWindow = null; // ???????????
2897	3095	}
2898		- objEditor.ctrlPanel.validate();
	3096	+ objEditor.ctrlPanel.FlushUI();
2899	3097	//objEditor.jTree.clearSelection();
2900	3098	//objEditor.ResetSliders();
2901	3099	refreshContents(true);
..	..	@@ -2979,7 +3177,10 @@
2979	3177	frontView.object = group;
2980	3178	sideView.object = group;
2981	3179	}
	3180	+
	3181	+// fix "+" issue
2982	3182	group.editWindow = this;
	3183	+
2983	3184	/*
2984	3185	currentLayout = radio.layout;
2985	3186	if (currentLayout == null)
..	..	@@ -2992,7 +3193,20 @@
2992	3193	//group.attributes = -1;
2993	3194	ResetModel();
2994	3195	refreshContents(true);
2995		- }
	3196	+ } else if (event.getSource() == editCameraItem)
	3197	+ {
	3198	+ cameraView.ProtectCamera();
	3199	+ cameraView.repaint();
	3200	+ return;
	3201	+ } else if (event.getSource() == revertCameraItem)
	3202	+ {
	3203	+ cameraView.RevertCamera();
	3204	+ cameraView.repaint();
	3205	+ return;
	3206	+ // } else if (event.getSource() == textureButton)
	3207	+ // {
	3208	+ // return; // true;
	3209	+ }
2996	3210	else
2997	3211	{
2998	3212	//return super.action(event, arg);
..	..	@@ -3053,6 +3267,28 @@
3053	3267	refreshContents();
3054	3268	}
3055	3269
	3270	+ void TransformChildren()
	3271	+ {
	3272	+ Object3D obj;
	3273	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3274	+ {
	3275	+ obj = (Object3D)e.nextElement();
	3276	+ obj.KeepTextureMatrices();
	3277	+ obj.TransformChildren();
	3278	+ obj.RestoreTextureMatrices();
	3279	+
	3280	+// if (obj.parent == null)
	3281	+// {
	3282	+// System.out.println("NULL PARENT!");
	3283	+// new Exception().printStackTrace();
	3284	+// }
	3285	+// else
	3286	+// TouchTransform(obj);
	3287	+// //obj.parent.Touch();
	3288	+ }
	3289	+
	3290	+ refreshContents();
	3291	+ }
3056	3292
3057	3293	void ResetTransform()
3058	3294	{
..	..	@@ -3165,7 +3401,7 @@
3165	3401	refreshContents();
3166	3402	}
3167	3403
3168		- void ResetCentroid()
	3404	+ void ResetCentroid(boolean full)
3169	3405	{
3170	3406	Object3D obj;
3171	3407	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3180,12 +3416,16 @@
3180	3416	LA.matIdentity(Object3D.mat);
3181	3417	obj.getBounds(minima, maxima, false);
3182	3418	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3183		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3419	+ if (full)
	3420	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3184	3421	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3185	3422	obj.TransformMesh(Object3D.mat);
	3423	+
3186	3424	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3187		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3425	+ if (full)
	3426	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3188	3427	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3428	+
3189	3429	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3190	3430	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3191	3431	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3214,7 +3454,8 @@
3214	3454
3215	3455	int size = obj.MemorySize();
3216	3456
3217		- System.err.println((size/1024) + " KB is the size of " + obj);
	3457	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3458	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3218	3459	}
3219	3460	}
3220	3461	catch (Exception e)
..	..	@@ -3251,9 +3492,9 @@
3251	3492	obj = (Object3D)e.nextElement();
3252	3493
3253	3494	System.out.println("Object is: " + obj);
3254		- GrafreeD.AnalyzeObject(obj);
	3495	+ Grafreed.AnalyzeObject(obj);
3255	3496	System.out.println("Boundary rep: " + obj.bRep);
3256		- GrafreeD.AnalyzeObject(obj.bRep);
	3497	+ Grafreed.AnalyzeObject(obj.bRep);
3257	3498
3258	3499	// System.err.println((size/1024) + " KB is the size of " + obj);
3259	3500	}
..	..	@@ -3295,6 +3536,13 @@
3295	3536	void GenNormals(boolean crease)
3296	3537	{
3297	3538	group.GenNormalsS(crease);
	3539	+
	3540	+ refreshContents();
	3541	+ }
	3542	+
	3543	+ void GenNormalsMESH()
	3544	+ {
	3545	+ group.GenNormalsMeshS();
3298	3546
3299	3547	refreshContents();
3300	3548	}
..	..	@@ -3467,8 +3715,8 @@
3467	3715
3468	3716	void ParseVertices()
3469	3717	{
3470		- boolean epsequal = GrafreeD.epsequal;
3471		- GrafreeD.epsequal = true;
	3718	+ boolean epsequal = Grafreed.epsequal;
	3719	+ Grafreed.epsequal = true;
3472	3720
3473	3721	for (int i=0; i<group.selection.size(); i++)
3474	3722	{
..	..	@@ -3493,7 +3741,7 @@
3493	3741	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3494	3742	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3495	3743
3496		- g.add(GrafreeD.clipboard);
	3744	+ g.add(Grafreed.clipboard);
3497	3745
3498	3746	buffer.add(g);
3499	3747	}
..	..	@@ -3508,7 +3756,7 @@
3508	3756	makeSomething(buffer, i==group.selection.size()-1);
3509	3757	}
3510	3758
3511		- GrafreeD.epsequal = epsequal;
	3759	+ Grafreed.epsequal = epsequal;
3512	3760
3513	3761	refreshContents();
3514	3762	}
..	..	@@ -3526,7 +3774,16 @@
3526	3774	String pigment = Object3D.GetPigment(tex);
3527	3775	//String bump = Object3D.GetBump(tex);
3528	3776
3529		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3777	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	3778	+
	3779	+ try
	3780	+ {
	3781	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3782	+ }
	3783	+ catch (Exception e)
	3784	+ {
	3785	+ System.err.println("FAIL: " + node);
	3786	+ }
3530	3787
3531	3788	double s = v.s;
3532	3789
..	..	@@ -3614,11 +3871,11 @@
3614	3871
3615	3872	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3616	3873
3617		- boolean random = CameraPane.RANDOM;
3618		- CameraPane.RANDOM = false; // parse all random nodes
	3874	+ boolean random = CameraPane.SWITCH;
	3875	+ CameraPane.SWITCH = false; // parse all random nodes
3619	3876	lowres.linkVerticesThis(null);
3620	3877	lowres.linkVerticesThis(sn);
3621		- CameraPane.RANDOM = random;
	3878	+ CameraPane.SWITCH = random;
3622	3879
3623	3880	System.err.flush();
3624	3881
..	..	@@ -3658,7 +3915,7 @@
3658	3915	return;
3659	3916
3660	3917	Object3D poses = group.selection.get(0);
3661		- Object3D ref = GrafreeD.clipboard.get(0);
	3918	+ Object3D ref = Grafreed.clipboard.get(0);
3662	3919
3663	3920	Object3D newgroup = new Object3D("Po:" + poses.name);
3664	3921
..	..	@@ -3852,9 +4109,9 @@
3852	4109
3853	4110	void ClipMesh()
3854	4111	{
3855		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4112	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3856	4113	{
3857		- Object3D content = GrafreeD.clipboard.get(0);
	4114	+ Object3D content = Grafreed.clipboard.get(0);
3858	4115
3859	4116	if (content instanceof cGroup && ((cGroup)content).transientlink )
3860	4117	content = ((cGroup)content).get(0);
..	..	@@ -3863,7 +4120,7 @@
3863	4120	// {
3864	4121	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3865	4122	// }
3866		- group.selection.ClipMesh(GrafreeD.clipboard);
	4123	+ group.selection.ClipMesh(Grafreed.clipboard);
3867	4124	}
3868	4125	// group.selection.ClipMesh(GrafreeD.clipboard);
3869	4126	System.out.println("DONE.");
..	..	@@ -3910,6 +4167,18 @@
3910	4167	void MarkLeaves(boolean hide)
3911	4168	{
3912	4169	group.selection.MarkLeaves(hide);
	4170	+ refreshContents();
	4171	+ }
	4172	+
	4173	+ void RewindLeaves(boolean hide)
	4174	+ {
	4175	+ group.selection.RewindLeaves(hide);
	4176	+ refreshContents();
	4177	+ }
	4178	+
	4179	+ void RandomLeaves(boolean hide)
	4180	+ {
	4181	+ group.selection.RandomLeaves(hide);
3913	4182	refreshContents();
3914	4183	}
3915	4184
..	..	@@ -3998,7 +4267,7 @@
3998	4267	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3999	4268
4000	4269	Object3D elem = (Object3D)group.selection.elementAt(i);
4001		- if(elem != group)
	4270	+ if(elem != group \|\| !newWindow)
4002	4271	{
4003	4272	// if (!(elem instanceof Composite))
4004	4273	// newWindow = false;
..	..	@@ -4088,7 +4357,6 @@
4088	4357	//case 702: // Event.LIST_DESELECT
4089	4358	group.deselectAll();
4090	4359	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4091		- objEditor.ClearInfo(); // .GetMaterial());
4092	4360	if (tps != null)
4093	4361	{
4094	4362	for (int i=0; i < tps.length; i++)
..	..	@@ -4097,10 +4365,8 @@
4097	4365
4098	4366	//if (child.parent != null)
4099	4367	//child.parent.addSelectee(child);
	4368	+ objEditor.SetMaterial(child);
4100	4369	group.addSelectee(child);
4101		- objEditor.SetMaterial(child); // .GetMaterial());
4102		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4103		- System.err.println("info : " + child.GetPath());
4104	4370	}
4105	4371	}
4106	4372	// else
..	..	@@ -4110,16 +4376,17 @@
4110	4376	// System.err.println("info : " + group.GetPath());
4111	4377	// }
4112	4378
4113		- objEditor.SetText(); // jan 2014
4114		-
4115		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4379	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4116	4380	CameraPane.flash = true;
4117	4381
4118		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4382	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4119	4383	// a camera
4120	4384	{
4121		- CameraPane.camerachangeframe = 0; // don't refuse it
4122		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4385	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4386	+ {
	4387	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4388	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4389	+ }
4123	4390	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4124	4391	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4125	4392	}
..	..	@@ -4132,6 +4399,26 @@
4132	4399
4133	4400	freezemodel = false;
4134	4401	}
	4402	+
	4403	+ void refreshContents(boolean cp)
	4404	+ {
	4405	+ if (!Globals.MOUSEDRAGGED)
	4406	+ {
	4407	+ objEditor.ClearInfo(); // .GetMaterial());
	4408	+
	4409	+ for (int i=0; i < group.selection.Size(); i++)
	4410	+ {
	4411	+ Object3D child = (Object3D) group.selection.get(i);
	4412	+
	4413	+ objEditor.AddInfo(child, this, true);
	4414	+ System.err.println("info : " + child.GetPath());
	4415	+ }
	4416	+
	4417	+ objEditor.SetText(); // jan 2014
	4418	+ }
	4419	+
	4420	+ super.refreshContents(cp);
	4421	+ }
4135	4422
4136	4423	void linkSomething(Object3D thing)
4137	4424	{
..	..	@@ -4203,16 +4490,18 @@
4203	4490	{
4204	4491	if (group.selection.isEmpty())
4205	4492	return;
4206		- GrafreeD.clipboardIsTempGroup = false;
	4493	+
	4494	+ Grafreed.clipboardIsTempGroup = false;
4207	4495	Composite tGroup = null;
4208	4496	if (group.selection.size() > 0) // 1)
4209	4497	{
4210	4498	tGroup = new cGroup();
4211		- GrafreeD.clipboardIsTempGroup = true;
	4499	+ Grafreed.clipboardIsTempGroup = true;
4212	4500	}
4213	4501
4214	4502	if (cut)
4215	4503	{
	4504	+ Save();
4216	4505	//int indices[] = jList.getSelectedIndices();
4217	4506	//for (int i = indices.length - 1; i >= 0; i--)
4218	4507	//jList.remove(indices[i]);
..	..	@@ -4248,16 +4537,16 @@
4248	4537	//System.out.println("cut " + child);
4249	4538	//System.out.println("parent = " + child.parent);
4250	4539	// tmp.addChild(child);
4251		- if (GrafreeD.clipboardIsTempGroup)
	4540	+ if (Grafreed.clipboardIsTempGroup)
4252	4541	tGroup.add/Child/(tmp);
4253	4542	else
4254		- GrafreeD.clipboard = tmp;
	4543	+ Grafreed.clipboard = tmp;
4255	4544	}
4256	4545	else
4257		- if (GrafreeD.clipboardIsTempGroup)
	4546	+ if (Grafreed.clipboardIsTempGroup)
4258	4547	tGroup.add/Child/(child);
4259	4548	else
4260		- GrafreeD.clipboard = child;
	4549	+ Grafreed.clipboard = child;
4261	4550	}
4262	4551
4263	4552	//ResetModel();
..	..	@@ -4289,21 +4578,23 @@
4289	4578	//System.out.println("cut " + elem);
4290	4579	//System.out.println("parent = " + elem.parent);
4291	4580	// tmp.addChild(elem);
4292		- if (GrafreeD.clipboardIsTempGroup)
	4581	+ if (Grafreed.clipboardIsTempGroup)
4293	4582	tGroup.add/Child/(tmp);
4294	4583	else
4295		- GrafreeD.clipboard = tmp;
	4584	+ Grafreed.clipboard = tmp;
4296	4585	}
4297	4586	else
4298		- if (GrafreeD.clipboardIsTempGroup)
	4587	+ if (Grafreed.clipboardIsTempGroup)
4299	4588	tGroup.add/Child/(child);
4300	4589	else
4301		- GrafreeD.clipboard = child;
	4590	+ Grafreed.clipboard = child;
4302	4591	}
4303	4592
4304	4593	}
4305		- if (GrafreeD.clipboardIsTempGroup)
4306		- GrafreeD.clipboard = tGroup;
	4594	+
	4595	+ if (Grafreed.clipboardIsTempGroup)
	4596	+ Grafreed.clipboard = tGroup;
	4597	+
4307	4598	if (cut)
4308	4599	{
4309	4600	ResetModel();
..	..	@@ -4317,7 +4608,7 @@
4317	4608	// return;
4318	4609	boolean first = true;
4319	4610
4320		- if (GrafreeD.clipboardIsTempGroup)
	4611	+ if (Grafreed.clipboardIsTempGroup)
4321	4612	{
4322	4613	Composite temp;
4323	4614
..	..	@@ -4328,7 +4619,7 @@
4328	4619	temp = (Composite)Applet3D.clipboard.deepCopy();
4329	4620	*/
4330	4621	Object3D elem;
4331		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4622	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4332	4623	{
4333	4624	Object3D child = (Object3D)e.nextElement();
4334	4625
..	..	@@ -4362,21 +4653,21 @@
4362	4653	//Object3D cb = Applet3D.clipboard;
4363	4654	//temp.addChild(cb);
4364	4655	//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());
	4656	+ assert(Grafreed.clipboard.parent == null);
	4657	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4658	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4659	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4660	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4370	4661	else
4371		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4372		- GrafreeD.clipboard.get(0).parent = keepparent;
	4662	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4663	+ Grafreed.clipboard.get(0).parent = keepparent;
4373	4664	}
4374	4665
4375	4666	ResetModel();
4376	4667	refreshContents();
4377	4668	}
4378	4669
4379		- void pasteInto(boolean copyit)
	4670	+ void pasteInto(boolean copyit, boolean clone)
4380	4671	{
4381	4672	// if (GrafreeD.clipboard == null)
4382	4673	// return;
..	..	@@ -4405,15 +4696,22 @@
4405	4696	if (copyit)
4406	4697	{
4407	4698	// paste(false);
4408		- CloneClipboard(false); // sept 2014
	4699	+ if (clone)
	4700	+ {
	4701	+ CloneClipboard(false); // sept 2014
	4702	+ }
	4703	+ else
	4704	+ {
	4705	+ paste(false);
	4706	+ }
4409	4707	}
4410	4708	else
4411	4709	{
4412	4710	boolean first = true;
4413	4711
4414		- if (GrafreeD.clipboardIsTempGroup)
	4712	+ if (Grafreed.clipboardIsTempGroup)
4415	4713	{
4416		- Composite temp = (Composite)GrafreeD.clipboard;
	4714	+ Composite temp = (Composite)Grafreed.clipboard;
4417	4715	Object3D copy;
4418	4716	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4419	4717	{
..	..	@@ -4423,7 +4721,7 @@
4423	4721	}
4424	4722	} else
4425	4723	{
4426		- linkSomething(GrafreeD.clipboard); //.get(0));
	4724	+ linkSomething(Grafreed.clipboard); //.get(0));
4427	4725	}
4428	4726	}
4429	4727	}
..	..	@@ -4828,21 +5126,6 @@
4828	5126	}
4829	5127	*/
4830	5128
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	5129	/*
4847	5130	public void Callback(Object obj)
4848	5131	{
..	..	@@ -4866,26 +5149,9 @@
4866	5149	}
4867	5150	*/
4868	5151
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	5152	String GetFile(String dialogName)
4887	5153	{
4888		- if (GrafreeD.standAlone)
	5154	+ if (Grafreed.standAlone)
4889	5155	{
4890	5156	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4891	5157	browser.show();
..	..	@@ -4949,10 +5215,15 @@
4949	5215	cButton flashSelectionButton;
4950	5216	cButton editButton;
4951	5217	cButton uneditButton;
	5218	+ JCheckBox allParamsButton;
4952	5219	cButton clearpanelButton;
4953		- cButton allParamsButton;
4954	5220	cButton unselectButton;
4955	5221
	5222	+ cButton saveButton;
	5223	+ cButton undoButton;
	5224	+ cButton redoButton;
	5225	+ cButton oneStepButton;
	5226	+
4956	5227	cButton screenfitButton;
4957	5228	cButton screenfitpointButton;
4958	5229	cButton snapobjectButton;
..	..	@@ -4983,6 +5254,8 @@
4983	5254	private MenuItem lookFromItem;
4984	5255	private MenuItem switchItem;
4985	5256	private MenuItem cutItem;
	5257	+ private MenuItem undoItem;
	5258	+ private MenuItem redoItem;
4986	5259	private MenuItem duplicateItem;
4987	5260	private MenuItem cloneItem;
4988	5261	private MenuItem cloneSupportItem;
..	..	@@ -4996,7 +5269,7 @@
4996	5269	private MenuItem linkverticesItem;
4997	5270	private MenuItem relinkverticesItem;
4998	5271	private MenuItem setMasterItem;
4999		- private MenuItem resetMeshItem;
	5272	+ private MenuItem resetAllItem;
5000	5273	private MenuItem stepAllItem;
5001	5274	private MenuItem revertMeshItem;
5002	5275	private MenuItem poseMeshItem;
..	..	@@ -5007,6 +5280,7 @@
5007	5280	private MenuItem mergeGeometriesItem;
5008	5281	private MenuItem copyItem;
5009	5282	private MenuItem pasteItem;
	5283	+ private MenuItem pasteIntoItem;
5010	5284	private MenuItem pasteLinkItem;
5011	5285	private MenuItem pasteCloneItem;
5012	5286	private MenuItem pasteExpandItem;
..	..	@@ -5045,6 +5319,10 @@
5045	5319	private MenuItem showleavesItem;
5046	5320	private MenuItem markleavesItem;
5047	5321	private MenuItem unmarkleavesItem;
	5322	+ private MenuItem rewindleavesItem;
	5323	+ private MenuItem unrewindleavesItem;
	5324	+ private MenuItem randomleavesItem;
	5325	+ private MenuItem unrandomleavesItem;
5048	5326
5049	5327	private MenuItem flipVItem;
5050	5328	private MenuItem unflipVItem;
..	..	@@ -5056,8 +5334,10 @@
5056	5334	private MenuItem panoTexturesItem;
5057	5335
5058	5336	private MenuItem resetCentroidItem;
5059		- private MenuItem transformgeometryItem;
	5337	+ private MenuItem resetCentroidXZItem;
5060	5338	private MenuItem resetTransformItem;
	5339	+ private MenuItem transformGeometryItem;
	5340	+ private MenuItem transformChildrenItem;
5061	5341	private MenuItem hideItem;
5062	5342	private MenuItem grabItem;
5063	5343	private MenuItem backItem;
..	..	@@ -5104,7 +5384,7 @@
5104	5384	private MenuItem blobItem;
5105	5385	private MenuItem latheItem;
5106	5386	private MenuItem bezierItem;
5107		- private MenuItem checkerItem;
	5387	+ private MenuItem overlayItem;
5108	5388	private MenuItem meshItem;
5109	5389	// private MenuItem meshGroupItem;
5110	5390	private MenuItem springItem;
..	..	@@ -5126,11 +5406,6 @@
5126	5406	private MenuItem doubleItem;
5127	5407	private MenuItem tripleItem;
5128	5408
5129		- private MenuItem importGFDItem;
5130		- private MenuItem importVRMLX3DItem;
5131		- private MenuItem import3DSItem;
5132		- private MenuItem importOBJItem;
5133		-
5134	5409	private MenuItem computeAOItem;
5135	5410	private MenuItem recompileItem;
5136	5411	private MenuItem editScriptItem;
..	..	@@ -5140,4 +5415,8 @@
5140	5415	private MenuItem analyzeItem;
5141	5416	private MenuItem dumpItem;
5142	5417	//boolean freezemodel = false;
	5418	+
	5419	+ Menu cameraMenu;
	5420	+ MenuItem editCameraItem;
	5421	+ MenuItem revertCameraItem;
5143	5422	}