~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -60,6 +60,12 @@
60	60	this.copy = this.group = group;
61	61	//selectees = this.group.selectees;
62	62
	63	+ if (copy.versions == null)
	64	+ {
	65	+ copy.versions = new byte[100][];
	66	+ copy.versionindex = -1;
	67	+ }
	68	+
63	69	if(ui)
64	70	SetupUI(objEditor);
65	71	}
..	..	@@ -74,7 +80,13 @@
74	80	this.copy = this.group = copy;
75	81	//selectees = this.group.selectees;
76	82
77		- SetupMenu2(objEditor);
	83	+ if (copy.versions == null)
	84	+ {
	85	+ copy.versions = new byte[100][];
	86	+ copy.versionindex = -1;
	87	+ }
	88	+
	89	+ SetupMenu2(this); //objEditor);
78	90	SetupUI2(objEditor);
79	91	objEditor.SetupUI(true);
80	92	SetupViews(objEditor);
..	..	@@ -84,6 +96,10 @@
84	96
85	97	void CloneSelection(boolean supports)
86	98	{
	99	+ if (Globals.REPLACEONMAKE)
	100	+ Save();
	101	+ boolean keep = Globals.REPLACEONMAKE;
	102	+ Globals.REPLACEONMAKE = false;
87	103	// Object3D keep = GrafreeD.clipboard;
88	104	//Object3D obj;
89	105	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,18 +110,19 @@
94	110
95	111	makeSomething(clone, i==group.selection.size()-1);
96	112	}
	113	+ Globals.REPLACEONMAKE = keep;
97	114	}
98	115
99	116	void CloneClipboard(boolean supports)
100	117	{
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));
	118	+ assert(Grafreed.clipboard.parent == null);
	119	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	120	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	121	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	122	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
106	123	else
107		- makeSomething(CloneObject(GrafreeD.clipboard, false));
108		- GrafreeD.clipboard.get(0).parent = keepparent;
	124	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	125	+ Grafreed.clipboard.get(0).parent = keepparent;
109	126	}
110	127
111	128	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -119,7 +136,7 @@
119	136	// obj.support = null;
120	137	if (!supports)
121	138	obj.SaveSupports();
122		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	139	+ Object3D clone = (Object3D)Grafreed.clone(obj);
123	140	obj.parent = parent;
124	141	// obj.support = support;
125	142	// clone.support = support; // aout 2013
..	..	@@ -148,40 +165,37 @@
148	165
149	166	//JTextField nameField;
150	167
151		- void SetupMenu2(ObjEditor oe)
	168	+ void SetupMenu2(GroupEditor oe)
152	169	{
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		-
	170	+ oe.jTree = new cTree();
	171	+
168	172	Menu menu;
169	173	oe.menuBar.add(menu = new Menu("Edit"));
170	174	//editItem = menu.add(new MenuItem("Edit"));
171	175	//editItem.addActionListener(this);
172		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	176	+
	177	+// undoItem = menu.add(new MenuItem("Undo"));
	178	+// undoItem.addActionListener(this);
	179	+// redoItem = menu.add(new MenuItem("Redo"));
	180	+// redoItem.addActionListener(this);
	181	+// menu.add("-");
	182	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
173	183	duplicateItem.addActionListener(this);
	184	+ cloneItem = menu.add(new MenuItem("Clone"));
	185	+ cloneItem.addActionListener(this);
	186	+ if (Globals.ADVANCED)
	187	+ {
	188	+ cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
	189	+ cloneSupportItem.addActionListener(this);
	190	+ }
	191	+ menu.add("-");
174	192	cutItem = menu.add(new MenuItem("Cut"));
175	193	cutItem.addActionListener(this);
176	194	copyItem = menu.add(new MenuItem("Copy"));
177	195	copyItem.addActionListener(this);
178	196	pasteItem = menu.add(new MenuItem("Paste"));
179	197	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);
	198	+
185	199	menu.add("-");
186	200	pasteIntoItem = menu.add(new MenuItem("Paste into"));
187	201	pasteIntoItem.addActionListener(this);
..	..	@@ -201,14 +215,97 @@
201	215	clearAllItem = menu.add(new MenuItem("Clear All"));
202	216	clearAllItem.addActionListener(this);
203	217	}
	218	+
	219	+ menuBar.add(cameraMenu = new Menu("View"));
	220	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	221	+ //zBufferItem.addActionListener(this);
	222	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	223	+ //normalLensItem.addActionListener(this);
	224	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	225	+ restoreCameraItem.addActionListener(this);
	226	+
	227	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	228	+// toggleFullScreenItem.addItemListener(this);
	229	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	230	+// cameraMenu.add("-");
	231	+//
	232	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	233	+// toggleTextureItem.addItemListener(this);
	234	+// toggleTextureItem.setState(CameraPane.textureon);
	235	+//
	236	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	237	+// toggleSwitchItem.addItemListener(this);
	238	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	239	+
	240	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	241	+ toggleHandleItem.addItemListener(this);
	242	+ toggleHandleItem.setState(CameraPane.HANDLES);
	243	+
	244	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	245	+ togglePaintItem.addItemListener(this);
	246	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	247	+
	248	+ if (Globals.ADVANCED)
	249	+ {
	250	+ cameraMenu.add("-");
	251	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	252	+ toggleLiveItem.addItemListener(this);
	253	+ toggleLiveItem.setState(Globals.isLIVE());
204	254
	255	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	256	+ stepItem.addActionListener(this);
	257	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	258	+ // toggleDLItem.addItemListener(this);
	259	+ // toggleDLItem.setState(false);
	260	+
	261	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	262	+ toggleRenderItem.addItemListener(this);
	263	+ toggleRenderItem.setState(!CameraPane.frozen);
	264	+
	265	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	266	+ toggleDebugItem.addItemListener(this);
	267	+ toggleDebugItem.setState(Globals.DEBUG);
	268	+
	269	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	270	+ toggleFrustumItem.addItemListener(this);
	271	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	272	+
	273	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	274	+ toggleFootContactItem.addItemListener(this);
	275	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	276	+
	277	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	278	+ toggleTimelineItem.addItemListener(this);
	279	+ }
	280	+
	281	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	282	+// toggleRootItem.addItemListener(this);
	283	+// toggleRootItem.setState(false);
	284	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	285	+// animationItem.addItemListener(this);
	286	+// animationItem.setState(CameraPane.ANIMATION);
	287	+ cameraMenu.add("-");
	288	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	289	+ editCameraItem.addActionListener(this);
	290	+
	291	+ if (Globals.ADVANCED)
	292	+ {
	293	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	294	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	295	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	296	+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	297	+ oe.cameraMenu.add("-");
	298	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	299	+ openWindowItem.addActionListener(this);
	300	+ editLeafItem.addActionListener(this);
	301	+ lookAtItem.addActionListener(this);
	302	+ //lookFromItem.addActinoListener(this);
	303	+ //switchViewItem.addActionListener(this);
	304	+ }
	305	+
205	306	oe.menuBar.add(menu = new Menu("Setting"));
206	307	if (Globals.ADVANCED)
207	308	{
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	309	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
213	310	revertMeshItem.addActionListener(this);
214	311	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
..	..	@@ -248,21 +345,29 @@
248	345	}
249	346
250	347	oe.menuBar.add(menu = new Menu("Group"));
251		- grabItem = menu.add(new MenuItem("Grab"));
252		- grabItem.addActionListener(this);
	348	+// grabItem = menu.add(new MenuItem("Grab"));
	349	+// grabItem.addActionListener(this);
253	350	backItem = menu.add(new MenuItem("Back"));
254	351	backItem.addActionListener(this);
255	352	frontItem = menu.add(new MenuItem("Front"));
256	353	frontItem.addActionListener(this);
257		- compositeItem = menu.add(new MenuItem("Composite"));
258		- compositeItem.addActionListener(this);
	354	+// compositeItem = menu.add(new MenuItem("Composite"));
	355	+// compositeItem.addActionListener(this);
	356	+
	357	+ if (Globals.ADVANCED)
	358	+ {
259	359	hideItem = menu.add(new MenuItem("Hidden Group"));
260	360	hideItem.addActionListener(this);
	361	+ }
