~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -12,6 +12,7 @@
12	12	import com.jme.math.Vector3f;
13	13	import com.jme.renderer.ColorRGBA;
14	14
	15	+import grafeme.ui.*;
15	16	//import buoy.widget.BFileChooser;
16	17
17	18	class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
..	..	@@ -22,6 +23,302 @@
22	23	DragGestureListener, DragSourceListener, DropTargetListener,
23	24	ItemListener // ListSelectionListener
24	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	+
25	322	//ObjEditor objEditor;
26	323	public void closeUI2()
27	324	{
..	..	@@ -59,6 +356,12 @@
59	356	this.copy = this.group = group;
60	357	//selectees = this.group.selectees;
61	358
	359	+ if (copy.versions == null)
	360	+ {
	361	+ copy.versions = new byte[100][];
	362	+ copy.versionindex = -1;
	363	+ }
	364	+
62	365	if(ui)
63	366	SetupUI(objEditor);
64	367	}
..	..	@@ -73,16 +376,28 @@
73	376	this.copy = this.group = copy;
74	377	//selectees = this.group.selectees;
75	378
76		- SetupMenu2(objEditor);
	379	+ SetupMenu2(this); //objEditor);
77	380	SetupUI2(objEditor);
78	381	objEditor.SetupUI(true);
79	382	SetupViews(objEditor);
80	383
81	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	+ }
82	393	}
83	394
84	395	void CloneSelection(boolean supports)
85	396	{
	397	+ if (Globals.REPLACEONMAKE)
	398	+ Save();
	399	+ boolean keep = Globals.REPLACEONMAKE;
	400	+ Globals.REPLACEONMAKE = false;
86	401	// Object3D keep = GrafreeD.clipboard;
87	402	//Object3D obj;
88	403	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -93,18 +408,19 @@
93	408
94	409	makeSomething(clone, i==group.selection.size()-1);
95	410	}
	411	+ Globals.REPLACEONMAKE = keep;
96	412	}
97	413
98	414	void CloneClipboard(boolean supports)
99	415	{
100		- assert(GrafreeD.clipboard.parent == null);
101		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
102		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
103		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
104		- 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));
105	421	else
106		- makeSomething(CloneObject(GrafreeD.clipboard, false));
107		- GrafreeD.clipboard.get(0).parent = keepparent;
	422	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	423	+ Grafreed.clipboard.get(0).parent = keepparent;
108	424	}
109	425
110	426	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -118,7 +434,7 @@
118	434	// obj.support = null;
119	435	if (!supports)
120	436	obj.SaveSupports();
121		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	437	+ Object3D clone = (Object3D)Grafreed.clone(obj);
122	438	obj.parent = parent;
123	439	// obj.support = support;
124	440	// clone.support = support; // aout 2013
..	..	@@ -147,30 +463,29 @@
147	463
148	464	//JTextField nameField;
149	465
150		- void SetupMenu2(ObjEditor oe)
	466	+ void SetupMenu2(GroupEditor oe)
151	467	{
152		- oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
153		- //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
154		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
155		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
156		- oe.cameraMenu.add("-");
157		- openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
158		- openWindowItem.addActionListener(this);
159		- editLeafItem.addActionListener(this);
160		- lookAtItem.addActionListener(this);
161		- //lookFromItem.addActinoListener(this);
162		- //switchItem.addActionListener(this);
	468	+ oe.jTree = new cTree();
	469	+
163	470	Menu menu;
164	471	oe.menuBar.add(menu = new Menu("Edit"));
165	472	//editItem = menu.add(new MenuItem("Edit"));
166	473	//editItem.addActionListener(this);
167		- 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"));
168	481	duplicateItem.addActionListener(this);
169		- menu.add("-");
170	482	cloneItem = menu.add(new MenuItem("Clone"));
171	483	cloneItem.addActionListener(this);
	484	+ if (Globals.ADVANCED)
	485	+ {
172	486	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
173	487	cloneSupportItem.addActionListener(this);
	488	+ }
174	489	menu.add("-");
175	490	cutItem = menu.add(new MenuItem("Cut"));
176	491	cutItem.addActionListener(this);
..	..	@@ -178,27 +493,123 @@
178	493	copyItem.addActionListener(this);
179	494	pasteItem = menu.add(new MenuItem("Paste"));
180	495	pasteItem.addActionListener(this);
	496	+
	497	+ menu.add("-");
	498	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	499	+ pasteIntoItem.addActionListener(this);
181	500	pasteLinkItem = menu.add(new MenuItem("Paste link"));
182	501	pasteLinkItem.addActionListener(this);
183	502	pasteCloneItem = menu.add(new MenuItem("Paste clone"));
184	503	pasteCloneItem.addActionListener(this);
185	504	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
186	505	// pasteExpandItem.addActionListener(this);
187		- clearItem = menu.add(new MenuItem("Clear"));
188		- clearItem.addActionListener(this);
	506	+ menu.add("-");
	507	+ deleteItem = menu.add(new MenuItem("Delete"));
	508	+ deleteItem.addActionListener(this);
	509	+
	510	+ if (Globals.ADVANCED)
	511	+ {
	512	+ // Deletes the cameras...
189	513	clearAllItem = menu.add(new MenuItem("Clear All"));
190	514	clearAllItem.addActionListener(this);
	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());
191	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	+
192	604	oe.menuBar.add(menu = new Menu("Setting"));
193		- resetMeshItem = menu.add(new MenuItem("Reset All"));
194		- resetMeshItem.addActionListener(this);
195		- stepAllItem = menu.add(new MenuItem("Step All"));
196		- stepAllItem.addActionListener(this);
	605	+ if (Globals.ADVANCED)
	606	+ {
197	607	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
198	608	revertMeshItem.addActionListener(this);
199	609	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
200	610	resetreferencesItem.addActionListener(this);
201	611	menu.add("-");
	612	+ }
202	613	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
203	614	overwriteGeoItem.addActionListener(this);
204	615	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -210,79 +621,104 @@
210	621	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211	622	overwriteUVItem.addActionListener(this);
212	623	menu.add("-");
	624	+ if (Globals.ADVANCED)
	625	+ {
213	626	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214	627	generateMeshItem.addActionListener(this);
215	628	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216	629	poseMeshItem.addActionListener(this);
217	630	menu.add("-");
	631	+ }
218	632	resetsupportItem = menu.add(new MenuItem("Reset support"));
219	633	resetsupportItem.addActionListener(this);
220	634	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	635	linkverticesItem.addActionListener(this);
222	636	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
223	637	relinkverticesItem.addActionListener(this);
	638	+
	639	+ if (Globals.ADVANCED)
	640	+ {
224	641	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
225	642	setMasterItem.addActionListener(this);
	643	+ }
226	644
227	645	oe.menuBar.add(menu = new Menu("Group"));
228		- grabItem = menu.add(new MenuItem("Grab"));
229		- grabItem.addActionListener(this);
	646	+// grabItem = menu.add(new MenuItem("Grab"));
	647	+// grabItem.addActionListener(this);
230	648	backItem = menu.add(new MenuItem("Back"));
231	649	backItem.addActionListener(this);
232	650	frontItem = menu.add(new MenuItem("Front"));
233	651	frontItem.addActionListener(this);
234		- compositeItem = menu.add(new MenuItem("Composite"));
235		- compositeItem.addActionListener(this);
236		- hideItem = menu.add(new MenuItem("Hide"));
	652	+// compositeItem = menu.add(new MenuItem("Composite"));
	653	+// compositeItem.addActionListener(this);
	654	+
	655	+ if (Globals.ADVANCED)
	656	+ {
	657	+ hideItem = menu.add(new MenuItem("Hidden Group"));
237	658	hideItem.addActionListener(this);
	659	+ }
238	660	ungroupItem = menu.add(new MenuItem("Ungroup"));
239	661	ungroupItem.addActionListener(this);
240		- menu.add("-");
241		- randomItem = menu.add(new MenuItem("Random"));
242		- randomItem.addActionListener(this);
243		- physicsItem = menu.add(new MenuItem("Physics"));
244		- physicsItem.addActionListener(this);
245		- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
246		- frameselectorItem.addActionListener(this);
	662	+
	663	+// menu.add("-");
	664	+//
	665	+// switchItem = menu.add(new MenuItem("Switch node"));
	666	+// switchItem.addActionListener(this);
	667	+ if (Globals.ADVANCED)
	668	+ {
247	669	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
248	670	switchGeoItem.addActionListener(this);
249	671	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
250	672	switchTransfoItem.addActionListener(this);
251		- morphItem = menu.add(new MenuItem("Morph"));
	673	+ morphItem = menu.add(new MenuItem("Morph Group"));
252	674	morphItem.addActionListener(this);
	675	+
	676	+ menu.add("-");
	677	+ physicsItem = menu.add(new MenuItem("Physics"));
	678	+ physicsItem.addActionListener(this);
	679	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	680	+ frameselectorItem.addActionListener(this);
253	681	scriptNodeItem = menu.add(new MenuItem("Script Node"));
254	682	scriptNodeItem.addActionListener(this);
255		- cameraItem = menu.add(new MenuItem("Camera"));
256		- cameraItem.addActionListener(this);
	683	+ }
257	684
258	685	oe.menuBar.add(menu = new Menu("Object"));
259		- textureItem = menu.add(new MenuItem("Texture"));
260		- textureItem.addActionListener(this);
	686	+// textureItem = menu.add(new MenuItem("Texture"));
	687	+// textureItem.addActionListener(this);
261	688	billboardItem = menu.add(new MenuItem("Billboard"));
262	689	billboardItem.addActionListener(this);
263	690	csgItem = menu.add(new MenuItem("CSG"));
264	691	csgItem.addActionListener(this);
265		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	692	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
266	693	shadowXItem.addActionListener(this);
267		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	694	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
268	695	shadowYItem.addActionListener(this);
269		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	696	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
270	697	shadowZItem.addActionListener(this);
	698	+ attributeItem = menu.add(new MenuItem("Attribute"));
	699	+ attributeItem.addActionListener(this);
	700	+
	701	+ if (Globals.ADVANCED)
	702	+ {
	703	+ menu.add("-");
271	704	linkerItem = menu.add(new MenuItem("Linker"));
272	705	linkerItem.addActionListener(this);
273	706	templateItem = menu.add(new MenuItem("Template"));
274	707	templateItem.addActionListener(this);
275		- attributeItem = menu.add(new MenuItem("Attribute"));
276		- attributeItem.addActionListener(this);
277	708	pointflowItem = menu.add(new MenuItem("Point Flow"));
278	709	pointflowItem.addActionListener(this);
	710	+ }
279	711	menu.add("-");
280	712	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
281	713	resetTransformItem.addActionListener(this);
282	714	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
283	715	resetCentroidItem.addActionListener(this);
284		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
285		- 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);
286	722
287	723	oe.menuBar.add(menu = new Menu("Geometry"));
288	724	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -293,8 +729,11 @@
293	729	genNormalsCADItem.addActionListener(this);
294	730	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
295	731	genNormalsMESHItem.addActionListener(this);
296		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	732	+ if (Globals.ADVANCED)
	733	+ {
	734	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
297	735	genNormalsMINEItem.addActionListener(this);
	736	+ }
298	737	stripifyItem = menu.add(new MenuItem("Stripify"));
299	738	stripifyItem.addActionListener(this);
300	739	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -316,23 +755,34 @@
316	755	reduce34MeshItem.addActionListener(this);
317	756	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
318	757	increaseMeshItem.addActionListener(this);
319		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
320		- smoothMeshItem.addActionListener(this);
321	758	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
322	759	clipMeshItem.addActionListener(this);
	760	+
	761	+ if (Globals.ADVANCED)
	762	+ {
	763	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	764	+ smoothMeshItem.addActionListener(this);
	765	+ }
323	766
324	767	oe.menuBar.add(menu = new Menu("Attributes"));
325	768	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
326	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);
327	774	menu.add("-");
328	775	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
329	776	liveleavesItem.addActionListener(this);
330	777	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
331	778	unliveleavesItem.addActionListener(this);
	779	+ if (Globals.ADVANCED)
	780	+ {
332	781	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
333	782	supportleavesItem.addActionListener(this);
334	783	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
335	784	unsupportleavesItem.addActionListener(this);
	785	+ }
336	786	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
337	787	hideleavesItem.addActionListener(this);
338	788	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -341,6 +791,14 @@
341	791	markleavesItem.addActionListener(this);
342	792	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
343	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);
344	802	menu.add("-");
345	803	flipVItem = menu.add(new MenuItem("Flip V"));
346	804	flipVItem.addActionListener(this);
..	..	@@ -366,45 +824,56 @@
366	824	attachBumpItem.addActionListener(this);
367	825	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
368	826	pigmentBumpItem.addActionListener(this);
	827	+ //embedTexturesItem
