~nbriere/GrafreeD.git - Noware Git Repository

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