~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,129 @@
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	+ undoItem = menu.add(new MenuItem("Undo"));
	158	+ undoItem.addActionListener(this);
	159	+ redoItem = menu.add(new MenuItem("Redo"));
	160	+ redoItem.addActionListener(this);
	161	+ menu.add("-");
	162	+ duplicateItem = menu.add(new MenuItem("Duplicate"));
	163	+ duplicateItem.addActionListener(this);
	164	+ cloneItem = menu.add(new MenuItem("Clone"));
	165	+ cloneItem.addActionListener(this);
	166	+ if (Globals.ADVANCED)
	167	+ {
	168	+ cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
	169	+ cloneSupportItem.addActionListener(this);
	170	+ }
	171	+ menu.add("-");
	172	+ cutItem = menu.add(new MenuItem("Cut"));
	173	+ cutItem.addActionListener(this);
	174	+ copyItem = menu.add(new MenuItem("Copy"));
	175	+ copyItem.addActionListener(this);
	176	+ pasteItem = menu.add(new MenuItem("Paste"));
	177	+ pasteItem.addActionListener(this);
	178	+ menu.add("-");
	179	+
	180	+ menu.add("-");
	181	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	182	+ pasteIntoItem.addActionListener(this);
	183	+ pasteLinkItem = menu.add(new MenuItem("Paste link"));
	184	+ pasteLinkItem.addActionListener(this);
	185	+ pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	186	+ pasteCloneItem.addActionListener(this);
	187	+// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	188	+// pasteExpandItem.addActionListener(this);
	189	+ menu.add("-");
	190	+ clearItem = menu.add(new MenuItem("Clear"));
	191	+ clearItem.addActionListener(this);
	192	+
	193	+ if (Globals.ADVANCED)
	194	+ {
	195	+ // Deletes the cameras...
	196	+ clearAllItem = menu.add(new MenuItem("Clear All"));
	197	+ clearAllItem.addActionListener(this);
	198	+ }
	199	+
	200	+ menuBar.add(cameraMenu = new Menu("View"));
	201	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	202	+ //zBufferItem.addActionListener(this);
	203	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	204	+ //normalLensItem.addActionListener(this);
	205	+ cameraMenu.add(revertCameraItem = new MenuItem("Restore Camera"));
	206	+ revertCameraItem.addActionListener(this);
	207	+
	208	+ cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	209	+ toggleFullScreenItem.addItemListener(this);
	210	+ toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	211	+ cameraMenu.add("-");
	212	+
	213	+ cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	214	+ toggleTextureItem.addItemListener(this);
	215	+ toggleTextureItem.setState(CameraPane.textureon);
	216	+
	217	+ cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	218	+ toggleSwitchItem.addItemListener(this);
	219	+ toggleSwitchItem.setState(CameraPane.SWITCH);
	220	+
	221	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	222	+ toggleHandleItem.addItemListener(this);
	223	+ toggleHandleItem.setState(CameraPane.HANDLES);
	224	+
	225	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	226	+ togglePaintItem.addItemListener(this);
	227	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	228	+
	229	+ if (Globals.ADVANCED)
	230	+ {
	231	+ cameraMenu.add("-");
	232	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	233	+ toggleLiveItem.addItemListener(this);
	234	+ toggleLiveItem.setState(Globals.isLIVE());
	235	+
	236	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	237	+ stepItem.addActionListener(this);
	238	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	239	+ // toggleDLItem.addItemListener(this);
	240	+ // toggleDLItem.setState(false);
	241	+
	242	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	243	+ toggleRenderItem.addItemListener(this);
	244	+ toggleRenderItem.setState(!CameraPane.frozen);
	245	+
	246	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	247	+ toggleDebugItem.addItemListener(this);
	248	+ toggleDebugItem.setState(CameraPane.DEBUG);
	249	+
	250	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	251	+ toggleFrustumItem.addItemListener(this);
	252	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	253	+
	254	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	255	+ toggleFootContactItem.addItemListener(this);
	256	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	257	+
	258	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	259	+ toggleTimelineItem.addItemListener(this);
	260	+ }
	261	+
	262	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	263	+// toggleRootItem.addItemListener(this);
	264	+// toggleRootItem.setState(false);
	265	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	266	+// animationItem.addItemListener(this);
	267	+// animationItem.setState(CameraPane.ANIMATION);
	268	+ cameraMenu.add("-");
	269	+ cameraMenu.add(editCameraItem = new MenuItem("Save Camera"));
	270	+ editCameraItem.addActionListener(this);
	271	+
	272	+ if (Globals.ADVANCED)
	273	+ {
153	274	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
154	275	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
155	276	//cameraMenu.add(switchItem = new MenuItem("Reverse View"));
..	..	@@ -161,45 +282,17 @@
161	282	lookAtItem.addActionListener(this);
162	283	//lookFromItem.addActinoListener(this);
163	284	//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		-
	285	+ }
	286	+
193	287	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);
	288	+ if (Globals.ADVANCED)
	289	+ {
198	290	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
199	291	revertMeshItem.addActionListener(this);
200	292	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
201	293	resetreferencesItem.addActionListener(this);
202	294	menu.add("-");
	295	+ }
203	296	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
204	297	overwriteGeoItem.addActionListener(this);
205	298	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -211,19 +304,26 @@
211	304	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
212	305	overwriteUVItem.addActionListener(this);
213	306	menu.add("-");
	307	+ if (Globals.ADVANCED)
	308	+ {
214	309	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
215	310	generateMeshItem.addActionListener(this);
216	311	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
217	312	poseMeshItem.addActionListener(this);
218	313	menu.add("-");
	314	+ }
219	315	resetsupportItem = menu.add(new MenuItem("Reset support"));
220	316	resetsupportItem.addActionListener(this);
221	317	linkverticesItem = menu.add(new MenuItem("Link to Support"));
222	318	linkverticesItem.addActionListener(this);
223	319	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
224	320	relinkverticesItem.addActionListener(this);
	321	+
	322	+ if (Globals.ADVANCED)
	323	+ {
225	324	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
226	325	setMasterItem.addActionListener(this);
	326	+ }
227	327
228	328	oe.menuBar.add(menu = new Menu("Group"));
229	329	grabItem = menu.add(new MenuItem("Grab"));
..	..	@@ -234,27 +334,32 @@
234	334	frontItem.addActionListener(this);
235	335	compositeItem = menu.add(new MenuItem("Composite"));
236	336	compositeItem.addActionListener(this);
237		- hideItem = menu.add(new MenuItem("Hide"));
	337	+ hideItem = menu.add(new MenuItem("Hidden Group"));
238	338	hideItem.addActionListener(this);
239	339	ungroupItem = menu.add(new MenuItem("Ungroup"));
240	340	ungroupItem.addActionListener(this);
241	341	menu.add("-");
242		- randomItem = menu.add(new MenuItem("Random"));
	342	+ randomItem = menu.add(new MenuItem("Switch node"));
