~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -60,6 +60,12 @@
60	60	this.copy = this.group = group;
61	61	//selectees = this.group.selectees;
62	62
	63	+ if (copy.versions == null)
	64	+ {
	65	+ copy.versions = new byte[100][];
	66	+ copy.versionindex = -1;
	67	+ }
	68	+
63	69	if(ui)
64	70	SetupUI(objEditor);
65	71	}
..	..	@@ -74,16 +80,28 @@
74	80	this.copy = this.group = copy;
75	81	//selectees = this.group.selectees;
76	82
77		- SetupMenu2(objEditor);
	83	+ SetupMenu2(this); //objEditor);
78	84	SetupUI2(objEditor);
79	85	objEditor.SetupUI(true);
80	86	SetupViews(objEditor);
81	87
82	88	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	89	+
	90	+ if (copy.versions == null)
	91	+ {
	92	+ copy.versions = new byte[100][];
	93	+ copy.versionindex = -1;
	94	+
	95	+ Save(true);
	96	+ }
83	97	}
84	98
85	99	void CloneSelection(boolean supports)
86	100	{
	101	+ if (Globals.REPLACEONMAKE)
	102	+ Save();
	103	+ boolean keep = Globals.REPLACEONMAKE;
	104	+ Globals.REPLACEONMAKE = false;
87	105	// Object3D keep = GrafreeD.clipboard;
88	106	//Object3D obj;
89	107	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,18 +112,19 @@
94	112
95	113	makeSomething(clone, i==group.selection.size()-1);
96	114	}
	115	+ Globals.REPLACEONMAKE = keep;
97	116	}
98	117
99	118	void CloneClipboard(boolean supports)
100	119	{
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));
	120	+ assert(Grafreed.clipboard.parent == null);
	121	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	122	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	123	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	124	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
106	125	else
107		- makeSomething(CloneObject(GrafreeD.clipboard, false));
108		- GrafreeD.clipboard.get(0).parent = keepparent;
	126	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	127	+ Grafreed.clipboard.get(0).parent = keepparent;
109	128	}
110	129
111	130	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -119,7 +138,7 @@
119	138	// obj.support = null;
120	139	if (!supports)
121	140	obj.SaveSupports();
122		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	141	+ Object3D clone = (Object3D)Grafreed.clone(obj);
123	142	obj.parent = parent;
124	143	// obj.support = support;
125	144	// clone.support = support; // aout 2013
..	..	@@ -148,30 +167,29 @@
148	167
149	168	//JTextField nameField;
150	169
151		- void SetupMenu2(ObjEditor oe)
	170	+ void SetupMenu2(GroupEditor oe)
152	171	{
153		- oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
154		- //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
155		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
156		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
157		- oe.cameraMenu.add("-");
158		- openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
159		- openWindowItem.addActionListener(this);
160		- editLeafItem.addActionListener(this);
161		- lookAtItem.addActionListener(this);
162		- //lookFromItem.addActinoListener(this);
163		- //switchItem.addActionListener(this);
	172	+ oe.jTree = new cTree();
	173	+
164	174	Menu menu;
165	175	oe.menuBar.add(menu = new Menu("Edit"));
166	176	//editItem = menu.add(new MenuItem("Edit"));
167	177	//editItem.addActionListener(this);
168		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	178	+
	179	+// undoItem = menu.add(new MenuItem("Undo"));
	180	+// undoItem.addActionListener(this);
	181	+// redoItem = menu.add(new MenuItem("Redo"));
	182	+// redoItem.addActionListener(this);
	183	+// menu.add("-");
	184	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
169	185	duplicateItem.addActionListener(this);
170		- menu.add("-");
171	186	cloneItem = menu.add(new MenuItem("Clone"));
172	187	cloneItem.addActionListener(this);
	188	+ if (Globals.ADVANCED)
	189	+ {
173	190	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
174	191	cloneSupportItem.addActionListener(this);
	192	+ }
175	193	menu.add("-");
176	194	cutItem = menu.add(new MenuItem("Cut"));
177	195	cutItem.addActionListener(this);
..	..	@@ -179,27 +197,123 @@
179	197	copyItem.addActionListener(this);
180	198	pasteItem = menu.add(new MenuItem("Paste"));
181	199	pasteItem.addActionListener(this);
	200	+
	201	+ menu.add("-");
	202	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	203	+ pasteIntoItem.addActionListener(this);
182	204	pasteLinkItem = menu.add(new MenuItem("Paste link"));
183	205	pasteLinkItem.addActionListener(this);
184	206	pasteCloneItem = menu.add(new MenuItem("Paste clone"));
185	207	pasteCloneItem.addActionListener(this);
186	208	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
187	209	// pasteExpandItem.addActionListener(this);
188		- clearItem = menu.add(new MenuItem("Clear"));
189		- clearItem.addActionListener(this);
	210	+ menu.add("-");
	211	+ deleteItem = menu.add(new MenuItem("Delete"));
	212	+ deleteItem.addActionListener(this);
	213	+
	214	+ if (Globals.ADVANCED)
	215	+ {
	216	+ // Deletes the cameras...
190	217	clearAllItem = menu.add(new MenuItem("Clear All"));
191	218	clearAllItem.addActionListener(this);
	219	+ }
	220	+
	221	+ menuBar.add(cameraMenu = new Menu("View"));
	222	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	223	+ //zBufferItem.addActionListener(this);
	224	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	225	+ //normalLensItem.addActionListener(this);
	226	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	227	+ restoreCameraItem.addActionListener(this);
	228	+
	229	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	230	+// toggleFullScreenItem.addItemListener(this);
	231	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	232	+// cameraMenu.add("-");
	233	+//
	234	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	235	+// toggleTextureItem.addItemListener(this);
	236	+// toggleTextureItem.setState(CameraPane.textureon);
	237	+//
	238	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	239	+// toggleSwitchItem.addItemListener(this);
	240	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	241	+
	242	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	243	+ toggleHandleItem.addItemListener(this);
	244	+ toggleHandleItem.setState(CameraPane.HANDLES);
	245	+
	246	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	247	+ togglePaintItem.addItemListener(this);
	248	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	249	+
	250	+ if (Globals.ADVANCED)
	251	+ {
	252	+ cameraMenu.add("-");
	253	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	254	+ toggleLiveItem.addItemListener(this);
	255	+ toggleLiveItem.setState(Globals.isLIVE());
192	256
	257	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	258	+ stepItem.addActionListener(this);
	259	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	260	+ // toggleDLItem.addItemListener(this);
	261	+ // toggleDLItem.setState(false);
	262	+
	263	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	264	+ toggleRenderItem.addItemListener(this);
	265	+ toggleRenderItem.setState(!CameraPane.frozen);
	266	+
	267	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	268	+ toggleDebugItem.addItemListener(this);
	269	+ toggleDebugItem.setState(Globals.DEBUG);
	270	+
	271	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	272	+ toggleFrustumItem.addItemListener(this);
	273	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	274	+
	275	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	276	+ toggleFootContactItem.addItemListener(this);
	277	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	278	+
	279	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	280	+ toggleTimelineItem.addItemListener(this);
	281	+ }
	282	+
	283	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	284	+// toggleRootItem.addItemListener(this);
	285	+// toggleRootItem.setState(false);
	286	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	287	+// animationItem.addItemListener(this);
	288	+// animationItem.setState(CameraPane.ANIMATION);
	289	+ cameraMenu.add("-");
	290	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	291	+ editCameraItem.addActionListener(this);
	292	+
	293	+ if (Globals.ADVANCED)
	294	+ {
	295	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	296	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	297	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	298	+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	299	+ oe.cameraMenu.add("-");
	300	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	301	+ openWindowItem.addActionListener(this);
	302	+ editLeafItem.addActionListener(this);
	303	+ lookAtItem.addActionListener(this);
	304	+ //lookFromItem.addActinoListener(this);
	305	+ //switchViewItem.addActionListener(this);
	306	+ }
	307	+
193	308	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);
	309	+ if (Globals.ADVANCED)
	310	+ {
198	311	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
199	312	revertMeshItem.addActionListener(this);
200	313	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
201	314	resetreferencesItem.addActionListener(this);
202	315	menu.add("-");
	316	+ }
203	317	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
204	318	overwriteGeoItem.addActionListener(this);
205	319	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -211,79 +325,104 @@
211	325	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
212	326	overwriteUVItem.addActionListener(this);
213	327	menu.add("-");
	328	+ if (Globals.ADVANCED)
	329	+ {
214	330	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
215	331	generateMeshItem.addActionListener(this);
216	332	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
217	333	poseMeshItem.addActionListener(this);
218	334	menu.add("-");
	335	+ }
219	336	resetsupportItem = menu.add(new MenuItem("Reset support"));
220	337	resetsupportItem.addActionListener(this);
221	338	linkverticesItem = menu.add(new MenuItem("Link to Support"));
222	339	linkverticesItem.addActionListener(this);
223	340	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
224	341	relinkverticesItem.addActionListener(this);
	342	+
	343	+ if (Globals.ADVANCED)
	344	+ {
225	345	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
226	346	setMasterItem.addActionListener(this);
	347	+ }
227	348
228	349	oe.menuBar.add(menu = new Menu("Group"));
229		- grabItem = menu.add(new MenuItem("Grab"));
230		- grabItem.addActionListener(this);
	350	+// grabItem = menu.add(new MenuItem("Grab"));
	351	+// grabItem.addActionListener(this);
231	352	backItem = menu.add(new MenuItem("Back"));
232	353	backItem.addActionListener(this);
233	354	frontItem = menu.add(new MenuItem("Front"));
234	355	frontItem.addActionListener(this);
235		- compositeItem = menu.add(new MenuItem("Composite"));
236		- compositeItem.addActionListener(this);
237		- hideItem = menu.add(new MenuItem("Hide"));
	356	+// compositeItem = menu.add(new MenuItem("Composite"));
	357	+// compositeItem.addActionListener(this);
	358	+
	359	+ if (Globals.ADVANCED)
	360	+ {
	361	+ hideItem = menu.add(new MenuItem("Hidden Group"));
238	362	hideItem.addActionListener(this);
	363	+ }
239	364	ungroupItem = menu.add(new MenuItem("Ungroup"));
240	365	ungroupItem.addActionListener(this);
241		- menu.add("-");
242		- randomItem = menu.add(new MenuItem("Random"));
243		- 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);
	366	+
	367	+// menu.add("-");
	368	+//
	369	+// switchItem = menu.add(new MenuItem("Switch node"));
	370	+// switchItem.addActionListener(this);
	371	+ if (Globals.ADVANCED)
	372	+ {
248	373	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
249	374	switchGeoItem.addActionListener(this);
250	375	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
251	376	switchTransfoItem.addActionListener(this);
252		- morphItem = menu.add(new MenuItem("Morph"));
	377	+ morphItem = menu.add(new MenuItem("Morph Group"));
253	378	morphItem.addActionListener(this);
	379	+
	380	+ menu.add("-");
	381	+ physicsItem = menu.add(new MenuItem("Physics"));
	382	+ physicsItem.addActionListener(this);
	383	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	384	+ frameselectorItem.addActionListener(this);
254	385	scriptNodeItem = menu.add(new MenuItem("Script Node"));
255	386	scriptNodeItem.addActionListener(this);
256		- cameraItem = menu.add(new MenuItem("Camera"));
257		- cameraItem.addActionListener(this);
	387	+ }
258	388
259	389	oe.menuBar.add(menu = new Menu("Object"));
260		- textureItem = menu.add(new MenuItem("Texture"));
261		- textureItem.addActionListener(this);
	390	+// textureItem = menu.add(new MenuItem("Texture"));
	391	+// textureItem.addActionListener(this);
262	392	billboardItem = menu.add(new MenuItem("Billboard"));
263	393	billboardItem.addActionListener(this);
264	394	csgItem = menu.add(new MenuItem("CSG"));
265	395	csgItem.addActionListener(this);
266		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	396	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
267	397	shadowXItem.addActionListener(this);
268		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	398	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
269	399	shadowYItem.addActionListener(this);
270		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	400	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
271	401	shadowZItem.addActionListener(this);
	402	+ attributeItem = menu.add(new MenuItem("Attribute"));
	403	+ attributeItem.addActionListener(this);
	404	+
	405	+ if (Globals.ADVANCED)
	406	+ {
	407	+ menu.add("-");
272	408	linkerItem = menu.add(new MenuItem("Linker"));
273	409	linkerItem.addActionListener(this);
274	410	templateItem = menu.add(new MenuItem("Template"));
275	411	templateItem.addActionListener(this);
276		- attributeItem = menu.add(new MenuItem("Attribute"));
277		- attributeItem.addActionListener(this);
278	412	pointflowItem = menu.add(new MenuItem("Point Flow"));
279	413	pointflowItem.addActionListener(this);
	414	+ }
