~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,6 +112,7 @@
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)
..	..	@@ -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"));
..	..	@@ -336,7 +435,7 @@
336	435	genNormalsMESHItem.addActionListener(this);
337	436	if (Globals.ADVANCED)
338	437	{
339		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	438	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
340	439	genNormalsMINEItem.addActionListener(this);
341	440	}
342	441	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -372,6 +471,10 @@
372	471	oe.menuBar.add(menu = new Menu("Attributes"));
373	472	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
374	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);
375	478	menu.add("-");
376	479	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
377	480	liveleavesItem.addActionListener(this);
..	..	@@ -392,6 +495,14 @@
392	495	markleavesItem.addActionListener(this);
393	496	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
394	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);
395	506	menu.add("-");
396	507	flipVItem = menu.add(new MenuItem("Flip V"));
397	508	flipVItem.addActionListener(this);
..	..	@@ -443,25 +554,25 @@
443	554	oe.menuBar.add(menu = new Menu("Insert"));
444	555	buildCreateMenu(menu);
445	556
446		- oe.menuBar.add(menu = new Menu("Include"));
447		- importOBJItem = menu.add(new MenuItem("OBJ file..."));
448		- importOBJItem.addActionListener(this);
449		- menu.add("-");
450		- import3DSItem = menu.add(new MenuItem("3DS file..."));
451		- import3DSItem.addActionListener(this);
452		- menu.add("-");
453		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
454		- importVRMLX3DItem.addActionListener(this);
455		- menu.add("-");
456		- importGFDItem = menu.add(new MenuItem("GrafreeD file..."));
457		- importGFDItem.addActionListener(this);
458		-
459	557	oe.menuBar.add(menu = new Menu("Tools"));
460	558	buildToolsMenu(menu);
461	559	}
462	560
	561	+
463	562	void SetupUI2(ObjEditor oe)
464	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	+
465	576	//new Exception().printStackTrace();
466	577
467	578	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -490,27 +601,79 @@
490	601	oe.radioPanel.add(dummyButton);
491	602	oe.buttonGroup.add(dummyButton);
492	603	*/
	604	+ cGridBag copyOptionsPanel = new cGridBag();
	605	+
	606	+ copyOptionsPanel.preferredHeight = 1;
	607	+
493	608	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
494	609
495		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
496		- 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");
497	662	liveCB.addItemListener(this);
498	663
499		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	664	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
500	665	oneStepButton.setToolTipText("Animate one step forward");
501	666	oneStepButton.addActionListener(this);
502	667
503		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	668	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
504	669	fastCB.setToolTipText("Fast mode");
505	670	fastCB.addItemListener(this);
506	671
507		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
508		- trackCB.setToolTipText("Enable tracking");
509		- trackCB.addItemListener(this);
510		-
511		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
512		- screenfitButton.setToolTipText("Screen fit");
513		- 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);
514	677
515	678	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
516	679	// screenfitpointButton.addActionListener(this);
..	..	@@ -522,65 +685,146 @@
522	685	snapobjectButton.setToolTipText("Snap Object");
523	686	}
524	687
525		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
526		- flashSelectionButton.setToolTipText("Show selection");
527		- flashSelectionButton.addActionListener(this);
	688	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
528	689
529		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
530		-
531		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
532		- twoButton.setToolTipText("Show center view only");
533		- twoButton.addActionListener(this);
534		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	690	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
535	691	fourButton.addActionListener(this);
536	692	fourButton.setToolTipText("Show left panel only");
537		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
538		- 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");
539	701	sixButton.addActionListener(this);
540		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
541		- threeButton.setToolTipText("2-column layout right");
542		- threeButton.addActionListener(this);
543		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
544		- sevenButton.setToolTipText("3-column layout");
545		- 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);
546	708	//
547	709
548		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
549		- 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");
550	712	rootButton.addActionListener(this);
551	713
552		- 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);
553	715	closeButton.setToolTipText("Close tab");
554	716	closeButton.addActionListener(this);
555	717	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
556	718	//clearButton.addActionListener(this);
557		-
558		- 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	+ }
559	751
560		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
561		- 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");
562	801	editButton.addActionListener(this);
563	802
564		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
565		- uneditButton.setToolTipText("Unedit selection");
	803	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	804	+ uneditButton.setToolTipText("Remove selection controls");
566	805	uneditButton.addActionListener(this);
567	806
568		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
569		- allParamsButton.setToolTipText("Edit all params");
	807	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	808	+ allParamsButton.setToolTipText("Show all controle");
570	809	allParamsButton.addActionListener(this);
571	810
572		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	811	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
573	812	clearPanelButton.setToolTipText("Clear edit panel");
574	813	clearPanelButton.addActionListener(this);
575	814
576		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	815	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
577	816	unselectButton.setToolTipText("Unselect");
578	817	unselectButton.addActionListener(this);
579	818
580		- 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);
581	822
582		- oe.treePanel.add(commandsPanel);
583		- oe.treePanel.Return();
	823	+ editCommandsPanel.preferredHeight = 1;
	824	+
	825	+ SetPinStates(false);
	826	+// oe.treePanel.add(commandsPanel);
	827	+// oe.treePanel.Return();
584	828
585	829	// oe.aConstraints.gridx += 1;
586	830	// oe.aConstraints.weighty = 0;
..	..	@@ -597,29 +841,17 @@
597	841
598	842	JScrollPane jSP;
599	843	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
600		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	844	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
601	845	ResetModel();
602	846
603	847	oe.treePanel.add(jSPPanel);
604	848	oe.treePanel.Return();
605	849
606		- cGridBag copyOptionsPanel = new cGridBag();
607		-
608		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
609		- colorCB.setToolTipText("Copy color when dropped");
610		- colorCB.addItemListener(this);
611		-
612		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
613		- materialCB.setToolTipText("Copy material when dropped");
614		- materialCB.addItemListener(this);
615		-
616		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
617		- textureCB.setToolTipText("Copy texture when dropped");
618		- textureCB.addItemListener(this);
619		-
620		- copyOptionsPanel.preferredHeight = 1;
621	850	oe.treePanel.add(copyOptionsPanel);
622	851	oe.treePanel.Return();
	852	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	853	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	854	+ sliderPane.preferredHeight = 1;
