~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);
..	..	@@ -84,6 +84,10 @@
84	84
85	85	void CloneSelection(boolean supports)
86	86	{
	87	+ if (Globals.SAVEONMAKE)
	88	+ Save();
	89	+ boolean keep = Globals.SAVEONMAKE;
	90	+ Globals.SAVEONMAKE = false;
87	91	// Object3D keep = GrafreeD.clipboard;
88	92	//Object3D obj;
89	93	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,18 +98,19 @@
94	98
95	99	makeSomething(clone, i==group.selection.size()-1);
96	100	}
	101	+ Globals.SAVEONMAKE = keep;
97	102	}
98	103
99	104	void CloneClipboard(boolean supports)
100	105	{
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	+ assert(Grafreed.clipboard.parent == null);
	107	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	108	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	109	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	110	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
106	111	else
107		- makeSomething(CloneObject(GrafreeD.clipboard, false));
108		- GrafreeD.clipboard.get(0).parent = keepparent;
	112	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	113	+ Grafreed.clipboard.get(0).parent = keepparent;
109	114	}
110	115
111	116	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -119,7 +124,7 @@
119	124	// obj.support = null;
120	125	if (!supports)
121	126	obj.SaveSupports();
122		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	127	+ Object3D clone = (Object3D)Grafreed.clone(obj);
123	128	obj.parent = parent;
124	129	// obj.support = support;
125	130	// clone.support = support; // aout 2013
..	..	@@ -148,40 +153,37 @@
148	153
149	154	//JTextField nameField;
150	155
151		- void SetupMenu2(ObjEditor oe)
	156	+ void SetupMenu2(GroupEditor oe)
152	157	{
153		- if (Globals.ADVANCED)
154		- {
155		- oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
156		- //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
157		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
158		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
159		- oe.cameraMenu.add("-");
160		- openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
161		- openWindowItem.addActionListener(this);
162		- editLeafItem.addActionListener(this);
163		- lookAtItem.addActionListener(this);
164		- //lookFromItem.addActinoListener(this);
165		- //switchItem.addActionListener(this);
166		- }
167		-
	158	+ oe.jTree = new cTree();
	159	+
168	160	Menu menu;
169	161	oe.menuBar.add(menu = new Menu("Edit"));
170	162	//editItem = menu.add(new MenuItem("Edit"));
171	163	//editItem.addActionListener(this);
172		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	164	+
	165	+// undoItem = menu.add(new MenuItem("Undo"));
	166	+// undoItem.addActionListener(this);
	167	+// redoItem = menu.add(new MenuItem("Redo"));
	168	+// redoItem.addActionListener(this);
	169	+// menu.add("-");
	170	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
173	171	duplicateItem.addActionListener(this);
	172	+ cloneItem = menu.add(new MenuItem("Clone"));
	173	+ cloneItem.addActionListener(this);
	174	+ if (Globals.ADVANCED)
	175	+ {
	176	+ cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
	177	+ cloneSupportItem.addActionListener(this);
	178	+ }
	179	+ menu.add("-");
174	180	cutItem = menu.add(new MenuItem("Cut"));
175	181	cutItem.addActionListener(this);
176	182	copyItem = menu.add(new MenuItem("Copy"));
177	183	copyItem.addActionListener(this);
178	184	pasteItem = menu.add(new MenuItem("Paste"));
179	185	pasteItem.addActionListener(this);
180		- menu.add("-");
181		- cloneItem = menu.add(new MenuItem("Clone"));
182		- cloneItem.addActionListener(this);
183		- cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
184		- cloneSupportItem.addActionListener(this);
	186	+
185	187	menu.add("-");
186	188	pasteIntoItem = menu.add(new MenuItem("Paste into"));
187	189	pasteIntoItem.addActionListener(this);
..	..	@@ -201,14 +203,97 @@
201	203	clearAllItem = menu.add(new MenuItem("Clear All"));
202	204	clearAllItem.addActionListener(this);
203	205	}
	206	+
	207	+ menuBar.add(cameraMenu = new Menu("View"));
	208	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	209	+ //zBufferItem.addActionListener(this);
	210	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	211	+ //normalLensItem.addActionListener(this);
	212	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	213	+ restoreCameraItem.addActionListener(this);
	214	+
	215	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	216	+// toggleFullScreenItem.addItemListener(this);
	217	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	218	+// cameraMenu.add("-");
	219	+//
	220	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	221	+// toggleTextureItem.addItemListener(this);
	222	+// toggleTextureItem.setState(CameraPane.textureon);
	223	+//
	224	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	225	+// toggleSwitchItem.addItemListener(this);
	226	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	227	+
	228	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	229	+ toggleHandleItem.addItemListener(this);
	230	+ toggleHandleItem.setState(CameraPane.HANDLES);
	231	+
	232	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	233	+ togglePaintItem.addItemListener(this);
	234	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	235	+
	236	+ if (Globals.ADVANCED)
	237	+ {
	238	+ cameraMenu.add("-");
	239	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	240	+ toggleLiveItem.addItemListener(this);
	241	+ toggleLiveItem.setState(Globals.isLIVE());
204	242
	243	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	244	+ stepItem.addActionListener(this);
	245	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	246	+ // toggleDLItem.addItemListener(this);
	247	+ // toggleDLItem.setState(false);
	248	+
	249	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	250	+ toggleRenderItem.addItemListener(this);
	251	+ toggleRenderItem.setState(!CameraPane.frozen);
	252	+
	253	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	254	+ toggleDebugItem.addItemListener(this);
	255	+ toggleDebugItem.setState(Globals.DEBUG);
	256	+
	257	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	258	+ toggleFrustumItem.addItemListener(this);
	259	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	260	+
	261	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	262	+ toggleFootContactItem.addItemListener(this);
	263	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	264	+
	265	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	266	+ toggleTimelineItem.addItemListener(this);
	267	+ }
	268	+
	269	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	270	+// toggleRootItem.addItemListener(this);
	271	+// toggleRootItem.setState(false);
	272	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	273	+// animationItem.addItemListener(this);
	274	+// animationItem.setState(CameraPane.ANIMATION);
	275	+ cameraMenu.add("-");
	276	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	277	+ editCameraItem.addActionListener(this);
	278	+
	279	+ if (Globals.ADVANCED)
	280	+ {
	281	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	282	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	283	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	284	+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	285	+ oe.cameraMenu.add("-");
	286	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	287	+ openWindowItem.addActionListener(this);
	288	+ editLeafItem.addActionListener(this);
	289	+ lookAtItem.addActionListener(this);
	290	+ //lookFromItem.addActinoListener(this);
	291	+ //switchViewItem.addActionListener(this);
	292	+ }
	293	+
205	294	oe.menuBar.add(menu = new Menu("Setting"));
206	295	if (Globals.ADVANCED)
207	296	{
208		- resetMeshItem = menu.add(new MenuItem("Reset All"));
209		- resetMeshItem.addActionListener(this);
210		- stepAllItem = menu.add(new MenuItem("Step All"));
211		- stepAllItem.addActionListener(this);
212	297	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
213	298	revertMeshItem.addActionListener(this);
214	299	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
..	..	@@ -248,21 +333,29 @@
248	333	}
249	334
250	335	oe.menuBar.add(menu = new Menu("Group"));
251		- grabItem = menu.add(new MenuItem("Grab"));
252		- grabItem.addActionListener(this);
	336	+// grabItem = menu.add(new MenuItem("Grab"));
	337	+// grabItem.addActionListener(this);
253	338	backItem = menu.add(new MenuItem("Back"));
254	339	backItem.addActionListener(this);
255	340	frontItem = menu.add(new MenuItem("Front"));
256	341	frontItem.addActionListener(this);
257		- compositeItem = menu.add(new MenuItem("Composite"));
258		- compositeItem.addActionListener(this);
	342	+// compositeItem = menu.add(new MenuItem("Composite"));
	343	+// compositeItem.addActionListener(this);
	344	+
	345	+ if (Globals.ADVANCED)
	346	+ {
259	347	hideItem = menu.add(new MenuItem("Hidden Group"));
260	348	hideItem.addActionListener(this);
	349	+ }
