~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	}
..	..	@@ -80,10 +86,22 @@
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)
..	..	@@ -150,11 +169,19 @@
150	169
151	170	void SetupMenu2(GroupEditor oe)
152	171	{
	172	+ oe.jTree = new cTree();
	173	+
153	174	Menu menu;
154	175	oe.menuBar.add(menu = new Menu("Edit"));
155	176	//editItem = menu.add(new MenuItem("Edit"));
156	177	//editItem.addActionListener(this);
157		- 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"));
158	185	duplicateItem.addActionListener(this);
159	186	cloneItem = menu.add(new MenuItem("Clone"));
160	187	cloneItem.addActionListener(this);
..	..	@@ -170,7 +197,6 @@
170	197	copyItem.addActionListener(this);
171	198	pasteItem = menu.add(new MenuItem("Paste"));
172	199	pasteItem.addActionListener(this);
173		- menu.add("-");
174	200
175	201	menu.add("-");
176	202	pasteIntoItem = menu.add(new MenuItem("Paste into"));
..	..	@@ -182,8 +208,8 @@
182	208	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
183	209	// pasteExpandItem.addActionListener(this);
184	210	menu.add("-");
185		- clearItem = menu.add(new MenuItem("Clear"));
186		- clearItem.addActionListener(this);
	211	+ deleteItem = menu.add(new MenuItem("Delete"));
	212	+ deleteItem.addActionListener(this);
187	213
188	214	if (Globals.ADVANCED)
189	215	{
..	..	@@ -197,23 +223,23 @@
197	223	//zBufferItem.addActionListener(this);
198	224	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
199	225	//normalLensItem.addActionListener(this);
200		- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
201		- revertCameraItem.addActionListener(this);
	226	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	227	+ restoreCameraItem.addActionListener(this);
202	228
203		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
204		- toggleFullScreenItem.addItemListener(this);
205		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
206		- cameraMenu.add("-");
	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);
207	241
208		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
209		- toggleTextureItem.addItemListener(this);
210		- toggleTextureItem.setState(CameraPane.textureon);
211		-
212		- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
213		- toggleSwitchItem.addItemListener(this);
214		- toggleSwitchItem.setState(CameraPane.SWITCH);
215		-
216		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	242	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
217	243	toggleHandleItem.addItemListener(this);
218	244	toggleHandleItem.setState(CameraPane.HANDLES);
219	245
..	..	@@ -240,7 +266,7 @@
240	266
241	267	cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
242	268	toggleDebugItem.addItemListener(this);
243		- toggleDebugItem.setState(CameraPane.DEBUG);
	269	+ toggleDebugItem.setState(Globals.DEBUG);
244	270
245	271	cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
246	272	toggleFrustumItem.addItemListener(this);
..	..	@@ -261,14 +287,14 @@
261	287	// animationItem.addItemListener(this);
262	288	// animationItem.setState(CameraPane.ANIMATION);
263	289	cameraMenu.add("-");
264		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
	290	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
265	291	editCameraItem.addActionListener(this);
266	292
267	293	if (Globals.ADVANCED)
268	294	{
269	295	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
270	296	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
271		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
	297	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
272	298	editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
273	299	oe.cameraMenu.add("-");
274	300	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
..	..	@@ -276,7 +302,7 @@
276	302	editLeafItem.addActionListener(this);
277	303	lookAtItem.addActionListener(this);
278	304	//lookFromItem.addActinoListener(this);
279		- //switchItem.addActionListener(this);
	305	+ //switchViewItem.addActionListener(this);
280	306	}
281	307
282	308	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -321,21 +347,29 @@
321	347	}
322	348
323	349	oe.menuBar.add(menu = new Menu("Group"));
324		- grabItem = menu.add(new MenuItem("Grab"));
325		- grabItem.addActionListener(this);
	350	+// grabItem = menu.add(new MenuItem("Grab"));
	351	+// grabItem.addActionListener(this);
326	352	backItem = menu.add(new MenuItem("Back"));
327	353	backItem.addActionListener(this);
328	354	frontItem = menu.add(new MenuItem("Front"));
329	355	frontItem.addActionListener(this);
330		- compositeItem = menu.add(new MenuItem("Composite"));
331		- compositeItem.addActionListener(this);
	356	+// compositeItem = menu.add(new MenuItem("Composite"));
	357	+// compositeItem.addActionListener(this);
	358	+
	359	+ if (Globals.ADVANCED)
	360	+ {
332	361	hideItem = menu.add(new MenuItem("Hidden Group"));
333	362	hideItem.addActionListener(this);
	363	+ }
334	364	ungroupItem = menu.add(new MenuItem("Ungroup"));
335	365	ungroupItem.addActionListener(this);
336		- menu.add("-");
337		- randomItem = menu.add(new MenuItem("Switch node"));
338		- 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	+ {
339	373	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
340	374	switchGeoItem.addActionListener(this);
341	375	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -343,8 +377,6 @@
343	377	morphItem = menu.add(new MenuItem("Morph Group"));
344	378	morphItem.addActionListener(this);
345	379
346		- if (Globals.ADVANCED)
347		- {
348	380	menu.add("-");
349	381	physicsItem = menu.add(new MenuItem("Physics"));
350	382	physicsItem.addActionListener(this);
..	..	@@ -352,30 +384,29 @@
352	384	frameselectorItem.addActionListener(this);
353	385	scriptNodeItem = menu.add(new MenuItem("Script Node"));
354	386	scriptNodeItem.addActionListener(this);
355		- cameraItem = menu.add(new MenuItem("Camera"));
356		- cameraItem.addActionListener(this);
357	387	}
358	388
359	389	oe.menuBar.add(menu = new Menu("Object"));
360		- textureItem = menu.add(new MenuItem("Texture"));
361		- textureItem.addActionListener(this);
	390	+// textureItem = menu.add(new MenuItem("Texture"));
	391	+// textureItem.addActionListener(this);
362	392	billboardItem = menu.add(new MenuItem("Billboard"));
363	393	billboardItem.addActionListener(this);
364	394	csgItem = menu.add(new MenuItem("CSG"));
365	395	csgItem.addActionListener(this);
366		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	396	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
367	397	shadowXItem.addActionListener(this);
368		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	398	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
369	399	shadowYItem.addActionListener(this);
370		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	400	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
371	401	shadowZItem.addActionListener(this);
	402	+ attributeItem = menu.add(new MenuItem("Attribute"));
	403	+ attributeItem.addActionListener(this);
	404	+
372	405	if (Globals.ADVANCED)
373	406	{
374	407	menu.add("-");
375	408	linkerItem = menu.add(new MenuItem("Linker"));
376	409	linkerItem.addActionListener(this);
377		- attributeItem = menu.add(new MenuItem("Attribute"));
378		- attributeItem.addActionListener(this);
379	410	templateItem = menu.add(new MenuItem("Template"));
380	411	templateItem.addActionListener(this);
381	412	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -404,7 +435,7 @@
404	435	genNormalsMESHItem.addActionListener(this);
405	436	if (Globals.ADVANCED)
406	437	{
407		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	438	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
408	439	genNormalsMINEItem.addActionListener(this);
409	440	}
410	441	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -464,6 +495,14 @@
464	495	markleavesItem.addActionListener(this);
465	496	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
466	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);
467	506	menu.add("-");
468	507	flipVItem = menu.add(new MenuItem("Flip V"));
469	508	flipVItem.addActionListener(this);
..	..	@@ -489,10 +528,15 @@
489	528	attachBumpItem.addActionListener(this);
490	529	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
491	530	pigmentBumpItem.addActionListener(this);
	531	+ //embedTexturesItem
492	532	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
493	533	detachPigmentItem.addActionListener(this);
494	534	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
495	535	detachBumpItem.addActionListener(this);
	536	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	537	+ embedTexturesItem.addActionListener(this);
	538	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	539	+ deEmbedTexturesItem.addActionListener(this);
496	540	menu.add("-");
497	541	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
498	542	sortbysizeItem.addActionListener(this);
..	..	@@ -519,8 +563,21 @@
519	563	buildToolsMenu(menu);
520	564	}
521	565
	566	+