280	415	menu.add("-");
281	416	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
282	417	resetTransformItem.addActionListener(this);
283	418	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
284	419	resetCentroidItem.addActionListener(this);
285		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
286		- transformgeometryItem.addActionListener(this);
	420	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	421	+ resetCentroidXZItem.addActionListener(this);
	422	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	423	+ transformGeometryItem.addActionListener(this);
	424	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	425	+ transformChildrenItem.addActionListener(this);
287	426
288	427	oe.menuBar.add(menu = new Menu("Geometry"));
289	428	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -294,8 +433,11 @@
294	433	genNormalsCADItem.addActionListener(this);
295	434	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
296	435	genNormalsMESHItem.addActionListener(this);
297		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	436	+ if (Globals.ADVANCED)
	437	+ {
	438	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
298	439	genNormalsMINEItem.addActionListener(this);
	440	+ }
299	441	stripifyItem = menu.add(new MenuItem("Stripify"));
300	442	stripifyItem.addActionListener(this);
301	443	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -317,23 +459,34 @@
317	459	reduce34MeshItem.addActionListener(this);
318	460	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
319	461	increaseMeshItem.addActionListener(this);
320		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
321		- smoothMeshItem.addActionListener(this);
322	462	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
323	463	clipMeshItem.addActionListener(this);
	464	+
	465	+ if (Globals.ADVANCED)
	466	+ {
	467	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	468	+ smoothMeshItem.addActionListener(this);
	469	+ }
324	470
325	471	oe.menuBar.add(menu = new Menu("Attributes"));
326	472	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
327	473	clearMaterialsItem.addActionListener(this);
	474	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	475	+ resetAllItem.addActionListener(this);
	476	+ stepAllItem = menu.add(new MenuItem("Step All"));
	477	+ stepAllItem.addActionListener(this);
328	478	menu.add("-");
329	479	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
330	480	liveleavesItem.addActionListener(this);
331	481	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
332	482	unliveleavesItem.addActionListener(this);
	483	+ if (Globals.ADVANCED)
	484	+ {
333	485	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
334	486	supportleavesItem.addActionListener(this);
335	487	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
336	488	unsupportleavesItem.addActionListener(this);
	489	+ }
337	490	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
338	491	hideleavesItem.addActionListener(this);
339	492	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -342,6 +495,14 @@
342	495	markleavesItem.addActionListener(this);
343	496	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
344	497	unmarkleavesItem.addActionListener(this);
	498	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	499	+ rewindleavesItem.addActionListener(this);
	500	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	501	+ unrewindleavesItem.addActionListener(this);
	502	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	503	+ randomleavesItem.addActionListener(this);
	504	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	505	+ unrandomleavesItem.addActionListener(this);
345	506	menu.add("-");
346	507	flipVItem = menu.add(new MenuItem("Flip V"));
347	508	flipVItem.addActionListener(this);
..	..	@@ -377,35 +538,41 @@
377	538	sortbynameItem = menu.add(new MenuItem("Sort by name"));
378	539	sortbynameItem.addActionListener(this);
379	540	menu.add("-");
	541	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	542	+ shareGeometriesItem.addActionListener(this);
	543	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	544	+ mergeGeometriesItem.addActionListener(this);
	545	+ if (Globals.ADVANCED)
	546	+ {
	547	+ // Pretty much the same as duplicate and clone.
380	548	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
381	549	extractGeometriesItem.addActionListener(this);
382	550	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
383	551	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);
	552	+ }
388	553
389	554	oe.menuBar.add(menu = new Menu("Insert"));
390	555	buildCreateMenu(menu);
391	556
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	557	oe.menuBar.add(menu = new Menu("Tools"));
404	558	buildToolsMenu(menu);
405	559	}
406	560
	561	+