261	350	ungroupItem = menu.add(new MenuItem("Ungroup"));
262	351	ungroupItem.addActionListener(this);
263		- menu.add("-");
264		- randomItem = menu.add(new MenuItem("Switch node"));
265		- randomItem.addActionListener(this);
	352	+
	353	+// menu.add("-");
	354	+//
	355	+// switchItem = menu.add(new MenuItem("Switch node"));
	356	+// switchItem.addActionListener(this);
	357	+ if (Globals.ADVANCED)
	358	+ {
266	359	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
267	360	switchGeoItem.addActionListener(this);
268	361	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -270,49 +363,52 @@
270	363	morphItem = menu.add(new MenuItem("Morph Group"));
271	364	morphItem.addActionListener(this);
272	365
273		- if (Globals.ADVANCED)
274		- {
	366	+ menu.add("-");
275	367	physicsItem = menu.add(new MenuItem("Physics"));
276	368	physicsItem.addActionListener(this);
277	369	frameselectorItem = menu.add(new MenuItem("Frame Selector"));
278	370	frameselectorItem.addActionListener(this);
279	371	scriptNodeItem = menu.add(new MenuItem("Script Node"));
280	372	scriptNodeItem.addActionListener(this);
281		- cameraItem = menu.add(new MenuItem("Camera"));
282		- cameraItem.addActionListener(this);
283	373	}
284	374
285	375	oe.menuBar.add(menu = new Menu("Object"));
286		- textureItem = menu.add(new MenuItem("Texture"));
287		- textureItem.addActionListener(this);
	376	+// textureItem = menu.add(new MenuItem("Texture"));
	377	+// textureItem.addActionListener(this);
288	378	billboardItem = menu.add(new MenuItem("Billboard"));
289	379	billboardItem.addActionListener(this);
290	380	csgItem = menu.add(new MenuItem("CSG"));
291	381	csgItem.addActionListener(this);
292		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	382	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
293	383	shadowXItem.addActionListener(this);
294		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	384	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
295	385	shadowYItem.addActionListener(this);
296		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	386	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
297	387	shadowZItem.addActionListener(this);
298		- if (Globals.ADVANCED)
299		- {
300		- linkerItem = menu.add(new MenuItem("Linker"));
301		- linkerItem.addActionListener(this);
302	388	attributeItem = menu.add(new MenuItem("Attribute"));
303	389	attributeItem.addActionListener(this);
	390	+
	391	+ if (Globals.ADVANCED)
	392	+ {
	393	+ menu.add("-");
	394	+ linkerItem = menu.add(new MenuItem("Linker"));
	395	+ linkerItem.addActionListener(this);
304	396	templateItem = menu.add(new MenuItem("Template"));
305	397	templateItem.addActionListener(this);
306	398	pointflowItem = menu.add(new MenuItem("Point Flow"));
307	399	pointflowItem.addActionListener(this);
308		- menu.add("-");
309	400	}
	401	+ menu.add("-");
310	402	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
311	403	resetTransformItem.addActionListener(this);
312	404	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
313	405	resetCentroidItem.addActionListener(this);
314		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
315		- transformgeometryItem.addActionListener(this);
	406	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	407	+ resetCentroidXZItem.addActionListener(this);
	408	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	409	+ transformGeometryItem.addActionListener(this);
	410	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	411	+ transformChildrenItem.addActionListener(this);
316	412
317	413	oe.menuBar.add(menu = new Menu("Geometry"));
318	414	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -361,6 +457,10 @@
361	457	oe.menuBar.add(menu = new Menu("Attributes"));
362	458	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
363	459	clearMaterialsItem.addActionListener(this);
	460	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	461	+ resetAllItem.addActionListener(this);
	462	+ stepAllItem = menu.add(new MenuItem("Step All"));
	463	+ stepAllItem.addActionListener(this);
364	464	menu.add("-");
365	465	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
366	466	liveleavesItem.addActionListener(this);
..	..	@@ -381,6 +481,14 @@
381	481	markleavesItem.addActionListener(this);
382	482	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
383	483	unmarkleavesItem.addActionListener(this);
	484	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	485	+ rewindleavesItem.addActionListener(this);
	486	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	487	+ unrewindleavesItem.addActionListener(this);
	488	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	489	+ randomleavesItem.addActionListener(this);
	490	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	491	+ unrandomleavesItem.addActionListener(this);
384	492	menu.add("-");
385	493	flipVItem = menu.add(new MenuItem("Flip V"));
386	494	flipVItem.addActionListener(this);
..	..	@@ -415,38 +523,41 @@
415	523	sortbysizeItem.addActionListener(this);
416	524	sortbynameItem = menu.add(new MenuItem("Sort by name"));
417	525	sortbynameItem.addActionListener(this);
	526	+ menu.add("-");
	527	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	528	+ shareGeometriesItem.addActionListener(this);
	529	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	530	+ mergeGeometriesItem.addActionListener(this);
418	531	if (Globals.ADVANCED)
419	532	{
420		- menu.add("-");
	533	+ // Pretty much the same as duplicate and clone.
421	534	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
422	535	extractGeometriesItem.addActionListener(this);
423	536	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
424	537	cloneGeometriesItem.addActionListener(this);
425		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
426		- shareGeometriesItem.addActionListener(this);
427		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
428		- mergeGeometriesItem.addActionListener(this);
429	538	}
430	539
431	540	oe.menuBar.add(menu = new Menu("Insert"));
432	541	buildCreateMenu(menu);
433	542
434		- oe.menuBar.add(menu = new Menu("Include"));
435		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
436		- importGFDItem.addActionListener(this);
437		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
438		- importVRMLX3DItem.addActionListener(this);
439		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
440		- importOBJItem.addActionListener(this);
441		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
442		- import3DSItem.addActionListener(this);
443		-
444	543	oe.menuBar.add(menu = new Menu("Tools"));
445	544	buildToolsMenu(menu);
446	545	}
447	546
448	547	void SetupUI2(ObjEditor oe)
449	548	{
	549	+ // June 2019
	550	+ if (oe == null)
	551	+ {
	552	+ //super.SetupUI2(this);
	553	+ //return;
	554	+ }
	555	+
	556	+ if (copy != group)
	557	+ {
	558	+ //super.SetupUI2(this);
	559	+ }
	560	+
450	561	//new Exception().printStackTrace();
451	562
452	563	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -475,97 +586,216 @@
475	586	oe.radioPanel.add(dummyButton);
476	587	oe.buttonGroup.add(dummyButton);
477	588	*/
	589	+ cGridBag copyOptionsPanel = new cGridBag();
	590	+
	591	+ copyOptionsPanel.preferredHeight = 1;
	592	+
478	593	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
479	594
480		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
481		- liveCB.setToolTipText("Enabled animation");
	595	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	596	+ //minButton.setToolTipText("Minimize window");
	597	+ //minButton.addActionListener(this);
	598	+
	599	+ if (Globals.ADVANCED)
	600	+ {
	601	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	602	+ maxButton.setToolTipText("Maximize window");
	603	+ maxButton.addActionListener(this);
	604	+ }
	605	+
	606	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	607	+ fullButton.setToolTipText("Full-screen window");
	608	+ fullButton.addActionListener(this);
	609	+
	610	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	611	+ screenfitButton.setToolTipText("Screen fit");
	612	+ screenfitButton.addActionListener(this);
	613	+
	614	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	615	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	616	+ restoreCameraButton.addActionListener(this);
	617	+
	618	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	619	+ undoButton.setToolTipText("Undo changes");
	620	+ undoButton.addActionListener(this);
	621	+ undoButton.setEnabled(false);
	622	+
	623	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	624	+ redoButton.setToolTipText("Redo changes");
	625	+ redoButton.addActionListener(this);
	626	+ redoButton.setEnabled(false);
	627	+
	628	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	629	+ saveButton.setToolTipText("Save changes");
	630	+ saveButton.addActionListener(this);
	631	+
	632	+ copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	633	+ liveCB.setToolTipText("Enable animation");
482	634	liveCB.addItemListener(this);
483	635
484		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	636	+ copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
485	637	oneStepButton.setToolTipText("Animate one step forward");
486	638	oneStepButton.addActionListener(this);
487	639
488		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	640	+ copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
489	641	fastCB.setToolTipText("Fast mode");
490	642	fastCB.addItemListener(this);
491	643
492		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
493		- trackCB.setToolTipText("Enable tracking");
494		- trackCB.addItemListener(this);
495		-
496		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
497		- screenfitButton.setToolTipText("Screen fit");
498		- screenfitButton.addActionListener(this);
	644	+ //oe.toolboxPanel.Return();
	645	+
	646	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	647	+// trackCB.setToolTipText("Enable tracking");
	648	+// trackCB.addItemListener(this);
499	649
500	650	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
501	651	// screenfitpointButton.addActionListener(this);
502	652
503	653	if (Globals.ADVANCED)
504	654	{
505		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	655	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
506	656	snapobjectButton.addActionListener(this);
507	657	snapobjectButton.setToolTipText("Snap Object");
508	658	}
509	659
510		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
511		- flashSelectionButton.setToolTipText("Show selection");
512		- flashSelectionButton.addActionListener(this);
	660	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
513	661
514		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
515		-
516		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	662	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
517	663	twoButton.setToolTipText("Show center view only");
518	664	twoButton.addActionListener(this);
519		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	665	+ this.fullscreenLayout = twoButton;
	666	+
	667	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
520	668	fourButton.addActionListener(this);
521	669	fourButton.setToolTipText("Show left panel only");
522		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	670	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
523	671	sixButton.setToolTipText("2-column layout left");
524	672	sixButton.addActionListener(this);
525		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	673	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
526	674	threeButton.setToolTipText("2-column layout right");
527	675	threeButton.addActionListener(this);
528		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	676	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
529	677	sevenButton.setToolTipText("3-column layout");
530	678	sevenButton.addActionListener(this);
531	679	//
532	680
533		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	681	+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
534	682	rootButton.setToolTipText("Edit selection in new tab");
535	683	rootButton.addActionListener(this);
536	684
537		- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	685	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
538	686	closeButton.setToolTipText("Close tab");
539	687	closeButton.addActionListener(this);
540	688	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
541	689	//clearButton.addActionListener(this);
542		-
543		- cGridBag commandsPanel = new cGridBag();
	690	+
	691	+ // INSERT
	692	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	693	+ gridButton.setToolTipText("Create grid");
	694	+ gridButton.addActionListener(this);
	695	+
	696	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	697	+ boxButton.setToolTipText("Create box");
	698	+ boxButton.addActionListener(this);
	699	+
	700	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	701	+ sphereButton.setToolTipText("Create sphere");
	702	+ sphereButton.addActionListener(this);
	703	+
	704	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	705	+ coneButton.setToolTipText("Create cone");
	706	+ coneButton.addActionListener(this);
	707	+
	708	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	709	+ torusButton.setToolTipText("Create torus");
	710	+ torusButton.addActionListener(this);
	711	+
	712	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	713	+ superButton.setToolTipText("Create superellipsoid");
	714	+ superButton.addActionListener(this);
	715	+
	716	+ if (Globals.ADVANCED)
	717	+ {
	718	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	719	+ kleinButton.setToolTipText("Create Klein bottle");
	720	+ kleinButton.addActionListener(this);
	721	+ }
544	722
545		- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
546		- editButton.setToolTipText("Edit selection");
	723	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	724	+ particlesButton.setToolTipText("Create particle system");
	725	+ particlesButton.addActionListener(this);
	726	+
	727	+ oe.toolboxPanel.Return();
	728	+
	729	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	730	+ groupButton.setToolTipText("Create group");
	731	+ groupButton.addActionListener(this);
	732	+
	733	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	734	+ compositeButton.setToolTipText("Create composite");
	735	+ compositeButton.addActionListener(this);
	736	+
	737	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	738	+ switchButton.setToolTipText("Create item switcher");
	739	+ switchButton.addActionListener(this);
	740	+
	741	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	742	+ loopButton.setToolTipText("Create loop");
	743	+ loopButton.addActionListener(this);
	744	+
	745	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	746	+ textureButton.setToolTipText("Create texture");
	747	+ textureButton.addActionListener(this);
	748	+
	749	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	750	+ overlayButton.setToolTipText("Create overlay");
	751	+ overlayButton.addActionListener(this);
	752	+
	753	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	754	+ lightButton.setToolTipText("Create light");
	755	+ lightButton.addActionListener(this);
	756	+
	757	+ for (int i=6; --i>=0;)
	758	+ {
	759	+ oe.toolboxPanel.Return();
	760	+ oe.toolboxPanel.add(new cGridBag());
	761	+ oe.toolboxPanel.add(new cGridBag());
	762	+ oe.toolboxPanel.add(new cGridBag());
	763	+ oe.toolboxPanel.add(new cGridBag());
	764	+ oe.toolboxPanel.add(new cGridBag());
	765	+ oe.toolboxPanel.add(new cGridBag());
	766	+ oe.toolboxPanel.add(new cGridBag());
	767	+ }
	768	+
	769	+ // EDIT panel
	770	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	771	+ editButton.setToolTipText("Pin selection controls");
547	772	editButton.addActionListener(this);
548	773
549		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
550		- uneditButton.setToolTipText("Unedit selection");
	774	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	775	+ uneditButton.setToolTipText("Remove selection controls");
551	776	uneditButton.addActionListener(this);
552	777
553		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
554		- allParamsButton.setToolTipText("Edit all params");
	778	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	779	+ allParamsButton.setToolTipText("Show all controle");
555	780	allParamsButton.addActionListener(this);
556	781
557		- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	782	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
558	783	clearPanelButton.setToolTipText("Clear edit panel");
559	784	clearPanelButton.addActionListener(this);
560	785
561		- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	786	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
562	787	unselectButton.setToolTipText("Unselect");
563	788	unselectButton.addActionListener(this);
564	789
565		- commandsPanel.preferredHeight = 1;
	790	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	791	+ flashSelectionButton.setToolTipText("Highlight selection");
	792	+ flashSelectionButton.addActionListener(this);
566	793
567		- oe.treePanel.add(commandsPanel);
568		- oe.treePanel.Return();
	794	+ editCommandsPanel.preferredHeight = 1;
	795	+
	796	+ SetPinStates(false);
	797	+// oe.treePanel.add(commandsPanel);
	798	+// oe.treePanel.Return();
569	799
570	800	// oe.aConstraints.gridx += 1;
571	801	// oe.aConstraints.weighty = 0;
..	..	@@ -582,27 +812,12 @@
582	812
583	813	JScrollPane jSP;
584	814	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
585		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	815	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
586	816	ResetModel();
587	817
588	818	oe.treePanel.add(jSPPanel);
589	819	oe.treePanel.Return();
590	820
591		- cGridBag copyOptionsPanel = new cGridBag();
592		-
593		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
594		- colorCB.setToolTipText("Copy color when dropped");
595		- colorCB.addItemListener(this);
596		-
597		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
598		- materialCB.setToolTipText("Copy material when dropped");
599		- materialCB.addItemListener(this);
600		-
601		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
602		- textureCB.setToolTipText("Copy texture when dropped");
603		- textureCB.addItemListener(this);
604		-
605		- copyOptionsPanel.preferredHeight = 1;
606	821	oe.treePanel.add(copyOptionsPanel);
607	822	oe.treePanel.Return();
608	823
..	..	@@ -633,23 +848,43 @@
633	848
634	849	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
635	850	{
	851	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	852	+ colorCB.setToolTipText("Copy color when dropped");
	853	+ colorCB.addItemListener(this);
	854	+
	855	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	856	+ materialCB.setToolTipText("Copy material when dropped");
	857	+ materialCB.addItemListener(this);
	858	+
	859	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	860	+ textureCB.setToolTipText("Copy texture when dropped");
	861	+ textureCB.addItemListener(this);
	862	+
	863	+ panel.Return();
	864	+
636	865	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
637	866	boxCB.setToolTipText("Display bounding boxes");
638	867	boxCB.addItemListener(this);
639	868
640	869	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
641		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	870	+ zoomBoxCB.setToolTipText("Display only for wheel");
642	871	zoomBoxCB.addItemListener(this);
643	872
644		- if (Globals.ADVANCED)
	873	+ if (true) // Globals.ADVANCED)
645	874	{
646		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
647		- supportCB.setToolTipText("Enable rigging");
648		- supportCB.addItemListener(this);
	875	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	876	+// supportCB.setToolTipText("Enable rigging");
	877	+// supportCB.addItemListener(this);
	878	+
	879	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	880	+ freezeCB.setToolTipText("Fast moving camera");
	881	+ freezeCB.addItemListener(this);
649	882
650	883	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
651	884	// localCB.addItemListener(this);
652	885
	886	+ panel.Return();
	887	+
653	888	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
654	889	crowdCB.setToolTipText("Used for crowds");
655	890	crowdCB.addItemListener(this);
..	..	@@ -666,6 +901,8 @@
666	901	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
667	902	// speakerMocapCB.addItemListener(this);
668	903
	904	+ panel.Return();
	905	+
669	906	if (false)
670	907	{
671	908	// handled in scripts
..	..	@@ -680,32 +917,72 @@
680	917	//constraints.gridy += 1;
681	918	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
682	919	smoothfocusCB.addItemListener(this);
	920	+ panel.Return();
683	921	}
684	922
685	923	//constraints.gridx += 1;
686	924	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
687	925	// debugCB.addItemListener(this);
688	926
	927	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	928	+ trackCB.setToolTipText("Enable tracking target");
	929	+ trackCB.addItemListener(this);
	930	+
689	931	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	932	+ oeilCB.setToolTipText("Move camera when tracking");
690	933	oeilCB.addItemListener(this);
691	934
	935	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	936	+ shadowCB.setToolTipText("When live compute shadows");
	937	+ shadowCB.addItemListener(this);
	938	+
	939	+ panel.Return();
	940	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	941	+ toggleTextureCB.setToolTipText("Load textures");
	942	+ toggleTextureCB.addItemListener(this);
	943	+
	944	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	945	+ toggleSwitchCB.setToolTipText("Choose a single item");
	946	+ toggleSwitchCB.addItemListener(this);
	947	+
	948	+ panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
	949	+ autosaveCB.setToolTipText("On structure change");
	950	+ autosaveCB.addItemListener(this);
	951	+
	952	+ panel.Return();
	953	+ if (Globals.ADVANCED)
	954	+ {
692	955	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
693	956	lookAtCB.setToolTipText("Look-at target");
694	957	lookAtCB.addItemListener(this);
	958	+ }
695	959
696	960	}
697	961
698	962	cGridBag fill = new cGridBag();
699		-
700	963	fill.preferredHeight = 200;
	964	+ cGridBag fill2 = new cGridBag();
	965	+ fill2.preferredHeight = 200;
	966	+ cGridBag fill3 = new cGridBag();
	967	+ fill3.preferredHeight = 200;
701	968
702	969	panel.add(fill);
	970	+ panel.add(fill2);
	971	+ panel.add(fill3);
703	972
704	973	}
705	974
706	975	void EditObject(Object3D obj)
707	976	{
708	977	cRadio radioButton = new cRadio(obj.name);
	978	+
	979	+ // June 2019. Patch to avoid bug with transparency.
	980	+ radioButton.hadMaterial = obj.material != null;
	981	+ if (!radioButton.hadMaterial)
	982	+ {
	983	+ obj.material = new cMaterial();
	984	+ }
	985	+
709	986	radioButton.SetObject(obj);
710	987	radioButton.layout = sevenButton;
711	988	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -714,8 +991,11 @@
714	991	buttonGroup.add(radioButton);
715	992	radioButton.doClick();
716	993	}
	994	+
717	995	void SetupViews(ObjEditor oe)
718	996	{
	997	+ theFrame = this;
	998	+
719	999	oe.SetupViews();
720	1000
721	1001	System.out.println("SetupViews");
..	..	@@ -724,23 +1004,28 @@
724	1004	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
725	1005	}
726	1006
727		- JCheckBox liveCB;
728		- JCheckBox supportCB;
729		- JCheckBox localCB;
730		- JCheckBox crowdCB;
731		- JCheckBox smoothCB;
732		- JCheckBox fastCB;
733		- JCheckBox slowCB;
734		- JCheckBox boxCB;
735		- JCheckBox zoomBoxCB;
736		- JCheckBox trackCB;
737		- JCheckBox smoothfocusCB;
	1007	+ cToggleButton liveCB;
	1008	+ cCheckBox supportCB;
	1009	+ cCheckBox localCB;
	1010	+ cCheckBox crowdCB;
	1011	+ cCheckBox smoothCB;
	1012	+ cToggleButton fastCB;
	1013	+ cCheckBox slowCB;
	1014	+ cCheckBox boxCB;
	1015	+ cCheckBox zoomBoxCB;
	1016	+ cCheckBox freezeCB;
	1017	+ //cToggleButton trackCB;
	1018	+ cCheckBox trackCB;
	1019	+ cCheckBox smoothfocusCB;
738	1020	// JCheckBox speakerMocapCB;
739		- JCheckBox speakerCameraCB;
740		- JCheckBox speakerFocusCB;
741		- JCheckBox debugCB;
742		- JCheckBox oeilCB;
743		- JCheckBox lookAtCB;
	1021	+ cCheckBox speakerCameraCB;
	1022	+ cCheckBox speakerFocusCB;
	1023	+ cCheckBox debugCB;
	1024	+
	1025	+ cCheckBox oeilCB;
	1026	+ cCheckBox shadowCB;
	1027	+ cCheckBox autosaveCB;
	1028	+ cCheckBox lookAtCB;
744	1029
745	1030	// static int COLOR = 1;
746	1031	// static int MATERIAL = 2;
..	..	@@ -748,9 +1033,9 @@
748	1033
749	1034	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
750	1035
751		- JCheckBox colorCB;
752		- JCheckBox materialCB;
753		- JCheckBox textureCB;
	1036	+ cCheckBox colorCB;
	1037	+ cCheckBox materialCB;
	1038	+ cCheckBox textureCB;
754	1039
755	1040	public void itemStateChanged(ItemEvent e)
756	1041	{
..	..	@@ -778,6 +1063,7 @@
778	1063	} else if(e.getSource() == liveCB)
779	1064	{
780	1065	cameraView.ToggleLive();
	1066	+ refreshContents(false);
781	1067	}
782	1068	else if(e.getSource() == supportCB)
783	1069	{
..	..	@@ -842,6 +1128,18 @@
842	1128	{
843	1129	cameraView.ToggleOeil();
844	1130	}
	1131	+ else if(e.getSource() == shadowCB)
	1132	+ {
	1133	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1134	+ }
	1135	+ else if(e.getSource() == freezeCB)
	1136	+ {
	1137	+ Globals.FREEZEONMOVE ^= true;
	1138	+ }
	1139	+ else if(e.getSource() == autosaveCB)
	1140	+ {
	1141	+ Globals.SAVEONMAKE ^= true;
	1142	+ }
845	1143	else if(e.getSource() == lookAtCB)
846	1144	{
847	1145	cameraView.ToggleLookAt();
..	..	@@ -858,7 +1156,8 @@
858	1156
859	1157	/**/
860	1158	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
861		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1159	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1160	+ TreePath path = objEditor.jTree.getSelectionPath();
862	1161	if ((path == null) \|\| (path.getPathCount() <= 1)) {
863	1162	// We can't move the root node or an empty selection
864	1163	return;
..	..	@@ -921,8 +1220,6 @@
921	1220	}
922	1221	}
923	1222
924		- String string = (String) object;
925		-
926	1223	System.out.println("Transfer = " + object + "; drop : " + target);
927	1224	// if( object instanceof java.io.File[])
928	1225	// {
..	..	@@ -930,7 +1227,11 @@
930	1227	// objEditor.DropFile((java.io.File[]) object, true);
931	1228	// return;
932	1229	// }
933		- if (string.charAt(0) == '/')
	1230	+
	1231	+ String string = object.toString();
	1232	+
	1233	+ // File path for Mac and Windows
	1234	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
934	1235	{
935	1236	// file(s)
936	1237	String[] names = string.split("\n");
..	..	@@ -957,7 +1258,7 @@
957	1258
958	1259	flashIt = false;
959	1260	CameraPane pane = (CameraPane) target;
960		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1261	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
961	1262	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
962	1263
963	1264	if (group.selection.size() == 1)
..	..	@@ -973,23 +1274,33 @@
973	1274
974	1275	assert target == objEditor.jTree;
975	1276	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1277	+ Object3D destinationLeaf;
976	1278	try {
977		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1279	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
978	1280	} catch (Exception e) {
979	1281	System.out.println("destinationPath : " + destinationPath);
980	1282	return;
981	1283	}
982	1284
983		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1285	+ for (int i=group.selection.size(); --i>=0;)
984	1286	{
	1287	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1288	+
	1289	+ // Cannot move into itself
	1290	+ if (child == destinationLeaf)
	1291	+ return;
	1292	+ }
	1293	+
	1294	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1295	+// {
985	1296	loadClipboard(true);
986	1297	objEditor.jTree.setSelectionPath(destinationPath);
987	1298	pasteInto(false, false);
988		- } else {
989		- loadClipboard(false);
990		- objEditor.jTree.setSelectionPath(destinationPath);
991		- pasteInto(false, false); // true); // ???
992		- }
	1299	+// } else {
	1300	+// loadClipboard(false);
	1301	+// objEditor.jTree.setSelectionPath(destinationPath);
	1302	+// pasteInto(false, false); // true); // ???
	1303	+// }
993	1304	}
994	1305	public void dropActionChanged(DropTargetDragEvent dtde)
995	1306	// Called if the user has modified the current drop gesture
..	..	@@ -1094,22 +1405,30 @@
1094	1405	{
1095	1406	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1096	1407	//heightFieldItem.addActionListener(this);
1097		- gridItem = menu.add(new MenuItem("Grid"));
1098		- gridItem.addActionListener(this);
1099		- rectoidItem = menu.add(new MenuItem("Box"));
1100		- rectoidItem.addActionListener(this);
1101		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1102		- ellipsoidItem.addActionListener(this);
1103		- coneItem = menu.add(new MenuItem("Cone"));
1104		- coneItem.addActionListener(this);
1105		- torusItem = menu.add(new MenuItem("Torus"));
1106		- torusItem.addActionListener(this);
1107		- superItem = menu.add(new MenuItem("Superellipsoid"));
1108		- superItem.addActionListener(this);
	1408	+// gridItem = menu.add(new MenuItem("Grid"));
	1409	+// gridItem.addActionListener(this);
	1410	+// rectoidItem = menu.add(new MenuItem("Box"));
	1411	+// rectoidItem.addActionListener(this);
	1412	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1413	+// ellipsoidItem.addActionListener(this);
	1414	+// coneItem = menu.add(new MenuItem("Cone"));
	1415	+// coneItem.addActionListener(this);
	1416	+// torusItem = menu.add(new MenuItem("Torus"));
	1417	+// torusItem.addActionListener(this);
	1418	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1419	+// superItem.addActionListener(this);
	1420	+
	1421	+ cameraItem = menu.add(new MenuItem("Camera"));
	1422	+ cameraItem.addActionListener(this);
	1423	+
	1424	+ if (!Globals.ADVANCED)
	1425	+ {
1109	1426	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1110	1427	kleinItem.addActionListener(this);
1111		- particleItem = menu.add(new MenuItem("Particle system"));
1112		- particleItem.addActionListener(this);
	1428	+ }
	1429	+
	1430	+// particleItem = menu.add(new MenuItem("Particle system"));
	1431	+// particleItem.addActionListener(this);
1113	1432	if (Globals.ADVANCED)
1114	1433	{
1115	1434	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1135,15 +1454,15 @@
1135	1454	}
1136	1455	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1137	1456	bezierItem.addActionListener(this);
1138		- overlayItem = menu.add(new MenuItem("Overlay"));
1139		- overlayItem.addActionListener(this);
1140		- lightItem = menu.add(new MenuItem("Light"));
1141		- lightItem.addActionListener(this);
	1457	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1458	+// overlayItem.addActionListener(this);
	1459	+// lightItem = menu.add(new MenuItem("Light"));
	1460	+// lightItem.addActionListener(this);
1142	1461	menu.add("-");
1143	1462	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1144	1463	//superLoopItem.addActionListener(this);
1145		- loopItem = menu.add(new MenuItem("Loop"));
1146		- loopItem.addActionListener(this);
	1464	+// loopItem = menu.add(new MenuItem("Loop"));
	1465	+// loopItem.addActionListener(this);
1147	1466	doubleItem = menu.add(new MenuItem("Fork"));
1148	1467	doubleItem.addActionListener(this);
1149	1468	if (Globals.ADVANCED)
..	..	@@ -1159,18 +1478,23 @@
1159	1478	animationItem.addItemListener(this);
1160	1479	animationItem.setState(Globals.ANIMATION);
1161	1480
	1481	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1482	+ archiveItem.addActionListener(this);
	1483	+
1162	1484	menu.add("-");
1163	1485	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1164	1486	parseverticesItem.addActionListener(this);
1165	1487	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1166	1488	textureFieldItem.addActionListener(this);
1167		- alignItem = menu.add(new MenuItem("Align Object"));
	1489	+ alignItem = menu.add(new MenuItem("Align Objects"));
1168	1490	alignItem.addActionListener(this);
1169	1491	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1170	1492	reduceMorphItem.addActionListener(this);
1171	1493	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1172	1494	reduce34MorphItem.addActionListener(this);
1173		-
	1495	+ menu.add("-");
	1496	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1497	+ memoryItem.addActionListener(this);
1174	1498	menu.add(computeAOItem = new MenuItem("Compute AO"));
1175	1499	computeAOItem.addActionListener(this);
1176	1500
..	..	@@ -1179,11 +1503,9 @@
1179	1503	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1180	1504	mirrorItem.addActionListener(this);
1181	1505	menu.add("-");
1182		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1183		- memoryItem.addActionListener(this);
1184	1506	menu.add(analyzeItem = new MenuItem("Analyze"));
1185	1507	analyzeItem.addActionListener(this);
1186		- menu.add(dumpItem = new MenuItem("Dump"));
	1508	+ menu.add(dumpItem = new MenuItem("Print"));
1187	1509	dumpItem.addActionListener(this);
1188	1510	// menu.add(pathItem = new MenuItem("From-to path"));
1189	1511	// pathItem.addActionListener(this);
..	..	@@ -1324,9 +1646,24 @@
1324	1646	shadow.material = new cMaterial(obj.material);
1325	1647	shadow.material.diffuse = 0.0001f;
1326	1648	shadow.material.specular = 0.0001f;
	1649	+ //shadow.projectedVertices[1].x = 300;
1327	1650
1328	1651	makeSomething(shadow);
1329	1652	}
	1653	+
	1654	+ private void ClearUnpinned()
	1655	+ {
	1656	+ //for (Object3D obj : listUI)
	1657	+ for (int i=listUI.size(); --i>=0;)
	1658	+ {
	1659	+ Object3D obj = listUI.elementAt(i);
	1660	+ if (!obj.pinned)
	1661	+ {
	1662	+ obj.CloseUI();
	1663	+ listUI.remove(i);
	1664	+ }
	1665	+ }
	1666	+ }
1330	1667
1331	1668	/**
1332	1669	* applyExample
..	..	@@ -1530,9 +1867,9 @@
1530	1867
1531	1868	void Overwrite(int mask)
1532	1869	{
1533		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1870	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1534	1871	{
1535		- Object3D content = GrafreeD.clipboard.get(0);
	1872	+ Object3D content = Grafreed.clipboard.get(0);
1536	1873
1537	1874	if (content instanceof cGroup && ((cGroup)content).transientlink )
1538	1875	content = ((cGroup)content).get(0);
..	..	@@ -1571,7 +1908,7 @@
1571	1908	{
1572	1909	ScreenFit();
1573	1910	} else
1574		- if (source == switchItem)
	1911	+ if (source == switchViewItem)
1575	1912	{
1576	1913	cVector v1 = new cVector();
1577	1914	cVector v2 = new cVector();
..	..	@@ -1580,11 +1917,11 @@
1580	1917	objEditor.cameraView.renderCamera.setAim(v2, v1);
1581	1918	objEditor.cameraView.repaint();
1582	1919	} else
1583		- if (source == rectoidItem)
	1920	+ if (source == rectoidItem \|\| source == boxButton)
1584	1921	{
1585	1922	makeSomething(new Box());
1586	1923	} else
1587		- if (source == particleItem)
	1924	+ if (source == particleItem \|\| source == particlesButton)
1588	1925	{
1589	1926	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1590	1927	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1663,27 +2000,27 @@
1663	2000
1664	2001	makeSomething(obj);
1665	2002	} else
1666		- if (source == gridItem)
	2003	+ if (source == gridItem \|\| source == gridButton)
1667	2004	{
1668	2005	makeSomething(new Grid());
1669	2006	} else
1670		- if (source == ellipsoidItem)
	2007	+ if (source == ellipsoidItem \|\| source == sphereButton)
1671	2008	{
1672	2009	makeSomething(new Sphere());
1673	2010	} else
1674		- if (source == coneItem)
	2011	+ if (source == coneItem \|\| source == coneButton)
1675	2012	{
1676	2013	makeSomething(new Cone());
1677	2014	} else
1678		- if (source == torusItem)
	2015	+ if (source == torusItem \|\| source == torusButton)
1679	2016	{
1680	2017	makeSomething(new Torus());
1681	2018	} else
1682		- if (source == superItem)
	2019	+ if (source == superItem \|\| source == superButton)
1683	2020	{
1684	2021	makeSomething(new Superellipsoid());
1685	2022	} else
1686		- if (source == kleinItem)
	2023	+ if (source == kleinItem \|\| source == kleinButton)
1687	2024	{
1688	2025	makeSomething(new Klein());
1689	2026	} else
..	..	@@ -1703,7 +2040,7 @@
1703	2040	{
1704	2041	makeSomething(new BezierSurface());
1705	2042	} else
1706		- if (source == overlayItem)
	2043	+ if (source == overlayItem \|\| source == overlayButton)
1707	2044	{
1708	2045	/*
1709	2046	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1751,7 +2088,7 @@
1751	2088	s.setup();
1752	2089	makeSomething(s);
1753	2090	} else
1754		- if (source == lightItem)
	2091	+ if (source == lightItem \|\| source == lightButton)
1755	2092	{
1756	2093	makeSomething(new Light());
1757	2094	} else
..	..	@@ -1801,30 +2138,30 @@
1801	2138
1802	2139	group(g);
1803	2140	} else
1804		- if (source == loopItem)
	2141	+ if (source == loopItem \|\| source == loopButton)
1805	2142	{
1806	2143	Composite csg = new GroupLeaf();
1807	2144	csg.count = 5;
1808	2145	group(csg);
1809		- Composite child = new cGroup();
	2146	+ Composite child = new cGroup("Branch");
1810	2147	csg.addChild(child);
1811	2148	child.addChild(csg);
1812	2149	} else
1813	2150	if (source == doubleItem)
1814	2151	{
1815		- Composite csg = new GroupLeaf();
	2152	+ Composite csg = new GroupLeaf("Fork");
1816	2153	csg.count = 5;
1817	2154	group(csg);
1818		- Composite child = new cGroup();
	2155	+ Composite child = new cGroup("Branch A");
1819	2156	csg.addChild(child);
1820	2157	child.addChild(csg);
1821		- child = new cGroup();
	2158	+ child = new cGroup("Branch B");
1822	2159	csg.addChild(child);
1823	2160	child.addChild(csg);
1824	2161	} else
1825	2162	if (source == tripleItem)
1826	2163	{
1827		- Composite csg = new GroupLeaf();
	2164	+ Composite csg = new GroupLeaf("Trident");
1828	2165	csg.count = 4;
1829	2166	group(csg);
1830	2167	Composite child = new cGroup();
..	..	@@ -1836,23 +2173,6 @@
1836	2173	child = new cGroup();
1837	2174	csg.addChild(child);
1838	2175	child.addChild(csg);
1839		- } else
1840		-
1841		- if (source == importGFDItem)
1842		- {
1843		- ImportGFD();
1844		- } else
1845		- if (source == importVRMLX3DItem)
1846		- {
1847		- ImportVRMLX3D();
1848		- } else
1849		- if (source == import3DSItem)
1850		- {
1851		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1852		- } else
1853		- if (source == importOBJItem)
1854		- {
1855		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1856	2176	} else
1857	2177	if (source == computeAOItem)
1858	2178	{
..	..	@@ -1872,7 +2192,7 @@
1872	2192	if (source == invariantsItem)
1873	2193	{
1874	2194	System.out.println("Invariants:");
1875		- GrafreeD.grafreeD.universe.invariants();
	2195	+ Grafreed.grafreeD.universe.invariants();
1876	2196	} else
1877	2197	if (source == memoryItem)
1878	2198	{
..	..	@@ -1891,6 +2211,32 @@
1891	2211	{
1892	2212	DumpObject();
1893	2213	} else
	2214	+ if (source == minButton)
	2215	+ {
	2216	+ Minimize();
	2217	+ } else
	2218	+ if (source == maxButton)
	2219	+ {
	2220	+ Maximize();
	2221	+ } else
	2222	+ if (source == fullButton)
	2223	+ {
	2224	+ ToggleFullScreen();
	2225	+ } else
	2226	+ if (source == undoButton)
	2227	+ {
	2228	+ if (!Undo())
	2229	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2230	+ } else
	2231	+ if (source == redoButton)
	2232	+ {
	2233	+ Redo();
	2234	+ } else
	2235	+ if (source == saveButton)
	2236	+ {
	2237	+ if (!Save(true))
	2238	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2239	+ } else
1894	2240	if (source == oneStepButton)
1895	2241	{
1896	2242	Globals.ONESTEP = true;
..	..	@@ -1898,17 +2244,14 @@
1898	2244	} else
1899	2245	if (source == screenfitButton)
1900	2246	{
1901		- //Reload(lastConverter, lastFilename, true);
1902	2247	ScreenFit();
1903	2248	} else
1904	2249	if (source == screenfitpointButton)
1905	2250	{
1906		- //Reload(lastConverter, lastFilename, true);
1907	2251	ScreenFitPoint();
1908	2252	} else
1909	2253	if (source == snapobjectButton)
1910	2254	{
1911		- //Reload(lastConverter, lastFilename, true);
1912	2255	SnapObject();
1913	2256	} else
1914	2257	// if (event.getSource() == recompileButton)
..	..	@@ -1945,12 +2288,20 @@
1945	2288	{
1946	2289	loadClipboard(true);
1947	2290	} else
	2291	+ if (source == undoItem)
	2292	+ {
	2293	+ Undo();
	2294	+ } else
	2295	+ if (source == redoItem)
	2296	+ {
	2297	+ Redo();
	2298	+ } else
1948	2299	if (source == duplicateItem)
1949	2300	{
1950		- Object3D keep = GrafreeD.clipboard;
	2301	+ Object3D keep = Grafreed.clipboard;
1951	2302	loadClipboard(false);
1952	2303	paste(false);
1953		- GrafreeD.clipboard = keep;
	2304	+ Grafreed.clipboard = keep;
1954	2305	} else
1955	2306	if (source == cloneItem)
1956	2307	{
..	..	@@ -2170,9 +2521,9 @@
2170	2521	// group.selection.get(0).setMasterThis(content); // should be identity
2171	2522	// refreshContents();
2172	2523	// }
2173		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2524	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2174	2525	{
2175		- Object3D content = GrafreeD.clipboard.get(0);
	2526	+ Object3D content = Grafreed.clipboard.get(0);
2176	2527
2177	2528	if (content instanceof cGroup && ((cGroup)content).transientlink )
2178	2529	content = ((cGroup)content).get(0);
..	..	@@ -2222,9 +2573,9 @@
2222	2573	} else
2223	2574	if (source == setMasterItem)
2224	2575	{
2225		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2576	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2226	2577	{
2227		- Object3D content = GrafreeD.clipboard.get(0);
	2578	+ Object3D content = Grafreed.clipboard.get(0);
2228	2579
2229	2580	if (content instanceof cGroup && ((cGroup)content).transientlink )
2230	2581	content = ((cGroup)content).get(0);
..	..	@@ -2237,9 +2588,9 @@
2237	2588	{
2238	2589	if (group.selection.size() == 1)
2239	2590	{
2240		- if (GrafreeD.clipboard.size() == 1)
	2591	+ if (Grafreed.clipboard.size() == 1)
2241	2592	{
2242		- Object3D content = GrafreeD.clipboard.get(0);
	2593	+ Object3D content = Grafreed.clipboard.get(0);
2243	2594
2244	2595	if (content instanceof cGroup && ((cGroup)content).transientlink )
2245	2596	content = ((cGroup)content).get(0);
..	..	@@ -2256,7 +2607,7 @@
2256	2607	{
2257	2608	RevertMeshes();
2258	2609	} else
2259		- if (source == resetMeshItem)
	2610	+ if (source == resetAllItem)
2260	2611	{
2261	2612	ResetAll();
2262	2613	} else
..	..	@@ -2276,9 +2627,9 @@
2276	2627	{
2277	2628	ClearSelection(true);
2278	2629	} else
2279		- if (source == grabItem)
	2630	+ if (source == grabItem \|\| source == groupButton)
2280	2631	{
2281		- group(new cGroup(), true);
	2632	+ group(new cGroup(), false); // true);
2282	2633	} else
2283	2634	if (source == hideItem)
2284	2635	{
..	..	@@ -2296,11 +2647,11 @@
2296	2647	{
2297	2648	makeSomething(new Camera());
2298	2649	} else
2299		- if (source == compositeItem)
	2650	+ if (source == compositeItem \|\| source == compositeButton)
2300	2651	{
2301	2652	group(new Composite());
2302	2653	} else
2303		- if (source == randomItem)
	2654	+ if (source == switchItem \|\| source == switchButton)
2304	2655	{
2305	2656	RandomNode random = new RandomNode();
2306	2657	group(random);
..	..	@@ -2402,7 +2753,7 @@
2402	2753	{
2403	2754	group(new cLinker());
2404	2755	} else
2405		- if (source == textureItem)
	2756	+ if (source == textureItem \|\| source == textureButton)
2406	2757	{
2407	2758	group(new TextureNode());
2408	2759	} else
..	..	@@ -2422,17 +2773,30 @@
2422	2773	{
2423	2774	CastShadow(2);
2424	2775	} else
2425		- if (source == ungroupItem)
	2776	+ if (source == ungroupItem \|\| source == ungroupButton)
2426	2777	{
2427		- //ungroup();
	2778	+ boolean hasRoot = false;
	2779	+
2428	2780	for (int i=0; i<group.selection.size(); i++)
2429	2781	{
2430		- Ungroup(group.selection.get(i));
	2782	+ if (group.selection.get(i) == group)
	2783	+ {
	2784	+ hasRoot = true;
	2785	+ break;
	2786	+ }
2431	2787	}
2432	2788
2433		- ClearSelection(false);
2434		-
2435		- refreshContents();
	2789	+ if (!hasRoot)
	2790	+ {
	2791	+ for (int i=0; i<group.selection.size(); i++)
	2792	+ {
	2793	+ Ungroup(group.selection.get(i));
	2794	+ }
	2795	+
	2796	+ ClearSelection(false);
	2797	+
	2798	+ refreshContents();
	2799	+ }
2436	2800	} else
2437	2801	if (source == genUVItem)
2438	2802	{
..	..	@@ -2444,7 +2808,7 @@
2444	2808	} else
2445	2809	if (source == genNormalsMESHItem)
2446	2810	{
2447		- GenNormals(true); // TODO
	2811	+ GenNormalsMESH();
2448	2812	} else
2449	2813	if (source == genNormalsORGANItem)
2450	2814	{
..	..	@@ -2509,6 +2873,22 @@
2509	2873	if (source == unmarkleavesItem)
2510	2874	{
2511	2875	MarkLeaves(false);
	2876	+ } else
	2877	+ if (source == rewindleavesItem)
	2878	+ {
	2879	+ RewindLeaves(true);
	2880	+ } else
	2881	+ if (source == unrewindleavesItem)
	2882	+ {
	2883	+ RewindLeaves(false);
	2884	+ } else
	2885	+ if (source == randomleavesItem)
	2886	+ {
	2887	+ RandomLeaves(true);
	2888	+ } else
	2889	+ if (source == unrandomleavesItem)
	2890	+ {
	2891	+ RandomLeaves(false);
2512	2892	} else
2513	2893	if (source == flipVItem)
2514	2894	{
..	..	@@ -2594,9 +2974,13 @@
2594	2974	{
2595	2975	SmoothMesh();
2596	2976	} else
2597		- if (source == transformgeometryItem)
	2977	+ if (source == transformGeometryItem)
2598	2978	{
2599	2979	TransformGeometry();
	2980	+ } else
	2981	+ if (source == transformChildrenItem)
	2982	+ {
	2983	+ TransformChildren();
2600	2984	} else
2601	2985	if (source == resetTransformItem)
2602	2986	{
..	..	@@ -2604,7 +2988,11 @@
2604	2988	} else
2605	2989	if (source == resetCentroidItem)
2606	2990	{
2607		- ResetCentroid();
	2991	+ ResetCentroid(true);
	2992	+ } else
	2993	+ if (source == resetCentroidXZItem)
	2994	+ {
	2995	+ ResetCentroid(false);
2608	2996	} else
2609	2997	if (source == resetParentItem)
2610	2998	{
..	..	@@ -2736,6 +3124,10 @@
2736	3124	if (source == twoButton)
2737	3125	{
2738	3126	radio.layout = twoButton;
	3127	+
	3128	+ if (CameraPane.FULLSCREEN)
	3129	+ fullscreenLayout = radio.layout;
	3130	+
2739	3131	// bug
2740	3132	//gridPanel.setDividerLocation(1.0);
2741	3133	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2768,10 +3160,31 @@
2768	3160	bigThree.ClearUI();
2769	3161	bigThree.add(centralPanel);
2770	3162	bigThree.FlushUI();
	3163	+
	3164	+ cameraView.requestFocusInWindow();
	3165	+
	3166	+// refreshContents(true);
	3167	+//
	3168	+// try
	3169	+// {
	3170	+// java.awt.Robot bot = new java.awt.Robot();
	3171	+// int mask = InputEvent.BUTTON1_MASK;
	3172	+// bot.mouseMove(100, 100);
	3173	+// bot.mousePress(mask);
	3174	+// bot.mouseRelease(mask);
	3175	+// }
	3176	+// catch (Exception e)
	3177	+// {
	3178	+//
	3179	+// }
	3180	+
2771	3181	} else
2772	3182	if (source == threeButton)
2773	3183	{
2774	3184	radio.layout = threeButton;
	3185	+
	3186	+ if (CameraPane.FULLSCREEN)
	3187	+ fullscreenLayout = radio.layout;
2775	3188
2776	3189	// bigThree.remove(scenePanel);
2777	3190	// bigThree.remove(centralPanel);
..	..	@@ -2804,10 +3217,15 @@
2804	3217	bigThree.add(centralPanel);
2805	3218	bigThree.add(XYZPanel);
2806	3219	bigThree.FlushUI();
	3220	+
	3221	+ cameraView.requestFocusInWindow();
2807	3222	} else
2808	3223	if (source == fourButton)
2809	3224	{
2810	3225	radio.layout = fourButton;
	3226	+
	3227	+ if (CameraPane.FULLSCREEN)
	3228	+ fullscreenLayout = radio.layout;
2811	3229
2812	3230	// bigThree.remove(scenePanel);
2813	3231	// bigThree.remove(centralPanel);
..	..	@@ -2839,10 +3257,15 @@
2839	3257	bigThree.ClearUI();
2840	3258	bigThree.add(scenePanel);
2841	3259	bigThree.FlushUI();
	3260	+
	3261	+ cameraView.requestFocusInWindow();
2842	3262	} else
2843	3263	if (source == sixButton)
2844	3264	{
2845	3265	radio.layout = sixButton;
	3266	+
	3267	+ if (CameraPane.FULLSCREEN)
	3268	+ fullscreenLayout = radio.layout;
2846	3269
2847	3270	// bigThree.remove(scenePanel);
2848	3271	// bigThree.remove(centralPanel);
..	..	@@ -2875,10 +3298,15 @@
2875	3298	bigThree.add(scenePanel);
2876	3299	bigThree.add(centralPanel);
2877	3300	bigThree.FlushUI();
	3301	+
	3302	+ cameraView.requestFocusInWindow();
2878	3303	} else
2879	3304	if (source == sevenButton)
2880	3305	{
2881	3306	radio.layout = sevenButton;
	3307	+
	3308	+ if (CameraPane.FULLSCREEN)
	3309	+ fullscreenLayout = radio.layout;
2882	3310
2883	3311	// bigThree.remove(scenePanel);
2884	3312	// bigThree.remove(centralPanel);
..	..	@@ -2912,6 +3340,8 @@
2912	3340	bigThree.add(centralPanel);
2913	3341	bigThree.add(XYZPanel);
2914	3342	bigThree.FlushUI();
	3343	+
	3344	+ cameraView.requestFocusInWindow();
2915	3345	} else
2916	3346	if (source == rootButton)
2917	3347	{
..	..	@@ -2923,6 +3353,7 @@
2923	3353	EditObject(obj);
2924	3354	}
2925	3355
	3356	+ cameraView.requestFocusInWindow();
2926	3357	refreshContents(true);
2927	3358	} else
2928	3359	if (source == closeButton)
..	..	@@ -2932,22 +3363,37 @@
2932	3363	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2933	3364	{
2934	3365	ab = (cRadio)e.nextElement();
2935		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3366	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2936	3367	{
	3368	+ // Patch to avoid bug with transparency.
	3369	+ if (!ab.hadMaterial)
	3370	+ {
	3371	+ ab.object.material = null;
	3372	+ }
	3373	+
2937	3374	buttonGroup.remove(ab);
2938	3375	radioPanel.remove(ab);
2939	3376
2940		- ab.GetObject().editWindow = null;
	3377	+ //ab.GetObject().editWindow = null;
	3378	+ ab.GetObject().manipWindow = null;
2941	3379	// ab.GetObject().objectUI = null; // ?????????
2942	3380
2943	3381	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2944	3382	break;
2945	3383	}
2946	3384	}
	3385	+
	3386	+ cameraView.requestFocusInWindow();
2947	3387	refreshContents(true);
2948	3388	} else
2949	3389	if (source == editItem \|\| source == editButton)
2950	3390	{
	3391	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3392	+ {
	3393	+ Object3D child = (Object3D)e.nextElement();
	3394	+ child.pinned = true;
	3395	+ }
	3396	+
2951	3397	EditSelection(false);
2952	3398	} else
2953	3399	if (source == uneditButton)
..	..	@@ -2957,10 +3403,11 @@
2957	3403	Object3D child = (Object3D)e.nextElement();
2958	3404	if(child.editWindow != null)
2959	3405	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3406	+ child.pinned = false;
2960	3407	child.CloseUI();
2961	3408	listUI.remove(child);
2962	3409
2963		- child.editWindow = null; // ???????????
	3410	+ //child.editWindow = null; // ???????????
2964	3411	}
2965	3412	objEditor.ctrlPanel.FlushUI();
2966	3413	//objEditor.jTree.clearSelection();
..	..	@@ -2973,6 +3420,7 @@
2973	3420	//copy.ClearUI();
2974	3421	for (Object3D obj : listUI)
2975	3422	{
	3423	+ obj.pinned = false;
2976	3424	obj.CloseUI();
2977	3425	}
2978	3426	listUI.clear();
..	..	@@ -2982,7 +3430,7 @@
2982	3430	{
2983	3431	assert(copy == group);
2984	3432
2985		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3433	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2986	3434
2987	3435	for (Object3D obj : listUI)
2988	3436	{
..	..	@@ -3046,20 +3494,44 @@
3046	3494	frontView.object = group;
3047	3495	sideView.object = group;
3048	3496	}
3049		- group.editWindow = this;
	3497	+
	3498	+// fix "+" issue
	3499	+ //group.editWindow = this;
	3500	+ group.manipWindow = this;
	3501	+
3050	3502	/*
3051	3503	currentLayout = radio.layout;
3052	3504	if (currentLayout == null)
3053	3505	currentLayout = sevenButton;
3054	3506	*/
3055	3507	radio.layout.doClick();
	3508	+
	3509	+ ClearUnpinned();
	3510	+ SetPinStates(group.selection.size() > 0);
	3511	+ if (group.selection.size() == 1)
	3512	+ EditSelection(false);
3056	3513	keepparent = group.parent;
3057	3514	// PARENT = NULL or not???
3058	3515	//group.parent = null; // ROOT
3059	3516	//group.attributes = -1;
3060	3517	ResetModel();
	3518	+
	3519	+ cameraView.requestFocusInWindow();
3061	3520	refreshContents(true);
3062		- }
	3521	+ } else if (event.getSource() == editCameraItem)
	3522	+ {
	3523	+ cameraView.ProtectCamera();
	3524	+ cameraView.repaint();
	3525	+ return;
	3526	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3527	+ {
	3528	+ cameraView.RevertCamera();
	3529	+ cameraView.repaint();
	3530	+ return;
	3531	+ // } else if (event.getSource() == textureButton)
	3532	+ // {
	3533	+ // return; // true;
	3534	+ }
3063	3535	else
3064	3536	{
3065	3537	//return super.action(event, arg);
..	..	@@ -3068,7 +3540,6 @@
3068	3540	}
3069	3541
3070	3542	boolean useclient = false;
3071		- cRadio radio;
3072	3543
3073	3544	void ToggleRoot()
3074	3545	{
..	..	@@ -3120,6 +3591,28 @@
3120	3591	refreshContents();
3121	3592	}
3122	3593
	3594	+ void TransformChildren()
	3595	+ {
	3596	+ Object3D obj;
	3597	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3598	+ {
	3599	+ obj = (Object3D)e.nextElement();
	3600	+ obj.KeepTextureMatrices();
	3601	+ obj.TransformChildren();
	3602	+ obj.RestoreTextureMatrices();
	3603	+
	3604	+// if (obj.parent == null)
	3605	+// {
	3606	+// System.out.println("NULL PARENT!");
	3607	+// new Exception().printStackTrace();
	3608	+// }
	3609	+// else
	3610	+// TouchTransform(obj);
	3611	+// //obj.parent.Touch();
	3612	+ }
	3613	+
	3614	+ refreshContents();
	3615	+ }
3123	3616
3124	3617	void ResetTransform()
3125	3618	{
..	..	@@ -3232,7 +3725,7 @@
3232	3725	refreshContents();
3233	3726	}
3234	3727
3235		- void ResetCentroid()
	3728	+ void ResetCentroid(boolean full)
3236	3729	{
3237	3730	Object3D obj;
3238	3731	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3247,12 +3740,16 @@
3247	3740	LA.matIdentity(Object3D.mat);
3248	3741	obj.getBounds(minima, maxima, false);
3249	3742	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3250		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3743	+ if (full)
	3744	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3251	3745	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3252	3746	obj.TransformMesh(Object3D.mat);
	3747	+
3253	3748	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3254		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3749	+ if (full)
	3750	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3255	3751	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3752	+
3256	3753	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3257	3754	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3258	3755	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3281,7 +3778,8 @@
3281	3778
3282	3779	int size = obj.MemorySize();
3283	3780
3284		- System.err.println((size/1024) + " KB is the size of " + obj);
	3781	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3782	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3285	3783	}
3286	3784	}
3287	3785	catch (Exception e)
..	..	@@ -3318,9 +3816,9 @@
3318	3816	obj = (Object3D)e.nextElement();
3319	3817
3320	3818	System.out.println("Object is: " + obj);
3321		- GrafreeD.AnalyzeObject(obj);
	3819	+ Grafreed.AnalyzeObject(obj);
