~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,341 @@
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);
	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", "rgb", 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	+ //cameraView.envyoff = false;
	334	+ group.skyboxname = skybox;
	335	+ group.skyboxext = "jpg";
	336	+ cameraView.repaint();
	337	+ }
	338	+
	339	+ public void CreateSkyboxPanel(cGridBag skyboxPanel)
	340	+ {
	341	+ JTabbedPane skyboxpane = new JTabbedPane();
	342	+
	343	+ AddSkyboxTab0(skyboxpane);
	344	+ AddSkyboxTab1(skyboxpane);
	345	+ AddSkyboxTab2(skyboxpane);
	346	+ AddSkyboxTab3(skyboxpane);
	347	+
	348	+ skyboxPanel.add(skyboxpane);
	349	+ }
	350	+
	351	+ public void ChangeTexture(String texture)
	352	+ {
	353	+ for (int i=0; i<group.selection.size(); i++)
	354	+ {
	355	+ Object3D obj = group.selection.get(i);
	356	+ obj.SetPigmentTexture("@" + texture);
	357	+ }
	358	+
	359	+ refreshContents();
	360	+ }
	361	+
26	362	//ObjEditor objEditor;
27	363	public void closeUI2()
28	364	{
..	..	@@ -60,6 +396,12 @@
60	396	this.copy = this.group = group;
61	397	//selectees = this.group.selectees;
62	398
	399	+ if (copy.versionlist == null)
	400	+ {
	401	+ copy.versionlist = new Object3D[100];
	402	+ copy.versionindex = -1;
	403	+ }
	404	+
63	405	if(ui)
64	406	SetupUI(objEditor);
65	407	}
..	..	@@ -74,16 +416,28 @@
74	416	this.copy = this.group = copy;
75	417	//selectees = this.group.selectees;
76	418
77		- SetupMenu2(objEditor);
	419	+ SetupMenu2(this); //objEditor);
78	420	SetupUI2(objEditor);
79	421	objEditor.SetupUI(true);
80	422	SetupViews(objEditor);
81	423
82	424	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	425	+
	426	+ if (copy.versionlist == null)
	427	+ {
	428	+ copy.versionlist = new Object3D[100];
	429	+ copy.versionindex = -1;
	430	+
	431	+ Save(true);
	432	+ }
83	433	}
84	434
85	435	void CloneSelection(boolean supports)
86	436	{
	437	+ if (Globals.REPLACEONMAKE)
	438	+ Save();
	439	+ boolean keep = Globals.REPLACEONMAKE;
	440	+ Globals.REPLACEONMAKE = false;
87	441	// Object3D keep = GrafreeD.clipboard;
88	442	//Object3D obj;
89	443	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,18 +448,19 @@
94	448
95	449	makeSomething(clone, i==group.selection.size()-1);
96	450	}
	451	+ Globals.REPLACEONMAKE = keep;
97	452	}
98	453
99	454	void CloneClipboard(boolean supports)
100	455	{
101		- assert(GrafreeD.clipboard.parent == null);
102		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
103		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
104		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
105		- makeSomething(CloneObject(GrafreeD.clipboard.get(0), false));
	456	+ assert(Grafreed.clipboard.parent == null);
	457	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	458	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	459	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	460	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
106	461	else
107		- makeSomething(CloneObject(GrafreeD.clipboard, false));
108		- GrafreeD.clipboard.get(0).parent = keepparent;
	462	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	463	+ Grafreed.clipboard.get(0).parent = keepparent;
109	464	}
110	465
111	466	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -119,7 +474,7 @@
119	474	// obj.support = null;
120	475	if (!supports)
121	476	obj.SaveSupports();
122		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	477	+ Object3D clone = (Object3D)Grafreed.clone(obj);
123	478	obj.parent = parent;
124	479	// obj.support = support;
125	480	// clone.support = support; // aout 2013
..	..	@@ -148,28 +503,21 @@
148	503
149	504	//JTextField nameField;
150	505
151		- void SetupMenu2(ObjEditor oe)
	506	+ void SetupMenu2(GroupEditor oe)
