~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,131 @@
148	148
149	149	//JTextField nameField;
150	150
151		- void SetupMenu2(ObjEditor oe)
	151	+ void SetupMenu2(GroupEditor oe)
152	152	{
	153	+ oe.jTree = new cTree();
	154	+
	155	+ Menu menu;
	156	+ oe.menuBar.add(menu = new Menu("Edit"));
	157	+ //editItem = menu.add(new MenuItem("Edit"));
	158	+ //editItem.addActionListener(this);
	159	+
	160	+// undoItem = menu.add(new MenuItem("Undo"));
	161	+// undoItem.addActionListener(this);
	162	+// redoItem = menu.add(new MenuItem("Redo"));
	163	+// redoItem.addActionListener(this);
	164	+// menu.add("-");
	165	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
	166	+ duplicateItem.addActionListener(this);
	167	+ cloneItem = menu.add(new MenuItem("Clone"));
	168	+ cloneItem.addActionListener(this);
	169	+ if (Globals.ADVANCED)
	170	+ {
	171	+ cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
	172	+ cloneSupportItem.addActionListener(this);
	173	+ }
	174	+ menu.add("-");
	175	+ cutItem = menu.add(new MenuItem("Cut"));
	176	+ cutItem.addActionListener(this);
	177	+ copyItem = menu.add(new MenuItem("Copy"));
	178	+ copyItem.addActionListener(this);
	179	+ pasteItem = menu.add(new MenuItem("Paste"));
	180	+ pasteItem.addActionListener(this);
	181	+
	182	+ menu.add("-");
	183	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	184	+ pasteIntoItem.addActionListener(this);
	185	+ pasteLinkItem = menu.add(new MenuItem("Paste link"));
	186	+ pasteLinkItem.addActionListener(this);
	187	+ pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	188	+ pasteCloneItem.addActionListener(this);
	189	+// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	190	+// pasteExpandItem.addActionListener(this);
	191	+ menu.add("-");
	192	+ clearItem = menu.add(new MenuItem("Clear"));
	193	+ clearItem.addActionListener(this);
	194	+
	195	+ if (Globals.ADVANCED)
	196	+ {
	197	+ // Deletes the cameras...
	198	+ clearAllItem = menu.add(new MenuItem("Clear All"));
	199	+ clearAllItem.addActionListener(this);
	200	+ }
	201	+
	202	+ menuBar.add(cameraMenu = new Menu("View"));
	203	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	204	+ //zBufferItem.addActionListener(this);
	205	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	206	+ //normalLensItem.addActionListener(this);
	207	+ cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
	208	+ revertCameraItem.addActionListener(this);
	209	+
	210	+ cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	211	+ toggleFullScreenItem.addItemListener(this);
	212	+ toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	213	+ cameraMenu.add("-");
	214	+
	215	+ cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	216	+ toggleTextureItem.addItemListener(this);
	217	+ toggleTextureItem.setState(CameraPane.textureon);
	218	+
	219	+ cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	220	+ toggleSwitchItem.addItemListener(this);
	221	+ toggleSwitchItem.setState(CameraPane.SWITCH);
	222	+
	223	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	224	+ toggleHandleItem.addItemListener(this);
	225	+ toggleHandleItem.setState(CameraPane.HANDLES);
	226	+
	227	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	228	+ togglePaintItem.addItemListener(this);
	229	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	230	+
	231	+ if (Globals.ADVANCED)
	232	+ {
	233	+ cameraMenu.add("-");
	234	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	235	+ toggleLiveItem.addItemListener(this);
	236	+ toggleLiveItem.setState(Globals.isLIVE());
	237	+
	238	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	239	+ stepItem.addActionListener(this);
	240	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	241	+ // toggleDLItem.addItemListener(this);
	242	+ // toggleDLItem.setState(false);
	243	+
	244	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	245	+ toggleRenderItem.addItemListener(this);
	246	+ toggleRenderItem.setState(!CameraPane.frozen);
	247	+
	248	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	249	+ toggleDebugItem.addItemListener(this);
	250	+ toggleDebugItem.setState(Globals.DEBUG);
	251	+
	252	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	253	+ toggleFrustumItem.addItemListener(this);
	254	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	255	+
	256	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	257	+ toggleFootContactItem.addItemListener(this);
	258	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	259	+
	260	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	261	+ toggleTimelineItem.addItemListener(this);
	262	+ }
	263	+
	264	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	265	+// toggleRootItem.addItemListener(this);
	266	+// toggleRootItem.setState(false);
	267	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	268	+// animationItem.addItemListener(this);
	269	+// animationItem.setState(CameraPane.ANIMATION);
	270	+ cameraMenu.add("-");
	271	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	272	+ editCameraItem.addActionListener(this);
	273	+
	274	+ if (Globals.ADVANCED)
	275	+ {
153	276	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
154	277	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
155	278	//cameraMenu.add(switchItem = new MenuItem("Reverse View"));
..	..	@@ -161,45 +284,17 @@
161	284	lookAtItem.addActionListener(this);
162	285	//lookFromItem.addActinoListener(this);
163	286	//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		-
	287	+ }
	288	+
193	289	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);
	290	+ if (Globals.ADVANCED)
	291	+ {
198	292	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
199	293	revertMeshItem.addActionListener(this);
200	294	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
201	295	resetreferencesItem.addActionListener(this);
202	296	menu.add("-");
	297	+ }
203	298	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
204	299	overwriteGeoItem.addActionListener(this);
205	300	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -211,19 +306,26 @@
211	306	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
212	307	overwriteUVItem.addActionListener(this);
213	308	menu.add("-");
	309	+ if (Globals.ADVANCED)
	310	+ {
214	311	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
215	312	generateMeshItem.addActionListener(this);
216	313	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
217	314	poseMeshItem.addActionListener(this);
218	315	menu.add("-");
	316	+ }
219	317	resetsupportItem = menu.add(new MenuItem("Reset support"));
220	318	resetsupportItem.addActionListener(this);
221	319	linkverticesItem = menu.add(new MenuItem("Link to Support"));
222	320	linkverticesItem.addActionListener(this);
223	321	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
224	322	relinkverticesItem.addActionListener(this);
	323	+
	324	+ if (Globals.ADVANCED)
	325	+ {
225	326	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
226	327	setMasterItem.addActionListener(this);
	328	+ }
227	329
228	330	oe.menuBar.add(menu = new Menu("Group"));
229	331	grabItem = menu.add(new MenuItem("Grab"));
..	..	@@ -234,27 +336,38 @@
234	336	frontItem.addActionListener(this);
235	337	compositeItem = menu.add(new MenuItem("Composite"));
236	338	compositeItem.addActionListener(this);
237		- hideItem = menu.add(new MenuItem("Hide"));
	339	+
	340	+ if (Globals.ADVANCED)
	341	+ {
	342	+ hideItem = menu.add(new MenuItem("Hidden Group"));
238	343	hideItem.addActionListener(this);
	344	+ }
239	345	ungroupItem = menu.add(new MenuItem("Ungroup"));
240	346	ungroupItem.addActionListener(this);
	347	+
241	348	menu.add("-");
242		- randomItem = menu.add(new MenuItem("Random"));
	349	+
	350	+ randomItem = menu.add(new MenuItem("Switch node"));
243	351	randomItem.addActionListener(this);
244		- physicsItem = menu.add(new MenuItem("Physics"));
245		- physicsItem.addActionListener(this);
246		- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
247		- frameselectorItem.addActionListener(this);
	352	+ if (Globals.ADVANCED)
	353	+ {
248	354	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
249	355	switchGeoItem.addActionListener(this);
250	356	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
251	357	switchTransfoItem.addActionListener(this);
252		- morphItem = menu.add(new MenuItem("Morph"));
	358	+ morphItem = menu.add(new MenuItem("Morph Group"));
253	359	morphItem.addActionListener(this);
	360	+
	361	+ menu.add("-");
	362	+ physicsItem = menu.add(new MenuItem("Physics"));
	363	+ physicsItem.addActionListener(this);
	364	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	365	+ frameselectorItem.addActionListener(this);
254	366	scriptNodeItem = menu.add(new MenuItem("Script Node"));
255	367	scriptNodeItem.addActionListener(this);
256	368	cameraItem = menu.add(new MenuItem("Camera"));
257	369	cameraItem.addActionListener(this);
	370	+ }
258	371
259	372	oe.menuBar.add(menu = new Menu("Object"));
260	373	textureItem = menu.add(new MenuItem("Texture"));
..	..	@@ -263,27 +376,35 @@
263	376	billboardItem.addActionListener(this);
264	377	csgItem = menu.add(new MenuItem("CSG"));
265	378	csgItem.addActionListener(this);
266		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	379	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
267	380	shadowXItem.addActionListener(this);
268		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	381	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
269	382	shadowYItem.addActionListener(this);
270		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	383	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
271	384	shadowZItem.addActionListener(this);
	385	+ if (Globals.ADVANCED)
	386	+ {
	387	+ menu.add("-");
272	388	linkerItem = menu.add(new MenuItem("Linker"));
273	389	linkerItem.addActionListener(this);
274		- templateItem = menu.add(new MenuItem("Template"));
275		- templateItem.addActionListener(this);
276	390	attributeItem = menu.add(new MenuItem("Attribute"));
277	391	attributeItem.addActionListener(this);
	392	+ templateItem = menu.add(new MenuItem("Template"));
	393	+ templateItem.addActionListener(this);
278	394	pointflowItem = menu.add(new MenuItem("Point Flow"));
279	395	pointflowItem.addActionListener(this);
	396	+ }
280	397	menu.add("-");
281	398	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
282	399	resetTransformItem.addActionListener(this);
283	400	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
284	401	resetCentroidItem.addActionListener(this);
285		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
286		- transformgeometryItem.addActionListener(this);
	402	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	403	+ resetCentroidXZItem.addActionListener(this);
	404	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	405	+ transformGeometryItem.addActionListener(this);
	406	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	407	+ transformChildrenItem.addActionListener(this);
