~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -23,6 +23,302 @@
23	23	DragGestureListener, DragSourceListener, DropTargetListener,
24	24	ItemListener // ListSelectionListener
25	25	{
	26	+
	27	+ public void AddSkyboxButton(String f, String s, cGridBag row)
	28	+ {
	29	+ cButton skyboxButton;
	30	+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
	31	+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
	32	+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
	33	+ skyboxButton.setToolTipText(s);
	34	+ skyboxButton.addActionListener(new ActionListener()
	35	+ {
	36	+ @Override
	37	+ public void actionPerformed(ActionEvent e)
	38	+ {
	39	+ ChangeSkybox(path);
	40	+ }
	41	+ });
	42	+ }
	43	+
	44	+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
	45	+ {
	46	+ cGridBag tab0 = new cGridBag().setVertical(true);
	47	+
	48	+ tab0.setName("Urban");
	49	+ skyboxpanel.add(tab0);
	50	+
	51	+ cGridBag row0 = new cGridBag();
	52	+ cGridBag row1 = new cGridBag();
	53	+ cGridBag row2 = new cGridBag();
	54	+ cGridBag row3 = new cGridBag();
	55	+ cGridBag row4 = new cGridBag();
	56	+ cGridBag row5 = new cGridBag();
	57	+ cGridBag row6 = new cGridBag();
	58	+
	59	+ AddSkyboxButton("default", "rgb", row0);
	60	+ //AddSkyboxButton("default", "cornell", row0);
	61	+ AddSkyboxButton("penguins", "dust", row0);
	62	+ AddSkyboxButton("penguins", "tropic", row0);
	63	+ AddSkyboxButton("penguins", "yonder", row0);
	64	+
	65	+ AddSkyboxButton("default", "uffizi", row1);
	66	+ AddSkyboxButton("bridge", "Bridge", row1);
	67	+ AddSkyboxButton("bridge", "Bridge2", row1);
	68	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	69	+
	70	+ AddSkyboxButton("urban", "Parliament", row2);
	71	+ AddSkyboxButton("urban", "Roundabout", row2);
	72	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	73	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	74	+
	75	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	76	+ AddSkyboxButton("urban", "UnionSquare", row3);
	77	+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
	78	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	79	+
	80	+ AddSkyboxButton("park", "Buddha", row4);
	81	+ AddSkyboxButton("park", "CNTower2", row4);
	82	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	83	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	84	+
	85	+ AddSkyboxButton("park", "Park", row5);
	86	+ AddSkyboxButton("park", "Pond", row5);
	87	+ AddSkyboxButton("park", "Skansen", row5);
	88	+ AddSkyboxButton("park", "Skansen2", row5);
	89	+
	90	+ AddSkyboxButton("park", "Skansen3", row6);
	91	+ AddSkyboxButton("park", "Skansen4", row6);
	92	+ AddSkyboxButton("park", "Skansen5", row6);
	93	+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
	94	+
	95	+ tab0.add(row0);
	96	+ tab0.add(row1);
	97	+ tab0.add(row2);
	98	+ tab0.add(row3);
	99	+ tab0.add(row4);
	100	+ tab0.add(row5);
	101	+ tab0.add(row6);
	102	+
	103	+ for (int i=5; --i>=0;)
	104	+ {
	105	+ //oe.toolboxPanel.Return();
	106	+ //tab0.add(new cGridBag());
	107	+ }
	108	+ }
	109	+
	110	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	111	+ {
	112	+ cGridBag tab0 = new cGridBag().setVertical(true);
	113	+
	114	+ tab0.setName("Nature");
	115	+ skyboxpanel.add(tab0);
	116	+
	117	+ cGridBag row0 = new cGridBag();
	118	+ cGridBag row1 = new cGridBag();
	119	+ cGridBag row2 = new cGridBag();
	120	+ cGridBag row3 = new cGridBag();
	121	+ cGridBag row4 = new cGridBag();
	122	+ cGridBag row5 = new cGridBag();
	123	+ cGridBag row6 = new cGridBag();
	124	+
	125	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	126	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	127	+ AddSkyboxButton("beach", "PalmTrees", row0);
	128	+ AddSkyboxButton("beach", "Tenerife", row0);
	129	+
	130	+ AddSkyboxButton("beach", "Tenerife2", row1);
	131	+ AddSkyboxButton("beach", "Tenerife3", row1);
	132	+ AddSkyboxButton("field", "FishPond", row1);
	133	+ AddSkyboxButton("field", "Footballfield", row1);
	134	+
	135	+ AddSkyboxButton("field", "Meadow", row2);
	136	+ AddSkyboxButton("field", "Sorsele", row2);
	137	+ AddSkyboxButton("field", "Sorsele2", row2);
	138	+ AddSkyboxButton("field", "Sorsele3", row2);
	139	+
	140	+ AddSkyboxButton("forest", "Brudslojan", row3);
	141	+ AddSkyboxButton("forest", "Langholmen2", row3);
	142	+ AddSkyboxButton("forest", "Plants", row3);
	143	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	144	+
	145	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	146	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	147	+ AddSkyboxButton("mountain", "Teide", row4);
	148	+ AddSkyboxButton("park", "Tantolunden4", row4);
	149	+
	150	+ AddSkyboxButton("park", "Stairs", row5);
	151	+ AddSkyboxButton("default", "skycube", row6);
	152	+ AddSkyboxButton("rocky", "Langholmen", row5);
	153	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	154	+
	155	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	156	+ AddSkyboxButton("default", "CloudyHills", row6);
	157	+ AddSkyboxButton("daz", "Autumn", row6);
	158	+ AddSkyboxButton("daz", "MountainTrail", row6);
	159	+ /*
	160	+Autumn
	161	+Greenlands
	162	+MountainTrail
	163	+Oasis
	164	+TheRock
	165	+TopOfTheWorld
	166	+Winter
	167	+ */
	168	+
	169	+ tab0.add(row0);
	170	+ tab0.add(row1);
	171	+ tab0.add(row2);
	172	+ tab0.add(row3);
	173	+ tab0.add(row4);
	174	+ tab0.add(row5);
	175	+ tab0.add(row6);
	176	+
	177	+ for (int i=5; --i>=0;)
	178	+ {
	179	+ //oe.toolboxPanel.Return();
	180	+ //tab0.add(new cGridBag());
	181	+ }
	182	+ }
	183	+
	184	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	185	+ {
	186	+ cGridBag tab0 = new cGridBag().setVertical(true);
	187	+
	188	+ tab0.setName("Night");
	189	+ skyboxpanel.add(tab0);
	190	+
	191	+ cGridBag row0 = new cGridBag();
	192	+ cGridBag row1 = new cGridBag();
	193	+ cGridBag row2 = new cGridBag();
	194	+ cGridBag row3 = new cGridBag();
	195	+ cGridBag row4 = new cGridBag();
	196	+ cGridBag row5 = new cGridBag();
	197	+ cGridBag row6 = new cGridBag();
	198	+
	199	+ AddSkyboxButton("night", "NightPath", row0);
	200	+ AddSkyboxButton("night", "PondNight", row0);
	201	+ AddSkyboxButton("night", "Powerlines", row0);
	202	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	203	+
	204	+ AddSkyboxButton("urban", "CNTower", row1);
	205	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	206	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	207	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
	208	+
	209	+ AddSkyboxButton("penguins", "kenon_star", row2);
	210	+ AddSkyboxButton("persson", "corona", row2);
	211	+ AddSkyboxButton("persson", "spaceskybox", row2);
	212	+ AddSkyboxButton("indoors", "Vasa", row2);
	213	+
	214	+ AddSkyboxButton("winter", "Backyard", row3);
	215	+ AddSkyboxButton("winter", "Creek", row3);
	216	+ AddSkyboxButton("winter", "FootballField3", row3);
	217	+ AddSkyboxButton("winter", "Forest", row3);
	218	+
	219	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	220	+ AddSkyboxButton("winter", "House", row4);
	221	+ AddSkyboxButton("winter", "IceLake", row4);
	222	+ AddSkyboxButton("winter", "IceRiver", row4);
	223	+
	224	+ AddSkyboxButton("winter", "Park3", row5);
	225	+ AddSkyboxButton("winter", "PondWinter", row5);
	226	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	227	+ AddSkyboxButton("winter", "Vindelalven", row5);
	228	+
	229	+ AddSkyboxButton("daz", "TheRock", row6);
	230	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	231	+ AddSkyboxButton("daz", "Winter", row6);
	232	+ AddSkyboxButton("mountain", "Ryfjallet", row6);
	233	+
	234	+ tab0.add(row0);
	235	+ tab0.add(row1);
	236	+ tab0.add(row2);
	237	+ tab0.add(row3);
	238	+ tab0.add(row4);
	239	+ tab0.add(row5);
	240	+ tab0.add(row6);
	241	+
	242	+ for (int i=5; --i>=0;)
	243	+ {
	244	+ //oe.toolboxPanel.Return();
	245	+ //tab0.add(new cGridBag());
	246	+ }
	247	+ }
	248	+
	249	+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
	250	+ {
	251	+ cGridBag tab0 = new cGridBag().setVertical(true);
	252	+
	253	+ tab0.setName("Others");
	254	+ skyboxpanel.add(tab0);
	255	+
	256	+ cGridBag row0 = new cGridBag();
	257	+ cGridBag row1 = new cGridBag();
	258	+ cGridBag row2 = new cGridBag();
	259	+ cGridBag row3 = new cGridBag();
	260	+ cGridBag row4 = new cGridBag();
	261	+ cGridBag row5 = new cGridBag();
	262	+ cGridBag row6 = new cGridBag();
	263	+
	264	+ AddSkyboxButton("mayhem", "afterrain", row0);
	265	+ AddSkyboxButton("mayhem", "aqua4", row0);
	266	+ AddSkyboxButton("mayhem", "aqua9", row0);
	267	+ AddSkyboxButton("mayhem", "flame", row0);
	268	+
	269	+ AddSkyboxButton("mayhem", "h2s", row1);
	270	+ AddSkyboxButton("mayhem", "prehistoric", row1);
	271	+ AddSkyboxButton("mayhem", "scorched", row1);
	272	+ AddSkyboxButton("penguins", "desertdawn", row1);
	273	+
	274	+ AddSkyboxButton("persson", "Citadella", row2);
	275	+ AddSkyboxButton("persson", "Citadella2", row2);
	276	+ AddSkyboxButton("persson", "clouds1", row2);
	277	+ AddSkyboxButton("penguins", "wrath", row2);
	278	+
	279	+ AddSkyboxButton("persson", "FishermansBastion", row3);
	280	+ AddSkyboxButton("persson", "HeroesSquare", row3);
	281	+ AddSkyboxButton("indoors", "DallasW", row3);
	282	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
	283	+
	284	+ AddSkyboxButton("persson", "LancellottiChapel", row4);
	285	+ AddSkyboxButton("persson", "PereaBeach1", row4);
	286	+ AddSkyboxButton("persson", "PereaBeach2", row4);
	287	+ AddSkyboxButton("persson", "redeclipse", row4);
	288	+
	289	+ AddSkyboxButton("daz", "Greenlands", row5);
	290	+ AddSkyboxButton("daz", "Oasis", row5);
	291	+ AddSkyboxButton("elyvisions", "arch3", row5);
	292	+ AddSkyboxButton("elyvisions", "calm_sea", row5);
	293	+
	294	+ AddSkyboxButton("elyvisions", "rainbow", row6);
	295	+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
	296	+ AddSkyboxButton("elyvisions", "heaven", row6);
	297	+ AddSkyboxButton("elyvisions", "hot", row6);
	298	+
	299	+ tab0.add(row0);
	300	+ tab0.add(row1);
	301	+ tab0.add(row2);
	302	+ tab0.add(row3);
	303	+ tab0.add(row4);
	304	+ tab0.add(row5);
	305	+ tab0.add(row6);
	306	+
	307	+ for (int i=5; --i>=0;)
	308	+ {
	309	+ //oe.toolboxPanel.Return();
	310	+ //tab0.add(new cGridBag());
	311	+ }
	312	+ }
	313	+
	314	+ public void ChangeSkybox(String name)
	315	+ {
	316	+ //cameraView.envyoff = false;
	317	+ group.skyboxname = name;
	318	+ group.skyboxext = "jpg";
	319	+ cameraView.repaint();
	320	+ }
	321	+
26	322	//ObjEditor objEditor;
27	323	public void closeUI2()
28	324	{
..	..	@@ -60,6 +356,12 @@
60	356	this.copy = this.group = group;
61	357	//selectees = this.group.selectees;
62	358
	359	+ if (copy.versionlist == null)
	360	+ {
	361	+ copy.versionlist = new Object3D[100];
	362	+ copy.versionindex = -1;
	363	+ }
	364	+
63	365	if(ui)
64	366	SetupUI(objEditor);
65	367	}
..	..	@@ -74,16 +376,28 @@
74	376	this.copy = this.group = copy;
75	377	//selectees = this.group.selectees;
76	378
77		- SetupMenu2(objEditor);
	379	+ SetupMenu2(this); //objEditor);
78	380	SetupUI2(objEditor);
79	381	objEditor.SetupUI(true);
80	382	SetupViews(objEditor);
81	383
82	384	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	385	+
	386	+ if (copy.versionlist == null)
	387	+ {
	388	+ copy.versionlist = new Object3D[100];
	389	+ copy.versionindex = -1;
	390	+
	391	+ Save(true);
	392	+ }
83	393	}
84	394
85	395	void CloneSelection(boolean supports)
86	396	{
	397	+ if (Globals.REPLACEONMAKE)
	398	+ Save();
	399	+ boolean keep = Globals.REPLACEONMAKE;
	400	+ Globals.REPLACEONMAKE = false;
87	401	// Object3D keep = GrafreeD.clipboard;
88	402	//Object3D obj;
89	403	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,6 +408,7 @@
94	408
95	409	makeSomething(clone, i==group.selection.size()-1);
96	410	}
	411	+ Globals.REPLACEONMAKE = keep;
