~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -12,6 +12,7 @@
12	12	import com.jme.math.Vector3f;
13	13	import com.jme.renderer.ColorRGBA;
14	14
	15	+import grafeme.ui.*;
15	16	//import buoy.widget.BFileChooser;
16	17
17	18	class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
..	..	@@ -73,7 +74,7 @@
73	74	this.copy = this.group = copy;
74	75	//selectees = this.group.selectees;
75	76
76		- SetupMenu2(objEditor);
	77	+ SetupMenu2(this); //objEditor);
77	78	SetupUI2(objEditor);
78	79	objEditor.SetupUI(true);
79	80	SetupViews(objEditor);
..	..	@@ -97,14 +98,14 @@
97	98
98	99	void CloneClipboard(boolean supports)
99	100	{
100		- assert(GrafreeD.clipboard.parent == null);
101		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
102		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
103		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
104		- 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));
105	106	else
106		- makeSomething(CloneObject(GrafreeD.clipboard, false));
107		- GrafreeD.clipboard.get(0).parent = keepparent;
	107	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	108	+ Grafreed.clipboard.get(0).parent = keepparent;
108	109	}
109	110
110	111	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -118,7 +119,7 @@
118	119	// obj.support = null;
119	120	if (!supports)
120	121	obj.SaveSupports();
121		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	122	+ Object3D clone = (Object3D)Grafreed.clone(obj);
122	123	obj.parent = parent;
123	124	// obj.support = support;
124	125	// clone.support = support; // aout 2013
..	..	@@ -147,8 +148,129 @@
147	148
148	149	//JTextField nameField;
149	150
150		- void SetupMenu2(ObjEditor oe)
	151	+ void SetupMenu2(GroupEditor oe)
151	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	+
	180	+ menu.add("-");
	181	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	182	+ pasteIntoItem.addActionListener(this);
	183	+ pasteLinkItem = menu.add(new MenuItem("Paste link"));
	184	+ pasteLinkItem.addActionListener(this);
	185	+ pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	186	+ pasteCloneItem.addActionListener(this);
	187	+// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	188	+// pasteExpandItem.addActionListener(this);
	189	+ menu.add("-");
	190	+ clearItem = menu.add(new MenuItem("Clear"));
	191	+ clearItem.addActionListener(this);
	192	+
	193	+ if (Globals.ADVANCED)
	194	+ {
	195	+ // Deletes the cameras...
	196	+ clearAllItem = menu.add(new MenuItem("Clear All"));
	197	+ clearAllItem.addActionListener(this);
	198	+ }
	199	+
	200	+ menuBar.add(cameraMenu = new Menu("View"));
	201	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	202	+ //zBufferItem.addActionListener(this);
	203	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	204	+ //normalLensItem.addActionListener(this);
	205	+ cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
	206	+ revertCameraItem.addActionListener(this);
	207	+
	208	+ cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	209	+ toggleFullScreenItem.addItemListener(this);
	210	+ toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	211	+ cameraMenu.add("-");
	212	+
	213	+ cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	214	+ toggleTextureItem.addItemListener(this);
	215	+ toggleTextureItem.setState(CameraPane.textureon);
	216	+
	217	+ cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	218	+ toggleSwitchItem.addItemListener(this);
	219	+ toggleSwitchItem.setState(CameraPane.SWITCH);
	220	+
	221	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	222	+ toggleHandleItem.addItemListener(this);
	223	+ toggleHandleItem.setState(CameraPane.HANDLES);
	224	+
	225	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	226	+ togglePaintItem.addItemListener(this);
	227	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	228	+
	229	+ if (Globals.ADVANCED)
	230	+ {
	231	+ cameraMenu.add("-");
	232	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	233	+ toggleLiveItem.addItemListener(this);
	234	+ toggleLiveItem.setState(Globals.isLIVE());
	235	+
	236	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	237	+ stepItem.addActionListener(this);
	238	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	239	+ // toggleDLItem.addItemListener(this);
	240	+ // toggleDLItem.setState(false);
	241	+
	242	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	243	+ toggleRenderItem.addItemListener(this);
	244	+ toggleRenderItem.setState(!CameraPane.frozen);
	245	+
	246	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	247	+ toggleDebugItem.addItemListener(this);
	248	+ toggleDebugItem.setState(Globals.DEBUG);
	249	+
	250	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	251	+ toggleFrustumItem.addItemListener(this);
	252	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	253	+
	254	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	255	+ toggleFootContactItem.addItemListener(this);
	256	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	257	+
	258	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	259	+ toggleTimelineItem.addItemListener(this);
	260	+ }
	261	+
	262	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	263	+// toggleRootItem.addItemListener(this);
	264	+// toggleRootItem.setState(false);
	265	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	266	+// animationItem.addItemListener(this);
	267	+// animationItem.setState(CameraPane.ANIMATION);
	268	+ cameraMenu.add("-");
	269	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	270	+ editCameraItem.addActionListener(this);
	271	+
	272	+ if (Globals.ADVANCED)
	273	+ {
152	274	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
153	275	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
154	276	//cameraMenu.add(switchItem = new MenuItem("Reverse View"));
..	..	@@ -160,45 +282,17 @@
160	282	lookAtItem.addActionListener(this);
161	283	//lookFromItem.addActinoListener(this);
162	284	//switchItem.addActionListener(this);
163		- Menu menu;
164		- oe.menuBar.add(menu = new Menu("Edit"));
165		- //editItem = menu.add(new MenuItem("Edit"));
166		- //editItem.addActionListener(this);
167		- duplicateItem = menu.add(new MenuItem("Duplicate"));
168		- duplicateItem.addActionListener(this);
169		- menu.add("-");
170		- cloneItem = menu.add(new MenuItem("Clone"));
171		- cloneItem.addActionListener(this);
172		- cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
173		- cloneSupportItem.addActionListener(this);
174		- menu.add("-");
175		- cutItem = menu.add(new MenuItem("Cut"));
176		- cutItem.addActionListener(this);
177		- copyItem = menu.add(new MenuItem("Copy"));
178		- copyItem.addActionListener(this);
179		- pasteItem = menu.add(new MenuItem("Paste"));
180		- pasteItem.addActionListener(this);
181		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
182		- pasteLinkItem.addActionListener(this);
183		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
184		- pasteCloneItem.addActionListener(this);
185		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
186		-// pasteExpandItem.addActionListener(this);
187		- clearItem = menu.add(new MenuItem("Clear"));
188		- clearItem.addActionListener(this);
189		- clearAllItem = menu.add(new MenuItem("Clear All"));
190		- clearAllItem.addActionListener(this);
191		-
	285	+ }
	286	+
192	287	oe.menuBar.add(menu = new Menu("Setting"));
193		- resetMeshItem = menu.add(new MenuItem("Reset All"));
194		- resetMeshItem.addActionListener(this);
195		- stepAllItem = menu.add(new MenuItem("Step All"));
196		- stepAllItem.addActionListener(this);
	288	+ if (Globals.ADVANCED)
	289	+ {
197	290	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
198	291	revertMeshItem.addActionListener(this);
199	292	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
200	293	resetreferencesItem.addActionListener(this);
201	294	menu.add("-");
	295	+ }
202	296	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
203	297	overwriteGeoItem.addActionListener(this);
204	298	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -210,19 +304,26 @@
210	304	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211	305	overwriteUVItem.addActionListener(this);
212	306	menu.add("-");
	307	+ if (Globals.ADVANCED)
	308	+ {
213	309	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214	310	generateMeshItem.addActionListener(this);
215	311	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216	312	poseMeshItem.addActionListener(this);
217	313	menu.add("-");
	314	+ }
218	315	resetsupportItem = menu.add(new MenuItem("Reset support"));
219	316	resetsupportItem.addActionListener(this);
220	317	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	318	linkverticesItem.addActionListener(this);
222	319	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
223	320	relinkverticesItem.addActionListener(this);
	321	+
	322	+ if (Globals.ADVANCED)
	323	+ {
224	324	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
225	325	setMasterItem.addActionListener(this);
	326	+ }
226	327
227	328	oe.menuBar.add(menu = new Menu("Group"));
228	329	grabItem = menu.add(new MenuItem("Grab"));
..	..	@@ -233,27 +334,32 @@
233	334	frontItem.addActionListener(this);
234	335	compositeItem = menu.add(new MenuItem("Composite"));
235	336	compositeItem.addActionListener(this);
236		- hideItem = menu.add(new MenuItem("Hide"));
	337	+ hideItem = menu.add(new MenuItem("Hidden Group"));
237	338	hideItem.addActionListener(this);
238	339	ungroupItem = menu.add(new MenuItem("Ungroup"));
239	340	ungroupItem.addActionListener(this);
240	341	menu.add("-");
241		- randomItem = menu.add(new MenuItem("Random"));
	342	+ randomItem = menu.add(new MenuItem("Switch node"));
242	343	randomItem.addActionListener(this);
243		- physicsItem = menu.add(new MenuItem("Physics"));
244		- physicsItem.addActionListener(this);
245		- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
246		- frameselectorItem.addActionListener(this);
247	344	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
248	345	switchGeoItem.addActionListener(this);
249	346	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
250	347	switchTransfoItem.addActionListener(this);
251		- morphItem = menu.add(new MenuItem("Morph"));
	348	+ morphItem = menu.add(new MenuItem("Morph Group"));
252	349	morphItem.addActionListener(this);
	350	+
	351	+ if (Globals.ADVANCED)
	352	+ {
	353	+ menu.add("-");
	354	+ physicsItem = menu.add(new MenuItem("Physics"));
	355	+ physicsItem.addActionListener(this);
	356	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	357	+ frameselectorItem.addActionListener(this);
253	358	scriptNodeItem = menu.add(new MenuItem("Script Node"));
254	359	scriptNodeItem.addActionListener(this);
255	360	cameraItem = menu.add(new MenuItem("Camera"));
256	361	cameraItem.addActionListener(this);
	362	+ }