152	507	{
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		-
	508	+ oe.jTree = new cTree();
	509	+
168	510	Menu menu;
169	511	oe.menuBar.add(menu = new Menu("Edit"));
170	512	//editItem = menu.add(new MenuItem("Edit"));
171	513	//editItem.addActionListener(this);
172		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	514	+
	515	+// undoItem = menu.add(new MenuItem("Undo"));
	516	+// undoItem.addActionListener(this);
	517	+// redoItem = menu.add(new MenuItem("Redo"));
	518	+// redoItem.addActionListener(this);
	519	+// menu.add("-");
	520	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
173	521	duplicateItem.addActionListener(this);
174	522	cloneItem = menu.add(new MenuItem("Clone"));
175	523	cloneItem.addActionListener(this);
..	..	@@ -185,7 +533,6 @@
185	533	copyItem.addActionListener(this);
186	534	pasteItem = menu.add(new MenuItem("Paste"));
187	535	pasteItem.addActionListener(this);
188		- menu.add("-");
189	536
190	537	menu.add("-");
191	538	pasteIntoItem = menu.add(new MenuItem("Paste into"));
..	..	@@ -197,8 +544,8 @@
197	544	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
198	545	// pasteExpandItem.addActionListener(this);
199	546	menu.add("-");
200		- clearItem = menu.add(new MenuItem("Clear"));
201		- clearItem.addActionListener(this);
	547	+ deleteItem = menu.add(new MenuItem("Delete"));
	548	+ deleteItem.addActionListener(this);
202	549
203	550	if (Globals.ADVANCED)
204	551	{
..	..	@@ -206,14 +553,97 @@
206	553	clearAllItem = menu.add(new MenuItem("Clear All"));
207	554	clearAllItem.addActionListener(this);
208	555	}
	556	+
	557	+ menuBar.add(cameraMenu = new Menu("View"));
	558	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	559	+ //zBufferItem.addActionListener(this);
	560	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	561	+ //normalLensItem.addActionListener(this);
	562	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	563	+ restoreCameraItem.addActionListener(this);
	564	+
	565	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	566	+// toggleFullScreenItem.addItemListener(this);
	567	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	568	+// cameraMenu.add("-");
	569	+//
	570	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	571	+// toggleTextureItem.addItemListener(this);
	572	+// toggleTextureItem.setState(CameraPane.textureon);
	573	+//
	574	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	575	+// toggleSwitchItem.addItemListener(this);
	576	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	577	+
	578	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	579	+ toggleHandleItem.addItemListener(this);
	580	+ toggleHandleItem.setState(CameraPane.HANDLES);
	581	+
	582	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	583	+ togglePaintItem.addItemListener(this);
	584	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	585	+
	586	+ if (Globals.ADVANCED)
	587	+ {
	588	+ cameraMenu.add("-");
	589	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	590	+ toggleLiveItem.addItemListener(this);
	591	+ toggleLiveItem.setState(Globals.isLIVE());
209	592
	593	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	594	+ stepItem.addActionListener(this);
	595	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	596	+ // toggleDLItem.addItemListener(this);
	597	+ // toggleDLItem.setState(false);
	598	+
	599	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	600	+ toggleRenderItem.addItemListener(this);
	601	+ toggleRenderItem.setState(!CameraPane.frozen);
	602	+
	603	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	604	+ toggleDebugItem.addItemListener(this);
	605	+ toggleDebugItem.setState(Globals.DEBUG);
	606	+
	607	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	608	+ toggleFrustumItem.addItemListener(this);
	609	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	610	+
	611	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	612	+ toggleFootContactItem.addItemListener(this);
	613	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	614	+
	615	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	616	+ toggleTimelineItem.addItemListener(this);
	617	+ }
	618	+
	619	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	620	+// toggleRootItem.addItemListener(this);
	621	+// toggleRootItem.setState(false);
	622	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	623	+// animationItem.addItemListener(this);
	624	+// animationItem.setState(CameraPane.ANIMATION);
	625	+ cameraMenu.add("-");
	626	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	627	+ editCameraItem.addActionListener(this);
	628	+
	629	+ if (Globals.ADVANCED)
	630	+ {
	631	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	632	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	633	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	634	+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	635	+ oe.cameraMenu.add("-");
	636	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	637	+ openWindowItem.addActionListener(this);
	638	+ editLeafItem.addActionListener(this);
	639	+ lookAtItem.addActionListener(this);
	640	+ //lookFromItem.addActinoListener(this);
	641	+ //switchViewItem.addActionListener(this);
	642	+ }
	643	+
210	644	oe.menuBar.add(menu = new Menu("Setting"));
211	645	if (Globals.ADVANCED)
212	646	{
213		- resetMeshItem = menu.add(new MenuItem("Reset All"));
214		- resetMeshItem.addActionListener(this);
215		- stepAllItem = menu.add(new MenuItem("Step All"));
216		- stepAllItem.addActionListener(this);
217	647	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
218	648	revertMeshItem.addActionListener(this);
219	649	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
..	..	@@ -253,21 +683,29 @@
253	683	}
254	684
255	685	oe.menuBar.add(menu = new Menu("Group"));
256		- grabItem = menu.add(new MenuItem("Grab"));
257		- grabItem.addActionListener(this);
	686	+// grabItem = menu.add(new MenuItem("Grab"));
	687	+// grabItem.addActionListener(this);
258	688	backItem = menu.add(new MenuItem("Back"));
259	689	backItem.addActionListener(this);
260	690	frontItem = menu.add(new MenuItem("Front"));
261	691	frontItem.addActionListener(this);
262		- compositeItem = menu.add(new MenuItem("Composite"));
263		- compositeItem.addActionListener(this);
	692	+// compositeItem = menu.add(new MenuItem("Composite"));
	693	+// compositeItem.addActionListener(this);
	694	+
	695	+ if (Globals.ADVANCED)
	696	+ {
264	697	hideItem = menu.add(new MenuItem("Hidden Group"));
265	698	hideItem.addActionListener(this);
	699	+ }
266	700	ungroupItem = menu.add(new MenuItem("Ungroup"));
267	701	ungroupItem.addActionListener(this);
268		- menu.add("-");
269		- randomItem = menu.add(new MenuItem("Switch node"));
270		- randomItem.addActionListener(this);
	702	+
	703	+// menu.add("-");
	704	+//
	705	+// switchItem = menu.add(new MenuItem("Switch node"));
	706	+// switchItem.addActionListener(this);
	707	+ if (Globals.ADVANCED)
	708	+ {
271	709	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
272	710	switchGeoItem.addActionListener(this);
273	711	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -275,8 +713,6 @@
275	713	morphItem = menu.add(new MenuItem("Morph Group"));
276	714	morphItem.addActionListener(this);
277	715
278		- if (Globals.ADVANCED)
279		- {
280	716	menu.add("-");
281	717	physicsItem = menu.add(new MenuItem("Physics"));
282	718	physicsItem.addActionListener(this);
..	..	@@ -284,30 +720,29 @@
284	720	frameselectorItem.addActionListener(this);
285	721	scriptNodeItem = menu.add(new MenuItem("Script Node"));
286	722	scriptNodeItem.addActionListener(this);
287		- cameraItem = menu.add(new MenuItem("Camera"));
288		- cameraItem.addActionListener(this);
289	723	}
290	724
291	725	oe.menuBar.add(menu = new Menu("Object"));
292		- textureItem = menu.add(new MenuItem("Texture"));
293		- textureItem.addActionListener(this);
	726	+// textureItem = menu.add(new MenuItem("Texture"));
	727	+// textureItem.addActionListener(this);
294	728	billboardItem = menu.add(new MenuItem("Billboard"));
295	729	billboardItem.addActionListener(this);
296	730	csgItem = menu.add(new MenuItem("CSG"));
297	731	csgItem.addActionListener(this);
298		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	732	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
299	733	shadowXItem.addActionListener(this);
300		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	734	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
301	735	shadowYItem.addActionListener(this);
302		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	736	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
303	737	shadowZItem.addActionListener(this);
	738	+ attributeItem = menu.add(new MenuItem("Attribute"));
	739	+ attributeItem.addActionListener(this);
	740	+
304	741	if (Globals.ADVANCED)
305	742	{
306	743	menu.add("-");
307	744	linkerItem = menu.add(new MenuItem("Linker"));
308	745	linkerItem.addActionListener(this);
309		- attributeItem = menu.add(new MenuItem("Attribute"));
310		- attributeItem.addActionListener(this);
311	746	templateItem = menu.add(new MenuItem("Template"));
312	747	templateItem.addActionListener(this);
313	748	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -318,8 +753,12 @@
318	753	resetTransformItem.addActionListener(this);
319	754	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
320	755	resetCentroidItem.addActionListener(this);
321		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
322		- transformgeometryItem.addActionListener(this);
	756	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	757	+ resetCentroidXZItem.addActionListener(this);
	758	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	759	+ transformGeometryItem.addActionListener(this);
	760	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	761	+ transformChildrenItem.addActionListener(this);
323	762
324	763	oe.menuBar.add(menu = new Menu("Geometry"));
325	764	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -332,7 +771,7 @@
332	771	genNormalsMESHItem.addActionListener(this);
333	772	if (Globals.ADVANCED)
334	773	{
335		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	774	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
336	775	genNormalsMINEItem.addActionListener(this);
337	776	}
338	777	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -368,6 +807,10 @@
368	807	oe.menuBar.add(menu = new Menu("Attributes"));
369	808	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
370	809	clearMaterialsItem.addActionListener(this);
	810	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	811	+ resetAllItem.addActionListener(this);
	812	+ stepAllItem = menu.add(new MenuItem("Step All"));
	813	+ stepAllItem.addActionListener(this);
371	814	menu.add("-");
372	815	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
373	816	liveleavesItem.addActionListener(this);
..	..	@@ -388,6 +831,14 @@
388	831	markleavesItem.addActionListener(this);
389	832	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
390	833	unmarkleavesItem.addActionListener(this);
	834	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	835	+ rewindleavesItem.addActionListener(this);
	836	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	837	+ unrewindleavesItem.addActionListener(this);
	838	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	839	+ randomleavesItem.addActionListener(this);
	840	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	841	+ unrandomleavesItem.addActionListener(this);
391	842	menu.add("-");
392	843	flipVItem = menu.add(new MenuItem("Flip V"));
393	844	flipVItem.addActionListener(this);
..	..	@@ -413,50 +864,123 @@
413	864	attachBumpItem.addActionListener(this);
414	865	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
415	866	pigmentBumpItem.addActionListener(this);
	867	+ //embedTexturesItem
416	868	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
417	869	detachPigmentItem.addActionListener(this);
418	870	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
419	871	detachBumpItem.addActionListener(this);
	872	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	873	+ embedTexturesItem.addActionListener(this);
	874	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	875	+ deEmbedTexturesItem.addActionListener(this);
420	876	menu.add("-");
421	877	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
422	878	sortbysizeItem.addActionListener(this);
423	879	sortbynameItem = menu.add(new MenuItem("Sort by name"));
424	880	sortbynameItem.addActionListener(this);
	881	+ menu.add("-");
	882	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	883	+ shareGeometriesItem.addActionListener(this);
	884	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	885	+ mergeGeometriesItem.addActionListener(this);
425	886	if (Globals.ADVANCED)
426	887	{
427		- menu.add("-");
	888	+ // Pretty much the same as duplicate and clone.
428	889	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
429	890	extractGeometriesItem.addActionListener(this);
430	891	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
431	892	cloneGeometriesItem.addActionListener(this);
432		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
433		- shareGeometriesItem.addActionListener(this);
434		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
435		- mergeGeometriesItem.addActionListener(this);
436	893	}
437	894
438	895	oe.menuBar.add(menu = new Menu("Insert"));
439	896	buildCreateMenu(menu);
440	897
441		- oe.menuBar.add(menu = new Menu("Include"));
442		- importOBJItem = menu.add(new MenuItem("OBJ file..."));
443		- importOBJItem.addActionListener(this);
444		- menu.add("-");
445		- import3DSItem = menu.add(new MenuItem("3DS file..."));
446		- import3DSItem.addActionListener(this);
447		- menu.add("-");
448		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
449		- importVRMLX3DItem.addActionListener(this);
450		- menu.add("-");
451		- importGFDItem = menu.add(new MenuItem("GrafreeD file..."));
452		- importGFDItem.addActionListener(this);
453		-
454	898	oe.menuBar.add(menu = new Menu("Tools"));
455	899	buildToolsMenu(menu);
456	900	}
457	901
	902	+ JTabbedPane resourcecontainer;
	903	+ cGridBag currenttab;
	904	+ boolean added; // patch for jar
	905	+
	906	+ int tabcount = 0;
	907	+ int colcount = 0;
	908	+ int rowcount = 0;
	909	+ int texturecount = 0;
	910	+
	911	+ int columns = 5;
	912	+ int rows = 7;
	913	+
	914	+ public void ResourceCallBack(String[] path)
	915	+ {
	916	+// for (int i = 0; i < path.length; i++)
	917	+// System.out.print(path[i] + "/");
	918	+// System.out.println();
	919	+
	920	+ if (//rowcount == 0 \|\|
	921	+ path.length == 1)
	922	+ {
	923	+ currenttab = new cGridBag();
	924	+ added = false;
	925	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	926	+ currenttab.setName(tabname);
	927	+ rowcount = 1;
	928	+ colcount = 0;
	929	+ texturecount = 0;
	930	+ }
	931	+
	932	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	933	+ {
	934	+ if (!added)
	935	+ {
	936	+ added = true;
	937	+ resourcecontainer.add(currenttab);
	938	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	939	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	940	+ }
	941	+
	942	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	943	+
	944	+ if (++colcount >= columns)
	945	+ {
	946	+ colcount = 0;
	947	+ currenttab.Return();
	948	+
	949	+ if (rowcount++ >= rows)
	950	+ {
	951	+ rowcount = 0;
	952	+ }
	953	+ }
	954	+ }
	955	+ else
	956	+ {
	957	+// if (!path[path.length-1].equals("icons"))
	958	+// resourcecontainer.Return();
	959	+ }
	960	+ }
	961	+
	962	+ void CreateTexturePanel(cGridBag container)
	963	+ {
	964	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	965	+ container.add(resourcecontainer);
	966	+
	967	+ Grafreed.ParseResources("textures", this);
	968	+ }
	969	+
458	970	void SetupUI2(ObjEditor oe)
459	971	{
	972	+ // June 2019
	973	+ if (oe == null)
	974	+ {
	975	+ //super.SetupUI2(this);
	976	+ //return;
	977	+ }
	978	+
	979	+ if (copy != group)
	980	+ {
	981	+ //super.SetupUI2(this);
	982	+ }
	983	+
460	984	//new Exception().printStackTrace();
461	985
462	986	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -485,97 +1009,238 @@
485	1009	oe.radioPanel.add(dummyButton);
486	1010	oe.buttonGroup.add(dummyButton);
487	1011	*/
	1012	+ cGridBag copyOptionsPanel = new cGridBag();
	1013	+
	1014	+ copyOptionsPanel.preferredHeight = 2;
	1015	+
488	1016	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
489	1017
490		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
491		- liveCB.setToolTipText("Enabled animation");
	1018	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1019	+ //minButton.setToolTipText("Minimize window");
	1020	+ //minButton.addActionListener(this);
	1021	+
	1022	+ if (Globals.ADVANCED)
	1023	+ {
	1024	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1025	+ maxButton.setToolTipText("Maximize window");
	1026	+ maxButton.addActionListener(this);
	1027	+ }
	1028	+
	1029	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1030	+ fullButton.setToolTipText("Full-screen window");
	1031	+ fullButton.addActionListener(this);
	1032	+
	1033	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1034	+ screenfitButton.setToolTipText("Screen fit");
	1035	+ screenfitButton.addActionListener(this);
	1036	+
	1037	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1038	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1039	+ restoreCameraButton.addActionListener(this);
	1040	+
	1041	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1042	+ saveVersionButton.setToolTipText("Duplicate current version");
	1043	+ saveVersionButton.addActionListener(this);
	1044	+
	1045	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1046	+ deleteVersionButton.setToolTipText("Delete current version");
	1047	+ deleteVersionButton.addActionListener(this);
	1048	+
	1049	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1050	+ previousVersionButton.setToolTipText("Previous version");
	1051	+ previousVersionButton.addActionListener(this);
	1052	+ previousVersionButton.setEnabled(false);
	1053	+
	1054	+ cGridBag updown = new cGridBag().setVertical(true);
	1055	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1056	+ restoreButton.setToolTipText("Undo (restore current version)");
	1057	+ restoreButton.addActionListener(this);
	1058	+ //restoreButton.setEnabled(false);
	1059	+
	1060	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1061	+ replaceButton.setToolTipText("Save (replace current version)");
	1062	+ replaceButton.addActionListener(this);
	1063	+ //replaceButton.setEnabled(false);
	1064	+
	1065	+ copyOptionsPanel.add(updown);
	1066	+
	1067	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1068	+ nextVersionButton.setToolTipText("Next version");
	1069	+ nextVersionButton.addActionListener(this);
	1070	+ nextVersionButton.setEnabled(false);
	1071	+
	1072	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1073	+ liveCB.setToolTipText("Enable animation");
492	1074	liveCB.addItemListener(this);
493	1075
494		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1076	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
495	1077	oneStepButton.setToolTipText("Animate one step forward");
496	1078	oneStepButton.addActionListener(this);
497	1079
498		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	1080	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
499	1081	fastCB.setToolTipText("Fast mode");
500	1082	fastCB.addItemListener(this);
501	1083
502		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
503		- trackCB.setToolTipText("Enable tracking");
504		- trackCB.addItemListener(this);
505		-
506		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
507		- screenfitButton.setToolTipText("Screen fit");
508		- screenfitButton.addActionListener(this);
	1084	+ //oe.toolboxPanel.Return();
	1085	+
	1086	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1087	+// trackCB.setToolTipText("Enable tracking");
	1088	+// trackCB.addItemListener(this);
509	1089
510	1090	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
511	1091	// screenfitpointButton.addActionListener(this);
512	1092
513	1093	if (Globals.ADVANCED)
514	1094	{
515		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1095	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
516	1096	snapobjectButton.addActionListener(this);
517	1097	snapobjectButton.setToolTipText("Snap Object");
	1098	+
	1099	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1100	+ fourButton.addActionListener(this);
	1101	+ fourButton.setToolTipText("Show control panel only");
518	1102	}
519	1103
520		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
521		- flashSelectionButton.setToolTipText("Show selection");
522		- flashSelectionButton.addActionListener(this);
	1104	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
523	1105
524		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
525		-
526		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
527		- twoButton.setToolTipText("Show center view only");
	1106	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1107	+ twoButton.setToolTipText("Show 3D view only");
528	1108	twoButton.addActionListener(this);
529		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
530		- fourButton.addActionListener(this);
531		- fourButton.setToolTipText("Show left panel only");
532		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
533		- sixButton.setToolTipText("2-column layout left");
534		- sixButton.addActionListener(this);
535		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
536		- threeButton.setToolTipText("2-column layout right");
	1109	+ this.fullscreenLayout = twoButton;
	1110	+
	1111	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1112	+ threeButton.setToolTipText("Show controls and 3D view");
537	1113	threeButton.addActionListener(this);
538		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
539		- sevenButton.setToolTipText("3-column layout");
540		- sevenButton.addActionListener(this);
	1114	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1115	+ sixButton.setToolTipText("Show 3D view and controls");
	1116	+ sixButton.addActionListener(this);
	1117	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1118	+// sevenButton.setToolTipText("3-column layout");
	1119	+// sevenButton.addActionListener(this);
541	1120	//
542	1121
543		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
544		- rootButton.setToolTipText("Edit selection in new tab");
	1122	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1123	+ rootButton.setToolTipText("Open selection in new tab");
545	1124	rootButton.addActionListener(this);
546	1125
547		- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1126	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
548	1127	closeButton.setToolTipText("Close tab");
549	1128	closeButton.addActionListener(this);
550	1129	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
551	1130	//clearButton.addActionListener(this);
552		-
553		- cGridBag commandsPanel = new cGridBag();
	1131	+
	1132	+ cGridBag row1 = new cGridBag();
554	1133
555		- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
556		- editButton.setToolTipText("Edit selection");
	1134	+ // INSERT
	1135	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1136	+ gridButton.setToolTipText("Create grid");
	1137	+ gridButton.addActionListener(this);
	1138	+
	1139	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1140	+ boxButton.setToolTipText("Create box");
	1141	+ boxButton.addActionListener(this);
	1142	+
	1143	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1144	+ sphereButton.setToolTipText("Create sphere");
	1145	+ sphereButton.addActionListener(this);
	1146	+
	1147	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1148	+ coneButton.setToolTipText("Create cone");
	1149	+ coneButton.addActionListener(this);
	1150	+
	1151	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1152	+ torusButton.setToolTipText("Create torus");
	1153	+ torusButton.addActionListener(this);
	1154	+
	1155	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1156	+ superButton.setToolTipText("Create superellipsoid");
	1157	+ superButton.addActionListener(this);
	1158	+
	1159	+ if (Globals.ADVANCED)
	1160	+ {
	1161	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1162	+ kleinButton.setToolTipText("Create Klein bottle");
	1163	+ kleinButton.addActionListener(this);
	1164	+ }
	1165	+
	1166	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1167	+ particlesButton.setToolTipText("Create particle system");
	1168	+ particlesButton.addActionListener(this);
	1169	+
	1170	+ oe.toolboxPanel.add(row1);
	1171	+
	1172	+ cGridBag row2 = new cGridBag();
	1173	+
	1174	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1175	+ groupButton.setToolTipText("Create group");
	1176	+ groupButton.addActionListener(this);
	1177	+
	1178	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1179	+ compositeButton.setToolTipText("Create composite");
	1180	+ compositeButton.addActionListener(this);
	1181	+
	1182	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1183	+ switchButton.setToolTipText("Create item switcher");
	1184	+ switchButton.addActionListener(this);
	1185	+
	1186	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1187	+ loopButton.setToolTipText("Create loop");
	1188	+ loopButton.addActionListener(this);
	1189	+
	1190	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1191	+ textureButton.setToolTipText("Create texture");
	1192	+ textureButton.addActionListener(this);
	1193	+
	1194	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1195	+ overlayButton.setToolTipText("Create overlay");
	1196	+ overlayButton.addActionListener(this);
	1197	+
	1198	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1199	+ lightButton.setToolTipText("Create light");
	1200	+ lightButton.addActionListener(this);
	1201	+
	1202	+ oe.toolboxPanel.add(row2);
	1203	+
	1204	+ cGridBag textures = new cGridBag();
	1205	+
	1206	+ CreateTexturePanel(textures);
	1207	+
	1208	+ oe.toolboxPanel.add(textures);
	1209	+
	1210	+ textures.preferredHeight = 100;
	1211	+
	1212	+ CreateSkyboxPanel(oe.skyboxPanel);
	1213	+
	1214	+ // EDIT panel
	1215	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1216	+ editButton.setToolTipText("Pin selection controls");
557	1217	editButton.addActionListener(this);
558	1218
559		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
560		- uneditButton.setToolTipText("Unedit selection");
	1219	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1220	+ uneditButton.setToolTipText("Unpin and remove selection controls");
561	1221	uneditButton.addActionListener(this);
562	1222
563		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
564		- allParamsButton.setToolTipText("Edit all params");
	1223	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1224	+ allParamsButton.setToolTipText("Show all controls");
565	1225	allParamsButton.addActionListener(this);
566	1226
567		- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
568		- clearPanelButton.setToolTipText("Clear edit panel");
	1227	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1228	+ clearPanelButton.setToolTipText("Clear all controls");
569	1229	clearPanelButton.addActionListener(this);
570	1230
571		- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
572		- unselectButton.setToolTipText("Unselect");
573		- unselectButton.addActionListener(this);
	1231	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1232	+ //unselectButton.setToolTipText("Unselect");
	1233	+ //unselectButton.addActionListener(this);
574	1234
575		- commandsPanel.preferredHeight = 1;
	1235	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1236	+ flashSelectionButton.setToolTipText("Highlight selection");
	1237	+ flashSelectionButton.addActionListener(this);
576	1238
577		- oe.treePanel.add(commandsPanel);
578		- oe.treePanel.Return();
	1239	+ editCommandsPanel.preferredHeight = 1;
	1240	+
	1241	+ SetPinStates(false);
	1242	+// oe.treePanel.add(commandsPanel);
	1243	+// oe.treePanel.Return();
579	1244
580	1245	// oe.aConstraints.gridx += 1;
581	1246	// oe.aConstraints.weighty = 0;
..	..	@@ -592,32 +1257,20 @@
592	1257
593	1258	JScrollPane jSP;
594	1259	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
595		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1260	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
596	1261	ResetModel();
597	1262
598	1263	oe.treePanel.add(jSPPanel);
599	1264	oe.treePanel.Return();
600	1265
601		- cGridBag copyOptionsPanel = new cGridBag();
602		-
603		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
604		- colorCB.setToolTipText("Copy color when dropped");
605		- colorCB.addItemListener(this);
606		-
607		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
608		- materialCB.setToolTipText("Copy material when dropped");
609		- materialCB.addItemListener(this);
610		-
611		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
612		- textureCB.setToolTipText("Copy texture when dropped");
613		- textureCB.addItemListener(this);
614		-
615		- copyOptionsPanel.preferredHeight = 1;
616	1266	oe.treePanel.add(copyOptionsPanel);
617	1267	oe.treePanel.Return();
	1268	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1269	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1270	+ sliderPane.preferredHeight = 1;
618	1271
619		-// mainPanel.setDividerLocation(0.5); //1.0);
620		-// mainPanel.setResizeWeight(0.5);
	1272	+// mainPanel.setDividerLocation(0.1); //1.0);
	1273	+ mainPanel.setResizeWeight(0.4);
621	1274
622	1275	//jList.addListSelectionListener(this);
623	1276	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -625,7 +1278,7 @@
625	1278	//jTree.setEditable(true);
626	1279	oe.jTree.setDragEnabled(true);
627	1280	//jTree.setPreferredSize(new Dimension(10,10));
628		- jSP.setPreferredSize(new Dimension(100,200));
	1281	+ //jSP.setPreferredSize(new Dimension(100,200));
629	1282
630	1283	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
631	1284
..	..	@@ -637,29 +1290,49 @@
637	1290	dgr.addDragGestureListener(this);
638	1291	}catch(Exception e) {}
639	1292	*/
640		- radio.layout = sevenButton;
	1293	+ radio.layout = threeButton; // sixButton;
641	1294	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
642	1295	}
643	1296
644	1297	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
645	1298	{
	1299	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1300	+ colorCB.setToolTipText("Copy color when dropped");
	1301	+ colorCB.addItemListener(this);
	1302	+
	1303	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1304	+ materialCB.setToolTipText("Copy material when dropped");
	1305	+ materialCB.addItemListener(this);
	1306	+
	1307	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1308	+ textureCB.setToolTipText("Copy texture when dropped");
	1309	+ textureCB.addItemListener(this);
	1310	+
	1311	+ panel.Return();
	1312	+
646	1313	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
647	1314	boxCB.setToolTipText("Display bounding boxes");
648	1315	boxCB.addItemListener(this);
649	1316
650	1317	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
651		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1318	+ zoomBoxCB.setToolTipText("Display only for wheel");
652	1319	zoomBoxCB.addItemListener(this);
653	1320
654		- if (Globals.ADVANCED)
	1321	+ if (true) // Globals.ADVANCED)
655	1322	{
656		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
657		- supportCB.setToolTipText("Enable rigging");
658		- supportCB.addItemListener(this);
	1323	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1324	+// supportCB.setToolTipText("Enable rigging");
	1325	+// supportCB.addItemListener(this);
	1326	+
	1327	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1328	+ freezeCB.setToolTipText("Fast moving camera");
	1329	+ freezeCB.addItemListener(this);
659	1330
660	1331	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
661	1332	// localCB.addItemListener(this);
662	1333
	1334	+ panel.Return();
	1335	+
663	1336	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
664	1337	crowdCB.setToolTipText("Used for crowds");
665	1338	crowdCB.addItemListener(this);
..	..	@@ -668,14 +1341,19 @@
668	1341	smoothCB.setToolTipText("Snapping delay");
669	1342	smoothCB.addItemListener(this);
670	1343
671		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
672		- slowCB.setToolTipText("Smooth interpolation");
673		- slowCB.addItemListener(this);
	1344	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1345	+// slowCB.setToolTipText("Smooth interpolation");
	1346	+// slowCB.addItemListener(this);
	1347	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1348	+ minshaderCB.setToolTipText("Minimal fast shader");
	1349	+ minshaderCB.addItemListener(this);
674	1350
675	1351	// constraints.gridy += 1;
676	1352	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
677	1353	// speakerMocapCB.addItemListener(this);
678	1354
	1355	+ panel.Return();
	1356	+
679	1357	if (false)
680	1358	{
681	1359	// handled in scripts
..	..	@@ -690,42 +1368,85 @@
690	1368	//constraints.gridy += 1;
691	1369	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
692	1370	smoothfocusCB.addItemListener(this);
	1371	+ panel.Return();
693	1372	}
694	1373
695	1374	//constraints.gridx += 1;
696	1375	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
697	1376	// debugCB.addItemListener(this);
698	1377
	1378	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1379	+ trackCB.setToolTipText("Enable tracking target");
	1380	+ trackCB.addItemListener(this);
	1381	+
699	1382	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1383	+ oeilCB.setToolTipText("Move camera when tracking");
700	1384	oeilCB.addItemListener(this);
701	1385
	1386	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1387	+ shadowCB.setToolTipText("When live compute shadows");
	1388	+ shadowCB.addItemListener(this);
	1389	+
	1390	+ panel.Return();
	1391	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1392	+ toggleTextureCB.setToolTipText("Load textures");
	1393	+ toggleTextureCB.addItemListener(this);
	1394	+
	1395	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1396	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1397	+ toggleSwitchCB.addItemListener(this);
	1398	+
	1399	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1400	+ autokeepCB.setToolTipText("On structure change");
	1401	+ autokeepCB.addItemListener(this);
	1402	+
	1403	+ panel.Return();
	1404	+ if (Globals.ADVANCED)
	1405	+ {
702	1406	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
703	1407	lookAtCB.setToolTipText("Look-at target");
704	1408	lookAtCB.addItemListener(this);
	1409	+ }
705	1410
706	1411	}
707	1412
708	1413	cGridBag fill = new cGridBag();
709		-
710	1414	fill.preferredHeight = 200;
	1415	+ cGridBag fill2 = new cGridBag();
	1416	+ fill2.preferredHeight = 200;
	1417	+ cGridBag fill3 = new cGridBag();
	1418	+ fill3.preferredHeight = 200;
711	1419
712	1420	panel.add(fill);
	1421	+ panel.add(fill2);
	1422	+ panel.add(fill3);
713	1423
714	1424	}
715	1425
716	1426	void EditObject(Object3D obj)
717	1427	{
718	1428	cRadio radioButton = new cRadio(obj.name);
	1429	+
	1430	+ // June 2019. Patch to avoid bug with transparency.
	1431	+ radioButton.hadMaterial = obj.material != null;
	1432	+ if (!radioButton.hadMaterial)
	1433	+ {
	1434	+ obj.material = new cMaterial();
	1435	+ }
	1436	+
719	1437	radioButton.SetObject(obj);
720		- radioButton.layout = sevenButton;
	1438	+ radioButton.layout = threeButton; // sixButton;
721	1439	radioButton.SetCamera(cameraView.renderCamera, false);
722	1440	radioButton.addActionListener(this);
723	1441	radioPanel.add(radioButton);
724	1442	buttonGroup.add(radioButton);
725	1443	radioButton.doClick();
726	1444	}
	1445	+
727	1446	void SetupViews(ObjEditor oe)
728	1447	{
	1448	+ theFrame = this;
	1449	+
729	1450	oe.SetupViews();
730	1451
731	1452	System.out.println("SetupViews");
..	..	@@ -734,23 +1455,30 @@
734	1455	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
735	1456	}
736	1457
737		- JCheckBox liveCB;
738		- JCheckBox supportCB;
739		- JCheckBox localCB;
740		- JCheckBox crowdCB;
741		- JCheckBox smoothCB;
742		- JCheckBox fastCB;
743		- JCheckBox slowCB;
744		- JCheckBox boxCB;
745		- JCheckBox zoomBoxCB;
746		- JCheckBox trackCB;
747		- JCheckBox smoothfocusCB;
	1458	+ cToggleButton liveCB;
	1459	+ cCheckBox supportCB;
	1460	+ cCheckBox localCB;
	1461	+ cCheckBox crowdCB;
	1462	+ cCheckBox smoothCB;
	1463	+ cCheckBox minshaderCB;
	1464	+
	1465	+ cToggleButton fastCB;
	1466	+ cCheckBox slowCB;
	1467	+ cCheckBox boxCB;
	1468	+ cCheckBox zoomBoxCB;
	1469	+ cCheckBox freezeCB;
	1470	+ //cToggleButton trackCB;
	1471	+ cCheckBox trackCB;
	1472	+ cCheckBox smoothfocusCB;
748	1473	// JCheckBox speakerMocapCB;
749		- JCheckBox speakerCameraCB;
750		- JCheckBox speakerFocusCB;
751		- JCheckBox debugCB;
752		- JCheckBox oeilCB;
753		- JCheckBox lookAtCB;
	1474	+ cCheckBox speakerCameraCB;
	1475	+ cCheckBox speakerFocusCB;
	1476	+ cCheckBox debugCB;
	1477	+
	1478	+ cCheckBox oeilCB;
	1479	+ cCheckBox shadowCB;
	1480	+ cCheckBox autokeepCB;
	1481	+ cCheckBox lookAtCB;
754	1482
755	1483	// static int COLOR = 1;
756	1484	// static int MATERIAL = 2;
..	..	@@ -758,9 +1486,9 @@
758	1486
759	1487	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
760	1488
761		- JCheckBox colorCB;
762		- JCheckBox materialCB;
763		- JCheckBox textureCB;
	1489	+ cCheckBox colorCB;
	1490	+ cCheckBox materialCB;
	1491	+ cCheckBox textureCB;
764	1492
765	1493	public void itemStateChanged(ItemEvent e)
766	1494	{
..	..	@@ -788,6 +1516,7 @@
788	1516	} else if(e.getSource() == liveCB)
789	1517	{
790	1518	cameraView.ToggleLive();
	1519	+ refreshContents(false);
791	1520	}
792	1521	else if(e.getSource() == supportCB)
793	1522	{
..	..	@@ -803,6 +1532,12 @@
803	1532	{
804	1533	cameraView.ToggleInertia();
805	1534	cameraView.repaint();
	1535	+ }
	1536	+ else if(e.getSource() == minshaderCB)
	1537	+ {
	1538	+ Globals.MINSHADER ^= true;
	1539	+ cameraView.programInitialized = false;
	1540	+ cameraView.repaint();
806	1541	}
807	1542	else if(e.getSource() == localCB)
808	1543	{
..	..	@@ -852,6 +1587,18 @@
852	1587	{
853	1588	cameraView.ToggleOeil();
854	1589	}
	1590	+ else if(e.getSource() == shadowCB)
	1591	+ {
	1592	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1593	+ }
	1594	+ else if(e.getSource() == freezeCB)
	1595	+ {
	1596	+ Globals.FREEZEONMOVE ^= true;
	1597	+ }
	1598	+ else if(e.getSource() == autokeepCB)
	1599	+ {
	1600	+ Globals.REPLACEONMAKE ^= true;
	1601	+ }
855	1602	else if(e.getSource() == lookAtCB)
856	1603	{
857	1604	cameraView.ToggleLookAt();
..	..	@@ -868,7 +1615,8 @@
868	1615
869	1616	/**/
870	1617	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
871		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1618	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1619	+ TreePath path = objEditor.jTree.getSelectionPath();
872	1620	if ((path == null) \|\| (path.getPathCount() <= 1)) {
873	1621	// We can't move the root node or an empty selection
874	1622	return;
..	..	@@ -931,8 +1679,6 @@
931	1679	}
932	1680	}
933	1681
934		- String string = (String) object;
935		-
936	1682	System.out.println("Transfer = " + object + "; drop : " + target);
937	1683	// if( object instanceof java.io.File[])
938	1684	// {
..	..	@@ -940,7 +1686,11 @@
940	1686	// objEditor.DropFile((java.io.File[]) object, true);
941	1687	// return;
942	1688	// }
943		- if (string.charAt(0) == '/')
	1689	+
	1690	+ String string = object.toString();
	1691	+
	1692	+ // File path for Mac and Windows
	1693	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
944	1694	{
945	1695	// file(s)
946	1696	String[] names = string.split("\n");
..	..	@@ -967,7 +1717,7 @@
967	1717
968	1718	flashIt = false;
969	1719	CameraPane pane = (CameraPane) target;
970		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1720	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
971	1721	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
972	1722
973	1723	if (group.selection.size() == 1)
..	..	@@ -983,23 +1733,33 @@
983	1733
984	1734	assert target == objEditor.jTree;
985	1735	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1736	+ Object3D destinationLeaf;
986	1737	try {
987		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1738	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
988	1739	} catch (Exception e) {
989	1740	System.out.println("destinationPath : " + destinationPath);
990	1741	return;
991	1742	}
992	1743
993		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1744	+ for (int i=group.selection.size(); --i>=0;)
994	1745	{
	1746	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1747	+
	1748	+ // Cannot move into itself
	1749	+ if (child == destinationLeaf)
	1750	+ return;
	1751	+ }
	1752	+
	1753	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1754	+// {
995	1755	loadClipboard(true);
996	1756	objEditor.jTree.setSelectionPath(destinationPath);
997	1757	pasteInto(false, false);
998		- } else {
999		- loadClipboard(false);
1000		- objEditor.jTree.setSelectionPath(destinationPath);
1001		- pasteInto(false, false); // true); // ???
1002		- }
	1758	+// } else {
	1759	+// loadClipboard(false);
	1760	+// objEditor.jTree.setSelectionPath(destinationPath);
	1761	+// pasteInto(false, false); // true); // ???
	1762	+// }
1003	1763	}
1004	1764	public void dropActionChanged(DropTargetDragEvent dtde)
1005	1765	// Called if the user has modified the current drop gesture
..	..	@@ -1104,22 +1864,30 @@
1104	1864	{
1105	1865	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1106	1866	//heightFieldItem.addActionListener(this);
1107		- gridItem = menu.add(new MenuItem("Grid"));
1108		- gridItem.addActionListener(this);
1109		- rectoidItem = menu.add(new MenuItem("Box"));
1110		- rectoidItem.addActionListener(this);
1111		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1112		- ellipsoidItem.addActionListener(this);
1113		- coneItem = menu.add(new MenuItem("Cone"));
1114		- coneItem.addActionListener(this);
1115		- torusItem = menu.add(new MenuItem("Torus"));
1116		- torusItem.addActionListener(this);
1117		- superItem = menu.add(new MenuItem("Superellipsoid"));
1118		- superItem.addActionListener(this);
	1867	+// gridItem = menu.add(new MenuItem("Grid"));
	1868	+// gridItem.addActionListener(this);
	1869	+// rectoidItem = menu.add(new MenuItem("Box"));
	1870	+// rectoidItem.addActionListener(this);
	1871	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1872	+// ellipsoidItem.addActionListener(this);
	1873	+// coneItem = menu.add(new MenuItem("Cone"));
	1874	+// coneItem.addActionListener(this);
	1875	+// torusItem = menu.add(new MenuItem("Torus"));
	1876	+// torusItem.addActionListener(this);
	1877	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1878	+// superItem.addActionListener(this);
	1879	+
	1880	+ cameraItem = menu.add(new MenuItem("Camera"));
	1881	+ cameraItem.addActionListener(this);
	1882	+
	1883	+ if (!Globals.ADVANCED)
	1884	+ {
1119	1885	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1120	1886	kleinItem.addActionListener(this);
1121		- particleItem = menu.add(new MenuItem("Particle system"));
1122		- particleItem.addActionListener(this);
	1887	+ }
	1888	+
	1889	+// particleItem = menu.add(new MenuItem("Particle system"));
	1890	+// particleItem.addActionListener(this);
1123	1891	if (Globals.ADVANCED)
1124	1892	{
1125	1893	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1145,15 +1913,15 @@
1145	1913	}
1146	1914	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1147	1915	bezierItem.addActionListener(this);
1148		- overlayItem = menu.add(new MenuItem("Overlay"));
1149		- overlayItem.addActionListener(this);
1150		- lightItem = menu.add(new MenuItem("Light"));
1151		- lightItem.addActionListener(this);
	1916	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1917	+// overlayItem.addActionListener(this);
	1918	+// lightItem = menu.add(new MenuItem("Light"));
	1919	+// lightItem.addActionListener(this);
1152	1920	menu.add("-");
1153	1921	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1154	1922	//superLoopItem.addActionListener(this);
1155		- loopItem = menu.add(new MenuItem("Loop"));
1156		- loopItem.addActionListener(this);
	1923	+// loopItem = menu.add(new MenuItem("Loop"));
	1924	+// loopItem.addActionListener(this);
1157	1925	doubleItem = menu.add(new MenuItem("Fork"));
1158	1926	doubleItem.addActionListener(this);
1159	1927	if (Globals.ADVANCED)
..	..	@@ -1169,6 +1937,9 @@
1169	1937	animationItem.addItemListener(this);
1170	1938	animationItem.setState(Globals.ANIMATION);
1171	1939
	1940	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1941	+ archiveItem.addActionListener(this);
	1942	+
1172	1943	menu.add("-");
1173	1944	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1174	1945	parseverticesItem.addActionListener(this);
..	..	@@ -1181,6 +1952,8 @@
1181	1952	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1182	1953	reduce34MorphItem.addActionListener(this);
1183	1954	menu.add("-");
	1955	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1956	+ memoryItem.addActionListener(this);
1184	1957	menu.add(computeAOItem = new MenuItem("Compute AO"));
1185	1958	computeAOItem.addActionListener(this);
1186	1959
..	..	@@ -1189,11 +1962,9 @@
1189	1962	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1190	1963	mirrorItem.addActionListener(this);
1191	1964	menu.add("-");
1192		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1193		- memoryItem.addActionListener(this);
1194	1965	menu.add(analyzeItem = new MenuItem("Analyze"));
1195	1966	analyzeItem.addActionListener(this);
1196		- menu.add(dumpItem = new MenuItem("Dump"));
	1967	+ menu.add(dumpItem = new MenuItem("Print"));
1197	1968	dumpItem.addActionListener(this);
1198	1969	// menu.add(pathItem = new MenuItem("From-to path"));
1199	1970	// pathItem.addActionListener(this);
..	..	@@ -1334,9 +2105,34 @@
1334	2105	shadow.material = new cMaterial(obj.material);
1335	2106	shadow.material.diffuse = 0.0001f;
1336	2107	shadow.material.specular = 0.0001f;
	2108	+ //shadow.projectedVertices[1].x = 300;
1337	2109
1338	2110	makeSomething(shadow);
1339	2111	}
	2112	+
	2113	+ private void ClearUnpinned()
	2114	+ {
	2115	+ //for (Object3D obj : listUI)
	2116	+ for (int i=listUI.size(); --i>=0;)
	2117	+ {
	2118	+ Object3D obj = listUI.elementAt(i);
	2119	+ if (!obj.pinned)
	2120	+ {
	2121	+ obj.CloseUI();
	2122	+ listUI.remove(i);
	2123	+ }
	2124	+ }
	2125	+ }
	2126	+
	2127	+ private void EditElement(Object3D elem, boolean newWindow)
	2128	+ {
	2129	+ // if (!(elem instanceof Composite))
	2130	+ // newWindow = false;
	2131	+ listUI.add(elem);
	2132	+ elem.openEditWindow(this, newWindow); //, false);
	2133	+ System.out.println("edit : " + elem);
	2134	+ elem.editWindow.refreshContents(true); // ? new
	2135	+ }
1340	2136
1341	2137	/**
1342	2138	* applyExample
..	..	@@ -1540,9 +2336,9 @@
1540	2336
1541	2337	void Overwrite(int mask)
1542	2338	{
1543		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2339	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1544	2340	{
1545		- Object3D content = GrafreeD.clipboard.get(0);
	2341	+ Object3D content = Grafreed.clipboard.get(0);
1546	2342
1547	2343	if (content instanceof cGroup && ((cGroup)content).transientlink )
1548	2344	content = ((cGroup)content).get(0);
..	..	@@ -1581,7 +2377,7 @@
1581	2377	{
1582	2378	ScreenFit();
1583	2379	} else
1584		- if (source == switchItem)
	2380	+ if (source == switchViewItem)
1585	2381	{
1586	2382	cVector v1 = new cVector();
1587	2383	cVector v2 = new cVector();
..	..	@@ -1590,11 +2386,11 @@
1590	2386	objEditor.cameraView.renderCamera.setAim(v2, v1);
1591	2387	objEditor.cameraView.repaint();
1592	2388	} else
1593		- if (source == rectoidItem)
	2389	+ if (source == rectoidItem \|\| source == boxButton)
1594	2390	{
1595	2391	makeSomething(new Box());
1596	2392	} else
1597		- if (source == particleItem)
	2393	+ if (source == particleItem \|\| source == particlesButton)
1598	2394	{
1599	2395	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1600	2396	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1673,27 +2469,27 @@
1673	2469
1674	2470	makeSomething(obj);
1675	2471	} else
1676		- if (source == gridItem)
	2472	+ if (source == gridItem \|\| source == gridButton)
1677	2473	{
1678	2474	makeSomething(new Grid());
1679	2475	} else
1680		- if (source == ellipsoidItem)
	2476	+ if (source == ellipsoidItem \|\| source == sphereButton)
1681	2477	{
1682	2478	makeSomething(new Sphere());
1683	2479	} else
1684		- if (source == coneItem)
	2480	+ if (source == coneItem \|\| source == coneButton)
1685	2481	{
1686	2482	makeSomething(new Cone());
1687	2483	} else
1688		- if (source == torusItem)
	2484	+ if (source == torusItem \|\| source == torusButton)
1689	2485	{
1690	2486	makeSomething(new Torus());
1691	2487	} else
1692		- if (source == superItem)
	2488	+ if (source == superItem \|\| source == superButton)
1693	2489	{
1694	2490	makeSomething(new Superellipsoid());
1695	2491	} else
1696		- if (source == kleinItem)
	2492	+ if (source == kleinItem \|\| source == kleinButton)
1697	2493	{
1698	2494	makeSomething(new Klein());
1699	2495	} else
..	..	@@ -1713,7 +2509,7 @@
1713	2509	{
1714	2510	makeSomething(new BezierSurface());
1715	2511	} else
1716		- if (source == overlayItem)
	2512	+ if (source == overlayItem \|\| source == overlayButton)
1717	2513	{
1718	2514	/*
1719	2515	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1761,10 +2557,27 @@
1761	2557	s.setup();
1762	2558	makeSomething(s);
1763	2559	} else
1764		- if (source == lightItem)
	2560	+ if (source == lightItem \|\| source == lightButton)
1765	2561	{
1766	2562	makeSomething(new Light());
1767	2563	} else
	2564	+// if (source == skybox1Button \|\|
	2565	+// source == skybox2Button \|\|
	2566	+// source == skybox3Button \|\|
	2567	+// source == skybox4Button \|\|
	2568	+// source == skybox5Button \|\|
	2569	+// source == skybox6Button \|\|
	2570	+// source == skybox7Button \|\|
	2571	+// source == skybox11Button \|\|
	2572	+// source == skybox12Button \|\|
	2573	+// source == skybox13Button \|\|
	2574	+// source == skybox14Button \|\|
	2575	+// source == skybox15Button \|\|
	2576	+// source == skybox16Button \|\|
	2577	+// source == skybox17Button)
	2578	+// {
	2579	+// ChangeSkybox(source);
	2580	+// } else
1768	2581	if (source == csgItem)
1769	2582	{
1770	2583	group(new CSG());
..	..	@@ -1811,30 +2624,30 @@
1811	2624
1812	2625	group(g);
1813	2626	} else
1814		- if (source == loopItem)
	2627	+ if (source == loopItem \|\| source == loopButton)
1815	2628	{
1816	2629	Composite csg = new GroupLeaf();
1817	2630	csg.count = 5;
1818	2631	group(csg);
1819		- Composite child = new cGroup();
	2632	+ Composite child = new cGroup("Branch");
1820	2633	csg.addChild(child);
1821	2634	child.addChild(csg);
1822	2635	} else
1823	2636	if (source == doubleItem)
1824	2637	{
1825		- Composite csg = new GroupLeaf();
	2638	+ Composite csg = new GroupLeaf("Fork");
1826	2639	csg.count = 5;
1827	2640	group(csg);
1828		- Composite child = new cGroup();
	2641	+ Composite child = new cGroup("Branch A");
1829	2642	csg.addChild(child);
1830	2643	child.addChild(csg);
1831		- child = new cGroup();
	2644	+ child = new cGroup("Branch B");
1832	2645	csg.addChild(child);
1833	2646	child.addChild(csg);
1834	2647	} else
1835	2648	if (source == tripleItem)
1836	2649	{
1837		- Composite csg = new GroupLeaf();
	2650	+ Composite csg = new GroupLeaf("Trident");
1838	2651	csg.count = 4;
1839	2652	group(csg);
1840	2653	Composite child = new cGroup();
..	..	@@ -1847,35 +2660,10 @@
1847	2660	csg.addChild(child);
1848	2661	child.addChild(csg);
1849	2662	} else
1850		-
1851		- if (source == importGFDItem)
1852		- {
1853		- ImportGFD();
1854		- } else
1855		- if (source == importVRMLX3DItem)
1856		- {
1857		- ImportVRMLX3D();
1858		- } else
1859		- if (source == import3DSItem)
1860		- {
1861		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1862		- } else
1863		- if (source == importOBJItem)
1864		- {
1865		- //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1866		- FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
1867		- browser.setVisible(true);
1868		- String filename = browser.getFile();
1869		- if (filename != null && filename.length() > 0)
1870		- {
1871		- String fullname = browser.getDirectory() + filename;
1872		- makeSomething(ReadOBJ(fullname), true);
1873		- }
1874		- } else
1875	2663	if (source == computeAOItem)
1876	2664	{
1877	2665	Globals.drawMode = CameraPane.OCCLUSION;
1878		- Globals.theRenderer.repaint();
	2666	+ cameraView.repaint();
1879	2667	} else
1880	2668	if (source == recompileItem)
1881	2669	{
..	..	@@ -1890,7 +2678,7 @@
1890	2678	if (source == invariantsItem)
1891	2679	{
1892	2680	System.out.println("Invariants:");
1893		- GrafreeD.grafreeD.universe.invariants();
	2681	+ Grafreed.grafreed.universe.invariants();
1894	2682	} else
1895	2683	if (source == memoryItem)
1896	2684	{
..	..	@@ -1909,6 +2697,53 @@
1909	2697	{
1910	2698	DumpObject();
1911	2699	} else
	2700	+ if (source == minButton)
	2701	+ {
	2702	+ Minimize();
	2703	+ } else
	2704	+ if (source == maxButton)
	2705	+ {
	2706	+ Maximize();
	2707	+ } else
	2708	+ if (source == fullButton)
	2709	+ {
	2710	+ ToggleFullScreen();
	2711	+ } else
	2712	+ if (source == previousVersionButton)
	2713	+ {
	2714	+ // Go to previous version
	2715	+ //if (!Undo())
	2716	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2717	+ PreviousVersion();
	2718	+ } else
	2719	+ if (source == restoreButton)
	2720	+ {
	2721	+ // Restore current version
	2722	+ Restore();
	2723	+ //restoreButton.setEnabled(false);
	2724	+ } else
	2725	+ if (source == replaceButton)
	2726	+ {
	2727	+ // Overwrite current version
	2728	+ Replace();
	2729	+ //replaceButton.setEnabled(false);
	2730	+ } else
	2731	+ if (source == nextVersionButton)
	2732	+ {
	2733	+ // Go to next version
	2734	+ NextVersion();
	2735	+ } else
	2736	+ if (source == saveVersionButton)
	2737	+ {
	2738	+ // Save a new version
	2739	+ if (!Save(true))
	2740	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2741	+ } else
	2742	+ if (source == deleteVersionButton)
	2743	+ {
	2744	+ // Delete a new version
	2745	+ DeleteVersion();
	2746	+ } else
1912	2747	if (source == oneStepButton)
1913	2748	{
1914	2749	Globals.ONESTEP = true;
..	..	@@ -1916,17 +2751,14 @@
1916	2751	} else
1917	2752	if (source == screenfitButton)
1918	2753	{
1919		- //Reload(lastConverter, lastFilename, true);
1920	2754	ScreenFit();
1921	2755	} else
1922	2756	if (source == screenfitpointButton)
1923	2757	{
1924		- //Reload(lastConverter, lastFilename, true);
1925	2758	ScreenFitPoint();
1926	2759	} else
1927	2760	if (source == snapobjectButton)
1928	2761	{
1929		- //Reload(lastConverter, lastFilename, true);
1930	2762	SnapObject();
1931	2763	} else
1932	2764	// if (event.getSource() == recompileButton)
..	..	@@ -1963,12 +2795,20 @@
1963	2795	{
1964	2796	loadClipboard(true);
1965	2797	} else
	2798	+ if (source == undoItem)
	2799	+ {
	2800	+ PreviousVersion();
	2801	+ } else
	2802	+ if (source == redoItem)
	2803	+ {
	2804	+ NextVersion();
	2805	+ } else
1966	2806	if (source == duplicateItem)
1967	2807	{
1968		- Object3D keep = GrafreeD.clipboard;
	2808	+ Object3D keep = Grafreed.clipboard;
1969	2809	loadClipboard(false);
1970	2810	paste(false);
1971		- GrafreeD.clipboard = keep;
	2811	+ Grafreed.clipboard = keep;
1972	2812	} else
1973	2813	if (source == cloneItem)
1974	2814	{
..	..	@@ -2188,9 +3028,9 @@
2188	3028	// group.selection.get(0).setMasterThis(content); // should be identity
2189	3029	// refreshContents();
2190	3030	// }
2191		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	3031	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2192	3032	{
2193		- Object3D content = GrafreeD.clipboard.get(0);
	3033	+ Object3D content = Grafreed.clipboard.get(0);
2194	3034
2195	3035	if (content instanceof cGroup && ((cGroup)content).transientlink )
2196	3036	content = ((cGroup)content).get(0);
..	..	@@ -2240,9 +3080,9 @@
2240	3080	} else
2241	3081	if (source == setMasterItem)
2242	3082	{
2243		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	3083	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2244	3084	{
2245		- Object3D content = GrafreeD.clipboard.get(0);
	3085	+ Object3D content = Grafreed.clipboard.get(0);
2246	3086
2247	3087	if (content instanceof cGroup && ((cGroup)content).transientlink )
2248	3088	content = ((cGroup)content).get(0);
..	..	@@ -2255,9 +3095,9 @@
2255	3095	{
2256	3096	if (group.selection.size() == 1)
2257	3097	{
2258		- if (GrafreeD.clipboard.size() == 1)
	3098	+ if (Grafreed.clipboard.size() == 1)
2259	3099	{
2260		- Object3D content = GrafreeD.clipboard.get(0);
	3100	+ Object3D content = Grafreed.clipboard.get(0);
2261	3101
2262	3102	if (content instanceof cGroup && ((cGroup)content).transientlink )
2263	3103	content = ((cGroup)content).get(0);
..	..	@@ -2274,7 +3114,7 @@
2274	3114	{
2275	3115	RevertMeshes();
2276	3116	} else
2277		- if (source == resetMeshItem)
	3117	+ if (source == resetAllItem)
2278	3118	{
2279	3119	ResetAll();
2280	3120	} else
..	..	@@ -2282,7 +3122,7 @@
2282	3122	{
2283	3123	StepAll();
2284	3124	} else
2285		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3125	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2286	3126	{
2287	3127	//int indices[] = jList.getSelectedIndices();
2288	3128	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2294,9 +3134,9 @@
2294	3134	{
2295	3135	ClearSelection(true);
2296	3136	} else
2297		- if (source == grabItem)
	3137	+ if (source == grabItem \|\| source == groupButton)
2298	3138	{
2299		- group(new cGroup(), true);
	3139	+ group(new cGroup(), false); // true);
2300	3140	} else
2301	3141	if (source == hideItem)
2302	3142	{
..	..	@@ -2314,11 +3154,11 @@
2314	3154	{
2315	3155	makeSomething(new Camera());
2316	3156	} else
2317		- if (source == compositeItem)
	3157	+ if (source == compositeItem \|\| source == compositeButton)
2318	3158	{
2319	3159	group(new Composite());
2320	3160	} else
2321		- if (source == randomItem)
	3161	+ if (source == switchItem \|\| source == switchButton)
2322	3162	{
2323	3163	RandomNode random = new RandomNode();
2324	3164	group(random);
..	..	@@ -2420,7 +3260,7 @@
2420	3260	{
2421	3261	group(new cLinker());
2422	3262	} else
2423		- if (source == textureItem)
	3263	+ if (source == textureItem \|\| source == textureButton)
2424	3264	{
2425	3265	group(new TextureNode());
2426	3266	} else
..	..	@@ -2440,17 +3280,30 @@
2440	3280	{
2441	3281	CastShadow(2);
2442	3282	} else
2443		- if (source == ungroupItem)
	3283	+ if (source == ungroupItem \|\| source == ungroupButton)
2444	3284	{
2445		- //ungroup();
	3285	+ boolean hasRoot = false;
	3286	+
2446	3287	for (int i=0; i<group.selection.size(); i++)
2447	3288	{
2448		- Ungroup(group.selection.get(i));
	3289	+ if (group.selection.get(i) == group)
	3290	+ {
	3291	+ hasRoot = true;
	3292	+ break;
	3293	+ }
2449	3294	}
2450	3295
2451		- ClearSelection(false);
2452		-
2453		- refreshContents();
	3296	+ if (!hasRoot)
	3297	+ {
	3298	+ for (int i=0; i<group.selection.size(); i++)
	3299	+ {
	3300	+ Ungroup(group.selection.get(i));
	3301	+ }
	3302	+
	3303	+ ClearSelection(false);
	3304	+
	3305	+ refreshContents();
	3306	+ }
2454	3307	} else
2455	3308	if (source == genUVItem)
2456	3309	{
..	..	@@ -2462,7 +3315,7 @@
2462	3315	} else
2463	3316	if (source == genNormalsMESHItem)
2464	3317	{
2465		- GenNormals(true); // TODO
	3318	+ GenNormalsMESH();
2466	3319	} else
2467	3320	if (source == genNormalsORGANItem)
2468	3321	{
..	..	@@ -2527,6 +3380,22 @@
2527	3380	if (source == unmarkleavesItem)
2528	3381	{
2529	3382	MarkLeaves(false);
	3383	+ } else
	3384	+ if (source == rewindleavesItem)
	3385	+ {
	3386	+ RewindLeaves(true);
	3387	+ } else
	3388	+ if (source == unrewindleavesItem)
	3389	+ {
	3390	+ RewindLeaves(false);
	3391	+ } else
	3392	+ if (source == randomleavesItem)
	3393	+ {
	3394	+ RandomLeaves(true);
	3395	+ } else
	3396	+ if (source == unrandomleavesItem)
	3397	+ {
	3398	+ RandomLeaves(false);
2530	3399	} else
2531	3400	if (source == flipVItem)
2532	3401	{
..	..	@@ -2612,9 +3481,13 @@
2612	3481	{
2613	3482	SmoothMesh();
2614	3483	} else
2615		- if (source == transformgeometryItem)
	3484	+ if (source == transformGeometryItem)
2616	3485	{
2617	3486	TransformGeometry();
	3487	+ } else
	3488	+ if (source == transformChildrenItem)
	3489	+ {
	3490	+ TransformChildren();
2618	3491	} else
2619	3492	if (source == resetTransformItem)
2620	3493	{
..	..	@@ -2622,7 +3495,11 @@
2622	3495	} else
2623	3496	if (source == resetCentroidItem)
2624	3497	{
2625		- ResetCentroid();
	3498	+ ResetCentroid(true);
	3499	+ } else
	3500	+ if (source == resetCentroidXZItem)
	3501	+ {
	3502	+ ResetCentroid(false);
2626	3503	} else
2627	3504	if (source == resetParentItem)
2628	3505	{
..	..	@@ -2727,7 +3604,7 @@
2727	3604	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2728	3605	{
2729	3606	obj = (Object3D)e.nextElement();
2730		- obj.SetBumpTexture(null);
	3607	+ obj.ResetBumpTexture();
2731	3608	}
2732	3609
2733	3610	refreshContents();
..	..	@@ -2743,6 +3620,31 @@
2743	3620
2744	3621	refreshContents();
2745	3622	} else
	3623	+ if (source == embedTexturesItem)
	3624	+ {
	3625	+ Object3D obj;
	3626	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3627	+ {
	3628	+ obj = (Object3D)e.nextElement();
	3629	+ obj.EmbedTextures(true);
	3630	+ }
	3631	+
	3632	+ refreshContents();
	3633	+ } else
	3634	+ if (source == deEmbedTexturesItem)
	3635	+ {
	3636	+ Object3D obj;
	3637	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3638	+ {
	3639	+ obj = (Object3D)e.nextElement();
	3640	+ obj.EmbedTextures(false);
	3641	+ }
	3642	+
	3643	+ CameraPane.texturepigment.clear();
	3644	+ CameraPane.texturebump.clear();
	3645	+
	3646	+ refreshContents();
	3647	+ } else
2746	3648	if (source == flashSelectionButton)
2747	3649	{
2748	3650	CameraPane.flash = true;
..	..	@@ -2754,6 +3656,10 @@
2754	3656	if (source == twoButton)
2755	3657	{
2756	3658	radio.layout = twoButton;
	3659	+
	3660	+ if (CameraPane.FULLSCREEN)
	3661	+ fullscreenLayout = radio.layout;
	3662	+
2757	3663	// bug
2758	3664	//gridPanel.setDividerLocation(1.0);
2759	3665	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2786,10 +3692,31 @@
2786	3692	bigThree.ClearUI();
2787	3693	bigThree.add(centralPanel);
2788	3694	bigThree.FlushUI();
	3695	+
	3696	+ cameraView.requestFocusInWindow();
	3697	+
	3698	+// refreshContents(true);
	3699	+//
	3700	+// try
	3701	+// {
	3702	+// java.awt.Robot bot = new java.awt.Robot();
	3703	+// int mask = InputEvent.BUTTON1_MASK;
	3704	+// bot.mouseMove(100, 100);
	3705	+// bot.mousePress(mask);
	3706	+// bot.mouseRelease(mask);
	3707	+// }
	3708	+// catch (Exception e)
	3709	+// {
	3710	+//
	3711	+// }
	3712	+
2789	3713	} else
2790	3714	if (source == threeButton)
2791	3715	{
2792	3716	radio.layout = threeButton;
	3717	+
	3718	+ if (CameraPane.FULLSCREEN)
	3719	+ fullscreenLayout = radio.layout;
2793	3720
2794	3721	// bigThree.remove(scenePanel);
2795	3722	// bigThree.remove(centralPanel);
..	..	@@ -2819,13 +3746,18 @@
2819	3746	// centralPanel.setVisible(true);
2820	3747	// XYZPanel.setVisible(true);
2821	3748	bigThree.ClearUI();
	3749	+ bigThree.add(scenePanel);
2822	3750	bigThree.add(centralPanel);
2823		- bigThree.add(XYZPanel);
2824	3751	bigThree.FlushUI();
	3752	+
	3753	+ cameraView.requestFocusInWindow();
2825	3754	} else
2826	3755	if (source == fourButton)
2827	3756	{
2828	3757	radio.layout = fourButton;
	3758	+
	3759	+ if (CameraPane.FULLSCREEN)
	3760	+ fullscreenLayout = radio.layout;
2829	3761
2830	3762	// bigThree.remove(scenePanel);
2831	3763	// bigThree.remove(centralPanel);
..	..	@@ -2857,10 +3789,15 @@
2857	3789	bigThree.ClearUI();
2858	3790	bigThree.add(scenePanel);
2859	3791	bigThree.FlushUI();
	3792	+
	3793	+ cameraView.requestFocusInWindow();
2860	3794	} else
2861	3795	if (source == sixButton)
2862	3796	{
2863	3797	radio.layout = sixButton;
	3798	+
	3799	+ if (CameraPane.FULLSCREEN)
	3800	+ fullscreenLayout = radio.layout;
2864	3801
2865	3802	// bigThree.remove(scenePanel);
2866	3803	// bigThree.remove(centralPanel);
..	..	@@ -2890,13 +3827,18 @@
2890	3827	// centralPanel.setVisible(true);
2891	3828	// XYZPanel.setVisible(false);
2892	3829	bigThree.ClearUI();
2893		- bigThree.add(scenePanel);
2894	3830	bigThree.add(centralPanel);
	3831	+ bigThree.add(scenePanel);
2895	3832	bigThree.FlushUI();
	3833	+
	3834	+ cameraView.requestFocusInWindow();
2896	3835	} else
2897	3836	if (source == sevenButton)
2898	3837	{
2899	3838	radio.layout = sevenButton;
	3839	+
	3840	+ if (CameraPane.FULLSCREEN)
	3841	+ fullscreenLayout = radio.layout;
2900	3842
2901	3843	// bigThree.remove(scenePanel);
2902	3844	// bigThree.remove(centralPanel);
..	..	@@ -2930,6 +3872,8 @@
2930	3872	bigThree.add(centralPanel);
2931	3873	bigThree.add(XYZPanel);
2932	3874	bigThree.FlushUI();
	3875	+
	3876	+ cameraView.requestFocusInWindow();
2933	3877	} else
2934	3878	if (source == rootButton)
2935	3879	{
..	..	@@ -2941,6 +3885,7 @@
2941	3885	EditObject(obj);
2942	3886	}
2943	3887
	3888	+ cameraView.requestFocusInWindow();
2944	3889	refreshContents(true);
2945	3890	} else
2946	3891	if (source == closeButton)
..	..	@@ -2950,22 +3895,37 @@
2950	3895	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2951	3896	{
2952	3897	ab = (cRadio)e.nextElement();
2953		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3898	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2954	3899	{
	3900	+ // Patch to avoid bug with transparency.
	3901	+ if (!ab.hadMaterial)
	3902	+ {
	3903	+ ab.object.material = null;
	3904	+ }
	3905	+
2955	3906	buttonGroup.remove(ab);
2956	3907	radioPanel.remove(ab);
2957	3908
2958		- ab.GetObject().editWindow = null;
	3909	+ //ab.GetObject().editWindow = null;
	3910	+ ab.GetObject().manipWindow = null;
2959	3911	// ab.GetObject().objectUI = null; // ?????????
2960	3912
2961	3913	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2962	3914	break;
2963	3915	}
2964	3916	}
	3917	+
	3918	+ cameraView.requestFocusInWindow();
2965	3919	refreshContents(true);
2966	3920	} else
2967	3921	if (source == editItem \|\| source == editButton)
2968	3922	{
	3923	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3924	+ {
	3925	+ Object3D child = (Object3D)e.nextElement();
	3926	+ child.pinned = true;
	3927	+ }
	3928	+
2969	3929	EditSelection(false);
2970	3930	} else
2971	3931	if (source == uneditButton)
..	..	@@ -2974,11 +3934,12 @@
2974	3934	{
2975	3935	Object3D child = (Object3D)e.nextElement();
2976	3936	if(child.editWindow != null)
2977		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3937	+ child.pinned = false;
2978	3938	child.CloseUI();
2979	3939	listUI.remove(child);
	3940	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2980	3941
2981		- child.editWindow = null; // ???????????
	3942	+ //child.editWindow = null; // ???????????
2982	3943	}
2983	3944	objEditor.ctrlPanel.FlushUI();
2984	3945	//objEditor.jTree.clearSelection();
..	..	@@ -2991,16 +3952,18 @@
2991	3952	//copy.ClearUI();
2992	3953	for (Object3D obj : listUI)
2993	3954	{
	3955	+ obj.pinned = false;
2994	3956	obj.CloseUI();
2995	3957	}
2996	3958	listUI.clear();
	3959	+ SetPinStates(group.selection.size() > 0);
2997	3960	refreshContents(true);
2998	3961	} else
2999	3962	if (source == allParamsButton)
3000	3963	{
3001	3964	assert(copy == group);
3002	3965
3003		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3966	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3004	3967
3005	3968	for (Object3D obj : listUI)
3006	3969	{
..	..	@@ -3049,6 +4012,9 @@
3049	4012	}
3050	4013
3051	4014	copy = group;
	4015	+
	4016	+ SetUndoStates();
	4017	+
3052	4018	//Globals.theRenderer.object = group;
3053	4019	if(!useclient)
3054	4020	{
..	..	@@ -3064,20 +4030,49 @@
3064	4030	frontView.object = group;
3065	4031	sideView.object = group;
3066	4032	}
3067		- group.editWindow = this;
	4033	+
	4034	+// fix "+" issue
	4035	+ //group.editWindow = this;
	4036	+ group.manipWindow = this;
	4037	+
3068	4038	/*
3069	4039	currentLayout = radio.layout;
3070	4040	if (currentLayout == null)
3071	4041	currentLayout = sevenButton;
3072	4042	*/
3073	4043	radio.layout.doClick();
	4044	+
	4045	+ ClearUnpinned();
	4046	+
	4047	+ //Grafreed.Assert(group != null);
	4048	+ //Grafreed.Assert(group.selection != null);
	4049	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4050	+ if (group.selection == null \|\| group.selection.size() == 1)
	4051	+ EditSelection(false);
3074	4052	keepparent = group.parent;
3075	4053	// PARENT = NULL or not???
3076	4054	//group.parent = null; // ROOT
3077	4055	//group.attributes = -1;
3078	4056	ResetModel();
	4057	+
	4058	+ cameraView.requestFocusInWindow();
3079	4059	refreshContents(true);
3080		- }
	4060	+ } else if (event.getSource() == editCameraItem)
	4061	+ {
	4062	+ cameraView.ProtectCamera();
	4063	+ cameraView.requestFocusInWindow();
	4064	+ cameraView.repaint();
	4065	+ return;
	4066	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	4067	+ {
	4068	+ cameraView.RevertCamera();
	4069	+ cameraView.requestFocusInWindow();
	4070	+ cameraView.repaint();
	4071	+ return;
	4072	+ // } else if (event.getSource() == textureButton)
	4073	+ // {
	4074	+ // return; // true;
	4075	+ }
3081	4076	else
3082	4077	{
3083	4078	//return super.action(event, arg);
..	..	@@ -3086,7 +4081,6 @@
3086	4081	}
3087	4082
3088	4083	boolean useclient = false;
3089		- cRadio radio;
3090	4084
3091	4085	void ToggleRoot()
3092	4086	{
..	..	@@ -3138,6 +4132,28 @@
3138	4132	refreshContents();
3139	4133	}
3140	4134
	4135	+ void TransformChildren()
	4136	+ {
	4137	+ Object3D obj;
	4138	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4139	+ {
	4140	+ obj = (Object3D)e.nextElement();
	4141	+ obj.KeepTextureMatrices();
	4142	+ obj.TransformChildren();
	4143	+ obj.RestoreTextureMatrices();
	4144	+
	4145	+// if (obj.parent == null)
	4146	+// {
	4147	+// System.out.println("NULL PARENT!");
	4148	+// new Exception().printStackTrace();
	4149	+// }
	4150	+// else
	4151	+// TouchTransform(obj);
	4152	+// //obj.parent.Touch();
	4153	+ }
	4154	+
	4155	+ refreshContents();
	4156	+ }
3141	4157
3142	4158	void ResetTransform()
3143	4159	{
..	..	@@ -3250,7 +4266,7 @@
3250	4266	refreshContents();
3251	4267	}
3252	4268
3253		- void ResetCentroid()
	4269	+ void ResetCentroid(boolean full)
3254	4270	{
3255	4271	Object3D obj;
3256	4272	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3265,12 +4281,16 @@
3265	4281	LA.matIdentity(Object3D.mat);
3266	4282	obj.getBounds(minima, maxima, false);
3267	4283	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3268		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	4284	+ if (full)
	4285	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3269	4286	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3270	4287	obj.TransformMesh(Object3D.mat);
	4288	+
3271	4289	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3272		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	4290	+ if (full)
	4291	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3273	4292	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	4293	+
3274	4294	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3275	4295	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3276	4296	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3299,7 +4319,8 @@
3299	4319
3300	4320	int size = obj.MemorySize();
3301	4321
3302		- System.err.println((size/1024) + " KB is the size of " + obj);
	4322	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4323	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3303	4324	}
3304	4325	}
3305	4326	catch (Exception e)
..	..	@@ -3336,9 +4357,9 @@
3336	4357	obj = (Object3D)e.nextElement();
3337	4358
3338	4359	System.out.println("Object is: " + obj);
3339		- GrafreeD.AnalyzeObject(obj);
	4360	+ Grafreed.AnalyzeObject(obj);