97	412	}
98	413
99	414	void CloneClipboard(boolean supports)
..	..	@@ -148,28 +463,21 @@
148	463
149	464	//JTextField nameField;
150	465
151		- void SetupMenu2(ObjEditor oe)
	466	+ void SetupMenu2(GroupEditor oe)
152	467	{
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		-
	468	+ oe.jTree = new cTree();
	469	+
168	470	Menu menu;
169	471	oe.menuBar.add(menu = new Menu("Edit"));
170	472	//editItem = menu.add(new MenuItem("Edit"));
171	473	//editItem.addActionListener(this);
172		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	474	+
	475	+// undoItem = menu.add(new MenuItem("Undo"));
	476	+// undoItem.addActionListener(this);
	477	+// redoItem = menu.add(new MenuItem("Redo"));
	478	+// redoItem.addActionListener(this);
	479	+// menu.add("-");
	480	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
173	481	duplicateItem.addActionListener(this);
174	482	cloneItem = menu.add(new MenuItem("Clone"));
175	483	cloneItem.addActionListener(this);
..	..	@@ -185,7 +493,6 @@
185	493	copyItem.addActionListener(this);
186	494	pasteItem = menu.add(new MenuItem("Paste"));
187	495	pasteItem.addActionListener(this);
188		- menu.add("-");
189	496
190	497	menu.add("-");
191	498	pasteIntoItem = menu.add(new MenuItem("Paste into"));
..	..	@@ -197,8 +504,8 @@
197	504	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
198	505	// pasteExpandItem.addActionListener(this);
199	506	menu.add("-");
200		- clearItem = menu.add(new MenuItem("Clear"));
201		- clearItem.addActionListener(this);
	507	+ deleteItem = menu.add(new MenuItem("Delete"));
	508	+ deleteItem.addActionListener(this);
202	509
203	510	if (Globals.ADVANCED)
204	511	{
..	..	@@ -206,7 +513,94 @@
206	513	clearAllItem = menu.add(new MenuItem("Clear All"));
207	514	clearAllItem.addActionListener(this);
208	515	}
	516	+
	517	+ menuBar.add(cameraMenu = new Menu("View"));
	518	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	519	+ //zBufferItem.addActionListener(this);
	520	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	521	+ //normalLensItem.addActionListener(this);
	522	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	523	+ restoreCameraItem.addActionListener(this);
	524	+
	525	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	526	+// toggleFullScreenItem.addItemListener(this);
	527	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	528	+// cameraMenu.add("-");
	529	+//
	530	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	531	+// toggleTextureItem.addItemListener(this);
	532	+// toggleTextureItem.setState(CameraPane.textureon);
	533	+//
	534	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	535	+// toggleSwitchItem.addItemListener(this);
	536	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	537	+
	538	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	539	+ toggleHandleItem.addItemListener(this);
	540	+ toggleHandleItem.setState(CameraPane.HANDLES);
	541	+
	542	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	543	+ togglePaintItem.addItemListener(this);
	544	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	545	+
	546	+ if (Globals.ADVANCED)
	547	+ {
	548	+ cameraMenu.add("-");
	549	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	550	+ toggleLiveItem.addItemListener(this);
	551	+ toggleLiveItem.setState(Globals.isLIVE());
209	552
	553	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	554	+ stepItem.addActionListener(this);
	555	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	556	+ // toggleDLItem.addItemListener(this);
	557	+ // toggleDLItem.setState(false);
	558	+
	559	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	560	+ toggleRenderItem.addItemListener(this);
	561	+ toggleRenderItem.setState(!CameraPane.frozen);
	562	+
	563	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	564	+ toggleDebugItem.addItemListener(this);
	565	+ toggleDebugItem.setState(Globals.DEBUG);
	566	+
	567	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	568	+ toggleFrustumItem.addItemListener(this);
	569	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	570	+
	571	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	572	+ toggleFootContactItem.addItemListener(this);
	573	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	574	+
	575	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	576	+ toggleTimelineItem.addItemListener(this);
	577	+ }
	578	+
	579	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	580	+// toggleRootItem.addItemListener(this);
	581	+// toggleRootItem.setState(false);
	582	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	583	+// animationItem.addItemListener(this);
	584	+// animationItem.setState(CameraPane.ANIMATION);
	585	+ cameraMenu.add("-");
	586	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	587	+ editCameraItem.addActionListener(this);
	588	+
	589	+ if (Globals.ADVANCED)
	590	+ {
	591	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	592	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	593	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	594	+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	595	+ oe.cameraMenu.add("-");
	596	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	597	+ openWindowItem.addActionListener(this);
	598	+ editLeafItem.addActionListener(this);
	599	+ lookAtItem.addActionListener(this);
	600	+ //lookFromItem.addActinoListener(this);
	601	+ //switchViewItem.addActionListener(this);
	602	+ }
	603	+
210	604	oe.menuBar.add(menu = new Menu("Setting"));
211	605	if (Globals.ADVANCED)
212	606	{
..	..	@@ -249,21 +643,29 @@
249	643	}
250	644
251	645	oe.menuBar.add(menu = new Menu("Group"));
252		- grabItem = menu.add(new MenuItem("Grab"));
253		- grabItem.addActionListener(this);
	646	+// grabItem = menu.add(new MenuItem("Grab"));
	647	+// grabItem.addActionListener(this);
254	648	backItem = menu.add(new MenuItem("Back"));
255	649	backItem.addActionListener(this);
256	650	frontItem = menu.add(new MenuItem("Front"));
257	651	frontItem.addActionListener(this);
258		- compositeItem = menu.add(new MenuItem("Composite"));
259		- compositeItem.addActionListener(this);
	652	+// compositeItem = menu.add(new MenuItem("Composite"));
	653	+// compositeItem.addActionListener(this);
	654	+
	655	+ if (Globals.ADVANCED)
	656	+ {
260	657	hideItem = menu.add(new MenuItem("Hidden Group"));
261	658	hideItem.addActionListener(this);
	659	+ }
262	660	ungroupItem = menu.add(new MenuItem("Ungroup"));
263	661	ungroupItem.addActionListener(this);
264		- menu.add("-");
265		- randomItem = menu.add(new MenuItem("Switch node"));
266		- randomItem.addActionListener(this);
	662	+
	663	+// menu.add("-");
	664	+//
	665	+// switchItem = menu.add(new MenuItem("Switch node"));
	666	+// switchItem.addActionListener(this);
	667	+ if (Globals.ADVANCED)
	668	+ {
267	669	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
268	670	switchGeoItem.addActionListener(this);
269	671	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -271,8 +673,6 @@
271	673	morphItem = menu.add(new MenuItem("Morph Group"));
272	674	morphItem.addActionListener(this);
273	675
274		- if (Globals.ADVANCED)
275		- {
276	676	menu.add("-");
277	677	physicsItem = menu.add(new MenuItem("Physics"));
278	678	physicsItem.addActionListener(this);
..	..	@@ -280,30 +680,29 @@
280	680	frameselectorItem.addActionListener(this);
281	681	scriptNodeItem = menu.add(new MenuItem("Script Node"));
282	682	scriptNodeItem.addActionListener(this);
283		- cameraItem = menu.add(new MenuItem("Camera"));
284		- cameraItem.addActionListener(this);
285	683	}
286	684
287	685	oe.menuBar.add(menu = new Menu("Object"));
288		- textureItem = menu.add(new MenuItem("Texture"));
289		- textureItem.addActionListener(this);
	686	+// textureItem = menu.add(new MenuItem("Texture"));
	687	+// textureItem.addActionListener(this);
290	688	billboardItem = menu.add(new MenuItem("Billboard"));
291	689	billboardItem.addActionListener(this);
292	690	csgItem = menu.add(new MenuItem("CSG"));
293	691	csgItem.addActionListener(this);
294		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	692	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
295	693	shadowXItem.addActionListener(this);
296		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	694	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
297	695	shadowYItem.addActionListener(this);
298		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	696	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
299	697	shadowZItem.addActionListener(this);
	698	+ attributeItem = menu.add(new MenuItem("Attribute"));
	699	+ attributeItem.addActionListener(this);
	700	+
300	701	if (Globals.ADVANCED)
301	702	{
302	703	menu.add("-");
303	704	linkerItem = menu.add(new MenuItem("Linker"));
304	705	linkerItem.addActionListener(this);
305		- attributeItem = menu.add(new MenuItem("Attribute"));
306		- attributeItem.addActionListener(this);
307	706	templateItem = menu.add(new MenuItem("Template"));
308	707	templateItem.addActionListener(this);
309	708	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -332,7 +731,7 @@
332	731	genNormalsMESHItem.addActionListener(this);
333	732	if (Globals.ADVANCED)
334	733	{
335		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	734	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
336	735	genNormalsMINEItem.addActionListener(this);
337	736	}
338	737	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -392,6 +791,14 @@
392	791	markleavesItem.addActionListener(this);
393	792	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
394	793	unmarkleavesItem.addActionListener(this);
	794	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	795	+ rewindleavesItem.addActionListener(this);
	796	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	797	+ unrewindleavesItem.addActionListener(this);
	798	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	799	+ randomleavesItem.addActionListener(this);
	800	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	801	+ unrandomleavesItem.addActionListener(this);
395	802	menu.add("-");
396	803	flipVItem = menu.add(new MenuItem("Flip V"));
397	804	flipVItem.addActionListener(this);
..	..	@@ -417,10 +824,15 @@
417	824	attachBumpItem.addActionListener(this);
418	825	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
419	826	pigmentBumpItem.addActionListener(this);
	827	+ //embedTexturesItem
420	828	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
421	829	detachPigmentItem.addActionListener(this);
422	830	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
423	831	detachBumpItem.addActionListener(this);
	832	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	833	+ embedTexturesItem.addActionListener(this);
	834	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	835	+ deEmbedTexturesItem.addActionListener(this);
424	836	menu.add("-");
425	837	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
426	838	sortbysizeItem.addActionListener(this);
..	..	@@ -443,25 +855,25 @@
443	855	oe.menuBar.add(menu = new Menu("Insert"));
444	856	buildCreateMenu(menu);
445	857
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	858	oe.menuBar.add(menu = new Menu("Tools"));
460	859	buildToolsMenu(menu);
461	860	}
462	861
	862	+
463	863	void SetupUI2(ObjEditor oe)
464	864	{
	865	+ // June 2019
	866	+ if (oe == null)
	867	+ {
	868	+ //super.SetupUI2(this);
	869	+ //return;
	870	+ }
	871	+
	872	+ if (copy != group)
	873	+ {
	874	+ //super.SetupUI2(this);
	875	+ }
	876	+
465	877	//new Exception().printStackTrace();
466	878
467	879	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -490,27 +902,79 @@
490	902	oe.radioPanel.add(dummyButton);
491	903	oe.buttonGroup.add(dummyButton);
492	904	*/
	905	+ cGridBag copyOptionsPanel = new cGridBag();
	906	+
	907	+ copyOptionsPanel.preferredHeight = 2;
	908	+
493	909	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
494	910
495		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	911	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	912	+ //minButton.setToolTipText("Minimize window");
	913	+ //minButton.addActionListener(this);
	914	+
	915	+ if (Globals.ADVANCED)
	916	+ {
	917	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	918	+ maxButton.setToolTipText("Maximize window");
	919	+ maxButton.addActionListener(this);
	920	+ }
	921	+
	922	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	923	+ fullButton.setToolTipText("Full-screen window");
	924	+ fullButton.addActionListener(this);
	925	+
	926	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	927	+ screenfitButton.setToolTipText("Screen fit");
	928	+ screenfitButton.addActionListener(this);
	929	+
	930	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	931	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	932	+ restoreCameraButton.addActionListener(this);
	933	+
	934	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	935	+ saveButton.setToolTipText("Duplicate current version");
	936	+ saveButton.addActionListener(this);
	937	+
	938	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	939	+ undoButton.setToolTipText("Previous version");
	940	+ undoButton.addActionListener(this);
	941	+ undoButton.setEnabled(false);
	942	+
	943	+ cGridBag updown = new cGridBag().setVertical(true);
	944	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	945	+ restoreButton.setToolTipText("Undo (restore current version)");
	946	+ restoreButton.addActionListener(this);
	947	+ restoreButton.setEnabled(false);
	948	+
	949	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	950	+ replaceButton.setToolTipText("Save (replace current version)");
	951	+ replaceButton.addActionListener(this);
	952	+ replaceButton.setEnabled(false);
	953	+
	954	+ copyOptionsPanel.add(updown);
	955	+
	956	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	957	+ redoButton.setToolTipText("Next version");
	958	+ redoButton.addActionListener(this);
	959	+ redoButton.setEnabled(false);
	960	+
	961	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
496	962	liveCB.setToolTipText("Enable animation");
497	963	liveCB.addItemListener(this);
498	964
499		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	965	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
500	966	oneStepButton.setToolTipText("Animate one step forward");
501	967	oneStepButton.addActionListener(this);
502	968
503		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	969	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
504	970	fastCB.setToolTipText("Fast mode");
505	971	fastCB.addItemListener(this);
506	972
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);
	973	+ //oe.toolboxPanel.Return();
	974	+
	975	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	976	+// trackCB.setToolTipText("Enable tracking");
	977	+// trackCB.addItemListener(this);
514	978
515	979	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
516	980	// screenfitpointButton.addActionListener(this);
..	..	@@ -520,67 +984,156 @@
520	984	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
521	985	snapobjectButton.addActionListener(this);
522	986	snapobjectButton.setToolTipText("Snap Object");
	987	+
	988	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	989	+ fourButton.addActionListener(this);
	990	+ fourButton.setToolTipText("Show control panel only");
523	991	}
524	992
525		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
526		- flashSelectionButton.setToolTipText("Show selection");
527		- flashSelectionButton.addActionListener(this);
	993	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
528	994
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");
	995	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	996	+ twoButton.setToolTipText("Show 3D view only");
533	997	twoButton.addActionListener(this);
534		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
535		- fourButton.addActionListener(this);
536		- fourButton.setToolTipText("Show left panel only");
537		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
538		- sixButton.setToolTipText("2-column layout left");
539		- sixButton.addActionListener(this);
540		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
541		- threeButton.setToolTipText("2-column layout right");
	998	+ this.fullscreenLayout = twoButton;
	999	+
	1000	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1001	+ threeButton.setToolTipText("Show controls and 3D view");
542	1002	threeButton.addActionListener(this);
543		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
544		- sevenButton.setToolTipText("3-column layout");
545		- sevenButton.addActionListener(this);
	1003	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1004	+ sixButton.setToolTipText("Show 3D view and controls");
	1005	+ sixButton.addActionListener(this);
	1006	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1007	+// sevenButton.setToolTipText("3-column layout");
	1008	+// sevenButton.addActionListener(this);
546	1009	//
547	1010
548		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
549		- rootButton.setToolTipText("Edit selection in new tab");
	1011	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1012	+ rootButton.setToolTipText("Open selection in new tab");
550	1013	rootButton.addActionListener(this);
551	1014
552		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1015	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
553	1016	closeButton.setToolTipText("Close tab");
554	1017	closeButton.addActionListener(this);
555	1018	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
556	1019	//clearButton.addActionListener(this);
557		-
558		- cGridBag commandsPanel = new cGridBag();
	1020	+
	1021	+ cGridBag row1 = new cGridBag();
559	1022
560		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
561		- editButton.setToolTipText("Edit selection");
	1023	+ // INSERT
	1024	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1025	+ gridButton.setToolTipText("Create grid");
	1026	+ gridButton.addActionListener(this);
	1027	+
	1028	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1029	+ boxButton.setToolTipText("Create box");
	1030	+ boxButton.addActionListener(this);
	1031	+
	1032	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1033	+ sphereButton.setToolTipText("Create sphere");
	1034	+ sphereButton.addActionListener(this);
	1035	+
	1036	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1037	+ coneButton.setToolTipText("Create cone");
	1038	+ coneButton.addActionListener(this);
	1039	+
	1040	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1041	+ torusButton.setToolTipText("Create torus");
	1042	+ torusButton.addActionListener(this);
	1043	+
	1044	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1045	+ superButton.setToolTipText("Create superellipsoid");
	1046	+ superButton.addActionListener(this);
	1047	+
	1048	+ if (Globals.ADVANCED)
	1049	+ {
	1050	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1051	+ kleinButton.setToolTipText("Create Klein bottle");
	1052	+ kleinButton.addActionListener(this);
	1053	+ }
	1054	+
	1055	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1056	+ particlesButton.setToolTipText("Create particle system");
	1057	+ particlesButton.addActionListener(this);
	1058	+
	1059	+ oe.toolboxPanel.add(row1);
	1060	+
	1061	+ cGridBag row2 = new cGridBag();
	1062	+
	1063	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1064	+ groupButton.setToolTipText("Create group");
	1065	+ groupButton.addActionListener(this);
	1066	+
	1067	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1068	+ compositeButton.setToolTipText("Create composite");
	1069	+ compositeButton.addActionListener(this);
	1070	+
	1071	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1072	+ switchButton.setToolTipText("Create item switcher");
	1073	+ switchButton.addActionListener(this);
	1074	+
	1075	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1076	+ loopButton.setToolTipText("Create loop");
	1077	+ loopButton.addActionListener(this);
	1078	+
	1079	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1080	+ textureButton.setToolTipText("Create texture");
	1081	+ textureButton.addActionListener(this);
	1082	+
	1083	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1084	+ overlayButton.setToolTipText("Create overlay");
	1085	+ overlayButton.addActionListener(this);
	1086	+
	1087	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1088	+ lightButton.setToolTipText("Create light");
	1089	+ lightButton.addActionListener(this);
	1090	+
	1091	+ oe.toolboxPanel.add(row2);
	1092	+
	1093	+ // ENVYMAPS
	1094	+ cGridBag skyboxpane = new cGridBag();
	1095	+ skyboxpane.preferredHeight = 100;
	1096	+
	1097	+ oe.toolboxPanel.add(skyboxpane);
	1098	+
	1099	+ JTabbedPane skyboxpanel = new JTabbedPane();
	1100	+ skyboxpane.add(skyboxpanel);
	1101	+
	1102	+ AddSkyboxTab0(skyboxpanel);
	1103	+ AddSkyboxTab1(skyboxpanel);
	1104	+ AddSkyboxTab2(skyboxpanel);
	1105	+ AddSkyboxTab3(skyboxpanel);
	1106	+
	1107	+ // EDIT panel
	1108	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1109	+ editButton.setToolTipText("Pin selection controls");
562	1110	editButton.addActionListener(this);
563	1111
564		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
565		- uneditButton.setToolTipText("Unedit selection");
	1112	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1113	+ uneditButton.setToolTipText("Unpin and remove selection controls");
566	1114	uneditButton.addActionListener(this);
567	1115
568		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
569		- allParamsButton.setToolTipText("Edit all params");
	1116	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1117	+ allParamsButton.setToolTipText("Show all controle");
570	1118	allParamsButton.addActionListener(this);
571	1119
572		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1120	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
573	1121	clearPanelButton.setToolTipText("Clear edit panel");
574	1122	clearPanelButton.addActionListener(this);
575	1123
576		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1124	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
577	1125	unselectButton.setToolTipText("Unselect");
578	1126	unselectButton.addActionListener(this);
579	1127
580		- commandsPanel.preferredHeight = 1;
	1128	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1129	+ flashSelectionButton.setToolTipText("Highlight selection");
	1130	+ flashSelectionButton.addActionListener(this);
581	1131
582		- oe.treePanel.add(commandsPanel);
583		- oe.treePanel.Return();
	1132	+ editCommandsPanel.preferredHeight = 1;
	1133	+
	1134	+ SetPinStates(false);
	1135	+// oe.treePanel.add(commandsPanel);
	1136	+// oe.treePanel.Return();
584	1137
585	1138	// oe.aConstraints.gridx += 1;
586	1139	// oe.aConstraints.weighty = 0;
..	..	@@ -597,32 +1150,20 @@
597	1150
598	1151	JScrollPane jSP;
599	1152	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
600		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1153	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
601	1154	ResetModel();
602	1155
603	1156	oe.treePanel.add(jSPPanel);
604	1157	oe.treePanel.Return();
605	1158
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	1159	oe.treePanel.add(copyOptionsPanel);
622	1160	oe.treePanel.Return();
	1161	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1162	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1163	+ sliderPane.preferredHeight = 1;
623	1164
624		-// mainPanel.setDividerLocation(0.5); //1.0);
625		-// mainPanel.setResizeWeight(0.5);
	1165	+// mainPanel.setDividerLocation(0.1); //1.0);
	1166	+ mainPanel.setResizeWeight(0.4);
626	1167
627	1168	//jList.addListSelectionListener(this);
628	1169	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -630,7 +1171,7 @@
630	1171	//jTree.setEditable(true);
631	1172	oe.jTree.setDragEnabled(true);
632	1173	//jTree.setPreferredSize(new Dimension(10,10));
633		- jSP.setPreferredSize(new Dimension(100,200));
	1174	+ //jSP.setPreferredSize(new Dimension(100,200));
634	1175
635	1176	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
636	1177
..	..	@@ -642,29 +1183,49 @@
642	1183	dgr.addDragGestureListener(this);
643	1184	}catch(Exception e) {}
644	1185	*/
645		- radio.layout = sevenButton;
	1186	+ radio.layout = threeButton; // sixButton;