257	363
258	364	oe.menuBar.add(menu = new Menu("Object"));
259	365	textureItem = menu.add(new MenuItem("Texture"));
..	..	@@ -262,27 +368,35 @@
262	368	billboardItem.addActionListener(this);
263	369	csgItem = menu.add(new MenuItem("CSG"));
264	370	csgItem.addActionListener(this);
265		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	371	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
266	372	shadowXItem.addActionListener(this);
267		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	373	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
268	374	shadowYItem.addActionListener(this);
269		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	375	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
270	376	shadowZItem.addActionListener(this);
	377	+ if (Globals.ADVANCED)
	378	+ {
	379	+ menu.add("-");
271	380	linkerItem = menu.add(new MenuItem("Linker"));
272	381	linkerItem.addActionListener(this);
273		- templateItem = menu.add(new MenuItem("Template"));
274		- templateItem.addActionListener(this);
275	382	attributeItem = menu.add(new MenuItem("Attribute"));
276	383	attributeItem.addActionListener(this);
	384	+ templateItem = menu.add(new MenuItem("Template"));
	385	+ templateItem.addActionListener(this);
277	386	pointflowItem = menu.add(new MenuItem("Point Flow"));
278	387	pointflowItem.addActionListener(this);
	388	+ }
279	389	menu.add("-");
280	390	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
281	391	resetTransformItem.addActionListener(this);
282	392	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
283	393	resetCentroidItem.addActionListener(this);
284		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
285		- transformgeometryItem.addActionListener(this);
	394	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	395	+ resetCentroidXZItem.addActionListener(this);
	396	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	397	+ transformGeometryItem.addActionListener(this);
	398	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	399	+ transformChildrenItem.addActionListener(this);
286	400
287	401	oe.menuBar.add(menu = new Menu("Geometry"));
288	402	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -293,8 +407,11 @@
293	407	genNormalsCADItem.addActionListener(this);
294	408	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
295	409	genNormalsMESHItem.addActionListener(this);
	410	+ if (Globals.ADVANCED)
	411	+ {
296	412	genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
297	413	genNormalsMINEItem.addActionListener(this);
	414	+ }
298	415	stripifyItem = menu.add(new MenuItem("Stripify"));
299	416	stripifyItem.addActionListener(this);
300	417	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -316,23 +433,34 @@
316	433	reduce34MeshItem.addActionListener(this);
317	434	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
318	435	increaseMeshItem.addActionListener(this);
319		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
320		- smoothMeshItem.addActionListener(this);
321	436	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
322	437	clipMeshItem.addActionListener(this);
	438	+
	439	+ if (Globals.ADVANCED)
	440	+ {
	441	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	442	+ smoothMeshItem.addActionListener(this);
	443	+ }
323	444
324	445	oe.menuBar.add(menu = new Menu("Attributes"));
325	446	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
326	447	clearMaterialsItem.addActionListener(this);
	448	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	449	+ resetAllItem.addActionListener(this);
	450	+ stepAllItem = menu.add(new MenuItem("Step All"));
	451	+ stepAllItem.addActionListener(this);
327	452	menu.add("-");
328	453	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
329	454	liveleavesItem.addActionListener(this);
330	455	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
331	456	unliveleavesItem.addActionListener(this);
	457	+ if (Globals.ADVANCED)
	458	+ {
332	459	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
333	460	supportleavesItem.addActionListener(this);
334	461	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
335	462	unsupportleavesItem.addActionListener(this);
	463	+ }
336	464	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
337	465	hideleavesItem.addActionListener(this);
338	466	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -341,6 +469,14 @@
341	469	markleavesItem.addActionListener(this);
342	470	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
343	471	unmarkleavesItem.addActionListener(this);
	472	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	473	+ rewindleavesItem.addActionListener(this);
	474	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	475	+ unrewindleavesItem.addActionListener(this);
	476	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	477	+ randomleavesItem.addActionListener(this);
	478	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	479	+ unrandomleavesItem.addActionListener(this);
344	480	menu.add("-");
345	481	flipVItem = menu.add(new MenuItem("Flip V"));
346	482	flipVItem.addActionListener(this);
..	..	@@ -376,35 +512,40 @@
376	512	sortbynameItem = menu.add(new MenuItem("Sort by name"));
377	513	sortbynameItem.addActionListener(this);
378	514	menu.add("-");
	515	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	516	+ shareGeometriesItem.addActionListener(this);
	517	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	518	+ mergeGeometriesItem.addActionListener(this);
	519	+ if (Globals.ADVANCED)
	520	+ {
	521	+ // Pretty much the same as duplicate and clone.
379	522	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
380	523	extractGeometriesItem.addActionListener(this);
381	524	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
382	525	cloneGeometriesItem.addActionListener(this);
383		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
384		- shareGeometriesItem.addActionListener(this);
385		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
386		- mergeGeometriesItem.addActionListener(this);
	526	+ }