287	408
288	409	oe.menuBar.add(menu = new Menu("Geometry"));
289	410	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -294,8 +415,11 @@
294	415	genNormalsCADItem.addActionListener(this);
295	416	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
296	417	genNormalsMESHItem.addActionListener(this);
	418	+ if (Globals.ADVANCED)
	419	+ {
297	420	genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
298	421	genNormalsMINEItem.addActionListener(this);
	422	+ }
299	423	stripifyItem = menu.add(new MenuItem("Stripify"));
300	424	stripifyItem.addActionListener(this);
301	425	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -317,23 +441,34 @@
317	441	reduce34MeshItem.addActionListener(this);
318	442	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
319	443	increaseMeshItem.addActionListener(this);
320		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
321		- smoothMeshItem.addActionListener(this);
322	444	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
323	445	clipMeshItem.addActionListener(this);
	446	+
	447	+ if (Globals.ADVANCED)
	448	+ {
	449	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	450	+ smoothMeshItem.addActionListener(this);
	451	+ }
324	452
325	453	oe.menuBar.add(menu = new Menu("Attributes"));
326	454	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
327	455	clearMaterialsItem.addActionListener(this);
	456	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	457	+ resetAllItem.addActionListener(this);
	458	+ stepAllItem = menu.add(new MenuItem("Step All"));
	459	+ stepAllItem.addActionListener(this);
328	460	menu.add("-");
329	461	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
330	462	liveleavesItem.addActionListener(this);
331	463	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
332	464	unliveleavesItem.addActionListener(this);
	465	+ if (Globals.ADVANCED)
	466	+ {
333	467	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
334	468	supportleavesItem.addActionListener(this);
335	469	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
336	470	unsupportleavesItem.addActionListener(this);
	471	+ }
337	472	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
338	473	hideleavesItem.addActionListener(this);
339	474	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -342,6 +477,14 @@
342	477	markleavesItem.addActionListener(this);
343	478	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
344	479	unmarkleavesItem.addActionListener(this);
	480	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	481	+ rewindleavesItem.addActionListener(this);
	482	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	483	+ unrewindleavesItem.addActionListener(this);
	484	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	485	+ randomleavesItem.addActionListener(this);
	486	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	487	+ unrandomleavesItem.addActionListener(this);
345	488	menu.add("-");
346	489	flipVItem = menu.add(new MenuItem("Flip V"));
347	490	flipVItem.addActionListener(this);
..	..	@@ -377,35 +520,40 @@
377	520	sortbynameItem = menu.add(new MenuItem("Sort by name"));
378	521	sortbynameItem.addActionListener(this);
379	522	menu.add("-");
	523	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	524	+ shareGeometriesItem.addActionListener(this);
	525	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	526	+ mergeGeometriesItem.addActionListener(this);
	527	+ if (Globals.ADVANCED)
	528	+ {
	529	+ // Pretty much the same as duplicate and clone.
380	530	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
381	531	extractGeometriesItem.addActionListener(this);
382	532	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
383	533	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);
	534	+ }
388	535
389	536	oe.menuBar.add(menu = new Menu("Insert"));
390	537	buildCreateMenu(menu);
391	538
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	539	oe.menuBar.add(menu = new Menu("Tools"));
404	540	buildToolsMenu(menu);
405	541	}
406	542
407	543	void SetupUI2(ObjEditor oe)
408	544	{
	545	+ // June 2019
	546	+ if (oe == null)
	547	+ {
	548	+ //super.SetupUI2(this);
	549	+ //return;
	550	+ }
	551	+
	552	+ if (copy != group)
	553	+ {
	554	+ //super.SetupUI2(this);
	555	+ }
	556	+
409	557	//new Exception().printStackTrace();
410	558
411	559	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -436,96 +584,169 @@
436	584	*/
437	585	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
438	586
439		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
440		- liveCB.setToolTipText("Enabled animation");
	587	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	588	+ //minButton.setToolTipText("Minimize window");
	589	+ //minButton.addActionListener(this);
	590	+
	591	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	592	+ maxButton.setToolTipText("Maximize window");
	593	+ maxButton.addActionListener(this);
	594	+
	595	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	596	+ fullButton.setToolTipText("Full-screen window");
	597	+ fullButton.addActionListener(this);
	598	+
	599	+ oe.toolboxPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	600	+ undoButton.setToolTipText("Undo changes");
	601	+ undoButton.addActionListener(this);
	602	+
	603	+ oe.toolboxPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	604	+ redoButton.setToolTipText("Redo changes");
	605	+ redoButton.addActionListener(this);
	606	+
	607	+ oe.toolboxPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	608	+ saveButton.setToolTipText("Save changes");
	609	+ saveButton.addActionListener(this);
	610	+
	611	+ oe.toolboxPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	612	+ liveCB.setToolTipText("Enable animation");
441	613	liveCB.addItemListener(this);
442	614
443		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK), oe.aConstraints);
	615	+ oe.toolboxPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	616	+ oneStepButton.setToolTipText("Animate one step forward");
	617	+ oneStepButton.addActionListener(this);
	618	+
	619	+ oe.toolboxPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	620	+ fastCB.setToolTipText("Fast mode");
	621	+ fastCB.addItemListener(this);
	622	+
	623	+ oe.toolboxPanel.Return();
	624	+
	625	+ oe.toolboxPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
444	626	trackCB.setToolTipText("Enable tracking");
445	627	trackCB.addItemListener(this);
446	628
447		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	629	+ oe.toolboxPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
448	630	screenfitButton.setToolTipText("Screen fit");
449	631	screenfitButton.addActionListener(this);
450	632
451	633	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
452	634	// screenfitpointButton.addActionListener(this);
453		-// oe.aConstraints.gridx += 1;
454		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
455		- snapobjectButton.addActionListener(this);
456		- snapobjectButton.setToolTipText("Snap Object");
457		- oe.aConstraints.gridx += 1;
458	635
459		- //aConstraints.gridx = 0;
460		- //aConstraints.gridy += 1;
461		- oe.aConstraints.weighty = 0;
462		- oe.aConstraints.gridwidth = 1;
463		-
464		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
465		- flashSelectionButton.setToolTipText("Show selection");
	636	+ if (Globals.ADVANCED)
	637	+ {
	638	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	639	+ snapobjectButton.addActionListener(this);
	640	+ snapobjectButton.setToolTipText("Snap Object");
	641	+ }
	642	+
	643	+ oe.toolboxPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	644	+ flashSelectionButton.setToolTipText("Highlight selection");
466	645	flashSelectionButton.addActionListener(this);
467	646
468		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	647	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
469	648
470		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	649	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
471	650	twoButton.setToolTipText("Show center view only");
472	651	twoButton.addActionListener(this);
473		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	652	+ this.fullscreenLayout = twoButton;
	653	+
	654	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
474	655	fourButton.addActionListener(this);
475	656	fourButton.setToolTipText("Show left panel only");
476		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	657	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
477	658	sixButton.setToolTipText("2-column layout left");
478	659	sixButton.addActionListener(this);
479		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	660	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
480	661	threeButton.setToolTipText("2-column layout right");
481	662	threeButton.addActionListener(this);
482		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	663	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
483	664	sevenButton.setToolTipText("3-column layout");
484	665	sevenButton.addActionListener(this);
485	666	//
486	667
487		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
488		- rootButton.setToolTipText("Edit object in new tab");
	668	+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	669	+ rootButton.setToolTipText("Edit selection in new tab");
489	670	rootButton.addActionListener(this);
490		- oe.aConstraints.gridx += 1;
491		- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	671	+
	672	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
492	673	closeButton.setToolTipText("Close tab");
493	674	closeButton.addActionListener(this);
494	675	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
495	676	//clearButton.addActionListener(this);
496		- oe.aConstraints.gridx += 1;
497		-
498		- oe.aConstraints.gridx = 1; //
499		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
500		- editButton.addActionListener(this);
501		- oe.aConstraints.gridx += 1;
502		- oe.aConstraints.weighty = 0;
503		- oe.aConstraints.gridwidth = 1;
504	677
505		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	678	+ // INSERT
	679	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	680	+ gridButton.setToolTipText("Create grid");
	681	+ gridButton.addActionListener(this);
	682	+
	683	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	684	+ boxButton.setToolTipText("Create box");
	685	+ boxButton.addActionListener(this);
	686	+
	687	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	688	+ sphereButton.setToolTipText("Create sphere");
	689	+ sphereButton.addActionListener(this);
	690	+
	691	+ oe.toolboxPanel.Return();
	692	+
	693	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	694	+ coneButton.setToolTipText("Create cone");
	695	+ coneButton.addActionListener(this);
	696	+
	697	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	698	+ torusButton.setToolTipText("Create torus");
	699	+ torusButton.addActionListener(this);
	700	+
	701	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	702	+ superButton.setToolTipText("Create superellipsoid");
	703	+ superButton.addActionListener(this);
	704	+
	705	+ if (Globals.ADVANCED)
	706	+ {
	707	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	708	+ kleinButton.setToolTipText("Create Klein bottle");
	709	+ kleinButton.addActionListener(this);
	710	+ }
	711	+
	712	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	713	+ particlesButton.setToolTipText("Create particle system");
	714	+ particlesButton.addActionListener(this);
	715	+
	716	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	717	+ overlayButton.setToolTipText("Create overlay");
	718	+ overlayButton.addActionListener(this);
	719	+
	720	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	721	+ lightButton.setToolTipText("Create light");
	722	+ lightButton.addActionListener(this);
	723	+
	724	+ // EDIT panel
	725	+ editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	726	+ editButton.setToolTipText("Edit selection");
	727	+ editButton.addActionListener(this);
	728	+
	729	+ editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	730	+ uneditButton.setToolTipText("Unedit selection");
