~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,28 +463,21 @@
148	463
149	464	//JTextField nameField;
150	465
151		- void SetupMenu2(ObjEditor oe)
	466	+ void SetupMenu2(GroupEditor oe)
152	467	{
153		- if (Globals.ADVANCED)
154		- {
155		- oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
156		- //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
157		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
158		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
159		- oe.cameraMenu.add("-");
160		- openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
161		- openWindowItem.addActionListener(this);
162		- editLeafItem.addActionListener(this);
163		- lookAtItem.addActionListener(this);
164		- //lookFromItem.addActinoListener(this);
165		- //switchItem.addActionListener(this);
166		- }
167		-
	468	+ oe.jTree = new cTree();
	469	+
168	470	Menu menu;
169	471	oe.menuBar.add(menu = new Menu("Edit"));
170	472	//editItem = menu.add(new MenuItem("Edit"));
171	473	//editItem.addActionListener(this);
172		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	474	+
	475	+// undoItem = menu.add(new MenuItem("Undo"));
	476	+// undoItem.addActionListener(this);
	477	+// redoItem = menu.add(new MenuItem("Redo"));
	478	+// redoItem.addActionListener(this);
	479	+// menu.add("-");
	480	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
173	481	duplicateItem.addActionListener(this);
174	482	cloneItem = menu.add(new MenuItem("Clone"));
175	483	cloneItem.addActionListener(this);
..	..	@@ -185,7 +493,6 @@
185	493	copyItem.addActionListener(this);
186	494	pasteItem = menu.add(new MenuItem("Paste"));
187	495	pasteItem.addActionListener(this);
188		- menu.add("-");
189	496
190	497	menu.add("-");
191	498	pasteIntoItem = menu.add(new MenuItem("Paste into"));
..	..	@@ -197,8 +504,8 @@
197	504	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
198	505	// pasteExpandItem.addActionListener(this);
199	506	menu.add("-");
200		- clearItem = menu.add(new MenuItem("Clear"));
201		- clearItem.addActionListener(this);
	507	+ deleteItem = menu.add(new MenuItem("Delete"));
	508	+ deleteItem.addActionListener(this);
202	509
203	510	if (Globals.ADVANCED)
204	511	{
..	..	@@ -206,14 +513,97 @@
206	513	clearAllItem = menu.add(new MenuItem("Clear All"));
207	514	clearAllItem.addActionListener(this);
208	515	}
	516	+
	517	+ menuBar.add(cameraMenu = new Menu("View"));
	518	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	519	+ //zBufferItem.addActionListener(this);
	520	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	521	+ //normalLensItem.addActionListener(this);
	522	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	523	+ restoreCameraItem.addActionListener(this);
	524	+
	525	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	526	+// toggleFullScreenItem.addItemListener(this);
	527	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	528	+// cameraMenu.add("-");
	529	+//
	530	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	531	+// toggleTextureItem.addItemListener(this);
	532	+// toggleTextureItem.setState(CameraPane.textureon);
	533	+//
	534	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	535	+// toggleSwitchItem.addItemListener(this);
	536	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	537	+
	538	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	539	+ toggleHandleItem.addItemListener(this);
	540	+ toggleHandleItem.setState(CameraPane.HANDLES);
	541	+
	542	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	543	+ togglePaintItem.addItemListener(this);
	544	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	545	+
	546	+ if (Globals.ADVANCED)
	547	+ {
	548	+ cameraMenu.add("-");
	549	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	550	+ toggleLiveItem.addItemListener(this);
	551	+ toggleLiveItem.setState(Globals.isLIVE());
209	552
	553	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	554	+ stepItem.addActionListener(this);
	555	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	556	+ // toggleDLItem.addItemListener(this);
	557	+ // toggleDLItem.setState(false);
	558	+
	559	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	560	+ toggleRenderItem.addItemListener(this);
	561	+ toggleRenderItem.setState(!CameraPane.frozen);
	562	+
	563	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	564	+ toggleDebugItem.addItemListener(this);
	565	+ toggleDebugItem.setState(Globals.DEBUG);
	566	+
	567	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	568	+ toggleFrustumItem.addItemListener(this);
	569	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	570	+
	571	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	572	+ toggleFootContactItem.addItemListener(this);
	573	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	574	+
	575	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	576	+ toggleTimelineItem.addItemListener(this);
	577	+ }
	578	+
	579	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	580	+// toggleRootItem.addItemListener(this);
	581	+// toggleRootItem.setState(false);
	582	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	583	+// animationItem.addItemListener(this);
	584	+// animationItem.setState(CameraPane.ANIMATION);
	585	+ cameraMenu.add("-");
	586	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	587	+ editCameraItem.addActionListener(this);
	588	+
	589	+ if (Globals.ADVANCED)
	590	+ {
	591	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	592	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	593	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	594	+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	595	+ oe.cameraMenu.add("-");
	596	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	597	+ openWindowItem.addActionListener(this);
	598	+ editLeafItem.addActionListener(this);
	599	+ lookAtItem.addActionListener(this);
	600	+ //lookFromItem.addActinoListener(this);
	601	+ //switchViewItem.addActionListener(this);
	602	+ }
	603	+
210	604	oe.menuBar.add(menu = new Menu("Setting"));
211	605	if (Globals.ADVANCED)
212	606	{
213		- resetMeshItem = menu.add(new MenuItem("Reset All"));
214		- resetMeshItem.addActionListener(this);
215		- stepAllItem = menu.add(new MenuItem("Step All"));
216		- stepAllItem.addActionListener(this);
217	607	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
218	608	revertMeshItem.addActionListener(this);
219	609	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
..	..	@@ -253,21 +643,29 @@
253	643	}
254	644
255	645	oe.menuBar.add(menu = new Menu("Group"));
256		- grabItem = menu.add(new MenuItem("Grab"));
257		- grabItem.addActionListener(this);
	646	+// grabItem = menu.add(new MenuItem("Grab"));
	647	+// grabItem.addActionListener(this);
258	648	backItem = menu.add(new MenuItem("Back"));
259	649	backItem.addActionListener(this);
260	650	frontItem = menu.add(new MenuItem("Front"));
261	651	frontItem.addActionListener(this);
262		- compositeItem = menu.add(new MenuItem("Composite"));
263		- compositeItem.addActionListener(this);
	652	+// compositeItem = menu.add(new MenuItem("Composite"));
	653	+// compositeItem.addActionListener(this);
	654	+
	655	+ if (Globals.ADVANCED)
	656	+ {
264	657	hideItem = menu.add(new MenuItem("Hidden Group"));
265	658	hideItem.addActionListener(this);
	659	+ }
266	660	ungroupItem = menu.add(new MenuItem("Ungroup"));
267	661	ungroupItem.addActionListener(this);
268		- menu.add("-");
269		- randomItem = menu.add(new MenuItem("Switch node"));
270		- 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	+ {
271	669	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
272	670	switchGeoItem.addActionListener(this);
273	671	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -275,8 +673,6 @@
275	673	morphItem = menu.add(new MenuItem("Morph Group"));
276	674	morphItem.addActionListener(this);
277	675
278		- if (Globals.ADVANCED)
279		- {
280	676	menu.add("-");
281	677	physicsItem = menu.add(new MenuItem("Physics"));
282	678	physicsItem.addActionListener(this);
..	..	@@ -284,30 +680,29 @@
284	680	frameselectorItem.addActionListener(this);
285	681	scriptNodeItem = menu.add(new MenuItem("Script Node"));
286	682	scriptNodeItem.addActionListener(this);
287		- cameraItem = menu.add(new MenuItem("Camera"));
288		- cameraItem.addActionListener(this);
289	683	}
290	684
291	685	oe.menuBar.add(menu = new Menu("Object"));
292		- textureItem = menu.add(new MenuItem("Texture"));
293		- textureItem.addActionListener(this);
	686	+// textureItem = menu.add(new MenuItem("Texture"));
	687	+// textureItem.addActionListener(this);
294	688	billboardItem = menu.add(new MenuItem("Billboard"));
295	689	billboardItem.addActionListener(this);
296	690	csgItem = menu.add(new MenuItem("CSG"));
297	691	csgItem.addActionListener(this);
298		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	692	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
299	693	shadowXItem.addActionListener(this);
300		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	694	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
301	695	shadowYItem.addActionListener(this);
302		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	696	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
303	697	shadowZItem.addActionListener(this);
	698	+ attributeItem = menu.add(new MenuItem("Attribute"));
	699	+ attributeItem.addActionListener(this);
	700	+
304	701	if (Globals.ADVANCED)
305	702	{
306	703	menu.add("-");
307	704	linkerItem = menu.add(new MenuItem("Linker"));
308	705	linkerItem.addActionListener(this);
309		- attributeItem = menu.add(new MenuItem("Attribute"));
310		- attributeItem.addActionListener(this);
311	706	templateItem = menu.add(new MenuItem("Template"));
312	707	templateItem.addActionListener(this);
313	708	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -318,8 +713,12 @@
318	713	resetTransformItem.addActionListener(this);
319	714	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
320	715	resetCentroidItem.addActionListener(this);
321		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
322		- 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);
323	722
324	723	oe.menuBar.add(menu = new Menu("Geometry"));
325	724	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -332,7 +731,7 @@
332	731	genNormalsMESHItem.addActionListener(this);
333	732	if (Globals.ADVANCED)
334	733	{
335		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	734	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
336	735	genNormalsMINEItem.addActionListener(this);
337	736	}
338	737	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -368,6 +767,10 @@
368	767	oe.menuBar.add(menu = new Menu("Attributes"));
369	768	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
370	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);
371	774	menu.add("-");
372	775	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
373	776	liveleavesItem.addActionListener(this);
..	..	@@ -388,6 +791,14 @@
388	791	markleavesItem.addActionListener(this);
389	792	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
390	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);
391	802	menu.add("-");
392	803	flipVItem = menu.add(new MenuItem("Flip V"));
393	804	flipVItem.addActionListener(this);
..	..	@@ -413,50 +824,56 @@
413	824	attachBumpItem.addActionListener(this);
414	825	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
415	826	pigmentBumpItem.addActionListener(this);
	827	+ //embedTexturesItem