407	562	void SetupUI2(ObjEditor oe)
408	563	{
	564	+ // June 2019
	565	+ if (oe == null)
	566	+ {
	567	+ //super.SetupUI2(this);
	568	+ //return;
	569	+ }
	570	+
	571	+ if (copy != group)
	572	+ {
	573	+ //super.SetupUI2(this);
	574	+ }
	575	+
409	576	//new Exception().printStackTrace();
410	577
411	578	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -434,92 +601,230 @@
434	601	oe.radioPanel.add(dummyButton);
435	602	oe.buttonGroup.add(dummyButton);
436	603	*/
	604	+ cGridBag copyOptionsPanel = new cGridBag();
	605	+
	606	+ copyOptionsPanel.preferredHeight = 1;
	607	+
437	608	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
438	609
439		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
440		- liveCB.setToolTipText("Enabled animation");
441		- liveCB.addItemListener(this);
442		-
443		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
444		- trackCB.setToolTipText("Enable tracking");
445		- trackCB.addItemListener(this);
446		-
447		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	610	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	611	+ //minButton.setToolTipText("Minimize window");
	612	+ //minButton.addActionListener(this);
	613	+
	614	+ if (Globals.ADVANCED)
	615	+ {
	616	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	617	+ maxButton.setToolTipText("Maximize window");
	618	+ maxButton.addActionListener(this);
	619	+ }
	620	+
	621	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	622	+ fullButton.setToolTipText("Full-screen window");
	623	+ fullButton.addActionListener(this);
	624	+
	625	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
448	626	screenfitButton.setToolTipText("Screen fit");
449	627	screenfitButton.addActionListener(this);
450	628
	629	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	630	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	631	+ restoreCameraButton.addActionListener(this);
	632	+
	633	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	634	+ saveButton.setToolTipText("New version");
	635	+ saveButton.addActionListener(this);
	636	+
	637	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	638	+ undoButton.setToolTipText("Previous version");
	639	+ undoButton.addActionListener(this);
	640	+ undoButton.setEnabled(false);
	641	+
	642	+ cGridBag updown = new cGridBag().setVertical(true);
	643	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	644	+ restoreButton.setToolTipText("Restore current");
	645	+ restoreButton.addActionListener(this);
	646	+ restoreButton.setEnabled(false);
	647	+
	648	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	649	+ replaceButton.setToolTipText("Replace current");
	650	+ replaceButton.addActionListener(this);
	651	+ replaceButton.setEnabled(false);
	652	+
	653	+ copyOptionsPanel.add(updown);
	654	+
	655	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	656	+ redoButton.setToolTipText("Next version");
	657	+ redoButton.addActionListener(this);
	658	+ redoButton.setEnabled(false);
	659	+
	660	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	661	+ liveCB.setToolTipText("Enable animation");
	662	+ liveCB.addItemListener(this);
	663	+
	664	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	665	+ oneStepButton.setToolTipText("Animate one step forward");
	666	+ oneStepButton.addActionListener(this);
	667	+
	668	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	669	+ fastCB.setToolTipText("Fast mode");
	670	+ fastCB.addItemListener(this);
	671	+
	672	+ //oe.toolboxPanel.Return();
	673	+
	674	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	675	+// trackCB.setToolTipText("Enable tracking");
	676	+// trackCB.addItemListener(this);
	677	+
451	678	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
452	679	// 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	680
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");
466		- flashSelectionButton.addActionListener(this);
	681	+ if (Globals.ADVANCED)
	682	+ {
	683	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	684	+ snapobjectButton.addActionListener(this);
	685	+ snapobjectButton.setToolTipText("Snap Object");
	686	+ }
	687	+
	688	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
467	689
468		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
469		-
470		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
471		- twoButton.setToolTipText("Show center view only");
472		- twoButton.addActionListener(this);
473		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	690	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
474	691	fourButton.addActionListener(this);
475	692	fourButton.setToolTipText("Show left panel only");
476		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
477		- sixButton.setToolTipText("2-column layout left");
	693	+
	694	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	695	+ twoButton.setToolTipText("Show right view only");
	696	+ twoButton.addActionListener(this);
	697	+ this.fullscreenLayout = twoButton;
	698	+
	699	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	700	+ sixButton.setToolTipText("Show left and right");
478	701	sixButton.addActionListener(this);
479		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
480		- threeButton.setToolTipText("2-column layout right");
481		- threeButton.addActionListener(this);
482		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
483		- sevenButton.setToolTipText("3-column layout");
484		- sevenButton.addActionListener(this);
	702	+// oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	703	+// threeButton.setToolTipText("2-column layout right");
	704	+// threeButton.addActionListener(this);
	705	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	706	+// sevenButton.setToolTipText("3-column layout");
	707	+// sevenButton.addActionListener(this);
485	708	//
486	709
487		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
488		- rootButton.setToolTipText("Edit selection in new tab");
	710	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	711	+ rootButton.setToolTipText("Open selection in new tab");
489	712	rootButton.addActionListener(this);
490	713
491		- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	714	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
492	715	closeButton.setToolTipText("Close tab");
493	716	closeButton.addActionListener(this);
494	717	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
495	718	//clearButton.addActionListener(this);
496		-
497		- cGridBag commandsPanel = new cGridBag();
	719	+
	720	+ // INSERT
	721	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	722	+ gridButton.setToolTipText("Create grid");
	723	+ gridButton.addActionListener(this);
	724	+
	725	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	726	+ boxButton.setToolTipText("Create box");
	727	+ boxButton.addActionListener(this);
	728	+
	729	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	730	+ sphereButton.setToolTipText("Create sphere");
	731	+ sphereButton.addActionListener(this);
	732	+
	733	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	734	+ coneButton.setToolTipText("Create cone");
	735	+ coneButton.addActionListener(this);
	736	+
	737	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	738	+ torusButton.setToolTipText("Create torus");
	739	+ torusButton.addActionListener(this);
	740	+
	741	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	742	+ superButton.setToolTipText("Create superellipsoid");
	743	+ superButton.addActionListener(this);
	744	+
	745	+ if (Globals.ADVANCED)
	746	+ {
	747	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	748	+ kleinButton.setToolTipText("Create Klein bottle");
	749	+ kleinButton.addActionListener(this);
	750	+ }
498	751
499		- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
500		- editButton.setToolTipText("Edit selection");
	752	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	753	+ particlesButton.setToolTipText("Create particle system");
	754	+ particlesButton.addActionListener(this);
	755	+
	756	+ oe.toolboxPanel.Return();
	757	+
	758	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	759	+ groupButton.setToolTipText("Create group");
	760	+ groupButton.addActionListener(this);
	761	+
	762	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	763	+ compositeButton.setToolTipText("Create composite");
	764	+ compositeButton.addActionListener(this);
	765	+
	766	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	767	+ switchButton.setToolTipText("Create item switcher");
	768	+ switchButton.addActionListener(this);
	769	+
	770	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	771	+ loopButton.setToolTipText("Create loop");
	772	+ loopButton.addActionListener(this);
	773	+
	774	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	775	+ textureButton.setToolTipText("Create texture");
	776	+ textureButton.addActionListener(this);
	777	+
	778	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	779	+ overlayButton.setToolTipText("Create overlay");
	780	+ overlayButton.addActionListener(this);
	781	+
	782	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	783	+ lightButton.setToolTipText("Create light");
	784	+ lightButton.addActionListener(this);
	785	+
	786	+ for (int i=6; --i>=0;)
	787	+ {
	788	+ oe.toolboxPanel.Return();
	789	+ oe.toolboxPanel.add(new cGridBag());
	790	+ oe.toolboxPanel.add(new cGridBag());
	791	+ oe.toolboxPanel.add(new cGridBag());
	792	+ oe.toolboxPanel.add(new cGridBag());
	793	+ oe.toolboxPanel.add(new cGridBag());
	794	+ oe.toolboxPanel.add(new cGridBag());
	795	+ oe.toolboxPanel.add(new cGridBag());
	796	+ }
	797	+
	798	+ // EDIT panel
	799	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	800	+ editButton.setToolTipText("Pin selection controls");
501	801	editButton.addActionListener(this);
502	802
503		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
504		- uneditButton.setToolTipText("Unedit selection");
	803	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	804	+ uneditButton.setToolTipText("Remove selection controls");
505	805	uneditButton.addActionListener(this);
506	806
507		- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	807	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	808	+ allParamsButton.setToolTipText("Show all controle");
	809	+ allParamsButton.addActionListener(this);
	810	+
	811	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
508	812	clearPanelButton.setToolTipText("Clear edit panel");
509	813	clearPanelButton.addActionListener(this);
510	814
511		- commandsPanel.add(allParamsButton = new cButton("A", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
512		- allParamsButton.setToolTipText("All params??");
513		- allParamsButton.addActionListener(this);
514		-
515		- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	815	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
516	816	unselectButton.setToolTipText("Unselect");
517	817	unselectButton.addActionListener(this);
518	818
519		- commandsPanel.preferredHeight = 1;
	819	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	820	+ flashSelectionButton.setToolTipText("Highlight selection");
	821	+ flashSelectionButton.addActionListener(this);
520	822
521		- oe.treePanel.add(commandsPanel);
522		- oe.treePanel.Return();
	823	+ editCommandsPanel.preferredHeight = 1;
	824	+
	825	+ SetPinStates(false);
	826	+// oe.treePanel.add(commandsPanel);
	827	+// oe.treePanel.Return();
523	828
524	829	// oe.aConstraints.gridx += 1;
525	830	// oe.aConstraints.weighty = 0;
..	..	@@ -536,29 +841,17 @@
536	841
537	842	JScrollPane jSP;
538	843	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
539		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	844	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
540	845	ResetModel();
541	846
542	847	oe.treePanel.add(jSPPanel);
543	848	oe.treePanel.Return();
544	849
545		- cGridBag copyOptionsPanel = new cGridBag();
546		-
547		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
548		- colorCB.setToolTipText("Copy color when dropped");
549		- colorCB.addItemListener(this);
550		-
551		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
552		- materialCB.setToolTipText("Copy material when dropped");
553		- materialCB.addItemListener(this);
554		-
555		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
556		- textureCB.setToolTipText("Copy texture when dropped");
557		- textureCB.addItemListener(this);
558		-
559		- copyOptionsPanel.preferredHeight = 1;
560	850	oe.treePanel.add(copyOptionsPanel);
561	851	oe.treePanel.Return();
	852	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	853	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	854	+ sliderPane.preferredHeight = 1;
562	855
563	856	// mainPanel.setDividerLocation(0.5); //1.0);
564	857	// mainPanel.setResizeWeight(0.5);
..	..	@@ -581,53 +874,67 @@
581	874	dgr.addDragGestureListener(this);
582	875	}catch(Exception e) {}
583	876	*/
584		- radio.layout = sevenButton;
	877	+ radio.layout = sixButton; // sevenButton;
585	878	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
586	879	}
587	880
588	881	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
589	882	{
590		- //constraints.gridx = 0;
591		- //constraints.gridy = 0;
592		- panel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
593		- fastCB.setToolTipText("Fast mode");
594		- fastCB.addItemListener(this);
595		- //constraints.gridy += 1;
596		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
597		- supportCB.setToolTipText("Enabled rigging");
598		- supportCB.addItemListener(this);
	883	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	884	+ colorCB.setToolTipText("Copy color when dropped");
	885	+ colorCB.addItemListener(this);
599	886
600		- // constraints.gridy += 1;
	887	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	888	+ materialCB.setToolTipText("Copy material when dropped");
	889	+ materialCB.addItemListener(this);
	890	+
	891	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	892	+ textureCB.setToolTipText("Copy texture when dropped");
	893	+ textureCB.addItemListener(this);
	894	+
	895	+ panel.Return();
	896	+
	897	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	898	+ boxCB.setToolTipText("Display bounding boxes");
	899	+ boxCB.addItemListener(this);
	900	+
	901	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	902	+ zoomBoxCB.setToolTipText("Display only for wheel");
	903	+ zoomBoxCB.addItemListener(this);
	904	+
	905	+ if (true) // Globals.ADVANCED)
	906	+ {
	907	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	908	+// supportCB.setToolTipText("Enable rigging");
	909	+// supportCB.addItemListener(this);
	910	+
	911	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	912	+ freezeCB.setToolTipText("Fast moving camera");
	913	+ freezeCB.addItemListener(this);
	914	+
601	915	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
602	916	// localCB.addItemListener(this);
603	917
604		- //constraints.gridy += 1;
	918	+ panel.Return();
	919	+
605	920	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
606	921	crowdCB.setToolTipText("Used for crowds");
607	922	crowdCB.addItemListener(this);
608	923
609		- //constraints.gridy += 1;
610	924	panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
611	925	smoothCB.setToolTipText("Snapping delay");
612	926	smoothCB.addItemListener(this);
613	927
614		- //constraints.gridy += 1;
615	928	panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
616	929	slowCB.setToolTipText("Smooth interpolation");
617	930	slowCB.addItemListener(this);
618		- //constraints.gridy += 1;
619		- panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
620		- boxCB.setToolTipText("Display bounding boxes");
621		- boxCB.addItemListener(this);
622		- //constraints.gridy += 1;
623		- panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
624		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
625		- zoomBoxCB.addItemListener(this);
626		-
	931	+
627	932	// constraints.gridy += 1;
628	933	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
629	934	// speakerMocapCB.addItemListener(this);
630	935
	936	+ panel.Return();
	937	+
631	938	if (false)
632	939	{
633	940	// handled in scripts
..	..	@@ -642,42 +949,85 @@
642	949	//constraints.gridy += 1;
643	950	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
644	951	smoothfocusCB.addItemListener(this);
	952	+ panel.Return();
645	953	}
646	954
647	955	//constraints.gridx += 1;
648	956	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
649	957	// debugCB.addItemListener(this);
650	958
651		- //constraints.gridy += 1;
	959	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	960	+ trackCB.setToolTipText("Enable tracking target");
	961	+ trackCB.addItemListener(this);
	962	+
652	963	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	964	+ oeilCB.setToolTipText("Move camera when tracking");
653	965	oeilCB.addItemListener(this);
654	966
655		- //constraints.gridy += 1;
	967	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	968	+ shadowCB.setToolTipText("When live compute shadows");
	969	+ shadowCB.addItemListener(this);
	970	+
	971	+ panel.Return();
	972	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	973	+ toggleTextureCB.setToolTipText("Load textures");
	974	+ toggleTextureCB.addItemListener(this);
	975	+
	976	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	977	+ toggleSwitchCB.setToolTipText("Choose a single item");
	978	+ toggleSwitchCB.addItemListener(this);
	979	+
	980	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	981	+ autokeepCB.setToolTipText("On structure change");
	982	+ autokeepCB.addItemListener(this);
	983	+
	984	+ panel.Return();
	985	+ if (Globals.ADVANCED)
	986	+ {
656	987	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
657	988	lookAtCB.setToolTipText("Look-at target");
658	989	lookAtCB.addItemListener(this);
	990	+ }
	991	+
	992	+ }
659	993
660	994	cGridBag fill = new cGridBag();
661		-
662	995	fill.preferredHeight = 200;
	996	+ cGridBag fill2 = new cGridBag();
	997	+ fill2.preferredHeight = 200;
	998	+ cGridBag fill3 = new cGridBag();
	999	+ fill3.preferredHeight = 200;
663	1000
664	1001	panel.add(fill);
	1002	+ panel.add(fill2);
	1003	+ panel.add(fill3);
665	1004
666	1005	}
667	1006
668	1007	void EditObject(Object3D obj)
669	1008	{
670	1009	cRadio radioButton = new cRadio(obj.name);
	1010	+
	1011	+ // June 2019. Patch to avoid bug with transparency.
	1012	+ radioButton.hadMaterial = obj.material != null;
	1013	+ if (!radioButton.hadMaterial)
	1014	+ {
	1015	+ obj.material = new cMaterial();
	1016	+ }
	1017	+
671	1018	radioButton.SetObject(obj);
672		- radioButton.layout = sevenButton;
	1019	+ radioButton.layout = sixButton; // sevenButton;
673	1020	radioButton.SetCamera(cameraView.renderCamera, false);
674	1021	radioButton.addActionListener(this);
675	1022	radioPanel.add(radioButton);
676	1023	buttonGroup.add(radioButton);
677	1024	radioButton.doClick();
678	1025	}
	1026	+
679	1027	void SetupViews(ObjEditor oe)
680	1028	{
	1029	+ theFrame = this;
	1030	+
681	1031	oe.SetupViews();
682	1032
683	1033	System.out.println("SetupViews");
..	..	@@ -686,23 +1036,28 @@
686	1036	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
687	1037	}
688	1038
689		- JCheckBox liveCB;
690		- JCheckBox supportCB;
691		- JCheckBox localCB;
692		- JCheckBox crowdCB;
693		- JCheckBox smoothCB;
694		- JCheckBox fastCB;
695		- JCheckBox slowCB;
696		- JCheckBox boxCB;
697		- JCheckBox zoomBoxCB;
698		- JCheckBox trackCB;
699		- JCheckBox smoothfocusCB;
	1039	+ cToggleButton liveCB;
	1040	+ cCheckBox supportCB;
	1041	+ cCheckBox localCB;
	1042	+ cCheckBox crowdCB;
	1043	+ cCheckBox smoothCB;
	1044	+ cToggleButton fastCB;
	1045	+ cCheckBox slowCB;
	1046	+ cCheckBox boxCB;
	1047	+ cCheckBox zoomBoxCB;
	1048	+ cCheckBox freezeCB;
	1049	+ //cToggleButton trackCB;
	1050	+ cCheckBox trackCB;
	1051	+ cCheckBox smoothfocusCB;
700	1052	// JCheckBox speakerMocapCB;
701		- JCheckBox speakerCameraCB;
702		- JCheckBox speakerFocusCB;
703		- JCheckBox debugCB;
704		- JCheckBox oeilCB;
705		- JCheckBox lookAtCB;
	1053	+ cCheckBox speakerCameraCB;
	1054	+ cCheckBox speakerFocusCB;
	1055	+ cCheckBox debugCB;
	1056	+
	1057	+ cCheckBox oeilCB;
	1058	+ cCheckBox shadowCB;
	1059	+ cCheckBox autokeepCB;
	1060	+ cCheckBox lookAtCB;
706	1061
707	1062	// static int COLOR = 1;
708	1063	// static int MATERIAL = 2;
..	..	@@ -710,9 +1065,9 @@
710	1065
711	1066	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
712	1067
713		- JCheckBox colorCB;
714		- JCheckBox materialCB;
715		- JCheckBox textureCB;
	1068	+ cCheckBox colorCB;
	1069	+ cCheckBox materialCB;
	1070	+ cCheckBox textureCB;
716	1071
717	1072	public void itemStateChanged(ItemEvent e)
718	1073	{
..	..	@@ -740,6 +1095,7 @@
740	1095	} else if(e.getSource() == liveCB)
741	1096	{
742	1097	cameraView.ToggleLive();
	1098	+ refreshContents(false);
743	1099	}
744	1100	else if(e.getSource() == supportCB)
745	1101	{
..	..	@@ -804,6 +1160,18 @@
804	1160	{
805	1161	cameraView.ToggleOeil();
806	1162	}
	1163	+ else if(e.getSource() == shadowCB)
	1164	+ {
	1165	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1166	+ }
	1167	+ else if(e.getSource() == freezeCB)
	1168	+ {
	1169	+ Globals.FREEZEONMOVE ^= true;
	1170	+ }
	1171	+ else if(e.getSource() == autokeepCB)
	1172	+ {
	1173	+ Globals.REPLACEONMAKE ^= true;
	1174	+ }
807	1175	else if(e.getSource() == lookAtCB)
808	1176	{
809	1177	cameraView.ToggleLookAt();
..	..	@@ -820,7 +1188,8 @@
820	1188
821	1189	/**/
822	1190	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
823		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1191	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1192	+ TreePath path = objEditor.jTree.getSelectionPath();
824	1193	if ((path == null) \|\| (path.getPathCount() <= 1)) {
825	1194	// We can't move the root node or an empty selection
826	1195	return;
..	..	@@ -883,8 +1252,6 @@
883	1252	}
884	1253	}
885	1254
886		- String string = (String) object;
887		-
888	1255	System.out.println("Transfer = " + object + "; drop : " + target);
889	1256	// if( object instanceof java.io.File[])
890	1257	// {
..	..	@@ -892,7 +1259,11 @@
892	1259	// objEditor.DropFile((java.io.File[]) object, true);
893	1260	// return;
894	1261	// }
895		- if (string.charAt(0) == '/')
	1262	+
	1263	+ String string = object.toString();
	1264	+
	1265	+ // File path for Mac and Windows
	1266	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
896	1267	{
897	1268	// file(s)
898	1269	String[] names = string.split("\n");
..	..	@@ -919,7 +1290,7 @@
919	1290
920	1291	flashIt = false;
921	1292	CameraPane pane = (CameraPane) target;
922		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1293	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
923	1294	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
924	1295
925	1296	if (group.selection.size() == 1)
..	..	@@ -935,23 +1306,33 @@
935	1306
936	1307	assert target == objEditor.jTree;
937	1308	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1309	+ Object3D destinationLeaf;
938	1310	try {
939		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1311	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
940	1312	} catch (Exception e) {
941	1313	System.out.println("destinationPath : " + destinationPath);
942	1314	return;
943	1315	}
944	1316
945		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1317	+ for (int i=group.selection.size(); --i>=0;)
946	1318	{
	1319	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1320	+
	1321	+ // Cannot move into itself
	1322	+ if (child == destinationLeaf)
	1323	+ return;
	1324	+ }
	1325	+
	1326	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1327	+// {
947	1328	loadClipboard(true);
948	1329	objEditor.jTree.setSelectionPath(destinationPath);
949		- pasteInto(false);
950		- } else {
951		- loadClipboard(false);
952		- objEditor.jTree.setSelectionPath(destinationPath);
953		- pasteInto(false); // true); // ???
954		- }
	1330	+ pasteInto(false, false);
	1331	+// } else {
	1332	+// loadClipboard(false);
	1333	+// objEditor.jTree.setSelectionPath(destinationPath);
	1334	+// pasteInto(false, false); // true); // ???
	1335	+// }
955	1336	}
956	1337	public void dropActionChanged(DropTargetDragEvent dtde)
957	1338	// Called if the user has modified the current drop gesture
..	..	@@ -1056,85 +1437,107 @@
1056	1437	{
1057	1438	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1058	1439	//heightFieldItem.addActionListener(this);
1059		- gridItem = menu.add(new MenuItem("Grid"));
1060		- gridItem.addActionListener(this);
1061		- rectoidItem = menu.add(new MenuItem("Box"));
1062		- rectoidItem.addActionListener(this);
1063		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1064		- ellipsoidItem.addActionListener(this);
1065		- coneItem = menu.add(new MenuItem("Cone"));
1066		- coneItem.addActionListener(this);
1067		- torusItem = menu.add(new MenuItem("Torus"));
1068		- torusItem.addActionListener(this);
1069		- superItem = menu.add(new MenuItem("Superellipsoid"));
1070		- superItem.addActionListener(this);
	1440	+// gridItem = menu.add(new MenuItem("Grid"));
	1441	+// gridItem.addActionListener(this);
	1442	+// rectoidItem = menu.add(new MenuItem("Box"));
	1443	+// rectoidItem.addActionListener(this);
	1444	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1445	+// ellipsoidItem.addActionListener(this);
	1446	+// coneItem = menu.add(new MenuItem("Cone"));
	1447	+// coneItem.addActionListener(this);
	1448	+// torusItem = menu.add(new MenuItem("Torus"));
	1449	+// torusItem.addActionListener(this);
	1450	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1451	+// superItem.addActionListener(this);
	1452	+
	1453	+ cameraItem = menu.add(new MenuItem("Camera"));
	1454	+ cameraItem.addActionListener(this);
	1455	+
	1456	+ if (!Globals.ADVANCED)
	1457	+ {
1071	1458	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1072	1459	kleinItem.addActionListener(this);
1073		- particleItem = menu.add(new MenuItem("Particle system"));
1074		- particleItem.addActionListener(this);
	1460	+ }
	1461	+
	1462	+// particleItem = menu.add(new MenuItem("Particle system"));
	1463	+// particleItem.addActionListener(this);
	1464	+ if (Globals.ADVANCED)
	1465	+ {
1075	1466	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1076	1467	ragdollItem.addActionListener(this);
1077	1468	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1078	1469	ragdoll2Item.addActionListener(this);
	1470	+ }
1079	1471	menu.add("-");
1080		- meshItem = menu.add(new MenuItem("Mesh"));
	1472	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1081	1473	meshItem.addActionListener(this);
1082	1474	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1083	1475	// meshGroupItem.addActionListener(this);
	1476	+ if (Globals.ADVANCED)
	1477	+ {
1084	1478	springItem = menu.add(new MenuItem("Spring"));
1085	1479	springItem.addActionListener(this);
1086	1480	flagItem = menu.add(new MenuItem("Flag"));
1087	1481	flagItem.addActionListener(this);
1088		- bezierItem = menu.add(new MenuItem("Patch"));
1089		- bezierItem.addActionListener(this);
1090		- checkerItem = menu.add(new MenuItem("Checker"));
1091		- checkerItem.addActionListener(this);
1092	1482	blobItem = menu.add(new MenuItem("Blob"));
1093	1483	blobItem.addActionListener(this);
1094	1484	latheItem = menu.add(new MenuItem("Lathe"));
1095	1485	latheItem.addActionListener(this);
1096		- lightItem = menu.add(new MenuItem("Light"));
1097		- lightItem.addActionListener(this);
	1486	+ }
	1487	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1488	+ bezierItem.addActionListener(this);
	1489	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1490	+// overlayItem.addActionListener(this);
	1491	+// lightItem = menu.add(new MenuItem("Light"));
	1492	+// lightItem.addActionListener(this);
1098	1493	menu.add("-");
1099	1494	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1100	1495	//superLoopItem.addActionListener(this);
1101		- loopItem = menu.add(new MenuItem("Loop"));
1102		- loopItem.addActionListener(this);
	1496	+// loopItem = menu.add(new MenuItem("Loop"));
	1497	+// loopItem.addActionListener(this);
1103	1498	doubleItem = menu.add(new MenuItem("Fork"));
1104	1499	doubleItem.addActionListener(this);
	1500	+ if (Globals.ADVANCED)
	1501	+ {
1105	1502	tripleItem = menu.add(new MenuItem("Trident"));
1106	1503	tripleItem.addActionListener(this);
	1504	+ }
1107	1505	}
1108	1506
1109	1507	void buildToolsMenu(Menu menu)
1110	1508	{
1111	1509	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1112	1510	animationItem.addItemListener(this);
1113		- animationItem.setState(CameraPane.ANIMATION);
	1511	+ animationItem.setState(Globals.ANIMATION);
	1512	+
	1513	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1514	+ archiveItem.addActionListener(this);
1114	1515
1115	1516	menu.add("-");
1116	1517	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1117	1518	parseverticesItem.addActionListener(this);
1118	1519	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1119	1520	textureFieldItem.addActionListener(this);
1120		- alignItem = menu.add(new MenuItem("Align"));
	1521	+ alignItem = menu.add(new MenuItem("Align Objects"));
1121	1522	alignItem.addActionListener(this);
1122		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1123		- mirrorItem.addActionListener(this);
1124	1523	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1125	1524	reduceMorphItem.addActionListener(this);
1126	1525	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1127	1526	reduce34MorphItem.addActionListener(this);
1128		-
1129		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1130		- computeAOItem.addActionListener(this);
1131	1527	menu.add("-");
1132		-
1133	1528	menu.add(memoryItem = new MenuItem("Memory Usage"));
1134	1529	memoryItem.addActionListener(this);
	1530	+ menu.add(computeAOItem = new MenuItem("Compute AO"));
	1531	+ computeAOItem.addActionListener(this);
	1532	+
	1533	+ if (Globals.ADVANCED)
	1534	+ {
	1535	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1536	+ mirrorItem.addActionListener(this);
	1537	+ menu.add("-");
1135	1538	menu.add(analyzeItem = new MenuItem("Analyze"));
1136	1539	analyzeItem.addActionListener(this);
1137		- menu.add(dumpItem = new MenuItem("Dump"));
	1540	+ menu.add(dumpItem = new MenuItem("Print"));
1138	1541	dumpItem.addActionListener(this);
1139	1542	// menu.add(pathItem = new MenuItem("From-to path"));
1140	1543	// pathItem.addActionListener(this);
..	..	@@ -1152,6 +1555,7 @@
1152	1555	menu.add("-");
1153	1556	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1154	1557	editScriptItem.addActionListener(this);
	1558	+ }
1155	1559	}
1156	1560
1157	1561	void ScreenFit()
..	..	@@ -1274,9 +1678,34 @@
1274	1678	shadow.material = new cMaterial(obj.material);
1275	1679	shadow.material.diffuse = 0.0001f;
1276	1680	shadow.material.specular = 0.0001f;
	1681	+ //shadow.projectedVertices[1].x = 300;
1277	1682
1278	1683	makeSomething(shadow);
1279	1684	}
	1685	+
	1686	+ private void ClearUnpinned()
	1687	+ {
	1688	+ //for (Object3D obj : listUI)
	1689	+ for (int i=listUI.size(); --i>=0;)
	1690	+ {
	1691	+ Object3D obj = listUI.elementAt(i);
	1692	+ if (!obj.pinned)
	1693	+ {
	1694	+ obj.CloseUI();
	1695	+ listUI.remove(i);
	1696	+ }
	1697	+ }
	1698	+ }
	1699	+
	1700	+ private void EditElement(Object3D elem, boolean newWindow)
	1701	+ {
	1702	+ // if (!(elem instanceof Composite))
	1703	+ // newWindow = false;
	1704	+ listUI.add(elem);
	1705	+ elem.openEditWindow(this, newWindow); //, false);
	1706	+ System.out.println("edit : " + elem);
	1707	+ elem.editWindow.refreshContents(true); // ? new
	1708	+ }