369	828	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
370	829	detachPigmentItem.addActionListener(this);
371	830	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
372	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);
373	836	menu.add("-");
374	837	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
375	838	sortbysizeItem.addActionListener(this);
376	839	sortbynameItem = menu.add(new MenuItem("Sort by name"));
377	840	sortbynameItem.addActionListener(this);
378	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);
	846	+ if (Globals.ADVANCED)
	847	+ {
	848	+ // Pretty much the same as duplicate and clone.
379	849	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
380	850	extractGeometriesItem.addActionListener(this);
381	851	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
382	852	cloneGeometriesItem.addActionListener(this);
383		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
384		- shareGeometriesItem.addActionListener(this);
385		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
386		- mergeGeometriesItem.addActionListener(this);
	853	+ }
387	854
388	855	oe.menuBar.add(menu = new Menu("Insert"));
389	856	buildCreateMenu(menu);
390	857
391		-
392		- oe.menuBar.add(menu = new Menu("Include"));
393		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
394		- importGFDItem.addActionListener(this);
395		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
396		- importVRMLX3DItem.addActionListener(this);
397		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
398		- importOBJItem.addActionListener(this);
399		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
400		- import3DSItem.addActionListener(this);
401		-
402	858	oe.menuBar.add(menu = new Menu("Tools"));
403	859	buildToolsMenu(menu);
404	860	}
405	861
	862	+
406	863	void SetupUI2(ObjEditor oe)
407	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	+
408	877	//new Exception().printStackTrace();
409	878
410	879	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -433,110 +902,239 @@
433	902	oe.radioPanel.add(dummyButton);
434	903	oe.buttonGroup.add(dummyButton);
435	904	*/
436		- aConstraints.gridy += 1;
	905	+ cGridBag copyOptionsPanel = new cGridBag();
	906	+
	907	+ copyOptionsPanel.preferredHeight = 2;
437	908
438	909	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
439	910
440		- oe.aConstraints.gridwidth = 1;
441		- oe.aConstraints.gridx = 0;
	911	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	912	+ //minButton.setToolTipText("Minimize window");
	913	+ //minButton.addActionListener(this);
442	914
443		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
444		- liveCB.setToolTipText("Enabled animation");
445		- liveCB.addItemListener(this);
446		-
447		- oe.aConstraints.gridx += 1;
448		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK), oe.aConstraints);
449		- trackCB.setToolTipText("Enable tracking");
450		- trackCB.addItemListener(this);
451		-
452		- oe.aConstraints.gridx += 1;
453		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	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);
454	927	screenfitButton.setToolTipText("Screen fit");
455	928	screenfitButton.addActionListener(this);
456		- oe.aConstraints.gridx += 1;
	929	+
	930	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	931	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	932	+ restoreCameraButton.addActionListener(this);
	933	+
	934	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	935	+ saveButton.setToolTipText("Duplicate current version");
	936	+ saveButton.addActionListener(this);
	937	+
	938	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	939	+ undoButton.setToolTipText("Previous version");
	940	+ undoButton.addActionListener(this);
	941	+ undoButton.setEnabled(false);
	942	+
	943	+ cGridBag updown = new cGridBag().setVertical(true);
	944	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	945	+ restoreButton.setToolTipText("Restore current version (undo latest change)");
	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 version (save latest change)");
	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");
	963	+ liveCB.addItemListener(this);
	964	+
	965	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	966	+ oneStepButton.setToolTipText("Animate one step forward");
	967	+ oneStepButton.addActionListener(this);
	968	+
	969	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	970	+ fastCB.setToolTipText("Fast mode");
	971	+ fastCB.addItemListener(this);
	972	+
	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);
	978	+
457	979	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
458	980	// screenfitpointButton.addActionListener(this);
459		-// oe.aConstraints.gridx += 1;
460		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
461		- snapobjectButton.addActionListener(this);
462		- snapobjectButton.setToolTipText("Snap Object");
463		- oe.aConstraints.gridx += 1;
464	981
465		- //aConstraints.gridx = 0;
466		- //aConstraints.gridy += 1;
467		- oe.aConstraints.weighty = 0;
468		- oe.aConstraints.gridwidth = 1;
469		-
470		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
471		- flashSelectionButton.setToolTipText("Show selection");
472		- flashSelectionButton.addActionListener(this);
473		-
474		- oe.toolbarPanel.add(new cButton(" ", false));
475		-
476		- oe.aConstraints.gridx += 1;
477		- oe.aConstraints.weighty = 0;
478		- oe.aConstraints.gridwidth = 1;
479		-
480		- //
481		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
482		- twoButton.setToolTipText("Show center view only");
483		- twoButton.addActionListener(this);
484		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	982	+ if (Globals.ADVANCED)
	983	+ {
	984	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	985	+ snapobjectButton.addActionListener(this);
	986	+ snapobjectButton.setToolTipText("Snap Object");
	987	+
	988	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
485	989	fourButton.addActionListener(this);
486		- fourButton.setToolTipText("Show left panel only");
487		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
488		- sixButton.setToolTipText("2-column layout left");
489		- sixButton.addActionListener(this);
490		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
491		- threeButton.setToolTipText("2-column layout right");
	990	+ fourButton.setToolTipText("Show control panel only");
	991	+ }
	992	+
	993	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	994	+
	995	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	996	+ twoButton.setToolTipText("Show 3D view only");
	997	+ twoButton.addActionListener(this);
	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");
492	1002	threeButton.addActionListener(this);
493		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
494		- sevenButton.setToolTipText("3-column layout");
495		- 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);
496	1009	//
497	1010
498		- oe.toolbarPanel.add(rootButton = new cButton(" o o o ")); //, oe.aConstraints);
499		- rootButton.setToolTipText("Edit object in new tab");
	1011	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1012	+ rootButton.setToolTipText("Open selection in new tab");
500	1013	rootButton.addActionListener(this);
501		- oe.aConstraints.gridx += 1;
502		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	1014	+
	1015	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
503	1016	closeButton.setToolTipText("Close tab");
504	1017	closeButton.addActionListener(this);
505	1018	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
506	1019	//clearButton.addActionListener(this);
507		- oe.aConstraints.gridx += 1;
508		-
509		- oe.aConstraints.gridx = 1; //
510		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
511		- editButton.addActionListener(this);
512		- oe.aConstraints.gridx += 1;
513		- oe.aConstraints.weighty = 0;
514		- oe.aConstraints.gridwidth = 1;
515	1020
516		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	1021	+ cGridBag row1 = new cGridBag();
	1022	+
	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");
	1110	+ editButton.addActionListener(this);
	1111	+
	1112	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1113	+ uneditButton.setToolTipText("Remove selection controls");
517	1114	uneditButton.addActionListener(this);
518	1115
519		- oe.aConstraints.gridx += 1;
520		- oe.aConstraints.weighty = 0;
521		- oe.aConstraints.gridwidth = 1;
522		-
523		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
524		- clearPanelButton.addActionListener(this);
525		-
526		- oe.aConstraints.gridx += 1;
527		- oe.aConstraints.weighty = 0;
528		- oe.aConstraints.gridwidth = 1;
529		-
530		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	1116	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1117	+ allParamsButton.setToolTipText("Show all controle");
531	1118	allParamsButton.addActionListener(this);
532	1119
533		- oe.aConstraints.gridx += 1;
534		- oe.aConstraints.weighty = 0;
535		- oe.aConstraints.gridwidth = 1;
536		-
537		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
	1120	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1121	+ clearPanelButton.setToolTipText("Clear edit panel");
	1122	+ clearPanelButton.addActionListener(this);
	1123	+
	1124	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1125	+ unselectButton.setToolTipText("Unselect");
538	1126	unselectButton.addActionListener(this);
539	1127
	1128	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1129	+ flashSelectionButton.setToolTipText("Highlight selection");
	1130	+ flashSelectionButton.addActionListener(this);
	1131	+
	1132	+ editCommandsPanel.preferredHeight = 1;
	1133	+
	1134	+ SetPinStates(false);
	1135	+// oe.treePanel.add(commandsPanel);
	1136	+// oe.treePanel.Return();
	1137	+
540	1138	// oe.aConstraints.gridx += 1;
541	1139	// oe.aConstraints.weighty = 0;
542	1140	// oe.aConstraints.gridwidth = 1;
..	..	@@ -548,47 +1146,32 @@
548	1146	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
549	1147	// gcButton.addActionListener(this);
550	1148
551		- oe.aConstraints.gridx = 0;
552		- oe.aConstraints.gridy += 1;
553		-
554		- //ctrlPanel.add(objList = new List(5, true));
555		- oe.aConstraints.gridwidth = 100;
556		- // oe.aConstraints.gridheight = 100;
557		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
558		- oe.aConstraints.gridheight = 1;
559		- oe.aConstraints.weighty = 0.5;
560		- oe.aConstraints.gridx = 0;
561		- JScrollPane jSP;
	1149	+ cGridBag jSPPanel = new cGridBag();
	1150	+
	1151	+ JScrollPane jSP;
562	1152	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
563		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	1153	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
564	1154	ResetModel();
565		- oe.aConstraints.weighty = 0.5;
566		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
567		- oe.aConstraints.gridy += 1;
568		- oe.aConstraints.gridwidth = 1;
569		-
570		- oe.aConstraints.weighty = 0;
571		- oe.aConstraints.gridwidth = 2;
572		-
573		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
574		- colorCB.addItemListener(this);
575		- oe.aConstraints.gridx += 2;
576		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
577		- materialCB.addItemListener(this);
578		- oe.aConstraints.gridx += 2;
579		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
580		- textureCB.addItemListener(this);
581		-
582		- oe.aConstraints.gridx = 0;
583		- oe.aConstraints.gridy += 1;
584	1155
	1156	+ oe.treePanel.add(jSPPanel);
	1157	+ oe.treePanel.Return();
	1158	+
	1159	+ oe.treePanel.add(copyOptionsPanel);
	1160	+ oe.treePanel.Return();
	1161	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1162	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1163	+ sliderPane.preferredHeight = 1;
	1164	+
	1165	+// mainPanel.setDividerLocation(0.1); //1.0);
	1166	+ mainPanel.setResizeWeight(0.4);
	1167	+
585	1168	//jList.addListSelectionListener(this);
586	1169	oe.jTree.addTreeSelectionListener(this);
587	1170	//jTree.setRootVisible(false);
588	1171	//jTree.setEditable(true);
589	1172	oe.jTree.setDragEnabled(true);
590	1173	//jTree.setPreferredSize(new Dimension(10,10));
591		- jSP.setPreferredSize(new Dimension(100,200));
	1174	+ //jSP.setPreferredSize(new Dimension(100,200));
592	1175
593	1176	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
594	1177
..	..	@@ -600,97 +1183,163 @@
600	1183	dgr.addDragGestureListener(this);
601	1184	}catch(Exception e) {}
602	1185	*/
603		- radio.layout = sevenButton;
	1186	+ radio.layout = threeButton; // sixButton;
604	1187	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
605	1188	}
606	1189
607		- void AddOptions(JPanel panel, GridBagConstraints constraints)
	1190	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
608	1191	{
609		- constraints.gridx = 0;
610		- constraints.gridy = 0;
611		- panel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), constraints);
612		- fastCB.setToolTipText("Fast mode");
613		- fastCB.addItemListener(this);
614		- constraints.gridy += 1;
615		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), constraints);
616		- supportCB.setToolTipText("Enabled rigging");
617		- supportCB.addItemListener(this);
	1192	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1193	+ colorCB.setToolTipText("Copy color when dropped");
	1194	+ colorCB.addItemListener(this);
618	1195
619		- // constraints.gridy += 1;
	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	+
	1206	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	1207	+ boxCB.setToolTipText("Display bounding boxes");
	1208	+ boxCB.addItemListener(this);
	1209	+
	1210	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	1211	+ zoomBoxCB.setToolTipText("Display only for wheel");
	1212	+ zoomBoxCB.addItemListener(this);
	1213	+
	1214	+ if (true) // Globals.ADVANCED)
	1215	+ {
	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);
	1223	+
620	1224	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
621	1225	// localCB.addItemListener(this);
622	1226
623		- constraints.gridy += 1;
624		- panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD), constraints);
	1227	+ panel.Return();
	1228	+
	1229	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
625	1230	crowdCB.setToolTipText("Used for crowds");
626	1231	crowdCB.addItemListener(this);
627	1232
628		- constraints.gridy += 1;
629		- panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), constraints);
	1233	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
630	1234	smoothCB.setToolTipText("Snapping delay");
631	1235	smoothCB.addItemListener(this);
632	1236
633		- constraints.gridy += 1;
634		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), constraints);
635		- slowCB.setToolTipText("Smooth interpolation");
636		- slowCB.addItemListener(this);
637		- constraints.gridy += 1;
638		- panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE), constraints);
639		- boxCB.setToolTipText("Display bounding boxes");
640		- boxCB.addItemListener(this);
641		- constraints.gridy += 1;
642		- panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE), constraints);
643		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
644		- zoomBoxCB.addItemListener(this);
645		-
	1237	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1238	+// slowCB.setToolTipText("Smooth interpolation");
	1239	+// slowCB.addItemListener(this);
	1240	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1241	+ minshaderCB.setToolTipText("Minimal fast shader");
	1242	+ minshaderCB.addItemListener(this);
	1243	+
