~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -16,6 +16,7 @@
16	16	//import buoy.widget.BFileChooser;
17	17
18	18	class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
	19	+ Grafreed.iResourceCallBack,
19	20	ObjectUI,
20	21	Runnable,
21	22	ActionListener,
..	..	@@ -23,6 +24,360 @@
23	24	DragGestureListener, DragSourceListener, DropTargetListener,
24	25	ItemListener // ListSelectionListener
25	26	{
	27	+
	28	+ public void AddSkyboxButton(String f, String s, cGridBag row)
	29	+ {
	30	+ cButton skyboxButton;
	31	+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
	32	+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
	33	+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
	34	+ skyboxButton.setToolTipText(s.equals("") ? "No background" : s);
	35	+ skyboxButton.addActionListener(new ActionListener()
	36	+ {
	37	+ @Override
	38	+ public void actionPerformed(ActionEvent e)
	39	+ {
	40	+ ChangeSkybox(path);
	41	+ }
	42	+ });
	43	+ }
	44	+
	45	+ public void AddTextureButton(String f, String c, final String t, int count, cGridBag row)
	46	+ {
	47	+ cButton textureButton;
	48	+ final String path = "textures/" + f + "/" + c + "/"; // + t;
	49	+ row.add(textureButton = GetButton(path + "icons/" + t, !Grafreed.NIMBUSLAF));
	50	+ textureButton.setToolTipText(c + count);
	51	+ textureButton.addActionListener(new ActionListener()
	52	+ {
	53	+ @Override
	54	+ public void actionPerformed(ActionEvent e)
	55	+ {
	56	+ ChangeTexture(path + t);
	57	+ }
	58	+ });
	59	+ }
	60	+
	61	+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
	62	+ {
	63	+ cGridBag tab0 = new cGridBag().setVertical(true);
	64	+
	65	+ tab0.setName("Urban");
	66	+ skyboxpanel.add(tab0);
	67	+
	68	+ cGridBag row0 = new cGridBag();
	69	+ cGridBag row1 = new cGridBag();
	70	+ cGridBag row2 = new cGridBag();
	71	+ cGridBag row3 = new cGridBag();
	72	+ cGridBag row4 = new cGridBag();
	73	+ cGridBag row5 = new cGridBag();
	74	+ cGridBag row6 = new cGridBag();
	75	+
	76	+ AddSkyboxButton("default", "", row0);
	77	+ //AddSkyboxButton("default", "cornell", row0);
	78	+ AddSkyboxButton("penguins", "dust", row0);
	79	+ AddSkyboxButton("penguins", "tropic", row0);
	80	+ AddSkyboxButton("penguins", "yonder", row0);
	81	+
	82	+ AddSkyboxButton("default", "uffizi", row1);
	83	+ AddSkyboxButton("bridge", "Bridge", row1);
	84	+ AddSkyboxButton("bridge", "Bridge2", row1);
	85	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	86	+
	87	+ AddSkyboxButton("urban", "Parliament", row2);
	88	+ AddSkyboxButton("urban", "Roundabout", row2);
	89	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	90	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	91	+
	92	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	93	+ AddSkyboxButton("urban", "UnionSquare", row3);
	94	+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
	95	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	96	+
	97	+ AddSkyboxButton("park", "Buddha", row4);
	98	+ AddSkyboxButton("park", "CNTower2", row4);
	99	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	100	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	101	+
	102	+ AddSkyboxButton("park", "Park", row5);
	103	+ AddSkyboxButton("park", "Pond", row5);
	104	+ AddSkyboxButton("park", "Skansen", row5);
	105	+ AddSkyboxButton("park", "Skansen2", row5);
	106	+
	107	+ AddSkyboxButton("park", "Skansen3", row6);
	108	+ AddSkyboxButton("park", "Skansen4", row6);
	109	+ AddSkyboxButton("park", "Skansen5", row6);
	110	+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
	111	+
	112	+ tab0.add(row0);
	113	+ tab0.add(row1);
	114	+ tab0.add(row2);
	115	+ tab0.add(row3);
	116	+ tab0.add(row4);
	117	+ tab0.add(row5);
	118	+ tab0.add(row6);
	119	+
	120	+ for (int i=5; --i>=0;)
	121	+ {
	122	+ //oe.toolboxPanel.Return();
	123	+ //tab0.add(new cGridBag());
	124	+ }
	125	+ }
	126	+
	127	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	128	+ {
	129	+ cGridBag tab0 = new cGridBag().setVertical(true);
	130	+
	131	+ tab0.setName("Nature");
	132	+ skyboxpanel.add(tab0);
	133	+
	134	+ cGridBag row0 = new cGridBag();
	135	+ cGridBag row1 = new cGridBag();
	136	+ cGridBag row2 = new cGridBag();
	137	+ cGridBag row3 = new cGridBag();
	138	+ cGridBag row4 = new cGridBag();
	139	+ cGridBag row5 = new cGridBag();
	140	+ cGridBag row6 = new cGridBag();
	141	+
	142	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	143	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	144	+ AddSkyboxButton("beach", "PalmTrees", row0);
	145	+ AddSkyboxButton("beach", "Tenerife", row0);
	146	+
	147	+ AddSkyboxButton("beach", "Tenerife2", row1);
	148	+ AddSkyboxButton("beach", "Tenerife3", row1);
	149	+ AddSkyboxButton("field", "FishPond", row1);
	150	+ AddSkyboxButton("field", "Footballfield", row1);
	151	+
	152	+ AddSkyboxButton("field", "Meadow", row2);
	153	+ AddSkyboxButton("field", "Sorsele", row2);
	154	+ AddSkyboxButton("field", "Sorsele2", row2);
	155	+ AddSkyboxButton("field", "Sorsele3", row2);
	156	+
	157	+ AddSkyboxButton("forest", "Brudslojan", row3);
	158	+ AddSkyboxButton("forest", "Langholmen2", row3);
	159	+ AddSkyboxButton("forest", "Plants", row3);
	160	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	161	+
	162	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	163	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	164	+ AddSkyboxButton("mountain", "Teide", row4);
	165	+ AddSkyboxButton("park", "Tantolunden4", row4);
	166	+
	167	+ AddSkyboxButton("park", "Stairs", row5);
	168	+ AddSkyboxButton("default", "skycube", row6);
	169	+ AddSkyboxButton("rocky", "Langholmen", row5);
	170	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	171	+
	172	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	173	+ AddSkyboxButton("default", "CloudyHills", row6);
	174	+ AddSkyboxButton("daz", "Autumn", row6);
	175	+ AddSkyboxButton("daz", "MountainTrail", row6);
	176	+ /*
	177	+Autumn
	178	+Greenlands
	179	+MountainTrail
	180	+Oasis
	181	+TheRock
	182	+TopOfTheWorld
	183	+Winter
	184	+ */
	185	+
	186	+ tab0.add(row0);
	187	+ tab0.add(row1);
	188	+ tab0.add(row2);
	189	+ tab0.add(row3);
	190	+ tab0.add(row4);
	191	+ tab0.add(row5);
	192	+ tab0.add(row6);
	193	+
	194	+ for (int i=5; --i>=0;)
	195	+ {
	196	+ //oe.toolboxPanel.Return();
	197	+ //tab0.add(new cGridBag());
	198	+ }
	199	+ }
	200	+
	201	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	202	+ {
	203	+ cGridBag tab0 = new cGridBag().setVertical(true);
	204	+
	205	+ tab0.setName("Night");
	206	+ skyboxpanel.add(tab0);
	207	+
	208	+ cGridBag row0 = new cGridBag();
	209	+ cGridBag row1 = new cGridBag();
	210	+ cGridBag row2 = new cGridBag();
	211	+ cGridBag row3 = new cGridBag();
	212	+ cGridBag row4 = new cGridBag();
	213	+ cGridBag row5 = new cGridBag();
	214	+ cGridBag row6 = new cGridBag();
	215	+
	216	+ AddSkyboxButton("night", "NightPath", row0);
	217	+ AddSkyboxButton("night", "PondNight", row0);
	218	+ AddSkyboxButton("night", "Powerlines", row0);
	219	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	220	+
	221	+ AddSkyboxButton("urban", "CNTower", row1);
	222	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	223	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	224	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
	225	+
	226	+ AddSkyboxButton("penguins", "kenon_star", row2);
	227	+ AddSkyboxButton("persson", "corona", row2);
	228	+ AddSkyboxButton("persson", "spaceskybox", row2);
	229	+ AddSkyboxButton("indoors", "Vasa", row2);
	230	+
	231	+ AddSkyboxButton("winter", "Backyard", row3);
	232	+ AddSkyboxButton("winter", "Creek", row3);
	233	+ AddSkyboxButton("winter", "FootballField3", row3);
	234	+ AddSkyboxButton("winter", "Forest", row3);
	235	+
	236	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	237	+ AddSkyboxButton("winter", "House", row4);
	238	+ AddSkyboxButton("winter", "IceLake", row4);
	239	+ AddSkyboxButton("winter", "IceRiver", row4);
	240	+
	241	+ AddSkyboxButton("winter", "Park3", row5);
	242	+ AddSkyboxButton("winter", "PondWinter", row5);
	243	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	244	+ AddSkyboxButton("winter", "Vindelalven", row5);
	245	+
	246	+ AddSkyboxButton("daz", "TheRock", row6);
	247	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	248	+ AddSkyboxButton("daz", "Winter", row6);
	249	+ AddSkyboxButton("mountain", "Ryfjallet", row6);
	250	+
	251	+ tab0.add(row0);
	252	+ tab0.add(row1);
	253	+ tab0.add(row2);
	254	+ tab0.add(row3);
	255	+ tab0.add(row4);
	256	+ tab0.add(row5);
	257	+ tab0.add(row6);
	258	+
	259	+ for (int i=5; --i>=0;)
	260	+ {
	261	+ //oe.toolboxPanel.Return();
	262	+ //tab0.add(new cGridBag());
	263	+ }
	264	+ }
	265	+
	266	+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
	267	+ {
	268	+ cGridBag tab0 = new cGridBag().setVertical(true);
	269	+
	270	+ tab0.setName("Others");
	271	+ skyboxpanel.add(tab0);
	272	+
	273	+ cGridBag row0 = new cGridBag();
	274	+ cGridBag row1 = new cGridBag();
	275	+ cGridBag row2 = new cGridBag();
	276	+ cGridBag row3 = new cGridBag();
	277	+ cGridBag row4 = new cGridBag();
	278	+ cGridBag row5 = new cGridBag();
	279	+ cGridBag row6 = new cGridBag();
	280	+
	281	+ AddSkyboxButton("mayhem", "afterrain", row0);
	282	+ AddSkyboxButton("mayhem", "aqua4", row0);
	283	+ AddSkyboxButton("mayhem", "aqua9", row0);
	284	+ AddSkyboxButton("mayhem", "flame", row0);
	285	+
	286	+ AddSkyboxButton("mayhem", "h2s", row1);
	287	+ AddSkyboxButton("mayhem", "prehistoric", row1);
	288	+ AddSkyboxButton("mayhem", "scorched", row1);
	289	+ AddSkyboxButton("penguins", "desertdawn", row1);
	290	+
	291	+ AddSkyboxButton("persson", "Citadella", row2);
	292	+ AddSkyboxButton("persson", "Citadella2", row2);
	293	+ AddSkyboxButton("persson", "clouds1", row2);
	294	+ AddSkyboxButton("penguins", "wrath", row2);
	295	+
	296	+ AddSkyboxButton("persson", "FishermansBastion", row3);
	297	+ AddSkyboxButton("persson", "HeroesSquare", row3);
	298	+ AddSkyboxButton("indoors", "DallasW", row3);
	299	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
	300	+
	301	+ AddSkyboxButton("persson", "LancellottiChapel", row4);
	302	+ AddSkyboxButton("persson", "PereaBeach1", row4);
	303	+ AddSkyboxButton("persson", "PereaBeach2", row4);
	304	+ AddSkyboxButton("persson", "redeclipse", row4);
	305	+
	306	+ AddSkyboxButton("daz", "Greenlands", row5);
	307	+ AddSkyboxButton("daz", "Oasis", row5);
	308	+ AddSkyboxButton("elyvisions", "arch3", row5);
	309	+ AddSkyboxButton("elyvisions", "calm_sea", row5);
	310	+
	311	+ AddSkyboxButton("elyvisions", "rainbow", row6);
	312	+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
	313	+ AddSkyboxButton("elyvisions", "heaven", row6);
	314	+ AddSkyboxButton("elyvisions", "hot", row6);
	315	+
	316	+ tab0.add(row0);
	317	+ tab0.add(row1);
	318	+ tab0.add(row2);
	319	+ tab0.add(row3);
	320	+ tab0.add(row4);
	321	+ tab0.add(row5);
	322	+ tab0.add(row6);
	323	+
	324	+ for (int i=5; --i>=0;)
	325	+ {
	326	+ //oe.toolboxPanel.Return();
	327	+ //tab0.add(new cGridBag());
	328	+ }
	329	+ }
	330	+
	331	+ public void ChangeSkybox(String skybox)
	332	+ {
	333	+ if (skybox.endsWith("/"))
	334	+ {
	335	+ group.skyboxname = null;
	336	+ group.skyboxext = null;
	337	+ cameraView.repaint();
	338	+ }
	339	+ else
	340	+ {
	341	+ //cameraView.envyoff = false;
	342	+ group.skyboxname = skybox;
	343	+ group.skyboxext = "jpg";
	344	+ cameraView.repaint();
	345	+ }
	346	+ }
	347	+
	348	+ public void CreateSkyboxPanel(cGridBag skyboxPanel)
	349	+ {
	350	+ JTabbedPane skyboxpane = new JTabbedPane();
	351	+
	352	+ AddSkyboxTab0(skyboxpane);
	353	+ AddSkyboxTab1(skyboxpane);
	354	+ AddSkyboxTab2(skyboxpane);
	355	+ AddSkyboxTab3(skyboxpane);
	356	+
	357	+ skyboxPanel.add(skyboxpane);
	358	+ }
	359	+
	360	+ public void ChangeTexture(String texture)
	361	+ {
	362	+ for (int i=0; i<group.selection.size(); i++)
	363	+ {
	364	+ Object3D obj = group.selection.get(i);
	365	+ obj.SetPigmentTexture("@" + texture);
	366	+ }
	367	+
	368	+ refreshContents();
	369	+ }
	370	+
	371	+ public void Show3DView()
	372	+ {
	373	+ // bug
	374	+ //gridPanel.setDividerLocation(1.0);
	375	+ //bigPanel.setDividerLocation(0.0);
	376	+ bigThree.ClearUI();
	377	+ bigThree.add(centralPanel);
	378	+ bigThree.FlushUI();
	379	+ }
	380	+
26	381	//ObjEditor objEditor;
27	382	public void closeUI2()
28	383	{
..	..	@@ -60,6 +415,14 @@
60	415	this.copy = this.group = group;
61	416	//selectees = this.group.selectees;
62	417
	418	+ if (copy.versionlist == null)
	419	+ {
	420	+ copy.versionlist = new Object3D[100];
	421	+ copy.versionindex = -1;
	422	+
	423	+ Save(true);
	424	+ }
	425	+
63	426	if(ui)
64	427	SetupUI(objEditor);
65	428	}
..	..	@@ -74,16 +437,28 @@
74	437	this.copy = this.group = copy;
75	438	//selectees = this.group.selectees;
76	439
77		- SetupMenu2(objEditor);
	440	+ SetupMenu2(this); //objEditor);
78	441	SetupUI2(objEditor);
79	442	objEditor.SetupUI(true);
80	443	SetupViews(objEditor);
81	444
82	445	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	446	+
	447	+ if (copy.versionlist == null)
	448	+ {
	449	+ copy.versionlist = new Object3D[100];
	450	+ copy.versionindex = -1;
	451	+
	452	+ Save(true);
	453	+ }
83	454	}
84	455
85	456	void CloneSelection(boolean supports)
86	457	{
	458	+ if (Globals.REPLACEONMAKE)
	459	+ Save();
	460	+ boolean keep = Globals.REPLACEONMAKE;
	461	+ Globals.REPLACEONMAKE = false;
87	462	// Object3D keep = GrafreeD.clipboard;
88	463	//Object3D obj;
89	464	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,6 +469,7 @@
94	469
95	470	makeSomething(clone, i==group.selection.size()-1);
96	471	}
	472	+ Globals.REPLACEONMAKE = keep;