623	855
624	856	// mainPanel.setDividerLocation(0.5); //1.0);
625	857	// mainPanel.setResizeWeight(0.5);
..	..	@@ -642,29 +874,49 @@
642	874	dgr.addDragGestureListener(this);
643	875	}catch(Exception e) {}
644	876	*/
645		- radio.layout = sevenButton;
	877	+ radio.layout = sixButton; // sevenButton;
646	878	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
647	879	}
648	880
649	881	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
650	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	+
651	897	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
652	898	boxCB.setToolTipText("Display bounding boxes");
653	899	boxCB.addItemListener(this);
654	900
655	901	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
656		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	902	+ zoomBoxCB.setToolTipText("Display only for wheel");
657	903	zoomBoxCB.addItemListener(this);
658	904
659	905	if (true) // Globals.ADVANCED)
660	906	{
661		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
662		- supportCB.setToolTipText("Enable rigging");
663		- 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);
664	914
665	915	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
666	916	// localCB.addItemListener(this);
667	917
	918	+ panel.Return();
	919	+
668	920	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
669	921	crowdCB.setToolTipText("Used for crowds");
670	922	crowdCB.addItemListener(this);
..	..	@@ -681,6 +933,8 @@
681	933	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
682	934	// speakerMocapCB.addItemListener(this);
683	935
	936	+ panel.Return();
	937	+
684	938	if (false)
685	939	{
686	940	// handled in scripts
..	..	@@ -695,42 +949,85 @@
695	949	//constraints.gridy += 1;
696	950	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
697	951	smoothfocusCB.addItemListener(this);
	952	+ panel.Return();
698	953	}
699	954
700	955	//constraints.gridx += 1;
701	956	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
702	957	// debugCB.addItemListener(this);
703	958
	959	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	960	+ trackCB.setToolTipText("Enable tracking target");
	961	+ trackCB.addItemListener(this);
	962	+
704	963	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	964	+ oeilCB.setToolTipText("Move camera when tracking");
705	965	oeilCB.addItemListener(this);
706	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	+ {
707	987	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
708	988	lookAtCB.setToolTipText("Look-at target");
709	989	lookAtCB.addItemListener(this);
	990	+ }
710	991
711	992	}
712	993
713	994	cGridBag fill = new cGridBag();
714		-
715	995	fill.preferredHeight = 200;
	996	+ cGridBag fill2 = new cGridBag();
	997	+ fill2.preferredHeight = 200;
	998	+ cGridBag fill3 = new cGridBag();
	999	+ fill3.preferredHeight = 200;
716	1000
717	1001	panel.add(fill);
	1002	+ panel.add(fill2);
	1003	+ panel.add(fill3);
718	1004
719	1005	}
720	1006
721	1007	void EditObject(Object3D obj)
722	1008	{
723	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	+
724	1018	radioButton.SetObject(obj);
725		- radioButton.layout = sevenButton;
	1019	+ radioButton.layout = sixButton; // sevenButton;
726	1020	radioButton.SetCamera(cameraView.renderCamera, false);
727	1021	radioButton.addActionListener(this);
728	1022	radioPanel.add(radioButton);
729	1023	buttonGroup.add(radioButton);
730	1024	radioButton.doClick();
731	1025	}
	1026	+
732	1027	void SetupViews(ObjEditor oe)
733	1028	{
	1029	+ theFrame = this;
	1030	+
734	1031	oe.SetupViews();
735	1032
736	1033	System.out.println("SetupViews");
..	..	@@ -739,23 +1036,28 @@
739	1036	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
740	1037	}
741	1038
742		- JCheckBox liveCB;
743		- JCheckBox supportCB;
744		- JCheckBox localCB;
745		- JCheckBox crowdCB;
746		- JCheckBox smoothCB;
747		- JCheckBox fastCB;
748		- JCheckBox slowCB;
749		- JCheckBox boxCB;
750		- JCheckBox zoomBoxCB;
751		- JCheckBox trackCB;
752		- 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;
753	1052	// JCheckBox speakerMocapCB;
754		- JCheckBox speakerCameraCB;
755		- JCheckBox speakerFocusCB;
756		- JCheckBox debugCB;
757		- JCheckBox oeilCB;
758		- JCheckBox lookAtCB;
	1053	+ cCheckBox speakerCameraCB;
	1054	+ cCheckBox speakerFocusCB;
	1055	+ cCheckBox debugCB;
	1056	+
	1057	+ cCheckBox oeilCB;
	1058	+ cCheckBox shadowCB;
	1059	+ cCheckBox autokeepCB;
	1060	+ cCheckBox lookAtCB;
759	1061
760	1062	// static int COLOR = 1;
761	1063	// static int MATERIAL = 2;
..	..	@@ -763,9 +1065,9 @@
763	1065
764	1066	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
765	1067
766		- JCheckBox colorCB;
767		- JCheckBox materialCB;
768		- JCheckBox textureCB;
	1068	+ cCheckBox colorCB;
	1069	+ cCheckBox materialCB;
	1070	+ cCheckBox textureCB;
