~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -60,6 +60,12 @@
60	60	this.copy = this.group = group;
61	61	//selectees = this.group.selectees;
62	62
	63	+ if (copy.versions == null)
	64	+ {
	65	+ copy.versions = new byte[100][];
	66	+ copy.versionindex = -1;
	67	+ }
	68	+
63	69	if(ui)
64	70	SetupUI(objEditor);
65	71	}
..	..	@@ -74,16 +80,28 @@
74	80	this.copy = this.group = copy;
75	81	//selectees = this.group.selectees;
76	82
77		- SetupMenu2(objEditor);
	83	+ SetupMenu2(this); //objEditor);
78	84	SetupUI2(objEditor);
79	85	objEditor.SetupUI(true);
80	86	SetupViews(objEditor);
81	87
82	88	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	89	+
	90	+ if (copy.versions == null)
	91	+ {
	92	+ copy.versions = new byte[100][];
	93	+ copy.versionindex = -1;
	94	+
	95	+ Save(true);
	96	+ }
83	97	}
84	98
85	99	void CloneSelection(boolean supports)
86	100	{
	101	+ if (Globals.REPLACEONMAKE)
	102	+ Save();
	103	+ boolean keep = Globals.REPLACEONMAKE;
	104	+ Globals.REPLACEONMAKE = false;
87	105	// Object3D keep = GrafreeD.clipboard;
88	106	//Object3D obj;
89	107	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,18 +112,19 @@
94	112
95	113	makeSomething(clone, i==group.selection.size()-1);
96	114	}
	115	+ Globals.REPLACEONMAKE = keep;
97	116	}
98	117
99	118	void CloneClipboard(boolean supports)
100	119	{
101		- assert(GrafreeD.clipboard.parent == null);
102		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
103		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
104		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
105		- makeSomething(CloneObject(GrafreeD.clipboard.get(0), false));
	120	+ assert(Grafreed.clipboard.parent == null);
	121	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	122	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	123	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	124	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
106	125	else
107		- makeSomething(CloneObject(GrafreeD.clipboard, false));
108		- GrafreeD.clipboard.get(0).parent = keepparent;
	126	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	127	+ Grafreed.clipboard.get(0).parent = keepparent;
109	128	}
110	129
111	130	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -119,7 +138,7 @@
119	138	// obj.support = null;
120	139	if (!supports)
121	140	obj.SaveSupports();
122		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	141	+ Object3D clone = (Object3D)Grafreed.clone(obj);
123	142	obj.parent = parent;
124	143	// obj.support = support;
125	144	// clone.support = support; // aout 2013
..	..	@@ -148,28 +167,21 @@
148	167
149	168	//JTextField nameField;
150	169
151		- void SetupMenu2(ObjEditor oe)
	170	+ void SetupMenu2(GroupEditor oe)