522	567	void SetupUI2(ObjEditor oe)
523	568	{
	569	+ // June 2019
	570	+ if (oe == null)
	571	+ {
	572	+ //super.SetupUI2(this);
	573	+ //return;
	574	+ }
	575	+
	576	+ if (copy != group)
	577	+ {
	578	+ //super.SetupUI2(this);
	579	+ }
	580	+
524	581	//new Exception().printStackTrace();
525	582
526	583	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -549,27 +606,79 @@
549	606	oe.radioPanel.add(dummyButton);
550	607	oe.buttonGroup.add(dummyButton);
551	608	*/
	609	+ cGridBag copyOptionsPanel = new cGridBag();
	610	+
	611	+ copyOptionsPanel.preferredHeight = 1;
	612	+
552	613	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
553	614
554		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	615	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	616	+ //minButton.setToolTipText("Minimize window");
	617	+ //minButton.addActionListener(this);
	618	+
	619	+ if (Globals.ADVANCED)
	620	+ {
	621	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	622	+ maxButton.setToolTipText("Maximize window");
	623	+ maxButton.addActionListener(this);
	624	+ }
	625	+
	626	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	627	+ fullButton.setToolTipText("Full-screen window");
	628	+ fullButton.addActionListener(this);
	629	+
	630	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	631	+ screenfitButton.setToolTipText("Screen fit");
	632	+ screenfitButton.addActionListener(this);
	633	+
	634	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	635	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	636	+ restoreCameraButton.addActionListener(this);
	637	+
	638	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	639	+ saveButton.setToolTipText("New version");
	640	+ saveButton.addActionListener(this);
	641	+
	642	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	643	+ undoButton.setToolTipText("Previous version");
	644	+ undoButton.addActionListener(this);
	645	+ undoButton.setEnabled(false);
	646	+
	647	+ cGridBag updown = new cGridBag().setVertical(true);
	648	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	649	+ restoreButton.setToolTipText("Restore current");
	650	+ restoreButton.addActionListener(this);
	651	+ restoreButton.setEnabled(false);
	652	+
	653	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	654	+ replaceButton.setToolTipText("Replace current");
	655	+ replaceButton.addActionListener(this);
	656	+ replaceButton.setEnabled(false);
	657	+
	658	+ copyOptionsPanel.add(updown);
	659	+
	660	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	661	+ redoButton.setToolTipText("Next version");
	662	+ redoButton.addActionListener(this);
	663	+ redoButton.setEnabled(false);
	664	+
	665	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
555	666	liveCB.setToolTipText("Enable animation");
556	667	liveCB.addItemListener(this);
557	668
558		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	669	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
559	670	oneStepButton.setToolTipText("Animate one step forward");
560	671	oneStepButton.addActionListener(this);
561	672
562		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	673	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
563	674	fastCB.setToolTipText("Fast mode");
564	675	fastCB.addItemListener(this);
565	676
566		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
567		- trackCB.setToolTipText("Enable tracking");
568		- trackCB.addItemListener(this);
569		-
570		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
571		- screenfitButton.setToolTipText("Screen fit");
572		- screenfitButton.addActionListener(this);
	677	+ //oe.toolboxPanel.Return();
	678	+
	679	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	680	+// trackCB.setToolTipText("Enable tracking");
	681	+// trackCB.addItemListener(this);
573	682
574	683	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
575	684	// screenfitpointButton.addActionListener(this);
..	..	@@ -581,65 +690,146 @@
581	690	snapobjectButton.setToolTipText("Snap Object");
582	691	}
583	692
584		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
585		- flashSelectionButton.setToolTipText("Show selection");
586		- flashSelectionButton.addActionListener(this);
	693	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
587	694
588		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
589		-
590		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
591		- twoButton.setToolTipText("Show center view only");
592		- twoButton.addActionListener(this);
593		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	695	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
594	696	fourButton.addActionListener(this);
595	697	fourButton.setToolTipText("Show left panel only");
596		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
597		- sixButton.setToolTipText("2-column layout left");
	698	+
	699	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	700	+ twoButton.setToolTipText("Show right view only");
	701	+ twoButton.addActionListener(this);
	702	+ this.fullscreenLayout = twoButton;
	703	+
	704	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	705	+ sixButton.setToolTipText("Show left and right");
598	706	sixButton.addActionListener(this);
599		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
600		- threeButton.setToolTipText("2-column layout right");
601		- threeButton.addActionListener(this);
602		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
603		- sevenButton.setToolTipText("3-column layout");
604		- sevenButton.addActionListener(this);
	707	+// oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	708	+// threeButton.setToolTipText("2-column layout right");
	709	+// threeButton.addActionListener(this);
	710	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	711	+// sevenButton.setToolTipText("3-column layout");
	712	+// sevenButton.addActionListener(this);
605	713	//
606	714
607		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
608		- rootButton.setToolTipText("Edit selection in new tab");
	715	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	716	+ rootButton.setToolTipText("Open selection in new tab");
609	717	rootButton.addActionListener(this);
610	718
611		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	719	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
612	720	closeButton.setToolTipText("Close tab");
613	721	closeButton.addActionListener(this);
614	722	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
615	723	//clearButton.addActionListener(this);
616		-
617		- cGridBag commandsPanel = new cGridBag();
	724	+
	725	+ // INSERT
	726	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	727	+ gridButton.setToolTipText("Create grid");
	728	+ gridButton.addActionListener(this);
	729	+
	730	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	731	+ boxButton.setToolTipText("Create box");
	732	+ boxButton.addActionListener(this);
	733	+
	734	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	735	+ sphereButton.setToolTipText("Create sphere");
	736	+ sphereButton.addActionListener(this);
	737	+
	738	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	739	+ coneButton.setToolTipText("Create cone");
	740	+ coneButton.addActionListener(this);
	741	+
	742	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	743	+ torusButton.setToolTipText("Create torus");
	744	+ torusButton.addActionListener(this);
	745	+
	746	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	747	+ superButton.setToolTipText("Create superellipsoid");
	748	+ superButton.addActionListener(this);
	749	+
	750	+ if (Globals.ADVANCED)
	751	+ {
	752	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	753	+ kleinButton.setToolTipText("Create Klein bottle");
	754	+ kleinButton.addActionListener(this);
	755	+ }
618	756
619		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
620		- editButton.setToolTipText("Edit selection");
	757	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	758	+ particlesButton.setToolTipText("Create particle system");
	759	+ particlesButton.addActionListener(this);
	760	+
	761	+ oe.toolboxPanel.Return();
	762	+
	763	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	764	+ groupButton.setToolTipText("Create group");
	765	+ groupButton.addActionListener(this);
	766	+
	767	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	768	+ compositeButton.setToolTipText("Create composite");
	769	+ compositeButton.addActionListener(this);
	770	+
	771	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	772	+ switchButton.setToolTipText("Create item switcher");
	773	+ switchButton.addActionListener(this);
	774	+
	775	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	776	+ loopButton.setToolTipText("Create loop");
	777	+ loopButton.addActionListener(this);
	778	+
	779	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	780	+ textureButton.setToolTipText("Create texture");
	781	+ textureButton.addActionListener(this);
	782	+
	783	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	784	+ overlayButton.setToolTipText("Create overlay");
	785	+ overlayButton.addActionListener(this);
	786	+
	787	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	788	+ lightButton.setToolTipText("Create light");
	789	+ lightButton.addActionListener(this);
	790	+
	791	+ for (int i=6; --i>=0;)
	792	+ {
	793	+ oe.toolboxPanel.Return();
	794	+ oe.toolboxPanel.add(new cGridBag());
	795	+ oe.toolboxPanel.add(new cGridBag());
	796	+ oe.toolboxPanel.add(new cGridBag());
	797	+ oe.toolboxPanel.add(new cGridBag());
	798	+ oe.toolboxPanel.add(new cGridBag());
	799	+ oe.toolboxPanel.add(new cGridBag());
	800	+ oe.toolboxPanel.add(new cGridBag());
	801	+ }
	802	+
	803	+ // EDIT panel
	804	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	805	+ editButton.setToolTipText("Pin selection controls");
621	806	editButton.addActionListener(this);
622	807
623		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
624		- uneditButton.setToolTipText("Unedit selection");
	808	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	809	+ uneditButton.setToolTipText("Remove selection controls");
625	810	uneditButton.addActionListener(this);
626	811
627		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
628		- allParamsButton.setToolTipText("Edit all params");
	812	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	813	+ allParamsButton.setToolTipText("Show all controle");
629	814	allParamsButton.addActionListener(this);
630	815
631		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	816	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
632	817	clearPanelButton.setToolTipText("Clear edit panel");
633	818	clearPanelButton.addActionListener(this);
634	819
635		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	820	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
636	821	unselectButton.setToolTipText("Unselect");
637	822	unselectButton.addActionListener(this);
638	823
639		- commandsPanel.preferredHeight = 1;
	824	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	825	+ flashSelectionButton.setToolTipText("Highlight selection");
	826	+ flashSelectionButton.addActionListener(this);
640	827
641		- oe.treePanel.add(commandsPanel);
642		- oe.treePanel.Return();
	828	+ editCommandsPanel.preferredHeight = 1;
	829	+
	830	+ SetPinStates(false);
	831	+// oe.treePanel.add(commandsPanel);
	832	+// oe.treePanel.Return();