416	828	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
417	829	detachPigmentItem.addActionListener(this);
418	830	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
419	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);
420	836	menu.add("-");
421	837	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
422	838	sortbysizeItem.addActionListener(this);
423	839	sortbynameItem = menu.add(new MenuItem("Sort by name"));
424	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);
425	846	if (Globals.ADVANCED)
426	847	{
427		- menu.add("-");
	848	+ // Pretty much the same as duplicate and clone.
428	849	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
429	850	extractGeometriesItem.addActionListener(this);
430	851	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
431	852	cloneGeometriesItem.addActionListener(this);
432		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
433		- shareGeometriesItem.addActionListener(this);
434		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
435		- mergeGeometriesItem.addActionListener(this);
436	853	}
437	854
438	855	oe.menuBar.add(menu = new Menu("Insert"));
439	856	buildCreateMenu(menu);
440	857
441		- oe.menuBar.add(menu = new Menu("Include"));
442		- importOBJItem = menu.add(new MenuItem("OBJ file..."));
443		- importOBJItem.addActionListener(this);
444		- menu.add("-");
445		- import3DSItem = menu.add(new MenuItem("3DS file..."));
446		- import3DSItem.addActionListener(this);
447		- menu.add("-");
448		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
449		- importVRMLX3DItem.addActionListener(this);
450		- menu.add("-");
451		- importGFDItem = menu.add(new MenuItem("GrafreeD file..."));
452		- importGFDItem.addActionListener(this);
453		-
454	858	oe.menuBar.add(menu = new Menu("Tools"));
455	859	buildToolsMenu(menu);
456	860	}
457	861
	862	+
458	863	void SetupUI2(ObjEditor oe)
459	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	+
460	877	//new Exception().printStackTrace();
461	878
462	879	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -485,97 +902,238 @@
485	902	oe.radioPanel.add(dummyButton);
486	903	oe.buttonGroup.add(dummyButton);
487	904	*/
	905	+ cGridBag copyOptionsPanel = new cGridBag();
	906	+
	907	+ copyOptionsPanel.preferredHeight = 2;
	908	+
488	909	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
489	910
490		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
491		- 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");
492	963	liveCB.addItemListener(this);
493	964
494		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	965	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
495	966	oneStepButton.setToolTipText("Animate one step forward");
496	967	oneStepButton.addActionListener(this);
497	968
498		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	969	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
499	970	fastCB.setToolTipText("Fast mode");
500	971	fastCB.addItemListener(this);
501	972
502		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
503		- trackCB.setToolTipText("Enable tracking");
504		- trackCB.addItemListener(this);
505		-
506		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
507		- screenfitButton.setToolTipText("Screen fit");
508		- screenfitButton.addActionListener(this);
	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);
509	978
510	979	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
511	980	// screenfitpointButton.addActionListener(this);
512	981
513	982	if (Globals.ADVANCED)
514	983	{
515		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	984	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
516	985	snapobjectButton.addActionListener(this);
517	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");
518	991	}
519	992
520		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
521		- flashSelectionButton.setToolTipText("Show selection");
522		- flashSelectionButton.addActionListener(this);
	993	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
523	994
524		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
525		-
526		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
527		- twoButton.setToolTipText("Show center view only");
	995	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	996	+ twoButton.setToolTipText("Show 3D view only");
528	997	twoButton.addActionListener(this);
529		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
530		- fourButton.addActionListener(this);
531		- fourButton.setToolTipText("Show left panel only");
532		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
533		- sixButton.setToolTipText("2-column layout left");
534		- sixButton.addActionListener(this);
535		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
536		- threeButton.setToolTipText("2-column layout right");
	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");
537	1002	threeButton.addActionListener(this);
538		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
539		- sevenButton.setToolTipText("3-column layout");
540		- 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);
541	1009	//
542	1010
543		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
544		- 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");
545	1013	rootButton.addActionListener(this);
546	1014
547		- 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);
548	1016	closeButton.setToolTipText("Close tab");
549	1017	closeButton.addActionListener(this);
550	1018	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
551	1019	//clearButton.addActionListener(this);
552		-
553		- cGridBag commandsPanel = new cGridBag();
	1020	+
	1021	+ cGridBag row1 = new cGridBag();
554	1022
555		- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
556		- 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");
557	1110	editButton.addActionListener(this);
558	1111
559		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
560		- uneditButton.setToolTipText("Unedit selection");
	1112	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1113	+ uneditButton.setToolTipText("Remove selection controls");
561	1114	uneditButton.addActionListener(this);
562	1115
563		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
564		- allParamsButton.setToolTipText("Edit all params");
	1116	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1117	+ allParamsButton.setToolTipText("Show all controle");
565	1118	allParamsButton.addActionListener(this);
566	1119
567		- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1120	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
568	1121	clearPanelButton.setToolTipText("Clear edit panel");
569	1122	clearPanelButton.addActionListener(this);
570	1123
571		- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1124	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
572	1125	unselectButton.setToolTipText("Unselect");
573	1126	unselectButton.addActionListener(this);
574	1127
575		- 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);
576	1131
577		- oe.treePanel.add(commandsPanel);
578		- oe.treePanel.Return();
	1132	+ editCommandsPanel.preferredHeight = 1;
	1133	+
	1134	+ SetPinStates(false);
	1135	+// oe.treePanel.add(commandsPanel);
	1136	+// oe.treePanel.Return();
579	1137
580	1138	// oe.aConstraints.gridx += 1;
581	1139	// oe.aConstraints.weighty = 0;
..	..	@@ -592,32 +1150,20 @@
592	1150
593	1151	JScrollPane jSP;
594	1152	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
595		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1153	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
596	1154	ResetModel();
597	1155
598	1156	oe.treePanel.add(jSPPanel);
599	1157	oe.treePanel.Return();
600	1158
601		- cGridBag copyOptionsPanel = new cGridBag();
602		-
603		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
604		- colorCB.setToolTipText("Copy color when dropped");
605		- colorCB.addItemListener(this);
606		-
607		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
608		- materialCB.setToolTipText("Copy material when dropped");
609		- materialCB.addItemListener(this);
610		-
611		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
612		- textureCB.setToolTipText("Copy texture when dropped");
613		- textureCB.addItemListener(this);
614		-
615		- copyOptionsPanel.preferredHeight = 1;
616	1159	oe.treePanel.add(copyOptionsPanel);
617	1160	oe.treePanel.Return();
	1161	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1162	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1163	+ sliderPane.preferredHeight = 1;
618	1164
619		-// mainPanel.setDividerLocation(0.5); //1.0);
620		-// mainPanel.setResizeWeight(0.5);
	1165	+// mainPanel.setDividerLocation(0.1); //1.0);
	1166	+ mainPanel.setResizeWeight(0.4);
621	1167
622	1168	//jList.addListSelectionListener(this);
623	1169	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -625,7 +1171,7 @@
625	1171	//jTree.setEditable(true);
626	1172	oe.jTree.setDragEnabled(true);
627	1173	//jTree.setPreferredSize(new Dimension(10,10));
628		- jSP.setPreferredSize(new Dimension(100,200));
	1174	+ //jSP.setPreferredSize(new Dimension(100,200));
629	1175
630	1176	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
631	1177
..	..	@@ -637,29 +1183,49 @@
637	1183	dgr.addDragGestureListener(this);
638	1184	}catch(Exception e) {}
639	1185	*/
640		- radio.layout = sevenButton;
	1186	+ radio.layout = sixButton; // sevenButton;
641	1187	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
642	1188	}
643	1189
644	1190	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
645	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	+
646	1206	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
647	1207	boxCB.setToolTipText("Display bounding boxes");
648	1208	boxCB.addItemListener(this);
649	1209
650	1210	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
651		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1211	+ zoomBoxCB.setToolTipText("Display only for wheel");
652	1212	zoomBoxCB.addItemListener(this);
653	1213
654		- if (Globals.ADVANCED)
	1214	+ if (true) // Globals.ADVANCED)
655	1215	{
656		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
657		- supportCB.setToolTipText("Enable rigging");
658		- 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);
659	1223
660	1224	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
661	1225	// localCB.addItemListener(this);
662	1226
	1227	+ panel.Return();
	1228	+
663	1229	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
664	1230	crowdCB.setToolTipText("Used for crowds");
665	1231	crowdCB.addItemListener(this);
..	..	@@ -676,6 +1242,8 @@
676	1242	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
677	1243	// speakerMocapCB.addItemListener(this);
678	1244
	1245	+ panel.Return();
	1246	+
679	1247	if (false)
680	1248	{
681	1249	// handled in scripts
..	..	@@ -690,42 +1258,85 @@
690	1258	//constraints.gridy += 1;
691	1259	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
692	1260	smoothfocusCB.addItemListener(this);
	1261	+ panel.Return();
693	1262	}
694	1263
695	1264	//constraints.gridx += 1;
696	1265	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
697	1266	// debugCB.addItemListener(this);
698	1267
	1268	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1269	+ trackCB.setToolTipText("Enable tracking target");
	1270	+ trackCB.addItemListener(this);
	1271	+
699	1272	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1273	+ oeilCB.setToolTipText("Move camera when tracking");
700	1274	oeilCB.addItemListener(this);
701	1275
	1276	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1277	+ shadowCB.setToolTipText("When live compute shadows");
	1278	+ shadowCB.addItemListener(this);
	1279	+
	1280	+ panel.Return();
	1281	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1282	+ toggleTextureCB.setToolTipText("Load textures");
	1283	+ toggleTextureCB.addItemListener(this);
	1284	+
	1285	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1286	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1287	+ toggleSwitchCB.addItemListener(this);
	1288	+
	1289	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1290	+ autokeepCB.setToolTipText("On structure change");
	1291	+ autokeepCB.addItemListener(this);
	1292	+
	1293	+ panel.Return();
	1294	+ if (Globals.ADVANCED)
	1295	+ {
702	1296	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
703	1297	lookAtCB.setToolTipText("Look-at target");
704	1298	lookAtCB.addItemListener(this);
	1299	+ }
705	1300
706	1301	}
707	1302
708	1303	cGridBag fill = new cGridBag();
709		-
710	1304	fill.preferredHeight = 200;
	1305	+ cGridBag fill2 = new cGridBag();
	1306	+ fill2.preferredHeight = 200;
	1307	+ cGridBag fill3 = new cGridBag();
	1308	+ fill3.preferredHeight = 200;
711	1309
712	1310	panel.add(fill);
	1311	+ panel.add(fill2);
	1312	+ panel.add(fill3);
713	1313
714	1314	}
715	1315
716	1316	void EditObject(Object3D obj)
717	1317	{
718	1318	cRadio radioButton = new cRadio(obj.name);
	1319	+
	1320	+ // June 2019. Patch to avoid bug with transparency.
	1321	+ radioButton.hadMaterial = obj.material != null;
	1322	+ if (!radioButton.hadMaterial)
	1323	+ {
	1324	+ obj.material = new cMaterial();
	1325	+ }
	1326	+
719	1327	radioButton.SetObject(obj);
720		- radioButton.layout = sevenButton;
	1328	+ radioButton.layout = sixButton; // sevenButton;
721	1329	radioButton.SetCamera(cameraView.renderCamera, false);
722	1330	radioButton.addActionListener(this);
723	1331	radioPanel.add(radioButton);
724	1332	buttonGroup.add(radioButton);
725	1333	radioButton.doClick();
726	1334	}
	1335	+