152	171	{
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		-
	172	+ oe.jTree = new cTree();
	173	+
168	174	Menu menu;
169	175	oe.menuBar.add(menu = new Menu("Edit"));
170	176	//editItem = menu.add(new MenuItem("Edit"));
171	177	//editItem.addActionListener(this);
172		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	178	+
	179	+// undoItem = menu.add(new MenuItem("Undo"));
	180	+// undoItem.addActionListener(this);
	181	+// redoItem = menu.add(new MenuItem("Redo"));
	182	+// redoItem.addActionListener(this);
	183	+// menu.add("-");
	184	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
173	185	duplicateItem.addActionListener(this);
174	186	cloneItem = menu.add(new MenuItem("Clone"));
175	187	cloneItem.addActionListener(this);
..	..	@@ -185,7 +197,6 @@
185	197	copyItem.addActionListener(this);
186	198	pasteItem = menu.add(new MenuItem("Paste"));
187	199	pasteItem.addActionListener(this);
188		- menu.add("-");
189	200
190	201	menu.add("-");
191	202	pasteIntoItem = menu.add(new MenuItem("Paste into"));
..	..	@@ -197,8 +208,8 @@
197	208	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
198	209	// pasteExpandItem.addActionListener(this);
199	210	menu.add("-");
200		- clearItem = menu.add(new MenuItem("Clear"));
201		- clearItem.addActionListener(this);
	211	+ deleteItem = menu.add(new MenuItem("Delete"));
	212	+ deleteItem.addActionListener(this);
202	213
203	214	if (Globals.ADVANCED)
204	215	{
..	..	@@ -206,14 +217,97 @@
206	217	clearAllItem = menu.add(new MenuItem("Clear All"));
207	218	clearAllItem.addActionListener(this);
208	219	}
	220	+
	221	+ menuBar.add(cameraMenu = new Menu("View"));
	222	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	223	+ //zBufferItem.addActionListener(this);
	224	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	225	+ //normalLensItem.addActionListener(this);
	226	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	227	+ restoreCameraItem.addActionListener(this);
	228	+
	229	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	230	+// toggleFullScreenItem.addItemListener(this);
	231	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	232	+// cameraMenu.add("-");
	233	+//
	234	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	235	+// toggleTextureItem.addItemListener(this);
	236	+// toggleTextureItem.setState(CameraPane.textureon);
	237	+//
	238	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	239	+// toggleSwitchItem.addItemListener(this);
	240	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	241	+
	242	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	243	+ toggleHandleItem.addItemListener(this);
	244	+ toggleHandleItem.setState(CameraPane.HANDLES);
	245	+
	246	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	247	+ togglePaintItem.addItemListener(this);
	248	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	249	+
	250	+ if (Globals.ADVANCED)
	251	+ {
	252	+ cameraMenu.add("-");
	253	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	254	+ toggleLiveItem.addItemListener(this);
	255	+ toggleLiveItem.setState(Globals.isLIVE());
209	256
	257	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	258	+ stepItem.addActionListener(this);
	259	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	260	+ // toggleDLItem.addItemListener(this);
	261	+ // toggleDLItem.setState(false);
	262	+
	263	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	264	+ toggleRenderItem.addItemListener(this);
	265	+ toggleRenderItem.setState(!CameraPane.frozen);
	266	+
	267	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	268	+ toggleDebugItem.addItemListener(this);
	269	+ toggleDebugItem.setState(Globals.DEBUG);
	270	+
	271	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	272	+ toggleFrustumItem.addItemListener(this);
	273	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	274	+
	275	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	276	+ toggleFootContactItem.addItemListener(this);
	277	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	278	+
	279	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	280	+ toggleTimelineItem.addItemListener(this);
	281	+ }
	282	+
	283	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	284	+// toggleRootItem.addItemListener(this);
	285	+// toggleRootItem.setState(false);
	286	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	287	+// animationItem.addItemListener(this);
	288	+// animationItem.setState(CameraPane.ANIMATION);
	289	+ cameraMenu.add("-");
	290	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	291	+ editCameraItem.addActionListener(this);
	292	+
	293	+ if (Globals.ADVANCED)
	294	+ {
	295	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	296	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	297	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	298	+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	299	+ oe.cameraMenu.add("-");
	300	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	301	+ openWindowItem.addActionListener(this);
	302	+ editLeafItem.addActionListener(this);
	303	+ lookAtItem.addActionListener(this);
	304	+ //lookFromItem.addActinoListener(this);
	305	+ //switchViewItem.addActionListener(this);
	306	+ }
	307	+
210	308	oe.menuBar.add(menu = new Menu("Setting"));
211	309	if (Globals.ADVANCED)
212	310	{
213		- resetMeshItem = menu.add(new MenuItem("Reset All"));
214		- resetMeshItem.addActionListener(this);
215		- stepAllItem = menu.add(new MenuItem("Step All"));
216		- stepAllItem.addActionListener(this);
217	311	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
218	312	revertMeshItem.addActionListener(this);
219	313	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
..	..	@@ -253,21 +347,29 @@
253	347	}
254	348
255	349	oe.menuBar.add(menu = new Menu("Group"));
256		- grabItem = menu.add(new MenuItem("Grab"));
257		- grabItem.addActionListener(this);
	350	+// grabItem = menu.add(new MenuItem("Grab"));
	351	+// grabItem.addActionListener(this);
258	352	backItem = menu.add(new MenuItem("Back"));
259	353	backItem.addActionListener(this);
260	354	frontItem = menu.add(new MenuItem("Front"));
261	355	frontItem.addActionListener(this);
262		- compositeItem = menu.add(new MenuItem("Composite"));
263		- compositeItem.addActionListener(this);
	356	+// compositeItem = menu.add(new MenuItem("Composite"));
	357	+// compositeItem.addActionListener(this);
	358	+
	359	+ if (Globals.ADVANCED)
	360	+ {
264	361	hideItem = menu.add(new MenuItem("Hidden Group"));
265	362	hideItem.addActionListener(this);
	363	+ }
266	364	ungroupItem = menu.add(new MenuItem("Ungroup"));
267	365	ungroupItem.addActionListener(this);
268		- menu.add("-");
269		- randomItem = menu.add(new MenuItem("Switch node"));
270		- randomItem.addActionListener(this);
	366	+
	367	+// menu.add("-");
	368	+//
	369	+// switchItem = menu.add(new MenuItem("Switch node"));
	370	+// switchItem.addActionListener(this);
	371	+ if (Globals.ADVANCED)
	372	+ {
271	373	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
272	374	switchGeoItem.addActionListener(this);
273	375	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -275,8 +377,6 @@
275	377	morphItem = menu.add(new MenuItem("Morph Group"));
276	378	morphItem.addActionListener(this);
277	379
278		- if (Globals.ADVANCED)
279		- {
280	380	menu.add("-");
281	381	physicsItem = menu.add(new MenuItem("Physics"));
282	382	physicsItem.addActionListener(this);
..	..	@@ -284,30 +384,29 @@
284	384	frameselectorItem.addActionListener(this);
285	385	scriptNodeItem = menu.add(new MenuItem("Script Node"));
286	386	scriptNodeItem.addActionListener(this);
287		- cameraItem = menu.add(new MenuItem("Camera"));
288		- cameraItem.addActionListener(this);
289	387	}
290	388
291	389	oe.menuBar.add(menu = new Menu("Object"));
292		- textureItem = menu.add(new MenuItem("Texture"));
293		- textureItem.addActionListener(this);
	390	+// textureItem = menu.add(new MenuItem("Texture"));
	391	+// textureItem.addActionListener(this);
294	392	billboardItem = menu.add(new MenuItem("Billboard"));
295	393	billboardItem.addActionListener(this);
296	394	csgItem = menu.add(new MenuItem("CSG"));
297	395	csgItem.addActionListener(this);
298		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	396	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
299	397	shadowXItem.addActionListener(this);
300		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	398	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
301	399	shadowYItem.addActionListener(this);
302		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	400	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
303	401	shadowZItem.addActionListener(this);
	402	+ attributeItem = menu.add(new MenuItem("Attribute"));
	403	+ attributeItem.addActionListener(this);
	404	+
304	405	if (Globals.ADVANCED)
305	406	{
306	407	menu.add("-");
307	408	linkerItem = menu.add(new MenuItem("Linker"));
308	409	linkerItem.addActionListener(this);
309		- attributeItem = menu.add(new MenuItem("Attribute"));
310		- attributeItem.addActionListener(this);
311	410	templateItem = menu.add(new MenuItem("Template"));
312	411	templateItem.addActionListener(this);
313	412	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -318,8 +417,12 @@
318	417	resetTransformItem.addActionListener(this);
319	418	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
320	419	resetCentroidItem.addActionListener(this);
321		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
322		- transformgeometryItem.addActionListener(this);
	420	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	421	+ resetCentroidXZItem.addActionListener(this);
	422	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	423	+ transformGeometryItem.addActionListener(this);
	424	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	425	+ transformChildrenItem.addActionListener(this);
323	426
324	427	oe.menuBar.add(menu = new Menu("Geometry"));
325	428	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -332,7 +435,7 @@
332	435	genNormalsMESHItem.addActionListener(this);
333	436	if (Globals.ADVANCED)
334	437	{
335		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	438	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
336	439	genNormalsMINEItem.addActionListener(this);
337	440	}
338	441	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -368,6 +471,10 @@
368	471	oe.menuBar.add(menu = new Menu("Attributes"));
369	472	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
370	473	clearMaterialsItem.addActionListener(this);
	474	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	475	+ resetAllItem.addActionListener(this);
	476	+ stepAllItem = menu.add(new MenuItem("Step All"));
	477	+ stepAllItem.addActionListener(this);
371	478	menu.add("-");
372	479	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
373	480	liveleavesItem.addActionListener(this);
..	..	@@ -388,6 +495,14 @@
388	495	markleavesItem.addActionListener(this);
389	496	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
390	497	unmarkleavesItem.addActionListener(this);
	498	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	499	+ rewindleavesItem.addActionListener(this);
	500	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	501	+ unrewindleavesItem.addActionListener(this);
	502	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	503	+ randomleavesItem.addActionListener(this);
	504	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	505	+ unrandomleavesItem.addActionListener(this);
391	506	menu.add("-");
392	507	flipVItem = menu.add(new MenuItem("Flip V"));
393	508	flipVItem.addActionListener(this);
..	..	@@ -422,41 +537,42 @@
422	537	sortbysizeItem.addActionListener(this);
423	538	sortbynameItem = menu.add(new MenuItem("Sort by name"));
424	539	sortbynameItem.addActionListener(this);
	540	+ menu.add("-");
	541	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	542	+ shareGeometriesItem.addActionListener(this);
	543	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	544	+ mergeGeometriesItem.addActionListener(this);
425	545	if (Globals.ADVANCED)
426	546	{
427		- menu.add("-");
	547	+ // Pretty much the same as duplicate and clone.
428	548	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
429	549	extractGeometriesItem.addActionListener(this);
430	550	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
431	551	cloneGeometriesItem.addActionListener(this);
432		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
433		- shareGeometriesItem.addActionListener(this);
434		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
435		- mergeGeometriesItem.addActionListener(this);
436	552	}
437	553
438	554	oe.menuBar.add(menu = new Menu("Insert"));
439	555	buildCreateMenu(menu);
440	556
441		- oe.menuBar.add(menu = new Menu("Include"));
442		- importOBJItem = menu.add(new MenuItem("OBJ file..."));
443		- importOBJItem.addActionListener(this);
444		- menu.add("-");
445		- import3DSItem = menu.add(new MenuItem("3DS file..."));
446		- import3DSItem.addActionListener(this);
447		- menu.add("-");
448		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
449		- importVRMLX3DItem.addActionListener(this);
450		- menu.add("-");
451		- importGFDItem = menu.add(new MenuItem("GrafreeD file..."));
452		- importGFDItem.addActionListener(this);
453		-
454	557	oe.menuBar.add(menu = new Menu("Tools"));
455	558	buildToolsMenu(menu);
456	559	}
457	560
	561	+
458	562	void SetupUI2(ObjEditor oe)
459	563	{
	564	+ // June 2019
	565	+ if (oe == null)
	566	+ {
	567	+ //super.SetupUI2(this);
	568	+ //return;
	569	+ }
	570	+
	571	+ if (copy != group)
	572	+ {
	573	+ //super.SetupUI2(this);
	574	+ }
	575	+
460	576	//new Exception().printStackTrace();
461	577
462	578	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -485,97 +601,230 @@
485	601	oe.radioPanel.add(dummyButton);
486	602	oe.buttonGroup.add(dummyButton);
487	603	*/
	604	+ cGridBag copyOptionsPanel = new cGridBag();
	605	+
	606	+ copyOptionsPanel.preferredHeight = 1;
	607	+
488	608	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
489	609
490		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
491		- liveCB.setToolTipText("Enabled animation");
	610	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	611	+ //minButton.setToolTipText("Minimize window");
	612	+ //minButton.addActionListener(this);
	613	+
	614	+ if (Globals.ADVANCED)
	615	+ {
	616	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	617	+ maxButton.setToolTipText("Maximize window");
	618	+ maxButton.addActionListener(this);
	619	+ }
	620	+
	621	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	622	+ fullButton.setToolTipText("Full-screen window");
	623	+ fullButton.addActionListener(this);
	624	+
	625	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	626	+ screenfitButton.setToolTipText("Screen fit");
	627	+ screenfitButton.addActionListener(this);
	628	+
	629	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	630	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	631	+ restoreCameraButton.addActionListener(this);
	632	+
	633	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	634	+ saveButton.setToolTipText("New version");
	635	+ saveButton.addActionListener(this);
	636	+
	637	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	638	+ undoButton.setToolTipText("Previous version");
	639	+ undoButton.addActionListener(this);
	640	+ undoButton.setEnabled(false);
	641	+
	642	+ cGridBag updown = new cGridBag().setVertical(true);
	643	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	644	+ restoreButton.setToolTipText("Restore current");
	645	+ restoreButton.addActionListener(this);
	646	+ restoreButton.setEnabled(false);
	647	+
	648	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	649	+ replaceButton.setToolTipText("Replace current");
	650	+ replaceButton.addActionListener(this);
	651	+ replaceButton.setEnabled(false);
	652	+
	653	+ copyOptionsPanel.add(updown);
	654	+
	655	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	656	+ redoButton.setToolTipText("Next version");
	657	+ redoButton.addActionListener(this);
	658	+ redoButton.setEnabled(false);
	659	+
	660	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	661	+ liveCB.setToolTipText("Enable animation");
492	662	liveCB.addItemListener(this);
493	663
494		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	664	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
495	665	oneStepButton.setToolTipText("Animate one step forward");
496	666	oneStepButton.addActionListener(this);
497	667
498		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	668	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
499	669	fastCB.setToolTipText("Fast mode");
500	670	fastCB.addItemListener(this);
501	671
502		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
503		- trackCB.setToolTipText("Enable tracking");
504		- trackCB.addItemListener(this);
505		-
506		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
507		- screenfitButton.setToolTipText("Screen fit");
508		- screenfitButton.addActionListener(this);
	672	+ //oe.toolboxPanel.Return();
	673	+
	674	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	675	+// trackCB.setToolTipText("Enable tracking");
	676	+// trackCB.addItemListener(this);
509	677
510	678	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
511	679	// screenfitpointButton.addActionListener(this);
512	680
513	681	if (Globals.ADVANCED)
514	682	{
515		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	683	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
516	684	snapobjectButton.addActionListener(this);
517	685	snapobjectButton.setToolTipText("Snap Object");
518	686	}
519	687
520		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
521		- flashSelectionButton.setToolTipText("Show selection");
522		- flashSelectionButton.addActionListener(this);
	688	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
523	689
524		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
525		-
526		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
527		- twoButton.setToolTipText("Show center view only");
528		- twoButton.addActionListener(this);
529		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	690	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
530	691	fourButton.addActionListener(this);
531	692	fourButton.setToolTipText("Show left panel only");
532		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
533		- sixButton.setToolTipText("2-column layout left");
	693	+
	694	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	695	+ twoButton.setToolTipText("Show right view only");
	696	+ twoButton.addActionListener(this);
	697	+ this.fullscreenLayout = twoButton;
	698	+
	699	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	700	+ sixButton.setToolTipText("Show left and right");
534	701	sixButton.addActionListener(this);
535		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
536		- threeButton.setToolTipText("2-column layout right");
537		- threeButton.addActionListener(this);
538		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
539		- sevenButton.setToolTipText("3-column layout");
540		- sevenButton.addActionListener(this);
	702	+// oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	703	+// threeButton.setToolTipText("2-column layout right");
	704	+// threeButton.addActionListener(this);
	705	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	706	+// sevenButton.setToolTipText("3-column layout");
	707	+// sevenButton.addActionListener(this);
541	708	//
542	709
543		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
544		- rootButton.setToolTipText("Edit selection in new tab");
	710	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	711	+ rootButton.setToolTipText("Open selection in new tab");
545	712	rootButton.addActionListener(this);
546	713
547		- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	714	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
548	715	closeButton.setToolTipText("Close tab");
549	716	closeButton.addActionListener(this);
550	717	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
551	718	//clearButton.addActionListener(this);
552		-
553		- cGridBag commandsPanel = new cGridBag();
	719	+
	720	+ // INSERT
	721	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	722	+ gridButton.setToolTipText("Create grid");
	723	+ gridButton.addActionListener(this);
	724	+
	725	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	726	+ boxButton.setToolTipText("Create box");
	727	+ boxButton.addActionListener(this);
	728	+
	729	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	730	+ sphereButton.setToolTipText("Create sphere");
	731	+ sphereButton.addActionListener(this);
	732	+
	733	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	734	+ coneButton.setToolTipText("Create cone");
	735	+ coneButton.addActionListener(this);
	736	+
	737	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	738	+ torusButton.setToolTipText("Create torus");
	739	+ torusButton.addActionListener(this);
	740	+
	741	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	742	+ superButton.setToolTipText("Create superellipsoid");
	743	+ superButton.addActionListener(this);
	744	+
	745	+ if (Globals.ADVANCED)
	746	+ {
	747	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	748	+ kleinButton.setToolTipText("Create Klein bottle");
	749	+ kleinButton.addActionListener(this);
	750	+ }
554	751
555		- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
556		- editButton.setToolTipText("Edit selection");
	752	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	753	+ particlesButton.setToolTipText("Create particle system");
	754	+ particlesButton.addActionListener(this);
	755	+
	756	+ oe.toolboxPanel.Return();
	757	+
	758	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	759	+ groupButton.setToolTipText("Create group");
	760	+ groupButton.addActionListener(this);
	761	+
	762	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	763	+ compositeButton.setToolTipText("Create composite");
	764	+ compositeButton.addActionListener(this);
	765	+
	766	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	767	+ switchButton.setToolTipText("Create item switcher");
	768	+ switchButton.addActionListener(this);
	769	+
	770	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	771	+ loopButton.setToolTipText("Create loop");
	772	+ loopButton.addActionListener(this);
	773	+
	774	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	775	+ textureButton.setToolTipText("Create texture");
	776	+ textureButton.addActionListener(this);
	777	+
	778	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	779	+ overlayButton.setToolTipText("Create overlay");
	780	+ overlayButton.addActionListener(this);
	781	+
	782	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	783	+ lightButton.setToolTipText("Create light");
	784	+ lightButton.addActionListener(this);
	785	+
	786	+ for (int i=6; --i>=0;)
	787	+ {
	788	+ oe.toolboxPanel.Return();
	789	+ oe.toolboxPanel.add(new cGridBag());
	790	+ oe.toolboxPanel.add(new cGridBag());
	791	+ oe.toolboxPanel.add(new cGridBag());
	792	+ oe.toolboxPanel.add(new cGridBag());
	793	+ oe.toolboxPanel.add(new cGridBag());
	794	+ oe.toolboxPanel.add(new cGridBag());
	795	+ oe.toolboxPanel.add(new cGridBag());
	796	+ }
	797	+
	798	+ // EDIT panel
	799	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	800	+ editButton.setToolTipText("Pin selection controls");
557	801	editButton.addActionListener(this);
558	802
559		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
560		- uneditButton.setToolTipText("Unedit selection");
	803	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	804	+ uneditButton.setToolTipText("Remove selection controls");
561	805	uneditButton.addActionListener(this);
562	806
563		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
564		- allParamsButton.setToolTipText("Edit all params");
	807	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	808	+ allParamsButton.setToolTipText("Show all controle");
565	809	allParamsButton.addActionListener(this);
566	810
567		- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	811	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
568	812	clearPanelButton.setToolTipText("Clear edit panel");
569	813	clearPanelButton.addActionListener(this);
570	814
571		- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	815	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
572	816	unselectButton.setToolTipText("Unselect");
573	817	unselectButton.addActionListener(this);
574	818
575		- commandsPanel.preferredHeight = 1;
	819	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	820	+ flashSelectionButton.setToolTipText("Highlight selection");
	821	+ flashSelectionButton.addActionListener(this);
576	822
577		- oe.treePanel.add(commandsPanel);
578		- oe.treePanel.Return();
	823	+ editCommandsPanel.preferredHeight = 1;
	824	+
	825	+ SetPinStates(false);
	826	+// oe.treePanel.add(commandsPanel);
	827	+// oe.treePanel.Return();
579	828
580	829	// oe.aConstraints.gridx += 1;
581	830	// oe.aConstraints.weighty = 0;
..	..	@@ -592,29 +841,17 @@
592	841
593	842	JScrollPane jSP;
594	843	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
595		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	844	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
596	845	ResetModel();
597	846
598	847	oe.treePanel.add(jSPPanel);
599	848	oe.treePanel.Return();
600	849
601		- cGridBag copyOptionsPanel = new cGridBag();
602		-
603		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
604		- colorCB.setToolTipText("Copy color when dropped");
605		- colorCB.addItemListener(this);
606		-
607		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
608		- materialCB.setToolTipText("Copy material when dropped");
609		- materialCB.addItemListener(this);
610		-
611		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
612		- textureCB.setToolTipText("Copy texture when dropped");
613		- textureCB.addItemListener(this);
614		-
615		- copyOptionsPanel.preferredHeight = 1;
616	850	oe.treePanel.add(copyOptionsPanel);
617	851	oe.treePanel.Return();
	852	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	853	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	854	+ sliderPane.preferredHeight = 1;
618	855
619	856	// mainPanel.setDividerLocation(0.5); //1.0);
620	857	// mainPanel.setResizeWeight(0.5);
..	..	@@ -637,29 +874,49 @@
637	874	dgr.addDragGestureListener(this);
638	875	}catch(Exception e) {}
639	876	*/
640		- radio.layout = sevenButton;
	877	+ radio.layout = sixButton; // sevenButton;
641	878	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
642	879	}
643	880
644	881	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
645	882	{
	883	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	884	+ colorCB.setToolTipText("Copy color when dropped");
	885	+ colorCB.addItemListener(this);
	886	+
	887	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	888	+ materialCB.setToolTipText("Copy material when dropped");
	889	+ materialCB.addItemListener(this);
	890	+
	891	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	892	+ textureCB.setToolTipText("Copy texture when dropped");
	893	+ textureCB.addItemListener(this);
	894	+
	895	+ panel.Return();
	896	+
646	897	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
647	898	boxCB.setToolTipText("Display bounding boxes");
648	899	boxCB.addItemListener(this);
649	900
650	901	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
651		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	902	+ zoomBoxCB.setToolTipText("Display only for wheel");
652	903	zoomBoxCB.addItemListener(this);
653	904
654		- if (Globals.ADVANCED)
	905	+ if (true) // Globals.ADVANCED)
655	906	{
656		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
657		- supportCB.setToolTipText("Enable rigging");
658		- supportCB.addItemListener(this);
	907	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	908	+// supportCB.setToolTipText("Enable rigging");
	909	+// supportCB.addItemListener(this);
	910	+
	911	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	912	+ freezeCB.setToolTipText("Fast moving camera");
	913	+ freezeCB.addItemListener(this);
659	914
660	915	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
661	916	// localCB.addItemListener(this);
662	917
	918	+ panel.Return();
	919	+
663	920	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
664	921	crowdCB.setToolTipText("Used for crowds");
665	922	crowdCB.addItemListener(this);
..	..	@@ -676,6 +933,8 @@
676	933	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
677	934	// speakerMocapCB.addItemListener(this);
678	935
	936	+ panel.Return();
	937	+
679	938	if (false)
680	939	{
681	940	// handled in scripts
..	..	@@ -690,42 +949,85 @@
690	949	//constraints.gridy += 1;
691	950	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
692	951	smoothfocusCB.addItemListener(this);
	952	+ panel.Return();
693	953	}
694	954
695	955	//constraints.gridx += 1;
696	956	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
697	957	// debugCB.addItemListener(this);
698	958
	959	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	960	+ trackCB.setToolTipText("Enable tracking target");
	961	+ trackCB.addItemListener(this);
	962	+
699	963	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	964	+ oeilCB.setToolTipText("Move camera when tracking");
700	965	oeilCB.addItemListener(this);
701	966
	967	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	968	+ shadowCB.setToolTipText("When live compute shadows");
	969	+ shadowCB.addItemListener(this);
	970	+
	971	+ panel.Return();
	972	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	973	+ toggleTextureCB.setToolTipText("Load textures");
	974	+ toggleTextureCB.addItemListener(this);
	975	+
	976	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	977	+ toggleSwitchCB.setToolTipText("Choose a single item");
	978	+ toggleSwitchCB.addItemListener(this);
	979	+
	980	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	981	+ autokeepCB.setToolTipText("On structure change");
	982	+ autokeepCB.addItemListener(this);
	983	+
	984	+ panel.Return();
	985	+ if (Globals.ADVANCED)
	986	+ {
702	987	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
703	988	lookAtCB.setToolTipText("Look-at target");
704	989	lookAtCB.addItemListener(this);
	990	+ }
705	991
706	992	}
707	993
708	994	cGridBag fill = new cGridBag();
709		-
710	995	fill.preferredHeight = 200;
	996	+ cGridBag fill2 = new cGridBag();
	997	+ fill2.preferredHeight = 200;
	998	+ cGridBag fill3 = new cGridBag();
	999	+ fill3.preferredHeight = 200;
711	1000
712	1001	panel.add(fill);
	1002	+ panel.add(fill2);
	1003	+ panel.add(fill3);
713	1004
714	1005	}
715	1006
716	1007	void EditObject(Object3D obj)
717	1008	{
718	1009	cRadio radioButton = new cRadio(obj.name);
	1010	+
	1011	+ // June 2019. Patch to avoid bug with transparency.
	1012	+ radioButton.hadMaterial = obj.material != null;
	1013	+ if (!radioButton.hadMaterial)
	1014	+ {
	1015	+ obj.material = new cMaterial();
	1016	+ }
	1017	+
719	1018	radioButton.SetObject(obj);
720		- radioButton.layout = sevenButton;
	1019	+ radioButton.layout = sixButton; // sevenButton;
721	1020	radioButton.SetCamera(cameraView.renderCamera, false);
722	1021	radioButton.addActionListener(this);
723	1022	radioPanel.add(radioButton);
724	1023	buttonGroup.add(radioButton);
725	1024	radioButton.doClick();
726	1025	}
	1026	+
727	1027	void SetupViews(ObjEditor oe)
728	1028	{
	1029	+ theFrame = this;
	1030	+
729	1031	oe.SetupViews();
730	1032
731	1033	System.out.println("SetupViews");
..	..	@@ -734,23 +1036,28 @@
734	1036	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
735	1037	}
736	1038
737		- JCheckBox liveCB;
738		- JCheckBox supportCB;
739		- JCheckBox localCB;
740		- JCheckBox crowdCB;
741		- JCheckBox smoothCB;
742		- JCheckBox fastCB;
743		- JCheckBox slowCB;
744		- JCheckBox boxCB;
745		- JCheckBox zoomBoxCB;
746		- JCheckBox trackCB;
747		- JCheckBox smoothfocusCB;
	1039	+ cToggleButton liveCB;
	1040	+ cCheckBox supportCB;
	1041	+ cCheckBox localCB;
	1042	+ cCheckBox crowdCB;
	1043	+ cCheckBox smoothCB;
	1044	+ cToggleButton fastCB;
	1045	+ cCheckBox slowCB;
	1046	+ cCheckBox boxCB;
	1047	+ cCheckBox zoomBoxCB;
	1048	+ cCheckBox freezeCB;
	1049	+ //cToggleButton trackCB;
	1050	+ cCheckBox trackCB;
	1051	+ cCheckBox smoothfocusCB;
748	1052	// JCheckBox speakerMocapCB;
749		- JCheckBox speakerCameraCB;
750		- JCheckBox speakerFocusCB;
751		- JCheckBox debugCB;
752		- JCheckBox oeilCB;
753		- JCheckBox lookAtCB;
	1053	+ cCheckBox speakerCameraCB;
	1054	+ cCheckBox speakerFocusCB;
	1055	+ cCheckBox debugCB;
	1056	+
	1057	+ cCheckBox oeilCB;
	1058	+ cCheckBox shadowCB;
	1059	+ cCheckBox autokeepCB;
	1060	+ cCheckBox lookAtCB;
754	1061
755	1062	// static int COLOR = 1;
756	1063	// static int MATERIAL = 2;
..	..	@@ -758,9 +1065,9 @@
758	1065
759	1066	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
760	1067
761		- JCheckBox colorCB;
762		- JCheckBox materialCB;
763		- JCheckBox textureCB;
	1068	+ cCheckBox colorCB;
	1069	+ cCheckBox materialCB;
	1070	+ cCheckBox textureCB;
764	1071
765	1072	public void itemStateChanged(ItemEvent e)
766	1073	{
..	..	@@ -788,6 +1095,7 @@
788	1095	} else if(e.getSource() == liveCB)
789	1096	{
790	1097	cameraView.ToggleLive();
	1098	+ refreshContents(false);
791	1099	}
792	1100	else if(e.getSource() == supportCB)
793	1101	{
..	..	@@ -852,6 +1160,18 @@
852	1160	{
853	1161	cameraView.ToggleOeil();
854	1162	}
	1163	+ else if(e.getSource() == shadowCB)
	1164	+ {
	1165	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1166	+ }
	1167	+ else if(e.getSource() == freezeCB)
	1168	+ {
	1169	+ Globals.FREEZEONMOVE ^= true;
	1170	+ }
	1171	+ else if(e.getSource() == autokeepCB)
	1172	+ {
	1173	+ Globals.REPLACEONMAKE ^= true;
	1174	+ }
855	1175	else if(e.getSource() == lookAtCB)
856	1176	{
857	1177	cameraView.ToggleLookAt();
..	..	@@ -868,7 +1188,8 @@
868	1188
869	1189	/**/
870	1190	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
871		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1191	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1192	+ TreePath path = objEditor.jTree.getSelectionPath();
872	1193	if ((path == null) \|\| (path.getPathCount() <= 1)) {
873	1194	// We can't move the root node or an empty selection
874	1195	return;
..	..	@@ -931,8 +1252,6 @@
931	1252	}
932	1253	}
933	1254
934		- String string = (String) object;
935		-
936	1255	System.out.println("Transfer = " + object + "; drop : " + target);
937	1256	// if( object instanceof java.io.File[])
938	1257	// {
..	..	@@ -940,6 +1259,8 @@
940	1259	// objEditor.DropFile((java.io.File[]) object, true);
941	1260	// return;
942	1261	// }
	1262	+
	1263	+ String string = object.toString();
943	1264
944	1265	// File path for Mac and Windows
945	1266	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -985,23 +1306,33 @@
985	1306
986	1307	assert target == objEditor.jTree;
987	1308	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1309	+ Object3D destinationLeaf;
988	1310	try {
989		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1311	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
990	1312	} catch (Exception e) {
991	1313	System.out.println("destinationPath : " + destinationPath);
992	1314	return;
993	1315	}
994	1316
995		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1317	+ for (int i=group.selection.size(); --i>=0;)
996	1318	{
	1319	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1320	+
	1321	+ // Cannot move into itself
	1322	+ if (child == destinationLeaf)
	1323	+ return;
	1324	+ }
	1325	+
	1326	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1327	+// {
997	1328	loadClipboard(true);
998	1329	objEditor.jTree.setSelectionPath(destinationPath);
999	1330	pasteInto(false, false);
1000		- } else {
1001		- loadClipboard(false);
1002		- objEditor.jTree.setSelectionPath(destinationPath);
1003		- pasteInto(false, false); // true); // ???
1004		- }
	1331	+// } else {
	1332	+// loadClipboard(false);
	1333	+// objEditor.jTree.setSelectionPath(destinationPath);
	1334	+// pasteInto(false, false); // true); // ???
	1335	+// }
1005	1336	}
1006	1337	public void dropActionChanged(DropTargetDragEvent dtde)
1007	1338	// Called if the user has modified the current drop gesture
..	..	@@ -1106,22 +1437,30 @@
1106	1437	{
1107	1438	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1108	1439	//heightFieldItem.addActionListener(this);
1109		- gridItem = menu.add(new MenuItem("Grid"));
1110		- gridItem.addActionListener(this);
1111		- rectoidItem = menu.add(new MenuItem("Box"));
1112		- rectoidItem.addActionListener(this);
1113		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1114		- ellipsoidItem.addActionListener(this);
1115		- coneItem = menu.add(new MenuItem("Cone"));
1116		- coneItem.addActionListener(this);
1117		- torusItem = menu.add(new MenuItem("Torus"));
1118		- torusItem.addActionListener(this);
1119		- superItem = menu.add(new MenuItem("Superellipsoid"));
1120		- superItem.addActionListener(this);
	1440	+// gridItem = menu.add(new MenuItem("Grid"));
	1441	+// gridItem.addActionListener(this);
	1442	+// rectoidItem = menu.add(new MenuItem("Box"));
	1443	+// rectoidItem.addActionListener(this);
	1444	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1445	+// ellipsoidItem.addActionListener(this);
	1446	+// coneItem = menu.add(new MenuItem("Cone"));
	1447	+// coneItem.addActionListener(this);
	1448	+// torusItem = menu.add(new MenuItem("Torus"));
	1449	+// torusItem.addActionListener(this);
	1450	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1451	+// superItem.addActionListener(this);
	1452	+
	1453	+ cameraItem = menu.add(new MenuItem("Camera"));
	1454	+ cameraItem.addActionListener(this);
	1455	+
	1456	+ if (!Globals.ADVANCED)
	1457	+ {
1121	1458	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1122	1459	kleinItem.addActionListener(this);
1123		- particleItem = menu.add(new MenuItem("Particle system"));
1124		- particleItem.addActionListener(this);
	1460	+ }
	1461	+
	1462	+// particleItem = menu.add(new MenuItem("Particle system"));
	1463	+// particleItem.addActionListener(this);
1125	1464	if (Globals.ADVANCED)
1126	1465	{
1127	1466	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1147,15 +1486,15 @@
1147	1486	}
1148	1487	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1149	1488	bezierItem.addActionListener(this);
1150		- overlayItem = menu.add(new MenuItem("Overlay"));
1151		- overlayItem.addActionListener(this);
1152		- lightItem = menu.add(new MenuItem("Light"));
1153		- lightItem.addActionListener(this);
	1489	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1490	+// overlayItem.addActionListener(this);
	1491	+// lightItem = menu.add(new MenuItem("Light"));
	1492	+// lightItem.addActionListener(this);
1154	1493	menu.add("-");
1155	1494	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1156	1495	//superLoopItem.addActionListener(this);
1157		- loopItem = menu.add(new MenuItem("Loop"));
1158		- loopItem.addActionListener(this);
	1496	+// loopItem = menu.add(new MenuItem("Loop"));
	1497	+// loopItem.addActionListener(this);
1159	1498	doubleItem = menu.add(new MenuItem("Fork"));
1160	1499	doubleItem.addActionListener(this);
1161	1500	if (Globals.ADVANCED)
..	..	@@ -1171,6 +1510,9 @@
1171	1510	animationItem.addItemListener(this);
1172	1511	animationItem.setState(Globals.ANIMATION);
1173	1512
	1513	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1514	+ archiveItem.addActionListener(this);
	1515	+
1174	1516	menu.add("-");
1175	1517	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1176	1518	parseverticesItem.addActionListener(this);
..	..	@@ -1183,6 +1525,8 @@
1183	1525	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1184	1526	reduce34MorphItem.addActionListener(this);
1185	1527	menu.add("-");
	1528	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1529	+ memoryItem.addActionListener(this);
1186	1530	menu.add(computeAOItem = new MenuItem("Compute AO"));
1187	1531	computeAOItem.addActionListener(this);
1188	1532
..	..	@@ -1191,11 +1535,9 @@
1191	1535	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1192	1536	mirrorItem.addActionListener(this);
1193	1537	menu.add("-");
1194		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1195		- memoryItem.addActionListener(this);
1196	1538	menu.add(analyzeItem = new MenuItem("Analyze"));
1197	1539	analyzeItem.addActionListener(this);
1198		- menu.add(dumpItem = new MenuItem("Dump"));
	1540	+ menu.add(dumpItem = new MenuItem("Print"));
1199	1541	dumpItem.addActionListener(this);
1200	1542	// menu.add(pathItem = new MenuItem("From-to path"));
1201	1543	// pathItem.addActionListener(this);
..	..	@@ -1336,9 +1678,34 @@
1336	1678	shadow.material = new cMaterial(obj.material);
1337	1679	shadow.material.diffuse = 0.0001f;
1338	1680	shadow.material.specular = 0.0001f;
	1681	+ //shadow.projectedVertices[1].x = 300;
1339	1682
1340	1683	makeSomething(shadow);
1341	1684	}
	1685	+
	1686	+ private void ClearUnpinned()
	1687	+ {
	1688	+ //for (Object3D obj : listUI)
	1689	+ for (int i=listUI.size(); --i>=0;)
	1690	+ {
	1691	+ Object3D obj = listUI.elementAt(i);
	1692	+ if (!obj.pinned)
	1693	+ {
	1694	+ obj.CloseUI();
	1695	+ listUI.remove(i);
	1696	+ }
	1697	+ }
	1698	+ }
	1699	+
	1700	+ private void EditElement(Object3D elem, boolean newWindow)
	1701	+ {
	1702	+ // if (!(elem instanceof Composite))
	1703	+ // newWindow = false;
	1704	+ listUI.add(elem);
	1705	+ elem.openEditWindow(this, newWindow); //, false);
	1706	+ System.out.println("edit : " + elem);
	1707	+ elem.editWindow.refreshContents(true); // ? new
	1708	+ }