3322	3820	System.out.println("Boundary rep: " + obj.bRep);
3323		- GrafreeD.AnalyzeObject(obj.bRep);
	3821	+ Grafreed.AnalyzeObject(obj.bRep);
3324	3822
3325	3823	// System.err.println((size/1024) + " KB is the size of " + obj);
3326	3824	}
..	..	@@ -3362,6 +3860,13 @@
3362	3860	void GenNormals(boolean crease)
3363	3861	{
3364	3862	group.GenNormalsS(crease);
	3863	+
	3864	+ refreshContents();
	3865	+ }
	3866	+
	3867	+ void GenNormalsMESH()
	3868	+ {
	3869	+ group.GenNormalsMeshS();
3365	3870
3366	3871	refreshContents();
3367	3872	}
..	..	@@ -3534,8 +4039,8 @@
3534	4039
3535	4040	void ParseVertices()
3536	4041	{
3537		- boolean epsequal = GrafreeD.epsequal;
3538		- GrafreeD.epsequal = true;
	4042	+ boolean epsequal = Grafreed.epsequal;
	4043	+ Grafreed.epsequal = true;
3539	4044
3540	4045	for (int i=0; i<group.selection.size(); i++)
3541	4046	{
..	..	@@ -3560,7 +4065,7 @@
3560	4065	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3561	4066	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3562	4067
3563		- g.add(GrafreeD.clipboard);
	4068	+ g.add(Grafreed.clipboard);
3564	4069
3565	4070	buffer.add(g);
3566	4071	}
..	..	@@ -3575,7 +4080,7 @@
3575	4080	makeSomething(buffer, i==group.selection.size()-1);
3576	4081	}
3577	4082
3578		- GrafreeD.epsequal = epsequal;
	4083	+ Grafreed.epsequal = epsequal;