1280	1709
1281	1710	/**
1282	1711	* applyExample
..	..	@@ -1480,9 +1909,9 @@
1480	1909
1481	1910	void Overwrite(int mask)
1482	1911	{
1483		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1912	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1484	1913	{
1485		- Object3D content = GrafreeD.clipboard.get(0);
	1914	+ Object3D content = Grafreed.clipboard.get(0);
1486	1915
1487	1916	if (content instanceof cGroup && ((cGroup)content).transientlink )
1488	1917	content = ((cGroup)content).get(0);
..	..	@@ -1521,7 +1950,7 @@
1521	1950	{
1522	1951	ScreenFit();
1523	1952	} else
1524		- if (source == switchItem)
	1953	+ if (source == switchViewItem)
1525	1954	{
1526	1955	cVector v1 = new cVector();
1527	1956	cVector v2 = new cVector();
..	..	@@ -1530,11 +1959,11 @@
1530	1959	objEditor.cameraView.renderCamera.setAim(v2, v1);
1531	1960	objEditor.cameraView.repaint();
1532	1961	} else
1533		- if (source == rectoidItem)
	1962	+ if (source == rectoidItem \|\| source == boxButton)
1534	1963	{
1535	1964	makeSomething(new Box());
1536	1965	} else
1537		- if (source == particleItem)
	1966	+ if (source == particleItem \|\| source == particlesButton)
1538	1967	{
1539	1968	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1540	1969	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1613,27 +2042,27 @@
1613	2042
1614	2043	makeSomething(obj);
1615	2044	} else
1616		- if (source == gridItem)
	2045	+ if (source == gridItem \|\| source == gridButton)
1617	2046	{
1618	2047	makeSomething(new Grid());
1619	2048	} else
1620		- if (source == ellipsoidItem)
	2049	+ if (source == ellipsoidItem \|\| source == sphereButton)
1621	2050	{
1622	2051	makeSomething(new Sphere());
1623	2052	} else
1624		- if (source == coneItem)
	2053	+ if (source == coneItem \|\| source == coneButton)
1625	2054	{
1626	2055	makeSomething(new Cone());
1627	2056	} else
1628		- if (source == torusItem)
	2057	+ if (source == torusItem \|\| source == torusButton)
1629	2058	{
1630	2059	makeSomething(new Torus());
1631	2060	} else
1632		- if (source == superItem)
	2061	+ if (source == superItem \|\| source == superButton)
1633	2062	{
1634	2063	makeSomething(new Superellipsoid());
1635	2064	} else
1636		- if (source == kleinItem)
	2065	+ if (source == kleinItem \|\| source == kleinButton)
1637	2066	{
1638	2067	makeSomething(new Klein());
1639	2068	} else
..	..	@@ -1653,7 +2082,7 @@
1653	2082	{
1654	2083	makeSomething(new BezierSurface());
1655	2084	} else
1656		- if (source == checkerItem)
	2085	+ if (source == overlayItem \|\| source == overlayButton)
1657	2086	{
1658	2087	/*
1659	2088	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1701,7 +2130,7 @@
1701	2130	s.setup();
1702	2131	makeSomething(s);
1703	2132	} else
1704		- if (source == lightItem)
	2133	+ if (source == lightItem \|\| source == lightButton)
1705	2134	{
1706	2135	makeSomething(new Light());
1707	2136	} else
..	..	@@ -1751,30 +2180,30 @@
1751	2180
1752	2181	group(g);
1753	2182	} else
1754		- if (source == loopItem)
	2183	+ if (source == loopItem \|\| source == loopButton)
1755	2184	{
1756	2185	Composite csg = new GroupLeaf();
1757	2186	csg.count = 5;
1758	2187	group(csg);
1759		- Composite child = new cGroup();
	2188	+ Composite child = new cGroup("Branch");
1760	2189	csg.addChild(child);
1761	2190	child.addChild(csg);
1762	2191	} else
1763	2192	if (source == doubleItem)
1764	2193	{
1765		- Composite csg = new GroupLeaf();
	2194	+ Composite csg = new GroupLeaf("Fork");
1766	2195	csg.count = 5;
1767	2196	group(csg);
1768		- Composite child = new cGroup();
	2197	+ Composite child = new cGroup("Branch A");
1769	2198	csg.addChild(child);
1770	2199	child.addChild(csg);
1771		- child = new cGroup();
	2200	+ child = new cGroup("Branch B");
1772	2201	csg.addChild(child);
1773	2202	child.addChild(csg);
1774	2203	} else
1775	2204	if (source == tripleItem)
1776	2205	{
1777		- Composite csg = new GroupLeaf();
	2206	+ Composite csg = new GroupLeaf("Trident");
1778	2207	csg.count = 4;
1779	2208	group(csg);
1780	2209	Composite child = new cGroup();
..	..	@@ -1786,23 +2215,6 @@
1786	2215	child = new cGroup();
1787	2216	csg.addChild(child);
1788	2217	child.addChild(csg);
1789		- } else
1790		-
1791		- if (source == importGFDItem)
1792		- {
1793		- ImportGFD();
1794		- } else
1795		- if (source == importVRMLX3DItem)
1796		- {
1797		- ImportVRMLX3D();
1798		- } else
1799		- if (source == import3DSItem)
1800		- {
1801		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1802		- } else
1803		- if (source == importOBJItem)
1804		- {
1805		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1806	2218	} else
1807	2219	if (source == computeAOItem)
1808	2220	{
..	..	@@ -1822,7 +2234,7 @@
1822	2234	if (source == invariantsItem)
1823	2235	{
1824	2236	System.out.println("Invariants:");
1825		- GrafreeD.grafreeD.universe.invariants();
	2237	+ Grafreed.grafreeD.universe.invariants();
1826	2238	} else
1827	2239	if (source == memoryItem)
1828	2240	{
..	..	@@ -1841,19 +2253,61 @@
1841	2253	{
1842	2254	DumpObject();
1843	2255	} else
	2256	+ if (source == minButton)
	2257	+ {
	2258	+ Minimize();
	2259	+ } else
	2260	+ if (source == maxButton)
	2261	+ {
	2262	+ Maximize();
	2263	+ } else
	2264	+ if (source == fullButton)
	2265	+ {
	2266	+ ToggleFullScreen();
	2267	+ } else
	2268	+ if (source == undoButton)
	2269	+ {
	2270	+ // Go to previous version
	2271	+ //if (!Undo())
	2272	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2273	+ Undo();
	2274	+ } else
	2275	+ if (source == restoreButton)
	2276	+ {
	2277	+ // Restore current version
	2278	+ Restore();
	2279	+ } else
	2280	+ if (source == replaceButton)
	2281	+ {
	2282	+ // Overwrite current version
	2283	+ Replace();
	2284	+ } else
	2285	+ if (source == redoButton)
	2286	+ {
	2287	+ // Go to next version
	2288	+ Redo();
	2289	+ } else
	2290	+ if (source == saveButton)
	2291	+ {
	2292	+ // Save a new version
	2293	+ if (!Save(true))
	2294	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2295	+ } else
	2296	+ if (source == oneStepButton)
	2297	+ {
	2298	+ Globals.ONESTEP = true;
	2299	+ cameraView.repaint();
	2300	+ } else
1844	2301	if (source == screenfitButton)
1845	2302	{
1846		- //Reload(lastConverter, lastFilename, true);
1847	2303	ScreenFit();
1848	2304	} else
1849	2305	if (source == screenfitpointButton)
1850	2306	{
1851		- //Reload(lastConverter, lastFilename, true);
1852	2307	ScreenFitPoint();
1853	2308	} else
1854	2309	if (source == snapobjectButton)
1855	2310	{
1856		- //Reload(lastConverter, lastFilename, true);
1857	2311	SnapObject();
1858	2312	} else
1859	2313	// if (event.getSource() == recompileButton)
..	..	@@ -1890,12 +2344,20 @@
1890	2344	{
1891	2345	loadClipboard(true);
1892	2346	} else
	2347	+ if (source == undoItem)
	2348	+ {
	2349	+ Undo();
	2350	+ } else
	2351	+ if (source == redoItem)
	2352	+ {
	2353	+ Redo();
	2354	+ } else
1893	2355	if (source == duplicateItem)
1894	2356	{
1895		- Object3D keep = GrafreeD.clipboard;
	2357	+ Object3D keep = Grafreed.clipboard;
1896	2358	loadClipboard(false);
1897	2359	paste(false);
1898		- GrafreeD.clipboard = keep;
	2360	+ Grafreed.clipboard = keep;
1899	2361	} else
1900	2362	if (source == cloneItem)
1901	2363	{
..	..	@@ -1913,13 +2375,17 @@
1913	2375	{
1914	2376	paste(false);
1915	2377	} else
	2378	+ if (source == pasteIntoItem)
	2379	+ {
	2380	+ pasteInto(true, false);
	2381	+ } else
1916	2382	if (source == pasteLinkItem)
1917	2383	{
1918		- pasteInto(false);
	2384	+ pasteInto(false, false);
1919	2385	} else
1920	2386	if (source == pasteCloneItem)
1921	2387	{
1922		- pasteInto(true);
	2388	+ pasteInto(true, true);
1923	2389	} else
1924	2390	if (source == pasteExpandItem)
1925	2391	{
..	..	@@ -2111,9 +2577,9 @@
2111	2577	// group.selection.get(0).setMasterThis(content); // should be identity
2112	2578	// refreshContents();
2113	2579	// }
2114		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2580	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2115	2581	{
2116		- Object3D content = GrafreeD.clipboard.get(0);
	2582	+ Object3D content = Grafreed.clipboard.get(0);
2117	2583
2118	2584	if (content instanceof cGroup && ((cGroup)content).transientlink )
2119	2585	content = ((cGroup)content).get(0);
..	..	@@ -2121,11 +2587,11 @@
2121	2587	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2122	2588	for (int i=0; i<group.selection.size(); i++)
2123	2589	{
2124		- boolean random = CameraPane.RANDOM;
2125		- CameraPane.RANDOM = false; // parse all random nodes
	2590	+ boolean random = CameraPane.SWITCH;
	2591	+ CameraPane.SWITCH = false; // parse all random nodes
2126	2592	group.selection.get(i).linkVerticesThis(content);
2127	2593	// group.selection.get(i).setMasterThis(content); // should be identity
2128		- CameraPane.RANDOM = random;
	2594	+ CameraPane.SWITCH = random;
2129	2595	}
2130	2596	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2131	2597	refreshContents();
..	..	@@ -2135,20 +2601,20 @@
2135	2601	{
2136	2602	for (int i=0; i<group.selection.size(); i++)
2137	2603	{
2138		- boolean random = CameraPane.RANDOM;
2139		- CameraPane.RANDOM = false; // parse all random nodes
	2604	+ boolean random = CameraPane.SWITCH;
	2605	+ CameraPane.SWITCH = false; // parse all random nodes
2140	2606	group.selection.get(i).linkVerticesThis(null);
2141		- CameraPane.RANDOM = random;
	2607	+ CameraPane.SWITCH = random;
2142	2608	}
2143	2609
2144	2610	refreshContents();
2145	2611	} else
2146	2612	if (source == relinkverticesItem)
2147	2613	{
2148		- boolean random = CameraPane.RANDOM;
2149		- CameraPane.RANDOM = false; // parse all random nodes
	2614	+ boolean random = CameraPane.SWITCH;
	2615	+ CameraPane.SWITCH = false; // parse all random nodes
2150	2616	group.selection.RelinkToSupport();
2151		- CameraPane.RANDOM = random;
	2617	+ CameraPane.SWITCH = random;
2152	2618
2153	2619	refreshContents();
2154	2620	} else
..	..	@@ -2163,9 +2629,9 @@
2163	2629	} else
2164	2630	if (source == setMasterItem)
2165	2631	{
2166		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2632	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2167	2633	{
2168		- Object3D content = GrafreeD.clipboard.get(0);
	2634	+ Object3D content = Grafreed.clipboard.get(0);
2169	2635
2170	2636	if (content instanceof cGroup && ((cGroup)content).transientlink )
2171	2637	content = ((cGroup)content).get(0);
..	..	@@ -2178,9 +2644,9 @@
2178	2644	{
2179	2645	if (group.selection.size() == 1)
2180	2646	{
2181		- if (GrafreeD.clipboard.size() == 1)
	2647	+ if (Grafreed.clipboard.size() == 1)
2182	2648	{
2183		- Object3D content = GrafreeD.clipboard.get(0);
	2649	+ Object3D content = Grafreed.clipboard.get(0);
2184	2650
2185	2651	if (content instanceof cGroup && ((cGroup)content).transientlink )
2186	2652	content = ((cGroup)content).get(0);
..	..	@@ -2197,7 +2663,7 @@
2197	2663	{
2198	2664	RevertMeshes();
2199	2665	} else
2200		- if (source == resetMeshItem)
	2666	+ if (source == resetAllItem)
2201	2667	{
2202	2668	ResetAll();
2203	2669	} else
..	..	@@ -2205,7 +2671,7 @@
2205	2671	{
2206	2672	StepAll();
2207	2673	} else
2208		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	2674	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2209	2675	{
2210	2676	//int indices[] = jList.getSelectedIndices();
2211	2677	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2217,9 +2683,9 @@
2217	2683	{
2218	2684	ClearSelection(true);
2219	2685	} else
2220		- if (source == grabItem)
	2686	+ if (source == grabItem \|\| source == groupButton)
2221	2687	{
2222		- group(new cGroup(), true);
	2688	+ group(new cGroup(), false); // true);
2223	2689	} else
2224	2690	if (source == hideItem)
2225	2691	{
..	..	@@ -2237,16 +2703,16 @@
2237	2703	{
2238	2704	makeSomething(new Camera());
2239	2705	} else
2240		- if (source == compositeItem)
	2706	+ if (source == compositeItem \|\| source == compositeButton)
2241	2707	{
2242	2708	group(new Composite());
2243	2709	} else
2244		- if (source == randomItem)
	2710	+ if (source == switchItem \|\| source == switchButton)
2245	2711	{
2246	2712	RandomNode random = new RandomNode();
2247	2713	group(random);
2248	2714	if (random.size() > 0)
2249		- random.name = random.get(0).name + "Rnd";
	2715	+ random.name = random.get(0).name + "Switch";
2250	2716	} else
2251	2717	if (source == physicsItem)
2252	2718	{
..	..	@@ -2343,7 +2809,7 @@
2343	2809	{
2344	2810	group(new cLinker());
2345	2811	} else
2346		- if (source == textureItem)
	2812	+ if (source == textureItem \|\| source == textureButton)
2347	2813	{
2348	2814	group(new TextureNode());
2349	2815	} else
..	..	@@ -2363,17 +2829,30 @@
2363	2829	{
2364	2830	CastShadow(2);
2365	2831	} else
2366		- if (source == ungroupItem)
	2832	+ if (source == ungroupItem \|\| source == ungroupButton)
2367	2833	{
2368		- //ungroup();
	2834	+ boolean hasRoot = false;
	2835	+
2369	2836	for (int i=0; i<group.selection.size(); i++)
2370	2837	{
2371		- Ungroup(group.selection.get(i));
	2838	+ if (group.selection.get(i) == group)
	2839	+ {
	2840	+ hasRoot = true;
	2841	+ break;
	2842	+ }
2372	2843	}
2373	2844
2374		- ClearSelection(false);
2375		-
2376		- refreshContents();
	2845	+ if (!hasRoot)
	2846	+ {
	2847	+ for (int i=0; i<group.selection.size(); i++)
	2848	+ {
	2849	+ Ungroup(group.selection.get(i));
	2850	+ }
	2851	+
	2852	+ ClearSelection(false);
	2853	+
	2854	+ refreshContents();
	2855	+ }
2377	2856	} else
2378	2857	if (source == genUVItem)
2379	2858	{
..	..	@@ -2385,7 +2864,7 @@
2385	2864	} else
2386	2865	if (source == genNormalsMESHItem)
2387	2866	{
2388		- GenNormals(true); // TODO
	2867	+ GenNormalsMESH();
2389	2868	} else
2390	2869	if (source == genNormalsORGANItem)
2391	2870	{
..	..	@@ -2450,6 +2929,22 @@
2450	2929	if (source == unmarkleavesItem)
2451	2930	{
2452	2931	MarkLeaves(false);
	2932	+ } else
	2933	+ if (source == rewindleavesItem)
	2934	+ {
	2935	+ RewindLeaves(true);
	2936	+ } else
	2937	+ if (source == unrewindleavesItem)
	2938	+ {
	2939	+ RewindLeaves(false);
	2940	+ } else
	2941	+ if (source == randomleavesItem)
	2942	+ {
	2943	+ RandomLeaves(true);
	2944	+ } else
	2945	+ if (source == unrandomleavesItem)
	2946	+ {
	2947	+ RandomLeaves(false);
2453	2948	} else
2454	2949	if (source == flipVItem)
2455	2950	{
..	..	@@ -2535,9 +3030,13 @@
2535	3030	{
2536	3031	SmoothMesh();
2537	3032	} else
2538		- if (source == transformgeometryItem)
	3033	+ if (source == transformGeometryItem)
2539	3034	{
2540	3035	TransformGeometry();
	3036	+ } else
	3037	+ if (source == transformChildrenItem)
	3038	+ {
	3039	+ TransformChildren();
2541	3040	} else
2542	3041	if (source == resetTransformItem)
2543	3042	{
..	..	@@ -2545,7 +3044,11 @@
2545	3044	} else
2546	3045	if (source == resetCentroidItem)
2547	3046	{
2548		- ResetCentroid();
	3047	+ ResetCentroid(true);
	3048	+ } else
	3049	+ if (source == resetCentroidXZItem)
	3050	+ {
	3051	+ ResetCentroid(false);
2549	3052	} else
2550	3053	if (source == resetParentItem)
2551	3054	{
..	..	@@ -2650,7 +3153,7 @@
2650	3153	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2651	3154	{
2652	3155	obj = (Object3D)e.nextElement();
2653		- obj.SetBumpTexture(null);
	3156	+ obj.ResetBumpTexture();
2654	3157	}
2655	3158
2656	3159	refreshContents();
..	..	@@ -2677,6 +3180,10 @@
2677	3180	if (source == twoButton)
2678	3181	{
2679	3182	radio.layout = twoButton;
	3183	+
	3184	+ if (CameraPane.FULLSCREEN)
	3185	+ fullscreenLayout = radio.layout;
	3186	+
2680	3187	// bug
2681	3188	//gridPanel.setDividerLocation(1.0);
2682	3189	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2709,10 +3216,31 @@
2709	3216	bigThree.ClearUI();
2710	3217	bigThree.add(centralPanel);
2711	3218	bigThree.FlushUI();
	3219	+
	3220	+ cameraView.requestFocusInWindow();
	3221	+
	3222	+// refreshContents(true);
	3223	+//
	3224	+// try
	3225	+// {
	3226	+// java.awt.Robot bot = new java.awt.Robot();
	3227	+// int mask = InputEvent.BUTTON1_MASK;
	3228	+// bot.mouseMove(100, 100);
	3229	+// bot.mousePress(mask);
	3230	+// bot.mouseRelease(mask);
	3231	+// }
	3232	+// catch (Exception e)
	3233	+// {
	3234	+//
	3235	+// }
	3236	+
2712	3237	} else
2713	3238	if (source == threeButton)
2714	3239	{
2715	3240	radio.layout = threeButton;
	3241	+
	3242	+ if (CameraPane.FULLSCREEN)
	3243	+ fullscreenLayout = radio.layout;
2716	3244
2717	3245	// bigThree.remove(scenePanel);
2718	3246	// bigThree.remove(centralPanel);
..	..	@@ -2745,10 +3273,15 @@
2745	3273	bigThree.add(centralPanel);
2746	3274	bigThree.add(XYZPanel);
2747	3275	bigThree.FlushUI();
	3276	+
	3277	+ cameraView.requestFocusInWindow();
2748	3278	} else
2749	3279	if (source == fourButton)
2750	3280	{
2751	3281	radio.layout = fourButton;
	3282	+
	3283	+ if (CameraPane.FULLSCREEN)
	3284	+ fullscreenLayout = radio.layout;
2752	3285
2753	3286	// bigThree.remove(scenePanel);
2754	3287	// bigThree.remove(centralPanel);
..	..	@@ -2780,10 +3313,15 @@
2780	3313	bigThree.ClearUI();
2781	3314	bigThree.add(scenePanel);
2782	3315	bigThree.FlushUI();
	3316	+
	3317	+ cameraView.requestFocusInWindow();
2783	3318	} else
2784	3319	if (source == sixButton)
2785	3320	{
2786	3321	radio.layout = sixButton;
	3322	+
	3323	+ if (CameraPane.FULLSCREEN)
	3324	+ fullscreenLayout = radio.layout;
2787	3325
2788	3326	// bigThree.remove(scenePanel);
2789	3327	// bigThree.remove(centralPanel);
..	..	@@ -2816,10 +3354,15 @@
2816	3354	bigThree.add(scenePanel);
2817	3355	bigThree.add(centralPanel);
2818	3356	bigThree.FlushUI();
	3357	+
	3358	+ cameraView.requestFocusInWindow();
2819	3359	} else
2820	3360	if (source == sevenButton)
2821	3361	{
2822	3362	radio.layout = sevenButton;
	3363	+
	3364	+ if (CameraPane.FULLSCREEN)
	3365	+ fullscreenLayout = radio.layout;
2823	3366
2824	3367	// bigThree.remove(scenePanel);
2825	3368	// bigThree.remove(centralPanel);
..	..	@@ -2853,6 +3396,8 @@
2853	3396	bigThree.add(centralPanel);
2854	3397	bigThree.add(XYZPanel);
2855	3398	bigThree.FlushUI();
	3399	+
	3400	+ cameraView.requestFocusInWindow();
2856	3401	} else
2857	3402	if (source == rootButton)
2858	3403	{
..	..	@@ -2864,6 +3409,7 @@
2864	3409	EditObject(obj);
2865	3410	}
2866	3411
	3412	+ cameraView.requestFocusInWindow();
2867	3413	refreshContents(true);
2868	3414	} else
2869	3415	if (source == closeButton)
..	..	@@ -2873,22 +3419,37 @@
2873	3419	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2874	3420	{
2875	3421	ab = (cRadio)e.nextElement();
2876		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3422	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2877	3423	{
	3424	+ // Patch to avoid bug with transparency.
	3425	+ if (!ab.hadMaterial)
	3426	+ {
	3427	+ ab.object.material = null;
	3428	+ }
	3429	+
2878	3430	buttonGroup.remove(ab);
2879	3431	radioPanel.remove(ab);
2880	3432
2881		- ab.GetObject().editWindow = null;
	3433	+ //ab.GetObject().editWindow = null;
	3434	+ ab.GetObject().manipWindow = null;
2882	3435	// ab.GetObject().objectUI = null; // ?????????
2883	3436
2884	3437	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2885	3438	break;
2886	3439	}
2887	3440	}
	3441	+
	3442	+ cameraView.requestFocusInWindow();
2888	3443	refreshContents(true);
2889	3444	} else
2890	3445	if (source == editItem \|\| source == editButton)
2891	3446	{
	3447	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3448	+ {
	3449	+ Object3D child = (Object3D)e.nextElement();
	3450	+ child.pinned = true;
	3451	+ }
	3452	+
2892	3453	EditSelection(false);
2893	3454	} else
2894	3455	if (source == uneditButton)
..	..	@@ -2898,12 +3459,13 @@
2898	3459	Object3D child = (Object3D)e.nextElement();
2899	3460	if(child.editWindow != null)
2900	3461	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3462	+ child.pinned = false;
2901	3463	child.CloseUI();
2902	3464	listUI.remove(child);
2903	3465
2904		- child.editWindow = null; // ???????????
	3466	+ //child.editWindow = null; // ???????????
2905	3467	}
2906		- objEditor.ctrlPanel.validate();
	3468	+ objEditor.ctrlPanel.FlushUI();
2907	3469	//objEditor.jTree.clearSelection();
2908	3470	//objEditor.ResetSliders();
2909	3471	refreshContents(true);
..	..	@@ -2914,6 +3476,7 @@
2914	3476	//copy.ClearUI();
2915	3477	for (Object3D obj : listUI)
2916	3478	{
	3479	+ obj.pinned = false;
2917	3480	obj.CloseUI();
2918	3481	}
2919	3482	listUI.clear();
..	..	@@ -2923,7 +3486,7 @@
2923	3486	{
2924	3487	assert(copy == group);
2925	3488
2926		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3489	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2927	3490
2928	3491	for (Object3D obj : listUI)
2929	3492	{
..	..	@@ -2972,6 +3535,9 @@
2972	3535	}
2973	3536
2974	3537	copy = group;
	3538	+
	3539	+ SetUndoStates();
	3540	+
2975	3541	//Globals.theRenderer.object = group;
2976	3542	if(!useclient)
2977	3543	{
..	..	@@ -2987,20 +3553,46 @@
2987	3553	frontView.object = group;
2988	3554	sideView.object = group;
2989	3555	}
2990		- group.editWindow = this;
	3556	+
	3557	+// fix "+" issue
	3558	+ //group.editWindow = this;
	3559	+ group.manipWindow = this;
	3560	+
2991	3561	/*
2992	3562	currentLayout = radio.layout;
2993	3563	if (currentLayout == null)
2994	3564	currentLayout = sevenButton;
2995	3565	*/
2996	3566	radio.layout.doClick();
	3567	+
	3568	+ ClearUnpinned();
	3569	+ //Grafreed.Assert(group != null);
	3570	+ //Grafreed.Assert(group.selection != null);
	3571	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	3572	+ if (group.selection == null \|\| group.selection.size() == 1)
	3573	+ EditSelection(false);
