~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -23,6 +23,302 @@
23	23	DragGestureListener, DragSourceListener, DropTargetListener,
24	24	ItemListener // ListSelectionListener
25	25	{
	26	+
	27	+ public void AddSkyboxButton(String f, String s, cGridBag row)
	28	+ {
	29	+ cButton skyboxButton;
	30	+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
	31	+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
	32	+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
	33	+ skyboxButton.setToolTipText(s);
	34	+ skyboxButton.addActionListener(new ActionListener()
	35	+ {
	36	+ @Override
	37	+ public void actionPerformed(ActionEvent e)
	38	+ {
	39	+ ChangeSkybox(path);
	40	+ }
	41	+ });
	42	+ }
	43	+
	44	+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
	45	+ {
	46	+ cGridBag tab0 = new cGridBag().setVertical(true);
	47	+
	48	+ tab0.setName("Urban");
	49	+ skyboxpanel.add(tab0);
	50	+
	51	+ cGridBag row0 = new cGridBag();
	52	+ cGridBag row1 = new cGridBag();
	53	+ cGridBag row2 = new cGridBag();
	54	+ cGridBag row3 = new cGridBag();
	55	+ cGridBag row4 = new cGridBag();
	56	+ cGridBag row5 = new cGridBag();
	57	+ cGridBag row6 = new cGridBag();
	58	+
	59	+ AddSkyboxButton("default", "rgb", row0);
	60	+ //AddSkyboxButton("default", "cornell", row0);
	61	+ AddSkyboxButton("penguins", "dust", row0);
	62	+ AddSkyboxButton("penguins", "tropic", row0);
	63	+ AddSkyboxButton("penguins", "yonder", row0);
	64	+
	65	+ AddSkyboxButton("default", "uffizi", row1);
	66	+ AddSkyboxButton("bridge", "Bridge", row1);
	67	+ AddSkyboxButton("bridge", "Bridge2", row1);
	68	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	69	+
	70	+ AddSkyboxButton("urban", "Parliament", row2);
	71	+ AddSkyboxButton("urban", "Roundabout", row2);
	72	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	73	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	74	+
	75	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	76	+ AddSkyboxButton("urban", "UnionSquare", row3);
	77	+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
	78	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	79	+
	80	+ AddSkyboxButton("park", "Buddha", row4);
	81	+ AddSkyboxButton("park", "CNTower2", row4);
	82	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	83	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	84	+
	85	+ AddSkyboxButton("park", "Park", row5);
	86	+ AddSkyboxButton("park", "Pond", row5);
	87	+ AddSkyboxButton("park", "Skansen", row5);
	88	+ AddSkyboxButton("park", "Skansen2", row5);
	89	+
	90	+ AddSkyboxButton("park", "Skansen3", row6);
	91	+ AddSkyboxButton("park", "Skansen4", row6);
	92	+ AddSkyboxButton("park", "Skansen5", row6);
	93	+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
	94	+
	95	+ tab0.add(row0);
	96	+ tab0.add(row1);
	97	+ tab0.add(row2);
	98	+ tab0.add(row3);
	99	+ tab0.add(row4);
	100	+ tab0.add(row5);
	101	+ tab0.add(row6);
	102	+
	103	+ for (int i=5; --i>=0;)
	104	+ {
	105	+ //oe.toolboxPanel.Return();
	106	+ //tab0.add(new cGridBag());
	107	+ }
	108	+ }
	109	+
	110	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	111	+ {
	112	+ cGridBag tab0 = new cGridBag().setVertical(true);
	113	+
	114	+ tab0.setName("Nature");
	115	+ skyboxpanel.add(tab0);
	116	+
	117	+ cGridBag row0 = new cGridBag();
	118	+ cGridBag row1 = new cGridBag();
	119	+ cGridBag row2 = new cGridBag();
	120	+ cGridBag row3 = new cGridBag();
	121	+ cGridBag row4 = new cGridBag();
	122	+ cGridBag row5 = new cGridBag();
	123	+ cGridBag row6 = new cGridBag();
	124	+
	125	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	126	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	127	+ AddSkyboxButton("beach", "PalmTrees", row0);
	128	+ AddSkyboxButton("beach", "Tenerife", row0);
	129	+
	130	+ AddSkyboxButton("beach", "Tenerife2", row1);
	131	+ AddSkyboxButton("beach", "Tenerife3", row1);
	132	+ AddSkyboxButton("field", "FishPond", row1);
	133	+ AddSkyboxButton("field", "Footballfield", row1);
	134	+
	135	+ AddSkyboxButton("field", "Meadow", row2);
	136	+ AddSkyboxButton("field", "Sorsele", row2);
	137	+ AddSkyboxButton("field", "Sorsele2", row2);
	138	+ AddSkyboxButton("field", "Sorsele3", row2);
	139	+
	140	+ AddSkyboxButton("forest", "Brudslojan", row3);
	141	+ AddSkyboxButton("forest", "Langholmen2", row3);
	142	+ AddSkyboxButton("forest", "Plants", row3);
	143	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	144	+
	145	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	146	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	147	+ AddSkyboxButton("mountain", "Teide", row4);
	148	+ AddSkyboxButton("park", "Tantolunden4", row4);
	149	+
	150	+ AddSkyboxButton("park", "Stairs", row5);
	151	+ AddSkyboxButton("default", "skycube", row6);
	152	+ AddSkyboxButton("rocky", "Langholmen", row5);
	153	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	154	+
	155	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	156	+ AddSkyboxButton("default", "CloudyHills", row6);
	157	+ AddSkyboxButton("daz", "Autumn", row6);
	158	+ AddSkyboxButton("daz", "MountainTrail", row6);
	159	+ /*
	160	+Autumn
	161	+Greenlands
	162	+MountainTrail
	163	+Oasis
	164	+TheRock
	165	+TopOfTheWorld
	166	+Winter
	167	+ */
	168	+
	169	+ tab0.add(row0);
	170	+ tab0.add(row1);
	171	+ tab0.add(row2);
	172	+ tab0.add(row3);
	173	+ tab0.add(row4);
	174	+ tab0.add(row5);
	175	+ tab0.add(row6);
	176	+
	177	+ for (int i=5; --i>=0;)
	178	+ {
	179	+ //oe.toolboxPanel.Return();
	180	+ //tab0.add(new cGridBag());
	181	+ }
	182	+ }
	183	+
	184	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	185	+ {
	186	+ cGridBag tab0 = new cGridBag().setVertical(true);
	187	+
	188	+ tab0.setName("Night");
	189	+ skyboxpanel.add(tab0);
	190	+
	191	+ cGridBag row0 = new cGridBag();
	192	+ cGridBag row1 = new cGridBag();
	193	+ cGridBag row2 = new cGridBag();
	194	+ cGridBag row3 = new cGridBag();
	195	+ cGridBag row4 = new cGridBag();
	196	+ cGridBag row5 = new cGridBag();
	197	+ cGridBag row6 = new cGridBag();
	198	+
	199	+ AddSkyboxButton("night", "NightPath", row0);
	200	+ AddSkyboxButton("night", "PondNight", row0);
	201	+ AddSkyboxButton("night", "Powerlines", row0);
	202	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	203	+
	204	+ AddSkyboxButton("urban", "CNTower", row1);
	205	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	206	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	207	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
	208	+
	209	+ AddSkyboxButton("penguins", "kenon_star", row2);
	210	+ AddSkyboxButton("persson", "corona", row2);
	211	+ AddSkyboxButton("persson", "spaceskybox", row2);
	212	+ AddSkyboxButton("indoors", "Vasa", row2);
	213	+
	214	+ AddSkyboxButton("winter", "Backyard", row3);
	215	+ AddSkyboxButton("winter", "Creek", row3);
	216	+ AddSkyboxButton("winter", "FootballField3", row3);
	217	+ AddSkyboxButton("winter", "Forest", row3);
	218	+
	219	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	220	+ AddSkyboxButton("winter", "House", row4);
	221	+ AddSkyboxButton("winter", "IceLake", row4);
	222	+ AddSkyboxButton("winter", "IceRiver", row4);
	223	+
	224	+ AddSkyboxButton("winter", "Park3", row5);
	225	+ AddSkyboxButton("winter", "PondWinter", row5);
	226	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	227	+ AddSkyboxButton("winter", "Vindelalven", row5);
	228	+
	229	+ AddSkyboxButton("daz", "TheRock", row6);
	230	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	231	+ AddSkyboxButton("daz", "Winter", row6);
	232	+ AddSkyboxButton("mountain", "Ryfjallet", row6);
	233	+
	234	+ tab0.add(row0);
	235	+ tab0.add(row1);
	236	+ tab0.add(row2);
	237	+ tab0.add(row3);
	238	+ tab0.add(row4);
	239	+ tab0.add(row5);
	240	+ tab0.add(row6);
	241	+
	242	+ for (int i=5; --i>=0;)
	243	+ {
	244	+ //oe.toolboxPanel.Return();
	245	+ //tab0.add(new cGridBag());
	246	+ }
	247	+ }
	248	+
	249	+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
	250	+ {
	251	+ cGridBag tab0 = new cGridBag().setVertical(true);
	252	+
	253	+ tab0.setName("Others");
	254	+ skyboxpanel.add(tab0);
	255	+
	256	+ cGridBag row0 = new cGridBag();
	257	+ cGridBag row1 = new cGridBag();
	258	+ cGridBag row2 = new cGridBag();
	259	+ cGridBag row3 = new cGridBag();
	260	+ cGridBag row4 = new cGridBag();
	261	+ cGridBag row5 = new cGridBag();
	262	+ cGridBag row6 = new cGridBag();
	263	+
	264	+ AddSkyboxButton("mayhem", "afterrain", row0);
	265	+ AddSkyboxButton("mayhem", "aqua4", row0);
	266	+ AddSkyboxButton("mayhem", "aqua9", row0);
	267	+ AddSkyboxButton("mayhem", "flame", row0);
	268	+
	269	+ AddSkyboxButton("mayhem", "h2s", row1);
	270	+ AddSkyboxButton("mayhem", "prehistoric", row1);
	271	+ AddSkyboxButton("mayhem", "scorched", row1);
	272	+ AddSkyboxButton("penguins", "desertdawn", row1);
	273	+
	274	+ AddSkyboxButton("persson", "Citadella", row2);
	275	+ AddSkyboxButton("persson", "Citadella2", row2);
	276	+ AddSkyboxButton("persson", "clouds1", row2);
	277	+ AddSkyboxButton("penguins", "wrath", row2);
	278	+
	279	+ AddSkyboxButton("persson", "FishermansBastion", row3);
	280	+ AddSkyboxButton("persson", "HeroesSquare", row3);
	281	+ AddSkyboxButton("indoors", "DallasW", row3);
	282	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
	283	+
	284	+ AddSkyboxButton("persson", "LancellottiChapel", row4);
	285	+ AddSkyboxButton("persson", "PereaBeach1", row4);
	286	+ AddSkyboxButton("persson", "PereaBeach2", row4);
	287	+ AddSkyboxButton("persson", "redeclipse", row4);
	288	+
	289	+ AddSkyboxButton("daz", "Greenlands", row5);
	290	+ AddSkyboxButton("daz", "Oasis", row5);
	291	+ AddSkyboxButton("elyvisions", "arch3", row5);
	292	+ AddSkyboxButton("elyvisions", "calm_sea", row5);
	293	+
	294	+ AddSkyboxButton("elyvisions", "rainbow", row6);
	295	+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
	296	+ AddSkyboxButton("elyvisions", "heaven", row6);
	297	+ AddSkyboxButton("elyvisions", "hot", row6);
	298	+
	299	+ tab0.add(row0);
	300	+ tab0.add(row1);
	301	+ tab0.add(row2);
	302	+ tab0.add(row3);
	303	+ tab0.add(row4);
	304	+ tab0.add(row5);
	305	+ tab0.add(row6);
	306	+
	307	+ for (int i=5; --i>=0;)
	308	+ {
	309	+ //oe.toolboxPanel.Return();
	310	+ //tab0.add(new cGridBag());
	311	+ }
	312	+ }
	313	+
	314	+ public void ChangeSkybox(String name)
	315	+ {
	316	+ //cameraView.envyoff = false;
	317	+ group.skyboxname = name;
	318	+ group.skyboxext = "jpg";
	319	+ cameraView.repaint();
	320	+ }
	321	+
26	322	//ObjEditor objEditor;
27	323	public void closeUI2()
28	324	{
..	..	@@ -60,6 +356,12 @@
60	356	this.copy = this.group = group;
61	357	//selectees = this.group.selectees;
62	358
	359	+ if (copy.versions == null)
	360	+ {
	361	+ copy.versions = new byte[100][];
	362	+ copy.versionindex = -1;
	363	+ }
	364	+
63	365	if(ui)
64	366	SetupUI(objEditor);
65	367	}
..	..	@@ -74,16 +376,28 @@
74	376	this.copy = this.group = copy;
75	377	//selectees = this.group.selectees;
76	378
77		- SetupMenu2(objEditor);
	379	+ SetupMenu2(this); //objEditor);
78	380	SetupUI2(objEditor);
79	381	objEditor.SetupUI(true);
80	382	SetupViews(objEditor);
81	383
82	384	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	385	+
	386	+ if (copy.versions == null)
	387	+ {
	388	+ copy.versions = new byte[100][];
	389	+ copy.versionindex = -1;
	390	+
	391	+ Save(true);
	392	+ }
83	393	}
84	394
85	395	void CloneSelection(boolean supports)
86	396	{
	397	+ if (Globals.REPLACEONMAKE)
	398	+ Save();
	399	+ boolean keep = Globals.REPLACEONMAKE;
	400	+ Globals.REPLACEONMAKE = false;
87	401	// Object3D keep = GrafreeD.clipboard;
88	402	//Object3D obj;
89	403	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,18 +408,19 @@
94	408
95	409	makeSomething(clone, i==group.selection.size()-1);
96	410	}
	411	+ Globals.REPLACEONMAKE = keep;