243	343	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	344	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
249	345	switchGeoItem.addActionListener(this);
250	346	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
251	347	switchTransfoItem.addActionListener(this);
252		- morphItem = menu.add(new MenuItem("Morph"));
	348	+ morphItem = menu.add(new MenuItem("Morph Group"));
253	349	morphItem.addActionListener(this);
	350	+
	351	+ if (Globals.ADVANCED)
	352	+ {
	353	+ menu.add("-");
	354	+ physicsItem = menu.add(new MenuItem("Physics"));
	355	+ physicsItem.addActionListener(this);
	356	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	357	+ frameselectorItem.addActionListener(this);
254	358	scriptNodeItem = menu.add(new MenuItem("Script Node"));
255	359	scriptNodeItem.addActionListener(this);
256	360	cameraItem = menu.add(new MenuItem("Camera"));
257	361	cameraItem.addActionListener(this);
	362	+ }
258	363
259	364	oe.menuBar.add(menu = new Menu("Object"));
260	365	textureItem = menu.add(new MenuItem("Texture"));
..	..	@@ -269,21 +374,29 @@
269	374	shadowYItem.addActionListener(this);
270	375	shadowZItem = menu.add(new MenuItem("Shadow Z"));
271	376	shadowZItem.addActionListener(this);
	377	+ if (Globals.ADVANCED)
	378	+ {
	379	+ menu.add("-");
272	380	linkerItem = menu.add(new MenuItem("Linker"));
273	381	linkerItem.addActionListener(this);
274		- templateItem = menu.add(new MenuItem("Template"));
275		- templateItem.addActionListener(this);
276	382	attributeItem = menu.add(new MenuItem("Attribute"));
277	383	attributeItem.addActionListener(this);
	384	+ templateItem = menu.add(new MenuItem("Template"));
	385	+ templateItem.addActionListener(this);
278	386	pointflowItem = menu.add(new MenuItem("Point Flow"));
279	387	pointflowItem.addActionListener(this);
	388	+ }
280	389	menu.add("-");
281	390	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
282	391	resetTransformItem.addActionListener(this);
283	392	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
284	393	resetCentroidItem.addActionListener(this);
285		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
286		- transformgeometryItem.addActionListener(this);
	394	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	395	+ resetCentroidXZItem.addActionListener(this);
	396	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	397	+ transformGeometryItem.addActionListener(this);
	398	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	399	+ transformChildrenItem.addActionListener(this);
287	400
288	401	oe.menuBar.add(menu = new Menu("Geometry"));
289	402	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -294,8 +407,11 @@
294	407	genNormalsCADItem.addActionListener(this);
295	408	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
296	409	genNormalsMESHItem.addActionListener(this);
	410	+ if (Globals.ADVANCED)
	411	+ {
297	412	genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
298	413	genNormalsMINEItem.addActionListener(this);
	414	+ }
299	415	stripifyItem = menu.add(new MenuItem("Stripify"));
300	416	stripifyItem.addActionListener(this);
301	417	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -317,23 +433,34 @@
317	433	reduce34MeshItem.addActionListener(this);
318	434	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
319	435	increaseMeshItem.addActionListener(this);
320		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
321		- smoothMeshItem.addActionListener(this);
322	436	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
323	437	clipMeshItem.addActionListener(this);
	438	+
	439	+ if (Globals.ADVANCED)
	440	+ {
	441	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	442	+ smoothMeshItem.addActionListener(this);
	443	+ }
324	444
325	445	oe.menuBar.add(menu = new Menu("Attributes"));
326	446	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
327	447	clearMaterialsItem.addActionListener(this);
	448	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	449	+ resetAllItem.addActionListener(this);
	450	+ stepAllItem = menu.add(new MenuItem("Step All"));
	451	+ stepAllItem.addActionListener(this);
328	452	menu.add("-");
329	453	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
330	454	liveleavesItem.addActionListener(this);
331	455	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
332	456	unliveleavesItem.addActionListener(this);
	457	+ if (Globals.ADVANCED)
	458	+ {
333	459	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
334	460	supportleavesItem.addActionListener(this);
335	461	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
336	462	unsupportleavesItem.addActionListener(this);
	463	+ }
337	464	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
338	465	hideleavesItem.addActionListener(this);
339	466	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -377,29 +504,22 @@
377	504	sortbynameItem = menu.add(new MenuItem("Sort by name"));
378	505	sortbynameItem.addActionListener(this);
379	506	menu.add("-");
	507	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	508	+ shareGeometriesItem.addActionListener(this);
	509	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	510	+ mergeGeometriesItem.addActionListener(this);
	511	+ if (Globals.ADVANCED)
	512	+ {
	513	+ // Pretty much the same as duplicate and clone.
380	514	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
381	515	extractGeometriesItem.addActionListener(this);
382	516	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
383	517	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);
	518	+ }
388	519
389	520	oe.menuBar.add(menu = new Menu("Insert"));
390	521	buildCreateMenu(menu);
391	522
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	523	oe.menuBar.add(menu = new Menu("Tools"));
404	524	buildToolsMenu(menu);
405	525	}
..	..	@@ -436,96 +556,96 @@
436	556	*/
437	557	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
438	558
439		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
440		- liveCB.setToolTipText("Enabled animation");
	559	+ oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	560	+ liveCB.setToolTipText("Enable animation");
441	561	liveCB.addItemListener(this);
442	562
443		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK), oe.aConstraints);
	563	+ oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	564	+ oneStepButton.setToolTipText("Animate one step forward");
	565	+ oneStepButton.addActionListener(this);
	566	+
	567	+ oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	568	+ fastCB.setToolTipText("Fast mode");
	569	+ fastCB.addItemListener(this);
	570	+
	571	+ oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
444	572	trackCB.setToolTipText("Enable tracking");
445	573	trackCB.addItemListener(this);
446	574
447		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	575	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
448	576	screenfitButton.setToolTipText("Screen fit");
449	577	screenfitButton.addActionListener(this);
450	578
451	579	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
452	580	// screenfitpointButton.addActionListener(this);
453		-// oe.aConstraints.gridx += 1;
454		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
455		- snapobjectButton.addActionListener(this);
456		- snapobjectButton.setToolTipText("Snap Object");
457		- oe.aConstraints.gridx += 1;
458	581
459		- //aConstraints.gridx = 0;
460		- //aConstraints.gridy += 1;
461		- oe.aConstraints.weighty = 0;
462		- oe.aConstraints.gridwidth = 1;
463		-
464		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	582	+ if (Globals.ADVANCED)
	583	+ {
	584	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	585	+ snapobjectButton.addActionListener(this);
	586	+ snapobjectButton.setToolTipText("Snap Object");
	587	+ }
	588	+
	589	+ oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