2997	3574	keepparent = group.parent;
2998	3575	// PARENT = NULL or not???
2999	3576	//group.parent = null; // ROOT
3000	3577	//group.attributes = -1;
3001	3578	ResetModel();
	3579	+
	3580	+ cameraView.requestFocusInWindow();
3002	3581	refreshContents(true);
3003		- }
	3582	+ } else if (event.getSource() == editCameraItem)
	3583	+ {
	3584	+ cameraView.ProtectCamera();
	3585	+ cameraView.repaint();
	3586	+ return;
	3587	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3588	+ {
	3589	+ cameraView.RevertCamera();
	3590	+ cameraView.repaint();
	3591	+ return;
	3592	+ // } else if (event.getSource() == textureButton)
	3593	+ // {
	3594	+ // return; // true;
	3595	+ }
3004	3596	else
3005	3597	{
3006	3598	//return super.action(event, arg);
..	..	@@ -3009,7 +3601,6 @@
3009	3601	}
3010	3602
3011	3603	boolean useclient = false;
3012		- cRadio radio;
3013	3604
3014	3605	void ToggleRoot()
3015	3606	{
..	..	@@ -3061,6 +3652,28 @@
3061	3652	refreshContents();
3062	3653	}
3063	3654
	3655	+ void TransformChildren()
	3656	+ {
	3657	+ Object3D obj;
	3658	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3659	+ {
	3660	+ obj = (Object3D)e.nextElement();
	3661	+ obj.KeepTextureMatrices();
	3662	+ obj.TransformChildren();
	3663	+ obj.RestoreTextureMatrices();
	3664	+
	3665	+// if (obj.parent == null)
	3666	+// {
	3667	+// System.out.println("NULL PARENT!");
	3668	+// new Exception().printStackTrace();
	3669	+// }
	3670	+// else
	3671	+// TouchTransform(obj);
	3672	+// //obj.parent.Touch();
	3673	+ }
	3674	+
	3675	+ refreshContents();
	3676	+ }
3064	3677
3065	3678	void ResetTransform()
3066	3679	{
..	..	@@ -3173,7 +3786,7 @@
3173	3786	refreshContents();
3174	3787	}
3175	3788
3176		- void ResetCentroid()
	3789	+ void ResetCentroid(boolean full)
3177	3790	{
3178	3791	Object3D obj;
3179	3792	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3188,12 +3801,16 @@
3188	3801	LA.matIdentity(Object3D.mat);
3189	3802	obj.getBounds(minima, maxima, false);
3190	3803	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3191		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3804	+ if (full)
	3805	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3192	3806	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3193	3807	obj.TransformMesh(Object3D.mat);
	3808	+
3194	3809	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3195		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3810	+ if (full)
	3811	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3196	3812	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3813	+
3197	3814	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3198	3815	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3199	3816	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3222,7 +3839,8 @@
3222	3839
3223	3840	int size = obj.MemorySize();
3224	3841
3225		- System.err.println((size/1024) + " KB is the size of " + obj);
	3842	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3843	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3226	3844	}
3227	3845	}
3228	3846	catch (Exception e)
..	..	@@ -3259,9 +3877,9 @@
3259	3877	obj = (Object3D)e.nextElement();
3260	3878
3261	3879	System.out.println("Object is: " + obj);
3262		- GrafreeD.AnalyzeObject(obj);
	3880	+ Grafreed.AnalyzeObject(obj);
