~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
	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	+
439	603	oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
440		- liveCB.setToolTipText("Enabled animation");
	604	+ liveCB.setToolTipText("Enable animation");
441	605	liveCB.addItemListener(this);
442	606
	607	+ oe.toolbarPanel.add(oneStepButton = new cButton("\u29f4", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	608	+ oneStepButton.setToolTipText("Animate one step forward");
	609	+ oneStepButton.addActionListener(this);
	610	+
443	611	oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
444	612	fastCB.setToolTipText("Fast mode");
445	613	fastCB.addItemListener(this);
446	614
447		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	615	+ oe.toolbarPanel.add(trackCB = new cCheckBox(":", 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 = new cButton("@", !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);
	633	+ oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
466	634	flashSelectionButton.setToolTipText("Show 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(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	674	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
509	675	allParamsButton.setToolTipText("Edit all params");
510	676	allParamsButton.addActionListener(this);
511	677
512		- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	678	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
513	679	clearPanelButton.setToolTipText("Clear edit panel");
514	680	clearPanelButton.addActionListener(this);
515	681
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);
..	..	@@ -645,6 +813,8 @@
645	813	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
646	814	lookAtCB.setToolTipText("Look-at target");
647	815	lookAtCB.addItemListener(this);
	816	+
	817	+ }
648	818
649	819	cGridBag fill = new cGridBag();
650	820
..	..	@@ -665,8 +835,11 @@
665	835	buttonGroup.add(radioButton);
666	836	radioButton.doClick();
667	837	}
	838	+
668	839	void SetupViews(ObjEditor oe)
669	840	{
	841	+ theFrame = this;
	842	+
670	843	oe.SetupViews();
671	844
672	845	System.out.println("SetupViews");
..	..	@@ -729,6 +902,7 @@
729	902	} else if(e.getSource() == liveCB)
730	903	{
731	904	cameraView.ToggleLive();
	905	+ refreshContents(false);
732	906	}
733	907	else if(e.getSource() == supportCB)
734	908	{
..	..	@@ -881,7 +1055,9 @@
881	1055	// objEditor.DropFile((java.io.File[]) object, true);
882	1056	// return;
883	1057	// }
884		- if (string.charAt(0) == '/')
	1058	+
	1059	+ // File path for Mac and Windows
	1060	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
885	1061	{
886	1062	// file(s)
887	1063	String[] names = string.split("\n");
..	..	@@ -908,7 +1084,7 @@
908	1084
909	1085	flashIt = false;
910	1086	CameraPane pane = (CameraPane) target;
911		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1087	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
912	1088	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
913	1089
914	1090	if (group.selection.size() == 1)
..	..	@@ -935,11 +1111,11 @@
935	1111	{
936	1112	loadClipboard(true);
937	1113	objEditor.jTree.setSelectionPath(destinationPath);
938		- pasteInto(false);
	1114	+ pasteInto(false, false);
939	1115	} else {
940	1116	loadClipboard(false);
941	1117	objEditor.jTree.setSelectionPath(destinationPath);
942		- pasteInto(false); // true); // ???
	1118	+ pasteInto(false, false); // true); // ???
943	1119	}
944	1120	}
945	1121	public void dropActionChanged(DropTargetDragEvent dtde)
..	..	@@ -1061,27 +1237,33 @@
1061	1237	kleinItem.addActionListener(this);
1062	1238	particleItem = menu.add(new MenuItem("Particle system"));
1063	1239	particleItem.addActionListener(this);
	1240	+ if (Globals.ADVANCED)
	1241	+ {
1064	1242	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1065	1243	ragdollItem.addActionListener(this);
1066	1244	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1067	1245	ragdoll2Item.addActionListener(this);
	1246	+ }
1068	1247	menu.add("-");
1069		- meshItem = menu.add(new MenuItem("Mesh"));
	1248	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1070	1249	meshItem.addActionListener(this);
1071	1250	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1072	1251	// meshGroupItem.addActionListener(this);
	1252	+ if (Globals.ADVANCED)
	1253	+ {
1073	1254	springItem = menu.add(new MenuItem("Spring"));
1074	1255	springItem.addActionListener(this);
1075	1256	flagItem = menu.add(new MenuItem("Flag"));
1076	1257	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	1258	blobItem = menu.add(new MenuItem("Blob"));
1082	1259	blobItem.addActionListener(this);
1083	1260	latheItem = menu.add(new MenuItem("Lathe"));
1084	1261	latheItem.addActionListener(this);
	1262	+ }
	1263	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1264	+ bezierItem.addActionListener(this);
	1265	+ overlayItem = menu.add(new MenuItem("Overlay"));
	1266	+ overlayItem.addActionListener(this);
1085	1267	lightItem = menu.add(new MenuItem("Light"));
1086	1268	lightItem.addActionListener(this);
1087	1269	menu.add("-");
..	..	@@ -1091,8 +1273,11 @@
1091	1273	loopItem.addActionListener(this);
1092	1274	doubleItem = menu.add(new MenuItem("Fork"));
1093	1275	doubleItem.addActionListener(this);
	1276	+ if (Globals.ADVANCED)
	1277	+ {
1094	1278	tripleItem = menu.add(new MenuItem("Trident"));
1095	1279	tripleItem.addActionListener(this);
	1280	+ }
1096	1281	}
1097	1282
1098	1283	void buildToolsMenu(Menu menu)
..	..	@@ -1106,24 +1291,26 @@
1106	1291	parseverticesItem.addActionListener(this);
1107	1292	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1108	1293	textureFieldItem.addActionListener(this);
1109		- alignItem = menu.add(new MenuItem("Align"));
	1294	+ alignItem = menu.add(new MenuItem("Align Objects"));
1110	1295	alignItem.addActionListener(this);
1111		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1112		- mirrorItem.addActionListener(this);
1113	1296	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1114	1297	reduceMorphItem.addActionListener(this);
1115	1298	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1116	1299	reduce34MorphItem.addActionListener(this);
1117		-
	1300	+ menu.add("-");
1118	1301	menu.add(computeAOItem = new MenuItem("Compute AO"));
1119	1302	computeAOItem.addActionListener(this);
1120		- menu.add("-");
1121	1303
	1304	+ if (Globals.ADVANCED)
	1305	+ {
	1306	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1307	+ mirrorItem.addActionListener(this);
	1308	+ menu.add("-");
1122	1309	menu.add(memoryItem = new MenuItem("Memory Usage"));
1123	1310	memoryItem.addActionListener(this);
1124	1311	menu.add(analyzeItem = new MenuItem("Analyze"));
1125	1312	analyzeItem.addActionListener(this);
1126		- menu.add(dumpItem = new MenuItem("Dump"));
	1313	+ menu.add(dumpItem = new MenuItem("Print"));
1127	1314	dumpItem.addActionListener(this);
1128	1315	// menu.add(pathItem = new MenuItem("From-to path"));
1129	1316	// pathItem.addActionListener(this);
..	..	@@ -1141,6 +1328,7 @@
1141	1328	menu.add("-");
1142	1329	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1143	1330	editScriptItem.addActionListener(this);
	1331	+ }
1144	1332	}
1145	1333
1146	1334	void ScreenFit()
..	..	@@ -1263,6 +1451,7 @@
1263	1451	shadow.material = new cMaterial(obj.material);
1264	1452	shadow.material.diffuse = 0.0001f;
1265	1453	shadow.material.specular = 0.0001f;
	1454	+ //shadow.projectedVertices[1].x = 300;
1266	1455
1267	1456	makeSomething(shadow);
1268	1457	}
..	..	@@ -1469,9 +1658,9 @@
1469	1658
1470	1659	void Overwrite(int mask)
1471	1660	{
1472		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1661	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1473	1662	{
1474		- Object3D content = GrafreeD.clipboard.get(0);
	1663	+ Object3D content = Grafreed.clipboard.get(0);
1475	1664
1476	1665	if (content instanceof cGroup && ((cGroup)content).transientlink )
1477	1666	content = ((cGroup)content).get(0);
..	..	@@ -1642,7 +1831,7 @@
1642	1831	{
1643	1832	makeSomething(new BezierSurface());
1644	1833	} else
1645		- if (source == checkerItem)
	1834	+ if (source == overlayItem)
1646	1835	{
1647	1836	/*
1648	1837	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1776,23 +1965,6 @@
1776	1965	csg.addChild(child);
1777	1966	child.addChild(csg);
1778	1967	} 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	1968	if (source == computeAOItem)
1797	1969	{
1798	1970	Globals.drawMode = CameraPane.OCCLUSION;
..	..	@@ -1811,7 +1983,7 @@
1811	1983	if (source == invariantsItem)
1812	1984	{
1813	1985	System.out.println("Invariants:");
1814		- GrafreeD.grafreeD.universe.invariants();
	1986	+ Grafreed.grafreeD.universe.invariants();
1815	1987	} else
1816	1988	if (source == memoryItem)
1817	1989	{
..	..	@@ -1829,6 +2001,35 @@
1829	2001	if (source == dumpItem)
1830	2002	{
1831	2003	DumpObject();
	2004	+ } else
	2005	+ if (source == minButton)
	2006	+ {
	2007	+ Minimize();
	2008	+ } else
	2009	+ if (source == maxButton)
	2010	+ {
	2011	+ Maximize();
	2012	+ } else
	2013	+ if (source == fullButton)
	2014	+ {
	2015	+ ToggleFullScreen();
	2016	+ } else
	2017	+ if (source == undoButton)
	2018	+ {
	2019	+ Undo();
	2020	+ } else
	2021	+ if (source == redoButton)
	2022	+ {
	2023	+ Redo();
	2024	+ } else
	2025	+ if (source == saveButton)
	2026	+ {
	2027	+ Save();
	2028	+ } else
	2029	+ if (source == oneStepButton)
	2030	+ {
	2031	+ Globals.ONESTEP = true;
	2032	+ cameraView.repaint();
1832	2033	} else
1833	2034	if (source == screenfitButton)
1834	2035	{
..	..	@@ -1879,12 +2080,20 @@
1879	2080	{
1880	2081	loadClipboard(true);
1881	2082	} else
	2083	+ if (source == undoItem)
	2084	+ {
	2085	+ Undo();
	2086	+ } else
	2087	+ if (source == redoItem)
	2088	+ {
	2089	+ Redo();
	2090	+ } else
1882	2091	if (source == duplicateItem)
1883	2092	{
1884		- Object3D keep = GrafreeD.clipboard;
	2093	+ Object3D keep = Grafreed.clipboard;
1885	2094	loadClipboard(false);
1886	2095	paste(false);
1887		- GrafreeD.clipboard = keep;
	2096	+ Grafreed.clipboard = keep;
1888	2097	} else
1889	2098	if (source == cloneItem)
1890	2099	{
..	..	@@ -1902,13 +2111,17 @@
1902	2111	{
1903	2112	paste(false);
1904	2113	} else
	2114	+ if (source == pasteIntoItem)
	2115	+ {
	2116	+ pasteInto(true, false);
	2117	+ } else
1905	2118	if (source == pasteLinkItem)
1906	2119	{
1907		- pasteInto(false);
	2120	+ pasteInto(false, false);
1908	2121	} else
1909	2122	if (source == pasteCloneItem)
1910	2123	{
1911		- pasteInto(true);
	2124	+ pasteInto(true, true);
1912	2125	} else
1913	2126	if (source == pasteExpandItem)
1914	2127	{
..	..	@@ -2100,9 +2313,9 @@
2100	2313	// group.selection.get(0).setMasterThis(content); // should be identity
2101	2314	// refreshContents();
2102	2315	// }
2103		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2316	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2104	2317	{
2105		- Object3D content = GrafreeD.clipboard.get(0);
	2318	+ Object3D content = Grafreed.clipboard.get(0);
2106	2319
2107	2320	if (content instanceof cGroup && ((cGroup)content).transientlink )
2108	2321	content = ((cGroup)content).get(0);
..	..	@@ -2110,11 +2323,11 @@
2110	2323	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2111	2324	for (int i=0; i<group.selection.size(); i++)
2112	2325	{
2113		- boolean random = CameraPane.RANDOM;
2114		- CameraPane.RANDOM = false; // parse all random nodes
	2326	+ boolean random = CameraPane.SWITCH;
	2327	+ CameraPane.SWITCH = false; // parse all random nodes
2115	2328	group.selection.get(i).linkVerticesThis(content);
2116	2329	// group.selection.get(i).setMasterThis(content); // should be identity
2117		- CameraPane.RANDOM = random;
	2330	+ CameraPane.SWITCH = random;
2118	2331	}
2119	2332	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2120	2333	refreshContents();
..	..	@@ -2124,20 +2337,20 @@
2124	2337	{
2125	2338	for (int i=0; i<group.selection.size(); i++)
2126	2339	{
2127		- boolean random = CameraPane.RANDOM;
2128		- CameraPane.RANDOM = false; // parse all random nodes
	2340	+ boolean random = CameraPane.SWITCH;
	2341	+ CameraPane.SWITCH = false; // parse all random nodes
2129	2342	group.selection.get(i).linkVerticesThis(null);
2130		- CameraPane.RANDOM = random;
	2343	+ CameraPane.SWITCH = random;
2131	2344	}
2132	2345
2133	2346	refreshContents();
2134	2347	} else
2135	2348	if (source == relinkverticesItem)
2136	2349	{
2137		- boolean random = CameraPane.RANDOM;
2138		- CameraPane.RANDOM = false; // parse all random nodes
	2350	+ boolean random = CameraPane.SWITCH;
	2351	+ CameraPane.SWITCH = false; // parse all random nodes
2139	2352	group.selection.RelinkToSupport();
2140		- CameraPane.RANDOM = random;
	2353	+ CameraPane.SWITCH = random;
2141	2354
2142	2355	refreshContents();
2143	2356	} else
..	..	@@ -2152,9 +2365,9 @@
2152	2365	} else
2153	2366	if (source == setMasterItem)
2154	2367	{
2155		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2368	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2156	2369	{
2157		- Object3D content = GrafreeD.clipboard.get(0);
	2370	+ Object3D content = Grafreed.clipboard.get(0);
2158	2371
2159	2372	if (content instanceof cGroup && ((cGroup)content).transientlink )
2160	2373	content = ((cGroup)content).get(0);
..	..	@@ -2167,9 +2380,9 @@
2167	2380	{
2168	2381	if (group.selection.size() == 1)
2169	2382	{
2170		- if (GrafreeD.clipboard.size() == 1)
	2383	+ if (Grafreed.clipboard.size() == 1)
2171	2384	{
2172		- Object3D content = GrafreeD.clipboard.get(0);
	2385	+ Object3D content = Grafreed.clipboard.get(0);
2173	2386
2174	2387	if (content instanceof cGroup && ((cGroup)content).transientlink )
2175	2388	content = ((cGroup)content).get(0);
..	..	@@ -2186,7 +2399,7 @@
2186	2399	{
2187	2400	RevertMeshes();
2188	2401	} else
2189		- if (source == resetMeshItem)
	2402	+ if (source == resetAllItem)
2190	2403	{
2191	2404	ResetAll();
2192	2405	} else
..	..	@@ -2374,7 +2587,7 @@
2374	2587	} else
2375	2588	if (source == genNormalsMESHItem)
2376	2589	{
2377		- GenNormals(true); // TODO
	2590	+ GenNormalsMESH();
2378	2591	} else
2379	2592	if (source == genNormalsORGANItem)
2380	2593	{
..	..	@@ -2439,6 +2652,22 @@
2439	2652	if (source == unmarkleavesItem)
2440	2653	{
2441	2654	MarkLeaves(false);
	2655	+ } else
	2656	+ if (source == rewindleavesItem)
	2657	+ {
	2658	+ RewindLeaves(true);
	2659	+ } else
	2660	+ if (source == unrewindleavesItem)
	2661	+ {
	2662	+ RewindLeaves(false);
	2663	+ } else
	2664	+ if (source == randomleavesItem)
	2665	+ {
	2666	+ RandomLeaves(true);
	2667	+ } else
	2668	+ if (source == unrandomleavesItem)
	2669	+ {
	2670	+ RandomLeaves(false);
2442	2671	} else
2443	2672	if (source == flipVItem)
2444	2673	{
..	..	@@ -2524,9 +2753,13 @@
2524	2753	{
2525	2754	SmoothMesh();
2526	2755	} else
2527		- if (source == transformgeometryItem)
	2756	+ if (source == transformGeometryItem)
2528	2757	{
2529	2758	TransformGeometry();
	2759	+ } else
	2760	+ if (source == transformChildrenItem)
	2761	+ {
	2762	+ TransformChildren();
2530	2763	} else
2531	2764	if (source == resetTransformItem)
2532	2765	{
..	..	@@ -2534,7 +2767,11 @@
2534	2767	} else
2535	2768	if (source == resetCentroidItem)
2536	2769	{
2537		- ResetCentroid();
	2770	+ ResetCentroid(true);
	2771	+ } else
	2772	+ if (source == resetCentroidXZItem)
	2773	+ {
	2774	+ ResetCentroid(false);
2538	2775	} else
2539	2776	if (source == resetParentItem)
2540	2777	{
..	..	@@ -2698,6 +2935,24 @@
2698	2935	bigThree.ClearUI();
2699	2936	bigThree.add(centralPanel);
2700	2937	bigThree.FlushUI();
	2938	+
	2939	+ cameraView.requestFocusInWindow();
	2940	+
	2941	+// refreshContents(true);
	2942	+//
	2943	+// try
	2944	+// {
	2945	+// java.awt.Robot bot = new java.awt.Robot();
	2946	+// int mask = InputEvent.BUTTON1_MASK;
	2947	+// bot.mouseMove(100, 100);
	2948	+// bot.mousePress(mask);
	2949	+// bot.mouseRelease(mask);
	2950	+// }
	2951	+// catch (Exception e)
	2952	+// {
	2953	+//
	2954	+// }
	2955	+
2701	2956	} else
2702	2957	if (source == threeButton)
2703	2958	{
..	..	@@ -2734,6 +2989,8 @@
2734	2989	bigThree.add(centralPanel);
2735	2990	bigThree.add(XYZPanel);
2736	2991	bigThree.FlushUI();
	2992	+
	2993	+ cameraView.requestFocusInWindow();
2737	2994	} else
2738	2995	if (source == fourButton)
2739	2996	{
..	..	@@ -2769,6 +3026,8 @@
2769	3026	bigThree.ClearUI();
2770	3027	bigThree.add(scenePanel);
2771	3028	bigThree.FlushUI();
	3029	+
	3030	+ cameraView.requestFocusInWindow();
2772	3031	} else
2773	3032	if (source == sixButton)
2774	3033	{
..	..	@@ -2805,6 +3064,8 @@
2805	3064	bigThree.add(scenePanel);
2806	3065	bigThree.add(centralPanel);
2807	3066	bigThree.FlushUI();
	3067	+
	3068	+ cameraView.requestFocusInWindow();
2808	3069	} else
2809	3070	if (source == sevenButton)
2810	3071	{
..	..	@@ -2842,6 +3103,8 @@
2842	3103	bigThree.add(centralPanel);
2843	3104	bigThree.add(XYZPanel);
2844	3105	bigThree.FlushUI();
	3106	+
	3107	+ cameraView.requestFocusInWindow();
2845	3108	} else
2846	3109	if (source == rootButton)
2847	3110	{
..	..	@@ -2853,6 +3116,7 @@
2853	3116	EditObject(obj);
2854	3117	}
2855	3118
	3119	+ cameraView.requestFocusInWindow();
2856	3120	refreshContents(true);
2857	3121	} else
2858	3122	if (source == closeButton)
..	..	@@ -2874,6 +3138,8 @@
2874	3138	break;
2875	3139	}
2876	3140	}
	3141	+
	3142	+ cameraView.requestFocusInWindow();
2877	3143	refreshContents(true);
2878	3144	} else
2879	3145	if (source == editItem \|\| source == editButton)
..	..	@@ -2890,7 +3156,7 @@
2890	3156	child.CloseUI();
2891	3157	listUI.remove(child);
2892	3158
2893		- child.editWindow = null; // ???????????
	3159	+ //child.editWindow = null; // ???????????
2894	3160	}
2895	3161	objEditor.ctrlPanel.FlushUI();
2896	3162	//objEditor.jTree.clearSelection();
..	..	@@ -2976,7 +3242,10 @@
2976	3242	frontView.object = group;
2977	3243	sideView.object = group;
2978	3244	}
2979		- group.editWindow = this;
	3245	+
	3246	+// fix "+" issue
	3247	+ //group.editWindow = this;
	3248	+
2980	3249	/*
2981	3250	currentLayout = radio.layout;
2982	3251	if (currentLayout == null)
..	..	@@ -2988,8 +3257,23 @@
2988	3257	//group.parent = null; // ROOT
2989	3258	//group.attributes = -1;
2990	3259	ResetModel();
	3260	+
	3261	+ cameraView.requestFocusInWindow();
2991	3262	refreshContents(true);
2992		- }
	3263	+ } else if (event.getSource() == editCameraItem)
	3264	+ {
	3265	+ cameraView.ProtectCamera();
	3266	+ cameraView.repaint();
	3267	+ return;
	3268	+ } else if (event.getSource() == revertCameraItem)
	3269	+ {
	3270	+ cameraView.RevertCamera();
	3271	+ cameraView.repaint();
	3272	+ return;
	3273	+ // } else if (event.getSource() == textureButton)
	3274	+ // {
	3275	+ // return; // true;
	3276	+ }
2993	3277	else
2994	3278	{
2995	3279	//return super.action(event, arg);
..	..	@@ -2998,7 +3282,6 @@
2998	3282	}
2999	3283
3000	3284	boolean useclient = false;
3001		- cRadio radio;
3002	3285
3003	3286	void ToggleRoot()
3004	3287	{
..	..	@@ -3050,6 +3333,28 @@
3050	3333	refreshContents();
3051	3334	}
3052	3335
	3336	+ void TransformChildren()
	3337	+ {
	3338	+ Object3D obj;
	3339	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3340	+ {
	3341	+ obj = (Object3D)e.nextElement();
	3342	+ obj.KeepTextureMatrices();
	3343	+ obj.TransformChildren();
	3344	+ obj.RestoreTextureMatrices();
	3345	+
	3346	+// if (obj.parent == null)
	3347	+// {
	3348	+// System.out.println("NULL PARENT!");
	3349	+// new Exception().printStackTrace();
	3350	+// }
	3351	+// else
	3352	+// TouchTransform(obj);
	3353	+// //obj.parent.Touch();
	3354	+ }
	3355	+
	3356	+ refreshContents();
	3357	+ }
3053	3358
3054	3359	void ResetTransform()
3055	3360	{
..	..	@@ -3162,7 +3467,7 @@
3162	3467	refreshContents();
3163	3468	}
3164	3469
3165		- void ResetCentroid()
	3470	+ void ResetCentroid(boolean full)
3166	3471	{
3167	3472	Object3D obj;
3168	3473	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3177,12 +3482,16 @@
3177	3482	LA.matIdentity(Object3D.mat);
3178	3483	obj.getBounds(minima, maxima, false);
3179	3484	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3180		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3485	+ if (full)
	3486	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3181	3487	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3182	3488	obj.TransformMesh(Object3D.mat);
	3489	+
3183	3490	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3184		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3491	+ if (full)
	3492	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3185	3493	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3494	+
3186	3495	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3187	3496	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3188	3497	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3211,7 +3520,8 @@
3211	3520
3212	3521	int size = obj.MemorySize();
3213	3522
3214		- System.err.println((size/1024) + " KB is the size of " + obj);
	3523	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3524	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3215	3525	}
3216	3526	}
3217	3527	catch (Exception e)
..	..	@@ -3248,9 +3558,9 @@
3248	3558	obj = (Object3D)e.nextElement();
3249	3559
3250	3560	System.out.println("Object is: " + obj);
3251		- GrafreeD.AnalyzeObject(obj);
	3561	+ Grafreed.AnalyzeObject(obj);
3252	3562	System.out.println("Boundary rep: " + obj.bRep);
3253		- GrafreeD.AnalyzeObject(obj.bRep);
	3563	+ Grafreed.AnalyzeObject(obj.bRep);
3254	3564
3255	3565	// System.err.println((size/1024) + " KB is the size of " + obj);
3256	3566	}
..	..	@@ -3292,6 +3602,13 @@
3292	3602	void GenNormals(boolean crease)
3293	3603	{
3294	3604	group.GenNormalsS(crease);
	3605	+
	3606	+ refreshContents();
	3607	+ }
	3608	+
	3609	+ void GenNormalsMESH()
	3610	+ {
	3611	+ group.GenNormalsMeshS();
3295	3612
3296	3613	refreshContents();
3297	3614	}
..	..	@@ -3464,8 +3781,8 @@
3464	3781
3465	3782	void ParseVertices()
3466	3783	{
3467		- boolean epsequal = GrafreeD.epsequal;
3468		- GrafreeD.epsequal = true;
	3784	+ boolean epsequal = Grafreed.epsequal;
	3785	+ Grafreed.epsequal = true;
3469	3786
3470	3787	for (int i=0; i<group.selection.size(); i++)
3471	3788	{
..	..	@@ -3490,7 +3807,7 @@
3490	3807	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3491	3808	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3492	3809
3493		- g.add(GrafreeD.clipboard);
	3810	+ g.add(Grafreed.clipboard);
3494	3811
3495	3812	buffer.add(g);
3496	3813	}
..	..	@@ -3505,7 +3822,7 @@
3505	3822	makeSomething(buffer, i==group.selection.size()-1);
3506	3823	}
3507	3824
3508		- GrafreeD.epsequal = epsequal;
	3825	+ Grafreed.epsequal = epsequal;
3509	3826
3510	3827	refreshContents();
3511	3828	}
..	..	@@ -3523,7 +3840,16 @@
3523	3840	String pigment = Object3D.GetPigment(tex);
3524	3841	//String bump = Object3D.GetBump(tex);
3525	3842
3526		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3843	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	3844	+
	3845	+ try
	3846	+ {
	3847	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3848	+ }
	3849	+ catch (Exception e)
	3850	+ {
	3851	+ System.err.println("FAIL: " + node);
	3852	+ }
3527	3853
3528	3854	double s = v.s;
3529	3855
..	..	@@ -3611,11 +3937,11 @@
3611	3937
3612	3938	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3613	3939
3614		- boolean random = CameraPane.RANDOM;
3615		- CameraPane.RANDOM = false; // parse all random nodes
	3940	+ boolean random = CameraPane.SWITCH;
	3941	+ CameraPane.SWITCH = false; // parse all random nodes
3616	3942	lowres.linkVerticesThis(null);
3617	3943	lowres.linkVerticesThis(sn);
3618		- CameraPane.RANDOM = random;
	3944	+ CameraPane.SWITCH = random;
3619	3945
3620	3946	System.err.flush();
3621	3947
..	..	@@ -3655,7 +3981,7 @@
3655	3981	return;
3656	3982
3657	3983	Object3D poses = group.selection.get(0);
3658		- Object3D ref = GrafreeD.clipboard.get(0);
	3984	+ Object3D ref = Grafreed.clipboard.get(0);
3659	3985
3660	3986	Object3D newgroup = new Object3D("Po:" + poses.name);
3661	3987
..	..	@@ -3849,9 +4175,9 @@
3849	4175
3850	4176	void ClipMesh()
3851	4177	{
3852		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4178	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3853	4179	{
3854		- Object3D content = GrafreeD.clipboard.get(0);
	4180	+ Object3D content = Grafreed.clipboard.get(0);
3855	4181
3856	4182	if (content instanceof cGroup && ((cGroup)content).transientlink )
3857	4183	content = ((cGroup)content).get(0);
..	..	@@ -3860,7 +4186,7 @@
3860	4186	// {
3861	4187	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3862	4188	// }
3863		- group.selection.ClipMesh(GrafreeD.clipboard);
	4189	+ group.selection.ClipMesh(Grafreed.clipboard);
3864	4190	}
3865	4191	// group.selection.ClipMesh(GrafreeD.clipboard);
3866	4192	System.out.println("DONE.");
..	..	@@ -3907,6 +4233,18 @@
3907	4233	void MarkLeaves(boolean hide)
3908	4234	{
3909	4235	group.selection.MarkLeaves(hide);
	4236	+ refreshContents();
	4237	+ }
	4238	+
	4239	+ void RewindLeaves(boolean hide)
	4240	+ {
	4241	+ group.selection.RewindLeaves(hide);
	4242	+ refreshContents();
	4243	+ }
	4244	+
	4245	+ void RandomLeaves(boolean hide)
	4246	+ {
	4247	+ group.selection.RandomLeaves(hide);
3910	4248	refreshContents();
3911	4249	}
3912	4250
..	..	@@ -3995,7 +4333,7 @@
3995	4333	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3996	4334
3997	4335	Object3D elem = (Object3D)group.selection.elementAt(i);
3998		- if(elem != group)
	4336	+ if(elem != group \|\| !newWindow)
3999	4337	{
4000	4338	// if (!(elem instanceof Composite))
4001	4339	// newWindow = false;
..	..	@@ -4085,7 +4423,6 @@
4085	4423	//case 702: // Event.LIST_DESELECT
4086	4424	group.deselectAll();
4087	4425	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4088		- objEditor.ClearInfo(); // .GetMaterial());
4089	4426	if (tps != null)
4090	4427	{
4091	4428	for (int i=0; i < tps.length; i++)
..	..	@@ -4094,10 +4431,8 @@
4094	4431
4095	4432	//if (child.parent != null)
4096	4433	//child.parent.addSelectee(child);
	4434	+ objEditor.SetMaterial(child);
4097	4435	group.addSelectee(child);
4098		- objEditor.SetMaterial(child); // .GetMaterial());
4099		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4100		- System.err.println("info : " + child.GetPath());
4101	4436	}
4102	4437	}
4103	4438	// else
..	..	@@ -4107,16 +4442,17 @@
4107	4442	// System.err.println("info : " + group.GetPath());
4108	4443	// }
4109	4444
4110		- objEditor.SetText(); // jan 2014
4111		-
4112		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4445	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4113	4446	CameraPane.flash = true;
4114	4447
4115		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4448	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4116	4449	// a camera
4117	4450	{
4118		- CameraPane.camerachangeframe = 0; // don't refuse it
4119		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4451	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4452	+ {
	4453	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4454	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4455	+ }
4120	4456	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4121	4457	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4122	4458	}
..	..	@@ -4129,6 +4465,26 @@
4129	4465
4130	4466	freezemodel = false;
4131	4467	}
	4468	+
	4469	+ void refreshContents(boolean cp)
	4470	+ {
	4471	+ if (!Globals.MOUSEDRAGGED)
	4472	+ {
	4473	+ objEditor.ClearInfo(); // .GetMaterial());
	4474	+
	4475	+ for (int i=0; i < group.selection.Size(); i++)
	4476	+ {
	4477	+ Object3D child = (Object3D) group.selection.get(i);
	4478	+
	4479	+ objEditor.AddInfo(child, this, true);
	4480	+ System.err.println("info : " + child.GetPath());
	4481	+ }
	4482	+
	4483	+ objEditor.SetText(); // jan 2014
	4484	+ }
	4485	+
	4486	+ super.refreshContents(cp);
	4487	+ }
4132	4488
4133	4489	void linkSomething(Object3D thing)
4134	4490	{
..	..	@@ -4200,16 +4556,18 @@
4200	4556	{
4201	4557	if (group.selection.isEmpty())
4202	4558	return;
4203		- GrafreeD.clipboardIsTempGroup = false;
	4559	+
	4560	+ Grafreed.clipboardIsTempGroup = false;
4204	4561	Composite tGroup = null;
4205	4562	if (group.selection.size() > 0) // 1)
4206	4563	{
4207	4564	tGroup = new cGroup();
4208		- GrafreeD.clipboardIsTempGroup = true;
	4565	+ Grafreed.clipboardIsTempGroup = true;
4209	4566	}
4210	4567
4211	4568	if (cut)
4212	4569	{
	4570	+ Save();
4213	4571	//int indices[] = jList.getSelectedIndices();
4214	4572	//for (int i = indices.length - 1; i >= 0; i--)
4215	4573	//jList.remove(indices[i]);
..	..	@@ -4245,16 +4603,16 @@
4245	4603	//System.out.println("cut " + child);
4246	4604	//System.out.println("parent = " + child.parent);
4247	4605	// tmp.addChild(child);
4248		- if (GrafreeD.clipboardIsTempGroup)
	4606	+ if (Grafreed.clipboardIsTempGroup)
4249	4607	tGroup.add/Child/(tmp);
4250	4608	else
4251		- GrafreeD.clipboard = tmp;
	4609	+ Grafreed.clipboard = tmp;
4252	4610	}
4253	4611	else
4254		- if (GrafreeD.clipboardIsTempGroup)
	4612	+ if (Grafreed.clipboardIsTempGroup)
4255	4613	tGroup.add/Child/(child);
4256	4614	else
4257		- GrafreeD.clipboard = child;
	4615	+ Grafreed.clipboard = child;
4258	4616	}
4259	4617
4260	4618	//ResetModel();
..	..	@@ -4286,21 +4644,23 @@
4286	4644	//System.out.println("cut " + elem);
4287	4645	//System.out.println("parent = " + elem.parent);
4288	4646	// tmp.addChild(elem);
4289		- if (GrafreeD.clipboardIsTempGroup)
	4647	+ if (Grafreed.clipboardIsTempGroup)
4290	4648	tGroup.add/Child/(tmp);
4291	4649	else
4292		- GrafreeD.clipboard = tmp;
	4650	+ Grafreed.clipboard = tmp;
4293	4651	}
4294	4652	else
4295		- if (GrafreeD.clipboardIsTempGroup)
	4653	+ if (Grafreed.clipboardIsTempGroup)
4296	4654	tGroup.add/Child/(child);
4297	4655	else
4298		- GrafreeD.clipboard = child;
	4656	+ Grafreed.clipboard = child;
4299	4657	}
4300	4658
4301	4659	}
4302		- if (GrafreeD.clipboardIsTempGroup)
4303		- GrafreeD.clipboard = tGroup;
	4660	+
	4661	+ if (Grafreed.clipboardIsTempGroup)
	4662	+ Grafreed.clipboard = tGroup;
	4663	+
4304	4664	if (cut)
4305	4665	{
4306	4666	ResetModel();
..	..	@@ -4314,7 +4674,7 @@
4314	4674	// return;
4315	4675	boolean first = true;
4316	4676
4317		- if (GrafreeD.clipboardIsTempGroup)
	4677	+ if (Grafreed.clipboardIsTempGroup)
4318	4678	{
4319	4679	Composite temp;
4320	4680
..	..	@@ -4325,7 +4685,7 @@
4325	4685	temp = (Composite)Applet3D.clipboard.deepCopy();
4326	4686	*/
4327	4687	Object3D elem;
4328		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4688	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4329	4689	{
4330	4690	Object3D child = (Object3D)e.nextElement();
4331	4691
..	..	@@ -4359,21 +4719,21 @@
4359	4719	//Object3D cb = Applet3D.clipboard;
4360	4720	//temp.addChild(cb);
4361	4721	//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());
	4722	+ assert(Grafreed.clipboard.parent == null);
	4723	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4724	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4725	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4726	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4367	4727	else
4368		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4369		- GrafreeD.clipboard.get(0).parent = keepparent;
	4728	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4729	+ Grafreed.clipboard.get(0).parent = keepparent;
4370	4730	}
4371	4731
4372	4732	ResetModel();
4373	4733	refreshContents();
4374	4734	}
4375	4735
4376		- void pasteInto(boolean copyit)
	4736	+ void pasteInto(boolean copyit, boolean clone)
4377	4737	{
4378	4738	// if (GrafreeD.clipboard == null)
4379	4739	// return;
..	..	@@ -4402,15 +4762,22 @@
4402	4762	if (copyit)
4403	4763	{
4404	4764	// paste(false);
4405		- CloneClipboard(false); // sept 2014
	4765	+ if (clone)
	4766	+ {
	4767	+ CloneClipboard(false); // sept 2014
	4768	+ }
	4769	+ else
	4770	+ {
	4771	+ paste(false);
	4772	+ }
4406	4773	}
4407	4774	else
4408	4775	{
4409	4776	boolean first = true;
4410	4777
4411		- if (GrafreeD.clipboardIsTempGroup)
	4778	+ if (Grafreed.clipboardIsTempGroup)
4412	4779	{
4413		- Composite temp = (Composite)GrafreeD.clipboard;
	4780	+ Composite temp = (Composite)Grafreed.clipboard;
4414	4781	Object3D copy;
4415	4782	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4416	4783	{
..	..	@@ -4420,7 +4787,7 @@
4420	4787	}
4421	4788	} else
4422	4789	{
4423		- linkSomething(GrafreeD.clipboard); //.get(0));
	4790	+ linkSomething(Grafreed.clipboard); //.get(0));
4424	4791	}
4425	4792	}
4426	4793	}
..	..	@@ -4825,21 +5192,6 @@
4825	5192	}
4826	5193	*/
4827	5194
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	5195	/*
4844	5196	public void Callback(Object obj)
4845	5197	{
..	..	@@ -4863,26 +5215,9 @@
4863	5215	}
4864	5216	*/
4865	5217
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	5218	String GetFile(String dialogName)
4884	5219	{
4885		- if (GrafreeD.standAlone)
	5220	+ if (Grafreed.standAlone)
4886	5221	{
4887	5222	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4888	5223	browser.show();
..	..	@@ -4950,6 +5285,14 @@
4950	5285	cButton clearpanelButton;
4951	5286	cButton unselectButton;
4952	5287
	5288	+ cButton minButton;
	5289	+ cButton maxButton;
	5290	+ cButton fullButton;
	5291	+ cButton undoButton;
	5292	+ cButton redoButton;
	5293	+ cButton saveButton;
	5294	+ cButton oneStepButton;
	5295	+
4953	5296	cButton screenfitButton;
4954	5297	cButton screenfitpointButton;
4955	5298	cButton snapobjectButton;
..	..	@@ -4960,14 +5303,6 @@
4960	5303	cButton closeButton;
4961	5304
4962	5305	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	5306
4972	5307	//
4973	5308	//Composite
..	..	@@ -4980,6 +5315,8 @@
4980	5315	private MenuItem lookFromItem;
4981	5316	private MenuItem switchItem;
4982	5317	private MenuItem cutItem;
	5318	+ private MenuItem undoItem;
	5319	+ private MenuItem redoItem;
4983	5320	private MenuItem duplicateItem;
4984	5321	private MenuItem cloneItem;
4985	5322	private MenuItem cloneSupportItem;
..	..	@@ -4993,7 +5330,7 @@
4993	5330	private MenuItem linkverticesItem;
4994	5331	private MenuItem relinkverticesItem;
4995	5332	private MenuItem setMasterItem;
4996		- private MenuItem resetMeshItem;
	5333	+ private MenuItem resetAllItem;
4997	5334	private MenuItem stepAllItem;
4998	5335	private MenuItem revertMeshItem;
4999	5336	private MenuItem poseMeshItem;
..	..	@@ -5004,6 +5341,7 @@
5004	5341	private MenuItem mergeGeometriesItem;
5005	5342	private MenuItem copyItem;
5006	5343	private MenuItem pasteItem;
	5344	+ private MenuItem pasteIntoItem;
5007	5345	private MenuItem pasteLinkItem;
5008	5346	private MenuItem pasteCloneItem;
5009	5347	private MenuItem pasteExpandItem;
..	..	@@ -5042,6 +5380,10 @@
5042	5380	private MenuItem showleavesItem;
5043	5381	private MenuItem markleavesItem;
5044	5382	private MenuItem unmarkleavesItem;
	5383	+ private MenuItem rewindleavesItem;
	5384	+ private MenuItem unrewindleavesItem;
	5385	+ private MenuItem randomleavesItem;
	5386	+ private MenuItem unrandomleavesItem;
5045	5387
5046	5388	private MenuItem flipVItem;
5047	5389	private MenuItem unflipVItem;
..	..	@@ -5053,8 +5395,10 @@
5053	5395	private MenuItem panoTexturesItem;
5054	5396
5055	5397	private MenuItem resetCentroidItem;
5056		- private MenuItem transformgeometryItem;
	5398	+ private MenuItem resetCentroidXZItem;
5057	5399	private MenuItem resetTransformItem;
	5400	+ private MenuItem transformGeometryItem;
	5401	+ private MenuItem transformChildrenItem;
5058	5402	private MenuItem hideItem;
5059	5403	private MenuItem grabItem;
5060	5404	private MenuItem backItem;
..	..	@@ -5101,7 +5445,7 @@
5101	5445	private MenuItem blobItem;
5102	5446	private MenuItem latheItem;
5103	5447	private MenuItem bezierItem;
5104		- private MenuItem checkerItem;
	5448	+ private MenuItem overlayItem;
5105	5449	private MenuItem meshItem;
5106	5450	// private MenuItem meshGroupItem;
5107	5451	private MenuItem springItem;
..	..	@@ -5123,11 +5467,6 @@
5123	5467	private MenuItem doubleItem;
5124	5468	private MenuItem tripleItem;
5125	5469
5126		- private MenuItem importGFDItem;
5127		- private MenuItem importVRMLX3DItem;
5128		- private MenuItem import3DSItem;
5129		- private MenuItem importOBJItem;
5130		-
5131	5470	private MenuItem computeAOItem;
5132	5471	private MenuItem recompileItem;
5133	5472	private MenuItem editScriptItem;
..	..	@@ -5137,4 +5476,8 @@
5137	5476	private MenuItem analyzeItem;
5138	5477	private MenuItem dumpItem;
5139	5478	//boolean freezemodel = false;
	5479	+
	5480	+ Menu cameraMenu;
	5481	+ MenuItem editCameraItem;
	5482	+ MenuItem revertCameraItem;
5140	5483	}