1342	1709
1343	1710	/**
1344	1711	* applyExample
..	..	@@ -1542,9 +1909,9 @@
1542	1909
1543	1910	void Overwrite(int mask)
1544	1911	{
1545		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1912	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1546	1913	{
1547		- Object3D content = GrafreeD.clipboard.get(0);
	1914	+ Object3D content = Grafreed.clipboard.get(0);
1548	1915
1549	1916	if (content instanceof cGroup && ((cGroup)content).transientlink )
1550	1917	content = ((cGroup)content).get(0);
..	..	@@ -1583,7 +1950,7 @@
1583	1950	{
1584	1951	ScreenFit();
1585	1952	} else
1586		- if (source == switchItem)
	1953	+ if (source == switchViewItem)
1587	1954	{
1588	1955	cVector v1 = new cVector();
1589	1956	cVector v2 = new cVector();
..	..	@@ -1592,11 +1959,11 @@
1592	1959	objEditor.cameraView.renderCamera.setAim(v2, v1);
1593	1960	objEditor.cameraView.repaint();
1594	1961	} else
1595		- if (source == rectoidItem)
	1962	+ if (source == rectoidItem \|\| source == boxButton)
1596	1963	{
1597	1964	makeSomething(new Box());
1598	1965	} else
1599		- if (source == particleItem)
	1966	+ if (source == particleItem \|\| source == particlesButton)
1600	1967	{
1601	1968	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1602	1969	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1675,27 +2042,27 @@
1675	2042
1676	2043	makeSomething(obj);
1677	2044	} else
1678		- if (source == gridItem)
	2045	+ if (source == gridItem \|\| source == gridButton)
1679	2046	{
1680	2047	makeSomething(new Grid());
1681	2048	} else
1682		- if (source == ellipsoidItem)
	2049	+ if (source == ellipsoidItem \|\| source == sphereButton)
1683	2050	{
1684	2051	makeSomething(new Sphere());
1685	2052	} else
1686		- if (source == coneItem)
	2053	+ if (source == coneItem \|\| source == coneButton)
1687	2054	{
1688	2055	makeSomething(new Cone());
1689	2056	} else
1690		- if (source == torusItem)
	2057	+ if (source == torusItem \|\| source == torusButton)
1691	2058	{
1692	2059	makeSomething(new Torus());
1693	2060	} else
1694		- if (source == superItem)
	2061	+ if (source == superItem \|\| source == superButton)
1695	2062	{
1696	2063	makeSomething(new Superellipsoid());
1697	2064	} else
1698		- if (source == kleinItem)
	2065	+ if (source == kleinItem \|\| source == kleinButton)
1699	2066	{
1700	2067	makeSomething(new Klein());
1701	2068	} else
..	..	@@ -1715,7 +2082,7 @@
1715	2082	{
1716	2083	makeSomething(new BezierSurface());
1717	2084	} else
1718		- if (source == overlayItem)
	2085	+ if (source == overlayItem \|\| source == overlayButton)
1719	2086	{
1720	2087	/*
1721	2088	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1763,7 +2130,7 @@
1763	2130	s.setup();
1764	2131	makeSomething(s);
1765	2132	} else
1766		- if (source == lightItem)
	2133	+ if (source == lightItem \|\| source == lightButton)
1767	2134	{
1768	2135	makeSomething(new Light());
1769	2136	} else
..	..	@@ -1813,30 +2180,30 @@
1813	2180
1814	2181	group(g);
1815	2182	} else
1816		- if (source == loopItem)
	2183	+ if (source == loopItem \|\| source == loopButton)
1817	2184	{
1818	2185	Composite csg = new GroupLeaf();
1819	2186	csg.count = 5;
1820	2187	group(csg);
1821		- Composite child = new cGroup();
	2188	+ Composite child = new cGroup("Branch");
1822	2189	csg.addChild(child);
1823	2190	child.addChild(csg);
1824	2191	} else
1825	2192	if (source == doubleItem)
1826	2193	{
1827		- Composite csg = new GroupLeaf();
	2194	+ Composite csg = new GroupLeaf("Fork");
1828	2195	csg.count = 5;
1829	2196	group(csg);
1830		- Composite child = new cGroup();
	2197	+ Composite child = new cGroup("Branch A");
1831	2198	csg.addChild(child);
1832	2199	child.addChild(csg);
1833		- child = new cGroup();
	2200	+ child = new cGroup("Branch B");
1834	2201	csg.addChild(child);
1835	2202	child.addChild(csg);
1836	2203	} else
1837	2204	if (source == tripleItem)
1838	2205	{
1839		- Composite csg = new GroupLeaf();
	2206	+ Composite csg = new GroupLeaf("Trident");
1840	2207	csg.count = 4;
1841	2208	group(csg);
1842	2209	Composite child = new cGroup();
..	..	@@ -1848,31 +2215,6 @@
1848	2215	child = new cGroup();
1849	2216	csg.addChild(child);
1850	2217	child.addChild(csg);
1851		- } else
1852		-
1853		- if (source == importGFDItem)
1854		- {
1855		- ImportGFD();
1856		- } else
1857		- if (source == importVRMLX3DItem)
1858		- {
1859		- ImportVRMLX3D();
1860		- } else
1861		- if (source == import3DSItem)
1862		- {
1863		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1864		- } else
1865		- if (source == importOBJItem)
1866		- {
1867		- //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1868		- FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
1869		- browser.setVisible(true);
1870		- String filename = browser.getFile();
1871		- if (filename != null && filename.length() > 0)
1872		- {
1873		- String fullname = browser.getDirectory() + filename;
1874		- makeSomething(ReadOBJ(fullname), true);
1875		- }
1876	2218	} else
1877	2219	if (source == computeAOItem)
1878	2220	{
..	..	@@ -1892,7 +2234,7 @@
1892	2234	if (source == invariantsItem)
1893	2235	{
1894	2236	System.out.println("Invariants:");
1895		- GrafreeD.grafreeD.universe.invariants();
	2237	+ Grafreed.grafreeD.universe.invariants();
1896	2238	} else
1897	2239	if (source == memoryItem)
1898	2240	{
..	..	@@ -1911,6 +2253,46 @@
1911	2253	{
1912	2254	DumpObject();
1913	2255	} else
	2256	+ if (source == minButton)
	2257	+ {
	2258	+ Minimize();
	2259	+ } else
	2260	+ if (source == maxButton)
	2261	+ {
	2262	+ Maximize();
	2263	+ } else
	2264	+ if (source == fullButton)
	2265	+ {
	2266	+ ToggleFullScreen();
	2267	+ } else
	2268	+ if (source == undoButton)
	2269	+ {
	2270	+ // Go to previous version
	2271	+ //if (!Undo())
	2272	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2273	+ Undo();
	2274	+ } else
	2275	+ if (source == restoreButton)
	2276	+ {
	2277	+ // Restore current version
	2278	+ Restore();
	2279	+ } else
	2280	+ if (source == replaceButton)
	2281	+ {
	2282	+ // Overwrite current version
	2283	+ Replace();
	2284	+ } else
	2285	+ if (source == redoButton)
	2286	+ {
	2287	+ // Go to next version
	2288	+ Redo();
	2289	+ } else
	2290	+ if (source == saveButton)
	2291	+ {
	2292	+ // Save a new version
	2293	+ if (!Save(true))
	2294	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2295	+ } else
1914	2296	if (source == oneStepButton)
1915	2297	{
1916	2298	Globals.ONESTEP = true;
..	..	@@ -1918,17 +2300,14 @@
1918	2300	} else
1919	2301	if (source == screenfitButton)
1920	2302	{
1921		- //Reload(lastConverter, lastFilename, true);
1922	2303	ScreenFit();
1923	2304	} else
1924	2305	if (source == screenfitpointButton)
1925	2306	{
1926		- //Reload(lastConverter, lastFilename, true);
1927	2307	ScreenFitPoint();
1928	2308	} else
1929	2309	if (source == snapobjectButton)
1930	2310	{
1931		- //Reload(lastConverter, lastFilename, true);
1932	2311	SnapObject();
1933	2312	} else
1934	2313	// if (event.getSource() == recompileButton)
..	..	@@ -1965,12 +2344,20 @@
1965	2344	{
1966	2345	loadClipboard(true);
1967	2346	} else
	2347	+ if (source == undoItem)
	2348	+ {
	2349	+ Undo();
	2350	+ } else
	2351	+ if (source == redoItem)
	2352	+ {
	2353	+ Redo();
	2354	+ } else
1968	2355	if (source == duplicateItem)
1969	2356	{
1970		- Object3D keep = GrafreeD.clipboard;
	2357	+ Object3D keep = Grafreed.clipboard;
1971	2358	loadClipboard(false);
1972	2359	paste(false);
1973		- GrafreeD.clipboard = keep;
	2360	+ Grafreed.clipboard = keep;
1974	2361	} else
1975	2362	if (source == cloneItem)
1976	2363	{
..	..	@@ -2190,9 +2577,9 @@
2190	2577	// group.selection.get(0).setMasterThis(content); // should be identity
2191	2578	// refreshContents();
2192	2579	// }
2193		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2580	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2194	2581	{
2195		- Object3D content = GrafreeD.clipboard.get(0);
	2582	+ Object3D content = Grafreed.clipboard.get(0);
2196	2583
2197	2584	if (content instanceof cGroup && ((cGroup)content).transientlink )
2198	2585	content = ((cGroup)content).get(0);
..	..	@@ -2242,9 +2629,9 @@
2242	2629	} else
2243	2630	if (source == setMasterItem)
2244	2631	{
2245		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2632	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2246	2633	{
2247		- Object3D content = GrafreeD.clipboard.get(0);
	2634	+ Object3D content = Grafreed.clipboard.get(0);
2248	2635
2249	2636	if (content instanceof cGroup && ((cGroup)content).transientlink )
2250	2637	content = ((cGroup)content).get(0);
..	..	@@ -2257,9 +2644,9 @@
2257	2644	{
2258	2645	if (group.selection.size() == 1)
2259	2646	{
2260		- if (GrafreeD.clipboard.size() == 1)
	2647	+ if (Grafreed.clipboard.size() == 1)
2261	2648	{
2262		- Object3D content = GrafreeD.clipboard.get(0);
	2649	+ Object3D content = Grafreed.clipboard.get(0);
2263	2650
2264	2651	if (content instanceof cGroup && ((cGroup)content).transientlink )
2265	2652	content = ((cGroup)content).get(0);
..	..	@@ -2276,7 +2663,7 @@
2276	2663	{
2277	2664	RevertMeshes();
2278	2665	} else
2279		- if (source == resetMeshItem)
	2666	+ if (source == resetAllItem)
2280	2667	{
2281	2668	ResetAll();
2282	2669	} else
..	..	@@ -2284,7 +2671,7 @@
2284	2671	{
2285	2672	StepAll();
2286	2673	} else
2287		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	2674	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2288	2675	{
2289	2676	//int indices[] = jList.getSelectedIndices();
2290	2677	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2296,9 +2683,9 @@
2296	2683	{
2297	2684	ClearSelection(true);
2298	2685	} else
2299		- if (source == grabItem)
	2686	+ if (source == grabItem \|\| source == groupButton)
2300	2687	{
2301		- group(new cGroup(), true);
	2688	+ group(new cGroup(), false); // true);
2302	2689	} else
2303	2690	if (source == hideItem)
2304	2691	{
..	..	@@ -2316,11 +2703,11 @@
2316	2703	{
2317	2704	makeSomething(new Camera());
2318	2705	} else
2319		- if (source == compositeItem)
	2706	+ if (source == compositeItem \|\| source == compositeButton)
2320	2707	{
2321	2708	group(new Composite());
2322	2709	} else
2323		- if (source == randomItem)
	2710	+ if (source == switchItem \|\| source == switchButton)
2324	2711	{
2325	2712	RandomNode random = new RandomNode();
2326	2713	group(random);
..	..	@@ -2422,7 +2809,7 @@
2422	2809	{
2423	2810	group(new cLinker());
2424	2811	} else
2425		- if (source == textureItem)
	2812	+ if (source == textureItem \|\| source == textureButton)
2426	2813	{
2427	2814	group(new TextureNode());
2428	2815	} else
..	..	@@ -2442,17 +2829,30 @@
2442	2829	{
2443	2830	CastShadow(2);
2444	2831	} else
2445		- if (source == ungroupItem)
	2832	+ if (source == ungroupItem \|\| source == ungroupButton)
2446	2833	{
2447		- //ungroup();
	2834	+ boolean hasRoot = false;
	2835	+
2448	2836	for (int i=0; i<group.selection.size(); i++)
2449	2837	{
2450		- Ungroup(group.selection.get(i));
	2838	+ if (group.selection.get(i) == group)
	2839	+ {
	2840	+ hasRoot = true;
	2841	+ break;
	2842	+ }
2451	2843	}
2452	2844
2453		- ClearSelection(false);
2454		-
2455		- refreshContents();
	2845	+ if (!hasRoot)
	2846	+ {
	2847	+ for (int i=0; i<group.selection.size(); i++)
	2848	+ {
	2849	+ Ungroup(group.selection.get(i));
	2850	+ }
	2851	+
	2852	+ ClearSelection(false);
	2853	+
	2854	+ refreshContents();
	2855	+ }
2456	2856	} else
2457	2857	if (source == genUVItem)
2458	2858	{
..	..	@@ -2464,7 +2864,7 @@
2464	2864	} else
2465	2865	if (source == genNormalsMESHItem)
2466	2866	{
2467		- GenNormals(true); // TODO
	2867	+ GenNormalsMESH();
2468	2868	} else
2469	2869	if (source == genNormalsORGANItem)
2470	2870	{
..	..	@@ -2529,6 +2929,22 @@
2529	2929	if (source == unmarkleavesItem)
2530	2930	{
2531	2931	MarkLeaves(false);
	2932	+ } else
	2933	+ if (source == rewindleavesItem)
	2934	+ {
	2935	+ RewindLeaves(true);
	2936	+ } else
	2937	+ if (source == unrewindleavesItem)
	2938	+ {
	2939	+ RewindLeaves(false);
	2940	+ } else
	2941	+ if (source == randomleavesItem)
	2942	+ {
	2943	+ RandomLeaves(true);
	2944	+ } else
	2945	+ if (source == unrandomleavesItem)
	2946	+ {
	2947	+ RandomLeaves(false);
2532	2948	} else
2533	2949	if (source == flipVItem)
2534	2950	{
..	..	@@ -2614,9 +3030,13 @@
2614	3030	{
2615	3031	SmoothMesh();
2616	3032	} else
2617		- if (source == transformgeometryItem)
	3033	+ if (source == transformGeometryItem)
2618	3034	{
2619	3035	TransformGeometry();
	3036	+ } else
	3037	+ if (source == transformChildrenItem)
	3038	+ {
	3039	+ TransformChildren();
2620	3040	} else
2621	3041	if (source == resetTransformItem)
2622	3042	{
..	..	@@ -2624,7 +3044,11 @@
2624	3044	} else
2625	3045	if (source == resetCentroidItem)
2626	3046	{
2627		- ResetCentroid();
	3047	+ ResetCentroid(true);
	3048	+ } else
	3049	+ if (source == resetCentroidXZItem)
	3050	+ {
	3051	+ ResetCentroid(false);
2628	3052	} else
2629	3053	if (source == resetParentItem)
2630	3054	{
..	..	@@ -2729,7 +3153,7 @@
2729	3153	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2730	3154	{
2731	3155	obj = (Object3D)e.nextElement();
2732		- obj.SetBumpTexture(null);
	3156	+ obj.ResetBumpTexture();
2733	3157	}
2734	3158
2735	3159	refreshContents();
..	..	@@ -2756,6 +3180,10 @@
2756	3180	if (source == twoButton)
2757	3181	{
2758	3182	radio.layout = twoButton;
	3183	+
	3184	+ if (CameraPane.FULLSCREEN)
	3185	+ fullscreenLayout = radio.layout;
	3186	+
2759	3187	// bug
2760	3188	//gridPanel.setDividerLocation(1.0);
2761	3189	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2788,10 +3216,31 @@
2788	3216	bigThree.ClearUI();
2789	3217	bigThree.add(centralPanel);
2790	3218	bigThree.FlushUI();
	3219	+
	3220	+ cameraView.requestFocusInWindow();
	3221	+
	3222	+// refreshContents(true);
	3223	+//
	3224	+// try
	3225	+// {
	3226	+// java.awt.Robot bot = new java.awt.Robot();
	3227	+// int mask = InputEvent.BUTTON1_MASK;
	3228	+// bot.mouseMove(100, 100);
	3229	+// bot.mousePress(mask);
	3230	+// bot.mouseRelease(mask);
	3231	+// }
	3232	+// catch (Exception e)
	3233	+// {
	3234	+//
	3235	+// }
	3236	+
2791	3237	} else
2792	3238	if (source == threeButton)
2793	3239	{
2794	3240	radio.layout = threeButton;
	3241	+
	3242	+ if (CameraPane.FULLSCREEN)
	3243	+ fullscreenLayout = radio.layout;
2795	3244
2796	3245	// bigThree.remove(scenePanel);
2797	3246	// bigThree.remove(centralPanel);
..	..	@@ -2824,10 +3273,15 @@
2824	3273	bigThree.add(centralPanel);
2825	3274	bigThree.add(XYZPanel);
2826	3275	bigThree.FlushUI();
	3276	+
	3277	+ cameraView.requestFocusInWindow();
2827	3278	} else
2828	3279	if (source == fourButton)
2829	3280	{
2830	3281	radio.layout = fourButton;
	3282	+
	3283	+ if (CameraPane.FULLSCREEN)
	3284	+ fullscreenLayout = radio.layout;
2831	3285
2832	3286	// bigThree.remove(scenePanel);
2833	3287	// bigThree.remove(centralPanel);
..	..	@@ -2859,10 +3313,15 @@
2859	3313	bigThree.ClearUI();
2860	3314	bigThree.add(scenePanel);
2861	3315	bigThree.FlushUI();
	3316	+
	3317	+ cameraView.requestFocusInWindow();
2862	3318	} else
2863	3319	if (source == sixButton)
2864	3320	{
2865	3321	radio.layout = sixButton;
	3322	+
	3323	+ if (CameraPane.FULLSCREEN)
	3324	+ fullscreenLayout = radio.layout;
2866	3325
2867	3326	// bigThree.remove(scenePanel);
2868	3327	// bigThree.remove(centralPanel);
..	..	@@ -2895,10 +3354,15 @@
2895	3354	bigThree.add(scenePanel);
2896	3355	bigThree.add(centralPanel);
2897	3356	bigThree.FlushUI();
	3357	+
	3358	+ cameraView.requestFocusInWindow();
2898	3359	} else
2899	3360	if (source == sevenButton)
2900	3361	{
2901	3362	radio.layout = sevenButton;
	3363	+
	3364	+ if (CameraPane.FULLSCREEN)
	3365	+ fullscreenLayout = radio.layout;
2902	3366
2903	3367	// bigThree.remove(scenePanel);
2904	3368	// bigThree.remove(centralPanel);
..	..	@@ -2932,6 +3396,8 @@
2932	3396	bigThree.add(centralPanel);
2933	3397	bigThree.add(XYZPanel);
2934	3398	bigThree.FlushUI();
	3399	+
	3400	+ cameraView.requestFocusInWindow();
2935	3401	} else
2936	3402	if (source == rootButton)
2937	3403	{
..	..	@@ -2943,6 +3409,7 @@
2943	3409	EditObject(obj);
2944	3410	}
2945	3411
	3412	+ cameraView.requestFocusInWindow();
2946	3413	refreshContents(true);
2947	3414	} else
2948	3415	if (source == closeButton)
..	..	@@ -2952,22 +3419,37 @@
2952	3419	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2953	3420	{
2954	3421	ab = (cRadio)e.nextElement();
2955		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3422	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2956	3423	{
	3424	+ // Patch to avoid bug with transparency.
	3425	+ if (!ab.hadMaterial)
	3426	+ {
	3427	+ ab.object.material = null;
	3428	+ }
	3429	+
2957	3430	buttonGroup.remove(ab);
2958	3431	radioPanel.remove(ab);
2959	3432
2960		- ab.GetObject().editWindow = null;
	3433	+ //ab.GetObject().editWindow = null;
	3434	+ ab.GetObject().manipWindow = null;
2961	3435	// ab.GetObject().objectUI = null; // ?????????
2962	3436
2963	3437	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2964	3438	break;
2965	3439	}
2966	3440	}
	3441	+
	3442	+ cameraView.requestFocusInWindow();
2967	3443	refreshContents(true);
2968	3444	} else
2969	3445	if (source == editItem \|\| source == editButton)
2970	3446	{
	3447	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3448	+ {
	3449	+ Object3D child = (Object3D)e.nextElement();
	3450	+ child.pinned = true;
	3451	+ }
	3452	+
2971	3453	EditSelection(false);
2972	3454	} else
2973	3455	if (source == uneditButton)
..	..	@@ -2977,10 +3459,11 @@
2977	3459	Object3D child = (Object3D)e.nextElement();
2978	3460	if(child.editWindow != null)
2979	3461	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3462	+ child.pinned = false;
2980	3463	child.CloseUI();
2981	3464	listUI.remove(child);
2982	3465
2983		- child.editWindow = null; // ???????????
	3466	+ //child.editWindow = null; // ???????????
2984	3467	}
2985	3468	objEditor.ctrlPanel.FlushUI();
2986	3469	//objEditor.jTree.clearSelection();
..	..	@@ -2993,6 +3476,7 @@
2993	3476	//copy.ClearUI();
2994	3477	for (Object3D obj : listUI)
2995	3478	{
	3479	+ obj.pinned = false;
2996	3480	obj.CloseUI();
2997	3481	}
2998	3482	listUI.clear();
..	..	@@ -3002,7 +3486,7 @@
3002	3486	{
3003	3487	assert(copy == group);
3004	3488
3005		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3489	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3006	3490
3007	3491	for (Object3D obj : listUI)
3008	3492	{
..	..	@@ -3051,6 +3535,9 @@
3051	3535	}
3052	3536
3053	3537	copy = group;
	3538	+
	3539	+ SetUndoStates();
	3540	+
3054	3541	//Globals.theRenderer.object = group;
3055	3542	if(!useclient)
3056	3543	{
..	..	@@ -3066,20 +3553,46 @@
3066	3553	frontView.object = group;
3067	3554	sideView.object = group;
3068	3555	}
3069		- group.editWindow = this;
	3556	+
	3557	+// fix "+" issue
	3558	+ //group.editWindow = this;
	3559	+ group.manipWindow = this;
	3560	+
3070	3561	/*
3071	3562	currentLayout = radio.layout;
3072	3563	if (currentLayout == null)
3073	3564	currentLayout = sevenButton;
3074	3565	*/
3075	3566	radio.layout.doClick();
	3567	+
	3568	+ ClearUnpinned();
	3569	+ //Grafreed.Assert(group != null);
	3570	+ //Grafreed.Assert(group.selection != null);
	3571	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	3572	+ if (group.selection == null \|\| group.selection.size() == 1)
	3573	+ EditSelection(false);