646	1244	// constraints.gridy += 1;
647	1245	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
648	1246	// speakerMocapCB.addItemListener(this);
649	1247
	1248	+ panel.Return();
	1249	+
650	1250	if (false)
651	1251	{
652	1252	// handled in scripts
653		- constraints.gridy += 1;
654		- panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), constraints);
	1253	+ //constraints.gridy += 1;
	1254	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
655	1255	speakerCameraCB.addItemListener(this);
656	1256
657		- constraints.gridy += 1;
658		- panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), constraints);
	1257	+ //constraints.gridy += 1;
	1258	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
659	1259	speakerFocusCB.addItemListener(this);
660	1260
661		- constraints.gridy += 1;
662		- panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), constraints);
	1261	+ //constraints.gridy += 1;
	1262	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
663	1263	smoothfocusCB.addItemListener(this);
	1264	+ panel.Return();
664	1265	}
665	1266
666	1267	//constraints.gridx += 1;
667	1268	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
668	1269	// debugCB.addItemListener(this);
669	1270
670		- constraints.gridy += 1;
671		- panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL), constraints);
	1271	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1272	+ trackCB.setToolTipText("Enable tracking target");
	1273	+ trackCB.addItemListener(this);
	1274	+
	1275	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1276	+ oeilCB.setToolTipText("Move camera when tracking");
672	1277	oeilCB.addItemListener(this);
673	1278
674		- constraints.gridy += 1;
675		- panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT), constraints);
	1279	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1280	+ shadowCB.setToolTipText("When live compute shadows");
	1281	+ shadowCB.addItemListener(this);
	1282	+
	1283	+ panel.Return();
	1284	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1285	+ toggleTextureCB.setToolTipText("Load textures");
	1286	+ toggleTextureCB.addItemListener(this);
	1287	+
	1288	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1289	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1290	+ toggleSwitchCB.addItemListener(this);
	1291	+
	1292	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1293	+ autokeepCB.setToolTipText("On structure change");
	1294	+ autokeepCB.addItemListener(this);
	1295	+
	1296	+ panel.Return();
	1297	+ if (Globals.ADVANCED)
	1298	+ {
	1299	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
676	1300	lookAtCB.setToolTipText("Look-at target");
677	1301	lookAtCB.addItemListener(this);
	1302	+ }
	1303	+
	1304	+ }
	1305	+
	1306	+ cGridBag fill = new cGridBag();
	1307	+ fill.preferredHeight = 200;
	1308	+ cGridBag fill2 = new cGridBag();
	1309	+ fill2.preferredHeight = 200;
	1310	+ cGridBag fill3 = new cGridBag();
	1311	+ fill3.preferredHeight = 200;
	1312	+
	1313	+ panel.add(fill);
	1314	+ panel.add(fill2);
	1315	+ panel.add(fill3);
678	1316
679	1317	}
680	1318
681	1319	void EditObject(Object3D obj)
682	1320	{
683	1321	cRadio radioButton = new cRadio(obj.name);
	1322	+
	1323	+ // June 2019. Patch to avoid bug with transparency.
	1324	+ radioButton.hadMaterial = obj.material != null;
	1325	+ if (!radioButton.hadMaterial)
	1326	+ {
	1327	+ obj.material = new cMaterial();
	1328	+ }
	1329	+
684	1330	radioButton.SetObject(obj);
685		- radioButton.layout = sevenButton;
	1331	+ radioButton.layout = threeButton; // sixButton;
686	1332	radioButton.SetCamera(cameraView.renderCamera, false);
687	1333	radioButton.addActionListener(this);
688	1334	radioPanel.add(radioButton);
689	1335	buttonGroup.add(radioButton);
690	1336	radioButton.doClick();
691	1337	}
	1338	+
692	1339	void SetupViews(ObjEditor oe)
693	1340	{
	1341	+ theFrame = this;
	1342	+
694	1343	oe.SetupViews();
695	1344
696	1345	System.out.println("SetupViews");
..	..	@@ -699,23 +1348,30 @@
699	1348	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
700	1349	}
701	1350
702		- JCheckBox liveCB;
703		- JCheckBox supportCB;
704		- JCheckBox localCB;
705		- JCheckBox crowdCB;
706		- JCheckBox smoothCB;
707		- JCheckBox fastCB;
708		- JCheckBox slowCB;
709		- JCheckBox boxCB;
710		- JCheckBox zoomBoxCB;
711		- JCheckBox trackCB;
712		- JCheckBox smoothfocusCB;
	1351	+ cToggleButton liveCB;
	1352	+ cCheckBox supportCB;
	1353	+ cCheckBox localCB;
	1354	+ cCheckBox crowdCB;
	1355	+ cCheckBox smoothCB;
	1356	+ cCheckBox minshaderCB;
	1357	+
	1358	+ cToggleButton fastCB;
	1359	+ cCheckBox slowCB;
	1360	+ cCheckBox boxCB;
	1361	+ cCheckBox zoomBoxCB;
	1362	+ cCheckBox freezeCB;
	1363	+ //cToggleButton trackCB;
	1364	+ cCheckBox trackCB;
	1365	+ cCheckBox smoothfocusCB;
713	1366	// JCheckBox speakerMocapCB;
714		- JCheckBox speakerCameraCB;
715		- JCheckBox speakerFocusCB;
716		- JCheckBox debugCB;
717		- JCheckBox oeilCB;
718		- JCheckBox lookAtCB;
	1367	+ cCheckBox speakerCameraCB;
	1368	+ cCheckBox speakerFocusCB;
	1369	+ cCheckBox debugCB;
	1370	+
	1371	+ cCheckBox oeilCB;
	1372	+ cCheckBox shadowCB;
	1373	+ cCheckBox autokeepCB;
	1374	+ cCheckBox lookAtCB;
719	1375
720	1376	// static int COLOR = 1;
721	1377	// static int MATERIAL = 2;
..	..	@@ -723,9 +1379,9 @@
723	1379
724	1380	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
725	1381
726		- JCheckBox colorCB;
727		- JCheckBox materialCB;
728		- JCheckBox textureCB;
	1382	+ cCheckBox colorCB;
	1383	+ cCheckBox materialCB;
	1384	+ cCheckBox textureCB;
729	1385
730	1386	public void itemStateChanged(ItemEvent e)
731	1387	{
..	..	@@ -753,6 +1409,7 @@
753	1409	} else if(e.getSource() == liveCB)
754	1410	{
755	1411	cameraView.ToggleLive();
	1412	+ refreshContents(false);
756	1413	}
757	1414	else if(e.getSource() == supportCB)
758	1415	{
..	..	@@ -768,6 +1425,12 @@
768	1425	{
769	1426	cameraView.ToggleInertia();
770	1427	cameraView.repaint();
	1428	+ }
	1429	+ else if(e.getSource() == minshaderCB)
	1430	+ {
	1431	+ Globals.MINSHADER ^= true;
	1432	+ cameraView.programInitialized = false;
	1433	+ cameraView.repaint();
771	1434	}
772	1435	else if(e.getSource() == localCB)
773	1436	{
..	..	@@ -817,6 +1480,18 @@
817	1480	{
818	1481	cameraView.ToggleOeil();
819	1482	}
	1483	+ else if(e.getSource() == shadowCB)
	1484	+ {
	1485	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1486	+ }
	1487	+ else if(e.getSource() == freezeCB)
	1488	+ {
	1489	+ Globals.FREEZEONMOVE ^= true;
	1490	+ }
	1491	+ else if(e.getSource() == autokeepCB)
	1492	+ {
	1493	+ Globals.REPLACEONMAKE ^= true;
	1494	+ }
820	1495	else if(e.getSource() == lookAtCB)
821	1496	{
822	1497	cameraView.ToggleLookAt();
..	..	@@ -833,7 +1508,8 @@
833	1508
834	1509	/**/
835	1510	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
836		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1511	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1512	+ TreePath path = objEditor.jTree.getSelectionPath();
837	1513	if ((path == null) \|\| (path.getPathCount() <= 1)) {
838	1514	// We can't move the root node or an empty selection
839	1515	return;
..	..	@@ -896,8 +1572,6 @@
896	1572	}
897	1573	}
898	1574
899		- String string = (String) object;
900		-
901	1575	System.out.println("Transfer = " + object + "; drop : " + target);
902	1576	// if( object instanceof java.io.File[])
903	1577	// {
..	..	@@ -905,7 +1579,11 @@
905	1579	// objEditor.DropFile((java.io.File[]) object, true);
906	1580	// return;
907	1581	// }
908		- if (string.charAt(0) == '/')
	1582	+
	1583	+ String string = object.toString();
	1584	+
	1585	+ // File path for Mac and Windows
	1586	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
909	1587	{
910	1588	// file(s)
911	1589	String[] names = string.split("\n");
..	..	@@ -932,7 +1610,7 @@
932	1610
933	1611	flashIt = false;
934	1612	CameraPane pane = (CameraPane) target;
935		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1613	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
936	1614	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
937	1615
938	1616	if (group.selection.size() == 1)
..	..	@@ -948,23 +1626,33 @@
948	1626
949	1627	assert target == objEditor.jTree;
950	1628	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1629	+ Object3D destinationLeaf;
951	1630	try {
952		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1631	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
953	1632	} catch (Exception e) {
954	1633	System.out.println("destinationPath : " + destinationPath);
955	1634	return;
956	1635	}
957	1636
958		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1637	+ for (int i=group.selection.size(); --i>=0;)
959	1638	{
	1639	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1640	+
	1641	+ // Cannot move into itself
	1642	+ if (child == destinationLeaf)
	1643	+ return;
	1644	+ }
	1645	+
	1646	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1647	+// {
960	1648	loadClipboard(true);
961	1649	objEditor.jTree.setSelectionPath(destinationPath);
962		- pasteInto(false);
963		- } else {
964		- loadClipboard(false);
965		- objEditor.jTree.setSelectionPath(destinationPath);
966		- pasteInto(false); // true); // ???
967		- }
	1650	+ pasteInto(false, false);
	1651	+// } else {
	1652	+// loadClipboard(false);
	1653	+// objEditor.jTree.setSelectionPath(destinationPath);
	1654	+// pasteInto(false, false); // true); // ???
	1655	+// }
968	1656	}
969	1657	public void dropActionChanged(DropTargetDragEvent dtde)
970	1658	// Called if the user has modified the current drop gesture
..	..	@@ -1069,85 +1757,107 @@
1069	1757	{
1070	1758	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1071	1759	//heightFieldItem.addActionListener(this);
1072		- gridItem = menu.add(new MenuItem("Grid"));
1073		- gridItem.addActionListener(this);
1074		- rectoidItem = menu.add(new MenuItem("Box"));
1075		- rectoidItem.addActionListener(this);
1076		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1077		- ellipsoidItem.addActionListener(this);
1078		- coneItem = menu.add(new MenuItem("Cone"));
1079		- coneItem.addActionListener(this);
1080		- torusItem = menu.add(new MenuItem("Torus"));
1081		- torusItem.addActionListener(this);
1082		- superItem = menu.add(new MenuItem("Superellipsoid"));
1083		- superItem.addActionListener(this);
	1760	+// gridItem = menu.add(new MenuItem("Grid"));
	1761	+// gridItem.addActionListener(this);
	1762	+// rectoidItem = menu.add(new MenuItem("Box"));
	1763	+// rectoidItem.addActionListener(this);
	1764	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1765	+// ellipsoidItem.addActionListener(this);
	1766	+// coneItem = menu.add(new MenuItem("Cone"));
	1767	+// coneItem.addActionListener(this);
	1768	+// torusItem = menu.add(new MenuItem("Torus"));
	1769	+// torusItem.addActionListener(this);
	1770	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1771	+// superItem.addActionListener(this);
	1772	+
	1773	+ cameraItem = menu.add(new MenuItem("Camera"));
	1774	+ cameraItem.addActionListener(this);
	1775	+
	1776	+ if (!Globals.ADVANCED)
	1777	+ {
1084	1778	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1085	1779	kleinItem.addActionListener(this);
1086		- particleItem = menu.add(new MenuItem("Particle system"));
1087		- particleItem.addActionListener(this);
	1780	+ }
	1781	+
	1782	+// particleItem = menu.add(new MenuItem("Particle system"));
	1783	+// particleItem.addActionListener(this);
	1784	+ if (Globals.ADVANCED)
	1785	+ {
1088	1786	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1089	1787	ragdollItem.addActionListener(this);
1090	1788	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1091	1789	ragdoll2Item.addActionListener(this);
	1790	+ }
1092	1791	menu.add("-");
1093		- meshItem = menu.add(new MenuItem("Mesh"));
	1792	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1094	1793	meshItem.addActionListener(this);
1095	1794	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1096	1795	// meshGroupItem.addActionListener(this);
	1796	+ if (Globals.ADVANCED)
	1797	+ {
1097	1798	springItem = menu.add(new MenuItem("Spring"));
1098	1799	springItem.addActionListener(this);
1099	1800	flagItem = menu.add(new MenuItem("Flag"));
1100	1801	flagItem.addActionListener(this);
1101		- bezierItem = menu.add(new MenuItem("Patch"));
1102		- bezierItem.addActionListener(this);
1103		- checkerItem = menu.add(new MenuItem("Checker"));
1104		- checkerItem.addActionListener(this);
1105	1802	blobItem = menu.add(new MenuItem("Blob"));
1106	1803	blobItem.addActionListener(this);
1107	1804	latheItem = menu.add(new MenuItem("Lathe"));
1108	1805	latheItem.addActionListener(this);
1109		- lightItem = menu.add(new MenuItem("Light"));
1110		- lightItem.addActionListener(this);
	1806	+ }
	1807	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1808	+ bezierItem.addActionListener(this);
	1809	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1810	+// overlayItem.addActionListener(this);
	1811	+// lightItem = menu.add(new MenuItem("Light"));
	1812	+// lightItem.addActionListener(this);
1111	1813	menu.add("-");
1112	1814	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1113	1815	//superLoopItem.addActionListener(this);
1114		- loopItem = menu.add(new MenuItem("Loop"));
1115		- loopItem.addActionListener(this);
	1816	+// loopItem = menu.add(new MenuItem("Loop"));
	1817	+// loopItem.addActionListener(this);
1116	1818	doubleItem = menu.add(new MenuItem("Fork"));
1117	1819	doubleItem.addActionListener(this);
	1820	+ if (Globals.ADVANCED)
	1821	+ {
1118	1822	tripleItem = menu.add(new MenuItem("Trident"));
1119	1823	tripleItem.addActionListener(this);
	1824	+ }
1120	1825	}
1121	1826
1122	1827	void buildToolsMenu(Menu menu)
1123	1828	{
1124	1829	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1125	1830	animationItem.addItemListener(this);
1126		- animationItem.setState(CameraPane.ANIMATION);
	1831	+ animationItem.setState(Globals.ANIMATION);
	1832	+
	1833	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1834	+ archiveItem.addActionListener(this);
1127	1835
1128	1836	menu.add("-");
1129	1837	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1130	1838	parseverticesItem.addActionListener(this);
1131	1839	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1132	1840	textureFieldItem.addActionListener(this);
1133		- alignItem = menu.add(new MenuItem("Align"));
	1841	+ alignItem = menu.add(new MenuItem("Align Objects"));
1134	1842	alignItem.addActionListener(this);
1135		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1136		- mirrorItem.addActionListener(this);
1137	1843	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1138	1844	reduceMorphItem.addActionListener(this);
1139	1845	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1140	1846	reduce34MorphItem.addActionListener(this);
1141		-
1142		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1143		- computeAOItem.addActionListener(this);
1144	1847	menu.add("-");
1145		-
1146	1848	menu.add(memoryItem = new MenuItem("Memory Usage"));
1147	1849	memoryItem.addActionListener(this);
	1850	+ menu.add(computeAOItem = new MenuItem("Compute AO"));
	1851	+ computeAOItem.addActionListener(this);
	1852	+
	1853	+ if (Globals.ADVANCED)
	1854	+ {
	1855	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1856	+ mirrorItem.addActionListener(this);
	1857	+ menu.add("-");
1148	1858	menu.add(analyzeItem = new MenuItem("Analyze"));
1149	1859	analyzeItem.addActionListener(this);
1150		- menu.add(dumpItem = new MenuItem("Dump"));
	1860	+ menu.add(dumpItem = new MenuItem("Print"));
1151	1861	dumpItem.addActionListener(this);
1152	1862	// menu.add(pathItem = new MenuItem("From-to path"));
1153	1863	// pathItem.addActionListener(this);
..	..	@@ -1165,6 +1875,7 @@
1165	1875	menu.add("-");
1166	1876	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1167	1877	editScriptItem.addActionListener(this);
	1878	+ }
1168	1879	}
1169	1880
1170	1881	void ScreenFit()
..	..	@@ -1287,9 +1998,34 @@
1287	1998	shadow.material = new cMaterial(obj.material);
1288	1999	shadow.material.diffuse = 0.0001f;
1289	2000	shadow.material.specular = 0.0001f;
	2001	+ //shadow.projectedVertices[1].x = 300;
1290	2002
1291	2003	makeSomething(shadow);
1292	2004	}
	2005	+
	2006	+ private void ClearUnpinned()
	2007	+ {
	2008	+ //for (Object3D obj : listUI)
	2009	+ for (int i=listUI.size(); --i>=0;)
	2010	+ {
	2011	+ Object3D obj = listUI.elementAt(i);
	2012	+ if (!obj.pinned)
	2013	+ {
	2014	+ obj.CloseUI();
	2015	+ listUI.remove(i);
	2016	+ }
	2017	+ }
	2018	+ }
	2019	+
	2020	+ private void EditElement(Object3D elem, boolean newWindow)
	2021	+ {
	2022	+ // if (!(elem instanceof Composite))
	2023	+ // newWindow = false;
	2024	+ listUI.add(elem);
	2025	+ elem.openEditWindow(this, newWindow); //, false);
	2026	+ System.out.println("edit : " + elem);
	2027	+ elem.editWindow.refreshContents(true); // ? new
	2028	+ }