465	590	flashSelectionButton.setToolTipText("Show selection");
466	591	flashSelectionButton.addActionListener(this);
467	592
468	593	oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
469	594
470		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	595	+ oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
471	596	twoButton.setToolTipText("Show center view only");
472	597	twoButton.addActionListener(this);
473		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	598	+ oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
474	599	fourButton.addActionListener(this);
475	600	fourButton.setToolTipText("Show left panel only");
476		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	601	+ oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
477	602	sixButton.setToolTipText("2-column layout left");
478	603	sixButton.addActionListener(this);
479		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	604	+ oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
480	605	threeButton.setToolTipText("2-column layout right");
481	606	threeButton.addActionListener(this);
482		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	607	+ oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
483	608	sevenButton.setToolTipText("3-column layout");
484	609	sevenButton.addActionListener(this);
485	610	//
486	611
487		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
488		- rootButton.setToolTipText("Edit object in new tab");
	612	+ oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	613	+ rootButton.setToolTipText("Edit selection in new tab");
489	614	rootButton.addActionListener(this);
490		- oe.aConstraints.gridx += 1;
491		- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	615	+
	616	+ oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
492	617	closeButton.setToolTipText("Close tab");
493	618	closeButton.addActionListener(this);
494	619	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
495	620	//clearButton.addActionListener(this);
496		- oe.aConstraints.gridx += 1;
497	621
498		- oe.aConstraints.gridx = 1; //
499		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
	622	+ cGridBag commandsPanel = new cGridBag();
	623	+
	624	+ commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	625	+ editButton.setToolTipText("Edit selection");
500	626	editButton.addActionListener(this);
501		- oe.aConstraints.gridx += 1;
502		- oe.aConstraints.weighty = 0;
503		- oe.aConstraints.gridwidth = 1;
504	627
505		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	628	+ commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	629	+ uneditButton.setToolTipText("Unedit selection");
506	630	uneditButton.addActionListener(this);
507	631
508		- oe.aConstraints.gridx += 1;
509		- oe.aConstraints.weighty = 0;
510		- oe.aConstraints.gridwidth = 1;
511		-
512		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
513		- clearPanelButton.addActionListener(this);
514		-
515		- oe.aConstraints.gridx += 1;
516		- oe.aConstraints.weighty = 0;
517		- oe.aConstraints.gridwidth = 1;
518		-
519		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	632	+ commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	633	+ allParamsButton.setToolTipText("Edit all params");
520	634	allParamsButton.addActionListener(this);
521	635
522		- oe.aConstraints.gridx += 1;
523		- oe.aConstraints.weighty = 0;
524		- oe.aConstraints.gridwidth = 1;
525		-
526		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
	636	+ commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	637	+ clearPanelButton.setToolTipText("Clear edit panel");
	638	+ clearPanelButton.addActionListener(this);
	639	+
	640	+ commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	641	+ unselectButton.setToolTipText("Unselect");
527	642	unselectButton.addActionListener(this);
528	643
	644	+ commandsPanel.preferredHeight = 1;
	645	+
	646	+ oe.treePanel.add(commandsPanel);
	647	+ oe.treePanel.Return();
	648	+
529	649	// oe.aConstraints.gridx += 1;
530	650	// oe.aConstraints.weighty = 0;
531	651	// oe.aConstraints.gridwidth = 1;
..	..	@@ -537,40 +657,37 @@
537	657	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
538	658	// gcButton.addActionListener(this);
539	659
540		- oe.aConstraints.gridx = 0;
541		- oe.aConstraints.gridy += 1;
542		-
543		- //ctrlPanel.add(objList = new List(5, true));
544		- oe.aConstraints.gridwidth = 100;
545		- // oe.aConstraints.gridheight = 100;
546		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
547		- oe.aConstraints.gridheight = 1;
548		- oe.aConstraints.weighty = 0.5;
549		- oe.aConstraints.gridx = 0;
550		- JScrollPane jSP;
	660	+ cGridBag jSPPanel = new cGridBag();
	661	+
	662	+ JScrollPane jSP;
551	663	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
552		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	664	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
553	665	ResetModel();
554		- oe.aConstraints.weighty = 0.5;
555		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
556		- oe.aConstraints.gridy += 1;
557		- oe.aConstraints.gridwidth = 1;
	666	+
	667	+ oe.treePanel.add(jSPPanel);
	668	+ oe.treePanel.Return();
558	669
559		- oe.aConstraints.weighty = 0;
560		- oe.aConstraints.gridwidth = 2;
561		-
562		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
	670	+ cGridBag copyOptionsPanel = new cGridBag();
	671	+
	672	+ copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	673	+ colorCB.setToolTipText("Copy color when dropped");
563	674	colorCB.addItemListener(this);
564		- oe.aConstraints.gridx += 2;
565		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
	675	+
	676	+ copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	677	+ materialCB.setToolTipText("Copy material when dropped");
566	678	materialCB.addItemListener(this);
567		- oe.aConstraints.gridx += 2;
568		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
	679	+
	680	+ copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	681	+ textureCB.setToolTipText("Copy texture when dropped");
569	682	textureCB.addItemListener(this);
570	683
571		- oe.aConstraints.gridx = 0;
572		- oe.aConstraints.gridy += 1;
	684	+ copyOptionsPanel.preferredHeight = 1;
	685	+ oe.treePanel.add(copyOptionsPanel);
	686	+ oe.treePanel.Return();
573	687
	688	+// mainPanel.setDividerLocation(0.5); //1.0);
	689	+// mainPanel.setResizeWeight(0.5);
	690	+
574	691	//jList.addListSelectionListener(this);
575	692	oe.jTree.addTreeSelectionListener(this);
576	693	//jTree.setRootVisible(false);
..	..	@@ -595,43 +712,35 @@
595	712
596	713	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
597	714	{
598		- //constraints.gridx = 0;
599		- //constraints.gridy = 0;
600		- panel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
601		- fastCB.setToolTipText("Fast mode");
602		- fastCB.addItemListener(this);
603		- //constraints.gridy += 1;
604		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
605		- supportCB.setToolTipText("Enabled rigging");
606		- supportCB.addItemListener(this);
607		-
608		- // constraints.gridy += 1;
609		- // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
610		- // localCB.addItemListener(this);
611		-
612		- //constraints.gridy += 1;
613		- panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
614		- crowdCB.setToolTipText("Used for crowds");
615		- crowdCB.addItemListener(this);
616		-
617		- //constraints.gridy += 1;
618		- panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
619		- smoothCB.setToolTipText("Snapping delay");
620		- smoothCB.addItemListener(this);
621		-
622		- //constraints.gridy += 1;
623		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
624		- slowCB.setToolTipText("Smooth interpolation");
625		- slowCB.addItemListener(this);
626		- //constraints.gridy += 1;
627	715	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
628	716	boxCB.setToolTipText("Display bounding boxes");
629	717	boxCB.addItemListener(this);
630		- //constraints.gridy += 1;
	718	+
631	719	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
632	720	zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
633	721	zoomBoxCB.addItemListener(this);
634	722
	723	+ if (true) // Globals.ADVANCED)
	724	+ {
	725	+ panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	726	+ supportCB.setToolTipText("Enable rigging");
	727	+ supportCB.addItemListener(this);
	728	+
	729	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	730	+ // localCB.addItemListener(this);
	731	+
	732	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	733	+ crowdCB.setToolTipText("Used for crowds");
	734	+ crowdCB.addItemListener(this);
	735	+
	736	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	737	+ smoothCB.setToolTipText("Snapping delay");
	738	+ smoothCB.addItemListener(this);
	739	+
	740	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	741	+ slowCB.setToolTipText("Smooth interpolation");
	742	+ slowCB.addItemListener(this);
	743	+
635	744	// constraints.gridy += 1;
636	745	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
637	746	// speakerMocapCB.addItemListener(this);
..	..	@@ -656,14 +765,20 @@
656	765	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
657	766	// debugCB.addItemListener(this);
658	767
659		- //constraints.gridy += 1;
660	768	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
661	769	oeilCB.addItemListener(this);
662	770
663		- //constraints.gridy += 1;
664	771	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
665	772	lookAtCB.setToolTipText("Look-at target");
666	773	lookAtCB.addItemListener(this);
	774	+
	775	+ }
	776	+
	777	+ cGridBag fill = new cGridBag();
	778	+
	779	+ fill.preferredHeight = 200;
	780	+
	781	+ panel.add(fill);
667	782
668	783	}
669	784
..	..	@@ -678,6 +793,7 @@
678	793	buttonGroup.add(radioButton);
679	794	radioButton.doClick();
680	795	}
	796	+