769	1071
770	1072	public void itemStateChanged(ItemEvent e)
771	1073	{
..	..	@@ -793,6 +1095,7 @@
793	1095	} else if(e.getSource() == liveCB)
794	1096	{
795	1097	cameraView.ToggleLive();
	1098	+ refreshContents(false);
796	1099	}
797	1100	else if(e.getSource() == supportCB)
798	1101	{
..	..	@@ -857,6 +1160,18 @@
857	1160	{
858	1161	cameraView.ToggleOeil();
859	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	+ }
860	1175	else if(e.getSource() == lookAtCB)
861	1176	{
862	1177	cameraView.ToggleLookAt();
..	..	@@ -873,7 +1188,8 @@
873	1188
874	1189	/**/
875	1190	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
876		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1191	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1192	+ TreePath path = objEditor.jTree.getSelectionPath();
877	1193	if ((path == null) \|\| (path.getPathCount() <= 1)) {
878	1194	// We can't move the root node or an empty selection
879	1195	return;
..	..	@@ -936,8 +1252,6 @@
936	1252	}
937	1253	}
938	1254
939		- String string = (String) object;
940		-
941	1255	System.out.println("Transfer = " + object + "; drop : " + target);
942	1256	// if( object instanceof java.io.File[])
943	1257	// {
..	..	@@ -945,6 +1259,8 @@
945	1259	// objEditor.DropFile((java.io.File[]) object, true);
946	1260	// return;
947	1261	// }
	1262	+
	1263	+ String string = object.toString();
948	1264
949	1265	// File path for Mac and Windows
950	1266	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -990,23 +1306,33 @@
990	1306
991	1307	assert target == objEditor.jTree;
992	1308	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1309	+ Object3D destinationLeaf;
993	1310	try {
994		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1311	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
995	1312	} catch (Exception e) {
996	1313	System.out.println("destinationPath : " + destinationPath);
997	1314	return;
998	1315	}
999	1316
1000		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1317	+ for (int i=group.selection.size(); --i>=0;)
1001	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	+// {
1002	1328	loadClipboard(true);
1003	1329	objEditor.jTree.setSelectionPath(destinationPath);
1004	1330	pasteInto(false, false);
1005		- } else {
1006		- loadClipboard(false);
1007		- objEditor.jTree.setSelectionPath(destinationPath);
1008		- pasteInto(false, false); // true); // ???
1009		- }
	1331	+// } else {
	1332	+// loadClipboard(false);
	1333	+// objEditor.jTree.setSelectionPath(destinationPath);
	1334	+// pasteInto(false, false); // true); // ???
	1335	+// }
1010	1336	}
1011	1337	public void dropActionChanged(DropTargetDragEvent dtde)
1012	1338	// Called if the user has modified the current drop gesture
..	..	@@ -1111,22 +1437,30 @@
1111	1437	{
1112	1438	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1113	1439	//heightFieldItem.addActionListener(this);
1114		- gridItem = menu.add(new MenuItem("Grid"));
1115		- gridItem.addActionListener(this);
1116		- rectoidItem = menu.add(new MenuItem("Box"));
1117		- rectoidItem.addActionListener(this);
1118		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1119		- ellipsoidItem.addActionListener(this);
1120		- coneItem = menu.add(new MenuItem("Cone"));
1121		- coneItem.addActionListener(this);
1122		- torusItem = menu.add(new MenuItem("Torus"));
1123		- torusItem.addActionListener(this);
1124		- superItem = menu.add(new MenuItem("Superellipsoid"));
1125		- 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	+ {
1126	1458	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1127	1459	kleinItem.addActionListener(this);
1128		- particleItem = menu.add(new MenuItem("Particle system"));
1129		- particleItem.addActionListener(this);
	1460	+ }
	1461	+
	1462	+// particleItem = menu.add(new MenuItem("Particle system"));
	1463	+// particleItem.addActionListener(this);
1130	1464	if (Globals.ADVANCED)
1131	1465	{
1132	1466	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1152,15 +1486,15 @@
1152	1486	}
1153	1487	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1154	1488	bezierItem.addActionListener(this);
1155		- overlayItem = menu.add(new MenuItem("Overlay"));
1156		- overlayItem.addActionListener(this);
1157		- lightItem = menu.add(new MenuItem("Light"));
1158		- 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);
1159	1493	menu.add("-");
1160	1494	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1161	1495	//superLoopItem.addActionListener(this);
1162		- loopItem = menu.add(new MenuItem("Loop"));
1163		- loopItem.addActionListener(this);
	1496	+// loopItem = menu.add(new MenuItem("Loop"));
	1497	+// loopItem.addActionListener(this);
1164	1498	doubleItem = menu.add(new MenuItem("Fork"));
1165	1499	doubleItem.addActionListener(this);
1166	1500	if (Globals.ADVANCED)
..	..	@@ -1176,6 +1510,9 @@
1176	1510	animationItem.addItemListener(this);
1177	1511	animationItem.setState(Globals.ANIMATION);
1178	1512
	1513	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1514	+ archiveItem.addActionListener(this);
	1515	+
1179	1516	menu.add("-");
1180	1517	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1181	1518	parseverticesItem.addActionListener(this);
..	..	@@ -1188,6 +1525,8 @@
1188	1525	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1189	1526	reduce34MorphItem.addActionListener(this);
1190	1527	menu.add("-");
	1528	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1529	+ memoryItem.addActionListener(this);
1191	1530	menu.add(computeAOItem = new MenuItem("Compute AO"));
1192	1531	computeAOItem.addActionListener(this);
1193	1532
..	..	@@ -1196,11 +1535,9 @@
1196	1535	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1197	1536	mirrorItem.addActionListener(this);
1198	1537	menu.add("-");
1199		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1200		- memoryItem.addActionListener(this);
1201	1538	menu.add(analyzeItem = new MenuItem("Analyze"));
1202	1539	analyzeItem.addActionListener(this);
1203		- menu.add(dumpItem = new MenuItem("Dump"));
	1540	+ menu.add(dumpItem = new MenuItem("Print"));
1204	1541	dumpItem.addActionListener(this);
1205	1542	// menu.add(pathItem = new MenuItem("From-to path"));
1206	1543	// pathItem.addActionListener(this);
..	..	@@ -1341,9 +1678,34 @@
1341	1678	shadow.material = new cMaterial(obj.material);
1342	1679	shadow.material.diffuse = 0.0001f;
1343	1680	shadow.material.specular = 0.0001f;
	1681	+ //shadow.projectedVertices[1].x = 300;