3263	3881	System.out.println("Boundary rep: " + obj.bRep);
3264		- GrafreeD.AnalyzeObject(obj.bRep);
	3882	+ Grafreed.AnalyzeObject(obj.bRep);
3265	3883
3266	3884	// System.err.println((size/1024) + " KB is the size of " + obj);
3267	3885	}
..	..	@@ -3303,6 +3921,13 @@
3303	3921	void GenNormals(boolean crease)
3304	3922	{
3305	3923	group.GenNormalsS(crease);
	3924	+
	3925	+ refreshContents();
	3926	+ }
	3927	+
	3928	+ void GenNormalsMESH()
	3929	+ {
	3930	+ group.GenNormalsMeshS();
3306	3931
3307	3932	refreshContents();
3308	3933	}
..	..	@@ -3475,8 +4100,8 @@
3475	4100
3476	4101	void ParseVertices()
3477	4102	{
3478		- boolean epsequal = GrafreeD.epsequal;
3479		- GrafreeD.epsequal = true;
	4103	+ boolean epsequal = Grafreed.epsequal;
	4104	+ Grafreed.epsequal = true;
3480	4105
3481	4106	for (int i=0; i<group.selection.size(); i++)
3482	4107	{
..	..	@@ -3501,7 +4126,7 @@
3501	4126	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3502	4127	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3503	4128
3504		- g.add(GrafreeD.clipboard);
	4129	+ g.add(Grafreed.clipboard);
3505	4130
3506	4131	buffer.add(g);
3507	4132	}
..	..	@@ -3516,7 +4141,7 @@
3516	4141	makeSomething(buffer, i==group.selection.size()-1);
3517	4142	}
3518	4143
3519		- GrafreeD.epsequal = epsequal;
	4144	+ Grafreed.epsequal = epsequal;