261	362	ungroupItem = menu.add(new MenuItem("Ungroup"));
262	363	ungroupItem.addActionListener(this);
263		- menu.add("-");
264		- randomItem = menu.add(new MenuItem("Switch node"));
265		- randomItem.addActionListener(this);
	364	+
	365	+// menu.add("-");
	366	+//
	367	+// switchItem = menu.add(new MenuItem("Switch node"));
	368	+// switchItem.addActionListener(this);
	369	+ if (Globals.ADVANCED)
	370	+ {
266	371	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
267	372	switchGeoItem.addActionListener(this);
268	373	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -270,49 +375,52 @@
270	375	morphItem = menu.add(new MenuItem("Morph Group"));
271	376	morphItem.addActionListener(this);
272	377
273		- if (Globals.ADVANCED)
274		- {
	378	+ menu.add("-");
275	379	physicsItem = menu.add(new MenuItem("Physics"));
276	380	physicsItem.addActionListener(this);
277	381	frameselectorItem = menu.add(new MenuItem("Frame Selector"));
278	382	frameselectorItem.addActionListener(this);
279	383	scriptNodeItem = menu.add(new MenuItem("Script Node"));
280	384	scriptNodeItem.addActionListener(this);
281		- cameraItem = menu.add(new MenuItem("Camera"));
282		- cameraItem.addActionListener(this);
283	385	}
284	386
285	387	oe.menuBar.add(menu = new Menu("Object"));
286		- textureItem = menu.add(new MenuItem("Texture"));
287		- textureItem.addActionListener(this);
	388	+// textureItem = menu.add(new MenuItem("Texture"));
	389	+// textureItem.addActionListener(this);
288	390	billboardItem = menu.add(new MenuItem("Billboard"));
289	391	billboardItem.addActionListener(this);
290	392	csgItem = menu.add(new MenuItem("CSG"));
291	393	csgItem.addActionListener(this);
292		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	394	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
293	395	shadowXItem.addActionListener(this);
294		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	396	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
295	397	shadowYItem.addActionListener(this);
296		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	398	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
297	399	shadowZItem.addActionListener(this);
298		- if (Globals.ADVANCED)
299		- {
300		- linkerItem = menu.add(new MenuItem("Linker"));
301		- linkerItem.addActionListener(this);
302	400	attributeItem = menu.add(new MenuItem("Attribute"));
303	401	attributeItem.addActionListener(this);
	402	+
	403	+ if (Globals.ADVANCED)
	404	+ {
	405	+ menu.add("-");
	406	+ linkerItem = menu.add(new MenuItem("Linker"));
	407	+ linkerItem.addActionListener(this);
304	408	templateItem = menu.add(new MenuItem("Template"));
305	409	templateItem.addActionListener(this);
306	410	pointflowItem = menu.add(new MenuItem("Point Flow"));
307	411	pointflowItem.addActionListener(this);
308		- menu.add("-");
309	412	}
	413	+ menu.add("-");
310	414	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
311	415	resetTransformItem.addActionListener(this);
312	416	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
313	417	resetCentroidItem.addActionListener(this);
314		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
315		- transformgeometryItem.addActionListener(this);
	418	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	419	+ resetCentroidXZItem.addActionListener(this);
	420	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	421	+ transformGeometryItem.addActionListener(this);
	422	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	423	+ transformChildrenItem.addActionListener(this);
316	424
317	425	oe.menuBar.add(menu = new Menu("Geometry"));
318	426	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -361,6 +469,10 @@
361	469	oe.menuBar.add(menu = new Menu("Attributes"));
362	470	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
363	471	clearMaterialsItem.addActionListener(this);
	472	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	473	+ resetAllItem.addActionListener(this);
	474	+ stepAllItem = menu.add(new MenuItem("Step All"));
	475	+ stepAllItem.addActionListener(this);
364	476	menu.add("-");
365	477	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
366	478	liveleavesItem.addActionListener(this);
..	..	@@ -381,6 +493,14 @@
381	493	markleavesItem.addActionListener(this);
382	494	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
383	495	unmarkleavesItem.addActionListener(this);
	496	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	497	+ rewindleavesItem.addActionListener(this);
	498	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	499	+ unrewindleavesItem.addActionListener(this);
	500	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	501	+ randomleavesItem.addActionListener(this);
	502	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	503	+ unrandomleavesItem.addActionListener(this);
384	504	menu.add("-");
385	505	flipVItem = menu.add(new MenuItem("Flip V"));
386	506	flipVItem.addActionListener(this);
..	..	@@ -415,38 +535,42 @@
415	535	sortbysizeItem.addActionListener(this);
416	536	sortbynameItem = menu.add(new MenuItem("Sort by name"));
417	537	sortbynameItem.addActionListener(this);
	538	+ menu.add("-");
	539	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	540	+ shareGeometriesItem.addActionListener(this);
	541	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	542	+ mergeGeometriesItem.addActionListener(this);
418	543	if (Globals.ADVANCED)
419	544	{
420		- menu.add("-");
	545	+ // Pretty much the same as duplicate and clone.
421	546	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
422	547	extractGeometriesItem.addActionListener(this);
423	548	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
424	549	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	550	}
430	551
431	552	oe.menuBar.add(menu = new Menu("Insert"));
432	553	buildCreateMenu(menu);
433	554
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	555	oe.menuBar.add(menu = new Menu("Tools"));
445	556	buildToolsMenu(menu);
446	557	}
447	558
	559	+
448	560	void SetupUI2(ObjEditor oe)
449	561	{
	562	+ // June 2019
	563	+ if (oe == null)
	564	+ {
	565	+ //super.SetupUI2(this);
	566	+ //return;
	567	+ }
	568	+
	569	+ if (copy != group)
	570	+ {
	571	+ //super.SetupUI2(this);
	572	+ }
	573	+
450	574	//new Exception().printStackTrace();
451	575
452	576	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -475,97 +599,229 @@
475	599	oe.radioPanel.add(dummyButton);
476	600	oe.buttonGroup.add(dummyButton);
477	601	*/
	602	+ cGridBag copyOptionsPanel = new cGridBag();
	603	+
	604	+ copyOptionsPanel.preferredHeight = 1;
	605	+
478	606	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
479	607
480		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
481		- liveCB.setToolTipText("Enabled animation");
	608	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	609	+ //minButton.setToolTipText("Minimize window");
	610	+ //minButton.addActionListener(this);
	611	+
	612	+ if (Globals.ADVANCED)
	613	+ {
	614	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	615	+ maxButton.setToolTipText("Maximize window");
	616	+ maxButton.addActionListener(this);
	617	+ }
	618	+
	619	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	620	+ fullButton.setToolTipText("Full-screen window");
	621	+ fullButton.addActionListener(this);
	622	+
	623	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	624	+ screenfitButton.setToolTipText("Screen fit");
	625	+ screenfitButton.addActionListener(this);
	626	+
	627	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	628	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	629	+ restoreCameraButton.addActionListener(this);
	630	+
	631	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	632	+ saveButton.setToolTipText("New version");
	633	+ saveButton.addActionListener(this);
	634	+
	635	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	636	+ undoButton.setToolTipText("Previous version");
	637	+ undoButton.addActionListener(this);
	638	+ undoButton.setEnabled(false);
	639	+
	640	+ cGridBag updown = new cGridBag().setVertical(true);
	641	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	642	+ restoreButton.setToolTipText("Restore current");
	643	+ restoreButton.addActionListener(this);
	644	+ restoreButton.setEnabled(false);
	645	+
	646	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	647	+ replaceButton.setToolTipText("Replace current");
	648	+ replaceButton.addActionListener(this);
	649	+ replaceButton.setEnabled(false);
	650	+
	651	+ copyOptionsPanel.add(updown);
	652	+
	653	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	654	+ redoButton.setToolTipText("Next version");
	655	+ redoButton.addActionListener(this);
	656	+ redoButton.setEnabled(false);
	657	+
	658	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	659	+ liveCB.setToolTipText("Enable animation");
482	660	liveCB.addItemListener(this);
483	661
484		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	662	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
485	663	oneStepButton.setToolTipText("Animate one step forward");
486	664	oneStepButton.addActionListener(this);
487	665
488		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	666	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
489	667	fastCB.setToolTipText("Fast mode");
490	668	fastCB.addItemListener(this);
491	669
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);
	670	+ //oe.toolboxPanel.Return();
	671	+
	672	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	673	+// trackCB.setToolTipText("Enable tracking");
	674	+// trackCB.addItemListener(this);
499	675
500	676	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
501	677	// screenfitpointButton.addActionListener(this);
502	678
503	679	if (Globals.ADVANCED)
504	680	{
505		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	681	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
506	682	snapobjectButton.addActionListener(this);
507	683	snapobjectButton.setToolTipText("Snap Object");
508	684	}
509	685
510		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
511		- flashSelectionButton.setToolTipText("Show selection");
512		- flashSelectionButton.addActionListener(this);
	686	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
513	687
514		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
515		-
516		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	688	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
517	689	twoButton.setToolTipText("Show center view only");
518	690	twoButton.addActionListener(this);
519		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	691	+ this.fullscreenLayout = twoButton;
	692	+
	693	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
520	694	fourButton.addActionListener(this);
521	695	fourButton.setToolTipText("Show left panel only");
522		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	696	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
523	697	sixButton.setToolTipText("2-column layout left");
524	698	sixButton.addActionListener(this);
525		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	699	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
526	700	threeButton.setToolTipText("2-column layout right");
527	701	threeButton.addActionListener(this);
528		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	702	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
529	703	sevenButton.setToolTipText("3-column layout");
530	704	sevenButton.addActionListener(this);
531	705	//
532	706
533		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	707	+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
534	708	rootButton.setToolTipText("Edit selection in new tab");
535	709	rootButton.addActionListener(this);
536	710
537		- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	711	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
538	712	closeButton.setToolTipText("Close tab");
539	713	closeButton.addActionListener(this);
540	714	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
541	715	//clearButton.addActionListener(this);
542		-
543		- cGridBag commandsPanel = new cGridBag();
	716	+
	717	+ // INSERT
	718	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	719	+ gridButton.setToolTipText("Create grid");
	720	+ gridButton.addActionListener(this);
	721	+
	722	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	723	+ boxButton.setToolTipText("Create box");
	724	+ boxButton.addActionListener(this);
	725	+
	726	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	727	+ sphereButton.setToolTipText("Create sphere");
	728	+ sphereButton.addActionListener(this);
	729	+
	730	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	731	+ coneButton.setToolTipText("Create cone");
	732	+ coneButton.addActionListener(this);
	733	+
	734	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	735	+ torusButton.setToolTipText("Create torus");
	736	+ torusButton.addActionListener(this);
	737	+
	738	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	739	+ superButton.setToolTipText("Create superellipsoid");
	740	+ superButton.addActionListener(this);
	741	+
	742	+ if (Globals.ADVANCED)
	743	+ {
	744	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	745	+ kleinButton.setToolTipText("Create Klein bottle");
	746	+ kleinButton.addActionListener(this);
	747	+ }
544	748
545		- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
546		- editButton.setToolTipText("Edit selection");
	749	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	750	+ particlesButton.setToolTipText("Create particle system");
	751	+ particlesButton.addActionListener(this);
	752	+
	753	+ oe.toolboxPanel.Return();
	754	+
	755	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	756	+ groupButton.setToolTipText("Create group");
	757	+ groupButton.addActionListener(this);
	758	+
	759	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	760	+ compositeButton.setToolTipText("Create composite");
	761	+ compositeButton.addActionListener(this);
	762	+
	763	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	764	+ switchButton.setToolTipText("Create item switcher");
	765	+ switchButton.addActionListener(this);
	766	+
	767	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	768	+ loopButton.setToolTipText("Create loop");
	769	+ loopButton.addActionListener(this);
	770	+
	771	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	772	+ textureButton.setToolTipText("Create texture");
	773	+ textureButton.addActionListener(this);
	774	+
	775	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	776	+ overlayButton.setToolTipText("Create overlay");
	777	+ overlayButton.addActionListener(this);
	778	+
	779	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	780	+ lightButton.setToolTipText("Create light");
	781	+ lightButton.addActionListener(this);
	782	+
	783	+ for (int i=6; --i>=0;)
	784	+ {
	785	+ oe.toolboxPanel.Return();
	786	+ oe.toolboxPanel.add(new cGridBag());
	787	+ oe.toolboxPanel.add(new cGridBag());
	788	+ oe.toolboxPanel.add(new cGridBag());
	789	+ oe.toolboxPanel.add(new cGridBag());
	790	+ oe.toolboxPanel.add(new cGridBag());
	791	+ oe.toolboxPanel.add(new cGridBag());
	792	+ oe.toolboxPanel.add(new cGridBag());
	793	+ }
	794	+
	795	+ // EDIT panel
	796	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	797	+ editButton.setToolTipText("Pin selection controls");
547	798	editButton.addActionListener(this);
548	799
549		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
550		- uneditButton.setToolTipText("Unedit selection");
	800	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	801	+ uneditButton.setToolTipText("Remove selection controls");
551	802	uneditButton.addActionListener(this);
552	803
553		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
554		- allParamsButton.setToolTipText("Edit all params");
	804	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	805	+ allParamsButton.setToolTipText("Show all controle");
555	806	allParamsButton.addActionListener(this);
556	807
557		- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	808	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
558	809	clearPanelButton.setToolTipText("Clear edit panel");
559	810	clearPanelButton.addActionListener(this);
560	811
561		- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	812	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
562	813	unselectButton.setToolTipText("Unselect");
563	814	unselectButton.addActionListener(this);
564	815
565		- commandsPanel.preferredHeight = 1;
	816	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	817	+ flashSelectionButton.setToolTipText("Highlight selection");
	818	+ flashSelectionButton.addActionListener(this);
566	819
567		- oe.treePanel.add(commandsPanel);
568		- oe.treePanel.Return();
	820	+ editCommandsPanel.preferredHeight = 1;
	821	+
	822	+ SetPinStates(false);
	823	+// oe.treePanel.add(commandsPanel);
	824	+// oe.treePanel.Return();
569	825
570	826	// oe.aConstraints.gridx += 1;
571	827	// oe.aConstraints.weighty = 0;
..	..	@@ -582,29 +838,17 @@
582	838
583	839	JScrollPane jSP;
584	840	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
585		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	841	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
586	842	ResetModel();
587	843
588	844	oe.treePanel.add(jSPPanel);
589	845	oe.treePanel.Return();
590	846
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	847	oe.treePanel.add(copyOptionsPanel);
607	848	oe.treePanel.Return();
	849	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	850	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	851	+ sliderPane.preferredHeight = 1;
608	852
609	853	// mainPanel.setDividerLocation(0.5); //1.0);
610	854	// mainPanel.setResizeWeight(0.5);
..	..	@@ -633,23 +877,43 @@
633	877
634	878	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
635	879	{
	880	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	881	+ colorCB.setToolTipText("Copy color when dropped");
	882	+ colorCB.addItemListener(this);
	883	+
	884	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	885	+ materialCB.setToolTipText("Copy material when dropped");
	886	+ materialCB.addItemListener(this);
	887	+
	888	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	889	+ textureCB.setToolTipText("Copy texture when dropped");
	890	+ textureCB.addItemListener(this);
	891	+
	892	+ panel.Return();
	893	+
636	894	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
637	895	boxCB.setToolTipText("Display bounding boxes");
638	896	boxCB.addItemListener(this);
639	897
640	898	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
641		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	899	+ zoomBoxCB.setToolTipText("Display only for wheel");
642	900	zoomBoxCB.addItemListener(this);
643	901
644		- if (Globals.ADVANCED)
	902	+ if (true) // Globals.ADVANCED)
645	903	{
646		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
647		- supportCB.setToolTipText("Enable rigging");
648		- supportCB.addItemListener(this);
	904	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	905	+// supportCB.setToolTipText("Enable rigging");
	906	+// supportCB.addItemListener(this);
	907	+
	908	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	909	+ freezeCB.setToolTipText("Fast moving camera");
	910	+ freezeCB.addItemListener(this);
649	911
650	912	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
651	913	// localCB.addItemListener(this);
652	914
	915	+ panel.Return();
	916	+
653	917	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
654	918	crowdCB.setToolTipText("Used for crowds");
655	919	crowdCB.addItemListener(this);
..	..	@@ -666,6 +930,8 @@
666	930	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
667	931	// speakerMocapCB.addItemListener(this);
668	932
	933	+ panel.Return();
	934	+
669	935	if (false)
670	936	{
671	937	// handled in scripts
..	..	@@ -680,32 +946,72 @@
680	946	//constraints.gridy += 1;
681	947	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
682	948	smoothfocusCB.addItemListener(this);
	949	+ panel.Return();
683	950	}
684	951
685	952	//constraints.gridx += 1;
686	953	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
687	954	// debugCB.addItemListener(this);
688	955
	956	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	957	+ trackCB.setToolTipText("Enable tracking target");
	958	+ trackCB.addItemListener(this);
	959	+
689	960	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	961	+ oeilCB.setToolTipText("Move camera when tracking");
690	962	oeilCB.addItemListener(this);
691	963
	964	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	965	+ shadowCB.setToolTipText("When live compute shadows");
	966	+ shadowCB.addItemListener(this);
	967	+
	968	+ panel.Return();
	969	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	970	+ toggleTextureCB.setToolTipText("Load textures");
	971	+ toggleTextureCB.addItemListener(this);
	972	+
	973	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	974	+ toggleSwitchCB.setToolTipText("Choose a single item");
	975	+ toggleSwitchCB.addItemListener(this);
	976	+
	977	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	978	+ autokeepCB.setToolTipText("On structure change");
	979	+ autokeepCB.addItemListener(this);
	980	+
	981	+ panel.Return();
	982	+ if (Globals.ADVANCED)
	983	+ {
692	984	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
693	985	lookAtCB.setToolTipText("Look-at target");
694	986	lookAtCB.addItemListener(this);
	987	+ }
695	988
696	989	}
697	990
698	991	cGridBag fill = new cGridBag();
699		-
700	992	fill.preferredHeight = 200;
	993	+ cGridBag fill2 = new cGridBag();
	994	+ fill2.preferredHeight = 200;
	995	+ cGridBag fill3 = new cGridBag();
	996	+ fill3.preferredHeight = 200;
701	997
702	998	panel.add(fill);
	999	+ panel.add(fill2);
	1000	+ panel.add(fill3);
703	1001
704	1002	}
705	1003
706	1004	void EditObject(Object3D obj)
707	1005	{
708	1006	cRadio radioButton = new cRadio(obj.name);
	1007	+
	1008	+ // June 2019. Patch to avoid bug with transparency.
	1009	+ radioButton.hadMaterial = obj.material != null;
	1010	+ if (!radioButton.hadMaterial)
	1011	+ {
	1012	+ obj.material = new cMaterial();
	1013	+ }
	1014	+
709	1015	radioButton.SetObject(obj);
710	1016	radioButton.layout = sevenButton;
711	1017	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -714,8 +1020,11 @@
714	1020	buttonGroup.add(radioButton);
715	1021	radioButton.doClick();
716	1022	}
	1023	+
717	1024	void SetupViews(ObjEditor oe)
718	1025	{
	1026	+ theFrame = this;
	1027	+
719	1028	oe.SetupViews();
720	1029
721	1030	System.out.println("SetupViews");
..	..	@@ -724,23 +1033,28 @@
724	1033	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
725	1034	}
726	1035
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;
	1036	+ cToggleButton liveCB;
	1037	+ cCheckBox supportCB;
	1038	+ cCheckBox localCB;
	1039	+ cCheckBox crowdCB;
	1040	+ cCheckBox smoothCB;
	1041	+ cToggleButton fastCB;
	1042	+ cCheckBox slowCB;
	1043	+ cCheckBox boxCB;
	1044	+ cCheckBox zoomBoxCB;
	1045	+ cCheckBox freezeCB;
	1046	+ //cToggleButton trackCB;
	1047	+ cCheckBox trackCB;
	1048	+ cCheckBox smoothfocusCB;
738	1049	// JCheckBox speakerMocapCB;
739		- JCheckBox speakerCameraCB;
740		- JCheckBox speakerFocusCB;
741		- JCheckBox debugCB;
742		- JCheckBox oeilCB;
743		- JCheckBox lookAtCB;
	1050	+ cCheckBox speakerCameraCB;
	1051	+ cCheckBox speakerFocusCB;
	1052	+ cCheckBox debugCB;
	1053	+
	1054	+ cCheckBox oeilCB;
	1055	+ cCheckBox shadowCB;
	1056	+ cCheckBox autokeepCB;
	1057	+ cCheckBox lookAtCB;
744	1058
745	1059	// static int COLOR = 1;
746	1060	// static int MATERIAL = 2;
..	..	@@ -748,9 +1062,9 @@
748	1062
749	1063	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
750	1064
751		- JCheckBox colorCB;
752		- JCheckBox materialCB;
753		- JCheckBox textureCB;
	1065	+ cCheckBox colorCB;
	1066	+ cCheckBox materialCB;
	1067	+ cCheckBox textureCB;
754	1068
755	1069	public void itemStateChanged(ItemEvent e)
756	1070	{
..	..	@@ -778,6 +1092,7 @@
778	1092	} else if(e.getSource() == liveCB)
779	1093	{
780	1094	cameraView.ToggleLive();
	1095	+ refreshContents(false);
781	1096	}
782	1097	else if(e.getSource() == supportCB)
783	1098	{
..	..	@@ -842,6 +1157,18 @@
842	1157	{
843	1158	cameraView.ToggleOeil();
844	1159	}
	1160	+ else if(e.getSource() == shadowCB)
	1161	+ {
	1162	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1163	+ }
	1164	+ else if(e.getSource() == freezeCB)
	1165	+ {
	1166	+ Globals.FREEZEONMOVE ^= true;
	1167	+ }
	1168	+ else if(e.getSource() == autokeepCB)
	1169	+ {
	1170	+ Globals.REPLACEONMAKE ^= true;
	1171	+ }
845	1172	else if(e.getSource() == lookAtCB)
846	1173	{
847	1174	cameraView.ToggleLookAt();
..	..	@@ -858,7 +1185,8 @@
858	1185
859	1186	/**/
860	1187	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
861		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1188	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1189	+ TreePath path = objEditor.jTree.getSelectionPath();
862	1190	if ((path == null) \|\| (path.getPathCount() <= 1)) {
863	1191	// We can't move the root node or an empty selection
864	1192	return;
..	..	@@ -921,8 +1249,6 @@
921	1249	}
922	1250	}
923	1251
924		- String string = (String) object;
925		-
926	1252	System.out.println("Transfer = " + object + "; drop : " + target);
927	1253	// if( object instanceof java.io.File[])
928	1254	// {
..	..	@@ -930,7 +1256,11 @@
930	1256	// objEditor.DropFile((java.io.File[]) object, true);
931	1257	// return;
932	1258	// }
933		- if (string.charAt(0) == '/')
	1259	+
	1260	+ String string = object.toString();
	1261	+
	1262	+ // File path for Mac and Windows
	1263	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
934	1264	{
935	1265	// file(s)
936	1266	String[] names = string.split("\n");
..	..	@@ -957,7 +1287,7 @@
957	1287
958	1288	flashIt = false;
959	1289	CameraPane pane = (CameraPane) target;
960		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1290	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
961	1291	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
962	1292
963	1293	if (group.selection.size() == 1)
..	..	@@ -973,23 +1303,33 @@
973	1303
974	1304	assert target == objEditor.jTree;
975	1305	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1306	+ Object3D destinationLeaf;
976	1307	try {
977		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1308	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
978	1309	} catch (Exception e) {
979	1310	System.out.println("destinationPath : " + destinationPath);
980	1311	return;
981	1312	}
982	1313
983		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1314	+ for (int i=group.selection.size(); --i>=0;)
984	1315	{
	1316	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1317	+
	1318	+ // Cannot move into itself
	1319	+ if (child == destinationLeaf)
	1320	+ return;
	1321	+ }
	1322	+
	1323	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1324	+// {
985	1325	loadClipboard(true);
986	1326	objEditor.jTree.setSelectionPath(destinationPath);
987	1327	pasteInto(false, false);
988		- } else {
989		- loadClipboard(false);
990		- objEditor.jTree.setSelectionPath(destinationPath);
991		- pasteInto(false, false); // true); // ???
992		- }
	1328	+// } else {
	1329	+// loadClipboard(false);
	1330	+// objEditor.jTree.setSelectionPath(destinationPath);
	1331	+// pasteInto(false, false); // true); // ???
	1332	+// }
993	1333	}
994	1334	public void dropActionChanged(DropTargetDragEvent dtde)
995	1335	// Called if the user has modified the current drop gesture
..	..	@@ -1094,22 +1434,30 @@
1094	1434	{
1095	1435	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1096	1436	//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);
	1437	+// gridItem = menu.add(new MenuItem("Grid"));
	1438	+// gridItem.addActionListener(this);
	1439	+// rectoidItem = menu.add(new MenuItem("Box"));
	1440	+// rectoidItem.addActionListener(this);
	1441	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1442	+// ellipsoidItem.addActionListener(this);
	1443	+// coneItem = menu.add(new MenuItem("Cone"));
	1444	+// coneItem.addActionListener(this);
	1445	+// torusItem = menu.add(new MenuItem("Torus"));
	1446	+// torusItem.addActionListener(this);
	1447	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1448	+// superItem.addActionListener(this);
	1449	+
	1450	+ cameraItem = menu.add(new MenuItem("Camera"));
	1451	+ cameraItem.addActionListener(this);
	1452	+
	1453	+ if (!Globals.ADVANCED)
	1454	+ {
1109	1455	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1110	1456	kleinItem.addActionListener(this);
1111		- particleItem = menu.add(new MenuItem("Particle system"));
1112		- particleItem.addActionListener(this);
	1457	+ }
	1458	+
	1459	+// particleItem = menu.add(new MenuItem("Particle system"));
	1460	+// particleItem.addActionListener(this);
1113	1461	if (Globals.ADVANCED)
1114	1462	{
1115	1463	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1135,15 +1483,15 @@
1135	1483	}
1136	1484	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1137	1485	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);
	1486	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1487	+// overlayItem.addActionListener(this);
	1488	+// lightItem = menu.add(new MenuItem("Light"));
	1489	+// lightItem.addActionListener(this);
1142	1490	menu.add("-");
1143	1491	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1144	1492	//superLoopItem.addActionListener(this);
1145		- loopItem = menu.add(new MenuItem("Loop"));
1146		- loopItem.addActionListener(this);
	1493	+// loopItem = menu.add(new MenuItem("Loop"));
	1494	+// loopItem.addActionListener(this);
1147	1495	doubleItem = menu.add(new MenuItem("Fork"));
1148	1496	doubleItem.addActionListener(this);
1149	1497	if (Globals.ADVANCED)
..	..	@@ -1159,18 +1507,23 @@
1159	1507	animationItem.addItemListener(this);
1160	1508	animationItem.setState(Globals.ANIMATION);
1161	1509
	1510	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1511	+ archiveItem.addActionListener(this);
	1512	+
1162	1513	menu.add("-");
1163	1514	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1164	1515	parseverticesItem.addActionListener(this);
1165	1516	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1166	1517	textureFieldItem.addActionListener(this);
1167		- alignItem = menu.add(new MenuItem("Align Object"));
	1518	+ alignItem = menu.add(new MenuItem("Align Objects"));
1168	1519	alignItem.addActionListener(this);
1169	1520	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1170	1521	reduceMorphItem.addActionListener(this);
1171	1522	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1172	1523	reduce34MorphItem.addActionListener(this);
1173		-
	1524	+ menu.add("-");
	1525	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1526	+ memoryItem.addActionListener(this);
1174	1527	menu.add(computeAOItem = new MenuItem("Compute AO"));
1175	1528	computeAOItem.addActionListener(this);
1176	1529
..	..	@@ -1179,11 +1532,9 @@
1179	1532	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1180	1533	mirrorItem.addActionListener(this);
1181	1534	menu.add("-");
1182		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1183		- memoryItem.addActionListener(this);
1184	1535	menu.add(analyzeItem = new MenuItem("Analyze"));
1185	1536	analyzeItem.addActionListener(this);
1186		- menu.add(dumpItem = new MenuItem("Dump"));
	1537	+ menu.add(dumpItem = new MenuItem("Print"));
1187	1538	dumpItem.addActionListener(this);
1188	1539	// menu.add(pathItem = new MenuItem("From-to path"));
1189	1540	// pathItem.addActionListener(this);
..	..	@@ -1324,9 +1675,24 @@
1324	1675	shadow.material = new cMaterial(obj.material);
1325	1676	shadow.material.diffuse = 0.0001f;
1326	1677	shadow.material.specular = 0.0001f;
	1678	+ //shadow.projectedVertices[1].x = 300;
1327	1679
1328	1680	makeSomething(shadow);
1329	1681	}
	1682	+
	1683	+ private void ClearUnpinned()
	1684	+ {
	1685	+ //for (Object3D obj : listUI)
	1686	+ for (int i=listUI.size(); --i>=0;)
	1687	+ {
	1688	+ Object3D obj = listUI.elementAt(i);
	1689	+ if (!obj.pinned)
	1690	+ {
	1691	+ obj.CloseUI();
	1692	+ listUI.remove(i);
	1693	+ }
	1694	+ }
	1695	+ }
