~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -12,6 +12,7 @@
12	12	import com.jme.math.Vector3f;
13	13	import com.jme.renderer.ColorRGBA;
14	14
	15	+import grafeme.ui.*;
15	16	//import buoy.widget.BFileChooser;
16	17
17	18	class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
..	..	@@ -73,7 +74,7 @@
73	74	this.copy = this.group = copy;
74	75	//selectees = this.group.selectees;
75	76
76		- SetupMenu2(objEditor);
	77	+ SetupMenu2(this); //objEditor);
77	78	SetupUI2(objEditor);
78	79	objEditor.SetupUI(true);
79	80	SetupViews(objEditor);
..	..	@@ -97,14 +98,14 @@
97	98
98	99	void CloneClipboard(boolean supports)
99	100	{
100		- assert(GrafreeD.clipboard.parent == null);
101		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
102		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
103		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
104		- makeSomething(CloneObject(GrafreeD.clipboard.get(0), false));
	101	+ assert(Grafreed.clipboard.parent == null);
	102	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	103	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	104	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	105	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
105	106	else
106		- makeSomething(CloneObject(GrafreeD.clipboard, false));
107		- GrafreeD.clipboard.get(0).parent = keepparent;
	107	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	108	+ Grafreed.clipboard.get(0).parent = keepparent;
108	109	}
109	110
110	111	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -118,7 +119,7 @@
118	119	// obj.support = null;
119	120	if (!supports)
120	121	obj.SaveSupports();
121		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	122	+ Object3D clone = (Object3D)Grafreed.clone(obj);
122	123	obj.parent = parent;
123	124	// obj.support = support;
124	125	// clone.support = support; // aout 2013
..	..	@@ -147,30 +148,29 @@
147	148
148	149	//JTextField nameField;
149	150
150		- void SetupMenu2(ObjEditor oe)
	151	+ void SetupMenu2(GroupEditor oe)
151	152	{
152		- oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
153		- //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
154		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
155		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
156		- oe.cameraMenu.add("-");
157		- openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
158		- openWindowItem.addActionListener(this);
159		- editLeafItem.addActionListener(this);
160		- lookAtItem.addActionListener(this);
161		- //lookFromItem.addActinoListener(this);
162		- //switchItem.addActionListener(this);
	153	+ oe.jTree = new cTree();
	154	+
163	155	Menu menu;
164	156	oe.menuBar.add(menu = new Menu("Edit"));
165	157	//editItem = menu.add(new MenuItem("Edit"));
166	158	//editItem.addActionListener(this);
167		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	159	+
	160	+// undoItem = menu.add(new MenuItem("Undo"));
	161	+// undoItem.addActionListener(this);
	162	+// redoItem = menu.add(new MenuItem("Redo"));
	163	+// redoItem.addActionListener(this);
	164	+// menu.add("-");
	165	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
168	166	duplicateItem.addActionListener(this);
169		- menu.add("-");
170	167	cloneItem = menu.add(new MenuItem("Clone"));
171	168	cloneItem.addActionListener(this);
	169	+ if (Globals.ADVANCED)
	170	+ {
172	171	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
173	172	cloneSupportItem.addActionListener(this);
	173	+ }
174	174	menu.add("-");
175	175	cutItem = menu.add(new MenuItem("Cut"));
176	176	cutItem.addActionListener(this);
..	..	@@ -178,27 +178,123 @@
178	178	copyItem.addActionListener(this);
179	179	pasteItem = menu.add(new MenuItem("Paste"));
180	180	pasteItem.addActionListener(this);
	181	+
	182	+ menu.add("-");
	183	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	184	+ pasteIntoItem.addActionListener(this);
181	185	pasteLinkItem = menu.add(new MenuItem("Paste link"));
182	186	pasteLinkItem.addActionListener(this);
183	187	pasteCloneItem = menu.add(new MenuItem("Paste clone"));
184	188	pasteCloneItem.addActionListener(this);
185	189	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
186	190	// pasteExpandItem.addActionListener(this);
	191	+ menu.add("-");
187	192	clearItem = menu.add(new MenuItem("Clear"));
188	193	clearItem.addActionListener(this);
	194	+
	195	+ if (Globals.ADVANCED)
	196	+ {
	197	+ // Deletes the cameras...
189	198	clearAllItem = menu.add(new MenuItem("Clear All"));
190	199	clearAllItem.addActionListener(this);
	200	+ }
	201	+
	202	+ menuBar.add(cameraMenu = new Menu("View"));
	203	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	204	+ //zBufferItem.addActionListener(this);
	205	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	206	+ //normalLensItem.addActionListener(this);
	207	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	208	+ restoreCameraItem.addActionListener(this);
	209	+
	210	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	211	+// toggleFullScreenItem.addItemListener(this);
	212	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	213	+// cameraMenu.add("-");
	214	+//
	215	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	216	+// toggleTextureItem.addItemListener(this);
	217	+// toggleTextureItem.setState(CameraPane.textureon);
	218	+//
	219	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	220	+// toggleSwitchItem.addItemListener(this);
	221	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	222	+
	223	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	224	+ toggleHandleItem.addItemListener(this);
	225	+ toggleHandleItem.setState(CameraPane.HANDLES);
	226	+
	227	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	228	+ togglePaintItem.addItemListener(this);
	229	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	230	+
	231	+ if (Globals.ADVANCED)
	232	+ {
	233	+ cameraMenu.add("-");
	234	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	235	+ toggleLiveItem.addItemListener(this);
	236	+ toggleLiveItem.setState(Globals.isLIVE());
191	237
	238	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	239	+ stepItem.addActionListener(this);
	240	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	241	+ // toggleDLItem.addItemListener(this);
	242	+ // toggleDLItem.setState(false);
	243	+
	244	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	245	+ toggleRenderItem.addItemListener(this);
	246	+ toggleRenderItem.setState(!CameraPane.frozen);
	247	+
	248	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	249	+ toggleDebugItem.addItemListener(this);
	250	+ toggleDebugItem.setState(Globals.DEBUG);
	251	+
	252	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	253	+ toggleFrustumItem.addItemListener(this);
	254	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	255	+
	256	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	257	+ toggleFootContactItem.addItemListener(this);
	258	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	259	+
	260	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	261	+ toggleTimelineItem.addItemListener(this);
	262	+ }
	263	+
	264	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	265	+// toggleRootItem.addItemListener(this);
	266	+// toggleRootItem.setState(false);
	267	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	268	+// animationItem.addItemListener(this);
	269	+// animationItem.setState(CameraPane.ANIMATION);
	270	+ cameraMenu.add("-");
	271	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	272	+ editCameraItem.addActionListener(this);
	273	+
	274	+ if (Globals.ADVANCED)
	275	+ {
	276	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	277	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	278	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	279	+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	280	+ oe.cameraMenu.add("-");
	281	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	282	+ openWindowItem.addActionListener(this);
	283	+ editLeafItem.addActionListener(this);
	284	+ lookAtItem.addActionListener(this);
	285	+ //lookFromItem.addActinoListener(this);
	286	+ //switchViewItem.addActionListener(this);
	287	+ }
	288	+
192	289	oe.menuBar.add(menu = new Menu("Setting"));
193		- resetMeshItem = menu.add(new MenuItem("Reset All"));
194		- resetMeshItem.addActionListener(this);
195		- stepAllItem = menu.add(new MenuItem("Step All"));
196		- stepAllItem.addActionListener(this);
	290	+ if (Globals.ADVANCED)
	291	+ {
197	292	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
198	293	revertMeshItem.addActionListener(this);
199	294	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
200	295	resetreferencesItem.addActionListener(this);
201	296	menu.add("-");
	297	+ }
202	298	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
203	299	overwriteGeoItem.addActionListener(this);
204	300	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -210,79 +306,103 @@
210	306	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211	307	overwriteUVItem.addActionListener(this);
212	308	menu.add("-");
	309	+ if (Globals.ADVANCED)
	310	+ {
213	311	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214	312	generateMeshItem.addActionListener(this);
215	313	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216	314	poseMeshItem.addActionListener(this);
217	315	menu.add("-");
	316	+ }
218	317	resetsupportItem = menu.add(new MenuItem("Reset support"));
219	318	resetsupportItem.addActionListener(this);
220	319	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	320	linkverticesItem.addActionListener(this);
222	321	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
223	322	relinkverticesItem.addActionListener(this);
	323	+
	324	+ if (Globals.ADVANCED)
	325	+ {
224	326	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
225	327	setMasterItem.addActionListener(this);
	328	+ }
226	329
227	330	oe.menuBar.add(menu = new Menu("Group"));
228		- grabItem = menu.add(new MenuItem("Grab"));
229		- grabItem.addActionListener(this);
	331	+// grabItem = menu.add(new MenuItem("Grab"));
	332	+// grabItem.addActionListener(this);
230	333	backItem = menu.add(new MenuItem("Back"));
231	334	backItem.addActionListener(this);
232	335	frontItem = menu.add(new MenuItem("Front"));
233	336	frontItem.addActionListener(this);
234		- compositeItem = menu.add(new MenuItem("Composite"));
235		- compositeItem.addActionListener(this);
236		- hideItem = menu.add(new MenuItem("Hide"));
	337	+// compositeItem = menu.add(new MenuItem("Composite"));
	338	+// compositeItem.addActionListener(this);
	339	+
	340	+ if (Globals.ADVANCED)
	341	+ {
	342	+ hideItem = menu.add(new MenuItem("Hidden Group"));
237	343	hideItem.addActionListener(this);
	344	+ }
238	345	ungroupItem = menu.add(new MenuItem("Ungroup"));
239	346	ungroupItem.addActionListener(this);
240		- menu.add("-");
241		- randomItem = menu.add(new MenuItem("Random"));
242		- randomItem.addActionListener(this);
243		- physicsItem = menu.add(new MenuItem("Physics"));
244		- physicsItem.addActionListener(this);
245		- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
246		- frameselectorItem.addActionListener(this);
	347	+
	348	+// menu.add("-");
	349	+//
	350	+// switchItem = menu.add(new MenuItem("Switch node"));
	351	+// switchItem.addActionListener(this);
	352	+ if (Globals.ADVANCED)
	353	+ {
247	354	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
248	355	switchGeoItem.addActionListener(this);
249	356	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
250	357	switchTransfoItem.addActionListener(this);
251		- morphItem = menu.add(new MenuItem("Morph"));
	358	+ morphItem = menu.add(new MenuItem("Morph Group"));
252	359	morphItem.addActionListener(this);
	360	+
	361	+ menu.add("-");
	362	+ physicsItem = menu.add(new MenuItem("Physics"));
	363	+ physicsItem.addActionListener(this);
	364	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	365	+ frameselectorItem.addActionListener(this);
253	366	scriptNodeItem = menu.add(new MenuItem("Script Node"));
254	367	scriptNodeItem.addActionListener(this);
255		- cameraItem = menu.add(new MenuItem("Camera"));
256		- cameraItem.addActionListener(this);
	368	+ }
257	369
258	370	oe.menuBar.add(menu = new Menu("Object"));
259		- textureItem = menu.add(new MenuItem("Texture"));
260		- textureItem.addActionListener(this);
	371	+// textureItem = menu.add(new MenuItem("Texture"));
	372	+// textureItem.addActionListener(this);
261	373	billboardItem = menu.add(new MenuItem("Billboard"));
262	374	billboardItem.addActionListener(this);
263	375	csgItem = menu.add(new MenuItem("CSG"));
264	376	csgItem.addActionListener(this);
265		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	377	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
266	378	shadowXItem.addActionListener(this);
267		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	379	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
268	380	shadowYItem.addActionListener(this);
269		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	381	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
270	382	shadowZItem.addActionListener(this);
	383	+ if (Globals.ADVANCED)
	384	+ {
	385	+ menu.add("-");
271	386	linkerItem = menu.add(new MenuItem("Linker"));
272	387	linkerItem.addActionListener(this);
273		- templateItem = menu.add(new MenuItem("Template"));
274		- templateItem.addActionListener(this);
275	388	attributeItem = menu.add(new MenuItem("Attribute"));
276	389	attributeItem.addActionListener(this);
	390	+ templateItem = menu.add(new MenuItem("Template"));
	391	+ templateItem.addActionListener(this);
277	392	pointflowItem = menu.add(new MenuItem("Point Flow"));
278	393	pointflowItem.addActionListener(this);
	394	+ }
279	395	menu.add("-");
280	396	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
281	397	resetTransformItem.addActionListener(this);
282	398	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
283	399	resetCentroidItem.addActionListener(this);
284		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
285		- transformgeometryItem.addActionListener(this);
	400	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	401	+ resetCentroidXZItem.addActionListener(this);
	402	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	403	+ transformGeometryItem.addActionListener(this);
	404	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	405	+ transformChildrenItem.addActionListener(this);
286	406
287	407	oe.menuBar.add(menu = new Menu("Geometry"));
288	408	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -293,8 +413,11 @@
293	413	genNormalsCADItem.addActionListener(this);
294	414	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
295	415	genNormalsMESHItem.addActionListener(this);
	416	+ if (Globals.ADVANCED)
	417	+ {
296	418	genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
297	419	genNormalsMINEItem.addActionListener(this);
	420	+ }
298	421	stripifyItem = menu.add(new MenuItem("Stripify"));
299	422	stripifyItem.addActionListener(this);
300	423	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -316,23 +439,34 @@
316	439	reduce34MeshItem.addActionListener(this);
317	440	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
318	441	increaseMeshItem.addActionListener(this);
319		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
320		- smoothMeshItem.addActionListener(this);
321	442	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
322	443	clipMeshItem.addActionListener(this);
	444	+
	445	+ if (Globals.ADVANCED)
	446	+ {
	447	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	448	+ smoothMeshItem.addActionListener(this);
	449	+ }
323	450
324	451	oe.menuBar.add(menu = new Menu("Attributes"));
325	452	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
326	453	clearMaterialsItem.addActionListener(this);
	454	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	455	+ resetAllItem.addActionListener(this);
	456	+ stepAllItem = menu.add(new MenuItem("Step All"));
	457	+ stepAllItem.addActionListener(this);
327	458	menu.add("-");
328	459	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
329	460	liveleavesItem.addActionListener(this);
330	461	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
331	462	unliveleavesItem.addActionListener(this);
	463	+ if (Globals.ADVANCED)
	464	+ {
332	465	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
333	466	supportleavesItem.addActionListener(this);
334	467	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
335	468	unsupportleavesItem.addActionListener(this);
	469	+ }
336	470	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
337	471	hideleavesItem.addActionListener(this);
338	472	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -341,6 +475,14 @@
341	475	markleavesItem.addActionListener(this);
342	476	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
343	477	unmarkleavesItem.addActionListener(this);
	478	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	479	+ rewindleavesItem.addActionListener(this);
	480	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	481	+ unrewindleavesItem.addActionListener(this);
	482	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	483	+ randomleavesItem.addActionListener(this);
	484	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	485	+ unrandomleavesItem.addActionListener(this);
344	486	menu.add("-");
345	487	flipVItem = menu.add(new MenuItem("Flip V"));
346	488	flipVItem.addActionListener(this);
..	..	@@ -376,35 +518,40 @@
376	518	sortbynameItem = menu.add(new MenuItem("Sort by name"));
377	519	sortbynameItem.addActionListener(this);
378	520	menu.add("-");
	521	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	522	+ shareGeometriesItem.addActionListener(this);
	523	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	524	+ mergeGeometriesItem.addActionListener(this);
	525	+ if (Globals.ADVANCED)
	526	+ {
	527	+ // Pretty much the same as duplicate and clone.
379	528	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
380	529	extractGeometriesItem.addActionListener(this);
381	530	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
382	531	cloneGeometriesItem.addActionListener(this);
383		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
384		- shareGeometriesItem.addActionListener(this);
385		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
386		- mergeGeometriesItem.addActionListener(this);
	532	+ }
387	533
388	534	oe.menuBar.add(menu = new Menu("Insert"));
389	535	buildCreateMenu(menu);
390	536
391		-
392		- oe.menuBar.add(menu = new Menu("Include"));
393		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
394		- importGFDItem.addActionListener(this);
395		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
396		- importVRMLX3DItem.addActionListener(this);
397		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
398		- importOBJItem.addActionListener(this);
399		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
400		- import3DSItem.addActionListener(this);
401		-
402	537	oe.menuBar.add(menu = new Menu("Tools"));
403	538	buildToolsMenu(menu);
404	539	}
405	540
406	541	void SetupUI2(ObjEditor oe)
407	542	{
	543	+ // June 2019
	544	+ if (oe == null)
	545	+ {
	546	+ //super.SetupUI2(this);
	547	+ //return;
	548	+ }
	549	+
	550	+ if (copy != group)
	551	+ {
	552	+ //super.SetupUI2(this);
	553	+ }
	554	+
408	555	//new Exception().printStackTrace();
409	556
410	557	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -433,110 +580,199 @@
433	580	oe.radioPanel.add(dummyButton);
434	581	oe.buttonGroup.add(dummyButton);
435	582	*/
436		- aConstraints.gridy += 1;
	583	+ cGridBag copyOptionsPanel = new cGridBag();
	584	+
	585	+ copyOptionsPanel.preferredHeight = 2;
437	586
438	587	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
439	588
440		- oe.aConstraints.gridwidth = 1;
441		- oe.aConstraints.gridx = 0;
	589	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	590	+ //minButton.setToolTipText("Minimize window");
	591	+ //minButton.addActionListener(this);
442	592
443		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
444		- liveCB.setToolTipText("Enabled animation");
	593	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	594	+ maxButton.setToolTipText("Maximize window");
	595	+ maxButton.addActionListener(this);
	596	+
	597	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	598	+ fullButton.setToolTipText("Full-screen window");
	599	+ fullButton.addActionListener(this);
	600	+
	601	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	602	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	603	+ restoreCameraButton.addActionListener(this);
	604	+
	605	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	606	+ undoButton.setToolTipText("Undo changes");
	607	+ undoButton.addActionListener(this);
	608	+
	609	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	610	+ redoButton.setToolTipText("Redo changes");
	611	+ redoButton.addActionListener(this);
	612	+
	613	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	614	+ saveButton.setToolTipText("Save changes");
	615	+ saveButton.addActionListener(this);
	616	+
	617	+ copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	618	+ liveCB.setToolTipText("Enable animation");
445	619	liveCB.addItemListener(this);
446	620
447		- oe.aConstraints.gridx += 1;
448		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK), oe.aConstraints);
449		- trackCB.setToolTipText("Enable tracking");
450		- trackCB.addItemListener(this);
451		-
452		- oe.aConstraints.gridx += 1;
453		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	621	+ copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	622	+ oneStepButton.setToolTipText("Animate one step forward");
	623	+ oneStepButton.addActionListener(this);
	624	+
	625	+ copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	626	+ fastCB.setToolTipText("Fast mode");
	627	+ fastCB.addItemListener(this);
	628	+
	629	+ //oe.toolboxPanel.Return();
	630	+
	631	+ copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