1293	2029
1294	2030	/**
1295	2031	* applyExample
..	..	@@ -1493,9 +2229,9 @@
1493	2229
1494	2230	void Overwrite(int mask)
1495	2231	{
1496		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2232	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1497	2233	{
1498		- Object3D content = GrafreeD.clipboard.get(0);
	2234	+ Object3D content = Grafreed.clipboard.get(0);
1499	2235
1500	2236	if (content instanceof cGroup && ((cGroup)content).transientlink )
1501	2237	content = ((cGroup)content).get(0);
..	..	@@ -1534,7 +2270,7 @@
1534	2270	{
1535	2271	ScreenFit();
1536	2272	} else
1537		- if (source == switchItem)
	2273	+ if (source == switchViewItem)
1538	2274	{
1539	2275	cVector v1 = new cVector();
1540	2276	cVector v2 = new cVector();
..	..	@@ -1543,11 +2279,11 @@
1543	2279	objEditor.cameraView.renderCamera.setAim(v2, v1);
1544	2280	objEditor.cameraView.repaint();
1545	2281	} else
1546		- if (source == rectoidItem)
	2282	+ if (source == rectoidItem \|\| source == boxButton)
1547	2283	{
1548	2284	makeSomething(new Box());
1549	2285	} else
1550		- if (source == particleItem)
	2286	+ if (source == particleItem \|\| source == particlesButton)
1551	2287	{
1552	2288	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1553	2289	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1626,27 +2362,27 @@
1626	2362
1627	2363	makeSomething(obj);
1628	2364	} else
1629		- if (source == gridItem)
	2365	+ if (source == gridItem \|\| source == gridButton)
1630	2366	{
1631	2367	makeSomething(new Grid());
1632	2368	} else
1633		- if (source == ellipsoidItem)
	2369	+ if (source == ellipsoidItem \|\| source == sphereButton)
1634	2370	{
1635	2371	makeSomething(new Sphere());
1636	2372	} else
1637		- if (source == coneItem)
	2373	+ if (source == coneItem \|\| source == coneButton)
1638	2374	{
1639	2375	makeSomething(new Cone());
1640	2376	} else
1641		- if (source == torusItem)
	2377	+ if (source == torusItem \|\| source == torusButton)
1642	2378	{
1643	2379	makeSomething(new Torus());
1644	2380	} else
1645		- if (source == superItem)
	2381	+ if (source == superItem \|\| source == superButton)
1646	2382	{
1647	2383	makeSomething(new Superellipsoid());
1648	2384	} else
1649		- if (source == kleinItem)
	2385	+ if (source == kleinItem \|\| source == kleinButton)
1650	2386	{
1651	2387	makeSomething(new Klein());
1652	2388	} else
..	..	@@ -1666,7 +2402,7 @@
1666	2402	{
1667	2403	makeSomething(new BezierSurface());
1668	2404	} else
1669		- if (source == checkerItem)
	2405	+ if (source == overlayItem \|\| source == overlayButton)
1670	2406	{
1671	2407	/*
1672	2408	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1714,10 +2450,27 @@
1714	2450	s.setup();
1715	2451	makeSomething(s);
1716	2452	} else
1717		- if (source == lightItem)
	2453	+ if (source == lightItem \|\| source == lightButton)
1718	2454	{
1719	2455	makeSomething(new Light());
1720	2456	} else
	2457	+// if (source == skybox1Button \|\|
	2458	+// source == skybox2Button \|\|
	2459	+// source == skybox3Button \|\|
	2460	+// source == skybox4Button \|\|
	2461	+// source == skybox5Button \|\|
	2462	+// source == skybox6Button \|\|
	2463	+// source == skybox7Button \|\|
	2464	+// source == skybox11Button \|\|
	2465	+// source == skybox12Button \|\|
	2466	+// source == skybox13Button \|\|
	2467	+// source == skybox14Button \|\|
	2468	+// source == skybox15Button \|\|
	2469	+// source == skybox16Button \|\|
	2470	+// source == skybox17Button)
	2471	+// {
	2472	+// ChangeSkybox(source);
	2473	+// } else
1721	2474	if (source == csgItem)
1722	2475	{
1723	2476	group(new CSG());
..	..	@@ -1764,30 +2517,30 @@
1764	2517
1765	2518	group(g);
1766	2519	} else
1767		- if (source == loopItem)
	2520	+ if (source == loopItem \|\| source == loopButton)
1768	2521	{
1769	2522	Composite csg = new GroupLeaf();
1770	2523	csg.count = 5;
1771	2524	group(csg);
1772		- Composite child = new cGroup();
	2525	+ Composite child = new cGroup("Branch");
1773	2526	csg.addChild(child);
1774	2527	child.addChild(csg);
1775	2528	} else
1776	2529	if (source == doubleItem)
1777	2530	{
1778		- Composite csg = new GroupLeaf();
	2531	+ Composite csg = new GroupLeaf("Fork");
1779	2532	csg.count = 5;
1780	2533	group(csg);
1781		- Composite child = new cGroup();
	2534	+ Composite child = new cGroup("Branch A");
1782	2535	csg.addChild(child);
1783	2536	child.addChild(csg);
1784		- child = new cGroup();
	2537	+ child = new cGroup("Branch B");
1785	2538	csg.addChild(child);
1786	2539	child.addChild(csg);
1787	2540	} else
1788	2541	if (source == tripleItem)
1789	2542	{
1790		- Composite csg = new GroupLeaf();
	2543	+ Composite csg = new GroupLeaf("Trident");
1791	2544	csg.count = 4;
1792	2545	group(csg);
1793	2546	Composite child = new cGroup();
..	..	@@ -1800,27 +2553,10 @@
1800	2553	csg.addChild(child);
1801	2554	child.addChild(csg);
1802	2555	} else
1803		-
1804		- if (source == importGFDItem)
1805		- {
1806		- ImportGFD();
1807		- } else
1808		- if (source == importVRMLX3DItem)
1809		- {
1810		- ImportVRMLX3D();
1811		- } else
1812		- if (source == import3DSItem)
1813		- {
1814		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1815		- } else
1816		- if (source == importOBJItem)
1817		- {
1818		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1819		- } else
1820	2556	if (source == computeAOItem)
1821	2557	{
1822	2558	Globals.drawMode = CameraPane.OCCLUSION;
1823		- Globals.theRenderer.repaint();
	2559	+ cameraView.repaint();
1824	2560	} else
1825	2561	if (source == recompileItem)
1826	2562	{
..	..	@@ -1835,7 +2571,7 @@
1835	2571	if (source == invariantsItem)
1836	2572	{
1837	2573	System.out.println("Invariants:");
1838		- GrafreeD.grafreeD.universe.invariants();
	2574	+ Grafreed.grafreeD.universe.invariants();
1839	2575	} else
1840	2576	if (source == memoryItem)
1841	2577	{
..	..	@@ -1854,19 +2590,61 @@
1854	2590	{
1855	2591	DumpObject();
1856	2592	} else
	2593	+ if (source == minButton)
	2594	+ {
	2595	+ Minimize();
	2596	+ } else
	2597	+ if (source == maxButton)
	2598	+ {
	2599	+ Maximize();
	2600	+ } else
	2601	+ if (source == fullButton)
	2602	+ {
	2603	+ ToggleFullScreen();
	2604	+ } else
	2605	+ if (source == undoButton)
	2606	+ {
	2607	+ // Go to previous version
	2608	+ //if (!Undo())
	2609	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2610	+ Undo();
	2611	+ } else
	2612	+ if (source == restoreButton)
	2613	+ {
	2614	+ // Restore current version
	2615	+ Restore();
	2616	+ } else
	2617	+ if (source == replaceButton)
	2618	+ {
	2619	+ // Overwrite current version
	2620	+ Replace();
	2621	+ } else
	2622	+ if (source == redoButton)
	2623	+ {
	2624	+ // Go to next version
	2625	+ Redo();
	2626	+ } else
	2627	+ if (source == saveButton)
	2628	+ {
	2629	+ // Save a new version
	2630	+ if (!Save(true))
	2631	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2632	+ } else
	2633	+ if (source == oneStepButton)
	2634	+ {
	2635	+ Globals.ONESTEP = true;
	2636	+ cameraView.repaint();
	2637	+ } else
1857	2638	if (source == screenfitButton)
1858	2639	{
1859		- //Reload(lastConverter, lastFilename, true);
1860	2640	ScreenFit();
1861	2641	} else
1862	2642	if (source == screenfitpointButton)
1863	2643	{
1864		- //Reload(lastConverter, lastFilename, true);
1865	2644	ScreenFitPoint();
1866	2645	} else
1867	2646	if (source == snapobjectButton)
1868	2647	{
1869		- //Reload(lastConverter, lastFilename, true);
1870	2648	SnapObject();
1871	2649	} else
1872	2650	// if (event.getSource() == recompileButton)
..	..	@@ -1903,12 +2681,20 @@
1903	2681	{
1904	2682	loadClipboard(true);
1905	2683	} else
	2684	+ if (source == undoItem)
	2685	+ {
	2686	+ Undo();
	2687	+ } else
	2688	+ if (source == redoItem)
	2689	+ {
	2690	+ Redo();
	2691	+ } else
1906	2692	if (source == duplicateItem)
1907	2693	{
1908		- Object3D keep = GrafreeD.clipboard;
	2694	+ Object3D keep = Grafreed.clipboard;
1909	2695	loadClipboard(false);
1910	2696	paste(false);
1911		- GrafreeD.clipboard = keep;
	2697	+ Grafreed.clipboard = keep;
1912	2698	} else
1913	2699	if (source == cloneItem)
1914	2700	{
..	..	@@ -1926,13 +2712,17 @@
1926	2712	{
1927	2713	paste(false);
1928	2714	} else
	2715	+ if (source == pasteIntoItem)
	2716	+ {
	2717	+ pasteInto(true, false);
	2718	+ } else
1929	2719	if (source == pasteLinkItem)
1930	2720	{
1931		- pasteInto(false);
	2721	+ pasteInto(false, false);
1932	2722	} else
1933	2723	if (source == pasteCloneItem)
1934	2724	{
1935		- pasteInto(true);
	2725	+ pasteInto(true, true);
1936	2726	} else
1937	2727	if (source == pasteExpandItem)
1938	2728	{
..	..	@@ -2124,9 +2914,9 @@
2124	2914	// group.selection.get(0).setMasterThis(content); // should be identity
2125	2915	// refreshContents();
2126	2916	// }
2127		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2917	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2128	2918	{
2129		- Object3D content = GrafreeD.clipboard.get(0);
	2919	+ Object3D content = Grafreed.clipboard.get(0);
2130	2920
2131	2921	if (content instanceof cGroup && ((cGroup)content).transientlink )
2132	2922	content = ((cGroup)content).get(0);
..	..	@@ -2134,11 +2924,11 @@
2134	2924	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2135	2925	for (int i=0; i<group.selection.size(); i++)
2136	2926	{
2137		- boolean random = CameraPane.RANDOM;
2138		- CameraPane.RANDOM = false; // parse all random nodes
	2927	+ boolean random = CameraPane.SWITCH;
	2928	+ CameraPane.SWITCH = false; // parse all random nodes
2139	2929	group.selection.get(i).linkVerticesThis(content);
2140	2930	// group.selection.get(i).setMasterThis(content); // should be identity
2141		- CameraPane.RANDOM = random;
	2931	+ CameraPane.SWITCH = random;
2142	2932	}
2143	2933	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2144	2934	refreshContents();
..	..	@@ -2148,20 +2938,20 @@
2148	2938	{
2149	2939	for (int i=0; i<group.selection.size(); i++)
2150	2940	{
2151		- boolean random = CameraPane.RANDOM;
2152		- CameraPane.RANDOM = false; // parse all random nodes
	2941	+ boolean random = CameraPane.SWITCH;
	2942	+ CameraPane.SWITCH = false; // parse all random nodes
2153	2943	group.selection.get(i).linkVerticesThis(null);
2154		- CameraPane.RANDOM = random;
	2944	+ CameraPane.SWITCH = random;
2155	2945	}
2156	2946
2157	2947	refreshContents();
2158	2948	} else
2159	2949	if (source == relinkverticesItem)
2160	2950	{
2161		- boolean random = CameraPane.RANDOM;
2162		- CameraPane.RANDOM = false; // parse all random nodes
	2951	+ boolean random = CameraPane.SWITCH;
	2952	+ CameraPane.SWITCH = false; // parse all random nodes
2163	2953	group.selection.RelinkToSupport();
2164		- CameraPane.RANDOM = random;
	2954	+ CameraPane.SWITCH = random;
2165	2955
2166	2956	refreshContents();
2167	2957	} else
..	..	@@ -2176,9 +2966,9 @@
2176	2966	} else
2177	2967	if (source == setMasterItem)
2178	2968	{
2179		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2969	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2180	2970	{
2181		- Object3D content = GrafreeD.clipboard.get(0);
	2971	+ Object3D content = Grafreed.clipboard.get(0);
2182	2972
2183	2973	if (content instanceof cGroup && ((cGroup)content).transientlink )
2184	2974	content = ((cGroup)content).get(0);
..	..	@@ -2191,9 +2981,9 @@
2191	2981	{
2192	2982	if (group.selection.size() == 1)
2193	2983	{
2194		- if (GrafreeD.clipboard.size() == 1)
	2984	+ if (Grafreed.clipboard.size() == 1)
2195	2985	{
2196		- Object3D content = GrafreeD.clipboard.get(0);
	2986	+ Object3D content = Grafreed.clipboard.get(0);
2197	2987
2198	2988	if (content instanceof cGroup && ((cGroup)content).transientlink )
2199	2989	content = ((cGroup)content).get(0);
..	..	@@ -2210,7 +3000,7 @@
2210	3000	{
2211	3001	RevertMeshes();
2212	3002	} else
2213		- if (source == resetMeshItem)
	3003	+ if (source == resetAllItem)
2214	3004	{
2215	3005	ResetAll();
2216	3006	} else
..	..	@@ -2218,7 +3008,7 @@
2218	3008	{
2219	3009	StepAll();
2220	3010	} else
2221		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3011	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2222	3012	{
2223	3013	//int indices[] = jList.getSelectedIndices();
2224	3014	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2230,9 +3020,9 @@
2230	3020	{
2231	3021	ClearSelection(true);
2232	3022	} else
2233		- if (source == grabItem)
	3023	+ if (source == grabItem \|\| source == groupButton)
2234	3024	{
2235		- group(new cGroup(), true);
	3025	+ group(new cGroup(), false); // true);
2236	3026	} else
2237	3027	if (source == hideItem)
2238	3028	{
..	..	@@ -2250,16 +3040,16 @@
2250	3040	{
2251	3041	makeSomething(new Camera());
2252	3042	} else
2253		- if (source == compositeItem)
	3043	+ if (source == compositeItem \|\| source == compositeButton)
2254	3044	{
2255	3045	group(new Composite());
2256	3046	} else
2257		- if (source == randomItem)
	3047	+ if (source == switchItem \|\| source == switchButton)
2258	3048	{
2259	3049	RandomNode random = new RandomNode();
2260	3050	group(random);
2261	3051	if (random.size() > 0)
2262		- random.name = random.get(0).name + "Rnd";
	3052	+ random.name = random.get(0).name + "Switch";
2263	3053	} else
2264	3054	if (source == physicsItem)
2265	3055	{
..	..	@@ -2356,7 +3146,7 @@
2356	3146	{
2357	3147	group(new cLinker());
2358	3148	} else
2359		- if (source == textureItem)
	3149	+ if (source == textureItem \|\| source == textureButton)
2360	3150	{
2361	3151	group(new TextureNode());
2362	3152	} else
..	..	@@ -2376,17 +3166,30 @@
2376	3166	{
2377	3167	CastShadow(2);
2378	3168	} else
2379		- if (source == ungroupItem)
	3169	+ if (source == ungroupItem \|\| source == ungroupButton)
2380	3170	{
2381		- //ungroup();
	3171	+ boolean hasRoot = false;
	3172	+
2382	3173	for (int i=0; i<group.selection.size(); i++)
2383	3174	{
2384		- Ungroup(group.selection.get(i));
	3175	+ if (group.selection.get(i) == group)
	3176	+ {
	3177	+ hasRoot = true;
	3178	+ break;
	3179	+ }
2385	3180	}
2386	3181
2387		- ClearSelection(false);
2388		-
2389		- refreshContents();
	3182	+ if (!hasRoot)
	3183	+ {
	3184	+ for (int i=0; i<group.selection.size(); i++)
	3185	+ {
	3186	+ Ungroup(group.selection.get(i));
	3187	+ }
	3188	+
	3189	+ ClearSelection(false);
	3190	+
	3191	+ refreshContents();
	3192	+ }
2390	3193	} else
2391	3194	if (source == genUVItem)
2392	3195	{
..	..	@@ -2398,7 +3201,7 @@
2398	3201	} else
2399	3202	if (source == genNormalsMESHItem)
2400	3203	{
2401		- GenNormals(true); // TODO
	3204	+ GenNormalsMESH();
2402	3205	} else
2403	3206	if (source == genNormalsORGANItem)
2404	3207	{
..	..	@@ -2463,6 +3266,22 @@
2463	3266	if (source == unmarkleavesItem)
2464	3267	{
2465	3268	MarkLeaves(false);
	3269	+ } else
	3270	+ if (source == rewindleavesItem)
	3271	+ {
	3272	+ RewindLeaves(true);
	3273	+ } else
	3274	+ if (source == unrewindleavesItem)
	3275	+ {
	3276	+ RewindLeaves(false);
	3277	+ } else
	3278	+ if (source == randomleavesItem)
	3279	+ {
	3280	+ RandomLeaves(true);
	3281	+ } else
	3282	+ if (source == unrandomleavesItem)
	3283	+ {
	3284	+ RandomLeaves(false);
2466	3285	} else
2467	3286	if (source == flipVItem)
2468	3287	{
..	..	@@ -2548,9 +3367,13 @@
2548	3367	{
2549	3368	SmoothMesh();
2550	3369	} else
2551		- if (source == transformgeometryItem)
	3370	+ if (source == transformGeometryItem)
2552	3371	{
2553	3372	TransformGeometry();
	3373	+ } else
	3374	+ if (source == transformChildrenItem)
	3375	+ {
	3376	+ TransformChildren();
2554	3377	} else
2555	3378	if (source == resetTransformItem)
2556	3379	{
..	..	@@ -2558,7 +3381,11 @@
2558	3381	} else
2559	3382	if (source == resetCentroidItem)
2560	3383	{
2561		- ResetCentroid();
	3384	+ ResetCentroid(true);
	3385	+ } else
	3386	+ if (source == resetCentroidXZItem)
	3387	+ {
	3388	+ ResetCentroid(false);
2562	3389	} else
2563	3390	if (source == resetParentItem)
2564	3391	{
..	..	@@ -2663,7 +3490,7 @@
2663	3490	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2664	3491	{
2665	3492	obj = (Object3D)e.nextElement();
2666		- obj.SetBumpTexture(null);
	3493	+ obj.ResetBumpTexture();
2667	3494	}
2668	3495
2669	3496	refreshContents();
..	..	@@ -2679,6 +3506,31 @@
2679	3506
2680	3507	refreshContents();
2681	3508	} else
	3509	+ if (source == embedTexturesItem)
	3510	+ {
	3511	+ Object3D obj;
	3512	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3513	+ {
	3514	+ obj = (Object3D)e.nextElement();
	3515	+ obj.EmbedTextures(true);
	3516	+ }
	3517	+
	3518	+ refreshContents();
	3519	+ } else
	3520	+ if (source == deEmbedTexturesItem)
	3521	+ {
	3522	+ Object3D obj;
	3523	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3524	+ {
	3525	+ obj = (Object3D)e.nextElement();
	3526	+ obj.EmbedTextures(false);
	3527	+ }
	3528	+
	3529	+ CameraPane.texturepigment.clear();
	3530	+ CameraPane.texturebump.clear();
	3531	+
	3532	+ refreshContents();
	3533	+ } else
2682	3534	if (source == flashSelectionButton)
2683	3535	{
2684	3536	CameraPane.flash = true;
..	..	@@ -2690,6 +3542,10 @@
2690	3542	if (source == twoButton)
2691	3543	{
2692	3544	radio.layout = twoButton;
	3545	+
	3546	+ if (CameraPane.FULLSCREEN)
	3547	+ fullscreenLayout = radio.layout;
	3548	+
2693	3549	// bug
2694	3550	//gridPanel.setDividerLocation(1.0);
2695	3551	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2720,12 +3576,33 @@
2720	3576	// centralPanel.setVisible(true);
2721	3577	// XYZPanel.setVisible(false);
2722	3578	bigThree.ClearUI();
2723		- bigThree.addComponent(centralPanel);
	3579	+ bigThree.add(centralPanel);
2724	3580	bigThree.FlushUI();
	3581	+
	3582	+ cameraView.requestFocusInWindow();
	3583	+
	3584	+// refreshContents(true);
	3585	+//
	3586	+// try
	3587	+// {
	3588	+// java.awt.Robot bot = new java.awt.Robot();
	3589	+// int mask = InputEvent.BUTTON1_MASK;
	3590	+// bot.mouseMove(100, 100);
	3591	+// bot.mousePress(mask);
	3592	+// bot.mouseRelease(mask);
	3593	+// }
	3594	+// catch (Exception e)
	3595	+// {
	3596	+//
	3597	+// }
	3598	+
2725	3599	} else
2726	3600	if (source == threeButton)
2727	3601	{
2728	3602	radio.layout = threeButton;
	3603	+
	3604	+ if (CameraPane.FULLSCREEN)
	3605	+ fullscreenLayout = radio.layout;
2729	3606
2730	3607	// bigThree.remove(scenePanel);
2731	3608	// bigThree.remove(centralPanel);
..	..	@@ -2755,13 +3632,18 @@
2755	3632	// centralPanel.setVisible(true);
2756	3633	// XYZPanel.setVisible(true);
2757	3634	bigThree.ClearUI();
2758		- bigThree.addComponent(centralPanel);
2759		- bigThree.addComponent(XYZPanel);
	3635	+ bigThree.add(scenePanel);
	3636	+ bigThree.add(centralPanel);
2760	3637	bigThree.FlushUI();
	3638	+
	3639	+ cameraView.requestFocusInWindow();
2761	3640	} else
2762	3641	if (source == fourButton)
2763	3642	{
2764	3643	radio.layout = fourButton;
	3644	+
	3645	+ if (CameraPane.FULLSCREEN)
	3646	+ fullscreenLayout = radio.layout;
2765	3647
2766	3648	// bigThree.remove(scenePanel);
2767	3649	// bigThree.remove(centralPanel);
..	..	@@ -2791,12 +3673,17 @@
2791	3673	// centralPanel.setVisible(false);
2792	3674	// XYZPanel.setVisible(false);
2793	3675	bigThree.ClearUI();
2794		- bigThree.addComponent(scenePanel);
	3676	+ bigThree.add(scenePanel);
2795	3677	bigThree.FlushUI();
	3678	+
	3679	+ cameraView.requestFocusInWindow();
2796	3680	} else
2797	3681	if (source == sixButton)
2798	3682	{
2799	3683	radio.layout = sixButton;
	3684	+
	3685	+ if (CameraPane.FULLSCREEN)
	3686	+ fullscreenLayout = radio.layout;
2800	3687
2801	3688	// bigThree.remove(scenePanel);
2802	3689	// bigThree.remove(centralPanel);
..	..	@@ -2826,13 +3713,18 @@
2826	3713	// centralPanel.setVisible(true);
2827	3714	// XYZPanel.setVisible(false);
2828	3715	bigThree.ClearUI();
2829		- bigThree.addComponent(scenePanel);
2830		- bigThree.addComponent(centralPanel);
	3716	+ bigThree.add(centralPanel);
	3717	+ bigThree.add(scenePanel);
2831	3718	bigThree.FlushUI();
	3719	+
	3720	+ cameraView.requestFocusInWindow();
2832	3721	} else
2833	3722	if (source == sevenButton)
2834	3723	{
2835	3724	radio.layout = sevenButton;
	3725	+
	3726	+ if (CameraPane.FULLSCREEN)
	3727	+ fullscreenLayout = radio.layout;
2836	3728
2837	3729	// bigThree.remove(scenePanel);
2838	3730	// bigThree.remove(centralPanel);
..	..	@@ -2862,10 +3754,12 @@
2862	3754	// centralPanel.setVisible(true);
2863	3755	// XYZPanel.setVisible(true);
2864	3756	bigThree.ClearUI();
2865		- bigThree.addComponent(scenePanel);
2866		- bigThree.addComponent(centralPanel);
2867		- bigThree.addComponent(XYZPanel);
	3757	+ bigThree.add(scenePanel);
	3758	+ bigThree.add(centralPanel);
	3759	+ bigThree.add(XYZPanel);
2868	3760	bigThree.FlushUI();
	3761	+
	3762	+ cameraView.requestFocusInWindow();
2869	3763	} else
2870	3764	if (source == rootButton)
2871	3765	{
..	..	@@ -2877,6 +3771,7 @@
2877	3771	EditObject(obj);
2878	3772	}
2879	3773
	3774	+ cameraView.requestFocusInWindow();
2880	3775	refreshContents(true);
2881	3776	} else
2882	3777	if (source == closeButton)
..	..	@@ -2886,22 +3781,37 @@
2886	3781	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2887	3782	{
2888	3783	ab = (cRadio)e.nextElement();
2889		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3784	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2890	3785	{
	3786	+ // Patch to avoid bug with transparency.
	3787	+ if (!ab.hadMaterial)
	3788	+ {
	3789	+ ab.object.material = null;
	3790	+ }
	3791	+
2891	3792	buttonGroup.remove(ab);
2892	3793	radioPanel.remove(ab);
2893	3794
2894		- ab.GetObject().editWindow = null;
	3795	+ //ab.GetObject().editWindow = null;
	3796	+ ab.GetObject().manipWindow = null;
2895	3797	// ab.GetObject().objectUI = null; // ?????????
2896	3798
2897	3799	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2898	3800	break;
2899	3801	}
2900	3802	}
	3803	+
	3804	+ cameraView.requestFocusInWindow();
2901	3805	refreshContents(true);
2902	3806	} else
2903	3807	if (source == editItem \|\| source == editButton)
2904	3808	{
	3809	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3810	+ {
	3811	+ Object3D child = (Object3D)e.nextElement();
	3812	+ child.pinned = true;
	3813	+ }
	3814	+
2905	3815	EditSelection(false);
2906	3816	} else
2907	3817	if (source == uneditButton)
..	..	@@ -2911,12 +3821,13 @@
2911	3821	Object3D child = (Object3D)e.nextElement();
2912	3822	if(child.editWindow != null)
2913	3823	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3824	+ child.pinned = false;
2914	3825	child.CloseUI();
2915	3826	listUI.remove(child);
2916	3827
2917		- child.editWindow = null; // ???????????
	3828	+ //child.editWindow = null; // ???????????
2918	3829	}
2919		- objEditor.ctrlPanel.revalidate();
	3830	+ objEditor.ctrlPanel.FlushUI();
2920	3831	//objEditor.jTree.clearSelection();
2921	3832	//objEditor.ResetSliders();
2922	3833	refreshContents(true);
..	..	@@ -2927,6 +3838,7 @@
2927	3838	//copy.ClearUI();
2928	3839	for (Object3D obj : listUI)
2929	3840	{
	3841	+ obj.pinned = false;
2930	3842	obj.CloseUI();
2931	3843	}
2932	3844	listUI.clear();
..	..	@@ -2936,7 +3848,7 @@
2936	3848	{
2937	3849	assert(copy == group);
2938	3850
2939		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3851	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2940	3852
2941	3853	for (Object3D obj : listUI)
2942	3854	{
..	..	@@ -2985,6 +3897,9 @@
2985	3897	}
2986	3898
2987	3899	copy = group;
	3900	+
	3901	+ SetUndoStates();
	3902	+
2988	3903	//Globals.theRenderer.object = group;
2989	3904	if(!useclient)
2990	3905	{
..	..	@@ -3000,20 +3915,48 @@
3000	3915	frontView.object = group;
3001	3916	sideView.object = group;
3002	3917	}
3003		- group.editWindow = this;
	3918	+
	3919	+// fix "+" issue
	3920	+ //group.editWindow = this;
	3921	+ group.manipWindow = this;
	3922	+
3004	3923	/*
3005	3924	currentLayout = radio.layout;
3006	3925	if (currentLayout == null)
3007	3926	currentLayout = sevenButton;
3008	3927	*/
3009	3928	radio.layout.doClick();
	3929	+
	3930	+ ClearUnpinned();
	3931	+ //Grafreed.Assert(group != null);
	3932	+ //Grafreed.Assert(group.selection != null);
	3933	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	3934	+ if (group.selection == null \|\| group.selection.size() == 1)
	3935	+ EditSelection(false);