97	473	}
98	474
99	475	void CloneClipboard(boolean supports)
..	..	@@ -148,28 +524,21 @@
148	524
149	525	//JTextField nameField;
150	526
151		- void SetupMenu2(ObjEditor oe)
	527	+ void SetupMenu2(GroupEditor oe)
152	528	{
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		-
	529	+ oe.jTree = new cTree();
	530	+
168	531	Menu menu;
169	532	oe.menuBar.add(menu = new Menu("Edit"));
170	533	//editItem = menu.add(new MenuItem("Edit"));
171	534	//editItem.addActionListener(this);
172		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	535	+
	536	+// undoItem = menu.add(new MenuItem("Undo"));
	537	+// undoItem.addActionListener(this);
	538	+// redoItem = menu.add(new MenuItem("Redo"));
	539	+// redoItem.addActionListener(this);
	540	+// menu.add("-");
	541	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
173	542	duplicateItem.addActionListener(this);
174	543	cloneItem = menu.add(new MenuItem("Clone"));
175	544	cloneItem.addActionListener(this);
..	..	@@ -185,7 +554,6 @@
185	554	copyItem.addActionListener(this);
186	555	pasteItem = menu.add(new MenuItem("Paste"));
187	556	pasteItem.addActionListener(this);
188		- menu.add("-");
189	557
190	558	menu.add("-");
191	559	pasteIntoItem = menu.add(new MenuItem("Paste into"));
..	..	@@ -197,8 +565,8 @@
197	565	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
198	566	// pasteExpandItem.addActionListener(this);
199	567	menu.add("-");
200		- clearItem = menu.add(new MenuItem("Clear"));
201		- clearItem.addActionListener(this);
	568	+ deleteItem = menu.add(new MenuItem("Delete"));
	569	+ deleteItem.addActionListener(this);
202	570
203	571	if (Globals.ADVANCED)
204	572	{
..	..	@@ -206,7 +574,92 @@
206	574	clearAllItem = menu.add(new MenuItem("Clear All"));
207	575	clearAllItem.addActionListener(this);
208	576	}
	577	+
	578	+ menuBar.add(cameraMenu = new Menu("View"));
	579	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	580	+ //zBufferItem.addActionListener(this);
	581	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	582	+ //normalLensItem.addActionListener(this);
	583	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	584	+ restoreCameraItem.addActionListener(this);
	585	+
	586	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	587	+// toggleFullScreenItem.addItemListener(this);
	588	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	589	+// cameraMenu.add("-");
	590	+//
	591	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	592	+// toggleTextureItem.addItemListener(this);
	593	+// toggleTextureItem.setState(CameraPane.textureon);
	594	+//
	595	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	596	+// toggleSwitchItem.addItemListener(this);
	597	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	598	+
	599	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	600	+ toggleHandleItem.addItemListener(this);
	601	+ toggleHandleItem.setState(CameraPane.HANDLES);
	602	+
	603	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	604	+ togglePaintItem.addItemListener(this);
	605	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	606	+
	607	+ if (Globals.ADVANCED)
	608	+ {
	609	+ cameraMenu.add("-");
	610	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	611	+ toggleLiveItem.addItemListener(this);
	612	+ toggleLiveItem.setState(Globals.isLIVE());
209	613
	614	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	615	+ stepItem.addActionListener(this);
	616	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	617	+ // toggleDLItem.addItemListener(this);
	618	+ // toggleDLItem.setState(false);
	619	+
	620	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	621	+ toggleRenderItem.addItemListener(this);
	622	+ toggleRenderItem.setState(!CameraPane.frozen);
	623	+
	624	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	625	+ toggleDebugItem.addItemListener(this);
	626	+ toggleDebugItem.setState(Globals.DEBUG);
	627	+
	628	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	629	+ toggleFrustumItem.addItemListener(this);
	630	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	631	+
	632	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	633	+ toggleFootContactItem.addItemListener(this);
	634	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	635	+
	636	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	637	+ toggleTimelineItem.addItemListener(this);
	638	+ }
	639	+
	640	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	641	+// toggleRootItem.addItemListener(this);
	642	+// toggleRootItem.setState(false);
	643	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	644	+// animationItem.addItemListener(this);
	645	+// animationItem.setState(CameraPane.ANIMATION);
	646	+ cameraMenu.add("-");
	647	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	648	+ editCameraItem.addActionListener(this);
	649	+
	650	+ if (Globals.ADVANCED)
	651	+ {
	652	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	653	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	654	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	655	+ oe.cameraMenu.add("-");
	656	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	657	+ openWindowItem.addActionListener(this);
	658	+ lookAtItem.addActionListener(this);
	659	+ //lookFromItem.addActinoListener(this);
	660	+ //switchViewItem.addActionListener(this);
	661	+ }
	662	+
210	663	oe.menuBar.add(menu = new Menu("Setting"));
211	664	if (Globals.ADVANCED)
212	665	{
..	..	@@ -249,21 +702,29 @@
249	702	}
250	703
251	704	oe.menuBar.add(menu = new Menu("Group"));
252		- grabItem = menu.add(new MenuItem("Grab"));
253		- grabItem.addActionListener(this);
	705	+// grabItem = menu.add(new MenuItem("Grab"));
	706	+// grabItem.addActionListener(this);
254	707	backItem = menu.add(new MenuItem("Back"));
255	708	backItem.addActionListener(this);
256	709	frontItem = menu.add(new MenuItem("Front"));
257	710	frontItem.addActionListener(this);
258		- compositeItem = menu.add(new MenuItem("Composite"));
259		- compositeItem.addActionListener(this);
	711	+// compositeItem = menu.add(new MenuItem("Composite"));
	712	+// compositeItem.addActionListener(this);
	713	+
	714	+ if (Globals.ADVANCED)
	715	+ {
260	716	hideItem = menu.add(new MenuItem("Hidden Group"));
261	717	hideItem.addActionListener(this);
	718	+ }
262	719	ungroupItem = menu.add(new MenuItem("Ungroup"));
263	720	ungroupItem.addActionListener(this);
264		- menu.add("-");
265		- randomItem = menu.add(new MenuItem("Switch node"));
266		- randomItem.addActionListener(this);
	721	+
	722	+// menu.add("-");
	723	+//
	724	+// switchItem = menu.add(new MenuItem("Switch node"));
	725	+// switchItem.addActionListener(this);
	726	+ if (Globals.ADVANCED)
	727	+ {
267	728	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
268	729	switchGeoItem.addActionListener(this);
269	730	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -271,8 +732,6 @@
271	732	morphItem = menu.add(new MenuItem("Morph Group"));
272	733	morphItem.addActionListener(this);
273	734
274		- if (Globals.ADVANCED)
275		- {
276	735	menu.add("-");
277	736	physicsItem = menu.add(new MenuItem("Physics"));
278	737	physicsItem.addActionListener(this);
..	..	@@ -280,30 +739,29 @@
280	739	frameselectorItem.addActionListener(this);
281	740	scriptNodeItem = menu.add(new MenuItem("Script Node"));
282	741	scriptNodeItem.addActionListener(this);
283		- cameraItem = menu.add(new MenuItem("Camera"));
284		- cameraItem.addActionListener(this);
285	742	}
286	743
287	744	oe.menuBar.add(menu = new Menu("Object"));
288		- textureItem = menu.add(new MenuItem("Texture"));
289		- textureItem.addActionListener(this);
	745	+// textureItem = menu.add(new MenuItem("Texture"));
	746	+// textureItem.addActionListener(this);
290	747	billboardItem = menu.add(new MenuItem("Billboard"));
291	748	billboardItem.addActionListener(this);
292	749	csgItem = menu.add(new MenuItem("CSG"));
293	750	csgItem.addActionListener(this);
294		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	751	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
295	752	shadowXItem.addActionListener(this);
296		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	753	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
297	754	shadowYItem.addActionListener(this);
298		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	755	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
299	756	shadowZItem.addActionListener(this);
	757	+ attributeItem = menu.add(new MenuItem("Attribute"));
	758	+ attributeItem.addActionListener(this);
	759	+
300	760	if (Globals.ADVANCED)
301	761	{
302	762	menu.add("-");
303	763	linkerItem = menu.add(new MenuItem("Linker"));
304	764	linkerItem.addActionListener(this);
305		- attributeItem = menu.add(new MenuItem("Attribute"));
306		- attributeItem.addActionListener(this);
307	765	templateItem = menu.add(new MenuItem("Template"));
308	766	templateItem.addActionListener(this);
309	767	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -332,7 +790,7 @@
332	790	genNormalsMESHItem.addActionListener(this);
333	791	if (Globals.ADVANCED)
334	792	{
335		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	793	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
336	794	genNormalsMINEItem.addActionListener(this);
337	795	}
338	796	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -392,6 +850,14 @@
392	850	markleavesItem.addActionListener(this);
393	851	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
394	852	unmarkleavesItem.addActionListener(this);
	853	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	854	+ rewindleavesItem.addActionListener(this);
	855	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	856	+ unrewindleavesItem.addActionListener(this);
	857	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	858	+ randomleavesItem.addActionListener(this);
	859	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	860	+ unrandomleavesItem.addActionListener(this);
395	861	menu.add("-");
396	862	flipVItem = menu.add(new MenuItem("Flip V"));
397	863	flipVItem.addActionListener(this);
..	..	@@ -417,10 +883,15 @@
417	883	attachBumpItem.addActionListener(this);
418	884	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
419	885	pigmentBumpItem.addActionListener(this);
	886	+ //embedTexturesItem
420	887	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
421	888	detachPigmentItem.addActionListener(this);
422	889	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
423	890	detachBumpItem.addActionListener(this);
	891	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	892	+ embedTexturesItem.addActionListener(this);
	893	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	894	+ deEmbedTexturesItem.addActionListener(this);
424	895	menu.add("-");
425	896	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
426	897	sortbysizeItem.addActionListener(this);
..	..	@@ -431,6 +902,9 @@
431	902	shareGeometriesItem.addActionListener(this);
432	903	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
433	904	mergeGeometriesItem.addActionListener(this);
	905	+ menu.add("-");
	906	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	907	+ editLeafItem.addActionListener(this);
434	908	if (Globals.ADVANCED)
435	909	{
436	910	// Pretty much the same as duplicate and clone.
..	..	@@ -443,33 +917,95 @@
443	917	oe.menuBar.add(menu = new Menu("Insert"));
444	918	buildCreateMenu(menu);
445	919
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	920	oe.menuBar.add(menu = new Menu("Tools"));
460	921	buildToolsMenu(menu);
461	922	}
462	923
	924	+ JTabbedPane resourcecontainer;
	925	+ cGridBag currenttab;
	926	+ boolean added; // patch for jar
	927	+
	928	+ int tabcount = 0;
	929	+ int colcount = 0;
	930	+ int rowcount = 0;
	931	+ int texturecount = 0;
	932	+
	933	+ int columns = 5;
	934	+ int rows = 7;
	935	+
	936	+ public void ResourceCallBack(String[] path)
	937	+ {
	938	+// for (int i = 0; i < path.length; i++)
	939	+// System.out.print(path[i] + "/");
	940	+// System.out.println();
	941	+
	942	+ if (//rowcount == 0 \|\|
	943	+ path.length == 1)
	944	+ {
	945	+ currenttab = new cGridBag();
	946	+ added = false;
	947	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	948	+ currenttab.setName(tabname);
	949	+ rowcount = 1;
	950	+ colcount = 0;
	951	+ texturecount = 0;
	952	+ }
	953	+
	954	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	955	+ {
	956	+ if (!added)
	957	+ {
	958	+ added = true;
	959	+ resourcecontainer.add(currenttab);
	960	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	961	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	962	+ }
	963	+
	964	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	965	+
	966	+ if (++colcount >= columns)
	967	+ {
	968	+ colcount = 0;
	969	+ currenttab.Return();
	970	+
	971	+ if (rowcount++ >= rows)
	972	+ {
	973	+ rowcount = 0;
	974	+ }
	975	+ }
	976	+ }
	977	+ else
	978	+ {
	979	+// if (!path[path.length-1].equals("icons"))
	980	+// resourcecontainer.Return();
	981	+ }
	982	+ }
	983	+
	984	+ void CreateTexturePanel(cGridBag container)
	985	+ {
	986	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	987	+ container.add(resourcecontainer);
	988	+
	989	+ Grafreed.ParseResources("textures", this);
	990	+ }
	991	+
463	992	void SetupUI2(ObjEditor oe)
464	993	{
	994	+ // June 2019
	995	+ if (oe == null)
	996	+ {
	997	+ //super.SetupUI2(this);
	998	+ //return;
	999	+ }
	1000	+
	1001	+ if (copy != group)
	1002	+ {
	1003	+ //super.SetupUI2(this);
	1004	+ }
	1005	+
465	1006	//new Exception().printStackTrace();
466	1007
467	1008	oe.radioPanel = new JPanel(new GridBagLayout());
468		- oe.aConstraints.weightx = 1;
469		- oe.aConstraints.weighty = 0;
470		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
471		- oe.aConstraints.gridwidth = 100;
472		- oe.aConstraints.gridheight = 1;
473	1009	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
474	1010
475	1011	oe.buttonGroup = new ButtonGroup();
..	..	@@ -490,27 +1026,122 @@
490	1026	oe.radioPanel.add(dummyButton);
491	1027	oe.buttonGroup.add(dummyButton);
492	1028	*/
	1029	+ cGridBag copyOptionsPanel = new cGridBag();
	1030	+
	1031	+ copyOptionsPanel.preferredHeight = 2;
	1032	+
493	1033	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
494	1034
495		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
496		- liveCB.setToolTipText("Enable animation");
497		- liveCB.addItemListener(this);
	1035	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1036	+ //minButton.setToolTipText("Minimize window");
	1037	+ //minButton.addActionListener(this);
	1038	+
	1039	+ if (Globals.ADVANCED)
	1040	+ {
	1041	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1042	+// maxButton.setToolTipText("Maximize window");
	1043	+// maxButton.addActionListener(this);
	1044	+ }
	1045	+
	1046	+// cButton gcButton;
	1047	+//
	1048	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1049	+// gcButton.setToolTipText("Garbage collect");
	1050	+// gcButton.addActionListener(new ActionListener()
	1051	+// {
	1052	+// public void actionPerformed(ActionEvent e)
	1053	+// {
	1054	+// System.gc();
	1055	+// }
	1056	+// });
	1057	+
	1058	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1059	+ collapseButton.setToolTipText("Collapse toolbar");
	1060	+ collapseButton.addActionListener(this);
	1061	+
	1062	+ oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1063	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1064	+ maximize3DButton.addActionListener(this);
	1065	+
	1066	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1067	+ twoButton.setToolTipText("Show 3D view only");
	1068	+ twoButton.addActionListener(this);
	1069	+ this.fullscreenLayout = twoButton;
	1070	+
	1071	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1072	+ threeButton.setToolTipText("Show controls and 3D view");
	1073	+ threeButton.addActionListener(this);
	1074	+ if (Globals.ADVANCED)
	1075	+ {
	1076	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1077	+ sixButton.setToolTipText("Show 3D view and controls");
	1078	+ sixButton.addActionListener(this);
	1079	+ }
	1080	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1081	+// sevenButton.setToolTipText("3-column layout");
	1082	+// sevenButton.addActionListener(this);
	1083	+ //
	1084	+
	1085	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1086	+ fullButton.setToolTipText("Full-screen window");
	1087	+ fullButton.addActionListener(this);
	1088	+
	1089	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1090	+ screenfitButton.setToolTipText("Screen fit");
	1091	+ screenfitButton.addActionListener(this);
498	1092
499		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1093	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1094	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1095	+ restoreCameraButton.addActionListener(this);
	1096	+
	1097	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1098	+ saveVersionButton.setToolTipText("Duplicate current version");
	1099	+ saveVersionButton.addActionListener(this);
	1100	+
	1101	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1102	+ deleteVersionButton.setToolTipText("Delete current version");
	1103	+ deleteVersionButton.addActionListener(this);
	1104	+
	1105	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1106	+ previousVersionButton.setToolTipText("Previous version");
	1107	+ previousVersionButton.addActionListener(this);
	1108	+ previousVersionButton.setEnabled(false);
	1109	+
	1110	+ cGridBag updown = new cGridBag().setVertical(true);
	1111	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1112	+ restoreButton.setToolTipText("Undo (restore current version)");
	1113	+ restoreButton.addActionListener(this);
	1114	+ //restoreButton.setEnabled(false);
	1115	+
	1116	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1117	+ replaceButton.setToolTipText("Save (replace current version)");
	1118	+ replaceButton.addActionListener(this);
	1119	+ //replaceButton.setEnabled(false);
	1120	+
	1121	+ copyOptionsPanel.add(updown);
	1122	+
	1123	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1124	+ nextVersionButton.setToolTipText("Next version");
	1125	+ nextVersionButton.addActionListener(this);
	1126	+ nextVersionButton.setEnabled(false);
	1127	+
	1128	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
500	1129	oneStepButton.setToolTipText("Animate one step forward");
501	1130	oneStepButton.addActionListener(this);
502	1131
503		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	1132	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1133	+ liveCB.setToolTipText("Enable animation");
	1134	+ liveCB.addItemListener(this);
	1135	+
	1136	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
504	1137	fastCB.setToolTipText("Fast mode");
505	1138	fastCB.addItemListener(this);
506	1139
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);
	1140	+ //oe.toolboxPanel.Return();
	1141	+
	1142	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1143	+// trackCB.setToolTipText("Enable tracking");
	1144	+// trackCB.addItemListener(this);
514	1145
515	1146	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
516	1147	// screenfitpointButton.addActionListener(this);
..	..	@@ -520,67 +1151,137 @@
520	1151	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
521	1152	snapobjectButton.addActionListener(this);
522	1153	snapobjectButton.setToolTipText("Snap Object");
	1154	+
	1155	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1156	+ fourButton.addActionListener(this);
	1157	+ fourButton.setToolTipText("Show control panel only");
523	1158	}
524	1159
525		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
526		- flashSelectionButton.setToolTipText("Show selection");
527		- flashSelectionButton.addActionListener(this);
	1160	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
528	1161
529		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
530		-
531		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
532		- twoButton.setToolTipText("Show center view only");
533		- twoButton.addActionListener(this);
534		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
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");
542		- threeButton.addActionListener(this);
543		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
544		- sevenButton.setToolTipText("3-column layout");
545		- sevenButton.addActionListener(this);
546		- //
547	1162
548		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
549		- rootButton.setToolTipText("Edit selection in new tab");
	1163	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1164	+ rootButton.setToolTipText("Open selection in new tab");
550	1165	rootButton.addActionListener(this);
551	1166
552		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1167	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
553	1168	closeButton.setToolTipText("Close tab");
554	1169	closeButton.addActionListener(this);
555	1170	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
556	1171	//clearButton.addActionListener(this);
557		-
558		- cGridBag commandsPanel = new cGridBag();
	1172	+
	1173	+ cGridBag row1 = new cGridBag();
559	1174
560		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
561		- editButton.setToolTipText("Edit selection");
	1175	+ // INSERT
	1176	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1177	+ gridButton.setToolTipText("Create ground");
	1178	+ gridButton.addActionListener(this);
	1179	+
	1180	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1181	+ boxButton.setToolTipText("Create box");
	1182	+ boxButton.addActionListener(this);
	1183	+
	1184	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1185	+ sphereButton.setToolTipText("Create sphere");
	1186	+ sphereButton.addActionListener(this);
	1187	+
	1188	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1189	+ coneButton.setToolTipText("Create cone");
	1190	+ coneButton.addActionListener(this);
	1191	+
	1192	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1193	+ torusButton.setToolTipText("Create torus");
	1194	+ torusButton.addActionListener(this);
	1195	+
	1196	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1197	+ superButton.setToolTipText("Create superellipsoid");
	1198	+ superButton.addActionListener(this);
	1199	+
	1200	+ if (Globals.ADVANCED)
	1201	+ {
	1202	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1203	+ kleinButton.setToolTipText("Create Klein bottle");
	1204	+ kleinButton.addActionListener(this);
	1205	+ }
	1206	+
	1207	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1208	+ particlesButton.setToolTipText("Create particle system");
	1209	+ particlesButton.addActionListener(this);
	1210	+
	1211	+ oe.toolboxPanel.add(row1);
	1212	+
	1213	+ cGridBag row2 = new cGridBag();
	1214	+
	1215	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1216	+ groupButton.setToolTipText("Create group");
	1217	+ groupButton.addActionListener(this);
	1218	+
	1219	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1220	+ compositeButton.setToolTipText("Create composite");
	1221	+ compositeButton.addActionListener(this);
	1222	+
	1223	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1224	+ switchButton.setToolTipText("Create item switcher");
	1225	+ switchButton.addActionListener(this);
	1226	+
	1227	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1228	+ loopButton.setToolTipText("Create loop");
	1229	+ loopButton.addActionListener(this);
	1230	+
	1231	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1232	+ textureButton.setToolTipText("Create texture");
	1233	+ textureButton.addActionListener(this);
	1234	+
	1235	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1236	+ overlayButton.setToolTipText("Create overlay");
	1237	+ overlayButton.addActionListener(this);
	1238	+
	1239	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1240	+ lightButton.setToolTipText("Create light");
	1241	+ lightButton.addActionListener(this);
	1242	+
	1243	+ oe.toolboxPanel.add(row2);
	1244	+
	1245	+ cGridBag textures = new cGridBag();
	1246	+
	1247	+ CreateTexturePanel(textures);
	1248	+
	1249	+ oe.toolboxPanel.add(textures);
	1250	+
	1251	+ textures.preferredHeight = 100;
	1252	+
	1253	+ CreateSkyboxPanel(oe.skyboxPanel);
	1254	+
	1255	+ // EDIT panel
	1256	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1257	+ editButton.setToolTipText("Pin selection controls");
562	1258	editButton.addActionListener(this);
563	1259
564		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
565		- uneditButton.setToolTipText("Unedit selection");
	1260	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1261	+ uneditButton.setToolTipText("Unpin and remove selection controls");
566	1262	uneditButton.addActionListener(this);
567	1263
568		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
569		- allParamsButton.setToolTipText("Edit all params");
	1264	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1265	+ allParamsButton.setToolTipText("Show all controls");
570	1266	allParamsButton.addActionListener(this);
571	1267
572		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
573		- clearPanelButton.setToolTipText("Clear edit panel");
	1268	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1269	+ clearPanelButton.setToolTipText("Clear all controls");
574	1270	clearPanelButton.addActionListener(this);
575	1271
576		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
577		- unselectButton.setToolTipText("Unselect");
578		- unselectButton.addActionListener(this);
	1272	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1273	+ //unselectButton.setToolTipText("Unselect");
	1274	+ //unselectButton.addActionListener(this);
579	1275
580		- commandsPanel.preferredHeight = 1;
	1276	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1277	+ flashSelectionButton.setToolTipText("Highlight selection");
	1278	+ flashSelectionButton.addActionListener(this);
581	1279
582		- oe.treePanel.add(commandsPanel);
583		- oe.treePanel.Return();
	1280	+ editCommandsPanel.preferredHeight = 1;
	1281	+
	1282	+ SetPinStates(false);
	1283	+// oe.treePanel.add(commandsPanel);
	1284	+// oe.treePanel.Return();
584	1285
585	1286	// oe.aConstraints.gridx += 1;
586	1287	// oe.aConstraints.weighty = 0;
..	..	@@ -597,32 +1298,20 @@
597	1298
598	1299	JScrollPane jSP;
599	1300	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
600		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1301	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
601	1302	ResetModel();
602	1303
603	1304	oe.treePanel.add(jSPPanel);
604	1305	oe.treePanel.Return();
605	1306
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	1307	oe.treePanel.add(copyOptionsPanel);
622	1308	oe.treePanel.Return();
	1309	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1310	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1311	+ sliderPane.preferredHeight = 1;
623	1312
624		-// mainPanel.setDividerLocation(0.5); //1.0);
625		-// mainPanel.setResizeWeight(0.5);
	1313	+// mainPanel.setDividerLocation(0.1); //1.0);
	1314	+ mainPanel.setResizeWeight(0.4);
626	1315
627	1316	//jList.addListSelectionListener(this);
628	1317	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -630,7 +1319,7 @@
630	1319	//jTree.setEditable(true);
631	1320	oe.jTree.setDragEnabled(true);
632	1321	//jTree.setPreferredSize(new Dimension(10,10));
633		- jSP.setPreferredSize(new Dimension(100,200));
	1322	+ //jSP.setPreferredSize(new Dimension(100,200));
634	1323
635	1324	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
636	1325
..	..	@@ -642,29 +1331,49 @@
642	1331	dgr.addDragGestureListener(this);
643	1332	}catch(Exception e) {}
644	1333	*/
645		- radio.layout = sevenButton;
	1334	+ radio.layout = threeButton; // sixButton;
646	1335	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
647	1336	}
648	1337
649	1338	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
650	1339	{
	1340	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1341	+ colorCB.setToolTipText("Copy color when dropped");
	1342	+ colorCB.addItemListener(this);
	1343	+
	1344	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1345	+ materialCB.setToolTipText("Copy material when dropped");
	1346	+ materialCB.addItemListener(this);
	1347	+
	1348	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1349	+ textureCB.setToolTipText("Copy texture when dropped");
	1350	+ textureCB.addItemListener(this);
	1351	+
	1352	+ panel.Return();
	1353	+
651	1354	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
652	1355	boxCB.setToolTipText("Display bounding boxes");
653	1356	boxCB.addItemListener(this);
654	1357
655	1358	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
656		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1359	+ zoomBoxCB.setToolTipText("Display only for wheel");
657	1360	zoomBoxCB.addItemListener(this);
658	1361
659	1362	if (true) // Globals.ADVANCED)
660	1363	{
661		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
662		- supportCB.setToolTipText("Enable rigging");
663		- supportCB.addItemListener(this);
	1364	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1365	+// supportCB.setToolTipText("Enable rigging");
	1366	+// supportCB.addItemListener(this);
	1367	+
	1368	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1369	+ freezeCB.setToolTipText("Fast moving camera");
	1370	+ freezeCB.addItemListener(this);
664	1371
665	1372	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
666	1373	// localCB.addItemListener(this);
667	1374
	1375	+ panel.Return();
	1376	+
668	1377	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
669	1378	crowdCB.setToolTipText("Used for crowds");
670	1379	crowdCB.addItemListener(this);
..	..	@@ -673,14 +1382,19 @@
673	1382	smoothCB.setToolTipText("Snapping delay");
674	1383	smoothCB.addItemListener(this);
675	1384
676		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
677		- slowCB.setToolTipText("Smooth interpolation");
678		- slowCB.addItemListener(this);
	1385	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1386	+// slowCB.setToolTipText("Smooth interpolation");
	1387	+// slowCB.addItemListener(this);
	1388	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1389	+ minshaderCB.setToolTipText("Minimal fast shader");
	1390	+ minshaderCB.addItemListener(this);
679	1391
680	1392	// constraints.gridy += 1;
681	1393	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
682	1394	// speakerMocapCB.addItemListener(this);
683	1395
	1396	+ panel.Return();
	1397	+
684	1398	if (false)
685	1399	{
686	1400	// handled in scripts
..	..	@@ -695,34 +1409,82 @@
695	1409	//constraints.gridy += 1;
696	1410	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
697	1411	smoothfocusCB.addItemListener(this);
	1412	+ panel.Return();
698	1413	}
699	1414
700	1415	//constraints.gridx += 1;
701	1416	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
702	1417	// debugCB.addItemListener(this);
703	1418
	1419	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1420	+ trackCB.setToolTipText("Enable tracking target");
	1421	+ trackCB.addItemListener(this);
	1422	+
704	1423	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1424	+ oeilCB.setToolTipText("Move camera when tracking");
705	1425	oeilCB.addItemListener(this);
706	1426
	1427	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1428	+ shadowCB.setToolTipText("When live compute shadows");
	1429	+ shadowCB.addItemListener(this);
	1430	+
	1431	+ panel.Return();
	1432	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1433	+ toggleTextureCB.setToolTipText("Load textures");
	1434	+ toggleTextureCB.addItemListener(this);
	1435	+
	1436	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1437	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1438	+ toggleSwitchCB.addItemListener(this);
	1439	+
	1440	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1441	+ autokeepCB.setToolTipText("On structure change");
	1442	+ autokeepCB.addItemListener(this);
	1443	+
	1444	+ panel.Return();
	1445	+ if (Globals.ADVANCED)
	1446	+ {
707	1447	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
708	1448	lookAtCB.setToolTipText("Look-at target");
709	1449	lookAtCB.addItemListener(this);
	1450	+ }
710	1451
711	1452	}
712	1453
713	1454	cGridBag fill = new cGridBag();
714		-
715	1455	fill.preferredHeight = 200;
	1456	+ cGridBag fill2 = new cGridBag();
	1457	+ fill2.preferredHeight = 200;
	1458	+ cGridBag fill3 = new cGridBag();
	1459	+ fill3.preferredHeight = 200;
716	1460
717	1461	panel.add(fill);
	1462	+ panel.add(fill2);
	1463	+ panel.add(fill3);
718	1464
719	1465	}
720	1466
721	1467	void EditObject(Object3D obj)
722	1468	{
	1469	+ assert(obj instanceof Composite);
	1470	+
	1471	+// if (obj.versionlist == null)
	1472	+// {
	1473	+// obj.versionlist = new Object3D[100];
	1474	+// obj.versionindex = -1;
	1475	+// }
	1476	+
723	1477	cRadio radioButton = new cRadio(obj.name);
	1478	+
	1479	+ // June 2019. Patch to avoid bug with transparency.
	1480	+ radioButton.hadMaterial = obj.material != null;
	1481	+ if (!radioButton.hadMaterial)
	1482	+ {
	1483	+ obj.material = new cMaterial();
	1484	+ }
	1485	+
724	1486	radioButton.SetObject(obj);
725		- radioButton.layout = sevenButton;
	1487	+ radioButton.layout = threeButton; // sixButton;
726	1488	radioButton.SetCamera(cameraView.renderCamera, false);
727	1489	radioButton.addActionListener(this);
728	1490	radioPanel.add(radioButton);
..	..	@@ -732,6 +1494,8 @@
732	1494
733	1495	void SetupViews(ObjEditor oe)
734	1496	{
	1497	+ theFrame = this;
	1498	+
735	1499	oe.SetupViews();
736	1500
737	1501	System.out.println("SetupViews");
..	..	@@ -740,23 +1504,30 @@
740	1504	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
741	1505	}
742	1506
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;
	1507	+ cToggleButton liveCB;
	1508	+ cCheckBox supportCB;
	1509	+ cCheckBox localCB;
	1510	+ cCheckBox crowdCB;
	1511	+ cCheckBox smoothCB;
	1512	+ cCheckBox minshaderCB;
	1513	+
	1514	+ cToggleButton fastCB;
	1515	+ cCheckBox slowCB;
	1516	+ cCheckBox boxCB;
	1517	+ cCheckBox zoomBoxCB;
	1518	+ cCheckBox freezeCB;
	1519	+ //cToggleButton trackCB;
	1520	+ cCheckBox trackCB;
	1521	+ cCheckBox smoothfocusCB;
754	1522	// JCheckBox speakerMocapCB;
755		- JCheckBox speakerCameraCB;
756		- JCheckBox speakerFocusCB;
757		- JCheckBox debugCB;
758		- JCheckBox oeilCB;
759		- JCheckBox lookAtCB;
	1523	+ cCheckBox speakerCameraCB;
	1524	+ cCheckBox speakerFocusCB;
	1525	+ cCheckBox debugCB;
	1526	+
	1527	+ cCheckBox oeilCB;
	1528	+ cCheckBox shadowCB;
	1529	+ cCheckBox autokeepCB;
	1530	+ cCheckBox lookAtCB;
760	1531
761	1532	// static int COLOR = 1;
762	1533	// static int MATERIAL = 2;
..	..	@@ -764,9 +1535,9 @@
764	1535
765	1536	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
766	1537
767		- JCheckBox colorCB;
768		- JCheckBox materialCB;
769		- JCheckBox textureCB;
	1538	+ cCheckBox colorCB;
	1539	+ cCheckBox materialCB;
	1540	+ cCheckBox textureCB;
770	1541
771	1542	public void itemStateChanged(ItemEvent e)
772	1543	{
..	..	@@ -794,6 +1565,7 @@
794	1565	} else if(e.getSource() == liveCB)
795	1566	{
796	1567	cameraView.ToggleLive();
	1568	+ refreshContents(false);
797	1569	}
798	1570	else if(e.getSource() == supportCB)
799	1571	{
..	..	@@ -809,6 +1581,12 @@
809	1581	{
810	1582	cameraView.ToggleInertia();
811	1583	cameraView.repaint();
	1584	+ }
	1585	+ else if(e.getSource() == minshaderCB)
	1586	+ {
	1587	+ Globals.MINSHADER ^= true;
	1588	+ cameraView.programInitialized = false;
	1589	+ cameraView.repaint();
812	1590	}
813	1591	else if(e.getSource() == localCB)
814	1592	{
..	..	@@ -858,6 +1636,18 @@
858	1636	{
859	1637	cameraView.ToggleOeil();
860	1638	}
	1639	+ else if(e.getSource() == shadowCB)
	1640	+ {
	1641	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1642	+ }
	1643	+ else if(e.getSource() == freezeCB)
	1644	+ {
	1645	+ Globals.FREEZEONMOVE ^= true;
	1646	+ }
	1647	+ else if(e.getSource() == autokeepCB)
	1648	+ {
	1649	+ Globals.REPLACEONMAKE ^= true;
	1650	+ }
861	1651	else if(e.getSource() == lookAtCB)
862	1652	{
863	1653	cameraView.ToggleLookAt();
..	..	@@ -874,7 +1664,8 @@
874	1664
875	1665	/**/
876	1666	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
877		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1667	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1668	+ TreePath path = objEditor.jTree.getSelectionPath();
878	1669	if ((path == null) \|\| (path.getPathCount() <= 1)) {
879	1670	// We can't move the root node or an empty selection
880	1671	return;
..	..	@@ -937,8 +1728,6 @@
937	1728	}
938	1729	}
939	1730
940		- String string = (String) object;
941		-
942	1731	System.out.println("Transfer = " + object + "; drop : " + target);
943	1732	// if( object instanceof java.io.File[])
944	1733	// {
..	..	@@ -946,6 +1735,8 @@
946	1735	// objEditor.DropFile((java.io.File[]) object, true);
947	1736	// return;
948	1737	// }
	1738	+
	1739	+ String string = object.toString();
949	1740
950	1741	// File path for Mac and Windows
951	1742	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -991,23 +1782,33 @@
991	1782
992	1783	assert target == objEditor.jTree;
993	1784	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1785	+ Object3D destinationLeaf;
994	1786	try {
995		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1787	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
996	1788	} catch (Exception e) {
997	1789	System.out.println("destinationPath : " + destinationPath);
998	1790	return;
999	1791	}
1000	1792
1001		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1793	+ for (int i=group.selection.size(); --i>=0;)
1002	1794	{
	1795	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1796	+
	1797	+ // Cannot move into itself
	1798	+ if (child == destinationLeaf)
	1799	+ return;
	1800	+ }
	1801	+
	1802	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1803	+// {
1003	1804	loadClipboard(true);
1004	1805	objEditor.jTree.setSelectionPath(destinationPath);
1005	1806	pasteInto(false, false);
1006		- } else {
1007		- loadClipboard(false);
1008		- objEditor.jTree.setSelectionPath(destinationPath);
1009		- pasteInto(false, false); // true); // ???
1010		- }
	1807	+// } else {
	1808	+// loadClipboard(false);
	1809	+// objEditor.jTree.setSelectionPath(destinationPath);
	1810	+// pasteInto(false, false); // true); // ???
	1811	+// }
1011	1812	}
1012	1813	public void dropActionChanged(DropTargetDragEvent dtde)
1013	1814	// Called if the user has modified the current drop gesture
..	..	@@ -1063,7 +1864,12 @@
1063	1864	TreePath path;
1064	1865
1065	1866	public TransferableTreePath(TreePath tp) {
1066		- path = tp;
	1867	+ Object[] objs = new Object[tp.getPathCount()];
	1868	+ for (int i=0; i<objs.length; i++)
	1869	+ {
	1870	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1871	+ }
	1872	+ path = new TreePath(objs);
1067	1873	}
1068	1874
1069	1875	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1112,22 +1918,30 @@
1112	1918	{
1113	1919	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1114	1920	//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);
	1921	+// gridItem = menu.add(new MenuItem("Grid"));
	1922	+// gridItem.addActionListener(this);
	1923	+// rectoidItem = menu.add(new MenuItem("Box"));
	1924	+// rectoidItem.addActionListener(this);
	1925	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1926	+// ellipsoidItem.addActionListener(this);
	1927	+// coneItem = menu.add(new MenuItem("Cone"));
	1928	+// coneItem.addActionListener(this);
	1929	+// torusItem = menu.add(new MenuItem("Torus"));
	1930	+// torusItem.addActionListener(this);
	1931	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1932	+// superItem.addActionListener(this);
	1933	+
	1934	+ cameraItem = menu.add(new MenuItem("Camera"));
	1935	+ cameraItem.addActionListener(this);
	1936	+
	1937	+ if (!Globals.ADVANCED)
	1938	+ {
1127	1939	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1128	1940	kleinItem.addActionListener(this);
1129		- particleItem = menu.add(new MenuItem("Particle system"));
1130		- particleItem.addActionListener(this);
	1941	+ }
	1942	+
	1943	+// particleItem = menu.add(new MenuItem("Particle system"));
	1944	+// particleItem.addActionListener(this);
1131	1945	if (Globals.ADVANCED)
1132	1946	{
1133	1947	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1153,15 +1967,15 @@
1153	1967	}
1154	1968	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1155	1969	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);
	1970	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1971	+// overlayItem.addActionListener(this);
	1972	+// lightItem = menu.add(new MenuItem("Light"));
	1973	+// lightItem.addActionListener(this);
1160	1974	menu.add("-");
1161	1975	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1162	1976	//superLoopItem.addActionListener(this);
1163		- loopItem = menu.add(new MenuItem("Loop"));
1164		- loopItem.addActionListener(this);
	1977	+// loopItem = menu.add(new MenuItem("Loop"));
	1978	+// loopItem.addActionListener(this);
1165	1979	doubleItem = menu.add(new MenuItem("Fork"));
1166	1980	doubleItem.addActionListener(this);
1167	1981	if (Globals.ADVANCED)
..	..	@@ -1177,6 +1991,9 @@
1177	1991	animationItem.addItemListener(this);
1178	1992	animationItem.setState(Globals.ANIMATION);
1179	1993
	1994	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1995	+ archiveItem.addActionListener(this);
	1996	+
1180	1997	menu.add("-");
1181	1998	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1182	1999	parseverticesItem.addActionListener(this);
..	..	@@ -1189,6 +2006,8 @@
1189	2006	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1190	2007	reduce34MorphItem.addActionListener(this);
1191	2008	menu.add("-");
	2009	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	2010	+ memoryItem.addActionListener(this);
1192	2011	menu.add(computeAOItem = new MenuItem("Compute AO"));
1193	2012	computeAOItem.addActionListener(this);
1194	2013
..	..	@@ -1197,11 +2016,9 @@
1197	2016	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1198	2017	mirrorItem.addActionListener(this);
1199	2018	menu.add("-");
1200		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1201		- memoryItem.addActionListener(this);
1202	2019	menu.add(analyzeItem = new MenuItem("Analyze"));
1203	2020	analyzeItem.addActionListener(this);
1204		- menu.add(dumpItem = new MenuItem("Dump"));
	2021	+ menu.add(dumpItem = new MenuItem("Print"));
1205	2022	dumpItem.addActionListener(this);
1206	2023	// menu.add(pathItem = new MenuItem("From-to path"));
1207	2024	// pathItem.addActionListener(this);
..	..	@@ -1342,9 +2159,34 @@
1342	2159	shadow.material = new cMaterial(obj.material);
1343	2160	shadow.material.diffuse = 0.0001f;
1344	2161	shadow.material.specular = 0.0001f;
	2162	+ //shadow.projectedVertices[1].x = 300;
1345	2163
1346	2164	makeSomething(shadow);
1347	2165	}
	2166	+
	2167	+ private void ClearUnpinned()
	2168	+ {
	2169	+ //for (Object3D obj : listUI)
	2170	+ for (int i=listUI.size(); --i>=0;)
	2171	+ {
	2172	+ Object3D obj = listUI.elementAt(i);
	2173	+ if (!obj.pinned)
	2174	+ {
	2175	+ obj.CloseUI();
	2176	+ listUI.remove(i);
	2177	+ }
	2178	+ }
	2179	+ }
	2180	+
	2181	+ private void EditElement(Object3D elem, boolean newWindow)
	2182	+ {
	2183	+ // if (!(elem instanceof Composite))
	2184	+ // newWindow = false;
	2185	+ listUI.add(elem);
	2186	+ elem.openEditWindow(this, newWindow); //, false);
	2187	+ System.out.println("edit : " + elem);
	2188	+ elem.editWindow.refreshContents(true); // ? new
	2189	+ }
