~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -74,7 +74,7 @@
74	74	this.copy = this.group = copy;
75	75	//selectees = this.group.selectees;
76	76
77		- SetupMenu2(objEditor);
	77	+ SetupMenu2(this); //objEditor);
78	78	SetupUI2(objEditor);
79	79	objEditor.SetupUI(true);
80	80	SetupViews(objEditor);
..	..	@@ -98,14 +98,14 @@
98	98
99	99	void CloneClipboard(boolean supports)
100	100	{
101		- assert(GrafreeD.clipboard.parent == null);
102		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
103		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
104		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
105		- makeSomething(CloneObject(GrafreeD.clipboard.get(0), false));
	101	+ assert(Grafreed.clipboard.parent == null);
	102	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	103	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	104	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	105	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
106	106	else
107		- makeSomething(CloneObject(GrafreeD.clipboard, false));
108		- GrafreeD.clipboard.get(0).parent = keepparent;
	107	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	108	+ Grafreed.clipboard.get(0).parent = keepparent;
109	109	}
110	110
111	111	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -119,7 +119,7 @@
119	119	// obj.support = null;
120	120	if (!supports)
121	121	obj.SaveSupports();
122		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	122	+ Object3D clone = (Object3D)Grafreed.clone(obj);
123	123	obj.parent = parent;
124	124	// obj.support = support;
125	125	// clone.support = support; // aout 2013
..	..	@@ -148,8 +148,129 @@
148	148
149	149	//JTextField nameField;
150	150
151		- void SetupMenu2(ObjEditor oe)
	151	+ void SetupMenu2(GroupEditor oe)
152	152	{
	153	+ Menu menu;
	154	+ oe.menuBar.add(menu = new Menu("Edit"));
	155	+ //editItem = menu.add(new MenuItem("Edit"));
	156	+ //editItem.addActionListener(this);
	157	+
	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	+ {
153	274	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
154	275	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
155	276	//cameraMenu.add(switchItem = new MenuItem("Reverse View"));
..	..	@@ -161,45 +282,17 @@
161	282	lookAtItem.addActionListener(this);
162	283	//lookFromItem.addActinoListener(this);
163	284	//switchItem.addActionListener(this);
164		- Menu menu;
165		- oe.menuBar.add(menu = new Menu("Edit"));
166		- //editItem = menu.add(new MenuItem("Edit"));
167		- //editItem.addActionListener(this);
168		- duplicateItem = menu.add(new MenuItem("Duplicate"));
169		- duplicateItem.addActionListener(this);
170		- menu.add("-");
171		- cloneItem = menu.add(new MenuItem("Clone"));
172		- cloneItem.addActionListener(this);
173		- cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
174		- cloneSupportItem.addActionListener(this);
175		- menu.add("-");
176		- cutItem = menu.add(new MenuItem("Cut"));
177		- cutItem.addActionListener(this);
178		- copyItem = menu.add(new MenuItem("Copy"));
179		- copyItem.addActionListener(this);
180		- pasteItem = menu.add(new MenuItem("Paste"));
181		- pasteItem.addActionListener(this);
182		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
183		- pasteLinkItem.addActionListener(this);
184		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
185		- pasteCloneItem.addActionListener(this);
186		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
187		-// pasteExpandItem.addActionListener(this);
188		- clearItem = menu.add(new MenuItem("Clear"));
189		- clearItem.addActionListener(this);
190		- clearAllItem = menu.add(new MenuItem("Clear All"));
191		- clearAllItem.addActionListener(this);
192		-
	285	+ }
	286	+
193	287	oe.menuBar.add(menu = new Menu("Setting"));
194		- resetMeshItem = menu.add(new MenuItem("Reset All"));
195		- resetMeshItem.addActionListener(this);
196		- stepAllItem = menu.add(new MenuItem("Step All"));
197		- stepAllItem.addActionListener(this);
	288	+ if (Globals.ADVANCED)
	289	+ {
198	290	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
199	291	revertMeshItem.addActionListener(this);
200	292	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
201	293	resetreferencesItem.addActionListener(this);
202	294	menu.add("-");
	295	+ }
203	296	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
204	297	overwriteGeoItem.addActionListener(this);
205	298	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -211,19 +304,26 @@
211	304	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
212	305	overwriteUVItem.addActionListener(this);
213	306	menu.add("-");
	307	+ if (Globals.ADVANCED)
	308	+ {
214	309	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
215	310	generateMeshItem.addActionListener(this);
216	311	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
217	312	poseMeshItem.addActionListener(this);
218	313	menu.add("-");
	314	+ }
219	315	resetsupportItem = menu.add(new MenuItem("Reset support"));
220	316	resetsupportItem.addActionListener(this);
221	317	linkverticesItem = menu.add(new MenuItem("Link to Support"));
222	318	linkverticesItem.addActionListener(this);
223	319	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
224	320	relinkverticesItem.addActionListener(this);
	321	+
	322	+ if (Globals.ADVANCED)
	323	+ {
225	324	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
226	325	setMasterItem.addActionListener(this);
	326	+ }
227	327
228	328	oe.menuBar.add(menu = new Menu("Group"));
229	329	grabItem = menu.add(new MenuItem("Grab"));
..	..	@@ -234,27 +334,32 @@
234	334	frontItem.addActionListener(this);
235	335	compositeItem = menu.add(new MenuItem("Composite"));
236	336	compositeItem.addActionListener(this);
237		- hideItem = menu.add(new MenuItem("Hide"));
	337	+ hideItem = menu.add(new MenuItem("Hidden Group"));
238	338	hideItem.addActionListener(this);
239	339	ungroupItem = menu.add(new MenuItem("Ungroup"));
240	340	ungroupItem.addActionListener(this);
241	341	menu.add("-");
242		- randomItem = menu.add(new MenuItem("Random"));
	342	+ randomItem = menu.add(new MenuItem("Switch node"));
243	343	randomItem.addActionListener(this);
244		- physicsItem = menu.add(new MenuItem("Physics"));
245		- physicsItem.addActionListener(this);
246		- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
247		- frameselectorItem.addActionListener(this);
248	344	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
249	345	switchGeoItem.addActionListener(this);
250	346	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
251	347	switchTransfoItem.addActionListener(this);
252		- morphItem = menu.add(new MenuItem("Morph"));
	348	+ morphItem = menu.add(new MenuItem("Morph Group"));
253	349	morphItem.addActionListener(this);
	350	+
	351	+ if (Globals.ADVANCED)
	352	+ {
	353	+ menu.add("-");
	354	+ physicsItem = menu.add(new MenuItem("Physics"));
	355	+ physicsItem.addActionListener(this);
	356	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	357	+ frameselectorItem.addActionListener(this);
254	358	scriptNodeItem = menu.add(new MenuItem("Script Node"));
255	359	scriptNodeItem.addActionListener(this);
256	360	cameraItem = menu.add(new MenuItem("Camera"));
257	361	cameraItem.addActionListener(this);
	362	+ }
258	363
259	364	oe.menuBar.add(menu = new Menu("Object"));
260	365	textureItem = menu.add(new MenuItem("Texture"));
..	..	@@ -263,27 +368,35 @@
263	368	billboardItem.addActionListener(this);
264	369	csgItem = menu.add(new MenuItem("CSG"));
265	370	csgItem.addActionListener(this);
266		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	371	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
267	372	shadowXItem.addActionListener(this);
268		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	373	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
269	374	shadowYItem.addActionListener(this);
270		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	375	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
271	376	shadowZItem.addActionListener(this);
	377	+ if (Globals.ADVANCED)
	378	+ {
	379	+ menu.add("-");
272	380	linkerItem = menu.add(new MenuItem("Linker"));
273	381	linkerItem.addActionListener(this);
274		- templateItem = menu.add(new MenuItem("Template"));
275		- templateItem.addActionListener(this);
276	382	attributeItem = menu.add(new MenuItem("Attribute"));
277	383	attributeItem.addActionListener(this);
	384	+ templateItem = menu.add(new MenuItem("Template"));
	385	+ templateItem.addActionListener(this);
278	386	pointflowItem = menu.add(new MenuItem("Point Flow"));
279	387	pointflowItem.addActionListener(this);
	388	+ }
280	389	menu.add("-");
281	390	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
282	391	resetTransformItem.addActionListener(this);
283	392	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
284	393	resetCentroidItem.addActionListener(this);
285		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
286		- transformgeometryItem.addActionListener(this);
	394	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	395	+ resetCentroidXZItem.addActionListener(this);
	396	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	397	+ transformGeometryItem.addActionListener(this);
	398	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	399	+ transformChildrenItem.addActionListener(this);
287	400
288	401	oe.menuBar.add(menu = new Menu("Geometry"));
289	402	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -294,8 +407,11 @@
294	407	genNormalsCADItem.addActionListener(this);
295	408	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
296	409	genNormalsMESHItem.addActionListener(this);
	410	+ if (Globals.ADVANCED)
	411	+ {
297	412	genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
298	413	genNormalsMINEItem.addActionListener(this);
	414	+ }
299	415	stripifyItem = menu.add(new MenuItem("Stripify"));
300	416	stripifyItem.addActionListener(this);
301	417	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -317,23 +433,34 @@
317	433	reduce34MeshItem.addActionListener(this);
318	434	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
319	435	increaseMeshItem.addActionListener(this);
320		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
321		- smoothMeshItem.addActionListener(this);
322	436	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
323	437	clipMeshItem.addActionListener(this);
	438	+
	439	+ if (Globals.ADVANCED)
	440	+ {
	441	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	442	+ smoothMeshItem.addActionListener(this);
	443	+ }
324	444
325	445	oe.menuBar.add(menu = new Menu("Attributes"));
326	446	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
327	447	clearMaterialsItem.addActionListener(this);
	448	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	449	+ resetAllItem.addActionListener(this);
	450	+ stepAllItem = menu.add(new MenuItem("Step All"));
	451	+ stepAllItem.addActionListener(this);
328	452	menu.add("-");
329	453	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
330	454	liveleavesItem.addActionListener(this);
331	455	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
332	456	unliveleavesItem.addActionListener(this);
	457	+ if (Globals.ADVANCED)
	458	+ {
333	459	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
334	460	supportleavesItem.addActionListener(this);
335	461	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
336	462	unsupportleavesItem.addActionListener(this);
	463	+ }
337	464	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
338	465	hideleavesItem.addActionListener(this);
339	466	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -342,6 +469,14 @@
342	469	markleavesItem.addActionListener(this);
343	470	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
344	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);
345	480	menu.add("-");
346	481	flipVItem = menu.add(new MenuItem("Flip V"));
347	482	flipVItem.addActionListener(this);
..	..	@@ -377,35 +512,40 @@
377	512	sortbynameItem = menu.add(new MenuItem("Sort by name"));
378	513	sortbynameItem.addActionListener(this);
379	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.
380	522	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
381	523	extractGeometriesItem.addActionListener(this);
382	524	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
383	525	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);
	526	+ }