3076	3574	keepparent = group.parent;
3077	3575	// PARENT = NULL or not???
3078	3576	//group.parent = null; // ROOT
3079	3577	//group.attributes = -1;
3080	3578	ResetModel();
	3579	+
	3580	+ cameraView.requestFocusInWindow();
3081	3581	refreshContents(true);
3082		- }
	3582	+ } else if (event.getSource() == editCameraItem)
	3583	+ {
	3584	+ cameraView.ProtectCamera();
	3585	+ cameraView.repaint();
	3586	+ return;
	3587	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3588	+ {
	3589	+ cameraView.RevertCamera();
	3590	+ cameraView.repaint();
	3591	+ return;
	3592	+ // } else if (event.getSource() == textureButton)
	3593	+ // {
	3594	+ // return; // true;
	3595	+ }
3083	3596	else
3084	3597	{
3085	3598	//return super.action(event, arg);
..	..	@@ -3088,7 +3601,6 @@
3088	3601	}
3089	3602
3090	3603	boolean useclient = false;
3091		- cRadio radio;
3092	3604
3093	3605	void ToggleRoot()
3094	3606	{
..	..	@@ -3140,6 +3652,28 @@
3140	3652	refreshContents();
3141	3653	}
3142	3654
	3655	+ void TransformChildren()
	3656	+ {
	3657	+ Object3D obj;
	3658	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3659	+ {
	3660	+ obj = (Object3D)e.nextElement();
	3661	+ obj.KeepTextureMatrices();
	3662	+ obj.TransformChildren();
	3663	+ obj.RestoreTextureMatrices();
	3664	+
	3665	+// if (obj.parent == null)
	3666	+// {
	3667	+// System.out.println("NULL PARENT!");
	3668	+// new Exception().printStackTrace();
	3669	+// }
	3670	+// else
	3671	+// TouchTransform(obj);
	3672	+// //obj.parent.Touch();
	3673	+ }
	3674	+
	3675	+ refreshContents();
	3676	+ }
3143	3677
3144	3678	void ResetTransform()
3145	3679	{
..	..	@@ -3252,7 +3786,7 @@
3252	3786	refreshContents();
3253	3787	}
3254	3788
3255		- void ResetCentroid()
	3789	+ void ResetCentroid(boolean full)
3256	3790	{
3257	3791	Object3D obj;
3258	3792	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3267,12 +3801,16 @@
3267	3801	LA.matIdentity(Object3D.mat);
3268	3802	obj.getBounds(minima, maxima, false);
3269	3803	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3270		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3804	+ if (full)
	3805	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3271	3806	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3272	3807	obj.TransformMesh(Object3D.mat);
	3808	+
3273	3809	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3274		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3810	+ if (full)
	3811	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3275	3812	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3813	+
3276	3814	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3277	3815	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3278	3816	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3301,7 +3839,8 @@
3301	3839
3302	3840	int size = obj.MemorySize();
3303	3841
3304		- System.err.println((size/1024) + " KB is the size of " + obj);
	3842	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3843	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3305	3844	}
3306	3845	}
3307	3846	catch (Exception e)
..	..	@@ -3338,9 +3877,9 @@
3338	3877	obj = (Object3D)e.nextElement();
3339	3878
3340	3879	System.out.println("Object is: " + obj);
3341		- GrafreeD.AnalyzeObject(obj);
	3880	+ Grafreed.AnalyzeObject(obj);