727	1336	void SetupViews(ObjEditor oe)
728	1337	{
	1338	+ theFrame = this;
	1339	+
729	1340	oe.SetupViews();
730	1341
731	1342	System.out.println("SetupViews");
..	..	@@ -734,23 +1345,28 @@
734	1345	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
735	1346	}
736	1347
737		- JCheckBox liveCB;
738		- JCheckBox supportCB;
739		- JCheckBox localCB;
740		- JCheckBox crowdCB;
741		- JCheckBox smoothCB;
742		- JCheckBox fastCB;
743		- JCheckBox slowCB;
744		- JCheckBox boxCB;
745		- JCheckBox zoomBoxCB;
746		- JCheckBox trackCB;
747		- JCheckBox smoothfocusCB;
	1348	+ cToggleButton liveCB;
	1349	+ cCheckBox supportCB;
	1350	+ cCheckBox localCB;
	1351	+ cCheckBox crowdCB;
	1352	+ cCheckBox smoothCB;
	1353	+ cToggleButton fastCB;
	1354	+ cCheckBox slowCB;
	1355	+ cCheckBox boxCB;
	1356	+ cCheckBox zoomBoxCB;
	1357	+ cCheckBox freezeCB;
	1358	+ //cToggleButton trackCB;
	1359	+ cCheckBox trackCB;
	1360	+ cCheckBox smoothfocusCB;
748	1361	// JCheckBox speakerMocapCB;
749		- JCheckBox speakerCameraCB;
750		- JCheckBox speakerFocusCB;
751		- JCheckBox debugCB;
752		- JCheckBox oeilCB;
753		- JCheckBox lookAtCB;
	1362	+ cCheckBox speakerCameraCB;
	1363	+ cCheckBox speakerFocusCB;
	1364	+ cCheckBox debugCB;
	1365	+
	1366	+ cCheckBox oeilCB;
	1367	+ cCheckBox shadowCB;
	1368	+ cCheckBox autokeepCB;
	1369	+ cCheckBox lookAtCB;
754	1370
755	1371	// static int COLOR = 1;
756	1372	// static int MATERIAL = 2;
..	..	@@ -758,9 +1374,9 @@
758	1374
759	1375	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
760	1376
761		- JCheckBox colorCB;
762		- JCheckBox materialCB;
763		- JCheckBox textureCB;
	1377	+ cCheckBox colorCB;
	1378	+ cCheckBox materialCB;
	1379	+ cCheckBox textureCB;
764	1380
765	1381	public void itemStateChanged(ItemEvent e)
766	1382	{
..	..	@@ -788,6 +1404,7 @@
788	1404	} else if(e.getSource() == liveCB)
789	1405	{
790	1406	cameraView.ToggleLive();
	1407	+ refreshContents(false);
791	1408	}
792	1409	else if(e.getSource() == supportCB)
793	1410	{
..	..	@@ -852,6 +1469,18 @@
852	1469	{
853	1470	cameraView.ToggleOeil();
854	1471	}
	1472	+ else if(e.getSource() == shadowCB)
	1473	+ {
	1474	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1475	+ }
	1476	+ else if(e.getSource() == freezeCB)
	1477	+ {
	1478	+ Globals.FREEZEONMOVE ^= true;
	1479	+ }
	1480	+ else if(e.getSource() == autokeepCB)
	1481	+ {
	1482	+ Globals.REPLACEONMAKE ^= true;
	1483	+ }
855	1484	else if(e.getSource() == lookAtCB)
856	1485	{
857	1486	cameraView.ToggleLookAt();
..	..	@@ -868,7 +1497,8 @@
868	1497
869	1498	/**/
870	1499	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
871		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1500	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1501	+ TreePath path = objEditor.jTree.getSelectionPath();
872	1502	if ((path == null) \|\| (path.getPathCount() <= 1)) {
873	1503	// We can't move the root node or an empty selection
874	1504	return;
..	..	@@ -931,8 +1561,6 @@
931	1561	}
932	1562	}
933	1563
934		- String string = (String) object;
935		-
936	1564	System.out.println("Transfer = " + object + "; drop : " + target);
937	1565	// if( object instanceof java.io.File[])
938	1566	// {
..	..	@@ -940,6 +1568,8 @@
940	1568	// objEditor.DropFile((java.io.File[]) object, true);
941	1569	// return;
942	1570	// }
	1571	+
	1572	+ String string = object.toString();
943	1573
944	1574	// File path for Mac and Windows
945	1575	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -969,7 +1599,7 @@
969	1599
970	1600	flashIt = false;
971	1601	CameraPane pane = (CameraPane) target;
972		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1602	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
973	1603	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
974	1604
975	1605	if (group.selection.size() == 1)
..	..	@@ -985,23 +1615,33 @@
985	1615
986	1616	assert target == objEditor.jTree;
987	1617	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1618	+ Object3D destinationLeaf;
988	1619	try {
989		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1620	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
990	1621	} catch (Exception e) {
991	1622	System.out.println("destinationPath : " + destinationPath);
992	1623	return;
993	1624	}
994	1625
995		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1626	+ for (int i=group.selection.size(); --i>=0;)
996	1627	{
	1628	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1629	+
	1630	+ // Cannot move into itself
	1631	+ if (child == destinationLeaf)
	1632	+ return;
	1633	+ }
	1634	+
	1635	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1636	+// {
997	1637	loadClipboard(true);
998	1638	objEditor.jTree.setSelectionPath(destinationPath);
999	1639	pasteInto(false, false);
1000		- } else {
1001		- loadClipboard(false);
1002		- objEditor.jTree.setSelectionPath(destinationPath);
1003		- pasteInto(false, false); // true); // ???
1004		- }
	1640	+// } else {
	1641	+// loadClipboard(false);
	1642	+// objEditor.jTree.setSelectionPath(destinationPath);
	1643	+// pasteInto(false, false); // true); // ???
	1644	+// }
1005	1645	}
1006	1646	public void dropActionChanged(DropTargetDragEvent dtde)
1007	1647	// Called if the user has modified the current drop gesture
..	..	@@ -1106,22 +1746,30 @@
1106	1746	{
1107	1747	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1108	1748	//heightFieldItem.addActionListener(this);
1109		- gridItem = menu.add(new MenuItem("Grid"));
1110		- gridItem.addActionListener(this);
1111		- rectoidItem = menu.add(new MenuItem("Box"));
1112		- rectoidItem.addActionListener(this);
1113		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1114		- ellipsoidItem.addActionListener(this);
1115		- coneItem = menu.add(new MenuItem("Cone"));
1116		- coneItem.addActionListener(this);
1117		- torusItem = menu.add(new MenuItem("Torus"));
1118		- torusItem.addActionListener(this);
1119		- superItem = menu.add(new MenuItem("Superellipsoid"));
1120		- superItem.addActionListener(this);
	1749	+// gridItem = menu.add(new MenuItem("Grid"));
	1750	+// gridItem.addActionListener(this);
	1751	+// rectoidItem = menu.add(new MenuItem("Box"));
	1752	+// rectoidItem.addActionListener(this);
	1753	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1754	+// ellipsoidItem.addActionListener(this);
	1755	+// coneItem = menu.add(new MenuItem("Cone"));
	1756	+// coneItem.addActionListener(this);
	1757	+// torusItem = menu.add(new MenuItem("Torus"));
	1758	+// torusItem.addActionListener(this);
	1759	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1760	+// superItem.addActionListener(this);
	1761	+
	1762	+ cameraItem = menu.add(new MenuItem("Camera"));
	1763	+ cameraItem.addActionListener(this);
	1764	+
	1765	+ if (!Globals.ADVANCED)
	1766	+ {
1121	1767	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1122	1768	kleinItem.addActionListener(this);
1123		- particleItem = menu.add(new MenuItem("Particle system"));
1124		- particleItem.addActionListener(this);
	1769	+ }
	1770	+
	1771	+// particleItem = menu.add(new MenuItem("Particle system"));
	1772	+// particleItem.addActionListener(this);
1125	1773	if (Globals.ADVANCED)
1126	1774	{
1127	1775	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1147,15 +1795,15 @@
1147	1795	}
1148	1796	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1149	1797	bezierItem.addActionListener(this);
1150		- overlayItem = menu.add(new MenuItem("Overlay"));
1151		- overlayItem.addActionListener(this);
1152		- lightItem = menu.add(new MenuItem("Light"));
1153		- lightItem.addActionListener(this);
	1798	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1799	+// overlayItem.addActionListener(this);
	1800	+// lightItem = menu.add(new MenuItem("Light"));
	1801	+// lightItem.addActionListener(this);
1154	1802	menu.add("-");
1155	1803	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1156	1804	//superLoopItem.addActionListener(this);
1157		- loopItem = menu.add(new MenuItem("Loop"));
1158		- loopItem.addActionListener(this);
	1805	+// loopItem = menu.add(new MenuItem("Loop"));
	1806	+// loopItem.addActionListener(this);
1159	1807	doubleItem = menu.add(new MenuItem("Fork"));
1160	1808	doubleItem.addActionListener(this);
1161	1809	if (Globals.ADVANCED)
..	..	@@ -1171,6 +1819,9 @@
1171	1819	animationItem.addItemListener(this);
1172	1820	animationItem.setState(Globals.ANIMATION);
1173	1821
	1822	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1823	+ archiveItem.addActionListener(this);
	1824	+
1174	1825	menu.add("-");
1175	1826	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1176	1827	parseverticesItem.addActionListener(this);
..	..	@@ -1183,6 +1834,8 @@
1183	1834	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1184	1835	reduce34MorphItem.addActionListener(this);
1185	1836	menu.add("-");
	1837	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1838	+ memoryItem.addActionListener(this);
1186	1839	menu.add(computeAOItem = new MenuItem("Compute AO"));
1187	1840	computeAOItem.addActionListener(this);
1188	1841
..	..	@@ -1191,11 +1844,9 @@
1191	1844	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1192	1845	mirrorItem.addActionListener(this);
1193	1846	menu.add("-");
1194		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1195		- memoryItem.addActionListener(this);
1196	1847	menu.add(analyzeItem = new MenuItem("Analyze"));
1197	1848	analyzeItem.addActionListener(this);
1198		- menu.add(dumpItem = new MenuItem("Dump"));
	1849	+ menu.add(dumpItem = new MenuItem("Print"));
1199	1850	dumpItem.addActionListener(this);
1200	1851	// menu.add(pathItem = new MenuItem("From-to path"));
1201	1852	// pathItem.addActionListener(this);
..	..	@@ -1336,9 +1987,34 @@
1336	1987	shadow.material = new cMaterial(obj.material);
1337	1988	shadow.material.diffuse = 0.0001f;
1338	1989	shadow.material.specular = 0.0001f;
	1990	+ //shadow.projectedVertices[1].x = 300;
1339	1991
1340	1992	makeSomething(shadow);
1341	1993	}
	1994	+
	1995	+ private void ClearUnpinned()
	1996	+ {
	1997	+ //for (Object3D obj : listUI)
	1998	+ for (int i=listUI.size(); --i>=0;)
	1999	+ {
	2000	+ Object3D obj = listUI.elementAt(i);
	2001	+ if (!obj.pinned)
	2002	+ {
	2003	+ obj.CloseUI();
	2004	+ listUI.remove(i);
	2005	+ }
	2006	+ }
	2007	+ }
	2008	+
	2009	+ private void EditElement(Object3D elem, boolean newWindow)
	2010	+ {
	2011	+ // if (!(elem instanceof Composite))
	2012	+ // newWindow = false;
	2013	+ listUI.add(elem);
	2014	+ elem.openEditWindow(this, newWindow); //, false);
	2015	+ System.out.println("edit : " + elem);
	2016	+ elem.editWindow.refreshContents(true); // ? new
	2017	+ }
