~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,7 +334,7 @@
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);
..	..	@@ -245,16 +345,21 @@
245	345	switchGeoItem.addActionListener(this);
246	346	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
247	347	switchTransfoItem.addActionListener(this);
	348	+ morphItem = menu.add(new MenuItem("Morph Group"));
	349	+ morphItem.addActionListener(this);
	350	+
	351	+ if (Globals.ADVANCED)
	352	+ {
	353	+ menu.add("-");
248	354	physicsItem = menu.add(new MenuItem("Physics"));
249	355	physicsItem.addActionListener(this);
250	356	frameselectorItem = menu.add(new MenuItem("Frame Selector"));
251	357	frameselectorItem.addActionListener(this);
252		- morphItem = menu.add(new MenuItem("Morph"));
253		- morphItem.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,19 +576,47 @@
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 = 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");
441	605	liveCB.addItemListener(this);
442	606
443		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	607	+ oe.toolbarPanel.add(fastCB = GetCheckBox("icons/runfast.png", CameraPane.FAST)); //, constraints);
444	608	fastCB.setToolTipText("Fast mode");
445	609	fastCB.addItemListener(this);
446	610
447		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	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);
448	616	trackCB.setToolTipText("Enable tracking");
449	617	trackCB.addItemListener(this);
450	618
451		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	619	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
452	620	screenfitButton.setToolTipText("Screen fit");
453	621	screenfitButton.addActionListener(this);
454	622
..	..	@@ -457,70 +625,68 @@
457	625
458	626	if (Globals.ADVANCED)
459	627	{
460		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	628	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
461	629	snapobjectButton.addActionListener(this);
462	630	snapobjectButton.setToolTipText("Snap Object");
463	631	}
464	632
465		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
466		- flashSelectionButton.setToolTipText("Show selection");
	633	+ oe.toolbarPanel.add(flashSelectionButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	634	+ flashSelectionButton.setToolTipText("Highlight selection");
467	635	flashSelectionButton.addActionListener(this);
468	636
469	637	oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
470	638
471		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	639	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
472	640	twoButton.setToolTipText("Show center view only");
473	641	twoButton.addActionListener(this);
474		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	642	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
475	643	fourButton.addActionListener(this);
476	644	fourButton.setToolTipText("Show left panel only");
477		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	645	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
478	646	sixButton.setToolTipText("2-column layout left");
479	647	sixButton.addActionListener(this);
480		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	648	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
481	649	threeButton.setToolTipText("2-column layout right");
482	650	threeButton.addActionListener(this);
483		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	651	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
484	652	sevenButton.setToolTipText("3-column layout");
485	653	sevenButton.addActionListener(this);
486	654	//
487	655
488		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	656	+ oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
489	657	rootButton.setToolTipText("Edit selection in new tab");
490	658	rootButton.addActionListener(this);
491	659
492		- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	660	+ oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
493	661	closeButton.setToolTipText("Close tab");
494	662	closeButton.addActionListener(this);
495	663	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
496	664	//clearButton.addActionListener(this);
497	665
498		- cGridBag commandsPanel = new cGridBag();
499		-
500		- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	666	+ editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
501	667	editButton.setToolTipText("Edit selection");
502	668	editButton.addActionListener(this);
503	669
504		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	670	+ editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
505	671	uneditButton.setToolTipText("Unedit selection");
506	672	uneditButton.addActionListener(this);
507	673
508		- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	674	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	675	+ allParamsButton.setToolTipText("Edit all params");
	676	+ allParamsButton.addActionListener(this);
	677	+
	678	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
509	679	clearPanelButton.setToolTipText("Clear edit panel");
510	680	clearPanelButton.addActionListener(this);
511	681
512		- commandsPanel.add(allParamsButton = new cButton("A", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
513		- allParamsButton.setToolTipText("All params??");
514		- allParamsButton.addActionListener(this);
515		-
516		- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	682	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
517	683	unselectButton.setToolTipText("Unselect");
518	684	unselectButton.addActionListener(this);
519	685
520		- commandsPanel.preferredHeight = 1;
	686	+ editCommandsPanel.preferredHeight = 1;
521	687
522		- oe.treePanel.add(commandsPanel);
523		- oe.treePanel.Return();
	688	+// oe.treePanel.add(commandsPanel);
	689	+// oe.treePanel.Return();
524	690
525	691	// oe.aConstraints.gridx += 1;
526	692	// oe.aConstraints.weighty = 0;
..	..	@@ -588,8 +754,18 @@
588	754
589	755	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
590	756	{
	757	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	758	+ boxCB.setToolTipText("Display bounding boxes");
	759	+ boxCB.addItemListener(this);
	760	+
	761	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	762	+ zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	763	+ zoomBoxCB.addItemListener(this);
	764	+
	765	+ if (true) // Globals.ADVANCED)
	766	+ {
591	767	panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
592		- supportCB.setToolTipText("Enabled rigging");
	768	+ supportCB.setToolTipText("Enable rigging");
593	769	supportCB.addItemListener(this);
594	770
595	771	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
..	..	@@ -607,14 +783,6 @@
607	783	slowCB.setToolTipText("Smooth interpolation");
608	784	slowCB.addItemListener(this);
609	785
610		- panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
611		- boxCB.setToolTipText("Display bounding boxes");
612		- boxCB.addItemListener(this);
613		-
614		- panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
615		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
616		- zoomBoxCB.addItemListener(this);
617		-
618	786	// constraints.gridy += 1;
619	787	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
620	788	// speakerMocapCB.addItemListener(this);
..	..	@@ -640,11 +808,25 @@
640	808	// debugCB.addItemListener(this);
641	809
642	810	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	811	+ oeilCB.setToolTipText("Move camera when tracking target");
643	812	oeilCB.addItemListener(this);
644	813
	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	+ {
645	824	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
646	825	lookAtCB.setToolTipText("Look-at target");
647	826	lookAtCB.addItemListener(this);
	827	+ }
	828	+
	829	+ }
648	830
649	831	cGridBag fill = new cGridBag();
650	832
..	..	@@ -657,6 +839,14 @@
657	839	void EditObject(Object3D obj)
658	840	{
659	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	+
660	850	radioButton.SetObject(obj);
661	851	radioButton.layout = sevenButton;
662	852	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -665,8 +855,11 @@
665	855	buttonGroup.add(radioButton);
666	856	radioButton.doClick();
667	857	}
	858	+
668	859	void SetupViews(ObjEditor oe)
669	860	{
	861	+ theFrame = this;
	862	+
670	863	oe.SetupViews();
671	864
672	865	System.out.println("SetupViews");
..	..	@@ -675,23 +868,26 @@
675	868	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
676	869	}
677	870
678		- JCheckBox liveCB;
679		- JCheckBox supportCB;
680		- JCheckBox localCB;
681		- JCheckBox crowdCB;
682		- JCheckBox smoothCB;
683		- JCheckBox fastCB;
684		- JCheckBox slowCB;
685		- JCheckBox boxCB;
686		- JCheckBox zoomBoxCB;
687		- JCheckBox trackCB;
688		- 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;
689	882	// JCheckBox speakerMocapCB;
690		- JCheckBox speakerCameraCB;
691		- JCheckBox speakerFocusCB;
692		- JCheckBox debugCB;
693		- JCheckBox oeilCB;
694		- JCheckBox lookAtCB;
	883	+ cCheckBox speakerCameraCB;
	884	+ cCheckBox speakerFocusCB;
	885	+ cCheckBox debugCB;
	886	+
	887	+ cCheckBox oeilCB;
	888	+ cCheckBox shadowCB;
	889	+ cCheckBox autosaveCB;
	890	+ cCheckBox lookAtCB;
695	891
696	892	// static int COLOR = 1;
697	893	// static int MATERIAL = 2;
..	..	@@ -699,9 +895,9 @@
699	895
700	896	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
701	897
702		- JCheckBox colorCB;
703		- JCheckBox materialCB;
704		- JCheckBox textureCB;
	898	+ cCheckBox colorCB;
	899	+ cCheckBox materialCB;
	900	+ cCheckBox textureCB;
705	901
706	902	public void itemStateChanged(ItemEvent e)
707	903	{
..	..	@@ -729,6 +925,7 @@
729	925	} else if(e.getSource() == liveCB)
730	926	{
731	927	cameraView.ToggleLive();
	928	+ refreshContents(false);
732	929	}
733	930	else if(e.getSource() == supportCB)
734	931	{
..	..	@@ -792,6 +989,14 @@
792	989	else if(e.getSource() == oeilCB)
793	990	{
794	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;
795	1000	}
796	1001	else if(e.getSource() == lookAtCB)
797	1002	{
..	..	@@ -881,7 +1086,9 @@
881	1086	// objEditor.DropFile((java.io.File[]) object, true);
882	1087	// return;
883	1088	// }
884		- if (string.charAt(0) == '/')
	1089	+
	1090	+ // File path for Mac and Windows
	1091	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
885	1092	{
886	1093	// file(s)
887	1094	String[] names = string.split("\n");
..	..	@@ -908,7 +1115,7 @@
908	1115
909	1116	flashIt = false;
910	1117	CameraPane pane = (CameraPane) target;
911		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1118	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
912	1119	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
913	1120
914	1121	if (group.selection.size() == 1)
..	..	@@ -935,11 +1142,11 @@
935	1142	{
936	1143	loadClipboard(true);
937	1144	objEditor.jTree.setSelectionPath(destinationPath);
938		- pasteInto(false);
	1145	+ pasteInto(false, false);
939	1146	} else {
940	1147	loadClipboard(false);
941	1148	objEditor.jTree.setSelectionPath(destinationPath);
942		- pasteInto(false); // true); // ???
	1149	+ pasteInto(false, false); // true); // ???
943	1150	}
944	1151	}
945	1152	public void dropActionChanged(DropTargetDragEvent dtde)
..	..	@@ -1061,27 +1268,33 @@
1061	1268	kleinItem.addActionListener(this);
1062	1269	particleItem = menu.add(new MenuItem("Particle system"));
1063	1270	particleItem.addActionListener(this);
	1271	+ if (Globals.ADVANCED)
	1272	+ {
1064	1273	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1065	1274	ragdollItem.addActionListener(this);
1066	1275	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1067	1276	ragdoll2Item.addActionListener(this);
	1277	+ }
1068	1278	menu.add("-");
1069		- meshItem = menu.add(new MenuItem("Mesh"));
	1279	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1070	1280	meshItem.addActionListener(this);
1071	1281	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1072	1282	// meshGroupItem.addActionListener(this);
	1283	+ if (Globals.ADVANCED)
	1284	+ {
1073	1285	springItem = menu.add(new MenuItem("Spring"));
1074	1286	springItem.addActionListener(this);
1075	1287	flagItem = menu.add(new MenuItem("Flag"));
1076	1288	flagItem.addActionListener(this);
1077		- bezierItem = menu.add(new MenuItem("Patch"));
1078		- bezierItem.addActionListener(this);
1079		- checkerItem = menu.add(new MenuItem("Checker"));
1080		- checkerItem.addActionListener(this);
1081	1289	blobItem = menu.add(new MenuItem("Blob"));
1082	1290	blobItem.addActionListener(this);
1083	1291	latheItem = menu.add(new MenuItem("Lathe"));
1084	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);
1085	1298	lightItem = menu.add(new MenuItem("Light"));
1086	1299	lightItem.addActionListener(this);
1087	1300	menu.add("-");
..	..	@@ -1091,8 +1304,11 @@
1091	1304	loopItem.addActionListener(this);
1092	1305	doubleItem = menu.add(new MenuItem("Fork"));
1093	1306	doubleItem.addActionListener(this);
	1307	+ if (Globals.ADVANCED)
	1308	+ {
1094	1309	tripleItem = menu.add(new MenuItem("Trident"));
1095	1310	tripleItem.addActionListener(this);
	1311	+ }
1096	1312	}
1097	1313
1098	1314	void buildToolsMenu(Menu menu)
..	..	@@ -1106,24 +1322,26 @@
1106	1322	parseverticesItem.addActionListener(this);
1107	1323	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1108	1324	textureFieldItem.addActionListener(this);
1109		- alignItem = menu.add(new MenuItem("Align"));
	1325	+ alignItem = menu.add(new MenuItem("Align Objects"));
1110	1326	alignItem.addActionListener(this);
1111		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1112		- mirrorItem.addActionListener(this);
1113	1327	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1114	1328	reduceMorphItem.addActionListener(this);
1115	1329	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1116	1330	reduce34MorphItem.addActionListener(this);
1117		-
	1331	+ menu.add("-");
1118	1332	menu.add(computeAOItem = new MenuItem("Compute AO"));
1119	1333	computeAOItem.addActionListener(this);
1120		- menu.add("-");
1121	1334
	1335	+ if (Globals.ADVANCED)
	1336	+ {
	1337	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1338	+ mirrorItem.addActionListener(this);
	1339	+ menu.add("-");
1122	1340	menu.add(memoryItem = new MenuItem("Memory Usage"));
1123	1341	memoryItem.addActionListener(this);
1124	1342	menu.add(analyzeItem = new MenuItem("Analyze"));
1125	1343	analyzeItem.addActionListener(this);
1126		- menu.add(dumpItem = new MenuItem("Dump"));
	1344	+ menu.add(dumpItem = new MenuItem("Print"));
1127	1345	dumpItem.addActionListener(this);
1128	1346	// menu.add(pathItem = new MenuItem("From-to path"));
1129	1347	// pathItem.addActionListener(this);
..	..	@@ -1141,6 +1359,7 @@
1141	1359	menu.add("-");
1142	1360	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1143	1361	editScriptItem.addActionListener(this);
	1362	+ }
1144	1363	}
1145	1364
1146	1365	void ScreenFit()
..	..	@@ -1263,6 +1482,7 @@
1263	1482	shadow.material = new cMaterial(obj.material);
1264	1483	shadow.material.diffuse = 0.0001f;
1265	1484	shadow.material.specular = 0.0001f;
	1485	+ //shadow.projectedVertices[1].x = 300;
1266	1486
1267	1487	makeSomething(shadow);
1268	1488	}
..	..	@@ -1469,9 +1689,9 @@
1469	1689
1470	1690	void Overwrite(int mask)
1471	1691	{
1472		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1692	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1473	1693	{
1474		- Object3D content = GrafreeD.clipboard.get(0);
	1694	+ Object3D content = Grafreed.clipboard.get(0);
1475	1695
1476	1696	if (content instanceof cGroup && ((cGroup)content).transientlink )
1477	1697	content = ((cGroup)content).get(0);
..	..	@@ -1642,7 +1862,7 @@
1642	1862	{
1643	1863	makeSomething(new BezierSurface());
1644	1864	} else
1645		- if (source == checkerItem)
	1865	+ if (source == overlayItem)
1646	1866	{
1647	1867	/*
1648	1868	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1776,23 +1996,6 @@
1776	1996	csg.addChild(child);
1777	1997	child.addChild(csg);
1778	1998	} else
1779		-
1780		- if (source == importGFDItem)
1781		- {
1782		- ImportGFD();
1783		- } else
1784		- if (source == importVRMLX3DItem)
1785		- {
1786		- ImportVRMLX3D();
1787		- } else
1788		- if (source == import3DSItem)
1789		- {
1790		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1791		- } else
1792		- if (source == importOBJItem)
1793		- {
1794		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1795		- } else
1796	1999	if (source == computeAOItem)
1797	2000	{
1798	2001	Globals.drawMode = CameraPane.OCCLUSION;
..	..	@@ -1811,7 +2014,7 @@
1811	2014	if (source == invariantsItem)
1812	2015	{
1813	2016	System.out.println("Invariants:");
1814		- GrafreeD.grafreeD.universe.invariants();
	2017	+ Grafreed.grafreeD.universe.invariants();
1815	2018	} else
1816	2019	if (source == memoryItem)
1817	2020	{
..	..	@@ -1829,6 +2032,35 @@
1829	2032	if (source == dumpItem)
1830	2033	{
1831	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();
1832	2064	} else
1833	2065	if (source == screenfitButton)
1834	2066	{
..	..	@@ -1879,12 +2111,20 @@
1879	2111	{
1880	2112	loadClipboard(true);
1881	2113	} else
	2114	+ if (source == undoItem)
	2115	+ {
	2116	+ Undo();
	2117	+ } else
	2118	+ if (source == redoItem)
	2119	+ {
	2120	+ Redo();
	2121	+ } else
1882	2122	if (source == duplicateItem)
1883	2123	{
1884		- Object3D keep = GrafreeD.clipboard;
	2124	+ Object3D keep = Grafreed.clipboard;
1885	2125	loadClipboard(false);
1886	2126	paste(false);
1887		- GrafreeD.clipboard = keep;
	2127	+ Grafreed.clipboard = keep;
1888	2128	} else
1889	2129	if (source == cloneItem)
1890	2130	{
..	..	@@ -1902,13 +2142,17 @@
1902	2142	{
1903	2143	paste(false);
1904	2144	} else
	2145	+ if (source == pasteIntoItem)
	2146	+ {
	2147	+ pasteInto(true, false);
	2148	+ } else
1905	2149	if (source == pasteLinkItem)
1906	2150	{
1907		- pasteInto(false);
	2151	+ pasteInto(false, false);
1908	2152	} else
1909	2153	if (source == pasteCloneItem)
1910	2154	{
1911		- pasteInto(true);
	2155	+ pasteInto(true, true);
1912	2156	} else
1913	2157	if (source == pasteExpandItem)
1914	2158	{
..	..	@@ -2100,9 +2344,9 @@
2100	2344	// group.selection.get(0).setMasterThis(content); // should be identity
2101	2345	// refreshContents();
2102	2346	// }
2103		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2347	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2104	2348	{
2105		- Object3D content = GrafreeD.clipboard.get(0);
	2349	+ Object3D content = Grafreed.clipboard.get(0);
2106	2350
2107	2351	if (content instanceof cGroup && ((cGroup)content).transientlink )
2108	2352	content = ((cGroup)content).get(0);
..	..	@@ -2110,11 +2354,11 @@
2110	2354	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2111	2355	for (int i=0; i<group.selection.size(); i++)
2112	2356	{
2113		- boolean random = CameraPane.RANDOM;
2114		- CameraPane.RANDOM = false; // parse all random nodes
	2357	+ boolean random = CameraPane.SWITCH;
	2358	+ CameraPane.SWITCH = false; // parse all random nodes
2115	2359	group.selection.get(i).linkVerticesThis(content);
2116	2360	// group.selection.get(i).setMasterThis(content); // should be identity
2117		- CameraPane.RANDOM = random;
	2361	+ CameraPane.SWITCH = random;
2118	2362	}
2119	2363	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2120	2364	refreshContents();
..	..	@@ -2124,20 +2368,20 @@
2124	2368	{
2125	2369	for (int i=0; i<group.selection.size(); i++)
2126	2370	{
2127		- boolean random = CameraPane.RANDOM;
2128		- CameraPane.RANDOM = false; // parse all random nodes
	2371	+ boolean random = CameraPane.SWITCH;
	2372	+ CameraPane.SWITCH = false; // parse all random nodes
2129	2373	group.selection.get(i).linkVerticesThis(null);
2130		- CameraPane.RANDOM = random;
	2374	+ CameraPane.SWITCH = random;
2131	2375	}
2132	2376
2133	2377	refreshContents();
2134	2378	} else
2135	2379	if (source == relinkverticesItem)
2136	2380	{
2137		- boolean random = CameraPane.RANDOM;
2138		- CameraPane.RANDOM = false; // parse all random nodes
	2381	+ boolean random = CameraPane.SWITCH;
	2382	+ CameraPane.SWITCH = false; // parse all random nodes
2139	2383	group.selection.RelinkToSupport();
2140		- CameraPane.RANDOM = random;
	2384	+ CameraPane.SWITCH = random;
2141	2385
2142	2386	refreshContents();
2143	2387	} else
..	..	@@ -2152,9 +2396,9 @@
2152	2396	} else
2153	2397	if (source == setMasterItem)
2154	2398	{
2155		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2399	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2156	2400	{
2157		- Object3D content = GrafreeD.clipboard.get(0);
	2401	+ Object3D content = Grafreed.clipboard.get(0);
2158	2402
2159	2403	if (content instanceof cGroup && ((cGroup)content).transientlink )
2160	2404	content = ((cGroup)content).get(0);
..	..	@@ -2167,9 +2411,9 @@
2167	2411	{
2168	2412	if (group.selection.size() == 1)
2169	2413	{
2170		- if (GrafreeD.clipboard.size() == 1)
	2414	+ if (Grafreed.clipboard.size() == 1)
2171	2415	{
2172		- Object3D content = GrafreeD.clipboard.get(0);
	2416	+ Object3D content = Grafreed.clipboard.get(0);
2173	2417
2174	2418	if (content instanceof cGroup && ((cGroup)content).transientlink )
2175	2419	content = ((cGroup)content).get(0);
..	..	@@ -2186,7 +2430,7 @@
2186	2430	{
2187	2431	RevertMeshes();
2188	2432	} else
2189		- if (source == resetMeshItem)
	2433	+ if (source == resetAllItem)
2190	2434	{
2191	2435	ResetAll();
2192	2436	} else
..	..	@@ -2374,7 +2618,7 @@
2374	2618	} else
2375	2619	if (source == genNormalsMESHItem)
2376	2620	{
2377		- GenNormals(true); // TODO
	2621	+ GenNormalsMESH();
2378	2622	} else
2379	2623	if (source == genNormalsORGANItem)
2380	2624	{
..	..	@@ -2439,6 +2683,22 @@
2439	2683	if (source == unmarkleavesItem)
2440	2684	{
2441	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);
2442	2702	} else
2443	2703	if (source == flipVItem)
2444	2704	{
..	..	@@ -2524,9 +2784,13 @@
2524	2784	{
2525	2785	SmoothMesh();
2526	2786	} else
2527		- if (source == transformgeometryItem)
	2787	+ if (source == transformGeometryItem)
2528	2788	{
2529	2789	TransformGeometry();
	2790	+ } else
	2791	+ if (source == transformChildrenItem)
	2792	+ {
	2793	+ TransformChildren();
2530	2794	} else
2531	2795	if (source == resetTransformItem)
2532	2796	{
..	..	@@ -2534,7 +2798,11 @@
2534	2798	} else
2535	2799	if (source == resetCentroidItem)
2536	2800	{
2537		- ResetCentroid();
	2801	+ ResetCentroid(true);
	2802	+ } else
	2803	+ if (source == resetCentroidXZItem)
	2804	+ {
	2805	+ ResetCentroid(false);
2538	2806	} else
2539	2807	if (source == resetParentItem)
2540	2808	{
..	..	@@ -2698,6 +2966,24 @@
2698	2966	bigThree.ClearUI();
2699	2967	bigThree.add(centralPanel);
2700	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	+
2701	2987	} else
2702	2988	if (source == threeButton)
2703	2989	{
..	..	@@ -2734,6 +3020,8 @@
2734	3020	bigThree.add(centralPanel);
2735	3021	bigThree.add(XYZPanel);
2736	3022	bigThree.FlushUI();
	3023	+
	3024	+ cameraView.requestFocusInWindow();
2737	3025	} else
2738	3026	if (source == fourButton)
2739	3027	{
..	..	@@ -2769,6 +3057,8 @@
2769	3057	bigThree.ClearUI();
2770	3058	bigThree.add(scenePanel);
2771	3059	bigThree.FlushUI();
	3060	+
	3061	+ cameraView.requestFocusInWindow();
2772	3062	} else
2773	3063	if (source == sixButton)
2774	3064	{
..	..	@@ -2805,6 +3095,8 @@
2805	3095	bigThree.add(scenePanel);
2806	3096	bigThree.add(centralPanel);
2807	3097	bigThree.FlushUI();
	3098	+
	3099	+ cameraView.requestFocusInWindow();
2808	3100	} else
2809	3101	if (source == sevenButton)
2810	3102	{
..	..	@@ -2842,6 +3134,8 @@
2842	3134	bigThree.add(centralPanel);
2843	3135	bigThree.add(XYZPanel);
2844	3136	bigThree.FlushUI();
	3137	+
	3138	+ cameraView.requestFocusInWindow();
2845	3139	} else
2846	3140	if (source == rootButton)
2847	3141	{
..	..	@@ -2853,6 +3147,7 @@
2853	3147	EditObject(obj);
2854	3148	}
2855	3149
	3150	+ cameraView.requestFocusInWindow();
2856	3151	refreshContents(true);
2857	3152	} else
2858	3153	if (source == closeButton)
..	..	@@ -2862,18 +3157,27 @@
2862	3157	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2863	3158	{
2864	3159	ab = (cRadio)e.nextElement();
2865		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3160	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2866	3161	{
	3162	+ // Patch to avoid bug with transparency.
	3163	+ if (!ab.hadMaterial)
	3164	+ {
	3165	+ ab.object.material = null;
	3166	+ }
	3167	+
2867	3168	buttonGroup.remove(ab);
2868	3169	radioPanel.remove(ab);
2869	3170
2870		- ab.GetObject().editWindow = null;
	3171	+ //ab.GetObject().editWindow = null;
	3172	+ ab.GetObject().manipWindow = null;
2871	3173	// ab.GetObject().objectUI = null; // ?????????
2872	3174
2873	3175	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2874	3176	break;
2875	3177	}
2876	3178	}
	3179	+
	3180	+ cameraView.requestFocusInWindow();
2877	3181	refreshContents(true);
2878	3182	} else
2879	3183	if (source == editItem \|\| source == editButton)
..	..	@@ -2890,9 +3194,9 @@
2890	3194	child.CloseUI();
2891	3195	listUI.remove(child);
2892	3196
2893		- child.editWindow = null; // ???????????
	3197	+ //child.editWindow = null; // ???????????
2894	3198	}
2895		- objEditor.ctrlPanel.validate();
	3199	+ objEditor.ctrlPanel.FlushUI();
2896	3200	//objEditor.jTree.clearSelection();
2897	3201	//objEditor.ResetSliders();
2898	3202	refreshContents(true);
..	..	@@ -2976,7 +3280,11 @@
2976	3280	frontView.object = group;
2977	3281	sideView.object = group;
2978	3282	}
2979		- group.editWindow = this;
	3283	+
	3284	+// fix "+" issue
	3285	+ //group.editWindow = this;
	3286	+ group.manipWindow = this;
	3287	+
2980	3288	/*
2981	3289	currentLayout = radio.layout;
2982	3290	if (currentLayout == null)
..	..	@@ -2988,8 +3296,23 @@
2988	3296	//group.parent = null; // ROOT
2989	3297	//group.attributes = -1;
2990	3298	ResetModel();
	3299	+
	3300	+ cameraView.requestFocusInWindow();
2991	3301	refreshContents(true);
2992		- }
	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	+ }
2993	3316	else
2994	3317	{
2995	3318	//return super.action(event, arg);
..	..	@@ -2998,7 +3321,6 @@
2998	3321	}
2999	3322
3000	3323	boolean useclient = false;
3001		- cRadio radio;
3002	3324
3003	3325	void ToggleRoot()
3004	3326	{
..	..	@@ -3050,6 +3372,28 @@
3050	3372	refreshContents();
3051	3373	}
3052	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	+ }
3053	3397
3054	3398	void ResetTransform()
3055	3399	{
..	..	@@ -3162,7 +3506,7 @@
3162	3506	refreshContents();
3163	3507	}
3164	3508
3165		- void ResetCentroid()
	3509	+ void ResetCentroid(boolean full)
3166	3510	{
3167	3511	Object3D obj;
3168	3512	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3177,12 +3521,16 @@
3177	3521	LA.matIdentity(Object3D.mat);
3178	3522	obj.getBounds(minima, maxima, false);
3179	3523	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3180		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3524	+ if (full)
	3525	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3181	3526	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3182	3527	obj.TransformMesh(Object3D.mat);
	3528	+
3183	3529	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3184		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3530	+ if (full)
	3531	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3185	3532	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3533	+
3186	3534	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3187	3535	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3188	3536	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3211,7 +3559,8 @@
3211	3559
3212	3560	int size = obj.MemorySize();
3213	3561
3214		- 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)");
3215	3564	}
3216	3565	}
3217	3566	catch (Exception e)
..	..	@@ -3248,9 +3597,9 @@
3248	3597	obj = (Object3D)e.nextElement();
3249	3598
3250	3599	System.out.println("Object is: " + obj);
3251		- GrafreeD.AnalyzeObject(obj);
	3600	+ Grafreed.AnalyzeObject(obj);
3252	3601	System.out.println("Boundary rep: " + obj.bRep);
3253		- GrafreeD.AnalyzeObject(obj.bRep);
	3602	+ Grafreed.AnalyzeObject(obj.bRep);
3254	3603
3255	3604	// System.err.println((size/1024) + " KB is the size of " + obj);
3256	3605	}
..	..	@@ -3292,6 +3641,13 @@
3292	3641	void GenNormals(boolean crease)
3293	3642	{
3294	3643	group.GenNormalsS(crease);
	3644	+
	3645	+ refreshContents();
	3646	+ }
	3647	+
	3648	+ void GenNormalsMESH()
	3649	+ {
	3650	+ group.GenNormalsMeshS();
3295	3651
3296	3652	refreshContents();
3297	3653	}
..	..	@@ -3464,8 +3820,8 @@
3464	3820
3465	3821	void ParseVertices()
3466	3822	{
3467		- boolean epsequal = GrafreeD.epsequal;
3468		- GrafreeD.epsequal = true;
	3823	+ boolean epsequal = Grafreed.epsequal;
	3824	+ Grafreed.epsequal = true;
3469	3825
3470	3826	for (int i=0; i<group.selection.size(); i++)
3471	3827	{
..	..	@@ -3490,7 +3846,7 @@
3490	3846	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3491	3847	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3492	3848
3493		- g.add(GrafreeD.clipboard);
	3849	+ g.add(Grafreed.clipboard);
3494	3850
3495	3851	buffer.add(g);
3496	3852	}
..	..	@@ -3505,7 +3861,7 @@
3505	3861	makeSomething(buffer, i==group.selection.size()-1);
3506	3862	}
3507	3863
3508		- GrafreeD.epsequal = epsequal;
	3864	+ Grafreed.epsequal = epsequal;
3509	3865
3510	3866	refreshContents();
3511	3867	}
..	..	@@ -3523,7 +3879,16 @@
3523	3879	String pigment = Object3D.GetPigment(tex);
3524	3880	//String bump = Object3D.GetBump(tex);
3525	3881
3526		- 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	+ }
3527	3892
3528	3893	double s = v.s;
3529	3894
..	..	@@ -3611,11 +3976,11 @@
3611	3976
3612	3977	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3613	3978
3614		- boolean random = CameraPane.RANDOM;
3615		- CameraPane.RANDOM = false; // parse all random nodes
	3979	+ boolean random = CameraPane.SWITCH;
	3980	+ CameraPane.SWITCH = false; // parse all random nodes
3616	3981	lowres.linkVerticesThis(null);
3617	3982	lowres.linkVerticesThis(sn);
3618		- CameraPane.RANDOM = random;
	3983	+ CameraPane.SWITCH = random;
3619	3984
3620	3985	System.err.flush();
3621	3986
..	..	@@ -3655,7 +4020,7 @@
3655	4020	return;
3656	4021
3657	4022	Object3D poses = group.selection.get(0);
3658		- Object3D ref = GrafreeD.clipboard.get(0);
	4023	+ Object3D ref = Grafreed.clipboard.get(0);
3659	4024
3660	4025	Object3D newgroup = new Object3D("Po:" + poses.name);
3661	4026
..	..	@@ -3849,9 +4214,9 @@
3849	4214
3850	4215	void ClipMesh()
3851	4216	{
3852		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4217	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3853	4218	{
3854		- Object3D content = GrafreeD.clipboard.get(0);
	4219	+ Object3D content = Grafreed.clipboard.get(0);
3855	4220
3856	4221	if (content instanceof cGroup && ((cGroup)content).transientlink )
3857	4222	content = ((cGroup)content).get(0);
..	..	@@ -3860,7 +4225,7 @@
3860	4225	// {
3861	4226	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3862	4227	// }
3863		- group.selection.ClipMesh(GrafreeD.clipboard);
	4228	+ group.selection.ClipMesh(Grafreed.clipboard);
3864	4229	}
3865	4230	// group.selection.ClipMesh(GrafreeD.clipboard);
3866	4231	System.out.println("DONE.");
..	..	@@ -3907,6 +4272,18 @@
3907	4272	void MarkLeaves(boolean hide)
3908	4273	{
3909	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);
3910	4287	refreshContents();
3911	4288	}
3912	4289
..	..	@@ -3995,7 +4372,7 @@
3995	4372	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3996	4373
3997	4374	Object3D elem = (Object3D)group.selection.elementAt(i);
3998		- if(elem != group)
	4375	+ if(elem != group \|\| !newWindow)
3999	4376	{
4000	4377	// if (!(elem instanceof Composite))
4001	4378	// newWindow = false;
..	..	@@ -4085,7 +4462,6 @@
4085	4462	//case 702: // Event.LIST_DESELECT
4086	4463	group.deselectAll();
4087	4464	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4088		- objEditor.ClearInfo(); // .GetMaterial());
4089	4465	if (tps != null)
4090	4466	{
4091	4467	for (int i=0; i < tps.length; i++)
..	..	@@ -4094,10 +4470,8 @@
4094	4470
4095	4471	//if (child.parent != null)
4096	4472	//child.parent.addSelectee(child);
	4473	+ objEditor.SetMaterial(child);
4097	4474	group.addSelectee(child);
4098		- objEditor.SetMaterial(child); // .GetMaterial());
4099		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4100		- System.err.println("info : " + child.GetPath());
4101	4475	}
4102	4476	}
4103	4477	// else
..	..	@@ -4107,16 +4481,17 @@
4107	4481	// System.err.println("info : " + group.GetPath());
4108	4482	// }
4109	4483
4110		- objEditor.SetText(); // jan 2014
4111		-
4112		- 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))
4113	4485	CameraPane.flash = true;
4114	4486
4115		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4487	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4116	4488	// a camera
4117	4489	{
4118		- CameraPane.camerachangeframe = 0; // don't refuse it
4119		- 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	+ }
4120	4495	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4121	4496	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4122	4497	}
..	..	@@ -4129,6 +4504,26 @@
4129	4504
4130	4505	freezemodel = false;
4131	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	+ }
4132	4527
4133	4528	void linkSomething(Object3D thing)
4134	4529	{
..	..	@@ -4200,16 +4595,19 @@
4200	4595	{
4201	4596	if (group.selection.isEmpty())
4202	4597	return;
4203		- GrafreeD.clipboardIsTempGroup = false;
	4598	+
	4599	+ Grafreed.clipboardIsTempGroup = false;
4204	4600	Composite tGroup = null;
4205	4601	if (group.selection.size() > 0) // 1)
4206	4602	{
4207	4603	tGroup = new cGroup();
4208		- GrafreeD.clipboardIsTempGroup = true;
	4604	+ Grafreed.clipboardIsTempGroup = true;
4209	4605	}
4210	4606
4211	4607	if (cut)
4212	4608	{
	4609	+ if (Globals.SAVEONMAKE)
	4610	+ Save();
4213	4611	//int indices[] = jList.getSelectedIndices();
4214	4612	//for (int i = indices.length - 1; i >= 0; i--)
4215	4613	//jList.remove(indices[i]);
..	..	@@ -4245,16 +4643,16 @@
4245	4643	//System.out.println("cut " + child);
4246	4644	//System.out.println("parent = " + child.parent);
4247	4645	// tmp.addChild(child);
4248		- if (GrafreeD.clipboardIsTempGroup)
	4646	+ if (Grafreed.clipboardIsTempGroup)
4249	4647	tGroup.add/Child/(tmp);
4250	4648	else
4251		- GrafreeD.clipboard = tmp;
	4649	+ Grafreed.clipboard = tmp;
4252	4650	}
4253	4651	else
4254		- if (GrafreeD.clipboardIsTempGroup)
	4652	+ if (Grafreed.clipboardIsTempGroup)
4255	4653	tGroup.add/Child/(child);
4256	4654	else
4257		- GrafreeD.clipboard = child;
	4655	+ Grafreed.clipboard = child;
4258	4656	}
4259	4657
4260	4658	//ResetModel();
..	..	@@ -4286,21 +4684,23 @@
4286	4684	//System.out.println("cut " + elem);
4287	4685	//System.out.println("parent = " + elem.parent);
4288	4686	// tmp.addChild(elem);
4289		- if (GrafreeD.clipboardIsTempGroup)
	4687	+ if (Grafreed.clipboardIsTempGroup)
4290	4688	tGroup.add/Child/(tmp);
4291	4689	else
4292		- GrafreeD.clipboard = tmp;
	4690	+ Grafreed.clipboard = tmp;
4293	4691	}
4294	4692	else
4295		- if (GrafreeD.clipboardIsTempGroup)
	4693	+ if (Grafreed.clipboardIsTempGroup)
4296	4694	tGroup.add/Child/(child);
4297	4695	else
4298		- GrafreeD.clipboard = child;
	4696	+ Grafreed.clipboard = child;
4299	4697	}
4300	4698
4301	4699	}
4302		- if (GrafreeD.clipboardIsTempGroup)
4303		- GrafreeD.clipboard = tGroup;
	4700	+
	4701	+ if (Grafreed.clipboardIsTempGroup)
	4702	+ Grafreed.clipboard = tGroup;
	4703	+
4304	4704	if (cut)
4305	4705	{
4306	4706	ResetModel();
..	..	@@ -4314,7 +4714,7 @@
4314	4714	// return;
4315	4715	boolean first = true;
4316	4716
4317		- if (GrafreeD.clipboardIsTempGroup)
	4717	+ if (Grafreed.clipboardIsTempGroup)
4318	4718	{
4319	4719	Composite temp;
4320	4720
..	..	@@ -4325,7 +4725,7 @@
4325	4725	temp = (Composite)Applet3D.clipboard.deepCopy();
4326	4726	*/
4327	4727	Object3D elem;
4328		- 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))
4329	4729	{
4330	4730	Object3D child = (Object3D)e.nextElement();
4331	4731
..	..	@@ -4359,21 +4759,21 @@
4359	4759	//Object3D cb = Applet3D.clipboard;
4360	4760	//temp.addChild(cb);
4361	4761	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4362		- assert(GrafreeD.clipboard.parent == null);
4363		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4364		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4365		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4366		- 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());
4367	4767	else
4368		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4369		- GrafreeD.clipboard.get(0).parent = keepparent;
	4768	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4769	+ Grafreed.clipboard.get(0).parent = keepparent;
4370	4770	}
4371	4771
4372	4772	ResetModel();
4373	4773	refreshContents();
4374	4774	}
4375	4775
4376		- void pasteInto(boolean copyit)
	4776	+ void pasteInto(boolean copyit, boolean clone)
4377	4777	{
4378	4778	// if (GrafreeD.clipboard == null)
4379	4779	// return;
..	..	@@ -4402,15 +4802,22 @@
4402	4802	if (copyit)
4403	4803	{
4404	4804	// paste(false);
4405		- CloneClipboard(false); // sept 2014
	4805	+ if (clone)
	4806	+ {
	4807	+ CloneClipboard(false); // sept 2014
	4808	+ }
	4809	+ else
	4810	+ {
	4811	+ paste(false);
	4812	+ }
4406	4813	}
4407	4814	else
4408	4815	{
4409	4816	boolean first = true;
4410	4817
4411		- if (GrafreeD.clipboardIsTempGroup)
	4818	+ if (Grafreed.clipboardIsTempGroup)
4412	4819	{
4413		- Composite temp = (Composite)GrafreeD.clipboard;
	4820	+ Composite temp = (Composite)Grafreed.clipboard;
4414	4821	Object3D copy;
4415	4822	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4416	4823	{
..	..	@@ -4420,7 +4827,7 @@
4420	4827	}
4421	4828	} else
4422	4829	{
4423		- linkSomething(GrafreeD.clipboard); //.get(0));
	4830	+ linkSomething(Grafreed.clipboard); //.get(0));
4424	4831	}
4425	4832	}
4426	4833	}
..	..	@@ -4825,21 +5232,6 @@
4825	5232	}
4826	5233	*/
4827	5234
4828		- void ImportGFD()
4829		- {
4830		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4831		- browser.show();
4832		- String filename = browser.getFile();
4833		- if (filename != null && filename.length() > 0)
4834		- {
4835		- String fullname = browser.getDirectory() + filename;
4836		-
4837		- //Object3D readobj =
4838		- objEditor.ReadGFD(fullname, objEditor);
4839		- //makeSomething(readobj);
4840		- }
4841		- }
4842		-
4843	5235	/*
4844	5236	public void Callback(Object obj)
4845	5237	{
..	..	@@ -4863,26 +5255,9 @@
4863	5255	}
4864	5256	*/
4865	5257
4866		- void ImportVRMLX3D()
4867		- {
4868		- if (GrafreeD.standAlone)
4869		- {
4870		- /**/
4871		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4872		- browser.show();
4873		- String filename = browser.getFile();
4874		- if (filename != null && filename.length() > 0)
4875		- {
4876		- String fullname = browser.getDirectory() + filename;
4877		- LoadVRMLX3D(fullname);
4878		- }
4879		- /**/
4880		- }
4881		- }
4882		-
4883	5258	String GetFile(String dialogName)
4884	5259	{
4885		- if (GrafreeD.standAlone)
	5260	+ if (Grafreed.standAlone)
4886	5261	{
4887	5262	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4888	5263	browser.show();
..	..	@@ -4946,10 +5321,18 @@
4946	5321	cButton flashSelectionButton;
4947	5322	cButton editButton;
4948	5323	cButton uneditButton;
	5324	+ JCheckBox allParamsButton;
4949	5325	cButton clearpanelButton;
4950		- cButton allParamsButton;
4951	5326	cButton unselectButton;
4952	5327
	5328	+ cButton minButton;
	5329	+ cButton maxButton;
	5330	+ cButton fullButton;
	5331	+ cButton undoButton;
	5332	+ cButton redoButton;
	5333	+ cButton saveButton;
	5334	+ cButton oneStepButton;
	5335	+
4953	5336	cButton screenfitButton;
4954	5337	cButton screenfitpointButton;
4955	5338	cButton snapobjectButton;
..	..	@@ -4960,14 +5343,6 @@
4960	5343	cButton closeButton;
4961	5344
4962	5345	cButton setsupportButton;
4963		-
4964		- cButton twoButton;
4965		- cButton sixButton;
4966		- cButton threeButton;
4967		- cButton sevenButton;
4968		- cButton fourButton; // full panel
4969		- cButton oneButton; // full XYZ
4970		- //cButton currentLayout;
4971	5346
4972	5347	//
4973	5348	//Composite
..	..	@@ -4980,6 +5355,8 @@
4980	5355	private MenuItem lookFromItem;
4981	5356	private MenuItem switchItem;
4982	5357	private MenuItem cutItem;
	5358	+ private MenuItem undoItem;
	5359	+ private MenuItem redoItem;
4983	5360	private MenuItem duplicateItem;
4984	5361	private MenuItem cloneItem;
4985	5362	private MenuItem cloneSupportItem;
..	..	@@ -4993,7 +5370,7 @@
4993	5370	private MenuItem linkverticesItem;
4994	5371	private MenuItem relinkverticesItem;
4995	5372	private MenuItem setMasterItem;
4996		- private MenuItem resetMeshItem;
	5373	+ private MenuItem resetAllItem;
4997	5374	private MenuItem stepAllItem;
4998	5375	private MenuItem revertMeshItem;
4999	5376	private MenuItem poseMeshItem;
..	..	@@ -5004,6 +5381,7 @@
5004	5381	private MenuItem mergeGeometriesItem;
5005	5382	private MenuItem copyItem;
5006	5383	private MenuItem pasteItem;
	5384	+ private MenuItem pasteIntoItem;
5007	5385	private MenuItem pasteLinkItem;
5008	5386	private MenuItem pasteCloneItem;
5009	5387	private MenuItem pasteExpandItem;
..	..	@@ -5042,6 +5420,10 @@
5042	5420	private MenuItem showleavesItem;
5043	5421	private MenuItem markleavesItem;
5044	5422	private MenuItem unmarkleavesItem;
	5423	+ private MenuItem rewindleavesItem;
	5424	+ private MenuItem unrewindleavesItem;
	5425	+ private MenuItem randomleavesItem;
	5426	+ private MenuItem unrandomleavesItem;
5045	5427
5046	5428	private MenuItem flipVItem;
5047	5429	private MenuItem unflipVItem;
..	..	@@ -5053,8 +5435,10 @@
5053	5435	private MenuItem panoTexturesItem;
5054	5436
5055	5437	private MenuItem resetCentroidItem;
5056		- private MenuItem transformgeometryItem;
	5438	+ private MenuItem resetCentroidXZItem;
5057	5439	private MenuItem resetTransformItem;
	5440	+ private MenuItem transformGeometryItem;
	5441	+ private MenuItem transformChildrenItem;
5058	5442	private MenuItem hideItem;
5059	5443	private MenuItem grabItem;
5060	5444	private MenuItem backItem;
..	..	@@ -5101,7 +5485,7 @@
5101	5485	private MenuItem blobItem;
5102	5486	private MenuItem latheItem;
5103	5487	private MenuItem bezierItem;
5104		- private MenuItem checkerItem;
	5488	+ private MenuItem overlayItem;
5105	5489	private MenuItem meshItem;
5106	5490	// private MenuItem meshGroupItem;
5107	5491	private MenuItem springItem;
..	..	@@ -5123,11 +5507,6 @@
5123	5507	private MenuItem doubleItem;
5124	5508	private MenuItem tripleItem;
5125	5509
5126		- private MenuItem importGFDItem;
5127		- private MenuItem importVRMLX3DItem;
5128		- private MenuItem import3DSItem;
5129		- private MenuItem importOBJItem;
5130		-
5131	5510	private MenuItem computeAOItem;
5132	5511	private MenuItem recompileItem;
5133	5512	private MenuItem editScriptItem;
..	..	@@ -5137,4 +5516,8 @@
5137	5516	private MenuItem analyzeItem;
5138	5517	private MenuItem dumpItem;
5139	5518	//boolean freezemodel = false;
	5519	+
	5520	+ Menu cameraMenu;
	5521	+ MenuItem editCameraItem;
	5522	+ MenuItem revertCameraItem;
5140	5523	}