3520	4145
3521	4146	refreshContents();
3522	4147	}
..	..	@@ -3534,7 +4159,16 @@
3534	4159	String pigment = Object3D.GetPigment(tex);
3535	4160	//String bump = Object3D.GetBump(tex);
3536	4161
3537		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4162	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4163	+
	4164	+ try
	4165	+ {
	4166	+ texturedata = Globals.theRenderer.GetTextureData(tex.pigmenttexture, pigment, false, node.texres);
	4167	+ }
	4168	+ catch (Exception e)
	4169	+ {
	4170	+ System.err.println("FAIL: " + node);
	4171	+ }
3538	4172
3539	4173	double s = v.s;
3540	4174
..	..	@@ -3622,11 +4256,11 @@
3622	4256
3623	4257	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3624	4258
3625		- boolean random = CameraPane.RANDOM;
3626		- CameraPane.RANDOM = false; // parse all random nodes
	4259	+ boolean random = CameraPane.SWITCH;
	4260	+ CameraPane.SWITCH = false; // parse all random nodes
3627	4261	lowres.linkVerticesThis(null);
3628	4262	lowres.linkVerticesThis(sn);
3629		- CameraPane.RANDOM = random;
	4263	+ CameraPane.SWITCH = random;
3630	4264
3631	4265	System.err.flush();
3632	4266
..	..	@@ -3666,7 +4300,7 @@
3666	4300	return;
3667	4301
3668	4302	Object3D poses = group.selection.get(0);
3669		- Object3D ref = GrafreeD.clipboard.get(0);
	4303	+ Object3D ref = Grafreed.clipboard.get(0);
3670	4304
3671	4305	Object3D newgroup = new Object3D("Po:" + poses.name);
3672	4306
..	..	@@ -3860,9 +4494,9 @@
3860	4494
3861	4495	void ClipMesh()
3862	4496	{
3863		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4497	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3864	4498	{
3865		- Object3D content = GrafreeD.clipboard.get(0);
	4499	+ Object3D content = Grafreed.clipboard.get(0);
3866	4500
3867	4501	if (content instanceof cGroup && ((cGroup)content).transientlink )
3868	4502	content = ((cGroup)content).get(0);
..	..	@@ -3871,7 +4505,7 @@
3871	4505	// {
3872	4506	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3873	4507	// }
3874		- group.selection.ClipMesh(GrafreeD.clipboard);
	4508	+ group.selection.ClipMesh(Grafreed.clipboard);
3875	4509	}
3876	4510	// group.selection.ClipMesh(GrafreeD.clipboard);
3877	4511	System.out.println("DONE.");
..	..	@@ -3918,6 +4552,18 @@
3918	4552	void MarkLeaves(boolean hide)
3919	4553	{
3920	4554	group.selection.MarkLeaves(hide);
	4555	+ refreshContents();
	4556	+ }
	4557	+
	4558	+ void RewindLeaves(boolean hide)
	4559	+ {
	4560	+ group.selection.RewindLeaves(hide);
	4561	+ refreshContents();
	4562	+ }
	4563	+
	4564	+ void RandomLeaves(boolean hide)
	4565	+ {
	4566	+ group.selection.RandomLeaves(hide);
3921	4567	refreshContents();
3922	4568	}
3923	4569
..	..	@@ -3992,28 +4638,25 @@
3992	4638	// }
3993	4639	// }
3994	4640
3995		- static boolean allparams = true;
3996		-
3997		- static Vector<Object3D> listUI = new Vector<Object3D>();
3998		-
3999	4641	void EditSelection(boolean newWindow)
4000	4642	{
	4643	+ if (group.selection == null)
	4644	+ {
	4645	+ EditElement(group, newWindow); // ? new
	4646	+ return;
	4647	+ }
	4648	+
4001	4649	// aConstraints.gridy = 0;
4002	4650	for (int i=0; i<group.selection.size(); i++)
4003	4651	{
4004	4652	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4005	4653	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4006		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4654	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4007	4655
4008	4656	Object3D elem = (Object3D)group.selection.elementAt(i);
4009		- if(elem != group)
	4657	+ if(elem != group \|\| !newWindow)
4010	4658	{
4011		- // if (!(elem instanceof Composite))
4012		- // newWindow = false;
4013		- listUI.add(elem);
4014		- elem.openEditWindow(this, newWindow); //, false);
4015		- System.out.println("edit : " + elem);
4016		- elem.editWindow.refreshContents(true); // ? new
	4659	+ EditElement(elem, newWindow); // ? new
4017	4660	}
4018	4661	}
4019	4662	}
..	..	@@ -4088,7 +4731,8 @@
4088	4731	//new Exception().printStackTrace();
4089	4732
4090	4733	freezemodel = true;
4091		-
	4734	+ ClearUnpinned();
	4735	+
4092	4736	/**/
4093	4737	//switch (event.id)
4094	4738	{
..	..	@@ -4096,7 +4740,6 @@
4096	4740	//case 702: // Event.LIST_DESELECT
4097	4741	group.deselectAll();
4098	4742	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4099		- objEditor.ClearInfo(); // .GetMaterial());
4100	4743	if (tps != null)
4101	4744	{
4102	4745	for (int i=0; i < tps.length; i++)
..	..	@@ -4105,10 +4748,8 @@
4105	4748
4106	4749	//if (child.parent != null)
4107	4750	//child.parent.addSelectee(child);
	4751	+ objEditor.SetMaterial(child);
4108	4752	group.addSelectee(child);
4109		- objEditor.SetMaterial(child); // .GetMaterial());
4110		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4111		- System.err.println("info : " + child.GetPath());
4112	4753	}
4113	4754	}
4114	4755	// else
..	..	@@ -4118,20 +4759,28 @@
4118	4759	// System.err.println("info : " + group.GetPath());
4119	4760	// }
4120	4761
4121		- objEditor.SetText(); // jan 2014
4122		-
4123		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4762	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4124	4763	CameraPane.flash = true;
4125	4764
4126		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4765	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4127	4766	// a camera
4128	4767	{
4129		- CameraPane.camerachangeframe = 0; // don't refuse it
4130		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4768	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	4769	+ {
	4770	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4771	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4772	+ }
4131	4773	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4132	4774	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4133	4775	}
4134	4776
	4777	+ if (tps != null && tps.length == 1)
	4778	+ {
	4779	+ EditSelection(false);
	4780	+ }
	4781	+
	4782	+ SetPinStates(tps != null && tps.length > 0);
	4783	+
4135	4784	refreshContents();
4136	4785	//return true;
4137	4786	}
..	..	@@ -4140,6 +4789,35 @@
4140	4789
4141	4790	freezemodel = false;
4142	4791	}
	4792	+
	4793	+ void SetPinStates(boolean enabled)
	4794	+ {
	4795	+ editButton.setEnabled(enabled);
	4796	+ uneditButton.setEnabled(enabled);
	4797	+ unselectButton.setEnabled(enabled);
	4798	+ flashSelectionButton.setEnabled(enabled);
	4799	+ }
	4800	+
	4801	+ void refreshContents(boolean cp)
	4802	+ {
	4803	+ if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	4804	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	4805	+ {
	4806	+ objEditor.ClearInfo(); // .GetMaterial());
	4807	+
	4808	+ for (int i=0; i < group.selection.Size(); i++)
	4809	+ {
	4810	+ Object3D child = (Object3D) group.selection.get(i);
	4811	+
	4812	+ objEditor.AddInfo(child, this, true);
	4813	+ System.err.println("info : " + child.GetPath());
	4814	+ }
	4815	+
	4816	+ objEditor.SetText(); // jan 2014
	4817	+ }
	4818	+
	4819	+ super.refreshContents(cp);
	4820	+ }
4143	4821
4144	4822	void linkSomething(Object3D thing)
4145	4823	{
..	..	@@ -4211,16 +4889,19 @@
4211	4889	{
4212	4890	if (group.selection.isEmpty())
4213	4891	return;
4214		- GrafreeD.clipboardIsTempGroup = false;
	4892	+
	4893	+ Grafreed.clipboardIsTempGroup = false;
4215	4894	Composite tGroup = null;
4216	4895	if (group.selection.size() > 0) // 1)
4217	4896	{
4218	4897	tGroup = new cGroup();
4219		- GrafreeD.clipboardIsTempGroup = true;
	4898	+ Grafreed.clipboardIsTempGroup = true;
4220	4899	}
4221	4900
4222	4901	if (cut)
4223	4902	{
	4903	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	4904	+// Save();
4224	4905	//int indices[] = jList.getSelectedIndices();
4225	4906	//for (int i = indices.length - 1; i >= 0; i--)
4226	4907	//jList.remove(indices[i]);
..	..	@@ -4256,16 +4937,16 @@
4256	4937	//System.out.println("cut " + child);
4257	4938	//System.out.println("parent = " + child.parent);
4258	4939	// tmp.addChild(child);
4259		- if (GrafreeD.clipboardIsTempGroup)
	4940	+ if (Grafreed.clipboardIsTempGroup)
4260	4941	tGroup.add/Child/(tmp);
4261	4942	else
4262		- GrafreeD.clipboard = tmp;
	4943	+ Grafreed.clipboard = tmp;
4263	4944	}
4264	4945	else
4265		- if (GrafreeD.clipboardIsTempGroup)
	4946	+ if (Grafreed.clipboardIsTempGroup)
4266	4947	tGroup.add/Child/(child);
4267	4948	else
4268		- GrafreeD.clipboard = child;
	4949	+ Grafreed.clipboard = child;
4269	4950	}
4270	4951
4271	4952	//ResetModel();
..	..	@@ -4297,21 +4978,23 @@
4297	4978	//System.out.println("cut " + elem);
4298	4979	//System.out.println("parent = " + elem.parent);
4299	4980	// tmp.addChild(elem);
4300		- if (GrafreeD.clipboardIsTempGroup)
	4981	+ if (Grafreed.clipboardIsTempGroup)
4301	4982	tGroup.add/Child/(tmp);
4302	4983	else
4303		- GrafreeD.clipboard = tmp;
	4984	+ Grafreed.clipboard = tmp;
4304	4985	}
4305	4986	else
4306		- if (GrafreeD.clipboardIsTempGroup)
	4987	+ if (Grafreed.clipboardIsTempGroup)
4307	4988	tGroup.add/Child/(child);
4308	4989	else
4309		- GrafreeD.clipboard = child;
	4990	+ Grafreed.clipboard = child;