1342	2018
1343	2019	/**
1344	2020	* applyExample
..	..	@@ -1542,9 +2218,9 @@
1542	2218
1543	2219	void Overwrite(int mask)
1544	2220	{
1545		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2221	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1546	2222	{
1547		- Object3D content = GrafreeD.clipboard.get(0);
	2223	+ Object3D content = Grafreed.clipboard.get(0);
1548	2224
1549	2225	if (content instanceof cGroup && ((cGroup)content).transientlink )
1550	2226	content = ((cGroup)content).get(0);
..	..	@@ -1583,7 +2259,7 @@
1583	2259	{
1584	2260	ScreenFit();
1585	2261	} else
1586		- if (source == switchItem)
	2262	+ if (source == switchViewItem)
1587	2263	{
1588	2264	cVector v1 = new cVector();
1589	2265	cVector v2 = new cVector();
..	..	@@ -1592,11 +2268,11 @@
1592	2268	objEditor.cameraView.renderCamera.setAim(v2, v1);
1593	2269	objEditor.cameraView.repaint();
1594	2270	} else
1595		- if (source == rectoidItem)
	2271	+ if (source == rectoidItem \|\| source == boxButton)
1596	2272	{
1597	2273	makeSomething(new Box());
1598	2274	} else
1599		- if (source == particleItem)
	2275	+ if (source == particleItem \|\| source == particlesButton)
1600	2276	{
1601	2277	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1602	2278	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1675,27 +2351,27 @@
1675	2351
1676	2352	makeSomething(obj);
1677	2353	} else
1678		- if (source == gridItem)
	2354	+ if (source == gridItem \|\| source == gridButton)
1679	2355	{
1680	2356	makeSomething(new Grid());
1681	2357	} else
1682		- if (source == ellipsoidItem)
	2358	+ if (source == ellipsoidItem \|\| source == sphereButton)
1683	2359	{
1684	2360	makeSomething(new Sphere());
1685	2361	} else
1686		- if (source == coneItem)
	2362	+ if (source == coneItem \|\| source == coneButton)
1687	2363	{
1688	2364	makeSomething(new Cone());
1689	2365	} else
1690		- if (source == torusItem)
	2366	+ if (source == torusItem \|\| source == torusButton)
1691	2367	{
1692	2368	makeSomething(new Torus());
1693	2369	} else
1694		- if (source == superItem)
	2370	+ if (source == superItem \|\| source == superButton)
1695	2371	{
1696	2372	makeSomething(new Superellipsoid());
1697	2373	} else
1698		- if (source == kleinItem)
	2374	+ if (source == kleinItem \|\| source == kleinButton)
1699	2375	{
1700	2376	makeSomething(new Klein());
1701	2377	} else
..	..	@@ -1715,7 +2391,7 @@
1715	2391	{
1716	2392	makeSomething(new BezierSurface());
1717	2393	} else
1718		- if (source == overlayItem)
	2394	+ if (source == overlayItem \|\| source == overlayButton)
1719	2395	{
1720	2396	/*
1721	2397	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1763,10 +2439,27 @@
1763	2439	s.setup();
1764	2440	makeSomething(s);
1765	2441	} else
1766		- if (source == lightItem)
	2442	+ if (source == lightItem \|\| source == lightButton)
1767	2443	{
1768	2444	makeSomething(new Light());
1769	2445	} else
	2446	+// if (source == skybox1Button \|\|
	2447	+// source == skybox2Button \|\|
	2448	+// source == skybox3Button \|\|
	2449	+// source == skybox4Button \|\|
	2450	+// source == skybox5Button \|\|
	2451	+// source == skybox6Button \|\|
	2452	+// source == skybox7Button \|\|
	2453	+// source == skybox11Button \|\|
	2454	+// source == skybox12Button \|\|
	2455	+// source == skybox13Button \|\|
	2456	+// source == skybox14Button \|\|
	2457	+// source == skybox15Button \|\|
	2458	+// source == skybox16Button \|\|
	2459	+// source == skybox17Button)
	2460	+// {
	2461	+// ChangeSkybox(source);
	2462	+// } else
1770	2463	if (source == csgItem)
1771	2464	{
1772	2465	group(new CSG());
..	..	@@ -1813,30 +2506,30 @@
1813	2506
1814	2507	group(g);
1815	2508	} else
1816		- if (source == loopItem)
	2509	+ if (source == loopItem \|\| source == loopButton)
1817	2510	{
1818	2511	Composite csg = new GroupLeaf();
1819	2512	csg.count = 5;
1820	2513	group(csg);
1821		- Composite child = new cGroup();
	2514	+ Composite child = new cGroup("Branch");
1822	2515	csg.addChild(child);
1823	2516	child.addChild(csg);
1824	2517	} else
1825	2518	if (source == doubleItem)
1826	2519	{
1827		- Composite csg = new GroupLeaf();
	2520	+ Composite csg = new GroupLeaf("Fork");
1828	2521	csg.count = 5;
1829	2522	group(csg);
1830		- Composite child = new cGroup();
	2523	+ Composite child = new cGroup("Branch A");
1831	2524	csg.addChild(child);
1832	2525	child.addChild(csg);
1833		- child = new cGroup();
	2526	+ child = new cGroup("Branch B");
1834	2527	csg.addChild(child);
1835	2528	child.addChild(csg);
1836	2529	} else
1837	2530	if (source == tripleItem)
1838	2531	{
1839		- Composite csg = new GroupLeaf();
	2532	+ Composite csg = new GroupLeaf("Trident");
1840	2533	csg.count = 4;
1841	2534	group(csg);
1842	2535	Composite child = new cGroup();
..	..	@@ -1849,35 +2542,10 @@
1849	2542	csg.addChild(child);
1850	2543	child.addChild(csg);
1851	2544	} else
1852		-
1853		- if (source == importGFDItem)
1854		- {
1855		- ImportGFD();
1856		- } else
1857		- if (source == importVRMLX3DItem)
1858		- {
1859		- ImportVRMLX3D();
1860		- } else
1861		- if (source == import3DSItem)
1862		- {
1863		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1864		- } else
1865		- if (source == importOBJItem)
1866		- {
1867		- //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1868		- FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
1869		- browser.setVisible(true);
1870		- String filename = browser.getFile();
1871		- if (filename != null && filename.length() > 0)
1872		- {
1873		- String fullname = browser.getDirectory() + filename;
1874		- makeSomething(ReadOBJ(fullname), true);
1875		- }
1876		- } else
1877	2545	if (source == computeAOItem)
1878	2546	{
1879	2547	Globals.drawMode = CameraPane.OCCLUSION;
1880		- Globals.theRenderer.repaint();
	2548	+ cameraView.repaint();
1881	2549	} else
1882	2550	if (source == recompileItem)
1883	2551	{
..	..	@@ -1892,7 +2560,7 @@
1892	2560	if (source == invariantsItem)
1893	2561	{
1894	2562	System.out.println("Invariants:");
1895		- GrafreeD.grafreeD.universe.invariants();
	2563	+ Grafreed.grafreeD.universe.invariants();
1896	2564	} else
1897	2565	if (source == memoryItem)
1898	2566	{
..	..	@@ -1911,6 +2579,46 @@
1911	2579	{
1912	2580	DumpObject();
1913	2581	} else
	2582	+ if (source == minButton)
	2583	+ {
	2584	+ Minimize();
	2585	+ } else
	2586	+ if (source == maxButton)
	2587	+ {
	2588	+ Maximize();
	2589	+ } else
	2590	+ if (source == fullButton)
	2591	+ {
	2592	+ ToggleFullScreen();
	2593	+ } else
	2594	+ if (source == undoButton)
	2595	+ {
	2596	+ // Go to previous version
	2597	+ //if (!Undo())
	2598	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2599	+ Undo();
	2600	+ } else
	2601	+ if (source == restoreButton)
	2602	+ {
	2603	+ // Restore current version
	2604	+ Restore();
	2605	+ } else
	2606	+ if (source == replaceButton)
	2607	+ {
	2608	+ // Overwrite current version
	2609	+ Replace();
	2610	+ } else
	2611	+ if (source == redoButton)
	2612	+ {
	2613	+ // Go to next version
	2614	+ Redo();
	2615	+ } else
	2616	+ if (source == saveButton)
	2617	+ {
	2618	+ // Save a new version
	2619	+ if (!Save(true))
	2620	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2621	+ } else
1914	2622	if (source == oneStepButton)
1915	2623	{
1916	2624	Globals.ONESTEP = true;
..	..	@@ -1918,17 +2626,14 @@
1918	2626	} else
1919	2627	if (source == screenfitButton)
1920	2628	{
1921		- //Reload(lastConverter, lastFilename, true);
1922	2629	ScreenFit();
1923	2630	} else
1924	2631	if (source == screenfitpointButton)
1925	2632	{
1926		- //Reload(lastConverter, lastFilename, true);
1927	2633	ScreenFitPoint();
1928	2634	} else
1929	2635	if (source == snapobjectButton)
1930	2636	{
1931		- //Reload(lastConverter, lastFilename, true);
1932	2637	SnapObject();
1933	2638	} else
1934	2639	// if (event.getSource() == recompileButton)
..	..	@@ -1965,12 +2670,20 @@
1965	2670	{
1966	2671	loadClipboard(true);
1967	2672	} else
	2673	+ if (source == undoItem)
	2674	+ {
	2675	+ Undo();
	2676	+ } else
	2677	+ if (source == redoItem)
	2678	+ {
	2679	+ Redo();
	2680	+ } else
1968	2681	if (source == duplicateItem)
1969	2682	{
1970		- Object3D keep = GrafreeD.clipboard;
	2683	+ Object3D keep = Grafreed.clipboard;
1971	2684	loadClipboard(false);
1972	2685	paste(false);
1973		- GrafreeD.clipboard = keep;
	2686	+ Grafreed.clipboard = keep;
1974	2687	} else
1975	2688	if (source == cloneItem)
1976	2689	{
..	..	@@ -2190,9 +2903,9 @@
2190	2903	// group.selection.get(0).setMasterThis(content); // should be identity
2191	2904	// refreshContents();
2192	2905	// }
2193		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2906	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2194	2907	{
2195		- Object3D content = GrafreeD.clipboard.get(0);
	2908	+ Object3D content = Grafreed.clipboard.get(0);
2196	2909
2197	2910	if (content instanceof cGroup && ((cGroup)content).transientlink )
2198	2911	content = ((cGroup)content).get(0);
..	..	@@ -2242,9 +2955,9 @@
2242	2955	} else
2243	2956	if (source == setMasterItem)
2244	2957	{
2245		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2958	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2246	2959	{
2247		- Object3D content = GrafreeD.clipboard.get(0);
	2960	+ Object3D content = Grafreed.clipboard.get(0);
2248	2961
2249	2962	if (content instanceof cGroup && ((cGroup)content).transientlink )
2250	2963	content = ((cGroup)content).get(0);
..	..	@@ -2257,9 +2970,9 @@
2257	2970	{
2258	2971	if (group.selection.size() == 1)
2259	2972	{
2260		- if (GrafreeD.clipboard.size() == 1)
	2973	+ if (Grafreed.clipboard.size() == 1)
2261	2974	{
2262		- Object3D content = GrafreeD.clipboard.get(0);
	2975	+ Object3D content = Grafreed.clipboard.get(0);
2263	2976
2264	2977	if (content instanceof cGroup && ((cGroup)content).transientlink )
2265	2978	content = ((cGroup)content).get(0);
..	..	@@ -2276,7 +2989,7 @@
2276	2989	{
2277	2990	RevertMeshes();
2278	2991	} else
2279		- if (source == resetMeshItem)
	2992	+ if (source == resetAllItem)
2280	2993	{
2281	2994	ResetAll();
2282	2995	} else
..	..	@@ -2284,7 +2997,7 @@
2284	2997	{
2285	2998	StepAll();
2286	2999	} else
2287		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3000	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2288	3001	{
2289	3002	//int indices[] = jList.getSelectedIndices();
2290	3003	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2296,9 +3009,9 @@
2296	3009	{
2297	3010	ClearSelection(true);
2298	3011	} else
2299		- if (source == grabItem)
	3012	+ if (source == grabItem \|\| source == groupButton)
2300	3013	{
2301		- group(new cGroup(), true);
	3014	+ group(new cGroup(), false); // true);
2302	3015	} else
2303	3016	if (source == hideItem)
2304	3017	{
..	..	@@ -2316,11 +3029,11 @@
2316	3029	{
2317	3030	makeSomething(new Camera());
2318	3031	} else
2319		- if (source == compositeItem)
	3032	+ if (source == compositeItem \|\| source == compositeButton)
2320	3033	{
2321	3034	group(new Composite());
2322	3035	} else
2323		- if (source == randomItem)
	3036	+ if (source == switchItem \|\| source == switchButton)
2324	3037	{
2325	3038	RandomNode random = new RandomNode();
2326	3039	group(random);
..	..	@@ -2422,7 +3135,7 @@
2422	3135	{
2423	3136	group(new cLinker());
2424	3137	} else
2425		- if (source == textureItem)
	3138	+ if (source == textureItem \|\| source == textureButton)
2426	3139	{
2427	3140	group(new TextureNode());
2428	3141	} else
..	..	@@ -2442,17 +3155,30 @@
2442	3155	{
2443	3156	CastShadow(2);
2444	3157	} else
2445		- if (source == ungroupItem)
	3158	+ if (source == ungroupItem \|\| source == ungroupButton)
2446	3159	{
2447		- //ungroup();
	3160	+ boolean hasRoot = false;
	3161	+
2448	3162	for (int i=0; i<group.selection.size(); i++)
2449	3163	{
2450		- Ungroup(group.selection.get(i));
	3164	+ if (group.selection.get(i) == group)
	3165	+ {
	3166	+ hasRoot = true;
	3167	+ break;
	3168	+ }
2451	3169	}
2452	3170
2453		- ClearSelection(false);
2454		-
2455		- refreshContents();
	3171	+ if (!hasRoot)
	3172	+ {
	3173	+ for (int i=0; i<group.selection.size(); i++)
	3174	+ {
	3175	+ Ungroup(group.selection.get(i));
	3176	+ }
	3177	+
	3178	+ ClearSelection(false);
	3179	+
	3180	+ refreshContents();
	3181	+ }
2456	3182	} else
2457	3183	if (source == genUVItem)
2458	3184	{
..	..	@@ -2464,7 +3190,7 @@
2464	3190	} else
2465	3191	if (source == genNormalsMESHItem)
2466	3192	{
2467		- GenNormals(true); // TODO
	3193	+ GenNormalsMESH();
2468	3194	} else
2469	3195	if (source == genNormalsORGANItem)
2470	3196	{
..	..	@@ -2529,6 +3255,22 @@
2529	3255	if (source == unmarkleavesItem)
2530	3256	{
2531	3257	MarkLeaves(false);
	3258	+ } else
	3259	+ if (source == rewindleavesItem)
	3260	+ {
	3261	+ RewindLeaves(true);
	3262	+ } else
	3263	+ if (source == unrewindleavesItem)
	3264	+ {
	3265	+ RewindLeaves(false);
	3266	+ } else
	3267	+ if (source == randomleavesItem)
	3268	+ {
	3269	+ RandomLeaves(true);
	3270	+ } else
	3271	+ if (source == unrandomleavesItem)
	3272	+ {
	3273	+ RandomLeaves(false);
2532	3274	} else
2533	3275	if (source == flipVItem)
2534	3276	{
..	..	@@ -2614,9 +3356,13 @@
2614	3356	{
2615	3357	SmoothMesh();
2616	3358	} else
2617		- if (source == transformgeometryItem)
	3359	+ if (source == transformGeometryItem)
2618	3360	{
2619	3361	TransformGeometry();
	3362	+ } else
	3363	+ if (source == transformChildrenItem)
	3364	+ {
	3365	+ TransformChildren();
2620	3366	} else
2621	3367	if (source == resetTransformItem)
2622	3368	{
..	..	@@ -2624,7 +3370,11 @@
2624	3370	} else
2625	3371	if (source == resetCentroidItem)
2626	3372	{
2627		- ResetCentroid();
	3373	+ ResetCentroid(true);
	3374	+ } else
	3375	+ if (source == resetCentroidXZItem)
	3376	+ {
	3377	+ ResetCentroid(false);
2628	3378	} else
2629	3379	if (source == resetParentItem)
2630	3380	{
..	..	@@ -2729,7 +3479,7 @@
2729	3479	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2730	3480	{
2731	3481	obj = (Object3D)e.nextElement();
2732		- obj.SetBumpTexture(null);
	3482	+ obj.ResetBumpTexture();
2733	3483	}
2734	3484
2735	3485	refreshContents();
..	..	@@ -2745,6 +3495,31 @@
2745	3495
2746	3496	refreshContents();
2747	3497	} else
	3498	+ if (source == embedTexturesItem)
	3499	+ {
	3500	+ Object3D obj;
	3501	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3502	+ {
	3503	+ obj = (Object3D)e.nextElement();
	3504	+ obj.EmbedTextures(true);
	3505	+ }
	3506	+
	3507	+ refreshContents();
	3508	+ } else
	3509	+ if (source == deEmbedTexturesItem)
	3510	+ {
	3511	+ Object3D obj;
	3512	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3513	+ {
	3514	+ obj = (Object3D)e.nextElement();
	3515	+ obj.EmbedTextures(false);
	3516	+ }
	3517	+
	3518	+ CameraPane.texturepigment.clear();
	3519	+ CameraPane.texturebump.clear();
	3520	+
	3521	+ refreshContents();
	3522	+ } else
2748	3523	if (source == flashSelectionButton)
2749	3524	{
2750	3525	CameraPane.flash = true;
..	..	@@ -2756,6 +3531,10 @@
2756	3531	if (source == twoButton)
2757	3532	{
2758	3533	radio.layout = twoButton;
	3534	+
	3535	+ if (CameraPane.FULLSCREEN)
	3536	+ fullscreenLayout = radio.layout;
	3537	+
2759	3538	// bug
2760	3539	//gridPanel.setDividerLocation(1.0);
2761	3540	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2788,10 +3567,31 @@
2788	3567	bigThree.ClearUI();
2789	3568	bigThree.add(centralPanel);
2790	3569	bigThree.FlushUI();
	3570	+
	3571	+ cameraView.requestFocusInWindow();
	3572	+
	3573	+// refreshContents(true);
	3574	+//
	3575	+// try
	3576	+// {
	3577	+// java.awt.Robot bot = new java.awt.Robot();
	3578	+// int mask = InputEvent.BUTTON1_MASK;
	3579	+// bot.mouseMove(100, 100);
	3580	+// bot.mousePress(mask);
	3581	+// bot.mouseRelease(mask);
	3582	+// }
	3583	+// catch (Exception e)
	3584	+// {
	3585	+//
	3586	+// }
	3587	+
2791	3588	} else
2792	3589	if (source == threeButton)
2793	3590	{
2794	3591	radio.layout = threeButton;
	3592	+
	3593	+ if (CameraPane.FULLSCREEN)
	3594	+ fullscreenLayout = radio.layout;
2795	3595
2796	3596	// bigThree.remove(scenePanel);
2797	3597	// bigThree.remove(centralPanel);
..	..	@@ -2821,13 +3621,18 @@
2821	3621	// centralPanel.setVisible(true);
2822	3622	// XYZPanel.setVisible(true);
2823	3623	bigThree.ClearUI();
	3624	+ bigThree.add(scenePanel);
2824	3625	bigThree.add(centralPanel);
2825		- bigThree.add(XYZPanel);
2826	3626	bigThree.FlushUI();
	3627	+
	3628	+ cameraView.requestFocusInWindow();
2827	3629	} else
2828	3630	if (source == fourButton)
2829	3631	{
2830	3632	radio.layout = fourButton;
	3633	+
	3634	+ if (CameraPane.FULLSCREEN)
	3635	+ fullscreenLayout = radio.layout;
2831	3636
2832	3637	// bigThree.remove(scenePanel);
2833	3638	// bigThree.remove(centralPanel);
..	..	@@ -2859,10 +3664,15 @@
2859	3664	bigThree.ClearUI();
2860	3665	bigThree.add(scenePanel);
2861	3666	bigThree.FlushUI();
	3667	+
	3668	+ cameraView.requestFocusInWindow();
2862	3669	} else
2863	3670	if (source == sixButton)
2864	3671	{
2865	3672	radio.layout = sixButton;
	3673	+
	3674	+ if (CameraPane.FULLSCREEN)
	3675	+ fullscreenLayout = radio.layout;
2866	3676
2867	3677	// bigThree.remove(scenePanel);
2868	3678	// bigThree.remove(centralPanel);
..	..	@@ -2892,13 +3702,18 @@
2892	3702	// centralPanel.setVisible(true);
2893	3703	// XYZPanel.setVisible(false);
2894	3704	bigThree.ClearUI();
2895		- bigThree.add(scenePanel);
2896	3705	bigThree.add(centralPanel);
	3706	+ bigThree.add(scenePanel);
2897	3707	bigThree.FlushUI();
	3708	+
	3709	+ cameraView.requestFocusInWindow();
2898	3710	} else
2899	3711	if (source == sevenButton)
2900	3712	{
2901	3713	radio.layout = sevenButton;
	3714	+
	3715	+ if (CameraPane.FULLSCREEN)
	3716	+ fullscreenLayout = radio.layout;
2902	3717
2903	3718	// bigThree.remove(scenePanel);
2904	3719	// bigThree.remove(centralPanel);
..	..	@@ -2932,6 +3747,8 @@
2932	3747	bigThree.add(centralPanel);
2933	3748	bigThree.add(XYZPanel);
2934	3749	bigThree.FlushUI();
	3750	+
	3751	+ cameraView.requestFocusInWindow();
2935	3752	} else
2936	3753	if (source == rootButton)
2937	3754	{
..	..	@@ -2943,6 +3760,7 @@
2943	3760	EditObject(obj);
2944	3761	}
2945	3762
	3763	+ cameraView.requestFocusInWindow();
2946	3764	refreshContents(true);
2947	3765	} else
2948	3766	if (source == closeButton)
..	..	@@ -2952,22 +3770,37 @@
2952	3770	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2953	3771	{
2954	3772	ab = (cRadio)e.nextElement();
2955		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3773	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2956	3774	{
	3775	+ // Patch to avoid bug with transparency.
	3776	+ if (!ab.hadMaterial)
	3777	+ {
	3778	+ ab.object.material = null;
	3779	+ }
	3780	+
2957	3781	buttonGroup.remove(ab);
2958	3782	radioPanel.remove(ab);
2959	3783
2960		- ab.GetObject().editWindow = null;
	3784	+ //ab.GetObject().editWindow = null;
	3785	+ ab.GetObject().manipWindow = null;
2961	3786	// ab.GetObject().objectUI = null; // ?????????
2962	3787
2963	3788	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2964	3789	break;
2965	3790	}
2966	3791	}
	3792	+
	3793	+ cameraView.requestFocusInWindow();
2967	3794	refreshContents(true);
2968	3795	} else
2969	3796	if (source == editItem \|\| source == editButton)
2970	3797	{
	3798	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3799	+ {
	3800	+ Object3D child = (Object3D)e.nextElement();
	3801	+ child.pinned = true;
	3802	+ }
	3803	+
2971	3804	EditSelection(false);
2972	3805	} else
2973	3806	if (source == uneditButton)
..	..	@@ -2977,10 +3810,11 @@
2977	3810	Object3D child = (Object3D)e.nextElement();
2978	3811	if(child.editWindow != null)
2979	3812	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3813	+ child.pinned = false;
2980	3814	child.CloseUI();
2981	3815	listUI.remove(child);
2982	3816
2983		- child.editWindow = null; // ???????????
	3817	+ //child.editWindow = null; // ???????????
2984	3818	}
2985	3819	objEditor.ctrlPanel.FlushUI();
2986	3820	//objEditor.jTree.clearSelection();
..	..	@@ -2993,6 +3827,7 @@
2993	3827	//copy.ClearUI();
2994	3828	for (Object3D obj : listUI)
2995	3829	{
	3830	+ obj.pinned = false;
2996	3831	obj.CloseUI();
2997	3832	}
2998	3833	listUI.clear();
..	..	@@ -3002,7 +3837,7 @@
3002	3837	{
3003	3838	assert(copy == group);
3004	3839
3005		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3840	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3006	3841
3007	3842	for (Object3D obj : listUI)
3008	3843	{
..	..	@@ -3051,6 +3886,9 @@
3051	3886	}
3052	3887
3053	3888	copy = group;
	3889	+
	3890	+ SetUndoStates();
	3891	+
3054	3892	//Globals.theRenderer.object = group;
3055	3893	if(!useclient)
3056	3894	{
..	..	@@ -3066,20 +3904,46 @@
3066	3904	frontView.object = group;
3067	3905	sideView.object = group;
3068	3906	}
3069		- group.editWindow = this;
	3907	+
	3908	+// fix "+" issue
	3909	+ //group.editWindow = this;
	3910	+ group.manipWindow = this;
	3911	+
3070	3912	/*
3071	3913	currentLayout = radio.layout;
3072	3914	if (currentLayout == null)
3073	3915	currentLayout = sevenButton;
3074	3916	*/
3075	3917	radio.layout.doClick();
	3918	+
	3919	+ ClearUnpinned();
	3920	+ //Grafreed.Assert(group != null);
	3921	+ //Grafreed.Assert(group.selection != null);
	3922	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	3923	+ if (group.selection == null \|\| group.selection.size() == 1)
	3924	+ EditSelection(false);