1348	2190
1349	2191	/**
1350	2192	* applyExample
..	..	@@ -1589,7 +2431,7 @@
1589	2431	{
1590	2432	ScreenFit();
1591	2433	} else
1592		- if (source == switchItem)
	2434	+ if (source == switchViewItem)
1593	2435	{
1594	2436	cVector v1 = new cVector();
1595	2437	cVector v2 = new cVector();
..	..	@@ -1598,11 +2440,11 @@
1598	2440	objEditor.cameraView.renderCamera.setAim(v2, v1);
1599	2441	objEditor.cameraView.repaint();
1600	2442	} else
1601		- if (source == rectoidItem)
	2443	+ if (source == rectoidItem \|\| source == boxButton)
1602	2444	{
1603	2445	makeSomething(new Box());
1604	2446	} else
1605		- if (source == particleItem)
	2447	+ if (source == particleItem \|\| source == particlesButton)
1606	2448	{
1607	2449	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1608	2450	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1681,27 +2523,27 @@
1681	2523
1682	2524	makeSomething(obj);
1683	2525	} else
1684		- if (source == gridItem)
	2526	+ if (source == gridItem \|\| source == gridButton)
1685	2527	{
1686	2528	makeSomething(new Grid());
1687	2529	} else
1688		- if (source == ellipsoidItem)
	2530	+ if (source == ellipsoidItem \|\| source == sphereButton)
1689	2531	{
1690	2532	makeSomething(new Sphere());
1691	2533	} else
1692		- if (source == coneItem)
	2534	+ if (source == coneItem \|\| source == coneButton)
1693	2535	{
1694	2536	makeSomething(new Cone());
1695	2537	} else
1696		- if (source == torusItem)
	2538	+ if (source == torusItem \|\| source == torusButton)
1697	2539	{
1698	2540	makeSomething(new Torus());
1699	2541	} else
1700		- if (source == superItem)
	2542	+ if (source == superItem \|\| source == superButton)
1701	2543	{
1702	2544	makeSomething(new Superellipsoid());
1703	2545	} else
1704		- if (source == kleinItem)
	2546	+ if (source == kleinItem \|\| source == kleinButton)
1705	2547	{
1706	2548	makeSomething(new Klein());
1707	2549	} else
..	..	@@ -1721,7 +2563,7 @@
1721	2563	{
1722	2564	makeSomething(new BezierSurface());
1723	2565	} else
1724		- if (source == overlayItem)
	2566	+ if (source == overlayItem \|\| source == overlayButton)
1725	2567	{
1726	2568	/*
1727	2569	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1769,10 +2611,27 @@
1769	2611	s.setup();
1770	2612	makeSomething(s);
1771	2613	} else
1772		- if (source == lightItem)
	2614	+ if (source == lightItem \|\| source == lightButton)
1773	2615	{
1774	2616	makeSomething(new Light());
1775	2617	} else
	2618	+// if (source == skybox1Button \|\|
	2619	+// source == skybox2Button \|\|
	2620	+// source == skybox3Button \|\|
	2621	+// source == skybox4Button \|\|
	2622	+// source == skybox5Button \|\|
	2623	+// source == skybox6Button \|\|
	2624	+// source == skybox7Button \|\|
	2625	+// source == skybox11Button \|\|
	2626	+// source == skybox12Button \|\|
	2627	+// source == skybox13Button \|\|
	2628	+// source == skybox14Button \|\|
	2629	+// source == skybox15Button \|\|
	2630	+// source == skybox16Button \|\|
	2631	+// source == skybox17Button)
	2632	+// {
	2633	+// ChangeSkybox(source);
	2634	+// } else
1776	2635	if (source == csgItem)
1777	2636	{
1778	2637	group(new CSG());
..	..	@@ -1819,30 +2678,30 @@
1819	2678
1820	2679	group(g);
1821	2680	} else
1822		- if (source == loopItem)
	2681	+ if (source == loopItem \|\| source == loopButton)
1823	2682	{
1824	2683	Composite csg = new GroupLeaf();
1825	2684	csg.count = 5;
1826	2685	group(csg);
1827		- Composite child = new cGroup();
	2686	+ Composite child = new cGroup("Branch");
1828	2687	csg.addChild(child);
1829	2688	child.addChild(csg);
1830	2689	} else
1831	2690	if (source == doubleItem)
1832	2691	{
1833		- Composite csg = new GroupLeaf();
	2692	+ Composite csg = new GroupLeaf("Fork");
1834	2693	csg.count = 5;
1835	2694	group(csg);
1836		- Composite child = new cGroup();
	2695	+ Composite child = new cGroup("Branch A");
1837	2696	csg.addChild(child);
1838	2697	child.addChild(csg);
1839		- child = new cGroup();
	2698	+ child = new cGroup("Branch B");
1840	2699	csg.addChild(child);
1841	2700	child.addChild(csg);
1842	2701	} else
1843	2702	if (source == tripleItem)
1844	2703	{
1845		- Composite csg = new GroupLeaf();
	2704	+ Composite csg = new GroupLeaf("Trident");
1846	2705	csg.count = 4;
1847	2706	group(csg);
1848	2707	Composite child = new cGroup();
..	..	@@ -1855,35 +2714,10 @@
1855	2714	csg.addChild(child);
1856	2715	child.addChild(csg);
1857	2716	} 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	2717	if (source == computeAOItem)
1884	2718	{
1885	2719	Globals.drawMode = CameraPane.OCCLUSION;
1886		- Globals.theRenderer.repaint();
	2720	+ cameraView.repaint();
1887	2721	} else
1888	2722	if (source == recompileItem)
1889	2723	{
..	..	@@ -1898,7 +2732,7 @@
1898	2732	if (source == invariantsItem)
1899	2733	{
1900	2734	System.out.println("Invariants:");
1901		- Grafreed.grafreeD.universe.invariants();
	2735	+ Grafreed.grafreed.universe.invariants();
1902	2736	} else
1903	2737	if (source == memoryItem)
1904	2738	{
..	..	@@ -1917,6 +2751,65 @@
1917	2751	{
1918	2752	DumpObject();
1919	2753	} else
	2754	+ if (source == minButton)
	2755	+ {
	2756	+ Minimize();
	2757	+ } else
	2758	+ if (source == maxButton)
	2759	+ {
	2760	+ Maximize();
	2761	+ } else
	2762	+ if (source == fullButton)
	2763	+ {
	2764	+ ToggleFullScreen();
	2765	+ } else
	2766	+ if (source == collapseButton)
	2767	+ {
	2768	+ this.expandedLayout = radio.layout;
	2769	+ CollapseToolbar();
	2770	+ } else
	2771	+ if (source == maximize3DButton)
	2772	+ {
	2773	+ this.expandedLayout = radio.layout;
	2774	+ radio.layout = twoButton;
	2775	+ Show3DView();
	2776	+ CollapseToolbar();
	2777	+ } else
	2778	+ if (source == previousVersionButton)
	2779	+ {
	2780	+ // Go to previous version
	2781	+ //if (!Undo())
	2782	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2783	+ PreviousVersion();
	2784	+ } else
	2785	+ if (source == restoreButton)
	2786	+ {
	2787	+ // Restore current version
	2788	+ Restore();
	2789	+ //restoreButton.setEnabled(false);
	2790	+ } else
	2791	+ if (source == replaceButton)
	2792	+ {
	2793	+ // Overwrite current version
	2794	+ Replace();
	2795	+ //replaceButton.setEnabled(false);
	2796	+ } else
	2797	+ if (source == nextVersionButton)
	2798	+ {
	2799	+ // Go to next version
	2800	+ NextVersion();
	2801	+ } else
	2802	+ if (source == saveVersionButton)
	2803	+ {
	2804	+ // Save a new version
	2805	+ if (!Save(true))
	2806	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2807	+ } else
	2808	+ if (source == deleteVersionButton)
	2809	+ {
	2810	+ // Delete a new version
	2811	+ DeleteVersion();
	2812	+ } else
1920	2813	if (source == oneStepButton)
1921	2814	{
1922	2815	Globals.ONESTEP = true;
..	..	@@ -1924,17 +2817,14 @@
1924	2817	} else
1925	2818	if (source == screenfitButton)
1926	2819	{
1927		- //Reload(lastConverter, lastFilename, true);
1928	2820	ScreenFit();
1929	2821	} else
1930	2822	if (source == screenfitpointButton)
1931	2823	{
1932		- //Reload(lastConverter, lastFilename, true);
1933	2824	ScreenFitPoint();
1934	2825	} else
1935	2826	if (source == snapobjectButton)
1936	2827	{
1937		- //Reload(lastConverter, lastFilename, true);
1938	2828	SnapObject();
1939	2829	} else
1940	2830	// if (event.getSource() == recompileButton)
..	..	@@ -1970,6 +2860,14 @@
1970	2860	if (source == cutItem \|\| source == clearButton)
1971	2861	{
1972	2862	loadClipboard(true);
	2863	+ } else
	2864	+ if (source == undoItem)
	2865	+ {
	2866	+ PreviousVersion();
	2867	+ } else
	2868	+ if (source == redoItem)
	2869	+ {
	2870	+ NextVersion();
1973	2871	} else
1974	2872	if (source == duplicateItem)
1975	2873	{
..	..	@@ -2290,7 +3188,7 @@
2290	3188	{
2291	3189	StepAll();
2292	3190	} else
2293		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3191	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2294	3192	{
2295	3193	//int indices[] = jList.getSelectedIndices();
2296	3194	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2302,9 +3200,9 @@
2302	3200	{
2303	3201	ClearSelection(true);
2304	3202	} else
2305		- if (source == grabItem)
	3203	+ if (source == grabItem \|\| source == groupButton)
2306	3204	{
2307		- group(new cGroup(), true);
	3205	+ group(new cGroup(), false); // true);
2308	3206	} else
2309	3207	if (source == hideItem)
2310	3208	{
..	..	@@ -2322,11 +3220,11 @@
2322	3220	{
2323	3221	makeSomething(new Camera());
2324	3222	} else
2325		- if (source == compositeItem)
	3223	+ if (source == compositeItem \|\| source == compositeButton)
2326	3224	{
2327	3225	group(new Composite());
2328	3226	} else
2329		- if (source == randomItem)
	3227	+ if (source == switchItem \|\| source == switchButton)
2330	3228	{
2331	3229	RandomNode random = new RandomNode();
2332	3230	group(random);
..	..	@@ -2428,7 +3326,7 @@
2428	3326	{
2429	3327	group(new cLinker());
2430	3328	} else
2431		- if (source == textureItem)
	3329	+ if (source == textureItem \|\| source == textureButton)
2432	3330	{
2433	3331	group(new TextureNode());
2434	3332	} else
..	..	@@ -2448,17 +3346,30 @@
2448	3346	{
2449	3347	CastShadow(2);
2450	3348	} else
2451		- if (source == ungroupItem)
	3349	+ if (source == ungroupItem \|\| source == ungroupButton)
2452	3350	{
2453		- //ungroup();
	3351	+ boolean hasRoot = false;
	3352	+
2454	3353	for (int i=0; i<group.selection.size(); i++)
2455	3354	{
2456		- Ungroup(group.selection.get(i));
	3355	+ if (group.selection.get(i) == group)
	3356	+ {
	3357	+ hasRoot = true;
	3358	+ break;
	3359	+ }
2457	3360	}
2458	3361
2459		- ClearSelection(false);
2460		-
2461		- refreshContents();
	3362	+ if (!hasRoot)
	3363	+ {
	3364	+ for (int i=0; i<group.selection.size(); i++)
	3365	+ {
	3366	+ Ungroup(group.selection.get(i));
	3367	+ }
	3368	+
	3369	+ ClearSelection(false);
	3370	+
	3371	+ refreshContents();
	3372	+ }
2462	3373	} else
2463	3374	if (source == genUVItem)
2464	3375	{
..	..	@@ -2470,7 +3381,7 @@
2470	3381	} else
2471	3382	if (source == genNormalsMESHItem)
2472	3383	{
2473		- GenNormals(true); // TODO
	3384	+ GenNormalsMESH();
2474	3385	} else
2475	3386	if (source == genNormalsORGANItem)
2476	3387	{
..	..	@@ -2535,6 +3446,22 @@
2535	3446	if (source == unmarkleavesItem)
2536	3447	{
2537	3448	MarkLeaves(false);
	3449	+ } else
	3450	+ if (source == rewindleavesItem)
	3451	+ {
	3452	+ RewindLeaves(true);
	3453	+ } else
	3454	+ if (source == unrewindleavesItem)
	3455	+ {
	3456	+ RewindLeaves(false);
	3457	+ } else
	3458	+ if (source == randomleavesItem)
	3459	+ {
	3460	+ RandomLeaves(true);
	3461	+ } else
	3462	+ if (source == unrandomleavesItem)
	3463	+ {
	3464	+ RandomLeaves(false);
2538	3465	} else
2539	3466	if (source == flipVItem)
2540	3467	{
..	..	@@ -2743,7 +3670,7 @@
2743	3670	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2744	3671	{
2745	3672	obj = (Object3D)e.nextElement();
2746		- obj.SetBumpTexture(null);
	3673	+ obj.ResetBumpTexture();
2747	3674	}
2748	3675
2749	3676	refreshContents();
..	..	@@ -2759,6 +3686,31 @@
2759	3686
2760	3687	refreshContents();
2761	3688	} else
	3689	+ if (source == embedTexturesItem)
	3690	+ {
	3691	+ Object3D obj;
	3692	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3693	+ {
	3694	+ obj = (Object3D)e.nextElement();
	3695	+ obj.EmbedTextures(true);
	3696	+ }
	3697	+
	3698	+ refreshContents();
	3699	+ } else
	3700	+ if (source == deEmbedTexturesItem)
	3701	+ {
	3702	+ Object3D obj;
	3703	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3704	+ {
	3705	+ obj = (Object3D)e.nextElement();
	3706	+ obj.EmbedTextures(false);
	3707	+ }
	3708	+
	3709	+ CameraPane.texturepigment.clear();
	3710	+ CameraPane.texturebump.clear();
	3711	+
	3712	+ refreshContents();
	3713	+ } else
2762	3714	if (source == flashSelectionButton)
2763	3715	{
2764	3716	CameraPane.flash = true;
..	..	@@ -2770,42 +3722,36 @@
2770	3722	if (source == twoButton)
2771	3723	{
2772	3724	radio.layout = twoButton;
2773		- // bug
2774		- //gridPanel.setDividerLocation(1.0);
2775		- //bigPanel.setDividerLocation(0.0);
2776		-// bigThree.remove(scenePanel);
2777		-// bigThree.remove(centralPanel);
2778		-// bigThree.remove(XYZPanel);
2779		-// aWindowConstraints.gridx = 0;
2780		-// aWindowConstraints.gridy = 0;
2781		-// aWindowConstraints.gridwidth = 1;
2782		-// // aConstraints.gridheight = 3;
2783		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2784		-// aWindowConstraints.weightx = 0;
2785		-// aWindowConstraints.weighty = 1;
2786		-// //bigThree.add(jtp, aWindowConstraints);
2787		-// aWindowConstraints.weightx = 1;
2788		-// aWindowConstraints.gridwidth = 3;
2789		-// // aConstraints.gridheight = 3;
2790		-// aWindowConstraints.gridx = 1;
2791		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
2792		-// bigThree.add(centralPanel, aWindowConstraints);
2793		-// aWindowConstraints.weightx = 0;
2794		-// aWindowConstraints.gridx = 4;
2795		-// aWindowConstraints.gridwidth = 1;
2796		-// // aConstraints.gridheight = 3;
2797		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2798		-// //bigThree.add(XYZPanel, aWindowConstraints);
2799		-// scenePanel.setVisible(false);
2800		-// centralPanel.setVisible(true);
2801		-// XYZPanel.setVisible(false);
2802		- bigThree.ClearUI();
2803		- bigThree.add(centralPanel);
2804		- bigThree.FlushUI();
	3725	+
	3726	+ if (CameraPane.FULLSCREEN)
	3727	+ fullscreenLayout = radio.layout;
	3728	+
	3729	+ Show3DView();
	3730	+
	3731	+ cameraView.requestFocusInWindow();
	3732	+
	3733	+// refreshContents(true);
	3734	+//
	3735	+// try
	3736	+// {
	3737	+// java.awt.Robot bot = new java.awt.Robot();
	3738	+// int mask = InputEvent.BUTTON1_MASK;
	3739	+// bot.mouseMove(100, 100);
	3740	+// bot.mousePress(mask);
	3741	+// bot.mouseRelease(mask);
	3742	+// }
	3743	+// catch (Exception e)
	3744	+// {
	3745	+//
	3746	+// }
	3747	+
2805	3748	} else
2806	3749	if (source == threeButton)
2807	3750	{
2808	3751	radio.layout = threeButton;
	3752	+
	3753	+ if (CameraPane.FULLSCREEN)
	3754	+ fullscreenLayout = radio.layout;
2809	3755
2810	3756	// bigThree.remove(scenePanel);
2811	3757	// bigThree.remove(centralPanel);
..	..	@@ -2835,13 +3781,18 @@
2835	3781	// centralPanel.setVisible(true);
2836	3782	// XYZPanel.setVisible(true);
2837	3783	bigThree.ClearUI();
	3784	+ bigThree.add(scenePanel);
2838	3785	bigThree.add(centralPanel);
2839		- bigThree.add(XYZPanel);
2840	3786	bigThree.FlushUI();
	3787	+
	3788	+ cameraView.requestFocusInWindow();
2841	3789	} else
2842	3790	if (source == fourButton)
2843	3791	{
2844	3792	radio.layout = fourButton;
	3793	+
	3794	+ if (CameraPane.FULLSCREEN)
	3795	+ fullscreenLayout = radio.layout;
2845	3796
2846	3797	// bigThree.remove(scenePanel);
2847	3798	// bigThree.remove(centralPanel);
..	..	@@ -2873,10 +3824,15 @@
2873	3824	bigThree.ClearUI();
2874	3825	bigThree.add(scenePanel);
2875	3826	bigThree.FlushUI();
	3827	+
	3828	+ cameraView.requestFocusInWindow();
2876	3829	} else
2877	3830	if (source == sixButton)
2878	3831	{
2879	3832	radio.layout = sixButton;
	3833	+
	3834	+ if (CameraPane.FULLSCREEN)
	3835	+ fullscreenLayout = radio.layout;
2880	3836
2881	3837	// bigThree.remove(scenePanel);
2882	3838	// bigThree.remove(centralPanel);
..	..	@@ -2906,13 +3862,18 @@
2906	3862	// centralPanel.setVisible(true);
2907	3863	// XYZPanel.setVisible(false);
2908	3864	bigThree.ClearUI();
2909		- bigThree.add(scenePanel);
2910	3865	bigThree.add(centralPanel);
	3866	+ bigThree.add(scenePanel);
2911	3867	bigThree.FlushUI();
	3868	+
	3869	+ cameraView.requestFocusInWindow();
2912	3870	} else
2913	3871	if (source == sevenButton)
2914	3872	{
2915	3873	radio.layout = sevenButton;
	3874	+
	3875	+ if (CameraPane.FULLSCREEN)
	3876	+ fullscreenLayout = radio.layout;
2916	3877
2917	3878	// bigThree.remove(scenePanel);
2918	3879	// bigThree.remove(centralPanel);
..	..	@@ -2946,9 +3907,12 @@
2946	3907	bigThree.add(centralPanel);
2947	3908	bigThree.add(XYZPanel);
2948	3909	bigThree.FlushUI();
	3910	+
	3911	+ cameraView.requestFocusInWindow();
2949	3912	} else
2950	3913	if (source == rootButton)
2951	3914	{
	3915	+ Replace();
2952	3916	Object3D obj;
2953	3917	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2954	3918	{
..	..	@@ -2957,6 +3921,7 @@
2957	3921	EditObject(obj);
2958	3922	}
2959	3923
	3924	+ cameraView.requestFocusInWindow();
2960	3925	refreshContents(true);
2961	3926	} else
2962	3927	if (source == closeButton)
..	..	@@ -2966,22 +3931,37 @@
2966	3931	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2967	3932	{
2968	3933	ab = (cRadio)e.nextElement();
2969		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3934	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2970	3935	{
	3936	+ // Patch to avoid bug with transparency.
	3937	+ if (!ab.hadMaterial)
	3938	+ {
	3939	+ ab.object.material = null;
	3940	+ }
	3941	+
2971	3942	buttonGroup.remove(ab);
2972	3943	radioPanel.remove(ab);
2973	3944
2974		- ab.GetObject().editWindow = null;
	3945	+ //ab.GetObject().editWindow = null;
	3946	+ ab.GetObject().manipWindow = null;
2975	3947	// ab.GetObject().objectUI = null; // ?????????
2976	3948
2977	3949	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2978	3950	break;
2979	3951	}
2980	3952	}
	3953	+
	3954	+ cameraView.requestFocusInWindow();
2981	3955	refreshContents(true);
2982	3956	} else
2983	3957	if (source == editItem \|\| source == editButton)
2984	3958	{
	3959	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3960	+ {
	3961	+ Object3D child = (Object3D)e.nextElement();
	3962	+ child.pinned = true;
	3963	+ }
	3964	+
2985	3965	EditSelection(false);
2986	3966	} else
2987	3967	if (source == uneditButton)
..	..	@@ -2990,11 +3970,12 @@
2990	3970	{
2991	3971	Object3D child = (Object3D)e.nextElement();
2992	3972	if(child.editWindow != null)
2993		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3973	+ child.pinned = false;
2994	3974	child.CloseUI();
2995	3975	listUI.remove(child);
	3976	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2996	3977
2997		- child.editWindow = null; // ???????????
	3978	+ //child.editWindow = null; // ???????????
2998	3979	}
2999	3980	objEditor.ctrlPanel.FlushUI();
3000	3981	//objEditor.jTree.clearSelection();
..	..	@@ -3007,16 +3988,18 @@
3007	3988	//copy.ClearUI();
3008	3989	for (Object3D obj : listUI)
3009	3990	{
	3991	+ obj.pinned = false;
3010	3992	obj.CloseUI();
3011	3993	}
3012	3994	listUI.clear();
	3995	+ SetPinStates(group.selection.size() > 0);
3013	3996	refreshContents(true);
3014	3997	} else
3015	3998	if (source == allParamsButton)
3016	3999	{
3017	4000	assert(copy == group);
3018	4001
3019		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4002	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3020	4003
3021	4004	for (Object3D obj : listUI)
3022	4005	{
..	..	@@ -3065,6 +4048,7 @@
3065	4048	}
3066	4049
3067	4050	copy = group;
	4051	+
3068	4052	//Globals.theRenderer.object = group;
3069	4053	if(!useclient)
3070	4054	{
..	..	@@ -3081,7 +4065,9 @@
3081	4065	sideView.object = group;
3082	4066	}
3083	4067
3084		-// fix "+" issue group.editWindow = this;
	4068	+// fix "+" issue
	4069	+ //group.editWindow = this;
	4070	+ group.manipWindow = this;
3085	4071
3086	4072	/*
3087	4073	currentLayout = radio.layout;
..	..	@@ -3089,13 +4075,50 @@
3089	4075	currentLayout = sevenButton;
3090	4076	*/
3091	4077	radio.layout.doClick();
	4078	+
	4079	+ assert(copy instanceof Composite);
	4080	+
	4081	+ if (copy.versionlist == null)
	4082	+ {
	4083	+ copy.versionlist = new Object3D[100];
	4084	+ copy.versionindex = -1;
	4085	+
	4086	+ Save(true);
	4087	+ }
	4088	+
	4089	+ SetVersionStates();
	4090	+
	4091	+ ClearUnpinned();
	4092	+
	4093	+ //Grafreed.Assert(group != null);
	4094	+ //Grafreed.Assert(group.selection != null);
	4095	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4096	+ if (group.selection == null \|\| group.selection.size() == 1)
	4097	+ EditSelection(false);