1344	1682
1345	1683	makeSomething(shadow);
1346	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	+ }
1347	1709
1348	1710	/**
1349	1711	* applyExample
..	..	@@ -1588,7 +1950,7 @@
1588	1950	{
1589	1951	ScreenFit();
1590	1952	} else
1591		- if (source == switchItem)
	1953	+ if (source == switchViewItem)
1592	1954	{
1593	1955	cVector v1 = new cVector();
1594	1956	cVector v2 = new cVector();
..	..	@@ -1597,11 +1959,11 @@
1597	1959	objEditor.cameraView.renderCamera.setAim(v2, v1);
1598	1960	objEditor.cameraView.repaint();
1599	1961	} else
1600		- if (source == rectoidItem)
	1962	+ if (source == rectoidItem \|\| source == boxButton)
1601	1963	{
1602	1964	makeSomething(new Box());
1603	1965	} else
1604		- if (source == particleItem)
	1966	+ if (source == particleItem \|\| source == particlesButton)
1605	1967	{
1606	1968	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1607	1969	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1680,27 +2042,27 @@
1680	2042
1681	2043	makeSomething(obj);
1682	2044	} else
1683		- if (source == gridItem)
	2045	+ if (source == gridItem \|\| source == gridButton)
1684	2046	{
1685	2047	makeSomething(new Grid());
1686	2048	} else
1687		- if (source == ellipsoidItem)
	2049	+ if (source == ellipsoidItem \|\| source == sphereButton)
1688	2050	{
1689	2051	makeSomething(new Sphere());
1690	2052	} else
1691		- if (source == coneItem)
	2053	+ if (source == coneItem \|\| source == coneButton)
1692	2054	{
1693	2055	makeSomething(new Cone());
1694	2056	} else
1695		- if (source == torusItem)
	2057	+ if (source == torusItem \|\| source == torusButton)
1696	2058	{
1697	2059	makeSomething(new Torus());
1698	2060	} else
1699		- if (source == superItem)
	2061	+ if (source == superItem \|\| source == superButton)
1700	2062	{
1701	2063	makeSomething(new Superellipsoid());
1702	2064	} else
1703		- if (source == kleinItem)
	2065	+ if (source == kleinItem \|\| source == kleinButton)
1704	2066	{
1705	2067	makeSomething(new Klein());
1706	2068	} else
..	..	@@ -1720,7 +2082,7 @@
1720	2082	{
1721	2083	makeSomething(new BezierSurface());
1722	2084	} else
1723		- if (source == overlayItem)
	2085	+ if (source == overlayItem \|\| source == overlayButton)
1724	2086	{
1725	2087	/*
1726	2088	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1768,7 +2130,7 @@
1768	2130	s.setup();
1769	2131	makeSomething(s);
1770	2132	} else
1771		- if (source == lightItem)
	2133	+ if (source == lightItem \|\| source == lightButton)
1772	2134	{
1773	2135	makeSomething(new Light());
1774	2136	} else
..	..	@@ -1818,30 +2180,30 @@
1818	2180
1819	2181	group(g);
1820	2182	} else
1821		- if (source == loopItem)
	2183	+ if (source == loopItem \|\| source == loopButton)
1822	2184	{
1823	2185	Composite csg = new GroupLeaf();
1824	2186	csg.count = 5;
1825	2187	group(csg);
1826		- Composite child = new cGroup();
	2188	+ Composite child = new cGroup("Branch");
1827	2189	csg.addChild(child);
1828	2190	child.addChild(csg);
1829	2191	} else
1830	2192	if (source == doubleItem)
1831	2193	{
1832		- Composite csg = new GroupLeaf();
	2194	+ Composite csg = new GroupLeaf("Fork");
1833	2195	csg.count = 5;
1834	2196	group(csg);
1835		- Composite child = new cGroup();
	2197	+ Composite child = new cGroup("Branch A");
1836	2198	csg.addChild(child);
1837	2199	child.addChild(csg);
1838		- child = new cGroup();
	2200	+ child = new cGroup("Branch B");
1839	2201	csg.addChild(child);
1840	2202	child.addChild(csg);
1841	2203	} else
1842	2204	if (source == tripleItem)
1843	2205	{
1844		- Composite csg = new GroupLeaf();
	2206	+ Composite csg = new GroupLeaf("Trident");
1845	2207	csg.count = 4;
1846	2208	group(csg);
1847	2209	Composite child = new cGroup();
..	..	@@ -1853,31 +2215,6 @@
1853	2215	child = new cGroup();
1854	2216	csg.addChild(child);
1855	2217	child.addChild(csg);
1856		- } else
1857		-
1858		- if (source == importGFDItem)
1859		- {
1860		- ImportGFD();
1861		- } else
1862		- if (source == importVRMLX3DItem)
1863		- {
1864		- ImportVRMLX3D();
1865		- } else
1866		- if (source == import3DSItem)
1867		- {
1868		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1869		- } else
1870		- if (source == importOBJItem)
1871		- {
1872		- //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1873		- FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
1874		- browser.setVisible(true);
1875		- String filename = browser.getFile();
1876		- if (filename != null && filename.length() > 0)
1877		- {
1878		- String fullname = browser.getDirectory() + filename;
1879		- makeSomething(ReadOBJ(fullname), true);
1880		- }
1881	2218	} else
1882	2219	if (source == computeAOItem)
1883	2220	{
..	..	@@ -1916,6 +2253,46 @@
1916	2253	{
1917	2254	DumpObject();
1918	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
1919	2296	if (source == oneStepButton)
1920	2297	{
1921	2298	Globals.ONESTEP = true;
..	..	@@ -1923,17 +2300,14 @@
1923	2300	} else
1924	2301	if (source == screenfitButton)
1925	2302	{
1926		- //Reload(lastConverter, lastFilename, true);
1927	2303	ScreenFit();
1928	2304	} else
1929	2305	if (source == screenfitpointButton)
1930	2306	{
1931		- //Reload(lastConverter, lastFilename, true);
1932	2307	ScreenFitPoint();
1933	2308	} else
1934	2309	if (source == snapobjectButton)
1935	2310	{
1936		- //Reload(lastConverter, lastFilename, true);
1937	2311	SnapObject();
1938	2312	} else
1939	2313	// if (event.getSource() == recompileButton)
..	..	@@ -1969,6 +2343,14 @@
1969	2343	if (source == cutItem \|\| source == clearButton)
1970	2344	{
1971	2345	loadClipboard(true);
	2346	+ } else
	2347	+ if (source == undoItem)
	2348	+ {
	2349	+ Undo();
	2350	+ } else
	2351	+ if (source == redoItem)
	2352	+ {
	2353	+ Redo();
1972	2354	} else
1973	2355	if (source == duplicateItem)
1974	2356	{
..	..	@@ -2281,7 +2663,7 @@
2281	2663	{
2282	2664	RevertMeshes();
2283	2665	} else
2284		- if (source == resetMeshItem)
	2666	+ if (source == resetAllItem)
2285	2667	{
2286	2668	ResetAll();
2287	2669	} else
..	..	@@ -2289,7 +2671,7 @@
2289	2671	{
2290	2672	StepAll();
2291	2673	} else
2292		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	2674	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2293	2675	{
2294	2676	//int indices[] = jList.getSelectedIndices();
2295	2677	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2301,9 +2683,9 @@
2301	2683	{
2302	2684	ClearSelection(true);
2303	2685	} else
2304		- if (source == grabItem)
	2686	+ if (source == grabItem \|\| source == groupButton)
2305	2687	{
2306		- group(new cGroup(), true);
	2688	+ group(new cGroup(), false); // true);
2307	2689	} else
2308	2690	if (source == hideItem)
2309	2691	{
..	..	@@ -2321,11 +2703,11 @@
2321	2703	{
2322	2704	makeSomething(new Camera());
2323	2705	} else
2324		- if (source == compositeItem)
	2706	+ if (source == compositeItem \|\| source == compositeButton)
2325	2707	{
2326	2708	group(new Composite());
2327	2709	} else
2328		- if (source == randomItem)
	2710	+ if (source == switchItem \|\| source == switchButton)
2329	2711	{
2330	2712	RandomNode random = new RandomNode();
2331	2713	group(random);
..	..	@@ -2427,7 +2809,7 @@
2427	2809	{
2428	2810	group(new cLinker());
2429	2811	} else
2430		- if (source == textureItem)
	2812	+ if (source == textureItem \|\| source == textureButton)
2431	2813	{
2432	2814	group(new TextureNode());
2433	2815	} else
..	..	@@ -2447,17 +2829,30 @@
2447	2829	{
2448	2830	CastShadow(2);
2449	2831	} else
2450		- if (source == ungroupItem)
	2832	+ if (source == ungroupItem \|\| source == ungroupButton)
2451	2833	{
2452		- //ungroup();
	2834	+ boolean hasRoot = false;
	2835	+
2453	2836	for (int i=0; i<group.selection.size(); i++)
2454	2837	{
2455		- Ungroup(group.selection.get(i));
	2838	+ if (group.selection.get(i) == group)
	2839	+ {
	2840	+ hasRoot = true;
	2841	+ break;
	2842	+ }
2456	2843	}
2457	2844
2458		- ClearSelection(false);
2459		-
2460		- 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	+ }
2461	2856	} else
2462	2857	if (source == genUVItem)
2463	2858	{
..	..	@@ -2469,7 +2864,7 @@
2469	2864	} else
2470	2865	if (source == genNormalsMESHItem)
2471	2866	{
2472		- GenNormals(true); // TODO
	2867	+ GenNormalsMESH();
2473	2868	} else
2474	2869	if (source == genNormalsORGANItem)
2475	2870	{
..	..	@@ -2534,6 +2929,22 @@
2534	2929	if (source == unmarkleavesItem)
2535	2930	{
2536	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);
2537	2948	} else
2538	2949	if (source == flipVItem)
2539	2950	{
..	..	@@ -2769,6 +3180,10 @@
2769	3180	if (source == twoButton)
2770	3181	{
2771	3182	radio.layout = twoButton;
	3183	+
	3184	+ if (CameraPane.FULLSCREEN)
	3185	+ fullscreenLayout = radio.layout;
	3186	+
2772	3187	// bug
2773	3188	//gridPanel.setDividerLocation(1.0);
2774	3189	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2801,10 +3216,31 @@
2801	3216	bigThree.ClearUI();
2802	3217	bigThree.add(centralPanel);
2803	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	+
2804	3237	} else
2805	3238	if (source == threeButton)
2806	3239	{
2807	3240	radio.layout = threeButton;
	3241	+
	3242	+ if (CameraPane.FULLSCREEN)
	3243	+ fullscreenLayout = radio.layout;
2808	3244
2809	3245	// bigThree.remove(scenePanel);
2810	3246	// bigThree.remove(centralPanel);
..	..	@@ -2837,10 +3273,15 @@
2837	3273	bigThree.add(centralPanel);
2838	3274	bigThree.add(XYZPanel);
2839	3275	bigThree.FlushUI();
	3276	+
	3277	+ cameraView.requestFocusInWindow();
2840	3278	} else
2841	3279	if (source == fourButton)
2842	3280	{
2843	3281	radio.layout = fourButton;
	3282	+
	3283	+ if (CameraPane.FULLSCREEN)
	3284	+ fullscreenLayout = radio.layout;
2844	3285
2845	3286	// bigThree.remove(scenePanel);
2846	3287	// bigThree.remove(centralPanel);
..	..	@@ -2872,10 +3313,15 @@
2872	3313	bigThree.ClearUI();
2873	3314	bigThree.add(scenePanel);
2874	3315	bigThree.FlushUI();
	3316	+
	3317	+ cameraView.requestFocusInWindow();
2875	3318	} else
2876	3319	if (source == sixButton)
2877	3320	{
2878	3321	radio.layout = sixButton;
	3322	+
	3323	+ if (CameraPane.FULLSCREEN)
	3324	+ fullscreenLayout = radio.layout;
2879	3325
2880	3326	// bigThree.remove(scenePanel);
2881	3327	// bigThree.remove(centralPanel);
..	..	@@ -2908,10 +3354,15 @@
2908	3354	bigThree.add(scenePanel);
2909	3355	bigThree.add(centralPanel);
2910	3356	bigThree.FlushUI();
	3357	+
	3358	+ cameraView.requestFocusInWindow();
2911	3359	} else
2912	3360	if (source == sevenButton)
2913	3361	{
2914	3362	radio.layout = sevenButton;
	3363	+
	3364	+ if (CameraPane.FULLSCREEN)
	3365	+ fullscreenLayout = radio.layout;
2915	3366
2916	3367	// bigThree.remove(scenePanel);
2917	3368	// bigThree.remove(centralPanel);
..	..	@@ -2945,6 +3396,8 @@
2945	3396	bigThree.add(centralPanel);
2946	3397	bigThree.add(XYZPanel);
2947	3398	bigThree.FlushUI();
	3399	+
	3400	+ cameraView.requestFocusInWindow();
2948	3401	} else
2949	3402	if (source == rootButton)
2950	3403	{
..	..	@@ -2956,6 +3409,7 @@
2956	3409	EditObject(obj);
2957	3410	}
2958	3411
	3412	+ cameraView.requestFocusInWindow();
2959	3413	refreshContents(true);
2960	3414	} else
2961	3415	if (source == closeButton)
..	..	@@ -2965,22 +3419,37 @@
2965	3419	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2966	3420	{
2967	3421	ab = (cRadio)e.nextElement();
2968		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3422	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2969	3423	{
	3424	+ // Patch to avoid bug with transparency.
	3425	+ if (!ab.hadMaterial)
	3426	+ {
	3427	+ ab.object.material = null;
	3428	+ }
	3429	+
2970	3430	buttonGroup.remove(ab);
2971	3431	radioPanel.remove(ab);
2972	3432
2973		- ab.GetObject().editWindow = null;
	3433	+ //ab.GetObject().editWindow = null;
	3434	+ ab.GetObject().manipWindow = null;
2974	3435	// ab.GetObject().objectUI = null; // ?????????
2975	3436
2976	3437	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2977	3438	break;
2978	3439	}
2979	3440	}
	3441	+
	3442	+ cameraView.requestFocusInWindow();
2980	3443	refreshContents(true);
2981	3444	} else
2982	3445	if (source == editItem \|\| source == editButton)
2983	3446	{
	3447	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3448	+ {
	3449	+ Object3D child = (Object3D)e.nextElement();
	3450	+ child.pinned = true;
	3451	+ }
	3452	+
2984	3453	EditSelection(false);
2985	3454	} else
2986	3455	if (source == uneditButton)
..	..	@@ -2990,10 +3459,11 @@
2990	3459	Object3D child = (Object3D)e.nextElement();
2991	3460	if(child.editWindow != null)
2992	3461	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3462	+ child.pinned = false;
2993	3463	child.CloseUI();
2994	3464	listUI.remove(child);
2995	3465
2996		- child.editWindow = null; // ???????????
	3466	+ //child.editWindow = null; // ???????????
2997	3467	}
2998	3468	objEditor.ctrlPanel.FlushUI();
2999	3469	//objEditor.jTree.clearSelection();
..	..	@@ -3006,6 +3476,7 @@
3006	3476	//copy.ClearUI();
3007	3477	for (Object3D obj : listUI)
3008	3478	{
	3479	+ obj.pinned = false;
3009	3480	obj.CloseUI();
3010	3481	}
3011	3482	listUI.clear();
..	..	@@ -3015,7 +3486,7 @@
3015	3486	{
3016	3487	assert(copy == group);
3017	3488
3018		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3489	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3019	3490
3020	3491	for (Object3D obj : listUI)
3021	3492	{
..	..	@@ -3064,6 +3535,9 @@
3064	3535	}
3065	3536
3066	3537	copy = group;
	3538	+
	3539	+ SetUndoStates();
	3540	+
3067	3541	//Globals.theRenderer.object = group;
3068	3542	if(!useclient)
3069	3543	{
..	..	@@ -3079,20 +3553,46 @@
3079	3553	frontView.object = group;
3080	3554	sideView.object = group;
3081	3555	}
3082		- group.editWindow = this;
	3556	+
	3557	+// fix "+" issue
	3558	+ //group.editWindow = this;
	3559	+ group.manipWindow = this;
	3560	+
3083	3561	/*
3084	3562	currentLayout = radio.layout;
3085	3563	if (currentLayout == null)
3086	3564	currentLayout = sevenButton;
3087	3565	*/
3088	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);
3089	3574	keepparent = group.parent;
3090	3575	// PARENT = NULL or not???
3091	3576	//group.parent = null; // ROOT
3092	3577	//group.attributes = -1;
3093	3578	ResetModel();
	3579	+
	3580	+ cameraView.requestFocusInWindow();