3340	4361	System.out.println("Boundary rep: " + obj.bRep);
3341		- GrafreeD.AnalyzeObject(obj.bRep);
	4362	+ Grafreed.AnalyzeObject(obj.bRep);
3342	4363
3343	4364	// System.err.println((size/1024) + " KB is the size of " + obj);
3344	4365	}
..	..	@@ -3380,6 +4401,13 @@
3380	4401	void GenNormals(boolean crease)
3381	4402	{
3382	4403	group.GenNormalsS(crease);
	4404	+
	4405	+ refreshContents();
	4406	+ }
	4407	+
	4408	+ void GenNormalsMESH()
	4409	+ {
	4410	+ group.GenNormalsMeshS();
3383	4411
3384	4412	refreshContents();
3385	4413	}
..	..	@@ -3552,8 +4580,8 @@
3552	4580
3553	4581	void ParseVertices()
3554	4582	{
3555		- boolean epsequal = GrafreeD.epsequal;
3556		- GrafreeD.epsequal = true;
	4583	+ boolean epsequal = Grafreed.epsequal;
	4584	+ Grafreed.epsequal = true;
3557	4585
3558	4586	for (int i=0; i<group.selection.size(); i++)
3559	4587	{
..	..	@@ -3578,7 +4606,7 @@
3578	4606	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3579	4607	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3580	4608
3581		- g.add(GrafreeD.clipboard);
	4609	+ g.add(Grafreed.clipboard);
3582	4610
3583	4611	buffer.add(g);
3584	4612	}
..	..	@@ -3593,7 +4621,7 @@
3593	4621	makeSomething(buffer, i==group.selection.size()-1);
3594	4622	}
3595	4623
3596		- GrafreeD.epsequal = epsequal;
	4624	+ Grafreed.epsequal = epsequal;