646	1187	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
647	1188	}
648	1189
649	1190	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
650	1191	{
	1192	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1193	+ colorCB.setToolTipText("Copy color when dropped");
	1194	+ colorCB.addItemListener(this);
	1195	+
	1196	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1197	+ materialCB.setToolTipText("Copy material when dropped");
	1198	+ materialCB.addItemListener(this);
	1199	+
	1200	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1201	+ textureCB.setToolTipText("Copy texture when dropped");
	1202	+ textureCB.addItemListener(this);
	1203	+
	1204	+ panel.Return();
	1205	+
651	1206	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
652	1207	boxCB.setToolTipText("Display bounding boxes");
653	1208	boxCB.addItemListener(this);
654	1209
655	1210	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
656		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1211	+ zoomBoxCB.setToolTipText("Display only for wheel");
657	1212	zoomBoxCB.addItemListener(this);
658	1213
659	1214	if (true) // Globals.ADVANCED)
660	1215	{
661		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
662		- supportCB.setToolTipText("Enable rigging");
663		- supportCB.addItemListener(this);
	1216	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1217	+// supportCB.setToolTipText("Enable rigging");
	1218	+// supportCB.addItemListener(this);
	1219	+
	1220	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1221	+ freezeCB.setToolTipText("Fast moving camera");
	1222	+ freezeCB.addItemListener(this);
664	1223
665	1224	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
666	1225	// localCB.addItemListener(this);
667	1226
	1227	+ panel.Return();
	1228	+
668	1229	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
669	1230	crowdCB.setToolTipText("Used for crowds");
670	1231	crowdCB.addItemListener(this);
..	..	@@ -673,14 +1234,19 @@
673	1234	smoothCB.setToolTipText("Snapping delay");
674	1235	smoothCB.addItemListener(this);
675	1236
676		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
677		- slowCB.setToolTipText("Smooth interpolation");
678		- slowCB.addItemListener(this);
	1237	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1238	+// slowCB.setToolTipText("Smooth interpolation");
	1239	+// slowCB.addItemListener(this);
	1240	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1241	+ minshaderCB.setToolTipText("Minimal fast shader");
	1242	+ minshaderCB.addItemListener(this);
679	1243
680	1244	// constraints.gridy += 1;
681	1245	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
682	1246	// speakerMocapCB.addItemListener(this);
683	1247
	1248	+ panel.Return();
	1249	+
684	1250	if (false)
685	1251	{
686	1252	// handled in scripts
..	..	@@ -695,34 +1261,74 @@
695	1261	//constraints.gridy += 1;
696	1262	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
697	1263	smoothfocusCB.addItemListener(this);
	1264	+ panel.Return();
698	1265	}
699	1266
700	1267	//constraints.gridx += 1;
701	1268	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
702	1269	// debugCB.addItemListener(this);
703	1270
	1271	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1272	+ trackCB.setToolTipText("Enable tracking target");
	1273	+ trackCB.addItemListener(this);
	1274	+
704	1275	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1276	+ oeilCB.setToolTipText("Move camera when tracking");
705	1277	oeilCB.addItemListener(this);
706	1278
	1279	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1280	+ shadowCB.setToolTipText("When live compute shadows");
	1281	+ shadowCB.addItemListener(this);
	1282	+
	1283	+ panel.Return();
	1284	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1285	+ toggleTextureCB.setToolTipText("Load textures");
	1286	+ toggleTextureCB.addItemListener(this);
	1287	+
	1288	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1289	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1290	+ toggleSwitchCB.addItemListener(this);
	1291	+
	1292	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1293	+ autokeepCB.setToolTipText("On structure change");
	1294	+ autokeepCB.addItemListener(this);
	1295	+
	1296	+ panel.Return();
	1297	+ if (Globals.ADVANCED)
	1298	+ {
707	1299	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
708	1300	lookAtCB.setToolTipText("Look-at target");
709	1301	lookAtCB.addItemListener(this);
	1302	+ }
710	1303
711	1304	}
712	1305
713	1306	cGridBag fill = new cGridBag();
714		-
715	1307	fill.preferredHeight = 200;
	1308	+ cGridBag fill2 = new cGridBag();
	1309	+ fill2.preferredHeight = 200;
	1310	+ cGridBag fill3 = new cGridBag();
	1311	+ fill3.preferredHeight = 200;
716	1312
717	1313	panel.add(fill);
	1314	+ panel.add(fill2);
	1315	+ panel.add(fill3);
718	1316
719	1317	}
720	1318
721	1319	void EditObject(Object3D obj)
722	1320	{
723	1321	cRadio radioButton = new cRadio(obj.name);
	1322	+
	1323	+ // June 2019. Patch to avoid bug with transparency.
	1324	+ radioButton.hadMaterial = obj.material != null;
	1325	+ if (!radioButton.hadMaterial)
	1326	+ {
	1327	+ obj.material = new cMaterial();
	1328	+ }
	1329	+
724	1330	radioButton.SetObject(obj);
725		- radioButton.layout = sevenButton;
	1331	+ radioButton.layout = threeButton; // sixButton;
726	1332	radioButton.SetCamera(cameraView.renderCamera, false);
727	1333	radioButton.addActionListener(this);
728	1334	radioPanel.add(radioButton);
..	..	@@ -732,6 +1338,8 @@
732	1338
733	1339	void SetupViews(ObjEditor oe)
734	1340	{
	1341	+ theFrame = this;
	1342	+
735	1343	oe.SetupViews();
736	1344
737	1345	System.out.println("SetupViews");
..	..	@@ -740,23 +1348,30 @@
740	1348	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
741	1349	}
742	1350
743		- JCheckBox liveCB;
744		- JCheckBox supportCB;
745		- JCheckBox localCB;
746		- JCheckBox crowdCB;
747		- JCheckBox smoothCB;
748		- JCheckBox fastCB;
749		- JCheckBox slowCB;
750		- JCheckBox boxCB;
751		- JCheckBox zoomBoxCB;
752		- JCheckBox trackCB;
753		- JCheckBox smoothfocusCB;
	1351	+ cToggleButton liveCB;
	1352	+ cCheckBox supportCB;
	1353	+ cCheckBox localCB;
	1354	+ cCheckBox crowdCB;
	1355	+ cCheckBox smoothCB;
	1356	+ cCheckBox minshaderCB;
	1357	+
	1358	+ cToggleButton fastCB;
	1359	+ cCheckBox slowCB;
	1360	+ cCheckBox boxCB;
	1361	+ cCheckBox zoomBoxCB;
	1362	+ cCheckBox freezeCB;
	1363	+ //cToggleButton trackCB;
	1364	+ cCheckBox trackCB;
	1365	+ cCheckBox smoothfocusCB;
754	1366	// JCheckBox speakerMocapCB;
755		- JCheckBox speakerCameraCB;
756		- JCheckBox speakerFocusCB;
757		- JCheckBox debugCB;
758		- JCheckBox oeilCB;
759		- JCheckBox lookAtCB;
	1367	+ cCheckBox speakerCameraCB;
	1368	+ cCheckBox speakerFocusCB;
	1369	+ cCheckBox debugCB;
	1370	+
	1371	+ cCheckBox oeilCB;
	1372	+ cCheckBox shadowCB;
	1373	+ cCheckBox autokeepCB;
	1374	+ cCheckBox lookAtCB;
760	1375
761	1376	// static int COLOR = 1;
762	1377	// static int MATERIAL = 2;
..	..	@@ -764,9 +1379,9 @@
764	1379
765	1380	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
766	1381
767		- JCheckBox colorCB;
768		- JCheckBox materialCB;
769		- JCheckBox textureCB;
	1382	+ cCheckBox colorCB;
	1383	+ cCheckBox materialCB;
	1384	+ cCheckBox textureCB;
770	1385
771	1386	public void itemStateChanged(ItemEvent e)
772	1387	{
..	..	@@ -794,6 +1409,7 @@
794	1409	} else if(e.getSource() == liveCB)
795	1410	{
796	1411	cameraView.ToggleLive();
	1412	+ refreshContents(false);
797	1413	}
798	1414	else if(e.getSource() == supportCB)
799	1415	{
..	..	@@ -809,6 +1425,12 @@
809	1425	{
810	1426	cameraView.ToggleInertia();
811	1427	cameraView.repaint();
	1428	+ }
	1429	+ else if(e.getSource() == minshaderCB)
	1430	+ {
	1431	+ Globals.MINSHADER ^= true;
	1432	+ cameraView.programInitialized = false;
	1433	+ cameraView.repaint();
812	1434	}
813	1435	else if(e.getSource() == localCB)
814	1436	{
..	..	@@ -858,6 +1480,18 @@
858	1480	{
859	1481	cameraView.ToggleOeil();
860	1482	}
	1483	+ else if(e.getSource() == shadowCB)
	1484	+ {
	1485	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1486	+ }
	1487	+ else if(e.getSource() == freezeCB)
	1488	+ {
	1489	+ Globals.FREEZEONMOVE ^= true;
	1490	+ }
	1491	+ else if(e.getSource() == autokeepCB)
	1492	+ {
	1493	+ Globals.REPLACEONMAKE ^= true;
	1494	+ }
861	1495	else if(e.getSource() == lookAtCB)
862	1496	{
863	1497	cameraView.ToggleLookAt();
..	..	@@ -874,7 +1508,8 @@
874	1508
875	1509	/**/
876	1510	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
877		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1511	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1512	+ TreePath path = objEditor.jTree.getSelectionPath();
878	1513	if ((path == null) \|\| (path.getPathCount() <= 1)) {
879	1514	// We can't move the root node or an empty selection
880	1515	return;
..	..	@@ -937,8 +1572,6 @@
937	1572	}
938	1573	}
939	1574
940		- String string = (String) object;
941		-
942	1575	System.out.println("Transfer = " + object + "; drop : " + target);
943	1576	// if( object instanceof java.io.File[])
944	1577	// {
..	..	@@ -946,6 +1579,8 @@
946	1579	// objEditor.DropFile((java.io.File[]) object, true);
947	1580	// return;
948	1581	// }
	1582	+
	1583	+ String string = object.toString();
949	1584
950	1585	// File path for Mac and Windows
951	1586	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -991,23 +1626,33 @@
991	1626
992	1627	assert target == objEditor.jTree;
993	1628	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1629	+ Object3D destinationLeaf;
994	1630	try {
995		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1631	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
996	1632	} catch (Exception e) {
997	1633	System.out.println("destinationPath : " + destinationPath);
998	1634	return;
999	1635	}
1000	1636
1001		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1637	+ for (int i=group.selection.size(); --i>=0;)
1002	1638	{
	1639	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1640	+
	1641	+ // Cannot move into itself
	1642	+ if (child == destinationLeaf)
	1643	+ return;
	1644	+ }
	1645	+
	1646	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1647	+// {
1003	1648	loadClipboard(true);
1004	1649	objEditor.jTree.setSelectionPath(destinationPath);
1005	1650	pasteInto(false, false);
1006		- } else {
1007		- loadClipboard(false);
1008		- objEditor.jTree.setSelectionPath(destinationPath);
1009		- pasteInto(false, false); // true); // ???
1010		- }
	1651	+// } else {
	1652	+// loadClipboard(false);
	1653	+// objEditor.jTree.setSelectionPath(destinationPath);
	1654	+// pasteInto(false, false); // true); // ???
	1655	+// }
1011	1656	}
1012	1657	public void dropActionChanged(DropTargetDragEvent dtde)
1013	1658	// Called if the user has modified the current drop gesture
..	..	@@ -1112,22 +1757,30 @@
1112	1757	{
1113	1758	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1114	1759	//heightFieldItem.addActionListener(this);
1115		- gridItem = menu.add(new MenuItem("Grid"));
1116		- gridItem.addActionListener(this);
1117		- rectoidItem = menu.add(new MenuItem("Box"));
1118		- rectoidItem.addActionListener(this);
1119		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1120		- ellipsoidItem.addActionListener(this);
1121		- coneItem = menu.add(new MenuItem("Cone"));
1122		- coneItem.addActionListener(this);
1123		- torusItem = menu.add(new MenuItem("Torus"));
1124		- torusItem.addActionListener(this);
1125		- superItem = menu.add(new MenuItem("Superellipsoid"));
1126		- superItem.addActionListener(this);
	1760	+// gridItem = menu.add(new MenuItem("Grid"));
	1761	+// gridItem.addActionListener(this);
	1762	+// rectoidItem = menu.add(new MenuItem("Box"));
	1763	+// rectoidItem.addActionListener(this);
	1764	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1765	+// ellipsoidItem.addActionListener(this);
	1766	+// coneItem = menu.add(new MenuItem("Cone"));
	1767	+// coneItem.addActionListener(this);
	1768	+// torusItem = menu.add(new MenuItem("Torus"));
	1769	+// torusItem.addActionListener(this);
	1770	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1771	+// superItem.addActionListener(this);
	1772	+
	1773	+ cameraItem = menu.add(new MenuItem("Camera"));
	1774	+ cameraItem.addActionListener(this);
	1775	+
	1776	+ if (!Globals.ADVANCED)
	1777	+ {
1127	1778	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1128	1779	kleinItem.addActionListener(this);
1129		- particleItem = menu.add(new MenuItem("Particle system"));
1130		- particleItem.addActionListener(this);
	1780	+ }
	1781	+
	1782	+// particleItem = menu.add(new MenuItem("Particle system"));
	1783	+// particleItem.addActionListener(this);
1131	1784	if (Globals.ADVANCED)
1132	1785	{
1133	1786	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1153,15 +1806,15 @@
1153	1806	}
1154	1807	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1155	1808	bezierItem.addActionListener(this);
1156		- overlayItem = menu.add(new MenuItem("Overlay"));
1157		- overlayItem.addActionListener(this);
1158		- lightItem = menu.add(new MenuItem("Light"));
1159		- lightItem.addActionListener(this);
	1809	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1810	+// overlayItem.addActionListener(this);
	1811	+// lightItem = menu.add(new MenuItem("Light"));
	1812	+// lightItem.addActionListener(this);
1160	1813	menu.add("-");
1161	1814	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1162	1815	//superLoopItem.addActionListener(this);
1163		- loopItem = menu.add(new MenuItem("Loop"));
1164		- loopItem.addActionListener(this);
	1816	+// loopItem = menu.add(new MenuItem("Loop"));
	1817	+// loopItem.addActionListener(this);
1165	1818	doubleItem = menu.add(new MenuItem("Fork"));
1166	1819	doubleItem.addActionListener(this);
1167	1820	if (Globals.ADVANCED)
..	..	@@ -1177,6 +1830,9 @@
1177	1830	animationItem.addItemListener(this);
1178	1831	animationItem.setState(Globals.ANIMATION);
1179	1832
	1833	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1834	+ archiveItem.addActionListener(this);
	1835	+
1180	1836	menu.add("-");
1181	1837	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1182	1838	parseverticesItem.addActionListener(this);
..	..	@@ -1189,6 +1845,8 @@
1189	1845	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1190	1846	reduce34MorphItem.addActionListener(this);
1191	1847	menu.add("-");
	1848	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1849	+ memoryItem.addActionListener(this);
1192	1850	menu.add(computeAOItem = new MenuItem("Compute AO"));
1193	1851	computeAOItem.addActionListener(this);
1194	1852
..	..	@@ -1197,11 +1855,9 @@
1197	1855	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1198	1856	mirrorItem.addActionListener(this);
1199	1857	menu.add("-");
1200		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1201		- memoryItem.addActionListener(this);
1202	1858	menu.add(analyzeItem = new MenuItem("Analyze"));
1203	1859	analyzeItem.addActionListener(this);
1204		- menu.add(dumpItem = new MenuItem("Dump"));
	1860	+ menu.add(dumpItem = new MenuItem("Print"));
1205	1861	dumpItem.addActionListener(this);
1206	1862	// menu.add(pathItem = new MenuItem("From-to path"));
1207	1863	// pathItem.addActionListener(this);
..	..	@@ -1342,9 +1998,34 @@
1342	1998	shadow.material = new cMaterial(obj.material);
1343	1999	shadow.material.diffuse = 0.0001f;
1344	2000	shadow.material.specular = 0.0001f;
	2001	+ //shadow.projectedVertices[1].x = 300;
1345	2002
1346	2003	makeSomething(shadow);
1347	2004	}
	2005	+
	2006	+ private void ClearUnpinned()
	2007	+ {
	2008	+ //for (Object3D obj : listUI)
	2009	+ for (int i=listUI.size(); --i>=0;)
	2010	+ {
	2011	+ Object3D obj = listUI.elementAt(i);
	2012	+ if (!obj.pinned)
	2013	+ {
	2014	+ obj.CloseUI();
	2015	+ listUI.remove(i);
	2016	+ }
	2017	+ }
	2018	+ }
	2019	+
	2020	+ private void EditElement(Object3D elem, boolean newWindow)
	2021	+ {
	2022	+ // if (!(elem instanceof Composite))
	2023	+ // newWindow = false;
	2024	+ listUI.add(elem);
	2025	+ elem.openEditWindow(this, newWindow); //, false);
	2026	+ System.out.println("edit : " + elem);
	2027	+ elem.editWindow.refreshContents(true); // ? new
	2028	+ }
1348	2029
1349	2030	/**
1350	2031	* applyExample
..	..	@@ -1589,7 +2270,7 @@
1589	2270	{
1590	2271	ScreenFit();
1591	2272	} else
1592		- if (source == switchItem)
	2273	+ if (source == switchViewItem)
1593	2274	{
1594	2275	cVector v1 = new cVector();
1595	2276	cVector v2 = new cVector();
..	..	@@ -1598,11 +2279,11 @@
1598	2279	objEditor.cameraView.renderCamera.setAim(v2, v1);
1599	2280	objEditor.cameraView.repaint();
1600	2281	} else
1601		- if (source == rectoidItem)
	2282	+ if (source == rectoidItem \|\| source == boxButton)
1602	2283	{
1603	2284	makeSomething(new Box());
1604	2285	} else
1605		- if (source == particleItem)
	2286	+ if (source == particleItem \|\| source == particlesButton)
1606	2287	{
1607	2288	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1608	2289	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1681,27 +2362,27 @@
1681	2362
1682	2363	makeSomething(obj);
1683	2364	} else
1684		- if (source == gridItem)
	2365	+ if (source == gridItem \|\| source == gridButton)
1685	2366	{
1686	2367	makeSomething(new Grid());
1687	2368	} else
1688		- if (source == ellipsoidItem)
	2369	+ if (source == ellipsoidItem \|\| source == sphereButton)
1689	2370	{
1690	2371	makeSomething(new Sphere());
1691	2372	} else
1692		- if (source == coneItem)
	2373	+ if (source == coneItem \|\| source == coneButton)
1693	2374	{
1694	2375	makeSomething(new Cone());
1695	2376	} else
1696		- if (source == torusItem)
	2377	+ if (source == torusItem \|\| source == torusButton)
1697	2378	{
1698	2379	makeSomething(new Torus());
1699	2380	} else
1700		- if (source == superItem)
	2381	+ if (source == superItem \|\| source == superButton)
1701	2382	{
1702	2383	makeSomething(new Superellipsoid());
1703	2384	} else
1704		- if (source == kleinItem)
	2385	+ if (source == kleinItem \|\| source == kleinButton)
1705	2386	{
1706	2387	makeSomething(new Klein());
1707	2388	} else
..	..	@@ -1721,7 +2402,7 @@
1721	2402	{
1722	2403	makeSomething(new BezierSurface());
1723	2404	} else
1724		- if (source == overlayItem)
	2405	+ if (source == overlayItem \|\| source == overlayButton)
1725	2406	{
1726	2407	/*
1727	2408	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1769,10 +2450,27 @@
1769	2450	s.setup();
1770	2451	makeSomething(s);
1771	2452	} else
1772		- if (source == lightItem)
	2453	+ if (source == lightItem \|\| source == lightButton)
1773	2454	{
1774	2455	makeSomething(new Light());
1775	2456	} else
	2457	+// if (source == skybox1Button \|\|
	2458	+// source == skybox2Button \|\|
	2459	+// source == skybox3Button \|\|
	2460	+// source == skybox4Button \|\|
	2461	+// source == skybox5Button \|\|
	2462	+// source == skybox6Button \|\|
	2463	+// source == skybox7Button \|\|
	2464	+// source == skybox11Button \|\|
	2465	+// source == skybox12Button \|\|
	2466	+// source == skybox13Button \|\|
	2467	+// source == skybox14Button \|\|
	2468	+// source == skybox15Button \|\|
	2469	+// source == skybox16Button \|\|
	2470	+// source == skybox17Button)
	2471	+// {
	2472	+// ChangeSkybox(source);
	2473	+// } else
1776	2474	if (source == csgItem)
1777	2475	{
1778	2476	group(new CSG());
..	..	@@ -1819,30 +2517,30 @@
1819	2517
1820	2518	group(g);
1821	2519	} else
1822		- if (source == loopItem)
	2520	+ if (source == loopItem \|\| source == loopButton)
1823	2521	{
1824	2522	Composite csg = new GroupLeaf();
1825	2523	csg.count = 5;
1826	2524	group(csg);
1827		- Composite child = new cGroup();
	2525	+ Composite child = new cGroup("Branch");
1828	2526	csg.addChild(child);
1829	2527	child.addChild(csg);
1830	2528	} else
1831	2529	if (source == doubleItem)
1832	2530	{
1833		- Composite csg = new GroupLeaf();
	2531	+ Composite csg = new GroupLeaf("Fork");
1834	2532	csg.count = 5;
1835	2533	group(csg);
1836		- Composite child = new cGroup();
	2534	+ Composite child = new cGroup("Branch A");
1837	2535	csg.addChild(child);
1838	2536	child.addChild(csg);
1839		- child = new cGroup();
	2537	+ child = new cGroup("Branch B");
1840	2538	csg.addChild(child);
1841	2539	child.addChild(csg);
1842	2540	} else
1843	2541	if (source == tripleItem)
1844	2542	{
1845		- Composite csg = new GroupLeaf();
	2543	+ Composite csg = new GroupLeaf("Trident");
1846	2544	csg.count = 4;
1847	2545	group(csg);
1848	2546	Composite child = new cGroup();
..	..	@@ -1855,35 +2553,10 @@
1855	2553	csg.addChild(child);
1856	2554	child.addChild(csg);
1857	2555	} else
1858		-
1859		- if (source == importGFDItem)
1860		- {
1861		- ImportGFD();
1862		- } else
1863		- if (source == importVRMLX3DItem)
1864		- {
1865		- ImportVRMLX3D();
1866		- } else
1867		- if (source == import3DSItem)
1868		- {
1869		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1870		- } else
1871		- if (source == importOBJItem)
1872		- {
1873		- //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1874		- FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
1875		- browser.setVisible(true);
1876		- String filename = browser.getFile();
1877		- if (filename != null && filename.length() > 0)
1878		- {
1879		- String fullname = browser.getDirectory() + filename;
1880		- makeSomething(ReadOBJ(fullname), true);
1881		- }
1882		- } else
1883	2556	if (source == computeAOItem)
1884	2557	{
1885	2558	Globals.drawMode = CameraPane.OCCLUSION;
1886		- Globals.theRenderer.repaint();
	2559	+ cameraView.repaint();
1887	2560	} else
1888	2561	if (source == recompileItem)
1889	2562	{
..	..	@@ -1917,6 +2590,48 @@
1917	2590	{
1918	2591	DumpObject();
1919	2592	} else
	2593	+ if (source == minButton)
	2594	+ {
	2595	+ Minimize();
	2596	+ } else
	2597	+ if (source == maxButton)
	2598	+ {
	2599	+ Maximize();
	2600	+ } else
	2601	+ if (source == fullButton)
	2602	+ {
	2603	+ ToggleFullScreen();
	2604	+ } else
	2605	+ if (source == undoButton)
	2606	+ {
	2607	+ // Go to previous version
	2608	+ //if (!Undo())
	2609	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2610	+ Undo();
	2611	+ } else
	2612	+ if (source == restoreButton)
	2613	+ {
	2614	+ // Restore current version
	2615	+ Restore();
	2616	+ restoreButton.setEnabled(false);
	2617	+ } else
	2618	+ if (source == replaceButton)
	2619	+ {
	2620	+ // Overwrite current version
	2621	+ Replace();
	2622	+ replaceButton.setEnabled(false);
	2623	+ } else
	2624	+ if (source == redoButton)
	2625	+ {
	2626	+ // Go to next version
	2627	+ Redo();
	2628	+ } else
	2629	+ if (source == saveButton)
	2630	+ {
	2631	+ // Save a new version
	2632	+ if (!Save(true))
	2633	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2634	+ } else
1920	2635	if (source == oneStepButton)
1921	2636	{
1922	2637	Globals.ONESTEP = true;
..	..	@@ -1924,17 +2639,14 @@
1924	2639	} else
1925	2640	if (source == screenfitButton)
1926	2641	{
1927		- //Reload(lastConverter, lastFilename, true);
1928	2642	ScreenFit();
1929	2643	} else
1930	2644	if (source == screenfitpointButton)
1931	2645	{
1932		- //Reload(lastConverter, lastFilename, true);
1933	2646	ScreenFitPoint();
1934	2647	} else
1935	2648	if (source == snapobjectButton)
1936	2649	{
1937		- //Reload(lastConverter, lastFilename, true);
1938	2650	SnapObject();
1939	2651	} else
1940	2652	// if (event.getSource() == recompileButton)
..	..	@@ -1970,6 +2682,14 @@
1970	2682	if (source == cutItem \|\| source == clearButton)
1971	2683	{
1972	2684	loadClipboard(true);
	2685	+ } else
	2686	+ if (source == undoItem)
	2687	+ {
	2688	+ Undo();
	2689	+ } else
	2690	+ if (source == redoItem)
	2691	+ {
	2692	+ Redo();
1973	2693	} else
1974	2694	if (source == duplicateItem)
1975	2695	{
..	..	@@ -2290,7 +3010,7 @@
2290	3010	{
2291	3011	StepAll();
2292	3012	} else
2293		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3013	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2294	3014	{
2295	3015	//int indices[] = jList.getSelectedIndices();
2296	3016	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2302,9 +3022,9 @@
2302	3022	{
2303	3023	ClearSelection(true);
2304	3024	} else
2305		- if (source == grabItem)
	3025	+ if (source == grabItem \|\| source == groupButton)
2306	3026	{
2307		- group(new cGroup(), true);
	3027	+ group(new cGroup(), false); // true);
2308	3028	} else
2309	3029	if (source == hideItem)
2310	3030	{
..	..	@@ -2322,11 +3042,11 @@
2322	3042	{
2323	3043	makeSomething(new Camera());
2324	3044	} else
2325		- if (source == compositeItem)
	3045	+ if (source == compositeItem \|\| source == compositeButton)
2326	3046	{
2327	3047	group(new Composite());
2328	3048	} else
2329		- if (source == randomItem)
	3049	+ if (source == switchItem \|\| source == switchButton)
2330	3050	{
2331	3051	RandomNode random = new RandomNode();
2332	3052	group(random);
..	..	@@ -2428,7 +3148,7 @@
2428	3148	{
2429	3149	group(new cLinker());
2430	3150	} else
2431		- if (source == textureItem)
	3151	+ if (source == textureItem \|\| source == textureButton)
2432	3152	{
2433	3153	group(new TextureNode());
2434	3154	} else
..	..	@@ -2448,17 +3168,30 @@
2448	3168	{
2449	3169	CastShadow(2);
2450	3170	} else
2451		- if (source == ungroupItem)
	3171	+ if (source == ungroupItem \|\| source == ungroupButton)
2452	3172	{
2453		- //ungroup();
	3173	+ boolean hasRoot = false;
	3174	+
2454	3175	for (int i=0; i<group.selection.size(); i++)
2455	3176	{
2456		- Ungroup(group.selection.get(i));
	3177	+ if (group.selection.get(i) == group)
	3178	+ {
	3179	+ hasRoot = true;
	3180	+ break;
	3181	+ }
2457	3182	}
2458	3183
2459		- ClearSelection(false);
2460		-
2461		- refreshContents();
	3184	+ if (!hasRoot)
	3185	+ {
	3186	+ for (int i=0; i<group.selection.size(); i++)
	3187	+ {
	3188	+ Ungroup(group.selection.get(i));
	3189	+ }
	3190	+
	3191	+ ClearSelection(false);
	3192	+
	3193	+ refreshContents();
	3194	+ }
2462	3195	} else
2463	3196	if (source == genUVItem)
2464	3197	{
..	..	@@ -2470,7 +3203,7 @@
2470	3203	} else
2471	3204	if (source == genNormalsMESHItem)
2472	3205	{
2473		- GenNormals(true); // TODO
	3206	+ GenNormalsMESH();
2474	3207	} else
2475	3208	if (source == genNormalsORGANItem)
2476	3209	{
..	..	@@ -2535,6 +3268,22 @@
2535	3268	if (source == unmarkleavesItem)
2536	3269	{
2537	3270	MarkLeaves(false);
	3271	+ } else
	3272	+ if (source == rewindleavesItem)
	3273	+ {
	3274	+ RewindLeaves(true);
	3275	+ } else
	3276	+ if (source == unrewindleavesItem)
	3277	+ {
	3278	+ RewindLeaves(false);
	3279	+ } else
	3280	+ if (source == randomleavesItem)
	3281	+ {
	3282	+ RandomLeaves(true);
	3283	+ } else
	3284	+ if (source == unrandomleavesItem)
	3285	+ {
	3286	+ RandomLeaves(false);
2538	3287	} else
2539	3288	if (source == flipVItem)
2540	3289	{
..	..	@@ -2743,7 +3492,7 @@
2743	3492	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2744	3493	{
2745	3494	obj = (Object3D)e.nextElement();
2746		- obj.SetBumpTexture(null);
	3495	+ obj.ResetBumpTexture();
2747	3496	}
2748	3497
2749	3498	refreshContents();
..	..	@@ -2759,6 +3508,31 @@
2759	3508
2760	3509	refreshContents();
2761	3510	} else
	3511	+ if (source == embedTexturesItem)
	3512	+ {
	3513	+ Object3D obj;
	3514	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3515	+ {
	3516	+ obj = (Object3D)e.nextElement();
	3517	+ obj.EmbedTextures(true);
	3518	+ }
	3519	+
	3520	+ refreshContents();
	3521	+ } else
	3522	+ if (source == deEmbedTexturesItem)
	3523	+ {
	3524	+ Object3D obj;
	3525	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3526	+ {
	3527	+ obj = (Object3D)e.nextElement();
	3528	+ obj.EmbedTextures(false);
	3529	+ }
	3530	+
	3531	+ CameraPane.texturepigment.clear();
	3532	+ CameraPane.texturebump.clear();
	3533	+
	3534	+ refreshContents();
	3535	+ } else
2762	3536	if (source == flashSelectionButton)
2763	3537	{
2764	3538	CameraPane.flash = true;
..	..	@@ -2770,6 +3544,10 @@
2770	3544	if (source == twoButton)
2771	3545	{
2772	3546	radio.layout = twoButton;
	3547	+
	3548	+ if (CameraPane.FULLSCREEN)
	3549	+ fullscreenLayout = radio.layout;
	3550	+
2773	3551	// bug
2774	3552	//gridPanel.setDividerLocation(1.0);
2775	3553	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2802,10 +3580,31 @@
2802	3580	bigThree.ClearUI();
2803	3581	bigThree.add(centralPanel);
2804	3582	bigThree.FlushUI();
	3583	+
	3584	+ cameraView.requestFocusInWindow();
	3585	+
	3586	+// refreshContents(true);
	3587	+//
	3588	+// try
	3589	+// {
	3590	+// java.awt.Robot bot = new java.awt.Robot();
	3591	+// int mask = InputEvent.BUTTON1_MASK;
	3592	+// bot.mouseMove(100, 100);
	3593	+// bot.mousePress(mask);
	3594	+// bot.mouseRelease(mask);
	3595	+// }
	3596	+// catch (Exception e)
	3597	+// {
	3598	+//
	3599	+// }
	3600	+
2805	3601	} else
2806	3602	if (source == threeButton)
2807	3603	{
2808	3604	radio.layout = threeButton;
	3605	+
	3606	+ if (CameraPane.FULLSCREEN)
	3607	+ fullscreenLayout = radio.layout;
2809	3608
2810	3609	// bigThree.remove(scenePanel);
2811	3610	// bigThree.remove(centralPanel);
..	..	@@ -2835,13 +3634,18 @@
2835	3634	// centralPanel.setVisible(true);
2836	3635	// XYZPanel.setVisible(true);
2837	3636	bigThree.ClearUI();
	3637	+ bigThree.add(scenePanel);
2838	3638	bigThree.add(centralPanel);
2839		- bigThree.add(XYZPanel);
2840	3639	bigThree.FlushUI();
	3640	+
	3641	+ cameraView.requestFocusInWindow();
2841	3642	} else
2842	3643	if (source == fourButton)
2843	3644	{
2844	3645	radio.layout = fourButton;
	3646	+
	3647	+ if (CameraPane.FULLSCREEN)
	3648	+ fullscreenLayout = radio.layout;
2845	3649
2846	3650	// bigThree.remove(scenePanel);
2847	3651	// bigThree.remove(centralPanel);
..	..	@@ -2873,10 +3677,15 @@
2873	3677	bigThree.ClearUI();
2874	3678	bigThree.add(scenePanel);
2875	3679	bigThree.FlushUI();
	3680	+
	3681	+ cameraView.requestFocusInWindow();
2876	3682	} else
2877	3683	if (source == sixButton)
2878	3684	{
2879	3685	radio.layout = sixButton;
	3686	+
	3687	+ if (CameraPane.FULLSCREEN)
	3688	+ fullscreenLayout = radio.layout;
2880	3689
2881	3690	// bigThree.remove(scenePanel);
2882	3691	// bigThree.remove(centralPanel);
..	..	@@ -2906,13 +3715,18 @@
2906	3715	// centralPanel.setVisible(true);
2907	3716	// XYZPanel.setVisible(false);
2908	3717	bigThree.ClearUI();
2909		- bigThree.add(scenePanel);
2910	3718	bigThree.add(centralPanel);
	3719	+ bigThree.add(scenePanel);
2911	3720	bigThree.FlushUI();
	3721	+
	3722	+ cameraView.requestFocusInWindow();
2912	3723	} else
2913	3724	if (source == sevenButton)
2914	3725	{
2915	3726	radio.layout = sevenButton;
	3727	+
	3728	+ if (CameraPane.FULLSCREEN)
	3729	+ fullscreenLayout = radio.layout;
2916	3730
2917	3731	// bigThree.remove(scenePanel);
2918	3732	// bigThree.remove(centralPanel);
..	..	@@ -2946,6 +3760,8 @@
2946	3760	bigThree.add(centralPanel);
2947	3761	bigThree.add(XYZPanel);
2948	3762	bigThree.FlushUI();
	3763	+
	3764	+ cameraView.requestFocusInWindow();
2949	3765	} else
2950	3766	if (source == rootButton)
2951	3767	{
..	..	@@ -2957,6 +3773,7 @@
2957	3773	EditObject(obj);
2958	3774	}
2959	3775
	3776	+ cameraView.requestFocusInWindow();
2960	3777	refreshContents(true);
2961	3778	} else
2962	3779	if (source == closeButton)
..	..	@@ -2966,22 +3783,37 @@
2966	3783	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2967	3784	{
2968	3785	ab = (cRadio)e.nextElement();
2969		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3786	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2970	3787	{
	3788	+ // Patch to avoid bug with transparency.
	3789	+ if (!ab.hadMaterial)
	3790	+ {
	3791	+ ab.object.material = null;
	3792	+ }
	3793	+
2971	3794	buttonGroup.remove(ab);
2972	3795	radioPanel.remove(ab);
2973	3796
2974		- ab.GetObject().editWindow = null;
	3797	+ //ab.GetObject().editWindow = null;
	3798	+ ab.GetObject().manipWindow = null;
2975	3799	// ab.GetObject().objectUI = null; // ?????????
2976	3800
2977	3801	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2978	3802	break;
2979	3803	}
2980	3804	}
	3805	+
	3806	+ cameraView.requestFocusInWindow();
2981	3807	refreshContents(true);
2982	3808	} else
2983	3809	if (source == editItem \|\| source == editButton)
2984	3810	{
	3811	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3812	+ {
	3813	+ Object3D child = (Object3D)e.nextElement();
	3814	+ child.pinned = true;
	3815	+ }
	3816	+
2985	3817	EditSelection(false);
2986	3818	} else
2987	3819	if (source == uneditButton)
..	..	@@ -2990,11 +3822,12 @@
2990	3822	{
2991	3823	Object3D child = (Object3D)e.nextElement();
2992	3824	if(child.editWindow != null)
2993		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3825	+ child.pinned = false;
2994	3826	child.CloseUI();
2995	3827	listUI.remove(child);
	3828	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2996	3829
2997		- child.editWindow = null; // ???????????
	3830	+ //child.editWindow = null; // ???????????
2998	3831	}
2999	3832	objEditor.ctrlPanel.FlushUI();
3000	3833	//objEditor.jTree.clearSelection();
..	..	@@ -3007,16 +3840,18 @@
3007	3840	//copy.ClearUI();
3008	3841	for (Object3D obj : listUI)
3009	3842	{
	3843	+ obj.pinned = false;
3010	3844	obj.CloseUI();
3011	3845	}
3012	3846	listUI.clear();
	3847	+ SetPinStates(group.selection.size() > 0);
3013	3848	refreshContents(true);
3014	3849	} else
3015	3850	if (source == allParamsButton)
3016	3851	{
3017	3852	assert(copy == group);
3018	3853
3019		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3854	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3020	3855
3021	3856	for (Object3D obj : listUI)
3022	3857	{
..	..	@@ -3065,6 +3900,9 @@
3065	3900	}
3066	3901
3067	3902	copy = group;
	3903	+
	3904	+ SetUndoStates();
	3905	+
3068	3906	//Globals.theRenderer.object = group;
3069	3907	if(!useclient)
3070	3908	{
..	..	@@ -3081,7 +3919,9 @@
3081	3919	sideView.object = group;
3082	3920	}
3083	3921
3084		-// fix "+" issue group.editWindow = this;
	3922	+// fix "+" issue
	3923	+ //group.editWindow = this;
	3924	+ group.manipWindow = this;
3085	3925
3086	3926	/*
3087	3927	currentLayout = radio.layout;
..	..	@@ -3089,13 +3929,38 @@
3089	3929	currentLayout = sevenButton;
3090	3930	*/
3091	3931	radio.layout.doClick();
	3932	+
	3933	+ ClearUnpinned();
	3934	+
	3935	+ //Grafreed.Assert(group != null);
	3936	+ //Grafreed.Assert(group.selection != null);
	3937	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	3938	+ if (group.selection == null \|\| group.selection.size() == 1)
	3939	+ EditSelection(false);
3092	3940	keepparent = group.parent;
3093	3941	// PARENT = NULL or not???
3094	3942	//group.parent = null; // ROOT
3095	3943	//group.attributes = -1;
3096	3944	ResetModel();
	3945	+
	3946	+ cameraView.requestFocusInWindow();
3097	3947	refreshContents(true);
3098		- }
	3948	+ } else if (event.getSource() == editCameraItem)
	3949	+ {
	3950	+ cameraView.ProtectCamera();
	3951	+ cameraView.requestFocusInWindow();
	3952	+ cameraView.repaint();
	3953	+ return;
	3954	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3955	+ {
	3956	+ cameraView.RevertCamera();
	3957	+ cameraView.requestFocusInWindow();
	3958	+ cameraView.repaint();
	3959	+ return;
	3960	+ // } else if (event.getSource() == textureButton)
	3961	+ // {
	3962	+ // return; // true;
	3963	+ }
3099	3964	else
3100	3965	{
3101	3966	//return super.action(event, arg);
..	..	@@ -3104,7 +3969,6 @@
3104	3969	}
3105	3970
3106	3971	boolean useclient = false;
3107		- cRadio radio;
3108	3972
3109	3973	void ToggleRoot()
3110	3974	{
..	..	@@ -3343,7 +4207,8 @@
3343	4207
3344	4208	int size = obj.MemorySize();
3345	4209
3346		- System.err.println((size/1024) + " KB is the size of " + obj);
	4210	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4211	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3347	4212	}
3348	4213	}
3349	4214	catch (Exception e)
..	..	@@ -3424,6 +4289,13 @@
3424	4289	void GenNormals(boolean crease)
3425	4290	{
3426	4291	group.GenNormalsS(crease);
	4292	+
	4293	+ refreshContents();
	4294	+ }
	4295	+
	4296	+ void GenNormalsMESH()
	4297	+ {
	4298	+ group.GenNormalsMeshS();
3427	4299
3428	4300	refreshContents();
3429	4301	}
..	..	@@ -3659,7 +4531,7 @@
3659	4531
3660	4532	try
3661	4533	{
3662		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4534	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
3663	4535	}
3664	4536	catch (Exception e)
3665	4537	{
..	..	@@ -4051,6 +4923,18 @@
4051	4923	refreshContents();
4052	4924	}
4053	4925
	4926	+ void RewindLeaves(boolean hide)
	4927	+ {
	4928	+ group.selection.RewindLeaves(hide);
	4929	+ refreshContents();
	4930	+ }
	4931	+
	4932	+ void RandomLeaves(boolean hide)
	4933	+ {
	4934	+ group.selection.RandomLeaves(hide);
	4935	+ refreshContents();
	4936	+ }
	4937	+