3076	3925	keepparent = group.parent;
3077	3926	// PARENT = NULL or not???
3078	3927	//group.parent = null; // ROOT
3079	3928	//group.attributes = -1;
3080	3929	ResetModel();
	3930	+
	3931	+ cameraView.requestFocusInWindow();
3081	3932	refreshContents(true);
3082		- }
	3933	+ } else if (event.getSource() == editCameraItem)
	3934	+ {
	3935	+ cameraView.ProtectCamera();
	3936	+ cameraView.repaint();
	3937	+ return;
	3938	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3939	+ {
	3940	+ cameraView.RevertCamera();
	3941	+ cameraView.repaint();
	3942	+ return;
	3943	+ // } else if (event.getSource() == textureButton)
	3944	+ // {
	3945	+ // return; // true;
	3946	+ }
3083	3947	else
3084	3948	{
3085	3949	//return super.action(event, arg);
..	..	@@ -3088,7 +3952,6 @@
3088	3952	}
3089	3953
3090	3954	boolean useclient = false;
3091		- cRadio radio;
3092	3955
3093	3956	void ToggleRoot()
3094	3957	{
..	..	@@ -3140,6 +4003,28 @@
3140	4003	refreshContents();
3141	4004	}
3142	4005
	4006	+ void TransformChildren()
	4007	+ {
	4008	+ Object3D obj;
	4009	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4010	+ {
	4011	+ obj = (Object3D)e.nextElement();
	4012	+ obj.KeepTextureMatrices();
	4013	+ obj.TransformChildren();
	4014	+ obj.RestoreTextureMatrices();
	4015	+
	4016	+// if (obj.parent == null)
	4017	+// {
	4018	+// System.out.println("NULL PARENT!");
	4019	+// new Exception().printStackTrace();
	4020	+// }
	4021	+// else
	4022	+// TouchTransform(obj);
	4023	+// //obj.parent.Touch();
	4024	+ }
	4025	+
	4026	+ refreshContents();
	4027	+ }
3143	4028
3144	4029	void ResetTransform()
3145	4030	{
..	..	@@ -3252,7 +4137,7 @@
3252	4137	refreshContents();
3253	4138	}
3254	4139
3255		- void ResetCentroid()
	4140	+ void ResetCentroid(boolean full)
3256	4141	{
3257	4142	Object3D obj;
3258	4143	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3267,12 +4152,16 @@
3267	4152	LA.matIdentity(Object3D.mat);
3268	4153	obj.getBounds(minima, maxima, false);
3269	4154	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3270		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	4155	+ if (full)
	4156	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3271	4157	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3272	4158	obj.TransformMesh(Object3D.mat);
	4159	+
3273	4160	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3274		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	4161	+ if (full)
	4162	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3275	4163	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	4164	+
3276	4165	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3277	4166	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3278	4167	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3301,7 +4190,8 @@
3301	4190
3302	4191	int size = obj.MemorySize();
3303	4192
3304		- System.err.println((size/1024) + " KB is the size of " + obj);
	4193	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4194	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3305	4195	}
3306	4196	}
3307	4197	catch (Exception e)
..	..	@@ -3338,9 +4228,9 @@
3338	4228	obj = (Object3D)e.nextElement();
3339	4229
3340	4230	System.out.println("Object is: " + obj);
3341		- GrafreeD.AnalyzeObject(obj);
	4231	+ Grafreed.AnalyzeObject(obj);