3597	4625
3598	4626	refreshContents();
3599	4627	}
..	..	@@ -3611,7 +4639,16 @@
3611	4639	String pigment = Object3D.GetPigment(tex);
3612	4640	//String bump = Object3D.GetBump(tex);
3613	4641
3614		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4642	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4643	+
	4644	+ try
	4645	+ {
	4646	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
	4647	+ }
	4648	+ catch (Exception e)
	4649	+ {
	4650	+ System.err.println("FAIL: " + node);
	4651	+ }
3615	4652
3616	4653	double s = v.s;
3617	4654
..	..	@@ -3743,7 +4780,7 @@
3743	4780	return;
3744	4781
3745	4782	Object3D poses = group.selection.get(0);
3746		- Object3D ref = GrafreeD.clipboard.get(0);
	4783	+ Object3D ref = Grafreed.clipboard.get(0);
3747	4784
3748	4785	Object3D newgroup = new Object3D("Po:" + poses.name);
3749	4786
..	..	@@ -3937,9 +4974,9 @@
3937	4974
3938	4975	void ClipMesh()
3939	4976	{
3940		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4977	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3941	4978	{
3942		- Object3D content = GrafreeD.clipboard.get(0);
	4979	+ Object3D content = Grafreed.clipboard.get(0);
3943	4980
3944	4981	if (content instanceof cGroup && ((cGroup)content).transientlink )
3945	4982	content = ((cGroup)content).get(0);
..	..	@@ -3948,7 +4985,7 @@
3948	4985	// {
3949	4986	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3950	4987	// }
3951		- group.selection.ClipMesh(GrafreeD.clipboard);
	4988	+ group.selection.ClipMesh(Grafreed.clipboard);
3952	4989	}
3953	4990	// group.selection.ClipMesh(GrafreeD.clipboard);
3954	4991	System.out.println("DONE.");
..	..	@@ -3995,6 +5032,18 @@
3995	5032	void MarkLeaves(boolean hide)
3996	5033	{
3997	5034	group.selection.MarkLeaves(hide);
	5035	+ refreshContents();
	5036	+ }
	5037	+
	5038	+ void RewindLeaves(boolean hide)
	5039	+ {
	5040	+ group.selection.RewindLeaves(hide);
	5041	+ refreshContents();
	5042	+ }
	5043	+
	5044	+ void RandomLeaves(boolean hide)
	5045	+ {
	5046	+ group.selection.RandomLeaves(hide);
3998	5047	refreshContents();
3999	5048	}
4000	5049
..	..	@@ -4069,28 +5118,25 @@
4069	5118	// }
4070	5119	// }
4071	5120
4072		- static boolean allparams = true;
4073		-
4074		- static Vector<Object3D> listUI = new Vector<Object3D>();
4075		-
4076	5121	void EditSelection(boolean newWindow)
4077	5122	{
	5123	+ if (group.selection == null)
	5124	+ {
	5125	+ EditElement(group, newWindow); // ? new
	5126	+ return;
	5127	+ }
	5128	+
4078	5129	// aConstraints.gridy = 0;
4079	5130	for (int i=0; i<group.selection.size(); i++)
4080	5131	{
4081	5132	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4082	5133	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4083		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5134	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4084	5135
4085	5136	Object3D elem = (Object3D)group.selection.elementAt(i);
4086		- if(elem != group)
	5137	+ if(elem != group \|\| !newWindow)
4087	5138	{
4088		- // if (!(elem instanceof Composite))
4089		- // newWindow = false;
4090		- listUI.add(elem);
4091		- elem.openEditWindow(this, newWindow); //, false);
4092		- System.out.println("edit : " + elem);
4093		- elem.editWindow.refreshContents(true); // ? new
	5139	+ EditElement(elem, newWindow); // ? new
4094	5140	}
4095	5141	}
4096	5142	}
..	..	@@ -4153,9 +5199,7 @@
4153	5199
4154	5200	freezemodel = false;
4155	5201	}
4156		-
4157		- boolean flashIt = true;
4158		-
	5202	+