3092	4098	keepparent = group.parent;
3093	4099	// PARENT = NULL or not???
3094	4100	//group.parent = null; // ROOT
3095	4101	//group.attributes = -1;
3096	4102	ResetModel();
	4103	+
	4104	+ cameraView.requestFocusInWindow();
3097	4105	refreshContents(true);
3098		- }
	4106	+ } else if (event.getSource() == editCameraItem)
	4107	+ {
	4108	+ cameraView.ProtectCamera();
	4109	+ cameraView.requestFocusInWindow();
	4110	+ cameraView.repaint();
	4111	+ return;
	4112	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	4113	+ {
	4114	+ cameraView.RevertCamera();
	4115	+ cameraView.requestFocusInWindow();
	4116	+ cameraView.repaint();
	4117	+ return;
	4118	+ // } else if (event.getSource() == textureButton)
	4119	+ // {
	4120	+ // return; // true;
	4121	+ }
3099	4122	else
3100	4123	{
3101	4124	//return super.action(event, arg);
..	..	@@ -3104,7 +4127,6 @@
3104	4127	}
3105	4128
3106	4129	boolean useclient = false;
3107		- cRadio radio;
3108	4130
3109	4131	void ToggleRoot()
3110	4132	{
..	..	@@ -3343,7 +4365,8 @@
3343	4365
3344	4366	int size = obj.MemorySize();
3345	4367
3346		- System.err.println((size/1024) + " KB is the size of " + obj);
	4368	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4369	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3347	4370	}
3348	4371	}
3349	4372	catch (Exception e)
..	..	@@ -3424,6 +4447,13 @@
3424	4447	void GenNormals(boolean crease)
3425	4448	{
3426	4449	group.GenNormalsS(crease);
	4450	+
	4451	+ refreshContents();
	4452	+ }
	4453	+
	4454	+ void GenNormalsMESH()
	4455	+ {
	4456	+ group.GenNormalsMeshS();
3427	4457
3428	4458	refreshContents();
3429	4459	}
..	..	@@ -3659,7 +4689,7 @@
3659	4689
3660	4690	try
3661	4691	{
3662		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4692	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
3663	4693	}
3664	4694	catch (Exception e)
3665	4695	{
..	..	@@ -4051,6 +5081,18 @@
4051	5081	refreshContents();
4052	5082	}
4053	5083
	5084	+ void RewindLeaves(boolean hide)
	5085	+ {
	5086	+ group.selection.RewindLeaves(hide);
	5087	+ refreshContents();
	5088	+ }
	5089	+
	5090	+ void RandomLeaves(boolean hide)
	5091	+ {
	5092	+ group.selection.RandomLeaves(hide);
	5093	+ refreshContents();
	5094	+ }
	5095	+