4054	4938	void SetTexRes(int tr)
4055	4939	{
4056	4940	group.selection.SetTexRes(tr);
..	..	@@ -4122,28 +5006,25 @@
4122	5006	// }
4123	5007	// }
4124	5008
4125		- static boolean allparams = true;
4126		-
4127		- static Vector<Object3D> listUI = new Vector<Object3D>();
4128		-
4129	5009	void EditSelection(boolean newWindow)
4130	5010	{
	5011	+ if (group.selection == null)
	5012	+ {
	5013	+ EditElement(group, newWindow); // ? new
	5014	+ return;
	5015	+ }
	5016	+
4131	5017	// aConstraints.gridy = 0;
4132	5018	for (int i=0; i<group.selection.size(); i++)
4133	5019	{
4134	5020	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4135	5021	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4136		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5022	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4137	5023
4138	5024	Object3D elem = (Object3D)group.selection.elementAt(i);
4139	5025	if(elem != group \|\| !newWindow)
4140	5026	{
4141		- // if (!(elem instanceof Composite))
4142		- // newWindow = false;
4143		- listUI.add(elem);
4144		- elem.openEditWindow(this, newWindow); //, false);
4145		- System.out.println("edit : " + elem);
4146		- elem.editWindow.refreshContents(true); // ? new
	5027	+ EditElement(elem, newWindow); // ? new
4147	5028	}
4148	5029	}
4149	5030	}
..	..	@@ -4206,9 +5087,7 @@
4206	5087
4207	5088	freezemodel = false;
4208	5089	}
4209		-
4210		- boolean flashIt = true;
4211		-
	5090	+