4159	5203	public void valueChanged(TreeSelectionEvent e)
4160	5204	//public boolean handleEvent(Event event)
4161	5205	{
..	..	@@ -4165,7 +5209,8 @@
4165	5209	//new Exception().printStackTrace();
4166	5210
4167	5211	freezemodel = true;
4168		-
	5212	+ ClearUnpinned();
	5213	+
4169	5214	/**/
4170	5215	//switch (event.id)
4171	5216	{
..	..	@@ -4173,7 +5218,6 @@
4173	5218	//case 702: // Event.LIST_DESELECT
4174	5219	group.deselectAll();
4175	5220	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4176		- objEditor.ClearInfo(); // .GetMaterial());
4177	5221	if (tps != null)
4178	5222	{
4179	5223	for (int i=0; i < tps.length; i++)
..	..	@@ -4182,10 +5226,8 @@
4182	5226
4183	5227	//if (child.parent != null)
4184	5228	//child.parent.addSelectee(child);
	5229	+ objEditor.SetMaterial(child);
4185	5230	group.addSelectee(child);
4186		- objEditor.SetMaterial(child); // .GetMaterial());
4187		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4188		- System.err.println("info : " + child.GetPath());
4189	5231	}
4190	5232	}
4191	5233	// else
..	..	@@ -4195,20 +5237,28 @@
4195	5237	// System.err.println("info : " + group.GetPath());
4196	5238	// }
4197	5239
4198		- objEditor.SetText(); // jan 2014
4199		-
4200		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	5240	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4201	5241	CameraPane.flash = true;
4202	5242
4203		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5243	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4204	5244	// a camera
4205	5245	{
4206		- CameraPane.camerachangeframe = 0; // don't refuse it
4207		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5246	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5247	+ {
	5248	+ CameraPane.camerachangeframe = 0; // don't refuse it
	5249	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5250	+ }
4208	5251	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4209	5252	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4210	5253	}
4211	5254
	5255	+ if (tps != null && tps.length == 1)
	5256	+ {
	5257	+ EditSelection(false);
	5258	+ }
	5259	+
	5260	+ SetPinStates(tps != null && tps.length > 0);
	5261	+
4212	5262	refreshContents();
4213	5263	//return true;
4214	5264	}
..	..	@@ -4217,6 +5267,37 @@
4217	5267
4218	5268	freezemodel = false;
4219	5269	}
	5270	+
	5271	+ void SetPinStates(boolean enabled)
	5272	+ {
	5273	+ editButton.setEnabled(enabled);
	5274	+ uneditButton.setEnabled(enabled);
	5275	+ //unselectButton.setEnabled(enabled);
	5276	+ flashSelectionButton.setEnabled(enabled);
	5277	+
	5278	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5279	+ }
	5280	+
	5281	+ void refreshContents(boolean cp)
	5282	+ {
	5283	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5284	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5285	+ {
	5286	+ objEditor.ClearInfo(); // .GetMaterial());
	5287	+
	5288	+ for (int i=0; i < group.selection.Size(); i++)
	5289	+ {
	5290	+ Object3D child = (Object3D) group.selection.get(i);
	5291	+
	5292	+ objEditor.AddInfo(child, this, true);
	5293	+ System.err.println("info : " + child.GetPath());
	5294	+ }
	5295	+
	5296	+ objEditor.SetText(); // jan 2014
	5297	+ }
	5298	+
	5299	+ super.refreshContents(cp);
	5300	+ }