4054	5096	void SetTexRes(int tr)
4055	5097	{
4056	5098	group.selection.SetTexRes(tr);
..	..	@@ -4122,28 +5164,25 @@
4122	5164	// }
4123	5165	// }
4124	5166
4125		- static boolean allparams = true;
4126		-
4127		- static Vector<Object3D> listUI = new Vector<Object3D>();
4128		-
4129	5167	void EditSelection(boolean newWindow)
4130	5168	{
	5169	+ if (group.selection == null)
	5170	+ {
	5171	+ EditElement(group, newWindow); // ? new
	5172	+ return;
	5173	+ }
	5174	+
4131	5175	// aConstraints.gridy = 0;
4132	5176	for (int i=0; i<group.selection.size(); i++)
4133	5177	{
4134	5178	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4135	5179	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4136		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5180	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4137	5181
4138	5182	Object3D elem = (Object3D)group.selection.elementAt(i);
4139	5183	if(elem != group \|\| !newWindow)
4140	5184	{
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
	5185	+ EditElement(elem, newWindow); // ? new
4147	5186	}
4148	5187	}
4149	5188	}
..	..	@@ -4206,9 +5245,7 @@
4206	5245
4207	5246	freezemodel = false;
4208	5247	}
4209		-
4210		- boolean flashIt = true;
4211		-
	5248	+