3342	4232	System.out.println("Boundary rep: " + obj.bRep);
3343		- GrafreeD.AnalyzeObject(obj.bRep);
	4233	+ Grafreed.AnalyzeObject(obj.bRep);
3344	4234
3345	4235	// System.err.println((size/1024) + " KB is the size of " + obj);
3346	4236	}
..	..	@@ -3382,6 +4272,13 @@
3382	4272	void GenNormals(boolean crease)
3383	4273	{
3384	4274	group.GenNormalsS(crease);
	4275	+
	4276	+ refreshContents();
	4277	+ }
	4278	+
	4279	+ void GenNormalsMESH()
	4280	+ {
	4281	+ group.GenNormalsMeshS();
3385	4282
3386	4283	refreshContents();
3387	4284	}
..	..	@@ -3554,8 +4451,8 @@
3554	4451
3555	4452	void ParseVertices()
3556	4453	{
3557		- boolean epsequal = GrafreeD.epsequal;
3558		- GrafreeD.epsequal = true;
	4454	+ boolean epsequal = Grafreed.epsequal;
	4455	+ Grafreed.epsequal = true;
3559	4456
3560	4457	for (int i=0; i<group.selection.size(); i++)
3561	4458	{
..	..	@@ -3580,7 +4477,7 @@
3580	4477	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3581	4478	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3582	4479
3583		- g.add(GrafreeD.clipboard);
	4480	+ g.add(Grafreed.clipboard);
3584	4481
3585	4482	buffer.add(g);
3586	4483	}
..	..	@@ -3595,7 +4492,7 @@
3595	4492	makeSomething(buffer, i==group.selection.size()-1);
3596	4493	}
3597	4494
3598		- GrafreeD.epsequal = epsequal;
	4495	+ Grafreed.epsequal = epsequal;
3599	4496
3600	4497	refreshContents();
3601	4498	}
..	..	@@ -3613,7 +4510,16 @@
3613	4510	String pigment = Object3D.GetPigment(tex);
3614	4511	//String bump = Object3D.GetBump(tex);
3615	4512
3616		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4513	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4514	+
	4515	+ try
	4516	+ {
	4517	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
	4518	+ }
	4519	+ catch (Exception e)
	4520	+ {
	4521	+ System.err.println("FAIL: " + node);
	4522	+ }