4212	5091	public void valueChanged(TreeSelectionEvent e)
4213	5092	//public boolean handleEvent(Event event)
4214	5093	{
..	..	@@ -4218,7 +5097,8 @@
4218	5097	//new Exception().printStackTrace();
4219	5098
4220	5099	freezemodel = true;
4221		-
	5100	+ ClearUnpinned();
	5101	+
4222	5102	/**/
4223	5103	//switch (event.id)
4224	5104	{
..	..	@@ -4226,7 +5106,6 @@
4226	5106	//case 702: // Event.LIST_DESELECT
4227	5107	group.deselectAll();
4228	5108	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4229		- objEditor.ClearInfo(); // .GetMaterial());
4230	5109	if (tps != null)
4231	5110	{
4232	5111	for (int i=0; i < tps.length; i++)
..	..	@@ -4235,10 +5114,8 @@
4235	5114
4236	5115	//if (child.parent != null)
4237	5116	//child.parent.addSelectee(child);
	5117	+ objEditor.SetMaterial(child);
4238	5118	group.addSelectee(child);
4239		- objEditor.SetMaterial(child); // .GetMaterial());
4240		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4241		- System.err.println("info : " + child.GetPath());
4242	5119	}
4243	5120	}
4244	5121	// else
..	..	@@ -4248,20 +5125,28 @@
4248	5125	// System.err.println("info : " + group.GetPath());
4249	5126	// }
4250	5127
4251		- objEditor.SetText(); // jan 2014
4252		-
4253		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	5128	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4254	5129	CameraPane.flash = true;
4255	5130
4256		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5131	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4257	5132	// a camera
4258	5133	{
4259		- CameraPane.camerachangeframe = 0; // don't refuse it
4260		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5134	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5135	+ {
	5136	+ CameraPane.camerachangeframe = 0; // don't refuse it
	5137	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5138	+ }
4261	5139	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4262	5140	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4263	5141	}
4264	5142
	5143	+ if (tps != null && tps.length == 1)
	5144	+ {
	5145	+ EditSelection(false);
	5146	+ }
	5147	+
	5148	+ SetPinStates(tps != null && tps.length > 0);
	5149	+
4265	5150	refreshContents();
4266	5151	//return true;
4267	5152	}
..	..	@@ -4270,6 +5155,37 @@
4270	5155
4271	5156	freezemodel = false;
4272	5157	}
	5158	+
	5159	+ void SetPinStates(boolean enabled)
	5160	+ {
	5161	+ editButton.setEnabled(enabled);
	5162	+ uneditButton.setEnabled(enabled);
	5163	+ unselectButton.setEnabled(enabled);
	5164	+ flashSelectionButton.setEnabled(enabled);
	5165	+
	5166	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5167	+ }
	5168	+
	5169	+ void refreshContents(boolean cp)
	5170	+ {
	5171	+ if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5172	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5173	+ {
	5174	+ objEditor.ClearInfo(); // .GetMaterial());
	5175	+
	5176	+ for (int i=0; i < group.selection.Size(); i++)
	5177	+ {
	5178	+ Object3D child = (Object3D) group.selection.get(i);
	5179	+
	5180	+ objEditor.AddInfo(child, this, true);
	5181	+ System.err.println("info : " + child.GetPath());
	5182	+ }
	5183	+
	5184	+ objEditor.SetText(); // jan 2014
	5185	+ }
	5186	+
	5187	+ super.refreshContents(cp);
	5188	+ }