3342	3881	System.out.println("Boundary rep: " + obj.bRep);
3343		- GrafreeD.AnalyzeObject(obj.bRep);
	3882	+ Grafreed.AnalyzeObject(obj.bRep);
3344	3883
3345	3884	// System.err.println((size/1024) + " KB is the size of " + obj);
3346	3885	}
..	..	@@ -3382,6 +3921,13 @@
3382	3921	void GenNormals(boolean crease)
3383	3922	{
3384	3923	group.GenNormalsS(crease);
	3924	+
	3925	+ refreshContents();
	3926	+ }
	3927	+
	3928	+ void GenNormalsMESH()
	3929	+ {
	3930	+ group.GenNormalsMeshS();
3385	3931
3386	3932	refreshContents();
3387	3933	}
..	..	@@ -3554,8 +4100,8 @@
3554	4100
3555	4101	void ParseVertices()
3556	4102	{
3557		- boolean epsequal = GrafreeD.epsequal;
3558		- GrafreeD.epsequal = true;
	4103	+ boolean epsequal = Grafreed.epsequal;
	4104	+ Grafreed.epsequal = true;
3559	4105
3560	4106	for (int i=0; i<group.selection.size(); i++)
3561	4107	{
..	..	@@ -3580,7 +4126,7 @@
3580	4126	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3581	4127	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3582	4128
3583		- g.add(GrafreeD.clipboard);
	4129	+ g.add(Grafreed.clipboard);
3584	4130
3585	4131	buffer.add(g);
3586	4132	}
..	..	@@ -3595,7 +4141,7 @@
3595	4141	makeSomething(buffer, i==group.selection.size()-1);
3596	4142	}
3597	4143
3598		- GrafreeD.epsequal = epsequal;
	4144	+ Grafreed.epsequal = epsequal;