4220	5301
4221	5302	void linkSomething(Object3D thing)
4222	5303	{
..	..	@@ -4288,16 +5369,19 @@
4288	5369	{
4289	5370	if (group.selection.isEmpty())
4290	5371	return;
4291		- GrafreeD.clipboardIsTempGroup = false;
	5372	+
	5373	+ Grafreed.clipboardIsTempGroup = false;
4292	5374	Composite tGroup = null;
4293	5375	if (group.selection.size() > 0) // 1)
4294	5376	{
4295	5377	tGroup = new cGroup();
4296		- GrafreeD.clipboardIsTempGroup = true;
	5378	+ Grafreed.clipboardIsTempGroup = true;
4297	5379	}
4298	5380
4299	5381	if (cut)
4300	5382	{
	5383	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5384	+// Save();
4301	5385	//int indices[] = jList.getSelectedIndices();
4302	5386	//for (int i = indices.length - 1; i >= 0; i--)
4303	5387	//jList.remove(indices[i]);
..	..	@@ -4333,16 +5417,16 @@
4333	5417	//System.out.println("cut " + child);
4334	5418	//System.out.println("parent = " + child.parent);
4335	5419	// tmp.addChild(child);
4336		- if (GrafreeD.clipboardIsTempGroup)
	5420	+ if (Grafreed.clipboardIsTempGroup)
4337	5421	tGroup.add/Child/(tmp);
4338	5422	else
4339		- GrafreeD.clipboard = tmp;
	5423	+ Grafreed.clipboard = tmp;
4340	5424	}
4341	5425	else
4342		- if (GrafreeD.clipboardIsTempGroup)
	5426	+ if (Grafreed.clipboardIsTempGroup)
4343	5427	tGroup.add/Child/(child);
4344	5428	else
4345		- GrafreeD.clipboard = child;
	5429	+ Grafreed.clipboard = child;
4346	5430	}
4347	5431
4348	5432	//ResetModel();
..	..	@@ -4374,21 +5458,23 @@
4374	5458	//System.out.println("cut " + elem);
4375	5459	//System.out.println("parent = " + elem.parent);
4376	5460	// tmp.addChild(elem);
4377		- if (GrafreeD.clipboardIsTempGroup)
	5461	+ if (Grafreed.clipboardIsTempGroup)
4378	5462	tGroup.add/Child/(tmp);
4379	5463	else
4380		- GrafreeD.clipboard = tmp;
	5464	+ Grafreed.clipboard = tmp;
4381	5465	}
4382	5466	else
4383		- if (GrafreeD.clipboardIsTempGroup)
	5467	+ if (Grafreed.clipboardIsTempGroup)
