~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -74,7 +74,7 @@
74	74	this.copy = this.group = copy;
75	75	//selectees = this.group.selectees;
76	76
77		- SetupMenu2(objEditor);
	77	+ SetupMenu2(this); //objEditor);
78	78	SetupUI2(objEditor);
79	79	objEditor.SetupUI(true);
80	80	SetupViews(objEditor);
..	..	@@ -98,14 +98,14 @@
98	98
99	99	void CloneClipboard(boolean supports)
100	100	{
101		- assert(GrafreeD.clipboard.parent == null);
102		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
103		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
104		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
105		- makeSomething(CloneObject(GrafreeD.clipboard.get(0), false));
	101	+ assert(Grafreed.clipboard.parent == null);
	102	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	103	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	104	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	105	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
106	106	else
107		- makeSomething(CloneObject(GrafreeD.clipboard, false));
108		- GrafreeD.clipboard.get(0).parent = keepparent;
	107	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	108	+ Grafreed.clipboard.get(0).parent = keepparent;
109	109	}
110	110
111	111	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -119,7 +119,7 @@
119	119	// obj.support = null;
120	120	if (!supports)
121	121	obj.SaveSupports();
122		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	122	+ Object3D clone = (Object3D)Grafreed.clone(obj);
123	123	obj.parent = parent;
124	124	// obj.support = support;
125	125	// clone.support = support; // aout 2013
..	..	@@ -148,8 +148,130 @@
148	148
149	149	//JTextField nameField;
150	150
151		- void SetupMenu2(ObjEditor oe)
	151	+ void SetupMenu2(GroupEditor oe)