387	527
388	528	oe.menuBar.add(menu = new Menu("Insert"));
389	529	buildCreateMenu(menu);
390	530
391		-
392		- oe.menuBar.add(menu = new Menu("Include"));
393		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
394		- importGFDItem.addActionListener(this);
395		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
396		- importVRMLX3DItem.addActionListener(this);
397		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
398		- importOBJItem.addActionListener(this);
399		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
400		- import3DSItem.addActionListener(this);
401		-
402	531	oe.menuBar.add(menu = new Menu("Tools"));
403	532	buildToolsMenu(menu);
404	533	}
405	534
406	535	void SetupUI2(ObjEditor oe)
407	536	{
	537	+ // June 2019
	538	+ if (oe == null)
	539	+ {
	540	+ //super.SetupUI2(this);
	541	+ //return;
	542	+ }
	543	+
	544	+ if (copy != group)
	545	+ {
	546	+ //super.SetupUI2(this);
	547	+ }
	548	+
408	549	//new Exception().printStackTrace();
409	550
410	551	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -433,110 +574,120 @@
433	574	oe.radioPanel.add(dummyButton);
434	575	oe.buttonGroup.add(dummyButton);
435	576	*/
436		- aConstraints.gridy += 1;
437		-
438	577	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
439	578
440		- oe.aConstraints.gridwidth = 1;
441		- oe.aConstraints.gridx = 0;
	579	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	580	+ //minButton.setToolTipText("Minimize window");
	581	+ //minButton.addActionListener(this);
442	582
443		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
444		- liveCB.setToolTipText("Enabled animation");
	583	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	584	+ maxButton.setToolTipText("Maximize window");
	585	+ maxButton.addActionListener(this);
	586	+
	587	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	588	+ fullButton.setToolTipText("Full-screen window");
	589	+ fullButton.addActionListener(this);
	590	+
	591	+ oe.toolbarPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	592	+ undoButton.setToolTipText("Undo changes");
	593	+ undoButton.addActionListener(this);
	594	+
	595	+ oe.toolbarPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	596	+ redoButton.setToolTipText("Redo changes");
	597	+ redoButton.addActionListener(this);
	598	+
	599	+ oe.toolbarPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	600	+ saveButton.setToolTipText("Save changes");
	601	+ saveButton.addActionListener(this);
	602	+
	603	+ oe.toolbarPanel.add(liveCB = GetCheckBox("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	604	+ liveCB.setToolTipText("Enable animation");
445	605	liveCB.addItemListener(this);
446	606
447		- oe.aConstraints.gridx += 1;
448		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK), oe.aConstraints);
	607	+ oe.toolbarPanel.add(fastCB = GetCheckBox("icons/runfast.png", CameraPane.FAST)); //, constraints);
	608	+ fastCB.setToolTipText("Fast mode");
	609	+ fastCB.addItemListener(this);
	610	+
	611	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	612	+ oneStepButton.setToolTipText("Animate one step forward");
	613	+ oneStepButton.addActionListener(this);
	614	+
	615	+ oe.toolbarPanel.add(trackCB = GetCheckBox("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
449	616	trackCB.setToolTipText("Enable tracking");
450	617	trackCB.addItemListener(this);
451	618
452		- oe.aConstraints.gridx += 1;
453		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	619	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
454	620	screenfitButton.setToolTipText("Screen fit");
455	621	screenfitButton.addActionListener(this);
456		- oe.aConstraints.gridx += 1;
	622	+
457	623	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
458	624	// screenfitpointButton.addActionListener(this);
459		-// oe.aConstraints.gridx += 1;
460		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
461		- snapobjectButton.addActionListener(this);
462		- snapobjectButton.setToolTipText("Snap Object");
463		- oe.aConstraints.gridx += 1;
464	625
465		- //aConstraints.gridx = 0;
466		- //aConstraints.gridy += 1;
467		- oe.aConstraints.weighty = 0;
468		- oe.aConstraints.gridwidth = 1;
469		-
470		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
471		- flashSelectionButton.setToolTipText("Show selection");
	626	+ if (Globals.ADVANCED)
	627	+ {
	628	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	629	+ snapobjectButton.addActionListener(this);
	630	+ snapobjectButton.setToolTipText("Snap Object");
	631	+ }
	632	+
	633	+ oe.toolbarPanel.add(flashSelectionButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	634	+ flashSelectionButton.setToolTipText("Highlight selection");
472	635	flashSelectionButton.addActionListener(this);
473	636
474		- oe.toolbarPanel.add(new cButton(" ", false));
	637	+ oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
475	638
476		- oe.aConstraints.gridx += 1;
477		- oe.aConstraints.weighty = 0;
478		- oe.aConstraints.gridwidth = 1;
479		-
480		- //
481		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	639	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
482	640	twoButton.setToolTipText("Show center view only");
483	641	twoButton.addActionListener(this);
484		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	642	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
485	643	fourButton.addActionListener(this);
486	644	fourButton.setToolTipText("Show left panel only");
487		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	645	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
488	646	sixButton.setToolTipText("2-column layout left");
489	647	sixButton.addActionListener(this);
490		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	648	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
491	649	threeButton.setToolTipText("2-column layout right");
492	650	threeButton.addActionListener(this);
493		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	651	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
494	652	sevenButton.setToolTipText("3-column layout");
495	653	sevenButton.addActionListener(this);
496	654	//
497	655
498		- oe.toolbarPanel.add(rootButton = new cButton(" o o o ")); //, oe.aConstraints);
499		- rootButton.setToolTipText("Edit object in new tab");
	656	+ oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	657	+ rootButton.setToolTipText("Edit selection in new tab");
500	658	rootButton.addActionListener(this);
501		- oe.aConstraints.gridx += 1;
502		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	659	+
	660	+ oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
503	661	closeButton.setToolTipText("Close tab");
504	662	closeButton.addActionListener(this);
505	663	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
506	664	//clearButton.addActionListener(this);
507		- oe.aConstraints.gridx += 1;
508	665
509		- oe.aConstraints.gridx = 1; //
510		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
	666	+ editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	667	+ editButton.setToolTipText("Edit selection");
511	668	editButton.addActionListener(this);
512		- oe.aConstraints.gridx += 1;
513		- oe.aConstraints.weighty = 0;
514		- oe.aConstraints.gridwidth = 1;
515	669
516		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	670	+ editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	671	+ uneditButton.setToolTipText("Unedit selection");
517	672	uneditButton.addActionListener(this);
518	673
519		- oe.aConstraints.gridx += 1;
520		- oe.aConstraints.weighty = 0;
521		- oe.aConstraints.gridwidth = 1;
522		-
523		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
524		- clearPanelButton.addActionListener(this);
525		-
526		- oe.aConstraints.gridx += 1;
527		- oe.aConstraints.weighty = 0;
528		- oe.aConstraints.gridwidth = 1;
529		-
530		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	674	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	675	+ allParamsButton.setToolTipText("Edit all params");
531	676	allParamsButton.addActionListener(this);
532	677
533		- oe.aConstraints.gridx += 1;
534		- oe.aConstraints.weighty = 0;
535		- oe.aConstraints.gridwidth = 1;
536		-
537		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
	678	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	679	+ clearPanelButton.setToolTipText("Clear edit panel");
	680	+ clearPanelButton.addActionListener(this);
	681	+
	682	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	683	+ unselectButton.setToolTipText("Unselect");
538	684	unselectButton.addActionListener(this);
539	685
	686	+ editCommandsPanel.preferredHeight = 1;
	687	+
	688	+// oe.treePanel.add(commandsPanel);
	689	+// oe.treePanel.Return();
	690	+
540	691	// oe.aConstraints.gridx += 1;
541	692	// oe.aConstraints.weighty = 0;
542	693	// oe.aConstraints.gridwidth = 1;
..	..	@@ -548,40 +699,37 @@
548	699	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
549	700	// gcButton.addActionListener(this);
550	701
551		- oe.aConstraints.gridx = 0;
552		- oe.aConstraints.gridy += 1;
553		-
554		- //ctrlPanel.add(objList = new List(5, true));
555		- oe.aConstraints.gridwidth = 100;
556		- // oe.aConstraints.gridheight = 100;
557		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
558		- oe.aConstraints.gridheight = 1;
559		- oe.aConstraints.weighty = 0.5;
560		- oe.aConstraints.gridx = 0;
561		- JScrollPane jSP;
	702	+ cGridBag jSPPanel = new cGridBag();
	703	+
	704	+ JScrollPane jSP;
562	705	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
563		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	706	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
564	707	ResetModel();
565		- oe.aConstraints.weighty = 0.5;
566		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
567		- oe.aConstraints.gridy += 1;
568		- oe.aConstraints.gridwidth = 1;
	708	+
	709	+ oe.treePanel.add(jSPPanel);
	710	+ oe.treePanel.Return();
569	711
570		- oe.aConstraints.weighty = 0;
571		- oe.aConstraints.gridwidth = 2;
572		-
573		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
	712	+ cGridBag copyOptionsPanel = new cGridBag();
	713	+
	714	+ copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	715	+ colorCB.setToolTipText("Copy color when dropped");
574	716	colorCB.addItemListener(this);
575		- oe.aConstraints.gridx += 2;
576		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
	717	+
	718	+ copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	719	+ materialCB.setToolTipText("Copy material when dropped");
577	720	materialCB.addItemListener(this);
578		- oe.aConstraints.gridx += 2;
579		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
	721	+
	722	+ copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	723	+ textureCB.setToolTipText("Copy texture when dropped");
580	724	textureCB.addItemListener(this);
581	725
582		- oe.aConstraints.gridx = 0;
583		- oe.aConstraints.gridy += 1;
	726	+ copyOptionsPanel.preferredHeight = 1;
	727	+ oe.treePanel.add(copyOptionsPanel);
	728	+ oe.treePanel.Return();
584	729
	730	+// mainPanel.setDividerLocation(0.5); //1.0);
	731	+// mainPanel.setResizeWeight(0.5);
	732	+
585	733	//jList.addListSelectionListener(this);
586	734	oe.jTree.addTreeSelectionListener(this);
587	735	//jTree.setRootVisible(false);
..	..	@@ -604,45 +752,37 @@
604	752	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
605	753	}
606	754
607		- void AddOptions(JPanel panel, GridBagConstraints constraints)
	755	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
608	756	{
609		- constraints.gridx = 0;
610		- constraints.gridy = 0;
611		- panel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), constraints);
612		- fastCB.setToolTipText("Fast mode");
613		- fastCB.addItemListener(this);
614		- constraints.gridy += 1;
615		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), constraints);
616		- supportCB.setToolTipText("Enabled rigging");
617		- supportCB.addItemListener(this);
618		-
619		- // constraints.gridy += 1;
620		- // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
621		- // localCB.addItemListener(this);
622		-
623		- constraints.gridy += 1;
624		- panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD), constraints);
625		- crowdCB.setToolTipText("Used for crowds");
626		- crowdCB.addItemListener(this);
627		-
628		- constraints.gridy += 1;
629		- panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), constraints);
630		- smoothCB.setToolTipText("Snapping delay");
631		- smoothCB.addItemListener(this);
632		-
633		- constraints.gridy += 1;
634		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), constraints);
635		- slowCB.setToolTipText("Smooth interpolation");
636		- slowCB.addItemListener(this);
637		- constraints.gridy += 1;
638		- panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE), constraints);
	757	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
639	758	boxCB.setToolTipText("Display bounding boxes");
640	759	boxCB.addItemListener(this);
641		- constraints.gridy += 1;
642		- panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE), constraints);
	760	+
	761	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
643	762	zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
644	763	zoomBoxCB.addItemListener(this);
645	764
	765	+ if (true) // Globals.ADVANCED)
	766	+ {
	767	+ panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	768	+ supportCB.setToolTipText("Enable rigging");
	769	+ supportCB.addItemListener(this);
	770	+
	771	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	772	+ // localCB.addItemListener(this);
	773	+
	774	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	775	+ crowdCB.setToolTipText("Used for crowds");
	776	+ crowdCB.addItemListener(this);
	777	+
	778	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	779	+ smoothCB.setToolTipText("Snapping delay");
	780	+ smoothCB.addItemListener(this);
	781	+
	782	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	783	+ slowCB.setToolTipText("Smooth interpolation");
	784	+ slowCB.addItemListener(this);
	785	+
646	786	// constraints.gridy += 1;
647	787	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
648	788	// speakerMocapCB.addItemListener(this);
..	..	@@ -650,16 +790,16 @@
650	790	if (false)
651	791	{
652	792	// handled in scripts
653		- constraints.gridy += 1;
654		- panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), constraints);
	793	+ //constraints.gridy += 1;
	794	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
655	795	speakerCameraCB.addItemListener(this);
656	796
657		- constraints.gridy += 1;
658		- panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), constraints);
	797	+ //constraints.gridy += 1;
	798	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
659	799	speakerFocusCB.addItemListener(this);
660	800
661		- constraints.gridy += 1;
662		- panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), constraints);
	801	+ //constraints.gridy += 1;
	802	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
663	803	smoothfocusCB.addItemListener(this);
664	804	}
665	805
..	..	@@ -667,20 +807,46 @@
667	807	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
668	808	// debugCB.addItemListener(this);
669	809
670		- constraints.gridy += 1;
671		- panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL), constraints);
	810	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	811	+ oeilCB.setToolTipText("Move camera when tracking target");
672	812	oeilCB.addItemListener(this);
673	813
674		- constraints.gridy += 1;
675		- panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT), constraints);
	814	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	815	+ shadowCB.setToolTipText("Compute shadows when live");
	816	+ shadowCB.addItemListener(this);
	817	+
	818	+ panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
	819	+ autosaveCB.setToolTipText("Auto-save on structure change");
	820	+ autosaveCB.addItemListener(this);
	821	+
	822	+ if (Globals.ADVANCED)
	823	+ {
	824	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
676	825	lookAtCB.setToolTipText("Look-at target");
677	826	lookAtCB.addItemListener(this);
	827	+ }
	828	+
	829	+ }
	830	+
	831	+ cGridBag fill = new cGridBag();
	832	+
	833	+ fill.preferredHeight = 200;
	834	+
	835	+ panel.add(fill);