3599	4145
3600	4146	refreshContents();
3601	4147	}
..	..	@@ -3613,7 +4159,16 @@
3613	4159	String pigment = Object3D.GetPigment(tex);
3614	4160	//String bump = Object3D.GetBump(tex);
3615	4161
3616		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4162	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4163	+
	4164	+ try
	4165	+ {
	4166	+ texturedata = Globals.theRenderer.GetTextureData(tex.pigmenttexture, pigment, false, node.texres);
	4167	+ }
	4168	+ catch (Exception e)
	4169	+ {
	4170	+ System.err.println("FAIL: " + node);
	4171	+ }
3617	4172
3618	4173	double s = v.s;
3619	4174
..	..	@@ -3745,7 +4300,7 @@
3745	4300	return;
3746	4301
3747	4302	Object3D poses = group.selection.get(0);
3748		- Object3D ref = GrafreeD.clipboard.get(0);
	4303	+ Object3D ref = Grafreed.clipboard.get(0);
3749	4304
3750	4305	Object3D newgroup = new Object3D("Po:" + poses.name);
3751	4306
..	..	@@ -3939,9 +4494,9 @@
3939	4494
3940	4495	void ClipMesh()
3941	4496	{
3942		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4497	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3943	4498	{
3944		- Object3D content = GrafreeD.clipboard.get(0);
	4499	+ Object3D content = Grafreed.clipboard.get(0);
3945	4500
3946	4501	if (content instanceof cGroup && ((cGroup)content).transientlink )
3947	4502	content = ((cGroup)content).get(0);
..	..	@@ -3950,7 +4505,7 @@
3950	4505	// {
3951	4506	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3952	4507	// }
3953		- group.selection.ClipMesh(GrafreeD.clipboard);
	4508	+ group.selection.ClipMesh(Grafreed.clipboard);
3954	4509	}
3955	4510	// group.selection.ClipMesh(GrafreeD.clipboard);
3956	4511	System.out.println("DONE.");
..	..	@@ -3997,6 +4552,18 @@
3997	4552	void MarkLeaves(boolean hide)
3998	4553	{
3999	4554	group.selection.MarkLeaves(hide);
	4555	+ refreshContents();
	4556	+ }
	4557	+
	4558	+ void RewindLeaves(boolean hide)
	4559	+ {
	4560	+ group.selection.RewindLeaves(hide);
	4561	+ refreshContents();
	4562	+ }
	4563	+
	4564	+ void RandomLeaves(boolean hide)
	4565	+ {
	4566	+ group.selection.RandomLeaves(hide);
4000	4567	refreshContents();
4001	4568	}
4002	4569
..	..	@@ -4071,28 +4638,25 @@
4071	4638	// }
4072	4639	// }
4073	4640
4074		- static boolean allparams = true;
4075		-
4076		- static Vector<Object3D> listUI = new Vector<Object3D>();
4077		-
4078	4641	void EditSelection(boolean newWindow)
4079	4642	{
	4643	+ if (group.selection == null)
	4644	+ {
	4645	+ EditElement(group, newWindow); // ? new
	4646	+ return;
	4647	+ }
	4648	+
4080	4649	// aConstraints.gridy = 0;
4081	4650	for (int i=0; i<group.selection.size(); i++)
4082	4651	{
4083	4652	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4084	4653	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4085		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4654	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4086	4655
4087	4656	Object3D elem = (Object3D)group.selection.elementAt(i);
4088		- if(elem != group)
	4657	+ if(elem != group \|\| !newWindow)
4089	4658	{
4090		- // if (!(elem instanceof Composite))
4091		- // newWindow = false;
4092		- listUI.add(elem);
4093		- elem.openEditWindow(this, newWindow); //, false);
4094		- System.out.println("edit : " + elem);
4095		- elem.editWindow.refreshContents(true); // ? new
	4659	+ EditElement(elem, newWindow); // ? new
4096	4660	}
4097	4661	}
4098	4662	}
..	..	@@ -4167,7 +4731,8 @@
4167	4731	//new Exception().printStackTrace();
4168	4732
4169	4733	freezemodel = true;
4170		-
	4734	+ ClearUnpinned();
	4735	+
4171	4736	/**/
4172	4737	//switch (event.id)
4173	4738	{
..	..	@@ -4175,7 +4740,6 @@
4175	4740	//case 702: // Event.LIST_DESELECT
4176	4741	group.deselectAll();
4177	4742	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4178		- objEditor.ClearInfo(); // .GetMaterial());
4179	4743	if (tps != null)
4180	4744	{
4181	4745	for (int i=0; i < tps.length; i++)
..	..	@@ -4184,10 +4748,8 @@
4184	4748
4185	4749	//if (child.parent != null)
4186	4750	//child.parent.addSelectee(child);
	4751	+ objEditor.SetMaterial(child);
4187	4752	group.addSelectee(child);
4188		- objEditor.SetMaterial(child); // .GetMaterial());
4189		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4190		- System.err.println("info : " + child.GetPath());
4191	4753	}
4192	4754	}
4193	4755	// else
..	..	@@ -4197,20 +4759,28 @@
4197	4759	// System.err.println("info : " + group.GetPath());
4198	4760	// }
4199	4761
4200		- objEditor.SetText(); // jan 2014
4201		-
4202		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4762	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4203	4763	CameraPane.flash = true;
4204	4764
4205		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4765	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4206	4766	// a camera
4207	4767	{
4208		- CameraPane.camerachangeframe = 0; // don't refuse it
4209		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4768	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	4769	+ {
	4770	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4771	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4772	+ }
4210	4773	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4211	4774	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4212	4775	}
4213	4776
	4777	+ if (tps != null && tps.length == 1)
	4778	+ {
	4779	+ EditSelection(false);
	4780	+ }
	4781	+
	4782	+ SetPinStates(tps != null && tps.length > 0);
	4783	+
4214	4784	refreshContents();
4215	4785	//return true;
4216	4786	}
..	..	@@ -4219,6 +4789,35 @@
4219	4789
4220	4790	freezemodel = false;
4221	4791	}
	4792	+
	4793	+ void SetPinStates(boolean enabled)
	4794	+ {
	4795	+ editButton.setEnabled(enabled);
	4796	+ uneditButton.setEnabled(enabled);
	4797	+ unselectButton.setEnabled(enabled);
	4798	+ flashSelectionButton.setEnabled(enabled);
	4799	+ }
	4800	+
	4801	+ void refreshContents(boolean cp)
	4802	+ {
	4803	+ if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	4804	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	4805	+ {
	4806	+ objEditor.ClearInfo(); // .GetMaterial());
	4807	+
	4808	+ for (int i=0; i < group.selection.Size(); i++)
	4809	+ {
	4810	+ Object3D child = (Object3D) group.selection.get(i);
	4811	+
	4812	+ objEditor.AddInfo(child, this, true);
	4813	+ System.err.println("info : " + child.GetPath());
	4814	+ }
	4815	+
	4816	+ objEditor.SetText(); // jan 2014
	4817	+ }
	4818	+
	4819	+ super.refreshContents(cp);
	4820	+ }