3010	3936	keepparent = group.parent;
3011	3937	// PARENT = NULL or not???
3012	3938	//group.parent = null; // ROOT
3013	3939	//group.attributes = -1;
3014	3940	ResetModel();
	3941	+
	3942	+ cameraView.requestFocusInWindow();
3015	3943	refreshContents(true);
3016		- }
	3944	+ } else if (event.getSource() == editCameraItem)
	3945	+ {
	3946	+ cameraView.ProtectCamera();
	3947	+ cameraView.requestFocusInWindow();
	3948	+ cameraView.repaint();
	3949	+ return;
	3950	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3951	+ {
	3952	+ cameraView.RevertCamera();
	3953	+ cameraView.requestFocusInWindow();
	3954	+ cameraView.repaint();
	3955	+ return;
	3956	+ // } else if (event.getSource() == textureButton)
	3957	+ // {
	3958	+ // return; // true;
	3959	+ }
3017	3960	else
3018	3961	{
3019	3962	//return super.action(event, arg);
..	..	@@ -3022,7 +3965,6 @@
3022	3965	}
3023	3966
3024	3967	boolean useclient = false;
3025		- cRadio radio;
3026	3968
3027	3969	void ToggleRoot()
3028	3970	{
..	..	@@ -3074,6 +4016,28 @@
3074	4016	refreshContents();
3075	4017	}
3076	4018
	4019	+ void TransformChildren()
	4020	+ {
	4021	+ Object3D obj;
	4022	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4023	+ {
	4024	+ obj = (Object3D)e.nextElement();
	4025	+ obj.KeepTextureMatrices();
	4026	+ obj.TransformChildren();
	4027	+ obj.RestoreTextureMatrices();
	4028	+
	4029	+// if (obj.parent == null)
	4030	+// {
	4031	+// System.out.println("NULL PARENT!");
	4032	+// new Exception().printStackTrace();
	4033	+// }
	4034	+// else
	4035	+// TouchTransform(obj);
	4036	+// //obj.parent.Touch();
	4037	+ }
	4038	+
	4039	+ refreshContents();
	4040	+ }
3077	4041
3078	4042	void ResetTransform()
3079	4043	{
..	..	@@ -3186,7 +4150,7 @@
3186	4150	refreshContents();
3187	4151	}
3188	4152
3189		- void ResetCentroid()
	4153	+ void ResetCentroid(boolean full)
3190	4154	{
3191	4155	Object3D obj;
3192	4156	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3201,12 +4165,16 @@
3201	4165	LA.matIdentity(Object3D.mat);
3202	4166	obj.getBounds(minima, maxima, false);
3203	4167	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3204		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	4168	+ if (full)
	4169	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3205	4170	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3206	4171	obj.TransformMesh(Object3D.mat);
	4172	+
3207	4173	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3208		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	4174	+ if (full)
	4175	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3209	4176	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	4177	+
3210	4178	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3211	4179	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3212	4180	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3235,7 +4203,8 @@
3235	4203
3236	4204	int size = obj.MemorySize();
3237	4205
3238		- System.err.println((size/1024) + " KB is the size of " + obj);
	4206	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4207	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3239	4208	}
3240	4209	}
3241	4210	catch (Exception e)
..	..	@@ -3272,9 +4241,9 @@
3272	4241	obj = (Object3D)e.nextElement();
3273	4242
3274	4243	System.out.println("Object is: " + obj);
3275		- GrafreeD.AnalyzeObject(obj);
	4244	+ Grafreed.AnalyzeObject(obj);