454	632	screenfitButton.setToolTipText("Screen fit");
455	633	screenfitButton.addActionListener(this);
456		- oe.aConstraints.gridx += 1;
	634	+
	635	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	636	+// trackCB.setToolTipText("Enable tracking");
	637	+// trackCB.addItemListener(this);
	638	+
457	639	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
458	640	// screenfitpointButton.addActionListener(this);
459		-// oe.aConstraints.gridx += 1;
460		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
461		- snapobjectButton.addActionListener(this);
462		- snapobjectButton.setToolTipText("Snap Object");
463		- oe.aConstraints.gridx += 1;
464	641
465		- //aConstraints.gridx = 0;
466		- //aConstraints.gridy += 1;
467		- oe.aConstraints.weighty = 0;
468		- oe.aConstraints.gridwidth = 1;
469		-
470		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
471		- flashSelectionButton.setToolTipText("Show selection");
472		- flashSelectionButton.addActionListener(this);
	642	+ if (Globals.ADVANCED)
	643	+ {
	644	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	645	+ snapobjectButton.addActionListener(this);
	646	+ snapobjectButton.setToolTipText("Snap Object");
	647	+ }
	648	+
	649	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
473	650
474		- oe.toolbarPanel.add(new cButton(" ", false));
475		-
476		- oe.aConstraints.gridx += 1;
477		- oe.aConstraints.weighty = 0;
478		- oe.aConstraints.gridwidth = 1;
479		-
480		- //
481		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	651	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
482	652	twoButton.setToolTipText("Show center view only");
483	653	twoButton.addActionListener(this);
484		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	654	+ this.fullscreenLayout = twoButton;
	655	+
	656	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
485	657	fourButton.addActionListener(this);
486	658	fourButton.setToolTipText("Show left panel only");
487		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	659	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
488	660	sixButton.setToolTipText("2-column layout left");
489	661	sixButton.addActionListener(this);
490		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	662	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
491	663	threeButton.setToolTipText("2-column layout right");
492	664	threeButton.addActionListener(this);
493		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	665	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
494	666	sevenButton.setToolTipText("3-column layout");
495	667	sevenButton.addActionListener(this);
496	668	//
497	669
498		- oe.toolbarPanel.add(rootButton = new cButton(" o o o ")); //, oe.aConstraints);
499		- rootButton.setToolTipText("Edit object in new tab");
	670	+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	671	+ rootButton.setToolTipText("Edit selection in new tab");
500	672	rootButton.addActionListener(this);
501		- oe.aConstraints.gridx += 1;
502		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	673	+
	674	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
503	675	closeButton.setToolTipText("Close tab");
504	676	closeButton.addActionListener(this);
505	677	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
506	678	//clearButton.addActionListener(this);
507		- oe.aConstraints.gridx += 1;
508		-
509		- oe.aConstraints.gridx = 1; //
510		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
511		- editButton.addActionListener(this);
512		- oe.aConstraints.gridx += 1;
513		- oe.aConstraints.weighty = 0;
514		- oe.aConstraints.gridwidth = 1;
515	679
516		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	680	+ // INSERT
	681	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	682	+ gridButton.setToolTipText("Create grid");
	683	+ gridButton.addActionListener(this);
	684	+
	685	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	686	+ boxButton.setToolTipText("Create box");
	687	+ boxButton.addActionListener(this);
	688	+
	689	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	690	+ sphereButton.setToolTipText("Create sphere");
	691	+ sphereButton.addActionListener(this);
	692	+
	693	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	694	+ coneButton.setToolTipText("Create cone");
	695	+ coneButton.addActionListener(this);
	696	+
	697	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	698	+ torusButton.setToolTipText("Create torus");
	699	+ torusButton.addActionListener(this);
	700	+
	701	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	702	+ superButton.setToolTipText("Create superellipsoid");
	703	+ superButton.addActionListener(this);
	704	+
	705	+ if (Globals.ADVANCED)
	706	+ {
	707	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	708	+ kleinButton.setToolTipText("Create Klein bottle");
	709	+ kleinButton.addActionListener(this);
	710	+ }
	711	+
	712	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	713	+ particlesButton.setToolTipText("Create particle system");
	714	+ particlesButton.addActionListener(this);
	715	+
	716	+ oe.toolboxPanel.Return();
	717	+
	718	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	719	+ groupButton.setToolTipText("Create group");
	720	+ groupButton.addActionListener(this);
	721	+
	722	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	723	+ compositeButton.setToolTipText("Create composite");
	724	+ compositeButton.addActionListener(this);
	725	+
	726	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	727	+ switchButton.setToolTipText("Create switch");
	728	+ switchButton.addActionListener(this);
	729	+
	730	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	731	+ loopButton.setToolTipText("Create loop");
	732	+ loopButton.addActionListener(this);
	733	+
	734	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	735	+ textureButton.setToolTipText("Create texture");
	736	+ textureButton.addActionListener(this);
	737	+
	738	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	739	+ overlayButton.setToolTipText("Create overlay");
	740	+ overlayButton.addActionListener(this);
	741	+
	742	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	743	+ lightButton.setToolTipText("Create light");
	744	+ lightButton.addActionListener(this);
	745	+
	746	+ // EDIT panel
	747	+ editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	748	+ editButton.setToolTipText("Edit selection");
	749	+ editButton.addActionListener(this);
	750	+
	751	+ editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	752	+ uneditButton.setToolTipText("Unedit selection");