4273	5189
4274	5190	void linkSomething(Object3D thing)
4275	5191	{
..	..	@@ -4341,6 +5257,7 @@
4341	5257	{
4342	5258	if (group.selection.isEmpty())
4343	5259	return;
	5260	+
4344	5261	Grafreed.clipboardIsTempGroup = false;
4345	5262	Composite tGroup = null;
4346	5263	if (group.selection.size() > 0) // 1)
..	..	@@ -4351,6 +5268,8 @@
4351	5268
4352	5269	if (cut)
4353	5270	{
	5271	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5272	+// Save();
4354	5273	//int indices[] = jList.getSelectedIndices();
4355	5274	//for (int i = indices.length - 1; i >= 0; i--)
4356	5275	//jList.remove(indices[i]);
..	..	@@ -4440,8 +5359,10 @@
4440	5359	}
4441	5360
4442	5361	}
	5362	+
4443	5363	if (Grafreed.clipboardIsTempGroup)
4444	5364	Grafreed.clipboard = tGroup;
	5365	+
4445	5366	if (cut)
4446	5367	{
4447	5368	ResetModel();
..	..	@@ -4451,6 +5372,10 @@
4451	5372
4452	5373	void paste(boolean expand)
4453	5374	{
	5375	+ if (Globals.REPLACEONMAKE)
	5376	+ Save();
	5377	+ boolean keep = Globals.REPLACEONMAKE;
	5378	+ Globals.REPLACEONMAKE = false;
4454	5379	// if (GrafreeD.clipboard == null)
4455	5380	// return;
4456	5381	boolean first = true;
..	..	@@ -4510,6 +5435,7 @@
4510	5435	Grafreed.clipboard.get(0).parent = keepparent;
4511	5436	}
4512	5437
	5438	+ Globals.REPLACEONMAKE = keep;
4513	5439	ResetModel();
4514	5440	refreshContents();
4515	5441	}
..	..	@@ -4645,6 +5571,10 @@
4645	5571
4646	5572	void group(Object3D csg, boolean grab)
4647	5573	{
	5574	+ if (Globals.REPLACEONMAKE)
	5575	+ Save();
	5576	+ boolean keep = Globals.REPLACEONMAKE;
	5577	+ Globals.REPLACEONMAKE = false;
4648	5578	if (//false) // why??
4649	5579	!group.selection.isEmpty())
4650	5580	{
..	..	@@ -4758,10 +5688,15 @@
4758	5688	//node.add(csg);
4759	5689	//makeSomething(node);
4760	5690	makeSomething(csg);
	5691	+ Globals.REPLACEONMAKE = keep;
4761	5692	}
4762	5693
4763	5694	void Ungroup(Object3D g)
4764	5695	{
	5696	+ if (Globals.REPLACEONMAKE)
	5697	+ Save();
	5698	+ boolean keep = Globals.REPLACEONMAKE;
	5699	+ Globals.REPLACEONMAKE = false;
4765	5700	if (g instanceof HiddenObject)
4766	5701	{
4767	5702	HiddenObject h = (HiddenObject) g;
..	..	@@ -4778,6 +5713,7 @@
4778	5713	objEditor.makeSomething(g.get(i), false);
4779	5714	}
4780	5715	}
	5716	+ Globals.REPLACEONMAKE = keep;
4781	5717	}
4782	5718
4783	5719	void ungroup()
..	..	@@ -4973,21 +5909,6 @@
4973	5909	}
4974	5910	*/
4975	5911
4976		- void ImportGFD()
4977		- {
4978		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4979		- browser.show();
4980		- String filename = browser.getFile();
4981		- if (filename != null && filename.length() > 0)
4982		- {
4983		- String fullname = browser.getDirectory() + filename;
4984		-
4985		- //Object3D readobj =
4986		- objEditor.ReadGFD(fullname, objEditor);
4987		- //makeSomething(readobj);
4988		- }
4989		- }
4990		-
4991	5912	/*
4992	5913	public void Callback(Object obj)
4993	5914	{
..	..	@@ -5011,23 +5932,6 @@
5011	5932	}
5012	5933	*/
5013	5934
5014		- void ImportVRMLX3D()
5015		- {
5016		- if (Grafreed.standAlone)
5017		- {
5018		- /**/
5019		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
5020		- browser.show();
5021		- String filename = browser.getFile();
5022		- if (filename != null && filename.length() > 0)
5023		- {
5024		- String fullname = browser.getDirectory() + filename;
5025		- LoadVRMLX3D(fullname);
5026		- }
5027		- /**/
5028		- }
5029		- }
5030		-
5031	5935	String GetFile(String dialogName)
5032	5936	{
5033	5937	if (Grafreed.standAlone)
..	..	@@ -5098,7 +6002,44 @@
5098	6002	cButton clearpanelButton;
5099	6003	cButton unselectButton;
5100	6004
	6005	+ cButton restoreCameraButton;
	6006	+
	6007	+ cButton saveButton;
5101	6008	cButton oneStepButton;
	6009	+
	6010	+ cButton groupButton;
	6011	+ cButton ungroupButton;
	6012	+ cButton compositeButton;
	6013	+ cButton switchButton;
	6014	+ cButton loopButton;
	6015	+ cButton textureButton;
	6016	+
	6017	+ cButton skybox1Button;
	6018	+ cButton skybox2Button;
	6019	+ cButton skybox3Button;
	6020	+ cButton skybox4Button;
	6021	+ cButton skybox5Button;
	6022	+ cButton skybox6Button;
	6023	+ cButton skybox7Button;
	6024	+
	6025	+ cButton skybox11Button;
	6026	+ cButton skybox12Button;
	6027	+ cButton skybox13Button;
	6028	+ cButton skybox14Button;
	6029	+ cButton skybox15Button;
	6030	+ cButton skybox16Button;
	6031	+ cButton skybox17Button;
	6032	+
	6033	+ cButton gridButton;
	6034	+ cButton boxButton;
	6035	+ cButton sphereButton;
	6036	+ cButton coneButton;
	6037	+ cButton torusButton;
	6038	+ cButton superButton;
	6039	+ cButton kleinButton;
	6040	+ cButton particlesButton;
	6041	+ cButton overlayButton;
	6042	+ cButton lightButton;
5102	6043
5103	6044	cButton screenfitButton;
5104	6045	cButton screenfitpointButton;
..	..	@@ -5111,14 +6052,6 @@
5111	6052
5112	6053	cButton setsupportButton;
5113	6054
5114		- cButton twoButton;
5115		- cButton sixButton;
5116		- cButton threeButton;
5117		- cButton sevenButton;
5118		- cButton fourButton; // full panel
5119		- cButton oneButton; // full XYZ
5120		- //cButton currentLayout;
5121		-
5122	6055	//
5123	6056	//Composite
5124	6057	Object3D // to do !!
..	..	@@ -5128,9 +6061,11 @@
5128	6061	//JTree jTree;
5129	6062	private MenuItem lookAtItem;
5130	6063	private MenuItem lookFromItem;
5131		- private MenuItem switchItem;
	6064	+ private MenuItem switchViewItem;
5132	6065	private MenuItem cutItem;
5133		- private MenuItem duplicateItem;
	6066	+ private MenuItem undoItem;
	6067	+ private MenuItem redoItem;
	6068	+ private JMenuItem duplicateItem;
5134	6069	private MenuItem cloneItem;
5135	6070	private MenuItem cloneSupportItem;
5136	6071	private MenuItem overwriteGeoItem;
..	..	@@ -5158,7 +6093,7 @@
5158	6093	private MenuItem pasteLinkItem;
5159	6094	private MenuItem pasteCloneItem;
5160	6095	private MenuItem pasteExpandItem;
5161		- private MenuItem clearItem;
	6096	+ private MenuItem deleteItem;
5162	6097	private MenuItem clearAllItem;
5163	6098	private MenuItem genUVItem;
5164	6099	private MenuItem genNormalsMESHItem;
..	..	@@ -5193,6 +6128,10 @@
5193	6128	private MenuItem showleavesItem;
5194	6129	private MenuItem markleavesItem;
5195	6130	private MenuItem unmarkleavesItem;
	6131	+ private MenuItem rewindleavesItem;
	6132	+ private MenuItem unrewindleavesItem;
	6133	+ private MenuItem randomleavesItem;
	6134	+ private MenuItem unrandomleavesItem;
5196	6135
5197	6136	private MenuItem flipVItem;
5198	6137	private MenuItem unflipVItem;
..	..	@@ -5214,7 +6153,7 @@
5214	6153	private MenuItem frontItem;
5215	6154	private MenuItem cameraItem;
5216	6155	private MenuItem compositeItem;
5217		- private MenuItem randomItem;
	6156	+ private MenuItem switchItem;
5218	6157	private MenuItem physicsItem;
5219	6158	private MenuItem frameselectorItem;
5220	6159	private MenuItem scriptNodeItem;
..	..	@@ -5238,6 +6177,8 @@
5238	6177	private MenuItem attachBumpItem;
5239	6178	private MenuItem detachBumpItem;
5240	6179	private MenuItem pigmentBumpItem;
	6180	+ private MenuItem embedTexturesItem;
	6181	+ private MenuItem deEmbedTexturesItem;
5241	6182
5242	6183	private MenuItem particleItem;
5243	6184	private MenuItem ragdollItem;
..	..	@@ -5276,11 +6217,6 @@
5276	6217	private MenuItem doubleItem;
5277	6218	private MenuItem tripleItem;
5278	6219
5279		- private MenuItem importGFDItem;
5280		- private MenuItem importVRMLX3DItem;
5281		- private MenuItem import3DSItem;
5282		- private MenuItem importOBJItem;
5283		-
5284	6220	private MenuItem computeAOItem;
5285	6221	private MenuItem recompileItem;
5286	6222	private MenuItem editScriptItem;
..	..	@@ -5290,4 +6226,8 @@
5290	6226	private MenuItem analyzeItem;
5291	6227	private MenuItem dumpItem;
5292	6228	//boolean freezemodel = false;
	6229	+
	6230	+ Menu cameraMenu;
	6231	+ MenuItem editCameraItem;
	6232	+ MenuItem restoreCameraItem;
5293	6233	}