97	412	}
98	413
99	414	void CloneClipboard(boolean supports)
100	415	{
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));
	416	+ assert(Grafreed.clipboard.parent == null);
	417	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	418	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	419	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	420	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
106	421	else
107		- makeSomething(CloneObject(GrafreeD.clipboard, false));
108		- GrafreeD.clipboard.get(0).parent = keepparent;
	422	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	423	+ Grafreed.clipboard.get(0).parent = keepparent;
109	424	}
110	425
111	426	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -119,7 +434,7 @@
119	434	// obj.support = null;
120	435	if (!supports)
121	436	obj.SaveSupports();
122		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	437	+ Object3D clone = (Object3D)Grafreed.clone(obj);
123	438	obj.parent = parent;
124	439	// obj.support = support;
125	440	// clone.support = support; // aout 2013
..	..	@@ -148,40 +463,37 @@
148	463
149	464	//JTextField nameField;
150	465
151		- void SetupMenu2(ObjEditor oe)
	466	+ void SetupMenu2(GroupEditor oe)
152	467	{
153		- if (Globals.ADVANCED)
154		- {
155		- oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
156		- //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
157		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
158		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
159		- oe.cameraMenu.add("-");
160		- openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
161		- openWindowItem.addActionListener(this);
162		- editLeafItem.addActionListener(this);
163		- lookAtItem.addActionListener(this);
164		- //lookFromItem.addActinoListener(this);
165		- //switchItem.addActionListener(this);
166		- }
167		-
	468	+ oe.jTree = new cTree();
	469	+
168	470	Menu menu;
169	471	oe.menuBar.add(menu = new Menu("Edit"));
170	472	//editItem = menu.add(new MenuItem("Edit"));
171	473	//editItem.addActionListener(this);
172		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	474	+
	475	+// undoItem = menu.add(new MenuItem("Undo"));
	476	+// undoItem.addActionListener(this);
	477	+// redoItem = menu.add(new MenuItem("Redo"));
	478	+// redoItem.addActionListener(this);
	479	+// menu.add("-");
	480	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
173	481	duplicateItem.addActionListener(this);
	482	+ cloneItem = menu.add(new MenuItem("Clone"));
	483	+ cloneItem.addActionListener(this);
	484	+ if (Globals.ADVANCED)
	485	+ {
	486	+ cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
	487	+ cloneSupportItem.addActionListener(this);
	488	+ }
	489	+ menu.add("-");
174	490	cutItem = menu.add(new MenuItem("Cut"));
175	491	cutItem.addActionListener(this);
176	492	copyItem = menu.add(new MenuItem("Copy"));
177	493	copyItem.addActionListener(this);
178	494	pasteItem = menu.add(new MenuItem("Paste"));
179	495	pasteItem.addActionListener(this);
180		- menu.add("-");
181		- cloneItem = menu.add(new MenuItem("Clone"));
182		- cloneItem.addActionListener(this);
183		- cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
184		- cloneSupportItem.addActionListener(this);
	496	+
185	497	menu.add("-");
186	498	pasteIntoItem = menu.add(new MenuItem("Paste into"));
187	499	pasteIntoItem.addActionListener(this);
..	..	@@ -192,8 +504,8 @@
192	504	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
193	505	// pasteExpandItem.addActionListener(this);
194	506	menu.add("-");
195		- clearItem = menu.add(new MenuItem("Clear"));
196		- clearItem.addActionListener(this);
	507	+ deleteItem = menu.add(new MenuItem("Delete"));
	508	+ deleteItem.addActionListener(this);
197	509
198	510	if (Globals.ADVANCED)
199	511	{
..	..	@@ -201,14 +513,97 @@
201	513	clearAllItem = menu.add(new MenuItem("Clear All"));
202	514	clearAllItem.addActionListener(this);
203	515	}
	516	+
	517	+ menuBar.add(cameraMenu = new Menu("View"));
	518	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	519	+ //zBufferItem.addActionListener(this);
	520	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	521	+ //normalLensItem.addActionListener(this);
	522	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	523	+ restoreCameraItem.addActionListener(this);
	524	+
	525	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	526	+// toggleFullScreenItem.addItemListener(this);
	527	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	528	+// cameraMenu.add("-");
	529	+//
	530	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	531	+// toggleTextureItem.addItemListener(this);
	532	+// toggleTextureItem.setState(CameraPane.textureon);
	533	+//
	534	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	535	+// toggleSwitchItem.addItemListener(this);
	536	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	537	+
	538	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	539	+ toggleHandleItem.addItemListener(this);
	540	+ toggleHandleItem.setState(CameraPane.HANDLES);
	541	+
	542	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	543	+ togglePaintItem.addItemListener(this);
	544	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	545	+
	546	+ if (Globals.ADVANCED)
	547	+ {
	548	+ cameraMenu.add("-");
	549	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	550	+ toggleLiveItem.addItemListener(this);
	551	+ toggleLiveItem.setState(Globals.isLIVE());
204	552
	553	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	554	+ stepItem.addActionListener(this);
	555	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	556	+ // toggleDLItem.addItemListener(this);
	557	+ // toggleDLItem.setState(false);
	558	+
	559	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	560	+ toggleRenderItem.addItemListener(this);
	561	+ toggleRenderItem.setState(!CameraPane.frozen);
	562	+
	563	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	564	+ toggleDebugItem.addItemListener(this);
	565	+ toggleDebugItem.setState(Globals.DEBUG);
	566	+
	567	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	568	+ toggleFrustumItem.addItemListener(this);
	569	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	570	+
	571	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	572	+ toggleFootContactItem.addItemListener(this);
	573	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	574	+
	575	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	576	+ toggleTimelineItem.addItemListener(this);
	577	+ }
	578	+
	579	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	580	+// toggleRootItem.addItemListener(this);
	581	+// toggleRootItem.setState(false);
	582	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	583	+// animationItem.addItemListener(this);
	584	+// animationItem.setState(CameraPane.ANIMATION);
	585	+ cameraMenu.add("-");
	586	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	587	+ editCameraItem.addActionListener(this);
	588	+
	589	+ if (Globals.ADVANCED)
	590	+ {
	591	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	592	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	593	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	594	+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	595	+ oe.cameraMenu.add("-");
	596	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	597	+ openWindowItem.addActionListener(this);
	598	+ editLeafItem.addActionListener(this);
	599	+ lookAtItem.addActionListener(this);
	600	+ //lookFromItem.addActinoListener(this);
	601	+ //switchViewItem.addActionListener(this);
	602	+ }
	603	+
205	604	oe.menuBar.add(menu = new Menu("Setting"));
206	605	if (Globals.ADVANCED)
207	606	{
208		- resetMeshItem = menu.add(new MenuItem("Reset All"));
209		- resetMeshItem.addActionListener(this);
210		- stepAllItem = menu.add(new MenuItem("Step All"));
211		- stepAllItem.addActionListener(this);
212	607	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
213	608	revertMeshItem.addActionListener(this);
214	609	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
..	..	@@ -248,21 +643,29 @@
248	643	}
249	644
250	645	oe.menuBar.add(menu = new Menu("Group"));
251		- grabItem = menu.add(new MenuItem("Grab"));
252		- grabItem.addActionListener(this);
	646	+// grabItem = menu.add(new MenuItem("Grab"));
	647	+// grabItem.addActionListener(this);
253	648	backItem = menu.add(new MenuItem("Back"));
254	649	backItem.addActionListener(this);
255	650	frontItem = menu.add(new MenuItem("Front"));
256	651	frontItem.addActionListener(this);
257		- compositeItem = menu.add(new MenuItem("Composite"));
258		- compositeItem.addActionListener(this);
	652	+// compositeItem = menu.add(new MenuItem("Composite"));
	653	+// compositeItem.addActionListener(this);
	654	+
	655	+ if (Globals.ADVANCED)
	656	+ {
259	657	hideItem = menu.add(new MenuItem("Hidden Group"));
260	658	hideItem.addActionListener(this);
	659	+ }
261	660	ungroupItem = menu.add(new MenuItem("Ungroup"));
262	661	ungroupItem.addActionListener(this);
263		- menu.add("-");
264		- randomItem = menu.add(new MenuItem("Switch node"));
265		- randomItem.addActionListener(this);
	662	+
	663	+// menu.add("-");
	664	+//
	665	+// switchItem = menu.add(new MenuItem("Switch node"));
	666	+// switchItem.addActionListener(this);
	667	+ if (Globals.ADVANCED)
	668	+ {
266	669	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
267	670	switchGeoItem.addActionListener(this);
268	671	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -270,49 +673,52 @@
270	673	morphItem = menu.add(new MenuItem("Morph Group"));
271	674	morphItem.addActionListener(this);
272	675
273		- if (Globals.ADVANCED)
274		- {
	676	+ menu.add("-");
275	677	physicsItem = menu.add(new MenuItem("Physics"));
276	678	physicsItem.addActionListener(this);
277	679	frameselectorItem = menu.add(new MenuItem("Frame Selector"));
278	680	frameselectorItem.addActionListener(this);
279	681	scriptNodeItem = menu.add(new MenuItem("Script Node"));
280	682	scriptNodeItem.addActionListener(this);
281		- cameraItem = menu.add(new MenuItem("Camera"));
282		- cameraItem.addActionListener(this);
283	683	}
284	684
285	685	oe.menuBar.add(menu = new Menu("Object"));
286		- textureItem = menu.add(new MenuItem("Texture"));
287		- textureItem.addActionListener(this);
	686	+// textureItem = menu.add(new MenuItem("Texture"));
	687	+// textureItem.addActionListener(this);
288	688	billboardItem = menu.add(new MenuItem("Billboard"));
289	689	billboardItem.addActionListener(this);
290	690	csgItem = menu.add(new MenuItem("CSG"));
291	691	csgItem.addActionListener(this);
292		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	692	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
293	693	shadowXItem.addActionListener(this);
294		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	694	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
295	695	shadowYItem.addActionListener(this);
296		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	696	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
297	697	shadowZItem.addActionListener(this);
298		- if (Globals.ADVANCED)
299		- {
300		- linkerItem = menu.add(new MenuItem("Linker"));
301		- linkerItem.addActionListener(this);
302	698	attributeItem = menu.add(new MenuItem("Attribute"));
303	699	attributeItem.addActionListener(this);
	700	+
	701	+ if (Globals.ADVANCED)
	702	+ {
	703	+ menu.add("-");
	704	+ linkerItem = menu.add(new MenuItem("Linker"));
	705	+ linkerItem.addActionListener(this);
304	706	templateItem = menu.add(new MenuItem("Template"));
305	707	templateItem.addActionListener(this);
306	708	pointflowItem = menu.add(new MenuItem("Point Flow"));
307	709	pointflowItem.addActionListener(this);
308		- menu.add("-");
309	710	}
	711	+ menu.add("-");
310	712	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
311	713	resetTransformItem.addActionListener(this);
312	714	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
313	715	resetCentroidItem.addActionListener(this);
314		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
315		- transformgeometryItem.addActionListener(this);
	716	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	717	+ resetCentroidXZItem.addActionListener(this);
	718	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	719	+ transformGeometryItem.addActionListener(this);
	720	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	721	+ transformChildrenItem.addActionListener(this);
316	722
317	723	oe.menuBar.add(menu = new Menu("Geometry"));
318	724	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -325,7 +731,7 @@
325	731	genNormalsMESHItem.addActionListener(this);
326	732	if (Globals.ADVANCED)
327	733	{
328		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	734	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
329	735	genNormalsMINEItem.addActionListener(this);
330	736	}
331	737	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -361,6 +767,10 @@
361	767	oe.menuBar.add(menu = new Menu("Attributes"));
362	768	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
363	769	clearMaterialsItem.addActionListener(this);
	770	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	771	+ resetAllItem.addActionListener(this);
	772	+ stepAllItem = menu.add(new MenuItem("Step All"));
	773	+ stepAllItem.addActionListener(this);
364	774	menu.add("-");
365	775	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
366	776	liveleavesItem.addActionListener(this);
..	..	@@ -381,6 +791,14 @@
381	791	markleavesItem.addActionListener(this);
382	792	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
383	793	unmarkleavesItem.addActionListener(this);
	794	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	795	+ rewindleavesItem.addActionListener(this);
	796	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	797	+ unrewindleavesItem.addActionListener(this);
	798	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	799	+ randomleavesItem.addActionListener(this);
	800	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	801	+ unrandomleavesItem.addActionListener(this);
384	802	menu.add("-");
385	803	flipVItem = menu.add(new MenuItem("Flip V"));
386	804	flipVItem.addActionListener(this);
..	..	@@ -406,47 +824,56 @@
406	824	attachBumpItem.addActionListener(this);
407	825	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
408	826	pigmentBumpItem.addActionListener(this);
	827	+ //embedTexturesItem
409	828	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
410	829	detachPigmentItem.addActionListener(this);
411	830	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
412	831	detachBumpItem.addActionListener(this);
	832	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	833	+ embedTexturesItem.addActionListener(this);
	834	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	835	+ deEmbedTexturesItem.addActionListener(this);
413	836	menu.add("-");
414	837	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
415	838	sortbysizeItem.addActionListener(this);
416	839	sortbynameItem = menu.add(new MenuItem("Sort by name"));
417	840	sortbynameItem.addActionListener(this);
	841	+ menu.add("-");
	842	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	843	+ shareGeometriesItem.addActionListener(this);
	844	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	845	+ mergeGeometriesItem.addActionListener(this);
418	846	if (Globals.ADVANCED)
419	847	{
420		- menu.add("-");
	848	+ // Pretty much the same as duplicate and clone.
421	849	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
422	850	extractGeometriesItem.addActionListener(this);
423	851	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
424	852	cloneGeometriesItem.addActionListener(this);
425		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
426		- shareGeometriesItem.addActionListener(this);
427		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
428		- mergeGeometriesItem.addActionListener(this);
429	853	}
430	854
431	855	oe.menuBar.add(menu = new Menu("Insert"));
432	856	buildCreateMenu(menu);
433	857
434		- oe.menuBar.add(menu = new Menu("Include"));
435		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
436		- importGFDItem.addActionListener(this);
437		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
438		- importVRMLX3DItem.addActionListener(this);
439		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
440		- importOBJItem.addActionListener(this);
441		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
442		- import3DSItem.addActionListener(this);
443		-
444	858	oe.menuBar.add(menu = new Menu("Tools"));
445	859	buildToolsMenu(menu);
446	860	}
447	861
	862	+
448	863	void SetupUI2(ObjEditor oe)
449	864	{
	865	+ // June 2019
	866	+ if (oe == null)
	867	+ {
	868	+ //super.SetupUI2(this);
	869	+ //return;
	870	+ }
	871	+
	872	+ if (copy != group)
	873	+ {
	874	+ //super.SetupUI2(this);
	875	+ }
	876	+
450	877	//new Exception().printStackTrace();
451	878
452	879	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -475,97 +902,238 @@
475	902	oe.radioPanel.add(dummyButton);
476	903	oe.buttonGroup.add(dummyButton);
477	904	*/
	905	+ cGridBag copyOptionsPanel = new cGridBag();
	906	+
	907	+ copyOptionsPanel.preferredHeight = 2;
	908	+
478	909	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
479	910
480		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
481		- liveCB.setToolTipText("Enabled animation");
	911	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	912	+ //minButton.setToolTipText("Minimize window");
	913	+ //minButton.addActionListener(this);
	914	+
	915	+ if (Globals.ADVANCED)
	916	+ {
	917	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	918	+ maxButton.setToolTipText("Maximize window");
	919	+ maxButton.addActionListener(this);
	920	+ }
	921	+
	922	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	923	+ fullButton.setToolTipText("Full-screen window");
	924	+ fullButton.addActionListener(this);
	925	+
	926	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	927	+ screenfitButton.setToolTipText("Screen fit");
	928	+ screenfitButton.addActionListener(this);
	929	+
	930	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	931	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	932	+ restoreCameraButton.addActionListener(this);
	933	+
	934	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	935	+ saveButton.setToolTipText("New version");
	936	+ saveButton.addActionListener(this);
	937	+
	938	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	939	+ undoButton.setToolTipText("Previous version");
	940	+ undoButton.addActionListener(this);
	941	+ undoButton.setEnabled(false);
	942	+
	943	+ cGridBag updown = new cGridBag().setVertical(true);
	944	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	945	+ restoreButton.setToolTipText("Restore current");
	946	+ restoreButton.addActionListener(this);
	947	+ restoreButton.setEnabled(false);
	948	+
	949	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	950	+ replaceButton.setToolTipText("Replace current");
	951	+ replaceButton.addActionListener(this);
	952	+ replaceButton.setEnabled(false);
	953	+
	954	+ copyOptionsPanel.add(updown);
	955	+
	956	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	957	+ redoButton.setToolTipText("Next version");
	958	+ redoButton.addActionListener(this);
	959	+ redoButton.setEnabled(false);
	960	+
	961	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	962	+ liveCB.setToolTipText("Enable animation");
482	963	liveCB.addItemListener(this);
483	964
484		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	965	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
485	966	oneStepButton.setToolTipText("Animate one step forward");
486	967	oneStepButton.addActionListener(this);
487	968
488		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	969	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
489	970	fastCB.setToolTipText("Fast mode");
490	971	fastCB.addItemListener(this);
491	972
492		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
493		- trackCB.setToolTipText("Enable tracking");
494		- trackCB.addItemListener(this);
495		-
496		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
497		- screenfitButton.setToolTipText("Screen fit");
498		- screenfitButton.addActionListener(this);
	973	+ //oe.toolboxPanel.Return();
	974	+
	975	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	976	+// trackCB.setToolTipText("Enable tracking");
	977	+// trackCB.addItemListener(this);
499	978
500	979	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
501	980	// screenfitpointButton.addActionListener(this);
502	981
503	982	if (Globals.ADVANCED)
504	983	{
505		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	984	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
506	985	snapobjectButton.addActionListener(this);
507	986	snapobjectButton.setToolTipText("Snap Object");
	987	+
	988	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	989	+ fourButton.addActionListener(this);
	990	+ fourButton.setToolTipText("Show control panel only");
508	991	}
509	992
510		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
511		- flashSelectionButton.setToolTipText("Show selection");
512		- flashSelectionButton.addActionListener(this);
	993	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
513	994
514		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
515		-
516		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
517		- twoButton.setToolTipText("Show center view only");
	995	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	996	+ twoButton.setToolTipText("Show 3D view only");
518	997	twoButton.addActionListener(this);
519		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
520		- fourButton.addActionListener(this);
521		- fourButton.setToolTipText("Show left panel only");
522		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
523		- sixButton.setToolTipText("2-column layout left");
524		- sixButton.addActionListener(this);
525		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
526		- threeButton.setToolTipText("2-column layout right");
	998	+ this.fullscreenLayout = twoButton;
	999	+
	1000	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1001	+ threeButton.setToolTipText("Show controls and 3D view");
527	1002	threeButton.addActionListener(this);
528		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
529		- sevenButton.setToolTipText("3-column layout");
530		- sevenButton.addActionListener(this);
	1003	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1004	+ sixButton.setToolTipText("Show 3D view and controls");
	1005	+ sixButton.addActionListener(this);
	1006	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1007	+// sevenButton.setToolTipText("3-column layout");
	1008	+// sevenButton.addActionListener(this);
531	1009	//
532	1010
533		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
534		- rootButton.setToolTipText("Edit selection in new tab");
	1011	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1012	+ rootButton.setToolTipText("Open selection in new tab");
535	1013	rootButton.addActionListener(this);
536	1014
537		- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1015	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
538	1016	closeButton.setToolTipText("Close tab");
539	1017	closeButton.addActionListener(this);
540	1018	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
541	1019	//clearButton.addActionListener(this);
542		-
543		- cGridBag commandsPanel = new cGridBag();
	1020	+
	1021	+ cGridBag row1 = new cGridBag();
544	1022
545		- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
546		- editButton.setToolTipText("Edit selection");
	1023	+ // INSERT
	1024	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1025	+ gridButton.setToolTipText("Create grid");
	1026	+ gridButton.addActionListener(this);
	1027	+
	1028	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1029	+ boxButton.setToolTipText("Create box");
	1030	+ boxButton.addActionListener(this);
	1031	+
	1032	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1033	+ sphereButton.setToolTipText("Create sphere");
	1034	+ sphereButton.addActionListener(this);
	1035	+
	1036	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1037	+ coneButton.setToolTipText("Create cone");
	1038	+ coneButton.addActionListener(this);
	1039	+
	1040	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1041	+ torusButton.setToolTipText("Create torus");
	1042	+ torusButton.addActionListener(this);
	1043	+
	1044	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1045	+ superButton.setToolTipText("Create superellipsoid");
	1046	+ superButton.addActionListener(this);
	1047	+
	1048	+ if (Globals.ADVANCED)
	1049	+ {
	1050	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1051	+ kleinButton.setToolTipText("Create Klein bottle");
	1052	+ kleinButton.addActionListener(this);
	1053	+ }
	1054	+
	1055	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1056	+ particlesButton.setToolTipText("Create particle system");
	1057	+ particlesButton.addActionListener(this);
	1058	+
	1059	+ oe.toolboxPanel.add(row1);
	1060	+
	1061	+ cGridBag row2 = new cGridBag();
	1062	+
	1063	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1064	+ groupButton.setToolTipText("Create group");
	1065	+ groupButton.addActionListener(this);
	1066	+
	1067	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1068	+ compositeButton.setToolTipText("Create composite");
	1069	+ compositeButton.addActionListener(this);
	1070	+
	1071	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1072	+ switchButton.setToolTipText("Create item switcher");
	1073	+ switchButton.addActionListener(this);
	1074	+
	1075	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1076	+ loopButton.setToolTipText("Create loop");
	1077	+ loopButton.addActionListener(this);
	1078	+
	1079	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1080	+ textureButton.setToolTipText("Create texture");
	1081	+ textureButton.addActionListener(this);
	1082	+
	1083	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1084	+ overlayButton.setToolTipText("Create overlay");
	1085	+ overlayButton.addActionListener(this);
	1086	+
	1087	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1088	+ lightButton.setToolTipText("Create light");
	1089	+ lightButton.addActionListener(this);
	1090	+
	1091	+ oe.toolboxPanel.add(row2);
	1092	+
	1093	+ // ENVYMAPS
	1094	+ cGridBag skyboxpane = new cGridBag();
	1095	+ skyboxpane.preferredHeight = 100;
	1096	+
	1097	+ oe.toolboxPanel.add(skyboxpane);
	1098	+
	1099	+ JTabbedPane skyboxpanel = new JTabbedPane();
	1100	+ skyboxpane.add(skyboxpanel);
	1101	+
	1102	+ AddSkyboxTab0(skyboxpanel);
	1103	+ AddSkyboxTab1(skyboxpanel);
	1104	+ AddSkyboxTab2(skyboxpanel);
	1105	+ AddSkyboxTab3(skyboxpanel);
	1106	+
	1107	+ // EDIT panel
	1108	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1109	+ editButton.setToolTipText("Pin selection controls");
547	1110	editButton.addActionListener(this);
548	1111
549		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
550		- uneditButton.setToolTipText("Unedit selection");
	1112	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1113	+ uneditButton.setToolTipText("Remove selection controls");
551	1114	uneditButton.addActionListener(this);
552	1115
553		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
554		- allParamsButton.setToolTipText("Edit all params");
	1116	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1117	+ allParamsButton.setToolTipText("Show all controle");
555	1118	allParamsButton.addActionListener(this);
556	1119
557		- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1120	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
558	1121	clearPanelButton.setToolTipText("Clear edit panel");
559	1122	clearPanelButton.addActionListener(this);
560	1123
561		- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1124	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
562	1125	unselectButton.setToolTipText("Unselect");
563	1126	unselectButton.addActionListener(this);
564	1127
565		- commandsPanel.preferredHeight = 1;
	1128	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1129	+ flashSelectionButton.setToolTipText("Highlight selection");
	1130	+ flashSelectionButton.addActionListener(this);
566	1131
567		- oe.treePanel.add(commandsPanel);
568		- oe.treePanel.Return();
	1132	+ editCommandsPanel.preferredHeight = 1;
	1133	+
	1134	+ SetPinStates(false);
	1135	+// oe.treePanel.add(commandsPanel);
	1136	+// oe.treePanel.Return();
569	1137
570	1138	// oe.aConstraints.gridx += 1;
571	1139	// oe.aConstraints.weighty = 0;
..	..	@@ -582,32 +1150,20 @@
582	1150
583	1151	JScrollPane jSP;
584	1152	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
585		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1153	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
586	1154	ResetModel();
587	1155
588	1156	oe.treePanel.add(jSPPanel);
589	1157	oe.treePanel.Return();
590	1158
591		- cGridBag copyOptionsPanel = new cGridBag();
592		-
593		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
594		- colorCB.setToolTipText("Copy color when dropped");
595		- colorCB.addItemListener(this);
596		-
597		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
598		- materialCB.setToolTipText("Copy material when dropped");
599		- materialCB.addItemListener(this);
600		-
601		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
602		- textureCB.setToolTipText("Copy texture when dropped");
603		- textureCB.addItemListener(this);
604		-
605		- copyOptionsPanel.preferredHeight = 1;
606	1159	oe.treePanel.add(copyOptionsPanel);
607	1160	oe.treePanel.Return();
	1161	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1162	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1163	+ sliderPane.preferredHeight = 1;
608	1164
609		-// mainPanel.setDividerLocation(0.5); //1.0);
610		-// mainPanel.setResizeWeight(0.5);
	1165	+// mainPanel.setDividerLocation(0.1); //1.0);
	1166	+ mainPanel.setResizeWeight(0.4);
611	1167
612	1168	//jList.addListSelectionListener(this);
613	1169	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -615,7 +1171,7 @@
615	1171	//jTree.setEditable(true);
616	1172	oe.jTree.setDragEnabled(true);
617	1173	//jTree.setPreferredSize(new Dimension(10,10));
618		- jSP.setPreferredSize(new Dimension(100,200));
	1174	+ //jSP.setPreferredSize(new Dimension(100,200));
619	1175
620	1176	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
621	1177
..	..	@@ -627,29 +1183,49 @@
627	1183	dgr.addDragGestureListener(this);
628	1184	}catch(Exception e) {}
629	1185	*/
630		- radio.layout = sevenButton;
	1186	+ radio.layout = sixButton; // sevenButton;
631	1187	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
632	1188	}
633	1189
634	1190	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
635	1191	{
	1192	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1193	+ colorCB.setToolTipText("Copy color when dropped");
	1194	+ colorCB.addItemListener(this);
	1195	+
	1196	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1197	+ materialCB.setToolTipText("Copy material when dropped");
	1198	+ materialCB.addItemListener(this);
	1199	+
	1200	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1201	+ textureCB.setToolTipText("Copy texture when dropped");
	1202	+ textureCB.addItemListener(this);
	1203	+
	1204	+ panel.Return();
	1205	+
636	1206	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
637	1207	boxCB.setToolTipText("Display bounding boxes");
638	1208	boxCB.addItemListener(this);
639	1209
640	1210	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
641		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1211	+ zoomBoxCB.setToolTipText("Display only for wheel");
642	1212	zoomBoxCB.addItemListener(this);
643	1213
644		- if (Globals.ADVANCED)
	1214	+ if (true) // Globals.ADVANCED)
645	1215	{
646		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
647		- supportCB.setToolTipText("Enable rigging");
648		- supportCB.addItemListener(this);
	1216	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1217	+// supportCB.setToolTipText("Enable rigging");
	1218	+// supportCB.addItemListener(this);
	1219	+
	1220	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1221	+ freezeCB.setToolTipText("Fast moving camera");
	1222	+ freezeCB.addItemListener(this);
649	1223
650	1224	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
651	1225	// localCB.addItemListener(this);
652	1226
	1227	+ panel.Return();
	1228	+
653	1229	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
654	1230	crowdCB.setToolTipText("Used for crowds");
655	1231	crowdCB.addItemListener(this);
..	..	@@ -658,14 +1234,19 @@
658	1234	smoothCB.setToolTipText("Snapping delay");
659	1235	smoothCB.addItemListener(this);
660	1236
661		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
662		- slowCB.setToolTipText("Smooth interpolation");
663		- slowCB.addItemListener(this);
	1237	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1238	+// slowCB.setToolTipText("Smooth interpolation");
	1239	+// slowCB.addItemListener(this);
	1240	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1241	+ minshaderCB.setToolTipText("Minimal fast shader");
	1242	+ minshaderCB.addItemListener(this);
664	1243
665	1244	// constraints.gridy += 1;
666	1245	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
667	1246	// speakerMocapCB.addItemListener(this);
668	1247
	1248	+ panel.Return();
	1249	+
669	1250	if (false)
670	1251	{
671	1252	// handled in scripts
..	..	@@ -680,42 +1261,85 @@
680	1261	//constraints.gridy += 1;
681	1262	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
682	1263	smoothfocusCB.addItemListener(this);
	1264	+ panel.Return();
683	1265	}
684	1266
685	1267	//constraints.gridx += 1;
686	1268	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
687	1269	// debugCB.addItemListener(this);
688	1270
	1271	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1272	+ trackCB.setToolTipText("Enable tracking target");
	1273	+ trackCB.addItemListener(this);
	1274	+
689	1275	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1276	+ oeilCB.setToolTipText("Move camera when tracking");
690	1277	oeilCB.addItemListener(this);
691	1278
	1279	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1280	+ shadowCB.setToolTipText("When live compute shadows");
	1281	+ shadowCB.addItemListener(this);
	1282	+
	1283	+ panel.Return();
	1284	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1285	+ toggleTextureCB.setToolTipText("Load textures");
	1286	+ toggleTextureCB.addItemListener(this);
	1287	+
	1288	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1289	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1290	+ toggleSwitchCB.addItemListener(this);
	1291	+
	1292	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1293	+ autokeepCB.setToolTipText("On structure change");
	1294	+ autokeepCB.addItemListener(this);
	1295	+
	1296	+ panel.Return();
	1297	+ if (Globals.ADVANCED)
	1298	+ {
692	1299	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
693	1300	lookAtCB.setToolTipText("Look-at target");
694	1301	lookAtCB.addItemListener(this);
	1302	+ }
695	1303
696	1304	}
697	1305
698	1306	cGridBag fill = new cGridBag();
699		-
700	1307	fill.preferredHeight = 200;
	1308	+ cGridBag fill2 = new cGridBag();
	1309	+ fill2.preferredHeight = 200;
	1310	+ cGridBag fill3 = new cGridBag();
	1311	+ fill3.preferredHeight = 200;
701	1312
702	1313	panel.add(fill);
	1314	+ panel.add(fill2);
	1315	+ panel.add(fill3);
703	1316
704	1317	}
705	1318
706	1319	void EditObject(Object3D obj)
707	1320	{
708	1321	cRadio radioButton = new cRadio(obj.name);
	1322	+
	1323	+ // June 2019. Patch to avoid bug with transparency.
	1324	+ radioButton.hadMaterial = obj.material != null;
	1325	+ if (!radioButton.hadMaterial)
	1326	+ {
	1327	+ obj.material = new cMaterial();
	1328	+ }
	1329	+
709	1330	radioButton.SetObject(obj);
710		- radioButton.layout = sevenButton;
	1331	+ radioButton.layout = sixButton; // sevenButton;
711	1332	radioButton.SetCamera(cameraView.renderCamera, false);
712	1333	radioButton.addActionListener(this);
713	1334	radioPanel.add(radioButton);
714	1335	buttonGroup.add(radioButton);
715	1336	radioButton.doClick();
716	1337	}
	1338	+
717	1339	void SetupViews(ObjEditor oe)
718	1340	{
	1341	+ theFrame = this;
	1342	+
719	1343	oe.SetupViews();
720	1344
721	1345	System.out.println("SetupViews");
..	..	@@ -724,23 +1348,30 @@
724	1348	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
725	1349	}
726	1350
727		- JCheckBox liveCB;
728		- JCheckBox supportCB;
729		- JCheckBox localCB;
730		- JCheckBox crowdCB;
731		- JCheckBox smoothCB;
732		- JCheckBox fastCB;
733		- JCheckBox slowCB;
734		- JCheckBox boxCB;
735		- JCheckBox zoomBoxCB;
736		- JCheckBox trackCB;
737		- JCheckBox smoothfocusCB;
	1351	+ cToggleButton liveCB;
	1352	+ cCheckBox supportCB;
	1353	+ cCheckBox localCB;
	1354	+ cCheckBox crowdCB;
	1355	+ cCheckBox smoothCB;
	1356	+ cCheckBox minshaderCB;
	1357	+
	1358	+ cToggleButton fastCB;
	1359	+ cCheckBox slowCB;
	1360	+ cCheckBox boxCB;
	1361	+ cCheckBox zoomBoxCB;
	1362	+ cCheckBox freezeCB;
	1363	+ //cToggleButton trackCB;
	1364	+ cCheckBox trackCB;
	1365	+ cCheckBox smoothfocusCB;
738	1366	// JCheckBox speakerMocapCB;
739		- JCheckBox speakerCameraCB;
740		- JCheckBox speakerFocusCB;
741		- JCheckBox debugCB;
742		- JCheckBox oeilCB;
743		- JCheckBox lookAtCB;
	1367	+ cCheckBox speakerCameraCB;
	1368	+ cCheckBox speakerFocusCB;
	1369	+ cCheckBox debugCB;
	1370	+
	1371	+ cCheckBox oeilCB;
	1372	+ cCheckBox shadowCB;
	1373	+ cCheckBox autokeepCB;
	1374	+ cCheckBox lookAtCB;
744	1375
745	1376	// static int COLOR = 1;
746	1377	// static int MATERIAL = 2;
..	..	@@ -748,9 +1379,9 @@
748	1379
749	1380	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
750	1381
751		- JCheckBox colorCB;
752		- JCheckBox materialCB;
753		- JCheckBox textureCB;
	1382	+ cCheckBox colorCB;
	1383	+ cCheckBox materialCB;
	1384	+ cCheckBox textureCB;
754	1385
755	1386	public void itemStateChanged(ItemEvent e)
756	1387	{
..	..	@@ -778,6 +1409,7 @@
778	1409	} else if(e.getSource() == liveCB)
779	1410	{
780	1411	cameraView.ToggleLive();
	1412	+ refreshContents(false);
781	1413	}
782	1414	else if(e.getSource() == supportCB)
783	1415	{
..	..	@@ -793,6 +1425,12 @@
793	1425	{
794	1426	cameraView.ToggleInertia();
795	1427	cameraView.repaint();
	1428	+ }
	1429	+ else if(e.getSource() == minshaderCB)
	1430	+ {
	1431	+ Globals.MINSHADER ^= true;
	1432	+ cameraView.programInitialized = false;
	1433	+ cameraView.repaint();
796	1434	}
797	1435	else if(e.getSource() == localCB)
798	1436	{
..	..	@@ -842,6 +1480,18 @@
842	1480	{
843	1481	cameraView.ToggleOeil();
844	1482	}
	1483	+ else if(e.getSource() == shadowCB)
	1484	+ {
	1485	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1486	+ }
	1487	+ else if(e.getSource() == freezeCB)
	1488	+ {
	1489	+ Globals.FREEZEONMOVE ^= true;
	1490	+ }
	1491	+ else if(e.getSource() == autokeepCB)
	1492	+ {
	1493	+ Globals.REPLACEONMAKE ^= true;
	1494	+ }
845	1495	else if(e.getSource() == lookAtCB)
846	1496	{
847	1497	cameraView.ToggleLookAt();
..	..	@@ -858,7 +1508,8 @@
858	1508
859	1509	/**/
860	1510	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
861		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1511	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1512	+ TreePath path = objEditor.jTree.getSelectionPath();
862	1513	if ((path == null) \|\| (path.getPathCount() <= 1)) {
863	1514	// We can't move the root node or an empty selection
864	1515	return;
..	..	@@ -921,8 +1572,6 @@
921	1572	}
922	1573	}
923	1574
924		- String string = (String) object;
925		-
926	1575	System.out.println("Transfer = " + object + "; drop : " + target);
927	1576	// if( object instanceof java.io.File[])
928	1577	// {
..	..	@@ -930,7 +1579,11 @@
930	1579	// objEditor.DropFile((java.io.File[]) object, true);
931	1580	// return;
932	1581	// }
933		- if (string.charAt(0) == '/')
	1582	+
	1583	+ String string = object.toString();
	1584	+
	1585	+ // File path for Mac and Windows
	1586	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
934	1587	{
935	1588	// file(s)
936	1589	String[] names = string.split("\n");
..	..	@@ -957,7 +1610,7 @@
957	1610
958	1611	flashIt = false;
959	1612	CameraPane pane = (CameraPane) target;
960		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1613	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
961	1614	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
962	1615
963	1616	if (group.selection.size() == 1)
..	..	@@ -973,23 +1626,33 @@
973	1626
974	1627	assert target == objEditor.jTree;
975	1628	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1629	+ Object3D destinationLeaf;
976	1630	try {
977		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1631	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
978	1632	} catch (Exception e) {
979	1633	System.out.println("destinationPath : " + destinationPath);
980	1634	return;
981	1635	}
982	1636
983		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1637	+ for (int i=group.selection.size(); --i>=0;)
984	1638	{
	1639	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1640	+
	1641	+ // Cannot move into itself
	1642	+ if (child == destinationLeaf)
	1643	+ return;
	1644	+ }
	1645	+
	1646	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1647	+// {
985	1648	loadClipboard(true);
986	1649	objEditor.jTree.setSelectionPath(destinationPath);
987	1650	pasteInto(false, false);
988		- } else {
989		- loadClipboard(false);
990		- objEditor.jTree.setSelectionPath(destinationPath);
991		- pasteInto(false, false); // true); // ???
992		- }
	1651	+// } else {
	1652	+// loadClipboard(false);
	1653	+// objEditor.jTree.setSelectionPath(destinationPath);
	1654	+// pasteInto(false, false); // true); // ???
	1655	+// }
993	1656	}
994	1657	public void dropActionChanged(DropTargetDragEvent dtde)
995	1658	// Called if the user has modified the current drop gesture
..	..	@@ -1094,22 +1757,30 @@
1094	1757	{
1095	1758	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1096	1759	//heightFieldItem.addActionListener(this);
1097		- gridItem = menu.add(new MenuItem("Grid"));
1098		- gridItem.addActionListener(this);
1099		- rectoidItem = menu.add(new MenuItem("Box"));
1100		- rectoidItem.addActionListener(this);
1101		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1102		- ellipsoidItem.addActionListener(this);
1103		- coneItem = menu.add(new MenuItem("Cone"));
1104		- coneItem.addActionListener(this);
1105		- torusItem = menu.add(new MenuItem("Torus"));
1106		- torusItem.addActionListener(this);
1107		- superItem = menu.add(new MenuItem("Superellipsoid"));
1108		- superItem.addActionListener(this);
	1760	+// gridItem = menu.add(new MenuItem("Grid"));
	1761	+// gridItem.addActionListener(this);
	1762	+// rectoidItem = menu.add(new MenuItem("Box"));
	1763	+// rectoidItem.addActionListener(this);
	1764	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1765	+// ellipsoidItem.addActionListener(this);
	1766	+// coneItem = menu.add(new MenuItem("Cone"));
	1767	+// coneItem.addActionListener(this);
	1768	+// torusItem = menu.add(new MenuItem("Torus"));
	1769	+// torusItem.addActionListener(this);
	1770	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1771	+// superItem.addActionListener(this);
	1772	+
	1773	+ cameraItem = menu.add(new MenuItem("Camera"));
	1774	+ cameraItem.addActionListener(this);
	1775	+
	1776	+ if (!Globals.ADVANCED)
	1777	+ {
1109	1778	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1110	1779	kleinItem.addActionListener(this);
1111		- particleItem = menu.add(new MenuItem("Particle system"));
1112		- particleItem.addActionListener(this);
	1780	+ }
	1781	+
	1782	+// particleItem = menu.add(new MenuItem("Particle system"));
	1783	+// particleItem.addActionListener(this);
1113	1784	if (Globals.ADVANCED)
1114	1785	{
1115	1786	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1135,15 +1806,15 @@
1135	1806	}
1136	1807	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1137	1808	bezierItem.addActionListener(this);
1138		- overlayItem = menu.add(new MenuItem("Overlay"));
1139		- overlayItem.addActionListener(this);
1140		- lightItem = menu.add(new MenuItem("Light"));
1141		- lightItem.addActionListener(this);
	1809	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1810	+// overlayItem.addActionListener(this);
	1811	+// lightItem = menu.add(new MenuItem("Light"));
	1812	+// lightItem.addActionListener(this);
1142	1813	menu.add("-");
1143	1814	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1144	1815	//superLoopItem.addActionListener(this);
1145		- loopItem = menu.add(new MenuItem("Loop"));
1146		- loopItem.addActionListener(this);
	1816	+// loopItem = menu.add(new MenuItem("Loop"));
	1817	+// loopItem.addActionListener(this);
1147	1818	doubleItem = menu.add(new MenuItem("Fork"));
1148	1819	doubleItem.addActionListener(this);
1149	1820	if (Globals.ADVANCED)
..	..	@@ -1159,18 +1830,23 @@
1159	1830	animationItem.addItemListener(this);
1160	1831	animationItem.setState(Globals.ANIMATION);
1161	1832
	1833	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1834	+ archiveItem.addActionListener(this);
	1835	+
1162	1836	menu.add("-");
1163	1837	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1164	1838	parseverticesItem.addActionListener(this);
1165	1839	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1166	1840	textureFieldItem.addActionListener(this);
1167		- alignItem = menu.add(new MenuItem("Align Object"));
	1841	+ alignItem = menu.add(new MenuItem("Align Objects"));
1168	1842	alignItem.addActionListener(this);
1169	1843	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1170	1844	reduceMorphItem.addActionListener(this);
1171	1845	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1172	1846	reduce34MorphItem.addActionListener(this);
1173		-
	1847	+ menu.add("-");
	1848	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1849	+ memoryItem.addActionListener(this);
1174	1850	menu.add(computeAOItem = new MenuItem("Compute AO"));
1175	1851	computeAOItem.addActionListener(this);
1176	1852
..	..	@@ -1179,11 +1855,9 @@
1179	1855	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1180	1856	mirrorItem.addActionListener(this);
1181	1857	menu.add("-");
1182		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1183		- memoryItem.addActionListener(this);
1184	1858	menu.add(analyzeItem = new MenuItem("Analyze"));
1185	1859	analyzeItem.addActionListener(this);
1186		- menu.add(dumpItem = new MenuItem("Dump"));
	1860	+ menu.add(dumpItem = new MenuItem("Print"));
1187	1861	dumpItem.addActionListener(this);
1188	1862	// menu.add(pathItem = new MenuItem("From-to path"));
1189	1863	// pathItem.addActionListener(this);
..	..	@@ -1324,9 +1998,34 @@
1324	1998	shadow.material = new cMaterial(obj.material);
1325	1999	shadow.material.diffuse = 0.0001f;
1326	2000	shadow.material.specular = 0.0001f;
	2001	+ //shadow.projectedVertices[1].x = 300;
1327	2002
1328	2003	makeSomething(shadow);
1329	2004	}
	2005	+
	2006	+ private void ClearUnpinned()
	2007	+ {
	2008	+ //for (Object3D obj : listUI)
	2009	+ for (int i=listUI.size(); --i>=0;)
	2010	+ {
	2011	+ Object3D obj = listUI.elementAt(i);
	2012	+ if (!obj.pinned)
	2013	+ {
	2014	+ obj.CloseUI();
	2015	+ listUI.remove(i);
	2016	+ }
	2017	+ }
	2018	+ }
	2019	+
	2020	+ private void EditElement(Object3D elem, boolean newWindow)
	2021	+ {
	2022	+ // if (!(elem instanceof Composite))
	2023	+ // newWindow = false;
	2024	+ listUI.add(elem);
	2025	+ elem.openEditWindow(this, newWindow); //, false);
	2026	+ System.out.println("edit : " + elem);
	2027	+ elem.editWindow.refreshContents(true); // ? new
	2028	+ }
1330	2029
1331	2030	/**
1332	2031	* applyExample
..	..	@@ -1530,9 +2229,9 @@
1530	2229
1531	2230	void Overwrite(int mask)
1532	2231	{
1533		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2232	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1534	2233	{
1535		- Object3D content = GrafreeD.clipboard.get(0);
	2234	+ Object3D content = Grafreed.clipboard.get(0);
1536	2235
1537	2236	if (content instanceof cGroup && ((cGroup)content).transientlink )
1538	2237	content = ((cGroup)content).get(0);
..	..	@@ -1571,7 +2270,7 @@
1571	2270	{
1572	2271	ScreenFit();
1573	2272	} else
1574		- if (source == switchItem)
	2273	+ if (source == switchViewItem)
1575	2274	{
1576	2275	cVector v1 = new cVector();
1577	2276	cVector v2 = new cVector();
..	..	@@ -1580,11 +2279,11 @@
1580	2279	objEditor.cameraView.renderCamera.setAim(v2, v1);
1581	2280	objEditor.cameraView.repaint();
1582	2281	} else
1583		- if (source == rectoidItem)
	2282	+ if (source == rectoidItem \|\| source == boxButton)
1584	2283	{
1585	2284	makeSomething(new Box());
1586	2285	} else
1587		- if (source == particleItem)
	2286	+ if (source == particleItem \|\| source == particlesButton)
1588	2287	{
1589	2288	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1590	2289	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1663,27 +2362,27 @@
1663	2362
1664	2363	makeSomething(obj);
1665	2364	} else
1666		- if (source == gridItem)
	2365	+ if (source == gridItem \|\| source == gridButton)
1667	2366	{
1668	2367	makeSomething(new Grid());
1669	2368	} else
1670		- if (source == ellipsoidItem)
	2369	+ if (source == ellipsoidItem \|\| source == sphereButton)
1671	2370	{
1672	2371	makeSomething(new Sphere());
1673	2372	} else
1674		- if (source == coneItem)
	2373	+ if (source == coneItem \|\| source == coneButton)
1675	2374	{
1676	2375	makeSomething(new Cone());
1677	2376	} else
1678		- if (source == torusItem)
	2377	+ if (source == torusItem \|\| source == torusButton)
1679	2378	{
1680	2379	makeSomething(new Torus());
1681	2380	} else
1682		- if (source == superItem)
	2381	+ if (source == superItem \|\| source == superButton)
1683	2382	{
1684	2383	makeSomething(new Superellipsoid());
1685	2384	} else
1686		- if (source == kleinItem)
	2385	+ if (source == kleinItem \|\| source == kleinButton)
1687	2386	{
1688	2387	makeSomething(new Klein());
1689	2388	} else
..	..	@@ -1703,7 +2402,7 @@
1703	2402	{
1704	2403	makeSomething(new BezierSurface());
1705	2404	} else
1706		- if (source == overlayItem)
	2405	+ if (source == overlayItem \|\| source == overlayButton)
1707	2406	{
1708	2407	/*
1709	2408	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1751,10 +2450,27 @@
1751	2450	s.setup();
1752	2451	makeSomething(s);
1753	2452	} else
1754		- if (source == lightItem)
	2453	+ if (source == lightItem \|\| source == lightButton)
1755	2454	{
1756	2455	makeSomething(new Light());
1757	2456	} else
	2457	+// if (source == skybox1Button \|\|
	2458	+// source == skybox2Button \|\|
	2459	+// source == skybox3Button \|\|
	2460	+// source == skybox4Button \|\|
	2461	+// source == skybox5Button \|\|
	2462	+// source == skybox6Button \|\|
	2463	+// source == skybox7Button \|\|
	2464	+// source == skybox11Button \|\|
	2465	+// source == skybox12Button \|\|
	2466	+// source == skybox13Button \|\|
	2467	+// source == skybox14Button \|\|
	2468	+// source == skybox15Button \|\|
	2469	+// source == skybox16Button \|\|
	2470	+// source == skybox17Button)
	2471	+// {
	2472	+// ChangeSkybox(source);
	2473	+// } else
1758	2474	if (source == csgItem)
1759	2475	{
1760	2476	group(new CSG());
..	..	@@ -1801,30 +2517,30 @@
1801	2517
1802	2518	group(g);
1803	2519	} else
1804		- if (source == loopItem)
	2520	+ if (source == loopItem \|\| source == loopButton)
1805	2521	{
1806	2522	Composite csg = new GroupLeaf();
1807	2523	csg.count = 5;
1808	2524	group(csg);
1809		- Composite child = new cGroup();
	2525	+ Composite child = new cGroup("Branch");
1810	2526	csg.addChild(child);
1811	2527	child.addChild(csg);
1812	2528	} else
1813	2529	if (source == doubleItem)
1814	2530	{
1815		- Composite csg = new GroupLeaf();
	2531	+ Composite csg = new GroupLeaf("Fork");
1816	2532	csg.count = 5;
1817	2533	group(csg);
1818		- Composite child = new cGroup();
	2534	+ Composite child = new cGroup("Branch A");
1819	2535	csg.addChild(child);
1820	2536	child.addChild(csg);
1821		- child = new cGroup();
	2537	+ child = new cGroup("Branch B");
1822	2538	csg.addChild(child);
1823	2539	child.addChild(csg);
1824	2540	} else
1825	2541	if (source == tripleItem)
1826	2542	{
1827		- Composite csg = new GroupLeaf();
	2543	+ Composite csg = new GroupLeaf("Trident");
1828	2544	csg.count = 4;
1829	2545	group(csg);
1830	2546	Composite child = new cGroup();
..	..	@@ -1837,27 +2553,10 @@
1837	2553	csg.addChild(child);
1838	2554	child.addChild(csg);
1839	2555	} else
1840		-
1841		- if (source == importGFDItem)
1842		- {
1843		- ImportGFD();
1844		- } else
1845		- if (source == importVRMLX3DItem)
1846		- {
1847		- ImportVRMLX3D();
1848		- } else
1849		- if (source == import3DSItem)
1850		- {
1851		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1852		- } else
1853		- if (source == importOBJItem)
1854		- {
1855		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1856		- } else
1857	2556	if (source == computeAOItem)
1858	2557	{
1859	2558	Globals.drawMode = CameraPane.OCCLUSION;
1860		- Globals.theRenderer.repaint();
	2559	+ cameraView.repaint();
1861	2560	} else
1862	2561	if (source == recompileItem)
1863	2562	{
..	..	@@ -1872,7 +2571,7 @@
1872	2571	if (source == invariantsItem)
1873	2572	{
1874	2573	System.out.println("Invariants:");
1875		- GrafreeD.grafreeD.universe.invariants();
	2574	+ Grafreed.grafreeD.universe.invariants();
1876	2575	} else
1877	2576	if (source == memoryItem)
1878	2577	{
..	..	@@ -1891,6 +2590,46 @@
1891	2590	{
1892	2591	DumpObject();
1893	2592	} else
	2593	+ if (source == minButton)
	2594	+ {
	2595	+ Minimize();
	2596	+ } else
	2597	+ if (source == maxButton)
	2598	+ {
	2599	+ Maximize();
	2600	+ } else
	2601	+ if (source == fullButton)
	2602	+ {
	2603	+ ToggleFullScreen();
	2604	+ } else
	2605	+ if (source == undoButton)
	2606	+ {
	2607	+ // Go to previous version
	2608	+ //if (!Undo())
	2609	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2610	+ Undo();
	2611	+ } else
	2612	+ if (source == restoreButton)
	2613	+ {
	2614	+ // Restore current version
	2615	+ Restore();
	2616	+ } else
	2617	+ if (source == replaceButton)
	2618	+ {
	2619	+ // Overwrite current version
	2620	+ Replace();
	2621	+ } else
	2622	+ if (source == redoButton)
	2623	+ {
	2624	+ // Go to next version
	2625	+ Redo();
	2626	+ } else
	2627	+ if (source == saveButton)
	2628	+ {
	2629	+ // Save a new version
	2630	+ if (!Save(true))
	2631	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2632	+ } else
1894	2633	if (source == oneStepButton)
1895	2634	{
1896	2635	Globals.ONESTEP = true;
..	..	@@ -1898,17 +2637,14 @@
1898	2637	} else
1899	2638	if (source == screenfitButton)
1900	2639	{
1901		- //Reload(lastConverter, lastFilename, true);
1902	2640	ScreenFit();
1903	2641	} else
1904	2642	if (source == screenfitpointButton)
1905	2643	{
1906		- //Reload(lastConverter, lastFilename, true);
1907	2644	ScreenFitPoint();
1908	2645	} else
1909	2646	if (source == snapobjectButton)
1910	2647	{
1911		- //Reload(lastConverter, lastFilename, true);
1912	2648	SnapObject();
1913	2649	} else
1914	2650	// if (event.getSource() == recompileButton)
..	..	@@ -1945,12 +2681,20 @@
1945	2681	{
1946	2682	loadClipboard(true);
1947	2683	} else
	2684	+ if (source == undoItem)
	2685	+ {
	2686	+ Undo();
	2687	+ } else
	2688	+ if (source == redoItem)
	2689	+ {
	2690	+ Redo();
	2691	+ } else
1948	2692	if (source == duplicateItem)
1949	2693	{
1950		- Object3D keep = GrafreeD.clipboard;
	2694	+ Object3D keep = Grafreed.clipboard;
1951	2695	loadClipboard(false);
1952	2696	paste(false);
1953		- GrafreeD.clipboard = keep;
	2697	+ Grafreed.clipboard = keep;
1954	2698	} else
1955	2699	if (source == cloneItem)
1956	2700	{
..	..	@@ -2170,9 +2914,9 @@
2170	2914	// group.selection.get(0).setMasterThis(content); // should be identity
2171	2915	// refreshContents();
2172	2916	// }
2173		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2917	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2174	2918	{
2175		- Object3D content = GrafreeD.clipboard.get(0);
	2919	+ Object3D content = Grafreed.clipboard.get(0);
2176	2920
2177	2921	if (content instanceof cGroup && ((cGroup)content).transientlink )
2178	2922	content = ((cGroup)content).get(0);
..	..	@@ -2222,9 +2966,9 @@
2222	2966	} else
2223	2967	if (source == setMasterItem)
2224	2968	{
2225		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2969	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2226	2970	{
2227		- Object3D content = GrafreeD.clipboard.get(0);
	2971	+ Object3D content = Grafreed.clipboard.get(0);
2228	2972
2229	2973	if (content instanceof cGroup && ((cGroup)content).transientlink )
2230	2974	content = ((cGroup)content).get(0);
..	..	@@ -2237,9 +2981,9 @@
2237	2981	{
2238	2982	if (group.selection.size() == 1)
2239	2983	{
2240		- if (GrafreeD.clipboard.size() == 1)
	2984	+ if (Grafreed.clipboard.size() == 1)
2241	2985	{
2242		- Object3D content = GrafreeD.clipboard.get(0);
	2986	+ Object3D content = Grafreed.clipboard.get(0);
2243	2987
2244	2988	if (content instanceof cGroup && ((cGroup)content).transientlink )
2245	2989	content = ((cGroup)content).get(0);
..	..	@@ -2256,7 +3000,7 @@
2256	3000	{
2257	3001	RevertMeshes();
2258	3002	} else
2259		- if (source == resetMeshItem)
	3003	+ if (source == resetAllItem)
2260	3004	{
2261	3005	ResetAll();
2262	3006	} else
..	..	@@ -2264,7 +3008,7 @@
2264	3008	{
2265	3009	StepAll();
2266	3010	} else
2267		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3011	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2268	3012	{
2269	3013	//int indices[] = jList.getSelectedIndices();
2270	3014	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2276,9 +3020,9 @@
2276	3020	{
2277	3021	ClearSelection(true);
2278	3022	} else
2279		- if (source == grabItem)
	3023	+ if (source == grabItem \|\| source == groupButton)
2280	3024	{
2281		- group(new cGroup(), true);
	3025	+ group(new cGroup(), false); // true);
2282	3026	} else
2283	3027	if (source == hideItem)
2284	3028	{
..	..	@@ -2296,11 +3040,11 @@
2296	3040	{
2297	3041	makeSomething(new Camera());
2298	3042	} else
2299		- if (source == compositeItem)
	3043	+ if (source == compositeItem \|\| source == compositeButton)
2300	3044	{
2301	3045	group(new Composite());
2302	3046	} else
2303		- if (source == randomItem)
	3047	+ if (source == switchItem \|\| source == switchButton)
2304	3048	{
2305	3049	RandomNode random = new RandomNode();
2306	3050	group(random);
..	..	@@ -2402,7 +3146,7 @@
2402	3146	{
2403	3147	group(new cLinker());
2404	3148	} else
2405		- if (source == textureItem)
	3149	+ if (source == textureItem \|\| source == textureButton)
2406	3150	{
2407	3151	group(new TextureNode());
2408	3152	} else
..	..	@@ -2422,17 +3166,30 @@
2422	3166	{
2423	3167	CastShadow(2);
2424	3168	} else
2425		- if (source == ungroupItem)
	3169	+ if (source == ungroupItem \|\| source == ungroupButton)
2426	3170	{
2427		- //ungroup();
	3171	+ boolean hasRoot = false;
	3172	+
2428	3173	for (int i=0; i<group.selection.size(); i++)
2429	3174	{
2430		- Ungroup(group.selection.get(i));
	3175	+ if (group.selection.get(i) == group)
	3176	+ {
	3177	+ hasRoot = true;
	3178	+ break;
	3179	+ }
2431	3180	}
2432	3181
2433		- ClearSelection(false);
2434		-
2435		- refreshContents();
	3182	+ if (!hasRoot)
	3183	+ {
	3184	+ for (int i=0; i<group.selection.size(); i++)
	3185	+ {
	3186	+ Ungroup(group.selection.get(i));
	3187	+ }
	3188	+
	3189	+ ClearSelection(false);
	3190	+
	3191	+ refreshContents();
	3192	+ }
2436	3193	} else
2437	3194	if (source == genUVItem)
2438	3195	{
..	..	@@ -2444,7 +3201,7 @@
2444	3201	} else
2445	3202	if (source == genNormalsMESHItem)
2446	3203	{
2447		- GenNormals(true); // TODO
	3204	+ GenNormalsMESH();
2448	3205	} else
2449	3206	if (source == genNormalsORGANItem)
2450	3207	{
..	..	@@ -2509,6 +3266,22 @@
2509	3266	if (source == unmarkleavesItem)
2510	3267	{
2511	3268	MarkLeaves(false);
	3269	+ } else
	3270	+ if (source == rewindleavesItem)
	3271	+ {
	3272	+ RewindLeaves(true);
	3273	+ } else
	3274	+ if (source == unrewindleavesItem)
	3275	+ {
	3276	+ RewindLeaves(false);
	3277	+ } else
	3278	+ if (source == randomleavesItem)
	3279	+ {
	3280	+ RandomLeaves(true);
	3281	+ } else
	3282	+ if (source == unrandomleavesItem)
	3283	+ {
	3284	+ RandomLeaves(false);
2512	3285	} else
2513	3286	if (source == flipVItem)
2514	3287	{
..	..	@@ -2594,9 +3367,13 @@
2594	3367	{
2595	3368	SmoothMesh();
2596	3369	} else
2597		- if (source == transformgeometryItem)
	3370	+ if (source == transformGeometryItem)
2598	3371	{
2599	3372	TransformGeometry();
	3373	+ } else
	3374	+ if (source == transformChildrenItem)
	3375	+ {
	3376	+ TransformChildren();
2600	3377	} else
2601	3378	if (source == resetTransformItem)
2602	3379	{
..	..	@@ -2604,7 +3381,11 @@
2604	3381	} else
2605	3382	if (source == resetCentroidItem)
2606	3383	{
2607		- ResetCentroid();
	3384	+ ResetCentroid(true);
	3385	+ } else
	3386	+ if (source == resetCentroidXZItem)
	3387	+ {
	3388	+ ResetCentroid(false);
2608	3389	} else
2609	3390	if (source == resetParentItem)
2610	3391	{
..	..	@@ -2709,7 +3490,7 @@
2709	3490	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2710	3491	{
2711	3492	obj = (Object3D)e.nextElement();
2712		- obj.SetBumpTexture(null);
	3493	+ obj.ResetBumpTexture();
2713	3494	}
2714	3495
2715	3496	refreshContents();
..	..	@@ -2725,6 +3506,31 @@
2725	3506
2726	3507	refreshContents();
2727	3508	} else
	3509	+ if (source == embedTexturesItem)
	3510	+ {
	3511	+ Object3D obj;
	3512	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3513	+ {
	3514	+ obj = (Object3D)e.nextElement();
	3515	+ obj.EmbedTextures(true);
	3516	+ }
	3517	+
	3518	+ refreshContents();
	3519	+ } else
	3520	+ if (source == deEmbedTexturesItem)
	3521	+ {
	3522	+ Object3D obj;
	3523	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3524	+ {
	3525	+ obj = (Object3D)e.nextElement();
	3526	+ obj.EmbedTextures(false);
	3527	+ }
	3528	+
	3529	+ CameraPane.texturepigment.clear();
	3530	+ CameraPane.texturebump.clear();
	3531	+
	3532	+ refreshContents();
	3533	+ } else
2728	3534	if (source == flashSelectionButton)
2729	3535	{
2730	3536	CameraPane.flash = true;
..	..	@@ -2736,6 +3542,10 @@
2736	3542	if (source == twoButton)
2737	3543	{
2738	3544	radio.layout = twoButton;
	3545	+
	3546	+ if (CameraPane.FULLSCREEN)
	3547	+ fullscreenLayout = radio.layout;
	3548	+
2739	3549	// bug
2740	3550	//gridPanel.setDividerLocation(1.0);
2741	3551	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2768,10 +3578,31 @@
2768	3578	bigThree.ClearUI();
2769	3579	bigThree.add(centralPanel);
2770	3580	bigThree.FlushUI();
	3581	+
	3582	+ cameraView.requestFocusInWindow();
	3583	+
	3584	+// refreshContents(true);
	3585	+//
	3586	+// try
	3587	+// {
	3588	+// java.awt.Robot bot = new java.awt.Robot();
	3589	+// int mask = InputEvent.BUTTON1_MASK;
	3590	+// bot.mouseMove(100, 100);
	3591	+// bot.mousePress(mask);
	3592	+// bot.mouseRelease(mask);
	3593	+// }
	3594	+// catch (Exception e)
	3595	+// {
	3596	+//
	3597	+// }
	3598	+
2771	3599	} else
2772	3600	if (source == threeButton)
2773	3601	{
2774	3602	radio.layout = threeButton;
	3603	+
	3604	+ if (CameraPane.FULLSCREEN)
	3605	+ fullscreenLayout = radio.layout;
2775	3606
2776	3607	// bigThree.remove(scenePanel);
2777	3608	// bigThree.remove(centralPanel);
..	..	@@ -2801,13 +3632,18 @@
2801	3632	// centralPanel.setVisible(true);
2802	3633	// XYZPanel.setVisible(true);
2803	3634	bigThree.ClearUI();
	3635	+ bigThree.add(scenePanel);
2804	3636	bigThree.add(centralPanel);
2805		- bigThree.add(XYZPanel);
2806	3637	bigThree.FlushUI();
	3638	+
	3639	+ cameraView.requestFocusInWindow();
2807	3640	} else
2808	3641	if (source == fourButton)
2809	3642	{
2810	3643	radio.layout = fourButton;
	3644	+
	3645	+ if (CameraPane.FULLSCREEN)
	3646	+ fullscreenLayout = radio.layout;
2811	3647
2812	3648	// bigThree.remove(scenePanel);
2813	3649	// bigThree.remove(centralPanel);
..	..	@@ -2839,10 +3675,15 @@
2839	3675	bigThree.ClearUI();
2840	3676	bigThree.add(scenePanel);
2841	3677	bigThree.FlushUI();
	3678	+
	3679	+ cameraView.requestFocusInWindow();
2842	3680	} else
2843	3681	if (source == sixButton)
2844	3682	{
2845	3683	radio.layout = sixButton;
	3684	+
	3685	+ if (CameraPane.FULLSCREEN)
	3686	+ fullscreenLayout = radio.layout;
2846	3687
2847	3688	// bigThree.remove(scenePanel);
2848	3689	// bigThree.remove(centralPanel);
..	..	@@ -2872,13 +3713,18 @@
2872	3713	// centralPanel.setVisible(true);
2873	3714	// XYZPanel.setVisible(false);
2874	3715	bigThree.ClearUI();
2875		- bigThree.add(scenePanel);
2876	3716	bigThree.add(centralPanel);
	3717	+ bigThree.add(scenePanel);
2877	3718	bigThree.FlushUI();
	3719	+
	3720	+ cameraView.requestFocusInWindow();
2878	3721	} else
2879	3722	if (source == sevenButton)
2880	3723	{
2881	3724	radio.layout = sevenButton;
	3725	+
	3726	+ if (CameraPane.FULLSCREEN)
	3727	+ fullscreenLayout = radio.layout;
2882	3728
2883	3729	// bigThree.remove(scenePanel);
2884	3730	// bigThree.remove(centralPanel);
..	..	@@ -2912,6 +3758,8 @@
2912	3758	bigThree.add(centralPanel);
2913	3759	bigThree.add(XYZPanel);
2914	3760	bigThree.FlushUI();
	3761	+
	3762	+ cameraView.requestFocusInWindow();
2915	3763	} else
2916	3764	if (source == rootButton)
2917	3765	{
..	..	@@ -2923,6 +3771,7 @@
2923	3771	EditObject(obj);
2924	3772	}
2925	3773
	3774	+ cameraView.requestFocusInWindow();
2926	3775	refreshContents(true);
2927	3776	} else
2928	3777	if (source == closeButton)
..	..	@@ -2932,22 +3781,37 @@
2932	3781	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2933	3782	{
2934	3783	ab = (cRadio)e.nextElement();
2935		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3784	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2936	3785	{
	3786	+ // Patch to avoid bug with transparency.
	3787	+ if (!ab.hadMaterial)
	3788	+ {
	3789	+ ab.object.material = null;
	3790	+ }
	3791	+
2937	3792	buttonGroup.remove(ab);
2938	3793	radioPanel.remove(ab);
2939	3794
2940		- ab.GetObject().editWindow = null;
	3795	+ //ab.GetObject().editWindow = null;
	3796	+ ab.GetObject().manipWindow = null;
2941	3797	// ab.GetObject().objectUI = null; // ?????????
2942	3798
2943	3799	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2944	3800	break;
2945	3801	}
2946	3802	}
	3803	+
	3804	+ cameraView.requestFocusInWindow();
2947	3805	refreshContents(true);
2948	3806	} else
2949	3807	if (source == editItem \|\| source == editButton)
2950	3808	{
	3809	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3810	+ {
	3811	+ Object3D child = (Object3D)e.nextElement();
	3812	+ child.pinned = true;
	3813	+ }
	3814	+
2951	3815	EditSelection(false);
2952	3816	} else
2953	3817	if (source == uneditButton)
..	..	@@ -2957,10 +3821,11 @@
2957	3821	Object3D child = (Object3D)e.nextElement();
2958	3822	if(child.editWindow != null)
2959	3823	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3824	+ child.pinned = false;
2960	3825	child.CloseUI();
2961	3826	listUI.remove(child);
2962	3827
2963		- child.editWindow = null; // ???????????
	3828	+ //child.editWindow = null; // ???????????
2964	3829	}
2965	3830	objEditor.ctrlPanel.FlushUI();
2966	3831	//objEditor.jTree.clearSelection();
..	..	@@ -2973,6 +3838,7 @@
2973	3838	//copy.ClearUI();
2974	3839	for (Object3D obj : listUI)
2975	3840	{
	3841	+ obj.pinned = false;
2976	3842	obj.CloseUI();
2977	3843	}
2978	3844	listUI.clear();
..	..	@@ -2982,7 +3848,7 @@
2982	3848	{
2983	3849	assert(copy == group);
2984	3850
2985		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3851	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2986	3852
2987	3853	for (Object3D obj : listUI)
2988	3854	{
..	..	@@ -3031,6 +3897,9 @@
3031	3897	}
3032	3898
3033	3899	copy = group;
	3900	+
	3901	+ SetUndoStates();
	3902	+
3034	3903	//Globals.theRenderer.object = group;
3035	3904	if(!useclient)
3036	3905	{
..	..	@@ -3046,20 +3915,46 @@
3046	3915	frontView.object = group;
3047	3916	sideView.object = group;
3048	3917	}
3049		- group.editWindow = this;
	3918	+
	3919	+// fix "+" issue
	3920	+ //group.editWindow = this;
	3921	+ group.manipWindow = this;
	3922	+
3050	3923	/*
3051	3924	currentLayout = radio.layout;
3052	3925	if (currentLayout == null)
3053	3926	currentLayout = sevenButton;
3054	3927	*/
3055	3928	radio.layout.doClick();
	3929	+
	3930	+ ClearUnpinned();
	3931	+ //Grafreed.Assert(group != null);
	3932	+ //Grafreed.Assert(group.selection != null);
	3933	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	3934	+ if (group.selection == null \|\| group.selection.size() == 1)
	3935	+ EditSelection(false);
3056	3936	keepparent = group.parent;
3057	3937	// PARENT = NULL or not???
3058	3938	//group.parent = null; // ROOT
3059	3939	//group.attributes = -1;
3060	3940	ResetModel();
	3941	+
	3942	+ cameraView.requestFocusInWindow();
3061	3943	refreshContents(true);
3062		- }
	3944	+ } else if (event.getSource() == editCameraItem)
	3945	+ {
	3946	+ cameraView.ProtectCamera();
	3947	+ cameraView.repaint();
	3948	+ return;
	3949	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3950	+ {
	3951	+ cameraView.RevertCamera();
	3952	+ cameraView.repaint();
	3953	+ return;
	3954	+ // } else if (event.getSource() == textureButton)
	3955	+ // {
	3956	+ // return; // true;
	3957	+ }
3063	3958	else
3064	3959	{
3065	3960	//return super.action(event, arg);
..	..	@@ -3068,7 +3963,6 @@
3068	3963	}
3069	3964
3070	3965	boolean useclient = false;
3071		- cRadio radio;
3072	3966
3073	3967	void ToggleRoot()
3074	3968	{
..	..	@@ -3120,6 +4014,28 @@
3120	4014	refreshContents();
3121	4015	}
3122	4016
	4017	+ void TransformChildren()
	4018	+ {
	4019	+ Object3D obj;
	4020	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4021	+ {
	4022	+ obj = (Object3D)e.nextElement();
	4023	+ obj.KeepTextureMatrices();
	4024	+ obj.TransformChildren();
	4025	+ obj.RestoreTextureMatrices();
	4026	+
	4027	+// if (obj.parent == null)
	4028	+// {
	4029	+// System.out.println("NULL PARENT!");
	4030	+// new Exception().printStackTrace();
	4031	+// }
	4032	+// else
	4033	+// TouchTransform(obj);
	4034	+// //obj.parent.Touch();
	4035	+ }
	4036	+
	4037	+ refreshContents();
	4038	+ }
3123	4039
3124	4040	void ResetTransform()
3125	4041	{
..	..	@@ -3232,7 +4148,7 @@
3232	4148	refreshContents();
3233	4149	}
3234	4150
3235		- void ResetCentroid()
	4151	+ void ResetCentroid(boolean full)
3236	4152	{
3237	4153	Object3D obj;
3238	4154	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3247,12 +4163,16 @@
3247	4163	LA.matIdentity(Object3D.mat);
3248	4164	obj.getBounds(minima, maxima, false);
3249	4165	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3250		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	4166	+ if (full)
	4167	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3251	4168	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3252	4169	obj.TransformMesh(Object3D.mat);
	4170	+
3253	4171	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3254		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	4172	+ if (full)
	4173	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3255	4174	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	4175	+
3256	4176	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3257	4177	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3258	4178	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3281,7 +4201,8 @@
3281	4201
3282	4202	int size = obj.MemorySize();
3283	4203
3284		- System.err.println((size/1024) + " KB is the size of " + obj);
	4204	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4205	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3285	4206	}
3286	4207	}
3287	4208	catch (Exception e)
..	..	@@ -3318,9 +4239,9 @@
3318	4239	obj = (Object3D)e.nextElement();
3319	4240
3320	4241	System.out.println("Object is: " + obj);
3321		- GrafreeD.AnalyzeObject(obj);
	4242	+ Grafreed.AnalyzeObject(obj);