681	797	void SetupViews(ObjEditor oe)
682	798	{
683	799	oe.SetupViews();
..	..	@@ -894,7 +1010,9 @@
894	1010	// objEditor.DropFile((java.io.File[]) object, true);
895	1011	// return;
896	1012	// }
897		- if (string.charAt(0) == '/')
	1013	+
	1014	+ // File path for Mac and Windows
	1015	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
898	1016	{
899	1017	// file(s)
900	1018	String[] names = string.split("\n");
..	..	@@ -921,7 +1039,7 @@
921	1039
922	1040	flashIt = false;
923	1041	CameraPane pane = (CameraPane) target;
924		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1042	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
925	1043	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
926	1044
927	1045	if (group.selection.size() == 1)
..	..	@@ -948,11 +1066,11 @@
948	1066	{
949	1067	loadClipboard(true);
950	1068	objEditor.jTree.setSelectionPath(destinationPath);
951		- pasteInto(false);
	1069	+ pasteInto(false, false);
952	1070	} else {
953	1071	loadClipboard(false);
954	1072	objEditor.jTree.setSelectionPath(destinationPath);
955		- pasteInto(false); // true); // ???
	1073	+ pasteInto(false, false); // true); // ???
956	1074	}
957	1075	}
958	1076	public void dropActionChanged(DropTargetDragEvent dtde)
..	..	@@ -1074,27 +1192,33 @@
1074	1192	kleinItem.addActionListener(this);
1075	1193	particleItem = menu.add(new MenuItem("Particle system"));
1076	1194	particleItem.addActionListener(this);
	1195	+ if (Globals.ADVANCED)
	1196	+ {
1077	1197	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1078	1198	ragdollItem.addActionListener(this);
1079	1199	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1080	1200	ragdoll2Item.addActionListener(this);
	1201	+ }
1081	1202	menu.add("-");
1082		- meshItem = menu.add(new MenuItem("Mesh"));
	1203	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1083	1204	meshItem.addActionListener(this);
1084	1205	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1085	1206	// meshGroupItem.addActionListener(this);
	1207	+ if (Globals.ADVANCED)
	1208	+ {
1086	1209	springItem = menu.add(new MenuItem("Spring"));
1087	1210	springItem.addActionListener(this);
1088	1211	flagItem = menu.add(new MenuItem("Flag"));
1089	1212	flagItem.addActionListener(this);
1090		- bezierItem = menu.add(new MenuItem("Patch"));
1091		- bezierItem.addActionListener(this);
1092		- checkerItem = menu.add(new MenuItem("Checker"));
1093		- checkerItem.addActionListener(this);
1094	1213	blobItem = menu.add(new MenuItem("Blob"));
1095	1214	blobItem.addActionListener(this);
1096	1215	latheItem = menu.add(new MenuItem("Lathe"));
1097	1216	latheItem.addActionListener(this);
	1217	+ }
	1218	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1219	+ bezierItem.addActionListener(this);
	1220	+ overlayItem = menu.add(new MenuItem("Overlay"));
	1221	+ overlayItem.addActionListener(this);
1098	1222	lightItem = menu.add(new MenuItem("Light"));
1099	1223	lightItem.addActionListener(this);
1100	1224	menu.add("-");
..	..	@@ -1104,34 +1228,39 @@
1104	1228	loopItem.addActionListener(this);
1105	1229	doubleItem = menu.add(new MenuItem("Fork"));
1106	1230	doubleItem.addActionListener(this);
	1231	+ if (Globals.ADVANCED)
	1232	+ {
1107	1233	tripleItem = menu.add(new MenuItem("Trident"));
1108	1234	tripleItem.addActionListener(this);
	1235	+ }
1109	1236	}
1110	1237
1111	1238	void buildToolsMenu(Menu menu)
1112	1239	{
1113	1240	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1114	1241	animationItem.addItemListener(this);
1115		- animationItem.setState(CameraPane.ANIMATION);
	1242	+ animationItem.setState(Globals.ANIMATION);
1116	1243
1117	1244	menu.add("-");
1118	1245	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1119	1246	parseverticesItem.addActionListener(this);
1120	1247	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1121	1248	textureFieldItem.addActionListener(this);
1122		- alignItem = menu.add(new MenuItem("Align"));
	1249	+ alignItem = menu.add(new MenuItem("Align Objects"));
1123	1250	alignItem.addActionListener(this);
1124		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1125		- mirrorItem.addActionListener(this);
1126	1251	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1127	1252	reduceMorphItem.addActionListener(this);
1128	1253	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1129	1254	reduce34MorphItem.addActionListener(this);
1130		-
	1255	+ menu.add("-");
1131	1256	menu.add(computeAOItem = new MenuItem("Compute AO"));
1132	1257	computeAOItem.addActionListener(this);
1133		- menu.add("-");
1134	1258
	1259	+ if (Globals.ADVANCED)
	1260	+ {
	1261	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1262	+ mirrorItem.addActionListener(this);
	1263	+ menu.add("-");
1135	1264	menu.add(memoryItem = new MenuItem("Memory Usage"));
1136	1265	memoryItem.addActionListener(this);
1137	1266	menu.add(analyzeItem = new MenuItem("Analyze"));
..	..	@@ -1154,6 +1283,7 @@
1154	1283	menu.add("-");
1155	1284	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1156	1285	editScriptItem.addActionListener(this);
	1286	+ }
1157	1287	}
1158	1288
1159	1289	void ScreenFit()
..	..	@@ -1482,9 +1612,9 @@
1482	1612
1483	1613	void Overwrite(int mask)
1484	1614	{
1485		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1615	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1486	1616	{
1487		- Object3D content = GrafreeD.clipboard.get(0);
	1617	+ Object3D content = Grafreed.clipboard.get(0);
1488	1618
1489	1619	if (content instanceof cGroup && ((cGroup)content).transientlink )
1490	1620	content = ((cGroup)content).get(0);
..	..	@@ -1655,7 +1785,7 @@
1655	1785	{
1656	1786	makeSomething(new BezierSurface());
1657	1787	} else
1658		- if (source == checkerItem)
	1788	+ if (source == overlayItem)
1659	1789	{
1660	1790	/*
1661	1791	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1789,23 +1919,6 @@
1789	1919	csg.addChild(child);
1790	1920	child.addChild(csg);
1791	1921	} else
1792		-
1793		- if (source == importGFDItem)
1794		- {
1795		- ImportGFD();
1796		- } else
1797		- if (source == importVRMLX3DItem)
1798		- {
1799		- ImportVRMLX3D();
1800		- } else
1801		- if (source == import3DSItem)
1802		- {
1803		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1804		- } else
1805		- if (source == importOBJItem)
1806		- {
1807		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1808		- } else
1809	1922	if (source == computeAOItem)
1810	1923	{
1811	1924	Globals.drawMode = CameraPane.OCCLUSION;
..	..	@@ -1824,7 +1937,7 @@
1824	1937	if (source == invariantsItem)
1825	1938	{
1826	1939	System.out.println("Invariants:");
1827		- GrafreeD.grafreeD.universe.invariants();
	1940	+ Grafreed.grafreeD.universe.invariants();
1828	1941	} else
1829	1942	if (source == memoryItem)
1830	1943	{
..	..	@@ -1842,6 +1955,11 @@
1842	1955	if (source == dumpItem)
1843	1956	{
1844	1957	DumpObject();
	1958	+ } else
	1959	+ if (source == oneStepButton)
	1960	+ {
	1961	+ Globals.ONESTEP = true;
	1962	+ cameraView.repaint();
1845	1963	} else
1846	1964	if (source == screenfitButton)
1847	1965	{
..	..	@@ -1892,12 +2010,20 @@
1892	2010	{
1893	2011	loadClipboard(true);
1894	2012	} else
	2013	+ if (source == undoItem)
	2014	+ {
	2015	+ Undo();
	2016	+ } else
	2017	+ if (source == redoItem)
	2018	+ {
	2019	+ Redo();
	2020	+ } else
1895	2021	if (source == duplicateItem)
1896	2022	{
1897		- Object3D keep = GrafreeD.clipboard;
	2023	+ Object3D keep = Grafreed.clipboard;
1898	2024	loadClipboard(false);
1899	2025	paste(false);
1900		- GrafreeD.clipboard = keep;
	2026	+ Grafreed.clipboard = keep;
1901	2027	} else
1902	2028	if (source == cloneItem)
1903	2029	{
..	..	@@ -1915,13 +2041,17 @@
1915	2041	{
1916	2042	paste(false);
1917	2043	} else
	2044	+ if (source == pasteIntoItem)
	2045	+ {
	2046	+ pasteInto(true, false);
	2047	+ } else
1918	2048	if (source == pasteLinkItem)
1919	2049	{
1920		- pasteInto(false);
	2050	+ pasteInto(false, false);
1921	2051	} else
1922	2052	if (source == pasteCloneItem)
1923	2053	{
1924		- pasteInto(true);
	2054	+ pasteInto(true, true);
1925	2055	} else
1926	2056	if (source == pasteExpandItem)
1927	2057	{
..	..	@@ -2113,9 +2243,9 @@
2113	2243	// group.selection.get(0).setMasterThis(content); // should be identity
2114	2244	// refreshContents();
2115	2245	// }
2116		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2246	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2117	2247	{
2118		- Object3D content = GrafreeD.clipboard.get(0);
	2248	+ Object3D content = Grafreed.clipboard.get(0);
2119	2249
2120	2250	if (content instanceof cGroup && ((cGroup)content).transientlink )
2121	2251	content = ((cGroup)content).get(0);
..	..	@@ -2123,11 +2253,11 @@
2123	2253	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2124	2254	for (int i=0; i<group.selection.size(); i++)
2125	2255	{
2126		- boolean random = CameraPane.RANDOM;
2127		- CameraPane.RANDOM = false; // parse all random nodes
	2256	+ boolean random = CameraPane.SWITCH;
	2257	+ CameraPane.SWITCH = false; // parse all random nodes
2128	2258	group.selection.get(i).linkVerticesThis(content);
2129	2259	// group.selection.get(i).setMasterThis(content); // should be identity
2130		- CameraPane.RANDOM = random;
	2260	+ CameraPane.SWITCH = random;
2131	2261	}
2132	2262	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2133	2263	refreshContents();
..	..	@@ -2137,20 +2267,20 @@
2137	2267	{
2138	2268	for (int i=0; i<group.selection.size(); i++)
2139	2269	{
2140		- boolean random = CameraPane.RANDOM;
2141		- CameraPane.RANDOM = false; // parse all random nodes
	2270	+ boolean random = CameraPane.SWITCH;
	2271	+ CameraPane.SWITCH = false; // parse all random nodes
2142	2272	group.selection.get(i).linkVerticesThis(null);
2143		- CameraPane.RANDOM = random;
	2273	+ CameraPane.SWITCH = random;
2144	2274	}
2145	2275
2146	2276	refreshContents();
2147	2277	} else
2148	2278	if (source == relinkverticesItem)
2149	2279	{
2150		- boolean random = CameraPane.RANDOM;
2151		- CameraPane.RANDOM = false; // parse all random nodes
	2280	+ boolean random = CameraPane.SWITCH;
	2281	+ CameraPane.SWITCH = false; // parse all random nodes
2152	2282	group.selection.RelinkToSupport();
2153		- CameraPane.RANDOM = random;
	2283	+ CameraPane.SWITCH = random;
2154	2284
2155	2285	refreshContents();
2156	2286	} else
..	..	@@ -2165,9 +2295,9 @@
2165	2295	} else
2166	2296	if (source == setMasterItem)
2167	2297	{
2168		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2298	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2169	2299	{
2170		- Object3D content = GrafreeD.clipboard.get(0);
	2300	+ Object3D content = Grafreed.clipboard.get(0);
2171	2301
2172	2302	if (content instanceof cGroup && ((cGroup)content).transientlink )
2173	2303	content = ((cGroup)content).get(0);
..	..	@@ -2180,9 +2310,9 @@
2180	2310	{
2181	2311	if (group.selection.size() == 1)
2182	2312	{
2183		- if (GrafreeD.clipboard.size() == 1)
	2313	+ if (Grafreed.clipboard.size() == 1)
2184	2314	{
2185		- Object3D content = GrafreeD.clipboard.get(0);
	2315	+ Object3D content = Grafreed.clipboard.get(0);
2186	2316
2187	2317	if (content instanceof cGroup && ((cGroup)content).transientlink )
2188	2318	content = ((cGroup)content).get(0);
..	..	@@ -2199,7 +2329,7 @@
2199	2329	{
2200	2330	RevertMeshes();
2201	2331	} else
2202		- if (source == resetMeshItem)
	2332	+ if (source == resetAllItem)
2203	2333	{
2204	2334	ResetAll();
2205	2335	} else
..	..	@@ -2248,7 +2378,7 @@
2248	2378	RandomNode random = new RandomNode();
2249	2379	group(random);
2250	2380	if (random.size() > 0)
2251		- random.name = random.get(0).name + "Rnd";
	2381	+ random.name = random.get(0).name + "Switch";
2252	2382	} else
2253	2383	if (source == physicsItem)
2254	2384	{
..	..	@@ -2537,9 +2667,13 @@
2537	2667	{
2538	2668	SmoothMesh();
2539	2669	} else
2540		- if (source == transformgeometryItem)
	2670	+ if (source == transformGeometryItem)
2541	2671	{
2542	2672	TransformGeometry();
	2673	+ } else
	2674	+ if (source == transformChildrenItem)
	2675	+ {
	2676	+ TransformChildren();
2543	2677	} else
2544	2678	if (source == resetTransformItem)
2545	2679	{
..	..	@@ -2547,7 +2681,11 @@
2547	2681	} else
2548	2682	if (source == resetCentroidItem)
2549	2683	{
2550		- ResetCentroid();
	2684	+ ResetCentroid(true);
	2685	+ } else
	2686	+ if (source == resetCentroidXZItem)
	2687	+ {
	2688	+ ResetCentroid(false);
2551	2689	} else
2552	2690	if (source == resetParentItem)
2553	2691	{
..	..	@@ -2903,9 +3041,9 @@
2903	3041	child.CloseUI();
2904	3042	listUI.remove(child);
2905	3043
2906		- child.editWindow = null; // ???????????
	3044	+ //child.editWindow = null; // ???????????
2907	3045	}
2908		- objEditor.ctrlPanel.validate();
	3046	+ objEditor.ctrlPanel.FlushUI();
2909	3047	//objEditor.jTree.clearSelection();
2910	3048	//objEditor.ResetSliders();
2911	3049	refreshContents(true);
..	..	@@ -2989,7 +3127,9 @@
2989	3127	frontView.object = group;
2990	3128	sideView.object = group;
2991	3129	}
2992		- group.editWindow = this;
	3130	+
	3131	+// fix "+" issue group.editWindow = this;
	3132	+
2993	3133	/*
2994	3134	currentLayout = radio.layout;
2995	3135	if (currentLayout == null)
..	..	@@ -3002,7 +3142,20 @@
3002	3142	//group.attributes = -1;
3003	3143	ResetModel();
3004	3144	refreshContents(true);
3005		- }
	3145	+ } else if (event.getSource() == editCameraItem)
	3146	+ {
	3147	+ cameraView.ProtectCamera();
	3148	+ cameraView.repaint();
	3149	+ return;
	3150	+ } else if (event.getSource() == revertCameraItem)
	3151	+ {
	3152	+ cameraView.RevertCamera();
	3153	+ cameraView.repaint();
	3154	+ return;
	3155	+ // } else if (event.getSource() == textureButton)
	3156	+ // {
	3157	+ // return; // true;
	3158	+ }
3006	3159	else
3007	3160	{
3008	3161	//return super.action(event, arg);
..	..	@@ -3063,6 +3216,28 @@
3063	3216	refreshContents();
3064	3217	}
3065	3218
	3219	+ void TransformChildren()
	3220	+ {
	3221	+ Object3D obj;
	3222	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3223	+ {
	3224	+ obj = (Object3D)e.nextElement();
	3225	+ obj.KeepTextureMatrices();
	3226	+ obj.TransformChildren();
	3227	+ obj.RestoreTextureMatrices();
	3228	+
	3229	+// if (obj.parent == null)
	3230	+// {
	3231	+// System.out.println("NULL PARENT!");
	3232	+// new Exception().printStackTrace();
	3233	+// }
	3234	+// else
	3235	+// TouchTransform(obj);
	3236	+// //obj.parent.Touch();
	3237	+ }
	3238	+
	3239	+ refreshContents();
	3240	+ }
3066	3241
3067	3242	void ResetTransform()
3068	3243	{
..	..	@@ -3175,7 +3350,7 @@
3175	3350	refreshContents();
3176	3351	}
3177	3352
3178		- void ResetCentroid()
	3353	+ void ResetCentroid(boolean full)
3179	3354	{
3180	3355	Object3D obj;
3181	3356	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3190,12 +3365,16 @@
3190	3365	LA.matIdentity(Object3D.mat);
3191	3366	obj.getBounds(minima, maxima, false);
3192	3367	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3193		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3368	+ if (full)
	3369	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3194	3370	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3195	3371	obj.TransformMesh(Object3D.mat);
	3372	+
3196	3373	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3197		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3374	+ if (full)
	3375	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3198	3376	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3377	+
3199	3378	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3200	3379	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3201	3380	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3261,9 +3440,9 @@
3261	3440	obj = (Object3D)e.nextElement();
3262	3441
3263	3442	System.out.println("Object is: " + obj);
3264		- GrafreeD.AnalyzeObject(obj);
	3443	+ Grafreed.AnalyzeObject(obj);
3265	3444	System.out.println("Boundary rep: " + obj.bRep);
3266		- GrafreeD.AnalyzeObject(obj.bRep);
	3445	+ Grafreed.AnalyzeObject(obj.bRep);
3267	3446
3268	3447	// System.err.println((size/1024) + " KB is the size of " + obj);
3269	3448	}
..	..	@@ -3477,8 +3656,8 @@
3477	3656
3478	3657	void ParseVertices()
3479	3658	{
3480		- boolean epsequal = GrafreeD.epsequal;
3481		- GrafreeD.epsequal = true;
	3659	+ boolean epsequal = Grafreed.epsequal;
	3660	+ Grafreed.epsequal = true;
3482	3661
3483	3662	for (int i=0; i<group.selection.size(); i++)
3484	3663	{
..	..	@@ -3503,7 +3682,7 @@
3503	3682	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3504	3683	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3505	3684
3506		- g.add(GrafreeD.clipboard);
	3685	+ g.add(Grafreed.clipboard);
3507	3686
3508	3687	buffer.add(g);
3509	3688	}
..	..	@@ -3518,7 +3697,7 @@
3518	3697	makeSomething(buffer, i==group.selection.size()-1);
3519	3698	}
3520	3699
3521		- GrafreeD.epsequal = epsequal;
	3700	+ Grafreed.epsequal = epsequal;
3522	3701
3523	3702	refreshContents();
3524	3703	}
..	..	@@ -3536,7 +3715,16 @@
3536	3715	String pigment = Object3D.GetPigment(tex);
3537	3716	//String bump = Object3D.GetBump(tex);
3538	3717
3539		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3718	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	3719	+
	3720	+ try
	3721	+ {
	3722	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3723	+ }
	3724	+ catch (Exception e)
	3725	+ {
	3726	+ System.err.println("FAIL: " + node);
	3727	+ }
3540	3728
3541	3729	double s = v.s;
3542	3730
..	..	@@ -3624,11 +3812,11 @@
3624	3812
3625	3813	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3626	3814
3627		- boolean random = CameraPane.RANDOM;
3628		- CameraPane.RANDOM = false; // parse all random nodes
	3815	+ boolean random = CameraPane.SWITCH;
	3816	+ CameraPane.SWITCH = false; // parse all random nodes
3629	3817	lowres.linkVerticesThis(null);
3630	3818	lowres.linkVerticesThis(sn);
3631		- CameraPane.RANDOM = random;
	3819	+ CameraPane.SWITCH = random;
3632	3820
3633	3821	System.err.flush();
3634	3822
..	..	@@ -3668,7 +3856,7 @@
3668	3856	return;
3669	3857
3670	3858	Object3D poses = group.selection.get(0);
3671		- Object3D ref = GrafreeD.clipboard.get(0);
	3859	+ Object3D ref = Grafreed.clipboard.get(0);
3672	3860
3673	3861	Object3D newgroup = new Object3D("Po:" + poses.name);
3674	3862
..	..	@@ -3862,9 +4050,9 @@
3862	4050
3863	4051	void ClipMesh()
3864	4052	{
3865		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4053	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3866	4054	{
3867		- Object3D content = GrafreeD.clipboard.get(0);
	4055	+ Object3D content = Grafreed.clipboard.get(0);
3868	4056
3869	4057	if (content instanceof cGroup && ((cGroup)content).transientlink )
3870	4058	content = ((cGroup)content).get(0);
..	..	@@ -3873,7 +4061,7 @@
3873	4061	// {
3874	4062	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3875	4063	// }
3876		- group.selection.ClipMesh(GrafreeD.clipboard);
	4064	+ group.selection.ClipMesh(Grafreed.clipboard);
3877	4065	}
3878	4066	// group.selection.ClipMesh(GrafreeD.clipboard);
3879	4067	System.out.println("DONE.");
..	..	@@ -4008,7 +4196,7 @@
4008	4196	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4009	4197
4010	4198	Object3D elem = (Object3D)group.selection.elementAt(i);
4011		- if(elem != group)
	4199	+ if(elem != group \|\| !newWindow)
4012	4200	{
4013	4201	// if (!(elem instanceof Composite))
4014	4202	// newWindow = false;
..	..	@@ -4113,23 +4301,26 @@
4113	4301	System.err.println("info : " + child.GetPath());
4114	4302	}
4115	4303	}
4116		- else
4117		- {
4118		- objEditor.SetMaterial(group); // .GetMaterial());
4119		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4120		- System.err.println("info : " + group.GetPath());
4121		- }
	4304	+// else
	4305	+// {
	4306	+// objEditor.SetMaterial(group); // .GetMaterial());
	4307	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4308	+// System.err.println("info : " + group.GetPath());
	4309	+// }
4122	4310
4123	4311	objEditor.SetText(); // jan 2014
4124	4312
4125		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4313	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4126	4314	CameraPane.flash = true;
4127	4315
4128		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4316	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4129	4317	// a camera
4130	4318	{
4131		- CameraPane.camerachangeframe = 0; // don't refuse it
4132		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4319	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4320	+ {
	4321	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4322	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4323	+ }
4133	4324	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4134	4325	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4135	4326	}
..	..	@@ -4213,12 +4404,12 @@
4213	4404	{
4214	4405	if (group.selection.isEmpty())
4215	4406	return;
4216		- GrafreeD.clipboardIsTempGroup = false;
	4407	+ Grafreed.clipboardIsTempGroup = false;
4217	4408	Composite tGroup = null;
4218	4409	if (group.selection.size() > 0) // 1)
4219	4410	{
4220	4411	tGroup = new cGroup();
4221		- GrafreeD.clipboardIsTempGroup = true;
	4412	+ Grafreed.clipboardIsTempGroup = true;
4222	4413	}
4223	4414
4224	4415	if (cut)
..	..	@@ -4258,16 +4449,16 @@
4258	4449	//System.out.println("cut " + child);
4259	4450	//System.out.println("parent = " + child.parent);
4260	4451	// tmp.addChild(child);
4261		- if (GrafreeD.clipboardIsTempGroup)
	4452	+ if (Grafreed.clipboardIsTempGroup)
4262	4453	tGroup.add/Child/(tmp);
4263	4454	else
4264		- GrafreeD.clipboard = tmp;
	4455	+ Grafreed.clipboard = tmp;
4265	4456	}
4266	4457	else
4267		- if (GrafreeD.clipboardIsTempGroup)
	4458	+ if (Grafreed.clipboardIsTempGroup)
4268	4459	tGroup.add/Child/(child);
4269	4460	else
4270		- GrafreeD.clipboard = child;
	4461	+ Grafreed.clipboard = child;
4271	4462	}
4272	4463
4273	4464	//ResetModel();
..	..	@@ -4299,21 +4490,21 @@
4299	4490	//System.out.println("cut " + elem);
4300	4491	//System.out.println("parent = " + elem.parent);
4301	4492	// tmp.addChild(elem);
4302		- if (GrafreeD.clipboardIsTempGroup)
	4493	+ if (Grafreed.clipboardIsTempGroup)
4303	4494	tGroup.add/Child/(tmp);
4304	4495	else
4305		- GrafreeD.clipboard = tmp;
	4496	+ Grafreed.clipboard = tmp;
4306	4497	}
4307	4498	else
4308		- if (GrafreeD.clipboardIsTempGroup)
	4499	+ if (Grafreed.clipboardIsTempGroup)
4309	4500	tGroup.add/Child/(child);
4310	4501	else
4311		- GrafreeD.clipboard = child;
	4502	+ Grafreed.clipboard = child;
4312	4503	}
4313	4504
4314	4505	}
4315		- if (GrafreeD.clipboardIsTempGroup)
4316		- GrafreeD.clipboard = tGroup;
	4506	+ if (Grafreed.clipboardIsTempGroup)
	4507	+ Grafreed.clipboard = tGroup;
4317	4508	if (cut)
4318	4509	{
4319	4510	ResetModel();
..	..	@@ -4327,7 +4518,7 @@
4327	4518	// return;
4328	4519	boolean first = true;
4329	4520
4330		- if (GrafreeD.clipboardIsTempGroup)
	4521	+ if (Grafreed.clipboardIsTempGroup)
4331	4522	{
4332	4523	Composite temp;
4333	4524
..	..	@@ -4338,7 +4529,7 @@
4338	4529	temp = (Composite)Applet3D.clipboard.deepCopy();
4339	4530	*/
4340	4531	Object3D elem;
4341		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4532	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4342	4533	{
4343	4534	Object3D child = (Object3D)e.nextElement();
4344	4535
..	..	@@ -4372,21 +4563,21 @@
4372	4563	//Object3D cb = Applet3D.clipboard;
4373	4564	//temp.addChild(cb);
4374	4565	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4375		- assert(GrafreeD.clipboard.parent == null);
4376		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4377		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4378		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4379		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	4566	+ assert(Grafreed.clipboard.parent == null);
	4567	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4568	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4569	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4570	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4380	4571	else
4381		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4382		- GrafreeD.clipboard.get(0).parent = keepparent;
	4572	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4573	+ Grafreed.clipboard.get(0).parent = keepparent;
4383	4574	}
4384	4575
4385	4576	ResetModel();
4386	4577	refreshContents();
4387	4578	}
4388	4579
4389		- void pasteInto(boolean copyit)
	4580	+ void pasteInto(boolean copyit, boolean clone)
4390	4581	{
4391	4582	// if (GrafreeD.clipboard == null)
4392	4583	// return;
..	..	@@ -4415,15 +4606,22 @@
4415	4606	if (copyit)
4416	4607	{
4417	4608	// paste(false);
4418		- CloneClipboard(false); // sept 2014
	4609	+ if (clone)
	4610	+ {
	4611	+ CloneClipboard(false); // sept 2014
	4612	+ }
	4613	+ else
	4614	+ {
	4615	+ paste(false);
	4616	+ }
4419	4617	}
4420	4618	else
4421	4619	{
4422	4620	boolean first = true;
4423	4621
4424		- if (GrafreeD.clipboardIsTempGroup)
	4622	+ if (Grafreed.clipboardIsTempGroup)
4425	4623	{
4426		- Composite temp = (Composite)GrafreeD.clipboard;
	4624	+ Composite temp = (Composite)Grafreed.clipboard;
4427	4625	Object3D copy;
4428	4626	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4429	4627	{
..	..	@@ -4433,7 +4631,7 @@
4433	4631	}
4434	4632	} else
4435	4633	{
4436		- linkSomething(GrafreeD.clipboard); //.get(0));
	4634	+ linkSomething(Grafreed.clipboard); //.get(0));
4437	4635	}
4438	4636	}
4439	4637	}
..	..	@@ -4838,21 +5036,6 @@
4838	5036	}
4839	5037	*/
4840	5038
4841		- void ImportGFD()
4842		- {
4843		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4844		- browser.show();
4845		- String filename = browser.getFile();
4846		- if (filename != null && filename.length() > 0)
4847		- {
4848		- String fullname = browser.getDirectory() + filename;
4849		-
4850		- //Object3D readobj =
4851		- objEditor.ReadGFD(fullname, objEditor);
4852		- //makeSomething(readobj);
4853		- }
4854		- }
4855		-
4856	5039	/*
4857	5040	public void Callback(Object obj)
4858	5041	{
..	..	@@ -4876,26 +5059,9 @@
4876	5059	}
4877	5060	*/
4878	5061
4879		- void ImportVRMLX3D()
4880		- {
4881		- if (GrafreeD.standAlone)
4882		- {
4883		- /**/
4884		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4885		- browser.show();
4886		- String filename = browser.getFile();
4887		- if (filename != null && filename.length() > 0)
4888		- {
4889		- String fullname = browser.getDirectory() + filename;
4890		- LoadVRMLX3D(fullname);
4891		- }
4892		- /**/
4893		- }
4894		- }
4895		-
4896	5062	String GetFile(String dialogName)
4897	5063	{
4898		- if (GrafreeD.standAlone)
	5064	+ if (Grafreed.standAlone)
4899	5065	{
4900	5066	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4901	5067	browser.show();
..	..	@@ -4959,10 +5125,12 @@
4959	5125	cButton flashSelectionButton;
4960	5126	cButton editButton;
4961	5127	cButton uneditButton;
	5128	+ JCheckBox allParamsButton;
4962	5129	cButton clearpanelButton;
4963		- cButton allParamsButton;
4964	5130	cButton unselectButton;
4965	5131
	5132	+ cButton oneStepButton;
	5133	+
4966	5134	cButton screenfitButton;
4967	5135	cButton screenfitpointButton;
4968	5136	cButton snapobjectButton;
..	..	@@ -4993,6 +5161,8 @@
4993	5161	private MenuItem lookFromItem;
4994	5162	private MenuItem switchItem;
4995	5163	private MenuItem cutItem;
	5164	+ private MenuItem undoItem;
	5165	+ private MenuItem redoItem;
4996	5166	private MenuItem duplicateItem;
4997	5167	private MenuItem cloneItem;
4998	5168	private MenuItem cloneSupportItem;
..	..	@@ -5006,7 +5176,7 @@
5006	5176	private MenuItem linkverticesItem;
5007	5177	private MenuItem relinkverticesItem;
5008	5178	private MenuItem setMasterItem;
5009		- private MenuItem resetMeshItem;
	5179	+ private MenuItem resetAllItem;
5010	5180	private MenuItem stepAllItem;
5011	5181	private MenuItem revertMeshItem;
5012	5182	private MenuItem poseMeshItem;
..	..	@@ -5017,6 +5187,7 @@
5017	5187	private MenuItem mergeGeometriesItem;
5018	5188	private MenuItem copyItem;
5019	5189	private MenuItem pasteItem;
	5190	+ private MenuItem pasteIntoItem;
5020	5191	private MenuItem pasteLinkItem;
5021	5192	private MenuItem pasteCloneItem;
5022	5193	private MenuItem pasteExpandItem;
..	..	@@ -5066,8 +5237,10 @@
5066	5237	private MenuItem panoTexturesItem;
5067	5238
5068	5239	private MenuItem resetCentroidItem;
5069		- private MenuItem transformgeometryItem;
	5240	+ private MenuItem resetCentroidXZItem;
5070	5241	private MenuItem resetTransformItem;
	5242	+ private MenuItem transformGeometryItem;
	5243	+ private MenuItem transformChildrenItem;
5071	5244	private MenuItem hideItem;
5072	5245	private MenuItem grabItem;
5073	5246	private MenuItem backItem;
..	..	@@ -5114,7 +5287,7 @@
5114	5287	private MenuItem blobItem;
5115	5288	private MenuItem latheItem;
5116	5289	private MenuItem bezierItem;
5117		- private MenuItem checkerItem;
	5290	+ private MenuItem overlayItem;
5118	5291	private MenuItem meshItem;
5119	5292	// private MenuItem meshGroupItem;
5120	5293	private MenuItem springItem;
..	..	@@ -5136,11 +5309,6 @@
5136	5309	private MenuItem doubleItem;
5137	5310	private MenuItem tripleItem;
5138	5311
5139		- private MenuItem importGFDItem;
5140		- private MenuItem importVRMLX3DItem;
5141		- private MenuItem import3DSItem;
5142		- private MenuItem importOBJItem;
5143		-
5144	5312	private MenuItem computeAOItem;
5145	5313	private MenuItem recompileItem;
5146	5314	private MenuItem editScriptItem;
..	..	@@ -5150,4 +5318,8 @@
5150	5318	private MenuItem analyzeItem;
5151	5319	private MenuItem dumpItem;
5152	5320	//boolean freezemodel = false;
	5321	+
	5322	+ Menu cameraMenu;
	5323	+ MenuItem editCameraItem;
	5324	+ MenuItem revertCameraItem;
5153	5325	}