678	836
679	837	}
680	838
681	839	void EditObject(Object3D obj)
682	840	{
683	841	cRadio radioButton = new cRadio(obj.name);
	842	+
	843	+ // Patch to avoid bug with transparency.
	844	+ radioButton.hadMaterial = obj.material != null;
	845	+ if (!radioButton.hadMaterial)
	846	+ {
	847	+ obj.material = new cMaterial();
	848	+ }
	849	+
684	850	radioButton.SetObject(obj);
685	851	radioButton.layout = sevenButton;
686	852	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -689,8 +855,11 @@
689	855	buttonGroup.add(radioButton);
690	856	radioButton.doClick();
691	857	}
	858	+
692	859	void SetupViews(ObjEditor oe)
693	860	{
	861	+ theFrame = this;
	862	+
694	863	oe.SetupViews();
695	864
696	865	System.out.println("SetupViews");
..	..	@@ -699,23 +868,26 @@
699	868	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
700	869	}
701	870
702		- JCheckBox liveCB;
703		- JCheckBox supportCB;
704		- JCheckBox localCB;
705		- JCheckBox crowdCB;
706		- JCheckBox smoothCB;
707		- JCheckBox fastCB;
708		- JCheckBox slowCB;
709		- JCheckBox boxCB;
710		- JCheckBox zoomBoxCB;
711		- JCheckBox trackCB;
712		- JCheckBox smoothfocusCB;
	871	+ cCheckBox liveCB;
	872	+ cCheckBox supportCB;
	873	+ cCheckBox localCB;
	874	+ cCheckBox crowdCB;
	875	+ cCheckBox smoothCB;
	876	+ cCheckBox fastCB;
	877	+ cCheckBox slowCB;
	878	+ cCheckBox boxCB;
	879	+ cCheckBox zoomBoxCB;
	880	+ cCheckBox trackCB;
	881	+ cCheckBox smoothfocusCB;
713	882	// JCheckBox speakerMocapCB;
714		- JCheckBox speakerCameraCB;
715		- JCheckBox speakerFocusCB;
716		- JCheckBox debugCB;
717		- JCheckBox oeilCB;
718		- JCheckBox lookAtCB;
	883	+ cCheckBox speakerCameraCB;
	884	+ cCheckBox speakerFocusCB;
	885	+ cCheckBox debugCB;
	886	+
	887	+ cCheckBox oeilCB;
	888	+ cCheckBox shadowCB;
	889	+ cCheckBox autosaveCB;
	890	+ cCheckBox lookAtCB;
719	891
720	892	// static int COLOR = 1;
721	893	// static int MATERIAL = 2;
..	..	@@ -723,9 +895,9 @@
723	895
724	896	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
725	897
726		- JCheckBox colorCB;
727		- JCheckBox materialCB;
728		- JCheckBox textureCB;
	898	+ cCheckBox colorCB;
	899	+ cCheckBox materialCB;
	900	+ cCheckBox textureCB;