3322	4243	System.out.println("Boundary rep: " + obj.bRep);
3323		- GrafreeD.AnalyzeObject(obj.bRep);
	4244	+ Grafreed.AnalyzeObject(obj.bRep);
3324	4245
3325	4246	// System.err.println((size/1024) + " KB is the size of " + obj);
3326	4247	}
..	..	@@ -3362,6 +4283,13 @@
3362	4283	void GenNormals(boolean crease)
3363	4284	{
3364	4285	group.GenNormalsS(crease);
	4286	+
	4287	+ refreshContents();
	4288	+ }
	4289	+
	4290	+ void GenNormalsMESH()
	4291	+ {
	4292	+ group.GenNormalsMeshS();
3365	4293
3366	4294	refreshContents();
3367	4295	}
..	..	@@ -3534,8 +4462,8 @@
3534	4462
3535	4463	void ParseVertices()
3536	4464	{
3537		- boolean epsequal = GrafreeD.epsequal;
3538		- GrafreeD.epsequal = true;
	4465	+ boolean epsequal = Grafreed.epsequal;
	4466	+ Grafreed.epsequal = true;
3539	4467
3540	4468	for (int i=0; i<group.selection.size(); i++)
3541	4469	{
..	..	@@ -3560,7 +4488,7 @@
3560	4488	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3561	4489	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3562	4490
3563		- g.add(GrafreeD.clipboard);
	4491	+ g.add(Grafreed.clipboard);
3564	4492
3565	4493	buffer.add(g);
3566	4494	}
..	..	@@ -3575,7 +4503,7 @@
3575	4503	makeSomething(buffer, i==group.selection.size()-1);
3576	4504	}
3577	4505
3578		- GrafreeD.epsequal = epsequal;
	4506	+ Grafreed.epsequal = epsequal;