3579	4084
3580	4085	refreshContents();
3581	4086	}
..	..	@@ -3593,7 +4098,16 @@
3593	4098	String pigment = Object3D.GetPigment(tex);
3594	4099	//String bump = Object3D.GetBump(tex);
3595	4100
3596		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4101	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4102	+
	4103	+ try
	4104	+ {
	4105	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4106	+ }
	4107	+ catch (Exception e)
	4108	+ {
	4109	+ System.err.println("FAIL: " + node);
	4110	+ }
3597	4111
3598	4112	double s = v.s;
3599	4113
..	..	@@ -3725,7 +4239,7 @@
3725	4239	return;
3726	4240
3727	4241	Object3D poses = group.selection.get(0);
3728		- Object3D ref = GrafreeD.clipboard.get(0);
	4242	+ Object3D ref = Grafreed.clipboard.get(0);
3729	4243
3730	4244	Object3D newgroup = new Object3D("Po:" + poses.name);
3731	4245
..	..	@@ -3919,9 +4433,9 @@
3919	4433
3920	4434	void ClipMesh()
3921	4435	{
3922		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4436	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3923	4437	{
3924		- Object3D content = GrafreeD.clipboard.get(0);
	4438	+ Object3D content = Grafreed.clipboard.get(0);
3925	4439
3926	4440	if (content instanceof cGroup && ((cGroup)content).transientlink )
3927	4441	content = ((cGroup)content).get(0);
..	..	@@ -3930,7 +4444,7 @@
3930	4444	// {
3931	4445	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3932	4446	// }
3933		- group.selection.ClipMesh(GrafreeD.clipboard);
	4447	+ group.selection.ClipMesh(Grafreed.clipboard);
3934	4448	}
3935	4449	// group.selection.ClipMesh(GrafreeD.clipboard);
3936	4450	System.out.println("DONE.");
..	..	@@ -3977,6 +4491,18 @@
3977	4491	void MarkLeaves(boolean hide)
3978	4492	{
3979	4493	group.selection.MarkLeaves(hide);
	4494	+ refreshContents();
	4495	+ }
	4496	+
	4497	+ void RewindLeaves(boolean hide)
	4498	+ {
	4499	+ group.selection.RewindLeaves(hide);
	4500	+ refreshContents();
	4501	+ }
	4502	+
	4503	+ void RandomLeaves(boolean hide)
	4504	+ {
	4505	+ group.selection.RandomLeaves(hide);
3980	4506	refreshContents();
3981	4507	}
3982	4508
..	..	@@ -4051,10 +4577,6 @@
4051	4577	// }
4052	4578	// }
4053	4579
4054		- static boolean allparams = true;
4055		-
4056		- static Vector<Object3D> listUI = new Vector<Object3D>();
4057		-
4058	4580	void EditSelection(boolean newWindow)
4059	4581	{
4060	4582	// aConstraints.gridy = 0;
..	..	@@ -4062,10 +4584,10 @@
4062	4584	{
4063	4585	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4064	4586	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4065		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4587	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4066	4588
4067	4589	Object3D elem = (Object3D)group.selection.elementAt(i);
4068		- if(elem != group)
	4590	+ if(elem != group \|\| !newWindow)
4069	4591	{
4070	4592	// if (!(elem instanceof Composite))
4071	4593	// newWindow = false;
..	..	@@ -4147,7 +4669,8 @@
4147	4669	//new Exception().printStackTrace();
4148	4670
4149	4671	freezemodel = true;
4150		-
	4672	+ ClearUnpinned();
	4673	+
4151	4674	/**/
4152	4675	//switch (event.id)
4153	4676	{
..	..	@@ -4155,7 +4678,6 @@
4155	4678	//case 702: // Event.LIST_DESELECT
4156	4679	group.deselectAll();
4157	4680	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4158		- objEditor.ClearInfo(); // .GetMaterial());
4159	4681	if (tps != null)
4160	4682	{
4161	4683	for (int i=0; i < tps.length; i++)
..	..	@@ -4164,10 +4686,8 @@
4164	4686
4165	4687	//if (child.parent != null)
4166	4688	//child.parent.addSelectee(child);
	4689	+ objEditor.SetMaterial(child);
4167	4690	group.addSelectee(child);
4168		- objEditor.SetMaterial(child); // .GetMaterial());
4169		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4170		- System.err.println("info : " + child.GetPath());
4171	4691	}
4172	4692	}
4173	4693	// else
..	..	@@ -4177,20 +4697,28 @@
4177	4697	// System.err.println("info : " + group.GetPath());
4178	4698	// }
4179	4699
4180		- objEditor.SetText(); // jan 2014
4181		-
4182		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4700	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4183	4701	CameraPane.flash = true;
4184	4702
4185		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4703	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4186	4704	// a camera
4187	4705	{
4188		- CameraPane.camerachangeframe = 0; // don't refuse it
4189		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4706	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	4707	+ {
	4708	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4709	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4710	+ }
4190	4711	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4191	4712	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4192	4713	}
4193	4714
	4715	+ if (tps != null && tps.length == 1)
	4716	+ {
	4717	+ EditSelection(false);
	4718	+ }
	4719	+
	4720	+ SetPinStates(tps != null && tps.length > 0);
	4721	+
4194	4722	refreshContents();
4195	4723	//return true;
4196	4724	}
..	..	@@ -4199,6 +4727,35 @@
4199	4727
4200	4728	freezemodel = false;
4201	4729	}
	4730	+
	4731	+ void SetPinStates(boolean enabled)
	4732	+ {
	4733	+ editButton.setEnabled(enabled);
	4734	+ uneditButton.setEnabled(enabled);
	4735	+ unselectButton.setEnabled(enabled);
	4736	+ flashSelectionButton.setEnabled(enabled);
	4737	+ }
	4738	+
	4739	+ void refreshContents(boolean cp)
	4740	+ {
	4741	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4742	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	4743	+ {
	4744	+ objEditor.ClearInfo(); // .GetMaterial());
	4745	+
	4746	+ for (int i=0; i < group.selection.Size(); i++)
	4747	+ {
	4748	+ Object3D child = (Object3D) group.selection.get(i);
	4749	+
	4750	+ objEditor.AddInfo(child, this, true);
	4751	+ System.err.println("info : " + child.GetPath());
	4752	+ }
	4753	+
	4754	+ objEditor.SetText(); // jan 2014
	4755	+ }
	4756	+
	4757	+ super.refreshContents(cp);
	4758	+ }
4202	4759
4203	4760	void linkSomething(Object3D thing)
4204	4761	{
..	..	@@ -4270,16 +4827,19 @@
4270	4827	{
4271	4828	if (group.selection.isEmpty())
4272	4829	return;
4273		- GrafreeD.clipboardIsTempGroup = false;
	4830	+
	4831	+ Grafreed.clipboardIsTempGroup = false;
4274	4832	Composite tGroup = null;
4275	4833	if (group.selection.size() > 0) // 1)
4276	4834	{
4277	4835	tGroup = new cGroup();
4278		- GrafreeD.clipboardIsTempGroup = true;
	4836	+ Grafreed.clipboardIsTempGroup = true;
4279	4837	}
4280	4838
4281	4839	if (cut)
4282	4840	{
	4841	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	4842	+// Save();
4283	4843	//int indices[] = jList.getSelectedIndices();
4284	4844	//for (int i = indices.length - 1; i >= 0; i--)
4285	4845	//jList.remove(indices[i]);
..	..	@@ -4315,16 +4875,16 @@
4315	4875	//System.out.println("cut " + child);
4316	4876	//System.out.println("parent = " + child.parent);
4317	4877	// tmp.addChild(child);
4318		- if (GrafreeD.clipboardIsTempGroup)
	4878	+ if (Grafreed.clipboardIsTempGroup)
4319	4879	tGroup.add/Child/(tmp);
4320	4880	else
4321		- GrafreeD.clipboard = tmp;
	4881	+ Grafreed.clipboard = tmp;
4322	4882	}
4323	4883	else
4324		- if (GrafreeD.clipboardIsTempGroup)
	4884	+ if (Grafreed.clipboardIsTempGroup)
4325	4885	tGroup.add/Child/(child);
4326	4886	else
4327		- GrafreeD.clipboard = child;
	4887	+ Grafreed.clipboard = child;
4328	4888	}
4329	4889
4330	4890	//ResetModel();
..	..	@@ -4356,21 +4916,23 @@
4356	4916	//System.out.println("cut " + elem);
4357	4917	//System.out.println("parent = " + elem.parent);
4358	4918	// tmp.addChild(elem);
4359		- if (GrafreeD.clipboardIsTempGroup)
	4919	+ if (Grafreed.clipboardIsTempGroup)
4360	4920	tGroup.add/Child/(tmp);
4361	4921	else
4362		- GrafreeD.clipboard = tmp;
	4922	+ Grafreed.clipboard = tmp;
4363	4923	}
4364	4924	else
4365		- if (GrafreeD.clipboardIsTempGroup)
	4925	+ if (Grafreed.clipboardIsTempGroup)
4366	4926	tGroup.add/Child/(child);
4367	4927	else
4368		- GrafreeD.clipboard = child;
	4928	+ Grafreed.clipboard = child;
4369	4929	}
4370	4930
4371	4931	}
4372		- if (GrafreeD.clipboardIsTempGroup)
4373		- GrafreeD.clipboard = tGroup;
	4932	+
	4933	+ if (Grafreed.clipboardIsTempGroup)
	4934	+ Grafreed.clipboard = tGroup;
	4935	+