1330	1696
1331	1697	/**
1332	1698	* applyExample
..	..	@@ -1530,9 +1896,9 @@
1530	1896
1531	1897	void Overwrite(int mask)
1532	1898	{
1533		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1899	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1534	1900	{
1535		- Object3D content = GrafreeD.clipboard.get(0);
	1901	+ Object3D content = Grafreed.clipboard.get(0);
1536	1902
1537	1903	if (content instanceof cGroup && ((cGroup)content).transientlink )
1538	1904	content = ((cGroup)content).get(0);
..	..	@@ -1571,7 +1937,7 @@
1571	1937	{
1572	1938	ScreenFit();
1573	1939	} else
1574		- if (source == switchItem)
	1940	+ if (source == switchViewItem)
1575	1941	{
1576	1942	cVector v1 = new cVector();
1577	1943	cVector v2 = new cVector();
..	..	@@ -1580,11 +1946,11 @@
1580	1946	objEditor.cameraView.renderCamera.setAim(v2, v1);
1581	1947	objEditor.cameraView.repaint();
1582	1948	} else
1583		- if (source == rectoidItem)
	1949	+ if (source == rectoidItem \|\| source == boxButton)
1584	1950	{
1585	1951	makeSomething(new Box());
1586	1952	} else
1587		- if (source == particleItem)
	1953	+ if (source == particleItem \|\| source == particlesButton)
1588	1954	{
1589	1955	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1590	1956	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1663,27 +2029,27 @@
1663	2029
1664	2030	makeSomething(obj);
1665	2031	} else
1666		- if (source == gridItem)
	2032	+ if (source == gridItem \|\| source == gridButton)
1667	2033	{
1668	2034	makeSomething(new Grid());
1669	2035	} else
1670		- if (source == ellipsoidItem)
	2036	+ if (source == ellipsoidItem \|\| source == sphereButton)
1671	2037	{
1672	2038	makeSomething(new Sphere());
1673	2039	} else
1674		- if (source == coneItem)
	2040	+ if (source == coneItem \|\| source == coneButton)
1675	2041	{
1676	2042	makeSomething(new Cone());
1677	2043	} else
1678		- if (source == torusItem)
	2044	+ if (source == torusItem \|\| source == torusButton)
1679	2045	{
1680	2046	makeSomething(new Torus());
1681	2047	} else
1682		- if (source == superItem)
	2048	+ if (source == superItem \|\| source == superButton)
1683	2049	{
1684	2050	makeSomething(new Superellipsoid());
1685	2051	} else
1686		- if (source == kleinItem)
	2052	+ if (source == kleinItem \|\| source == kleinButton)
1687	2053	{
1688	2054	makeSomething(new Klein());
1689	2055	} else
..	..	@@ -1703,7 +2069,7 @@
1703	2069	{
1704	2070	makeSomething(new BezierSurface());
1705	2071	} else
1706		- if (source == overlayItem)
	2072	+ if (source == overlayItem \|\| source == overlayButton)
1707	2073	{
1708	2074	/*
1709	2075	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1751,7 +2117,7 @@
1751	2117	s.setup();
1752	2118	makeSomething(s);
1753	2119	} else
1754		- if (source == lightItem)
	2120	+ if (source == lightItem \|\| source == lightButton)
1755	2121	{
1756	2122	makeSomething(new Light());
1757	2123	} else
..	..	@@ -1801,30 +2167,30 @@
1801	2167
1802	2168	group(g);
1803	2169	} else
1804		- if (source == loopItem)
	2170	+ if (source == loopItem \|\| source == loopButton)
1805	2171	{
1806	2172	Composite csg = new GroupLeaf();
1807	2173	csg.count = 5;
1808	2174	group(csg);
1809		- Composite child = new cGroup();
	2175	+ Composite child = new cGroup("Branch");
1810	2176	csg.addChild(child);
1811	2177	child.addChild(csg);
1812	2178	} else
1813	2179	if (source == doubleItem)
1814	2180	{
1815		- Composite csg = new GroupLeaf();
	2181	+ Composite csg = new GroupLeaf("Fork");
1816	2182	csg.count = 5;
1817	2183	group(csg);
1818		- Composite child = new cGroup();
	2184	+ Composite child = new cGroup("Branch A");
1819	2185	csg.addChild(child);
1820	2186	child.addChild(csg);
1821		- child = new cGroup();
	2187	+ child = new cGroup("Branch B");
1822	2188	csg.addChild(child);
1823	2189	child.addChild(csg);
1824	2190	} else
1825	2191	if (source == tripleItem)
1826	2192	{
1827		- Composite csg = new GroupLeaf();
	2193	+ Composite csg = new GroupLeaf("Trident");
1828	2194	csg.count = 4;
1829	2195	group(csg);
1830	2196	Composite child = new cGroup();
..	..	@@ -1836,23 +2202,6 @@
1836	2202	child = new cGroup();
1837	2203	csg.addChild(child);
1838	2204	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	2205	} else
1857	2206	if (source == computeAOItem)
1858	2207	{
..	..	@@ -1872,7 +2221,7 @@
1872	2221	if (source == invariantsItem)
1873	2222	{
1874	2223	System.out.println("Invariants:");
1875		- GrafreeD.grafreeD.universe.invariants();
	2224	+ Grafreed.grafreeD.universe.invariants();
1876	2225	} else
1877	2226	if (source == memoryItem)
1878	2227	{
..	..	@@ -1891,6 +2240,46 @@
1891	2240	{
1892	2241	DumpObject();
1893	2242	} else
	2243	+ if (source == minButton)
	2244	+ {
	2245	+ Minimize();
	2246	+ } else
	2247	+ if (source == maxButton)
	2248	+ {
	2249	+ Maximize();
	2250	+ } else
	2251	+ if (source == fullButton)
	2252	+ {
	2253	+ ToggleFullScreen();
	2254	+ } else
	2255	+ if (source == undoButton)
	2256	+ {
	2257	+ // Go to previous version
	2258	+ //if (!Undo())
	2259	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2260	+ Undo();
	2261	+ } else
	2262	+ if (source == restoreButton)
	2263	+ {
	2264	+ // Restore current version
	2265	+ Restore();
	2266	+ } else
	2267	+ if (source == replaceButton)
	2268	+ {
	2269	+ // Overwrite current version
	2270	+ Replace();
	2271	+ } else
	2272	+ if (source == redoButton)
	2273	+ {
	2274	+ // Go to next version
	2275	+ Redo();
	2276	+ } else
	2277	+ if (source == saveButton)
	2278	+ {
	2279	+ // Save a new version
	2280	+ if (!Save(true))
	2281	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2282	+ } else
1894	2283	if (source == oneStepButton)
1895	2284	{
1896	2285	Globals.ONESTEP = true;
..	..	@@ -1898,17 +2287,14 @@
1898	2287	} else
1899	2288	if (source == screenfitButton)
1900	2289	{
1901		- //Reload(lastConverter, lastFilename, true);
1902	2290	ScreenFit();
1903	2291	} else
1904	2292	if (source == screenfitpointButton)
1905	2293	{
1906		- //Reload(lastConverter, lastFilename, true);
1907	2294	ScreenFitPoint();
1908	2295	} else
1909	2296	if (source == snapobjectButton)
1910	2297	{
1911		- //Reload(lastConverter, lastFilename, true);
1912	2298	SnapObject();
1913	2299	} else
1914	2300	// if (event.getSource() == recompileButton)
..	..	@@ -1945,12 +2331,20 @@
1945	2331	{
1946	2332	loadClipboard(true);
1947	2333	} else
	2334	+ if (source == undoItem)
	2335	+ {
	2336	+ Undo();
	2337	+ } else
	2338	+ if (source == redoItem)
	2339	+ {
	2340	+ Redo();
	2341	+ } else
1948	2342	if (source == duplicateItem)
1949	2343	{
1950		- Object3D keep = GrafreeD.clipboard;
	2344	+ Object3D keep = Grafreed.clipboard;
1951	2345	loadClipboard(false);
1952	2346	paste(false);
1953		- GrafreeD.clipboard = keep;
	2347	+ Grafreed.clipboard = keep;
1954	2348	} else
1955	2349	if (source == cloneItem)
1956	2350	{
..	..	@@ -2170,9 +2564,9 @@
2170	2564	// group.selection.get(0).setMasterThis(content); // should be identity
2171	2565	// refreshContents();
2172	2566	// }
2173		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2567	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2174	2568	{
2175		- Object3D content = GrafreeD.clipboard.get(0);
	2569	+ Object3D content = Grafreed.clipboard.get(0);
2176	2570
2177	2571	if (content instanceof cGroup && ((cGroup)content).transientlink )
2178	2572	content = ((cGroup)content).get(0);
..	..	@@ -2222,9 +2616,9 @@
2222	2616	} else
2223	2617	if (source == setMasterItem)
2224	2618	{
2225		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2619	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2226	2620	{
2227		- Object3D content = GrafreeD.clipboard.get(0);
	2621	+ Object3D content = Grafreed.clipboard.get(0);
2228	2622
2229	2623	if (content instanceof cGroup && ((cGroup)content).transientlink )
2230	2624	content = ((cGroup)content).get(0);
..	..	@@ -2237,9 +2631,9 @@
2237	2631	{
2238	2632	if (group.selection.size() == 1)
2239	2633	{
2240		- if (GrafreeD.clipboard.size() == 1)
	2634	+ if (Grafreed.clipboard.size() == 1)
2241	2635	{
2242		- Object3D content = GrafreeD.clipboard.get(0);
	2636	+ Object3D content = Grafreed.clipboard.get(0);
2243	2637
2244	2638	if (content instanceof cGroup && ((cGroup)content).transientlink )
2245	2639	content = ((cGroup)content).get(0);
..	..	@@ -2256,7 +2650,7 @@
2256	2650	{
2257	2651	RevertMeshes();
2258	2652	} else
2259		- if (source == resetMeshItem)
	2653	+ if (source == resetAllItem)
2260	2654	{
2261	2655	ResetAll();
2262	2656	} else
..	..	@@ -2276,9 +2670,9 @@
2276	2670	{
2277	2671	ClearSelection(true);
2278	2672	} else
2279		- if (source == grabItem)
	2673	+ if (source == grabItem \|\| source == groupButton)
2280	2674	{
2281		- group(new cGroup(), true);
	2675	+ group(new cGroup(), false); // true);
2282	2676	} else
2283	2677	if (source == hideItem)
2284	2678	{
..	..	@@ -2296,11 +2690,11 @@
2296	2690	{
2297	2691	makeSomething(new Camera());
2298	2692	} else
2299		- if (source == compositeItem)
	2693	+ if (source == compositeItem \|\| source == compositeButton)
2300	2694	{
2301	2695	group(new Composite());
2302	2696	} else
2303		- if (source == randomItem)
	2697	+ if (source == switchItem \|\| source == switchButton)
2304	2698	{
2305	2699	RandomNode random = new RandomNode();
2306	2700	group(random);
..	..	@@ -2402,7 +2796,7 @@
2402	2796	{
2403	2797	group(new cLinker());
2404	2798	} else
2405		- if (source == textureItem)
	2799	+ if (source == textureItem \|\| source == textureButton)
2406	2800	{
2407	2801	group(new TextureNode());
2408	2802	} else
..	..	@@ -2422,17 +2816,30 @@
2422	2816	{
2423	2817	CastShadow(2);
2424	2818	} else
2425		- if (source == ungroupItem)
	2819	+ if (source == ungroupItem \|\| source == ungroupButton)
2426	2820	{
2427		- //ungroup();
	2821	+ boolean hasRoot = false;
	2822	+
2428	2823	for (int i=0; i<group.selection.size(); i++)
2429	2824	{
2430		- Ungroup(group.selection.get(i));
	2825	+ if (group.selection.get(i) == group)
	2826	+ {
	2827	+ hasRoot = true;
	2828	+ break;
	2829	+ }
2431	2830	}
2432	2831
2433		- ClearSelection(false);
2434		-
2435		- refreshContents();
	2832	+ if (!hasRoot)
	2833	+ {
	2834	+ for (int i=0; i<group.selection.size(); i++)
	2835	+ {
	2836	+ Ungroup(group.selection.get(i));
	2837	+ }
	2838	+
	2839	+ ClearSelection(false);
	2840	+
	2841	+ refreshContents();
	2842	+ }
2436	2843	} else
2437	2844	if (source == genUVItem)
2438	2845	{
..	..	@@ -2444,7 +2851,7 @@
2444	2851	} else
2445	2852	if (source == genNormalsMESHItem)
2446	2853	{
2447		- GenNormals(true); // TODO
	2854	+ GenNormalsMESH();
2448	2855	} else
2449	2856	if (source == genNormalsORGANItem)
2450	2857	{
..	..	@@ -2509,6 +2916,22 @@
2509	2916	if (source == unmarkleavesItem)
2510	2917	{
2511	2918	MarkLeaves(false);
	2919	+ } else
	2920	+ if (source == rewindleavesItem)
	2921	+ {
	2922	+ RewindLeaves(true);
	2923	+ } else
	2924	+ if (source == unrewindleavesItem)
	2925	+ {
	2926	+ RewindLeaves(false);
	2927	+ } else
	2928	+ if (source == randomleavesItem)
	2929	+ {
	2930	+ RandomLeaves(true);
	2931	+ } else
	2932	+ if (source == unrandomleavesItem)
	2933	+ {
	2934	+ RandomLeaves(false);
2512	2935	} else
2513	2936	if (source == flipVItem)
2514	2937	{
..	..	@@ -2594,9 +3017,13 @@
2594	3017	{
2595	3018	SmoothMesh();
2596	3019	} else
2597		- if (source == transformgeometryItem)
	3020	+ if (source == transformGeometryItem)
2598	3021	{
2599	3022	TransformGeometry();
	3023	+ } else
	3024	+ if (source == transformChildrenItem)
	3025	+ {
	3026	+ TransformChildren();
2600	3027	} else
2601	3028	if (source == resetTransformItem)
2602	3029	{
..	..	@@ -2604,7 +3031,11 @@
2604	3031	} else
2605	3032	if (source == resetCentroidItem)
2606	3033	{
2607		- ResetCentroid();
	3034	+ ResetCentroid(true);
	3035	+ } else
	3036	+ if (source == resetCentroidXZItem)
	3037	+ {
	3038	+ ResetCentroid(false);
2608	3039	} else
2609	3040	if (source == resetParentItem)
2610	3041	{
..	..	@@ -2736,6 +3167,10 @@
2736	3167	if (source == twoButton)
2737	3168	{
2738	3169	radio.layout = twoButton;
	3170	+
	3171	+ if (CameraPane.FULLSCREEN)
	3172	+ fullscreenLayout = radio.layout;
	3173	+
2739	3174	// bug
2740	3175	//gridPanel.setDividerLocation(1.0);
2741	3176	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2768,10 +3203,31 @@
2768	3203	bigThree.ClearUI();
2769	3204	bigThree.add(centralPanel);
2770	3205	bigThree.FlushUI();
	3206	+
	3207	+ cameraView.requestFocusInWindow();
	3208	+
	3209	+// refreshContents(true);
	3210	+//
	3211	+// try
	3212	+// {
	3213	+// java.awt.Robot bot = new java.awt.Robot();
	3214	+// int mask = InputEvent.BUTTON1_MASK;
	3215	+// bot.mouseMove(100, 100);
	3216	+// bot.mousePress(mask);
	3217	+// bot.mouseRelease(mask);
	3218	+// }
	3219	+// catch (Exception e)
	3220	+// {
	3221	+//
	3222	+// }
	3223	+
2771	3224	} else
2772	3225	if (source == threeButton)
2773	3226	{
2774	3227	radio.layout = threeButton;
	3228	+
	3229	+ if (CameraPane.FULLSCREEN)
	3230	+ fullscreenLayout = radio.layout;
2775	3231
2776	3232	// bigThree.remove(scenePanel);
2777	3233	// bigThree.remove(centralPanel);
..	..	@@ -2804,10 +3260,15 @@
2804	3260	bigThree.add(centralPanel);
2805	3261	bigThree.add(XYZPanel);
2806	3262	bigThree.FlushUI();
	3263	+
	3264	+ cameraView.requestFocusInWindow();
2807	3265	} else
2808	3266	if (source == fourButton)
2809	3267	{
2810	3268	radio.layout = fourButton;
	3269	+
	3270	+ if (CameraPane.FULLSCREEN)
	3271	+ fullscreenLayout = radio.layout;
2811	3272
2812	3273	// bigThree.remove(scenePanel);
2813	3274	// bigThree.remove(centralPanel);
..	..	@@ -2839,10 +3300,15 @@
2839	3300	bigThree.ClearUI();
2840	3301	bigThree.add(scenePanel);
2841	3302	bigThree.FlushUI();
	3303	+
	3304	+ cameraView.requestFocusInWindow();
2842	3305	} else
2843	3306	if (source == sixButton)
2844	3307	{
2845	3308	radio.layout = sixButton;
	3309	+
	3310	+ if (CameraPane.FULLSCREEN)
	3311	+ fullscreenLayout = radio.layout;
2846	3312
2847	3313	// bigThree.remove(scenePanel);
2848	3314	// bigThree.remove(centralPanel);
..	..	@@ -2875,10 +3341,15 @@
2875	3341	bigThree.add(scenePanel);
2876	3342	bigThree.add(centralPanel);
2877	3343	bigThree.FlushUI();
	3344	+
	3345	+ cameraView.requestFocusInWindow();
2878	3346	} else
2879	3347	if (source == sevenButton)
2880	3348	{
2881	3349	radio.layout = sevenButton;
	3350	+
	3351	+ if (CameraPane.FULLSCREEN)
	3352	+ fullscreenLayout = radio.layout;
2882	3353
2883	3354	// bigThree.remove(scenePanel);
2884	3355	// bigThree.remove(centralPanel);
..	..	@@ -2912,6 +3383,8 @@
2912	3383	bigThree.add(centralPanel);
2913	3384	bigThree.add(XYZPanel);
2914	3385	bigThree.FlushUI();
	3386	+
	3387	+ cameraView.requestFocusInWindow();
2915	3388	} else
2916	3389	if (source == rootButton)
2917	3390	{
..	..	@@ -2923,6 +3396,7 @@
2923	3396	EditObject(obj);
2924	3397	}
2925	3398
	3399	+ cameraView.requestFocusInWindow();
2926	3400	refreshContents(true);
2927	3401	} else
2928	3402	if (source == closeButton)
..	..	@@ -2932,22 +3406,37 @@
2932	3406	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2933	3407	{
2934	3408	ab = (cRadio)e.nextElement();
2935		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3409	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2936	3410	{
	3411	+ // Patch to avoid bug with transparency.
	3412	+ if (!ab.hadMaterial)
	3413	+ {
	3414	+ ab.object.material = null;
	3415	+ }
	3416	+
2937	3417	buttonGroup.remove(ab);
2938	3418	radioPanel.remove(ab);
2939	3419
2940		- ab.GetObject().editWindow = null;
	3420	+ //ab.GetObject().editWindow = null;
	3421	+ ab.GetObject().manipWindow = null;
2941	3422	// ab.GetObject().objectUI = null; // ?????????
2942	3423
2943	3424	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2944	3425	break;
2945	3426	}
2946	3427	}
	3428	+
	3429	+ cameraView.requestFocusInWindow();
2947	3430	refreshContents(true);
2948	3431	} else
2949	3432	if (source == editItem \|\| source == editButton)
2950	3433	{
	3434	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3435	+ {
	3436	+ Object3D child = (Object3D)e.nextElement();
	3437	+ child.pinned = true;
	3438	+ }
	3439	+
2951	3440	EditSelection(false);
2952	3441	} else
2953	3442	if (source == uneditButton)
..	..	@@ -2957,10 +3446,11 @@
2957	3446	Object3D child = (Object3D)e.nextElement();
2958	3447	if(child.editWindow != null)
2959	3448	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3449	+ child.pinned = false;
2960	3450	child.CloseUI();
2961	3451	listUI.remove(child);
2962	3452
2963		- child.editWindow = null; // ???????????
	3453	+ //child.editWindow = null; // ???????????
2964	3454	}
2965	3455	objEditor.ctrlPanel.FlushUI();
2966	3456	//objEditor.jTree.clearSelection();
..	..	@@ -2973,6 +3463,7 @@
2973	3463	//copy.ClearUI();
2974	3464	for (Object3D obj : listUI)
2975	3465	{
	3466	+ obj.pinned = false;
2976	3467	obj.CloseUI();
2977	3468	}
2978	3469	listUI.clear();
..	..	@@ -2982,7 +3473,7 @@
2982	3473	{
2983	3474	assert(copy == group);
2984	3475
2985		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3476	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2986	3477
2987	3478	for (Object3D obj : listUI)
2988	3479	{
..	..	@@ -3031,6 +3522,9 @@
3031	3522	}
3032	3523
3033	3524	copy = group;
	3525	+
	3526	+ SetUndoStates();
	3527	+
3034	3528	//Globals.theRenderer.object = group;
3035	3529	if(!useclient)
3036	3530	{
..	..	@@ -3046,20 +3540,46 @@
3046	3540	frontView.object = group;
3047	3541	sideView.object = group;
3048	3542	}
3049		- group.editWindow = this;
	3543	+
	3544	+// fix "+" issue
	3545	+ //group.editWindow = this;
	3546	+ group.manipWindow = this;
	3547	+
3050	3548	/*
3051	3549	currentLayout = radio.layout;
3052	3550	if (currentLayout == null)
3053	3551	currentLayout = sevenButton;
3054	3552	*/
3055	3553	radio.layout.doClick();
	3554	+
	3555	+ ClearUnpinned();
	3556	+ Grafreed.Assert(group != null);
	3557	+ Grafreed.Assert(group.selection != null);
	3558	+ SetPinStates(group.selection.size() > 0);
	3559	+ if (group.selection.size() == 1)
	3560	+ EditSelection(false);