643	833
644	834	// oe.aConstraints.gridx += 1;
645	835	// oe.aConstraints.weighty = 0;
..	..	@@ -656,29 +846,17 @@
656	846
657	847	JScrollPane jSP;
658	848	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
659		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	849	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
660	850	ResetModel();
661	851
662	852	oe.treePanel.add(jSPPanel);
663	853	oe.treePanel.Return();
664	854
665		- cGridBag copyOptionsPanel = new cGridBag();
666		-
667		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
668		- colorCB.setToolTipText("Copy color when dropped");
669		- colorCB.addItemListener(this);
670		-
671		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
672		- materialCB.setToolTipText("Copy material when dropped");
673		- materialCB.addItemListener(this);
674		-
675		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
676		- textureCB.setToolTipText("Copy texture when dropped");
677		- textureCB.addItemListener(this);
678		-
679		- copyOptionsPanel.preferredHeight = 1;
680	855	oe.treePanel.add(copyOptionsPanel);
681	856	oe.treePanel.Return();
	857	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	858	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	859	+ sliderPane.preferredHeight = 1;
682	860
683	861	// mainPanel.setDividerLocation(0.5); //1.0);
684	862	// mainPanel.setResizeWeight(0.5);
..	..	@@ -701,29 +879,49 @@
701	879	dgr.addDragGestureListener(this);
702	880	}catch(Exception e) {}
703	881	*/
704		- radio.layout = sevenButton;
	882	+ radio.layout = sixButton; // sevenButton;