3579	4507
3580	4508	refreshContents();
3581	4509	}
..	..	@@ -3593,7 +4521,16 @@
3593	4521	String pigment = Object3D.GetPigment(tex);
3594	4522	//String bump = Object3D.GetBump(tex);
3595	4523
3596		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4524	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4525	+
	4526	+ try
	4527	+ {
	4528	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
	4529	+ }
	4530	+ catch (Exception e)
	4531	+ {
	4532	+ System.err.println("FAIL: " + node);
	4533	+ }
3597	4534
3598	4535	double s = v.s;
3599	4536
..	..	@@ -3725,7 +4662,7 @@
3725	4662	return;
3726	4663
3727	4664	Object3D poses = group.selection.get(0);
3728		- Object3D ref = GrafreeD.clipboard.get(0);
	4665	+ Object3D ref = Grafreed.clipboard.get(0);
3729	4666
3730	4667	Object3D newgroup = new Object3D("Po:" + poses.name);
3731	4668
..	..	@@ -3919,9 +4856,9 @@
3919	4856
3920	4857	void ClipMesh()
3921	4858	{
3922		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4859	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3923	4860	{
3924		- Object3D content = GrafreeD.clipboard.get(0);
	4861	+ Object3D content = Grafreed.clipboard.get(0);
3925	4862
3926	4863	if (content instanceof cGroup && ((cGroup)content).transientlink )
3927	4864	content = ((cGroup)content).get(0);
..	..	@@ -3930,7 +4867,7 @@
3930	4867	// {
3931	4868	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3932	4869	// }
3933		- group.selection.ClipMesh(GrafreeD.clipboard);
	4870	+ group.selection.ClipMesh(Grafreed.clipboard);
3934	4871	}
3935	4872	// group.selection.ClipMesh(GrafreeD.clipboard);
3936	4873	System.out.println("DONE.");
..	..	@@ -3977,6 +4914,18 @@
3977	4914	void MarkLeaves(boolean hide)
3978	4915	{
3979	4916	group.selection.MarkLeaves(hide);
	4917	+ refreshContents();
	4918	+ }
	4919	+
	4920	+ void RewindLeaves(boolean hide)
	4921	+ {
	4922	+ group.selection.RewindLeaves(hide);
	4923	+ refreshContents();
	4924	+ }
	4925	+
	4926	+ void RandomLeaves(boolean hide)
	4927	+ {
	4928	+ group.selection.RandomLeaves(hide);
3980	4929	refreshContents();
3981	4930	}
3982	4931
..	..	@@ -4051,28 +5000,25 @@
4051	5000	// }
4052	5001	// }
4053	5002
4054		- static boolean allparams = true;
4055		-
4056		- static Vector<Object3D> listUI = new Vector<Object3D>();
4057		-
4058	5003	void EditSelection(boolean newWindow)
4059	5004	{
	5005	+ if (group.selection == null)
	5006	+ {
	5007	+ EditElement(group, newWindow); // ? new
	5008	+ return;
	5009	+ }
	5010	+
4060	5011	// aConstraints.gridy = 0;
4061	5012	for (int i=0; i<group.selection.size(); i++)
4062	5013	{
4063	5014	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4064	5015	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4065		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5016	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4066	5017
4067	5018	Object3D elem = (Object3D)group.selection.elementAt(i);
4068		- if(elem != group)
	5019	+ if(elem != group \|\| !newWindow)
4069	5020	{
4070		- // if (!(elem instanceof Composite))
4071		- // newWindow = false;
4072		- listUI.add(elem);
4073		- elem.openEditWindow(this, newWindow); //, false);
4074		- System.out.println("edit : " + elem);
4075		- elem.editWindow.refreshContents(true); // ? new
	5021	+ EditElement(elem, newWindow); // ? new
4076	5022	}
4077	5023	}
4078	5024	}
..	..	@@ -4147,7 +5093,8 @@
4147	5093	//new Exception().printStackTrace();
4148	5094
4149	5095	freezemodel = true;
4150		-
	5096	+ ClearUnpinned();
	5097	+
4151	5098	/**/
4152	5099	//switch (event.id)
4153	5100	{
..	..	@@ -4155,7 +5102,6 @@
4155	5102	//case 702: // Event.LIST_DESELECT
4156	5103	group.deselectAll();
4157	5104	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4158		- objEditor.ClearInfo(); // .GetMaterial());
4159	5105	if (tps != null)
4160	5106	{
4161	5107	for (int i=0; i < tps.length; i++)
..	..	@@ -4164,10 +5110,8 @@
4164	5110
4165	5111	//if (child.parent != null)
4166	5112	//child.parent.addSelectee(child);
	5113	+ objEditor.SetMaterial(child);
4167	5114	group.addSelectee(child);
4168		- objEditor.SetMaterial(child); // .GetMaterial());
4169		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4170		- System.err.println("info : " + child.GetPath());
4171	5115	}
4172	5116	}
4173	5117	// else
..	..	@@ -4177,20 +5121,28 @@
4177	5121	// System.err.println("info : " + group.GetPath());
4178	5122	// }
4179	5123
4180		- objEditor.SetText(); // jan 2014
4181		-
4182		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	5124	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4183	5125	CameraPane.flash = true;
4184	5126
4185		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5127	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4186	5128	// a camera
4187	5129	{
4188		- CameraPane.camerachangeframe = 0; // don't refuse it
4189		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5130	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5131	+ {
	5132	+ CameraPane.camerachangeframe = 0; // don't refuse it
	5133	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5134	+ }
4190	5135	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4191	5136	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4192	5137	}
4193	5138
	5139	+ if (tps != null && tps.length == 1)
	5140	+ {
	5141	+ EditSelection(false);
	5142	+ }
	5143	+
	5144	+ SetPinStates(tps != null && tps.length > 0);
	5145	+
4194	5146	refreshContents();
4195	5147	//return true;
4196	5148	}
..	..	@@ -4199,6 +5151,35 @@
4199	5151
4200	5152	freezemodel = false;
4201	5153	}
	5154	+
	5155	+ void SetPinStates(boolean enabled)
	5156	+ {
	5157	+ editButton.setEnabled(enabled);
	5158	+ uneditButton.setEnabled(enabled);
	5159	+ unselectButton.setEnabled(enabled);
	5160	+ flashSelectionButton.setEnabled(enabled);
	5161	+ }
	5162	+
	5163	+ void refreshContents(boolean cp)
	5164	+ {
	5165	+ if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5166	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5167	+ {
	5168	+ objEditor.ClearInfo(); // .GetMaterial());
	5169	+
	5170	+ for (int i=0; i < group.selection.Size(); i++)
	5171	+ {
	5172	+ Object3D child = (Object3D) group.selection.get(i);
	5173	+
	5174	+ objEditor.AddInfo(child, this, true);
	5175	+ System.err.println("info : " + child.GetPath());
	5176	+ }
	5177	+
	5178	+ objEditor.SetText(); // jan 2014
	5179	+ }
	5180	+
	5181	+ super.refreshContents(cp);
	5182	+ }