3056	3561	keepparent = group.parent;
3057	3562	// PARENT = NULL or not???
3058	3563	//group.parent = null; // ROOT
3059	3564	//group.attributes = -1;
3060	3565	ResetModel();
	3566	+
	3567	+ cameraView.requestFocusInWindow();
3061	3568	refreshContents(true);
3062		- }
	3569	+ } else if (event.getSource() == editCameraItem)
	3570	+ {
	3571	+ cameraView.ProtectCamera();
	3572	+ cameraView.repaint();
	3573	+ return;
	3574	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3575	+ {
	3576	+ cameraView.RevertCamera();
	3577	+ cameraView.repaint();
	3578	+ return;
	3579	+ // } else if (event.getSource() == textureButton)
	3580	+ // {
	3581	+ // return; // true;
	3582	+ }
3063	3583	else
3064	3584	{
3065	3585	//return super.action(event, arg);
..	..	@@ -3068,7 +3588,6 @@
3068	3588	}
3069	3589
3070	3590	boolean useclient = false;
3071		- cRadio radio;
3072	3591
3073	3592	void ToggleRoot()
3074	3593	{
..	..	@@ -3120,6 +3639,28 @@
3120	3639	refreshContents();
3121	3640	}
3122	3641
	3642	+ void TransformChildren()
	3643	+ {
	3644	+ Object3D obj;
	3645	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3646	+ {
	3647	+ obj = (Object3D)e.nextElement();
	3648	+ obj.KeepTextureMatrices();
	3649	+ obj.TransformChildren();
	3650	+ obj.RestoreTextureMatrices();
	3651	+
	3652	+// if (obj.parent == null)
	3653	+// {
	3654	+// System.out.println("NULL PARENT!");
	3655	+// new Exception().printStackTrace();
	3656	+// }
	3657	+// else
	3658	+// TouchTransform(obj);
	3659	+// //obj.parent.Touch();
	3660	+ }
	3661	+
	3662	+ refreshContents();
	3663	+ }
3123	3664
3124	3665	void ResetTransform()
3125	3666	{
..	..	@@ -3232,7 +3773,7 @@
3232	3773	refreshContents();
3233	3774	}
3234	3775
3235		- void ResetCentroid()
	3776	+ void ResetCentroid(boolean full)
3236	3777	{
3237	3778	Object3D obj;
3238	3779	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3247,12 +3788,16 @@
3247	3788	LA.matIdentity(Object3D.mat);
3248	3789	obj.getBounds(minima, maxima, false);
3249	3790	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3250		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3791	+ if (full)
	3792	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3251	3793	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3252	3794	obj.TransformMesh(Object3D.mat);
	3795	+
3253	3796	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3254		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3797	+ if (full)
	3798	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3255	3799	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3800	+
3256	3801	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3257	3802	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3258	3803	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3281,7 +3826,8 @@
3281	3826
3282	3827	int size = obj.MemorySize();
3283	3828
3284		- System.err.println((size/1024) + " KB is the size of " + obj);
	3829	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3830	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3285	3831	}
3286	3832	}
3287	3833	catch (Exception e)
..	..	@@ -3318,9 +3864,9 @@
3318	3864	obj = (Object3D)e.nextElement();
3319	3865
3320	3866	System.out.println("Object is: " + obj);
3321		- GrafreeD.AnalyzeObject(obj);
	3867	+ Grafreed.AnalyzeObject(obj);