4384	5468	tGroup.add/Child/(child);
4385	5469	else
4386		- GrafreeD.clipboard = child;
	5470	+ Grafreed.clipboard = child;
4387	5471	}
4388	5472
4389	5473	}
4390		- if (GrafreeD.clipboardIsTempGroup)
4391		- GrafreeD.clipboard = tGroup;
	5474	+
	5475	+ if (Grafreed.clipboardIsTempGroup)
	5476	+ Grafreed.clipboard = tGroup;
	5477	+
4392	5478	if (cut)
4393	5479	{
4394	5480	ResetModel();
..	..	@@ -4398,11 +5484,15 @@
4398	5484
4399	5485	void paste(boolean expand)
4400	5486	{
	5487	+ if (Globals.REPLACEONMAKE)
	5488	+ Save();
	5489	+ boolean keep = Globals.REPLACEONMAKE;
	5490	+ Globals.REPLACEONMAKE = false;
4401	5491	// if (GrafreeD.clipboard == null)
4402	5492	// return;
4403	5493	boolean first = true;
4404	5494
4405		- if (GrafreeD.clipboardIsTempGroup)
	5495	+ if (Grafreed.clipboardIsTempGroup)
4406	5496	{
4407	5497	Composite temp;
4408	5498
..	..	@@ -4413,7 +5503,7 @@
4413	5503	temp = (Composite)Applet3D.clipboard.deepCopy();
4414	5504	*/
4415	5505	Object3D elem;
4416		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5506	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4417	5507	{
4418	5508	Object3D child = (Object3D)e.nextElement();
4419	5509
..	..	@@ -4447,16 +5537,17 @@
4447	5537	//Object3D cb = Applet3D.clipboard;
4448	5538	//temp.addChild(cb);
4449	5539	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4450		- assert(GrafreeD.clipboard.parent == null);
4451		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4452		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4453		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4454		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	5540	+ assert(Grafreed.clipboard.parent == null);
	5541	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5542	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5543	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5544	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4455	5545	else
4456		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4457		- GrafreeD.clipboard.get(0).parent = keepparent;
	5546	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5547	+ Grafreed.clipboard.get(0).parent = keepparent;
4458	5548	}
4459	5549
	5550	+ Globals.REPLACEONMAKE = keep;
4460	5551	ResetModel();
4461	5552	refreshContents();
4462	5553	}
..	..	@@ -4503,9 +5594,9 @@
4503	5594	{
4504	5595	boolean first = true;
4505	5596
4506		- if (GrafreeD.clipboardIsTempGroup)
	5597	+ if (Grafreed.clipboardIsTempGroup)
4507	5598	{
4508		- Composite temp = (Composite)GrafreeD.clipboard;
	5599	+ Composite temp = (Composite)Grafreed.clipboard;
4509	5600	Object3D copy;
4510	5601	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4511	5602	{
..	..	@@ -4515,7 +5606,7 @@
4515	5606	}
4516	5607	} else
4517	5608	{
4518		- linkSomething(GrafreeD.clipboard); //.get(0));
	5609	+ linkSomething(Grafreed.clipboard); //.get(0));
4519	5610	}
4520	5611	}
4521	5612	}
..	..	@@ -4592,6 +5683,10 @@
4592	5683
4593	5684	void group(Object3D csg, boolean grab)
4594	5685	{
	5686	+ if (Globals.REPLACEONMAKE)
	5687	+ Save();
	5688	+ boolean keep = Globals.REPLACEONMAKE;
	5689	+ Globals.REPLACEONMAKE = false;
4595	5690	if (//false) // why??
4596	5691	!group.selection.isEmpty())
4597	5692	{
..	..	@@ -4705,10 +5800,15 @@
4705	5800	//node.add(csg);
4706	5801	//makeSomething(node);
4707	5802	makeSomething(csg);
	5803	+ Globals.REPLACEONMAKE = keep;
4708	5804	}
4709	5805
4710	5806	void Ungroup(Object3D g)
4711	5807	{
	5808	+ if (Globals.REPLACEONMAKE)
	5809	+ Save();
	5810	+ boolean keep = Globals.REPLACEONMAKE;
	5811	+ Globals.REPLACEONMAKE = false;
4712	5812	if (g instanceof HiddenObject)
4713	5813	{
4714	5814	HiddenObject h = (HiddenObject) g;
..	..	@@ -4725,6 +5825,7 @@
4725	5825	objEditor.makeSomething(g.get(i), false);
4726	5826	}
4727	5827	}
	5828	+ Globals.REPLACEONMAKE = keep;
4728	5829	}
4729	5830
4730	5831	void ungroup()
..	..	@@ -4920,21 +6021,6 @@
4920	6021	}
4921	6022	*/
4922	6023
4923		- void ImportGFD()
4924		- {
4925		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4926		- browser.show();
4927		- String filename = browser.getFile();
4928		- if (filename != null && filename.length() > 0)
4929		- {
4930		- String fullname = browser.getDirectory() + filename;
4931		-
4932		- //Object3D readobj =
4933		- objEditor.ReadGFD(fullname, objEditor);
4934		- //makeSomething(readobj);
4935		- }
4936		- }
4937		-
4938	6024	/*
4939	6025	public void Callback(Object obj)
4940	6026	{
..	..	@@ -4958,26 +6044,9 @@
4958	6044	}
4959	6045	*/
4960	6046
4961		- void ImportVRMLX3D()
4962		- {
4963		- if (GrafreeD.standAlone)
4964		- {
4965		- /**/
4966		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4967		- browser.show();
4968		- String filename = browser.getFile();
4969		- if (filename != null && filename.length() > 0)
4970		- {
4971		- String fullname = browser.getDirectory() + filename;
4972		- LoadVRMLX3D(fullname);
4973		- }
4974		- /**/
4975		- }
4976		- }
4977		-
4978	6047	String GetFile(String dialogName)
4979	6048	{
4980		- if (GrafreeD.standAlone)
	6049	+ if (Grafreed.standAlone)
4981	6050	{
4982	6051	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4983	6052	browser.show();
..	..	@@ -5045,7 +6114,43 @@
5045	6114	cButton clearpanelButton;
5046	6115	cButton unselectButton;
5047	6116
	6117	+ cButton restoreCameraButton;
	6118	+
5048	6119	cButton oneStepButton;
	6120	+
	6121	+ cButton groupButton;
	6122	+ cButton ungroupButton;
	6123	+ cButton compositeButton;
	6124	+ cButton switchButton;
	6125	+ cButton loopButton;
	6126	+ cButton textureButton;
	6127	+
	6128	+ cButton skybox1Button;
	6129	+ cButton skybox2Button;
	6130	+ cButton skybox3Button;
	6131	+ cButton skybox4Button;
	6132	+ cButton skybox5Button;
	6133	+ cButton skybox6Button;
	6134	+ cButton skybox7Button;
	6135	+
	6136	+ cButton skybox11Button;
	6137	+ cButton skybox12Button;
	6138	+ cButton skybox13Button;
	6139	+ cButton skybox14Button;
	6140	+ cButton skybox15Button;
	6141	+ cButton skybox16Button;
	6142	+ cButton skybox17Button;
	6143	+
	6144	+ cButton gridButton;
	6145	+ cButton boxButton;
	6146	+ cButton sphereButton;
	6147	+ cButton coneButton;
	6148	+ cButton torusButton;
	6149	+ cButton superButton;
	6150	+ cButton kleinButton;
	6151	+ cButton particlesButton;
	6152	+ cButton overlayButton;
	6153	+ cButton lightButton;
5049	6154
5050	6155	cButton screenfitButton;
5051	6156	cButton screenfitpointButton;
..	..	@@ -5058,14 +6163,6 @@
5058	6163
5059	6164	cButton setsupportButton;
5060	6165
5061		- cButton twoButton;
5062		- cButton sixButton;
5063		- cButton threeButton;
5064		- cButton sevenButton;
5065		- cButton fourButton; // full panel
5066		- cButton oneButton; // full XYZ
5067		- //cButton currentLayout;
5068		-
5069	6166	//
5070	6167	//Composite
5071	6168	Object3D // to do !!
..	..	@@ -5075,9 +6172,11 @@
5075	6172	//JTree jTree;
5076	6173	private MenuItem lookAtItem;
5077	6174	private MenuItem lookFromItem;
5078		- private MenuItem switchItem;
	6175	+ private MenuItem switchViewItem;
5079	6176	private MenuItem cutItem;
5080		- private MenuItem duplicateItem;
	6177	+ private MenuItem undoItem;
	6178	+ private MenuItem redoItem;
	6179	+ private JMenuItem duplicateItem;
5081	6180	private MenuItem cloneItem;
5082	6181	private MenuItem cloneSupportItem;
5083	6182	private MenuItem overwriteGeoItem;
..	..	@@ -5090,7 +6189,7 @@
5090	6189	private MenuItem linkverticesItem;
5091	6190	private MenuItem relinkverticesItem;
5092	6191	private MenuItem setMasterItem;
5093		- private MenuItem resetMeshItem;
	6192	+ private MenuItem resetAllItem;
5094	6193	private MenuItem stepAllItem;
5095	6194	private MenuItem revertMeshItem;
5096	6195	private MenuItem poseMeshItem;
..	..	@@ -5105,7 +6204,7 @@
5105	6204	private MenuItem pasteLinkItem;
5106	6205	private MenuItem pasteCloneItem;
5107	6206	private MenuItem pasteExpandItem;
5108		- private MenuItem clearItem;
	6207	+ private MenuItem deleteItem;
5109	6208	private MenuItem clearAllItem;
5110	6209	private MenuItem genUVItem;
5111	6210	private MenuItem genNormalsMESHItem;
..	..	@@ -5140,6 +6239,10 @@
5140	6239	private MenuItem showleavesItem;
5141	6240	private MenuItem markleavesItem;
5142	6241	private MenuItem unmarkleavesItem;
	6242	+ private MenuItem rewindleavesItem;
	6243	+ private MenuItem unrewindleavesItem;
	6244	+ private MenuItem randomleavesItem;
	6245	+ private MenuItem unrandomleavesItem;
5143	6246
5144	6247	private MenuItem flipVItem;
5145	6248	private MenuItem unflipVItem;
..	..	@@ -5151,15 +6254,17 @@
5151	6254	private MenuItem panoTexturesItem;
5152	6255
5153	6256	private MenuItem resetCentroidItem;
5154		- private MenuItem transformgeometryItem;
	6257	+ private MenuItem resetCentroidXZItem;
5155	6258	private MenuItem resetTransformItem;
	6259	+ private MenuItem transformGeometryItem;
	6260	+ private MenuItem transformChildrenItem;
5156	6261	private MenuItem hideItem;
5157	6262	private MenuItem grabItem;
5158	6263	private MenuItem backItem;
5159	6264	private MenuItem frontItem;
5160	6265	private MenuItem cameraItem;
5161	6266	private MenuItem compositeItem;
5162		- private MenuItem randomItem;
	6267	+ private MenuItem switchItem;
5163	6268	private MenuItem physicsItem;
5164	6269	private MenuItem frameselectorItem;
5165	6270	private MenuItem scriptNodeItem;
..	..	@@ -5183,6 +6288,8 @@
5183	6288	private MenuItem attachBumpItem;
5184	6289	private MenuItem detachBumpItem;
5185	6290	private MenuItem pigmentBumpItem;
	6291	+ private MenuItem embedTexturesItem;
	6292	+ private MenuItem deEmbedTexturesItem;
5186	6293
5187	6294	private MenuItem particleItem;
5188	6295	private MenuItem ragdollItem;
..	..	@@ -5221,11 +6328,6 @@
5221	6328	private MenuItem doubleItem;
5222	6329	private MenuItem tripleItem;
5223	6330
5224		- private MenuItem importGFDItem;
5225		- private MenuItem importVRMLX3DItem;
5226		- private MenuItem import3DSItem;
5227		- private MenuItem importOBJItem;
5228		-
5229	6331	private MenuItem computeAOItem;
5230	6332	private MenuItem recompileItem;
5231	6333	private MenuItem editScriptItem;
..	..	@@ -5235,4 +6337,8 @@
5235	6337	private MenuItem analyzeItem;
5236	6338	private MenuItem dumpItem;
5237	6339	//boolean freezemodel = false;
	6340	+
	6341	+ Menu cameraMenu;
	6342	+ MenuItem editCameraItem;
	6343	+ MenuItem restoreCameraItem;
5238	6344	}