3094	3581	refreshContents(true);
3095		- }
	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	+ }
3096	3596	else
3097	3597	{
3098	3598	//return super.action(event, arg);
..	..	@@ -3101,7 +3601,6 @@
3101	3601	}
3102	3602
3103	3603	boolean useclient = false;
3104		- cRadio radio;
3105	3604
3106	3605	void ToggleRoot()
3107	3606	{
..	..	@@ -3340,7 +3839,8 @@
3340	3839
3341	3840	int size = obj.MemorySize();
3342	3841
3343		- 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)");
3344	3844	}
3345	3845	}
3346	3846	catch (Exception e)
..	..	@@ -3421,6 +3921,13 @@
3421	3921	void GenNormals(boolean crease)
3422	3922	{
3423	3923	group.GenNormalsS(crease);
	3924	+
	3925	+ refreshContents();
	3926	+ }
	3927	+
	3928	+ void GenNormalsMESH()
	3929	+ {
	3930	+ group.GenNormalsMeshS();
3424	3931
3425	3932	refreshContents();
3426	3933	}
..	..	@@ -3652,7 +4159,16 @@
3652	4159	String pigment = Object3D.GetPigment(tex);
3653	4160	//String bump = Object3D.GetBump(tex);
3654	4161
3655		- 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(pigment, false, node.texres);
	4167	+ }
	4168	+ catch (Exception e)
	4169	+ {
	4170	+ System.err.println("FAIL: " + node);
	4171	+ }