4374	4936	if (cut)
4375	4937	{
4376	4938	ResetModel();
..	..	@@ -4380,11 +4942,15 @@
4380	4942
4381	4943	void paste(boolean expand)
4382	4944	{
	4945	+ if (Globals.SAVEONMAKE)
	4946	+ Save();
	4947	+ boolean keep = Globals.SAVEONMAKE;
	4948	+ Globals.SAVEONMAKE = false;
4383	4949	// if (GrafreeD.clipboard == null)
4384	4950	// return;
4385	4951	boolean first = true;
4386	4952
4387		- if (GrafreeD.clipboardIsTempGroup)
	4953	+ if (Grafreed.clipboardIsTempGroup)
4388	4954	{
4389	4955	Composite temp;
4390	4956
..	..	@@ -4395,7 +4961,7 @@
4395	4961	temp = (Composite)Applet3D.clipboard.deepCopy();
4396	4962	*/
4397	4963	Object3D elem;
4398		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4964	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4399	4965	{
4400	4966	Object3D child = (Object3D)e.nextElement();
4401	4967
..	..	@@ -4429,16 +4995,17 @@
4429	4995	//Object3D cb = Applet3D.clipboard;
4430	4996	//temp.addChild(cb);
4431	4997	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4432		- assert(GrafreeD.clipboard.parent == null);
4433		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4434		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4435		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4436		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	4998	+ assert(Grafreed.clipboard.parent == null);
	4999	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5000	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5001	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5002	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4437	5003	else
4438		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4439		- GrafreeD.clipboard.get(0).parent = keepparent;
	5004	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5005	+ Grafreed.clipboard.get(0).parent = keepparent;
4440	5006	}
4441	5007
	5008	+ Globals.SAVEONMAKE = keep;
4442	5009	ResetModel();
4443	5010	refreshContents();
4444	5011	}
..	..	@@ -4485,9 +5052,9 @@
4485	5052	{
4486	5053	boolean first = true;
4487	5054
4488		- if (GrafreeD.clipboardIsTempGroup)
	5055	+ if (Grafreed.clipboardIsTempGroup)
4489	5056	{
4490		- Composite temp = (Composite)GrafreeD.clipboard;
	5057	+ Composite temp = (Composite)Grafreed.clipboard;
4491	5058	Object3D copy;
4492	5059	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4493	5060	{
..	..	@@ -4497,7 +5064,7 @@
4497	5064	}
4498	5065	} else
4499	5066	{
4500		- linkSomething(GrafreeD.clipboard); //.get(0));
	5067	+ linkSomething(Grafreed.clipboard); //.get(0));
4501	5068	}
4502	5069	}
4503	5070	}
..	..	@@ -4574,6 +5141,10 @@
4574	5141
4575	5142	void group(Object3D csg, boolean grab)
4576	5143	{
	5144	+ if (Globals.SAVEONMAKE)
	5145	+ Save();
	5146	+ boolean keep = Globals.SAVEONMAKE;
	5147	+ Globals.SAVEONMAKE = false;
4577	5148	if (//false) // why??
4578	5149	!group.selection.isEmpty())
4579	5150	{
..	..	@@ -4687,10 +5258,15 @@
4687	5258	//node.add(csg);
4688	5259	//makeSomething(node);
4689	5260	makeSomething(csg);
	5261	+ Globals.SAVEONMAKE = keep;
4690	5262	}
4691	5263
4692	5264	void Ungroup(Object3D g)
4693	5265	{
	5266	+ if (Globals.SAVEONMAKE)
	5267	+ Save();
	5268	+ boolean keep = Globals.SAVEONMAKE;
	5269	+ Globals.SAVEONMAKE = false;
4694	5270	if (g instanceof HiddenObject)
4695	5271	{
4696	5272	HiddenObject h = (HiddenObject) g;
..	..	@@ -4707,6 +5283,7 @@
4707	5283	objEditor.makeSomething(g.get(i), false);
4708	5284	}
4709	5285	}
	5286	+ Globals.SAVEONMAKE = keep;
4710	5287	}
4711	5288
4712	5289	void ungroup()
..	..	@@ -4902,21 +5479,6 @@
4902	5479	}
4903	5480	*/
4904	5481
4905		- void ImportGFD()
4906		- {
4907		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4908		- browser.show();
4909		- String filename = browser.getFile();
4910		- if (filename != null && filename.length() > 0)
4911		- {
4912		- String fullname = browser.getDirectory() + filename;
4913		-
4914		- //Object3D readobj =
4915		- objEditor.ReadGFD(fullname, objEditor);
4916		- //makeSomething(readobj);
4917		- }
4918		- }
4919		-
4920	5482	/*
4921	5483	public void Callback(Object obj)
4922	5484	{
..	..	@@ -4940,26 +5502,9 @@
4940	5502	}
4941	5503	*/
4942	5504
4943		- void ImportVRMLX3D()
4944		- {
4945		- if (GrafreeD.standAlone)
4946		- {
4947		- /**/
4948		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4949		- browser.show();
4950		- String filename = browser.getFile();
4951		- if (filename != null && filename.length() > 0)
4952		- {
4953		- String fullname = browser.getDirectory() + filename;
4954		- LoadVRMLX3D(fullname);
4955		- }
4956		- /**/
4957		- }
4958		- }
4959		-
4960	5505	String GetFile(String dialogName)
4961	5506	{
4962		- if (GrafreeD.standAlone)
	5507	+ if (Grafreed.standAlone)
4963	5508	{
4964	5509	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4965	5510	browser.show();
..	..	@@ -5027,7 +5572,28 @@
5027	5572	cButton clearpanelButton;
5028	5573	cButton unselectButton;
5029	5574
	5575	+ cButton restoreCameraButton;
	5576	+
	5577	+ cButton saveButton;
5030	5578	cButton oneStepButton;
	5579	+
	5580	+ cButton groupButton;
	5581	+ cButton ungroupButton;
	5582	+ cButton compositeButton;
	5583	+ cButton switchButton;
	5584	+ cButton loopButton;
	5585	+ cButton textureButton;
	5586	+
	5587	+ cButton gridButton;
	5588	+ cButton boxButton;
	5589	+ cButton sphereButton;
	5590	+ cButton coneButton;
	5591	+ cButton torusButton;
	5592	+ cButton superButton;
	5593	+ cButton kleinButton;
	5594	+ cButton particlesButton;
	5595	+ cButton overlayButton;
	5596	+ cButton lightButton;
5031	5597
5032	5598	cButton screenfitButton;
5033	5599	cButton screenfitpointButton;
..	..	@@ -5040,14 +5606,6 @@
5040	5606
5041	5607	cButton setsupportButton;
5042	5608
5043		- cButton twoButton;
5044		- cButton sixButton;
5045		- cButton threeButton;
5046		- cButton sevenButton;
5047		- cButton fourButton; // full panel
5048		- cButton oneButton; // full XYZ
5049		- //cButton currentLayout;
5050		-
5051	5609	//
5052	5610	//Composite
5053	5611	Object3D // to do !!
..	..	@@ -5057,9 +5615,11 @@
5057	5615	//JTree jTree;
5058	5616	private MenuItem lookAtItem;
5059	5617	private MenuItem lookFromItem;
5060		- private MenuItem switchItem;
	5618	+ private MenuItem switchViewItem;
5061	5619	private MenuItem cutItem;
5062		- private MenuItem duplicateItem;
	5620	+ private MenuItem undoItem;
	5621	+ private MenuItem redoItem;
	5622	+ private JMenuItem duplicateItem;
5063	5623	private MenuItem cloneItem;
5064	5624	private MenuItem cloneSupportItem;
5065	5625	private MenuItem overwriteGeoItem;
..	..	@@ -5072,7 +5632,7 @@
5072	5632	private MenuItem linkverticesItem;
5073	5633	private MenuItem relinkverticesItem;
5074	5634	private MenuItem setMasterItem;
5075		- private MenuItem resetMeshItem;
	5635	+ private MenuItem resetAllItem;
5076	5636	private MenuItem stepAllItem;
5077	5637	private MenuItem revertMeshItem;
5078	5638	private MenuItem poseMeshItem;
..	..	@@ -5122,6 +5682,10 @@
5122	5682	private MenuItem showleavesItem;
5123	5683	private MenuItem markleavesItem;
5124	5684	private MenuItem unmarkleavesItem;
	5685	+ private MenuItem rewindleavesItem;
	5686	+ private MenuItem unrewindleavesItem;
	5687	+ private MenuItem randomleavesItem;
	5688	+ private MenuItem unrandomleavesItem;
5125	5689
5126	5690	private MenuItem flipVItem;
5127	5691	private MenuItem unflipVItem;
..	..	@@ -5133,15 +5697,17 @@
5133	5697	private MenuItem panoTexturesItem;
5134	5698
5135	5699	private MenuItem resetCentroidItem;
5136		- private MenuItem transformgeometryItem;
	5700	+ private MenuItem resetCentroidXZItem;
5137	5701	private MenuItem resetTransformItem;
	5702	+ private MenuItem transformGeometryItem;
	5703	+ private MenuItem transformChildrenItem;
5138	5704	private MenuItem hideItem;
5139	5705	private MenuItem grabItem;
5140	5706	private MenuItem backItem;
5141	5707	private MenuItem frontItem;
5142	5708	private MenuItem cameraItem;
5143	5709	private MenuItem compositeItem;
5144		- private MenuItem randomItem;
	5710	+ private MenuItem switchItem;
5145	5711	private MenuItem physicsItem;
5146	5712	private MenuItem frameselectorItem;
5147	5713	private MenuItem scriptNodeItem;
..	..	@@ -5203,11 +5769,6 @@
5203	5769	private MenuItem doubleItem;
5204	5770	private MenuItem tripleItem;
5205	5771
5206		- private MenuItem importGFDItem;
5207		- private MenuItem importVRMLX3DItem;
5208		- private MenuItem import3DSItem;
5209		- private MenuItem importOBJItem;
5210		-
5211	5772	private MenuItem computeAOItem;
5212	5773	private MenuItem recompileItem;
5213	5774	private MenuItem editScriptItem;
..	..	@@ -5217,4 +5778,8 @@
5217	5778	private MenuItem analyzeItem;
5218	5779	private MenuItem dumpItem;
5219	5780	//boolean freezemodel = false;
	5781	+
	5782	+ Menu cameraMenu;
	5783	+ MenuItem editCameraItem;
	5784	+ MenuItem restoreCameraItem;
5220	5785	}