3617	4523
3618	4524	double s = v.s;
3619	4525
..	..	@@ -3745,7 +4651,7 @@
3745	4651	return;
3746	4652
3747	4653	Object3D poses = group.selection.get(0);
3748		- Object3D ref = GrafreeD.clipboard.get(0);
	4654	+ Object3D ref = Grafreed.clipboard.get(0);
3749	4655
3750	4656	Object3D newgroup = new Object3D("Po:" + poses.name);
3751	4657
..	..	@@ -3939,9 +4845,9 @@
3939	4845
3940	4846	void ClipMesh()
3941	4847	{
3942		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4848	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3943	4849	{
3944		- Object3D content = GrafreeD.clipboard.get(0);
	4850	+ Object3D content = Grafreed.clipboard.get(0);
3945	4851
3946	4852	if (content instanceof cGroup && ((cGroup)content).transientlink )
3947	4853	content = ((cGroup)content).get(0);
..	..	@@ -3950,7 +4856,7 @@
3950	4856	// {
3951	4857	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3952	4858	// }
3953		- group.selection.ClipMesh(GrafreeD.clipboard);
	4859	+ group.selection.ClipMesh(Grafreed.clipboard);
3954	4860	}
3955	4861	// group.selection.ClipMesh(GrafreeD.clipboard);
3956	4862	System.out.println("DONE.");
..	..	@@ -3997,6 +4903,18 @@
3997	4903	void MarkLeaves(boolean hide)
3998	4904	{
3999	4905	group.selection.MarkLeaves(hide);
	4906	+ refreshContents();
	4907	+ }
	4908	+
	4909	+ void RewindLeaves(boolean hide)
	4910	+ {
	4911	+ group.selection.RewindLeaves(hide);
	4912	+ refreshContents();
	4913	+ }
	4914	+
	4915	+ void RandomLeaves(boolean hide)
	4916	+ {
	4917	+ group.selection.RandomLeaves(hide);
4000	4918	refreshContents();
4001	4919	}
4002	4920
..	..	@@ -4071,28 +4989,25 @@
4071	4989	// }
4072	4990	// }
4073	4991
4074		- static boolean allparams = true;
4075		-
4076		- static Vector<Object3D> listUI = new Vector<Object3D>();
4077		-
4078	4992	void EditSelection(boolean newWindow)
4079	4993	{
	4994	+ if (group.selection == null)
	4995	+ {
	4996	+ EditElement(group, newWindow); // ? new
	4997	+ return;
	4998	+ }
	4999	+
4080	5000	// aConstraints.gridy = 0;
4081	5001	for (int i=0; i<group.selection.size(); i++)
4082	5002	{
4083	5003	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4084	5004	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4085		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5005	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4086	5006
4087	5007	Object3D elem = (Object3D)group.selection.elementAt(i);
4088		- if(elem != group)
	5008	+ if(elem != group \|\| !newWindow)
4089	5009	{
4090		- // if (!(elem instanceof Composite))
4091		- // newWindow = false;
4092		- listUI.add(elem);
4093		- elem.openEditWindow(this, newWindow); //, false);
4094		- System.out.println("edit : " + elem);
4095		- elem.editWindow.refreshContents(true); // ? new
	5010	+ EditElement(elem, newWindow); // ? new
4096	5011	}
4097	5012	}
4098	5013	}
..	..	@@ -4167,7 +5082,8 @@
4167	5082	//new Exception().printStackTrace();
4168	5083
4169	5084	freezemodel = true;
4170		-
	5085	+ ClearUnpinned();
	5086	+
4171	5087	/**/
4172	5088	//switch (event.id)
4173	5089	{
..	..	@@ -4175,7 +5091,6 @@
4175	5091	//case 702: // Event.LIST_DESELECT
4176	5092	group.deselectAll();
4177	5093	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4178		- objEditor.ClearInfo(); // .GetMaterial());
4179	5094	if (tps != null)
4180	5095	{
4181	5096	for (int i=0; i < tps.length; i++)
..	..	@@ -4184,10 +5099,8 @@
4184	5099
4185	5100	//if (child.parent != null)
4186	5101	//child.parent.addSelectee(child);
	5102	+ objEditor.SetMaterial(child);
4187	5103	group.addSelectee(child);
4188		- objEditor.SetMaterial(child); // .GetMaterial());
4189		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4190		- System.err.println("info : " + child.GetPath());
4191	5104	}
4192	5105	}
4193	5106	// else
..	..	@@ -4197,20 +5110,28 @@
4197	5110	// System.err.println("info : " + group.GetPath());
4198	5111	// }
4199	5112
4200		- objEditor.SetText(); // jan 2014
4201		-
4202		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	5113	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4203	5114	CameraPane.flash = true;
4204	5115
4205		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5116	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4206	5117	// a camera
4207	5118	{
4208		- CameraPane.camerachangeframe = 0; // don't refuse it
4209		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5119	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5120	+ {
	5121	+ CameraPane.camerachangeframe = 0; // don't refuse it
	5122	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5123	+ }
4210	5124	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4211	5125	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4212	5126	}
4213	5127
	5128	+ if (tps != null && tps.length == 1)
	5129	+ {
	5130	+ EditSelection(false);
	5131	+ }
	5132	+
	5133	+ SetPinStates(tps != null && tps.length > 0);
	5134	+
4214	5135	refreshContents();
4215	5136	//return true;
4216	5137	}
..	..	@@ -4219,6 +5140,35 @@
4219	5140
4220	5141	freezemodel = false;
4221	5142	}
	5143	+
	5144	+ void SetPinStates(boolean enabled)
	5145	+ {
	5146	+ editButton.setEnabled(enabled);
	5147	+ uneditButton.setEnabled(enabled);
	5148	+ unselectButton.setEnabled(enabled);
	5149	+ flashSelectionButton.setEnabled(enabled);
	5150	+ }
	5151	+
	5152	+ void refreshContents(boolean cp)
	5153	+ {
	5154	+ if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5155	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5156	+ {
	5157	+ objEditor.ClearInfo(); // .GetMaterial());
	5158	+
	5159	+ for (int i=0; i < group.selection.Size(); i++)
	5160	+ {
	5161	+ Object3D child = (Object3D) group.selection.get(i);
	5162	+
	5163	+ objEditor.AddInfo(child, this, true);
	5164	+ System.err.println("info : " + child.GetPath());
	5165	+ }
	5166	+
	5167	+ objEditor.SetText(); // jan 2014
	5168	+ }
	5169	+
	5170	+ super.refreshContents(cp);
	5171	+ }
4222	5172
4223	5173	void linkSomething(Object3D thing)
4224	5174	{
..	..	@@ -4290,16 +5240,19 @@
4290	5240	{
4291	5241	if (group.selection.isEmpty())
4292	5242	return;
4293		- GrafreeD.clipboardIsTempGroup = false;
	5243	+
	5244	+ Grafreed.clipboardIsTempGroup = false;
4294	5245	Composite tGroup = null;
4295	5246	if (group.selection.size() > 0) // 1)
4296	5247	{
4297	5248	tGroup = new cGroup();
4298		- GrafreeD.clipboardIsTempGroup = true;
	5249	+ Grafreed.clipboardIsTempGroup = true;
4299	5250	}
4300	5251
4301	5252	if (cut)
4302	5253	{
	5254	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5255	+// Save();
4303	5256	//int indices[] = jList.getSelectedIndices();
4304	5257	//for (int i = indices.length - 1; i >= 0; i--)
4305	5258	//jList.remove(indices[i]);
..	..	@@ -4335,16 +5288,16 @@
4335	5288	//System.out.println("cut " + child);
4336	5289	//System.out.println("parent = " + child.parent);
4337	5290	// tmp.addChild(child);
4338		- if (GrafreeD.clipboardIsTempGroup)
	5291	+ if (Grafreed.clipboardIsTempGroup)
4339	5292	tGroup.add/Child/(tmp);
4340	5293	else
4341		- GrafreeD.clipboard = tmp;
	5294	+ Grafreed.clipboard = tmp;
4342	5295	}
4343	5296	else
4344		- if (GrafreeD.clipboardIsTempGroup)
	5297	+ if (Grafreed.clipboardIsTempGroup)
4345	5298	tGroup.add/Child/(child);
4346	5299	else
4347		- GrafreeD.clipboard = child;
	5300	+ Grafreed.clipboard = child;
4348	5301	}
4349	5302
4350	5303	//ResetModel();
..	..	@@ -4376,21 +5329,23 @@
4376	5329	//System.out.println("cut " + elem);
4377	5330	//System.out.println("parent = " + elem.parent);
4378	5331	// tmp.addChild(elem);
4379		- if (GrafreeD.clipboardIsTempGroup)
	5332	+ if (Grafreed.clipboardIsTempGroup)
4380	5333	tGroup.add/Child/(tmp);
4381	5334	else
4382		- GrafreeD.clipboard = tmp;
	5335	+ Grafreed.clipboard = tmp;
4383	5336	}
4384	5337	else
4385		- if (GrafreeD.clipboardIsTempGroup)
	5338	+ if (Grafreed.clipboardIsTempGroup)
4386	5339	tGroup.add/Child/(child);
4387	5340	else
4388		- GrafreeD.clipboard = child;
	5341	+ Grafreed.clipboard = child;
4389	5342	}
4390	5343
4391	5344	}
4392		- if (GrafreeD.clipboardIsTempGroup)
4393		- GrafreeD.clipboard = tGroup;
	5345	+
	5346	+ if (Grafreed.clipboardIsTempGroup)
	5347	+ Grafreed.clipboard = tGroup;
	5348	+