152	152	{
	153	+ Menu menu;
	154	+ oe.menuBar.add(menu = new Menu("Edit"));
	155	+ //editItem = menu.add(new MenuItem("Edit"));
	156	+ //editItem.addActionListener(this);
	157	+
	158	+// undoItem = menu.add(new MenuItem("Undo"));
	159	+// undoItem.addActionListener(this);
	160	+// redoItem = menu.add(new MenuItem("Redo"));
	161	+// redoItem.addActionListener(this);
	162	+// menu.add("-");
	163	+ duplicateItem = menu.add(new MenuItem("Duplicate"));
	164	+ duplicateItem.addActionListener(this);
	165	+ cloneItem = menu.add(new MenuItem("Clone"));
	166	+ cloneItem.addActionListener(this);
	167	+ if (Globals.ADVANCED)
	168	+ {
	169	+ cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
	170	+ cloneSupportItem.addActionListener(this);
	171	+ }
	172	+ menu.add("-");
	173	+ cutItem = menu.add(new MenuItem("Cut"));
	174	+ cutItem.addActionListener(this);
	175	+ copyItem = menu.add(new MenuItem("Copy"));
	176	+ copyItem.addActionListener(this);
	177	+ pasteItem = menu.add(new MenuItem("Paste"));
	178	+ pasteItem.addActionListener(this);
	179	+ menu.add("-");
	180	+
	181	+ menu.add("-");
	182	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	183	+ pasteIntoItem.addActionListener(this);
	184	+ pasteLinkItem = menu.add(new MenuItem("Paste link"));
	185	+ pasteLinkItem.addActionListener(this);
	186	+ pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	187	+ pasteCloneItem.addActionListener(this);
	188	+// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	189	+// pasteExpandItem.addActionListener(this);
	190	+ menu.add("-");
	191	+ clearItem = menu.add(new MenuItem("Clear"));
	192	+ clearItem.addActionListener(this);
	193	+
	194	+ if (Globals.ADVANCED)
	195	+ {
	196	+ // Deletes the cameras...
	197	+ clearAllItem = menu.add(new MenuItem("Clear All"));
	198	+ clearAllItem.addActionListener(this);
	199	+ }
	200	+
	201	+ menuBar.add(cameraMenu = new Menu("View"));
	202	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	203	+ //zBufferItem.addActionListener(this);
	204	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	205	+ //normalLensItem.addActionListener(this);
	206	+ cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
	207	+ revertCameraItem.addActionListener(this);
	208	+
	209	+ cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	210	+ toggleFullScreenItem.addItemListener(this);
	211	+ toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	212	+ cameraMenu.add("-");
	213	+
	214	+ cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	215	+ toggleTextureItem.addItemListener(this);
	216	+ toggleTextureItem.setState(CameraPane.textureon);
	217	+
	218	+ cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	219	+ toggleSwitchItem.addItemListener(this);
	220	+ toggleSwitchItem.setState(CameraPane.SWITCH);
	221	+
	222	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	223	+ toggleHandleItem.addItemListener(this);
	224	+ toggleHandleItem.setState(CameraPane.HANDLES);
	225	+
	226	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	227	+ togglePaintItem.addItemListener(this);
	228	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	229	+
	230	+ if (Globals.ADVANCED)
	231	+ {
	232	+ cameraMenu.add("-");
	233	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	234	+ toggleLiveItem.addItemListener(this);
	235	+ toggleLiveItem.setState(Globals.isLIVE());
	236	+
	237	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	238	+ stepItem.addActionListener(this);
	239	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	240	+ // toggleDLItem.addItemListener(this);
	241	+ // toggleDLItem.setState(false);
	242	+
	243	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	244	+ toggleRenderItem.addItemListener(this);
	245	+ toggleRenderItem.setState(!CameraPane.frozen);
	246	+
	247	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	248	+ toggleDebugItem.addItemListener(this);
	249	+ toggleDebugItem.setState(Globals.DEBUG);
	250	+
	251	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	252	+ toggleFrustumItem.addItemListener(this);
	253	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	254	+
	255	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	256	+ toggleFootContactItem.addItemListener(this);
	257	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	258	+
	259	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	260	+ toggleTimelineItem.addItemListener(this);
	261	+ }
	262	+
	263	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	264	+// toggleRootItem.addItemListener(this);
	265	+// toggleRootItem.setState(false);
	266	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	267	+// animationItem.addItemListener(this);
	268	+// animationItem.setState(CameraPane.ANIMATION);
	269	+ cameraMenu.add("-");
	270	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	271	+ editCameraItem.addActionListener(this);
	272	+
	273	+ if (Globals.ADVANCED)
	274	+ {
153	275	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
154	276	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
155	277	//cameraMenu.add(switchItem = new MenuItem("Reverse View"));
..	..	@@ -161,45 +283,17 @@
161	283	lookAtItem.addActionListener(this);
162	284	//lookFromItem.addActinoListener(this);
163	285	//switchItem.addActionListener(this);
164		- Menu menu;
165		- oe.menuBar.add(menu = new Menu("Edit"));
166		- //editItem = menu.add(new MenuItem("Edit"));
167		- //editItem.addActionListener(this);
168		- duplicateItem = menu.add(new MenuItem("Duplicate"));
169		- duplicateItem.addActionListener(this);
170		- menu.add("-");
171		- cloneItem = menu.add(new MenuItem("Clone"));
172		- cloneItem.addActionListener(this);
173		- cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
174		- cloneSupportItem.addActionListener(this);
175		- menu.add("-");
176		- cutItem = menu.add(new MenuItem("Cut"));
177		- cutItem.addActionListener(this);
178		- copyItem = menu.add(new MenuItem("Copy"));
179		- copyItem.addActionListener(this);
180		- pasteItem = menu.add(new MenuItem("Paste"));
181		- pasteItem.addActionListener(this);
182		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
183		- pasteLinkItem.addActionListener(this);
184		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
185		- pasteCloneItem.addActionListener(this);
186		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
187		-// pasteExpandItem.addActionListener(this);
188		- clearItem = menu.add(new MenuItem("Clear"));
189		- clearItem.addActionListener(this);
190		- clearAllItem = menu.add(new MenuItem("Clear All"));
191		- clearAllItem.addActionListener(this);
192		-
	286	+ }
	287	+
193	288	oe.menuBar.add(menu = new Menu("Setting"));
194		- resetMeshItem = menu.add(new MenuItem("Reset All"));
195		- resetMeshItem.addActionListener(this);
196		- stepAllItem = menu.add(new MenuItem("Step All"));
197		- stepAllItem.addActionListener(this);
	289	+ if (Globals.ADVANCED)
	290	+ {
198	291	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
199	292	revertMeshItem.addActionListener(this);
200	293	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
201	294	resetreferencesItem.addActionListener(this);
202	295	menu.add("-");
	296	+ }
203	297	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
204	298	overwriteGeoItem.addActionListener(this);
205	299	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -211,19 +305,26 @@
211	305	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
212	306	overwriteUVItem.addActionListener(this);
213	307	menu.add("-");
	308	+ if (Globals.ADVANCED)
	309	+ {
214	310	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
215	311	generateMeshItem.addActionListener(this);
216	312	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
217	313	poseMeshItem.addActionListener(this);
218	314	menu.add("-");
	315	+ }
219	316	resetsupportItem = menu.add(new MenuItem("Reset support"));
220	317	resetsupportItem.addActionListener(this);
221	318	linkverticesItem = menu.add(new MenuItem("Link to Support"));
222	319	linkverticesItem.addActionListener(this);
223	320	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
224	321	relinkverticesItem.addActionListener(this);
	322	+
	323	+ if (Globals.ADVANCED)
	324	+ {
225	325	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
226	326	setMasterItem.addActionListener(this);
	327	+ }
227	328
228	329	oe.menuBar.add(menu = new Menu("Group"));
229	330	grabItem = menu.add(new MenuItem("Grab"));
..	..	@@ -234,27 +335,32 @@
234	335	frontItem.addActionListener(this);
235	336	compositeItem = menu.add(new MenuItem("Composite"));
236	337	compositeItem.addActionListener(this);
237		- hideItem = menu.add(new MenuItem("Hide"));
	338	+ hideItem = menu.add(new MenuItem("Hidden Group"));
238	339	hideItem.addActionListener(this);
239	340	ungroupItem = menu.add(new MenuItem("Ungroup"));
240	341	ungroupItem.addActionListener(this);
241	342	menu.add("-");
242		- randomItem = menu.add(new MenuItem("Random"));
	343	+ randomItem = menu.add(new MenuItem("Switch node"));
243	344	randomItem.addActionListener(this);
244		- physicsItem = menu.add(new MenuItem("Physics"));
245		- physicsItem.addActionListener(this);
246		- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
247		- frameselectorItem.addActionListener(this);
248	345	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
249	346	switchGeoItem.addActionListener(this);
250	347	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
251	348	switchTransfoItem.addActionListener(this);
252		- morphItem = menu.add(new MenuItem("Morph"));
	349	+ morphItem = menu.add(new MenuItem("Morph Group"));
253	350	morphItem.addActionListener(this);
	351	+
	352	+ if (Globals.ADVANCED)
	353	+ {
	354	+ menu.add("-");
	355	+ physicsItem = menu.add(new MenuItem("Physics"));
	356	+ physicsItem.addActionListener(this);
	357	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	358	+ frameselectorItem.addActionListener(this);
254	359	scriptNodeItem = menu.add(new MenuItem("Script Node"));
255	360	scriptNodeItem.addActionListener(this);
256	361	cameraItem = menu.add(new MenuItem("Camera"));
257	362	cameraItem.addActionListener(this);
	363	+ }
258	364
259	365	oe.menuBar.add(menu = new Menu("Object"));
260	366	textureItem = menu.add(new MenuItem("Texture"));
..	..	@@ -269,21 +375,29 @@
269	375	shadowYItem.addActionListener(this);
270	376	shadowZItem = menu.add(new MenuItem("Shadow Z"));
271	377	shadowZItem.addActionListener(this);
	378	+ if (Globals.ADVANCED)
	379	+ {
	380	+ menu.add("-");
272	381	linkerItem = menu.add(new MenuItem("Linker"));
273	382	linkerItem.addActionListener(this);
274		- templateItem = menu.add(new MenuItem("Template"));
275		- templateItem.addActionListener(this);
276	383	attributeItem = menu.add(new MenuItem("Attribute"));
277	384	attributeItem.addActionListener(this);
	385	+ templateItem = menu.add(new MenuItem("Template"));
	386	+ templateItem.addActionListener(this);
278	387	pointflowItem = menu.add(new MenuItem("Point Flow"));
279	388	pointflowItem.addActionListener(this);
	389	+ }
280	390	menu.add("-");
281	391	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
282	392	resetTransformItem.addActionListener(this);
283	393	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
284	394	resetCentroidItem.addActionListener(this);
285		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
286		- transformgeometryItem.addActionListener(this);
	395	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	396	+ resetCentroidXZItem.addActionListener(this);
	397	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	398	+ transformGeometryItem.addActionListener(this);
	399	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	400	+ transformChildrenItem.addActionListener(this);
287	401
288	402	oe.menuBar.add(menu = new Menu("Geometry"));
289	403	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -294,8 +408,11 @@
294	408	genNormalsCADItem.addActionListener(this);
295	409	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
296	410	genNormalsMESHItem.addActionListener(this);
	411	+ if (Globals.ADVANCED)
	412	+ {
297	413	genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
298	414	genNormalsMINEItem.addActionListener(this);
	415	+ }
299	416	stripifyItem = menu.add(new MenuItem("Stripify"));
300	417	stripifyItem.addActionListener(this);
301	418	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -317,23 +434,34 @@
317	434	reduce34MeshItem.addActionListener(this);
318	435	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
319	436	increaseMeshItem.addActionListener(this);
320		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
321		- smoothMeshItem.addActionListener(this);
322	437	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
323	438	clipMeshItem.addActionListener(this);
	439	+
	440	+ if (Globals.ADVANCED)
	441	+ {
	442	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	443	+ smoothMeshItem.addActionListener(this);
	444	+ }
324	445
325	446	oe.menuBar.add(menu = new Menu("Attributes"));
326	447	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
327	448	clearMaterialsItem.addActionListener(this);
	449	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	450	+ resetAllItem.addActionListener(this);
	451	+ stepAllItem = menu.add(new MenuItem("Step All"));
	452	+ stepAllItem.addActionListener(this);
328	453	menu.add("-");
329	454	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
330	455	liveleavesItem.addActionListener(this);
331	456	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
332	457	unliveleavesItem.addActionListener(this);
	458	+ if (Globals.ADVANCED)
	459	+ {
333	460	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
334	461	supportleavesItem.addActionListener(this);
335	462	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
336	463	unsupportleavesItem.addActionListener(this);
	464	+ }
337	465	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
338	466	hideleavesItem.addActionListener(this);
339	467	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -342,6 +470,14 @@
342	470	markleavesItem.addActionListener(this);
343	471	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
344	472	unmarkleavesItem.addActionListener(this);
	473	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	474	+ rewindleavesItem.addActionListener(this);
	475	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	476	+ unrewindleavesItem.addActionListener(this);
	477	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	478	+ randomleavesItem.addActionListener(this);
	479	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	480	+ unrandomleavesItem.addActionListener(this);
345	481	menu.add("-");
346	482	flipVItem = menu.add(new MenuItem("Flip V"));
347	483	flipVItem.addActionListener(this);
..	..	@@ -377,35 +513,40 @@
377	513	sortbynameItem = menu.add(new MenuItem("Sort by name"));
378	514	sortbynameItem.addActionListener(this);
379	515	menu.add("-");
	516	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	517	+ shareGeometriesItem.addActionListener(this);
	518	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	519	+ mergeGeometriesItem.addActionListener(this);
	520	+ if (Globals.ADVANCED)
	521	+ {
	522	+ // Pretty much the same as duplicate and clone.
380	523	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
381	524	extractGeometriesItem.addActionListener(this);
382	525	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
383	526	cloneGeometriesItem.addActionListener(this);
384		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
385		- shareGeometriesItem.addActionListener(this);
386		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
387		- mergeGeometriesItem.addActionListener(this);
	527	+ }
388	528
389	529	oe.menuBar.add(menu = new Menu("Insert"));
390	530	buildCreateMenu(menu);
391	531
392		-
393		- oe.menuBar.add(menu = new Menu("Include"));
394		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
395		- importGFDItem.addActionListener(this);
396		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
397		- importVRMLX3DItem.addActionListener(this);
398		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
399		- importOBJItem.addActionListener(this);
400		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
401		- import3DSItem.addActionListener(this);
402		-
403	532	oe.menuBar.add(menu = new Menu("Tools"));
404	533	buildToolsMenu(menu);
405	534	}
406	535
407	536	void SetupUI2(ObjEditor oe)
408	537	{
	538	+ // June 2019
	539	+ if (oe == null)
	540	+ {
	541	+ //super.SetupUI2(this);
	542	+ //return;
	543	+ }
	544	+
	545	+ if (copy != group)
	546	+ {
	547	+ //super.SetupUI2(this);
	548	+ }
	549	+
409	550	//new Exception().printStackTrace();
410	551
411	552	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -434,110 +575,122 @@
434	575	oe.radioPanel.add(dummyButton);
435	576	oe.buttonGroup.add(dummyButton);
436	577	*/
437		- aConstraints.gridy += 1;
438		-
439	578	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
440	579
441		- oe.aConstraints.gridwidth = 1;
442		- oe.aConstraints.gridx = 0;
	580	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	581	+ //minButton.setToolTipText("Minimize window");
	582	+ //minButton.addActionListener(this);
443	583
444		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
445		- liveCB.setToolTipText("Enabled animation");
	584	+ oe.toolbarPanel.add(maxButton = new cButton("\u271A", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	585	+ maxButton.setToolTipText("Maximize window");
	586	+ maxButton.addActionListener(this);
	587	+
	588	+ oe.toolbarPanel.add(fullButton = new cButton("\u2b1c", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	589	+ fullButton.setToolTipText("Full-screen window");
	590	+ fullButton.addActionListener(this);
	591	+
	592	+ oe.toolbarPanel.add(undoButton = new cButton("\u21a9", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	593	+ undoButton.setToolTipText("Undo changes");
	594	+ undoButton.addActionListener(this);
	595	+
	596	+ oe.toolbarPanel.add(redoButton = new cButton("\u21aa", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	597	+ redoButton.setToolTipText("Redo changes");
	598	+ redoButton.addActionListener(this);
	599	+
	600	+ oe.toolbarPanel.add(saveButton = new cButton("\u21e3", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	601	+ saveButton.setToolTipText("Save changes");
	602	+ saveButton.addActionListener(this);
	603	+
	604	+ oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	605	+ liveCB.setToolTipText("Enable animation");
446	606	liveCB.addItemListener(this);
447	607
448		- oe.aConstraints.gridx += 1;
449		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK), oe.aConstraints);
	608	+ oe.toolbarPanel.add(oneStepButton = new cButton("\u29f4", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	609	+ oneStepButton.setToolTipText("Animate one step forward");
	610	+ oneStepButton.addActionListener(this);
	611	+
	612	+ oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	613	+ fastCB.setToolTipText("Fast mode");
	614	+ fastCB.addItemListener(this);
	615	+
	616	+ oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK)); //, oe.aConstraints);
450	617	trackCB.setToolTipText("Enable tracking");
451	618	trackCB.addItemListener(this);
452	619
453		- oe.aConstraints.gridx += 1;
454		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	620	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
455	621	screenfitButton.setToolTipText("Screen fit");
456	622	screenfitButton.addActionListener(this);
457		- oe.aConstraints.gridx += 1;
	623	+
458	624	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
459	625	// 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	626
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);
	627	+ if (Globals.ADVANCED)
	628	+ {
	629	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	630	+ snapobjectButton.addActionListener(this);
	631	+ snapobjectButton.setToolTipText("Snap Object");
	632	+ }
	633	+
	634	+ oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
472	635	flashSelectionButton.setToolTipText("Show selection");
473	636	flashSelectionButton.addActionListener(this);
474	637
475		- oe.toolbarPanel.add(new cButton(" ", false));
	638	+ oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
476	639
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);
	640	+ oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
483	641	twoButton.setToolTipText("Show center view only");
484	642	twoButton.addActionListener(this);
485		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	643	+ oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
486	644	fourButton.addActionListener(this);
487	645	fourButton.setToolTipText("Show left panel only");
488		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	646	+ oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
489	647	sixButton.setToolTipText("2-column layout left");
490	648	sixButton.addActionListener(this);
491		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	649	+ oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
492	650	threeButton.setToolTipText("2-column layout right");
493	651	threeButton.addActionListener(this);
494		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	652	+ oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
495	653	sevenButton.setToolTipText("3-column layout");
496	654	sevenButton.addActionListener(this);
497	655	//
498	656
499		- oe.toolbarPanel.add(rootButton = new cButton(" o o o ")); //, oe.aConstraints);
500		- rootButton.setToolTipText("Edit object in new tab");
	657	+ oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	658	+ rootButton.setToolTipText("Edit selection in new tab");
501	659	rootButton.addActionListener(this);
502		- oe.aConstraints.gridx += 1;
503		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	660	+
	661	+ oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
504	662	closeButton.setToolTipText("Close tab");
505	663	closeButton.addActionListener(this);
506	664	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
507	665	//clearButton.addActionListener(this);
508		- oe.aConstraints.gridx += 1;
509	666
510		- oe.aConstraints.gridx = 1; //
511		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
	667	+ cGridBag commandsPanel = new cGridBag();
	668	+
	669	+ commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	670	+ editButton.setToolTipText("Edit selection");
512	671	editButton.addActionListener(this);
513		- oe.aConstraints.gridx += 1;
514		- oe.aConstraints.weighty = 0;
515		- oe.aConstraints.gridwidth = 1;
516	672
517		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	673	+ commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	674	+ uneditButton.setToolTipText("Unedit selection");
518	675	uneditButton.addActionListener(this);
519	676
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);
	677	+ commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	678	+ allParamsButton.setToolTipText("Edit all params");
532	679	allParamsButton.addActionListener(this);
533	680
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);
	681	+ commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	682	+ clearPanelButton.setToolTipText("Clear edit panel");
	683	+ clearPanelButton.addActionListener(this);
	684	+
	685	+ commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	686	+ unselectButton.setToolTipText("Unselect");
539	687	unselectButton.addActionListener(this);
540	688
	689	+ commandsPanel.preferredHeight = 1;
	690	+
	691	+ oe.treePanel.add(commandsPanel);
	692	+ oe.treePanel.Return();
	693	+
541	694	// oe.aConstraints.gridx += 1;
542	695	// oe.aConstraints.weighty = 0;
543	696	// oe.aConstraints.gridwidth = 1;
..	..	@@ -549,40 +702,37 @@
549	702	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
550	703	// gcButton.addActionListener(this);
551	704
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;
	705	+ cGridBag jSPPanel = new cGridBag();
	706	+
	707	+ JScrollPane jSP;
563	708	//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);
	709	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
565	710	ResetModel();
566		- oe.aConstraints.weighty = 0.5;
567		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
568		- oe.aConstraints.gridy += 1;
569		- oe.aConstraints.gridwidth = 1;
	711	+
	712	+ oe.treePanel.add(jSPPanel);
	713	+ oe.treePanel.Return();
570	714
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);
	715	+ cGridBag copyOptionsPanel = new cGridBag();
	716	+
	717	+ copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	718	+ colorCB.setToolTipText("Copy color when dropped");
575	719	colorCB.addItemListener(this);
576		- oe.aConstraints.gridx += 2;
577		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
	720	+
	721	+ copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	722	+ materialCB.setToolTipText("Copy material when dropped");
578	723	materialCB.addItemListener(this);
579		- oe.aConstraints.gridx += 2;
580		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
	724	+
	725	+ copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	726	+ textureCB.setToolTipText("Copy texture when dropped");
581	727	textureCB.addItemListener(this);
582	728
583		- oe.aConstraints.gridx = 0;
584		- oe.aConstraints.gridy += 1;
	729	+ copyOptionsPanel.preferredHeight = 1;
	730	+ oe.treePanel.add(copyOptionsPanel);
	731	+ oe.treePanel.Return();
585	732
	733	+// mainPanel.setDividerLocation(0.5); //1.0);
	734	+// mainPanel.setResizeWeight(0.5);
	735	+
586	736	//jList.addListSelectionListener(this);
587	737	oe.jTree.addTreeSelectionListener(this);
588	738	//jTree.setRootVisible(false);
..	..	@@ -607,43 +757,35 @@
607	757
608	758	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
609	759	{
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	760	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
640	761	boxCB.setToolTipText("Display bounding boxes");
641	762	boxCB.addItemListener(this);
642		- //constraints.gridy += 1;
	763	+
643	764	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
644	765	zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
645	766	zoomBoxCB.addItemListener(this);
646	767
	768	+ if (true) // Globals.ADVANCED)
	769	+ {
	770	+ panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	771	+ supportCB.setToolTipText("Enable rigging");
	772	+ supportCB.addItemListener(this);
	773	+
	774	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	775	+ // localCB.addItemListener(this);
	776	+
	777	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	778	+ crowdCB.setToolTipText("Used for crowds");
	779	+ crowdCB.addItemListener(this);
	780	+
	781	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	782	+ smoothCB.setToolTipText("Snapping delay");
	783	+ smoothCB.addItemListener(this);
	784	+
	785	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	786	+ slowCB.setToolTipText("Smooth interpolation");
	787	+ slowCB.addItemListener(this);
	788	+
647	789	// constraints.gridy += 1;
648	790	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
649	791	// speakerMocapCB.addItemListener(this);
..	..	@@ -668,14 +810,20 @@
668	810	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
669	811	// debugCB.addItemListener(this);
670	812
671		- //constraints.gridy += 1;
672	813	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
673	814	oeilCB.addItemListener(this);
674	815
675		- //constraints.gridy += 1;
676	816	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
677	817	lookAtCB.setToolTipText("Look-at target");
678	818	lookAtCB.addItemListener(this);
	819	+
	820	+ }
	821	+
	822	+ cGridBag fill = new cGridBag();
	823	+
	824	+ fill.preferredHeight = 200;
	825	+
	826	+ panel.add(fill);
679	827
680	828	}
681	829
..	..	@@ -690,8 +838,11 @@
690	838	buttonGroup.add(radioButton);
691	839	radioButton.doClick();
692	840	}
	841	+
693	842	void SetupViews(ObjEditor oe)
694	843	{
	844	+ theFrame = this;
	845	+
695	846	oe.SetupViews();
696	847
697	848	System.out.println("SetupViews");
..	..	@@ -754,6 +905,7 @@
754	905	} else if(e.getSource() == liveCB)
755	906	{
756	907	cameraView.ToggleLive();
	908	+ refreshContents(false);
757	909	}
758	910	else if(e.getSource() == supportCB)
759	911	{
..	..	@@ -906,7 +1058,9 @@
906	1058	// objEditor.DropFile((java.io.File[]) object, true);
907	1059	// return;
908	1060	// }
909		- if (string.charAt(0) == '/')
	1061	+
	1062	+ // File path for Mac and Windows
	1063	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
910	1064	{
911	1065	// file(s)
912	1066	String[] names = string.split("\n");
..	..	@@ -933,7 +1087,7 @@
933	1087
934	1088	flashIt = false;
935	1089	CameraPane pane = (CameraPane) target;
936		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1090	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
937	1091	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
938	1092
939	1093	if (group.selection.size() == 1)
..	..	@@ -960,11 +1114,11 @@
960	1114	{
961	1115	loadClipboard(true);
962	1116	objEditor.jTree.setSelectionPath(destinationPath);
963		- pasteInto(false);
	1117	+ pasteInto(false, false);
964	1118	} else {
965	1119	loadClipboard(false);
966	1120	objEditor.jTree.setSelectionPath(destinationPath);
967		- pasteInto(false); // true); // ???
	1121	+ pasteInto(false, false); // true); // ???
968	1122	}
969	1123	}
970	1124	public void dropActionChanged(DropTargetDragEvent dtde)
..	..	@@ -1086,27 +1240,33 @@
1086	1240	kleinItem.addActionListener(this);
1087	1241	particleItem = menu.add(new MenuItem("Particle system"));
1088	1242	particleItem.addActionListener(this);
	1243	+ if (Globals.ADVANCED)
	1244	+ {
1089	1245	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1090	1246	ragdollItem.addActionListener(this);
1091	1247	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1092	1248	ragdoll2Item.addActionListener(this);
	1249	+ }
1093	1250	menu.add("-");
1094		- meshItem = menu.add(new MenuItem("Mesh"));
	1251	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1095	1252	meshItem.addActionListener(this);
1096	1253	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1097	1254	// meshGroupItem.addActionListener(this);
	1255	+ if (Globals.ADVANCED)
	1256	+ {
1098	1257	springItem = menu.add(new MenuItem("Spring"));
1099	1258	springItem.addActionListener(this);
1100	1259	flagItem = menu.add(new MenuItem("Flag"));
1101	1260	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	1261	blobItem = menu.add(new MenuItem("Blob"));
1107	1262	blobItem.addActionListener(this);
1108	1263	latheItem = menu.add(new MenuItem("Lathe"));
1109	1264	latheItem.addActionListener(this);
	1265	+ }
	1266	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1267	+ bezierItem.addActionListener(this);
	1268	+ overlayItem = menu.add(new MenuItem("Overlay"));
	1269	+ overlayItem.addActionListener(this);
1110	1270	lightItem = menu.add(new MenuItem("Light"));
1111	1271	lightItem.addActionListener(this);
1112	1272	menu.add("-");
..	..	@@ -1116,39 +1276,44 @@
1116	1276	loopItem.addActionListener(this);
1117	1277	doubleItem = menu.add(new MenuItem("Fork"));
1118	1278	doubleItem.addActionListener(this);
	1279	+ if (Globals.ADVANCED)
	1280	+ {
1119	1281	tripleItem = menu.add(new MenuItem("Trident"));
1120	1282	tripleItem.addActionListener(this);
	1283	+ }
1121	1284	}
1122	1285
1123	1286	void buildToolsMenu(Menu menu)
1124	1287	{
1125	1288	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1126	1289	animationItem.addItemListener(this);
1127		- animationItem.setState(CameraPane.ANIMATION);
	1290	+ animationItem.setState(Globals.ANIMATION);
1128	1291
1129	1292	menu.add("-");
1130	1293	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1131	1294	parseverticesItem.addActionListener(this);
1132	1295	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1133	1296	textureFieldItem.addActionListener(this);
1134		- alignItem = menu.add(new MenuItem("Align"));
	1297	+ alignItem = menu.add(new MenuItem("Align Objects"));
1135	1298	alignItem.addActionListener(this);
1136		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1137		- mirrorItem.addActionListener(this);
1138	1299	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1139	1300	reduceMorphItem.addActionListener(this);
1140	1301	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1141	1302	reduce34MorphItem.addActionListener(this);
1142		-
	1303	+ menu.add("-");
1143	1304	menu.add(computeAOItem = new MenuItem("Compute AO"));
1144	1305	computeAOItem.addActionListener(this);
1145		- menu.add("-");
1146	1306
	1307	+ if (Globals.ADVANCED)
	1308	+ {
	1309	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1310	+ mirrorItem.addActionListener(this);
	1311	+ menu.add("-");
1147	1312	menu.add(memoryItem = new MenuItem("Memory Usage"));
1148	1313	memoryItem.addActionListener(this);
1149	1314	menu.add(analyzeItem = new MenuItem("Analyze"));
1150	1315	analyzeItem.addActionListener(this);
1151		- menu.add(dumpItem = new MenuItem("Dump"));
	1316	+ menu.add(dumpItem = new MenuItem("Print"));
1152	1317	dumpItem.addActionListener(this);
1153	1318	// menu.add(pathItem = new MenuItem("From-to path"));
1154	1319	// pathItem.addActionListener(this);
..	..	@@ -1166,6 +1331,7 @@
1166	1331	menu.add("-");
1167	1332	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1168	1333	editScriptItem.addActionListener(this);
	1334	+ }
1169	1335	}
1170	1336
1171	1337	void ScreenFit()
..	..	@@ -1494,9 +1660,9 @@
1494	1660
1495	1661	void Overwrite(int mask)
1496	1662	{
1497		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1663	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1498	1664	{
1499		- Object3D content = GrafreeD.clipboard.get(0);
	1665	+ Object3D content = Grafreed.clipboard.get(0);
1500	1666
1501	1667	if (content instanceof cGroup && ((cGroup)content).transientlink )
1502	1668	content = ((cGroup)content).get(0);
..	..	@@ -1667,7 +1833,7 @@
1667	1833	{
1668	1834	makeSomething(new BezierSurface());
1669	1835	} else
1670		- if (source == checkerItem)
	1836	+ if (source == overlayItem)
1671	1837	{
1672	1838	/*
1673	1839	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1801,23 +1967,6 @@
1801	1967	csg.addChild(child);
1802	1968	child.addChild(csg);
1803	1969	} 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	1970	if (source == computeAOItem)
1822	1971	{
1823	1972	Globals.drawMode = CameraPane.OCCLUSION;
..	..	@@ -1836,7 +1985,7 @@
1836	1985	if (source == invariantsItem)
1837	1986	{
1838	1987	System.out.println("Invariants:");
1839		- GrafreeD.grafreeD.universe.invariants();
	1988	+ Grafreed.grafreeD.universe.invariants();
1840	1989	} else
1841	1990	if (source == memoryItem)
1842	1991	{
..	..	@@ -1854,6 +2003,35 @@
1854	2003	if (source == dumpItem)
1855	2004	{
1856	2005	DumpObject();
	2006	+ } else
	2007	+ if (source == minButton)
	2008	+ {
	2009	+ Minimize();
	2010	+ } else
	2011	+ if (source == maxButton)
	2012	+ {
	2013	+ Maximize();
	2014	+ } else
	2015	+ if (source == fullButton)
	2016	+ {
	2017	+ ToggleFullScreen();
	2018	+ } else
	2019	+ if (source == undoButton)
	2020	+ {
	2021	+ Undo();
	2022	+ } else
	2023	+ if (source == redoButton)
	2024	+ {
	2025	+ Redo();
	2026	+ } else
	2027	+ if (source == saveButton)
	2028	+ {
	2029	+ Save();
	2030	+ } else
	2031	+ if (source == oneStepButton)
	2032	+ {
	2033	+ Globals.ONESTEP = true;
	2034	+ cameraView.repaint();
1857	2035	} else
1858	2036	if (source == screenfitButton)
1859	2037	{
..	..	@@ -1904,12 +2082,20 @@
1904	2082	{
1905	2083	loadClipboard(true);
1906	2084	} else
	2085	+ if (source == undoItem)
	2086	+ {
	2087	+ Undo();
	2088	+ } else
	2089	+ if (source == redoItem)
	2090	+ {
	2091	+ Redo();
	2092	+ } else
1907	2093	if (source == duplicateItem)
1908	2094	{
1909		- Object3D keep = GrafreeD.clipboard;
	2095	+ Object3D keep = Grafreed.clipboard;
1910	2096	loadClipboard(false);
1911	2097	paste(false);
1912		- GrafreeD.clipboard = keep;
	2098	+ Grafreed.clipboard = keep;
1913	2099	} else
1914	2100	if (source == cloneItem)
1915	2101	{
..	..	@@ -1927,13 +2113,17 @@
1927	2113	{
1928	2114	paste(false);
1929	2115	} else
	2116	+ if (source == pasteIntoItem)
	2117	+ {
	2118	+ pasteInto(true, false);
	2119	+ } else
1930	2120	if (source == pasteLinkItem)
1931	2121	{
1932		- pasteInto(false);
	2122	+ pasteInto(false, false);
1933	2123	} else
1934	2124	if (source == pasteCloneItem)
1935	2125	{
1936		- pasteInto(true);
	2126	+ pasteInto(true, true);
1937	2127	} else
1938	2128	if (source == pasteExpandItem)
1939	2129	{
..	..	@@ -2125,9 +2315,9 @@
2125	2315	// group.selection.get(0).setMasterThis(content); // should be identity
2126	2316	// refreshContents();
2127	2317	// }
2128		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2318	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2129	2319	{
2130		- Object3D content = GrafreeD.clipboard.get(0);
	2320	+ Object3D content = Grafreed.clipboard.get(0);
2131	2321
2132	2322	if (content instanceof cGroup && ((cGroup)content).transientlink )
2133	2323	content = ((cGroup)content).get(0);
..	..	@@ -2135,11 +2325,11 @@
2135	2325	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2136	2326	for (int i=0; i<group.selection.size(); i++)
2137	2327	{
2138		- boolean random = CameraPane.RANDOM;
2139		- CameraPane.RANDOM = false; // parse all random nodes
	2328	+ boolean random = CameraPane.SWITCH;
	2329	+ CameraPane.SWITCH = false; // parse all random nodes
2140	2330	group.selection.get(i).linkVerticesThis(content);
2141	2331	// group.selection.get(i).setMasterThis(content); // should be identity
2142		- CameraPane.RANDOM = random;
	2332	+ CameraPane.SWITCH = random;
2143	2333	}
2144	2334	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2145	2335	refreshContents();
..	..	@@ -2149,20 +2339,20 @@
2149	2339	{
2150	2340	for (int i=0; i<group.selection.size(); i++)
2151	2341	{
2152		- boolean random = CameraPane.RANDOM;
2153		- CameraPane.RANDOM = false; // parse all random nodes
	2342	+ boolean random = CameraPane.SWITCH;
	2343	+ CameraPane.SWITCH = false; // parse all random nodes
2154	2344	group.selection.get(i).linkVerticesThis(null);
2155		- CameraPane.RANDOM = random;
	2345	+ CameraPane.SWITCH = random;
2156	2346	}
2157	2347
2158	2348	refreshContents();
2159	2349	} else
2160	2350	if (source == relinkverticesItem)
2161	2351	{
2162		- boolean random = CameraPane.RANDOM;
2163		- CameraPane.RANDOM = false; // parse all random nodes
	2352	+ boolean random = CameraPane.SWITCH;
	2353	+ CameraPane.SWITCH = false; // parse all random nodes
2164	2354	group.selection.RelinkToSupport();
2165		- CameraPane.RANDOM = random;
	2355	+ CameraPane.SWITCH = random;
2166	2356
2167	2357	refreshContents();
2168	2358	} else
..	..	@@ -2177,9 +2367,9 @@
2177	2367	} else
2178	2368	if (source == setMasterItem)
2179	2369	{
2180		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2370	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2181	2371	{
2182		- Object3D content = GrafreeD.clipboard.get(0);
	2372	+ Object3D content = Grafreed.clipboard.get(0);
2183	2373
2184	2374	if (content instanceof cGroup && ((cGroup)content).transientlink )
2185	2375	content = ((cGroup)content).get(0);
..	..	@@ -2192,9 +2382,9 @@
2192	2382	{
2193	2383	if (group.selection.size() == 1)
2194	2384	{
2195		- if (GrafreeD.clipboard.size() == 1)
	2385	+ if (Grafreed.clipboard.size() == 1)
2196	2386	{
2197		- Object3D content = GrafreeD.clipboard.get(0);
	2387	+ Object3D content = Grafreed.clipboard.get(0);
2198	2388
2199	2389	if (content instanceof cGroup && ((cGroup)content).transientlink )
2200	2390	content = ((cGroup)content).get(0);
..	..	@@ -2211,7 +2401,7 @@
2211	2401	{
2212	2402	RevertMeshes();
2213	2403	} else
2214		- if (source == resetMeshItem)
	2404	+ if (source == resetAllItem)
2215	2405	{
2216	2406	ResetAll();
2217	2407	} else
..	..	@@ -2260,7 +2450,7 @@
2260	2450	RandomNode random = new RandomNode();
2261	2451	group(random);
2262	2452	if (random.size() > 0)
2263		- random.name = random.get(0).name + "Rnd";
	2453	+ random.name = random.get(0).name + "Switch";
2264	2454	} else
2265	2455	if (source == physicsItem)
2266	2456	{
..	..	@@ -2399,7 +2589,7 @@
2399	2589	} else
2400	2590	if (source == genNormalsMESHItem)
2401	2591	{
2402		- GenNormals(true); // TODO
	2592	+ GenNormalsMESH();
2403	2593	} else
2404	2594	if (source == genNormalsORGANItem)
2405	2595	{
..	..	@@ -2464,6 +2654,22 @@
2464	2654	if (source == unmarkleavesItem)
2465	2655	{
2466	2656	MarkLeaves(false);
	2657	+ } else
	2658	+ if (source == rewindleavesItem)
	2659	+ {
	2660	+ RewindLeaves(true);
	2661	+ } else
	2662	+ if (source == unrewindleavesItem)
	2663	+ {
	2664	+ RewindLeaves(false);
	2665	+ } else
	2666	+ if (source == randomleavesItem)
	2667	+ {
	2668	+ RandomLeaves(true);
	2669	+ } else
	2670	+ if (source == unrandomleavesItem)
	2671	+ {
	2672	+ RandomLeaves(false);
2467	2673	} else
2468	2674	if (source == flipVItem)
2469	2675	{
..	..	@@ -2549,9 +2755,13 @@
2549	2755	{
2550	2756	SmoothMesh();
2551	2757	} else
2552		- if (source == transformgeometryItem)
	2758	+ if (source == transformGeometryItem)
2553	2759	{
2554	2760	TransformGeometry();
	2761	+ } else
	2762	+ if (source == transformChildrenItem)
	2763	+ {
	2764	+ TransformChildren();
2555	2765	} else
2556	2766	if (source == resetTransformItem)
2557	2767	{
..	..	@@ -2559,7 +2769,11 @@
2559	2769	} else
2560	2770	if (source == resetCentroidItem)
2561	2771	{
2562		- ResetCentroid();
	2772	+ ResetCentroid(true);
	2773	+ } else
	2774	+ if (source == resetCentroidXZItem)
	2775	+ {
	2776	+ ResetCentroid(false);
2563	2777	} else
2564	2778	if (source == resetParentItem)
2565	2779	{
..	..	@@ -2723,6 +2937,24 @@
2723	2937	bigThree.ClearUI();
2724	2938	bigThree.add(centralPanel);
2725	2939	bigThree.FlushUI();
	2940	+
	2941	+ cameraView.requestFocusInWindow();
	2942	+
	2943	+// refreshContents(true);
	2944	+//
	2945	+// try
	2946	+// {
	2947	+// java.awt.Robot bot = new java.awt.Robot();
	2948	+// int mask = InputEvent.BUTTON1_MASK;
	2949	+// bot.mouseMove(100, 100);
	2950	+// bot.mousePress(mask);
	2951	+// bot.mouseRelease(mask);
	2952	+// }
	2953	+// catch (Exception e)
	2954	+// {
	2955	+//
	2956	+// }
	2957	+
2726	2958	} else
2727	2959	if (source == threeButton)
2728	2960	{
..	..	@@ -2759,6 +2991,8 @@
2759	2991	bigThree.add(centralPanel);
2760	2992	bigThree.add(XYZPanel);
2761	2993	bigThree.FlushUI();
	2994	+
	2995	+ cameraView.requestFocusInWindow();
2762	2996	} else
2763	2997	if (source == fourButton)
2764	2998	{
..	..	@@ -2794,6 +3028,8 @@
2794	3028	bigThree.ClearUI();
2795	3029	bigThree.add(scenePanel);
2796	3030	bigThree.FlushUI();
	3031	+
	3032	+ cameraView.requestFocusInWindow();
2797	3033	} else
2798	3034	if (source == sixButton)
2799	3035	{
..	..	@@ -2830,6 +3066,8 @@
2830	3066	bigThree.add(scenePanel);
2831	3067	bigThree.add(centralPanel);
2832	3068	bigThree.FlushUI();
	3069	+
	3070	+ cameraView.requestFocusInWindow();
2833	3071	} else
2834	3072	if (source == sevenButton)
2835	3073	{
..	..	@@ -2867,6 +3105,8 @@
2867	3105	bigThree.add(centralPanel);
2868	3106	bigThree.add(XYZPanel);
2869	3107	bigThree.FlushUI();
	3108	+
	3109	+ cameraView.requestFocusInWindow();
2870	3110	} else
2871	3111	if (source == rootButton)
2872	3112	{
..	..	@@ -2878,6 +3118,7 @@
2878	3118	EditObject(obj);
2879	3119	}
2880	3120
	3121	+ cameraView.requestFocusInWindow();
2881	3122	refreshContents(true);
2882	3123	} else
2883	3124	if (source == closeButton)
..	..	@@ -2899,6 +3140,8 @@
2899	3140	break;
2900	3141	}
2901	3142	}
	3143	+
	3144	+ cameraView.requestFocusInWindow();
2902	3145	refreshContents(true);
2903	3146	} else
2904	3147	if (source == editItem \|\| source == editButton)
..	..	@@ -2915,9 +3158,9 @@
2915	3158	child.CloseUI();
2916	3159	listUI.remove(child);
2917	3160
2918		- child.editWindow = null; // ???????????
	3161	+ //child.editWindow = null; // ???????????
2919	3162	}
2920		- objEditor.ctrlPanel.validate();
	3163	+ objEditor.ctrlPanel.FlushUI();
2921	3164	//objEditor.jTree.clearSelection();
2922	3165	//objEditor.ResetSliders();
2923	3166	refreshContents(true);
..	..	@@ -3001,7 +3244,10 @@
3001	3244	frontView.object = group;
3002	3245	sideView.object = group;
3003	3246	}
3004		- group.editWindow = this;
	3247	+
	3248	+// fix "+" issue
	3249	+ //group.editWindow = this;
	3250	+
3005	3251	/*
3006	3252	currentLayout = radio.layout;
3007	3253	if (currentLayout == null)
..	..	@@ -3013,8 +3259,23 @@
3013	3259	//group.parent = null; // ROOT
3014	3260	//group.attributes = -1;
3015	3261	ResetModel();
	3262	+
	3263	+ cameraView.requestFocusInWindow();
3016	3264	refreshContents(true);
3017		- }
	3265	+ } else if (event.getSource() == editCameraItem)
	3266	+ {
	3267	+ cameraView.ProtectCamera();
	3268	+ cameraView.repaint();
	3269	+ return;
	3270	+ } else if (event.getSource() == revertCameraItem)
	3271	+ {
	3272	+ cameraView.RevertCamera();
	3273	+ cameraView.repaint();
	3274	+ return;
	3275	+ // } else if (event.getSource() == textureButton)
	3276	+ // {
	3277	+ // return; // true;
	3278	+ }
3018	3279	else
3019	3280	{
3020	3281	//return super.action(event, arg);
..	..	@@ -3023,7 +3284,6 @@
3023	3284	}
3024	3285
3025	3286	boolean useclient = false;
3026		- cRadio radio;
3027	3287
3028	3288	void ToggleRoot()
3029	3289	{
..	..	@@ -3075,6 +3335,28 @@
3075	3335	refreshContents();
3076	3336	}
3077	3337
	3338	+ void TransformChildren()
	3339	+ {
	3340	+ Object3D obj;
	3341	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3342	+ {
	3343	+ obj = (Object3D)e.nextElement();
	3344	+ obj.KeepTextureMatrices();
	3345	+ obj.TransformChildren();
	3346	+ obj.RestoreTextureMatrices();
	3347	+
	3348	+// if (obj.parent == null)
	3349	+// {
	3350	+// System.out.println("NULL PARENT!");
	3351	+// new Exception().printStackTrace();
	3352	+// }
	3353	+// else
	3354	+// TouchTransform(obj);
	3355	+// //obj.parent.Touch();
	3356	+ }
	3357	+
	3358	+ refreshContents();
	3359	+ }
3078	3360
3079	3361	void ResetTransform()
3080	3362	{
..	..	@@ -3187,7 +3469,7 @@
3187	3469	refreshContents();
3188	3470	}
3189	3471
3190		- void ResetCentroid()
	3472	+ void ResetCentroid(boolean full)
3191	3473	{
3192	3474	Object3D obj;
3193	3475	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3202,12 +3484,16 @@
3202	3484	LA.matIdentity(Object3D.mat);
3203	3485	obj.getBounds(minima, maxima, false);
3204	3486	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3205		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3487	+ if (full)
	3488	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3206	3489	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3207	3490	obj.TransformMesh(Object3D.mat);
	3491	+
3208	3492	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3209		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3493	+ if (full)
	3494	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3210	3495	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3496	+
3211	3497	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3212	3498	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3213	3499	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3236,7 +3522,8 @@
3236	3522
3237	3523	int size = obj.MemorySize();
3238	3524
3239		- System.err.println((size/1024) + " KB is the size of " + obj);
	3525	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3526	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3240	3527	}
3241	3528	}
3242	3529	catch (Exception e)
..	..	@@ -3273,9 +3560,9 @@
3273	3560	obj = (Object3D)e.nextElement();
3274	3561
3275	3562	System.out.println("Object is: " + obj);
3276		- GrafreeD.AnalyzeObject(obj);
	3563	+ Grafreed.AnalyzeObject(obj);
3277	3564	System.out.println("Boundary rep: " + obj.bRep);
3278		- GrafreeD.AnalyzeObject(obj.bRep);
	3565	+ Grafreed.AnalyzeObject(obj.bRep);
3279	3566
3280	3567	// System.err.println((size/1024) + " KB is the size of " + obj);
3281	3568	}
..	..	@@ -3317,6 +3604,13 @@
3317	3604	void GenNormals(boolean crease)
3318	3605	{
3319	3606	group.GenNormalsS(crease);
	3607	+
	3608	+ refreshContents();
	3609	+ }
	3610	+
	3611	+ void GenNormalsMESH()
	3612	+ {
	3613	+ group.GenNormalsMeshS();
3320	3614
3321	3615	refreshContents();
3322	3616	}
..	..	@@ -3489,8 +3783,8 @@
3489	3783
3490	3784	void ParseVertices()
3491	3785	{
3492		- boolean epsequal = GrafreeD.epsequal;
3493		- GrafreeD.epsequal = true;
	3786	+ boolean epsequal = Grafreed.epsequal;
	3787	+ Grafreed.epsequal = true;
3494	3788
3495	3789	for (int i=0; i<group.selection.size(); i++)
3496	3790	{
..	..	@@ -3515,7 +3809,7 @@
3515	3809	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3516	3810	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3517	3811
3518		- g.add(GrafreeD.clipboard);
	3812	+ g.add(Grafreed.clipboard);
3519	3813
3520	3814	buffer.add(g);
3521	3815	}
..	..	@@ -3530,7 +3824,7 @@
3530	3824	makeSomething(buffer, i==group.selection.size()-1);
3531	3825	}
3532	3826
3533		- GrafreeD.epsequal = epsequal;
	3827	+ Grafreed.epsequal = epsequal;
3534	3828
3535	3829	refreshContents();
3536	3830	}
..	..	@@ -3548,7 +3842,16 @@
3548	3842	String pigment = Object3D.GetPigment(tex);
3549	3843	//String bump = Object3D.GetBump(tex);
3550	3844
3551		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3845	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	3846	+
	3847	+ try
	3848	+ {
	3849	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3850	+ }
	3851	+ catch (Exception e)
	3852	+ {
	3853	+ System.err.println("FAIL: " + node);
	3854	+ }
3552	3855
3553	3856	double s = v.s;
3554	3857
..	..	@@ -3636,11 +3939,11 @@
3636	3939
3637	3940	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3638	3941
3639		- boolean random = CameraPane.RANDOM;
3640		- CameraPane.RANDOM = false; // parse all random nodes
	3942	+ boolean random = CameraPane.SWITCH;
	3943	+ CameraPane.SWITCH = false; // parse all random nodes
3641	3944	lowres.linkVerticesThis(null);
3642	3945	lowres.linkVerticesThis(sn);
3643		- CameraPane.RANDOM = random;
	3946	+ CameraPane.SWITCH = random;
3644	3947
3645	3948	System.err.flush();
3646	3949
..	..	@@ -3680,7 +3983,7 @@
3680	3983	return;
3681	3984
3682	3985	Object3D poses = group.selection.get(0);
3683		- Object3D ref = GrafreeD.clipboard.get(0);
	3986	+ Object3D ref = Grafreed.clipboard.get(0);
3684	3987
3685	3988	Object3D newgroup = new Object3D("Po:" + poses.name);
3686	3989
..	..	@@ -3874,9 +4177,9 @@
3874	4177
3875	4178	void ClipMesh()
3876	4179	{
3877		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4180	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3878	4181	{
3879		- Object3D content = GrafreeD.clipboard.get(0);
	4182	+ Object3D content = Grafreed.clipboard.get(0);
3880	4183
3881	4184	if (content instanceof cGroup && ((cGroup)content).transientlink )
3882	4185	content = ((cGroup)content).get(0);
..	..	@@ -3885,7 +4188,7 @@
3885	4188	// {
3886	4189	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3887	4190	// }
3888		- group.selection.ClipMesh(GrafreeD.clipboard);
	4191	+ group.selection.ClipMesh(Grafreed.clipboard);
3889	4192	}
3890	4193	// group.selection.ClipMesh(GrafreeD.clipboard);
3891	4194	System.out.println("DONE.");
..	..	@@ -3932,6 +4235,18 @@
3932	4235	void MarkLeaves(boolean hide)
3933	4236	{
3934	4237	group.selection.MarkLeaves(hide);
	4238	+ refreshContents();
	4239	+ }
	4240	+
	4241	+ void RewindLeaves(boolean hide)
	4242	+ {
	4243	+ group.selection.RewindLeaves(hide);
	4244	+ refreshContents();
	4245	+ }
	4246	+
	4247	+ void RandomLeaves(boolean hide)
	4248	+ {
	4249	+ group.selection.RandomLeaves(hide);
3935	4250	refreshContents();
3936	4251	}
3937	4252
..	..	@@ -4020,7 +4335,7 @@
4020	4335	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4021	4336
4022	4337	Object3D elem = (Object3D)group.selection.elementAt(i);
4023		- if(elem != group)
	4338	+ if(elem != group \|\| !newWindow)
4024	4339	{
4025	4340	// if (!(elem instanceof Composite))
4026	4341	// newWindow = false;
..	..	@@ -4110,7 +4425,6 @@
4110	4425	//case 702: // Event.LIST_DESELECT
4111	4426	group.deselectAll();
4112	4427	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4113		- objEditor.ClearInfo(); // .GetMaterial());
4114	4428	if (tps != null)
4115	4429	{
4116	4430	for (int i=0; i < tps.length; i++)
..	..	@@ -4119,29 +4433,28 @@
4119	4433
4120	4434	//if (child.parent != null)
4121	4435	//child.parent.addSelectee(child);
	4436	+ objEditor.SetMaterial(child);
4122	4437	group.addSelectee(child);
4123		- objEditor.SetMaterial(child); // .GetMaterial());
4124		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4125		- System.err.println("info : " + child.GetPath());
4126	4438	}
4127	4439	}
4128		- else
4129		- {
4130		- objEditor.SetMaterial(group); // .GetMaterial());
4131		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4132		- System.err.println("info : " + group.GetPath());
4133		- }
	4440	+// else
	4441	+// {
	4442	+// objEditor.SetMaterial(group); // .GetMaterial());
	4443	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4444	+// System.err.println("info : " + group.GetPath());
	4445	+// }
4134	4446
4135		- objEditor.SetText(); // jan 2014
4136		-
4137		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4447	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4138	4448	CameraPane.flash = true;
4139	4449
4140		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4450	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4141	4451	// a camera
4142	4452	{
4143		- CameraPane.camerachangeframe = 0; // don't refuse it
4144		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4453	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4454	+ {
	4455	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4456	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4457	+ }
4145	4458	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4146	4459	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4147	4460	}
..	..	@@ -4154,6 +4467,26 @@
4154	4467
4155	4468	freezemodel = false;
4156	4469	}
	4470	+
	4471	+ void refreshContents(boolean cp)
	4472	+ {
	4473	+ if (!Globals.MOUSEDRAGGED)
	4474	+ {
	4475	+ objEditor.ClearInfo(); // .GetMaterial());
	4476	+
	4477	+ for (int i=0; i < group.selection.Size(); i++)
	4478	+ {
	4479	+ Object3D child = (Object3D) group.selection.get(i);
	4480	+
	4481	+ objEditor.AddInfo(child, this, true);
	4482	+ System.err.println("info : " + child.GetPath());
	4483	+ }
	4484	+
	4485	+ objEditor.SetText(); // jan 2014
	4486	+ }
	4487	+
	4488	+ super.refreshContents(cp);
	4489	+ }
4157	4490
4158	4491	void linkSomething(Object3D thing)
4159	4492	{
..	..	@@ -4225,16 +4558,18 @@
4225	4558	{
4226	4559	if (group.selection.isEmpty())
4227	4560	return;
4228		- GrafreeD.clipboardIsTempGroup = false;
	4561	+
	4562	+ Grafreed.clipboardIsTempGroup = false;
4229	4563	Composite tGroup = null;
4230	4564	if (group.selection.size() > 0) // 1)
4231	4565	{
4232	4566	tGroup = new cGroup();
4233		- GrafreeD.clipboardIsTempGroup = true;
	4567	+ Grafreed.clipboardIsTempGroup = true;
4234	4568	}
4235	4569
4236	4570	if (cut)
4237	4571	{
	4572	+ Save();
4238	4573	//int indices[] = jList.getSelectedIndices();
4239	4574	//for (int i = indices.length - 1; i >= 0; i--)
4240	4575	//jList.remove(indices[i]);
..	..	@@ -4270,16 +4605,16 @@
4270	4605	//System.out.println("cut " + child);
4271	4606	//System.out.println("parent = " + child.parent);
4272	4607	// tmp.addChild(child);
4273		- if (GrafreeD.clipboardIsTempGroup)
	4608	+ if (Grafreed.clipboardIsTempGroup)
4274	4609	tGroup.add/Child/(tmp);
4275	4610	else
4276		- GrafreeD.clipboard = tmp;
	4611	+ Grafreed.clipboard = tmp;
4277	4612	}
4278	4613	else
4279		- if (GrafreeD.clipboardIsTempGroup)
	4614	+ if (Grafreed.clipboardIsTempGroup)
4280	4615	tGroup.add/Child/(child);
4281	4616	else
4282		- GrafreeD.clipboard = child;
	4617	+ Grafreed.clipboard = child;
4283	4618	}
4284	4619
4285	4620	//ResetModel();
..	..	@@ -4311,21 +4646,23 @@
4311	4646	//System.out.println("cut " + elem);
4312	4647	//System.out.println("parent = " + elem.parent);
4313	4648	// tmp.addChild(elem);
4314		- if (GrafreeD.clipboardIsTempGroup)
	4649	+ if (Grafreed.clipboardIsTempGroup)
4315	4650	tGroup.add/Child/(tmp);
4316	4651	else
4317		- GrafreeD.clipboard = tmp;
	4652	+ Grafreed.clipboard = tmp;
4318	4653	}
4319	4654	else
4320		- if (GrafreeD.clipboardIsTempGroup)
	4655	+ if (Grafreed.clipboardIsTempGroup)
4321	4656	tGroup.add/Child/(child);
4322	4657	else
4323		- GrafreeD.clipboard = child;
	4658	+ Grafreed.clipboard = child;
4324	4659	}
4325	4660
4326	4661	}
4327		- if (GrafreeD.clipboardIsTempGroup)
4328		- GrafreeD.clipboard = tGroup;
	4662	+
	4663	+ if (Grafreed.clipboardIsTempGroup)
	4664	+ Grafreed.clipboard = tGroup;
	4665	+
4329	4666	if (cut)
4330	4667	{
4331	4668	ResetModel();
..	..	@@ -4339,7 +4676,7 @@
4339	4676	// return;
4340	4677	boolean first = true;
4341	4678
4342		- if (GrafreeD.clipboardIsTempGroup)
	4679	+ if (Grafreed.clipboardIsTempGroup)
4343	4680	{
4344	4681	Composite temp;
4345	4682
..	..	@@ -4350,7 +4687,7 @@
4350	4687	temp = (Composite)Applet3D.clipboard.deepCopy();
4351	4688	*/
4352	4689	Object3D elem;
4353		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4690	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4354	4691	{
4355	4692	Object3D child = (Object3D)e.nextElement();
4356	4693
..	..	@@ -4384,21 +4721,21 @@
4384	4721	//Object3D cb = Applet3D.clipboard;
4385	4722	//temp.addChild(cb);
4386	4723	//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());
	4724	+ assert(Grafreed.clipboard.parent == null);
	4725	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4726	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4727	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4728	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4392	4729	else
4393		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4394		- GrafreeD.clipboard.get(0).parent = keepparent;
	4730	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4731	+ Grafreed.clipboard.get(0).parent = keepparent;
4395	4732	}
4396	4733
4397	4734	ResetModel();
4398	4735	refreshContents();
4399	4736	}
4400	4737
4401		- void pasteInto(boolean copyit)
	4738	+ void pasteInto(boolean copyit, boolean clone)
4402	4739	{
4403	4740	// if (GrafreeD.clipboard == null)
4404	4741	// return;
..	..	@@ -4427,15 +4764,22 @@
4427	4764	if (copyit)
4428	4765	{
4429	4766	// paste(false);
4430		- CloneClipboard(false); // sept 2014
	4767	+ if (clone)
	4768	+ {
	4769	+ CloneClipboard(false); // sept 2014
	4770	+ }
	4771	+ else
	4772	+ {
	4773	+ paste(false);
	4774	+ }
4431	4775	}
4432	4776	else
4433	4777	{
4434	4778	boolean first = true;
4435	4779
4436		- if (GrafreeD.clipboardIsTempGroup)
	4780	+ if (Grafreed.clipboardIsTempGroup)
4437	4781	{
4438		- Composite temp = (Composite)GrafreeD.clipboard;
	4782	+ Composite temp = (Composite)Grafreed.clipboard;
4439	4783	Object3D copy;
4440	4784	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4441	4785	{
..	..	@@ -4445,7 +4789,7 @@
4445	4789	}
4446	4790	} else
4447	4791	{
4448		- linkSomething(GrafreeD.clipboard); //.get(0));
	4792	+ linkSomething(Grafreed.clipboard); //.get(0));
4449	4793	}
4450	4794	}
4451	4795	}
..	..	@@ -4850,21 +5194,6 @@
4850	5194	}
4851	5195	*/
4852	5196
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	5197	/*
4869	5198	public void Callback(Object obj)
4870	5199	{
..	..	@@ -4888,26 +5217,9 @@
4888	5217	}
4889	5218	*/
4890	5219
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	5220	String GetFile(String dialogName)
4909	5221	{
4910		- if (GrafreeD.standAlone)
	5222	+ if (Grafreed.standAlone)
4911	5223	{
4912	5224	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4913	5225	browser.show();
..	..	@@ -4971,10 +5283,18 @@
4971	5283	cButton flashSelectionButton;
4972	5284	cButton editButton;
4973	5285	cButton uneditButton;
	5286	+ JCheckBox allParamsButton;
4974	5287	cButton clearpanelButton;
4975		- cButton allParamsButton;
4976	5288	cButton unselectButton;
4977	5289
	5290	+ cButton minButton;
	5291	+ cButton maxButton;
	5292	+ cButton fullButton;
	5293	+ cButton undoButton;
	5294	+ cButton redoButton;
	5295	+ cButton saveButton;
	5296	+ cButton oneStepButton;
	5297	+
4978	5298	cButton screenfitButton;
4979	5299	cButton screenfitpointButton;
4980	5300	cButton snapobjectButton;
..	..	@@ -4985,14 +5305,6 @@
4985	5305	cButton closeButton;
4986	5306
4987	5307	cButton setsupportButton;
4988		-
4989		- cButton twoButton;
4990		- cButton sixButton;
4991		- cButton threeButton;
4992		- cButton sevenButton;
4993		- cButton fourButton; // full panel
4994		- cButton oneButton; // full XYZ
4995		- //cButton currentLayout;
4996	5308
4997	5309	//
4998	5310	//Composite
..	..	@@ -5005,6 +5317,8 @@
5005	5317	private MenuItem lookFromItem;
5006	5318	private MenuItem switchItem;
5007	5319	private MenuItem cutItem;
	5320	+ private MenuItem undoItem;
	5321	+ private MenuItem redoItem;
5008	5322	private MenuItem duplicateItem;
5009	5323	private MenuItem cloneItem;
5010	5324	private MenuItem cloneSupportItem;
..	..	@@ -5018,7 +5332,7 @@
5018	5332	private MenuItem linkverticesItem;
5019	5333	private MenuItem relinkverticesItem;
5020	5334	private MenuItem setMasterItem;
5021		- private MenuItem resetMeshItem;
	5335	+ private MenuItem resetAllItem;
5022	5336	private MenuItem stepAllItem;
5023	5337	private MenuItem revertMeshItem;
5024	5338	private MenuItem poseMeshItem;
..	..	@@ -5029,6 +5343,7 @@
5029	5343	private MenuItem mergeGeometriesItem;
5030	5344	private MenuItem copyItem;
5031	5345	private MenuItem pasteItem;
	5346	+ private MenuItem pasteIntoItem;
5032	5347	private MenuItem pasteLinkItem;
5033	5348	private MenuItem pasteCloneItem;
5034	5349	private MenuItem pasteExpandItem;
..	..	@@ -5067,6 +5382,10 @@
5067	5382	private MenuItem showleavesItem;
5068	5383	private MenuItem markleavesItem;
5069	5384	private MenuItem unmarkleavesItem;
	5385	+ private MenuItem rewindleavesItem;
	5386	+ private MenuItem unrewindleavesItem;
	5387	+ private MenuItem randomleavesItem;
	5388	+ private MenuItem unrandomleavesItem;
5070	5389
5071	5390	private MenuItem flipVItem;
5072	5391	private MenuItem unflipVItem;
..	..	@@ -5078,8 +5397,10 @@
5078	5397	private MenuItem panoTexturesItem;
5079	5398
5080	5399	private MenuItem resetCentroidItem;
5081		- private MenuItem transformgeometryItem;
	5400	+ private MenuItem resetCentroidXZItem;
5082	5401	private MenuItem resetTransformItem;
	5402	+ private MenuItem transformGeometryItem;
	5403	+ private MenuItem transformChildrenItem;
5083	5404	private MenuItem hideItem;
5084	5405	private MenuItem grabItem;
5085	5406	private MenuItem backItem;
..	..	@@ -5126,7 +5447,7 @@
5126	5447	private MenuItem blobItem;
5127	5448	private MenuItem latheItem;
5128	5449	private MenuItem bezierItem;
5129		- private MenuItem checkerItem;
	5450	+ private MenuItem overlayItem;
5130	5451	private MenuItem meshItem;
5131	5452	// private MenuItem meshGroupItem;
5132	5453	private MenuItem springItem;
..	..	@@ -5148,11 +5469,6 @@
5148	5469	private MenuItem doubleItem;
5149	5470	private MenuItem tripleItem;
5150	5471
5151		- private MenuItem importGFDItem;
5152		- private MenuItem importVRMLX3DItem;
5153		- private MenuItem import3DSItem;
5154		- private MenuItem importOBJItem;
5155		-
5156	5472	private MenuItem computeAOItem;
5157	5473	private MenuItem recompileItem;
5158	5474	private MenuItem editScriptItem;
..	..	@@ -5162,4 +5478,8 @@
5162	5478	private MenuItem analyzeItem;
5163	5479	private MenuItem dumpItem;
5164	5480	//boolean freezemodel = false;
	5481	+
	5482	+ Menu cameraMenu;
	5483	+ MenuItem editCameraItem;
	5484	+ MenuItem revertCameraItem;
5165	5485	}