517	753	uneditButton.addActionListener(this);
518	754
519		- oe.aConstraints.gridx += 1;
520		- oe.aConstraints.weighty = 0;
521		- oe.aConstraints.gridwidth = 1;
522		-
523		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
524		- clearPanelButton.addActionListener(this);
525		-
526		- oe.aConstraints.gridx += 1;
527		- oe.aConstraints.weighty = 0;
528		- oe.aConstraints.gridwidth = 1;
529		-
530		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	755	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	756	+ allParamsButton.setToolTipText("Edit all params");
531	757	allParamsButton.addActionListener(this);
532	758
533		- oe.aConstraints.gridx += 1;
534		- oe.aConstraints.weighty = 0;
535		- oe.aConstraints.gridwidth = 1;
536		-
537		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
	759	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	760	+ clearPanelButton.setToolTipText("Clear edit panel");
	761	+ clearPanelButton.addActionListener(this);
	762	+
	763	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	764	+ unselectButton.setToolTipText("Unselect");
538	765	unselectButton.addActionListener(this);
539	766
	767	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	768	+ flashSelectionButton.setToolTipText("Highlight selection");
	769	+ flashSelectionButton.addActionListener(this);
	770	+
	771	+ editCommandsPanel.preferredHeight = 1;
	772	+
	773	+// oe.treePanel.add(commandsPanel);
	774	+// oe.treePanel.Return();
	775	+
540	776	// oe.aConstraints.gridx += 1;
541	777	// oe.aConstraints.weighty = 0;
542	778	// oe.aConstraints.gridwidth = 1;
..	..	@@ -548,40 +784,22 @@
548	784	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
549	785	// gcButton.addActionListener(this);
550	786
551		- oe.aConstraints.gridx = 0;
552		- oe.aConstraints.gridy += 1;
553		-
554		- //ctrlPanel.add(objList = new List(5, true));
555		- oe.aConstraints.gridwidth = 100;
556		- // oe.aConstraints.gridheight = 100;
557		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
558		- oe.aConstraints.gridheight = 1;
559		- oe.aConstraints.weighty = 0.5;
560		- oe.aConstraints.gridx = 0;
561		- JScrollPane jSP;
	787	+ cGridBag jSPPanel = new cGridBag();
	788	+
	789	+ JScrollPane jSP;
562	790	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
563		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	791	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
564	792	ResetModel();
565		- oe.aConstraints.weighty = 0.5;
566		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
567		- oe.aConstraints.gridy += 1;
568		- oe.aConstraints.gridwidth = 1;
569		-
570		- oe.aConstraints.weighty = 0;
571		- oe.aConstraints.gridwidth = 2;
572		-
573		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
574		- colorCB.addItemListener(this);
575		- oe.aConstraints.gridx += 2;
576		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
577		- materialCB.addItemListener(this);
578		- oe.aConstraints.gridx += 2;
579		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
580		- textureCB.addItemListener(this);
581		-
582		- oe.aConstraints.gridx = 0;
583		- oe.aConstraints.gridy += 1;
584	793
	794	+ oe.treePanel.add(jSPPanel);
	795	+ oe.treePanel.Return();
	796	+
	797	+ oe.treePanel.add(copyOptionsPanel);
	798	+ oe.treePanel.Return();
	799	+
	800	+// mainPanel.setDividerLocation(0.5); //1.0);
	801	+// mainPanel.setResizeWeight(0.5);
	802	+
585	803	//jList.addListSelectionListener(this);
586	804	oe.jTree.addTreeSelectionListener(this);
587	805	//jTree.setRootVisible(false);
..	..	@@ -604,83 +822,139 @@
604	822	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
605	823	}
606	824
607		- void AddOptions(JPanel panel, GridBagConstraints constraints)
	825	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
608	826	{
609		- constraints.gridx = 0;
610		- constraints.gridy = 0;
611		- panel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), constraints);
612		- fastCB.setToolTipText("Fast mode");
613		- fastCB.addItemListener(this);
614		- constraints.gridy += 1;
615		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), constraints);
616		- supportCB.setToolTipText("Enabled rigging");
617		- supportCB.addItemListener(this);
	827	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	828	+ colorCB.setToolTipText("Copy color when dropped");
	829	+ colorCB.addItemListener(this);
618	830
619		- // constraints.gridy += 1;
620		- // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
621		- // localCB.addItemListener(this);
	831	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	832	+ materialCB.setToolTipText("Copy material when dropped");
	833	+ materialCB.addItemListener(this);
622	834
623		- constraints.gridy += 1;
624		- panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD), constraints);
625		- crowdCB.setToolTipText("Used for crowds");
626		- crowdCB.addItemListener(this);
627		-
628		- constraints.gridy += 1;
629		- panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), constraints);
630		- smoothCB.setToolTipText("Snapping delay");
631		- smoothCB.addItemListener(this);
632		-
633		- constraints.gridy += 1;
634		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), constraints);
635		- slowCB.setToolTipText("Smooth interpolation");
636		- slowCB.addItemListener(this);
637		- constraints.gridy += 1;
638		- panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE), constraints);
	835	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	836	+ textureCB.setToolTipText("Copy texture when dropped");
	837	+ textureCB.addItemListener(this);
	838	+
	839	+ panel.Return();
	840	+
	841	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
639	842	boxCB.setToolTipText("Display bounding boxes");
640	843	boxCB.addItemListener(this);
641		- constraints.gridy += 1;
642		- panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE), constraints);
	844	+
	845	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
643	846	zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
644	847	zoomBoxCB.addItemListener(this);
645	848
	849	+ if (true) // Globals.ADVANCED)
	850	+ {
	851	+ panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	852	+ supportCB.setToolTipText("Enable rigging");
	853	+ supportCB.addItemListener(this);
	854	+
	855	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	856	+ // localCB.addItemListener(this);
	857	+
	858	+ panel.Return();
	859	+
	860	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	861	+ crowdCB.setToolTipText("Used for crowds");
	862	+ crowdCB.addItemListener(this);
	863	+
	864	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	865	+ smoothCB.setToolTipText("Snapping delay");
	866	+ smoothCB.addItemListener(this);
	867	+
	868	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	869	+ slowCB.setToolTipText("Smooth interpolation");
	870	+ slowCB.addItemListener(this);
	871	+
646	872	// constraints.gridy += 1;
647	873	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
648	874	// speakerMocapCB.addItemListener(this);
649	875
	876	+ panel.Return();
	877	+
650	878	if (false)
651	879	{
652	880	// handled in scripts
653		- constraints.gridy += 1;
654		- panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), constraints);
	881	+ //constraints.gridy += 1;
	882	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
655	883	speakerCameraCB.addItemListener(this);
656	884
657		- constraints.gridy += 1;
658		- panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), constraints);
	885	+ //constraints.gridy += 1;
	886	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
659	887	speakerFocusCB.addItemListener(this);
660	888
661		- constraints.gridy += 1;
662		- panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), constraints);
	889	+ //constraints.gridy += 1;
	890	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
663	891	smoothfocusCB.addItemListener(this);
	892	+ panel.Return();
664	893	}
665	894
666	895	//constraints.gridx += 1;
667	896	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
668	897	// debugCB.addItemListener(this);
669	898
670		- constraints.gridy += 1;
671		- panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL), constraints);
	899	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	900	+ trackCB.setToolTipText("Enable tracking target");
	901	+ trackCB.addItemListener(this);
	902	+
	903	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	904	+ oeilCB.setToolTipText("Move camera when tracking");
672	905	oeilCB.addItemListener(this);
673	906
674		- constraints.gridy += 1;
675		- panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT), constraints);
	907	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	908	+ shadowCB.setToolTipText("Compute shadows when live");
	909	+ shadowCB.addItemListener(this);
	910	+
	911	+ panel.Return();
	912	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	913	+ toggleTextureCB.setToolTipText("Load textures");
	914	+ toggleTextureCB.addItemListener(this);
	915	+
	916	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	917	+ toggleSwitchCB.setToolTipText("Use switch");
	918	+ toggleSwitchCB.addItemListener(this);
	919	+
	920	+ panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
	921	+ autosaveCB.setToolTipText("Auto-save on structure change");
	922	+ autosaveCB.addItemListener(this);
	923	+
	924	+ panel.Return();
	925	+ if (Globals.ADVANCED)
	926	+ {
	927	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
676	928	lookAtCB.setToolTipText("Look-at target");
677	929	lookAtCB.addItemListener(this);
	930	+ }
	931	+
	932	+ }
	933	+
	934	+ cGridBag fill = new cGridBag();
	935	+ fill.preferredHeight = 200;
	936	+ cGridBag fill2 = new cGridBag();
	937	+ fill2.preferredHeight = 200;
	938	+ cGridBag fill3 = new cGridBag();
	939	+ fill3.preferredHeight = 200;
	940	+
	941	+ panel.add(fill);
	942	+ panel.add(fill2);
	943	+ panel.add(fill3);
678	944
679	945	}
680	946
681	947	void EditObject(Object3D obj)
682	948	{
683	949	cRadio radioButton = new cRadio(obj.name);
	950	+
	951	+ // Patch to avoid bug with transparency.
	952	+ radioButton.hadMaterial = obj.material != null;
	953	+ if (!radioButton.hadMaterial)
	954	+ {
	955	+ obj.material = new cMaterial();
	956	+ }
	957	+
684	958	radioButton.SetObject(obj);
685	959	radioButton.layout = sevenButton;
686	960	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -689,8 +963,11 @@
689	963	buttonGroup.add(radioButton);
690	964	radioButton.doClick();
691	965	}
	966	+
692	967	void SetupViews(ObjEditor oe)
693	968	{
	969	+ theFrame = this;
	970	+
694	971	oe.SetupViews();
695	972
696	973	System.out.println("SetupViews");
..	..	@@ -699,23 +976,27 @@
699	976	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
700	977	}
701	978
702		- JCheckBox liveCB;
703		- JCheckBox supportCB;
704		- JCheckBox localCB;
705		- JCheckBox crowdCB;
706		- JCheckBox smoothCB;
707		- JCheckBox fastCB;
708		- JCheckBox slowCB;
709		- JCheckBox boxCB;
710		- JCheckBox zoomBoxCB;
711		- JCheckBox trackCB;
712		- JCheckBox smoothfocusCB;
	979	+ cToggleButton liveCB;
	980	+ cCheckBox supportCB;
	981	+ cCheckBox localCB;
	982	+ cCheckBox crowdCB;
	983	+ cCheckBox smoothCB;
	984	+ cToggleButton fastCB;
	985	+ cCheckBox slowCB;
	986	+ cCheckBox boxCB;
	987	+ cCheckBox zoomBoxCB;
	988	+ //cToggleButton trackCB;
	989	+ cCheckBox trackCB;
	990	+ cCheckBox smoothfocusCB;