506	731	uneditButton.addActionListener(this);
507	732
508		- oe.aConstraints.gridx += 1;
509		- oe.aConstraints.weighty = 0;
510		- oe.aConstraints.gridwidth = 1;
511		-
512		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
513		- clearPanelButton.addActionListener(this);
514		-
515		- oe.aConstraints.gridx += 1;
516		- oe.aConstraints.weighty = 0;
517		- oe.aConstraints.gridwidth = 1;
518		-
519		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	733	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	734	+ allParamsButton.setToolTipText("Edit all params");
520	735	allParamsButton.addActionListener(this);
521	736
522		- oe.aConstraints.gridx += 1;
523		- oe.aConstraints.weighty = 0;
524		- oe.aConstraints.gridwidth = 1;
525		-
526		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
	737	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	738	+ clearPanelButton.setToolTipText("Clear edit panel");
	739	+ clearPanelButton.addActionListener(this);
	740	+
	741	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	742	+ unselectButton.setToolTipText("Unselect");
527	743	unselectButton.addActionListener(this);
528	744
	745	+ editCommandsPanel.preferredHeight = 1;
	746	+
	747	+// oe.treePanel.add(commandsPanel);
	748	+// oe.treePanel.Return();
	749	+
529	750	// oe.aConstraints.gridx += 1;
530	751	// oe.aConstraints.weighty = 0;
531	752	// oe.aConstraints.gridwidth = 1;
..	..	@@ -537,40 +758,37 @@
537	758	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
538	759	// gcButton.addActionListener(this);
539	760
540		- oe.aConstraints.gridx = 0;
541		- oe.aConstraints.gridy += 1;
542		-
543		- //ctrlPanel.add(objList = new List(5, true));
544		- oe.aConstraints.gridwidth = 100;
545		- // oe.aConstraints.gridheight = 100;
546		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
547		- oe.aConstraints.gridheight = 1;
548		- oe.aConstraints.weighty = 0.5;
549		- oe.aConstraints.gridx = 0;
550		- JScrollPane jSP;
	761	+ cGridBag jSPPanel = new cGridBag();
	762	+
	763	+ JScrollPane jSP;
551	764	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
552		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	765	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
553	766	ResetModel();
554		- oe.aConstraints.weighty = 0.5;
555		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
556		- oe.aConstraints.gridy += 1;
557		- oe.aConstraints.gridwidth = 1;
	767	+
	768	+ oe.treePanel.add(jSPPanel);
	769	+ oe.treePanel.Return();
558	770
559		- oe.aConstraints.weighty = 0;
560		- oe.aConstraints.gridwidth = 2;
561		-
562		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
	771	+ cGridBag copyOptionsPanel = new cGridBag();
	772	+
	773	+ copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	774	+ colorCB.setToolTipText("Copy color when dropped");
563	775	colorCB.addItemListener(this);
564		- oe.aConstraints.gridx += 2;
565		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
	776	+
	777	+ copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	778	+ materialCB.setToolTipText("Copy material when dropped");
566	779	materialCB.addItemListener(this);
567		- oe.aConstraints.gridx += 2;
568		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
	780	+
	781	+ copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	782	+ textureCB.setToolTipText("Copy texture when dropped");
569	783	textureCB.addItemListener(this);
570	784
571		- oe.aConstraints.gridx = 0;
572		- oe.aConstraints.gridy += 1;
	785	+ copyOptionsPanel.preferredHeight = 1;
	786	+ oe.treePanel.add(copyOptionsPanel);
	787	+ oe.treePanel.Return();
573	788
	789	+// mainPanel.setDividerLocation(0.5); //1.0);
	790	+// mainPanel.setResizeWeight(0.5);
	791	+
574	792	//jList.addListSelectionListener(this);
575	793	oe.jTree.addTreeSelectionListener(this);
576	794	//jTree.setRootVisible(false);
..	..	@@ -595,43 +813,35 @@
595	813
596	814	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
597	815	{
598		- //constraints.gridx = 0;
599		- //constraints.gridy = 0;
600		- panel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
601		- fastCB.setToolTipText("Fast mode");
602		- fastCB.addItemListener(this);
603		- //constraints.gridy += 1;
604		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
605		- supportCB.setToolTipText("Enabled rigging");
606		- supportCB.addItemListener(this);
607		-
608		- // constraints.gridy += 1;
609		- // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
610		- // localCB.addItemListener(this);
611		-
612		- //constraints.gridy += 1;
613		- panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
614		- crowdCB.setToolTipText("Used for crowds");
615		- crowdCB.addItemListener(this);
616		-
617		- //constraints.gridy += 1;
618		- panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
619		- smoothCB.setToolTipText("Snapping delay");
620		- smoothCB.addItemListener(this);
621		-
622		- //constraints.gridy += 1;
623		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
624		- slowCB.setToolTipText("Smooth interpolation");
625		- slowCB.addItemListener(this);
626		- //constraints.gridy += 1;
627	816	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
628	817	boxCB.setToolTipText("Display bounding boxes");
629	818	boxCB.addItemListener(this);
630		- //constraints.gridy += 1;
	819	+
631	820	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
632	821	zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
633	822	zoomBoxCB.addItemListener(this);
634	823
	824	+ if (true) // Globals.ADVANCED)
	825	+ {
	826	+ panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	827	+ supportCB.setToolTipText("Enable rigging");
	828	+ supportCB.addItemListener(this);
	829	+
	830	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	831	+ // localCB.addItemListener(this);
	832	+
	833	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	834	+ crowdCB.setToolTipText("Used for crowds");
	835	+ crowdCB.addItemListener(this);
	836	+
	837	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	838	+ smoothCB.setToolTipText("Snapping delay");
	839	+ smoothCB.addItemListener(this);
	840	+
	841	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	842	+ slowCB.setToolTipText("Smooth interpolation");
	843	+ slowCB.addItemListener(this);
	844	+
635	845	// constraints.gridy += 1;
636	846	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
637	847	// speakerMocapCB.addItemListener(this);
..	..	@@ -656,20 +866,46 @@
656	866	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
657	867	// debugCB.addItemListener(this);
658	868
659		- //constraints.gridy += 1;
660	869	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	870	+ oeilCB.setToolTipText("Move camera when tracking target");
661	871	oeilCB.addItemListener(this);
662	872
663		- //constraints.gridy += 1;
	873	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	874	+ shadowCB.setToolTipText("Compute shadows when live");
	875	+ shadowCB.addItemListener(this);
	876	+
	877	+ panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
	878	+ autosaveCB.setToolTipText("Auto-save on structure change");
	879	+ autosaveCB.addItemListener(this);
	880	+
	881	+ if (Globals.ADVANCED)
	882	+ {
664	883	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
665	884	lookAtCB.setToolTipText("Look-at target");
666	885	lookAtCB.addItemListener(this);
	886	+ }
	887	+
	888	+ }
	889	+
	890	+ cGridBag fill = new cGridBag();
	891	+
	892	+ fill.preferredHeight = 200;
	893	+
	894	+ panel.add(fill);
667	895
668	896	}
669	897
670	898	void EditObject(Object3D obj)
671	899	{
672	900	cRadio radioButton = new cRadio(obj.name);
	901	+
	902	+ // Patch to avoid bug with transparency.
	903	+ radioButton.hadMaterial = obj.material != null;
	904	+ if (!radioButton.hadMaterial)
	905	+ {
	906	+ obj.material = new cMaterial();
	907	+ }
	908	+
673	909	radioButton.SetObject(obj);
674	910	radioButton.layout = sevenButton;
675	911	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -678,8 +914,11 @@
678	914	buttonGroup.add(radioButton);
679	915	radioButton.doClick();
680	916	}
	917	+
681	918	void SetupViews(ObjEditor oe)
682	919	{
	920	+ theFrame = this;
	921	+
683	922	oe.SetupViews();
684	923
685	924	System.out.println("SetupViews");
..	..	@@ -688,23 +927,26 @@
688	927	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
689	928	}
690	929
691		- JCheckBox liveCB;
692		- JCheckBox supportCB;
693		- JCheckBox localCB;
694		- JCheckBox crowdCB;
695		- JCheckBox smoothCB;
696		- JCheckBox fastCB;
697		- JCheckBox slowCB;
698		- JCheckBox boxCB;
699		- JCheckBox zoomBoxCB;
700		- JCheckBox trackCB;
701		- JCheckBox smoothfocusCB;
	930	+ cToggleButton liveCB;
	931	+ cCheckBox supportCB;
	932	+ cCheckBox localCB;
	933	+ cCheckBox crowdCB;
	934	+ cCheckBox smoothCB;
	935	+ cToggleButton fastCB;
	936	+ cCheckBox slowCB;
	937	+ cCheckBox boxCB;
	938	+ cCheckBox zoomBoxCB;
	939	+ cToggleButton trackCB;
	940	+ cCheckBox smoothfocusCB;
702	941	// JCheckBox speakerMocapCB;
703		- JCheckBox speakerCameraCB;
704		- JCheckBox speakerFocusCB;
705		- JCheckBox debugCB;
706		- JCheckBox oeilCB;
707		- JCheckBox lookAtCB;
	942	+ cCheckBox speakerCameraCB;
	943	+ cCheckBox speakerFocusCB;
	944	+ cCheckBox debugCB;
	945	+
	946	+ cCheckBox oeilCB;
	947	+ cCheckBox shadowCB;
	948	+ cCheckBox autosaveCB;
	949	+ cCheckBox lookAtCB;
708	950
709	951	// static int COLOR = 1;
710	952	// static int MATERIAL = 2;
..	..	@@ -712,9 +954,9 @@
712	954
713	955	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
714	956
715		- JCheckBox colorCB;
716		- JCheckBox materialCB;
717		- JCheckBox textureCB;
	957	+ cCheckBox colorCB;
	958	+ cCheckBox materialCB;
	959	+ cCheckBox textureCB;