388	527
389	528	oe.menuBar.add(menu = new Menu("Insert"));
390	529	buildCreateMenu(menu);
391	530
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	531	oe.menuBar.add(menu = new Menu("Tools"));
404	532	buildToolsMenu(menu);
405	533	}
406	534
407	535	void SetupUI2(ObjEditor oe)
408	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	+
409	549	//new Exception().printStackTrace();
410	550
411	551	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -436,96 +576,118 @@
436	576	*/
437	577	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
438	578
439		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
440		- liveCB.setToolTipText("Enabled animation");
	579	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	580	+ //minButton.setToolTipText("Minimize window");
	581	+ //minButton.addActionListener(this);
	582	+
	583	+ oe.toolbarPanel.add(maxButton = new cButton("\u271A", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	584	+ maxButton.setToolTipText("Maximize window");
	585	+ maxButton.addActionListener(this);
	586	+
	587	+ oe.toolbarPanel.add(fullButton = new cButton("\u2b1c", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	588	+ fullButton.setToolTipText("Full-screen window");
	589	+ fullButton.addActionListener(this);
	590	+
	591	+ oe.toolbarPanel.add(undoButton = new cButton("\u21a9", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	592	+ undoButton.setToolTipText("Undo changes");
	593	+ undoButton.addActionListener(this);
	594	+
	595	+ oe.toolbarPanel.add(redoButton = new cButton("\u21aa", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	596	+ redoButton.setToolTipText("Redo changes");
	597	+ redoButton.addActionListener(this);
	598	+
	599	+ oe.toolbarPanel.add(saveButton = new cButton("\u21e3", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	600	+ saveButton.setToolTipText("Save changes");
	601	+ saveButton.addActionListener(this);
	602	+
	603	+ oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	604	+ liveCB.setToolTipText("Enable animation");
441	605	liveCB.addItemListener(this);
442	606
443		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK), oe.aConstraints);
	607	+ oe.toolbarPanel.add(oneStepButton = new cButton("\u29f4", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	608	+ oneStepButton.setToolTipText("Animate one step forward");
	609	+ oneStepButton.addActionListener(this);
	610	+
	611	+ oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	612	+ fastCB.setToolTipText("Fast mode");
	613	+ fastCB.addItemListener(this);
	614	+
	615	+ oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK)); //, oe.aConstraints);
444	616	trackCB.setToolTipText("Enable tracking");
445	617	trackCB.addItemListener(this);
446	618
447		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	619	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
448	620	screenfitButton.setToolTipText("Screen fit");
449	621	screenfitButton.addActionListener(this);
450	622
451	623	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
452	624	// screenfitpointButton.addActionListener(this);
453		-// oe.aConstraints.gridx += 1;
454		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
455		- snapobjectButton.addActionListener(this);
456		- snapobjectButton.setToolTipText("Snap Object");
457		- oe.aConstraints.gridx += 1;
458	625
459		- //aConstraints.gridx = 0;
460		- //aConstraints.gridy += 1;
461		- oe.aConstraints.weighty = 0;
462		- oe.aConstraints.gridwidth = 1;
463		-
464		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	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 = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
465	634	flashSelectionButton.setToolTipText("Show selection");
466	635	flashSelectionButton.addActionListener(this);
467	636
468	637	oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
469	638
470		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	639	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
471	640	twoButton.setToolTipText("Show center view only");
472	641	twoButton.addActionListener(this);
473		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	642	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
474	643	fourButton.addActionListener(this);
475	644	fourButton.setToolTipText("Show left panel only");
476		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	645	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
477	646	sixButton.setToolTipText("2-column layout left");
478	647	sixButton.addActionListener(this);
479		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	648	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
480	649	threeButton.setToolTipText("2-column layout right");
481	650	threeButton.addActionListener(this);
482		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	651	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
483	652	sevenButton.setToolTipText("3-column layout");
484	653	sevenButton.addActionListener(this);
485	654	//
486	655
487		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
488		- 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");
489	658	rootButton.addActionListener(this);
490		- oe.aConstraints.gridx += 1;
491		- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	659	+
	660	+ oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
492	661	closeButton.setToolTipText("Close tab");
493	662	closeButton.addActionListener(this);
494	663	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
495	664	//clearButton.addActionListener(this);
496		- oe.aConstraints.gridx += 1;
497	665
498		- oe.aConstraints.gridx = 1; //
499		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
	666	+ editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	667	+ editButton.setToolTipText("Edit selection");
500	668	editButton.addActionListener(this);
501		- oe.aConstraints.gridx += 1;
502		- oe.aConstraints.weighty = 0;
503		- oe.aConstraints.gridwidth = 1;
504	669
505		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	670	+ editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	671	+ uneditButton.setToolTipText("Unedit selection");
506	672	uneditButton.addActionListener(this);
507	673
508		- oe.aConstraints.gridx += 1;
509		- oe.aConstraints.weighty = 0;
510		- oe.aConstraints.gridwidth = 1;
511		-
512		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
513		- clearPanelButton.addActionListener(this);
514		-
515		- oe.aConstraints.gridx += 1;
516		- oe.aConstraints.weighty = 0;
517		- oe.aConstraints.gridwidth = 1;
518		-
519		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	674	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	675	+ allParamsButton.setToolTipText("Edit all params");
520	676	allParamsButton.addActionListener(this);
521	677
522		- oe.aConstraints.gridx += 1;
523		- oe.aConstraints.weighty = 0;
524		- oe.aConstraints.gridwidth = 1;
525		-
526		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
	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");
527	684	unselectButton.addActionListener(this);
528	685
	686	+ editCommandsPanel.preferredHeight = 1;
	687	+
	688	+// oe.treePanel.add(commandsPanel);
	689	+// oe.treePanel.Return();
	690	+
529	691	// oe.aConstraints.gridx += 1;
530	692	// oe.aConstraints.weighty = 0;
531	693	// oe.aConstraints.gridwidth = 1;
..	..	@@ -537,40 +699,37 @@
537	699	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
538	700	// gcButton.addActionListener(this);
539	701
540		- oe.aConstraints.gridx = 0;
541		- oe.aConstraints.gridy += 1;
542		-
543		- //ctrlPanel.add(objList = new List(5, true));
544		- oe.aConstraints.gridwidth = 100;
545		- // oe.aConstraints.gridheight = 100;
546		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
547		- oe.aConstraints.gridheight = 1;
548		- oe.aConstraints.weighty = 0.5;
549		- oe.aConstraints.gridx = 0;
550		- JScrollPane jSP;
	702	+ cGridBag jSPPanel = new cGridBag();
	703	+
	704	+ JScrollPane jSP;
551	705	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
552		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	706	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
553	707	ResetModel();
554		- oe.aConstraints.weighty = 0.5;
555		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
556		- oe.aConstraints.gridy += 1;
557		- oe.aConstraints.gridwidth = 1;
	708	+
	709	+ oe.treePanel.add(jSPPanel);
	710	+ oe.treePanel.Return();
558	711
559		- oe.aConstraints.weighty = 0;
560		- oe.aConstraints.gridwidth = 2;
561		-
562		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
	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");
563	716	colorCB.addItemListener(this);
564		- oe.aConstraints.gridx += 2;
565		- 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");
566	720	materialCB.addItemListener(this);
567		- oe.aConstraints.gridx += 2;
568		- 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");
569	724	textureCB.addItemListener(this);
570	725
571		- oe.aConstraints.gridx = 0;
572		- oe.aConstraints.gridy += 1;
	726	+ copyOptionsPanel.preferredHeight = 1;
	727	+ oe.treePanel.add(copyOptionsPanel);
	728	+ oe.treePanel.Return();
573	729
	730	+// mainPanel.setDividerLocation(0.5); //1.0);
	731	+// mainPanel.setResizeWeight(0.5);
	732	+
574	733	//jList.addListSelectionListener(this);
575	734	oe.jTree.addTreeSelectionListener(this);
576	735	//jTree.setRootVisible(false);
..	..	@@ -595,43 +754,35 @@
595	754
596	755	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
597	756	{
598		- //constraints.gridx = 0;
599		- //constraints.gridy = 0;
600		- panel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
601		- fastCB.setToolTipText("Fast mode");
602		- fastCB.addItemListener(this);
603		- //constraints.gridy += 1;
604		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
605		- supportCB.setToolTipText("Enabled rigging");
606		- supportCB.addItemListener(this);
607		-
608		- // constraints.gridy += 1;
609		- // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
610		- // localCB.addItemListener(this);
611		-
612		- //constraints.gridy += 1;
613		- panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
614		- crowdCB.setToolTipText("Used for crowds");
615		- crowdCB.addItemListener(this);
616		-
617		- //constraints.gridy += 1;
618		- panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
619		- smoothCB.setToolTipText("Snapping delay");
620		- smoothCB.addItemListener(this);
621		-
622		- //constraints.gridy += 1;
623		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
624		- slowCB.setToolTipText("Smooth interpolation");
625		- slowCB.addItemListener(this);
626		- //constraints.gridy += 1;
627	757	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
628	758	boxCB.setToolTipText("Display bounding boxes");
629	759	boxCB.addItemListener(this);
630		- //constraints.gridy += 1;
	760	+
631	761	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
632	762	zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
633	763	zoomBoxCB.addItemListener(this);
634	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	+
635	786	// constraints.gridy += 1;
636	787	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
637	788	// speakerMocapCB.addItemListener(this);
..	..	@@ -656,20 +807,42 @@
656	807	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
657	808	// debugCB.addItemListener(this);
658	809
659		- //constraints.gridy += 1;
660	810	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	811	+ oeilCB.setToolTipText("Move camera when tracking target");
661	812	oeilCB.addItemListener(this);
662	813
663		- //constraints.gridy += 1;
	814	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	815	+ shadowCB.setToolTipText("Compute shadows when live");
	816	+ shadowCB.addItemListener(this);
	817	+
	818	+ if (Globals.ADVANCED)
	819	+ {
664	820	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
665	821	lookAtCB.setToolTipText("Look-at target");
666	822	lookAtCB.addItemListener(this);
	823	+ }
	824	+
	825	+ }
	826	+
	827	+ cGridBag fill = new cGridBag();
	828	+
	829	+ fill.preferredHeight = 200;
	830	+
	831	+ panel.add(fill);
667	832
668	833	}
669	834
670	835	void EditObject(Object3D obj)
671	836	{
672	837	cRadio radioButton = new cRadio(obj.name);
	838	+
	839	+ // Patch to avoid bug with transparency.
	840	+ radioButton.hadMaterial = obj.material != null;
	841	+ if (!radioButton.hadMaterial)
	842	+ {
	843	+ obj.material = new cMaterial();
	844	+ }
	845	+
673	846	radioButton.SetObject(obj);
674	847	radioButton.layout = sevenButton;
675	848	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -678,8 +851,11 @@
678	851	buttonGroup.add(radioButton);
679	852	radioButton.doClick();
680	853	}
	854	+
681	855	void SetupViews(ObjEditor oe)
682	856	{
	857	+ theFrame = this;
	858	+
683	859	oe.SetupViews();
684	860
685	861	System.out.println("SetupViews");
..	..	@@ -703,7 +879,9 @@
703	879	JCheckBox speakerCameraCB;
704	880	JCheckBox speakerFocusCB;
705	881	JCheckBox debugCB;
	882	+
706	883	JCheckBox oeilCB;
	884	+ JCheckBox shadowCB;
707	885	JCheckBox lookAtCB;
708	886
709	887	// static int COLOR = 1;
..	..	@@ -742,6 +920,7 @@
742	920	} else if(e.getSource() == liveCB)
743	921	{
744	922	cameraView.ToggleLive();
	923	+ refreshContents(false);
745	924	}
746	925	else if(e.getSource() == supportCB)
747	926	{
..	..	@@ -805,6 +984,10 @@
805	984	else if(e.getSource() == oeilCB)
806	985	{
807	986	cameraView.ToggleOeil();
	987	+ }
	988	+ else if(e.getSource() == shadowCB)
	989	+ {
	990	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
808	991	}
809	992	else if(e.getSource() == lookAtCB)
810	993	{
..	..	@@ -894,7 +1077,9 @@
894	1077	// objEditor.DropFile((java.io.File[]) object, true);
895	1078	// return;
896	1079	// }
897		- if (string.charAt(0) == '/')
	1080	+
	1081	+ // File path for Mac and Windows
	1082	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
898	1083	{
899	1084	// file(s)
900	1085	String[] names = string.split("\n");
..	..	@@ -921,7 +1106,7 @@
921	1106
922	1107	flashIt = false;
923	1108	CameraPane pane = (CameraPane) target;
924		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1109	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
925	1110	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
926	1111
927	1112	if (group.selection.size() == 1)
..	..	@@ -948,11 +1133,11 @@
948	1133	{
949	1134	loadClipboard(true);
950	1135	objEditor.jTree.setSelectionPath(destinationPath);
951		- pasteInto(false);
	1136	+ pasteInto(false, false);
952	1137	} else {
953	1138	loadClipboard(false);
954	1139	objEditor.jTree.setSelectionPath(destinationPath);
955		- pasteInto(false); // true); // ???
	1140	+ pasteInto(false, false); // true); // ???
956	1141	}
957	1142	}
958	1143	public void dropActionChanged(DropTargetDragEvent dtde)
..	..	@@ -1074,27 +1259,33 @@
1074	1259	kleinItem.addActionListener(this);
1075	1260	particleItem = menu.add(new MenuItem("Particle system"));
1076	1261	particleItem.addActionListener(this);
	1262	+ if (Globals.ADVANCED)
	1263	+ {
1077	1264	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1078	1265	ragdollItem.addActionListener(this);
1079	1266	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1080	1267	ragdoll2Item.addActionListener(this);
	1268	+ }
1081	1269	menu.add("-");
1082		- meshItem = menu.add(new MenuItem("Mesh"));
	1270	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1083	1271	meshItem.addActionListener(this);
1084	1272	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1085	1273	// meshGroupItem.addActionListener(this);
	1274	+ if (Globals.ADVANCED)
	1275	+ {
1086	1276	springItem = menu.add(new MenuItem("Spring"));
1087	1277	springItem.addActionListener(this);
1088	1278	flagItem = menu.add(new MenuItem("Flag"));
1089	1279	flagItem.addActionListener(this);
1090		- bezierItem = menu.add(new MenuItem("Patch"));
1091		- bezierItem.addActionListener(this);
1092		- checkerItem = menu.add(new MenuItem("Checker"));
1093		- checkerItem.addActionListener(this);
1094	1280	blobItem = menu.add(new MenuItem("Blob"));
1095	1281	blobItem.addActionListener(this);
1096	1282	latheItem = menu.add(new MenuItem("Lathe"));
1097	1283	latheItem.addActionListener(this);
	1284	+ }
	1285	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1286	+ bezierItem.addActionListener(this);
	1287	+ overlayItem = menu.add(new MenuItem("Overlay"));
	1288	+ overlayItem.addActionListener(this);
1098	1289	lightItem = menu.add(new MenuItem("Light"));
1099	1290	lightItem.addActionListener(this);
1100	1291	menu.add("-");
..	..	@@ -1104,39 +1295,44 @@
1104	1295	loopItem.addActionListener(this);
1105	1296	doubleItem = menu.add(new MenuItem("Fork"));
1106	1297	doubleItem.addActionListener(this);
	1298	+ if (Globals.ADVANCED)
	1299	+ {
1107	1300	tripleItem = menu.add(new MenuItem("Trident"));
1108	1301	tripleItem.addActionListener(this);
	1302	+ }
1109	1303	}
1110	1304
1111	1305	void buildToolsMenu(Menu menu)
1112	1306	{
1113	1307	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1114	1308	animationItem.addItemListener(this);
1115		- animationItem.setState(CameraPane.ANIMATION);
	1309	+ animationItem.setState(Globals.ANIMATION);
1116	1310
1117	1311	menu.add("-");
1118	1312	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1119	1313	parseverticesItem.addActionListener(this);
1120	1314	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1121	1315	textureFieldItem.addActionListener(this);
1122		- alignItem = menu.add(new MenuItem("Align"));
	1316	+ alignItem = menu.add(new MenuItem("Align Objects"));
1123	1317	alignItem.addActionListener(this);
1124		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1125		- mirrorItem.addActionListener(this);
1126	1318	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1127	1319	reduceMorphItem.addActionListener(this);
1128	1320	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1129	1321	reduce34MorphItem.addActionListener(this);
1130		-
	1322	+ menu.add("-");
1131	1323	menu.add(computeAOItem = new MenuItem("Compute AO"));
1132	1324	computeAOItem.addActionListener(this);
1133		- menu.add("-");
1134	1325
	1326	+ if (Globals.ADVANCED)
	1327	+ {
	1328	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1329	+ mirrorItem.addActionListener(this);
	1330	+ menu.add("-");
1135	1331	menu.add(memoryItem = new MenuItem("Memory Usage"));
1136	1332	memoryItem.addActionListener(this);
1137	1333	menu.add(analyzeItem = new MenuItem("Analyze"));
1138	1334	analyzeItem.addActionListener(this);
1139		- menu.add(dumpItem = new MenuItem("Dump"));
	1335	+ menu.add(dumpItem = new MenuItem("Print"));
1140	1336	dumpItem.addActionListener(this);
1141	1337	// menu.add(pathItem = new MenuItem("From-to path"));
1142	1338	// pathItem.addActionListener(this);
..	..	@@ -1154,6 +1350,7 @@
1154	1350	menu.add("-");
1155	1351	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1156	1352	editScriptItem.addActionListener(this);
	1353	+ }
1157	1354	}
1158	1355
1159	1356	void ScreenFit()
..	..	@@ -1276,6 +1473,7 @@
1276	1473	shadow.material = new cMaterial(obj.material);
1277	1474	shadow.material.diffuse = 0.0001f;
1278	1475	shadow.material.specular = 0.0001f;
	1476	+ //shadow.projectedVertices[1].x = 300;
1279	1477
1280	1478	makeSomething(shadow);
1281	1479	}
..	..	@@ -1482,9 +1680,9 @@
1482	1680
1483	1681	void Overwrite(int mask)
1484	1682	{
1485		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1683	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1486	1684	{
1487		- Object3D content = GrafreeD.clipboard.get(0);
	1685	+ Object3D content = Grafreed.clipboard.get(0);
1488	1686
1489	1687	if (content instanceof cGroup && ((cGroup)content).transientlink )
1490	1688	content = ((cGroup)content).get(0);
..	..	@@ -1655,7 +1853,7 @@
1655	1853	{
1656	1854	makeSomething(new BezierSurface());
1657	1855	} else
1658		- if (source == checkerItem)
	1856	+ if (source == overlayItem)
1659	1857	{
1660	1858	/*
1661	1859	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1789,23 +1987,6 @@
1789	1987	csg.addChild(child);
1790	1988	child.addChild(csg);
1791	1989	} else
1792		-
1793		- if (source == importGFDItem)
1794		- {
1795		- ImportGFD();
1796		- } else
1797		- if (source == importVRMLX3DItem)
1798		- {
1799		- ImportVRMLX3D();
1800		- } else
1801		- if (source == import3DSItem)
1802		- {
1803		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1804		- } else
1805		- if (source == importOBJItem)
1806		- {
1807		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1808		- } else
1809	1990	if (source == computeAOItem)
1810	1991	{
1811	1992	Globals.drawMode = CameraPane.OCCLUSION;
..	..	@@ -1824,7 +2005,7 @@
1824	2005	if (source == invariantsItem)
1825	2006	{
1826	2007	System.out.println("Invariants:");
1827		- GrafreeD.grafreeD.universe.invariants();
	2008	+ Grafreed.grafreeD.universe.invariants();
1828	2009	} else
1829	2010	if (source == memoryItem)
1830	2011	{
..	..	@@ -1842,6 +2023,35 @@
1842	2023	if (source == dumpItem)
1843	2024	{
1844	2025	DumpObject();
	2026	+ } else
	2027	+ if (source == minButton)
	2028	+ {
	2029	+ Minimize();
	2030	+ } else
	2031	+ if (source == maxButton)
	2032	+ {
	2033	+ Maximize();
	2034	+ } else
	2035	+ if (source == fullButton)
	2036	+ {
	2037	+ ToggleFullScreen();
	2038	+ } else
	2039	+ if (source == undoButton)
	2040	+ {
	2041	+ Undo();
	2042	+ } else
	2043	+ if (source == redoButton)
	2044	+ {
	2045	+ Redo();
	2046	+ } else
	2047	+ if (source == saveButton)
	2048	+ {
	2049	+ Save();
	2050	+ } else
	2051	+ if (source == oneStepButton)
	2052	+ {
	2053	+ Globals.ONESTEP = true;
	2054	+ cameraView.repaint();
1845	2055	} else
1846	2056	if (source == screenfitButton)
1847	2057	{
..	..	@@ -1892,12 +2102,20 @@
1892	2102	{
1893	2103	loadClipboard(true);
1894	2104	} else
	2105	+ if (source == undoItem)
	2106	+ {
	2107	+ Undo();
	2108	+ } else
	2109	+ if (source == redoItem)
	2110	+ {
	2111	+ Redo();
	2112	+ } else
1895	2113	if (source == duplicateItem)
1896	2114	{
1897		- Object3D keep = GrafreeD.clipboard;
	2115	+ Object3D keep = Grafreed.clipboard;
1898	2116	loadClipboard(false);
1899	2117	paste(false);
1900		- GrafreeD.clipboard = keep;
	2118	+ Grafreed.clipboard = keep;
1901	2119	} else
1902	2120	if (source == cloneItem)
1903	2121	{
..	..	@@ -1915,13 +2133,17 @@
1915	2133	{
1916	2134	paste(false);
1917	2135	} else
	2136	+ if (source == pasteIntoItem)
	2137	+ {
	2138	+ pasteInto(true, false);
	2139	+ } else
1918	2140	if (source == pasteLinkItem)
1919	2141	{
1920		- pasteInto(false);
	2142	+ pasteInto(false, false);
1921	2143	} else
1922	2144	if (source == pasteCloneItem)
1923	2145	{
1924		- pasteInto(true);
	2146	+ pasteInto(true, true);
1925	2147	} else
1926	2148	if (source == pasteExpandItem)
1927	2149	{
..	..	@@ -2113,9 +2335,9 @@
2113	2335	// group.selection.get(0).setMasterThis(content); // should be identity
2114	2336	// refreshContents();
2115	2337	// }
2116		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2338	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2117	2339	{
2118		- Object3D content = GrafreeD.clipboard.get(0);
	2340	+ Object3D content = Grafreed.clipboard.get(0);
2119	2341
2120	2342	if (content instanceof cGroup && ((cGroup)content).transientlink )
2121	2343	content = ((cGroup)content).get(0);
..	..	@@ -2123,11 +2345,11 @@
2123	2345	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2124	2346	for (int i=0; i<group.selection.size(); i++)
2125	2347	{
2126		- boolean random = CameraPane.RANDOM;
2127		- CameraPane.RANDOM = false; // parse all random nodes
	2348	+ boolean random = CameraPane.SWITCH;
	2349	+ CameraPane.SWITCH = false; // parse all random nodes
2128	2350	group.selection.get(i).linkVerticesThis(content);
2129	2351	// group.selection.get(i).setMasterThis(content); // should be identity
2130		- CameraPane.RANDOM = random;
	2352	+ CameraPane.SWITCH = random;
2131	2353	}
2132	2354	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2133	2355	refreshContents();
..	..	@@ -2137,20 +2359,20 @@
2137	2359	{
2138	2360	for (int i=0; i<group.selection.size(); i++)
2139	2361	{
2140		- boolean random = CameraPane.RANDOM;
2141		- CameraPane.RANDOM = false; // parse all random nodes
	2362	+ boolean random = CameraPane.SWITCH;
	2363	+ CameraPane.SWITCH = false; // parse all random nodes
2142	2364	group.selection.get(i).linkVerticesThis(null);
2143		- CameraPane.RANDOM = random;
	2365	+ CameraPane.SWITCH = random;
2144	2366	}
2145	2367
2146	2368	refreshContents();
2147	2369	} else
2148	2370	if (source == relinkverticesItem)
2149	2371	{
2150		- boolean random = CameraPane.RANDOM;
2151		- CameraPane.RANDOM = false; // parse all random nodes
	2372	+ boolean random = CameraPane.SWITCH;
	2373	+ CameraPane.SWITCH = false; // parse all random nodes
2152	2374	group.selection.RelinkToSupport();
2153		- CameraPane.RANDOM = random;
	2375	+ CameraPane.SWITCH = random;
2154	2376
2155	2377	refreshContents();
2156	2378	} else
..	..	@@ -2165,9 +2387,9 @@
2165	2387	} else
2166	2388	if (source == setMasterItem)
2167	2389	{
2168		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2390	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2169	2391	{
2170		- Object3D content = GrafreeD.clipboard.get(0);
	2392	+ Object3D content = Grafreed.clipboard.get(0);
2171	2393
2172	2394	if (content instanceof cGroup && ((cGroup)content).transientlink )
2173	2395	content = ((cGroup)content).get(0);
..	..	@@ -2180,9 +2402,9 @@
2180	2402	{
2181	2403	if (group.selection.size() == 1)
2182	2404	{
2183		- if (GrafreeD.clipboard.size() == 1)
	2405	+ if (Grafreed.clipboard.size() == 1)
2184	2406	{
2185		- Object3D content = GrafreeD.clipboard.get(0);
	2407	+ Object3D content = Grafreed.clipboard.get(0);
2186	2408
2187	2409	if (content instanceof cGroup && ((cGroup)content).transientlink )
2188	2410	content = ((cGroup)content).get(0);
..	..	@@ -2199,7 +2421,7 @@
2199	2421	{
2200	2422	RevertMeshes();
2201	2423	} else
2202		- if (source == resetMeshItem)
	2424	+ if (source == resetAllItem)
2203	2425	{
2204	2426	ResetAll();
2205	2427	} else
..	..	@@ -2248,7 +2470,7 @@
2248	2470	RandomNode random = new RandomNode();
2249	2471	group(random);
2250	2472	if (random.size() > 0)
2251		- random.name = random.get(0).name + "Rnd";
	2473	+ random.name = random.get(0).name + "Switch";
2252	2474	} else
2253	2475	if (source == physicsItem)
2254	2476	{
..	..	@@ -2387,7 +2609,7 @@
2387	2609	} else
2388	2610	if (source == genNormalsMESHItem)
2389	2611	{
2390		- GenNormals(true); // TODO
	2612	+ GenNormalsMESH();
2391	2613	} else
2392	2614	if (source == genNormalsORGANItem)
2393	2615	{
..	..	@@ -2452,6 +2674,22 @@
2452	2674	if (source == unmarkleavesItem)
2453	2675	{
2454	2676	MarkLeaves(false);
	2677	+ } else
	2678	+ if (source == rewindleavesItem)
	2679	+ {
	2680	+ RewindLeaves(true);
	2681	+ } else
	2682	+ if (source == unrewindleavesItem)
	2683	+ {
	2684	+ RewindLeaves(false);
	2685	+ } else
	2686	+ if (source == randomleavesItem)
	2687	+ {
	2688	+ RandomLeaves(true);
	2689	+ } else
	2690	+ if (source == unrandomleavesItem)
	2691	+ {
	2692	+ RandomLeaves(false);
2455	2693	} else
2456	2694	if (source == flipVItem)
2457	2695	{
..	..	@@ -2537,9 +2775,13 @@
2537	2775	{
2538	2776	SmoothMesh();
2539	2777	} else
2540		- if (source == transformgeometryItem)
	2778	+ if (source == transformGeometryItem)
2541	2779	{
2542	2780	TransformGeometry();
	2781	+ } else
	2782	+ if (source == transformChildrenItem)
	2783	+ {
	2784	+ TransformChildren();
2543	2785	} else
2544	2786	if (source == resetTransformItem)
2545	2787	{
..	..	@@ -2547,7 +2789,11 @@
2547	2789	} else
2548	2790	if (source == resetCentroidItem)
2549	2791	{
2550		- ResetCentroid();
	2792	+ ResetCentroid(true);
	2793	+ } else
	2794	+ if (source == resetCentroidXZItem)
	2795	+ {
	2796	+ ResetCentroid(false);
2551	2797	} else
2552	2798	if (source == resetParentItem)
2553	2799	{
..	..	@@ -2711,6 +2957,24 @@
2711	2957	bigThree.ClearUI();
2712	2958	bigThree.add(centralPanel);
2713	2959	bigThree.FlushUI();
	2960	+
	2961	+ cameraView.requestFocusInWindow();
	2962	+
	2963	+// refreshContents(true);
	2964	+//
	2965	+// try
	2966	+// {
	2967	+// java.awt.Robot bot = new java.awt.Robot();
	2968	+// int mask = InputEvent.BUTTON1_MASK;
	2969	+// bot.mouseMove(100, 100);
	2970	+// bot.mousePress(mask);
	2971	+// bot.mouseRelease(mask);
	2972	+// }
	2973	+// catch (Exception e)
	2974	+// {
	2975	+//
	2976	+// }
	2977	+
2714	2978	} else
2715	2979	if (source == threeButton)
2716	2980	{
..	..	@@ -2747,6 +3011,8 @@
2747	3011	bigThree.add(centralPanel);
2748	3012	bigThree.add(XYZPanel);
2749	3013	bigThree.FlushUI();
	3014	+
	3015	+ cameraView.requestFocusInWindow();
2750	3016	} else
2751	3017	if (source == fourButton)
2752	3018	{
..	..	@@ -2782,6 +3048,8 @@
2782	3048	bigThree.ClearUI();
2783	3049	bigThree.add(scenePanel);
2784	3050	bigThree.FlushUI();
	3051	+
	3052	+ cameraView.requestFocusInWindow();
2785	3053	} else
2786	3054	if (source == sixButton)
2787	3055	{
..	..	@@ -2818,6 +3086,8 @@
2818	3086	bigThree.add(scenePanel);
2819	3087	bigThree.add(centralPanel);
2820	3088	bigThree.FlushUI();
	3089	+
	3090	+ cameraView.requestFocusInWindow();
2821	3091	} else
2822	3092	if (source == sevenButton)
2823	3093	{
..	..	@@ -2855,6 +3125,8 @@
2855	3125	bigThree.add(centralPanel);
2856	3126	bigThree.add(XYZPanel);
2857	3127	bigThree.FlushUI();
	3128	+
	3129	+ cameraView.requestFocusInWindow();
2858	3130	} else
2859	3131	if (source == rootButton)
2860	3132	{
..	..	@@ -2866,6 +3138,7 @@
2866	3138	EditObject(obj);
2867	3139	}
2868	3140
	3141	+ cameraView.requestFocusInWindow();
2869	3142	refreshContents(true);
2870	3143	} else
2871	3144	if (source == closeButton)
..	..	@@ -2875,8 +3148,14 @@
2875	3148	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2876	3149	{
2877	3150	ab = (cRadio)e.nextElement();
2878		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3151	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2879	3152	{
	3153	+ // Patch to avoid bug with transparency.
	3154	+ if (!ab.hadMaterial)
	3155	+ {
	3156	+ ab.object.material = null;
	3157	+ }
	3158	+
2880	3159	buttonGroup.remove(ab);
2881	3160	radioPanel.remove(ab);
2882	3161
..	..	@@ -2887,6 +3166,8 @@
2887	3166	break;
2888	3167	}
2889	3168	}
	3169	+
	3170	+ cameraView.requestFocusInWindow();
2890	3171	refreshContents(true);
2891	3172	} else
2892	3173	if (source == editItem \|\| source == editButton)
..	..	@@ -2903,9 +3184,9 @@
2903	3184	child.CloseUI();
2904	3185	listUI.remove(child);
2905	3186
2906		- child.editWindow = null; // ???????????
	3187	+ //child.editWindow = null; // ???????????
2907	3188	}
2908		- objEditor.ctrlPanel.validate();
	3189	+ objEditor.ctrlPanel.FlushUI();
2909	3190	//objEditor.jTree.clearSelection();
2910	3191	//objEditor.ResetSliders();
2911	3192	refreshContents(true);
..	..	@@ -2989,7 +3270,10 @@
2989	3270	frontView.object = group;
2990	3271	sideView.object = group;
2991	3272	}
2992		- group.editWindow = this;
	3273	+
	3274	+// fix "+" issue
	3275	+ //group.editWindow = this;
	3276	+
2993	3277	/*
2994	3278	currentLayout = radio.layout;
2995	3279	if (currentLayout == null)
..	..	@@ -3001,8 +3285,23 @@
3001	3285	//group.parent = null; // ROOT
3002	3286	//group.attributes = -1;
3003	3287	ResetModel();
	3288	+
	3289	+ cameraView.requestFocusInWindow();
3004	3290	refreshContents(true);
3005		- }
	3291	+ } else if (event.getSource() == editCameraItem)
	3292	+ {
	3293	+ cameraView.ProtectCamera();
	3294	+ cameraView.repaint();
	3295	+ return;
	3296	+ } else if (event.getSource() == revertCameraItem)
	3297	+ {
	3298	+ cameraView.RevertCamera();
	3299	+ cameraView.repaint();
	3300	+ return;
	3301	+ // } else if (event.getSource() == textureButton)
	3302	+ // {
	3303	+ // return; // true;
	3304	+ }
3006	3305	else
3007	3306	{
3008	3307	//return super.action(event, arg);
..	..	@@ -3011,7 +3310,6 @@
3011	3310	}
3012	3311
3013	3312	boolean useclient = false;
3014		- cRadio radio;
3015	3313
3016	3314	void ToggleRoot()
3017	3315	{
..	..	@@ -3063,6 +3361,28 @@
3063	3361	refreshContents();
3064	3362	}
3065	3363
	3364	+ void TransformChildren()
	3365	+ {
	3366	+ Object3D obj;
	3367	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3368	+ {
	3369	+ obj = (Object3D)e.nextElement();
	3370	+ obj.KeepTextureMatrices();
	3371	+ obj.TransformChildren();
	3372	+ obj.RestoreTextureMatrices();
	3373	+
	3374	+// if (obj.parent == null)
	3375	+// {
	3376	+// System.out.println("NULL PARENT!");
	3377	+// new Exception().printStackTrace();
	3378	+// }
	3379	+// else
	3380	+// TouchTransform(obj);
	3381	+// //obj.parent.Touch();
	3382	+ }
	3383	+
	3384	+ refreshContents();
	3385	+ }
3066	3386
3067	3387	void ResetTransform()
3068	3388	{
..	..	@@ -3175,7 +3495,7 @@
3175	3495	refreshContents();
3176	3496	}
3177	3497
3178		- void ResetCentroid()
	3498	+ void ResetCentroid(boolean full)
3179	3499	{
3180	3500	Object3D obj;
3181	3501	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3190,12 +3510,16 @@
3190	3510	LA.matIdentity(Object3D.mat);
3191	3511	obj.getBounds(minima, maxima, false);
3192	3512	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3193		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3513	+ if (full)
	3514	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3194	3515	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3195	3516	obj.TransformMesh(Object3D.mat);
	3517	+
3196	3518	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3197		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3519	+ if (full)
	3520	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3198	3521	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3522	+
3199	3523	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3200	3524	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3201	3525	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3224,7 +3548,8 @@
3224	3548
3225	3549	int size = obj.MemorySize();
3226	3550
3227		- System.err.println((size/1024) + " KB is the size of " + obj);
	3551	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3552	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3228	3553	}
3229	3554	}
3230	3555	catch (Exception e)
..	..	@@ -3261,9 +3586,9 @@
3261	3586	obj = (Object3D)e.nextElement();
3262	3587
3263	3588	System.out.println("Object is: " + obj);
3264		- GrafreeD.AnalyzeObject(obj);
	3589	+ Grafreed.AnalyzeObject(obj);
3265	3590	System.out.println("Boundary rep: " + obj.bRep);
3266		- GrafreeD.AnalyzeObject(obj.bRep);
	3591	+ Grafreed.AnalyzeObject(obj.bRep);
3267	3592
3268	3593	// System.err.println((size/1024) + " KB is the size of " + obj);
3269	3594	}
..	..	@@ -3305,6 +3630,13 @@
3305	3630	void GenNormals(boolean crease)
3306	3631	{
3307	3632	group.GenNormalsS(crease);
	3633	+
	3634	+ refreshContents();
	3635	+ }
	3636	+
	3637	+ void GenNormalsMESH()
	3638	+ {
	3639	+ group.GenNormalsMeshS();
3308	3640
3309	3641	refreshContents();
3310	3642	}
..	..	@@ -3477,8 +3809,8 @@
3477	3809
3478	3810	void ParseVertices()
3479	3811	{
3480		- boolean epsequal = GrafreeD.epsequal;
3481		- GrafreeD.epsequal = true;
	3812	+ boolean epsequal = Grafreed.epsequal;
	3813	+ Grafreed.epsequal = true;
3482	3814
3483	3815	for (int i=0; i<group.selection.size(); i++)
3484	3816	{
..	..	@@ -3503,7 +3835,7 @@
3503	3835	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3504	3836	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3505	3837
3506		- g.add(GrafreeD.clipboard);
	3838	+ g.add(Grafreed.clipboard);
3507	3839
3508	3840	buffer.add(g);
3509	3841	}
..	..	@@ -3518,7 +3850,7 @@
3518	3850	makeSomething(buffer, i==group.selection.size()-1);
3519	3851	}
3520	3852
3521		- GrafreeD.epsequal = epsequal;
	3853	+ Grafreed.epsequal = epsequal;
3522	3854
3523	3855	refreshContents();
3524	3856	}
..	..	@@ -3536,7 +3868,16 @@
3536	3868	String pigment = Object3D.GetPigment(tex);
3537	3869	//String bump = Object3D.GetBump(tex);
3538	3870
3539		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3871	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	3872	+
	3873	+ try
	3874	+ {
	3875	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3876	+ }
	3877	+ catch (Exception e)
	3878	+ {
	3879	+ System.err.println("FAIL: " + node);
	3880	+ }
3540	3881
3541	3882	double s = v.s;
3542	3883
..	..	@@ -3624,11 +3965,11 @@
3624	3965
3625	3966	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3626	3967
3627		- boolean random = CameraPane.RANDOM;
3628		- CameraPane.RANDOM = false; // parse all random nodes
	3968	+ boolean random = CameraPane.SWITCH;
	3969	+ CameraPane.SWITCH = false; // parse all random nodes
3629	3970	lowres.linkVerticesThis(null);
3630	3971	lowres.linkVerticesThis(sn);
3631		- CameraPane.RANDOM = random;
	3972	+ CameraPane.SWITCH = random;
3632	3973
3633	3974	System.err.flush();
3634	3975
..	..	@@ -3668,7 +4009,7 @@
3668	4009	return;
3669	4010
3670	4011	Object3D poses = group.selection.get(0);
3671		- Object3D ref = GrafreeD.clipboard.get(0);
	4012	+ Object3D ref = Grafreed.clipboard.get(0);
3672	4013
3673	4014	Object3D newgroup = new Object3D("Po:" + poses.name);
3674	4015
..	..	@@ -3862,9 +4203,9 @@
3862	4203
3863	4204	void ClipMesh()
3864	4205	{
3865		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4206	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3866	4207	{
3867		- Object3D content = GrafreeD.clipboard.get(0);
	4208	+ Object3D content = Grafreed.clipboard.get(0);
3868	4209
3869	4210	if (content instanceof cGroup && ((cGroup)content).transientlink )
3870	4211	content = ((cGroup)content).get(0);
..	..	@@ -3873,7 +4214,7 @@
3873	4214	// {
3874	4215	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3875	4216	// }
3876		- group.selection.ClipMesh(GrafreeD.clipboard);
	4217	+ group.selection.ClipMesh(Grafreed.clipboard);
3877	4218	}
3878	4219	// group.selection.ClipMesh(GrafreeD.clipboard);
3879	4220	System.out.println("DONE.");
..	..	@@ -3920,6 +4261,18 @@
3920	4261	void MarkLeaves(boolean hide)
3921	4262	{
3922	4263	group.selection.MarkLeaves(hide);
	4264	+ refreshContents();
	4265	+ }
	4266	+
	4267	+ void RewindLeaves(boolean hide)
	4268	+ {
	4269	+ group.selection.RewindLeaves(hide);
	4270	+ refreshContents();
	4271	+ }
	4272	+
	4273	+ void RandomLeaves(boolean hide)
	4274	+ {
	4275	+ group.selection.RandomLeaves(hide);
3923	4276	refreshContents();
3924	4277	}
3925	4278
..	..	@@ -4008,7 +4361,7 @@
4008	4361	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4009	4362
4010	4363	Object3D elem = (Object3D)group.selection.elementAt(i);
4011		- if(elem != group)
	4364	+ if(elem != group \|\| !newWindow)
4012	4365	{
4013	4366	// if (!(elem instanceof Composite))
4014	4367	// newWindow = false;
..	..	@@ -4098,7 +4451,6 @@
4098	4451	//case 702: // Event.LIST_DESELECT
4099	4452	group.deselectAll();
4100	4453	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4101		- objEditor.ClearInfo(); // .GetMaterial());
4102	4454	if (tps != null)
4103	4455	{
4104	4456	for (int i=0; i < tps.length; i++)
..	..	@@ -4107,29 +4459,28 @@
4107	4459
4108	4460	//if (child.parent != null)
4109	4461	//child.parent.addSelectee(child);
	4462	+ objEditor.SetMaterial(child);
4110	4463	group.addSelectee(child);
4111		- objEditor.SetMaterial(child); // .GetMaterial());
4112		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4113		- System.err.println("info : " + child.GetPath());
4114	4464	}
4115	4465	}
4116		- else
4117		- {
4118		- objEditor.SetMaterial(group); // .GetMaterial());
4119		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4120		- System.err.println("info : " + group.GetPath());
4121		- }
	4466	+// else
	4467	+// {
	4468	+// objEditor.SetMaterial(group); // .GetMaterial());
	4469	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4470	+// System.err.println("info : " + group.GetPath());
	4471	+// }
4122	4472
4123		- objEditor.SetText(); // jan 2014
4124		-
4125		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4473	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4126	4474	CameraPane.flash = true;
4127	4475
4128		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4476	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4129	4477	// a camera
4130	4478	{
4131		- CameraPane.camerachangeframe = 0; // don't refuse it
4132		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4479	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4480	+ {
	4481	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4482	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4483	+ }
4133	4484	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4134	4485	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4135	4486	}
..	..	@@ -4142,6 +4493,26 @@
4142	4493
4143	4494	freezemodel = false;
4144	4495	}
	4496	+
	4497	+ void refreshContents(boolean cp)
	4498	+ {
	4499	+ if (!Globals.MOUSEDRAGGED)
	4500	+ {
	4501	+ objEditor.ClearInfo(); // .GetMaterial());
	4502	+
	4503	+ for (int i=0; i < group.selection.Size(); i++)
	4504	+ {
	4505	+ Object3D child = (Object3D) group.selection.get(i);
	4506	+
	4507	+ objEditor.AddInfo(child, this, true);
	4508	+ System.err.println("info : " + child.GetPath());
	4509	+ }
	4510	+
	4511	+ objEditor.SetText(); // jan 2014
	4512	+ }
	4513	+
	4514	+ super.refreshContents(cp);
	4515	+ }
4145	4516
4146	4517	void linkSomething(Object3D thing)
4147	4518	{
..	..	@@ -4213,16 +4584,18 @@
4213	4584	{
4214	4585	if (group.selection.isEmpty())
4215	4586	return;
4216		- GrafreeD.clipboardIsTempGroup = false;
	4587	+
	4588	+ Grafreed.clipboardIsTempGroup = false;
4217	4589	Composite tGroup = null;
4218	4590	if (group.selection.size() > 0) // 1)
4219	4591	{
4220	4592	tGroup = new cGroup();
4221		- GrafreeD.clipboardIsTempGroup = true;
	4593	+ Grafreed.clipboardIsTempGroup = true;
4222	4594	}
4223	4595
4224	4596	if (cut)
4225	4597	{
	4598	+ Save();
4226	4599	//int indices[] = jList.getSelectedIndices();
4227	4600	//for (int i = indices.length - 1; i >= 0; i--)
4228	4601	//jList.remove(indices[i]);
..	..	@@ -4258,16 +4631,16 @@
4258	4631	//System.out.println("cut " + child);
4259	4632	//System.out.println("parent = " + child.parent);
4260	4633	// tmp.addChild(child);
4261		- if (GrafreeD.clipboardIsTempGroup)
	4634	+ if (Grafreed.clipboardIsTempGroup)
4262	4635	tGroup.add/Child/(tmp);
4263	4636	else
4264		- GrafreeD.clipboard = tmp;
	4637	+ Grafreed.clipboard = tmp;
4265	4638	}
4266	4639	else
4267		- if (GrafreeD.clipboardIsTempGroup)
	4640	+ if (Grafreed.clipboardIsTempGroup)
4268	4641	tGroup.add/Child/(child);
4269	4642	else
4270		- GrafreeD.clipboard = child;
	4643	+ Grafreed.clipboard = child;
4271	4644	}
4272	4645
4273	4646	//ResetModel();
..	..	@@ -4299,21 +4672,23 @@
4299	4672	//System.out.println("cut " + elem);
4300	4673	//System.out.println("parent = " + elem.parent);
4301	4674	// tmp.addChild(elem);
4302		- if (GrafreeD.clipboardIsTempGroup)
	4675	+ if (Grafreed.clipboardIsTempGroup)
4303	4676	tGroup.add/Child/(tmp);
4304	4677	else
4305		- GrafreeD.clipboard = tmp;
	4678	+ Grafreed.clipboard = tmp;
4306	4679	}
4307	4680	else
4308		- if (GrafreeD.clipboardIsTempGroup)
	4681	+ if (Grafreed.clipboardIsTempGroup)
4309	4682	tGroup.add/Child/(child);
4310	4683	else
4311		- GrafreeD.clipboard = child;
	4684	+ Grafreed.clipboard = child;
4312	4685	}
4313	4686
4314	4687	}
4315		- if (GrafreeD.clipboardIsTempGroup)
4316		- GrafreeD.clipboard = tGroup;
	4688	+
	4689	+ if (Grafreed.clipboardIsTempGroup)
	4690	+ Grafreed.clipboard = tGroup;
	4691	+
4317	4692	if (cut)
4318	4693	{
4319	4694	ResetModel();
..	..	@@ -4327,7 +4702,7 @@
4327	4702	// return;
4328	4703	boolean first = true;
4329	4704
4330		- if (GrafreeD.clipboardIsTempGroup)
	4705	+ if (Grafreed.clipboardIsTempGroup)
4331	4706	{
4332	4707	Composite temp;
4333	4708
..	..	@@ -4338,7 +4713,7 @@
4338	4713	temp = (Composite)Applet3D.clipboard.deepCopy();
4339	4714	*/
4340	4715	Object3D elem;
4341		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4716	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4342	4717	{
4343	4718	Object3D child = (Object3D)e.nextElement();
4344	4719
..	..	@@ -4372,21 +4747,21 @@
4372	4747	//Object3D cb = Applet3D.clipboard;
4373	4748	//temp.addChild(cb);
4374	4749	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4375		- assert(GrafreeD.clipboard.parent == null);
4376		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4377		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4378		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4379		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	4750	+ assert(Grafreed.clipboard.parent == null);
	4751	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4752	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4753	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4754	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4380	4755	else
4381		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4382		- GrafreeD.clipboard.get(0).parent = keepparent;
	4756	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4757	+ Grafreed.clipboard.get(0).parent = keepparent;
4383	4758	}
4384	4759
4385	4760	ResetModel();
4386	4761	refreshContents();
4387	4762	}
4388	4763
4389		- void pasteInto(boolean copyit)
	4764	+ void pasteInto(boolean copyit, boolean clone)
4390	4765	{
4391	4766	// if (GrafreeD.clipboard == null)
4392	4767	// return;
..	..	@@ -4415,15 +4790,22 @@
4415	4790	if (copyit)
4416	4791	{
4417	4792	// paste(false);
4418		- CloneClipboard(false); // sept 2014
	4793	+ if (clone)
	4794	+ {
	4795	+ CloneClipboard(false); // sept 2014
	4796	+ }
	4797	+ else
	4798	+ {
	4799	+ paste(false);
	4800	+ }
4419	4801	}
4420	4802	else
4421	4803	{
4422	4804	boolean first = true;
4423	4805
4424		- if (GrafreeD.clipboardIsTempGroup)
	4806	+ if (Grafreed.clipboardIsTempGroup)
4425	4807	{
4426		- Composite temp = (Composite)GrafreeD.clipboard;
	4808	+ Composite temp = (Composite)Grafreed.clipboard;
4427	4809	Object3D copy;
4428	4810	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4429	4811	{
..	..	@@ -4433,7 +4815,7 @@
4433	4815	}
4434	4816	} else
4435	4817	{
4436		- linkSomething(GrafreeD.clipboard); //.get(0));
	4818	+ linkSomething(Grafreed.clipboard); //.get(0));
4437	4819	}
4438	4820	}
4439	4821	}
..	..	@@ -4838,21 +5220,6 @@
4838	5220	}
4839	5221	*/
4840	5222
4841		- void ImportGFD()
4842		- {
4843		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4844		- browser.show();
4845		- String filename = browser.getFile();
4846		- if (filename != null && filename.length() > 0)
4847		- {
4848		- String fullname = browser.getDirectory() + filename;
4849		-
4850		- //Object3D readobj =
4851		- objEditor.ReadGFD(fullname, objEditor);
4852		- //makeSomething(readobj);
4853		- }
4854		- }
4855		-
4856	5223	/*
4857	5224	public void Callback(Object obj)
4858	5225	{
..	..	@@ -4876,26 +5243,9 @@
4876	5243	}
4877	5244	*/
4878	5245
4879		- void ImportVRMLX3D()
4880		- {
4881		- if (GrafreeD.standAlone)
4882		- {
4883		- /**/
4884		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4885		- browser.show();
4886		- String filename = browser.getFile();
4887		- if (filename != null && filename.length() > 0)
4888		- {
4889		- String fullname = browser.getDirectory() + filename;
4890		- LoadVRMLX3D(fullname);
4891		- }
4892		- /**/
4893		- }
4894		- }
4895		-
4896	5246	String GetFile(String dialogName)
4897	5247	{
4898		- if (GrafreeD.standAlone)
	5248	+ if (Grafreed.standAlone)
4899	5249	{
4900	5250	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4901	5251	browser.show();
..	..	@@ -4959,10 +5309,18 @@
4959	5309	cButton flashSelectionButton;
4960	5310	cButton editButton;
4961	5311	cButton uneditButton;
	5312	+ JCheckBox allParamsButton;
4962	5313	cButton clearpanelButton;
4963		- cButton allParamsButton;
4964	5314	cButton unselectButton;
4965	5315
	5316	+ cButton minButton;
	5317	+ cButton maxButton;
	5318	+ cButton fullButton;
	5319	+ cButton undoButton;
	5320	+ cButton redoButton;
	5321	+ cButton saveButton;
	5322	+ cButton oneStepButton;
	5323	+
4966	5324	cButton screenfitButton;
4967	5325	cButton screenfitpointButton;
4968	5326	cButton snapobjectButton;
..	..	@@ -4973,14 +5331,6 @@
4973	5331	cButton closeButton;
4974	5332
4975	5333	cButton setsupportButton;
4976		-
4977		- cButton twoButton;
4978		- cButton sixButton;
4979		- cButton threeButton;
4980		- cButton sevenButton;
4981		- cButton fourButton; // full panel
4982		- cButton oneButton; // full XYZ
4983		- //cButton currentLayout;
4984	5334
4985	5335	//
4986	5336	//Composite
..	..	@@ -4993,6 +5343,8 @@
4993	5343	private MenuItem lookFromItem;
4994	5344	private MenuItem switchItem;
4995	5345	private MenuItem cutItem;
	5346	+ private MenuItem undoItem;
	5347	+ private MenuItem redoItem;
4996	5348	private MenuItem duplicateItem;
4997	5349	private MenuItem cloneItem;
4998	5350	private MenuItem cloneSupportItem;
..	..	@@ -5006,7 +5358,7 @@
5006	5358	private MenuItem linkverticesItem;
5007	5359	private MenuItem relinkverticesItem;
5008	5360	private MenuItem setMasterItem;
5009		- private MenuItem resetMeshItem;
	5361	+ private MenuItem resetAllItem;
5010	5362	private MenuItem stepAllItem;
5011	5363	private MenuItem revertMeshItem;
5012	5364	private MenuItem poseMeshItem;
..	..	@@ -5017,6 +5369,7 @@
5017	5369	private MenuItem mergeGeometriesItem;
5018	5370	private MenuItem copyItem;
5019	5371	private MenuItem pasteItem;
	5372	+ private MenuItem pasteIntoItem;
5020	5373	private MenuItem pasteLinkItem;
5021	5374	private MenuItem pasteCloneItem;
5022	5375	private MenuItem pasteExpandItem;
..	..	@@ -5055,6 +5408,10 @@
5055	5408	private MenuItem showleavesItem;
5056	5409	private MenuItem markleavesItem;
5057	5410	private MenuItem unmarkleavesItem;
	5411	+ private MenuItem rewindleavesItem;
	5412	+ private MenuItem unrewindleavesItem;
	5413	+ private MenuItem randomleavesItem;
	5414	+ private MenuItem unrandomleavesItem;
5058	5415
5059	5416	private MenuItem flipVItem;
5060	5417	private MenuItem unflipVItem;
..	..	@@ -5066,8 +5423,10 @@
5066	5423	private MenuItem panoTexturesItem;
5067	5424
5068	5425	private MenuItem resetCentroidItem;
5069		- private MenuItem transformgeometryItem;
	5426	+ private MenuItem resetCentroidXZItem;
5070	5427	private MenuItem resetTransformItem;
	5428	+ private MenuItem transformGeometryItem;
	5429	+ private MenuItem transformChildrenItem;
5071	5430	private MenuItem hideItem;
5072	5431	private MenuItem grabItem;
5073	5432	private MenuItem backItem;
..	..	@@ -5114,7 +5473,7 @@
5114	5473	private MenuItem blobItem;
5115	5474	private MenuItem latheItem;
5116	5475	private MenuItem bezierItem;
5117		- private MenuItem checkerItem;
	5476	+ private MenuItem overlayItem;
5118	5477	private MenuItem meshItem;
5119	5478	// private MenuItem meshGroupItem;
5120	5479	private MenuItem springItem;
..	..	@@ -5136,11 +5495,6 @@
5136	5495	private MenuItem doubleItem;
5137	5496	private MenuItem tripleItem;
5138	5497
5139		- private MenuItem importGFDItem;
5140		- private MenuItem importVRMLX3DItem;
5141		- private MenuItem import3DSItem;
5142		- private MenuItem importOBJItem;
5143		-
5144	5498	private MenuItem computeAOItem;
5145	5499	private MenuItem recompileItem;
5146	5500	private MenuItem editScriptItem;
..	..	@@ -5150,4 +5504,8 @@
5150	5504	private MenuItem analyzeItem;
5151	5505	private MenuItem dumpItem;
5152	5506	//boolean freezemodel = false;
	5507	+
	5508	+ Menu cameraMenu;
	5509	+ MenuItem editCameraItem;
	5510	+ MenuItem revertCameraItem;
5153	5511	}