3276	4245	System.out.println("Boundary rep: " + obj.bRep);
3277		- GrafreeD.AnalyzeObject(obj.bRep);
	4246	+ Grafreed.AnalyzeObject(obj.bRep);
3278	4247
3279	4248	// System.err.println((size/1024) + " KB is the size of " + obj);
3280	4249	}
..	..	@@ -3316,6 +4285,13 @@
3316	4285	void GenNormals(boolean crease)
3317	4286	{
3318	4287	group.GenNormalsS(crease);
	4288	+
	4289	+ refreshContents();
	4290	+ }
	4291	+
	4292	+ void GenNormalsMESH()
	4293	+ {
	4294	+ group.GenNormalsMeshS();
3319	4295
3320	4296	refreshContents();
3321	4297	}
..	..	@@ -3488,8 +4464,8 @@
3488	4464
3489	4465	void ParseVertices()
3490	4466	{
3491		- boolean epsequal = GrafreeD.epsequal;
3492		- GrafreeD.epsequal = true;
	4467	+ boolean epsequal = Grafreed.epsequal;
	4468	+ Grafreed.epsequal = true;
3493	4469
3494	4470	for (int i=0; i<group.selection.size(); i++)
3495	4471	{
..	..	@@ -3514,7 +4490,7 @@
3514	4490	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3515	4491	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3516	4492
3517		- g.add(GrafreeD.clipboard);
	4493	+ g.add(Grafreed.clipboard);
3518	4494
3519	4495	buffer.add(g);
3520	4496	}
..	..	@@ -3529,7 +4505,7 @@
3529	4505	makeSomething(buffer, i==group.selection.size()-1);
3530	4506	}
3531	4507
3532		- GrafreeD.epsequal = epsequal;
	4508	+ Grafreed.epsequal = epsequal;