4310	4991	}
4311	4992
4312	4993	}
4313		- if (GrafreeD.clipboardIsTempGroup)
4314		- GrafreeD.clipboard = tGroup;
	4994	+
	4995	+ if (Grafreed.clipboardIsTempGroup)
	4996	+ Grafreed.clipboard = tGroup;
	4997	+
4315	4998	if (cut)
4316	4999	{
4317	5000	ResetModel();
..	..	@@ -4321,11 +5004,15 @@
4321	5004
4322	5005	void paste(boolean expand)
4323	5006	{
	5007	+ if (Globals.REPLACEONMAKE)
	5008	+ Save();
	5009	+ boolean keep = Globals.REPLACEONMAKE;
	5010	+ Globals.REPLACEONMAKE = false;
4324	5011	// if (GrafreeD.clipboard == null)
4325	5012	// return;
4326	5013	boolean first = true;
4327	5014
4328		- if (GrafreeD.clipboardIsTempGroup)
	5015	+ if (Grafreed.clipboardIsTempGroup)
4329	5016	{
4330	5017	Composite temp;
4331	5018
..	..	@@ -4336,7 +5023,7 @@
4336	5023	temp = (Composite)Applet3D.clipboard.deepCopy();
4337	5024	*/
4338	5025	Object3D elem;
4339		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5026	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4340	5027	{
4341	5028	Object3D child = (Object3D)e.nextElement();
4342	5029
..	..	@@ -4370,21 +5057,22 @@
4370	5057	//Object3D cb = Applet3D.clipboard;
4371	5058	//temp.addChild(cb);
4372	5059	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4373		- assert(GrafreeD.clipboard.parent == null);
4374		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4375		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4376		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4377		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	5060	+ assert(Grafreed.clipboard.parent == null);
	5061	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5062	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5063	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5064	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4378	5065	else
4379		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4380		- GrafreeD.clipboard.get(0).parent = keepparent;
	5066	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5067	+ Grafreed.clipboard.get(0).parent = keepparent;
4381	5068	}
4382	5069
	5070	+ Globals.REPLACEONMAKE = keep;
4383	5071	ResetModel();
4384	5072	refreshContents();
4385	5073	}
4386	5074
4387		- void pasteInto(boolean copyit)
	5075	+ void pasteInto(boolean copyit, boolean clone)
4388	5076	{
4389	5077	// if (GrafreeD.clipboard == null)
4390	5078	// return;
..	..	@@ -4413,15 +5101,22 @@
4413	5101	if (copyit)
4414	5102	{
4415	5103	// paste(false);
4416		- CloneClipboard(false); // sept 2014
	5104	+ if (clone)
	5105	+ {
	5106	+ CloneClipboard(false); // sept 2014
	5107	+ }
	5108	+ else
	5109	+ {
	5110	+ paste(false);
	5111	+ }
4417	5112	}
4418	5113	else
4419	5114	{
4420	5115	boolean first = true;
4421	5116
4422		- if (GrafreeD.clipboardIsTempGroup)
	5117	+ if (Grafreed.clipboardIsTempGroup)
4423	5118	{
4424		- Composite temp = (Composite)GrafreeD.clipboard;
	5119	+ Composite temp = (Composite)Grafreed.clipboard;
4425	5120	Object3D copy;
4426	5121	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4427	5122	{
..	..	@@ -4431,7 +5126,7 @@
4431	5126	}
4432	5127	} else
4433	5128	{
4434		- linkSomething(GrafreeD.clipboard); //.get(0));
	5129	+ linkSomething(Grafreed.clipboard); //.get(0));
4435	5130	}
4436	5131	}
4437	5132	}
..	..	@@ -4508,6 +5203,10 @@
4508	5203
4509	5204	void group(Object3D csg, boolean grab)
4510	5205	{
	5206	+ if (Globals.REPLACEONMAKE)
	5207	+ Save();
	5208	+ boolean keep = Globals.REPLACEONMAKE;
	5209	+ Globals.REPLACEONMAKE = false;
4511	5210	if (//false) // why??
4512	5211	!group.selection.isEmpty())
4513	5212	{
..	..	@@ -4621,10 +5320,15 @@
4621	5320	//node.add(csg);
4622	5321	//makeSomething(node);
4623	5322	makeSomething(csg);
	5323	+ Globals.REPLACEONMAKE = keep;
4624	5324	}
4625	5325
4626	5326	void Ungroup(Object3D g)
4627	5327	{
	5328	+ if (Globals.REPLACEONMAKE)
	5329	+ Save();
	5330	+ boolean keep = Globals.REPLACEONMAKE;
	5331	+ Globals.REPLACEONMAKE = false;
4628	5332	if (g instanceof HiddenObject)
4629	5333	{
4630	5334	HiddenObject h = (HiddenObject) g;
..	..	@@ -4641,6 +5345,7 @@
4641	5345	objEditor.makeSomething(g.get(i), false);
4642	5346	}
4643	5347	}
	5348	+ Globals.REPLACEONMAKE = keep;
4644	5349	}
4645	5350
4646	5351	void ungroup()
..	..	@@ -4836,21 +5541,6 @@
4836	5541	}
4837	5542	*/
4838	5543
4839		- void ImportGFD()
4840		- {
4841		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4842		- browser.show();
4843		- String filename = browser.getFile();
4844		- if (filename != null && filename.length() > 0)
4845		- {
4846		- String fullname = browser.getDirectory() + filename;
4847		-
4848		- //Object3D readobj =
4849		- objEditor.ReadGFD(fullname, objEditor);
4850		- //makeSomething(readobj);
4851		- }
4852		- }
4853		-
4854	5544	/*
4855	5545	public void Callback(Object obj)
4856	5546	{
..	..	@@ -4874,26 +5564,9 @@
4874	5564	}
4875	5565	*/
4876	5566
4877		- void ImportVRMLX3D()
4878		- {
4879		- if (GrafreeD.standAlone)
4880		- {
4881		- /**/
4882		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4883		- browser.show();
4884		- String filename = browser.getFile();
4885		- if (filename != null && filename.length() > 0)
4886		- {
4887		- String fullname = browser.getDirectory() + filename;
4888		- LoadVRMLX3D(fullname);
4889		- }
4890		- /**/
4891		- }
4892		- }
4893		-
4894	5567	String GetFile(String dialogName)
4895	5568	{
4896		- if (GrafreeD.standAlone)
	5569	+ if (Grafreed.standAlone)
4897	5570	{
4898	5571	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4899	5572	browser.show();
..	..	@@ -4957,10 +5630,33 @@
4957	5630	cButton flashSelectionButton;
4958	5631	cButton editButton;
4959	5632	cButton uneditButton;
	5633	+ JCheckBox allParamsButton;
4960	5634	cButton clearpanelButton;
4961		- cButton allParamsButton;
4962	5635	cButton unselectButton;
4963	5636
	5637	+ cButton restoreCameraButton;
	5638	+
	5639	+ cButton saveButton;
	5640	+ cButton oneStepButton;
	5641	+
	5642	+ cButton groupButton;
	5643	+ cButton ungroupButton;
	5644	+ cButton compositeButton;
	5645	+ cButton switchButton;
	5646	+ cButton loopButton;
	5647	+ cButton textureButton;
	5648	+
	5649	+ cButton gridButton;
	5650	+ cButton boxButton;
	5651	+ cButton sphereButton;
	5652	+ cButton coneButton;
	5653	+ cButton torusButton;
	5654	+ cButton superButton;
	5655	+ cButton kleinButton;
	5656	+ cButton particlesButton;
	5657	+ cButton overlayButton;
	5658	+ cButton lightButton;
	5659	+
4964	5660	cButton screenfitButton;
4965	5661	cButton screenfitpointButton;
4966	5662	cButton snapobjectButton;
..	..	@@ -4972,14 +5668,6 @@
4972	5668
4973	5669	cButton setsupportButton;
4974	5670
4975		- cButton twoButton;
4976		- cButton sixButton;
4977		- cButton threeButton;
4978		- cButton sevenButton;
4979		- cButton fourButton; // full panel
4980		- cButton oneButton; // full XYZ
4981		- //cButton currentLayout;
4982		-
4983	5671	//
4984	5672	//Composite
4985	5673	Object3D // to do !!
..	..	@@ -4989,9 +5677,11 @@
4989	5677	//JTree jTree;
4990	5678	private MenuItem lookAtItem;
4991	5679	private MenuItem lookFromItem;
4992		- private MenuItem switchItem;
	5680	+ private MenuItem switchViewItem;
4993	5681	private MenuItem cutItem;
4994		- private MenuItem duplicateItem;
	5682	+ private MenuItem undoItem;
	5683	+ private MenuItem redoItem;
	5684	+ private JMenuItem duplicateItem;
4995	5685	private MenuItem cloneItem;
4996	5686	private MenuItem cloneSupportItem;
4997	5687	private MenuItem overwriteGeoItem;
..	..	@@ -5004,7 +5694,7 @@
5004	5694	private MenuItem linkverticesItem;
5005	5695	private MenuItem relinkverticesItem;
5006	5696	private MenuItem setMasterItem;
5007		- private MenuItem resetMeshItem;
	5697	+ private MenuItem resetAllItem;
5008	5698	private MenuItem stepAllItem;
5009	5699	private MenuItem revertMeshItem;
5010	5700	private MenuItem poseMeshItem;
..	..	@@ -5015,10 +5705,11 @@
5015	5705	private MenuItem mergeGeometriesItem;
5016	5706	private MenuItem copyItem;
5017	5707	private MenuItem pasteItem;
	5708	+ private MenuItem pasteIntoItem;
5018	5709	private MenuItem pasteLinkItem;
5019	5710	private MenuItem pasteCloneItem;
5020	5711	private MenuItem pasteExpandItem;
5021		- private MenuItem clearItem;
	5712	+ private MenuItem deleteItem;
5022	5713	private MenuItem clearAllItem;
5023	5714	private MenuItem genUVItem;
5024	5715	private MenuItem genNormalsMESHItem;
..	..	@@ -5053,6 +5744,10 @@
5053	5744	private MenuItem showleavesItem;
5054	5745	private MenuItem markleavesItem;
5055	5746	private MenuItem unmarkleavesItem;
	5747	+ private MenuItem rewindleavesItem;
	5748	+ private MenuItem unrewindleavesItem;
	5749	+ private MenuItem randomleavesItem;
	5750	+ private MenuItem unrandomleavesItem;
5056	5751
5057	5752	private MenuItem flipVItem;
5058	5753	private MenuItem unflipVItem;
..	..	@@ -5064,15 +5759,17 @@
5064	5759	private MenuItem panoTexturesItem;
5065	5760
5066	5761	private MenuItem resetCentroidItem;
5067		- private MenuItem transformgeometryItem;
	5762	+ private MenuItem resetCentroidXZItem;
5068	5763	private MenuItem resetTransformItem;
	5764	+ private MenuItem transformGeometryItem;
	5765	+ private MenuItem transformChildrenItem;
5069	5766	private MenuItem hideItem;
5070	5767	private MenuItem grabItem;
5071	5768	private MenuItem backItem;
5072	5769	private MenuItem frontItem;
5073	5770	private MenuItem cameraItem;
5074	5771	private MenuItem compositeItem;
5075		- private MenuItem randomItem;
	5772	+ private MenuItem switchItem;
5076	5773	private MenuItem physicsItem;
5077	5774	private MenuItem frameselectorItem;
5078	5775	private MenuItem scriptNodeItem;
..	..	@@ -5112,7 +5809,7 @@
5112	5809	private MenuItem blobItem;
5113	5810	private MenuItem latheItem;
5114	5811	private MenuItem bezierItem;
5115		- private MenuItem checkerItem;
	5812	+ private MenuItem overlayItem;
5116	5813	private MenuItem meshItem;
5117	5814	// private MenuItem meshGroupItem;
5118	5815	private MenuItem springItem;
..	..	@@ -5134,11 +5831,6 @@
5134	5831	private MenuItem doubleItem;
5135	5832	private MenuItem tripleItem;
5136	5833
5137		- private MenuItem importGFDItem;
5138		- private MenuItem importVRMLX3DItem;
5139		- private MenuItem import3DSItem;
5140		- private MenuItem importOBJItem;
5141		-
5142	5834	private MenuItem computeAOItem;
5143	5835	private MenuItem recompileItem;
5144	5836	private MenuItem editScriptItem;
..	..	@@ -5148,4 +5840,8 @@
5148	5840	private MenuItem analyzeItem;
5149	5841	private MenuItem dumpItem;
5150	5842	//boolean freezemodel = false;
	5843	+
	5844	+ Menu cameraMenu;
	5845	+ MenuItem editCameraItem;
	5846	+ MenuItem restoreCameraItem;
5151	5847	}