705	883	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
706	884	}
707	885
708	886	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
709	887	{
	888	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	889	+ colorCB.setToolTipText("Copy color when dropped");
	890	+ colorCB.addItemListener(this);
	891	+
	892	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	893	+ materialCB.setToolTipText("Copy material when dropped");
	894	+ materialCB.addItemListener(this);
	895	+
	896	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	897	+ textureCB.setToolTipText("Copy texture when dropped");
	898	+ textureCB.addItemListener(this);
	899	+
	900	+ panel.Return();
	901	+
710	902	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
711	903	boxCB.setToolTipText("Display bounding boxes");
712	904	boxCB.addItemListener(this);
713	905
714	906	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
715		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	907	+ zoomBoxCB.setToolTipText("Display only for wheel");
716	908	zoomBoxCB.addItemListener(this);
717	909
718	910	if (true) // Globals.ADVANCED)
719	911	{
720		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
721		- supportCB.setToolTipText("Enable rigging");
722		- supportCB.addItemListener(this);
	912	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	913	+// supportCB.setToolTipText("Enable rigging");
	914	+// supportCB.addItemListener(this);
	915	+
	916	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	917	+ freezeCB.setToolTipText("Fast moving camera");
	918	+ freezeCB.addItemListener(this);
723	919
724	920	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
725	921	// localCB.addItemListener(this);
726	922
	923	+ panel.Return();
	924	+
727	925	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
728	926	crowdCB.setToolTipText("Used for crowds");
729	927	crowdCB.addItemListener(this);
..	..	@@ -740,6 +938,8 @@
740	938	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
741	939	// speakerMocapCB.addItemListener(this);
742	940
	941	+ panel.Return();
	942	+
743	943	if (false)
744	944	{
745	945	// handled in scripts
..	..	@@ -754,34 +954,74 @@
754	954	//constraints.gridy += 1;
755	955	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
756	956	smoothfocusCB.addItemListener(this);
	957	+ panel.Return();
757	958	}
758	959
759	960	//constraints.gridx += 1;
760	961	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
761	962	// debugCB.addItemListener(this);
762	963
	964	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	965	+ trackCB.setToolTipText("Enable tracking target");
	966	+ trackCB.addItemListener(this);
	967	+
763	968	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	969	+ oeilCB.setToolTipText("Move camera when tracking");
764	970	oeilCB.addItemListener(this);
765	971
	972	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	973	+ shadowCB.setToolTipText("When live compute shadows");
	974	+ shadowCB.addItemListener(this);
	975	+
	976	+ panel.Return();
	977	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	978	+ toggleTextureCB.setToolTipText("Load textures");
	979	+ toggleTextureCB.addItemListener(this);
	980	+
	981	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	982	+ toggleSwitchCB.setToolTipText("Choose a single item");
	983	+ toggleSwitchCB.addItemListener(this);
	984	+
	985	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	986	+ autokeepCB.setToolTipText("On structure change");
	987	+ autokeepCB.addItemListener(this);
	988	+
	989	+ panel.Return();
	990	+ if (Globals.ADVANCED)
	991	+ {
766	992	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
767	993	lookAtCB.setToolTipText("Look-at target");
768	994	lookAtCB.addItemListener(this);
	995	+ }
769	996
770	997	}
771	998
772	999	cGridBag fill = new cGridBag();
773		-
774	1000	fill.preferredHeight = 200;
	1001	+ cGridBag fill2 = new cGridBag();
	1002	+ fill2.preferredHeight = 200;
	1003	+ cGridBag fill3 = new cGridBag();
	1004	+ fill3.preferredHeight = 200;
775	1005
776	1006	panel.add(fill);
	1007	+ panel.add(fill2);
	1008	+ panel.add(fill3);
777	1009
778	1010	}
779	1011
780	1012	void EditObject(Object3D obj)
781	1013	{
782	1014	cRadio radioButton = new cRadio(obj.name);
	1015	+
	1016	+ // June 2019. Patch to avoid bug with transparency.
	1017	+ radioButton.hadMaterial = obj.material != null;
	1018	+ if (!radioButton.hadMaterial)
	1019	+ {
	1020	+ obj.material = new cMaterial();
	1021	+ }
	1022	+
783	1023	radioButton.SetObject(obj);
784		- radioButton.layout = sevenButton;
	1024	+ radioButton.layout = sixButton; // sevenButton;
785	1025	radioButton.SetCamera(cameraView.renderCamera, false);
786	1026	radioButton.addActionListener(this);
787	1027	radioPanel.add(radioButton);
..	..	@@ -791,6 +1031,8 @@
791	1031
792	1032	void SetupViews(ObjEditor oe)
793	1033	{
	1034	+ theFrame = this;
	1035	+
794	1036	oe.SetupViews();
795	1037
796	1038	System.out.println("SetupViews");
..	..	@@ -799,23 +1041,28 @@
799	1041	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
800	1042	}
801	1043
802		- JCheckBox liveCB;
803		- JCheckBox supportCB;
804		- JCheckBox localCB;
805		- JCheckBox crowdCB;
806		- JCheckBox smoothCB;
807		- JCheckBox fastCB;
808		- JCheckBox slowCB;
809		- JCheckBox boxCB;
810		- JCheckBox zoomBoxCB;
811		- JCheckBox trackCB;
812		- JCheckBox smoothfocusCB;
	1044	+ cToggleButton liveCB;
	1045	+ cCheckBox supportCB;
	1046	+ cCheckBox localCB;
	1047	+ cCheckBox crowdCB;
	1048	+ cCheckBox smoothCB;
	1049	+ cToggleButton fastCB;
	1050	+ cCheckBox slowCB;
	1051	+ cCheckBox boxCB;
	1052	+ cCheckBox zoomBoxCB;
	1053	+ cCheckBox freezeCB;
	1054	+ //cToggleButton trackCB;
	1055	+ cCheckBox trackCB;
	1056	+ cCheckBox smoothfocusCB;
813	1057	// JCheckBox speakerMocapCB;
814		- JCheckBox speakerCameraCB;
815		- JCheckBox speakerFocusCB;
816		- JCheckBox debugCB;
817		- JCheckBox oeilCB;
818		- JCheckBox lookAtCB;
	1058	+ cCheckBox speakerCameraCB;
	1059	+ cCheckBox speakerFocusCB;
	1060	+ cCheckBox debugCB;
	1061	+
	1062	+ cCheckBox oeilCB;
	1063	+ cCheckBox shadowCB;
	1064	+ cCheckBox autokeepCB;
	1065	+ cCheckBox lookAtCB;
819	1066
820	1067	// static int COLOR = 1;
821	1068	// static int MATERIAL = 2;
..	..	@@ -823,9 +1070,9 @@
823	1070
824	1071	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
825	1072
826		- JCheckBox colorCB;
827		- JCheckBox materialCB;
828		- JCheckBox textureCB;
	1073	+ cCheckBox colorCB;
	1074	+ cCheckBox materialCB;
	1075	+ cCheckBox textureCB;
829	1076
830	1077	public void itemStateChanged(ItemEvent e)
831	1078	{
..	..	@@ -853,6 +1100,7 @@
853	1100	} else if(e.getSource() == liveCB)
854	1101	{
855	1102	cameraView.ToggleLive();
	1103	+ refreshContents(false);
856	1104	}
857	1105	else if(e.getSource() == supportCB)
858	1106	{
..	..	@@ -917,6 +1165,18 @@
917	1165	{
918	1166	cameraView.ToggleOeil();
919	1167	}
	1168	+ else if(e.getSource() == shadowCB)
	1169	+ {
	1170	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1171	+ }
	1172	+ else if(e.getSource() == freezeCB)
	1173	+ {
	1174	+ Globals.FREEZEONMOVE ^= true;
	1175	+ }
	1176	+ else if(e.getSource() == autokeepCB)
	1177	+ {
	1178	+ Globals.REPLACEONMAKE ^= true;
	1179	+ }
920	1180	else if(e.getSource() == lookAtCB)
921	1181	{
922	1182	cameraView.ToggleLookAt();
..	..	@@ -933,7 +1193,8 @@
933	1193
934	1194	/**/
935	1195	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
936		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1196	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1197	+ TreePath path = objEditor.jTree.getSelectionPath();
937	1198	if ((path == null) \|\| (path.getPathCount() <= 1)) {
938	1199	// We can't move the root node or an empty selection
939	1200	return;
..	..	@@ -996,8 +1257,6 @@
996	1257	}
997	1258	}
998	1259
999		- String string = (String) object;
1000		-
1001	1260	System.out.println("Transfer = " + object + "; drop : " + target);
1002	1261	// if( object instanceof java.io.File[])
1003	1262	// {
..	..	@@ -1005,6 +1264,8 @@
1005	1264	// objEditor.DropFile((java.io.File[]) object, true);
1006	1265	// return;
1007	1266	// }
	1267	+
	1268	+ String string = object.toString();
1008	1269
1009	1270	// File path for Mac and Windows
1010	1271	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1050,23 +1311,33 @@
1050	1311
1051	1312	assert target == objEditor.jTree;
1052	1313	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1314	+ Object3D destinationLeaf;
1053	1315	try {
1054		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1316	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1055	1317	} catch (Exception e) {
1056	1318	System.out.println("destinationPath : " + destinationPath);
1057	1319	return;
1058	1320	}
1059	1321
1060		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1322	+ for (int i=group.selection.size(); --i>=0;)
1061	1323	{
	1324	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1325	+
	1326	+ // Cannot move into itself
	1327	+ if (child == destinationLeaf)
	1328	+ return;
	1329	+ }
	1330	+
	1331	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1332	+// {
1062	1333	loadClipboard(true);
1063	1334	objEditor.jTree.setSelectionPath(destinationPath);
1064	1335	pasteInto(false, false);
1065		- } else {
1066		- loadClipboard(false);
1067		- objEditor.jTree.setSelectionPath(destinationPath);
1068		- pasteInto(false, false); // true); // ???
1069		- }
	1336	+// } else {
	1337	+// loadClipboard(false);
	1338	+// objEditor.jTree.setSelectionPath(destinationPath);
	1339	+// pasteInto(false, false); // true); // ???
	1340	+// }
1070	1341	}
1071	1342	public void dropActionChanged(DropTargetDragEvent dtde)
1072	1343	// Called if the user has modified the current drop gesture
..	..	@@ -1171,22 +1442,30 @@
1171	1442	{
1172	1443	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1173	1444	//heightFieldItem.addActionListener(this);
1174		- gridItem = menu.add(new MenuItem("Grid"));
1175		- gridItem.addActionListener(this);
1176		- rectoidItem = menu.add(new MenuItem("Box"));
1177		- rectoidItem.addActionListener(this);
1178		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1179		- ellipsoidItem.addActionListener(this);
1180		- coneItem = menu.add(new MenuItem("Cone"));
1181		- coneItem.addActionListener(this);
1182		- torusItem = menu.add(new MenuItem("Torus"));
1183		- torusItem.addActionListener(this);
1184		- superItem = menu.add(new MenuItem("Superellipsoid"));
1185		- superItem.addActionListener(this);
	1445	+// gridItem = menu.add(new MenuItem("Grid"));
	1446	+// gridItem.addActionListener(this);
	1447	+// rectoidItem = menu.add(new MenuItem("Box"));
	1448	+// rectoidItem.addActionListener(this);
	1449	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1450	+// ellipsoidItem.addActionListener(this);
	1451	+// coneItem = menu.add(new MenuItem("Cone"));
	1452	+// coneItem.addActionListener(this);
	1453	+// torusItem = menu.add(new MenuItem("Torus"));
	1454	+// torusItem.addActionListener(this);
	1455	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1456	+// superItem.addActionListener(this);
	1457	+
	1458	+ cameraItem = menu.add(new MenuItem("Camera"));
	1459	+ cameraItem.addActionListener(this);
	1460	+
	1461	+ if (!Globals.ADVANCED)
	1462	+ {
1186	1463	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1187	1464	kleinItem.addActionListener(this);
1188		- particleItem = menu.add(new MenuItem("Particle system"));
1189		- particleItem.addActionListener(this);
	1465	+ }
	1466	+
	1467	+// particleItem = menu.add(new MenuItem("Particle system"));
	1468	+// particleItem.addActionListener(this);
1190	1469	if (Globals.ADVANCED)
1191	1470	{
1192	1471	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1212,15 +1491,15 @@
1212	1491	}
1213	1492	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1214	1493	bezierItem.addActionListener(this);
1215		- overlayItem = menu.add(new MenuItem("Overlay"));
1216		- overlayItem.addActionListener(this);
1217		- lightItem = menu.add(new MenuItem("Light"));
1218		- lightItem.addActionListener(this);
	1494	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1495	+// overlayItem.addActionListener(this);
	1496	+// lightItem = menu.add(new MenuItem("Light"));
	1497	+// lightItem.addActionListener(this);
1219	1498	menu.add("-");
1220	1499	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1221	1500	//superLoopItem.addActionListener(this);
1222		- loopItem = menu.add(new MenuItem("Loop"));
1223		- loopItem.addActionListener(this);
	1501	+// loopItem = menu.add(new MenuItem("Loop"));
	1502	+// loopItem.addActionListener(this);
1224	1503	doubleItem = menu.add(new MenuItem("Fork"));
1225	1504	doubleItem.addActionListener(this);
1226	1505	if (Globals.ADVANCED)
..	..	@@ -1236,6 +1515,9 @@
1236	1515	animationItem.addItemListener(this);
1237	1516	animationItem.setState(Globals.ANIMATION);
1238	1517
	1518	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1519	+ archiveItem.addActionListener(this);
	1520	+
1239	1521	menu.add("-");
1240	1522	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1241	1523	parseverticesItem.addActionListener(this);
..	..	@@ -1248,6 +1530,8 @@
1248	1530	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1249	1531	reduce34MorphItem.addActionListener(this);
1250	1532	menu.add("-");
	1533	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1534	+ memoryItem.addActionListener(this);
1251	1535	menu.add(computeAOItem = new MenuItem("Compute AO"));
1252	1536	computeAOItem.addActionListener(this);
1253	1537
..	..	@@ -1256,11 +1540,9 @@
1256	1540	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1257	1541	mirrorItem.addActionListener(this);
1258	1542	menu.add("-");
1259		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1260		- memoryItem.addActionListener(this);
1261	1543	menu.add(analyzeItem = new MenuItem("Analyze"));
1262	1544	analyzeItem.addActionListener(this);
1263		- menu.add(dumpItem = new MenuItem("Dump"));
	1545	+ menu.add(dumpItem = new MenuItem("Print"));
1264	1546	dumpItem.addActionListener(this);
1265	1547	// menu.add(pathItem = new MenuItem("From-to path"));
1266	1548	// pathItem.addActionListener(this);
..	..	@@ -1401,9 +1683,34 @@
1401	1683	shadow.material = new cMaterial(obj.material);
1402	1684	shadow.material.diffuse = 0.0001f;
1403	1685	shadow.material.specular = 0.0001f;
	1686	+ //shadow.projectedVertices[1].x = 300;
1404	1687
1405	1688	makeSomething(shadow);
1406	1689	}
	1690	+
	1691	+ private void ClearUnpinned()
	1692	+ {
	1693	+ //for (Object3D obj : listUI)
	1694	+ for (int i=listUI.size(); --i>=0;)
	1695	+ {
	1696	+ Object3D obj = listUI.elementAt(i);
	1697	+ if (!obj.pinned)
	1698	+ {
	1699	+ obj.CloseUI();
	1700	+ listUI.remove(i);
	1701	+ }
	1702	+ }
	1703	+ }
	1704	+
	1705	+ private void EditElement(Object3D elem, boolean newWindow)
	1706	+ {
	1707	+ // if (!(elem instanceof Composite))
	1708	+ // newWindow = false;
	1709	+ listUI.add(elem);
	1710	+ elem.openEditWindow(this, newWindow); //, false);
	1711	+ System.out.println("edit : " + elem);
	1712	+ elem.editWindow.refreshContents(true); // ? new
	1713	+ }