718	960
719	961	public void itemStateChanged(ItemEvent e)
720	962	{
..	..	@@ -742,6 +984,7 @@
742	984	} else if(e.getSource() == liveCB)
743	985	{
744	986	cameraView.ToggleLive();
	987	+ refreshContents(false);
745	988	}
746	989	else if(e.getSource() == supportCB)
747	990	{
..	..	@@ -806,6 +1049,14 @@
806	1049	{
807	1050	cameraView.ToggleOeil();
808	1051	}
	1052	+ else if(e.getSource() == shadowCB)
	1053	+ {
	1054	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1055	+ }
	1056	+ else if(e.getSource() == autosaveCB)
	1057	+ {
	1058	+ Globals.SAVEONMAKE ^= true;
	1059	+ }
809	1060	else if(e.getSource() == lookAtCB)
810	1061	{
811	1062	cameraView.ToggleLookAt();
..	..	@@ -822,7 +1073,8 @@
822	1073
823	1074	/**/
824	1075	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
825		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1076	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1077	+ TreePath path = objEditor.jTree.getSelectionPath();
826	1078	if ((path == null) \|\| (path.getPathCount() <= 1)) {
827	1079	// We can't move the root node or an empty selection
828	1080	return;
..	..	@@ -894,7 +1146,9 @@
894	1146	// objEditor.DropFile((java.io.File[]) object, true);
895	1147	// return;
896	1148	// }
897		- if (string.charAt(0) == '/')
	1149	+
	1150	+ // File path for Mac and Windows
	1151	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
898	1152	{
899	1153	// file(s)
900	1154	String[] names = string.split("\n");
..	..	@@ -921,7 +1175,7 @@
921	1175
922	1176	flashIt = false;
923	1177	CameraPane pane = (CameraPane) target;
924		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1178	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
925	1179	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
926	1180
927	1181	if (group.selection.size() == 1)
..	..	@@ -944,16 +1198,16 @@
944	1198	return;
945	1199	}
946	1200
947		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
948		- {
	1201	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1202	+// {
949	1203	loadClipboard(true);
950	1204	objEditor.jTree.setSelectionPath(destinationPath);
951		- pasteInto(false);
952		- } else {
953		- loadClipboard(false);
954		- objEditor.jTree.setSelectionPath(destinationPath);
955		- pasteInto(false); // true); // ???
956		- }
	1205	+ pasteInto(false, false);
	1206	+// } else {
	1207	+// loadClipboard(false);
	1208	+// objEditor.jTree.setSelectionPath(destinationPath);
	1209	+// pasteInto(false, false); // true); // ???
	1210	+// }
957	1211	}
958	1212	public void dropActionChanged(DropTargetDragEvent dtde)
959	1213	// Called if the user has modified the current drop gesture
..	..	@@ -1074,27 +1328,33 @@
1074	1328	kleinItem.addActionListener(this);
1075	1329	particleItem = menu.add(new MenuItem("Particle system"));
1076	1330	particleItem.addActionListener(this);
	1331	+ if (Globals.ADVANCED)
	1332	+ {
1077	1333	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1078	1334	ragdollItem.addActionListener(this);
1079	1335	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1080	1336	ragdoll2Item.addActionListener(this);
	1337	+ }
1081	1338	menu.add("-");
1082		- meshItem = menu.add(new MenuItem("Mesh"));
	1339	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1083	1340	meshItem.addActionListener(this);
1084	1341	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1085	1342	// meshGroupItem.addActionListener(this);
	1343	+ if (Globals.ADVANCED)
	1344	+ {
1086	1345	springItem = menu.add(new MenuItem("Spring"));
1087	1346	springItem.addActionListener(this);
1088	1347	flagItem = menu.add(new MenuItem("Flag"));
1089	1348	flagItem.addActionListener(this);
1090		- bezierItem = menu.add(new MenuItem("Patch"));
1091		- bezierItem.addActionListener(this);
1092		- checkerItem = menu.add(new MenuItem("Checker"));
1093		- checkerItem.addActionListener(this);
1094	1349	blobItem = menu.add(new MenuItem("Blob"));
1095	1350	blobItem.addActionListener(this);
1096	1351	latheItem = menu.add(new MenuItem("Lathe"));
1097	1352	latheItem.addActionListener(this);
	1353	+ }
	1354	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1355	+ bezierItem.addActionListener(this);
	1356	+ overlayItem = menu.add(new MenuItem("Overlay"));
	1357	+ overlayItem.addActionListener(this);
1098	1358	lightItem = menu.add(new MenuItem("Light"));
1099	1359	lightItem.addActionListener(this);
1100	1360	menu.add("-");
..	..	@@ -1104,39 +1364,44 @@
1104	1364	loopItem.addActionListener(this);
1105	1365	doubleItem = menu.add(new MenuItem("Fork"));
1106	1366	doubleItem.addActionListener(this);
	1367	+ if (Globals.ADVANCED)
	1368	+ {
1107	1369	tripleItem = menu.add(new MenuItem("Trident"));
1108	1370	tripleItem.addActionListener(this);
	1371	+ }
1109	1372	}
1110	1373
1111	1374	void buildToolsMenu(Menu menu)
1112	1375	{
1113	1376	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1114	1377	animationItem.addItemListener(this);
1115		- animationItem.setState(CameraPane.ANIMATION);
	1378	+ animationItem.setState(Globals.ANIMATION);
1116	1379
1117	1380	menu.add("-");
1118	1381	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1119	1382	parseverticesItem.addActionListener(this);
1120	1383	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1121	1384	textureFieldItem.addActionListener(this);
1122		- alignItem = menu.add(new MenuItem("Align"));
	1385	+ alignItem = menu.add(new MenuItem("Align Objects"));
1123	1386	alignItem.addActionListener(this);
1124		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1125		- mirrorItem.addActionListener(this);
1126	1387	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1127	1388	reduceMorphItem.addActionListener(this);
1128	1389	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1129	1390	reduce34MorphItem.addActionListener(this);
1130		-
	1391	+ menu.add("-");
1131	1392	menu.add(computeAOItem = new MenuItem("Compute AO"));
1132	1393	computeAOItem.addActionListener(this);
1133		- menu.add("-");
1134	1394
	1395	+ if (Globals.ADVANCED)
	1396	+ {
	1397	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1398	+ mirrorItem.addActionListener(this);
	1399	+ menu.add("-");
1135	1400	menu.add(memoryItem = new MenuItem("Memory Usage"));
1136	1401	memoryItem.addActionListener(this);
1137	1402	menu.add(analyzeItem = new MenuItem("Analyze"));
1138	1403	analyzeItem.addActionListener(this);
1139		- menu.add(dumpItem = new MenuItem("Dump"));
	1404	+ menu.add(dumpItem = new MenuItem("Print"));
1140	1405	dumpItem.addActionListener(this);
1141	1406	// menu.add(pathItem = new MenuItem("From-to path"));
1142	1407	// pathItem.addActionListener(this);
..	..	@@ -1154,6 +1419,7 @@
1154	1419	menu.add("-");
1155	1420	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1156	1421	editScriptItem.addActionListener(this);
	1422	+ }
1157	1423	}
1158	1424
1159	1425	void ScreenFit()
..	..	@@ -1276,6 +1542,7 @@
1276	1542	shadow.material = new cMaterial(obj.material);
1277	1543	shadow.material.diffuse = 0.0001f;
1278	1544	shadow.material.specular = 0.0001f;
	1545	+ //shadow.projectedVertices[1].x = 300;
1279	1546
1280	1547	makeSomething(shadow);
1281	1548	}
..	..	@@ -1482,9 +1749,9 @@
1482	1749
1483	1750	void Overwrite(int mask)
1484	1751	{
1485		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1752	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1486	1753	{
1487		- Object3D content = GrafreeD.clipboard.get(0);
	1754	+ Object3D content = Grafreed.clipboard.get(0);
1488	1755
1489	1756	if (content instanceof cGroup && ((cGroup)content).transientlink )
1490	1757	content = ((cGroup)content).get(0);
..	..	@@ -1532,11 +1799,11 @@
1532	1799	objEditor.cameraView.renderCamera.setAim(v2, v1);
1533	1800	objEditor.cameraView.repaint();
1534	1801	} else
1535		- if (source == rectoidItem)
	1802	+ if (source == rectoidItem \|\| source == boxButton)
1536	1803	{
1537	1804	makeSomething(new Box());
1538	1805	} else
1539		- if (source == particleItem)
	1806	+ if (source == particleItem \|\| source == particlesButton)
1540	1807	{
1541	1808	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1542	1809	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1615,27 +1882,27 @@
1615	1882
1616	1883	makeSomething(obj);
1617	1884	} else
1618		- if (source == gridItem)
	1885	+ if (source == gridItem \|\| source == gridButton)
1619	1886	{
1620	1887	makeSomething(new Grid());
1621	1888	} else
1622		- if (source == ellipsoidItem)
	1889	+ if (source == ellipsoidItem \|\| source == sphereButton)
1623	1890	{
1624	1891	makeSomething(new Sphere());
1625	1892	} else
1626		- if (source == coneItem)
	1893	+ if (source == coneItem \|\| source == coneButton)
1627	1894	{
1628	1895	makeSomething(new Cone());
1629	1896	} else
1630		- if (source == torusItem)
	1897	+ if (source == torusItem \|\| source == torusButton)
1631	1898	{
1632	1899	makeSomething(new Torus());
1633	1900	} else
1634		- if (source == superItem)
	1901	+ if (source == superItem \|\| source == superButton)
1635	1902	{
1636	1903	makeSomething(new Superellipsoid());
1637	1904	} else
1638		- if (source == kleinItem)
	1905	+ if (source == kleinItem \|\| source == kleinButton)
1639	1906	{
1640	1907	makeSomething(new Klein());
1641	1908	} else
..	..	@@ -1655,7 +1922,7 @@
1655	1922	{
1656	1923	makeSomething(new BezierSurface());
1657	1924	} else
1658		- if (source == checkerItem)
	1925	+ if (source == overlayItem \|\| source == overlayButton)
1659	1926	{
1660	1927	/*
1661	1928	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1703,7 +1970,7 @@
1703	1970	s.setup();
1704	1971	makeSomething(s);
1705	1972	} else
1706		- if (source == lightItem)
	1973	+ if (source == lightItem \|\| source == lightButton)
1707	1974	{
1708	1975	makeSomething(new Light());
1709	1976	} else
..	..	@@ -1789,23 +2056,6 @@
1789	2056	csg.addChild(child);
1790	2057	child.addChild(csg);
1791	2058	} else
1792		-
1793		- if (source == importGFDItem)
1794		- {
1795		- ImportGFD();
1796		- } else
1797		- if (source == importVRMLX3DItem)
1798		- {
1799		- ImportVRMLX3D();
1800		- } else
1801		- if (source == import3DSItem)
1802		- {
1803		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1804		- } else
1805		- if (source == importOBJItem)
1806		- {
1807		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1808		- } else
1809	2059	if (source == computeAOItem)
1810	2060	{
1811	2061	Globals.drawMode = CameraPane.OCCLUSION;
..	..	@@ -1824,7 +2074,7 @@
1824	2074	if (source == invariantsItem)
1825	2075	{
1826	2076	System.out.println("Invariants:");
1827		- GrafreeD.grafreeD.universe.invariants();
	2077	+ Grafreed.grafreeD.universe.invariants();
1828	2078	} else
1829	2079	if (source == memoryItem)
1830	2080	{
..	..	@@ -1842,6 +2092,35 @@
1842	2092	if (source == dumpItem)
1843	2093	{
1844	2094	DumpObject();
	2095	+ } else
	2096	+ if (source == minButton)
	2097	+ {
	2098	+ Minimize();
	2099	+ } else
	2100	+ if (source == maxButton)
	2101	+ {
	2102	+ Maximize();
	2103	+ } else
	2104	+ if (source == fullButton)
	2105	+ {
	2106	+ ToggleFullScreen();
	2107	+ } else
	2108	+ if (source == undoButton)
	2109	+ {
	2110	+ Undo();
	2111	+ } else
	2112	+ if (source == redoButton)
	2113	+ {
	2114	+ Redo();
	2115	+ } else
	2116	+ if (source == saveButton)
	2117	+ {
	2118	+ Save();
	2119	+ } else
	2120	+ if (source == oneStepButton)
	2121	+ {
	2122	+ Globals.ONESTEP = true;
	2123	+ cameraView.repaint();
1845	2124	} else
1846	2125	if (source == screenfitButton)
1847	2126	{
..	..	@@ -1892,12 +2171,20 @@
1892	2171	{
1893	2172	loadClipboard(true);
1894	2173	} else
	2174	+ if (source == undoItem)
	2175	+ {
	2176	+ Undo();
	2177	+ } else
	2178	+ if (source == redoItem)
	2179	+ {
	2180	+ Redo();
	2181	+ } else
1895	2182	if (source == duplicateItem)
1896	2183	{
1897		- Object3D keep = GrafreeD.clipboard;
	2184	+ Object3D keep = Grafreed.clipboard;
1898	2185	loadClipboard(false);
1899	2186	paste(false);
1900		- GrafreeD.clipboard = keep;
	2187	+ Grafreed.clipboard = keep;
1901	2188	} else
1902	2189	if (source == cloneItem)
1903	2190	{
..	..	@@ -1915,13 +2202,17 @@
1915	2202	{
1916	2203	paste(false);
1917	2204	} else
	2205	+ if (source == pasteIntoItem)
	2206	+ {
	2207	+ pasteInto(true, false);
	2208	+ } else
1918	2209	if (source == pasteLinkItem)
1919	2210	{
1920		- pasteInto(false);
	2211	+ pasteInto(false, false);
1921	2212	} else
1922	2213	if (source == pasteCloneItem)
1923	2214	{
1924		- pasteInto(true);
	2215	+ pasteInto(true, true);
1925	2216	} else
1926	2217	if (source == pasteExpandItem)
1927	2218	{
..	..	@@ -2113,9 +2404,9 @@
2113	2404	// group.selection.get(0).setMasterThis(content); // should be identity
2114	2405	// refreshContents();
2115	2406	// }
2116		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2407	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2117	2408	{
2118		- Object3D content = GrafreeD.clipboard.get(0);
	2409	+ Object3D content = Grafreed.clipboard.get(0);
2119	2410
2120	2411	if (content instanceof cGroup && ((cGroup)content).transientlink )
2121	2412	content = ((cGroup)content).get(0);
..	..	@@ -2123,11 +2414,11 @@
2123	2414	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2124	2415	for (int i=0; i<group.selection.size(); i++)
2125	2416	{
2126		- boolean random = CameraPane.RANDOM;
2127		- CameraPane.RANDOM = false; // parse all random nodes
	2417	+ boolean random = CameraPane.SWITCH;
	2418	+ CameraPane.SWITCH = false; // parse all random nodes
2128	2419	group.selection.get(i).linkVerticesThis(content);
2129	2420	// group.selection.get(i).setMasterThis(content); // should be identity
2130		- CameraPane.RANDOM = random;
	2421	+ CameraPane.SWITCH = random;
2131	2422	}
2132	2423	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2133	2424	refreshContents();
..	..	@@ -2137,20 +2428,20 @@
2137	2428	{
2138	2429	for (int i=0; i<group.selection.size(); i++)
2139	2430	{
2140		- boolean random = CameraPane.RANDOM;
2141		- CameraPane.RANDOM = false; // parse all random nodes
	2431	+ boolean random = CameraPane.SWITCH;
	2432	+ CameraPane.SWITCH = false; // parse all random nodes
2142	2433	group.selection.get(i).linkVerticesThis(null);
2143		- CameraPane.RANDOM = random;
	2434	+ CameraPane.SWITCH = random;
2144	2435	}
2145	2436
2146	2437	refreshContents();
2147	2438	} else
2148	2439	if (source == relinkverticesItem)
2149	2440	{
2150		- boolean random = CameraPane.RANDOM;
2151		- CameraPane.RANDOM = false; // parse all random nodes
	2441	+ boolean random = CameraPane.SWITCH;
	2442	+ CameraPane.SWITCH = false; // parse all random nodes
2152	2443	group.selection.RelinkToSupport();
2153		- CameraPane.RANDOM = random;
	2444	+ CameraPane.SWITCH = random;
2154	2445
2155	2446	refreshContents();
2156	2447	} else
..	..	@@ -2165,9 +2456,9 @@
2165	2456	} else
2166	2457	if (source == setMasterItem)
2167	2458	{
2168		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2459	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2169	2460	{
2170		- Object3D content = GrafreeD.clipboard.get(0);
	2461	+ Object3D content = Grafreed.clipboard.get(0);
2171	2462
2172	2463	if (content instanceof cGroup && ((cGroup)content).transientlink )
2173	2464	content = ((cGroup)content).get(0);
..	..	@@ -2180,9 +2471,9 @@
2180	2471	{
2181	2472	if (group.selection.size() == 1)
2182	2473	{
2183		- if (GrafreeD.clipboard.size() == 1)
	2474	+ if (Grafreed.clipboard.size() == 1)
2184	2475	{
2185		- Object3D content = GrafreeD.clipboard.get(0);
	2476	+ Object3D content = Grafreed.clipboard.get(0);
2186	2477
2187	2478	if (content instanceof cGroup && ((cGroup)content).transientlink )
2188	2479	content = ((cGroup)content).get(0);
..	..	@@ -2199,7 +2490,7 @@
2199	2490	{
2200	2491	RevertMeshes();
2201	2492	} else
2202		- if (source == resetMeshItem)
	2493	+ if (source == resetAllItem)
2203	2494	{
2204	2495	ResetAll();
2205	2496	} else
..	..	@@ -2248,7 +2539,7 @@
2248	2539	RandomNode random = new RandomNode();
2249	2540	group(random);
2250	2541	if (random.size() > 0)
2251		- random.name = random.get(0).name + "Rnd";
	2542	+ random.name = random.get(0).name + "Switch";
2252	2543	} else
2253	2544	if (source == physicsItem)
2254	2545	{
..	..	@@ -2365,7 +2656,7 @@
2365	2656	{
2366	2657	CastShadow(2);
2367	2658	} else
2368		- if (source == ungroupItem)
	2659	+ if (source == ungroupItem \|\| source == ungroupButton)
2369	2660	{
2370	2661	//ungroup();
2371	2662	for (int i=0; i<group.selection.size(); i++)
..	..	@@ -2387,7 +2678,7 @@
2387	2678	} else
2388	2679	if (source == genNormalsMESHItem)
2389	2680	{
2390		- GenNormals(true); // TODO
	2681	+ GenNormalsMESH();
2391	2682	} else
2392	2683	if (source == genNormalsORGANItem)
2393	2684	{
..	..	@@ -2452,6 +2743,22 @@
2452	2743	if (source == unmarkleavesItem)
2453	2744	{
2454	2745	MarkLeaves(false);
	2746	+ } else
	2747	+ if (source == rewindleavesItem)
	2748	+ {
	2749	+ RewindLeaves(true);
	2750	+ } else
	2751	+ if (source == unrewindleavesItem)
	2752	+ {
	2753	+ RewindLeaves(false);
	2754	+ } else
	2755	+ if (source == randomleavesItem)
	2756	+ {
	2757	+ RandomLeaves(true);
	2758	+ } else
	2759	+ if (source == unrandomleavesItem)
	2760	+ {
	2761	+ RandomLeaves(false);
2455	2762	} else
2456	2763	if (source == flipVItem)
2457	2764	{
..	..	@@ -2537,9 +2844,13 @@
2537	2844	{
2538	2845	SmoothMesh();
2539	2846	} else
2540		- if (source == transformgeometryItem)
	2847	+ if (source == transformGeometryItem)
2541	2848	{
2542	2849	TransformGeometry();
	2850	+ } else
	2851	+ if (source == transformChildrenItem)
	2852	+ {
	2853	+ TransformChildren();
2543	2854	} else
2544	2855	if (source == resetTransformItem)
2545	2856	{
..	..	@@ -2547,7 +2858,11 @@
2547	2858	} else
2548	2859	if (source == resetCentroidItem)
2549	2860	{
2550		- ResetCentroid();
	2861	+ ResetCentroid(true);
	2862	+ } else
	2863	+ if (source == resetCentroidXZItem)
	2864	+ {
	2865	+ ResetCentroid(false);
2551	2866	} else
2552	2867	if (source == resetParentItem)
2553	2868	{
..	..	@@ -2679,6 +2994,10 @@
2679	2994	if (source == twoButton)
2680	2995	{
2681	2996	radio.layout = twoButton;
	2997	+
	2998	+ if (CameraPane.FULLSCREEN)
	2999	+ fullscreenLayout = radio.layout;
	3000	+
2682	3001	// bug
2683	3002	//gridPanel.setDividerLocation(1.0);
2684	3003	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2711,10 +3030,31 @@
2711	3030	bigThree.ClearUI();
2712	3031	bigThree.add(centralPanel);
2713	3032	bigThree.FlushUI();
	3033	+
	3034	+ cameraView.requestFocusInWindow();
	3035	+
	3036	+// refreshContents(true);
	3037	+//
	3038	+// try
	3039	+// {
	3040	+// java.awt.Robot bot = new java.awt.Robot();
	3041	+// int mask = InputEvent.BUTTON1_MASK;
	3042	+// bot.mouseMove(100, 100);
	3043	+// bot.mousePress(mask);
	3044	+// bot.mouseRelease(mask);
	3045	+// }
	3046	+// catch (Exception e)
	3047	+// {
	3048	+//
	3049	+// }
	3050	+
2714	3051	} else
2715	3052	if (source == threeButton)
2716	3053	{
2717	3054	radio.layout = threeButton;
	3055	+
	3056	+ if (CameraPane.FULLSCREEN)
	3057	+ fullscreenLayout = radio.layout;
2718	3058
2719	3059	// bigThree.remove(scenePanel);
2720	3060	// bigThree.remove(centralPanel);
..	..	@@ -2747,10 +3087,15 @@
2747	3087	bigThree.add(centralPanel);
2748	3088	bigThree.add(XYZPanel);
2749	3089	bigThree.FlushUI();
	3090	+
	3091	+ cameraView.requestFocusInWindow();
2750	3092	} else
2751	3093	if (source == fourButton)
2752	3094	{
2753	3095	radio.layout = fourButton;
	3096	+
	3097	+ if (CameraPane.FULLSCREEN)
	3098	+ fullscreenLayout = radio.layout;
2754	3099
2755	3100	// bigThree.remove(scenePanel);
2756	3101	// bigThree.remove(centralPanel);
..	..	@@ -2782,10 +3127,15 @@
2782	3127	bigThree.ClearUI();
2783	3128	bigThree.add(scenePanel);
2784	3129	bigThree.FlushUI();
	3130	+
	3131	+ cameraView.requestFocusInWindow();
2785	3132	} else
2786	3133	if (source == sixButton)
2787	3134	{
2788	3135	radio.layout = sixButton;
	3136	+
	3137	+ if (CameraPane.FULLSCREEN)
	3138	+ fullscreenLayout = radio.layout;
2789	3139
2790	3140	// bigThree.remove(scenePanel);
2791	3141	// bigThree.remove(centralPanel);
..	..	@@ -2818,10 +3168,15 @@
2818	3168	bigThree.add(scenePanel);
2819	3169	bigThree.add(centralPanel);
2820	3170	bigThree.FlushUI();
	3171	+
	3172	+ cameraView.requestFocusInWindow();
2821	3173	} else
2822	3174	if (source == sevenButton)
2823	3175	{
2824	3176	radio.layout = sevenButton;
	3177	+
	3178	+ if (CameraPane.FULLSCREEN)
	3179	+ fullscreenLayout = radio.layout;
2825	3180
2826	3181	// bigThree.remove(scenePanel);
2827	3182	// bigThree.remove(centralPanel);
..	..	@@ -2855,6 +3210,8 @@
2855	3210	bigThree.add(centralPanel);
2856	3211	bigThree.add(XYZPanel);
2857	3212	bigThree.FlushUI();
	3213	+
	3214	+ cameraView.requestFocusInWindow();
2858	3215	} else
2859	3216	if (source == rootButton)
2860	3217	{
..	..	@@ -2866,6 +3223,7 @@
2866	3223	EditObject(obj);
2867	3224	}
2868	3225
	3226	+ cameraView.requestFocusInWindow();
2869	3227	refreshContents(true);
2870	3228	} else
2871	3229	if (source == closeButton)
..	..	@@ -2875,18 +3233,27 @@
2875	3233	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2876	3234	{
2877	3235	ab = (cRadio)e.nextElement();
2878		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3236	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2879	3237	{
	3238	+ // Patch to avoid bug with transparency.
	3239	+ if (!ab.hadMaterial)
	3240	+ {
	3241	+ ab.object.material = null;
	3242	+ }
	3243	+
2880	3244	buttonGroup.remove(ab);
2881	3245	radioPanel.remove(ab);
2882	3246
2883		- ab.GetObject().editWindow = null;
	3247	+ //ab.GetObject().editWindow = null;
	3248	+ ab.GetObject().manipWindow = null;
2884	3249	// ab.GetObject().objectUI = null; // ?????????
2885	3250
2886	3251	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2887	3252	break;
2888	3253	}
2889	3254	}
	3255	+
	3256	+ cameraView.requestFocusInWindow();
2890	3257	refreshContents(true);
2891	3258	} else
2892	3259	if (source == editItem \|\| source == editButton)
..	..	@@ -2903,9 +3270,9 @@
2903	3270	child.CloseUI();
2904	3271	listUI.remove(child);
2905	3272
2906		- child.editWindow = null; // ???????????
	3273	+ //child.editWindow = null; // ???????????
2907	3274	}
2908		- objEditor.ctrlPanel.validate();
	3275	+ objEditor.ctrlPanel.FlushUI();
2909	3276	//objEditor.jTree.clearSelection();
2910	3277	//objEditor.ResetSliders();
2911	3278	refreshContents(true);
..	..	@@ -2989,7 +3356,11 @@
2989	3356	frontView.object = group;
2990	3357	sideView.object = group;
2991	3358	}
2992		- group.editWindow = this;
	3359	+
	3360	+// fix "+" issue
	3361	+ //group.editWindow = this;
	3362	+ group.manipWindow = this;
	3363	+
2993	3364	/*
2994	3365	currentLayout = radio.layout;
2995	3366	if (currentLayout == null)
..	..	@@ -3001,8 +3372,23 @@
3001	3372	//group.parent = null; // ROOT
3002	3373	//group.attributes = -1;
3003	3374	ResetModel();
	3375	+
	3376	+ cameraView.requestFocusInWindow();
3004	3377	refreshContents(true);
3005		- }
	3378	+ } else if (event.getSource() == editCameraItem)
	3379	+ {
	3380	+ cameraView.ProtectCamera();
	3381	+ cameraView.repaint();
	3382	+ return;
	3383	+ } else if (event.getSource() == revertCameraItem)
	3384	+ {
	3385	+ cameraView.RevertCamera();
	3386	+ cameraView.repaint();
	3387	+ return;
	3388	+ // } else if (event.getSource() == textureButton)
	3389	+ // {
	3390	+ // return; // true;
	3391	+ }
3006	3392	else
3007	3393	{
3008	3394	//return super.action(event, arg);
..	..	@@ -3011,7 +3397,6 @@
3011	3397	}
3012	3398
3013	3399	boolean useclient = false;
3014		- cRadio radio;
3015	3400
3016	3401	void ToggleRoot()
3017	3402	{
..	..	@@ -3063,6 +3448,28 @@
3063	3448	refreshContents();
3064	3449	}
3065	3450
	3451	+ void TransformChildren()
	3452	+ {
	3453	+ Object3D obj;
	3454	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3455	+ {
	3456	+ obj = (Object3D)e.nextElement();
	3457	+ obj.KeepTextureMatrices();
	3458	+ obj.TransformChildren();
	3459	+ obj.RestoreTextureMatrices();
	3460	+
	3461	+// if (obj.parent == null)
	3462	+// {
	3463	+// System.out.println("NULL PARENT!");
	3464	+// new Exception().printStackTrace();
	3465	+// }
	3466	+// else
	3467	+// TouchTransform(obj);
	3468	+// //obj.parent.Touch();
	3469	+ }
	3470	+
	3471	+ refreshContents();
	3472	+ }
3066	3473
3067	3474	void ResetTransform()
3068	3475	{
..	..	@@ -3175,7 +3582,7 @@
3175	3582	refreshContents();
3176	3583	}
3177	3584
3178		- void ResetCentroid()
	3585	+ void ResetCentroid(boolean full)
3179	3586	{
3180	3587	Object3D obj;
3181	3588	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3190,12 +3597,16 @@
3190	3597	LA.matIdentity(Object3D.mat);
3191	3598	obj.getBounds(minima, maxima, false);
3192	3599	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3193		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3600	+ if (full)
	3601	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3194	3602	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3195	3603	obj.TransformMesh(Object3D.mat);
	3604	+
3196	3605	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3197		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3606	+ if (full)
	3607	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3198	3608	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3609	+
3199	3610	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3200	3611	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3201	3612	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3224,7 +3635,8 @@
3224	3635
3225	3636	int size = obj.MemorySize();
3226	3637
3227		- System.err.println((size/1024) + " KB is the size of " + obj);
	3638	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3639	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3228	3640	}
3229	3641	}
3230	3642	catch (Exception e)
..	..	@@ -3261,9 +3673,9 @@
3261	3673	obj = (Object3D)e.nextElement();
3262	3674
3263	3675	System.out.println("Object is: " + obj);
3264		- GrafreeD.AnalyzeObject(obj);
	3676	+ Grafreed.AnalyzeObject(obj);
3265	3677	System.out.println("Boundary rep: " + obj.bRep);
3266		- GrafreeD.AnalyzeObject(obj.bRep);
	3678	+ Grafreed.AnalyzeObject(obj.bRep);
3267	3679
3268	3680	// System.err.println((size/1024) + " KB is the size of " + obj);
3269	3681	}
..	..	@@ -3305,6 +3717,13 @@
3305	3717	void GenNormals(boolean crease)
3306	3718	{
3307	3719	group.GenNormalsS(crease);
	3720	+
	3721	+ refreshContents();
	3722	+ }
	3723	+
	3724	+ void GenNormalsMESH()
	3725	+ {
	3726	+ group.GenNormalsMeshS();
3308	3727
3309	3728	refreshContents();
3310	3729	}
..	..	@@ -3477,8 +3896,8 @@
3477	3896
3478	3897	void ParseVertices()
3479	3898	{
3480		- boolean epsequal = GrafreeD.epsequal;
3481		- GrafreeD.epsequal = true;
	3899	+ boolean epsequal = Grafreed.epsequal;
	3900	+ Grafreed.epsequal = true;
3482	3901
3483	3902	for (int i=0; i<group.selection.size(); i++)
3484	3903	{
..	..	@@ -3503,7 +3922,7 @@
3503	3922	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3504	3923	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3505	3924
3506		- g.add(GrafreeD.clipboard);
	3925	+ g.add(Grafreed.clipboard);
3507	3926
3508	3927	buffer.add(g);
3509	3928	}
..	..	@@ -3518,7 +3937,7 @@
3518	3937	makeSomething(buffer, i==group.selection.size()-1);
3519	3938	}
3520	3939
3521		- GrafreeD.epsequal = epsequal;
	3940	+ Grafreed.epsequal = epsequal;
3522	3941
3523	3942	refreshContents();
3524	3943	}
..	..	@@ -3536,7 +3955,16 @@
3536	3955	String pigment = Object3D.GetPigment(tex);
3537	3956	//String bump = Object3D.GetBump(tex);
3538	3957
3539		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3958	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	3959	+
	3960	+ try
	3961	+ {
	3962	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3963	+ }
	3964	+ catch (Exception e)
	3965	+ {
	3966	+ System.err.println("FAIL: " + node);
	3967	+ }
3540	3968
3541	3969	double s = v.s;
3542	3970
..	..	@@ -3624,11 +4052,11 @@
3624	4052
3625	4053	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3626	4054
3627		- boolean random = CameraPane.RANDOM;
3628		- CameraPane.RANDOM = false; // parse all random nodes
	4055	+ boolean random = CameraPane.SWITCH;
	4056	+ CameraPane.SWITCH = false; // parse all random nodes
3629	4057	lowres.linkVerticesThis(null);
3630	4058	lowres.linkVerticesThis(sn);
3631		- CameraPane.RANDOM = random;
	4059	+ CameraPane.SWITCH = random;
3632	4060
3633	4061	System.err.flush();
3634	4062
..	..	@@ -3668,7 +4096,7 @@
3668	4096	return;
3669	4097
3670	4098	Object3D poses = group.selection.get(0);
3671		- Object3D ref = GrafreeD.clipboard.get(0);
	4099	+ Object3D ref = Grafreed.clipboard.get(0);
3672	4100
3673	4101	Object3D newgroup = new Object3D("Po:" + poses.name);
3674	4102
..	..	@@ -3862,9 +4290,9 @@
3862	4290
3863	4291	void ClipMesh()
3864	4292	{
3865		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4293	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3866	4294	{
3867		- Object3D content = GrafreeD.clipboard.get(0);
	4295	+ Object3D content = Grafreed.clipboard.get(0);
3868	4296
3869	4297	if (content instanceof cGroup && ((cGroup)content).transientlink )
3870	4298	content = ((cGroup)content).get(0);
..	..	@@ -3873,7 +4301,7 @@
3873	4301	// {
3874	4302	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3875	4303	// }
3876		- group.selection.ClipMesh(GrafreeD.clipboard);
	4304	+ group.selection.ClipMesh(Grafreed.clipboard);
3877	4305	}
3878	4306	// group.selection.ClipMesh(GrafreeD.clipboard);
3879	4307	System.out.println("DONE.");
..	..	@@ -3920,6 +4348,18 @@
3920	4348	void MarkLeaves(boolean hide)
3921	4349	{
3922	4350	group.selection.MarkLeaves(hide);
	4351	+ refreshContents();
	4352	+ }
	4353	+
	4354	+ void RewindLeaves(boolean hide)
	4355	+ {
	4356	+ group.selection.RewindLeaves(hide);
	4357	+ refreshContents();
	4358	+ }
	4359	+
	4360	+ void RandomLeaves(boolean hide)
	4361	+ {
	4362	+ group.selection.RandomLeaves(hide);
3923	4363	refreshContents();
3924	4364	}
3925	4365
..	..	@@ -4005,10 +4445,10 @@
4005	4445	{
4006	4446	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4007	4447	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4008		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4448	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4009	4449
4010	4450	Object3D elem = (Object3D)group.selection.elementAt(i);
4011		- if(elem != group)
	4451	+ if(elem != group \|\| !newWindow)
4012	4452	{
4013	4453	// if (!(elem instanceof Composite))
4014	4454	// newWindow = false;
..	..	@@ -4098,7 +4538,6 @@
4098	4538	//case 702: // Event.LIST_DESELECT
4099	4539	group.deselectAll();
4100	4540	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4101		- objEditor.ClearInfo(); // .GetMaterial());
4102	4541	if (tps != null)
4103	4542	{
4104	4543	for (int i=0; i < tps.length; i++)
..	..	@@ -4107,29 +4546,28 @@
4107	4546
4108	4547	//if (child.parent != null)
4109	4548	//child.parent.addSelectee(child);
	4549	+ objEditor.SetMaterial(child);
4110	4550	group.addSelectee(child);
4111		- objEditor.SetMaterial(child); // .GetMaterial());
4112		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4113		- System.err.println("info : " + child.GetPath());
4114	4551	}
4115	4552	}
4116		- else
4117		- {
4118		- objEditor.SetMaterial(group); // .GetMaterial());
4119		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4120		- System.err.println("info : " + group.GetPath());
4121		- }
	4553	+// else
	4554	+// {
	4555	+// objEditor.SetMaterial(group); // .GetMaterial());
	4556	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4557	+// System.err.println("info : " + group.GetPath());
	4558	+// }
4122	4559
4123		- objEditor.SetText(); // jan 2014
4124		-
4125		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4560	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4126	4561	CameraPane.flash = true;
4127	4562
4128		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4563	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4129	4564	// a camera
4130	4565	{
4131		- CameraPane.camerachangeframe = 0; // don't refuse it
4132		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4566	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4567	+ {
	4568	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4569	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4570	+ }
4133	4571	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4134	4572	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4135	4573	}
..	..	@@ -4142,6 +4580,26 @@
4142	4580
4143	4581	freezemodel = false;
4144	4582	}
	4583	+
	4584	+ void refreshContents(boolean cp)
	4585	+ {
	4586	+ if (!Globals.MOUSEDRAGGED)
	4587	+ {
	4588	+ objEditor.ClearInfo(); // .GetMaterial());
	4589	+
	4590	+ for (int i=0; i < group.selection.Size(); i++)
	4591	+ {
	4592	+ Object3D child = (Object3D) group.selection.get(i);
	4593	+
	4594	+ objEditor.AddInfo(child, this, true);
	4595	+ System.err.println("info : " + child.GetPath());
	4596	+ }
	4597	+
	4598	+ objEditor.SetText(); // jan 2014
	4599	+ }
	4600	+
	4601	+ super.refreshContents(cp);
	4602	+ }
4145	4603
4146	4604	void linkSomething(Object3D thing)
4147	4605	{
..	..	@@ -4213,16 +4671,19 @@
4213	4671	{
4214	4672	if (group.selection.isEmpty())
4215	4673	return;
4216		- GrafreeD.clipboardIsTempGroup = false;
	4674	+
	4675	+ Grafreed.clipboardIsTempGroup = false;
4217	4676	Composite tGroup = null;
4218	4677	if (group.selection.size() > 0) // 1)
4219	4678	{
4220	4679	tGroup = new cGroup();
4221		- GrafreeD.clipboardIsTempGroup = true;
	4680	+ Grafreed.clipboardIsTempGroup = true;
4222	4681	}
4223	4682
4224	4683	if (cut)
4225	4684	{
	4685	+ if (Globals.SAVEONMAKE)
	4686	+ Save();
4226	4687	//int indices[] = jList.getSelectedIndices();
4227	4688	//for (int i = indices.length - 1; i >= 0; i--)
4228	4689	//jList.remove(indices[i]);
..	..	@@ -4258,16 +4719,16 @@
4258	4719	//System.out.println("cut " + child);
4259	4720	//System.out.println("parent = " + child.parent);
4260	4721	// tmp.addChild(child);
4261		- if (GrafreeD.clipboardIsTempGroup)
	4722	+ if (Grafreed.clipboardIsTempGroup)
4262	4723	tGroup.add/Child/(tmp);
4263	4724	else
4264		- GrafreeD.clipboard = tmp;
	4725	+ Grafreed.clipboard = tmp;
4265	4726	}
4266	4727	else
4267		- if (GrafreeD.clipboardIsTempGroup)
	4728	+ if (Grafreed.clipboardIsTempGroup)
4268	4729	tGroup.add/Child/(child);
4269	4730	else
4270		- GrafreeD.clipboard = child;
	4731	+ Grafreed.clipboard = child;
4271	4732	}
4272	4733
4273	4734	//ResetModel();
..	..	@@ -4299,21 +4760,23 @@
4299	4760	//System.out.println("cut " + elem);
4300	4761	//System.out.println("parent = " + elem.parent);
4301	4762	// tmp.addChild(elem);
4302		- if (GrafreeD.clipboardIsTempGroup)
	4763	+ if (Grafreed.clipboardIsTempGroup)
4303	4764	tGroup.add/Child/(tmp);
4304	4765	else
4305		- GrafreeD.clipboard = tmp;
	4766	+ Grafreed.clipboard = tmp;
4306	4767	}
4307	4768	else
4308		- if (GrafreeD.clipboardIsTempGroup)
	4769	+ if (Grafreed.clipboardIsTempGroup)
4309	4770	tGroup.add/Child/(child);
4310	4771	else
4311		- GrafreeD.clipboard = child;
	4772	+ Grafreed.clipboard = child;
4312	4773	}
4313	4774
4314	4775	}
4315		- if (GrafreeD.clipboardIsTempGroup)
4316		- GrafreeD.clipboard = tGroup;
	4776	+
	4777	+ if (Grafreed.clipboardIsTempGroup)
	4778	+ Grafreed.clipboard = tGroup;
	4779	+
4317	4780	if (cut)
4318	4781	{
4319	4782	ResetModel();
..	..	@@ -4327,7 +4790,7 @@
4327	4790	// return;
4328	4791	boolean first = true;
4329	4792
4330		- if (GrafreeD.clipboardIsTempGroup)
	4793	+ if (Grafreed.clipboardIsTempGroup)
4331	4794	{
4332	4795	Composite temp;
4333	4796
..	..	@@ -4338,7 +4801,7 @@
4338	4801	temp = (Composite)Applet3D.clipboard.deepCopy();
4339	4802	*/
4340	4803	Object3D elem;
4341		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4804	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4342	4805	{
4343	4806	Object3D child = (Object3D)e.nextElement();
4344	4807
..	..	@@ -4372,21 +4835,21 @@
4372	4835	//Object3D cb = Applet3D.clipboard;
4373	4836	//temp.addChild(cb);
4374	4837	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4375		- assert(GrafreeD.clipboard.parent == null);
4376		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4377		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4378		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4379		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	4838	+ assert(Grafreed.clipboard.parent == null);
	4839	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4840	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4841	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4842	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4380	4843	else
4381		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4382		- GrafreeD.clipboard.get(0).parent = keepparent;
	4844	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4845	+ Grafreed.clipboard.get(0).parent = keepparent;
4383	4846	}
4384	4847
4385	4848	ResetModel();
4386	4849	refreshContents();
4387	4850	}
4388	4851
4389		- void pasteInto(boolean copyit)
	4852	+ void pasteInto(boolean copyit, boolean clone)
4390	4853	{
4391	4854	// if (GrafreeD.clipboard == null)
4392	4855	// return;
..	..	@@ -4415,15 +4878,22 @@
4415	4878	if (copyit)
4416	4879	{
4417	4880	// paste(false);
4418		- CloneClipboard(false); // sept 2014
	4881	+ if (clone)
	4882	+ {
	4883	+ CloneClipboard(false); // sept 2014
	4884	+ }
	4885	+ else
	4886	+ {
	4887	+ paste(false);
	4888	+ }
4419	4889	}
4420	4890	else
4421	4891	{
4422	4892	boolean first = true;
4423	4893
4424		- if (GrafreeD.clipboardIsTempGroup)
	4894	+ if (Grafreed.clipboardIsTempGroup)
4425	4895	{
4426		- Composite temp = (Composite)GrafreeD.clipboard;
	4896	+ Composite temp = (Composite)Grafreed.clipboard;
4427	4897	Object3D copy;
4428	4898	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4429	4899	{
..	..	@@ -4433,7 +4903,7 @@
4433	4903	}
4434	4904	} else
4435	4905	{
4436		- linkSomething(GrafreeD.clipboard); //.get(0));
	4906	+ linkSomething(Grafreed.clipboard); //.get(0));
4437	4907	}
4438	4908	}
4439	4909	}
..	..	@@ -4838,21 +5308,6 @@
4838	5308	}
4839	5309	*/
4840	5310
4841		- void ImportGFD()
4842		- {
4843		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4844		- browser.show();
4845		- String filename = browser.getFile();
4846		- if (filename != null && filename.length() > 0)
4847		- {
4848		- String fullname = browser.getDirectory() + filename;
4849		-
4850		- //Object3D readobj =
4851		- objEditor.ReadGFD(fullname, objEditor);
4852		- //makeSomething(readobj);
4853		- }
4854		- }
4855		-
4856	5311	/*
4857	5312	public void Callback(Object obj)
4858	5313	{
..	..	@@ -4876,26 +5331,9 @@
4876	5331	}
4877	5332	*/
4878	5333
4879		- void ImportVRMLX3D()
4880		- {
4881		- if (GrafreeD.standAlone)
4882		- {
4883		- /**/
4884		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4885		- browser.show();
4886		- String filename = browser.getFile();
4887		- if (filename != null && filename.length() > 0)
4888		- {
4889		- String fullname = browser.getDirectory() + filename;
4890		- LoadVRMLX3D(fullname);
4891		- }
4892		- /**/
4893		- }
4894		- }
4895		-
4896	5334	String GetFile(String dialogName)
4897	5335	{
4898		- if (GrafreeD.standAlone)
	5336	+ if (Grafreed.standAlone)
4899	5337	{
4900	5338	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4901	5339	browser.show();
..	..	@@ -4959,10 +5397,33 @@
4959	5397	cButton flashSelectionButton;
4960	5398	cButton editButton;
4961	5399	cButton uneditButton;
	5400	+ JCheckBox allParamsButton;
4962	5401	cButton clearpanelButton;
4963		- cButton allParamsButton;
4964	5402	cButton unselectButton;
4965	5403
	5404	+ cButton minButton;
	5405	+ cButton maxButton;
	5406	+ cButton fullButton;
	5407	+ cButton undoButton;
	5408	+ cButton redoButton;
	5409	+ cButton saveButton;
	5410	+ cButton oneStepButton;
	5411	+
	5412	+ cButton groupButton;
	5413	+ cButton ungroupButton;
	5414	+ cButton compositeButton;
	5415	+
	5416	+ cButton gridButton;
	5417	+ cButton boxButton;
	5418	+ cButton sphereButton;
	5419	+ cButton coneButton;
	5420	+ cButton torusButton;
	5421	+ cButton superButton;
	5422	+ cButton kleinButton;
	5423	+ cButton particlesButton;
	5424	+ cButton overlayButton;
	5425	+ cButton lightButton;
	5426	+
4966	5427	cButton screenfitButton;
4967	5428	cButton screenfitpointButton;
4968	5429	cButton snapobjectButton;
..	..	@@ -4973,14 +5434,6 @@
4973	5434	cButton closeButton;
4974	5435
4975	5436	cButton setsupportButton;
4976		-
4977		- cButton twoButton;
4978		- cButton sixButton;
4979		- cButton threeButton;
4980		- cButton sevenButton;
4981		- cButton fourButton; // full panel
4982		- cButton oneButton; // full XYZ
4983		- //cButton currentLayout;
4984	5437
4985	5438	//
4986	5439	//Composite
..	..	@@ -4993,7 +5446,9 @@
4993	5446	private MenuItem lookFromItem;
4994	5447	private MenuItem switchItem;
4995	5448	private MenuItem cutItem;
4996		- private MenuItem duplicateItem;
	5449	+ private MenuItem undoItem;
	5450	+ private MenuItem redoItem;
	5451	+ private JMenuItem duplicateItem;
4997	5452	private MenuItem cloneItem;
4998	5453	private MenuItem cloneSupportItem;
4999	5454	private MenuItem overwriteGeoItem;
..	..	@@ -5006,7 +5461,7 @@
5006	5461	private MenuItem linkverticesItem;
5007	5462	private MenuItem relinkverticesItem;
5008	5463	private MenuItem setMasterItem;
5009		- private MenuItem resetMeshItem;
	5464	+ private MenuItem resetAllItem;
5010	5465	private MenuItem stepAllItem;
5011	5466	private MenuItem revertMeshItem;
5012	5467	private MenuItem poseMeshItem;
..	..	@@ -5017,6 +5472,7 @@
5017	5472	private MenuItem mergeGeometriesItem;
5018	5473	private MenuItem copyItem;
5019	5474	private MenuItem pasteItem;
	5475	+ private MenuItem pasteIntoItem;
5020	5476	private MenuItem pasteLinkItem;
5021	5477	private MenuItem pasteCloneItem;
5022	5478	private MenuItem pasteExpandItem;
..	..	@@ -5055,6 +5511,10 @@
5055	5511	private MenuItem showleavesItem;
5056	5512	private MenuItem markleavesItem;
5057	5513	private MenuItem unmarkleavesItem;
	5514	+ private MenuItem rewindleavesItem;
	5515	+ private MenuItem unrewindleavesItem;
	5516	+ private MenuItem randomleavesItem;
	5517	+ private MenuItem unrandomleavesItem;
5058	5518
5059	5519	private MenuItem flipVItem;
5060	5520	private MenuItem unflipVItem;
..	..	@@ -5066,8 +5526,10 @@
5066	5526	private MenuItem panoTexturesItem;
5067	5527
5068	5528	private MenuItem resetCentroidItem;
5069		- private MenuItem transformgeometryItem;
	5529	+ private MenuItem resetCentroidXZItem;
5070	5530	private MenuItem resetTransformItem;
	5531	+ private MenuItem transformGeometryItem;
	5532	+ private MenuItem transformChildrenItem;
5071	5533	private MenuItem hideItem;
5072	5534	private MenuItem grabItem;
5073	5535	private MenuItem backItem;
..	..	@@ -5114,7 +5576,7 @@
5114	5576	private MenuItem blobItem;
5115	5577	private MenuItem latheItem;
5116	5578	private MenuItem bezierItem;
5117		- private MenuItem checkerItem;
	5579	+ private MenuItem overlayItem;
5118	5580	private MenuItem meshItem;
5119	5581	// private MenuItem meshGroupItem;
5120	5582	private MenuItem springItem;
..	..	@@ -5136,11 +5598,6 @@
5136	5598	private MenuItem doubleItem;
5137	5599	private MenuItem tripleItem;
5138	5600
5139		- private MenuItem importGFDItem;
5140		- private MenuItem importVRMLX3DItem;
5141		- private MenuItem import3DSItem;
5142		- private MenuItem importOBJItem;
5143		-
5144	5601	private MenuItem computeAOItem;
5145	5602	private MenuItem recompileItem;
5146	5603	private MenuItem editScriptItem;
..	..	@@ -5150,4 +5607,8 @@
5150	5607	private MenuItem analyzeItem;
5151	5608	private MenuItem dumpItem;
5152	5609	//boolean freezemodel = false;
	5610	+
	5611	+ Menu cameraMenu;
	5612	+ MenuItem editCameraItem;
	5613	+ MenuItem revertCameraItem;
5153	5614	}