4202	5183
4203	5184	void linkSomething(Object3D thing)
4204	5185	{
..	..	@@ -4270,16 +5251,19 @@
4270	5251	{
4271	5252	if (group.selection.isEmpty())
4272	5253	return;
4273		- GrafreeD.clipboardIsTempGroup = false;
	5254	+
	5255	+ Grafreed.clipboardIsTempGroup = false;
4274	5256	Composite tGroup = null;
4275	5257	if (group.selection.size() > 0) // 1)
4276	5258	{
4277	5259	tGroup = new cGroup();
4278		- GrafreeD.clipboardIsTempGroup = true;
	5260	+ Grafreed.clipboardIsTempGroup = true;
4279	5261	}
4280	5262
4281	5263	if (cut)
4282	5264	{
	5265	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5266	+// Save();
4283	5267	//int indices[] = jList.getSelectedIndices();
4284	5268	//for (int i = indices.length - 1; i >= 0; i--)
4285	5269	//jList.remove(indices[i]);
..	..	@@ -4315,16 +5299,16 @@
4315	5299	//System.out.println("cut " + child);
4316	5300	//System.out.println("parent = " + child.parent);
4317	5301	// tmp.addChild(child);
4318		- if (GrafreeD.clipboardIsTempGroup)
	5302	+ if (Grafreed.clipboardIsTempGroup)
4319	5303	tGroup.add/Child/(tmp);
4320	5304	else
4321		- GrafreeD.clipboard = tmp;
	5305	+ Grafreed.clipboard = tmp;
4322	5306	}
4323	5307	else
4324		- if (GrafreeD.clipboardIsTempGroup)
	5308	+ if (Grafreed.clipboardIsTempGroup)
4325	5309	tGroup.add/Child/(child);
4326	5310	else
4327		- GrafreeD.clipboard = child;
	5311	+ Grafreed.clipboard = child;
4328	5312	}
4329	5313
4330	5314	//ResetModel();
..	..	@@ -4356,21 +5340,23 @@
4356	5340	//System.out.println("cut " + elem);
4357	5341	//System.out.println("parent = " + elem.parent);
4358	5342	// tmp.addChild(elem);
4359		- if (GrafreeD.clipboardIsTempGroup)
	5343	+ if (Grafreed.clipboardIsTempGroup)
4360	5344	tGroup.add/Child/(tmp);
4361	5345	else
4362		- GrafreeD.clipboard = tmp;
	5346	+ Grafreed.clipboard = tmp;
4363	5347	}
4364	5348	else
4365		- if (GrafreeD.clipboardIsTempGroup)
	5349	+ if (Grafreed.clipboardIsTempGroup)