1407	1714
1408	1715	/**
1409	1716	* applyExample
..	..	@@ -1648,7 +1955,7 @@
1648	1955	{
1649	1956	ScreenFit();
1650	1957	} else
1651		- if (source == switchItem)
	1958	+ if (source == switchViewItem)
1652	1959	{
1653	1960	cVector v1 = new cVector();
1654	1961	cVector v2 = new cVector();
..	..	@@ -1657,11 +1964,11 @@
1657	1964	objEditor.cameraView.renderCamera.setAim(v2, v1);
1658	1965	objEditor.cameraView.repaint();
1659	1966	} else
1660		- if (source == rectoidItem)
	1967	+ if (source == rectoidItem \|\| source == boxButton)
1661	1968	{
1662	1969	makeSomething(new Box());
1663	1970	} else
1664		- if (source == particleItem)
	1971	+ if (source == particleItem \|\| source == particlesButton)
1665	1972	{
1666	1973	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1667	1974	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1740,27 +2047,27 @@
1740	2047
1741	2048	makeSomething(obj);
1742	2049	} else
1743		- if (source == gridItem)
	2050	+ if (source == gridItem \|\| source == gridButton)
1744	2051	{
1745	2052	makeSomething(new Grid());
1746	2053	} else
1747		- if (source == ellipsoidItem)
	2054	+ if (source == ellipsoidItem \|\| source == sphereButton)
1748	2055	{
1749	2056	makeSomething(new Sphere());
1750	2057	} else
1751		- if (source == coneItem)
	2058	+ if (source == coneItem \|\| source == coneButton)
1752	2059	{
1753	2060	makeSomething(new Cone());
1754	2061	} else
1755		- if (source == torusItem)
	2062	+ if (source == torusItem \|\| source == torusButton)
1756	2063	{
1757	2064	makeSomething(new Torus());
1758	2065	} else
1759		- if (source == superItem)
	2066	+ if (source == superItem \|\| source == superButton)
1760	2067	{
1761	2068	makeSomething(new Superellipsoid());
1762	2069	} else
1763		- if (source == kleinItem)
	2070	+ if (source == kleinItem \|\| source == kleinButton)
1764	2071	{
1765	2072	makeSomething(new Klein());
1766	2073	} else
..	..	@@ -1780,7 +2087,7 @@
1780	2087	{
1781	2088	makeSomething(new BezierSurface());
1782	2089	} else
1783		- if (source == overlayItem)
	2090	+ if (source == overlayItem \|\| source == overlayButton)
1784	2091	{
1785	2092	/*
1786	2093	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1828,7 +2135,7 @@
1828	2135	s.setup();
1829	2136	makeSomething(s);
1830	2137	} else
1831		- if (source == lightItem)
	2138	+ if (source == lightItem \|\| source == lightButton)
1832	2139	{
1833	2140	makeSomething(new Light());
1834	2141	} else
..	..	@@ -1878,30 +2185,30 @@
1878	2185
1879	2186	group(g);
1880	2187	} else
1881		- if (source == loopItem)
	2188	+ if (source == loopItem \|\| source == loopButton)
1882	2189	{
1883	2190	Composite csg = new GroupLeaf();
1884	2191	csg.count = 5;
1885	2192	group(csg);
1886		- Composite child = new cGroup();
	2193	+ Composite child = new cGroup("Branch");
1887	2194	csg.addChild(child);
1888	2195	child.addChild(csg);
1889	2196	} else
1890	2197	if (source == doubleItem)
1891	2198	{
1892		- Composite csg = new GroupLeaf();
	2199	+ Composite csg = new GroupLeaf("Fork");
1893	2200	csg.count = 5;
1894	2201	group(csg);
1895		- Composite child = new cGroup();
	2202	+ Composite child = new cGroup("Branch A");
1896	2203	csg.addChild(child);
1897	2204	child.addChild(csg);
1898		- child = new cGroup();
	2205	+ child = new cGroup("Branch B");
1899	2206	csg.addChild(child);
1900	2207	child.addChild(csg);
1901	2208	} else
1902	2209	if (source == tripleItem)
1903	2210	{
1904		- Composite csg = new GroupLeaf();
	2211	+ Composite csg = new GroupLeaf("Trident");
1905	2212	csg.count = 4;
1906	2213	group(csg);
1907	2214	Composite child = new cGroup();
..	..	@@ -1951,6 +2258,46 @@
1951	2258	{
1952	2259	DumpObject();
1953	2260	} else
	2261	+ if (source == minButton)
	2262	+ {
	2263	+ Minimize();
	2264	+ } else
	2265	+ if (source == maxButton)
	2266	+ {
	2267	+ Maximize();
	2268	+ } else
	2269	+ if (source == fullButton)
	2270	+ {
	2271	+ ToggleFullScreen();
	2272	+ } else
	2273	+ if (source == undoButton)
	2274	+ {
	2275	+ // Go to previous version
	2276	+ //if (!Undo())
	2277	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2278	+ Undo();
	2279	+ } else
	2280	+ if (source == restoreButton)
	2281	+ {
	2282	+ // Restore current version
	2283	+ Restore();
	2284	+ } else
	2285	+ if (source == replaceButton)
	2286	+ {
	2287	+ // Overwrite current version
	2288	+ Replace();
	2289	+ } else
	2290	+ if (source == redoButton)
	2291	+ {
	2292	+ // Go to next version
	2293	+ Redo();
	2294	+ } else
	2295	+ if (source == saveButton)
	2296	+ {
	2297	+ // Save a new version
	2298	+ if (!Save(true))
	2299	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2300	+ } else
1954	2301	if (source == oneStepButton)
1955	2302	{
1956	2303	Globals.ONESTEP = true;
..	..	@@ -1958,17 +2305,14 @@
1958	2305	} else
1959	2306	if (source == screenfitButton)
1960	2307	{
1961		- //Reload(lastConverter, lastFilename, true);
1962	2308	ScreenFit();
1963	2309	} else
1964	2310	if (source == screenfitpointButton)
1965	2311	{
1966		- //Reload(lastConverter, lastFilename, true);
1967	2312	ScreenFitPoint();
1968	2313	} else
1969	2314	if (source == snapobjectButton)
1970	2315	{
1971		- //Reload(lastConverter, lastFilename, true);
1972	2316	SnapObject();
1973	2317	} else
1974	2318	// if (event.getSource() == recompileButton)
..	..	@@ -2004,6 +2348,14 @@
2004	2348	if (source == cutItem \|\| source == clearButton)
2005	2349	{
2006	2350	loadClipboard(true);
	2351	+ } else
	2352	+ if (source == undoItem)
	2353	+ {
	2354	+ Undo();
	2355	+ } else
	2356	+ if (source == redoItem)
	2357	+ {
	2358	+ Redo();
2007	2359	} else
2008	2360	if (source == duplicateItem)
2009	2361	{
..	..	@@ -2324,7 +2676,7 @@
2324	2676	{
2325	2677	StepAll();
2326	2678	} else
2327		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	2679	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2328	2680	{
2329	2681	//int indices[] = jList.getSelectedIndices();
2330	2682	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2336,9 +2688,9 @@
2336	2688	{
2337	2689	ClearSelection(true);
2338	2690	} else
2339		- if (source == grabItem)
	2691	+ if (source == grabItem \|\| source == groupButton)
2340	2692	{
2341		- group(new cGroup(), true);
	2693	+ group(new cGroup(), false); // true);
2342	2694	} else
2343	2695	if (source == hideItem)
2344	2696	{
..	..	@@ -2356,11 +2708,11 @@
2356	2708	{
2357	2709	makeSomething(new Camera());
2358	2710	} else
2359		- if (source == compositeItem)
	2711	+ if (source == compositeItem \|\| source == compositeButton)
2360	2712	{
2361	2713	group(new Composite());
2362	2714	} else
2363		- if (source == randomItem)
	2715	+ if (source == switchItem \|\| source == switchButton)
2364	2716	{
2365	2717	RandomNode random = new RandomNode();
2366	2718	group(random);
..	..	@@ -2462,7 +2814,7 @@
2462	2814	{
2463	2815	group(new cLinker());
2464	2816	} else
2465		- if (source == textureItem)
	2817	+ if (source == textureItem \|\| source == textureButton)
2466	2818	{
2467	2819	group(new TextureNode());
2468	2820	} else
..	..	@@ -2482,17 +2834,30 @@
2482	2834	{
2483	2835	CastShadow(2);
2484	2836	} else
2485		- if (source == ungroupItem)
	2837	+ if (source == ungroupItem \|\| source == ungroupButton)
2486	2838	{
2487		- //ungroup();
	2839	+ boolean hasRoot = false;
	2840	+
2488	2841	for (int i=0; i<group.selection.size(); i++)
2489	2842	{
2490		- Ungroup(group.selection.get(i));
	2843	+ if (group.selection.get(i) == group)
	2844	+ {
	2845	+ hasRoot = true;
	2846	+ break;
	2847	+ }
2491	2848	}
2492	2849
2493		- ClearSelection(false);
2494		-
2495		- refreshContents();
	2850	+ if (!hasRoot)
	2851	+ {
	2852	+ for (int i=0; i<group.selection.size(); i++)
	2853	+ {
	2854	+ Ungroup(group.selection.get(i));
	2855	+ }
	2856	+
	2857	+ ClearSelection(false);
	2858	+
	2859	+ refreshContents();
	2860	+ }
2496	2861	} else
2497	2862	if (source == genUVItem)
2498	2863	{
..	..	@@ -2504,7 +2869,7 @@
2504	2869	} else
2505	2870	if (source == genNormalsMESHItem)
2506	2871	{
2507		- GenNormals(true); // TODO
	2872	+ GenNormalsMESH();
2508	2873	} else
2509	2874	if (source == genNormalsORGANItem)
2510	2875	{
..	..	@@ -2569,6 +2934,22 @@
2569	2934	if (source == unmarkleavesItem)
2570	2935	{
2571	2936	MarkLeaves(false);
	2937	+ } else
	2938	+ if (source == rewindleavesItem)
	2939	+ {
	2940	+ RewindLeaves(true);
	2941	+ } else
	2942	+ if (source == unrewindleavesItem)
	2943	+ {
	2944	+ RewindLeaves(false);
	2945	+ } else
	2946	+ if (source == randomleavesItem)
	2947	+ {
	2948	+ RandomLeaves(true);
	2949	+ } else
	2950	+ if (source == unrandomleavesItem)
	2951	+ {
	2952	+ RandomLeaves(false);
2572	2953	} else
2573	2954	if (source == flipVItem)
2574	2955	{
..	..	@@ -2777,7 +3158,7 @@
2777	3158	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2778	3159	{
2779	3160	obj = (Object3D)e.nextElement();
2780		- obj.SetBumpTexture(null);
	3161	+ obj.ResetBumpTexture();
2781	3162	}
2782	3163
2783	3164	refreshContents();
..	..	@@ -2793,6 +3174,31 @@
2793	3174
2794	3175	refreshContents();
2795	3176	} else
	3177	+ if (source == embedTexturesItem)
	3178	+ {
	3179	+ Object3D obj;
	3180	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3181	+ {
	3182	+ obj = (Object3D)e.nextElement();
	3183	+ obj.EmbedTextures(true);
	3184	+ }
	3185	+
	3186	+ refreshContents();
	3187	+ } else
	3188	+ if (source == deEmbedTexturesItem)
	3189	+ {
	3190	+ Object3D obj;
	3191	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3192	+ {
	3193	+ obj = (Object3D)e.nextElement();
	3194	+ obj.EmbedTextures(false);
	3195	+ }
	3196	+
	3197	+ CameraPane.texturepigment.clear();
	3198	+ CameraPane.texturebump.clear();
	3199	+
	3200	+ refreshContents();
	3201	+ } else
2796	3202	if (source == flashSelectionButton)
2797	3203	{
2798	3204	CameraPane.flash = true;
..	..	@@ -2804,6 +3210,10 @@
2804	3210	if (source == twoButton)
2805	3211	{
2806	3212	radio.layout = twoButton;
	3213	+
	3214	+ if (CameraPane.FULLSCREEN)
	3215	+ fullscreenLayout = radio.layout;
	3216	+
2807	3217	// bug
2808	3218	//gridPanel.setDividerLocation(1.0);
2809	3219	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2836,10 +3246,31 @@
2836	3246	bigThree.ClearUI();
2837	3247	bigThree.add(centralPanel);
2838	3248	bigThree.FlushUI();
	3249	+
	3250	+ cameraView.requestFocusInWindow();
	3251	+
	3252	+// refreshContents(true);
	3253	+//
	3254	+// try
	3255	+// {
	3256	+// java.awt.Robot bot = new java.awt.Robot();
	3257	+// int mask = InputEvent.BUTTON1_MASK;
	3258	+// bot.mouseMove(100, 100);
	3259	+// bot.mousePress(mask);
	3260	+// bot.mouseRelease(mask);
	3261	+// }
	3262	+// catch (Exception e)
	3263	+// {
	3264	+//
	3265	+// }
	3266	+
2839	3267	} else
2840	3268	if (source == threeButton)
2841	3269	{
2842	3270	radio.layout = threeButton;
	3271	+
	3272	+ if (CameraPane.FULLSCREEN)
	3273	+ fullscreenLayout = radio.layout;
2843	3274
2844	3275	// bigThree.remove(scenePanel);
2845	3276	// bigThree.remove(centralPanel);
..	..	@@ -2872,10 +3303,15 @@
2872	3303	bigThree.add(centralPanel);
2873	3304	bigThree.add(XYZPanel);
2874	3305	bigThree.FlushUI();
	3306	+
	3307	+ cameraView.requestFocusInWindow();
2875	3308	} else
2876	3309	if (source == fourButton)
2877	3310	{
2878	3311	radio.layout = fourButton;
	3312	+
	3313	+ if (CameraPane.FULLSCREEN)
	3314	+ fullscreenLayout = radio.layout;
2879	3315
2880	3316	// bigThree.remove(scenePanel);
2881	3317	// bigThree.remove(centralPanel);
..	..	@@ -2907,10 +3343,15 @@
2907	3343	bigThree.ClearUI();
2908	3344	bigThree.add(scenePanel);
2909	3345	bigThree.FlushUI();
	3346	+
	3347	+ cameraView.requestFocusInWindow();
2910	3348	} else
2911	3349	if (source == sixButton)
2912	3350	{
2913	3351	radio.layout = sixButton;
	3352	+
	3353	+ if (CameraPane.FULLSCREEN)
	3354	+ fullscreenLayout = radio.layout;
2914	3355
2915	3356	// bigThree.remove(scenePanel);
2916	3357	// bigThree.remove(centralPanel);
..	..	@@ -2943,10 +3384,15 @@
2943	3384	bigThree.add(scenePanel);
2944	3385	bigThree.add(centralPanel);
2945	3386	bigThree.FlushUI();
	3387	+
	3388	+ cameraView.requestFocusInWindow();
2946	3389	} else
2947	3390	if (source == sevenButton)
2948	3391	{
2949	3392	radio.layout = sevenButton;
	3393	+
	3394	+ if (CameraPane.FULLSCREEN)
	3395	+ fullscreenLayout = radio.layout;
2950	3396
2951	3397	// bigThree.remove(scenePanel);
2952	3398	// bigThree.remove(centralPanel);
..	..	@@ -2980,6 +3426,8 @@
2980	3426	bigThree.add(centralPanel);
2981	3427	bigThree.add(XYZPanel);
2982	3428	bigThree.FlushUI();
	3429	+
	3430	+ cameraView.requestFocusInWindow();
2983	3431	} else
2984	3432	if (source == rootButton)
2985	3433	{
..	..	@@ -2991,6 +3439,7 @@
2991	3439	EditObject(obj);
2992	3440	}
2993	3441
	3442	+ cameraView.requestFocusInWindow();
2994	3443	refreshContents(true);
2995	3444	} else
2996	3445	if (source == closeButton)
..	..	@@ -3000,22 +3449,37 @@
3000	3449	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3001	3450	{
3002	3451	ab = (cRadio)e.nextElement();
3003		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3452	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3004	3453	{
	3454	+ // Patch to avoid bug with transparency.
	3455	+ if (!ab.hadMaterial)
	3456	+ {
	3457	+ ab.object.material = null;
	3458	+ }
	3459	+
3005	3460	buttonGroup.remove(ab);
3006	3461	radioPanel.remove(ab);
3007	3462
3008		- ab.GetObject().editWindow = null;
	3463	+ //ab.GetObject().editWindow = null;
	3464	+ ab.GetObject().manipWindow = null;
3009	3465	// ab.GetObject().objectUI = null; // ?????????
3010	3466
3011	3467	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
3012	3468	break;
3013	3469	}
3014	3470	}
	3471	+
	3472	+ cameraView.requestFocusInWindow();
3015	3473	refreshContents(true);
3016	3474	} else
3017	3475	if (source == editItem \|\| source == editButton)
3018	3476	{
	3477	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3478	+ {
	3479	+ Object3D child = (Object3D)e.nextElement();
	3480	+ child.pinned = true;
	3481	+ }
	3482	+
3019	3483	EditSelection(false);
3020	3484	} else
3021	3485	if (source == uneditButton)
..	..	@@ -3025,10 +3489,11 @@
3025	3489	Object3D child = (Object3D)e.nextElement();
3026	3490	if(child.editWindow != null)
3027	3491	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3492	+ child.pinned = false;
3028	3493	child.CloseUI();
3029	3494	listUI.remove(child);
3030	3495
3031		- child.editWindow = null; // ???????????
	3496	+ //child.editWindow = null; // ???????????
3032	3497	}
3033	3498	objEditor.ctrlPanel.FlushUI();
3034	3499	//objEditor.jTree.clearSelection();
..	..	@@ -3041,6 +3506,7 @@
3041	3506	//copy.ClearUI();
3042	3507	for (Object3D obj : listUI)
3043	3508	{
	3509	+ obj.pinned = false;
3044	3510	obj.CloseUI();
3045	3511	}
3046	3512	listUI.clear();
..	..	@@ -3050,7 +3516,7 @@
3050	3516	{
3051	3517	assert(copy == group);
3052	3518
3053		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3519	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3054	3520
3055	3521	for (Object3D obj : listUI)
3056	3522	{
..	..	@@ -3099,6 +3565,9 @@
3099	3565	}
3100	3566
3101	3567	copy = group;
	3568	+
	3569	+ SetUndoStates();
	3570	+
3102	3571	//Globals.theRenderer.object = group;
3103	3572	if(!useclient)
3104	3573	{
..	..	@@ -3115,7 +3584,9 @@
3115	3584	sideView.object = group;
3116	3585	}
3117	3586
3118		-// fix "+" issue group.editWindow = this;
	3587	+// fix "+" issue
	3588	+ //group.editWindow = this;
	3589	+ group.manipWindow = this;
3119	3590
3120	3591	/*
3121	3592	currentLayout = radio.layout;
..	..	@@ -3123,18 +3594,27 @@
3123	3594	currentLayout = sevenButton;
3124	3595	*/
3125	3596	radio.layout.doClick();
	3597	+
	3598	+ ClearUnpinned();
	3599	+ //Grafreed.Assert(group != null);
	3600	+ //Grafreed.Assert(group.selection != null);
	3601	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	3602	+ if (group.selection == null \|\| group.selection.size() == 1)
	3603	+ EditSelection(false);