3656	4172
3657	4173	double s = v.s;
3658	4174
..	..	@@ -4039,6 +4555,18 @@
4039	4555	refreshContents();
4040	4556	}
4041	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);
	4567	+ refreshContents();
	4568	+ }
	4569	+
4042	4570	void SetTexRes(int tr)
4043	4571	{
4044	4572	group.selection.SetTexRes(tr);
..	..	@@ -4110,28 +4638,25 @@
4110	4638	// }
4111	4639	// }
4112	4640
4113		- static boolean allparams = true;
4114		-
4115		- static Vector<Object3D> listUI = new Vector<Object3D>();
4116		-
4117	4641	void EditSelection(boolean newWindow)
4118	4642	{
	4643	+ if (group.selection == null)
	4644	+ {
	4645	+ EditElement(group, newWindow); // ? new
	4646	+ return;
	4647	+ }
	4648	+
4119	4649	// aConstraints.gridy = 0;
4120	4650	for (int i=0; i<group.selection.size(); i++)
4121	4651	{
4122	4652	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4123	4653	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4124		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4654	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4125	4655
4126	4656	Object3D elem = (Object3D)group.selection.elementAt(i);
4127		- if(elem != group)
	4657	+ if(elem != group \|\| !newWindow)
4128	4658	{
4129		- // if (!(elem instanceof Composite))
4130		- // newWindow = false;
4131		- listUI.add(elem);
4132		- elem.openEditWindow(this, newWindow); //, false);
4133		- System.out.println("edit : " + elem);
4134		- elem.editWindow.refreshContents(true); // ? new
	4659	+ EditElement(elem, newWindow); // ? new
4135	4660	}
4136	4661	}
4137	4662	}
..	..	@@ -4206,7 +4731,8 @@
4206	4731	//new Exception().printStackTrace();
4207	4732
4208	4733	freezemodel = true;
4209		-
	4734	+ ClearUnpinned();
	4735	+
4210	4736	/**/
4211	4737	//switch (event.id)
4212	4738	{
..	..	@@ -4214,7 +4740,6 @@
4214	4740	//case 702: // Event.LIST_DESELECT
4215	4741	group.deselectAll();
4216	4742	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4217		- objEditor.ClearInfo(); // .GetMaterial());
4218	4743	if (tps != null)
4219	4744	{
4220	4745	for (int i=0; i < tps.length; i++)
..	..	@@ -4223,10 +4748,8 @@
4223	4748
4224	4749	//if (child.parent != null)
4225	4750	//child.parent.addSelectee(child);
	4751	+ objEditor.SetMaterial(child);
4226	4752	group.addSelectee(child);
4227		- objEditor.SetMaterial(child); // .GetMaterial());
4228		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4229		- System.err.println("info : " + child.GetPath());
4230	4753	}
4231	4754	}
4232	4755	// else
..	..	@@ -4236,20 +4759,28 @@
4236	4759	// System.err.println("info : " + group.GetPath());
4237	4760	// }
4238	4761
4239		- objEditor.SetText(); // jan 2014
4240		-
4241		- 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))
4242	4763	CameraPane.flash = true;
4243	4764
4244		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4765	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4245	4766	// a camera
4246	4767	{
4247		- CameraPane.camerachangeframe = 0; // don't refuse it
4248		- 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	+ }
4249	4773	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4250	4774	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4251	4775	}
4252	4776
	4777	+ if (tps != null && tps.length == 1)
	4778	+ {
	4779	+ EditSelection(false);
	4780	+ }
	4781	+
	4782	+ SetPinStates(tps != null && tps.length > 0);
	4783	+