4222	4821
4223	4822	void linkSomething(Object3D thing)
4224	4823	{
..	..	@@ -4290,16 +4889,19 @@
4290	4889	{
4291	4890	if (group.selection.isEmpty())
4292	4891	return;
4293		- GrafreeD.clipboardIsTempGroup = false;
	4892	+
	4893	+ Grafreed.clipboardIsTempGroup = false;
4294	4894	Composite tGroup = null;
4295	4895	if (group.selection.size() > 0) // 1)
4296	4896	{
4297	4897	tGroup = new cGroup();
4298		- GrafreeD.clipboardIsTempGroup = true;
	4898	+ Grafreed.clipboardIsTempGroup = true;
4299	4899	}
4300	4900
4301	4901	if (cut)
4302	4902	{
	4903	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	4904	+// Save();
4303	4905	//int indices[] = jList.getSelectedIndices();
4304	4906	//for (int i = indices.length - 1; i >= 0; i--)
4305	4907	//jList.remove(indices[i]);
..	..	@@ -4335,16 +4937,16 @@
4335	4937	//System.out.println("cut " + child);
4336	4938	//System.out.println("parent = " + child.parent);
4337	4939	// tmp.addChild(child);
4338		- if (GrafreeD.clipboardIsTempGroup)
	4940	+ if (Grafreed.clipboardIsTempGroup)
4339	4941	tGroup.add/Child/(tmp);
4340	4942	else
4341		- GrafreeD.clipboard = tmp;
	4943	+ Grafreed.clipboard = tmp;
4342	4944	}
4343	4945	else
4344		- if (GrafreeD.clipboardIsTempGroup)
	4946	+ if (Grafreed.clipboardIsTempGroup)
4345	4947	tGroup.add/Child/(child);
4346	4948	else
4347		- GrafreeD.clipboard = child;
	4949	+ Grafreed.clipboard = child;
4348	4950	}
4349	4951
4350	4952	//ResetModel();
..	..	@@ -4376,21 +4978,23 @@
4376	4978	//System.out.println("cut " + elem);
4377	4979	//System.out.println("parent = " + elem.parent);
4378	4980	// tmp.addChild(elem);
4379		- if (GrafreeD.clipboardIsTempGroup)
	4981	+ if (Grafreed.clipboardIsTempGroup)
4380	4982	tGroup.add/Child/(tmp);
4381	4983	else
4382		- GrafreeD.clipboard = tmp;
	4984	+ Grafreed.clipboard = tmp;
4383	4985	}
4384	4986	else
4385		- if (GrafreeD.clipboardIsTempGroup)
	4987	+ if (Grafreed.clipboardIsTempGroup)