4394	5349	if (cut)
4395	5350	{
4396	5351	ResetModel();
..	..	@@ -4400,11 +5355,15 @@
4400	5355
4401	5356	void paste(boolean expand)
4402	5357	{
	5358	+ if (Globals.REPLACEONMAKE)
	5359	+ Save();
	5360	+ boolean keep = Globals.REPLACEONMAKE;
	5361	+ Globals.REPLACEONMAKE = false;
4403	5362	// if (GrafreeD.clipboard == null)
4404	5363	// return;
4405	5364	boolean first = true;
4406	5365
4407		- if (GrafreeD.clipboardIsTempGroup)
	5366	+ if (Grafreed.clipboardIsTempGroup)
4408	5367	{
4409	5368	Composite temp;
4410	5369
..	..	@@ -4415,7 +5374,7 @@
4415	5374	temp = (Composite)Applet3D.clipboard.deepCopy();
4416	5375	*/
4417	5376	Object3D elem;
4418		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5377	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4419	5378	{
4420	5379	Object3D child = (Object3D)e.nextElement();
4421	5380
..	..	@@ -4449,16 +5408,17 @@
4449	5408	//Object3D cb = Applet3D.clipboard;
4450	5409	//temp.addChild(cb);
4451	5410	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4452		- assert(GrafreeD.clipboard.parent == null);
4453		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4454		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4455		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4456		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	5411	+ assert(Grafreed.clipboard.parent == null);
	5412	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5413	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5414	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5415	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4457	5416	else
4458		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4459		- GrafreeD.clipboard.get(0).parent = keepparent;
	5417	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5418	+ Grafreed.clipboard.get(0).parent = keepparent;
4460	5419	}
4461	5420
	5421	+ Globals.REPLACEONMAKE = keep;
4462	5422	ResetModel();
4463	5423	refreshContents();
4464	5424	}
..	..	@@ -4505,9 +5465,9 @@
4505	5465	{
4506	5466	boolean first = true;
4507	5467
4508		- if (GrafreeD.clipboardIsTempGroup)
	5468	+ if (Grafreed.clipboardIsTempGroup)
4509	5469	{
4510		- Composite temp = (Composite)GrafreeD.clipboard;
	5470	+ Composite temp = (Composite)Grafreed.clipboard;
4511	5471	Object3D copy;
4512	5472	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4513	5473	{
..	..	@@ -4517,7 +5477,7 @@
4517	5477	}
4518	5478	} else
4519	5479	{
4520		- linkSomething(GrafreeD.clipboard); //.get(0));
	5480	+ linkSomething(Grafreed.clipboard); //.get(0));
4521	5481	}
4522	5482	}
4523	5483	}
..	..	@@ -4594,6 +5554,10 @@
4594	5554
4595	5555	void group(Object3D csg, boolean grab)
4596	5556	{
	5557	+ if (Globals.REPLACEONMAKE)
	5558	+ Save();
	5559	+ boolean keep = Globals.REPLACEONMAKE;
	5560	+ Globals.REPLACEONMAKE = false;
4597	5561	if (//false) // why??
4598	5562	!group.selection.isEmpty())
4599	5563	{
..	..	@@ -4707,10 +5671,15 @@
4707	5671	//node.add(csg);
4708	5672	//makeSomething(node);
4709	5673	makeSomething(csg);
	5674	+ Globals.REPLACEONMAKE = keep;
4710	5675	}
4711	5676
4712	5677	void Ungroup(Object3D g)
4713	5678	{
	5679	+ if (Globals.REPLACEONMAKE)
	5680	+ Save();
	5681	+ boolean keep = Globals.REPLACEONMAKE;
	5682	+ Globals.REPLACEONMAKE = false;
4714	5683	if (g instanceof HiddenObject)
4715	5684	{
4716	5685	HiddenObject h = (HiddenObject) g;
..	..	@@ -4727,6 +5696,7 @@
4727	5696	objEditor.makeSomething(g.get(i), false);
4728	5697	}
4729	5698	}
	5699	+ Globals.REPLACEONMAKE = keep;
4730	5700	}
4731	5701
4732	5702	void ungroup()
..	..	@@ -4922,21 +5892,6 @@
4922	5892	}
4923	5893	*/
4924	5894
4925		- void ImportGFD()
4926		- {
4927		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4928		- browser.show();
4929		- String filename = browser.getFile();
4930		- if (filename != null && filename.length() > 0)
4931		- {
4932		- String fullname = browser.getDirectory() + filename;
4933		-
4934		- //Object3D readobj =
4935		- objEditor.ReadGFD(fullname, objEditor);
4936		- //makeSomething(readobj);
4937		- }
4938		- }
4939		-
4940	5895	/*
4941	5896	public void Callback(Object obj)
4942	5897	{
..	..	@@ -4960,26 +5915,9 @@
4960	5915	}
4961	5916	*/
4962	5917
4963		- void ImportVRMLX3D()
4964		- {
4965		- if (GrafreeD.standAlone)
4966		- {
4967		- /**/
4968		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4969		- browser.show();
4970		- String filename = browser.getFile();
4971		- if (filename != null && filename.length() > 0)
4972		- {
4973		- String fullname = browser.getDirectory() + filename;
4974		- LoadVRMLX3D(fullname);
4975		- }
4976		- /**/
4977		- }
4978		- }
4979		-
4980	5918	String GetFile(String dialogName)
4981	5919	{
4982		- if (GrafreeD.standAlone)
	5920	+ if (Grafreed.standAlone)
4983	5921	{
4984	5922	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4985	5923	browser.show();
..	..	@@ -5047,7 +5985,44 @@
5047	5985	cButton clearpanelButton;
5048	5986	cButton unselectButton;
5049	5987
	5988	+ cButton restoreCameraButton;
	5989	+
	5990	+ cButton saveButton;
5050	5991	cButton oneStepButton;
	5992	+
	5993	+ cButton groupButton;
	5994	+ cButton ungroupButton;
	5995	+ cButton compositeButton;
	5996	+ cButton switchButton;
	5997	+ cButton loopButton;
	5998	+ cButton textureButton;
	5999	+
	6000	+ cButton skybox1Button;
	6001	+ cButton skybox2Button;
	6002	+ cButton skybox3Button;
	6003	+ cButton skybox4Button;
	6004	+ cButton skybox5Button;
	6005	+ cButton skybox6Button;
	6006	+ cButton skybox7Button;
	6007	+
	6008	+ cButton skybox11Button;
	6009	+ cButton skybox12Button;
	6010	+ cButton skybox13Button;
	6011	+ cButton skybox14Button;
	6012	+ cButton skybox15Button;
	6013	+ cButton skybox16Button;
	6014	+ cButton skybox17Button;
	6015	+
	6016	+ cButton gridButton;
	6017	+ cButton boxButton;
	6018	+ cButton sphereButton;
	6019	+ cButton coneButton;
	6020	+ cButton torusButton;
	6021	+ cButton superButton;
	6022	+ cButton kleinButton;
	6023	+ cButton particlesButton;
	6024	+ cButton overlayButton;
	6025	+ cButton lightButton;
5051	6026
5052	6027	cButton screenfitButton;
5053	6028	cButton screenfitpointButton;
..	..	@@ -5060,14 +6035,6 @@
5060	6035
5061	6036	cButton setsupportButton;
5062	6037
5063		- cButton twoButton;
5064		- cButton sixButton;
5065		- cButton threeButton;
5066		- cButton sevenButton;
5067		- cButton fourButton; // full panel
5068		- cButton oneButton; // full XYZ
5069		- //cButton currentLayout;
5070		-
5071	6038	//
5072	6039	//Composite
5073	6040	Object3D // to do !!
..	..	@@ -5077,9 +6044,11 @@
5077	6044	//JTree jTree;
5078	6045	private MenuItem lookAtItem;
5079	6046	private MenuItem lookFromItem;
5080		- private MenuItem switchItem;
	6047	+ private MenuItem switchViewItem;
5081	6048	private MenuItem cutItem;
5082		- private MenuItem duplicateItem;
	6049	+ private MenuItem undoItem;
	6050	+ private MenuItem redoItem;
	6051	+ private JMenuItem duplicateItem;
5083	6052	private MenuItem cloneItem;
5084	6053	private MenuItem cloneSupportItem;
5085	6054	private MenuItem overwriteGeoItem;
..	..	@@ -5092,7 +6061,7 @@
5092	6061	private MenuItem linkverticesItem;
5093	6062	private MenuItem relinkverticesItem;
5094	6063	private MenuItem setMasterItem;
5095		- private MenuItem resetMeshItem;
	6064	+ private MenuItem resetAllItem;
5096	6065	private MenuItem stepAllItem;
5097	6066	private MenuItem revertMeshItem;
5098	6067	private MenuItem poseMeshItem;
..	..	@@ -5107,7 +6076,7 @@
5107	6076	private MenuItem pasteLinkItem;
5108	6077	private MenuItem pasteCloneItem;
5109	6078	private MenuItem pasteExpandItem;
5110		- private MenuItem clearItem;
	6079	+ private MenuItem deleteItem;
5111	6080	private MenuItem clearAllItem;
5112	6081	private MenuItem genUVItem;
5113	6082	private MenuItem genNormalsMESHItem;
..	..	@@ -5142,6 +6111,10 @@
5142	6111	private MenuItem showleavesItem;
5143	6112	private MenuItem markleavesItem;
5144	6113	private MenuItem unmarkleavesItem;
	6114	+ private MenuItem rewindleavesItem;
	6115	+ private MenuItem unrewindleavesItem;
	6116	+ private MenuItem randomleavesItem;
	6117	+ private MenuItem unrandomleavesItem;
5145	6118
5146	6119	private MenuItem flipVItem;
5147	6120	private MenuItem unflipVItem;
..	..	@@ -5153,15 +6126,17 @@
5153	6126	private MenuItem panoTexturesItem;
5154	6127
5155	6128	private MenuItem resetCentroidItem;
5156		- private MenuItem transformgeometryItem;
	6129	+ private MenuItem resetCentroidXZItem;
5157	6130	private MenuItem resetTransformItem;
	6131	+ private MenuItem transformGeometryItem;
	6132	+ private MenuItem transformChildrenItem;
5158	6133	private MenuItem hideItem;
5159	6134	private MenuItem grabItem;
5160	6135	private MenuItem backItem;
5161	6136	private MenuItem frontItem;
5162	6137	private MenuItem cameraItem;
5163	6138	private MenuItem compositeItem;
5164		- private MenuItem randomItem;
	6139	+ private MenuItem switchItem;
5165	6140	private MenuItem physicsItem;
5166	6141	private MenuItem frameselectorItem;
5167	6142	private MenuItem scriptNodeItem;
..	..	@@ -5185,6 +6160,8 @@
5185	6160	private MenuItem attachBumpItem;
5186	6161	private MenuItem detachBumpItem;
5187	6162	private MenuItem pigmentBumpItem;
	6163	+ private MenuItem embedTexturesItem;
	6164	+ private MenuItem deEmbedTexturesItem;
5188	6165
5189	6166	private MenuItem particleItem;
5190	6167	private MenuItem ragdollItem;
..	..	@@ -5223,11 +6200,6 @@
5223	6200	private MenuItem doubleItem;
5224	6201	private MenuItem tripleItem;
5225	6202
5226		- private MenuItem importGFDItem;
5227		- private MenuItem importVRMLX3DItem;
5228		- private MenuItem import3DSItem;
5229		- private MenuItem importOBJItem;
5230		-
5231	6203	private MenuItem computeAOItem;
5232	6204	private MenuItem recompileItem;
5233	6205	private MenuItem editScriptItem;
..	..	@@ -5237,4 +6209,8 @@
5237	6209	private MenuItem analyzeItem;
5238	6210	private MenuItem dumpItem;
5239	6211	//boolean freezemodel = false;
	6212	+
	6213	+ Menu cameraMenu;
	6214	+ MenuItem editCameraItem;
	6215	+ MenuItem restoreCameraItem;
5240	6216	}