3322	3868	System.out.println("Boundary rep: " + obj.bRep);
3323		- GrafreeD.AnalyzeObject(obj.bRep);
	3869	+ Grafreed.AnalyzeObject(obj.bRep);
3324	3870
3325	3871	// System.err.println((size/1024) + " KB is the size of " + obj);
3326	3872	}
..	..	@@ -3362,6 +3908,13 @@
3362	3908	void GenNormals(boolean crease)
3363	3909	{
3364	3910	group.GenNormalsS(crease);
	3911	+
	3912	+ refreshContents();
	3913	+ }
	3914	+
	3915	+ void GenNormalsMESH()
	3916	+ {
	3917	+ group.GenNormalsMeshS();
3365	3918
3366	3919	refreshContents();
3367	3920	}
..	..	@@ -3534,8 +4087,8 @@
3534	4087
3535	4088	void ParseVertices()
3536	4089	{
3537		- boolean epsequal = GrafreeD.epsequal;
3538		- GrafreeD.epsequal = true;
	4090	+ boolean epsequal = Grafreed.epsequal;
	4091	+ Grafreed.epsequal = true;
3539	4092
3540	4093	for (int i=0; i<group.selection.size(); i++)
3541	4094	{
..	..	@@ -3560,7 +4113,7 @@
3560	4113	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3561	4114	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3562	4115
3563		- g.add(GrafreeD.clipboard);
	4116	+ g.add(Grafreed.clipboard);
3564	4117
3565	4118	buffer.add(g);
3566	4119	}
..	..	@@ -3575,7 +4128,7 @@
3575	4128	makeSomething(buffer, i==group.selection.size()-1);
3576	4129	}
3577	4130
3578		- GrafreeD.epsequal = epsequal;
	4131	+ Grafreed.epsequal = epsequal;