3126	3604	keepparent = group.parent;
3127	3605	// PARENT = NULL or not???
3128	3606	//group.parent = null; // ROOT
3129	3607	//group.attributes = -1;
3130	3608	ResetModel();
	3609	+
	3610	+ cameraView.requestFocusInWindow();
3131	3611	refreshContents(true);
3132	3612	} else if (event.getSource() == editCameraItem)
3133	3613	{
3134	3614	cameraView.ProtectCamera();
3135	3615	cameraView.repaint();
3136	3616	return;
3137		- } else if (event.getSource() == revertCameraItem)
	3617	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3138	3618	{
3139	3619	cameraView.RevertCamera();
3140	3620	cameraView.repaint();
..	..	@@ -3151,7 +3631,6 @@
3151	3631	}
3152	3632
3153	3633	boolean useclient = false;
3154		- cRadio radio;
3155	3634
3156	3635	void ToggleRoot()
3157	3636	{
..	..	@@ -3390,7 +3869,8 @@
3390	3869
3391	3870	int size = obj.MemorySize();
3392	3871
3393		- System.err.println((size/1024) + " KB is the size of " + obj);
	3872	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3873	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3394	3874	}
3395	3875	}
3396	3876	catch (Exception e)
..	..	@@ -3471,6 +3951,13 @@
3471	3951	void GenNormals(boolean crease)
3472	3952	{
3473	3953	group.GenNormalsS(crease);
	3954	+
	3955	+ refreshContents();
	3956	+ }
	3957	+
	3958	+ void GenNormalsMESH()
	3959	+ {
	3960	+ group.GenNormalsMeshS();
3474	3961
3475	3962	refreshContents();
3476	3963	}
..	..	@@ -3706,7 +4193,7 @@
3706	4193
3707	4194	try
3708	4195	{
3709		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4196	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
3710	4197	}
3711	4198	catch (Exception e)
3712	4199	{
..	..	@@ -4098,6 +4585,18 @@
4098	4585	refreshContents();
4099	4586	}
4100	4587
	4588	+ void RewindLeaves(boolean hide)
	4589	+ {
	4590	+ group.selection.RewindLeaves(hide);
	4591	+ refreshContents();
	4592	+ }
	4593	+
	4594	+ void RandomLeaves(boolean hide)
	4595	+ {
	4596	+ group.selection.RandomLeaves(hide);
	4597	+ refreshContents();
	4598	+ }
	4599	+