3533	4509
3534	4510	refreshContents();
3535	4511	}
..	..	@@ -3547,7 +4523,16 @@
3547	4523	String pigment = Object3D.GetPigment(tex);
3548	4524	//String bump = Object3D.GetBump(tex);
3549	4525
3550		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4526	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4527	+
	4528	+ try
	4529	+ {
	4530	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
	4531	+ }
	4532	+ catch (Exception e)
	4533	+ {
	4534	+ System.err.println("FAIL: " + node);
	4535	+ }
3551	4536
3552	4537	double s = v.s;
3553	4538
..	..	@@ -3635,11 +4620,11 @@
3635	4620
3636	4621	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3637	4622
3638		- boolean random = CameraPane.RANDOM;
3639		- CameraPane.RANDOM = false; // parse all random nodes
	4623	+ boolean random = CameraPane.SWITCH;
	4624	+ CameraPane.SWITCH = false; // parse all random nodes
3640	4625	lowres.linkVerticesThis(null);
3641	4626	lowres.linkVerticesThis(sn);
3642		- CameraPane.RANDOM = random;
	4627	+ CameraPane.SWITCH = random;
3643	4628
3644	4629	System.err.flush();
3645	4630
..	..	@@ -3679,7 +4664,7 @@
3679	4664	return;
3680	4665
3681	4666	Object3D poses = group.selection.get(0);
3682		- Object3D ref = GrafreeD.clipboard.get(0);
	4667	+ Object3D ref = Grafreed.clipboard.get(0);
3683	4668
3684	4669	Object3D newgroup = new Object3D("Po:" + poses.name);
3685	4670
..	..	@@ -3873,9 +4858,9 @@
3873	4858
3874	4859	void ClipMesh()
3875	4860	{
3876		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4861	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3877	4862	{
3878		- Object3D content = GrafreeD.clipboard.get(0);
	4863	+ Object3D content = Grafreed.clipboard.get(0);
3879	4864
3880	4865	if (content instanceof cGroup && ((cGroup)content).transientlink )
3881	4866	content = ((cGroup)content).get(0);
..	..	@@ -3884,7 +4869,7 @@
3884	4869	// {
3885	4870	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3886	4871	// }
3887		- group.selection.ClipMesh(GrafreeD.clipboard);
	4872	+ group.selection.ClipMesh(Grafreed.clipboard);
3888	4873	}
3889	4874	// group.selection.ClipMesh(GrafreeD.clipboard);
3890	4875	System.out.println("DONE.");
..	..	@@ -3931,6 +4916,18 @@
3931	4916	void MarkLeaves(boolean hide)
3932	4917	{
3933	4918	group.selection.MarkLeaves(hide);
	4919	+ refreshContents();
	4920	+ }
	4921	+
	4922	+ void RewindLeaves(boolean hide)
	4923	+ {
	4924	+ group.selection.RewindLeaves(hide);
	4925	+ refreshContents();
	4926	+ }
	4927	+
	4928	+ void RandomLeaves(boolean hide)
	4929	+ {
	4930	+ group.selection.RandomLeaves(hide);
3934	4931	refreshContents();
3935	4932	}
3936	4933
..	..	@@ -4005,28 +5002,25 @@
4005	5002	// }
4006	5003	// }
4007	5004
4008		- static boolean allparams = true;
4009		-
4010		- static Vector<Object3D> listUI = new Vector<Object3D>();
4011		-
4012	5005	void EditSelection(boolean newWindow)
4013	5006	{
	5007	+ if (group.selection == null)
	5008	+ {
	5009	+ EditElement(group, newWindow); // ? new
	5010	+ return;
	5011	+ }
	5012	+
4014	5013	// aConstraints.gridy = 0;
4015	5014	for (int i=0; i<group.selection.size(); i++)
4016	5015	{
4017	5016	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4018	5017	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4019		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5018	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4020	5019
4021	5020	Object3D elem = (Object3D)group.selection.elementAt(i);
4022		- if(elem != group)
	5021	+ if(elem != group \|\| !newWindow)
4023	5022	{
4024		- // if (!(elem instanceof Composite))
4025		- // newWindow = false;
4026		- listUI.add(elem);
4027		- elem.openEditWindow(this, newWindow); //, false);
4028		- System.out.println("edit : " + elem);
4029		- elem.editWindow.refreshContents(true); // ? new
	5023	+ EditElement(elem, newWindow); // ? new
4030	5024	}
4031	5025	}
4032	5026	}
..	..	@@ -4101,7 +5095,8 @@
4101	5095	//new Exception().printStackTrace();
4102	5096
4103	5097	freezemodel = true;
4104		-
	5098	+ ClearUnpinned();
	5099	+
4105	5100	/**/
4106	5101	//switch (event.id)
4107	5102	{
..	..	@@ -4109,7 +5104,6 @@
4109	5104	//case 702: // Event.LIST_DESELECT
4110	5105	group.deselectAll();
4111	5106	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4112		- objEditor.ClearInfo(); // .GetMaterial());
4113	5107	if (tps != null)
4114	5108	{
4115	5109	for (int i=0; i < tps.length; i++)
..	..	@@ -4118,33 +5112,39 @@
4118	5112
4119	5113	//if (child.parent != null)
4120	5114	//child.parent.addSelectee(child);
	5115	+ objEditor.SetMaterial(child);
4121	5116	group.addSelectee(child);
4122		- objEditor.SetMaterial(child); // .GetMaterial());
4123		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4124		- System.err.println("info : " + child.GetPath());
4125	5117	}
4126	5118	}
4127		- else
4128		- {
4129		- objEditor.SetMaterial(group); // .GetMaterial());
4130		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4131		- System.err.println("info : " + group.GetPath());
4132		- }
	5119	+// else
	5120	+// {
	5121	+// objEditor.SetMaterial(group); // .GetMaterial());
	5122	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	5123	+// System.err.println("info : " + group.GetPath());
	5124	+// }
4133	5125
4134		- objEditor.SetText(); // jan 2014
4135		-
4136		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	5126	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4137	5127	CameraPane.flash = true;
4138	5128
4139		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5129	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4140	5130	// a camera
4141	5131	{
4142		- CameraPane.camerachangeframe = 0; // don't refuse it
4143		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5132	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5133	+ {
	5134	+ CameraPane.camerachangeframe = 0; // don't refuse it
	5135	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5136	+ }
4144	5137	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4145	5138	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4146	5139	}
4147	5140
	5141	+ if (tps != null && tps.length == 1)
	5142	+ {
	5143	+ EditSelection(false);
	5144	+ }
	5145	+
	5146	+ SetPinStates(tps != null && tps.length > 0);
	5147	+
4148	5148	refreshContents();
4149	5149	//return true;
4150	5150	}
..	..	@@ -4153,6 +5153,35 @@
4153	5153
4154	5154	freezemodel = false;
4155	5155	}
	5156	+
	5157	+ void SetPinStates(boolean enabled)
	5158	+ {
	5159	+ editButton.setEnabled(enabled);
	5160	+ uneditButton.setEnabled(enabled);
	5161	+ unselectButton.setEnabled(enabled);
	5162	+ flashSelectionButton.setEnabled(enabled);
	5163	+ }
	5164	+
	5165	+ void refreshContents(boolean cp)
	5166	+ {
	5167	+ if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5168	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5169	+ {
	5170	+ objEditor.ClearInfo(); // .GetMaterial());
	5171	+
	5172	+ for (int i=0; i < group.selection.Size(); i++)
	5173	+ {
	5174	+ Object3D child = (Object3D) group.selection.get(i);
	5175	+
	5176	+ objEditor.AddInfo(child, this, true);
	5177	+ System.err.println("info : " + child.GetPath());
	5178	+ }
	5179	+
	5180	+ objEditor.SetText(); // jan 2014
	5181	+ }
	5182	+
	5183	+ super.refreshContents(cp);
	5184	+ }
4156	5185
4157	5186	void linkSomething(Object3D thing)
4158	5187	{
..	..	@@ -4224,16 +5253,19 @@
4224	5253	{
4225	5254	if (group.selection.isEmpty())
4226	5255	return;
4227		- GrafreeD.clipboardIsTempGroup = false;
	5256	+
	5257	+ Grafreed.clipboardIsTempGroup = false;
4228	5258	Composite tGroup = null;
4229	5259	if (group.selection.size() > 0) // 1)
4230	5260	{
4231	5261	tGroup = new cGroup();
4232		- GrafreeD.clipboardIsTempGroup = true;
	5262	+ Grafreed.clipboardIsTempGroup = true;
4233	5263	}
4234	5264
4235	5265	if (cut)
4236	5266	{
	5267	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5268	+// Save();
4237	5269	//int indices[] = jList.getSelectedIndices();
4238	5270	//for (int i = indices.length - 1; i >= 0; i--)
4239	5271	//jList.remove(indices[i]);
..	..	@@ -4269,16 +5301,16 @@
4269	5301	//System.out.println("cut " + child);
4270	5302	//System.out.println("parent = " + child.parent);
4271	5303	// tmp.addChild(child);
4272		- if (GrafreeD.clipboardIsTempGroup)
	5304	+ if (Grafreed.clipboardIsTempGroup)
4273	5305	tGroup.add/Child/(tmp);
4274	5306	else
4275		- GrafreeD.clipboard = tmp;
	5307	+ Grafreed.clipboard = tmp;
4276	5308	}
4277	5309	else
4278		- if (GrafreeD.clipboardIsTempGroup)
	5310	+ if (Grafreed.clipboardIsTempGroup)
4279	5311	tGroup.add/Child/(child);
4280	5312	else
4281		- GrafreeD.clipboard = child;
	5313	+ Grafreed.clipboard = child;
4282	5314	}
4283	5315
4284	5316	//ResetModel();
..	..	@@ -4310,21 +5342,23 @@
4310	5342	//System.out.println("cut " + elem);
4311	5343	//System.out.println("parent = " + elem.parent);
4312	5344	// tmp.addChild(elem);
4313		- if (GrafreeD.clipboardIsTempGroup)
	5345	+ if (Grafreed.clipboardIsTempGroup)
4314	5346	tGroup.add/Child/(tmp);
4315	5347	else
4316		- GrafreeD.clipboard = tmp;
	5348	+ Grafreed.clipboard = tmp;
4317	5349	}
4318	5350	else
4319		- if (GrafreeD.clipboardIsTempGroup)
	5351	+ if (Grafreed.clipboardIsTempGroup)
4320	5352	tGroup.add/Child/(child);
4321	5353	else
4322		- GrafreeD.clipboard = child;
	5354	+ Grafreed.clipboard = child;
4323	5355	}
4324	5356
4325	5357	}
4326		- if (GrafreeD.clipboardIsTempGroup)
4327		- GrafreeD.clipboard = tGroup;
	5358	+
	5359	+ if (Grafreed.clipboardIsTempGroup)
	5360	+ Grafreed.clipboard = tGroup;
	5361	+