3579	4132
3580	4133	refreshContents();
3581	4134	}
..	..	@@ -3593,7 +4146,16 @@
3593	4146	String pigment = Object3D.GetPigment(tex);
3594	4147	//String bump = Object3D.GetBump(tex);
3595	4148
3596		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4149	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4150	+
	4151	+ try
	4152	+ {
	4153	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4154	+ }
	4155	+ catch (Exception e)
	4156	+ {
	4157	+ System.err.println("FAIL: " + node);
	4158	+ }
3597	4159
3598	4160	double s = v.s;
3599	4161
..	..	@@ -3725,7 +4287,7 @@
3725	4287	return;
3726	4288
3727	4289	Object3D poses = group.selection.get(0);
3728		- Object3D ref = GrafreeD.clipboard.get(0);
	4290	+ Object3D ref = Grafreed.clipboard.get(0);
3729	4291
3730	4292	Object3D newgroup = new Object3D("Po:" + poses.name);
3731	4293
..	..	@@ -3919,9 +4481,9 @@
3919	4481
3920	4482	void ClipMesh()
3921	4483	{
3922		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4484	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3923	4485	{
3924		- Object3D content = GrafreeD.clipboard.get(0);
	4486	+ Object3D content = Grafreed.clipboard.get(0);
3925	4487
3926	4488	if (content instanceof cGroup && ((cGroup)content).transientlink )
3927	4489	content = ((cGroup)content).get(0);
..	..	@@ -3930,7 +4492,7 @@
3930	4492	// {
3931	4493	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3932	4494	// }
3933		- group.selection.ClipMesh(GrafreeD.clipboard);
	4495	+ group.selection.ClipMesh(Grafreed.clipboard);
3934	4496	}
3935	4497	// group.selection.ClipMesh(GrafreeD.clipboard);
3936	4498	System.out.println("DONE.");
..	..	@@ -3977,6 +4539,18 @@
3977	4539	void MarkLeaves(boolean hide)
3978	4540	{
3979	4541	group.selection.MarkLeaves(hide);
	4542	+ refreshContents();
	4543	+ }
	4544	+
	4545	+ void RewindLeaves(boolean hide)
	4546	+ {
	4547	+ group.selection.RewindLeaves(hide);
	4548	+ refreshContents();
	4549	+ }
	4550	+
	4551	+ void RandomLeaves(boolean hide)
	4552	+ {
	4553	+ group.selection.RandomLeaves(hide);
3980	4554	refreshContents();
3981	4555	}
3982	4556
..	..	@@ -4051,10 +4625,6 @@
4051	4625	// }
4052	4626	// }
4053	4627
4054		- static boolean allparams = true;
4055		-
4056		- static Vector<Object3D> listUI = new Vector<Object3D>();
4057		-
4058	4628	void EditSelection(boolean newWindow)
4059	4629	{
4060	4630	// aConstraints.gridy = 0;
..	..	@@ -4062,10 +4632,10 @@
4062	4632	{
4063	4633	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4064	4634	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4065		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4635	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4066	4636
4067	4637	Object3D elem = (Object3D)group.selection.elementAt(i);
4068		- if(elem != group)
	4638	+ if(elem != group \|\| !newWindow)
4069	4639	{
4070	4640	// if (!(elem instanceof Composite))
4071	4641	// newWindow = false;
..	..	@@ -4147,7 +4717,8 @@
4147	4717	//new Exception().printStackTrace();
4148	4718
4149	4719	freezemodel = true;
4150		-
	4720	+ ClearUnpinned();
	4721	+
4151	4722	/**/
4152	4723	//switch (event.id)
4153	4724	{
..	..	@@ -4155,7 +4726,6 @@
4155	4726	//case 702: // Event.LIST_DESELECT
4156	4727	group.deselectAll();
4157	4728	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4158		- objEditor.ClearInfo(); // .GetMaterial());
4159	4729	if (tps != null)
4160	4730	{
4161	4731	for (int i=0; i < tps.length; i++)
..	..	@@ -4164,10 +4734,8 @@
4164	4734
4165	4735	//if (child.parent != null)
4166	4736	//child.parent.addSelectee(child);
	4737	+ objEditor.SetMaterial(child);
4167	4738	group.addSelectee(child);
4168		- objEditor.SetMaterial(child); // .GetMaterial());
4169		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4170		- System.err.println("info : " + child.GetPath());
4171	4739	}
4172	4740	}
4173	4741	// else
..	..	@@ -4177,20 +4745,28 @@
4177	4745	// System.err.println("info : " + group.GetPath());
4178	4746	// }
4179	4747
4180		- objEditor.SetText(); // jan 2014
4181		-
4182		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4748	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4183	4749	CameraPane.flash = true;
4184	4750
4185		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4751	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4186	4752	// a camera
4187	4753	{
4188		- CameraPane.camerachangeframe = 0; // don't refuse it
4189		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4754	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	4755	+ {
	4756	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4757	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4758	+ }
4190	4759	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4191	4760	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4192	4761	}
4193	4762
	4763	+ if (tps != null && tps.length == 1)
	4764	+ {
	4765	+ EditSelection(false);
	4766	+ }
	4767	+
	4768	+ SetPinStates(tps != null && tps.length > 0);
	4769	+
4194	4770	refreshContents();
4195	4771	//return true;
4196	4772	}
..	..	@@ -4199,6 +4775,35 @@
4199	4775
4200	4776	freezemodel = false;
4201	4777	}
	4778	+
	4779	+ void SetPinStates(boolean enabled)
	4780	+ {
	4781	+ editButton.setEnabled(enabled);
	4782	+ uneditButton.setEnabled(enabled);
	4783	+ unselectButton.setEnabled(enabled);
	4784	+ flashSelectionButton.setEnabled(enabled);
	4785	+ }
	4786	+
	4787	+ void refreshContents(boolean cp)
	4788	+ {
	4789	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4790	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	4791	+ {
	4792	+ objEditor.ClearInfo(); // .GetMaterial());
	4793	+
	4794	+ for (int i=0; i < group.selection.Size(); i++)
	4795	+ {
	4796	+ Object3D child = (Object3D) group.selection.get(i);
	4797	+
	4798	+ objEditor.AddInfo(child, this, true);
	4799	+ System.err.println("info : " + child.GetPath());
	4800	+ }
	4801	+
	4802	+ objEditor.SetText(); // jan 2014
	4803	+ }
	4804	+
	4805	+ super.refreshContents(cp);
	4806	+ }
4202	4807
4203	4808	void linkSomething(Object3D thing)
4204	4809	{
..	..	@@ -4270,16 +4875,19 @@
4270	4875	{
4271	4876	if (group.selection.isEmpty())
4272	4877	return;
4273		- GrafreeD.clipboardIsTempGroup = false;
	4878	+
	4879	+ Grafreed.clipboardIsTempGroup = false;
4274	4880	Composite tGroup = null;
4275	4881	if (group.selection.size() > 0) // 1)
4276	4882	{
4277	4883	tGroup = new cGroup();
4278		- GrafreeD.clipboardIsTempGroup = true;
	4884	+ Grafreed.clipboardIsTempGroup = true;
4279	4885	}
4280	4886
4281	4887	if (cut)
4282	4888	{
	4889	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	4890	+// Save();
4283	4891	//int indices[] = jList.getSelectedIndices();
4284	4892	//for (int i = indices.length - 1; i >= 0; i--)
4285	4893	//jList.remove(indices[i]);
..	..	@@ -4315,16 +4923,16 @@
4315	4923	//System.out.println("cut " + child);
4316	4924	//System.out.println("parent = " + child.parent);
4317	4925	// tmp.addChild(child);
4318		- if (GrafreeD.clipboardIsTempGroup)
	4926	+ if (Grafreed.clipboardIsTempGroup)
4319	4927	tGroup.add/Child/(tmp);
4320	4928	else
4321		- GrafreeD.clipboard = tmp;
	4929	+ Grafreed.clipboard = tmp;
4322	4930	}
4323	4931	else
4324		- if (GrafreeD.clipboardIsTempGroup)
	4932	+ if (Grafreed.clipboardIsTempGroup)
4325	4933	tGroup.add/Child/(child);
4326	4934	else
4327		- GrafreeD.clipboard = child;
	4935	+ Grafreed.clipboard = child;
4328	4936	}
4329	4937
4330	4938	//ResetModel();
..	..	@@ -4356,21 +4964,23 @@
4356	4964	//System.out.println("cut " + elem);
4357	4965	//System.out.println("parent = " + elem.parent);
4358	4966	// tmp.addChild(elem);
4359		- if (GrafreeD.clipboardIsTempGroup)
	4967	+ if (Grafreed.clipboardIsTempGroup)
4360	4968	tGroup.add/Child/(tmp);
4361	4969	else
4362		- GrafreeD.clipboard = tmp;
	4970	+ Grafreed.clipboard = tmp;
4363	4971	}
4364	4972	else
4365		- if (GrafreeD.clipboardIsTempGroup)
	4973	+ if (Grafreed.clipboardIsTempGroup)
4366	4974	tGroup.add/Child/(child);
4367	4975	else
4368		- GrafreeD.clipboard = child;
	4976	+ Grafreed.clipboard = child;
4369	4977	}
4370	4978
4371	4979	}
4372		- if (GrafreeD.clipboardIsTempGroup)
4373		- GrafreeD.clipboard = tGroup;
	4980	+
	4981	+ if (Grafreed.clipboardIsTempGroup)
	4982	+ Grafreed.clipboard = tGroup;
	4983	+