4386	4988	tGroup.add/Child/(child);
4387	4989	else
4388		- GrafreeD.clipboard = child;
	4990	+ Grafreed.clipboard = child;
4389	4991	}
4390	4992
4391	4993	}
4392		- if (GrafreeD.clipboardIsTempGroup)
4393		- GrafreeD.clipboard = tGroup;
	4994	+
	4995	+ if (Grafreed.clipboardIsTempGroup)
	4996	+ Grafreed.clipboard = tGroup;
	4997	+
4394	4998	if (cut)
4395	4999	{
4396	5000	ResetModel();
..	..	@@ -4400,11 +5004,15 @@
4400	5004
4401	5005	void paste(boolean expand)
4402	5006	{
	5007	+ if (Globals.REPLACEONMAKE)
	5008	+ Save();
	5009	+ boolean keep = Globals.REPLACEONMAKE;
	5010	+ Globals.REPLACEONMAKE = false;
4403	5011	// if (GrafreeD.clipboard == null)
4404	5012	// return;
4405	5013	boolean first = true;
4406	5014
4407		- if (GrafreeD.clipboardIsTempGroup)
	5015	+ if (Grafreed.clipboardIsTempGroup)
4408	5016	{
4409	5017	Composite temp;
4410	5018
..	..	@@ -4415,7 +5023,7 @@
4415	5023	temp = (Composite)Applet3D.clipboard.deepCopy();
4416	5024	*/
4417	5025	Object3D elem;
4418		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5026	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4419	5027	{
4420	5028	Object3D child = (Object3D)e.nextElement();
4421	5029
..	..	@@ -4449,16 +5057,17 @@
4449	5057	//Object3D cb = Applet3D.clipboard;
4450	5058	//temp.addChild(cb);
4451	5059	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4452		- assert(GrafreeD.clipboard.parent == null);
4453		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4454		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4455		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4456		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	5060	+ assert(Grafreed.clipboard.parent == null);
	5061	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5062	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5063	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5064	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4457	5065	else
4458		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4459		- GrafreeD.clipboard.get(0).parent = keepparent;
	5066	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5067	+ Grafreed.clipboard.get(0).parent = keepparent;
4460	5068	}
4461	5069
	5070	+ Globals.REPLACEONMAKE = keep;
4462	5071	ResetModel();
4463	5072	refreshContents();
4464	5073	}
..	..	@@ -4505,9 +5114,9 @@
4505	5114	{
4506	5115	boolean first = true;
4507	5116
4508		- if (GrafreeD.clipboardIsTempGroup)
	5117	+ if (Grafreed.clipboardIsTempGroup)
4509	5118	{
4510		- Composite temp = (Composite)GrafreeD.clipboard;
	5119	+ Composite temp = (Composite)Grafreed.clipboard;
4511	5120	Object3D copy;
4512	5121	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4513	5122	{
..	..	@@ -4517,7 +5126,7 @@
4517	5126	}
4518	5127	} else
4519	5128	{
4520		- linkSomething(GrafreeD.clipboard); //.get(0));
	5129	+ linkSomething(Grafreed.clipboard); //.get(0));
4521	5130	}
4522	5131	}
4523	5132	}
..	..	@@ -4594,6 +5203,10 @@
4594	5203
4595	5204	void group(Object3D csg, boolean grab)
4596	5205	{
	5206	+ if (Globals.REPLACEONMAKE)
	5207	+ Save();
	5208	+ boolean keep = Globals.REPLACEONMAKE;
	5209	+ Globals.REPLACEONMAKE = false;
4597	5210	if (//false) // why??
4598	5211	!group.selection.isEmpty())
4599	5212	{
..	..	@@ -4707,10 +5320,15 @@
4707	5320	//node.add(csg);
4708	5321	//makeSomething(node);
4709	5322	makeSomething(csg);
	5323	+ Globals.REPLACEONMAKE = keep;
4710	5324	}
4711	5325
4712	5326	void Ungroup(Object3D g)
4713	5327	{
	5328	+ if (Globals.REPLACEONMAKE)
	5329	+ Save();
	5330	+ boolean keep = Globals.REPLACEONMAKE;
	5331	+ Globals.REPLACEONMAKE = false;
4714	5332	if (g instanceof HiddenObject)
4715	5333	{
4716	5334	HiddenObject h = (HiddenObject) g;
..	..	@@ -4727,6 +5345,7 @@
4727	5345	objEditor.makeSomething(g.get(i), false);
4728	5346	}
4729	5347	}
	5348	+ Globals.REPLACEONMAKE = keep;
4730	5349	}
4731	5350
4732	5351	void ungroup()
..	..	@@ -4922,21 +5541,6 @@
4922	5541	}
4923	5542	*/
4924	5543
4925		- void ImportGFD()
4926		- {
4927		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4928		- browser.show();
4929		- String filename = browser.getFile();
4930		- if (filename != null && filename.length() > 0)
4931		- {
4932		- String fullname = browser.getDirectory() + filename;
4933		-
4934		- //Object3D readobj =
4935		- objEditor.ReadGFD(fullname, objEditor);
4936		- //makeSomething(readobj);
4937		- }
4938		- }
4939		-
4940	5544	/*
4941	5545	public void Callback(Object obj)
4942	5546	{
..	..	@@ -4960,26 +5564,9 @@
4960	5564	}
4961	5565	*/
4962	5566
4963		- void ImportVRMLX3D()
4964		- {
4965		- if (GrafreeD.standAlone)
4966		- {
4967		- /**/
4968		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4969		- browser.show();
4970		- String filename = browser.getFile();
4971		- if (filename != null && filename.length() > 0)
4972		- {
4973		- String fullname = browser.getDirectory() + filename;
4974		- LoadVRMLX3D(fullname);
4975		- }
4976		- /**/
4977		- }
4978		- }
4979		-
4980	5567	String GetFile(String dialogName)
4981	5568	{
4982		- if (GrafreeD.standAlone)
	5569	+ if (Grafreed.standAlone)
4983	5570	{
4984	5571	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4985	5572	browser.show();
..	..	@@ -5047,7 +5634,28 @@
5047	5634	cButton clearpanelButton;
5048	5635	cButton unselectButton;
5049	5636
	5637	+ cButton restoreCameraButton;
	5638	+
	5639	+ cButton saveButton;
5050	5640	cButton oneStepButton;
	5641	+
	5642	+ cButton groupButton;
	5643	+ cButton ungroupButton;
	5644	+ cButton compositeButton;
	5645	+ cButton switchButton;
	5646	+ cButton loopButton;
	5647	+ cButton textureButton;
	5648	+
	5649	+ cButton gridButton;
	5650	+ cButton boxButton;
	5651	+ cButton sphereButton;
	5652	+ cButton coneButton;
	5653	+ cButton torusButton;
	5654	+ cButton superButton;
	5655	+ cButton kleinButton;
	5656	+ cButton particlesButton;
	5657	+ cButton overlayButton;
	5658	+ cButton lightButton;
5051	5659
5052	5660	cButton screenfitButton;
5053	5661	cButton screenfitpointButton;
..	..	@@ -5060,14 +5668,6 @@
5060	5668
5061	5669	cButton setsupportButton;
5062	5670
5063		- cButton twoButton;
5064		- cButton sixButton;
5065		- cButton threeButton;
5066		- cButton sevenButton;
5067		- cButton fourButton; // full panel
5068		- cButton oneButton; // full XYZ
5069		- //cButton currentLayout;
5070		-
5071	5671	//
5072	5672	//Composite
5073	5673	Object3D // to do !!
..	..	@@ -5077,9 +5677,11 @@
5077	5677	//JTree jTree;
5078	5678	private MenuItem lookAtItem;
5079	5679	private MenuItem lookFromItem;
5080		- private MenuItem switchItem;
	5680	+ private MenuItem switchViewItem;
5081	5681	private MenuItem cutItem;
5082		- private MenuItem duplicateItem;
	5682	+ private MenuItem undoItem;
	5683	+ private MenuItem redoItem;
	5684	+ private JMenuItem duplicateItem;
5083	5685	private MenuItem cloneItem;
5084	5686	private MenuItem cloneSupportItem;
5085	5687	private MenuItem overwriteGeoItem;
..	..	@@ -5092,7 +5694,7 @@
5092	5694	private MenuItem linkverticesItem;
5093	5695	private MenuItem relinkverticesItem;
5094	5696	private MenuItem setMasterItem;
5095		- private MenuItem resetMeshItem;
	5697	+ private MenuItem resetAllItem;
5096	5698	private MenuItem stepAllItem;
5097	5699	private MenuItem revertMeshItem;
5098	5700	private MenuItem poseMeshItem;
..	..	@@ -5107,7 +5709,7 @@
5107	5709	private MenuItem pasteLinkItem;
5108	5710	private MenuItem pasteCloneItem;
5109	5711	private MenuItem pasteExpandItem;
5110		- private MenuItem clearItem;
	5712	+ private MenuItem deleteItem;
5111	5713	private MenuItem clearAllItem;
5112	5714	private MenuItem genUVItem;
5113	5715	private MenuItem genNormalsMESHItem;
..	..	@@ -5142,6 +5744,10 @@
5142	5744	private MenuItem showleavesItem;
5143	5745	private MenuItem markleavesItem;
5144	5746	private MenuItem unmarkleavesItem;
	5747	+ private MenuItem rewindleavesItem;
	5748	+ private MenuItem unrewindleavesItem;
	5749	+ private MenuItem randomleavesItem;
	5750	+ private MenuItem unrandomleavesItem;
5145	5751
5146	5752	private MenuItem flipVItem;
5147	5753	private MenuItem unflipVItem;
..	..	@@ -5153,15 +5759,17 @@
5153	5759	private MenuItem panoTexturesItem;
5154	5760
5155	5761	private MenuItem resetCentroidItem;
5156		- private MenuItem transformgeometryItem;
	5762	+ private MenuItem resetCentroidXZItem;
5157	5763	private MenuItem resetTransformItem;
	5764	+ private MenuItem transformGeometryItem;
	5765	+ private MenuItem transformChildrenItem;
5158	5766	private MenuItem hideItem;
5159	5767	private MenuItem grabItem;
5160	5768	private MenuItem backItem;
5161	5769	private MenuItem frontItem;
5162	5770	private MenuItem cameraItem;
5163	5771	private MenuItem compositeItem;
5164		- private MenuItem randomItem;
	5772	+ private MenuItem switchItem;
5165	5773	private MenuItem physicsItem;
5166	5774	private MenuItem frameselectorItem;
5167	5775	private MenuItem scriptNodeItem;
..	..	@@ -5223,11 +5831,6 @@
5223	5831	private MenuItem doubleItem;
5224	5832	private MenuItem tripleItem;
5225	5833
5226		- private MenuItem importGFDItem;
5227		- private MenuItem importVRMLX3DItem;
5228		- private MenuItem import3DSItem;
5229		- private MenuItem importOBJItem;
5230		-
5231	5834	private MenuItem computeAOItem;
5232	5835	private MenuItem recompileItem;
5233	5836	private MenuItem editScriptItem;
..	..	@@ -5237,4 +5840,8 @@
5237	5840	private MenuItem analyzeItem;
5238	5841	private MenuItem dumpItem;
5239	5842	//boolean freezemodel = false;
	5843	+
	5844	+ Menu cameraMenu;
	5845	+ MenuItem editCameraItem;
	5846	+ MenuItem restoreCameraItem;
5240	5847	}