4101	4600	void SetTexRes(int tr)
4102	4601	{
4103	4602	group.selection.SetTexRes(tr);
..	..	@@ -4169,28 +4668,25 @@
4169	4668	// }
4170	4669	// }
4171	4670
4172		- static boolean allparams = true;
4173		-
4174		- static Vector<Object3D> listUI = new Vector<Object3D>();
4175		-
4176	4671	void EditSelection(boolean newWindow)
4177	4672	{
	4673	+ if (group.selection == null)
	4674	+ {
	4675	+ EditElement(group, newWindow); // ? new
	4676	+ return;
	4677	+ }
	4678	+
4178	4679	// aConstraints.gridy = 0;
4179	4680	for (int i=0; i<group.selection.size(); i++)
4180	4681	{
4181	4682	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4182	4683	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4183		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4684	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4184	4685
4185	4686	Object3D elem = (Object3D)group.selection.elementAt(i);
4186	4687	if(elem != group \|\| !newWindow)
4187	4688	{
4188		- // if (!(elem instanceof Composite))
4189		- // newWindow = false;
4190		- listUI.add(elem);
4191		- elem.openEditWindow(this, newWindow); //, false);
4192		- System.out.println("edit : " + elem);
4193		- elem.editWindow.refreshContents(true); // ? new
	4689	+ EditElement(elem, newWindow); // ? new
4194	4690	}
4195	4691	}
4196	4692	}
..	..	@@ -4265,7 +4761,8 @@
4265	4761	//new Exception().printStackTrace();
4266	4762
4267	4763	freezemodel = true;
4268		-
	4764	+ ClearUnpinned();
	4765	+
4269	4766	/**/
4270	4767	//switch (event.id)
4271	4768	{
..	..	@@ -4273,7 +4770,6 @@
4273	4770	//case 702: // Event.LIST_DESELECT
4274	4771	group.deselectAll();
4275	4772	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4276		- objEditor.ClearInfo(); // .GetMaterial());
4277	4773	if (tps != null)
4278	4774	{
4279	4775	for (int i=0; i < tps.length; i++)
..	..	@@ -4282,10 +4778,8 @@
4282	4778
4283	4779	//if (child.parent != null)
4284	4780	//child.parent.addSelectee(child);
	4781	+ objEditor.SetMaterial(child);
4285	4782	group.addSelectee(child);
4286		- objEditor.SetMaterial(child); // .GetMaterial());
4287		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4288		- System.err.println("info : " + child.GetPath());
4289	4783	}
4290	4784	}
4291	4785	// else
..	..	@@ -4295,20 +4789,28 @@
4295	4789	// System.err.println("info : " + group.GetPath());
4296	4790	// }
4297	4791
4298		- objEditor.SetText(); // jan 2014
4299		-
4300		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4792	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4301	4793	CameraPane.flash = true;
4302	4794
4303		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4795	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4304	4796	// a camera
4305	4797	{
4306		- CameraPane.camerachangeframe = 0; // don't refuse it
4307		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4798	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	4799	+ {
	4800	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4801	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4802	+ }
4308	4803	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4309	4804	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4310	4805	}
4311	4806
	4807	+ if (tps != null && tps.length == 1)
	4808	+ {
	4809	+ EditSelection(false);
	4810	+ }
	4811	+
	4812	+ SetPinStates(tps != null && tps.length > 0);
	4813	+
4312	4814	refreshContents();
4313	4815	//return true;
4314	4816	}
..	..	@@ -4317,6 +4819,35 @@
4317	4819
4318	4820	freezemodel = false;
4319	4821	}
	4822	+
	4823	+ void SetPinStates(boolean enabled)
	4824	+ {
	4825	+ editButton.setEnabled(enabled);
	4826	+ uneditButton.setEnabled(enabled);
	4827	+ unselectButton.setEnabled(enabled);
	4828	+ flashSelectionButton.setEnabled(enabled);
	4829	+ }
	4830	+
	4831	+ void refreshContents(boolean cp)
	4832	+ {
	4833	+ if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	4834	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	4835	+ {
	4836	+ objEditor.ClearInfo(); // .GetMaterial());
	4837	+
	4838	+ for (int i=0; i < group.selection.Size(); i++)
	4839	+ {
	4840	+ Object3D child = (Object3D) group.selection.get(i);
	4841	+
	4842	+ objEditor.AddInfo(child, this, true);
	4843	+ System.err.println("info : " + child.GetPath());
	4844	+ }
	4845	+
	4846	+ objEditor.SetText(); // jan 2014
	4847	+ }
	4848	+
	4849	+ super.refreshContents(cp);
	4850	+ }