729	901
730	902	public void itemStateChanged(ItemEvent e)
731	903	{
..	..	@@ -753,6 +925,7 @@
753	925	} else if(e.getSource() == liveCB)
754	926	{
755	927	cameraView.ToggleLive();
	928	+ refreshContents(false);
756	929	}
757	930	else if(e.getSource() == supportCB)
758	931	{
..	..	@@ -816,6 +989,14 @@
816	989	else if(e.getSource() == oeilCB)
817	990	{
818	991	cameraView.ToggleOeil();
	992	+ }
	993	+ else if(e.getSource() == shadowCB)
	994	+ {
	995	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	996	+ }
	997	+ else if(e.getSource() == autosaveCB)
	998	+ {
	999	+ Globals.SAVEONMAKE ^= true;
819	1000	}
820	1001	else if(e.getSource() == lookAtCB)
821	1002	{
..	..	@@ -905,7 +1086,9 @@
905	1086	// objEditor.DropFile((java.io.File[]) object, true);
906	1087	// return;
907	1088	// }
908		- if (string.charAt(0) == '/')
	1089	+
	1090	+ // File path for Mac and Windows
	1091	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
909	1092	{
910	1093	// file(s)
911	1094	String[] names = string.split("\n");
..	..	@@ -932,7 +1115,7 @@
932	1115
933	1116	flashIt = false;
934	1117	CameraPane pane = (CameraPane) target;
935		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1118	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
936	1119	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
937	1120
938	1121	if (group.selection.size() == 1)
..	..	@@ -959,11 +1142,11 @@
959	1142	{
960	1143	loadClipboard(true);
961	1144	objEditor.jTree.setSelectionPath(destinationPath);
962		- pasteInto(false);
	1145	+ pasteInto(false, false);
963	1146	} else {
964	1147	loadClipboard(false);
965	1148	objEditor.jTree.setSelectionPath(destinationPath);
966		- pasteInto(false); // true); // ???
	1149	+ pasteInto(false, false); // true); // ???
967	1150	}
968	1151	}
969	1152	public void dropActionChanged(DropTargetDragEvent dtde)
..	..	@@ -1085,27 +1268,33 @@
1085	1268	kleinItem.addActionListener(this);
1086	1269	particleItem = menu.add(new MenuItem("Particle system"));
1087	1270	particleItem.addActionListener(this);
	1271	+ if (Globals.ADVANCED)
	1272	+ {
1088	1273	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1089	1274	ragdollItem.addActionListener(this);
1090	1275	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1091	1276	ragdoll2Item.addActionListener(this);
	1277	+ }
1092	1278	menu.add("-");
1093		- meshItem = menu.add(new MenuItem("Mesh"));
	1279	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1094	1280	meshItem.addActionListener(this);
1095	1281	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1096	1282	// meshGroupItem.addActionListener(this);
	1283	+ if (Globals.ADVANCED)
	1284	+ {
1097	1285	springItem = menu.add(new MenuItem("Spring"));
1098	1286	springItem.addActionListener(this);
1099	1287	flagItem = menu.add(new MenuItem("Flag"));
1100	1288	flagItem.addActionListener(this);
1101		- bezierItem = menu.add(new MenuItem("Patch"));
1102		- bezierItem.addActionListener(this);
1103		- checkerItem = menu.add(new MenuItem("Checker"));
1104		- checkerItem.addActionListener(this);
1105	1289	blobItem = menu.add(new MenuItem("Blob"));
1106	1290	blobItem.addActionListener(this);
1107	1291	latheItem = menu.add(new MenuItem("Lathe"));
1108	1292	latheItem.addActionListener(this);
	1293	+ }
	1294	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1295	+ bezierItem.addActionListener(this);
	1296	+ overlayItem = menu.add(new MenuItem("Overlay"));
	1297	+ overlayItem.addActionListener(this);
1109	1298	lightItem = menu.add(new MenuItem("Light"));
1110	1299	lightItem.addActionListener(this);
1111	1300	menu.add("-");
..	..	@@ -1115,39 +1304,44 @@
1115	1304	loopItem.addActionListener(this);
1116	1305	doubleItem = menu.add(new MenuItem("Fork"));
1117	1306	doubleItem.addActionListener(this);
	1307	+ if (Globals.ADVANCED)
	1308	+ {
1118	1309	tripleItem = menu.add(new MenuItem("Trident"));
1119	1310	tripleItem.addActionListener(this);
	1311	+ }
1120	1312	}
1121	1313
1122	1314	void buildToolsMenu(Menu menu)
1123	1315	{
1124	1316	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1125	1317	animationItem.addItemListener(this);
1126		- animationItem.setState(CameraPane.ANIMATION);
	1318	+ animationItem.setState(Globals.ANIMATION);
1127	1319
1128	1320	menu.add("-");
1129	1321	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1130	1322	parseverticesItem.addActionListener(this);
1131	1323	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1132	1324	textureFieldItem.addActionListener(this);
1133		- alignItem = menu.add(new MenuItem("Align"));
	1325	+ alignItem = menu.add(new MenuItem("Align Objects"));
1134	1326	alignItem.addActionListener(this);
1135		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1136		- mirrorItem.addActionListener(this);
1137	1327	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1138	1328	reduceMorphItem.addActionListener(this);
1139	1329	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1140	1330	reduce34MorphItem.addActionListener(this);
1141		-
	1331	+ menu.add("-");
1142	1332	menu.add(computeAOItem = new MenuItem("Compute AO"));
1143	1333	computeAOItem.addActionListener(this);
1144		- menu.add("-");
1145	1334
	1335	+ if (Globals.ADVANCED)
	1336	+ {
	1337	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1338	+ mirrorItem.addActionListener(this);
	1339	+ menu.add("-");
1146	1340	menu.add(memoryItem = new MenuItem("Memory Usage"));
1147	1341	memoryItem.addActionListener(this);
1148	1342	menu.add(analyzeItem = new MenuItem("Analyze"));
1149	1343	analyzeItem.addActionListener(this);
1150		- menu.add(dumpItem = new MenuItem("Dump"));
	1344	+ menu.add(dumpItem = new MenuItem("Print"));
1151	1345	dumpItem.addActionListener(this);
1152	1346	// menu.add(pathItem = new MenuItem("From-to path"));
1153	1347	// pathItem.addActionListener(this);
..	..	@@ -1165,6 +1359,7 @@
1165	1359	menu.add("-");
1166	1360	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1167	1361	editScriptItem.addActionListener(this);
	1362	+ }
1168	1363	}
1169	1364
1170	1365	void ScreenFit()
..	..	@@ -1287,6 +1482,7 @@
1287	1482	shadow.material = new cMaterial(obj.material);
1288	1483	shadow.material.diffuse = 0.0001f;
1289	1484	shadow.material.specular = 0.0001f;
	1485	+ //shadow.projectedVertices[1].x = 300;
1290	1486
1291	1487	makeSomething(shadow);
1292	1488	}
..	..	@@ -1493,9 +1689,9 @@
1493	1689
1494	1690	void Overwrite(int mask)
1495	1691	{
1496		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1692	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1497	1693	{
1498		- Object3D content = GrafreeD.clipboard.get(0);
	1694	+ Object3D content = Grafreed.clipboard.get(0);
1499	1695
1500	1696	if (content instanceof cGroup && ((cGroup)content).transientlink )
1501	1697	content = ((cGroup)content).get(0);
..	..	@@ -1666,7 +1862,7 @@
1666	1862	{
1667	1863	makeSomething(new BezierSurface());
1668	1864	} else
1669		- if (source == checkerItem)
	1865	+ if (source == overlayItem)
1670	1866	{
1671	1867	/*
1672	1868	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1800,23 +1996,6 @@
1800	1996	csg.addChild(child);
1801	1997	child.addChild(csg);
1802	1998	} else
1803		-
1804		- if (source == importGFDItem)
1805		- {
1806		- ImportGFD();
1807		- } else
1808		- if (source == importVRMLX3DItem)
1809		- {
1810		- ImportVRMLX3D();
1811		- } else
1812		- if (source == import3DSItem)
1813		- {
1814		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1815		- } else
1816		- if (source == importOBJItem)
1817		- {
1818		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1819		- } else
1820	1999	if (source == computeAOItem)
1821	2000	{
1822	2001	Globals.drawMode = CameraPane.OCCLUSION;
..	..	@@ -1835,7 +2014,7 @@
1835	2014	if (source == invariantsItem)
1836	2015	{
1837	2016	System.out.println("Invariants:");
1838		- GrafreeD.grafreeD.universe.invariants();
	2017	+ Grafreed.grafreeD.universe.invariants();
1839	2018	} else
1840	2019	if (source == memoryItem)
1841	2020	{
..	..	@@ -1853,6 +2032,35 @@
1853	2032	if (source == dumpItem)
1854	2033	{
1855	2034	DumpObject();
	2035	+ } else
	2036	+ if (source == minButton)
	2037	+ {
	2038	+ Minimize();
	2039	+ } else
	2040	+ if (source == maxButton)
	2041	+ {
	2042	+ Maximize();
	2043	+ } else
	2044	+ if (source == fullButton)
	2045	+ {
	2046	+ ToggleFullScreen();
	2047	+ } else
	2048	+ if (source == undoButton)
	2049	+ {
	2050	+ Undo();
	2051	+ } else
	2052	+ if (source == redoButton)
	2053	+ {
	2054	+ Redo();
	2055	+ } else
	2056	+ if (source == saveButton)
	2057	+ {
	2058	+ Save();
	2059	+ } else
	2060	+ if (source == oneStepButton)
	2061	+ {
	2062	+ Globals.ONESTEP = true;
	2063	+ cameraView.repaint();
1856	2064	} else
1857	2065	if (source == screenfitButton)
1858	2066	{
..	..	@@ -1903,12 +2111,20 @@
1903	2111	{
1904	2112	loadClipboard(true);
1905	2113	} else
	2114	+ if (source == undoItem)
	2115	+ {
	2116	+ Undo();
	2117	+ } else
	2118	+ if (source == redoItem)
	2119	+ {
	2120	+ Redo();
	2121	+ } else
1906	2122	if (source == duplicateItem)
1907	2123	{
1908		- Object3D keep = GrafreeD.clipboard;
	2124	+ Object3D keep = Grafreed.clipboard;
1909	2125	loadClipboard(false);
1910	2126	paste(false);
1911		- GrafreeD.clipboard = keep;
	2127	+ Grafreed.clipboard = keep;
1912	2128	} else
1913	2129	if (source == cloneItem)
1914	2130	{
..	..	@@ -1926,13 +2142,17 @@
1926	2142	{
1927	2143	paste(false);
1928	2144	} else
	2145	+ if (source == pasteIntoItem)
	2146	+ {
	2147	+ pasteInto(true, false);
	2148	+ } else
1929	2149	if (source == pasteLinkItem)
1930	2150	{
1931		- pasteInto(false);
	2151	+ pasteInto(false, false);
1932	2152	} else
1933	2153	if (source == pasteCloneItem)
1934	2154	{
1935		- pasteInto(true);
	2155	+ pasteInto(true, true);
1936	2156	} else
1937	2157	if (source == pasteExpandItem)
1938	2158	{
..	..	@@ -2124,9 +2344,9 @@
2124	2344	// group.selection.get(0).setMasterThis(content); // should be identity
2125	2345	// refreshContents();
2126	2346	// }
2127		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2347	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2128	2348	{
2129		- Object3D content = GrafreeD.clipboard.get(0);
	2349	+ Object3D content = Grafreed.clipboard.get(0);
2130	2350
2131	2351	if (content instanceof cGroup && ((cGroup)content).transientlink )
2132	2352	content = ((cGroup)content).get(0);
..	..	@@ -2134,11 +2354,11 @@
2134	2354	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2135	2355	for (int i=0; i<group.selection.size(); i++)
2136	2356	{
2137		- boolean random = CameraPane.RANDOM;
2138		- CameraPane.RANDOM = false; // parse all random nodes
	2357	+ boolean random = CameraPane.SWITCH;
	2358	+ CameraPane.SWITCH = false; // parse all random nodes
2139	2359	group.selection.get(i).linkVerticesThis(content);
2140	2360	// group.selection.get(i).setMasterThis(content); // should be identity
2141		- CameraPane.RANDOM = random;
	2361	+ CameraPane.SWITCH = random;
2142	2362	}
2143	2363	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2144	2364	refreshContents();
..	..	@@ -2148,20 +2368,20 @@
2148	2368	{
2149	2369	for (int i=0; i<group.selection.size(); i++)
2150	2370	{
2151		- boolean random = CameraPane.RANDOM;
2152		- CameraPane.RANDOM = false; // parse all random nodes
	2371	+ boolean random = CameraPane.SWITCH;
	2372	+ CameraPane.SWITCH = false; // parse all random nodes
2153	2373	group.selection.get(i).linkVerticesThis(null);
2154		- CameraPane.RANDOM = random;
	2374	+ CameraPane.SWITCH = random;
2155	2375	}
2156	2376
2157	2377	refreshContents();
2158	2378	} else
2159	2379	if (source == relinkverticesItem)
2160	2380	{
2161		- boolean random = CameraPane.RANDOM;
2162		- CameraPane.RANDOM = false; // parse all random nodes
	2381	+ boolean random = CameraPane.SWITCH;
	2382	+ CameraPane.SWITCH = false; // parse all random nodes
2163	2383	group.selection.RelinkToSupport();
2164		- CameraPane.RANDOM = random;
	2384	+ CameraPane.SWITCH = random;
2165	2385
2166	2386	refreshContents();
2167	2387	} else
..	..	@@ -2176,9 +2396,9 @@
2176	2396	} else
2177	2397	if (source == setMasterItem)
2178	2398	{
2179		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2399	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2180	2400	{
2181		- Object3D content = GrafreeD.clipboard.get(0);
	2401	+ Object3D content = Grafreed.clipboard.get(0);
2182	2402
2183	2403	if (content instanceof cGroup && ((cGroup)content).transientlink )
2184	2404	content = ((cGroup)content).get(0);
..	..	@@ -2191,9 +2411,9 @@
2191	2411	{
2192	2412	if (group.selection.size() == 1)
2193	2413	{
2194		- if (GrafreeD.clipboard.size() == 1)
	2414	+ if (Grafreed.clipboard.size() == 1)
2195	2415	{
2196		- Object3D content = GrafreeD.clipboard.get(0);
	2416	+ Object3D content = Grafreed.clipboard.get(0);
2197	2417
2198	2418	if (content instanceof cGroup && ((cGroup)content).transientlink )
2199	2419	content = ((cGroup)content).get(0);
..	..	@@ -2210,7 +2430,7 @@
2210	2430	{
2211	2431	RevertMeshes();
2212	2432	} else
2213		- if (source == resetMeshItem)
	2433	+ if (source == resetAllItem)
2214	2434	{
2215	2435	ResetAll();
2216	2436	} else
..	..	@@ -2259,7 +2479,7 @@
2259	2479	RandomNode random = new RandomNode();
2260	2480	group(random);
2261	2481	if (random.size() > 0)
2262		- random.name = random.get(0).name + "Rnd";
	2482	+ random.name = random.get(0).name + "Switch";
2263	2483	} else
2264	2484	if (source == physicsItem)
2265	2485	{
..	..	@@ -2398,7 +2618,7 @@
2398	2618	} else
2399	2619	if (source == genNormalsMESHItem)
2400	2620	{
2401		- GenNormals(true); // TODO
	2621	+ GenNormalsMESH();
2402	2622	} else
2403	2623	if (source == genNormalsORGANItem)
2404	2624	{
..	..	@@ -2463,6 +2683,22 @@
2463	2683	if (source == unmarkleavesItem)
2464	2684	{
2465	2685	MarkLeaves(false);
	2686	+ } else
	2687	+ if (source == rewindleavesItem)
	2688	+ {
	2689	+ RewindLeaves(true);
	2690	+ } else
	2691	+ if (source == unrewindleavesItem)
	2692	+ {
	2693	+ RewindLeaves(false);
	2694	+ } else
	2695	+ if (source == randomleavesItem)
	2696	+ {
	2697	+ RandomLeaves(true);
	2698	+ } else
	2699	+ if (source == unrandomleavesItem)
	2700	+ {
	2701	+ RandomLeaves(false);
2466	2702	} else
2467	2703	if (source == flipVItem)
2468	2704	{
..	..	@@ -2548,9 +2784,13 @@
2548	2784	{
2549	2785	SmoothMesh();
2550	2786	} else
2551		- if (source == transformgeometryItem)
	2787	+ if (source == transformGeometryItem)
2552	2788	{
2553	2789	TransformGeometry();
	2790	+ } else
	2791	+ if (source == transformChildrenItem)
	2792	+ {
	2793	+ TransformChildren();
2554	2794	} else
2555	2795	if (source == resetTransformItem)
2556	2796	{
..	..	@@ -2558,7 +2798,11 @@
2558	2798	} else
2559	2799	if (source == resetCentroidItem)
2560	2800	{
2561		- ResetCentroid();
	2801	+ ResetCentroid(true);
	2802	+ } else
	2803	+ if (source == resetCentroidXZItem)
	2804	+ {
	2805	+ ResetCentroid(false);
2562	2806	} else
2563	2807	if (source == resetParentItem)
2564	2808	{
..	..	@@ -2722,6 +2966,24 @@
2722	2966	bigThree.ClearUI();
2723	2967	bigThree.add(centralPanel);
2724	2968	bigThree.FlushUI();
	2969	+
	2970	+ cameraView.requestFocusInWindow();
	2971	+
	2972	+// refreshContents(true);
	2973	+//
	2974	+// try
	2975	+// {
	2976	+// java.awt.Robot bot = new java.awt.Robot();
	2977	+// int mask = InputEvent.BUTTON1_MASK;
	2978	+// bot.mouseMove(100, 100);
	2979	+// bot.mousePress(mask);
	2980	+// bot.mouseRelease(mask);
	2981	+// }
	2982	+// catch (Exception e)
	2983	+// {
	2984	+//
	2985	+// }
	2986	+
2725	2987	} else
2726	2988	if (source == threeButton)
2727	2989	{
..	..	@@ -2758,6 +3020,8 @@
2758	3020	bigThree.add(centralPanel);
2759	3021	bigThree.add(XYZPanel);
2760	3022	bigThree.FlushUI();
	3023	+
	3024	+ cameraView.requestFocusInWindow();
2761	3025	} else
2762	3026	if (source == fourButton)
2763	3027	{
..	..	@@ -2793,6 +3057,8 @@
2793	3057	bigThree.ClearUI();
2794	3058	bigThree.add(scenePanel);
2795	3059	bigThree.FlushUI();
	3060	+
	3061	+ cameraView.requestFocusInWindow();
2796	3062	} else
2797	3063	if (source == sixButton)
2798	3064	{
..	..	@@ -2829,6 +3095,8 @@
2829	3095	bigThree.add(scenePanel);
2830	3096	bigThree.add(centralPanel);
2831	3097	bigThree.FlushUI();
	3098	+
	3099	+ cameraView.requestFocusInWindow();
2832	3100	} else
2833	3101	if (source == sevenButton)
2834	3102	{
..	..	@@ -2866,6 +3134,8 @@
2866	3134	bigThree.add(centralPanel);
2867	3135	bigThree.add(XYZPanel);
2868	3136	bigThree.FlushUI();
	3137	+
	3138	+ cameraView.requestFocusInWindow();
2869	3139	} else
2870	3140	if (source == rootButton)
2871	3141	{
..	..	@@ -2877,6 +3147,7 @@
2877	3147	EditObject(obj);
2878	3148	}
2879	3149
	3150	+ cameraView.requestFocusInWindow();
2880	3151	refreshContents(true);
2881	3152	} else
2882	3153	if (source == closeButton)
..	..	@@ -2886,18 +3157,27 @@
2886	3157	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2887	3158	{
2888	3159	ab = (cRadio)e.nextElement();
2889		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3160	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2890	3161	{
	3162	+ // Patch to avoid bug with transparency.
	3163	+ if (!ab.hadMaterial)
	3164	+ {
	3165	+ ab.object.material = null;
	3166	+ }
	3167	+
2891	3168	buttonGroup.remove(ab);
2892	3169	radioPanel.remove(ab);
2893	3170
2894		- ab.GetObject().editWindow = null;
	3171	+ //ab.GetObject().editWindow = null;
	3172	+ ab.GetObject().manipWindow = null;
2895	3173	// ab.GetObject().objectUI = null; // ?????????
2896	3174
2897	3175	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2898	3176	break;
2899	3177	}
2900	3178	}
	3179	+
	3180	+ cameraView.requestFocusInWindow();
2901	3181	refreshContents(true);
2902	3182	} else
2903	3183	if (source == editItem \|\| source == editButton)
..	..	@@ -2914,9 +3194,9 @@
2914	3194	child.CloseUI();
2915	3195	listUI.remove(child);
2916	3196
2917		- child.editWindow = null; // ???????????
	3197	+ //child.editWindow = null; // ???????????
2918	3198	}
2919		- objEditor.ctrlPanel.revalidate();
	3199	+ objEditor.ctrlPanel.FlushUI();
2920	3200	//objEditor.jTree.clearSelection();
2921	3201	//objEditor.ResetSliders();
2922	3202	refreshContents(true);
..	..	@@ -3000,7 +3280,11 @@
3000	3280	frontView.object = group;
3001	3281	sideView.object = group;
3002	3282	}
3003		- group.editWindow = this;
	3283	+
	3284	+// fix "+" issue
	3285	+ //group.editWindow = this;
	3286	+ group.manipWindow = this;
	3287	+
3004	3288	/*
3005	3289	currentLayout = radio.layout;
3006	3290	if (currentLayout == null)
..	..	@@ -3012,8 +3296,23 @@
3012	3296	//group.parent = null; // ROOT
3013	3297	//group.attributes = -1;
3014	3298	ResetModel();
	3299	+
	3300	+ cameraView.requestFocusInWindow();
3015	3301	refreshContents(true);
3016		- }
	3302	+ } else if (event.getSource() == editCameraItem)
	3303	+ {
	3304	+ cameraView.ProtectCamera();
	3305	+ cameraView.repaint();
	3306	+ return;
	3307	+ } else if (event.getSource() == revertCameraItem)
	3308	+ {
	3309	+ cameraView.RevertCamera();
	3310	+ cameraView.repaint();
	3311	+ return;
	3312	+ // } else if (event.getSource() == textureButton)
	3313	+ // {
	3314	+ // return; // true;
	3315	+ }
3017	3316	else
3018	3317	{
3019	3318	//return super.action(event, arg);
..	..	@@ -3022,7 +3321,6 @@
3022	3321	}
3023	3322
3024	3323	boolean useclient = false;
3025		- cRadio radio;
3026	3324
3027	3325	void ToggleRoot()
3028	3326	{
..	..	@@ -3074,6 +3372,28 @@
3074	3372	refreshContents();
3075	3373	}
3076	3374
	3375	+ void TransformChildren()
	3376	+ {
	3377	+ Object3D obj;
	3378	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3379	+ {
	3380	+ obj = (Object3D)e.nextElement();
	3381	+ obj.KeepTextureMatrices();
	3382	+ obj.TransformChildren();
	3383	+ obj.RestoreTextureMatrices();
	3384	+
	3385	+// if (obj.parent == null)
	3386	+// {
	3387	+// System.out.println("NULL PARENT!");
	3388	+// new Exception().printStackTrace();
	3389	+// }
	3390	+// else
	3391	+// TouchTransform(obj);
	3392	+// //obj.parent.Touch();
	3393	+ }
	3394	+
	3395	+ refreshContents();
	3396	+ }
3077	3397
3078	3398	void ResetTransform()
3079	3399	{
..	..	@@ -3186,7 +3506,7 @@
3186	3506	refreshContents();
3187	3507	}
3188	3508
3189		- void ResetCentroid()
	3509	+ void ResetCentroid(boolean full)
3190	3510	{
3191	3511	Object3D obj;
3192	3512	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3201,12 +3521,16 @@
3201	3521	LA.matIdentity(Object3D.mat);
3202	3522	obj.getBounds(minima, maxima, false);
3203	3523	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3204		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3524	+ if (full)
	3525	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3205	3526	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3206	3527	obj.TransformMesh(Object3D.mat);
	3528	+
3207	3529	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3208		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3530	+ if (full)
	3531	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3209	3532	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3533	+
3210	3534	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3211	3535	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3212	3536	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3235,7 +3559,8 @@
3235	3559
3236	3560	int size = obj.MemorySize();
3237	3561
3238		- System.err.println((size/1024) + " KB is the size of " + obj);
	3562	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3563	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3239	3564	}
3240	3565	}
3241	3566	catch (Exception e)
..	..	@@ -3272,9 +3597,9 @@
3272	3597	obj = (Object3D)e.nextElement();
3273	3598
3274	3599	System.out.println("Object is: " + obj);
3275		- GrafreeD.AnalyzeObject(obj);
	3600	+ Grafreed.AnalyzeObject(obj);
3276	3601	System.out.println("Boundary rep: " + obj.bRep);
3277		- GrafreeD.AnalyzeObject(obj.bRep);
	3602	+ Grafreed.AnalyzeObject(obj.bRep);
3278	3603
3279	3604	// System.err.println((size/1024) + " KB is the size of " + obj);
3280	3605	}
..	..	@@ -3316,6 +3641,13 @@
3316	3641	void GenNormals(boolean crease)
3317	3642	{
3318	3643	group.GenNormalsS(crease);
	3644	+
	3645	+ refreshContents();
	3646	+ }
	3647	+
	3648	+ void GenNormalsMESH()
	3649	+ {
	3650	+ group.GenNormalsMeshS();
3319	3651
3320	3652	refreshContents();
3321	3653	}
..	..	@@ -3488,8 +3820,8 @@
3488	3820
3489	3821	void ParseVertices()
3490	3822	{
3491		- boolean epsequal = GrafreeD.epsequal;
3492		- GrafreeD.epsequal = true;
	3823	+ boolean epsequal = Grafreed.epsequal;
	3824	+ Grafreed.epsequal = true;
3493	3825
3494	3826	for (int i=0; i<group.selection.size(); i++)
3495	3827	{
..	..	@@ -3514,7 +3846,7 @@
3514	3846	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3515	3847	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3516	3848
3517		- g.add(GrafreeD.clipboard);
	3849	+ g.add(Grafreed.clipboard);
3518	3850
3519	3851	buffer.add(g);
3520	3852	}
..	..	@@ -3529,7 +3861,7 @@
3529	3861	makeSomething(buffer, i==group.selection.size()-1);
3530	3862	}
3531	3863
3532		- GrafreeD.epsequal = epsequal;
	3864	+ Grafreed.epsequal = epsequal;
3533	3865
3534	3866	refreshContents();
3535	3867	}
..	..	@@ -3547,7 +3879,16 @@
3547	3879	String pigment = Object3D.GetPigment(tex);
3548	3880	//String bump = Object3D.GetBump(tex);
3549	3881
3550		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3882	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	3883	+
	3884	+ try
	3885	+ {
	3886	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3887	+ }
	3888	+ catch (Exception e)
	3889	+ {
	3890	+ System.err.println("FAIL: " + node);
	3891	+ }
3551	3892
3552	3893	double s = v.s;
3553	3894
..	..	@@ -3635,11 +3976,11 @@
3635	3976
3636	3977	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3637	3978
3638		- boolean random = CameraPane.RANDOM;
3639		- CameraPane.RANDOM = false; // parse all random nodes
	3979	+ boolean random = CameraPane.SWITCH;
	3980	+ CameraPane.SWITCH = false; // parse all random nodes
3640	3981	lowres.linkVerticesThis(null);
3641	3982	lowres.linkVerticesThis(sn);
3642		- CameraPane.RANDOM = random;
	3983	+ CameraPane.SWITCH = random;
3643	3984
3644	3985	System.err.flush();
3645	3986
..	..	@@ -3679,7 +4020,7 @@
3679	4020	return;
3680	4021
3681	4022	Object3D poses = group.selection.get(0);
3682		- Object3D ref = GrafreeD.clipboard.get(0);
	4023	+ Object3D ref = Grafreed.clipboard.get(0);
3683	4024
3684	4025	Object3D newgroup = new Object3D("Po:" + poses.name);
3685	4026
..	..	@@ -3873,9 +4214,9 @@
3873	4214
3874	4215	void ClipMesh()
3875	4216	{
3876		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4217	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3877	4218	{
3878		- Object3D content = GrafreeD.clipboard.get(0);
	4219	+ Object3D content = Grafreed.clipboard.get(0);
3879	4220
3880	4221	if (content instanceof cGroup && ((cGroup)content).transientlink )
3881	4222	content = ((cGroup)content).get(0);
..	..	@@ -3884,7 +4225,7 @@
3884	4225	// {
3885	4226	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3886	4227	// }
3887		- group.selection.ClipMesh(GrafreeD.clipboard);
	4228	+ group.selection.ClipMesh(Grafreed.clipboard);
3888	4229	}
3889	4230	// group.selection.ClipMesh(GrafreeD.clipboard);
3890	4231	System.out.println("DONE.");
..	..	@@ -3931,6 +4272,18 @@
3931	4272	void MarkLeaves(boolean hide)
3932	4273	{
3933	4274	group.selection.MarkLeaves(hide);
	4275	+ refreshContents();
	4276	+ }
	4277	+
	4278	+ void RewindLeaves(boolean hide)
	4279	+ {
	4280	+ group.selection.RewindLeaves(hide);
	4281	+ refreshContents();
	4282	+ }
	4283	+
	4284	+ void RandomLeaves(boolean hide)
	4285	+ {
	4286	+ group.selection.RandomLeaves(hide);
3934	4287	refreshContents();
3935	4288	}
3936	4289
..	..	@@ -4019,7 +4372,7 @@
4019	4372	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4020	4373
4021	4374	Object3D elem = (Object3D)group.selection.elementAt(i);
4022		- if(elem != group)
	4375	+ if(elem != group \|\| !newWindow)
4023	4376	{
4024	4377	// if (!(elem instanceof Composite))
4025	4378	// newWindow = false;
..	..	@@ -4109,7 +4462,6 @@
4109	4462	//case 702: // Event.LIST_DESELECT
4110	4463	group.deselectAll();
4111	4464	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4112		- objEditor.ClearInfo(); // .GetMaterial());
4113	4465	if (tps != null)
4114	4466	{
4115	4467	for (int i=0; i < tps.length; i++)
..	..	@@ -4118,29 +4470,28 @@
4118	4470
4119	4471	//if (child.parent != null)
4120	4472	//child.parent.addSelectee(child);
	4473	+ objEditor.SetMaterial(child);
4121	4474	group.addSelectee(child);
4122		- objEditor.SetMaterial(child); // .GetMaterial());
4123		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4124		- System.err.println("info : " + child.GetPath());
4125	4475	}
4126	4476	}
4127		- else
4128		- {
4129		- objEditor.SetMaterial(group); // .GetMaterial());
4130		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4131		- System.err.println("info : " + group.GetPath());
4132		- }
	4477	+// else
	4478	+// {
	4479	+// objEditor.SetMaterial(group); // .GetMaterial());
	4480	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4481	+// System.err.println("info : " + group.GetPath());
	4482	+// }
4133	4483
4134		- objEditor.SetText(); // jan 2014
4135		-
4136		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4484	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4137	4485	CameraPane.flash = true;
4138	4486
4139		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4487	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4140	4488	// a camera
4141	4489	{
4142		- CameraPane.camerachangeframe = 0; // don't refuse it
4143		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4490	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4491	+ {
	4492	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4493	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4494	+ }
4144	4495	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4145	4496	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4146	4497	}
..	..	@@ -4153,6 +4504,26 @@
4153	4504
4154	4505	freezemodel = false;
4155	4506	}
	4507	+
	4508	+ void refreshContents(boolean cp)
	4509	+ {
	4510	+ if (!Globals.MOUSEDRAGGED)
	4511	+ {
	4512	+ objEditor.ClearInfo(); // .GetMaterial());
	4513	+
	4514	+ for (int i=0; i < group.selection.Size(); i++)
	4515	+ {
	4516	+ Object3D child = (Object3D) group.selection.get(i);
	4517	+
	4518	+ objEditor.AddInfo(child, this, true);
	4519	+ System.err.println("info : " + child.GetPath());
	4520	+ }
	4521	+
	4522	+ objEditor.SetText(); // jan 2014
	4523	+ }
	4524	+
	4525	+ super.refreshContents(cp);
	4526	+ }
4156	4527
4157	4528	void linkSomething(Object3D thing)
4158	4529	{
..	..	@@ -4224,16 +4595,19 @@
4224	4595	{
4225	4596	if (group.selection.isEmpty())
4226	4597	return;
4227		- GrafreeD.clipboardIsTempGroup = false;
	4598	+
	4599	+ Grafreed.clipboardIsTempGroup = false;
4228	4600	Composite tGroup = null;
4229	4601	if (group.selection.size() > 0) // 1)
4230	4602	{
4231	4603	tGroup = new cGroup();
4232		- GrafreeD.clipboardIsTempGroup = true;
	4604	+ Grafreed.clipboardIsTempGroup = true;
4233	4605	}
4234	4606
4235	4607	if (cut)
4236	4608	{
	4609	+ if (Globals.SAVEONMAKE)
	4610	+ Save();
4237	4611	//int indices[] = jList.getSelectedIndices();
4238	4612	//for (int i = indices.length - 1; i >= 0; i--)
4239	4613	//jList.remove(indices[i]);
..	..	@@ -4269,16 +4643,16 @@
4269	4643	//System.out.println("cut " + child);
4270	4644	//System.out.println("parent = " + child.parent);
4271	4645	// tmp.addChild(child);
4272		- if (GrafreeD.clipboardIsTempGroup)
	4646	+ if (Grafreed.clipboardIsTempGroup)
4273	4647	tGroup.add/Child/(tmp);
4274	4648	else
4275		- GrafreeD.clipboard = tmp;
	4649	+ Grafreed.clipboard = tmp;
4276	4650	}
4277	4651	else
4278		- if (GrafreeD.clipboardIsTempGroup)
	4652	+ if (Grafreed.clipboardIsTempGroup)
4279	4653	tGroup.add/Child/(child);
4280	4654	else
4281		- GrafreeD.clipboard = child;
	4655	+ Grafreed.clipboard = child;
4282	4656	}
4283	4657
4284	4658	//ResetModel();
..	..	@@ -4310,21 +4684,23 @@
4310	4684	//System.out.println("cut " + elem);
4311	4685	//System.out.println("parent = " + elem.parent);
4312	4686	// tmp.addChild(elem);
4313		- if (GrafreeD.clipboardIsTempGroup)
	4687	+ if (Grafreed.clipboardIsTempGroup)
4314	4688	tGroup.add/Child/(tmp);
4315	4689	else
4316		- GrafreeD.clipboard = tmp;
	4690	+ Grafreed.clipboard = tmp;
4317	4691	}
4318	4692	else
4319		- if (GrafreeD.clipboardIsTempGroup)
	4693	+ if (Grafreed.clipboardIsTempGroup)
4320	4694	tGroup.add/Child/(child);
4321	4695	else
4322		- GrafreeD.clipboard = child;
	4696	+ Grafreed.clipboard = child;
4323	4697	}
4324	4698
4325	4699	}
4326		- if (GrafreeD.clipboardIsTempGroup)
4327		- GrafreeD.clipboard = tGroup;
	4700	+
	4701	+ if (Grafreed.clipboardIsTempGroup)
	4702	+ Grafreed.clipboard = tGroup;
	4703	+
4328	4704	if (cut)
4329	4705	{
4330	4706	ResetModel();
..	..	@@ -4338,7 +4714,7 @@
4338	4714	// return;
4339	4715	boolean first = true;
4340	4716
4341		- if (GrafreeD.clipboardIsTempGroup)
	4717	+ if (Grafreed.clipboardIsTempGroup)
4342	4718	{
4343	4719	Composite temp;
4344	4720
..	..	@@ -4349,7 +4725,7 @@
4349	4725	temp = (Composite)Applet3D.clipboard.deepCopy();
4350	4726	*/
4351	4727	Object3D elem;
4352		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4728	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4353	4729	{
4354	4730	Object3D child = (Object3D)e.nextElement();
4355	4731
..	..	@@ -4383,21 +4759,21 @@
4383	4759	//Object3D cb = Applet3D.clipboard;
4384	4760	//temp.addChild(cb);
4385	4761	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4386		- assert(GrafreeD.clipboard.parent == null);
4387		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4388		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4389		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4390		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	4762	+ assert(Grafreed.clipboard.parent == null);
	4763	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4764	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4765	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4766	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4391	4767	else
4392		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4393		- GrafreeD.clipboard.get(0).parent = keepparent;
	4768	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4769	+ Grafreed.clipboard.get(0).parent = keepparent;
4394	4770	}
4395	4771
4396	4772	ResetModel();
4397	4773	refreshContents();
4398	4774	}
4399	4775
4400		- void pasteInto(boolean copyit)
	4776	+ void pasteInto(boolean copyit, boolean clone)
4401	4777	{
4402	4778	// if (GrafreeD.clipboard == null)
4403	4779	// return;
..	..	@@ -4426,15 +4802,22 @@
4426	4802	if (copyit)
4427	4803	{
4428	4804	// paste(false);
4429		- CloneClipboard(false); // sept 2014
	4805	+ if (clone)
	4806	+ {
	4807	+ CloneClipboard(false); // sept 2014
	4808	+ }
	4809	+ else
	4810	+ {
	4811	+ paste(false);
	4812	+ }
4430	4813	}
4431	4814	else
4432	4815	{
4433	4816	boolean first = true;
4434	4817
4435		- if (GrafreeD.clipboardIsTempGroup)
	4818	+ if (Grafreed.clipboardIsTempGroup)
4436	4819	{
4437		- Composite temp = (Composite)GrafreeD.clipboard;
	4820	+ Composite temp = (Composite)Grafreed.clipboard;
4438	4821	Object3D copy;
4439	4822	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4440	4823	{
..	..	@@ -4444,7 +4827,7 @@
4444	4827	}
4445	4828	} else
4446	4829	{
4447		- linkSomething(GrafreeD.clipboard); //.get(0));
	4830	+ linkSomething(Grafreed.clipboard); //.get(0));
4448	4831	}
4449	4832	}
4450	4833	}
..	..	@@ -4849,21 +5232,6 @@
4849	5232	}
4850	5233	*/
4851	5234
4852		- void ImportGFD()
4853		- {
4854		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4855		- browser.show();
4856		- String filename = browser.getFile();
4857		- if (filename != null && filename.length() > 0)
4858		- {
4859		- String fullname = browser.getDirectory() + filename;
4860		-
4861		- //Object3D readobj =
4862		- objEditor.ReadGFD(fullname, objEditor);
4863		- //makeSomething(readobj);
4864		- }
4865		- }
4866		-
4867	5235	/*
4868	5236	public void Callback(Object obj)
4869	5237	{
..	..	@@ -4887,26 +5255,9 @@
4887	5255	}
4888	5256	*/
4889	5257
4890		- void ImportVRMLX3D()
4891		- {
4892		- if (GrafreeD.standAlone)
4893		- {
4894		- /**/
4895		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4896		- browser.show();
4897		- String filename = browser.getFile();
4898		- if (filename != null && filename.length() > 0)
4899		- {
4900		- String fullname = browser.getDirectory() + filename;
4901		- LoadVRMLX3D(fullname);
4902		- }
4903		- /**/
4904		- }
4905		- }
4906		-
4907	5258	String GetFile(String dialogName)
4908	5259	{
4909		- if (GrafreeD.standAlone)
	5260	+ if (Grafreed.standAlone)
4910	5261	{
4911	5262	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4912	5263	browser.show();
..	..	@@ -4970,10 +5321,18 @@
4970	5321	cButton flashSelectionButton;
4971	5322	cButton editButton;
4972	5323	cButton uneditButton;
	5324	+ JCheckBox allParamsButton;
4973	5325	cButton clearpanelButton;
4974		- cButton allParamsButton;
4975	5326	cButton unselectButton;
4976	5327
	5328	+ cButton minButton;
	5329	+ cButton maxButton;
	5330	+ cButton fullButton;
	5331	+ cButton undoButton;
	5332	+ cButton redoButton;
	5333	+ cButton saveButton;
	5334	+ cButton oneStepButton;
	5335	+
4977	5336	cButton screenfitButton;
4978	5337	cButton screenfitpointButton;
4979	5338	cButton snapobjectButton;
..	..	@@ -4984,14 +5343,6 @@
4984	5343	cButton closeButton;
4985	5344
4986	5345	cButton setsupportButton;
4987		-
4988		- cButton twoButton;
4989		- cButton sixButton;
4990		- cButton threeButton;
4991		- cButton sevenButton;
4992		- cButton fourButton; // full panel
4993		- cButton oneButton; // full XYZ
4994		- //cButton currentLayout;
4995	5346
4996	5347	//
4997	5348	//Composite
..	..	@@ -5004,6 +5355,8 @@
5004	5355	private MenuItem lookFromItem;
5005	5356	private MenuItem switchItem;
5006	5357	private MenuItem cutItem;
	5358	+ private MenuItem undoItem;
	5359	+ private MenuItem redoItem;
5007	5360	private MenuItem duplicateItem;
5008	5361	private MenuItem cloneItem;
5009	5362	private MenuItem cloneSupportItem;
..	..	@@ -5017,7 +5370,7 @@
5017	5370	private MenuItem linkverticesItem;
5018	5371	private MenuItem relinkverticesItem;
5019	5372	private MenuItem setMasterItem;
5020		- private MenuItem resetMeshItem;
	5373	+ private MenuItem resetAllItem;
5021	5374	private MenuItem stepAllItem;
5022	5375	private MenuItem revertMeshItem;
5023	5376	private MenuItem poseMeshItem;
..	..	@@ -5028,6 +5381,7 @@
5028	5381	private MenuItem mergeGeometriesItem;
5029	5382	private MenuItem copyItem;
5030	5383	private MenuItem pasteItem;
	5384	+ private MenuItem pasteIntoItem;
5031	5385	private MenuItem pasteLinkItem;
5032	5386	private MenuItem pasteCloneItem;
5033	5387	private MenuItem pasteExpandItem;
..	..	@@ -5066,6 +5420,10 @@
5066	5420	private MenuItem showleavesItem;
5067	5421	private MenuItem markleavesItem;
5068	5422	private MenuItem unmarkleavesItem;
	5423	+ private MenuItem rewindleavesItem;
	5424	+ private MenuItem unrewindleavesItem;
	5425	+ private MenuItem randomleavesItem;
	5426	+ private MenuItem unrandomleavesItem;
5069	5427
5070	5428	private MenuItem flipVItem;
5071	5429	private MenuItem unflipVItem;
..	..	@@ -5077,8 +5435,10 @@
5077	5435	private MenuItem panoTexturesItem;
5078	5436
5079	5437	private MenuItem resetCentroidItem;
5080		- private MenuItem transformgeometryItem;
	5438	+ private MenuItem resetCentroidXZItem;
5081	5439	private MenuItem resetTransformItem;
	5440	+ private MenuItem transformGeometryItem;
	5441	+ private MenuItem transformChildrenItem;
5082	5442	private MenuItem hideItem;
5083	5443	private MenuItem grabItem;
5084	5444	private MenuItem backItem;
..	..	@@ -5125,7 +5485,7 @@
5125	5485	private MenuItem blobItem;
5126	5486	private MenuItem latheItem;
5127	5487	private MenuItem bezierItem;
5128		- private MenuItem checkerItem;
	5488	+ private MenuItem overlayItem;
5129	5489	private MenuItem meshItem;
5130	5490	// private MenuItem meshGroupItem;
5131	5491	private MenuItem springItem;
..	..	@@ -5147,11 +5507,6 @@
5147	5507	private MenuItem doubleItem;
5148	5508	private MenuItem tripleItem;
5149	5509
5150		- private MenuItem importGFDItem;
5151		- private MenuItem importVRMLX3DItem;
5152		- private MenuItem import3DSItem;
5153		- private MenuItem importOBJItem;
5154		-
5155	5510	private MenuItem computeAOItem;
5156	5511	private MenuItem recompileItem;
5157	5512	private MenuItem editScriptItem;
..	..	@@ -5161,4 +5516,8 @@
5161	5516	private MenuItem analyzeItem;
5162	5517	private MenuItem dumpItem;
5163	5518	//boolean freezemodel = false;
	5519	+
	5520	+ Menu cameraMenu;
	5521	+ MenuItem editCameraItem;
	5522	+ MenuItem revertCameraItem;
5164	5523	}