4366	5350	tGroup.add/Child/(child);
4367	5351	else
4368		- GrafreeD.clipboard = child;
	5352	+ Grafreed.clipboard = child;
4369	5353	}
4370	5354
4371	5355	}
4372		- if (GrafreeD.clipboardIsTempGroup)
4373		- GrafreeD.clipboard = tGroup;
	5356	+
	5357	+ if (Grafreed.clipboardIsTempGroup)
	5358	+ Grafreed.clipboard = tGroup;
	5359	+
4374	5360	if (cut)
4375	5361	{
4376	5362	ResetModel();
..	..	@@ -4380,11 +5366,15 @@
4380	5366
4381	5367	void paste(boolean expand)
4382	5368	{
	5369	+ if (Globals.REPLACEONMAKE)
	5370	+ Save();
	5371	+ boolean keep = Globals.REPLACEONMAKE;
	5372	+ Globals.REPLACEONMAKE = false;
4383	5373	// if (GrafreeD.clipboard == null)
4384	5374	// return;
4385	5375	boolean first = true;
4386	5376
4387		- if (GrafreeD.clipboardIsTempGroup)
	5377	+ if (Grafreed.clipboardIsTempGroup)
4388	5378	{
4389	5379	Composite temp;
4390	5380
..	..	@@ -4395,7 +5385,7 @@
4395	5385	temp = (Composite)Applet3D.clipboard.deepCopy();
4396	5386	*/
4397	5387	Object3D elem;
4398		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5388	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4399	5389	{
4400	5390	Object3D child = (Object3D)e.nextElement();
4401	5391
..	..	@@ -4429,16 +5419,17 @@
4429	5419	//Object3D cb = Applet3D.clipboard;
4430	5420	//temp.addChild(cb);
4431	5421	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4432		- assert(GrafreeD.clipboard.parent == null);
4433		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4434		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4435		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4436		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	5422	+ assert(Grafreed.clipboard.parent == null);
	5423	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5424	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5425	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5426	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4437	5427	else
4438		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4439		- GrafreeD.clipboard.get(0).parent = keepparent;
	5428	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5429	+ Grafreed.clipboard.get(0).parent = keepparent;
4440	5430	}
4441	5431
	5432	+ Globals.REPLACEONMAKE = keep;
4442	5433	ResetModel();
4443	5434	refreshContents();
4444	5435	}
..	..	@@ -4485,9 +5476,9 @@
4485	5476	{
4486	5477	boolean first = true;
4487	5478
4488		- if (GrafreeD.clipboardIsTempGroup)
	5479	+ if (Grafreed.clipboardIsTempGroup)
4489	5480	{
4490		- Composite temp = (Composite)GrafreeD.clipboard;
	5481	+ Composite temp = (Composite)Grafreed.clipboard;
4491	5482	Object3D copy;
4492	5483	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4493	5484	{
..	..	@@ -4497,7 +5488,7 @@
4497	5488	}
4498	5489	} else
4499	5490	{
4500		- linkSomething(GrafreeD.clipboard); //.get(0));
	5491	+ linkSomething(Grafreed.clipboard); //.get(0));
4501	5492	}
4502	5493	}
4503	5494	}
..	..	@@ -4574,6 +5565,10 @@
4574	5565
4575	5566	void group(Object3D csg, boolean grab)
4576	5567	{
	5568	+ if (Globals.REPLACEONMAKE)
	5569	+ Save();
	5570	+ boolean keep = Globals.REPLACEONMAKE;
	5571	+ Globals.REPLACEONMAKE = false;
4577	5572	if (//false) // why??
4578	5573	!group.selection.isEmpty())
4579	5574	{
..	..	@@ -4687,10 +5682,15 @@
4687	5682	//node.add(csg);
4688	5683	//makeSomething(node);
4689	5684	makeSomething(csg);
	5685	+ Globals.REPLACEONMAKE = keep;
4690	5686	}
4691	5687
4692	5688	void Ungroup(Object3D g)
4693	5689	{
	5690	+ if (Globals.REPLACEONMAKE)
	5691	+ Save();
	5692	+ boolean keep = Globals.REPLACEONMAKE;
	5693	+ Globals.REPLACEONMAKE = false;
4694	5694	if (g instanceof HiddenObject)
4695	5695	{
4696	5696	HiddenObject h = (HiddenObject) g;
..	..	@@ -4707,6 +5707,7 @@
4707	5707	objEditor.makeSomething(g.get(i), false);
4708	5708	}
4709	5709	}
	5710	+ Globals.REPLACEONMAKE = keep;
4710	5711	}
4711	5712
4712	5713	void ungroup()
..	..	@@ -4902,21 +5903,6 @@
4902	5903	}
4903	5904	*/
4904	5905
4905		- void ImportGFD()
4906		- {
4907		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4908		- browser.show();
4909		- String filename = browser.getFile();
4910		- if (filename != null && filename.length() > 0)
4911		- {
4912		- String fullname = browser.getDirectory() + filename;
4913		-
4914		- //Object3D readobj =
4915		- objEditor.ReadGFD(fullname, objEditor);
4916		- //makeSomething(readobj);
4917		- }
4918		- }
4919		-
4920	5906	/*
4921	5907	public void Callback(Object obj)
4922	5908	{
..	..	@@ -4940,26 +5926,9 @@
4940	5926	}
4941	5927	*/
4942	5928
4943		- void ImportVRMLX3D()
4944		- {
4945		- if (GrafreeD.standAlone)
4946		- {
4947		- /**/
4948		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4949		- browser.show();
4950		- String filename = browser.getFile();
4951		- if (filename != null && filename.length() > 0)
4952		- {
4953		- String fullname = browser.getDirectory() + filename;
4954		- LoadVRMLX3D(fullname);
4955		- }
4956		- /**/
4957		- }
4958		- }
4959		-
4960	5929	String GetFile(String dialogName)
4961	5930	{
4962		- if (GrafreeD.standAlone)
	5931	+ if (Grafreed.standAlone)
4963	5932	{
4964	5933	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4965	5934	browser.show();
..	..	@@ -5027,7 +5996,44 @@
5027	5996	cButton clearpanelButton;
5028	5997	cButton unselectButton;
5029	5998
	5999	+ cButton restoreCameraButton;
	6000	+
	6001	+ cButton saveButton;
5030	6002	cButton oneStepButton;
	6003	+
	6004	+ cButton groupButton;
	6005	+ cButton ungroupButton;
	6006	+ cButton compositeButton;
	6007	+ cButton switchButton;
	6008	+ cButton loopButton;
	6009	+ cButton textureButton;
	6010	+
	6011	+ cButton skybox1Button;
	6012	+ cButton skybox2Button;
	6013	+ cButton skybox3Button;
	6014	+ cButton skybox4Button;
	6015	+ cButton skybox5Button;
	6016	+ cButton skybox6Button;
	6017	+ cButton skybox7Button;
	6018	+
	6019	+ cButton skybox11Button;
	6020	+ cButton skybox12Button;
	6021	+ cButton skybox13Button;
	6022	+ cButton skybox14Button;
	6023	+ cButton skybox15Button;
	6024	+ cButton skybox16Button;
	6025	+ cButton skybox17Button;
	6026	+
	6027	+ cButton gridButton;
	6028	+ cButton boxButton;
	6029	+ cButton sphereButton;
	6030	+ cButton coneButton;
	6031	+ cButton torusButton;
	6032	+ cButton superButton;
	6033	+ cButton kleinButton;
	6034	+ cButton particlesButton;
	6035	+ cButton overlayButton;
	6036	+ cButton lightButton;
5031	6037
5032	6038	cButton screenfitButton;
5033	6039	cButton screenfitpointButton;
..	..	@@ -5040,14 +6046,6 @@
5040	6046
5041	6047	cButton setsupportButton;
5042	6048
5043		- cButton twoButton;
5044		- cButton sixButton;
5045		- cButton threeButton;
5046		- cButton sevenButton;
5047		- cButton fourButton; // full panel
5048		- cButton oneButton; // full XYZ
5049		- //cButton currentLayout;
5050		-
5051	6049	//
5052	6050	//Composite
5053	6051	Object3D // to do !!
..	..	@@ -5057,9 +6055,11 @@
5057	6055	//JTree jTree;
5058	6056	private MenuItem lookAtItem;
5059	6057	private MenuItem lookFromItem;
5060		- private MenuItem switchItem;
	6058	+ private MenuItem switchViewItem;
5061	6059	private MenuItem cutItem;
5062		- private MenuItem duplicateItem;
	6060	+ private MenuItem undoItem;
	6061	+ private MenuItem redoItem;
	6062	+ private JMenuItem duplicateItem;
5063	6063	private MenuItem cloneItem;
5064	6064	private MenuItem cloneSupportItem;
5065	6065	private MenuItem overwriteGeoItem;
..	..	@@ -5072,7 +6072,7 @@
5072	6072	private MenuItem linkverticesItem;
5073	6073	private MenuItem relinkverticesItem;
5074	6074	private MenuItem setMasterItem;
5075		- private MenuItem resetMeshItem;
	6075	+ private MenuItem resetAllItem;
5076	6076	private MenuItem stepAllItem;
5077	6077	private MenuItem revertMeshItem;
5078	6078	private MenuItem poseMeshItem;
..	..	@@ -5087,7 +6087,7 @@
5087	6087	private MenuItem pasteLinkItem;
5088	6088	private MenuItem pasteCloneItem;
5089	6089	private MenuItem pasteExpandItem;
5090		- private MenuItem clearItem;
	6090	+ private MenuItem deleteItem;
5091	6091	private MenuItem clearAllItem;
5092	6092	private MenuItem genUVItem;
5093	6093	private MenuItem genNormalsMESHItem;
..	..	@@ -5122,6 +6122,10 @@
5122	6122	private MenuItem showleavesItem;
5123	6123	private MenuItem markleavesItem;
5124	6124	private MenuItem unmarkleavesItem;
	6125	+ private MenuItem rewindleavesItem;
	6126	+ private MenuItem unrewindleavesItem;
	6127	+ private MenuItem randomleavesItem;
	6128	+ private MenuItem unrandomleavesItem;
5125	6129
5126	6130	private MenuItem flipVItem;
5127	6131	private MenuItem unflipVItem;
..	..	@@ -5133,15 +6137,17 @@
5133	6137	private MenuItem panoTexturesItem;
5134	6138
5135	6139	private MenuItem resetCentroidItem;
5136		- private MenuItem transformgeometryItem;
	6140	+ private MenuItem resetCentroidXZItem;
5137	6141	private MenuItem resetTransformItem;
	6142	+ private MenuItem transformGeometryItem;
	6143	+ private MenuItem transformChildrenItem;
5138	6144	private MenuItem hideItem;
5139	6145	private MenuItem grabItem;
5140	6146	private MenuItem backItem;
5141	6147	private MenuItem frontItem;
5142	6148	private MenuItem cameraItem;
5143	6149	private MenuItem compositeItem;
5144		- private MenuItem randomItem;
	6150	+ private MenuItem switchItem;
5145	6151	private MenuItem physicsItem;
5146	6152	private MenuItem frameselectorItem;
5147	6153	private MenuItem scriptNodeItem;
..	..	@@ -5165,6 +6171,8 @@
5165	6171	private MenuItem attachBumpItem;
5166	6172	private MenuItem detachBumpItem;
5167	6173	private MenuItem pigmentBumpItem;
	6174	+ private MenuItem embedTexturesItem;
	6175	+ private MenuItem deEmbedTexturesItem;
5168	6176
5169	6177	private MenuItem particleItem;
5170	6178	private MenuItem ragdollItem;
..	..	@@ -5203,11 +6211,6 @@
5203	6211	private MenuItem doubleItem;
5204	6212	private MenuItem tripleItem;
5205	6213
5206		- private MenuItem importGFDItem;
5207		- private MenuItem importVRMLX3DItem;
5208		- private MenuItem import3DSItem;
5209		- private MenuItem importOBJItem;
5210		-
5211	6214	private MenuItem computeAOItem;
5212	6215	private MenuItem recompileItem;
5213	6216	private MenuItem editScriptItem;
..	..	@@ -5217,4 +6220,8 @@
5217	6220	private MenuItem analyzeItem;
5218	6221	private MenuItem dumpItem;
5219	6222	//boolean freezemodel = false;
	6223	+
	6224	+ Menu cameraMenu;
	6225	+ MenuItem editCameraItem;
	6226	+ MenuItem restoreCameraItem;
5220	6227	}