4320	4851
4321	4852	void linkSomething(Object3D thing)
4322	4853	{
..	..	@@ -4388,6 +4919,7 @@
4388	4919	{
4389	4920	if (group.selection.isEmpty())
4390	4921	return;
	4922	+
4391	4923	Grafreed.clipboardIsTempGroup = false;
4392	4924	Composite tGroup = null;
4393	4925	if (group.selection.size() > 0) // 1)
..	..	@@ -4398,6 +4930,8 @@
4398	4930
4399	4931	if (cut)
4400	4932	{
	4933	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	4934	+// Save();
4401	4935	//int indices[] = jList.getSelectedIndices();
4402	4936	//for (int i = indices.length - 1; i >= 0; i--)
4403	4937	//jList.remove(indices[i]);
..	..	@@ -4487,8 +5021,10 @@
4487	5021	}
4488	5022
4489	5023	}
	5024	+
4490	5025	if (Grafreed.clipboardIsTempGroup)
4491	5026	Grafreed.clipboard = tGroup;
	5027	+
4492	5028	if (cut)
4493	5029	{
4494	5030	ResetModel();
..	..	@@ -4498,6 +5034,10 @@
4498	5034
4499	5035	void paste(boolean expand)
4500	5036	{
	5037	+ if (Globals.REPLACEONMAKE)
	5038	+ Save();
	5039	+ boolean keep = Globals.REPLACEONMAKE;
	5040	+ Globals.REPLACEONMAKE = false;
4501	5041	// if (GrafreeD.clipboard == null)
4502	5042	// return;
4503	5043	boolean first = true;
..	..	@@ -4557,6 +5097,7 @@
4557	5097	Grafreed.clipboard.get(0).parent = keepparent;
4558	5098	}
4559	5099
	5100	+ Globals.REPLACEONMAKE = keep;
4560	5101	ResetModel();
4561	5102	refreshContents();
4562	5103	}
..	..	@@ -4692,6 +5233,10 @@
4692	5233
4693	5234	void group(Object3D csg, boolean grab)
4694	5235	{
	5236	+ if (Globals.REPLACEONMAKE)
	5237	+ Save();
	5238	+ boolean keep = Globals.REPLACEONMAKE;
	5239	+ Globals.REPLACEONMAKE = false;
4695	5240	if (//false) // why??
4696	5241	!group.selection.isEmpty())
4697	5242	{
..	..	@@ -4805,10 +5350,15 @@
4805	5350	//node.add(csg);
4806	5351	//makeSomething(node);
4807	5352	makeSomething(csg);
	5353	+ Globals.REPLACEONMAKE = keep;
4808	5354	}
4809	5355
4810	5356	void Ungroup(Object3D g)
4811	5357	{
	5358	+ if (Globals.REPLACEONMAKE)
	5359	+ Save();
	5360	+ boolean keep = Globals.REPLACEONMAKE;
	5361	+ Globals.REPLACEONMAKE = false;
4812	5362	if (g instanceof HiddenObject)
4813	5363	{
4814	5364	HiddenObject h = (HiddenObject) g;
..	..	@@ -4825,6 +5375,7 @@
4825	5375	objEditor.makeSomething(g.get(i), false);
4826	5376	}
4827	5377	}
	5378	+ Globals.REPLACEONMAKE = keep;
4828	5379	}
4829	5380
4830	5381	void ungroup()
..	..	@@ -5113,7 +5664,28 @@
5113	5664	cButton clearpanelButton;
5114	5665	cButton unselectButton;
5115	5666
	5667	+ cButton restoreCameraButton;
	5668	+
	5669	+ cButton saveButton;
5116	5670	cButton oneStepButton;
	5671	+
	5672	+ cButton groupButton;
	5673	+ cButton ungroupButton;
	5674	+ cButton compositeButton;
	5675	+ cButton switchButton;
	5676	+ cButton loopButton;
	5677	+ cButton textureButton;
	5678	+
	5679	+ cButton gridButton;
	5680	+ cButton boxButton;
	5681	+ cButton sphereButton;
	5682	+ cButton coneButton;
	5683	+ cButton torusButton;
	5684	+ cButton superButton;
	5685	+ cButton kleinButton;
	5686	+ cButton particlesButton;
	5687	+ cButton overlayButton;
	5688	+ cButton lightButton;
5117	5689
5118	5690	cButton screenfitButton;
5119	5691	cButton screenfitpointButton;
..	..	@@ -5126,14 +5698,6 @@
5126	5698
5127	5699	cButton setsupportButton;
5128	5700
5129		- cButton twoButton;
5130		- cButton sixButton;
5131		- cButton threeButton;
5132		- cButton sevenButton;
5133		- cButton fourButton; // full panel
5134		- cButton oneButton; // full XYZ
5135		- //cButton currentLayout;
5136		-
5137	5701	//
5138	5702	//Composite
5139	5703	Object3D // to do !!
..	..	@@ -5143,9 +5707,11 @@
5143	5707	//JTree jTree;
5144	5708	private MenuItem lookAtItem;
5145	5709	private MenuItem lookFromItem;
5146		- private MenuItem switchItem;
	5710	+ private MenuItem switchViewItem;
5147	5711	private MenuItem cutItem;
5148		- private MenuItem duplicateItem;
	5712	+ private MenuItem undoItem;
	5713	+ private MenuItem redoItem;
	5714	+ private JMenuItem duplicateItem;
5149	5715	private MenuItem cloneItem;
5150	5716	private MenuItem cloneSupportItem;
5151	5717	private MenuItem overwriteGeoItem;
..	..	@@ -5173,7 +5739,7 @@
5173	5739	private MenuItem pasteLinkItem;
5174	5740	private MenuItem pasteCloneItem;
5175	5741	private MenuItem pasteExpandItem;
5176		- private MenuItem clearItem;
	5742	+ private MenuItem deleteItem;
5177	5743	private MenuItem clearAllItem;
5178	5744	private MenuItem genUVItem;
5179	5745	private MenuItem genNormalsMESHItem;
..	..	@@ -5208,6 +5774,10 @@
5208	5774	private MenuItem showleavesItem;
5209	5775	private MenuItem markleavesItem;
5210	5776	private MenuItem unmarkleavesItem;
	5777	+ private MenuItem rewindleavesItem;
	5778	+ private MenuItem unrewindleavesItem;
	5779	+ private MenuItem randomleavesItem;
	5780	+ private MenuItem unrandomleavesItem;
5211	5781
5212	5782	private MenuItem flipVItem;
5213	5783	private MenuItem unflipVItem;
..	..	@@ -5229,7 +5799,7 @@
5229	5799	private MenuItem frontItem;
5230	5800	private MenuItem cameraItem;
5231	5801	private MenuItem compositeItem;
5232		- private MenuItem randomItem;
	5802	+ private MenuItem switchItem;
5233	5803	private MenuItem physicsItem;
5234	5804	private MenuItem frameselectorItem;
5235	5805	private MenuItem scriptNodeItem;
..	..	@@ -5253,6 +5823,8 @@
5253	5823	private MenuItem attachBumpItem;
5254	5824	private MenuItem detachBumpItem;
5255	5825	private MenuItem pigmentBumpItem;
	5826	+ private MenuItem embedTexturesItem;
	5827	+ private MenuItem deEmbedTexturesItem;
5256	5828
5257	5829	private MenuItem particleItem;
5258	5830	private MenuItem ragdollItem;
..	..	@@ -5303,5 +5875,5 @@
5303	5875
5304	5876	Menu cameraMenu;
5305	5877	MenuItem editCameraItem;
5306		- MenuItem revertCameraItem;
	5878	+ MenuItem restoreCameraItem;
5307	5879	}