713	991	// JCheckBox speakerMocapCB;
714		- JCheckBox speakerCameraCB;
715		- JCheckBox speakerFocusCB;
716		- JCheckBox debugCB;
717		- JCheckBox oeilCB;
718		- JCheckBox lookAtCB;
	992	+ cCheckBox speakerCameraCB;
	993	+ cCheckBox speakerFocusCB;
	994	+ cCheckBox debugCB;
	995	+
	996	+ cCheckBox oeilCB;
	997	+ cCheckBox shadowCB;
	998	+ cCheckBox autosaveCB;
	999	+ cCheckBox lookAtCB;
719	1000
720	1001	// static int COLOR = 1;
721	1002	// static int MATERIAL = 2;
..	..	@@ -723,9 +1004,9 @@
723	1004
724	1005	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
725	1006
726		- JCheckBox colorCB;
727		- JCheckBox materialCB;
728		- JCheckBox textureCB;
	1007	+ cCheckBox colorCB;
	1008	+ cCheckBox materialCB;
	1009	+ cCheckBox textureCB;
729	1010
730	1011	public void itemStateChanged(ItemEvent e)
731	1012	{
..	..	@@ -753,6 +1034,7 @@
753	1034	} else if(e.getSource() == liveCB)
754	1035	{
755	1036	cameraView.ToggleLive();
	1037	+ refreshContents(false);
756	1038	}
757	1039	else if(e.getSource() == supportCB)
758	1040	{
..	..	@@ -817,6 +1099,14 @@
817	1099	{
818	1100	cameraView.ToggleOeil();
819	1101	}
	1102	+ else if(e.getSource() == shadowCB)
	1103	+ {
	1104	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1105	+ }
	1106	+ else if(e.getSource() == autosaveCB)
	1107	+ {
	1108	+ Globals.SAVEONMAKE ^= true;
	1109	+ }
820	1110	else if(e.getSource() == lookAtCB)
821	1111	{
822	1112	cameraView.ToggleLookAt();
..	..	@@ -833,7 +1123,8 @@
833	1123
834	1124	/**/
835	1125	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
836		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1126	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1127	+ TreePath path = objEditor.jTree.getSelectionPath();
837	1128	if ((path == null) \|\| (path.getPathCount() <= 1)) {
838	1129	// We can't move the root node or an empty selection
839	1130	return;
..	..	@@ -905,7 +1196,9 @@
905	1196	// objEditor.DropFile((java.io.File[]) object, true);
906	1197	// return;
907	1198	// }
908		- if (string.charAt(0) == '/')
	1199	+
	1200	+ // File path for Mac and Windows
	1201	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
909	1202	{
910	1203	// file(s)
911	1204	String[] names = string.split("\n");
..	..	@@ -932,7 +1225,7 @@
932	1225
933	1226	flashIt = false;
934	1227	CameraPane pane = (CameraPane) target;
935		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1228	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
936	1229	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
937	1230
938	1231	if (group.selection.size() == 1)
..	..	@@ -948,23 +1241,33 @@
948	1241
949	1242	assert target == objEditor.jTree;
950	1243	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1244	+ Object3D destinationLeaf;
951	1245	try {
952		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1246	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
953	1247	} catch (Exception e) {
954	1248	System.out.println("destinationPath : " + destinationPath);
955	1249	return;
956	1250	}
957	1251
958		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1252	+ for (int i=group.selection.size(); --i>=0;)
959	1253	{
	1254	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1255	+
	1256	+ // Cannot move into itself
	1257	+ if (child == destinationLeaf)
	1258	+ return;
	1259	+ }
	1260	+
	1261	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1262	+// {
960	1263	loadClipboard(true);
961	1264	objEditor.jTree.setSelectionPath(destinationPath);
962		- pasteInto(false);
963		- } else {
964		- loadClipboard(false);
965		- objEditor.jTree.setSelectionPath(destinationPath);
966		- pasteInto(false); // true); // ???
967		- }
	1265	+ pasteInto(false, false);
	1266	+// } else {
	1267	+// loadClipboard(false);
	1268	+// objEditor.jTree.setSelectionPath(destinationPath);
	1269	+// pasteInto(false, false); // true); // ???
	1270	+// }
968	1271	}
969	1272	public void dropActionChanged(DropTargetDragEvent dtde)
970	1273	// Called if the user has modified the current drop gesture
..	..	@@ -1069,85 +1372,104 @@
1069	1372	{
1070	1373	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1071	1374	//heightFieldItem.addActionListener(this);
1072		- gridItem = menu.add(new MenuItem("Grid"));
1073		- gridItem.addActionListener(this);
1074		- rectoidItem = menu.add(new MenuItem("Box"));
1075		- rectoidItem.addActionListener(this);
1076		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1077		- ellipsoidItem.addActionListener(this);
1078		- coneItem = menu.add(new MenuItem("Cone"));
1079		- coneItem.addActionListener(this);
1080		- torusItem = menu.add(new MenuItem("Torus"));
1081		- torusItem.addActionListener(this);
1082		- superItem = menu.add(new MenuItem("Superellipsoid"));
1083		- superItem.addActionListener(this);
	1375	+// gridItem = menu.add(new MenuItem("Grid"));
	1376	+// gridItem.addActionListener(this);
	1377	+// rectoidItem = menu.add(new MenuItem("Box"));
	1378	+// rectoidItem.addActionListener(this);
	1379	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1380	+// ellipsoidItem.addActionListener(this);
	1381	+// coneItem = menu.add(new MenuItem("Cone"));
	1382	+// coneItem.addActionListener(this);
	1383	+// torusItem = menu.add(new MenuItem("Torus"));
	1384	+// torusItem.addActionListener(this);
	1385	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1386	+// superItem.addActionListener(this);
	1387	+
	1388	+ cameraItem = menu.add(new MenuItem("Camera"));
	1389	+ cameraItem.addActionListener(this);
	1390	+
	1391	+ if (!Globals.ADVANCED)
	1392	+ {
1084	1393	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1085	1394	kleinItem.addActionListener(this);
1086		- particleItem = menu.add(new MenuItem("Particle system"));
1087		- particleItem.addActionListener(this);
	1395	+ }
	1396	+
	1397	+// particleItem = menu.add(new MenuItem("Particle system"));
	1398	+// particleItem.addActionListener(this);
	1399	+ if (Globals.ADVANCED)
	1400	+ {
1088	1401	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1089	1402	ragdollItem.addActionListener(this);
1090	1403	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1091	1404	ragdoll2Item.addActionListener(this);
	1405	+ }
1092	1406	menu.add("-");
1093		- meshItem = menu.add(new MenuItem("Mesh"));
	1407	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1094	1408	meshItem.addActionListener(this);
1095	1409	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1096	1410	// meshGroupItem.addActionListener(this);
	1411	+ if (Globals.ADVANCED)
	1412	+ {
1097	1413	springItem = menu.add(new MenuItem("Spring"));
1098	1414	springItem.addActionListener(this);
1099	1415	flagItem = menu.add(new MenuItem("Flag"));
1100	1416	flagItem.addActionListener(this);
1101		- bezierItem = menu.add(new MenuItem("Patch"));
1102		- bezierItem.addActionListener(this);
1103		- checkerItem = menu.add(new MenuItem("Checker"));
1104		- checkerItem.addActionListener(this);
1105	1417	blobItem = menu.add(new MenuItem("Blob"));
1106	1418	blobItem.addActionListener(this);
1107	1419	latheItem = menu.add(new MenuItem("Lathe"));
1108	1420	latheItem.addActionListener(this);
1109		- lightItem = menu.add(new MenuItem("Light"));
1110		- lightItem.addActionListener(this);
	1421	+ }
	1422	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1423	+ bezierItem.addActionListener(this);
	1424	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1425	+// overlayItem.addActionListener(this);
	1426	+// lightItem = menu.add(new MenuItem("Light"));
	1427	+// lightItem.addActionListener(this);
1111	1428	menu.add("-");
1112	1429	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1113	1430	//superLoopItem.addActionListener(this);
1114		- loopItem = menu.add(new MenuItem("Loop"));
1115		- loopItem.addActionListener(this);
	1431	+// loopItem = menu.add(new MenuItem("Loop"));
	1432	+// loopItem.addActionListener(this);
1116	1433	doubleItem = menu.add(new MenuItem("Fork"));
1117	1434	doubleItem.addActionListener(this);
	1435	+ if (Globals.ADVANCED)
	1436	+ {
1118	1437	tripleItem = menu.add(new MenuItem("Trident"));
1119	1438	tripleItem.addActionListener(this);
	1439	+ }
1120	1440	}
1121	1441
1122	1442	void buildToolsMenu(Menu menu)
1123	1443	{
1124	1444	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1125	1445	animationItem.addItemListener(this);
1126		- animationItem.setState(CameraPane.ANIMATION);
	1446	+ animationItem.setState(Globals.ANIMATION);
1127	1447
1128	1448	menu.add("-");
1129	1449	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1130	1450	parseverticesItem.addActionListener(this);
1131	1451	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1132	1452	textureFieldItem.addActionListener(this);
1133		- alignItem = menu.add(new MenuItem("Align"));
	1453	+ alignItem = menu.add(new MenuItem("Align Objects"));
1134	1454	alignItem.addActionListener(this);
1135		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1136		- mirrorItem.addActionListener(this);
1137	1455	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1138	1456	reduceMorphItem.addActionListener(this);
1139	1457	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1140	1458	reduce34MorphItem.addActionListener(this);
1141		-
	1459	+ menu.add("-");
1142	1460	menu.add(computeAOItem = new MenuItem("Compute AO"));
1143	1461	computeAOItem.addActionListener(this);
1144		- menu.add("-");
1145	1462
	1463	+ if (Globals.ADVANCED)
	1464	+ {
	1465	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1466	+ mirrorItem.addActionListener(this);
	1467	+ menu.add("-");
1146	1468	menu.add(memoryItem = new MenuItem("Memory Usage"));
1147	1469	memoryItem.addActionListener(this);
1148	1470	menu.add(analyzeItem = new MenuItem("Analyze"));
1149	1471	analyzeItem.addActionListener(this);
1150		- menu.add(dumpItem = new MenuItem("Dump"));
	1472	+ menu.add(dumpItem = new MenuItem("Print"));
1151	1473	dumpItem.addActionListener(this);
1152	1474	// menu.add(pathItem = new MenuItem("From-to path"));
1153	1475	// pathItem.addActionListener(this);
..	..	@@ -1165,6 +1487,7 @@
1165	1487	menu.add("-");
1166	1488	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1167	1489	editScriptItem.addActionListener(this);
	1490	+ }
1168	1491	}
1169	1492
1170	1493	void ScreenFit()
..	..	@@ -1287,6 +1610,7 @@
1287	1610	shadow.material = new cMaterial(obj.material);
1288	1611	shadow.material.diffuse = 0.0001f;
1289	1612	shadow.material.specular = 0.0001f;
	1613	+ //shadow.projectedVertices[1].x = 300;
1290	1614
1291	1615	makeSomething(shadow);
1292	1616	}
..	..	@@ -1493,9 +1817,9 @@
1493	1817
1494	1818	void Overwrite(int mask)
1495	1819	{
1496		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1820	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1497	1821	{
1498		- Object3D content = GrafreeD.clipboard.get(0);
	1822	+ Object3D content = Grafreed.clipboard.get(0);
1499	1823
1500	1824	if (content instanceof cGroup && ((cGroup)content).transientlink )
1501	1825	content = ((cGroup)content).get(0);
..	..	@@ -1534,7 +1858,7 @@
1534	1858	{
1535	1859	ScreenFit();
1536	1860	} else
1537		- if (source == switchItem)
	1861	+ if (source == switchViewItem)
1538	1862	{
1539	1863	cVector v1 = new cVector();
1540	1864	cVector v2 = new cVector();
..	..	@@ -1543,11 +1867,11 @@
1543	1867	objEditor.cameraView.renderCamera.setAim(v2, v1);
1544	1868	objEditor.cameraView.repaint();
1545	1869	} else
1546		- if (source == rectoidItem)
	1870	+ if (source == rectoidItem \|\| source == boxButton)
1547	1871	{
1548	1872	makeSomething(new Box());
1549	1873	} else
1550		- if (source == particleItem)
	1874	+ if (source == particleItem \|\| source == particlesButton)
1551	1875	{
1552	1876	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1553	1877	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1626,27 +1950,27 @@
1626	1950
1627	1951	makeSomething(obj);
1628	1952	} else
1629		- if (source == gridItem)
	1953	+ if (source == gridItem \|\| source == gridButton)
1630	1954	{
1631	1955	makeSomething(new Grid());
1632	1956	} else
1633		- if (source == ellipsoidItem)
	1957	+ if (source == ellipsoidItem \|\| source == sphereButton)
1634	1958	{
1635	1959	makeSomething(new Sphere());
1636	1960	} else
1637		- if (source == coneItem)
	1961	+ if (source == coneItem \|\| source == coneButton)
1638	1962	{
1639	1963	makeSomething(new Cone());
1640	1964	} else
1641		- if (source == torusItem)
	1965	+ if (source == torusItem \|\| source == torusButton)
1642	1966	{
1643	1967	makeSomething(new Torus());
1644	1968	} else
1645		- if (source == superItem)
	1969	+ if (source == superItem \|\| source == superButton)
1646	1970	{
1647	1971	makeSomething(new Superellipsoid());
1648	1972	} else
1649		- if (source == kleinItem)
	1973	+ if (source == kleinItem \|\| source == kleinButton)
1650	1974	{
1651	1975	makeSomething(new Klein());
1652	1976	} else
..	..	@@ -1666,7 +1990,7 @@
1666	1990	{
1667	1991	makeSomething(new BezierSurface());
1668	1992	} else
1669		- if (source == checkerItem)
	1993	+ if (source == overlayItem \|\| source == overlayButton)
1670	1994	{
1671	1995	/*
1672	1996	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1714,7 +2038,7 @@
1714	2038	s.setup();
1715	2039	makeSomething(s);
1716	2040	} else
1717		- if (source == lightItem)
	2041	+ if (source == lightItem \|\| source == lightButton)
1718	2042	{
1719	2043	makeSomething(new Light());
1720	2044	} else
..	..	@@ -1764,7 +2088,7 @@
1764	2088
1765	2089	group(g);
1766	2090	} else
1767		- if (source == loopItem)
	2091	+ if (source == loopItem \|\| source == loopButton)
1768	2092	{
1769	2093	Composite csg = new GroupLeaf();
1770	2094	csg.count = 5;
..	..	@@ -1800,23 +2124,6 @@
1800	2124	csg.addChild(child);
1801	2125	child.addChild(csg);
1802	2126	} else
1803		-
1804		- if (source == importGFDItem)
1805		- {
1806		- ImportGFD();
1807		- } else
1808		- if (source == importVRMLX3DItem)
1809		- {
1810		- ImportVRMLX3D();
1811		- } else
1812		- if (source == import3DSItem)
1813		- {
1814		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1815		- } else
1816		- if (source == importOBJItem)
1817		- {
1818		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1819		- } else
1820	2127	if (source == computeAOItem)
1821	2128	{
1822	2129	Globals.drawMode = CameraPane.OCCLUSION;
..	..	@@ -1835,7 +2142,7 @@
1835	2142	if (source == invariantsItem)
1836	2143	{
1837	2144	System.out.println("Invariants:");
1838		- GrafreeD.grafreeD.universe.invariants();
	2145	+ Grafreed.grafreeD.universe.invariants();
1839	2146	} else
1840	2147	if (source == memoryItem)
1841	2148	{
..	..	@@ -1853,6 +2160,35 @@
1853	2160	if (source == dumpItem)
1854	2161	{
1855	2162	DumpObject();
	2163	+ } else
	2164	+ if (source == minButton)
	2165	+ {
	2166	+ Minimize();
	2167	+ } else
	2168	+ if (source == maxButton)
	2169	+ {
	2170	+ Maximize();
	2171	+ } else
	2172	+ if (source == fullButton)
	2173	+ {
	2174	+ ToggleFullScreen();
	2175	+ } else
	2176	+ if (source == undoButton)
	2177	+ {
	2178	+ Undo();
	2179	+ } else
	2180	+ if (source == redoButton)
	2181	+ {
	2182	+ Redo();
	2183	+ } else
	2184	+ if (source == saveButton)
	2185	+ {
	2186	+ Save();
	2187	+ } else
	2188	+ if (source == oneStepButton)
	2189	+ {
	2190	+ Globals.ONESTEP = true;
	2191	+ cameraView.repaint();
1856	2192	} else
1857	2193	if (source == screenfitButton)
1858	2194	{
..	..	@@ -1903,12 +2239,20 @@
1903	2239	{
1904	2240	loadClipboard(true);
1905	2241	} else
	2242	+ if (source == undoItem)
	2243	+ {
	2244	+ Undo();
	2245	+ } else
	2246	+ if (source == redoItem)
	2247	+ {
	2248	+ Redo();
	2249	+ } else
1906	2250	if (source == duplicateItem)
1907	2251	{
1908		- Object3D keep = GrafreeD.clipboard;
	2252	+ Object3D keep = Grafreed.clipboard;
1909	2253	loadClipboard(false);
1910	2254	paste(false);
1911		- GrafreeD.clipboard = keep;
	2255	+ Grafreed.clipboard = keep;
1912	2256	} else
1913	2257	if (source == cloneItem)
1914	2258	{
..	..	@@ -1926,13 +2270,17 @@
1926	2270	{
1927	2271	paste(false);
1928	2272	} else
	2273	+ if (source == pasteIntoItem)
	2274	+ {
	2275	+ pasteInto(true, false);
	2276	+ } else
1929	2277	if (source == pasteLinkItem)
1930	2278	{
1931		- pasteInto(false);
	2279	+ pasteInto(false, false);
1932	2280	} else
1933	2281	if (source == pasteCloneItem)
1934	2282	{
1935		- pasteInto(true);
	2283	+ pasteInto(true, true);
1936	2284	} else
1937	2285	if (source == pasteExpandItem)
1938	2286	{
..	..	@@ -2124,9 +2472,9 @@
2124	2472	// group.selection.get(0).setMasterThis(content); // should be identity
2125	2473	// refreshContents();
2126	2474	// }
2127		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2475	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2128	2476	{
2129		- Object3D content = GrafreeD.clipboard.get(0);
	2477	+ Object3D content = Grafreed.clipboard.get(0);
2130	2478
2131	2479	if (content instanceof cGroup && ((cGroup)content).transientlink )
2132	2480	content = ((cGroup)content).get(0);
..	..	@@ -2134,11 +2482,11 @@
2134	2482	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2135	2483	for (int i=0; i<group.selection.size(); i++)
2136	2484	{
2137		- boolean random = CameraPane.RANDOM;
2138		- CameraPane.RANDOM = false; // parse all random nodes
	2485	+ boolean random = CameraPane.SWITCH;
	2486	+ CameraPane.SWITCH = false; // parse all random nodes
2139	2487	group.selection.get(i).linkVerticesThis(content);
2140	2488	// group.selection.get(i).setMasterThis(content); // should be identity
2141		- CameraPane.RANDOM = random;
	2489	+ CameraPane.SWITCH = random;
2142	2490	}
2143	2491	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2144	2492	refreshContents();
..	..	@@ -2148,20 +2496,20 @@
2148	2496	{
2149	2497	for (int i=0; i<group.selection.size(); i++)
2150	2498	{
2151		- boolean random = CameraPane.RANDOM;
2152		- CameraPane.RANDOM = false; // parse all random nodes
	2499	+ boolean random = CameraPane.SWITCH;
	2500	+ CameraPane.SWITCH = false; // parse all random nodes
2153	2501	group.selection.get(i).linkVerticesThis(null);
2154		- CameraPane.RANDOM = random;
	2502	+ CameraPane.SWITCH = random;
2155	2503	}
2156	2504
2157	2505	refreshContents();
2158	2506	} else
2159	2507	if (source == relinkverticesItem)
2160	2508	{
2161		- boolean random = CameraPane.RANDOM;
2162		- CameraPane.RANDOM = false; // parse all random nodes
	2509	+ boolean random = CameraPane.SWITCH;
	2510	+ CameraPane.SWITCH = false; // parse all random nodes
2163	2511	group.selection.RelinkToSupport();
2164		- CameraPane.RANDOM = random;
	2512	+ CameraPane.SWITCH = random;
2165	2513
2166	2514	refreshContents();
2167	2515	} else
..	..	@@ -2176,9 +2524,9 @@
2176	2524	} else
2177	2525	if (source == setMasterItem)
2178	2526	{
2179		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2527	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2180	2528	{
2181		- Object3D content = GrafreeD.clipboard.get(0);
	2529	+ Object3D content = Grafreed.clipboard.get(0);
2182	2530
2183	2531	if (content instanceof cGroup && ((cGroup)content).transientlink )
2184	2532	content = ((cGroup)content).get(0);
..	..	@@ -2191,9 +2539,9 @@
2191	2539	{
2192	2540	if (group.selection.size() == 1)
2193	2541	{
2194		- if (GrafreeD.clipboard.size() == 1)
	2542	+ if (Grafreed.clipboard.size() == 1)
2195	2543	{
2196		- Object3D content = GrafreeD.clipboard.get(0);
	2544	+ Object3D content = Grafreed.clipboard.get(0);
2197	2545
2198	2546	if (content instanceof cGroup && ((cGroup)content).transientlink )
2199	2547	content = ((cGroup)content).get(0);
..	..	@@ -2210,7 +2558,7 @@
2210	2558	{
2211	2559	RevertMeshes();
2212	2560	} else
2213		- if (source == resetMeshItem)
	2561	+ if (source == resetAllItem)
2214	2562	{
2215	2563	ResetAll();
2216	2564	} else
..	..	@@ -2230,9 +2578,9 @@
2230	2578	{
2231	2579	ClearSelection(true);
2232	2580	} else
2233		- if (source == grabItem)
	2581	+ if (source == grabItem \|\| source == groupButton)
2234	2582	{
2235		- group(new cGroup(), true);
	2583	+ group(new cGroup(), false); // true);
2236	2584	} else
2237	2585	if (source == hideItem)
2238	2586	{
..	..	@@ -2250,16 +2598,16 @@
2250	2598	{
2251	2599	makeSomething(new Camera());
2252	2600	} else
2253		- if (source == compositeItem)
	2601	+ if (source == compositeItem \|\| source == compositeButton)
2254	2602	{
2255	2603	group(new Composite());
2256	2604	} else
2257		- if (source == randomItem)
	2605	+ if (source == switchItem \|\| source == switchButton)
2258	2606	{
2259	2607	RandomNode random = new RandomNode();
2260	2608	group(random);
2261	2609	if (random.size() > 0)
2262		- random.name = random.get(0).name + "Rnd";
	2610	+ random.name = random.get(0).name + "Switch";
2263	2611	} else
2264	2612	if (source == physicsItem)
2265	2613	{
..	..	@@ -2356,7 +2704,7 @@
2356	2704	{
2357	2705	group(new cLinker());
2358	2706	} else
2359		- if (source == textureItem)
	2707	+ if (source == textureItem \|\| source == textureButton)
2360	2708	{
2361	2709	group(new TextureNode());
2362	2710	} else
..	..	@@ -2376,7 +2724,7 @@
2376	2724	{
2377	2725	CastShadow(2);
2378	2726	} else
2379		- if (source == ungroupItem)
	2727	+ if (source == ungroupItem \|\| source == ungroupButton)
2380	2728	{
2381	2729	//ungroup();
2382	2730	for (int i=0; i<group.selection.size(); i++)
..	..	@@ -2398,7 +2746,7 @@
2398	2746	} else
2399	2747	if (source == genNormalsMESHItem)
2400	2748	{
2401		- GenNormals(true); // TODO
	2749	+ GenNormalsMESH();
2402	2750	} else
2403	2751	if (source == genNormalsORGANItem)
2404	2752	{
..	..	@@ -2463,6 +2811,22 @@
2463	2811	if (source == unmarkleavesItem)
2464	2812	{
2465	2813	MarkLeaves(false);
	2814	+ } else
	2815	+ if (source == rewindleavesItem)
	2816	+ {
	2817	+ RewindLeaves(true);
	2818	+ } else
	2819	+ if (source == unrewindleavesItem)
	2820	+ {
	2821	+ RewindLeaves(false);
	2822	+ } else
	2823	+ if (source == randomleavesItem)
	2824	+ {
	2825	+ RandomLeaves(true);
	2826	+ } else
	2827	+ if (source == unrandomleavesItem)
	2828	+ {
	2829	+ RandomLeaves(false);
2466	2830	} else
2467	2831	if (source == flipVItem)
2468	2832	{
..	..	@@ -2548,9 +2912,13 @@
2548	2912	{
2549	2913	SmoothMesh();
2550	2914	} else
2551		- if (source == transformgeometryItem)
	2915	+ if (source == transformGeometryItem)
2552	2916	{
2553	2917	TransformGeometry();
	2918	+ } else
	2919	+ if (source == transformChildrenItem)
	2920	+ {
	2921	+ TransformChildren();
2554	2922	} else
2555	2923	if (source == resetTransformItem)
2556	2924	{
..	..	@@ -2558,7 +2926,11 @@
2558	2926	} else
2559	2927	if (source == resetCentroidItem)
2560	2928	{
2561		- ResetCentroid();
	2929	+ ResetCentroid(true);
	2930	+ } else
	2931	+ if (source == resetCentroidXZItem)
	2932	+ {
	2933	+ ResetCentroid(false);
2562	2934	} else
2563	2935	if (source == resetParentItem)
2564	2936	{
..	..	@@ -2690,6 +3062,10 @@
2690	3062	if (source == twoButton)
2691	3063	{
2692	3064	radio.layout = twoButton;
	3065	+
	3066	+ if (CameraPane.FULLSCREEN)
	3067	+ fullscreenLayout = radio.layout;
	3068	+
2693	3069	// bug
2694	3070	//gridPanel.setDividerLocation(1.0);
2695	3071	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2720,12 +3096,33 @@
2720	3096	// centralPanel.setVisible(true);
2721	3097	// XYZPanel.setVisible(false);
2722	3098	bigThree.ClearUI();
2723		- bigThree.addComponent(centralPanel);
	3099	+ bigThree.add(centralPanel);
2724	3100	bigThree.FlushUI();
	3101	+
	3102	+ cameraView.requestFocusInWindow();
	3103	+
	3104	+// refreshContents(true);
	3105	+//
	3106	+// try
	3107	+// {
	3108	+// java.awt.Robot bot = new java.awt.Robot();
	3109	+// int mask = InputEvent.BUTTON1_MASK;
	3110	+// bot.mouseMove(100, 100);
	3111	+// bot.mousePress(mask);
	3112	+// bot.mouseRelease(mask);
	3113	+// }
	3114	+// catch (Exception e)
	3115	+// {
	3116	+//
	3117	+// }
	3118	+
2725	3119	} else
2726	3120	if (source == threeButton)
2727	3121	{
2728	3122	radio.layout = threeButton;
	3123	+
	3124	+ if (CameraPane.FULLSCREEN)
	3125	+ fullscreenLayout = radio.layout;
2729	3126
2730	3127	// bigThree.remove(scenePanel);
2731	3128	// bigThree.remove(centralPanel);
..	..	@@ -2755,13 +3152,18 @@
2755	3152	// centralPanel.setVisible(true);
2756	3153	// XYZPanel.setVisible(true);
2757	3154	bigThree.ClearUI();
2758		- bigThree.addComponent(centralPanel);
2759		- bigThree.addComponent(XYZPanel);
	3155	+ bigThree.add(centralPanel);
	3156	+ bigThree.add(XYZPanel);
2760	3157	bigThree.FlushUI();
	3158	+
	3159	+ cameraView.requestFocusInWindow();
2761	3160	} else
2762	3161	if (source == fourButton)
2763	3162	{
2764	3163	radio.layout = fourButton;
	3164	+
	3165	+ if (CameraPane.FULLSCREEN)
	3166	+ fullscreenLayout = radio.layout;
2765	3167
2766	3168	// bigThree.remove(scenePanel);
2767	3169	// bigThree.remove(centralPanel);
..	..	@@ -2791,12 +3193,17 @@
2791	3193	// centralPanel.setVisible(false);
2792	3194	// XYZPanel.setVisible(false);
2793	3195	bigThree.ClearUI();
2794		- bigThree.addComponent(scenePanel);
	3196	+ bigThree.add(scenePanel);
2795	3197	bigThree.FlushUI();
	3198	+
	3199	+ cameraView.requestFocusInWindow();
2796	3200	} else
2797	3201	if (source == sixButton)
2798	3202	{
2799	3203	radio.layout = sixButton;
	3204	+
	3205	+ if (CameraPane.FULLSCREEN)
	3206	+ fullscreenLayout = radio.layout;
2800	3207
2801	3208	// bigThree.remove(scenePanel);
2802	3209	// bigThree.remove(centralPanel);
..	..	@@ -2826,13 +3233,18 @@
2826	3233	// centralPanel.setVisible(true);
2827	3234	// XYZPanel.setVisible(false);
2828	3235	bigThree.ClearUI();
2829		- bigThree.addComponent(scenePanel);
2830		- bigThree.addComponent(centralPanel);
	3236	+ bigThree.add(scenePanel);
	3237	+ bigThree.add(centralPanel);
2831	3238	bigThree.FlushUI();
	3239	+
	3240	+ cameraView.requestFocusInWindow();
2832	3241	} else
2833	3242	if (source == sevenButton)
2834	3243	{
2835	3244	radio.layout = sevenButton;
	3245	+
	3246	+ if (CameraPane.FULLSCREEN)
	3247	+ fullscreenLayout = radio.layout;
2836	3248
2837	3249	// bigThree.remove(scenePanel);
2838	3250	// bigThree.remove(centralPanel);
..	..	@@ -2862,10 +3274,12 @@
2862	3274	// centralPanel.setVisible(true);
2863	3275	// XYZPanel.setVisible(true);
2864	3276	bigThree.ClearUI();
2865		- bigThree.addComponent(scenePanel);
2866		- bigThree.addComponent(centralPanel);
2867		- bigThree.addComponent(XYZPanel);
	3277	+ bigThree.add(scenePanel);
	3278	+ bigThree.add(centralPanel);
	3279	+ bigThree.add(XYZPanel);
2868	3280	bigThree.FlushUI();
	3281	+
	3282	+ cameraView.requestFocusInWindow();
2869	3283	} else
2870	3284	if (source == rootButton)
2871	3285	{
..	..	@@ -2877,6 +3291,7 @@
2877	3291	EditObject(obj);
2878	3292	}
2879	3293
	3294	+ cameraView.requestFocusInWindow();
2880	3295	refreshContents(true);
2881	3296	} else
2882	3297	if (source == closeButton)
..	..	@@ -2886,18 +3301,27 @@
2886	3301	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2887	3302	{
2888	3303	ab = (cRadio)e.nextElement();
2889		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3304	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2890	3305	{
	3306	+ // Patch to avoid bug with transparency.
	3307	+ if (!ab.hadMaterial)
	3308	+ {
	3309	+ ab.object.material = null;
	3310	+ }
	3311	+
2891	3312	buttonGroup.remove(ab);
2892	3313	radioPanel.remove(ab);
2893	3314
2894		- ab.GetObject().editWindow = null;
	3315	+ //ab.GetObject().editWindow = null;
	3316	+ ab.GetObject().manipWindow = null;
2895	3317	// ab.GetObject().objectUI = null; // ?????????
2896	3318
2897	3319	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2898	3320	break;
2899	3321	}
2900	3322	}
	3323	+
	3324	+ cameraView.requestFocusInWindow();
2901	3325	refreshContents(true);
2902	3326	} else
2903	3327	if (source == editItem \|\| source == editButton)
..	..	@@ -2914,9 +3338,9 @@
2914	3338	child.CloseUI();
2915	3339	listUI.remove(child);
2916	3340
2917		- child.editWindow = null; // ???????????
	3341	+ //child.editWindow = null; // ???????????
2918	3342	}
2919		- objEditor.ctrlPanel.revalidate();
	3343	+ objEditor.ctrlPanel.FlushUI();
2920	3344	//objEditor.jTree.clearSelection();
2921	3345	//objEditor.ResetSliders();
2922	3346	refreshContents(true);
..	..	@@ -3000,7 +3424,11 @@
3000	3424	frontView.object = group;
3001	3425	sideView.object = group;
3002	3426	}
3003		- group.editWindow = this;
	3427	+
	3428	+// fix "+" issue
	3429	+ //group.editWindow = this;
	3430	+ group.manipWindow = this;
	3431	+
3004	3432	/*
3005	3433	currentLayout = radio.layout;
3006	3434	if (currentLayout == null)
..	..	@@ -3012,8 +3440,23 @@
3012	3440	//group.parent = null; // ROOT
3013	3441	//group.attributes = -1;
3014	3442	ResetModel();
	3443	+
	3444	+ cameraView.requestFocusInWindow();
3015	3445	refreshContents(true);
3016		- }
	3446	+ } else if (event.getSource() == editCameraItem)
	3447	+ {
	3448	+ cameraView.ProtectCamera();
	3449	+ cameraView.repaint();
	3450	+ return;
	3451	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3452	+ {
	3453	+ cameraView.RevertCamera();
	3454	+ cameraView.repaint();
	3455	+ return;
	3456	+ // } else if (event.getSource() == textureButton)
	3457	+ // {
	3458	+ // return; // true;
	3459	+ }
3017	3460	else
3018	3461	{
3019	3462	//return super.action(event, arg);
..	..	@@ -3022,7 +3465,6 @@
3022	3465	}
3023	3466
3024	3467	boolean useclient = false;
3025		- cRadio radio;
3026	3468
3027	3469	void ToggleRoot()
3028	3470	{
..	..	@@ -3074,6 +3516,28 @@
3074	3516	refreshContents();
3075	3517	}
3076	3518
	3519	+ void TransformChildren()
	3520	+ {
	3521	+ Object3D obj;
	3522	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3523	+ {
	3524	+ obj = (Object3D)e.nextElement();
	3525	+ obj.KeepTextureMatrices();
	3526	+ obj.TransformChildren();
	3527	+ obj.RestoreTextureMatrices();
	3528	+
	3529	+// if (obj.parent == null)
	3530	+// {
	3531	+// System.out.println("NULL PARENT!");
	3532	+// new Exception().printStackTrace();
	3533	+// }
	3534	+// else
	3535	+// TouchTransform(obj);
	3536	+// //obj.parent.Touch();
	3537	+ }
	3538	+
	3539	+ refreshContents();
	3540	+ }
3077	3541
3078	3542	void ResetTransform()
3079	3543	{
..	..	@@ -3186,7 +3650,7 @@
3186	3650	refreshContents();
3187	3651	}
3188	3652
3189		- void ResetCentroid()
	3653	+ void ResetCentroid(boolean full)
3190	3654	{
3191	3655	Object3D obj;
3192	3656	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3201,12 +3665,16 @@
3201	3665	LA.matIdentity(Object3D.mat);
3202	3666	obj.getBounds(minima, maxima, false);
3203	3667	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3204		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3668	+ if (full)
	3669	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3205	3670	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3206	3671	obj.TransformMesh(Object3D.mat);
	3672	+
3207	3673	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3208		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3674	+ if (full)
	3675	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3209	3676	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3677	+
3210	3678	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3211	3679	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3212	3680	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3235,7 +3703,8 @@
3235	3703
3236	3704	int size = obj.MemorySize();
3237	3705
3238		- System.err.println((size/1024) + " KB is the size of " + obj);
	3706	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3707	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3239	3708	}
3240	3709	}
3241	3710	catch (Exception e)
..	..	@@ -3272,9 +3741,9 @@
3272	3741	obj = (Object3D)e.nextElement();
3273	3742
3274	3743	System.out.println("Object is: " + obj);
3275		- GrafreeD.AnalyzeObject(obj);
	3744	+ Grafreed.AnalyzeObject(obj);
3276	3745	System.out.println("Boundary rep: " + obj.bRep);
3277		- GrafreeD.AnalyzeObject(obj.bRep);
	3746	+ Grafreed.AnalyzeObject(obj.bRep);
3278	3747
3279	3748	// System.err.println((size/1024) + " KB is the size of " + obj);
3280	3749	}
..	..	@@ -3316,6 +3785,13 @@
3316	3785	void GenNormals(boolean crease)
3317	3786	{
3318	3787	group.GenNormalsS(crease);
	3788	+
	3789	+ refreshContents();
	3790	+ }
	3791	+
	3792	+ void GenNormalsMESH()
	3793	+ {
	3794	+ group.GenNormalsMeshS();
3319	3795
3320	3796	refreshContents();
3321	3797	}
..	..	@@ -3488,8 +3964,8 @@
3488	3964
3489	3965	void ParseVertices()
3490	3966	{
3491		- boolean epsequal = GrafreeD.epsequal;
3492		- GrafreeD.epsequal = true;
	3967	+ boolean epsequal = Grafreed.epsequal;
	3968	+ Grafreed.epsequal = true;
3493	3969
3494	3970	for (int i=0; i<group.selection.size(); i++)
3495	3971	{
..	..	@@ -3514,7 +3990,7 @@
3514	3990	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3515	3991	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3516	3992
3517		- g.add(GrafreeD.clipboard);
	3993	+ g.add(Grafreed.clipboard);
3518	3994
3519	3995	buffer.add(g);
3520	3996	}
..	..	@@ -3529,7 +4005,7 @@
3529	4005	makeSomething(buffer, i==group.selection.size()-1);
3530	4006	}
3531	4007
3532		- GrafreeD.epsequal = epsequal;
	4008	+ Grafreed.epsequal = epsequal;
3533	4009
3534	4010	refreshContents();
3535	4011	}
..	..	@@ -3547,7 +4023,16 @@
3547	4023	String pigment = Object3D.GetPigment(tex);
3548	4024	//String bump = Object3D.GetBump(tex);
3549	4025
3550		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4026	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4027	+
	4028	+ try
	4029	+ {
	4030	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4031	+ }
	4032	+ catch (Exception e)
	4033	+ {
	4034	+ System.err.println("FAIL: " + node);
	4035	+ }
3551	4036
3552	4037	double s = v.s;
3553	4038
..	..	@@ -3635,11 +4120,11 @@
3635	4120
3636	4121	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3637	4122
3638		- boolean random = CameraPane.RANDOM;
3639		- CameraPane.RANDOM = false; // parse all random nodes
	4123	+ boolean random = CameraPane.SWITCH;
	4124	+ CameraPane.SWITCH = false; // parse all random nodes
3640	4125	lowres.linkVerticesThis(null);
3641	4126	lowres.linkVerticesThis(sn);
3642		- CameraPane.RANDOM = random;
	4127	+ CameraPane.SWITCH = random;
3643	4128
3644	4129	System.err.flush();
3645	4130
..	..	@@ -3679,7 +4164,7 @@
3679	4164	return;
3680	4165
3681	4166	Object3D poses = group.selection.get(0);
3682		- Object3D ref = GrafreeD.clipboard.get(0);
	4167	+ Object3D ref = Grafreed.clipboard.get(0);
3683	4168
3684	4169	Object3D newgroup = new Object3D("Po:" + poses.name);
3685	4170
..	..	@@ -3873,9 +4358,9 @@
3873	4358
3874	4359	void ClipMesh()
3875	4360	{
3876		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4361	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3877	4362	{
3878		- Object3D content = GrafreeD.clipboard.get(0);
	4363	+ Object3D content = Grafreed.clipboard.get(0);
3879	4364
3880	4365	if (content instanceof cGroup && ((cGroup)content).transientlink )
3881	4366	content = ((cGroup)content).get(0);
..	..	@@ -3884,7 +4369,7 @@
3884	4369	// {
3885	4370	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3886	4371	// }
3887		- group.selection.ClipMesh(GrafreeD.clipboard);
	4372	+ group.selection.ClipMesh(Grafreed.clipboard);
3888	4373	}
3889	4374	// group.selection.ClipMesh(GrafreeD.clipboard);
3890	4375	System.out.println("DONE.");
..	..	@@ -3931,6 +4416,18 @@
3931	4416	void MarkLeaves(boolean hide)
3932	4417	{
3933	4418	group.selection.MarkLeaves(hide);
	4419	+ refreshContents();
	4420	+ }
	4421	+
	4422	+ void RewindLeaves(boolean hide)
	4423	+ {
	4424	+ group.selection.RewindLeaves(hide);
	4425	+ refreshContents();
	4426	+ }
	4427	+
	4428	+ void RandomLeaves(boolean hide)
	4429	+ {
	4430	+ group.selection.RandomLeaves(hide);
3934	4431	refreshContents();
3935	4432	}
3936	4433
..	..	@@ -4016,10 +4513,10 @@
4016	4513	{
4017	4514	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4018	4515	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4019		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4516	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4020	4517
4021	4518	Object3D elem = (Object3D)group.selection.elementAt(i);
4022		- if(elem != group)
	4519	+ if(elem != group \|\| !newWindow)
4023	4520	{
4024	4521	// if (!(elem instanceof Composite))
4025	4522	// newWindow = false;
..	..	@@ -4109,7 +4606,6 @@
4109	4606	//case 702: // Event.LIST_DESELECT
4110	4607	group.deselectAll();
4111	4608	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4112		- objEditor.ClearInfo(); // .GetMaterial());
4113	4609	if (tps != null)
4114	4610	{
4115	4611	for (int i=0; i < tps.length; i++)
..	..	@@ -4118,29 +4614,28 @@
4118	4614
4119	4615	//if (child.parent != null)
4120	4616	//child.parent.addSelectee(child);
	4617	+ objEditor.SetMaterial(child);
4121	4618	group.addSelectee(child);
4122		- objEditor.SetMaterial(child); // .GetMaterial());
4123		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4124		- System.err.println("info : " + child.GetPath());
4125	4619	}
4126	4620	}
4127		- else
4128		- {
4129		- objEditor.SetMaterial(group); // .GetMaterial());
4130		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4131		- System.err.println("info : " + group.GetPath());
4132		- }
	4621	+// else
	4622	+// {
	4623	+// objEditor.SetMaterial(group); // .GetMaterial());
	4624	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4625	+// System.err.println("info : " + group.GetPath());
	4626	+// }
4133	4627
4134		- objEditor.SetText(); // jan 2014
4135		-
4136		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4628	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4137	4629	CameraPane.flash = true;
4138	4630
4139		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4631	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4140	4632	// a camera
4141	4633	{
4142		- CameraPane.camerachangeframe = 0; // don't refuse it
4143		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4634	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4635	+ {
	4636	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4637	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4638	+ }
4144	4639	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4145	4640	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4146	4641	}
..	..	@@ -4153,6 +4648,27 @@
4153	4648
4154	4649	freezemodel = false;
4155	4650	}
	4651	+
	4652	+ void refreshContents(boolean cp)
	4653	+ {
	4654	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4655	+ if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
	4656	+ {
	4657	+ objEditor.ClearInfo(); // .GetMaterial());
	4658	+
	4659	+ for (int i=0; i < group.selection.Size(); i++)
	4660	+ {
	4661	+ Object3D child = (Object3D) group.selection.get(i);
	4662	+
	4663	+ objEditor.AddInfo(child, this, true);
	4664	+ System.err.println("info : " + child.GetPath());
	4665	+ }
	4666	+
	4667	+ objEditor.SetText(); // jan 2014
	4668	+ }
	4669	+
	4670	+ super.refreshContents(cp);
	4671	+ }
4156	4672
4157	4673	void linkSomething(Object3D thing)
4158	4674	{
..	..	@@ -4224,16 +4740,19 @@
4224	4740	{
4225	4741	if (group.selection.isEmpty())
4226	4742	return;
4227		- GrafreeD.clipboardIsTempGroup = false;
	4743	+
	4744	+ Grafreed.clipboardIsTempGroup = false;
4228	4745	Composite tGroup = null;
4229	4746	if (group.selection.size() > 0) // 1)
4230	4747	{
4231	4748	tGroup = new cGroup();
4232		- GrafreeD.clipboardIsTempGroup = true;
	4749	+ Grafreed.clipboardIsTempGroup = true;
4233	4750	}
4234	4751
4235	4752	if (cut)
4236	4753	{
	4754	+ if (Globals.SAVEONMAKE)
	4755	+ Save();
4237	4756	//int indices[] = jList.getSelectedIndices();
4238	4757	//for (int i = indices.length - 1; i >= 0; i--)
4239	4758	//jList.remove(indices[i]);
..	..	@@ -4269,16 +4788,16 @@
4269	4788	//System.out.println("cut " + child);
4270	4789	//System.out.println("parent = " + child.parent);
4271	4790	// tmp.addChild(child);
4272		- if (GrafreeD.clipboardIsTempGroup)
	4791	+ if (Grafreed.clipboardIsTempGroup)
4273	4792	tGroup.add/Child/(tmp);
4274	4793	else
4275		- GrafreeD.clipboard = tmp;
	4794	+ Grafreed.clipboard = tmp;
4276	4795	}
4277	4796	else
4278		- if (GrafreeD.clipboardIsTempGroup)
	4797	+ if (Grafreed.clipboardIsTempGroup)
4279	4798	tGroup.add/Child/(child);
4280	4799	else
4281		- GrafreeD.clipboard = child;
	4800	+ Grafreed.clipboard = child;
4282	4801	}
4283	4802
4284	4803	//ResetModel();
..	..	@@ -4310,21 +4829,23 @@
4310	4829	//System.out.println("cut " + elem);
4311	4830	//System.out.println("parent = " + elem.parent);
4312	4831	// tmp.addChild(elem);
4313		- if (GrafreeD.clipboardIsTempGroup)
	4832	+ if (Grafreed.clipboardIsTempGroup)
4314	4833	tGroup.add/Child/(tmp);
4315	4834	else
4316		- GrafreeD.clipboard = tmp;
	4835	+ Grafreed.clipboard = tmp;
4317	4836	}
4318	4837	else
4319		- if (GrafreeD.clipboardIsTempGroup)
	4838	+ if (Grafreed.clipboardIsTempGroup)
4320	4839	tGroup.add/Child/(child);
4321	4840	else
4322		- GrafreeD.clipboard = child;
	4841	+ Grafreed.clipboard = child;
4323	4842	}
4324	4843
4325	4844	}
4326		- if (GrafreeD.clipboardIsTempGroup)
4327		- GrafreeD.clipboard = tGroup;
	4845	+
	4846	+ if (Grafreed.clipboardIsTempGroup)
	4847	+ Grafreed.clipboard = tGroup;
	4848	+
4328	4849	if (cut)
4329	4850	{
4330	4851	ResetModel();
..	..	@@ -4338,7 +4859,7 @@
4338	4859	// return;
4339	4860	boolean first = true;
4340	4861
4341		- if (GrafreeD.clipboardIsTempGroup)
	4862	+ if (Grafreed.clipboardIsTempGroup)
4342	4863	{
4343	4864	Composite temp;
4344	4865
..	..	@@ -4349,7 +4870,7 @@
4349	4870	temp = (Composite)Applet3D.clipboard.deepCopy();
4350	4871	*/
4351	4872	Object3D elem;
4352		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4873	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4353	4874	{
4354	4875	Object3D child = (Object3D)e.nextElement();
4355	4876
..	..	@@ -4383,21 +4904,21 @@
4383	4904	//Object3D cb = Applet3D.clipboard;
4384	4905	//temp.addChild(cb);
4385	4906	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4386		- assert(GrafreeD.clipboard.parent == null);
4387		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4388		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4389		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4390		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	4907	+ assert(Grafreed.clipboard.parent == null);
	4908	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4909	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4910	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4911	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4391	4912	else
4392		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4393		- GrafreeD.clipboard.get(0).parent = keepparent;
	4913	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4914	+ Grafreed.clipboard.get(0).parent = keepparent;
4394	4915	}
4395	4916
4396	4917	ResetModel();
4397	4918	refreshContents();
4398	4919	}
4399	4920
4400		- void pasteInto(boolean copyit)
	4921	+ void pasteInto(boolean copyit, boolean clone)
4401	4922	{
4402	4923	// if (GrafreeD.clipboard == null)
4403	4924	// return;
..	..	@@ -4426,15 +4947,22 @@
4426	4947	if (copyit)
4427	4948	{
4428	4949	// paste(false);
4429		- CloneClipboard(false); // sept 2014
	4950	+ if (clone)
	4951	+ {
	4952	+ CloneClipboard(false); // sept 2014
	4953	+ }
	4954	+ else
	4955	+ {
	4956	+ paste(false);
	4957	+ }
4430	4958	}
4431	4959	else
4432	4960	{
4433	4961	boolean first = true;
4434	4962
4435		- if (GrafreeD.clipboardIsTempGroup)
	4963	+ if (Grafreed.clipboardIsTempGroup)
4436	4964	{
4437		- Composite temp = (Composite)GrafreeD.clipboard;
	4965	+ Composite temp = (Composite)Grafreed.clipboard;
4438	4966	Object3D copy;
4439	4967	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4440	4968	{
..	..	@@ -4444,7 +4972,7 @@
4444	4972	}
4445	4973	} else
4446	4974	{
4447		- linkSomething(GrafreeD.clipboard); //.get(0));
	4975	+ linkSomething(Grafreed.clipboard); //.get(0));
4448	4976	}
4449	4977	}
4450	4978	}
..	..	@@ -4849,21 +5377,6 @@
4849	5377	}
4850	5378	*/
4851	5379
4852		- void ImportGFD()
4853		- {
4854		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4855		- browser.show();
4856		- String filename = browser.getFile();
4857		- if (filename != null && filename.length() > 0)
4858		- {
4859		- String fullname = browser.getDirectory() + filename;
4860		-
4861		- //Object3D readobj =
4862		- objEditor.ReadGFD(fullname, objEditor);
4863		- //makeSomething(readobj);
4864		- }
4865		- }
4866		-
4867	5380	/*
4868	5381	public void Callback(Object obj)
4869	5382	{
..	..	@@ -4887,26 +5400,9 @@
4887	5400	}
4888	5401	*/
4889	5402
4890		- void ImportVRMLX3D()
4891		- {
4892		- if (GrafreeD.standAlone)
4893		- {
4894		- /**/
4895		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4896		- browser.show();
4897		- String filename = browser.getFile();
4898		- if (filename != null && filename.length() > 0)
4899		- {
4900		- String fullname = browser.getDirectory() + filename;
4901		- LoadVRMLX3D(fullname);
4902		- }
4903		- /**/
4904		- }
4905		- }
4906		-
4907	5403	String GetFile(String dialogName)
4908	5404	{
4909		- if (GrafreeD.standAlone)
	5405	+ if (Grafreed.standAlone)
4910	5406	{
4911	5407	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4912	5408	browser.show();
..	..	@@ -4970,10 +5466,38 @@
4970	5466	cButton flashSelectionButton;
4971	5467	cButton editButton;
4972	5468	cButton uneditButton;
	5469	+ JCheckBox allParamsButton;
4973	5470	cButton clearpanelButton;
4974		- cButton allParamsButton;
4975	5471	cButton unselectButton;
4976	5472
	5473	+ cButton restoreCameraButton;
	5474	+
	5475	+ cButton minButton;
	5476	+ cButton maxButton;
	5477	+ cButton fullButton;
	5478	+ cButton undoButton;
	5479	+ cButton redoButton;
	5480	+ cButton saveButton;
	5481	+ cButton oneStepButton;
	5482	+
	5483	+ cButton groupButton;
	5484	+ cButton ungroupButton;
	5485	+ cButton compositeButton;
	5486	+ cButton switchButton;
	5487	+ cButton loopButton;
	5488	+ cButton textureButton;
	5489	+
	5490	+ cButton gridButton;
	5491	+ cButton boxButton;
	5492	+ cButton sphereButton;
	5493	+ cButton coneButton;
	5494	+ cButton torusButton;
	5495	+ cButton superButton;
	5496	+ cButton kleinButton;
	5497	+ cButton particlesButton;
	5498	+ cButton overlayButton;
	5499	+ cButton lightButton;
	5500	+
4977	5501	cButton screenfitButton;
4978	5502	cButton screenfitpointButton;
4979	5503	cButton snapobjectButton;
..	..	@@ -4985,14 +5509,6 @@
4985	5509
4986	5510	cButton setsupportButton;
4987	5511
4988		- cButton twoButton;
4989		- cButton sixButton;
4990		- cButton threeButton;
4991		- cButton sevenButton;
4992		- cButton fourButton; // full panel
4993		- cButton oneButton; // full XYZ
4994		- //cButton currentLayout;
4995		-
4996	5512	//
4997	5513	//Composite
4998	5514	Object3D // to do !!
..	..	@@ -5002,9 +5518,11 @@
5002	5518	//JTree jTree;
5003	5519	private MenuItem lookAtItem;
5004	5520	private MenuItem lookFromItem;
5005		- private MenuItem switchItem;
	5521	+ private MenuItem switchViewItem;
5006	5522	private MenuItem cutItem;
5007		- private MenuItem duplicateItem;
	5523	+ private MenuItem undoItem;
	5524	+ private MenuItem redoItem;
	5525	+ private JMenuItem duplicateItem;
5008	5526	private MenuItem cloneItem;
5009	5527	private MenuItem cloneSupportItem;
5010	5528	private MenuItem overwriteGeoItem;
..	..	@@ -5017,7 +5535,7 @@
5017	5535	private MenuItem linkverticesItem;
5018	5536	private MenuItem relinkverticesItem;
5019	5537	private MenuItem setMasterItem;
5020		- private MenuItem resetMeshItem;
	5538	+ private MenuItem resetAllItem;
5021	5539	private MenuItem stepAllItem;
5022	5540	private MenuItem revertMeshItem;
5023	5541	private MenuItem poseMeshItem;
..	..	@@ -5028,6 +5546,7 @@
5028	5546	private MenuItem mergeGeometriesItem;
5029	5547	private MenuItem copyItem;
5030	5548	private MenuItem pasteItem;
	5549	+ private MenuItem pasteIntoItem;
5031	5550	private MenuItem pasteLinkItem;
5032	5551	private MenuItem pasteCloneItem;
5033	5552	private MenuItem pasteExpandItem;
..	..	@@ -5066,6 +5585,10 @@
5066	5585	private MenuItem showleavesItem;
5067	5586	private MenuItem markleavesItem;
5068	5587	private MenuItem unmarkleavesItem;
	5588	+ private MenuItem rewindleavesItem;
	5589	+ private MenuItem unrewindleavesItem;
	5590	+ private MenuItem randomleavesItem;
	5591	+ private MenuItem unrandomleavesItem;
5069	5592
5070	5593	private MenuItem flipVItem;
5071	5594	private MenuItem unflipVItem;
..	..	@@ -5077,15 +5600,17 @@
5077	5600	private MenuItem panoTexturesItem;
5078	5601
5079	5602	private MenuItem resetCentroidItem;
5080		- private MenuItem transformgeometryItem;
	5603	+ private MenuItem resetCentroidXZItem;
5081	5604	private MenuItem resetTransformItem;
	5605	+ private MenuItem transformGeometryItem;
	5606	+ private MenuItem transformChildrenItem;
5082	5607	private MenuItem hideItem;
5083	5608	private MenuItem grabItem;
5084	5609	private MenuItem backItem;
5085	5610	private MenuItem frontItem;
5086	5611	private MenuItem cameraItem;
5087	5612	private MenuItem compositeItem;
5088		- private MenuItem randomItem;
	5613	+ private MenuItem switchItem;
5089	5614	private MenuItem physicsItem;
5090	5615	private MenuItem frameselectorItem;
5091	5616	private MenuItem scriptNodeItem;
..	..	@@ -5125,7 +5650,7 @@
5125	5650	private MenuItem blobItem;
5126	5651	private MenuItem latheItem;
5127	5652	private MenuItem bezierItem;
5128		- private MenuItem checkerItem;
	5653	+ private MenuItem overlayItem;
5129	5654	private MenuItem meshItem;
5130	5655	// private MenuItem meshGroupItem;
5131	5656	private MenuItem springItem;
..	..	@@ -5147,11 +5672,6 @@
5147	5672	private MenuItem doubleItem;
5148	5673	private MenuItem tripleItem;
5149	5674
5150		- private MenuItem importGFDItem;
5151		- private MenuItem importVRMLX3DItem;
5152		- private MenuItem import3DSItem;
5153		- private MenuItem importOBJItem;
5154		-
5155	5675	private MenuItem computeAOItem;
5156	5676	private MenuItem recompileItem;
5157	5677	private MenuItem editScriptItem;
..	..	@@ -5161,4 +5681,8 @@
5161	5681	private MenuItem analyzeItem;
5162	5682	private MenuItem dumpItem;
5163	5683	//boolean freezemodel = false;
	5684	+
	5685	+ Menu cameraMenu;
	5686	+ MenuItem editCameraItem;
	5687	+ MenuItem restoreCameraItem;
5164	5688	}