4212	5249	public void valueChanged(TreeSelectionEvent e)
4213	5250	//public boolean handleEvent(Event event)
4214	5251	{
..	..	@@ -4218,7 +5255,8 @@
4218	5255	//new Exception().printStackTrace();
4219	5256
4220	5257	freezemodel = true;
4221		-
	5258	+ ClearUnpinned();
	5259	+
4222	5260	/**/
4223	5261	//switch (event.id)
4224	5262	{
..	..	@@ -4226,7 +5264,6 @@
4226	5264	//case 702: // Event.LIST_DESELECT
4227	5265	group.deselectAll();
4228	5266	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4229		- objEditor.ClearInfo(); // .GetMaterial());
4230	5267	if (tps != null)
4231	5268	{
4232	5269	for (int i=0; i < tps.length; i++)
..	..	@@ -4235,10 +5272,8 @@
4235	5272
4236	5273	//if (child.parent != null)
4237	5274	//child.parent.addSelectee(child);
	5275	+ objEditor.SetMaterial(child);
4238	5276	group.addSelectee(child);
4239		- objEditor.SetMaterial(child); // .GetMaterial());
4240		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4241		- System.err.println("info : " + child.GetPath());
4242	5277	}
4243	5278	}
4244	5279	// else
..	..	@@ -4248,20 +5283,28 @@
4248	5283	// System.err.println("info : " + group.GetPath());
4249	5284	// }
4250	5285
4251		- objEditor.SetText(); // jan 2014
4252		-
4253		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	5286	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4254	5287	CameraPane.flash = true;
4255	5288
4256		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5289	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4257	5290	// a camera
4258	5291	{
4259		- CameraPane.camerachangeframe = 0; // don't refuse it
4260		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5292	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5293	+ {
	5294	+ CameraPane.camerachangeframe = 0; // don't refuse it
	5295	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5296	+ }
4261	5297	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4262	5298	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4263	5299	}
4264	5300
	5301	+ if (tps != null && tps.length == 1)
	5302	+ {
	5303	+ EditSelection(false);
	5304	+ }
	5305	+
	5306	+ SetPinStates(tps != null && tps.length > 0);
	5307	+
4265	5308	refreshContents();
4266	5309	//return true;
4267	5310	}
..	..	@@ -4270,6 +5313,50 @@
4270	5313
4271	5314	freezemodel = false;
4272	5315	}
	5316	+
	5317	+ void SetPinStates(boolean enabled)
	5318	+ {
	5319	+ editButton.setEnabled(enabled);
	5320	+ uneditButton.setEnabled(enabled);
	5321	+ //unselectButton.setEnabled(enabled);
	5322	+ flashSelectionButton.setEnabled(enabled);
	5323	+
	5324	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5325	+
	5326	+ boolean allComposites = true;
	5327	+
	5328	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5329	+ {
	5330	+ if (!(e.nextElement() instanceof Composite))
	5331	+ {
	5332	+ allComposites = false;
	5333	+ break;
	5334	+ }
	5335	+ }
	5336	+
	5337	+ rootButton.setEnabled(allComposites);
	5338	+ }
	5339	+
	5340	+ void refreshContents(boolean cp)
	5341	+ {
	5342	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5343	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5344	+ {
	5345	+ objEditor.ClearInfo(); // .GetMaterial());
	5346	+
	5347	+ for (int i=0; i < group.selection.Size(); i++)
	5348	+ {
	5349	+ Object3D child = (Object3D) group.selection.get(i);
	5350	+
	5351	+ objEditor.AddInfo(child, this, true);
	5352	+// System.err.println("info : " + child.GetPath());
	5353	+ }
	5354	+
	5355	+ objEditor.SetText(); // jan 2014
	5356	+ }
	5357	+
	5358	+ super.refreshContents(cp);
	5359	+ }
