~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"));
..	..	@@ -377,29 +505,22 @@
377	505	sortbynameItem = menu.add(new MenuItem("Sort by name"));
378	506	sortbynameItem.addActionListener(this);
379	507	menu.add("-");
	508	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	509	+ shareGeometriesItem.addActionListener(this);
	510	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	511	+ mergeGeometriesItem.addActionListener(this);
	512	+ if (Globals.ADVANCED)
	513	+ {
	514	+ // Pretty much the same as duplicate and clone.
380	515	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
381	516	extractGeometriesItem.addActionListener(this);
382	517	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
383	518	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);
	519	+ }
388	520
389	521	oe.menuBar.add(menu = new Menu("Insert"));
390	522	buildCreateMenu(menu);
391	523
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	524	oe.menuBar.add(menu = new Menu("Tools"));
404	525	buildToolsMenu(menu);
405	526	}
..	..	@@ -434,110 +555,110 @@
434	555	oe.radioPanel.add(dummyButton);
435	556	oe.buttonGroup.add(dummyButton);
436	557	*/
437		- aConstraints.gridy += 1;
438		-
439	558	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
440	559
441		- oe.aConstraints.gridwidth = 1;
442		- oe.aConstraints.gridx = 0;
	560	+ oe.toolbarPanel.add(undoButton = new cButton("Undo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	561	+ undoButton.setToolTipText("Undo changes");
	562	+ undoButton.addActionListener(this);
443	563
444		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
445		- liveCB.setToolTipText("Enabled animation");
	564	+ oe.toolbarPanel.add(redoButton = new cButton("Redo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	565	+ redoButton.setToolTipText("Redo changes");
	566	+ redoButton.addActionListener(this);
	567	+
	568	+ oe.toolbarPanel.add(saveButton = new cButton("Save", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	569	+ saveButton.setToolTipText("Save changes");
	570	+ saveButton.addActionListener(this);
	571	+
	572	+ oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	573	+ liveCB.setToolTipText("Enable animation");
446	574	liveCB.addItemListener(this);
447	575
448		- oe.aConstraints.gridx += 1;
449		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK), oe.aConstraints);
	576	+ oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	577	+ oneStepButton.setToolTipText("Animate one step forward");
	578	+ oneStepButton.addActionListener(this);
	579	+
	580	+ oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	581	+ fastCB.setToolTipText("Fast mode");
	582	+ fastCB.addItemListener(this);
	583	+
	584	+ oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
450	585	trackCB.setToolTipText("Enable tracking");
451	586	trackCB.addItemListener(this);
452	587
453		- oe.aConstraints.gridx += 1;
454		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	588	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
455	589	screenfitButton.setToolTipText("Screen fit");
456	590	screenfitButton.addActionListener(this);
457		- oe.aConstraints.gridx += 1;
	591	+
458	592	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
459	593	// screenfitpointButton.addActionListener(this);
460		-// oe.aConstraints.gridx += 1;
461		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
462		- snapobjectButton.addActionListener(this);
463		- snapobjectButton.setToolTipText("Snap Object");
464		- oe.aConstraints.gridx += 1;
465	594
466		- //aConstraints.gridx = 0;
467		- //aConstraints.gridy += 1;
468		- oe.aConstraints.weighty = 0;
469		- oe.aConstraints.gridwidth = 1;
470		-
471		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
	595	+ if (Globals.ADVANCED)
	596	+ {
	597	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	598	+ snapobjectButton.addActionListener(this);
	599	+ snapobjectButton.setToolTipText("Snap Object");
	600	+ }
	601	+
	602	+ oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
472	603	flashSelectionButton.setToolTipText("Show selection");
473	604	flashSelectionButton.addActionListener(this);
474	605
475		- oe.toolbarPanel.add(new cButton(" ", false));
	606	+ oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
476	607
477		- oe.aConstraints.gridx += 1;
478		- oe.aConstraints.weighty = 0;
479		- oe.aConstraints.gridwidth = 1;
480		-
481		- //
482		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	608	+ oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
483	609	twoButton.setToolTipText("Show center view only");
484	610	twoButton.addActionListener(this);
485		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	611	+ oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
486	612	fourButton.addActionListener(this);
487	613	fourButton.setToolTipText("Show left panel only");
488		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	614	+ oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
489	615	sixButton.setToolTipText("2-column layout left");
490	616	sixButton.addActionListener(this);
491		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	617	+ oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
492	618	threeButton.setToolTipText("2-column layout right");
493	619	threeButton.addActionListener(this);
494		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	620	+ oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
495	621	sevenButton.setToolTipText("3-column layout");
496	622	sevenButton.addActionListener(this);
497	623	//
498	624
499		- oe.toolbarPanel.add(rootButton = new cButton(" o o o ")); //, oe.aConstraints);
500		- rootButton.setToolTipText("Edit object in new tab");
	625	+ oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	626	+ rootButton.setToolTipText("Edit selection in new tab");
501	627	rootButton.addActionListener(this);
502		- oe.aConstraints.gridx += 1;
503		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	628	+
	629	+ oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
504	630	closeButton.setToolTipText("Close tab");
505	631	closeButton.addActionListener(this);
506	632	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
507	633	//clearButton.addActionListener(this);
508		- oe.aConstraints.gridx += 1;
509	634
510		- oe.aConstraints.gridx = 1; //
511		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
	635	+ cGridBag commandsPanel = new cGridBag();
	636	+
	637	+ commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	638	+ editButton.setToolTipText("Edit selection");
512	639	editButton.addActionListener(this);
513		- oe.aConstraints.gridx += 1;
514		- oe.aConstraints.weighty = 0;
515		- oe.aConstraints.gridwidth = 1;
516	640
517		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	641	+ commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	642	+ uneditButton.setToolTipText("Unedit selection");
518	643	uneditButton.addActionListener(this);
519	644
520		- oe.aConstraints.gridx += 1;
521		- oe.aConstraints.weighty = 0;
522		- oe.aConstraints.gridwidth = 1;
523		-
524		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
525		- clearPanelButton.addActionListener(this);
526		-
527		- oe.aConstraints.gridx += 1;
528		- oe.aConstraints.weighty = 0;
529		- oe.aConstraints.gridwidth = 1;
530		-
531		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	645	+ commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	646	+ allParamsButton.setToolTipText("Edit all params");
532	647	allParamsButton.addActionListener(this);
533	648
534		- oe.aConstraints.gridx += 1;
535		- oe.aConstraints.weighty = 0;
536		- oe.aConstraints.gridwidth = 1;
537		-
538		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
	649	+ commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	650	+ clearPanelButton.setToolTipText("Clear edit panel");
	651	+ clearPanelButton.addActionListener(this);
	652	+
	653	+ commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	654	+ unselectButton.setToolTipText("Unselect");
539	655	unselectButton.addActionListener(this);
540	656
	657	+ commandsPanel.preferredHeight = 1;
	658	+
	659	+ oe.treePanel.add(commandsPanel);
	660	+ oe.treePanel.Return();
	661	+
541	662	// oe.aConstraints.gridx += 1;
542	663	// oe.aConstraints.weighty = 0;
543	664	// oe.aConstraints.gridwidth = 1;
..	..	@@ -549,40 +670,37 @@
549	670	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
550	671	// gcButton.addActionListener(this);
551	672
552		- oe.aConstraints.gridx = 0;
553		- oe.aConstraints.gridy += 1;
554		-
555		- //ctrlPanel.add(objList = new List(5, true));
556		- oe.aConstraints.gridwidth = 100;
557		- // oe.aConstraints.gridheight = 100;
558		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
559		- oe.aConstraints.gridheight = 1;
560		- oe.aConstraints.weighty = 0.5;
561		- oe.aConstraints.gridx = 0;
562		- JScrollPane jSP;
	673	+ cGridBag jSPPanel = new cGridBag();
	674	+
	675	+ JScrollPane jSP;
563	676	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
564		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	677	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
565	678	ResetModel();
566		- oe.aConstraints.weighty = 0.5;
567		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
568		- oe.aConstraints.gridy += 1;
569		- oe.aConstraints.gridwidth = 1;
	679	+
	680	+ oe.treePanel.add(jSPPanel);
	681	+ oe.treePanel.Return();
570	682
571		- oe.aConstraints.weighty = 0;
572		- oe.aConstraints.gridwidth = 2;
573		-
574		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
	683	+ cGridBag copyOptionsPanel = new cGridBag();
	684	+
	685	+ copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	686	+ colorCB.setToolTipText("Copy color when dropped");
575	687	colorCB.addItemListener(this);
576		- oe.aConstraints.gridx += 2;
577		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
	688	+
	689	+ copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	690	+ materialCB.setToolTipText("Copy material when dropped");
578	691	materialCB.addItemListener(this);
579		- oe.aConstraints.gridx += 2;
580		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
	692	+
	693	+ copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	694	+ textureCB.setToolTipText("Copy texture when dropped");
581	695	textureCB.addItemListener(this);
582	696
583		- oe.aConstraints.gridx = 0;
584		- oe.aConstraints.gridy += 1;
	697	+ copyOptionsPanel.preferredHeight = 1;
	698	+ oe.treePanel.add(copyOptionsPanel);
	699	+ oe.treePanel.Return();
585	700
	701	+// mainPanel.setDividerLocation(0.5); //1.0);
	702	+// mainPanel.setResizeWeight(0.5);
	703	+
586	704	//jList.addListSelectionListener(this);
587	705	oe.jTree.addTreeSelectionListener(this);
588	706	//jTree.setRootVisible(false);
..	..	@@ -607,43 +725,35 @@
607	725
608	726	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
609	727	{
610		- //constraints.gridx = 0;
611		- //constraints.gridy = 0;
612		- panel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
613		- fastCB.setToolTipText("Fast mode");
614		- fastCB.addItemListener(this);
615		- //constraints.gridy += 1;
616		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
617		- supportCB.setToolTipText("Enabled rigging");
618		- supportCB.addItemListener(this);
619		-
620		- // constraints.gridy += 1;
621		- // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
622		- // localCB.addItemListener(this);
623		-
624		- //constraints.gridy += 1;
625		- panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
626		- crowdCB.setToolTipText("Used for crowds");
627		- crowdCB.addItemListener(this);
628		-
629		- //constraints.gridy += 1;
630		- panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
631		- smoothCB.setToolTipText("Snapping delay");
632		- smoothCB.addItemListener(this);
633		-
634		- //constraints.gridy += 1;
635		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
636		- slowCB.setToolTipText("Smooth interpolation");
637		- slowCB.addItemListener(this);
638		- //constraints.gridy += 1;
639	728	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
640	729	boxCB.setToolTipText("Display bounding boxes");
641	730	boxCB.addItemListener(this);
642		- //constraints.gridy += 1;
	731	+
643	732	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
644	733	zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
645	734	zoomBoxCB.addItemListener(this);
646	735
	736	+ if (true) // Globals.ADVANCED)
	737	+ {
	738	+ panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	739	+ supportCB.setToolTipText("Enable rigging");
	740	+ supportCB.addItemListener(this);
	741	+
	742	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	743	+ // localCB.addItemListener(this);
	744	+
	745	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	746	+ crowdCB.setToolTipText("Used for crowds");
	747	+ crowdCB.addItemListener(this);
	748	+
	749	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	750	+ smoothCB.setToolTipText("Snapping delay");
	751	+ smoothCB.addItemListener(this);
	752	+
	753	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	754	+ slowCB.setToolTipText("Smooth interpolation");
	755	+ slowCB.addItemListener(this);
	756	+
647	757	// constraints.gridy += 1;
648	758	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
649	759	// speakerMocapCB.addItemListener(this);
..	..	@@ -668,14 +778,20 @@
668	778	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
669	779	// debugCB.addItemListener(this);
670	780
671		- //constraints.gridy += 1;
672	781	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
673	782	oeilCB.addItemListener(this);
674	783
675		- //constraints.gridy += 1;
676	784	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
677	785	lookAtCB.setToolTipText("Look-at target");
678	786	lookAtCB.addItemListener(this);
	787	+
	788	+ }
	789	+
	790	+ cGridBag fill = new cGridBag();
	791	+
	792	+ fill.preferredHeight = 200;
	793	+
	794	+ panel.add(fill);
679	795
680	796	}
681	797
..	..	@@ -690,6 +806,7 @@
690	806	buttonGroup.add(radioButton);
691	807	radioButton.doClick();
692	808	}
	809	+
693	810	void SetupViews(ObjEditor oe)
694	811	{
695	812	oe.SetupViews();
..	..	@@ -754,6 +871,7 @@
754	871	} else if(e.getSource() == liveCB)
755	872	{
756	873	cameraView.ToggleLive();
	874	+ refreshContents(false);
757	875	}
758	876	else if(e.getSource() == supportCB)
759	877	{
..	..	@@ -906,7 +1024,9 @@
906	1024	// objEditor.DropFile((java.io.File[]) object, true);
907	1025	// return;
908	1026	// }
909		- if (string.charAt(0) == '/')
	1027	+
	1028	+ // File path for Mac and Windows
	1029	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
910	1030	{
911	1031	// file(s)
912	1032	String[] names = string.split("\n");
..	..	@@ -933,7 +1053,7 @@
933	1053
934	1054	flashIt = false;
935	1055	CameraPane pane = (CameraPane) target;
936		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1056	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
937	1057	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
938	1058
939	1059	if (group.selection.size() == 1)
..	..	@@ -960,11 +1080,11 @@
960	1080	{
961	1081	loadClipboard(true);
962	1082	objEditor.jTree.setSelectionPath(destinationPath);
963		- pasteInto(false);
	1083	+ pasteInto(false, false);
964	1084	} else {
965	1085	loadClipboard(false);
966	1086	objEditor.jTree.setSelectionPath(destinationPath);
967		- pasteInto(false); // true); // ???
	1087	+ pasteInto(false, false); // true); // ???
968	1088	}
969	1089	}
970	1090	public void dropActionChanged(DropTargetDragEvent dtde)
..	..	@@ -1086,27 +1206,33 @@
1086	1206	kleinItem.addActionListener(this);
1087	1207	particleItem = menu.add(new MenuItem("Particle system"));
1088	1208	particleItem.addActionListener(this);
	1209	+ if (Globals.ADVANCED)
	1210	+ {
1089	1211	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1090	1212	ragdollItem.addActionListener(this);
1091	1213	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1092	1214	ragdoll2Item.addActionListener(this);
	1215	+ }
1093	1216	menu.add("-");
1094		- meshItem = menu.add(new MenuItem("Mesh"));
	1217	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1095	1218	meshItem.addActionListener(this);
1096	1219	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1097	1220	// meshGroupItem.addActionListener(this);
	1221	+ if (Globals.ADVANCED)
	1222	+ {
1098	1223	springItem = menu.add(new MenuItem("Spring"));
1099	1224	springItem.addActionListener(this);
1100	1225	flagItem = menu.add(new MenuItem("Flag"));
1101	1226	flagItem.addActionListener(this);
1102		- bezierItem = menu.add(new MenuItem("Patch"));
1103		- bezierItem.addActionListener(this);
1104		- checkerItem = menu.add(new MenuItem("Checker"));
1105		- checkerItem.addActionListener(this);
1106	1227	blobItem = menu.add(new MenuItem("Blob"));
1107	1228	blobItem.addActionListener(this);
1108	1229	latheItem = menu.add(new MenuItem("Lathe"));
1109	1230	latheItem.addActionListener(this);
	1231	+ }
	1232	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1233	+ bezierItem.addActionListener(this);
	1234	+ overlayItem = menu.add(new MenuItem("Overlay"));
	1235	+ overlayItem.addActionListener(this);
1110	1236	lightItem = menu.add(new MenuItem("Light"));
1111	1237	lightItem.addActionListener(this);
1112	1238	menu.add("-");
..	..	@@ -1116,39 +1242,44 @@
1116	1242	loopItem.addActionListener(this);
1117	1243	doubleItem = menu.add(new MenuItem("Fork"));
1118	1244	doubleItem.addActionListener(this);
	1245	+ if (Globals.ADVANCED)
	1246	+ {
1119	1247	tripleItem = menu.add(new MenuItem("Trident"));
1120	1248	tripleItem.addActionListener(this);
	1249	+ }
1121	1250	}
1122	1251
1123	1252	void buildToolsMenu(Menu menu)
1124	1253	{
1125	1254	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1126	1255	animationItem.addItemListener(this);
1127		- animationItem.setState(CameraPane.ANIMATION);
	1256	+ animationItem.setState(Globals.ANIMATION);
1128	1257
1129	1258	menu.add("-");
1130	1259	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1131	1260	parseverticesItem.addActionListener(this);
1132	1261	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1133	1262	textureFieldItem.addActionListener(this);
1134		- alignItem = menu.add(new MenuItem("Align"));
	1263	+ alignItem = menu.add(new MenuItem("Align Objects"));
1135	1264	alignItem.addActionListener(this);
1136		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1137		- mirrorItem.addActionListener(this);
1138	1265	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1139	1266	reduceMorphItem.addActionListener(this);
1140	1267	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1141	1268	reduce34MorphItem.addActionListener(this);
1142		-
	1269	+ menu.add("-");
1143	1270	menu.add(computeAOItem = new MenuItem("Compute AO"));
1144	1271	computeAOItem.addActionListener(this);
1145		- menu.add("-");
1146	1272
	1273	+ if (Globals.ADVANCED)
	1274	+ {
	1275	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1276	+ mirrorItem.addActionListener(this);
	1277	+ menu.add("-");
1147	1278	menu.add(memoryItem = new MenuItem("Memory Usage"));
1148	1279	memoryItem.addActionListener(this);
1149	1280	menu.add(analyzeItem = new MenuItem("Analyze"));
1150	1281	analyzeItem.addActionListener(this);
1151		- menu.add(dumpItem = new MenuItem("Dump"));
	1282	+ menu.add(dumpItem = new MenuItem("Print"));
1152	1283	dumpItem.addActionListener(this);
1153	1284	// menu.add(pathItem = new MenuItem("From-to path"));
1154	1285	// pathItem.addActionListener(this);
..	..	@@ -1166,6 +1297,7 @@
1166	1297	menu.add("-");
1167	1298	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1168	1299	editScriptItem.addActionListener(this);
	1300	+ }
1169	1301	}
1170	1302
1171	1303	void ScreenFit()
..	..	@@ -1494,9 +1626,9 @@
1494	1626
1495	1627	void Overwrite(int mask)
1496	1628	{
1497		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1629	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1498	1630	{
1499		- Object3D content = GrafreeD.clipboard.get(0);
	1631	+ Object3D content = Grafreed.clipboard.get(0);
1500	1632
1501	1633	if (content instanceof cGroup && ((cGroup)content).transientlink )
1502	1634	content = ((cGroup)content).get(0);
..	..	@@ -1667,7 +1799,7 @@
1667	1799	{
1668	1800	makeSomething(new BezierSurface());
1669	1801	} else
1670		- if (source == checkerItem)
	1802	+ if (source == overlayItem)
1671	1803	{
1672	1804	/*
1673	1805	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1801,23 +1933,6 @@
1801	1933	csg.addChild(child);
1802	1934	child.addChild(csg);
1803	1935	} else
1804		-
1805		- if (source == importGFDItem)
1806		- {
1807		- ImportGFD();
1808		- } else
1809		- if (source == importVRMLX3DItem)
1810		- {
1811		- ImportVRMLX3D();
1812		- } else
1813		- if (source == import3DSItem)
1814		- {
1815		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1816		- } else
1817		- if (source == importOBJItem)
1818		- {
1819		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1820		- } else
1821	1936	if (source == computeAOItem)
1822	1937	{
1823	1938	Globals.drawMode = CameraPane.OCCLUSION;
..	..	@@ -1836,7 +1951,7 @@
1836	1951	if (source == invariantsItem)
1837	1952	{
1838	1953	System.out.println("Invariants:");
1839		- GrafreeD.grafreeD.universe.invariants();
	1954	+ Grafreed.grafreeD.universe.invariants();
1840	1955	} else
1841	1956	if (source == memoryItem)
1842	1957	{
..	..	@@ -1854,6 +1969,23 @@
1854	1969	if (source == dumpItem)
1855	1970	{
1856	1971	DumpObject();
	1972	+ } else
	1973	+ if (source == undoButton)
	1974	+ {
	1975	+ Undo();
	1976	+ } else
	1977	+ if (source == redoButton)
	1978	+ {
	1979	+ Redo();
	1980	+ } else
	1981	+ if (source == saveButton)
	1982	+ {
	1983	+ Save();
	1984	+ } else
	1985	+ if (source == oneStepButton)
	1986	+ {
	1987	+ Globals.ONESTEP = true;
	1988	+ cameraView.repaint();
1857	1989	} else
1858	1990	if (source == screenfitButton)
1859	1991	{
..	..	@@ -1904,12 +2036,20 @@
1904	2036	{
1905	2037	loadClipboard(true);
1906	2038	} else
	2039	+ if (source == undoItem)
	2040	+ {
	2041	+ Undo();
	2042	+ } else
	2043	+ if (source == redoItem)
	2044	+ {
	2045	+ Redo();
	2046	+ } else
1907	2047	if (source == duplicateItem)
1908	2048	{
1909		- Object3D keep = GrafreeD.clipboard;
	2049	+ Object3D keep = Grafreed.clipboard;
1910	2050	loadClipboard(false);
1911	2051	paste(false);
1912		- GrafreeD.clipboard = keep;
	2052	+ Grafreed.clipboard = keep;
1913	2053	} else
1914	2054	if (source == cloneItem)
1915	2055	{
..	..	@@ -1927,13 +2067,17 @@
1927	2067	{
1928	2068	paste(false);
1929	2069	} else
	2070	+ if (source == pasteIntoItem)
	2071	+ {
	2072	+ pasteInto(true, false);
	2073	+ } else
1930	2074	if (source == pasteLinkItem)
1931	2075	{
1932		- pasteInto(false);
	2076	+ pasteInto(false, false);
1933	2077	} else
1934	2078	if (source == pasteCloneItem)
1935	2079	{
1936		- pasteInto(true);
	2080	+ pasteInto(true, true);
1937	2081	} else
1938	2082	if (source == pasteExpandItem)
1939	2083	{
..	..	@@ -2125,9 +2269,9 @@
2125	2269	// group.selection.get(0).setMasterThis(content); // should be identity
2126	2270	// refreshContents();
2127	2271	// }
2128		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2272	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2129	2273	{
2130		- Object3D content = GrafreeD.clipboard.get(0);
	2274	+ Object3D content = Grafreed.clipboard.get(0);
2131	2275
2132	2276	if (content instanceof cGroup && ((cGroup)content).transientlink )
2133	2277	content = ((cGroup)content).get(0);
..	..	@@ -2135,11 +2279,11 @@
2135	2279	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2136	2280	for (int i=0; i<group.selection.size(); i++)
2137	2281	{
2138		- boolean random = CameraPane.RANDOM;
2139		- CameraPane.RANDOM = false; // parse all random nodes
	2282	+ boolean random = CameraPane.SWITCH;
	2283	+ CameraPane.SWITCH = false; // parse all random nodes
2140	2284	group.selection.get(i).linkVerticesThis(content);
2141	2285	// group.selection.get(i).setMasterThis(content); // should be identity
2142		- CameraPane.RANDOM = random;
	2286	+ CameraPane.SWITCH = random;
2143	2287	}
2144	2288	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2145	2289	refreshContents();
..	..	@@ -2149,20 +2293,20 @@
2149	2293	{
2150	2294	for (int i=0; i<group.selection.size(); i++)
2151	2295	{
2152		- boolean random = CameraPane.RANDOM;
2153		- CameraPane.RANDOM = false; // parse all random nodes
	2296	+ boolean random = CameraPane.SWITCH;
	2297	+ CameraPane.SWITCH = false; // parse all random nodes
2154	2298	group.selection.get(i).linkVerticesThis(null);
2155		- CameraPane.RANDOM = random;
	2299	+ CameraPane.SWITCH = random;
2156	2300	}
2157	2301
2158	2302	refreshContents();
2159	2303	} else
2160	2304	if (source == relinkverticesItem)
2161	2305	{
2162		- boolean random = CameraPane.RANDOM;
2163		- CameraPane.RANDOM = false; // parse all random nodes
	2306	+ boolean random = CameraPane.SWITCH;
	2307	+ CameraPane.SWITCH = false; // parse all random nodes
2164	2308	group.selection.RelinkToSupport();
2165		- CameraPane.RANDOM = random;
	2309	+ CameraPane.SWITCH = random;
2166	2310
2167	2311	refreshContents();
2168	2312	} else
..	..	@@ -2177,9 +2321,9 @@
2177	2321	} else
2178	2322	if (source == setMasterItem)
2179	2323	{
2180		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2324	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2181	2325	{
2182		- Object3D content = GrafreeD.clipboard.get(0);
	2326	+ Object3D content = Grafreed.clipboard.get(0);
2183	2327
2184	2328	if (content instanceof cGroup && ((cGroup)content).transientlink )
2185	2329	content = ((cGroup)content).get(0);
..	..	@@ -2192,9 +2336,9 @@
2192	2336	{
2193	2337	if (group.selection.size() == 1)
2194	2338	{
2195		- if (GrafreeD.clipboard.size() == 1)
	2339	+ if (Grafreed.clipboard.size() == 1)
2196	2340	{
2197		- Object3D content = GrafreeD.clipboard.get(0);
	2341	+ Object3D content = Grafreed.clipboard.get(0);
2198	2342
2199	2343	if (content instanceof cGroup && ((cGroup)content).transientlink )
2200	2344	content = ((cGroup)content).get(0);
..	..	@@ -2211,7 +2355,7 @@
2211	2355	{
2212	2356	RevertMeshes();
2213	2357	} else
2214		- if (source == resetMeshItem)
	2358	+ if (source == resetAllItem)
2215	2359	{
2216	2360	ResetAll();
2217	2361	} else
..	..	@@ -2260,7 +2404,7 @@
2260	2404	RandomNode random = new RandomNode();
2261	2405	group(random);
2262	2406	if (random.size() > 0)
2263		- random.name = random.get(0).name + "Rnd";
	2407	+ random.name = random.get(0).name + "Switch";
2264	2408	} else
2265	2409	if (source == physicsItem)
2266	2410	{
..	..	@@ -2399,7 +2543,7 @@
2399	2543	} else
2400	2544	if (source == genNormalsMESHItem)
2401	2545	{
2402		- GenNormals(true); // TODO
	2546	+ GenNormalsMESH();
2403	2547	} else
2404	2548	if (source == genNormalsORGANItem)
2405	2549	{
..	..	@@ -2549,9 +2693,13 @@
2549	2693	{
2550	2694	SmoothMesh();
2551	2695	} else
2552		- if (source == transformgeometryItem)
	2696	+ if (source == transformGeometryItem)
2553	2697	{
2554	2698	TransformGeometry();
	2699	+ } else
	2700	+ if (source == transformChildrenItem)
	2701	+ {
	2702	+ TransformChildren();
2555	2703	} else
2556	2704	if (source == resetTransformItem)
2557	2705	{
..	..	@@ -2559,7 +2707,11 @@
2559	2707	} else
2560	2708	if (source == resetCentroidItem)
2561	2709	{
2562		- ResetCentroid();
	2710	+ ResetCentroid(true);
	2711	+ } else
	2712	+ if (source == resetCentroidXZItem)
	2713	+ {
	2714	+ ResetCentroid(false);
2563	2715	} else
2564	2716	if (source == resetParentItem)
2565	2717	{
..	..	@@ -2915,9 +3067,9 @@
2915	3067	child.CloseUI();
2916	3068	listUI.remove(child);
2917	3069
2918		- child.editWindow = null; // ???????????
	3070	+ //child.editWindow = null; // ???????????
2919	3071	}
2920		- objEditor.ctrlPanel.validate();
	3072	+ objEditor.ctrlPanel.FlushUI();
2921	3073	//objEditor.jTree.clearSelection();
2922	3074	//objEditor.ResetSliders();
2923	3075	refreshContents(true);
..	..	@@ -3001,7 +3153,10 @@
3001	3153	frontView.object = group;
3002	3154	sideView.object = group;
3003	3155	}
	3156	+
	3157	+// fix "+" issue
3004	3158	group.editWindow = this;
	3159	+
3005	3160	/*
3006	3161	currentLayout = radio.layout;
3007	3162	if (currentLayout == null)
..	..	@@ -3014,7 +3169,20 @@
3014	3169	//group.attributes = -1;
3015	3170	ResetModel();
3016	3171	refreshContents(true);
3017		- }
	3172	+ } else if (event.getSource() == editCameraItem)
	3173	+ {
	3174	+ cameraView.ProtectCamera();
	3175	+ cameraView.repaint();
	3176	+ return;
	3177	+ } else if (event.getSource() == revertCameraItem)
	3178	+ {
	3179	+ cameraView.RevertCamera();
	3180	+ cameraView.repaint();
	3181	+ return;
	3182	+ // } else if (event.getSource() == textureButton)
	3183	+ // {
	3184	+ // return; // true;
	3185	+ }
3018	3186	else
3019	3187	{
3020	3188	//return super.action(event, arg);
..	..	@@ -3075,6 +3243,28 @@
3075	3243	refreshContents();
3076	3244	}
3077	3245
	3246	+ void TransformChildren()
	3247	+ {
	3248	+ Object3D obj;
	3249	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3250	+ {
	3251	+ obj = (Object3D)e.nextElement();
	3252	+ obj.KeepTextureMatrices();
	3253	+ obj.TransformChildren();
	3254	+ obj.RestoreTextureMatrices();
	3255	+
	3256	+// if (obj.parent == null)
	3257	+// {
	3258	+// System.out.println("NULL PARENT!");
	3259	+// new Exception().printStackTrace();
	3260	+// }
	3261	+// else
	3262	+// TouchTransform(obj);
	3263	+// //obj.parent.Touch();
	3264	+ }
	3265	+
	3266	+ refreshContents();
	3267	+ }
3078	3268
3079	3269	void ResetTransform()
3080	3270	{
..	..	@@ -3187,7 +3377,7 @@
3187	3377	refreshContents();
3188	3378	}
3189	3379
3190		- void ResetCentroid()
	3380	+ void ResetCentroid(boolean full)
3191	3381	{
3192	3382	Object3D obj;
3193	3383	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3202,12 +3392,16 @@
3202	3392	LA.matIdentity(Object3D.mat);
3203	3393	obj.getBounds(minima, maxima, false);
3204	3394	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3205		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3395	+ if (full)
	3396	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3206	3397	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3207	3398	obj.TransformMesh(Object3D.mat);
	3399	+
3208	3400	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3209		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3401	+ if (full)
	3402	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3210	3403	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3404	+
3211	3405	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3212	3406	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3213	3407	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3236,7 +3430,8 @@
3236	3430
3237	3431	int size = obj.MemorySize();
3238	3432
3239		- System.err.println((size/1024) + " KB is the size of " + obj);
	3433	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3434	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3240	3435	}
3241	3436	}
3242	3437	catch (Exception e)
..	..	@@ -3273,9 +3468,9 @@
3273	3468	obj = (Object3D)e.nextElement();
3274	3469
3275	3470	System.out.println("Object is: " + obj);
3276		- GrafreeD.AnalyzeObject(obj);
	3471	+ Grafreed.AnalyzeObject(obj);
3277	3472	System.out.println("Boundary rep: " + obj.bRep);
3278		- GrafreeD.AnalyzeObject(obj.bRep);
	3473	+ Grafreed.AnalyzeObject(obj.bRep);
3279	3474
3280	3475	// System.err.println((size/1024) + " KB is the size of " + obj);
3281	3476	}
..	..	@@ -3317,6 +3512,13 @@
3317	3512	void GenNormals(boolean crease)
3318	3513	{
3319	3514	group.GenNormalsS(crease);
	3515	+
	3516	+ refreshContents();
	3517	+ }
	3518	+
	3519	+ void GenNormalsMESH()
	3520	+ {
	3521	+ group.GenNormalsMeshS();
3320	3522
3321	3523	refreshContents();
3322	3524	}
..	..	@@ -3489,8 +3691,8 @@
3489	3691
3490	3692	void ParseVertices()
3491	3693	{
3492		- boolean epsequal = GrafreeD.epsequal;
3493		- GrafreeD.epsequal = true;
	3694	+ boolean epsequal = Grafreed.epsequal;
	3695	+ Grafreed.epsequal = true;
3494	3696
3495	3697	for (int i=0; i<group.selection.size(); i++)
3496	3698	{
..	..	@@ -3515,7 +3717,7 @@
3515	3717	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3516	3718	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3517	3719
3518		- g.add(GrafreeD.clipboard);
	3720	+ g.add(Grafreed.clipboard);
3519	3721
3520	3722	buffer.add(g);
3521	3723	}
..	..	@@ -3530,7 +3732,7 @@
3530	3732	makeSomething(buffer, i==group.selection.size()-1);
3531	3733	}
3532	3734
3533		- GrafreeD.epsequal = epsequal;
	3735	+ Grafreed.epsequal = epsequal;
3534	3736
3535	3737	refreshContents();
3536	3738	}
..	..	@@ -3548,7 +3750,16 @@
3548	3750	String pigment = Object3D.GetPigment(tex);
3549	3751	//String bump = Object3D.GetBump(tex);
3550	3752
3551		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3753	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	3754	+
	3755	+ try
	3756	+ {
	3757	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3758	+ }
	3759	+ catch (Exception e)
	3760	+ {
	3761	+ System.err.println("FAIL: " + node);
	3762	+ }
3552	3763
3553	3764	double s = v.s;
3554	3765
..	..	@@ -3636,11 +3847,11 @@
3636	3847
3637	3848	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3638	3849
3639		- boolean random = CameraPane.RANDOM;
3640		- CameraPane.RANDOM = false; // parse all random nodes
	3850	+ boolean random = CameraPane.SWITCH;
	3851	+ CameraPane.SWITCH = false; // parse all random nodes
3641	3852	lowres.linkVerticesThis(null);
3642	3853	lowres.linkVerticesThis(sn);
3643		- CameraPane.RANDOM = random;
	3854	+ CameraPane.SWITCH = random;
3644	3855
3645	3856	System.err.flush();
3646	3857
..	..	@@ -3680,7 +3891,7 @@
3680	3891	return;
3681	3892
3682	3893	Object3D poses = group.selection.get(0);
3683		- Object3D ref = GrafreeD.clipboard.get(0);
	3894	+ Object3D ref = Grafreed.clipboard.get(0);
3684	3895
3685	3896	Object3D newgroup = new Object3D("Po:" + poses.name);
3686	3897
..	..	@@ -3874,9 +4085,9 @@
3874	4085
3875	4086	void ClipMesh()
3876	4087	{
3877		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4088	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3878	4089	{
3879		- Object3D content = GrafreeD.clipboard.get(0);
	4090	+ Object3D content = Grafreed.clipboard.get(0);
3880	4091
3881	4092	if (content instanceof cGroup && ((cGroup)content).transientlink )
3882	4093	content = ((cGroup)content).get(0);
..	..	@@ -3885,7 +4096,7 @@
3885	4096	// {
3886	4097	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3887	4098	// }
3888		- group.selection.ClipMesh(GrafreeD.clipboard);
	4099	+ group.selection.ClipMesh(Grafreed.clipboard);
3889	4100	}
3890	4101	// group.selection.ClipMesh(GrafreeD.clipboard);
3891	4102	System.out.println("DONE.");
..	..	@@ -4020,7 +4231,7 @@
4020	4231	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4021	4232
4022	4233	Object3D elem = (Object3D)group.selection.elementAt(i);
4023		- if(elem != group)
	4234	+ if(elem != group \|\| !newWindow)
4024	4235	{
4025	4236	// if (!(elem instanceof Composite))
4026	4237	// newWindow = false;
..	..	@@ -4110,7 +4321,6 @@
4110	4321	//case 702: // Event.LIST_DESELECT
4111	4322	group.deselectAll();
4112	4323	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4113		- objEditor.ClearInfo(); // .GetMaterial());
4114	4324	if (tps != null)
4115	4325	{
4116	4326	for (int i=0; i < tps.length; i++)
..	..	@@ -4119,29 +4329,28 @@
4119	4329
4120	4330	//if (child.parent != null)
4121	4331	//child.parent.addSelectee(child);
	4332	+ objEditor.SetMaterial(child);
4122	4333	group.addSelectee(child);
4123		- objEditor.SetMaterial(child); // .GetMaterial());
4124		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4125		- System.err.println("info : " + child.GetPath());
4126	4334	}
4127	4335	}
4128		- else
4129		- {
4130		- objEditor.SetMaterial(group); // .GetMaterial());
4131		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4132		- System.err.println("info : " + group.GetPath());
4133		- }
	4336	+// else
	4337	+// {
	4338	+// objEditor.SetMaterial(group); // .GetMaterial());
	4339	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4340	+// System.err.println("info : " + group.GetPath());
	4341	+// }
4134	4342
4135		- objEditor.SetText(); // jan 2014
4136		-
4137		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4343	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4138	4344	CameraPane.flash = true;
4139	4345
4140		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4346	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4141	4347	// a camera
4142	4348	{
4143		- CameraPane.camerachangeframe = 0; // don't refuse it
4144		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4349	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4350	+ {
	4351	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4352	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4353	+ }
4145	4354	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4146	4355	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4147	4356	}
..	..	@@ -4154,6 +4363,26 @@
4154	4363
4155	4364	freezemodel = false;
4156	4365	}
	4366	+
	4367	+ void refreshContents(boolean cp)
	4368	+ {
	4369	+ if (!Globals.MOUSEDRAGGED)
	4370	+ {
	4371	+ objEditor.ClearInfo(); // .GetMaterial());
	4372	+
	4373	+ for (int i=0; i < group.selection.Size(); i++)
	4374	+ {
	4375	+ Object3D child = (Object3D) group.selection.get(i);
	4376	+
	4377	+ objEditor.AddInfo(child, this, true);
	4378	+ System.err.println("info : " + child.GetPath());
	4379	+ }
	4380	+
	4381	+ objEditor.SetText(); // jan 2014
	4382	+ }
	4383	+
	4384	+ super.refreshContents(cp);
	4385	+ }
4157	4386
4158	4387	void linkSomething(Object3D thing)
4159	4388	{
..	..	@@ -4225,16 +4454,18 @@
4225	4454	{
4226	4455	if (group.selection.isEmpty())
4227	4456	return;
4228		- GrafreeD.clipboardIsTempGroup = false;
	4457	+
	4458	+ Grafreed.clipboardIsTempGroup = false;
4229	4459	Composite tGroup = null;
4230	4460	if (group.selection.size() > 0) // 1)
4231	4461	{
4232	4462	tGroup = new cGroup();
4233		- GrafreeD.clipboardIsTempGroup = true;
	4463	+ Grafreed.clipboardIsTempGroup = true;
4234	4464	}
4235	4465
4236	4466	if (cut)
4237	4467	{
	4468	+ Save();
4238	4469	//int indices[] = jList.getSelectedIndices();
4239	4470	//for (int i = indices.length - 1; i >= 0; i--)
4240	4471	//jList.remove(indices[i]);
..	..	@@ -4270,16 +4501,16 @@
4270	4501	//System.out.println("cut " + child);
4271	4502	//System.out.println("parent = " + child.parent);
4272	4503	// tmp.addChild(child);
4273		- if (GrafreeD.clipboardIsTempGroup)
	4504	+ if (Grafreed.clipboardIsTempGroup)
4274	4505	tGroup.add/Child/(tmp);
4275	4506	else
4276		- GrafreeD.clipboard = tmp;
	4507	+ Grafreed.clipboard = tmp;
4277	4508	}
4278	4509	else
4279		- if (GrafreeD.clipboardIsTempGroup)
	4510	+ if (Grafreed.clipboardIsTempGroup)
4280	4511	tGroup.add/Child/(child);
4281	4512	else
4282		- GrafreeD.clipboard = child;
	4513	+ Grafreed.clipboard = child;
4283	4514	}
4284	4515
4285	4516	//ResetModel();
..	..	@@ -4311,21 +4542,23 @@
4311	4542	//System.out.println("cut " + elem);
4312	4543	//System.out.println("parent = " + elem.parent);
4313	4544	// tmp.addChild(elem);
4314		- if (GrafreeD.clipboardIsTempGroup)
	4545	+ if (Grafreed.clipboardIsTempGroup)
4315	4546	tGroup.add/Child/(tmp);
4316	4547	else
4317		- GrafreeD.clipboard = tmp;
	4548	+ Grafreed.clipboard = tmp;
4318	4549	}
4319	4550	else
4320		- if (GrafreeD.clipboardIsTempGroup)
	4551	+ if (Grafreed.clipboardIsTempGroup)
4321	4552	tGroup.add/Child/(child);
4322	4553	else
4323		- GrafreeD.clipboard = child;
	4554	+ Grafreed.clipboard = child;
4324	4555	}
4325	4556
4326	4557	}
4327		- if (GrafreeD.clipboardIsTempGroup)
4328		- GrafreeD.clipboard = tGroup;
	4558	+
	4559	+ if (Grafreed.clipboardIsTempGroup)
	4560	+ Grafreed.clipboard = tGroup;
	4561	+
4329	4562	if (cut)
4330	4563	{
4331	4564	ResetModel();
..	..	@@ -4339,7 +4572,7 @@
4339	4572	// return;
4340	4573	boolean first = true;
4341	4574
4342		- if (GrafreeD.clipboardIsTempGroup)
	4575	+ if (Grafreed.clipboardIsTempGroup)
4343	4576	{
4344	4577	Composite temp;
4345	4578
..	..	@@ -4350,7 +4583,7 @@
4350	4583	temp = (Composite)Applet3D.clipboard.deepCopy();
4351	4584	*/
4352	4585	Object3D elem;
4353		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4586	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4354	4587	{
4355	4588	Object3D child = (Object3D)e.nextElement();
4356	4589
..	..	@@ -4384,21 +4617,21 @@
4384	4617	//Object3D cb = Applet3D.clipboard;
4385	4618	//temp.addChild(cb);
4386	4619	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4387		- assert(GrafreeD.clipboard.parent == null);
4388		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4389		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4390		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4391		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	4620	+ assert(Grafreed.clipboard.parent == null);
	4621	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4622	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4623	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4624	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4392	4625	else
4393		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4394		- GrafreeD.clipboard.get(0).parent = keepparent;
	4626	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4627	+ Grafreed.clipboard.get(0).parent = keepparent;
4395	4628	}
4396	4629
4397	4630	ResetModel();
4398	4631	refreshContents();
4399	4632	}
4400	4633
4401		- void pasteInto(boolean copyit)
	4634	+ void pasteInto(boolean copyit, boolean clone)
4402	4635	{
4403	4636	// if (GrafreeD.clipboard == null)
4404	4637	// return;
..	..	@@ -4427,15 +4660,22 @@
4427	4660	if (copyit)
4428	4661	{
4429	4662	// paste(false);
4430		- CloneClipboard(false); // sept 2014
	4663	+ if (clone)
	4664	+ {
	4665	+ CloneClipboard(false); // sept 2014
	4666	+ }
	4667	+ else
	4668	+ {
	4669	+ paste(false);
	4670	+ }
4431	4671	}
4432	4672	else
4433	4673	{
4434	4674	boolean first = true;
4435	4675
4436		- if (GrafreeD.clipboardIsTempGroup)
	4676	+ if (Grafreed.clipboardIsTempGroup)
4437	4677	{
4438		- Composite temp = (Composite)GrafreeD.clipboard;
	4678	+ Composite temp = (Composite)Grafreed.clipboard;
4439	4679	Object3D copy;
4440	4680	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4441	4681	{
..	..	@@ -4445,7 +4685,7 @@
4445	4685	}
4446	4686	} else
4447	4687	{
4448		- linkSomething(GrafreeD.clipboard); //.get(0));
	4688	+ linkSomething(Grafreed.clipboard); //.get(0));
4449	4689	}
4450	4690	}
4451	4691	}
..	..	@@ -4850,21 +5090,6 @@
4850	5090	}
4851	5091	*/
4852	5092
4853		- void ImportGFD()
4854		- {
4855		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4856		- browser.show();
4857		- String filename = browser.getFile();
4858		- if (filename != null && filename.length() > 0)
4859		- {
4860		- String fullname = browser.getDirectory() + filename;
4861		-
4862		- //Object3D readobj =
4863		- objEditor.ReadGFD(fullname, objEditor);
4864		- //makeSomething(readobj);
4865		- }
4866		- }
4867		-
4868	5093	/*
4869	5094	public void Callback(Object obj)
4870	5095	{
..	..	@@ -4888,26 +5113,9 @@
4888	5113	}
4889	5114	*/
4890	5115
4891		- void ImportVRMLX3D()
4892		- {
4893		- if (GrafreeD.standAlone)
4894		- {
4895		- /**/
4896		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4897		- browser.show();
4898		- String filename = browser.getFile();
4899		- if (filename != null && filename.length() > 0)
4900		- {
4901		- String fullname = browser.getDirectory() + filename;
4902		- LoadVRMLX3D(fullname);
4903		- }
4904		- /**/
4905		- }
4906		- }
4907		-
4908	5116	String GetFile(String dialogName)
4909	5117	{
4910		- if (GrafreeD.standAlone)
	5118	+ if (Grafreed.standAlone)
4911	5119	{
4912	5120	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4913	5121	browser.show();
..	..	@@ -4971,10 +5179,15 @@
4971	5179	cButton flashSelectionButton;
4972	5180	cButton editButton;
4973	5181	cButton uneditButton;
	5182	+ JCheckBox allParamsButton;
4974	5183	cButton clearpanelButton;
4975		- cButton allParamsButton;
4976	5184	cButton unselectButton;
4977	5185
	5186	+ cButton saveButton;
	5187	+ cButton undoButton;
	5188	+ cButton redoButton;
	5189	+ cButton oneStepButton;
	5190	+
4978	5191	cButton screenfitButton;
4979	5192	cButton screenfitpointButton;
4980	5193	cButton snapobjectButton;
..	..	@@ -5005,6 +5218,8 @@
5005	5218	private MenuItem lookFromItem;
5006	5219	private MenuItem switchItem;
5007	5220	private MenuItem cutItem;
	5221	+ private MenuItem undoItem;
	5222	+ private MenuItem redoItem;
5008	5223	private MenuItem duplicateItem;
5009	5224	private MenuItem cloneItem;
5010	5225	private MenuItem cloneSupportItem;
..	..	@@ -5018,7 +5233,7 @@
5018	5233	private MenuItem linkverticesItem;
5019	5234	private MenuItem relinkverticesItem;
5020	5235	private MenuItem setMasterItem;
5021		- private MenuItem resetMeshItem;
	5236	+ private MenuItem resetAllItem;
5022	5237	private MenuItem stepAllItem;
5023	5238	private MenuItem revertMeshItem;
5024	5239	private MenuItem poseMeshItem;
..	..	@@ -5029,6 +5244,7 @@
5029	5244	private MenuItem mergeGeometriesItem;
5030	5245	private MenuItem copyItem;
5031	5246	private MenuItem pasteItem;
	5247	+ private MenuItem pasteIntoItem;
5032	5248	private MenuItem pasteLinkItem;
5033	5249	private MenuItem pasteCloneItem;
5034	5250	private MenuItem pasteExpandItem;
..	..	@@ -5078,8 +5294,10 @@
5078	5294	private MenuItem panoTexturesItem;
5079	5295
5080	5296	private MenuItem resetCentroidItem;
5081		- private MenuItem transformgeometryItem;
	5297	+ private MenuItem resetCentroidXZItem;
5082	5298	private MenuItem resetTransformItem;
	5299	+ private MenuItem transformGeometryItem;
	5300	+ private MenuItem transformChildrenItem;
5083	5301	private MenuItem hideItem;
5084	5302	private MenuItem grabItem;
5085	5303	private MenuItem backItem;
..	..	@@ -5126,7 +5344,7 @@
5126	5344	private MenuItem blobItem;
5127	5345	private MenuItem latheItem;
5128	5346	private MenuItem bezierItem;
5129		- private MenuItem checkerItem;
	5347	+ private MenuItem overlayItem;
5130	5348	private MenuItem meshItem;
5131	5349	// private MenuItem meshGroupItem;
5132	5350	private MenuItem springItem;
..	..	@@ -5148,11 +5366,6 @@
5148	5366	private MenuItem doubleItem;
5149	5367	private MenuItem tripleItem;
5150	5368
5151		- private MenuItem importGFDItem;
5152		- private MenuItem importVRMLX3DItem;
5153		- private MenuItem import3DSItem;
5154		- private MenuItem importOBJItem;
5155		-
5156	5369	private MenuItem computeAOItem;
5157	5370	private MenuItem recompileItem;
5158	5371	private MenuItem editScriptItem;
..	..	@@ -5162,4 +5375,8 @@
5162	5375	private MenuItem analyzeItem;
5163	5376	private MenuItem dumpItem;
5164	5377	//boolean freezemodel = false;
	5378	+
	5379	+ Menu cameraMenu;
	5380	+ MenuItem editCameraItem;
	5381	+ MenuItem revertCameraItem;
5165	5382	}