4328	5362	if (cut)
4329	5363	{
4330	5364	ResetModel();
..	..	@@ -4334,11 +5368,15 @@
4334	5368
4335	5369	void paste(boolean expand)
4336	5370	{
	5371	+ if (Globals.REPLACEONMAKE)
	5372	+ Save();
	5373	+ boolean keep = Globals.REPLACEONMAKE;
	5374	+ Globals.REPLACEONMAKE = false;
4337	5375	// if (GrafreeD.clipboard == null)
4338	5376	// return;
4339	5377	boolean first = true;
4340	5378
4341		- if (GrafreeD.clipboardIsTempGroup)
	5379	+ if (Grafreed.clipboardIsTempGroup)
4342	5380	{
4343	5381	Composite temp;
4344	5382
..	..	@@ -4349,7 +5387,7 @@
4349	5387	temp = (Composite)Applet3D.clipboard.deepCopy();
4350	5388	*/
4351	5389	Object3D elem;
4352		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5390	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4353	5391	{
4354	5392	Object3D child = (Object3D)e.nextElement();
4355	5393
..	..	@@ -4383,21 +5421,22 @@
4383	5421	//Object3D cb = Applet3D.clipboard;
4384	5422	//temp.addChild(cb);
4385	5423	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4386		- assert(GrafreeD.clipboard.parent == null);
4387		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4388		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4389		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4390		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	5424	+ assert(Grafreed.clipboard.parent == null);
	5425	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5426	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5427	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5428	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4391	5429	else
4392		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4393		- GrafreeD.clipboard.get(0).parent = keepparent;
	5430	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5431	+ Grafreed.clipboard.get(0).parent = keepparent;
4394	5432	}
4395	5433
	5434	+ Globals.REPLACEONMAKE = keep;
4396	5435	ResetModel();
4397	5436	refreshContents();
4398	5437	}
4399	5438
4400		- void pasteInto(boolean copyit)
	5439	+ void pasteInto(boolean copyit, boolean clone)
4401	5440	{
4402	5441	// if (GrafreeD.clipboard == null)
4403	5442	// return;
..	..	@@ -4426,15 +5465,22 @@
4426	5465	if (copyit)
4427	5466	{
4428	5467	// paste(false);
4429		- CloneClipboard(false); // sept 2014
	5468	+ if (clone)
	5469	+ {
	5470	+ CloneClipboard(false); // sept 2014
	5471	+ }
	5472	+ else
	5473	+ {
	5474	+ paste(false);
	5475	+ }
4430	5476	}
4431	5477	else
4432	5478	{
4433	5479	boolean first = true;
4434	5480
4435		- if (GrafreeD.clipboardIsTempGroup)
	5481	+ if (Grafreed.clipboardIsTempGroup)
4436	5482	{
4437		- Composite temp = (Composite)GrafreeD.clipboard;
	5483	+ Composite temp = (Composite)Grafreed.clipboard;
4438	5484	Object3D copy;
4439	5485	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4440	5486	{
..	..	@@ -4444,7 +5490,7 @@
4444	5490	}
4445	5491	} else
4446	5492	{
4447		- linkSomething(GrafreeD.clipboard); //.get(0));
	5493	+ linkSomething(Grafreed.clipboard); //.get(0));
4448	5494	}
4449	5495	}
4450	5496	}
..	..	@@ -4521,6 +5567,10 @@
4521	5567
4522	5568	void group(Object3D csg, boolean grab)
4523	5569	{
	5570	+ if (Globals.REPLACEONMAKE)
	5571	+ Save();
	5572	+ boolean keep = Globals.REPLACEONMAKE;
	5573	+ Globals.REPLACEONMAKE = false;
4524	5574	if (//false) // why??
4525	5575	!group.selection.isEmpty())
4526	5576	{
..	..	@@ -4634,10 +5684,15 @@
4634	5684	//node.add(csg);
4635	5685	//makeSomething(node);
4636	5686	makeSomething(csg);
	5687	+ Globals.REPLACEONMAKE = keep;
4637	5688	}
4638	5689
4639	5690	void Ungroup(Object3D g)
4640	5691	{
	5692	+ if (Globals.REPLACEONMAKE)
	5693	+ Save();
	5694	+ boolean keep = Globals.REPLACEONMAKE;
	5695	+ Globals.REPLACEONMAKE = false;
4641	5696	if (g instanceof HiddenObject)
4642	5697	{
4643	5698	HiddenObject h = (HiddenObject) g;
..	..	@@ -4654,6 +5709,7 @@
4654	5709	objEditor.makeSomething(g.get(i), false);
4655	5710	}
4656	5711	}
	5712	+ Globals.REPLACEONMAKE = keep;
4657	5713	}
4658	5714
4659	5715	void ungroup()
..	..	@@ -4849,21 +5905,6 @@
4849	5905	}
4850	5906	*/
4851	5907
4852		- void ImportGFD()
4853		- {
4854		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4855		- browser.show();
4856		- String filename = browser.getFile();
4857		- if (filename != null && filename.length() > 0)
4858		- {
4859		- String fullname = browser.getDirectory() + filename;
4860		-
4861		- //Object3D readobj =
4862		- objEditor.ReadGFD(fullname, objEditor);
4863		- //makeSomething(readobj);
4864		- }
4865		- }
4866		-
4867	5908	/*
4868	5909	public void Callback(Object obj)
4869	5910	{
..	..	@@ -4887,26 +5928,9 @@
4887	5928	}
4888	5929	*/
4889	5930
4890		- void ImportVRMLX3D()
4891		- {
4892		- if (GrafreeD.standAlone)
4893		- {
4894		- /**/
4895		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4896		- browser.show();
4897		- String filename = browser.getFile();
4898		- if (filename != null && filename.length() > 0)
4899		- {
4900		- String fullname = browser.getDirectory() + filename;
4901		- LoadVRMLX3D(fullname);
4902		- }
4903		- /**/
4904		- }
4905		- }
4906		-
4907	5931	String GetFile(String dialogName)
4908	5932	{
4909		- if (GrafreeD.standAlone)
	5933	+ if (Grafreed.standAlone)
4910	5934	{
4911	5935	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4912	5936	browser.show();
..	..	@@ -4970,10 +5994,49 @@
4970	5994	cButton flashSelectionButton;
4971	5995	cButton editButton;
4972	5996	cButton uneditButton;
	5997	+ JCheckBox allParamsButton;
4973	5998	cButton clearpanelButton;
4974		- cButton allParamsButton;
4975	5999	cButton unselectButton;
4976	6000
	6001	+ cButton restoreCameraButton;
	6002	+
	6003	+ cButton saveButton;
	6004	+ cButton oneStepButton;
	6005	+
	6006	+ cButton groupButton;
	6007	+ cButton ungroupButton;
	6008	+ cButton compositeButton;
	6009	+ cButton switchButton;
	6010	+ cButton loopButton;
	6011	+ cButton textureButton;
	6012	+
	6013	+ cButton skybox1Button;
	6014	+ cButton skybox2Button;
	6015	+ cButton skybox3Button;
	6016	+ cButton skybox4Button;
	6017	+ cButton skybox5Button;
	6018	+ cButton skybox6Button;
	6019	+ cButton skybox7Button;
	6020	+
	6021	+ cButton skybox11Button;
	6022	+ cButton skybox12Button;
	6023	+ cButton skybox13Button;
	6024	+ cButton skybox14Button;
	6025	+ cButton skybox15Button;
	6026	+ cButton skybox16Button;
	6027	+ cButton skybox17Button;
	6028	+
	6029	+ cButton gridButton;
	6030	+ cButton boxButton;
	6031	+ cButton sphereButton;
	6032	+ cButton coneButton;
	6033	+ cButton torusButton;
	6034	+ cButton superButton;
	6035	+ cButton kleinButton;
	6036	+ cButton particlesButton;
	6037	+ cButton overlayButton;
	6038	+ cButton lightButton;
	6039	+
4977	6040	cButton screenfitButton;
4978	6041	cButton screenfitpointButton;
4979	6042	cButton snapobjectButton;
..	..	@@ -4985,14 +6048,6 @@
4985	6048
4986	6049	cButton setsupportButton;
4987	6050
4988		- cButton twoButton;
4989		- cButton sixButton;
4990		- cButton threeButton;
4991		- cButton sevenButton;
4992		- cButton fourButton; // full panel
4993		- cButton oneButton; // full XYZ
4994		- //cButton currentLayout;
4995		-
4996	6051	//
4997	6052	//Composite
4998	6053	Object3D // to do !!
..	..	@@ -5002,9 +6057,11 @@
5002	6057	//JTree jTree;
5003	6058	private MenuItem lookAtItem;
5004	6059	private MenuItem lookFromItem;
5005		- private MenuItem switchItem;
	6060	+ private MenuItem switchViewItem;
5006	6061	private MenuItem cutItem;
5007		- private MenuItem duplicateItem;
	6062	+ private MenuItem undoItem;
	6063	+ private MenuItem redoItem;
	6064	+ private JMenuItem duplicateItem;
5008	6065	private MenuItem cloneItem;
5009	6066	private MenuItem cloneSupportItem;
5010	6067	private MenuItem overwriteGeoItem;
..	..	@@ -5017,7 +6074,7 @@
5017	6074	private MenuItem linkverticesItem;
5018	6075	private MenuItem relinkverticesItem;
5019	6076	private MenuItem setMasterItem;
5020		- private MenuItem resetMeshItem;
	6077	+ private MenuItem resetAllItem;
5021	6078	private MenuItem stepAllItem;
5022	6079	private MenuItem revertMeshItem;
5023	6080	private MenuItem poseMeshItem;
..	..	@@ -5028,10 +6085,11 @@
5028	6085	private MenuItem mergeGeometriesItem;
5029	6086	private MenuItem copyItem;
5030	6087	private MenuItem pasteItem;
	6088	+ private MenuItem pasteIntoItem;
5031	6089	private MenuItem pasteLinkItem;
5032	6090	private MenuItem pasteCloneItem;
5033	6091	private MenuItem pasteExpandItem;
5034		- private MenuItem clearItem;
	6092	+ private MenuItem deleteItem;
5035	6093	private MenuItem clearAllItem;
5036	6094	private MenuItem genUVItem;
5037	6095	private MenuItem genNormalsMESHItem;
..	..	@@ -5066,6 +6124,10 @@
5066	6124	private MenuItem showleavesItem;
5067	6125	private MenuItem markleavesItem;
5068	6126	private MenuItem unmarkleavesItem;
	6127	+ private MenuItem rewindleavesItem;
	6128	+ private MenuItem unrewindleavesItem;
	6129	+ private MenuItem randomleavesItem;
	6130	+ private MenuItem unrandomleavesItem;
5069	6131
5070	6132	private MenuItem flipVItem;
5071	6133	private MenuItem unflipVItem;
..	..	@@ -5077,15 +6139,17 @@
5077	6139	private MenuItem panoTexturesItem;
5078	6140
5079	6141	private MenuItem resetCentroidItem;
5080		- private MenuItem transformgeometryItem;
	6142	+ private MenuItem resetCentroidXZItem;
5081	6143	private MenuItem resetTransformItem;
	6144	+ private MenuItem transformGeometryItem;
	6145	+ private MenuItem transformChildrenItem;
5082	6146	private MenuItem hideItem;
5083	6147	private MenuItem grabItem;
5084	6148	private MenuItem backItem;
5085	6149	private MenuItem frontItem;
5086	6150	private MenuItem cameraItem;
5087	6151	private MenuItem compositeItem;
5088		- private MenuItem randomItem;
	6152	+ private MenuItem switchItem;
5089	6153	private MenuItem physicsItem;
5090	6154	private MenuItem frameselectorItem;
5091	6155	private MenuItem scriptNodeItem;
..	..	@@ -5109,6 +6173,8 @@
5109	6173	private MenuItem attachBumpItem;
5110	6174	private MenuItem detachBumpItem;
5111	6175	private MenuItem pigmentBumpItem;
	6176	+ private MenuItem embedTexturesItem;
	6177	+ private MenuItem deEmbedTexturesItem;
5112	6178
5113	6179	private MenuItem particleItem;
5114	6180	private MenuItem ragdollItem;
..	..	@@ -5125,7 +6191,7 @@
5125	6191	private MenuItem blobItem;
5126	6192	private MenuItem latheItem;
5127	6193	private MenuItem bezierItem;
5128		- private MenuItem checkerItem;
	6194	+ private MenuItem overlayItem;
5129	6195	private MenuItem meshItem;
5130	6196	// private MenuItem meshGroupItem;
5131	6197	private MenuItem springItem;
..	..	@@ -5147,11 +6213,6 @@
5147	6213	private MenuItem doubleItem;
5148	6214	private MenuItem tripleItem;
5149	6215
5150		- private MenuItem importGFDItem;
5151		- private MenuItem importVRMLX3DItem;
5152		- private MenuItem import3DSItem;
5153		- private MenuItem importOBJItem;
5154		-
5155	6216	private MenuItem computeAOItem;
5156	6217	private MenuItem recompileItem;
5157	6218	private MenuItem editScriptItem;
..	..	@@ -5161,4 +6222,8 @@
5161	6222	private MenuItem analyzeItem;
5162	6223	private MenuItem dumpItem;
5163	6224	//boolean freezemodel = false;
	6225	+
	6226	+ Menu cameraMenu;
	6227	+ MenuItem editCameraItem;
	6228	+ MenuItem restoreCameraItem;
5164	6229	}