4273	5360
4274	5361	void linkSomething(Object3D thing)
4275	5362	{
..	..	@@ -4341,6 +5428,7 @@
4341	5428	{
4342	5429	if (group.selection.isEmpty())
4343	5430	return;
	5431	+
4344	5432	Grafreed.clipboardIsTempGroup = false;
4345	5433	Composite tGroup = null;
4346	5434	if (group.selection.size() > 0) // 1)
..	..	@@ -4351,6 +5439,8 @@
4351	5439
4352	5440	if (cut)
4353	5441	{
	5442	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5443	+// Save();
4354	5444	//int indices[] = jList.getSelectedIndices();
4355	5445	//for (int i = indices.length - 1; i >= 0; i--)
4356	5446	//jList.remove(indices[i]);
..	..	@@ -4440,8 +5530,10 @@
4440	5530	}
4441	5531
4442	5532	}
	5533	+
4443	5534	if (Grafreed.clipboardIsTempGroup)
4444	5535	Grafreed.clipboard = tGroup;
	5536	+
4445	5537	if (cut)
4446	5538	{
4447	5539	ResetModel();
..	..	@@ -4451,6 +5543,10 @@
4451	5543
4452	5544	void paste(boolean expand)
4453	5545	{
	5546	+ if (Globals.REPLACEONMAKE)
	5547	+ Save();
	5548	+ boolean keep = Globals.REPLACEONMAKE;
	5549	+ Globals.REPLACEONMAKE = false;
4454	5550	// if (GrafreeD.clipboard == null)
4455	5551	// return;
4456	5552	boolean first = true;
..	..	@@ -4510,6 +5606,7 @@
4510	5606	Grafreed.clipboard.get(0).parent = keepparent;
4511	5607	}
4512	5608
	5609	+ Globals.REPLACEONMAKE = keep;
4513	5610	ResetModel();
4514	5611	refreshContents();
4515	5612	}
..	..	@@ -4645,6 +5742,10 @@
4645	5742
4646	5743	void group(Object3D csg, boolean grab)
4647	5744	{
	5745	+ if (Globals.REPLACEONMAKE)
	5746	+ Save();
	5747	+ boolean keep = Globals.REPLACEONMAKE;
	5748	+ Globals.REPLACEONMAKE = false;
4648	5749	if (//false) // why??
4649	5750	!group.selection.isEmpty())
4650	5751	{
..	..	@@ -4758,10 +5859,15 @@
4758	5859	//node.add(csg);
4759	5860	//makeSomething(node);
4760	5861	makeSomething(csg);
	5862	+ Globals.REPLACEONMAKE = keep;
4761	5863	}
4762	5864
4763	5865	void Ungroup(Object3D g)
4764	5866	{
	5867	+ if (Globals.REPLACEONMAKE)
	5868	+ Save();
	5869	+ boolean keep = Globals.REPLACEONMAKE;
	5870	+ Globals.REPLACEONMAKE = false;
4765	5871	if (g instanceof HiddenObject)
4766	5872	{
4767	5873	HiddenObject h = (HiddenObject) g;
..	..	@@ -4778,6 +5884,7 @@
4778	5884	objEditor.makeSomething(g.get(i), false);
4779	5885	}
4780	5886	}
	5887	+ Globals.REPLACEONMAKE = keep;
4781	5888	}
4782	5889
4783	5890	void ungroup()
..	..	@@ -4973,21 +6080,6 @@
4973	6080	}
4974	6081	*/
4975	6082
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	6083	/*
4992	6084	public void Callback(Object obj)
4993	6085	{
..	..	@@ -5011,23 +6103,6 @@
5011	6103	}
5012	6104	*/
5013	6105
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	6106	String GetFile(String dialogName)
5032	6107	{
5033	6108	if (Grafreed.standAlone)
..	..	@@ -5098,7 +6173,43 @@
5098	6173	cButton clearpanelButton;
5099	6174	cButton unselectButton;
5100	6175
	6176	+ cButton restoreCameraButton;
	6177	+
5101	6178	cButton oneStepButton;
	6179	+
	6180	+ cButton groupButton;
	6181	+ cButton ungroupButton;
	6182	+ cButton compositeButton;
	6183	+ cButton switchButton;
	6184	+ cButton loopButton;
	6185	+ cButton textureButton;
	6186	+
	6187	+ cButton skybox1Button;
	6188	+ cButton skybox2Button;
	6189	+ cButton skybox3Button;
	6190	+ cButton skybox4Button;
	6191	+ cButton skybox5Button;
	6192	+ cButton skybox6Button;
	6193	+ cButton skybox7Button;
	6194	+
	6195	+ cButton skybox11Button;
	6196	+ cButton skybox12Button;
	6197	+ cButton skybox13Button;
	6198	+ cButton skybox14Button;
	6199	+ cButton skybox15Button;
	6200	+ cButton skybox16Button;
	6201	+ cButton skybox17Button;
	6202	+
	6203	+ cButton gridButton;
	6204	+ cButton boxButton;
	6205	+ cButton sphereButton;
	6206	+ cButton coneButton;
	6207	+ cButton torusButton;
	6208	+ cButton superButton;
	6209	+ cButton kleinButton;
	6210	+ cButton particlesButton;
	6211	+ cButton overlayButton;
	6212	+ cButton lightButton;
5102	6213
5103	6214	cButton screenfitButton;
5104	6215	cButton screenfitpointButton;
..	..	@@ -5111,14 +6222,6 @@
5111	6222
5112	6223	cButton setsupportButton;
5113	6224
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	6225	//
5123	6226	//Composite
5124	6227	Object3D // to do !!
..	..	@@ -5128,9 +6231,11 @@
5128	6231	//JTree jTree;
5129	6232	private MenuItem lookAtItem;
5130	6233	private MenuItem lookFromItem;
5131		- private MenuItem switchItem;
	6234	+ private MenuItem switchViewItem;
5132	6235	private MenuItem cutItem;
5133		- private MenuItem duplicateItem;
	6236	+ private MenuItem undoItem;
	6237	+ private MenuItem redoItem;
	6238	+ private JMenuItem duplicateItem;
5134	6239	private MenuItem cloneItem;
5135	6240	private MenuItem cloneSupportItem;
5136	6241	private MenuItem overwriteGeoItem;
..	..	@@ -5158,7 +6263,7 @@
5158	6263	private MenuItem pasteLinkItem;
5159	6264	private MenuItem pasteCloneItem;
5160	6265	private MenuItem pasteExpandItem;
5161		- private MenuItem clearItem;
	6266	+ private MenuItem deleteItem;
5162	6267	private MenuItem clearAllItem;
5163	6268	private MenuItem genUVItem;
5164	6269	private MenuItem genNormalsMESHItem;
..	..	@@ -5193,6 +6298,10 @@
5193	6298	private MenuItem showleavesItem;
5194	6299	private MenuItem markleavesItem;
5195	6300	private MenuItem unmarkleavesItem;
	6301	+ private MenuItem rewindleavesItem;
	6302	+ private MenuItem unrewindleavesItem;
	6303	+ private MenuItem randomleavesItem;
	6304	+ private MenuItem unrandomleavesItem;
5196	6305
5197	6306	private MenuItem flipVItem;
5198	6307	private MenuItem unflipVItem;
..	..	@@ -5214,7 +6323,7 @@
5214	6323	private MenuItem frontItem;
5215	6324	private MenuItem cameraItem;
5216	6325	private MenuItem compositeItem;
5217		- private MenuItem randomItem;
	6326	+ private MenuItem switchItem;
5218	6327	private MenuItem physicsItem;
5219	6328	private MenuItem frameselectorItem;
5220	6329	private MenuItem scriptNodeItem;
..	..	@@ -5238,6 +6347,8 @@
5238	6347	private MenuItem attachBumpItem;
5239	6348	private MenuItem detachBumpItem;
5240	6349	private MenuItem pigmentBumpItem;
	6350	+ private MenuItem embedTexturesItem;
	6351	+ private MenuItem deEmbedTexturesItem;
5241	6352
5242	6353	private MenuItem particleItem;
5243	6354	private MenuItem ragdollItem;
..	..	@@ -5276,11 +6387,6 @@
5276	6387	private MenuItem doubleItem;
5277	6388	private MenuItem tripleItem;
5278	6389
5279		- private MenuItem importGFDItem;
5280		- private MenuItem importVRMLX3DItem;
5281		- private MenuItem import3DSItem;
5282		- private MenuItem importOBJItem;
5283		-
5284	6390	private MenuItem computeAOItem;
5285	6391	private MenuItem recompileItem;
5286	6392	private MenuItem editScriptItem;
..	..	@@ -5290,4 +6396,8 @@
5290	6396	private MenuItem analyzeItem;
5291	6397	private MenuItem dumpItem;
5292	6398	//boolean freezemodel = false;
	6399	+
	6400	+ Menu cameraMenu;
	6401	+ MenuItem editCameraItem;
	6402	+ MenuItem restoreCameraItem;
5293	6403	}