4253	4784	refreshContents();
4254	4785	//return true;
4255	4786	}
..	..	@@ -4258,6 +4789,35 @@
4258	4789
4259	4790	freezemodel = false;
4260	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	+ }
4261	4821
4262	4822	void linkSomething(Object3D thing)
4263	4823	{
..	..	@@ -4329,6 +4889,7 @@
4329	4889	{
4330	4890	if (group.selection.isEmpty())
4331	4891	return;
	4892	+
4332	4893	Grafreed.clipboardIsTempGroup = false;
4333	4894	Composite tGroup = null;
4334	4895	if (group.selection.size() > 0) // 1)
..	..	@@ -4339,6 +4900,8 @@
4339	4900
4340	4901	if (cut)
4341	4902	{
	4903	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	4904	+// Save();
4342	4905	//int indices[] = jList.getSelectedIndices();
4343	4906	//for (int i = indices.length - 1; i >= 0; i--)
4344	4907	//jList.remove(indices[i]);
..	..	@@ -4428,8 +4991,10 @@
4428	4991	}
4429	4992
4430	4993	}
	4994	+
4431	4995	if (Grafreed.clipboardIsTempGroup)
4432	4996	Grafreed.clipboard = tGroup;
	4997	+
4433	4998	if (cut)
4434	4999	{
4435	5000	ResetModel();
..	..	@@ -4439,6 +5004,10 @@
4439	5004
4440	5005	void paste(boolean expand)
4441	5006	{
	5007	+ if (Globals.REPLACEONMAKE)
	5008	+ Save();
	5009	+ boolean keep = Globals.REPLACEONMAKE;
	5010	+ Globals.REPLACEONMAKE = false;
4442	5011	// if (GrafreeD.clipboard == null)
4443	5012	// return;
4444	5013	boolean first = true;
..	..	@@ -4498,6 +5067,7 @@
4498	5067	Grafreed.clipboard.get(0).parent = keepparent;
4499	5068	}
4500	5069
	5070	+ Globals.REPLACEONMAKE = keep;
4501	5071	ResetModel();
4502	5072	refreshContents();
4503	5073	}
..	..	@@ -4633,6 +5203,10 @@
4633	5203
4634	5204	void group(Object3D csg, boolean grab)
4635	5205	{
	5206	+ if (Globals.REPLACEONMAKE)
	5207	+ Save();
	5208	+ boolean keep = Globals.REPLACEONMAKE;
	5209	+ Globals.REPLACEONMAKE = false;
4636	5210	if (//false) // why??
4637	5211	!group.selection.isEmpty())
4638	5212	{
..	..	@@ -4746,10 +5320,15 @@
4746	5320	//node.add(csg);
4747	5321	//makeSomething(node);
4748	5322	makeSomething(csg);
	5323	+ Globals.REPLACEONMAKE = keep;
4749	5324	}
4750	5325
4751	5326	void Ungroup(Object3D g)
4752	5327	{
	5328	+ if (Globals.REPLACEONMAKE)
	5329	+ Save();
	5330	+ boolean keep = Globals.REPLACEONMAKE;
	5331	+ Globals.REPLACEONMAKE = false;
4753	5332	if (g instanceof HiddenObject)
4754	5333	{
4755	5334	HiddenObject h = (HiddenObject) g;
..	..	@@ -4766,6 +5345,7 @@
4766	5345	objEditor.makeSomething(g.get(i), false);
4767	5346	}
4768	5347	}
	5348	+ Globals.REPLACEONMAKE = keep;
4769	5349	}
4770	5350
4771	5351	void ungroup()
..	..	@@ -4961,21 +5541,6 @@
4961	5541	}
4962	5542	*/
4963	5543
4964		- void ImportGFD()
4965		- {
4966		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4967		- browser.show();
4968		- String filename = browser.getFile();
4969		- if (filename != null && filename.length() > 0)
4970		- {
4971		- String fullname = browser.getDirectory() + filename;
4972		-
4973		- //Object3D readobj =
4974		- objEditor.ReadGFD(fullname, objEditor);
4975		- //makeSomething(readobj);
4976		- }
4977		- }
4978		-
4979	5544	/*
4980	5545	public void Callback(Object obj)
4981	5546	{
..	..	@@ -4999,23 +5564,6 @@
4999	5564	}
5000	5565	*/
5001	5566
5002		- void ImportVRMLX3D()
5003		- {
5004		- if (Grafreed.standAlone)
5005		- {
5006		- /**/
5007		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
5008		- browser.show();
5009		- String filename = browser.getFile();
5010		- if (filename != null && filename.length() > 0)
5011		- {
5012		- String fullname = browser.getDirectory() + filename;
5013		- LoadVRMLX3D(fullname);
5014		- }
5015		- /**/
5016		- }
5017		- }
5018		-
5019	5567	String GetFile(String dialogName)
5020	5568	{
5021	5569	if (Grafreed.standAlone)
..	..	@@ -5086,7 +5634,28 @@
5086	5634	cButton clearpanelButton;
5087	5635	cButton unselectButton;
5088	5636
	5637	+ cButton restoreCameraButton;
	5638	+
	5639	+ cButton saveButton;
5089	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;
5090	5659
5091	5660	cButton screenfitButton;
5092	5661	cButton screenfitpointButton;
..	..	@@ -5099,14 +5668,6 @@
5099	5668
5100	5669	cButton setsupportButton;
5101	5670
5102		- cButton twoButton;
5103		- cButton sixButton;
5104		- cButton threeButton;
5105		- cButton sevenButton;
5106		- cButton fourButton; // full panel
5107		- cButton oneButton; // full XYZ
5108		- //cButton currentLayout;
5109		-
5110	5671	//
5111	5672	//Composite
5112	5673	Object3D // to do !!
..	..	@@ -5116,9 +5677,11 @@
5116	5677	//JTree jTree;
5117	5678	private MenuItem lookAtItem;
5118	5679	private MenuItem lookFromItem;
5119		- private MenuItem switchItem;
	5680	+ private MenuItem switchViewItem;
5120	5681	private MenuItem cutItem;
5121		- private MenuItem duplicateItem;
	5682	+ private MenuItem undoItem;
	5683	+ private MenuItem redoItem;
	5684	+ private JMenuItem duplicateItem;
5122	5685	private MenuItem cloneItem;
5123	5686	private MenuItem cloneSupportItem;
5124	5687	private MenuItem overwriteGeoItem;
..	..	@@ -5131,7 +5694,7 @@
5131	5694	private MenuItem linkverticesItem;
5132	5695	private MenuItem relinkverticesItem;
5133	5696	private MenuItem setMasterItem;
5134		- private MenuItem resetMeshItem;
	5697	+ private MenuItem resetAllItem;
5135	5698	private MenuItem stepAllItem;
5136	5699	private MenuItem revertMeshItem;
5137	5700	private MenuItem poseMeshItem;
..	..	@@ -5146,7 +5709,7 @@
5146	5709	private MenuItem pasteLinkItem;
5147	5710	private MenuItem pasteCloneItem;
5148	5711	private MenuItem pasteExpandItem;
5149		- private MenuItem clearItem;
	5712	+ private MenuItem deleteItem;
5150	5713	private MenuItem clearAllItem;
5151	5714	private MenuItem genUVItem;
5152	5715	private MenuItem genNormalsMESHItem;
..	..	@@ -5181,6 +5744,10 @@
5181	5744	private MenuItem showleavesItem;
5182	5745	private MenuItem markleavesItem;
5183	5746	private MenuItem unmarkleavesItem;
	5747	+ private MenuItem rewindleavesItem;
	5748	+ private MenuItem unrewindleavesItem;
	5749	+ private MenuItem randomleavesItem;
	5750	+ private MenuItem unrandomleavesItem;
5184	5751
5185	5752	private MenuItem flipVItem;
5186	5753	private MenuItem unflipVItem;
..	..	@@ -5202,7 +5769,7 @@
5202	5769	private MenuItem frontItem;
5203	5770	private MenuItem cameraItem;
5204	5771	private MenuItem compositeItem;
5205		- private MenuItem randomItem;
	5772	+ private MenuItem switchItem;
5206	5773	private MenuItem physicsItem;
5207	5774	private MenuItem frameselectorItem;
5208	5775	private MenuItem scriptNodeItem;
..	..	@@ -5264,11 +5831,6 @@
5264	5831	private MenuItem doubleItem;
5265	5832	private MenuItem tripleItem;
5266	5833
5267		- private MenuItem importGFDItem;
5268		- private MenuItem importVRMLX3DItem;
5269		- private MenuItem import3DSItem;
5270		- private MenuItem importOBJItem;
5271		-
5272	5834	private MenuItem computeAOItem;
5273	5835	private MenuItem recompileItem;
5274	5836	private MenuItem editScriptItem;
..	..	@@ -5278,4 +5840,8 @@
5278	5840	private MenuItem analyzeItem;
5279	5841	private MenuItem dumpItem;
5280	5842	//boolean freezemodel = false;
	5843	+
	5844	+ Menu cameraMenu;
	5845	+ MenuItem editCameraItem;
	5846	+ MenuItem restoreCameraItem;
5281	5847	}