4374	4984	if (cut)
4375	4985	{
4376	4986	ResetModel();
..	..	@@ -4380,11 +4990,15 @@
4380	4990
4381	4991	void paste(boolean expand)
4382	4992	{
	4993	+ if (Globals.REPLACEONMAKE)
	4994	+ Save();
	4995	+ boolean keep = Globals.REPLACEONMAKE;
	4996	+ Globals.REPLACEONMAKE = false;
4383	4997	// if (GrafreeD.clipboard == null)
4384	4998	// return;
4385	4999	boolean first = true;
4386	5000
4387		- if (GrafreeD.clipboardIsTempGroup)
	5001	+ if (Grafreed.clipboardIsTempGroup)
4388	5002	{
4389	5003	Composite temp;
4390	5004
..	..	@@ -4395,7 +5009,7 @@
4395	5009	temp = (Composite)Applet3D.clipboard.deepCopy();
4396	5010	*/
4397	5011	Object3D elem;
4398		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5012	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4399	5013	{
4400	5014	Object3D child = (Object3D)e.nextElement();
4401	5015
..	..	@@ -4429,16 +5043,17 @@
4429	5043	//Object3D cb = Applet3D.clipboard;
4430	5044	//temp.addChild(cb);
4431	5045	//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());
	5046	+ assert(Grafreed.clipboard.parent == null);
	5047	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5048	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5049	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5050	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4437	5051	else
4438		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4439		- GrafreeD.clipboard.get(0).parent = keepparent;
	5052	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5053	+ Grafreed.clipboard.get(0).parent = keepparent;
4440	5054	}
4441	5055
	5056	+ Globals.REPLACEONMAKE = keep;
4442	5057	ResetModel();
4443	5058	refreshContents();
4444	5059	}
..	..	@@ -4485,9 +5100,9 @@
4485	5100	{
4486	5101	boolean first = true;
4487	5102
4488		- if (GrafreeD.clipboardIsTempGroup)
	5103	+ if (Grafreed.clipboardIsTempGroup)
4489	5104	{
4490		- Composite temp = (Composite)GrafreeD.clipboard;
	5105	+ Composite temp = (Composite)Grafreed.clipboard;
4491	5106	Object3D copy;
4492	5107	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4493	5108	{
..	..	@@ -4497,7 +5112,7 @@
4497	5112	}
4498	5113	} else
4499	5114	{
4500		- linkSomething(GrafreeD.clipboard); //.get(0));
	5115	+ linkSomething(Grafreed.clipboard); //.get(0));
4501	5116	}
4502	5117	}
4503	5118	}
..	..	@@ -4574,6 +5189,10 @@
4574	5189
4575	5190	void group(Object3D csg, boolean grab)
4576	5191	{
	5192	+ if (Globals.REPLACEONMAKE)
	5193	+ Save();
	5194	+ boolean keep = Globals.REPLACEONMAKE;
	5195	+ Globals.REPLACEONMAKE = false;
4577	5196	if (//false) // why??
4578	5197	!group.selection.isEmpty())
4579	5198	{
..	..	@@ -4687,10 +5306,15 @@
4687	5306	//node.add(csg);
4688	5307	//makeSomething(node);
4689	5308	makeSomething(csg);
	5309	+ Globals.REPLACEONMAKE = keep;
4690	5310	}
4691	5311
4692	5312	void Ungroup(Object3D g)
4693	5313	{
	5314	+ if (Globals.REPLACEONMAKE)
	5315	+ Save();
	5316	+ boolean keep = Globals.REPLACEONMAKE;
	5317	+ Globals.REPLACEONMAKE = false;
4694	5318	if (g instanceof HiddenObject)
4695	5319	{
4696	5320	HiddenObject h = (HiddenObject) g;
..	..	@@ -4707,6 +5331,7 @@
4707	5331	objEditor.makeSomething(g.get(i), false);
4708	5332	}
4709	5333	}
	5334	+ Globals.REPLACEONMAKE = keep;
4710	5335	}
4711	5336
4712	5337	void ungroup()
..	..	@@ -4902,21 +5527,6 @@
4902	5527	}
4903	5528	*/
4904	5529
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	5530	/*
4921	5531	public void Callback(Object obj)
4922	5532	{
..	..	@@ -4940,26 +5550,9 @@
4940	5550	}
4941	5551	*/
4942	5552
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	5553	String GetFile(String dialogName)
4961	5554	{
4962		- if (GrafreeD.standAlone)
	5555	+ if (Grafreed.standAlone)
4963	5556	{
4964	5557	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4965	5558	browser.show();
..	..	@@ -5027,7 +5620,28 @@
5027	5620	cButton clearpanelButton;
5028	5621	cButton unselectButton;
5029	5622
	5623	+ cButton restoreCameraButton;
	5624	+
	5625	+ cButton saveButton;
5030	5626	cButton oneStepButton;
	5627	+
	5628	+ cButton groupButton;
	5629	+ cButton ungroupButton;
	5630	+ cButton compositeButton;
	5631	+ cButton switchButton;
	5632	+ cButton loopButton;
	5633	+ cButton textureButton;
	5634	+
	5635	+ cButton gridButton;
	5636	+ cButton boxButton;
	5637	+ cButton sphereButton;
	5638	+ cButton coneButton;
	5639	+ cButton torusButton;
	5640	+ cButton superButton;
	5641	+ cButton kleinButton;
	5642	+ cButton particlesButton;
	5643	+ cButton overlayButton;
	5644	+ cButton lightButton;
5031	5645
5032	5646	cButton screenfitButton;
5033	5647	cButton screenfitpointButton;
..	..	@@ -5040,14 +5654,6 @@
5040	5654
5041	5655	cButton setsupportButton;
5042	5656
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	5657	//
5052	5658	//Composite
5053	5659	Object3D // to do !!
..	..	@@ -5057,9 +5663,11 @@
5057	5663	//JTree jTree;
5058	5664	private MenuItem lookAtItem;
5059	5665	private MenuItem lookFromItem;
5060		- private MenuItem switchItem;
	5666	+ private MenuItem switchViewItem;
5061	5667	private MenuItem cutItem;
5062		- private MenuItem duplicateItem;
	5668	+ private MenuItem undoItem;
	5669	+ private MenuItem redoItem;
	5670	+ private JMenuItem duplicateItem;
5063	5671	private MenuItem cloneItem;
5064	5672	private MenuItem cloneSupportItem;
5065	5673	private MenuItem overwriteGeoItem;
..	..	@@ -5072,7 +5680,7 @@
5072	5680	private MenuItem linkverticesItem;
5073	5681	private MenuItem relinkverticesItem;
5074	5682	private MenuItem setMasterItem;
5075		- private MenuItem resetMeshItem;
	5683	+ private MenuItem resetAllItem;
5076	5684	private MenuItem stepAllItem;
5077	5685	private MenuItem revertMeshItem;
5078	5686	private MenuItem poseMeshItem;
..	..	@@ -5122,6 +5730,10 @@
5122	5730	private MenuItem showleavesItem;
5123	5731	private MenuItem markleavesItem;
5124	5732	private MenuItem unmarkleavesItem;
	5733	+ private MenuItem rewindleavesItem;
	5734	+ private MenuItem unrewindleavesItem;
	5735	+ private MenuItem randomleavesItem;
	5736	+ private MenuItem unrandomleavesItem;
5125	5737
5126	5738	private MenuItem flipVItem;
5127	5739	private MenuItem unflipVItem;
..	..	@@ -5133,15 +5745,17 @@
5133	5745	private MenuItem panoTexturesItem;
5134	5746
5135	5747	private MenuItem resetCentroidItem;
5136		- private MenuItem transformgeometryItem;
	5748	+ private MenuItem resetCentroidXZItem;
5137	5749	private MenuItem resetTransformItem;
	5750	+ private MenuItem transformGeometryItem;
	5751	+ private MenuItem transformChildrenItem;
5138	5752	private MenuItem hideItem;
5139	5753	private MenuItem grabItem;
5140	5754	private MenuItem backItem;
5141	5755	private MenuItem frontItem;
5142	5756	private MenuItem cameraItem;
5143	5757	private MenuItem compositeItem;
5144		- private MenuItem randomItem;
	5758	+ private MenuItem switchItem;
5145	5759	private MenuItem physicsItem;
5146	5760	private MenuItem frameselectorItem;
5147	5761	private MenuItem scriptNodeItem;
..	..	@@ -5203,11 +5817,6 @@
5203	5817	private MenuItem doubleItem;
5204	5818	private MenuItem tripleItem;
5205	5819
5206		- private MenuItem importGFDItem;
5207		- private MenuItem importVRMLX3DItem;
5208		- private MenuItem import3DSItem;
5209		- private MenuItem importOBJItem;
5210		-
5211	5820	private MenuItem computeAOItem;
5212	5821	private MenuItem recompileItem;
5213	5822	private MenuItem editScriptItem;
..	..	@@ -5217,4 +5826,8 @@
5217	5826	private MenuItem analyzeItem;
5218	5827	private MenuItem dumpItem;
5219	5828	//boolean freezemodel = false;
	5829	+
	5830	+ Menu cameraMenu;
	5831	+ MenuItem editCameraItem;
	5832	+ MenuItem restoreCameraItem;
5220	5833	}