~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -12,9 +12,11 @@
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,
	19	+ Grafreed.iResourceCallBack,
18	20	ObjectUI,
19	21	Runnable,
20	22	ActionListener,
..	..	@@ -22,6 +24,335 @@
22	24	DragGestureListener, DragSourceListener, DropTargetListener,
23	25	ItemListener // ListSelectionListener
24	26	{
	27	+
	28	+ public void AddSkyboxButton(String f, String s, cGridBag row)
	29	+ {
	30	+ cButton skyboxButton;
	31	+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
	32	+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
	33	+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
	34	+ skyboxButton.setToolTipText(s);
	35	+ skyboxButton.addActionListener(new ActionListener()
	36	+ {
	37	+ @Override
	38	+ public void actionPerformed(ActionEvent e)
	39	+ {
	40	+ ChangeSkybox(path);
	41	+ }
	42	+ });
	43	+ }
	44	+
	45	+ public void AddTextureButton(String f, final String t, cGridBag row)
	46	+ {
	47	+ cButton textureButton;
	48	+ final String path = "textures/" + f + "/"; // + t;
	49	+ row.add(textureButton = GetButton(path + "icons/" + t, !Grafreed.NIMBUSLAF));
	50	+ textureButton.setToolTipText(f + "s");
	51	+ textureButton.addActionListener(new ActionListener()
	52	+ {
	53	+ @Override
	54	+ public void actionPerformed(ActionEvent e)
	55	+ {
	56	+ ChangeTexture(path + t);
	57	+ }
	58	+ });
	59	+ }
	60	+
	61	+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
	62	+ {
	63	+ cGridBag tab0 = new cGridBag().setVertical(true);
	64	+
	65	+ tab0.setName("Urban");
	66	+ skyboxpanel.add(tab0);
	67	+
	68	+ cGridBag row0 = new cGridBag();
	69	+ cGridBag row1 = new cGridBag();
	70	+ cGridBag row2 = new cGridBag();
	71	+ cGridBag row3 = new cGridBag();
	72	+ cGridBag row4 = new cGridBag();
	73	+ cGridBag row5 = new cGridBag();
	74	+ cGridBag row6 = new cGridBag();
	75	+
	76	+ AddSkyboxButton("default", "rgb", row0);
	77	+ //AddSkyboxButton("default", "cornell", row0);
	78	+ AddSkyboxButton("penguins", "dust", row0);
	79	+ AddSkyboxButton("penguins", "tropic", row0);
	80	+ AddSkyboxButton("penguins", "yonder", row0);
	81	+
	82	+ AddSkyboxButton("default", "uffizi", row1);
	83	+ AddSkyboxButton("bridge", "Bridge", row1);
	84	+ AddSkyboxButton("bridge", "Bridge2", row1);
	85	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	86	+
	87	+ AddSkyboxButton("urban", "Parliament", row2);
	88	+ AddSkyboxButton("urban", "Roundabout", row2);
	89	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	90	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	91	+
	92	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	93	+ AddSkyboxButton("urban", "UnionSquare", row3);
	94	+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
	95	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	96	+
	97	+ AddSkyboxButton("park", "Buddha", row4);
	98	+ AddSkyboxButton("park", "CNTower2", row4);
	99	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	100	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	101	+
	102	+ AddSkyboxButton("park", "Park", row5);
	103	+ AddSkyboxButton("park", "Pond", row5);
	104	+ AddSkyboxButton("park", "Skansen", row5);
	105	+ AddSkyboxButton("park", "Skansen2", row5);
	106	+
	107	+ AddSkyboxButton("park", "Skansen3", row6);
	108	+ AddSkyboxButton("park", "Skansen4", row6);
	109	+ AddSkyboxButton("park", "Skansen5", row6);
	110	+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
	111	+
	112	+ tab0.add(row0);
	113	+ tab0.add(row1);
	114	+ tab0.add(row2);
	115	+ tab0.add(row3);
	116	+ tab0.add(row4);
	117	+ tab0.add(row5);
	118	+ tab0.add(row6);
	119	+
	120	+ for (int i=5; --i>=0;)
	121	+ {
	122	+ //oe.toolboxPanel.Return();
	123	+ //tab0.add(new cGridBag());
	124	+ }
	125	+ }
	126	+
	127	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	128	+ {
	129	+ cGridBag tab0 = new cGridBag().setVertical(true);
	130	+
	131	+ tab0.setName("Nature");
	132	+ skyboxpanel.add(tab0);
	133	+
	134	+ cGridBag row0 = new cGridBag();
	135	+ cGridBag row1 = new cGridBag();
	136	+ cGridBag row2 = new cGridBag();
	137	+ cGridBag row3 = new cGridBag();
	138	+ cGridBag row4 = new cGridBag();
	139	+ cGridBag row5 = new cGridBag();
	140	+ cGridBag row6 = new cGridBag();
	141	+
	142	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	143	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	144	+ AddSkyboxButton("beach", "PalmTrees", row0);
	145	+ AddSkyboxButton("beach", "Tenerife", row0);
	146	+
	147	+ AddSkyboxButton("beach", "Tenerife2", row1);
	148	+ AddSkyboxButton("beach", "Tenerife3", row1);
	149	+ AddSkyboxButton("field", "FishPond", row1);
	150	+ AddSkyboxButton("field", "Footballfield", row1);
	151	+
	152	+ AddSkyboxButton("field", "Meadow", row2);
	153	+ AddSkyboxButton("field", "Sorsele", row2);
	154	+ AddSkyboxButton("field", "Sorsele2", row2);
	155	+ AddSkyboxButton("field", "Sorsele3", row2);
	156	+
	157	+ AddSkyboxButton("forest", "Brudslojan", row3);
	158	+ AddSkyboxButton("forest", "Langholmen2", row3);
	159	+ AddSkyboxButton("forest", "Plants", row3);
	160	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	161	+
	162	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	163	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	164	+ AddSkyboxButton("mountain", "Teide", row4);
	165	+ AddSkyboxButton("park", "Tantolunden4", row4);
	166	+
	167	+ AddSkyboxButton("park", "Stairs", row5);
	168	+ AddSkyboxButton("default", "skycube", row6);
	169	+ AddSkyboxButton("rocky", "Langholmen", row5);
	170	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	171	+
	172	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	173	+ AddSkyboxButton("default", "CloudyHills", row6);
	174	+ AddSkyboxButton("daz", "Autumn", row6);
	175	+ AddSkyboxButton("daz", "MountainTrail", row6);
	176	+ /*
	177	+Autumn
	178	+Greenlands
	179	+MountainTrail
	180	+Oasis
	181	+TheRock
	182	+TopOfTheWorld
	183	+Winter
	184	+ */
	185	+
	186	+ tab0.add(row0);
	187	+ tab0.add(row1);
	188	+ tab0.add(row2);
	189	+ tab0.add(row3);
	190	+ tab0.add(row4);
	191	+ tab0.add(row5);
	192	+ tab0.add(row6);
	193	+
	194	+ for (int i=5; --i>=0;)
	195	+ {
	196	+ //oe.toolboxPanel.Return();
	197	+ //tab0.add(new cGridBag());
	198	+ }
	199	+ }
	200	+
	201	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	202	+ {
	203	+ cGridBag tab0 = new cGridBag().setVertical(true);
	204	+
	205	+ tab0.setName("Night");
	206	+ skyboxpanel.add(tab0);
	207	+
	208	+ cGridBag row0 = new cGridBag();
	209	+ cGridBag row1 = new cGridBag();
	210	+ cGridBag row2 = new cGridBag();
	211	+ cGridBag row3 = new cGridBag();
	212	+ cGridBag row4 = new cGridBag();
	213	+ cGridBag row5 = new cGridBag();
	214	+ cGridBag row6 = new cGridBag();
	215	+
	216	+ AddSkyboxButton("night", "NightPath", row0);
	217	+ AddSkyboxButton("night", "PondNight", row0);
	218	+ AddSkyboxButton("night", "Powerlines", row0);
	219	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	220	+
	221	+ AddSkyboxButton("urban", "CNTower", row1);
	222	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	223	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	224	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
	225	+
	226	+ AddSkyboxButton("penguins", "kenon_star", row2);
	227	+ AddSkyboxButton("persson", "corona", row2);
	228	+ AddSkyboxButton("persson", "spaceskybox", row2);
	229	+ AddSkyboxButton("indoors", "Vasa", row2);
	230	+
	231	+ AddSkyboxButton("winter", "Backyard", row3);
	232	+ AddSkyboxButton("winter", "Creek", row3);
	233	+ AddSkyboxButton("winter", "FootballField3", row3);
	234	+ AddSkyboxButton("winter", "Forest", row3);
	235	+
	236	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	237	+ AddSkyboxButton("winter", "House", row4);
	238	+ AddSkyboxButton("winter", "IceLake", row4);
	239	+ AddSkyboxButton("winter", "IceRiver", row4);
	240	+
	241	+ AddSkyboxButton("winter", "Park3", row5);
	242	+ AddSkyboxButton("winter", "PondWinter", row5);
	243	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	244	+ AddSkyboxButton("winter", "Vindelalven", row5);
	245	+
	246	+ AddSkyboxButton("daz", "TheRock", row6);
	247	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	248	+ AddSkyboxButton("daz", "Winter", row6);
	249	+ AddSkyboxButton("mountain", "Ryfjallet", row6);
	250	+
	251	+ tab0.add(row0);
	252	+ tab0.add(row1);
	253	+ tab0.add(row2);
	254	+ tab0.add(row3);
	255	+ tab0.add(row4);
	256	+ tab0.add(row5);
	257	+ tab0.add(row6);
	258	+
	259	+ for (int i=5; --i>=0;)
	260	+ {
	261	+ //oe.toolboxPanel.Return();
	262	+ //tab0.add(new cGridBag());
	263	+ }
	264	+ }
	265	+
	266	+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
	267	+ {
	268	+ cGridBag tab0 = new cGridBag().setVertical(true);
	269	+
	270	+ tab0.setName("Others");
	271	+ skyboxpanel.add(tab0);
	272	+
	273	+ cGridBag row0 = new cGridBag();
	274	+ cGridBag row1 = new cGridBag();
	275	+ cGridBag row2 = new cGridBag();
	276	+ cGridBag row3 = new cGridBag();
	277	+ cGridBag row4 = new cGridBag();
	278	+ cGridBag row5 = new cGridBag();
	279	+ cGridBag row6 = new cGridBag();
	280	+
	281	+ AddSkyboxButton("mayhem", "afterrain", row0);
	282	+ AddSkyboxButton("mayhem", "aqua4", row0);
	283	+ AddSkyboxButton("mayhem", "aqua9", row0);
	284	+ AddSkyboxButton("mayhem", "flame", row0);
	285	+
	286	+ AddSkyboxButton("mayhem", "h2s", row1);
	287	+ AddSkyboxButton("mayhem", "prehistoric", row1);
	288	+ AddSkyboxButton("mayhem", "scorched", row1);
	289	+ AddSkyboxButton("penguins", "desertdawn", row1);
	290	+
	291	+ AddSkyboxButton("persson", "Citadella", row2);
	292	+ AddSkyboxButton("persson", "Citadella2", row2);
	293	+ AddSkyboxButton("persson", "clouds1", row2);
	294	+ AddSkyboxButton("penguins", "wrath", row2);
	295	+
	296	+ AddSkyboxButton("persson", "FishermansBastion", row3);
	297	+ AddSkyboxButton("persson", "HeroesSquare", row3);
	298	+ AddSkyboxButton("indoors", "DallasW", row3);
	299	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
	300	+
	301	+ AddSkyboxButton("persson", "LancellottiChapel", row4);
	302	+ AddSkyboxButton("persson", "PereaBeach1", row4);
	303	+ AddSkyboxButton("persson", "PereaBeach2", row4);
	304	+ AddSkyboxButton("persson", "redeclipse", row4);
	305	+
	306	+ AddSkyboxButton("daz", "Greenlands", row5);
	307	+ AddSkyboxButton("daz", "Oasis", row5);
	308	+ AddSkyboxButton("elyvisions", "arch3", row5);
	309	+ AddSkyboxButton("elyvisions", "calm_sea", row5);
	310	+
	311	+ AddSkyboxButton("elyvisions", "rainbow", row6);
	312	+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
	313	+ AddSkyboxButton("elyvisions", "heaven", row6);
	314	+ AddSkyboxButton("elyvisions", "hot", row6);
	315	+
	316	+ tab0.add(row0);
	317	+ tab0.add(row1);
	318	+ tab0.add(row2);
	319	+ tab0.add(row3);
	320	+ tab0.add(row4);
	321	+ tab0.add(row5);
	322	+ tab0.add(row6);
	323	+
	324	+ for (int i=5; --i>=0;)
	325	+ {
	326	+ //oe.toolboxPanel.Return();
	327	+ //tab0.add(new cGridBag());
	328	+ }
	329	+ }
	330	+
	331	+ public void ChangeSkybox(String skybox)
	332	+ {
	333	+ //cameraView.envyoff = false;
	334	+ group.skyboxname = skybox;
	335	+ group.skyboxext = "jpg";
	336	+ cameraView.repaint();
	337	+ }
	338	+
	339	+ public void CreateSkyboxPanel(cGridBag skyboxPanel)
	340	+ {
	341	+ JTabbedPane skyboxpane = new JTabbedPane();
	342	+
	343	+ AddSkyboxTab0(skyboxpane);
	344	+ AddSkyboxTab1(skyboxpane);
	345	+ AddSkyboxTab2(skyboxpane);
	346	+ AddSkyboxTab3(skyboxpane);
	347	+
	348	+ skyboxPanel.add(skyboxpane);
	349	+ }
	350	+
	351	+ public void ChangeTexture(String texture)
	352	+ {
	353	+ cameraView.repaint();
	354	+ }
	355	+
25	356	//ObjEditor objEditor;
26	357	public void closeUI2()
27	358	{
..	..	@@ -59,6 +390,12 @@
59	390	this.copy = this.group = group;
60	391	//selectees = this.group.selectees;
61	392
	393	+ if (copy.versionlist == null)
	394	+ {
	395	+ copy.versionlist = new Object3D[100];
	396	+ copy.versionindex = -1;
	397	+ }
	398	+
62	399	if(ui)
63	400	SetupUI(objEditor);
64	401	}
..	..	@@ -73,17 +410,29 @@
73	410	this.copy = this.group = copy;
74	411	//selectees = this.group.selectees;
75	412
76		- SetupMenu2(objEditor);
	413	+ SetupMenu2(this); //objEditor);
77	414	SetupUI2(objEditor);
78	415	objEditor.SetupUI(true);
79	416	SetupViews(objEditor);
80	417
81	418	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	419	+
	420	+ if (copy.versionlist == null)
	421	+ {
	422	+ copy.versionlist = new Object3D[100];
	423	+ copy.versionindex = -1;
	424	+
	425	+ Save(true);
	426	+ }
82	427	}
83	428
84	429	void CloneSelection(boolean supports)
85	430	{
86		- // Object3D keep = GraphreeD.clipboard;
	431	+ if (Globals.REPLACEONMAKE)
	432	+ Save();
	433	+ boolean keep = Globals.REPLACEONMAKE;
	434	+ Globals.REPLACEONMAKE = false;
	435	+ // Object3D keep = GrafreeD.clipboard;
87	436	//Object3D obj;
88	437	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
89	438	{
..	..	@@ -93,18 +442,19 @@
93	442
94	443	makeSomething(clone, i==group.selection.size()-1);
95	444	}
	445	+ Globals.REPLACEONMAKE = keep;
96	446	}
97	447
98	448	void CloneClipboard(boolean supports)
99	449	{
100		- assert(GraphreeD.clipboard.parent == null);
101		- Object3D /Composite/ keepparent = GraphreeD.clipboard.get(0).parent;
102		- GraphreeD.clipboard.get(0).parent = null; // Avoid copy?
103		- if (LA.isIdentity(GraphreeD.clipboard.toParent))
104		- makeSomething(CloneObject(GraphreeD.clipboard.get(0), false));
	450	+ assert(Grafreed.clipboard.parent == null);
	451	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	452	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	453	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	454	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
105	455	else
106		- makeSomething(CloneObject(GraphreeD.clipboard, false));
107		- GraphreeD.clipboard.get(0).parent = keepparent;
	456	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	457	+ Grafreed.clipboard.get(0).parent = keepparent;
108	458	}
109	459
110	460	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -118,7 +468,7 @@
118	468	// obj.support = null;
119	469	if (!supports)
120	470	obj.SaveSupports();
121		- Object3D clone = (Object3D)GraphreeD.clone(obj);
	471	+ Object3D clone = (Object3D)Grafreed.clone(obj);
122	472	obj.parent = parent;
123	473	// obj.support = support;
124	474	// clone.support = support; // aout 2013
..	..	@@ -147,30 +497,29 @@
147	497
148	498	//JTextField nameField;
149	499
150		- void SetupMenu2(ObjEditor oe)
	500	+ void SetupMenu2(GroupEditor oe)
151	501	{
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);
	502	+ oe.jTree = new cTree();
	503	+
163	504	Menu menu;
164	505	oe.menuBar.add(menu = new Menu("Edit"));
165	506	//editItem = menu.add(new MenuItem("Edit"));
166	507	//editItem.addActionListener(this);
167		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	508	+
	509	+// undoItem = menu.add(new MenuItem("Undo"));
	510	+// undoItem.addActionListener(this);
	511	+// redoItem = menu.add(new MenuItem("Redo"));
	512	+// redoItem.addActionListener(this);
	513	+// menu.add("-");
	514	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
168	515	duplicateItem.addActionListener(this);
169		- menu.add("-");
170	516	cloneItem = menu.add(new MenuItem("Clone"));
171	517	cloneItem.addActionListener(this);
	518	+ if (Globals.ADVANCED)
	519	+ {
172	520	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
173	521	cloneSupportItem.addActionListener(this);
	522	+ }
174	523	menu.add("-");
175	524	cutItem = menu.add(new MenuItem("Cut"));
176	525	cutItem.addActionListener(this);
..	..	@@ -178,27 +527,123 @@
178	527	copyItem.addActionListener(this);
179	528	pasteItem = menu.add(new MenuItem("Paste"));
180	529	pasteItem.addActionListener(this);
	530	+
	531	+ menu.add("-");
	532	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	533	+ pasteIntoItem.addActionListener(this);
181	534	pasteLinkItem = menu.add(new MenuItem("Paste link"));
182	535	pasteLinkItem.addActionListener(this);
183	536	pasteCloneItem = menu.add(new MenuItem("Paste clone"));
184	537	pasteCloneItem.addActionListener(this);
185	538	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
186	539	// pasteExpandItem.addActionListener(this);
187		- clearItem = menu.add(new MenuItem("Clear"));
188		- clearItem.addActionListener(this);
	540	+ menu.add("-");
	541	+ deleteItem = menu.add(new MenuItem("Delete"));
	542	+ deleteItem.addActionListener(this);
	543	+
	544	+ if (Globals.ADVANCED)
	545	+ {
	546	+ // Deletes the cameras...
189	547	clearAllItem = menu.add(new MenuItem("Clear All"));
190	548	clearAllItem.addActionListener(this);
	549	+ }
	550	+
	551	+ menuBar.add(cameraMenu = new Menu("View"));
	552	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	553	+ //zBufferItem.addActionListener(this);
	554	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	555	+ //normalLensItem.addActionListener(this);
	556	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	557	+ restoreCameraItem.addActionListener(this);
	558	+
	559	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	560	+// toggleFullScreenItem.addItemListener(this);
	561	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	562	+// cameraMenu.add("-");
	563	+//
	564	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	565	+// toggleTextureItem.addItemListener(this);
	566	+// toggleTextureItem.setState(CameraPane.textureon);
	567	+//
	568	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	569	+// toggleSwitchItem.addItemListener(this);
	570	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	571	+
	572	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	573	+ toggleHandleItem.addItemListener(this);
	574	+ toggleHandleItem.setState(CameraPane.HANDLES);
	575	+
	576	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	577	+ togglePaintItem.addItemListener(this);
	578	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	579	+
	580	+ if (Globals.ADVANCED)
	581	+ {
	582	+ cameraMenu.add("-");
	583	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	584	+ toggleLiveItem.addItemListener(this);
	585	+ toggleLiveItem.setState(Globals.isLIVE());
191	586
	587	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	588	+ stepItem.addActionListener(this);
	589	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	590	+ // toggleDLItem.addItemListener(this);
	591	+ // toggleDLItem.setState(false);
	592	+
	593	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	594	+ toggleRenderItem.addItemListener(this);
	595	+ toggleRenderItem.setState(!CameraPane.frozen);
	596	+
	597	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	598	+ toggleDebugItem.addItemListener(this);
	599	+ toggleDebugItem.setState(Globals.DEBUG);
	600	+
	601	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	602	+ toggleFrustumItem.addItemListener(this);
	603	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	604	+
	605	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	606	+ toggleFootContactItem.addItemListener(this);
	607	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	608	+
	609	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	610	+ toggleTimelineItem.addItemListener(this);
	611	+ }
	612	+
	613	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	614	+// toggleRootItem.addItemListener(this);
	615	+// toggleRootItem.setState(false);
	616	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	617	+// animationItem.addItemListener(this);
	618	+// animationItem.setState(CameraPane.ANIMATION);
	619	+ cameraMenu.add("-");
	620	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	621	+ editCameraItem.addActionListener(this);
	622	+
	623	+ if (Globals.ADVANCED)
	624	+ {
	625	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	626	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	627	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	628	+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	629	+ oe.cameraMenu.add("-");
	630	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	631	+ openWindowItem.addActionListener(this);
	632	+ editLeafItem.addActionListener(this);
	633	+ lookAtItem.addActionListener(this);
	634	+ //lookFromItem.addActinoListener(this);
	635	+ //switchViewItem.addActionListener(this);
	636	+ }
	637	+
192	638	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);
	639	+ if (Globals.ADVANCED)
	640	+ {
197	641	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
198	642	revertMeshItem.addActionListener(this);
199	643	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
200	644	resetreferencesItem.addActionListener(this);
201	645	menu.add("-");
	646	+ }
202	647	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
203	648	overwriteGeoItem.addActionListener(this);
204	649	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -210,73 +655,104 @@
210	655	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211	656	overwriteUVItem.addActionListener(this);
212	657	menu.add("-");
	658	+ if (Globals.ADVANCED)
	659	+ {
213	660	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214	661	generateMeshItem.addActionListener(this);
215	662	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216	663	poseMeshItem.addActionListener(this);
217	664	menu.add("-");
	665	+ }
218	666	resetsupportItem = menu.add(new MenuItem("Reset support"));
219	667	resetsupportItem.addActionListener(this);
220	668	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	669	linkverticesItem.addActionListener(this);
	670	+ relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
	671	+ relinkverticesItem.addActionListener(this);
	672	+
	673	+ if (Globals.ADVANCED)
	674	+ {
222	675	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
223	676	setMasterItem.addActionListener(this);
	677	+ }
224	678
225	679	oe.menuBar.add(menu = new Menu("Group"));
226		- grabItem = menu.add(new MenuItem("Grab"));
227		- grabItem.addActionListener(this);
228		- frontItem = menu.add(new MenuItem("Front"));
229		- frontItem.addActionListener(this);
	680	+// grabItem = menu.add(new MenuItem("Grab"));
	681	+// grabItem.addActionListener(this);
230	682	backItem = menu.add(new MenuItem("Back"));
231	683	backItem.addActionListener(this);
232		- compositeItem = menu.add(new MenuItem("Composite"));
233		- compositeItem.addActionListener(this);
234		- menu.add("-");
235		- randomItem = menu.add(new MenuItem("Random"));
236		- randomItem.addActionListener(this);
237		- physicsItem = menu.add(new MenuItem("Physics"));
238		- physicsItem.addActionListener(this);
239		- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
240		- frameselectorItem.addActionListener(this);
	684	+ frontItem = menu.add(new MenuItem("Front"));
	685	+ frontItem.addActionListener(this);
	686	+// compositeItem = menu.add(new MenuItem("Composite"));
	687	+// compositeItem.addActionListener(this);
	688	+
	689	+ if (Globals.ADVANCED)
	690	+ {
	691	+ hideItem = menu.add(new MenuItem("Hidden Group"));
	692	+ hideItem.addActionListener(this);
	693	+ }
	694	+ ungroupItem = menu.add(new MenuItem("Ungroup"));
	695	+ ungroupItem.addActionListener(this);
	696	+
	697	+// menu.add("-");
	698	+//
	699	+// switchItem = menu.add(new MenuItem("Switch node"));
	700	+// switchItem.addActionListener(this);
	701	+ if (Globals.ADVANCED)
	702	+ {
241	703	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
242	704	switchGeoItem.addActionListener(this);
243	705	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
244	706	switchTransfoItem.addActionListener(this);
245		- morphItem = menu.add(new MenuItem("Morph"));
	707	+ morphItem = menu.add(new MenuItem("Morph Group"));
246	708	morphItem.addActionListener(this);
	709	+
	710	+ menu.add("-");
	711	+ physicsItem = menu.add(new MenuItem("Physics"));
	712	+ physicsItem.addActionListener(this);
	713	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	714	+ frameselectorItem.addActionListener(this);
247	715	scriptNodeItem = menu.add(new MenuItem("Script Node"));
248	716	scriptNodeItem.addActionListener(this);
249		- cameraItem = menu.add(new MenuItem("Camera"));
250		- cameraItem.addActionListener(this);
	717	+ }
251	718
252	719	oe.menuBar.add(menu = new Menu("Object"));
253		- textureItem = menu.add(new MenuItem("Texture"));
254		- textureItem.addActionListener(this);
	720	+// textureItem = menu.add(new MenuItem("Texture"));
	721	+// textureItem.addActionListener(this);
	722	+ billboardItem = menu.add(new MenuItem("Billboard"));
	723	+ billboardItem.addActionListener(this);
255	724	csgItem = menu.add(new MenuItem("CSG"));
256	725	csgItem.addActionListener(this);
257		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	726	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
258	727	shadowXItem.addActionListener(this);
259		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	728	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
260	729	shadowYItem.addActionListener(this);
261		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	730	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
262	731	shadowZItem.addActionListener(this);
	732	+ attributeItem = menu.add(new MenuItem("Attribute"));
	733	+ attributeItem.addActionListener(this);
	734	+
	735	+ if (Globals.ADVANCED)
	736	+ {
	737	+ menu.add("-");
263	738	linkerItem = menu.add(new MenuItem("Linker"));
264	739	linkerItem.addActionListener(this);
265	740	templateItem = menu.add(new MenuItem("Template"));
266	741	templateItem.addActionListener(this);
267		- attributeItem = menu.add(new MenuItem("Attribute"));
268		- attributeItem.addActionListener(this);
269	742	pointflowItem = menu.add(new MenuItem("Point Flow"));
270	743	pointflowItem.addActionListener(this);
	744	+ }
271	745	menu.add("-");
272		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
273		- transformgeometryItem.addActionListener(this);
274	746	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
275	747	resetTransformItem.addActionListener(this);
276	748	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
277	749	resetCentroidItem.addActionListener(this);
278		- ungroupItem = menu.add(new MenuItem("Ungroup"));
279		- ungroupItem.addActionListener(this);
	750	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	751	+ resetCentroidXZItem.addActionListener(this);
	752	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	753	+ transformGeometryItem.addActionListener(this);
	754	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	755	+ transformChildrenItem.addActionListener(this);
280	756
281	757	oe.menuBar.add(menu = new Menu("Geometry"));
282	758	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -285,6 +761,13 @@
285	761	genNormalsORGANItem.addActionListener(this);
286	762	genNormalsCADItem = menu.add(new MenuItem("CAD Normals"));
287	763	genNormalsCADItem.addActionListener(this);
	764	+ genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
	765	+ genNormalsMESHItem.addActionListener(this);
	766	+ if (Globals.ADVANCED)
	767	+ {
	768	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
	769	+ genNormalsMINEItem.addActionListener(this);
	770	+ }
288	771	stripifyItem = menu.add(new MenuItem("Stripify"));
289	772	stripifyItem.addActionListener(this);
290	773	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -306,23 +789,34 @@
306	789	reduce34MeshItem.addActionListener(this);
307	790	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
308	791	increaseMeshItem.addActionListener(this);
309		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
310		- smoothMeshItem.addActionListener(this);
311	792	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
312	793	clipMeshItem.addActionListener(this);
	794	+
	795	+ if (Globals.ADVANCED)
	796	+ {
	797	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	798	+ smoothMeshItem.addActionListener(this);
	799	+ }
313	800
314	801	oe.menuBar.add(menu = new Menu("Attributes"));
315	802	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
316	803	clearMaterialsItem.addActionListener(this);
	804	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	805	+ resetAllItem.addActionListener(this);
	806	+ stepAllItem = menu.add(new MenuItem("Step All"));
	807	+ stepAllItem.addActionListener(this);
317	808	menu.add("-");
318	809	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
319	810	liveleavesItem.addActionListener(this);
320	811	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
321	812	unliveleavesItem.addActionListener(this);
	813	+ if (Globals.ADVANCED)
	814	+ {
322	815	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
323	816	supportleavesItem.addActionListener(this);
324	817	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
325	818	unsupportleavesItem.addActionListener(this);
	819	+ }
326	820	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
327	821	hideleavesItem.addActionListener(this);
328	822	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -331,6 +825,14 @@
331	825	markleavesItem.addActionListener(this);
332	826	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
333	827	unmarkleavesItem.addActionListener(this);
	828	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	829	+ rewindleavesItem.addActionListener(this);
	830	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	831	+ unrewindleavesItem.addActionListener(this);
	832	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	833	+ randomleavesItem.addActionListener(this);
	834	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	835	+ unrandomleavesItem.addActionListener(this);
334	836	menu.add("-");
335	837	flipVItem = menu.add(new MenuItem("Flip V"));
336	838	flipVItem.addActionListener(this);
..	..	@@ -356,45 +858,117 @@
356	858	attachBumpItem.addActionListener(this);
357	859	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
358	860	pigmentBumpItem.addActionListener(this);
	861	+ //embedTexturesItem
359	862	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
360	863	detachPigmentItem.addActionListener(this);
361	864	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
362	865	detachBumpItem.addActionListener(this);
	866	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	867	+ embedTexturesItem.addActionListener(this);
	868	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	869	+ deEmbedTexturesItem.addActionListener(this);
363	870	menu.add("-");
364	871	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
365	872	sortbysizeItem.addActionListener(this);
366	873	sortbynameItem = menu.add(new MenuItem("Sort by name"));
367	874	sortbynameItem.addActionListener(this);
368	875	menu.add("-");
	876	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	877	+ shareGeometriesItem.addActionListener(this);
	878	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	879	+ mergeGeometriesItem.addActionListener(this);
	880	+ if (Globals.ADVANCED)
	881	+ {
	882	+ // Pretty much the same as duplicate and clone.
369	883	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
370	884	extractGeometriesItem.addActionListener(this);
371	885	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
372	886	cloneGeometriesItem.addActionListener(this);
373		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
374		- shareGeometriesItem.addActionListener(this);
375		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
376		- mergeGeometriesItem.addActionListener(this);
	887	+ }
377	888
378	889	oe.menuBar.add(menu = new Menu("Insert"));
379	890	buildCreateMenu(menu);
380	891
381		-
382		- oe.menuBar.add(menu = new Menu("Include"));
383		- importGFDItem = menu.add(new MenuItem("GraphreeD Object..."));
384		- importGFDItem.addActionListener(this);
385		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
386		- importVRMLX3DItem.addActionListener(this);
387		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
388		- importOBJItem.addActionListener(this);
389		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
390		- import3DSItem.addActionListener(this);
391		-
392	892	oe.menuBar.add(menu = new Menu("Tools"));
393	893	buildToolsMenu(menu);
394	894	}
395	895
	896	+ JTabbedPane resourcecontainer;
	897	+ cGridBag currenttab;
	898	+ boolean added; // patch for jar
	899	+
	900	+ int tabcount = 0;
	901	+ int colcount = 0;
	902	+ int rowcount = 0;
	903	+
	904	+ int columns = 5;
	905	+ int rows = 7;
	906	+
	907	+ public void ResourceCallBack(String[] path)
	908	+ {
	909	+ for (int i = 0; i < path.length; i++)
	910	+ System.out.print(path[i] + "/");
	911	+ System.out.println();
	912	+ if (rowcount == 0)
	913	+ {
	914	+ currenttab = new cGridBag();
	915	+ added = false;
	916	+ String tabname = String.valueOf((char)('A'+tabcount));
	917	+ currenttab.setName(tabname);
	918	+ rowcount = 1;
	919	+ }
	920	+
	921	+ if (path.length > 1 && path[1].toLowerCase().endsWith(".jpg"))
	922	+ {
	923	+ if (!added)
	924	+ {
	925	+ added = true;
	926	+ resourcecontainer.add(currenttab);
	927	+ String tabname = String.valueOf((char)('A'+tabcount));
	928	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	929	+ }
	930	+
	931	+ AddTextureButton(path[0], path[1], currenttab);
	932	+ if (++colcount >= columns)
	933	+ {
	934	+ colcount = 0;
	935	+ currenttab.Return();
	936	+
	937	+ if (rowcount++ >= rows)
	938	+ {
	939	+ rowcount = 0;
	940	+ }
	941	+ }
	942	+ }
	943	+ else
	944	+ {
	945	+// if (!path[path.length-1].equals("icons"))
	946	+// resourcecontainer.Return();
	947	+ }
	948	+ }
	949	+
	950	+ void CreateTexturePanel(cGridBag container)
	951	+ {
	952	+ resourcecontainer = new JTabbedPane();
	953	+ container.add(resourcecontainer);
	954	+
	955	+ Grafreed.ParseResources("textures", this);
	956	+ }
	957	+
396	958	void SetupUI2(ObjEditor oe)
397	959	{
	960	+ // June 2019
	961	+ if (oe == null)
	962	+ {
	963	+ //super.SetupUI2(this);
	964	+ //return;
	965	+ }
	966	+
	967	+ if (copy != group)
	968	+ {
	969	+ //super.SetupUI2(this);
	970	+ }
	971	+
398	972	//new Exception().printStackTrace();
399	973
400	974	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -423,150 +997,239 @@
423	997	oe.radioPanel.add(dummyButton);
424	998	oe.buttonGroup.add(dummyButton);
425	999	*/
426		- aConstraints.gridy += 1;
427		- oe.aConstraints.gridwidth = 1;
428		- oe.aConstraints.gridx = 0;
	1000	+ cGridBag copyOptionsPanel = new cGridBag();
	1001	+
	1002	+ copyOptionsPanel.preferredHeight = 2;
429	1003
430		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
	1004	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
	1005	+
	1006	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1007	+ //minButton.setToolTipText("Minimize window");
	1008	+ //minButton.addActionListener(this);
	1009	+
	1010	+ if (Globals.ADVANCED)
	1011	+ {
	1012	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1013	+ maxButton.setToolTipText("Maximize window");
	1014	+ maxButton.addActionListener(this);
	1015	+ }
	1016	+
	1017	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1018	+ fullButton.setToolTipText("Full-screen window");
	1019	+ fullButton.addActionListener(this);
	1020	+
	1021	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1022	+ screenfitButton.setToolTipText("Screen fit");
	1023	+ screenfitButton.addActionListener(this);
	1024	+
	1025	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1026	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1027	+ restoreCameraButton.addActionListener(this);
	1028	+
	1029	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1030	+ saveVersionButton.setToolTipText("Duplicate current version");
	1031	+ saveVersionButton.addActionListener(this);
	1032	+
	1033	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1034	+ deleteVersionButton.setToolTipText("Delete current version");
	1035	+ deleteVersionButton.addActionListener(this);
	1036	+
	1037	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1038	+ previousVersionButton.setToolTipText("Previous version");
	1039	+ previousVersionButton.addActionListener(this);
	1040	+ previousVersionButton.setEnabled(false);
	1041	+
	1042	+ cGridBag updown = new cGridBag().setVertical(true);
	1043	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1044	+ restoreButton.setToolTipText("Undo (restore current version)");
	1045	+ restoreButton.addActionListener(this);
	1046	+ //restoreButton.setEnabled(false);
	1047	+
	1048	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1049	+ replaceButton.setToolTipText("Save (replace current version)");
	1050	+ replaceButton.addActionListener(this);
	1051	+ //replaceButton.setEnabled(false);
	1052	+
	1053	+ copyOptionsPanel.add(updown);
	1054	+
	1055	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1056	+ nextVersionButton.setToolTipText("Next version");
	1057	+ nextVersionButton.addActionListener(this);
	1058	+ nextVersionButton.setEnabled(false);
	1059	+
	1060	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1061	+ liveCB.setToolTipText("Enable animation");
431	1062	liveCB.addItemListener(this);
432	1063
433		- oe.aConstraints.gridx += 1;
434		- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
435		- supportCB.addItemListener(this);
436		-
437		- // oe.aConstraints.gridx += 1;
438		- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
439		- // localCB.addItemListener(this);
440		-
441		- oe.aConstraints.gridx += 1;
442		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", CameraPane.CROWD), oe.aConstraints);
443		- crowdCB.addItemListener(this);
444		-
445		- oe.aConstraints.gridx += 1;
446		- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
447		- smoothCB.addItemListener(this);
448		-
449		- oe.aConstraints.gridx += 1;
450		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
	1064	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1065	+ oneStepButton.setToolTipText("Animate one step forward");
	1066	+ oneStepButton.addActionListener(this);
	1067	+
	1068	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	1069	+ fastCB.setToolTipText("Fast mode");
451	1070	fastCB.addItemListener(this);
452		- oe.aConstraints.gridx += 1;
453		- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
454		- slowCB.addItemListener(this);
455		- oe.aConstraints.gridx += 1;
456		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.FAST), oe.aConstraints);
457		- boxCB.addItemListener(this);
	1071	+
	1072	+ //oe.toolboxPanel.Return();
	1073	+
	1074	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1075	+// trackCB.setToolTipText("Enable tracking");
	1076	+// trackCB.addItemListener(this);
458	1077
459		-// oe.aConstraints.gridx += 1;
460		-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
461		-// speakerMocapCB.addItemListener(this);
462		-
463		- if (false)
464		- {
465		- // handled in scripts
466		- oe.aConstraints.gridx += 1;
467		- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
468		- speakerCameraCB.addItemListener(this);
469		-
470		- oe.aConstraints.gridx += 1;
471		- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
472		- speakerFocusCB.addItemListener(this);
473		-
474		- oe.aConstraints.gridx += 1;
475		- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
476		- smoothfocusCB.addItemListener(this);
477		- }
478		-
479		-//oe.aConstraints.gridx += 1;
480		-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
481		-// debugCB.addItemListener(this);
482		-
483		- oe.aConstraints.gridx += 1;
484		- oe.toolbarPanel.add(oeilCB = new cCheckBox("O", CameraPane.OEIL), oe.aConstraints);
485		- oeilCB.addItemListener(this);
486		-
487		- oe.aConstraints.gridx += 1;
488		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("T", CameraPane.LOOKAT), oe.aConstraints);
489		- lookAtCB.addItemListener(this);
490		-
491		- oe.aConstraints.gridx += 1;
492		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
493		- trackCB.addItemListener(this);
494		-
495		- oe.aConstraints.gridx += 1;
496		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
497		- screenfitButton.addActionListener(this);
498		- oe.aConstraints.gridx += 1;
499	1078	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
500	1079	// screenfitpointButton.addActionListener(this);
501		-// oe.aConstraints.gridx += 1;
502		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
503		- snapobjectButton.addActionListener(this);
504		- oe.aConstraints.gridx += 1;
505	1080
506		- //aConstraints.gridx = 0;
507		- //aConstraints.gridy += 1;
508		- oe.aConstraints.weighty = 0;
509		- oe.aConstraints.gridwidth = 1;
510		-
511		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
512		- flashSelectionButton.addActionListener(this);
513		- oe.aConstraints.gridx += 1;
514		- oe.aConstraints.weighty = 0;
515		- oe.aConstraints.gridwidth = 1;
516		-
517		- //
518		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
519		- twoButton.addActionListener(this);
520		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	1081	+ if (Globals.ADVANCED)
	1082	+ {
	1083	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1084	+ snapobjectButton.addActionListener(this);
	1085	+ snapobjectButton.setToolTipText("Snap Object");
	1086	+
	1087	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
521	1088	fourButton.addActionListener(this);
522		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
523		- sixButton.addActionListener(this);
524		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	1089	+ fourButton.setToolTipText("Show control panel only");
	1090	+ }
	1091	+
	1092	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	1093	+
	1094	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1095	+ twoButton.setToolTipText("Show 3D view only");
	1096	+ twoButton.addActionListener(this);
	1097	+ this.fullscreenLayout = twoButton;
	1098	+
	1099	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1100	+ threeButton.setToolTipText("Show controls and 3D view");
525	1101	threeButton.addActionListener(this);
526		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
527		- sevenButton.addActionListener(this);
	1102	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1103	+ sixButton.setToolTipText("Show 3D view and controls");
	1104	+ sixButton.addActionListener(this);
	1105	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1106	+// sevenButton.setToolTipText("3-column layout");
	1107	+// sevenButton.addActionListener(this);
528	1108	//
529	1109
530		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	1110	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1111	+ rootButton.setToolTipText("Open selection in new tab");
531	1112	rootButton.addActionListener(this);
532		- oe.aConstraints.gridx += 1;
533		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	1113	+
	1114	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1115	+ closeButton.setToolTipText("Close tab");
534	1116	closeButton.addActionListener(this);
535	1117	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
536	1118	//clearButton.addActionListener(this);
537		- oe.aConstraints.gridx += 1;
538		-
539		- oe.aConstraints.gridx = 1; //
540		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
541		- editButton.addActionListener(this);
542		- oe.aConstraints.gridx += 1;
543		- oe.aConstraints.weighty = 0;
544		- oe.aConstraints.gridwidth = 1;
545	1119
546		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	1120	+ cGridBag row1 = new cGridBag();
	1121	+
	1122	+ // INSERT
	1123	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1124	+ gridButton.setToolTipText("Create grid");
	1125	+ gridButton.addActionListener(this);
	1126	+
	1127	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1128	+ boxButton.setToolTipText("Create box");
	1129	+ boxButton.addActionListener(this);
	1130	+
	1131	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1132	+ sphereButton.setToolTipText("Create sphere");
	1133	+ sphereButton.addActionListener(this);
	1134	+
	1135	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1136	+ coneButton.setToolTipText("Create cone");
	1137	+ coneButton.addActionListener(this);
	1138	+
	1139	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1140	+ torusButton.setToolTipText("Create torus");
	1141	+ torusButton.addActionListener(this);
	1142	+
	1143	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1144	+ superButton.setToolTipText("Create superellipsoid");
	1145	+ superButton.addActionListener(this);
	1146	+
	1147	+ if (Globals.ADVANCED)
	1148	+ {
	1149	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1150	+ kleinButton.setToolTipText("Create Klein bottle");
	1151	+ kleinButton.addActionListener(this);
	1152	+ }
	1153	+
	1154	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1155	+ particlesButton.setToolTipText("Create particle system");
	1156	+ particlesButton.addActionListener(this);
	1157	+
	1158	+ oe.toolboxPanel.add(row1);
	1159	+
	1160	+ cGridBag row2 = new cGridBag();
	1161	+
	1162	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1163	+ groupButton.setToolTipText("Create group");
	1164	+ groupButton.addActionListener(this);
	1165	+
	1166	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1167	+ compositeButton.setToolTipText("Create composite");
	1168	+ compositeButton.addActionListener(this);
	1169	+
	1170	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1171	+ switchButton.setToolTipText("Create item switcher");
	1172	+ switchButton.addActionListener(this);
	1173	+
	1174	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1175	+ loopButton.setToolTipText("Create loop");
	1176	+ loopButton.addActionListener(this);
	1177	+
	1178	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1179	+ textureButton.setToolTipText("Create texture");
	1180	+ textureButton.addActionListener(this);
	1181	+
	1182	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1183	+ overlayButton.setToolTipText("Create overlay");
	1184	+ overlayButton.addActionListener(this);
	1185	+
	1186	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1187	+ lightButton.setToolTipText("Create light");
	1188	+ lightButton.addActionListener(this);
	1189	+
	1190	+ oe.toolboxPanel.add(row2);
	1191	+
	1192	+ cGridBag textures = new cGridBag();
	1193	+
	1194	+ CreateTexturePanel(textures);
	1195	+
	1196	+ oe.toolboxPanel.add(textures);
	1197	+
	1198	+ textures.preferredHeight = 100;
	1199	+
	1200	+ CreateSkyboxPanel(oe.skyboxPanel);
	1201	+
	1202	+ // EDIT panel
	1203	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1204	+ editButton.setToolTipText("Pin selection controls");
	1205	+ editButton.addActionListener(this);
	1206	+
	1207	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1208	+ uneditButton.setToolTipText("Unpin and remove selection controls");
547	1209	uneditButton.addActionListener(this);
548	1210
549		- oe.aConstraints.gridx += 1;
550		- oe.aConstraints.weighty = 0;
551		- oe.aConstraints.gridwidth = 1;
552		-
553		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
554		- clearPanelButton.addActionListener(this);
555		-
556		- oe.aConstraints.gridx += 1;
557		- oe.aConstraints.weighty = 0;
558		- oe.aConstraints.gridwidth = 1;
559		-
560		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	1211	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1212	+ allParamsButton.setToolTipText("Show all controls");
561	1213	allParamsButton.addActionListener(this);
562	1214
563		- oe.aConstraints.gridx += 1;
564		- oe.aConstraints.weighty = 0;
565		- oe.aConstraints.gridwidth = 1;
566		-
567		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
568		- unselectButton.addActionListener(this);
	1215	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1216	+ clearPanelButton.setToolTipText("Clear all controls");
	1217	+ clearPanelButton.addActionListener(this);
569	1218
	1219	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1220	+ //unselectButton.setToolTipText("Unselect");
	1221	+ //unselectButton.addActionListener(this);
	1222	+
	1223	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1224	+ flashSelectionButton.setToolTipText("Highlight selection");
	1225	+ flashSelectionButton.addActionListener(this);
	1226	+
	1227	+ editCommandsPanel.preferredHeight = 1;
	1228	+
	1229	+ SetPinStates(false);
	1230	+// oe.treePanel.add(commandsPanel);
	1231	+// oe.treePanel.Return();
	1232	+
570	1233	// oe.aConstraints.gridx += 1;
571	1234	// oe.aConstraints.weighty = 0;
572	1235	// oe.aConstraints.gridwidth = 1;
..	..	@@ -578,47 +1241,32 @@
578	1241	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
579	1242	// gcButton.addActionListener(this);
580	1243
581		- oe.aConstraints.gridx = 0;
582		- oe.aConstraints.gridy += 1;
583		-
584		- //ctrlPanel.add(objList = new List(5, true));
585		- oe.aConstraints.gridwidth = 100;
586		- // oe.aConstraints.gridheight = 100;
587		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
588		- oe.aConstraints.gridheight = 1;
589		- oe.aConstraints.weighty = 0.5;
590		- oe.aConstraints.gridx = 0;
591		- JScrollPane jSP;
	1244	+ cGridBag jSPPanel = new cGridBag();
	1245	+
	1246	+ JScrollPane jSP;
592	1247	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
593		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	1248	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
594	1249	ResetModel();
595		- oe.aConstraints.weighty = 0.5;
596		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
597		- oe.aConstraints.gridy += 1;
598		- oe.aConstraints.gridwidth = 1;
599		-
600		- oe.aConstraints.weighty = 0;
601		- oe.aConstraints.gridwidth = 2;
602		-
603		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
604		- colorCB.addItemListener(this);
605		- oe.aConstraints.gridx += 2;
606		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
607		- materialCB.addItemListener(this);
608		- oe.aConstraints.gridx += 2;
609		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
610		- textureCB.addItemListener(this);
611		-
612		- oe.aConstraints.gridx = 0;
613		- oe.aConstraints.gridy += 1;
614	1250
	1251	+ oe.treePanel.add(jSPPanel);
	1252	+ oe.treePanel.Return();
	1253	+
	1254	+ oe.treePanel.add(copyOptionsPanel);
	1255	+ oe.treePanel.Return();
	1256	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1257	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1258	+ sliderPane.preferredHeight = 1;
	1259	+
	1260	+// mainPanel.setDividerLocation(0.1); //1.0);
	1261	+ mainPanel.setResizeWeight(0.4);
	1262	+
615	1263	//jList.addListSelectionListener(this);
616	1264	oe.jTree.addTreeSelectionListener(this);
617	1265	//jTree.setRootVisible(false);
618	1266	//jTree.setEditable(true);
619	1267	oe.jTree.setDragEnabled(true);
620	1268	//jTree.setPreferredSize(new Dimension(10,10));
621		- jSP.setPreferredSize(new Dimension(100,200));
	1269	+ //jSP.setPreferredSize(new Dimension(100,200));
622	1270
623	1271	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
624	1272
..	..	@@ -630,23 +1278,163 @@
630	1278	dgr.addDragGestureListener(this);
631	1279	}catch(Exception e) {}
632	1280	*/
633		- radio.layout = sevenButton;
	1281	+ radio.layout = threeButton; // sixButton;
634	1282	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
635	1283	}
	1284	+
	1285	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	1286	+ {
	1287	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1288	+ colorCB.setToolTipText("Copy color when dropped");
	1289	+ colorCB.addItemListener(this);
	1290	+
	1291	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1292	+ materialCB.setToolTipText("Copy material when dropped");
	1293	+ materialCB.addItemListener(this);
	1294	+
	1295	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1296	+ textureCB.setToolTipText("Copy texture when dropped");
	1297	+ textureCB.addItemListener(this);
	1298	+
	1299	+ panel.Return();
	1300	+
	1301	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	1302	+ boxCB.setToolTipText("Display bounding boxes");
	1303	+ boxCB.addItemListener(this);
	1304	+
	1305	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	1306	+ zoomBoxCB.setToolTipText("Display only for wheel");
	1307	+ zoomBoxCB.addItemListener(this);
	1308	+
	1309	+ if (true) // Globals.ADVANCED)
	1310	+ {
	1311	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1312	+// supportCB.setToolTipText("Enable rigging");
	1313	+// supportCB.addItemListener(this);
	1314	+
	1315	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1316	+ freezeCB.setToolTipText("Fast moving camera");
	1317	+ freezeCB.addItemListener(this);
	1318	+
	1319	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	1320	+ // localCB.addItemListener(this);
	1321	+
	1322	+ panel.Return();
	1323	+
	1324	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	1325	+ crowdCB.setToolTipText("Used for crowds");
	1326	+ crowdCB.addItemListener(this);
	1327	+
	1328	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	1329	+ smoothCB.setToolTipText("Snapping delay");
	1330	+ smoothCB.addItemListener(this);
	1331	+
	1332	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1333	+// slowCB.setToolTipText("Smooth interpolation");
	1334	+// slowCB.addItemListener(this);
	1335	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1336	+ minshaderCB.setToolTipText("Minimal fast shader");
	1337	+ minshaderCB.addItemListener(this);
	1338	+
	1339	+// constraints.gridy += 1;
	1340	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	1341	+// speakerMocapCB.addItemListener(this);
	1342	+
	1343	+ panel.Return();
	1344	+
	1345	+ if (false)
	1346	+ {
	1347	+ // handled in scripts
	1348	+ //constraints.gridy += 1;
	1349	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	1350	+ speakerCameraCB.addItemListener(this);
	1351	+
	1352	+ //constraints.gridy += 1;
	1353	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	1354	+ speakerFocusCB.addItemListener(this);
	1355	+
	1356	+ //constraints.gridy += 1;
	1357	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	1358	+ smoothfocusCB.addItemListener(this);
	1359	+ panel.Return();
	1360	+ }
	1361	+
	1362	+//constraints.gridx += 1;
	1363	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	1364	+// debugCB.addItemListener(this);
	1365	+
	1366	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1367	+ trackCB.setToolTipText("Enable tracking target");
	1368	+ trackCB.addItemListener(this);
	1369	+
	1370	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1371	+ oeilCB.setToolTipText("Move camera when tracking");
	1372	+ oeilCB.addItemListener(this);
	1373	+
	1374	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1375	+ shadowCB.setToolTipText("When live compute shadows");
	1376	+ shadowCB.addItemListener(this);
	1377	+
	1378	+ panel.Return();
	1379	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1380	+ toggleTextureCB.setToolTipText("Load textures");
	1381	+ toggleTextureCB.addItemListener(this);
	1382	+
	1383	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1384	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1385	+ toggleSwitchCB.addItemListener(this);
	1386	+
	1387	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1388	+ autokeepCB.setToolTipText("On structure change");
	1389	+ autokeepCB.addItemListener(this);
	1390	+
	1391	+ panel.Return();
	1392	+ if (Globals.ADVANCED)
	1393	+ {
	1394	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	1395	+ lookAtCB.setToolTipText("Look-at target");
	1396	+ lookAtCB.addItemListener(this);
	1397	+ }
	1398	+
	1399	+ }
	1400	+
	1401	+ cGridBag fill = new cGridBag();
	1402	+ fill.preferredHeight = 200;
	1403	+ cGridBag fill2 = new cGridBag();
	1404	+ fill2.preferredHeight = 200;
	1405	+ cGridBag fill3 = new cGridBag();
	1406	+ fill3.preferredHeight = 200;
	1407	+
	1408	+ panel.add(fill);
	1409	+ panel.add(fill2);
	1410	+ panel.add(fill3);
	1411	+
	1412	+ }
636	1413
637	1414	void EditObject(Object3D obj)
638	1415	{
639		- cRadio dummyButton = new cRadio(obj.name);
640		- dummyButton.SetObject(obj);
641		- dummyButton.layout = sevenButton;
642		- dummyButton.SetCamera(cameraView.renderCamera, false);
643		- dummyButton.addActionListener(this);
644		- radioPanel.add(dummyButton);
645		- buttonGroup.add(dummyButton);
646		- dummyButton.doClick();
	1416	+ cRadio radioButton = new cRadio(obj.name);
	1417	+
	1418	+ // June 2019. Patch to avoid bug with transparency.
	1419	+ radioButton.hadMaterial = obj.material != null;
	1420	+ if (!radioButton.hadMaterial)
	1421	+ {
	1422	+ obj.material = new cMaterial();
	1423	+ }
	1424	+
	1425	+ radioButton.SetObject(obj);
	1426	+ radioButton.layout = threeButton; // sixButton;
	1427	+ radioButton.SetCamera(cameraView.renderCamera, false);
	1428	+ radioButton.addActionListener(this);
	1429	+ radioPanel.add(radioButton);
	1430	+ buttonGroup.add(radioButton);
	1431	+ radioButton.doClick();
647	1432	}
	1433	+
648	1434	void SetupViews(ObjEditor oe)
649	1435	{
	1436	+ theFrame = this;
	1437	+
650	1438	oe.SetupViews();
651	1439
652	1440	System.out.println("SetupViews");
..	..	@@ -655,22 +1443,30 @@
655	1443	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
656	1444	}
657	1445
658		- JCheckBox liveCB;
659		- JCheckBox supportCB;
660		- JCheckBox localCB;
661		- JCheckBox crowdCB;
662		- JCheckBox smoothCB;
663		- JCheckBox fastCB;
664		- JCheckBox slowCB;
665		- JCheckBox boxCB;
666		- JCheckBox trackCB;
667		- JCheckBox smoothfocusCB;
	1446	+ cToggleButton liveCB;
	1447	+ cCheckBox supportCB;
	1448	+ cCheckBox localCB;
	1449	+ cCheckBox crowdCB;
	1450	+ cCheckBox smoothCB;
	1451	+ cCheckBox minshaderCB;
	1452	+
	1453	+ cToggleButton fastCB;
	1454	+ cCheckBox slowCB;
	1455	+ cCheckBox boxCB;
	1456	+ cCheckBox zoomBoxCB;
	1457	+ cCheckBox freezeCB;
	1458	+ //cToggleButton trackCB;
	1459	+ cCheckBox trackCB;
	1460	+ cCheckBox smoothfocusCB;
668	1461	// JCheckBox speakerMocapCB;
669		- JCheckBox speakerCameraCB;
670		- JCheckBox speakerFocusCB;
671		- JCheckBox debugCB;
672		- JCheckBox oeilCB;
673		- JCheckBox lookAtCB;
	1462	+ cCheckBox speakerCameraCB;
	1463	+ cCheckBox speakerFocusCB;
	1464	+ cCheckBox debugCB;
	1465	+
	1466	+ cCheckBox oeilCB;
	1467	+ cCheckBox shadowCB;
	1468	+ cCheckBox autokeepCB;
	1469	+ cCheckBox lookAtCB;
674	1470
675	1471	// static int COLOR = 1;
676	1472	// static int MATERIAL = 2;
..	..	@@ -678,9 +1474,9 @@
678	1474
679	1475	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
680	1476
681		- JCheckBox colorCB;
682		- JCheckBox materialCB;
683		- JCheckBox textureCB;
	1477	+ cCheckBox colorCB;
	1478	+ cCheckBox materialCB;
	1479	+ cCheckBox textureCB;
684	1480
685	1481	public void itemStateChanged(ItemEvent e)
686	1482	{
..	..	@@ -705,10 +1501,10 @@
705	1501	dropAttributes \|= Object3D.TEXTURE;
706	1502	else
707	1503	dropAttributes &= ~Object3D.TEXTURE;
708		- }
709		- else if(e.getSource() == liveCB)
	1504	+ } else if(e.getSource() == liveCB)
710	1505	{
711	1506	cameraView.ToggleLive();
	1507	+ refreshContents(false);
712	1508	}
713	1509	else if(e.getSource() == supportCB)
714	1510	{
..	..	@@ -724,6 +1520,12 @@
724	1520	{
725	1521	cameraView.ToggleInertia();
726	1522	cameraView.repaint();
	1523	+ }
	1524	+ else if(e.getSource() == minshaderCB)
	1525	+ {
	1526	+ Globals.MINSHADER ^= true;
	1527	+ cameraView.programInitialized = false;
	1528	+ cameraView.repaint();
727	1529	}
728	1530	else if(e.getSource() == localCB)
729	1531	{
..	..	@@ -743,6 +1545,10 @@
743	1545	Recompile();
744	1546	cameraView.repaint();
745	1547	// refreshContents();
	1548	+ }
	1549	+ else if(e.getSource() == zoomBoxCB)
	1550	+ {
	1551	+ cameraView.ToggleZoomBoxMode();
746	1552	}
747	1553	else if(e.getSource() == smoothfocusCB)
748	1554	{
..	..	@@ -769,6 +1575,18 @@
769	1575	{
770	1576	cameraView.ToggleOeil();
771	1577	}
	1578	+ else if(e.getSource() == shadowCB)
	1579	+ {
	1580	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1581	+ }
	1582	+ else if(e.getSource() == freezeCB)
	1583	+ {
	1584	+ Globals.FREEZEONMOVE ^= true;
	1585	+ }
	1586	+ else if(e.getSource() == autokeepCB)
	1587	+ {
	1588	+ Globals.REPLACEONMAKE ^= true;
	1589	+ }
772	1590	else if(e.getSource() == lookAtCB)
773	1591	{
774	1592	cameraView.ToggleLookAt();
..	..	@@ -785,7 +1603,8 @@
785	1603
786	1604	/**/
787	1605	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
788		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1606	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1607	+ TreePath path = objEditor.jTree.getSelectionPath();
789	1608	if ((path == null) \|\| (path.getPathCount() <= 1)) {
790	1609	// We can't move the root node or an empty selection
791	1610	return;
..	..	@@ -848,8 +1667,6 @@
848	1667	}
849	1668	}
850	1669
851		- String string = (String) object;
852		-
853	1670	System.out.println("Transfer = " + object + "; drop : " + target);
854	1671	// if( object instanceof java.io.File[])
855	1672	// {
..	..	@@ -857,7 +1674,11 @@
857	1674	// objEditor.DropFile((java.io.File[]) object, true);
858	1675	// return;
859	1676	// }
860		- if (string.charAt(0) == '/')
	1677	+
	1678	+ String string = object.toString();
	1679	+
	1680	+ // File path for Mac and Windows
	1681	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
861	1682	{
862	1683	// file(s)
863	1684	String[] names = string.split("\n");
..	..	@@ -884,7 +1705,7 @@
884	1705
885	1706	flashIt = false;
886	1707	CameraPane pane = (CameraPane) target;
887		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1708	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
888	1709	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
889	1710
890	1711	if (group.selection.size() == 1)
..	..	@@ -900,23 +1721,33 @@
900	1721
901	1722	assert target == objEditor.jTree;
902	1723	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1724	+ Object3D destinationLeaf;
903	1725	try {
904		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1726	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
905	1727	} catch (Exception e) {
906	1728	System.out.println("destinationPath : " + destinationPath);
907	1729	return;
908	1730	}
909	1731
910		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1732	+ for (int i=group.selection.size(); --i>=0;)
911	1733	{
	1734	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1735	+
	1736	+ // Cannot move into itself
	1737	+ if (child == destinationLeaf)
	1738	+ return;
	1739	+ }
	1740	+
	1741	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1742	+// {
912	1743	loadClipboard(true);
913	1744	objEditor.jTree.setSelectionPath(destinationPath);
914		- pasteInto(false);
915		- } else {
916		- loadClipboard(false);
917		- objEditor.jTree.setSelectionPath(destinationPath);
918		- pasteInto(false); // true); // ???
919		- }
	1745	+ pasteInto(false, false);
	1746	+// } else {
	1747	+// loadClipboard(false);
	1748	+// objEditor.jTree.setSelectionPath(destinationPath);
	1749	+// pasteInto(false, false); // true); // ???
	1750	+// }
920	1751	}
921	1752	public void dropActionChanged(DropTargetDragEvent dtde)
922	1753	// Called if the user has modified the current drop gesture
..	..	@@ -1021,83 +1852,107 @@
1021	1852	{
1022	1853	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1023	1854	//heightFieldItem.addActionListener(this);
1024		- gridItem = menu.add(new MenuItem("Grid"));
1025		- gridItem.addActionListener(this);
1026		- rectoidItem = menu.add(new MenuItem("Box"));
1027		- rectoidItem.addActionListener(this);
1028		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1029		- ellipsoidItem.addActionListener(this);
1030		- coneItem = menu.add(new MenuItem("Cone"));
1031		- coneItem.addActionListener(this);
1032		- torusItem = menu.add(new MenuItem("Torus"));
1033		- torusItem.addActionListener(this);
1034		- superItem = menu.add(new MenuItem("Superellipsoid"));
1035		- superItem.addActionListener(this);
1036		- particleItem = menu.add(new MenuItem("Particle system"));
1037		- particleItem.addActionListener(this);
	1855	+// gridItem = menu.add(new MenuItem("Grid"));
	1856	+// gridItem.addActionListener(this);
	1857	+// rectoidItem = menu.add(new MenuItem("Box"));
	1858	+// rectoidItem.addActionListener(this);
	1859	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1860	+// ellipsoidItem.addActionListener(this);
	1861	+// coneItem = menu.add(new MenuItem("Cone"));
	1862	+// coneItem.addActionListener(this);
	1863	+// torusItem = menu.add(new MenuItem("Torus"));
	1864	+// torusItem.addActionListener(this);
	1865	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1866	+// superItem.addActionListener(this);
	1867	+
	1868	+ cameraItem = menu.add(new MenuItem("Camera"));
	1869	+ cameraItem.addActionListener(this);
	1870	+
	1871	+ if (!Globals.ADVANCED)
	1872	+ {
	1873	+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
	1874	+ kleinItem.addActionListener(this);
	1875	+ }
	1876	+
	1877	+// particleItem = menu.add(new MenuItem("Particle system"));
	1878	+// particleItem.addActionListener(this);
	1879	+ if (Globals.ADVANCED)
	1880	+ {
1038	1881	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1039	1882	ragdollItem.addActionListener(this);
1040	1883	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1041	1884	ragdoll2Item.addActionListener(this);
	1885	+ }
1042	1886	menu.add("-");
1043		- meshItem = menu.add(new MenuItem("Mesh"));
	1887	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1044	1888	meshItem.addActionListener(this);
1045	1889	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1046	1890	// meshGroupItem.addActionListener(this);
	1891	+ if (Globals.ADVANCED)
	1892	+ {
1047	1893	springItem = menu.add(new MenuItem("Spring"));
1048	1894	springItem.addActionListener(this);
1049	1895	flagItem = menu.add(new MenuItem("Flag"));
1050	1896	flagItem.addActionListener(this);
1051		- bezierItem = menu.add(new MenuItem("Patch"));
1052		- bezierItem.addActionListener(this);
1053		- checkerItem = menu.add(new MenuItem("Checker"));
1054		- checkerItem.addActionListener(this);
1055	1897	blobItem = menu.add(new MenuItem("Blob"));
1056	1898	blobItem.addActionListener(this);
1057	1899	latheItem = menu.add(new MenuItem("Lathe"));
1058	1900	latheItem.addActionListener(this);
1059		- lightItem = menu.add(new MenuItem("Light"));
1060		- lightItem.addActionListener(this);
	1901	+ }
	1902	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1903	+ bezierItem.addActionListener(this);
	1904	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1905	+// overlayItem.addActionListener(this);
	1906	+// lightItem = menu.add(new MenuItem("Light"));
	1907	+// lightItem.addActionListener(this);
1061	1908	menu.add("-");
1062	1909	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1063	1910	//superLoopItem.addActionListener(this);
1064		- loopItem = menu.add(new MenuItem("Loop"));
1065		- loopItem.addActionListener(this);
	1911	+// loopItem = menu.add(new MenuItem("Loop"));
	1912	+// loopItem.addActionListener(this);
1066	1913	doubleItem = menu.add(new MenuItem("Fork"));
1067	1914	doubleItem.addActionListener(this);
	1915	+ if (Globals.ADVANCED)
	1916	+ {
1068	1917	tripleItem = menu.add(new MenuItem("Trident"));
1069	1918	tripleItem.addActionListener(this);
	1919	+ }
1070	1920	}
1071	1921
1072	1922	void buildToolsMenu(Menu menu)
1073	1923	{
1074	1924	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1075	1925	animationItem.addItemListener(this);
1076		- animationItem.setState(CameraPane.ANIMATION);
	1926	+ animationItem.setState(Globals.ANIMATION);
	1927	+
	1928	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1929	+ archiveItem.addActionListener(this);
1077	1930
1078	1931	menu.add("-");
1079	1932	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1080	1933	parseverticesItem.addActionListener(this);
1081	1934	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1082	1935	textureFieldItem.addActionListener(this);
1083		- alignItem = menu.add(new MenuItem("Align"));
	1936	+ alignItem = menu.add(new MenuItem("Align Objects"));
1084	1937	alignItem.addActionListener(this);
1085		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1086		- mirrorItem.addActionListener(this);
1087	1938	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1088	1939	reduceMorphItem.addActionListener(this);
1089	1940	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1090	1941	reduce34MorphItem.addActionListener(this);
1091		-
1092		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1093		- computeAOItem.addActionListener(this);
1094	1942	menu.add("-");
1095		-
1096	1943	menu.add(memoryItem = new MenuItem("Memory Usage"));
1097	1944	memoryItem.addActionListener(this);
	1945	+ menu.add(computeAOItem = new MenuItem("Compute AO"));
	1946	+ computeAOItem.addActionListener(this);
	1947	+
	1948	+ if (Globals.ADVANCED)
	1949	+ {
	1950	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1951	+ mirrorItem.addActionListener(this);
	1952	+ menu.add("-");
1098	1953	menu.add(analyzeItem = new MenuItem("Analyze"));
1099	1954	analyzeItem.addActionListener(this);
1100		- menu.add(dumpItem = new MenuItem("Dump"));
	1955	+ menu.add(dumpItem = new MenuItem("Print"));
1101	1956	dumpItem.addActionListener(this);
1102	1957	// menu.add(pathItem = new MenuItem("From-to path"));
1103	1958	// pathItem.addActionListener(this);
..	..	@@ -1106,6 +1961,8 @@
1106	1961	resetParentItem.addActionListener(this);
1107	1962	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1108	1963	repairParentItem.addActionListener(this);
	1964	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1965	+ repairShadowItem.addActionListener(this);
1109	1966	menu.add(invariantsItem = new MenuItem("Invariants"));
1110	1967	invariantsItem.addActionListener(this);
1111	1968	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1113,6 +1970,7 @@
1113	1970	menu.add("-");
1114	1971	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1115	1972	editScriptItem.addActionListener(this);
	1973	+ }
1116	1974	}
1117	1975
1118	1976	void ScreenFit()
..	..	@@ -1235,9 +2093,34 @@
1235	2093	shadow.material = new cMaterial(obj.material);
1236	2094	shadow.material.diffuse = 0.0001f;
1237	2095	shadow.material.specular = 0.0001f;
	2096	+ //shadow.projectedVertices[1].x = 300;
1238	2097
1239	2098	makeSomething(shadow);
1240	2099	}
	2100	+
	2101	+ private void ClearUnpinned()
	2102	+ {
	2103	+ //for (Object3D obj : listUI)
	2104	+ for (int i=listUI.size(); --i>=0;)
	2105	+ {
	2106	+ Object3D obj = listUI.elementAt(i);
	2107	+ if (!obj.pinned)
	2108	+ {
	2109	+ obj.CloseUI();
	2110	+ listUI.remove(i);
	2111	+ }
	2112	+ }
	2113	+ }
	2114	+
	2115	+ private void EditElement(Object3D elem, boolean newWindow)
	2116	+ {
	2117	+ // if (!(elem instanceof Composite))
	2118	+ // newWindow = false;
	2119	+ listUI.add(elem);
	2120	+ elem.openEditWindow(this, newWindow); //, false);
	2121	+ System.out.println("edit : " + elem);
	2122	+ elem.editWindow.refreshContents(true); // ? new
	2123	+ }
1241	2124
1242	2125	/**
1243	2126	* applyExample
..	..	@@ -1441,9 +2324,9 @@
1441	2324
1442	2325	void Overwrite(int mask)
1443	2326	{
1444		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2327	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1445	2328	{
1446		- Object3D content = GraphreeD.clipboard.get(0);
	2329	+ Object3D content = Grafreed.clipboard.get(0);
1447	2330
1448	2331	if (content instanceof cGroup && ((cGroup)content).transientlink )
1449	2332	content = ((cGroup)content).get(0);
..	..	@@ -1466,6 +2349,7 @@
1466	2349	//
1467	2350	public void actionPerformed(ActionEvent event) // , Object arg)
1468	2351	{
	2352	+ Object source = event.getSource();
1469	2353	/*
1470	2354	if (event.getSource() == nameField)
1471	2355	{
..	..	@@ -1477,11 +2361,11 @@
1477	2361	}
1478	2362	else
1479	2363	*/
1480		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	2364	+ if (source == lookAtItem \|\| source == lookFromItem)
1481	2365	{
1482	2366	ScreenFit();
1483	2367	} else
1484		- if (event.getSource() == switchItem)
	2368	+ if (source == switchViewItem)
1485	2369	{
1486	2370	cVector v1 = new cVector();
1487	2371	cVector v2 = new cVector();
..	..	@@ -1490,11 +2374,11 @@
1490	2374	objEditor.cameraView.renderCamera.setAim(v2, v1);
1491	2375	objEditor.cameraView.repaint();
1492	2376	} else
1493		- if (event.getSource() == rectoidItem)
	2377	+ if (source == rectoidItem \|\| source == boxButton)
1494	2378	{
1495	2379	makeSomething(new Box());
1496	2380	} else
1497		- if (event.getSource() == particleItem)
	2381	+ if (source == particleItem \|\| source == particlesButton)
1498	2382	{
1499	2383	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1500	2384	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1515,9 +2399,9 @@
1515	2399	applyExample(particleGeom, "SMOKE");
1516	2400	makeSomething(particleGeom);
1517	2401	} else
1518		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	2402	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1519	2403	{
1520		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	2404	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1521	2405
1522	2406	ragdoll.toParent = LA.newMatrix();
1523	2407	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1535,7 +2419,7 @@
1535	2419	} else
1536	2420	/*
1537	2421	*/
1538		- if (event.getSource() == heightFieldItem)
	2422	+ if (source == heightFieldItem)
1539	2423	{
1540	2424	Object3D obj = new Object3D();
1541	2425
..	..	@@ -1573,27 +2457,31 @@
1573	2457
1574	2458	makeSomething(obj);
1575	2459	} else
1576		- if (event.getSource() == gridItem)
	2460	+ if (source == gridItem \|\| source == gridButton)
1577	2461	{
1578	2462	makeSomething(new Grid());
1579	2463	} else
1580		- if (event.getSource() == ellipsoidItem)
	2464	+ if (source == ellipsoidItem \|\| source == sphereButton)
1581	2465	{
1582	2466	makeSomething(new Sphere());
1583	2467	} else
1584		- if (event.getSource() == coneItem)
	2468	+ if (source == coneItem \|\| source == coneButton)
1585	2469	{
1586	2470	makeSomething(new Cone());
1587	2471	} else
1588		- if (event.getSource() == torusItem)
	2472	+ if (source == torusItem \|\| source == torusButton)
1589	2473	{
1590	2474	makeSomething(new Torus());
1591	2475	} else
1592		- if (event.getSource() == superItem)
	2476	+ if (source == superItem \|\| source == superButton)
1593	2477	{
1594	2478	makeSomething(new Superellipsoid());
1595	2479	} else
1596		- if (event.getSource() == blobItem)
	2480	+ if (source == kleinItem \|\| source == kleinButton)
	2481	+ {
	2482	+ makeSomething(new Klein());
	2483	+ } else
	2484	+ if (source == blobItem)
1597	2485	{
1598	2486	Blob blob = new Blob();
1599	2487	BlobComponent comp = new BlobComponent();
..	..	@@ -1601,15 +2489,15 @@
1601	2489	//blob.retile();
1602	2490	makeSomething(blob);
1603	2491	} else
1604		- if (event.getSource() == latheItem)
	2492	+ if (source == latheItem)
1605	2493	{
1606	2494	makeSomething(new Lathe());
1607	2495	} else
1608		- if (event.getSource() == bezierItem)
	2496	+ if (source == bezierItem)
1609	2497	{
1610	2498	makeSomething(new BezierSurface());
1611	2499	} else
1612		- if (event.getSource() == checkerItem)
	2500	+ if (source == overlayItem \|\| source == overlayButton)
1613	2501	{
1614	2502	/*
1615	2503	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1624,7 +2512,7 @@
1624	2512	*/
1625	2513	makeSomething(new Checker());
1626	2514	} else
1627		- if (event.getSource() == meshItem)
	2515	+ if (source == meshItem)
1628	2516	{
1629	2517	Object3D itemtomake = new Object3D();
1630	2518	Object3D child;
..	..	@@ -1645,35 +2533,52 @@
1645	2533	makeSomething(child);
1646	2534	}
1647	2535	} else
1648		- if (event.getSource() == springItem)
	2536	+ if (source == springItem)
1649	2537	{
1650	2538	cSpring s = new cSpring();
1651	2539	s.setup();
1652	2540	makeSomething(s);
1653	2541	} else
1654		- if (event.getSource() == flagItem)
	2542	+ if (source == flagItem)
1655	2543	{
1656	2544	cSpring s = new cFlag();
1657	2545	s.setup();
1658	2546	makeSomething(s);
1659	2547	} else
1660		- if (event.getSource() == lightItem)
	2548	+ if (source == lightItem \|\| source == lightButton)
1661	2549	{
1662	2550	makeSomething(new Light());
1663	2551	} else
1664		- if (event.getSource() == csgItem)
	2552	+// if (source == skybox1Button \|\|
	2553	+// source == skybox2Button \|\|
	2554	+// source == skybox3Button \|\|
	2555	+// source == skybox4Button \|\|
	2556	+// source == skybox5Button \|\|
	2557	+// source == skybox6Button \|\|
	2558	+// source == skybox7Button \|\|
	2559	+// source == skybox11Button \|\|
	2560	+// source == skybox12Button \|\|
	2561	+// source == skybox13Button \|\|
	2562	+// source == skybox14Button \|\|
	2563	+// source == skybox15Button \|\|
	2564	+// source == skybox16Button \|\|
	2565	+// source == skybox17Button)
	2566	+// {
	2567	+// ChangeSkybox(source);
	2568	+// } else
	2569	+ if (source == csgItem)
1665	2570	{
1666	2571	group(new CSG());
1667	2572	} else
1668		- if (event.getSource() == templateItem)
	2573	+ if (source == templateItem)
1669	2574	{
1670	2575	group(new cTemplate());
1671	2576	} else
1672		- if (event.getSource() == attributeItem)
	2577	+ if (source == attributeItem)
1673	2578	{
1674	2579	makeSomething(new Attribute());
1675	2580	} else
1676		- if (event.getSource() == pointflowItem)
	2581	+ if (source == pointflowItem)
1677	2582	{
1678	2583	makeSomething(new PointFlow());
1679	2584	} else
..	..	@@ -1685,7 +2590,7 @@
1685	2590	} else
1686	2591	*/
1687	2592
1688		- if (event.getSource() == superLoopItem)
	2593	+ if (source == superLoopItem)
1689	2594	{
1690	2595	Composite g = new cGroup();
1691	2596	for (int i=0; i<15; i++)
..	..	@@ -1707,30 +2612,30 @@
1707	2612
1708	2613	group(g);
1709	2614	} else
1710		- if (event.getSource() == loopItem)
	2615	+ if (source == loopItem \|\| source == loopButton)
1711	2616	{
1712	2617	Composite csg = new GroupLeaf();
1713	2618	csg.count = 5;
1714	2619	group(csg);
1715		- Composite child = new cGroup();
	2620	+ Composite child = new cGroup("Branch");
1716	2621	csg.addChild(child);
1717	2622	child.addChild(csg);
1718	2623	} else
1719		- if (event.getSource() == doubleItem)
	2624	+ if (source == doubleItem)
1720	2625	{
1721		- Composite csg = new GroupLeaf();
	2626	+ Composite csg = new GroupLeaf("Fork");
1722	2627	csg.count = 5;
1723	2628	group(csg);
1724		- Composite child = new cGroup();
	2629	+ Composite child = new cGroup("Branch A");
1725	2630	csg.addChild(child);
1726	2631	child.addChild(csg);
1727		- child = new cGroup();
	2632	+ child = new cGroup("Branch B");
1728	2633	csg.addChild(child);
1729	2634	child.addChild(csg);
1730	2635	} else
1731		- if (event.getSource() == tripleItem)
	2636	+ if (source == tripleItem)
1732	2637	{
1733		- Composite csg = new GroupLeaf();
	2638	+ Composite csg = new GroupLeaf("Trident");
1734	2639	csg.count = 4;
1735	2640	group(csg);
1736	2641	Composite child = new cGroup();
..	..	@@ -1743,73 +2648,105 @@
1743	2648	csg.addChild(child);
1744	2649	child.addChild(csg);
1745	2650	} else
1746		-
1747		- if (event.getSource() == importGFDItem)
	2651	+ if (source == computeAOItem)
1748	2652	{
1749		- ImportGFD();
	2653	+ Globals.drawMode = CameraPane.OCCLUSION;
	2654	+ cameraView.repaint();
1750	2655	} else
1751		- if (event.getSource() == importVRMLX3DItem)
1752		- {
1753		- ImportVRMLX3D();
1754		- } else
1755		- if (event.getSource() == import3DSItem)
1756		- {
1757		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1758		- } else
1759		- if (event.getSource() == importOBJItem)
1760		- {
1761		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1762		- } else
1763		- if (event.getSource() == computeAOItem)
1764		- {
1765		- CameraPane.drawMode = CameraPane.OCCLUSION;
1766		- CameraPane.theRenderer.repaint();
1767		- } else
1768		- if (event.getSource() == recompileItem)
	2656	+ if (source == recompileItem)
1769	2657	{
1770	2658	Recompile();
1771	2659	refreshContents();
1772	2660	} else
1773		- if (event.getSource() == editScriptItem)
	2661	+ if (source == editScriptItem)
1774	2662	{
1775	2663	OpenDialog();
1776	2664	refreshContents();
1777	2665	} else
1778		- if (event.getSource() == invariantsItem)
	2666	+ if (source == invariantsItem)
1779	2667	{
1780	2668	System.out.println("Invariants:");
1781		- GraphreeD.theApplet3D.universe.invariants();
	2669	+ Grafreed.grafreed.universe.invariants();
1782	2670	} else
1783		- if (event.getSource() == memoryItem)
	2671	+ if (source == memoryItem)
1784	2672	{
1785	2673	//System.out.println("Invariants:");
1786	2674	PrintMemory();
1787	2675	} else
1788		- if (event.getSource() == pathItem)
	2676	+ if (source == pathItem)
1789	2677	{
1790	2678	PrintPath();
1791	2679	} else
1792		- if (event.getSource() == analyzeItem)
	2680	+ if (source == analyzeItem)
1793	2681	{
1794	2682	AnalyzeObject();
1795	2683	} else
1796		- if (event.getSource() == dumpItem)
	2684	+ if (source == dumpItem)
1797	2685	{
1798	2686	DumpObject();
1799	2687	} else
1800		- if (event.getSource() == screenfitButton)
	2688	+ if (source == minButton)
1801	2689	{
1802		- //Reload(lastConverter, lastFilename, true);
	2690	+ Minimize();
	2691	+ } else
	2692	+ if (source == maxButton)
	2693	+ {
	2694	+ Maximize();
	2695	+ } else
	2696	+ if (source == fullButton)
	2697	+ {
	2698	+ ToggleFullScreen();
	2699	+ } else
	2700	+ if (source == previousVersionButton)
	2701	+ {
	2702	+ // Go to previous version
	2703	+ //if (!Undo())
	2704	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2705	+ PreviousVersion();
	2706	+ } else
	2707	+ if (source == restoreButton)
	2708	+ {
	2709	+ // Restore current version
	2710	+ Restore();
	2711	+ //restoreButton.setEnabled(false);
	2712	+ } else
	2713	+ if (source == replaceButton)
	2714	+ {
	2715	+ // Overwrite current version
	2716	+ Replace();
	2717	+ //replaceButton.setEnabled(false);
	2718	+ } else
	2719	+ if (source == nextVersionButton)
	2720	+ {
	2721	+ // Go to next version
	2722	+ NextVersion();
	2723	+ } else
	2724	+ if (source == saveVersionButton)
	2725	+ {
	2726	+ // Save a new version
	2727	+ if (!Save(true))
	2728	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2729	+ } else
	2730	+ if (source == deleteVersionButton)
	2731	+ {
	2732	+ // Delete a new version
	2733	+ DeleteVersion();
	2734	+ } else
	2735	+ if (source == oneStepButton)
	2736	+ {
	2737	+ Globals.ONESTEP = true;
	2738	+ cameraView.repaint();
	2739	+ } else
	2740	+ if (source == screenfitButton)
	2741	+ {
1803	2742	ScreenFit();
1804	2743	} else
1805		- if (event.getSource() == screenfitpointButton)
	2744	+ if (source == screenfitpointButton)
1806	2745	{
1807		- //Reload(lastConverter, lastFilename, true);
1808	2746	ScreenFitPoint();
1809	2747	} else
1810		- if (event.getSource() == snapobjectButton)
	2748	+ if (source == snapobjectButton)
1811	2749	{
1812		- //Reload(lastConverter, lastFilename, true);
1813	2750	SnapObject();
1814	2751	} else
1815	2752	// if (event.getSource() == recompileButton)
..	..	@@ -1818,13 +2755,13 @@
1818	2755	// Recompile();
1819	2756	// refreshContents();
1820	2757	// } else
1821		- if (event.getSource() == gcButton)
	2758	+ if (source == gcButton)
1822	2759	{
1823	2760	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1824	2761	System.gc();
1825	2762	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1826	2763	} else
1827		- if (event.getSource() == editLeafItem)
	2764	+ if (source == editLeafItem)
1828	2765	{
1829	2766	Object3D obj;
1830	2767	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1838,65 +2775,78 @@
1838	2775	}
1839	2776	refreshContents(true);
1840	2777	} else
1841		- if (event.getSource() == openWindowItem)
	2778	+ if (source == openWindowItem)
1842	2779	{
1843	2780	EditSelection(true);
1844	2781	} else
1845		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2782	+ if (source == cutItem \|\| source == clearButton)
1846	2783	{
1847	2784	loadClipboard(true);
1848	2785	} else
1849		- if (event.getSource() == duplicateItem)
	2786	+ if (source == undoItem)
1850	2787	{
1851		- Object3D keep = GraphreeD.clipboard;
	2788	+ PreviousVersion();
	2789	+ } else
	2790	+ if (source == redoItem)
	2791	+ {
	2792	+ NextVersion();
	2793	+ } else
	2794	+ if (source == duplicateItem)
	2795	+ {
	2796	+ Object3D keep = Grafreed.clipboard;
1852	2797	loadClipboard(false);
1853	2798	paste(false);
1854		- GraphreeD.clipboard = keep;
	2799	+ Grafreed.clipboard = keep;
1855	2800	} else
1856		- if (event.getSource() == cloneItem)
	2801	+ if (source == cloneItem)
1857	2802	{
1858	2803	CloneSelection(false);
1859	2804	} else
1860		- if (event.getSource() == cloneSupportItem)
	2805	+ if (source == cloneSupportItem)
1861	2806	{
1862	2807	CloneSelection(true);
1863	2808	} else
1864		- if (event.getSource() == copyItem)
	2809	+ if (source == copyItem)
1865	2810	{
1866	2811	loadClipboard(false);
1867	2812	} else
1868		- if (event.getSource() == pasteItem)
	2813	+ if (source == pasteItem)
1869	2814	{
1870	2815	paste(false);
1871	2816	} else
1872		- if (event.getSource() == pasteLinkItem)
	2817	+ if (source == pasteIntoItem)
1873	2818	{
1874		- pasteInto(false);
	2819	+ pasteInto(true, false);
1875	2820	} else
1876		- if (event.getSource() == pasteCloneItem)
	2821	+ if (source == pasteLinkItem)
1877	2822	{
1878		- pasteInto(true);
	2823	+ pasteInto(false, false);
1879	2824	} else
1880		- if (event.getSource() == pasteExpandItem)
	2825	+ if (source == pasteCloneItem)
	2826	+ {
	2827	+ pasteInto(true, true);
	2828	+ } else
	2829	+ if (source == pasteExpandItem)
1881	2830	{
1882	2831	paste(true);
1883	2832	} else
1884		- if (event.getSource() == synchronizeItem)
	2833	+ if (source == synchronizeItem)
1885	2834	{
1886	2835	Overwrite(Object3D.TRANSFORM);
1887	2836	} else
1888		- if (event.getSource() == overwriteNameItem)
	2837	+ if (source == overwriteNameItem)
1889	2838	{
1890	2839	Overwrite(Object3D.NAME);
1891	2840	} else
1892		- if (event.getSource() == overwriteUVItem)
	2841	+ if (source == overwriteUVItem)
1893	2842	{
1894	2843	Overwrite(Object3D.UV);
1895	2844	} else
1896		- if (event.getSource() == overwriteMatItem)
	2845	+ if (source == overwriteMatItem)
1897	2846	{
	2847	+ /* july 2015
1898	2848	if ((dropAttributes & Object3D.TEXTURE) == 0)
1899		- Overwrite(Object3D.MATERIAL);
	2849	+ Overwrite(Object3D.MATERIAL \| Object3D.COLOR);
1900	2850	else
1901	2851	{
1902	2852	if ((dropAttributes & Object3D.COLOR) == 0 && (dropAttributes & Object3D.MATERIAL) == 0)
..	..	@@ -1908,13 +2858,16 @@
1908	2858	Overwrite(Object3D.MATERIAL \| Object3D.TEXTURE);
1909	2859	}
1910	2860	}
	2861	+ */
	2862	+
	2863	+ Overwrite(dropAttributes);
1911	2864	}
1912		- if (event.getSource() == overwriteGeoItem)
	2865	+ if (source == overwriteGeoItem)
1913	2866	{
1914	2867	Overwrite(Object3D.GEOMETRY);
1915		-// if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2868	+// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
1916	2869	// {
1917		-// Object3D content = GraphreeD.clipboard.get(0);
	2870	+// Object3D content = GrafreeD.clipboard.get(0);
1918	2871	//
1919	2872	// if (content instanceof cGroup && ((cGroup)content).transientlink )
1920	2873	// content = ((cGroup)content).get(0);
..	..	@@ -1926,7 +2879,7 @@
1926	2879	// refreshContents();
1927	2880	// }
1928	2881	} else
1929		- if (event.getSource() == generateMeshItem)
	2882	+ if (source == generateMeshItem)
1930	2883	{
1931	2884	//if (group.selection.size() == 1)
1932	2885	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1937,7 +2890,7 @@
1937	2890	ResetModel();
1938	2891	refreshContents();
1939	2892	} else
1940		- if (event.getSource() == extractGeometriesItem)
	2893	+ if (source == extractGeometriesItem)
1941	2894	{
1942	2895	boolean one = false;
1943	2896
..	..	@@ -1964,7 +2917,7 @@
1964	2917	ResetModel();
1965	2918	refreshContents();
1966	2919	} else
1967		- if (event.getSource() == cloneGeometriesItem)
	2920	+ if (source == cloneGeometriesItem)
1968	2921	{
1969	2922	boolean one = false;
1970	2923
..	..	@@ -1990,32 +2943,37 @@
1990	2943	ResetModel();
1991	2944	refreshContents();
1992	2945	} else
1993		- if (event.getSource() == shareGeometriesItem)
	2946	+ if (source == shareGeometriesItem)
1994	2947	{
1995	2948	boolean one = false;
1996	2949
1997	2950	if (group.selection.size() == 1)
1998	2951	one = true;
1999	2952
	2953	+ Object3D merge = null;
	2954	+
2000	2955	Object3D content = new cGroup();
2001	2956
2002	2957	for (int i=0; i<group.selection.size(); i++)
2003	2958	{
2004		- Object3D sel = new Merge(group.selection.get(i));
	2959	+ merge = new Merge(group.selection.get(i));
2005	2960
2006	2961	if (one)
2007		- makeSomething(sel, false);
	2962	+ makeSomething(merge, false);
2008	2963	else
2009		- content.addChild(sel);
	2964	+ content.addChild(merge);
2010	2965	}
2011	2966
2012	2967	if (!one)
2013		- makeSomething(content, false);
2014		-
2015		- ResetModel();
2016		- refreshContents();
	2968	+ makeSomething(content, true);
	2969	+ else
	2970	+ {
	2971	+ ResetModel();
	2972	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	2973	+ refreshContents();
	2974	+ }
2017	2975	} else
2018		- if (event.getSource() == mergeGeometriesItem)
	2976	+ if (source == mergeGeometriesItem)
2019	2977	{
2020	2978	boolean one = false;
2021	2979
..	..	@@ -2045,11 +3003,11 @@
2045	3003	ResetModel();
2046	3004	refreshContents();
2047	3005	} else
2048		- if (event.getSource() == linkverticesItem)
	3006	+ if (source == linkverticesItem)
2049	3007	{
2050		-// if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	3008	+// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2051	3009	// {
2052		-// Object3D content = GraphreeD.clipboard.get(0);
	3010	+// Object3D content = GrafreeD.clipboard.get(0);
2053	3011	//
2054	3012	// if (content instanceof cGroup && ((cGroup)content).transientlink )
2055	3013	// content = ((cGroup)content).get(0);
..	..	@@ -2058,39 +3016,48 @@
2058	3016	// group.selection.get(0).setMasterThis(content); // should be identity
2059	3017	// refreshContents();
2060	3018	// }
2061		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	3019	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2062	3020	{
2063		- Object3D content = GraphreeD.clipboard.get(0);
	3021	+ Object3D content = Grafreed.clipboard.get(0);
2064	3022
2065	3023	if (content instanceof cGroup && ((cGroup)content).transientlink )
2066	3024	content = ((cGroup)content).get(0);
2067	3025
2068		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	3026	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2069	3027	for (int i=0; i<group.selection.size(); i++)
2070	3028	{
2071		- boolean random = CameraPane.RANDOM;
2072		- CameraPane.RANDOM = false; // parse all random nodes
	3029	+ boolean random = CameraPane.SWITCH;
	3030	+ CameraPane.SWITCH = false; // parse all random nodes
2073	3031	group.selection.get(i).linkVerticesThis(content);
2074	3032	// group.selection.get(i).setMasterThis(content); // should be identity
2075		- CameraPane.RANDOM = random;
	3033	+ CameraPane.SWITCH = random;
2076	3034	}
2077		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	3035	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2078	3036	refreshContents();
2079	3037	}
2080	3038	} else
2081		- if (event.getSource() == resetsupportItem)
	3039	+ if (source == resetsupportItem)
2082	3040	{
2083	3041	for (int i=0; i<group.selection.size(); i++)
2084	3042	{
2085		- boolean random = CameraPane.RANDOM;
2086		- CameraPane.RANDOM = false; // parse all random nodes
	3043	+ boolean random = CameraPane.SWITCH;
	3044	+ CameraPane.SWITCH = false; // parse all random nodes
2087	3045	group.selection.get(i).linkVerticesThis(null);
2088		- CameraPane.RANDOM = random;
	3046	+ CameraPane.SWITCH = random;
2089	3047	}
2090	3048
2091	3049	refreshContents();
2092	3050	} else
2093		- if (event.getSource() == resetreferencesItem)
	3051	+ if (source == relinkverticesItem)
	3052	+ {
	3053	+ boolean random = CameraPane.SWITCH;
	3054	+ CameraPane.SWITCH = false; // parse all random nodes
	3055	+ group.selection.RelinkToSupport();
	3056	+ CameraPane.SWITCH = random;
	3057	+
	3058	+ refreshContents();
	3059	+ } else
	3060	+ if (source == resetreferencesItem)
2094	3061	{
2095	3062	for (int i=0; i<group.selection.size(); i++)
2096	3063	{
..	..	@@ -2099,11 +3066,11 @@
2099	3066
2100	3067	refreshContents();
2101	3068	} else
2102		- if (event.getSource() == setMasterItem)
	3069	+ if (source == setMasterItem)
2103	3070	{
2104		- if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	3071	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2105	3072	{
2106		- Object3D content = GraphreeD.clipboard.get(0);
	3073	+ Object3D content = Grafreed.clipboard.get(0);
2107	3074
2108	3075	if (content instanceof cGroup && ((cGroup)content).transientlink )
2109	3076	content = ((cGroup)content).get(0);
..	..	@@ -2112,13 +3079,13 @@
2112	3079	refreshContents();
2113	3080	}
2114	3081	} else
2115		- if (event.getSource() == poseMeshItem)
	3082	+ if (source == poseMeshItem)
2116	3083	{
2117	3084	if (group.selection.size() == 1)
2118	3085	{
2119		- if (GraphreeD.clipboard.size() == 1)
	3086	+ if (Grafreed.clipboard.size() == 1)
2120	3087	{
2121		- Object3D content = GraphreeD.clipboard.get(0);
	3088	+ Object3D content = Grafreed.clipboard.get(0);
2122	3089
2123	3090	if (content instanceof cGroup && ((cGroup)content).transientlink )
2124	3091	content = ((cGroup)content).get(0);
..	..	@@ -2131,19 +3098,19 @@
2131	3098	}
2132	3099
2133	3100	} else
2134		- if (event.getSource() == revertMeshItem)
	3101	+ if (source == revertMeshItem)
2135	3102	{
2136	3103	RevertMeshes();
2137	3104	} else
2138		- if (event.getSource() == resetMeshItem)
	3105	+ if (source == resetAllItem)
2139	3106	{
2140	3107	ResetAll();
2141	3108	} else
2142		- if (event.getSource() == stepAllItem)
	3109	+ if (source == stepAllItem)
2143	3110	{
2144	3111	StepAll();
2145	3112	} else
2146		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	3113	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2147	3114	{
2148	3115	//int indices[] = jList.getSelectedIndices();
2149	3116	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2151,42 +3118,46 @@
2151	3118
2152	3119	ClearSelection(false);
2153	3120	} else
2154		- if (event.getSource() == clearAllItem)
	3121	+ if (source == clearAllItem)
2155	3122	{
2156	3123	ClearSelection(true);
2157	3124	} else
2158		- if (event.getSource() == grabItem)
	3125	+ if (source == grabItem \|\| source == groupButton)
2159	3126	{
2160		- group(new cGroup(), true);
	3127	+ group(new cGroup(), false); // true);
2161	3128	} else
2162		- if (event.getSource() == frontItem)
	3129	+ if (source == hideItem)
	3130	+ {
	3131	+ group(new HiddenObject());
	3132	+ } else
	3133	+ if (source == frontItem)
2163	3134	{
2164	3135	front();
2165	3136	} else
2166		- if (event.getSource() == backItem)
	3137	+ if (source == backItem)
2167	3138	{
2168	3139	back();
2169	3140	} else
2170		- if (event.getSource() == cameraItem)
	3141	+ if (source == cameraItem)
2171	3142	{
2172	3143	makeSomething(new Camera());
2173	3144	} else
2174		- if (event.getSource() == compositeItem)
	3145	+ if (source == compositeItem \|\| source == compositeButton)
2175	3146	{
2176	3147	group(new Composite());
2177	3148	} else
2178		- if (event.getSource() == randomItem)
	3149	+ if (source == switchItem \|\| source == switchButton)
2179	3150	{
2180	3151	RandomNode random = new RandomNode();
2181	3152	group(random);
2182	3153	if (random.size() > 0)
2183		- random.name = random.get(0).name + "Rnd";
	3154	+ random.name = random.get(0).name + "Switch";
2184	3155	} else
2185		- if (event.getSource() == physicsItem)
	3156	+ if (source == physicsItem)
2186	3157	{
2187	3158	group(new PhysicsNode());
2188	3159	} else
2189		- if (event.getSource() == frameselectorItem)
	3160	+ if (source == frameselectorItem)
2190	3161	{
2191	3162	for (int i=0; i<group.selection.size(); i++)
2192	3163	{
..	..	@@ -2198,7 +3169,7 @@
2198	3169	ResetModel();
2199	3170	refreshContents();
2200	3171	} else
2201		- if (event.getSource() == switchGeoItem)
	3172	+ if (source == switchGeoItem)
2202	3173	{
2203	3174	for (int i=0; i<group.selection.size(); i++)
2204	3175	{
..	..	@@ -2210,7 +3181,7 @@
2210	3181	ResetModel();
2211	3182	refreshContents();
2212	3183	} else
2213		- if (event.getSource() == switchTransfoItem)
	3184	+ if (source == switchTransfoItem)
2214	3185	{
2215	3186	for (int i=0; i<group.selection.size(); i++)
2216	3187	{
..	..	@@ -2222,7 +3193,7 @@
2222	3193	ResetModel();
2223	3194	refreshContents();
2224	3195	} else
2225		- if (event.getSource() == morphItem)
	3196	+ if (source == morphItem)
2226	3197	{
2227	3198	for (int i=0; i<group.selection.size(); i++)
2228	3199	{
..	..	@@ -2234,7 +3205,7 @@
2234	3205	ResetModel();
2235	3206	refreshContents();
2236	3207	} else
2237		- if (event.getSource() == scriptNodeItem)
	3208	+ if (source == scriptNodeItem)
2238	3209	{
2239	3210	boolean atleastone = false;
2240	3211
..	..	@@ -2273,195 +3244,252 @@
2273	3244	}
2274	3245	}
2275	3246	} else
2276		- if (event.getSource() == linkerItem)
	3247	+ if (source == linkerItem)
2277	3248	{
2278	3249	group(new cLinker());
2279	3250	} else
2280		- if (event.getSource() == textureItem)
	3251	+ if (source == textureItem \|\| source == textureButton)
2281	3252	{
2282	3253	group(new TextureNode());
2283	3254	} else
2284		- if (event.getSource() == shadowXItem)
	3255	+ if (source == billboardItem)
	3256	+ {
	3257	+ group(new BillboardNode());
	3258	+ } else
	3259	+ if (source == shadowXItem)
2285	3260	{
2286	3261	CastShadow(0);
2287	3262	} else
2288		- if (event.getSource() == shadowYItem)
	3263	+ if (source == shadowYItem)
2289	3264	{
2290	3265	CastShadow(1);
2291	3266	} else
2292		- if (event.getSource() == shadowZItem)
	3267	+ if (source == shadowZItem)
2293	3268	{
2294	3269	CastShadow(2);
2295	3270	} else
2296		- if (event.getSource() == ungroupItem)
	3271	+ if (source == ungroupItem \|\| source == ungroupButton)
2297	3272	{
2298		- ungroup();
	3273	+ boolean hasRoot = false;
	3274	+
	3275	+ for (int i=0; i<group.selection.size(); i++)
	3276	+ {
	3277	+ if (group.selection.get(i) == group)
	3278	+ {
	3279	+ hasRoot = true;
	3280	+ break;
	3281	+ }
	3282	+ }
	3283	+
	3284	+ if (!hasRoot)
	3285	+ {
	3286	+ for (int i=0; i<group.selection.size(); i++)
	3287	+ {
	3288	+ Ungroup(group.selection.get(i));
	3289	+ }
	3290	+
	3291	+ ClearSelection(false);
	3292	+
	3293	+ refreshContents();
	3294	+ }
2299	3295	} else
2300		- if (event.getSource() == genUVItem)
	3296	+ if (source == genUVItem)
2301	3297	{
2302	3298	GenUV();
2303	3299	} else
2304		- if (event.getSource() == genNormalsCADItem)
	3300	+ if (source == genNormalsCADItem)
2305	3301	{
2306	3302	GenNormals(true);
2307	3303	} else
2308		- if (event.getSource() == genNormalsORGANItem)
	3304	+ if (source == genNormalsMESHItem)
	3305	+ {
	3306	+ GenNormalsMESH();
	3307	+ } else
	3308	+ if (source == genNormalsORGANItem)
2309	3309	{
2310	3310	GenNormals(false);
2311	3311	} else
2312		- if (event.getSource() == stripifyItem)
	3312	+ if (source == genNormalsMINEItem)
	3313	+ {
	3314	+ GenNormalsMINE();
	3315	+ } else
	3316	+ if (source == stripifyItem)
2313	3317	{
2314	3318	Stripify();
2315	3319	} else
2316		- if (event.getSource() == unstripifyItem)
	3320	+ if (source == unstripifyItem)
2317	3321	{
2318	3322	Unstripify();
2319	3323	} else
2320		- if (event.getSource() == trimItem)
	3324	+ if (source == trimItem)
2321	3325	{
2322	3326	Trim();
2323	3327	} else
2324		- if (event.getSource() == untrimItem)
	3328	+ if (source == untrimItem)
2325	3329	{
2326	3330	Untrim();
2327	3331	} else
2328		- if (event.getSource() == clearColorsItem)
	3332	+ if (source == clearColorsItem)
2329	3333	{
2330	3334	ClearColors();
2331	3335	} else
2332		- if (event.getSource() == clearMaterialsItem)
	3336	+ if (source == clearMaterialsItem)
2333	3337	{
2334	3338	ClearMaterials();
2335	3339	} else
2336		- if (event.getSource() == liveleavesItem)
	3340	+ if (source == liveleavesItem)
2337	3341	{
2338	3342	LiveLeaves(true);
2339	3343	} else
2340		- if (event.getSource() == unliveleavesItem)
	3344	+ if (source == unliveleavesItem)
2341	3345	{
2342	3346	LiveLeaves(false);
2343	3347	} else
2344		- if (event.getSource() == supportleavesItem)
	3348	+ if (source == supportleavesItem)
2345	3349	{
2346	3350	SupportLeaves(true);
2347	3351	} else
2348		- if (event.getSource() == unsupportleavesItem)
	3352	+ if (source == unsupportleavesItem)
2349	3353	{
2350	3354	SupportLeaves(false);
2351	3355	} else
2352		- if (event.getSource() == hideleavesItem)
	3356	+ if (source == hideleavesItem)
2353	3357	{
2354	3358	HideLeaves(true);
2355	3359	} else
2356		- if (event.getSource() == showleavesItem)
	3360	+ if (source == showleavesItem)
2357	3361	{
2358	3362	HideLeaves(false);
2359	3363	} else
2360		- if (event.getSource() == markleavesItem)
	3364	+ if (source == markleavesItem)
2361	3365	{
2362	3366	MarkLeaves(true);
2363	3367	} else
2364		- if (event.getSource() == unmarkleavesItem)
	3368	+ if (source == unmarkleavesItem)
2365	3369	{
2366	3370	MarkLeaves(false);
2367	3371	} else
2368		- if (event.getSource() == flipVItem)
	3372	+ if (source == rewindleavesItem)
	3373	+ {
	3374	+ RewindLeaves(true);
	3375	+ } else
	3376	+ if (source == unrewindleavesItem)
	3377	+ {
	3378	+ RewindLeaves(false);
	3379	+ } else
	3380	+ if (source == randomleavesItem)
	3381	+ {
	3382	+ RandomLeaves(true);
	3383	+ } else
	3384	+ if (source == unrandomleavesItem)
	3385	+ {
	3386	+ RandomLeaves(false);
	3387	+ } else
	3388	+ if (source == flipVItem)
2369	3389	{
2370	3390	FlipV(true);
2371	3391	} else
2372		- if (event.getSource() == unflipVItem)
	3392	+ if (source == unflipVItem)
2373	3393	{
2374	3394	FlipV(false);
2375	3395	} else
2376		- if (event.getSource() == lowTexturesItem)
	3396	+ if (source == lowTexturesItem)
2377	3397	{
2378	3398	SetTexRes(0);
2379	3399	} else
2380		- if (event.getSource() == normalTexturesItem)
	3400	+ if (source == normalTexturesItem)
2381	3401	{
2382	3402	SetTexRes(1);
2383	3403	} else
2384		- if (event.getSource() == highTexturesItem)
	3404	+ if (source == highTexturesItem)
2385	3405	{
2386	3406	SetTexRes(2);
2387	3407	} else
2388		- if (event.getSource() == veryhighTexturesItem)
	3408	+ if (source == veryhighTexturesItem)
2389	3409	{
2390	3410	SetTexRes(3);
2391	3411	} else
2392		- if (event.getSource() == maxTexturesItem)
	3412	+ if (source == maxTexturesItem)
2393	3413	{
2394	3414	SetTexRes(4);
2395	3415	} else
2396		- if (event.getSource() == panoTexturesItem)
	3416	+ if (source == panoTexturesItem)
2397	3417	{
2398	3418	SetTexRes(5);
2399	3419	} else
2400		- if (event.getSource() == reverseNormalsItem)
	3420	+ if (source == reverseNormalsItem)
2401	3421	{
2402	3422	ReverseNormals();
2403	3423	} else
2404		- if (event.getSource() == parseverticesItem)
	3424	+ if (source == parseverticesItem)
2405	3425	{
2406	3426	ParseVertices();
2407	3427	} else
2408		- if (event.getSource() == textureFieldItem)
	3428	+ if (source == textureFieldItem)
2409	3429	{
2410	3430	TextureVertices();
2411	3431	} else
2412		- if (event.getSource() == alignItem)
	3432	+ if (source == alignItem)
2413	3433	{
2414	3434	Align();
2415	3435	} else
2416		- if (event.getSource() == mirrorItem)
	3436	+ if (source == mirrorItem)
2417	3437	{
2418	3438	MirrorPoses();
2419	3439	} else
2420		- if (event.getSource() == reduceMorphItem)
	3440	+ if (source == reduceMorphItem)
2421	3441	{
2422	3442	MeshReduction(false);
2423	3443	} else
2424		- if (event.getSource() == reduce34MorphItem)
	3444	+ if (source == reduce34MorphItem)
2425	3445	{
2426	3446	MeshReduction(true);
2427	3447	} else
2428		- if (event.getSource() == reverseTrianglesItem)
	3448	+ if (source == reverseTrianglesItem)
2429	3449	{
2430	3450	ReverseTriangles();
2431	3451	} else
2432		- if (event.getSource() == reduceMeshItem)
	3452	+ if (source == reduceMeshItem)
2433	3453	{
2434	3454	ReduceMesh(false);
2435	3455	} else
2436		- if (event.getSource() == reduce34MeshItem)
	3456	+ if (source == reduce34MeshItem)
2437	3457	{
2438	3458	ReduceMesh(true);
2439	3459	} else
2440		- if (event.getSource() == increaseMeshItem)
	3460	+ if (source == increaseMeshItem)
2441	3461	{
2442	3462	IncreaseMesh();
2443	3463	} else
2444		- if (event.getSource() == clipMeshItem)
	3464	+ if (source == clipMeshItem)
2445	3465	{
2446	3466	ClipMesh();
2447	3467	} else
2448		- if (event.getSource() == smoothMeshItem)
	3468	+ if (source == smoothMeshItem)
2449	3469	{
2450	3470	SmoothMesh();
2451	3471	} else
2452		- if (event.getSource() == transformgeometryItem)
	3472	+ if (source == transformGeometryItem)
2453	3473	{
2454	3474	TransformGeometry();
2455	3475	} else
2456		- if (event.getSource() == resetTransformItem)
	3476	+ if (source == transformChildrenItem)
	3477	+ {
	3478	+ TransformChildren();
	3479	+ } else
	3480	+ if (source == resetTransformItem)
2457	3481	{
2458	3482	ResetTransform();
2459	3483	} else
2460		- if (event.getSource() == resetCentroidItem)
	3484	+ if (source == resetCentroidItem)
2461	3485	{
2462		- ResetCentroid();
	3486	+ ResetCentroid(true);
2463	3487	} else
2464		- if (event.getSource() == resetParentItem)
	3488	+ if (source == resetCentroidXZItem)
	3489	+ {
	3490	+ ResetCentroid(false);
	3491	+ } else
	3492	+ if (source == resetParentItem)
2465	3493	{
2466	3494	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2467	3495	{
..	..	@@ -2471,7 +3499,7 @@
2471	3499
2472	3500	refreshContents();
2473	3501	} else
2474		- if (event.getSource() == repairParentItem)
	3502	+ if (source == repairParentItem)
2475	3503	{
2476	3504	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2477	3505	{
..	..	@@ -2485,7 +3513,21 @@
2485	3513
2486	3514	refreshContents();
2487	3515	} else
2488		- if (event.getSource() == sortbysizeItem)
	3516	+ if (source == repairShadowItem)
	3517	+ {
	3518	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3519	+ {
	3520	+ Object3D obj = (Object3D)e.nextElement();
	3521	+ obj.RepairShadow();
	3522	+// for (int i=0; i<obj.size(); i++)
	3523	+// {
	3524	+// obj.get(i).parent = obj;
	3525	+// }
	3526	+ }
	3527	+
	3528	+ refreshContents();
	3529	+ } else
	3530	+ if (source == sortbysizeItem)
2489	3531	{
2490	3532	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2491	3533	{
..	..	@@ -2497,7 +3539,7 @@
2497	3539	ResetModel();
2498	3540	refreshContents();
2499	3541	} else
2500		- if (event.getSource() == sortbynameItem)
	3542	+ if (source == sortbynameItem)
2501	3543	{
2502	3544	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2503	3545	{
..	..	@@ -2509,7 +3551,7 @@
2509	3551	ResetModel();
2510	3552	refreshContents();
2511	3553	} else
2512		- if (event.getSource() == attachPigmentItem)
	3554	+ if (source == attachPigmentItem)
2513	3555	{
2514	3556	String texture = GetFile("Attach pigment");
2515	3557	Object3D obj;
..	..	@@ -2521,7 +3563,7 @@
2521	3563
2522	3564	refreshContents();
2523	3565	} else
2524		- if (event.getSource() == detachPigmentItem)
	3566	+ if (source == detachPigmentItem)
2525	3567	{
2526	3568	Object3D obj;
2527	3569	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2532,7 +3574,7 @@
2532	3574
2533	3575	refreshContents();
2534	3576	} else
2535		- if (event.getSource() == attachBumpItem)
	3577	+ if (source == attachBumpItem)
2536	3578	{
2537	3579	String texture = GetFile("Attach bump");
2538	3580	Object3D obj;
..	..	@@ -2544,18 +3586,18 @@
2544	3586
2545	3587	refreshContents();
2546	3588	} else
2547		- if (event.getSource() == detachBumpItem)
	3589	+ if (source == detachBumpItem)
2548	3590	{
2549	3591	Object3D obj;
2550	3592	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2551	3593	{
2552	3594	obj = (Object3D)e.nextElement();
2553		- obj.SetBumpTexture(null);
	3595	+ obj.ResetBumpTexture();
2554	3596	}
2555	3597
2556	3598	refreshContents();
2557	3599	} else
2558		- if (event.getSource() == pigmentBumpItem)
	3600	+ if (source == pigmentBumpItem)
2559	3601	{
2560	3602	Object3D obj;
2561	3603	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2566,158 +3608,262 @@
2566	3608
2567	3609	refreshContents();
2568	3610	} else
2569		- if (event.getSource() == flashSelectionButton)
	3611	+ if (source == embedTexturesItem)
	3612	+ {
	3613	+ Object3D obj;
	3614	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3615	+ {
	3616	+ obj = (Object3D)e.nextElement();
	3617	+ obj.EmbedTextures(true);
	3618	+ }
	3619	+
	3620	+ refreshContents();
	3621	+ } else
	3622	+ if (source == deEmbedTexturesItem)
	3623	+ {
	3624	+ Object3D obj;
	3625	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3626	+ {
	3627	+ obj = (Object3D)e.nextElement();
	3628	+ obj.EmbedTextures(false);
	3629	+ }
	3630	+
	3631	+ CameraPane.texturepigment.clear();
	3632	+ CameraPane.texturebump.clear();
	3633	+
	3634	+ refreshContents();
	3635	+ } else
	3636	+ if (source == flashSelectionButton)
2570	3637	{
2571	3638	CameraPane.flash = true;
2572	3639	refreshContents();
2573	3640	} else
2574		- if (event.getSource() == oneButton)
	3641	+ if (source == oneButton)
2575	3642	{
2576	3643	} else
2577		- if (event.getSource() == twoButton)
	3644	+ if (source == twoButton)
2578	3645	{
2579	3646	radio.layout = twoButton;
	3647	+
	3648	+ if (CameraPane.FULLSCREEN)
	3649	+ fullscreenLayout = radio.layout;
	3650	+
2580	3651	// bug
2581	3652	//gridPanel.setDividerLocation(1.0);
2582	3653	//bigPanel.setDividerLocation(0.0);
2583		- bigThree.remove(jtp);
2584		- bigThree.remove(cameraPanel);
2585		- bigThree.remove(XYZPanel);
2586		- aWindowConstraints.gridx = 0;
2587		- aWindowConstraints.gridy = 0;
2588		- aWindowConstraints.gridwidth = 1;
2589		- // aConstraints.gridheight = 3;
2590		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2591		- aWindowConstraints.weightx = 0;
2592		- aWindowConstraints.weighty = 1;
2593		- //bigThree.add(jtp, aWindowConstraints);
2594		- aWindowConstraints.weightx = 1;
2595		- aWindowConstraints.gridwidth = 3;
2596		- // aConstraints.gridheight = 3;
2597		- aWindowConstraints.gridx = 1;
2598		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2599		- bigThree.add(cameraPanel, aWindowConstraints);
2600		- aWindowConstraints.weightx = 0;
2601		- aWindowConstraints.gridx = 4;
2602		- aWindowConstraints.gridwidth = 1;
2603		- // aConstraints.gridheight = 3;
2604		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2605		- //bigThree.add(XYZPanel, aWindowConstraints);
2606		- bigThree.revalidate();
	3654	+// bigThree.remove(scenePanel);
	3655	+// bigThree.remove(centralPanel);
	3656	+// bigThree.remove(XYZPanel);
	3657	+// aWindowConstraints.gridx = 0;
	3658	+// aWindowConstraints.gridy = 0;
	3659	+// aWindowConstraints.gridwidth = 1;
	3660	+// // aConstraints.gridheight = 3;
	3661	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3662	+// aWindowConstraints.weightx = 0;
	3663	+// aWindowConstraints.weighty = 1;
	3664	+// //bigThree.add(jtp, aWindowConstraints);
	3665	+// aWindowConstraints.weightx = 1;
	3666	+// aWindowConstraints.gridwidth = 3;
	3667	+// // aConstraints.gridheight = 3;
	3668	+// aWindowConstraints.gridx = 1;
	3669	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3670	+// bigThree.add(centralPanel, aWindowConstraints);
	3671	+// aWindowConstraints.weightx = 0;
	3672	+// aWindowConstraints.gridx = 4;
	3673	+// aWindowConstraints.gridwidth = 1;
	3674	+// // aConstraints.gridheight = 3;
	3675	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3676	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3677	+// scenePanel.setVisible(false);
	3678	+// centralPanel.setVisible(true);
	3679	+// XYZPanel.setVisible(false);
	3680	+ bigThree.ClearUI();
	3681	+ bigThree.add(centralPanel);
	3682	+ bigThree.FlushUI();
	3683	+
	3684	+ cameraView.requestFocusInWindow();
	3685	+
	3686	+// refreshContents(true);
	3687	+//
	3688	+// try
	3689	+// {
	3690	+// java.awt.Robot bot = new java.awt.Robot();
	3691	+// int mask = InputEvent.BUTTON1_MASK;
	3692	+// bot.mouseMove(100, 100);
	3693	+// bot.mousePress(mask);
	3694	+// bot.mouseRelease(mask);
	3695	+// }
	3696	+// catch (Exception e)
	3697	+// {
	3698	+//
	3699	+// }
	3700	+
2607	3701	} else
2608		- if (event.getSource() == threeButton)
	3702	+ if (source == threeButton)
2609	3703	{
2610	3704	radio.layout = threeButton;
2611		- bigThree.remove(jtp);
2612		- bigThree.remove(cameraPanel);
2613		- bigThree.remove(XYZPanel);
2614		- aWindowConstraints.gridx = 0;
2615		- aWindowConstraints.gridy = 0;
2616		- aWindowConstraints.gridwidth = 1;
2617		- // aConstraints.gridheight = 3;
2618		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2619		- aWindowConstraints.weightx = 0;
2620		- aWindowConstraints.weighty = 1;
2621		- //bigThree.add(jtp, aWindowConstraints);
2622		- aWindowConstraints.weightx = 1;
2623		- aWindowConstraints.gridwidth = 3;
2624		- // aConstraints.gridheight = 3;
2625		- aWindowConstraints.gridx = 1;
2626		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2627		- bigThree.add(cameraPanel, aWindowConstraints);
2628		- aWindowConstraints.weightx = 0;
2629		- aWindowConstraints.gridx = 4;
2630		- aWindowConstraints.gridwidth = 1;
2631		- // aConstraints.gridheight = 3;
2632		- aConstraints.fill = GridBagConstraints.VERTICAL;
2633		- bigThree.add(XYZPanel, aWindowConstraints);
2634		- bigThree.revalidate();
	3705	+
	3706	+ if (CameraPane.FULLSCREEN)
	3707	+ fullscreenLayout = radio.layout;
	3708	+
	3709	+// bigThree.remove(scenePanel);
	3710	+// bigThree.remove(centralPanel);
	3711	+// bigThree.remove(XYZPanel);
	3712	+// aWindowConstraints.gridx = 0;
	3713	+// aWindowConstraints.gridy = 0;
	3714	+// aWindowConstraints.gridwidth = 1;
	3715	+// // aConstraints.gridheight = 3;
	3716	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3717	+// aWindowConstraints.weightx = 0;
	3718	+// aWindowConstraints.weighty = 1;
	3719	+// //bigThree.add(jtp, aWindowConstraints);
	3720	+// aWindowConstraints.weightx = 1;
	3721	+// aWindowConstraints.gridwidth = 3;
	3722	+// // aConstraints.gridheight = 3;
	3723	+// aWindowConstraints.gridx = 1;
	3724	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3725	+// bigThree.add(centralPanel, aWindowConstraints);
	3726	+// aWindowConstraints.weightx = 0;
	3727	+// aWindowConstraints.gridx = 4;
	3728	+// aWindowConstraints.gridwidth = 1;
	3729	+// // aConstraints.gridheight = 3;
	3730	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	3731	+// bigThree.add(XYZPanel, aWindowConstraints);
	3732	+// bigThree.validate();
	3733	+// scenePanel.setVisible(false);
	3734	+// centralPanel.setVisible(true);
	3735	+// XYZPanel.setVisible(true);
	3736	+ bigThree.ClearUI();
	3737	+ bigThree.add(scenePanel);
	3738	+ bigThree.add(centralPanel);
	3739	+ bigThree.FlushUI();
	3740	+
	3741	+ cameraView.requestFocusInWindow();
2635	3742	} else
2636		- if (event.getSource() == fourButton)
	3743	+ if (source == fourButton)
2637	3744	{
2638	3745	radio.layout = fourButton;
2639		- bigThree.remove(jtp);
2640		- bigThree.remove(cameraPanel);
2641		- bigThree.remove(XYZPanel);
2642		- aWindowConstraints.gridx = 0;
2643		- aWindowConstraints.gridy = 0;
2644		- aWindowConstraints.gridwidth = 1;
2645		- // aWindowConstraints.gridheight = 3;
2646		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2647		- aWindowConstraints.weightx = 1;
2648		- aWindowConstraints.weighty = 1;
2649		- bigThree.add(jtp, aWindowConstraints);
2650		- aWindowConstraints.weightx = 1;
2651		- aWindowConstraints.gridwidth = 3;
2652		- // aConstraints.gridheight = 3;
2653		- aWindowConstraints.gridx = 1;
2654		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2655		- //bigThree.add(cameraPanel, aWindowConstraints);
2656		- aWindowConstraints.weightx = 0;
2657		- aWindowConstraints.gridx = 4;
2658		- aWindowConstraints.gridwidth = 1;
2659		- // aWindowConstraints.gridheight = 3;
2660		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2661		- //bigThree.add(XYZPanel, aWindowConstraints);
2662		- bigThree.revalidate();
	3746	+
	3747	+ if (CameraPane.FULLSCREEN)
	3748	+ fullscreenLayout = radio.layout;
	3749	+
	3750	+// bigThree.remove(scenePanel);
	3751	+// bigThree.remove(centralPanel);
	3752	+// bigThree.remove(XYZPanel);
	3753	+// aWindowConstraints.gridx = 0;
	3754	+// aWindowConstraints.gridy = 0;
	3755	+// aWindowConstraints.gridwidth = 1;
	3756	+// // aWindowConstraints.gridheight = 3;
	3757	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3758	+// aWindowConstraints.weightx = 1;
	3759	+// aWindowConstraints.weighty = 1;
	3760	+// bigThree.add(scenePanel, aWindowConstraints);
	3761	+// aWindowConstraints.weightx = 1;
	3762	+// aWindowConstraints.gridwidth = 3;
	3763	+// // aConstraints.gridheight = 3;
	3764	+// aWindowConstraints.gridx = 1;
	3765	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3766	+// //bigThree.add(cameraPanel, aWindowConstraints);
	3767	+// aWindowConstraints.weightx = 0;
	3768	+// aWindowConstraints.gridx = 4;
	3769	+// aWindowConstraints.gridwidth = 1;
	3770	+// // aWindowConstraints.gridheight = 3;
	3771	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3772	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3773	+// bigThree.validate();
	3774	+// scenePanel.setVisible(true);
	3775	+// centralPanel.setVisible(false);
	3776	+// XYZPanel.setVisible(false);
	3777	+ bigThree.ClearUI();
	3778	+ bigThree.add(scenePanel);
	3779	+ bigThree.FlushUI();
	3780	+
	3781	+ cameraView.requestFocusInWindow();
2663	3782	} else
2664		- if (event.getSource() == sixButton)
	3783	+ if (source == sixButton)
2665	3784	{
2666	3785	radio.layout = sixButton;
2667		- bigThree.remove(jtp);
2668		- bigThree.remove(cameraPanel);
2669		- bigThree.remove(XYZPanel);
2670		- aWindowConstraints.gridx = 0;
2671		- aWindowConstraints.gridy = 0;
2672		- aWindowConstraints.gridwidth = 1;
2673		- // aConstraints.gridheight = 3;
2674		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2675		- aWindowConstraints.weightx = 0;
2676		- aWindowConstraints.weighty = 1;
2677		- bigThree.add(jtp, aWindowConstraints);
2678		- aWindowConstraints.weightx = 1;
2679		- aWindowConstraints.gridwidth = 3;
2680		- // aWindowConstraints.gridheight = 3;
2681		- aWindowConstraints.gridx = 1;
2682		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2683		- bigThree.add(cameraPanel, aWindowConstraints);
2684		- aWindowConstraints.weightx = 0;
2685		- aWindowConstraints.gridx = 4;
2686		- aWindowConstraints.gridwidth = 1;
2687		- // aWindowConstraints.gridheight = 3;
2688		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2689		- //bigThree.add(XYZPanel, aConstraints);
2690		- bigThree.revalidate();
	3786	+
	3787	+ if (CameraPane.FULLSCREEN)
	3788	+ fullscreenLayout = radio.layout;
	3789	+
	3790	+// bigThree.remove(scenePanel);
	3791	+// bigThree.remove(centralPanel);
	3792	+// bigThree.remove(XYZPanel);
	3793	+// aWindowConstraints.gridx = 0;
	3794	+// aWindowConstraints.gridy = 0;
	3795	+// aWindowConstraints.gridwidth = 1;
	3796	+// // aConstraints.gridheight = 3;
	3797	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3798	+// aWindowConstraints.weightx = 0;
	3799	+// aWindowConstraints.weighty = 1;
	3800	+// bigThree.add(scenePanel, aWindowConstraints);
	3801	+// aWindowConstraints.weightx = 1;
	3802	+// aWindowConstraints.gridwidth = 3;
	3803	+// // aWindowConstraints.gridheight = 3;
	3804	+// aWindowConstraints.gridx = 1;
	3805	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3806	+// bigThree.add(centralPanel, aWindowConstraints);
	3807	+// aWindowConstraints.weightx = 0;
	3808	+// aWindowConstraints.gridx = 4;
	3809	+// aWindowConstraints.gridwidth = 1;
	3810	+// // aWindowConstraints.gridheight = 3;
	3811	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3812	+// //bigThree.add(XYZPanel, aConstraints);
	3813	+// bigThree.validate();
	3814	+// scenePanel.setVisible(true);
	3815	+// centralPanel.setVisible(true);
	3816	+// XYZPanel.setVisible(false);
	3817	+ bigThree.ClearUI();
	3818	+ bigThree.add(centralPanel);
	3819	+ bigThree.add(scenePanel);
	3820	+ bigThree.FlushUI();
	3821	+
	3822	+ cameraView.requestFocusInWindow();
2691	3823	} else
2692		- if (event.getSource() == sevenButton)
	3824	+ if (source == sevenButton)
2693	3825	{
2694	3826	radio.layout = sevenButton;
2695		- bigThree.remove(jtp);
2696		- bigThree.remove(cameraPanel);
2697		- bigThree.remove(XYZPanel);
2698		- aWindowConstraints.gridx = 0;
2699		- aWindowConstraints.gridy = 0;
2700		- aWindowConstraints.gridwidth = 1;
2701		- // aWindowConstraints.gridheight = 3;
2702		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2703		- aWindowConstraints.weightx = 0;
2704		- aWindowConstraints.weighty = 1;
2705		- bigThree.add(jtp, aWindowConstraints);
2706		- aWindowConstraints.weightx = 1;
2707		- aWindowConstraints.gridwidth = 3;
2708		- // aWindowConstraints.gridheight = 3;
2709		- aWindowConstraints.gridx = 1;
2710		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2711		- bigThree.add(cameraPanel, aWindowConstraints);
2712		- aWindowConstraints.weightx = 0;
2713		- aWindowConstraints.gridx = 4;
2714		- aWindowConstraints.gridwidth = 1;
2715		- // aConstraints.gridheight = 3;
2716		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2717		- bigThree.add(XYZPanel, aWindowConstraints);
2718		- bigThree.revalidate();
	3827	+
	3828	+ if (CameraPane.FULLSCREEN)
	3829	+ fullscreenLayout = radio.layout;
	3830	+
	3831	+// bigThree.remove(scenePanel);
	3832	+// bigThree.remove(centralPanel);
	3833	+// bigThree.remove(XYZPanel);
	3834	+// aWindowConstraints.gridx = 0;
	3835	+// aWindowConstraints.gridy = 0;
	3836	+// aWindowConstraints.gridwidth = 1;
	3837	+// // aWindowConstraints.gridheight = 3;
	3838	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3839	+// aWindowConstraints.weightx = 0;
	3840	+// aWindowConstraints.weighty = 1;
	3841	+// bigThree.add(scenePanel, aWindowConstraints);
	3842	+// aWindowConstraints.weightx = 1;
	3843	+// aWindowConstraints.gridwidth = 3;
	3844	+// // aWindowConstraints.gridheight = 3;
	3845	+// aWindowConstraints.gridx = 1;
	3846	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3847	+// bigThree.add(centralPanel, aWindowConstraints);
	3848	+// aWindowConstraints.weightx = 0;
	3849	+// aWindowConstraints.gridx = 4;
	3850	+// aWindowConstraints.gridwidth = 1;
	3851	+// // aConstraints.gridheight = 3;
	3852	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3853	+// bigThree.add(XYZPanel, aWindowConstraints);
	3854	+// bigThree.validate();
	3855	+// scenePanel.setVisible(true);
	3856	+// centralPanel.setVisible(true);
	3857	+// XYZPanel.setVisible(true);
	3858	+ bigThree.ClearUI();
	3859	+ bigThree.add(scenePanel);
	3860	+ bigThree.add(centralPanel);
	3861	+ bigThree.add(XYZPanel);
	3862	+ bigThree.FlushUI();
	3863	+
	3864	+ cameraView.requestFocusInWindow();
2719	3865	} else
2720		- if (event.getSource() == rootButton)
	3866	+ if (source == rootButton)
2721	3867	{
2722	3868	Object3D obj;
2723	3869	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2727,66 +3873,85 @@
2727	3873	EditObject(obj);
2728	3874	}
2729	3875
	3876	+ cameraView.requestFocusInWindow();
2730	3877	refreshContents(true);
2731	3878	} else
2732		- if (event.getSource() == closeButton)
	3879	+ if (source == closeButton)
2733	3880	{
2734	3881	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2735	3882	cRadio ab;
2736	3883	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2737	3884	{
2738	3885	ab = (cRadio)e.nextElement();
2739		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3886	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2740	3887	{
	3888	+ // Patch to avoid bug with transparency.
	3889	+ if (!ab.hadMaterial)
	3890	+ {
	3891	+ ab.object.material = null;
	3892	+ }
	3893	+
2741	3894	buttonGroup.remove(ab);
2742	3895	radioPanel.remove(ab);
2743	3896
2744		- ab.GetObject().editWindow = null;
	3897	+ //ab.GetObject().editWindow = null;
	3898	+ ab.GetObject().manipWindow = null;
2745	3899	// ab.GetObject().objectUI = null; // ?????????
2746	3900
2747	3901	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2748	3902	break;
2749	3903	}
2750	3904	}
	3905	+
	3906	+ cameraView.requestFocusInWindow();
2751	3907	refreshContents(true);
2752	3908	} else
2753		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3909	+ if (source == editItem \|\| source == editButton)
2754	3910	{
	3911	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3912	+ {
	3913	+ Object3D child = (Object3D)e.nextElement();
	3914	+ child.pinned = true;
	3915	+ }
	3916	+
2755	3917	EditSelection(false);
2756	3918	} else
2757		- if (event.getSource() == uneditButton)
	3919	+ if (source == uneditButton)
2758	3920	{
2759	3921	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2760	3922	{
2761	3923	Object3D child = (Object3D)e.nextElement();
2762	3924	if(child.editWindow != null)
2763		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3925	+ child.pinned = false;
2764	3926	child.CloseUI();
2765	3927	listUI.remove(child);
	3928	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2766	3929
2767		- child.editWindow = null; // ???????????
	3930	+ //child.editWindow = null; // ???????????
2768	3931	}
2769		- objEditor.ctrlPanel.revalidate();
	3932	+ objEditor.ctrlPanel.FlushUI();
2770	3933	//objEditor.jTree.clearSelection();
2771	3934	//objEditor.ResetSliders();
2772	3935	refreshContents(true);
2773	3936	} else
2774		- if (event.getSource() == clearPanelButton)
	3937	+ if (source == clearPanelButton)
2775	3938	{
2776	3939	assert(copy == group);
2777	3940	//copy.ClearUI();
2778	3941	for (Object3D obj : listUI)
2779	3942	{
	3943	+ obj.pinned = false;
2780	3944	obj.CloseUI();
2781	3945	}
2782	3946	listUI.clear();
	3947	+ SetPinStates(group.selection.size() > 0);
2783	3948	refreshContents(true);
2784	3949	} else
2785		- if (event.getSource() == allParamsButton)
	3950	+ if (source == allParamsButton)
2786	3951	{
2787	3952	assert(copy == group);
2788	3953
2789		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3954	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2790	3955
2791	3956	for (Object3D obj : listUI)
2792	3957	{
..	..	@@ -2803,19 +3968,19 @@
2803	3968
2804	3969	refreshContents(true);
2805	3970	} else
2806		- if (event.getSource() == unselectButton)
	3971	+ if (source == unselectButton)
2807	3972	{
2808	3973	objEditor.jTree.clearSelection();
2809		- // ?? oct 2012 GraphreeD.clipboard.clear();
	3974	+ // ?? oct 2012 GrafreeD.clipboard.clear();
2810	3975	objEditor.ResetSliders();
2811	3976	refreshContents(true);
2812	3977	} else
2813		- if(event.getSource() instanceof cRadio)
	3978	+ if(source instanceof cRadio)
2814	3979	{
2815	3980	group.parent = keepparent;
2816	3981	group.attributes = 0;
2817	3982	//group.editWindow = null;
2818		- /cRadio/ radio = (cRadio)event.getSource();
	3983	+ /cRadio/ radio = (cRadio)source;
2819	3984	Object3D obj = radio.GetObject();
2820	3985	System.out.println("Edit " + obj);
2821	3986	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2835,7 +4000,10 @@
2835	4000	}
2836	4001
2837	4002	copy = group;
2838		- //CameraPane.theRenderer.object = group;
	4003	+
	4004	+ SetUndoStates();
	4005	+
	4006	+ //Globals.theRenderer.object = group;
2839	4007	if(!useclient)
2840	4008	{
2841	4009	cameraView.renderCamera = radio.camera;
..	..	@@ -2844,25 +4012,55 @@
2844	4012	cameraView.cameras[cameraView.cameracount] = radio.camera;
2845	4013	cameraView.targetLookAt.set(radio.camera.lookAt);
2846	4014	cameraView.object = group;
2847		- cameraView.lighttouched = true;
	4015	+ //cameraView.lighttouched = true;
	4016	+ Globals.lighttouched = true;
2848	4017	topView.object = group;
2849	4018	frontView.object = group;
2850	4019	sideView.object = group;
2851	4020	}
2852		- group.editWindow = this;
	4021	+
	4022	+// fix "+" issue
	4023	+ //group.editWindow = this;
	4024	+ group.manipWindow = this;
	4025	+
2853	4026	/*
2854	4027	currentLayout = radio.layout;
2855	4028	if (currentLayout == null)
2856	4029	currentLayout = sevenButton;
2857	4030	*/
2858	4031	radio.layout.doClick();
	4032	+
	4033	+ ClearUnpinned();
	4034	+
	4035	+ //Grafreed.Assert(group != null);
	4036	+ //Grafreed.Assert(group.selection != null);
	4037	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4038	+ if (group.selection == null \|\| group.selection.size() == 1)
	4039	+ EditSelection(false);
2859	4040	keepparent = group.parent;
2860	4041	// PARENT = NULL or not???
2861	4042	//group.parent = null; // ROOT
2862	4043	//group.attributes = -1;
2863	4044	ResetModel();
	4045	+
	4046	+ cameraView.requestFocusInWindow();
2864	4047	refreshContents(true);
2865		- }
	4048	+ } else if (event.getSource() == editCameraItem)
	4049	+ {
	4050	+ cameraView.ProtectCamera();
	4051	+ cameraView.requestFocusInWindow();
	4052	+ cameraView.repaint();
	4053	+ return;
	4054	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	4055	+ {
	4056	+ cameraView.RevertCamera();
	4057	+ cameraView.requestFocusInWindow();
	4058	+ cameraView.repaint();
	4059	+ return;
	4060	+ // } else if (event.getSource() == textureButton)
	4061	+ // {
	4062	+ // return; // true;
	4063	+ }
2866	4064	else
2867	4065	{
2868	4066	//return super.action(event, arg);
..	..	@@ -2871,7 +4069,6 @@
2871	4069	}
2872	4070
2873	4071	boolean useclient = false;
2874		- cRadio radio;
2875	4072
2876	4073	void ToggleRoot()
2877	4074	{
..	..	@@ -2880,7 +4077,7 @@
2880	4077	if (useclient)
2881	4078	{
2882	4079	cameraView.object = client;
2883		- cameraView.lighttouched = true;
	4080	+ Globals.lighttouched = true;
2884	4081	//topView.object = client;
2885	4082	//frontView.object = client;
2886	4083	//sideView.object = client;
..	..	@@ -2888,7 +4085,7 @@
2888	4085	else
2889	4086	{
2890	4087	cameraView.object = group;
2891		- cameraView.lighttouched = true;
	4088	+ Globals.lighttouched = true;
2892	4089	//topView.object = group;
2893	4090	//frontView.object = group;
2894	4091	//sideView.object = group;
..	..	@@ -2923,6 +4120,28 @@
2923	4120	refreshContents();
2924	4121	}
2925	4122
	4123	+ void TransformChildren()
	4124	+ {
	4125	+ Object3D obj;
	4126	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4127	+ {
	4128	+ obj = (Object3D)e.nextElement();
	4129	+ obj.KeepTextureMatrices();
	4130	+ obj.TransformChildren();
	4131	+ obj.RestoreTextureMatrices();
	4132	+
	4133	+// if (obj.parent == null)
	4134	+// {
	4135	+// System.out.println("NULL PARENT!");
	4136	+// new Exception().printStackTrace();
	4137	+// }
	4138	+// else
	4139	+// TouchTransform(obj);
	4140	+// //obj.parent.Touch();
	4141	+ }
	4142	+
	4143	+ refreshContents();
	4144	+ }
2926	4145
2927	4146	void ResetTransform()
2928	4147	{
..	..	@@ -3035,7 +4254,7 @@
3035	4254	refreshContents();
3036	4255	}
3037	4256
3038		- void ResetCentroid()
	4257	+ void ResetCentroid(boolean full)
3039	4258	{
3040	4259	Object3D obj;
3041	4260	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3050,12 +4269,16 @@
3050	4269	LA.matIdentity(Object3D.mat);
3051	4270	obj.getBounds(minima, maxima, false);
3052	4271	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3053		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	4272	+ if (full)
	4273	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3054	4274	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3055	4275	obj.TransformMesh(Object3D.mat);
	4276	+
3056	4277	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3057		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	4278	+ if (full)
	4279	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3058	4280	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	4281	+
3059	4282	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3060	4283	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3061	4284	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3084,7 +4307,8 @@
3084	4307
3085	4308	int size = obj.MemorySize();
3086	4309
3087		- System.err.println((size/1024) + " KB is the size of " + obj);
	4310	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4311	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3088	4312	}
3089	4313	}
3090	4314	catch (Exception e)
..	..	@@ -3121,9 +4345,9 @@
3121	4345	obj = (Object3D)e.nextElement();
3122	4346
3123	4347	System.out.println("Object is: " + obj);
3124		- GraphreeD.AnalyzeObject(obj);
	4348	+ Grafreed.AnalyzeObject(obj);
3125	4349	System.out.println("Boundary rep: " + obj.bRep);
3126		- GraphreeD.AnalyzeObject(obj.bRep);
	4350	+ Grafreed.AnalyzeObject(obj.bRep);
3127	4351
3128	4352	// System.err.println((size/1024) + " KB is the size of " + obj);
3129	4353	}
..	..	@@ -3165,6 +4389,20 @@
3165	4389	void GenNormals(boolean crease)
3166	4390	{
3167	4391	group.GenNormalsS(crease);
	4392	+
	4393	+ refreshContents();
	4394	+ }
	4395	+
	4396	+ void GenNormalsMESH()
	4397	+ {
	4398	+ group.GenNormalsMeshS();
	4399	+
	4400	+ refreshContents();
	4401	+ }
	4402	+
	4403	+ void GenNormalsMINE()
	4404	+ {
	4405	+ group.selection.GenNormalsMINE();
3168	4406
3169	4407	refreshContents();
3170	4408	}
..	..	@@ -3250,7 +4488,7 @@
3250	4488	// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3251	4489	// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3252	4490	//
3253		-// g.add(GraphreeD.clipboard);
	4491	+// g.add(GrafreeD.clipboard);
3254	4492	//
3255	4493	// buffer.add(g);
3256	4494	// }
..	..	@@ -3269,8 +4507,8 @@
3269	4507	// nodes = new Object3D();
3270	4508	// vertices = new Vector<Vertex>();
3271	4509	//
3272		-// boolean epsequal = GraphreeD.epsequal;
3273		-// GraphreeD.epsequal = true;
	4510	+// boolean epsequal = GrafreeD.epsequal;
	4511	+// GrafreeD.epsequal = true;
3274	4512	//
3275	4513	// for (int i=0; i<group.selection.size(); i++)
3276	4514	// {
..	..	@@ -3311,7 +4549,7 @@
3311	4549	// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3312	4550	// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3313	4551	//
3314		-// g.add(GraphreeD.clipboard);
	4552	+// g.add(GrafreeD.clipboard);
3315	4553	//
3316	4554	// buffer.add(g);
3317	4555	// }
..	..	@@ -3319,7 +4557,7 @@
3319	4557	// makeSomething(buffer, i==group.selection.size()-1);
3320	4558	// }
3321	4559	//
3322		-// GraphreeD.epsequal = epsequal;
	4560	+// GrafreeD.epsequal = epsequal;
3323	4561	//
3324	4562	// //buffer = null;
3325	4563	// temprep = null;
..	..	@@ -3330,8 +4568,8 @@
3330	4568
3331	4569	void ParseVertices()
3332	4570	{
3333		- boolean epsequal = GraphreeD.epsequal;
3334		- GraphreeD.epsequal = true;
	4571	+ boolean epsequal = Grafreed.epsequal;
	4572	+ Grafreed.epsequal = true;
3335	4573
3336	4574	for (int i=0; i<group.selection.size(); i++)
3337	4575	{
..	..	@@ -3356,7 +4594,7 @@
3356	4594	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3357	4595	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3358	4596
3359		- g.add(GraphreeD.clipboard);
	4597	+ g.add(Grafreed.clipboard);
3360	4598
3361	4599	buffer.add(g);
3362	4600	}
..	..	@@ -3371,7 +4609,7 @@
3371	4609	makeSomething(buffer, i==group.selection.size()-1);
3372	4610	}
3373	4611
3374		- GraphreeD.epsequal = epsequal;
	4612	+ Grafreed.epsequal = epsequal;
3375	4613
3376	4614	refreshContents();
3377	4615	}
..	..	@@ -3389,7 +4627,16 @@
3389	4627	String pigment = Object3D.GetPigment(tex);
3390	4628	//String bump = Object3D.GetBump(tex);
3391	4629
3392		- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
	4630	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4631	+
	4632	+ try
	4633	+ {
	4634	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
	4635	+ }
	4636	+ catch (Exception e)
	4637	+ {
	4638	+ System.err.println("FAIL: " + node);
	4639	+ }
3393	4640
3394	4641	double s = v.s;
3395	4642
..	..	@@ -3416,7 +4663,7 @@
3416	4663	scale /= 3;
3417	4664
3418	4665	scale /= 0xFF;
3419		- scale /= 4;
	4666	+ // c'est quoi ca? scale /= 4;
3420	4667
3421	4668	//v.AO = scale;
3422	4669
..	..	@@ -3437,12 +4684,26 @@
3437	4684
3438	4685	void Align()
3439	4686	{
	4687	+ if (group.selection.size() == 0)
	4688	+ return;
	4689	+
	4690	+ cVector bbmin = new cVector();
	4691	+ cVector bbmax = new cVector();
	4692	+
	4693	+ group.selection.get(0).getBounds(bbmin, bbmax, true);
	4694	+
	4695	+ double dx = bbmax.x - bbmin.x;
	4696	+ double dy = bbmax.y - bbmin.y;
	4697	+ double dz = bbmax.z - bbmin.z;
	4698	+
	4699	+ double scale = Math.sqrt(dxdx + dydy + dz*dz);
	4700	+
3440	4701	for (int i=0; i<group.selection.size(); i++)
3441	4702	{
3442	4703	Object3D obj = group.selection.get(i);
3443	4704
3444		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3445		- LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
	4705	+ LA.matTranslate(obj.toParent, i * scale, 0, 0);
	4706	+ LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3446	4707	}
3447	4708
3448	4709	refreshContents();
..	..	@@ -3455,7 +4716,7 @@
3455	4716	// ref.SaveSupports();
3456	4717	// Object3D par = ref.parent;
3457	4718	// ref.parent = null;
3458		-// Object3D lowres = (Object3D) GraphreeD.clone(ref);
	4719	+// Object3D lowres = (Object3D) GrafreeD.clone(ref);
3459	4720	// ref.parent = par;
3460	4721	// ref.RestoreSupports();
3461	4722
..	..	@@ -3463,11 +4724,11 @@
3463	4724
3464	4725	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3465	4726
3466		- boolean random = CameraPane.RANDOM;
3467		- CameraPane.RANDOM = false; // parse all random nodes
	4727	+ boolean random = CameraPane.SWITCH;
	4728	+ CameraPane.SWITCH = false; // parse all random nodes
3468	4729	lowres.linkVerticesThis(null);
3469	4730	lowres.linkVerticesThis(sn);
3470		- CameraPane.RANDOM = random;
	4731	+ CameraPane.SWITCH = random;
3471	4732
3472	4733	System.err.flush();
3473	4734
..	..	@@ -3485,7 +4746,7 @@
3485	4746	// lowres.SaveSupports();
3486	4747	// par = lowres.parent;
3487	4748	// lowres.parent = null;
3488		-// Object3D newlow = (Object3D) GraphreeD.clone(lowres);
	4749	+// Object3D newlow = (Object3D) GrafreeD.clone(lowres);
3489	4750	Object3D newlow = CloneObject(lowres, false);
3490	4751	newlow.name = sn.switchobject.get(i).name;
3491	4752	System.out.println(" pose#" + i + " = " + newlow);
..	..	@@ -3507,7 +4768,7 @@
3507	4768	return;
3508	4769
3509	4770	Object3D poses = group.selection.get(0);
3510		- Object3D ref = GraphreeD.clipboard.get(0);
	4771	+ Object3D ref = Grafreed.clipboard.get(0);
3511	4772
3512	4773	Object3D newgroup = new Object3D("Po:" + poses.name);
3513	4774
..	..	@@ -3676,7 +4937,7 @@
3676	4937	group.selection.RelinkToSupport(); // july 2014
3677	4938	System.out.println("DONE.");
3678	4939	refreshContents();
3679		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	4940	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3680	4941	}
3681	4942
3682	4943	void ReduceMesh(boolean reduction34)
..	..	@@ -3701,20 +4962,20 @@
3701	4962
3702	4963	void ClipMesh()
3703	4964	{
3704		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	4965	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3705	4966	{
3706		- Object3D content = GraphreeD.clipboard.get(0);
	4967	+ Object3D content = Grafreed.clipboard.get(0);
3707	4968
3708	4969	if (content instanceof cGroup && ((cGroup)content).transientlink )
3709	4970	content = ((cGroup)content).get(0);
3710	4971
3711	4972	// for (int i=0; i<group.selection.size(); i++)
3712	4973	// {
3713		-// group.selection.get(i).ClipMesh(GraphreeD.clipboard);
	4974	+// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3714	4975	// }
3715		- group.selection.ClipMesh(GraphreeD.clipboard);
	4976	+ group.selection.ClipMesh(Grafreed.clipboard);
3716	4977	}
3717		-// group.selection.ClipMesh(GraphreeD.clipboard);
	4978	+// group.selection.ClipMesh(GrafreeD.clipboard);
3718	4979	System.out.println("DONE.");
3719	4980	refreshContents();
3720	4981	}
..	..	@@ -3759,6 +5020,18 @@
3759	5020	void MarkLeaves(boolean hide)
3760	5021	{
3761	5022	group.selection.MarkLeaves(hide);
	5023	+ refreshContents();
	5024	+ }
	5025	+
	5026	+ void RewindLeaves(boolean hide)
	5027	+ {
	5028	+ group.selection.RewindLeaves(hide);
	5029	+ refreshContents();
	5030	+ }
	5031	+
	5032	+ void RandomLeaves(boolean hide)
	5033	+ {
	5034	+ group.selection.RandomLeaves(hide);
3762	5035	refreshContents();
3763	5036	}
3764	5037
..	..	@@ -3833,28 +5106,25 @@
3833	5106	// }
3834	5107	// }
3835	5108
3836		- static boolean allparams = true;
3837		-
3838		- static Vector<Object3D> listUI = new Vector<Object3D>();
3839		-
3840	5109	void EditSelection(boolean newWindow)
3841	5110	{
	5111	+ if (group.selection == null)
	5112	+ {
	5113	+ EditElement(group, newWindow); // ? new
	5114	+ return;
	5115	+ }
	5116	+
3842	5117	// aConstraints.gridy = 0;
3843	5118	for (int i=0; i<group.selection.size(); i++)
3844	5119	{
3845	5120	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
3846	5121	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3847		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5122	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3848	5123
3849	5124	Object3D elem = (Object3D)group.selection.elementAt(i);
3850		- if(elem != group)
	5125	+ if(elem != group \|\| !newWindow)
3851	5126	{
3852		- // if (!(elem instanceof Composite))
3853		- // newWindow = false;
3854		- listUI.add(elem);
3855		- elem.openEditWindow(this, newWindow); //, false);
3856		- System.out.println("edit : " + elem);
3857		- elem.editWindow.refreshContents(true); // ? new
	5127	+ EditElement(elem, newWindow); // ? new
3858	5128	}
3859	5129	}
3860	5130	}
..	..	@@ -3917,9 +5187,7 @@
3917	5187
3918	5188	freezemodel = false;
3919	5189	}
3920		-
3921		- boolean flashIt = true;
3922		-
	5190	+
3923	5191	public void valueChanged(TreeSelectionEvent e)
3924	5192	//public boolean handleEvent(Event event)
3925	5193	{
..	..	@@ -3929,7 +5197,8 @@
3929	5197	//new Exception().printStackTrace();
3930	5198
3931	5199	freezemodel = true;
3932		-
	5200	+ ClearUnpinned();
	5201	+
3933	5202	/**/
3934	5203	//switch (event.id)
3935	5204	{
..	..	@@ -3937,7 +5206,6 @@
3937	5206	//case 702: // Event.LIST_DESELECT
3938	5207	group.deselectAll();
3939	5208	TreePath tps[] = objEditor.jTree.getSelectionPaths();
3940		- objEditor.ClearInfo(); // .GetMaterial());
3941	5209	if (tps != null)
3942	5210	{
3943	5211	for (int i=0; i < tps.length; i++)
..	..	@@ -3946,33 +5214,39 @@
3946	5214
3947	5215	//if (child.parent != null)
3948	5216	//child.parent.addSelectee(child);
	5217	+ objEditor.SetMaterial(child);
3949	5218	group.addSelectee(child);
3950		- objEditor.SetMaterial(child); // .GetMaterial());
3951		- objEditor.AddInfo(child, this, true); // .GetMaterial());
3952		- System.err.println("info : " + child.GetPath());
3953	5219	}
3954	5220	}
3955		- else
3956		- {
3957		- objEditor.SetMaterial(group); // .GetMaterial());
3958		- objEditor.AddInfo(group, this, true); // .GetMaterial());
3959		- System.err.println("info : " + group.GetPath());
3960		- }
	5221	+// else
	5222	+// {
	5223	+// objEditor.SetMaterial(group); // .GetMaterial());
	5224	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	5225	+// System.err.println("info : " + group.GetPath());
	5226	+// }
3961	5227
3962		- objEditor.SetText(); // jan 2014
3963		-
3964		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	5228	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
3965	5229	CameraPane.flash = true;
3966	5230
3967		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5231	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
3968	5232	// a camera
3969	5233	{
3970		- CameraPane.camerachangeframe = 0; // don't refuse it
3971		- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
3972		- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
3973		- // CameraPane.theRenderer.eyeCamera = CameraPane.theRenderer.manipCamera;
	5234	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5235	+ {
	5236	+ CameraPane.camerachangeframe = 0; // don't refuse it
	5237	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5238	+ }
	5239	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	5240	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
3974	5241	}
3975	5242
	5243	+ if (tps != null && tps.length == 1)
	5244	+ {
	5245	+ EditSelection(false);
	5246	+ }
	5247	+
	5248	+ SetPinStates(tps != null && tps.length > 0);
	5249	+
3976	5250	refreshContents();
3977	5251	//return true;
3978	5252	}
..	..	@@ -3981,6 +5255,37 @@
3981	5255
3982	5256	freezemodel = false;
3983	5257	}
	5258	+
	5259	+ void SetPinStates(boolean enabled)
	5260	+ {
	5261	+ editButton.setEnabled(enabled);
	5262	+ uneditButton.setEnabled(enabled);
	5263	+ //unselectButton.setEnabled(enabled);
	5264	+ flashSelectionButton.setEnabled(enabled);
	5265	+
	5266	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5267	+ }
	5268	+
	5269	+ void refreshContents(boolean cp)
	5270	+ {
	5271	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5272	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5273	+ {
	5274	+ objEditor.ClearInfo(); // .GetMaterial());
	5275	+
	5276	+ for (int i=0; i < group.selection.Size(); i++)
	5277	+ {
	5278	+ Object3D child = (Object3D) group.selection.get(i);
	5279	+
	5280	+ objEditor.AddInfo(child, this, true);
	5281	+ System.err.println("info : " + child.GetPath());
	5282	+ }
	5283	+
	5284	+ objEditor.SetText(); // jan 2014
	5285	+ }
	5286	+
	5287	+ super.refreshContents(cp);
	5288	+ }
3984	5289
3985	5290	void linkSomething(Object3D thing)
3986	5291	{
..	..	@@ -4052,16 +5357,19 @@
4052	5357	{
4053	5358	if (group.selection.isEmpty())
4054	5359	return;
4055		- GraphreeD.clipboardIsTempGroup = false;
	5360	+
	5361	+ Grafreed.clipboardIsTempGroup = false;
4056	5362	Composite tGroup = null;
4057	5363	if (group.selection.size() > 0) // 1)
4058	5364	{
4059	5365	tGroup = new cGroup();
4060		- GraphreeD.clipboardIsTempGroup = true;
	5366	+ Grafreed.clipboardIsTempGroup = true;
4061	5367	}
4062	5368
4063	5369	if (cut)
4064	5370	{
	5371	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5372	+// Save();
4065	5373	//int indices[] = jList.getSelectedIndices();
4066	5374	//for (int i = indices.length - 1; i >= 0; i--)
4067	5375	//jList.remove(indices[i]);
..	..	@@ -4097,16 +5405,16 @@
4097	5405	//System.out.println("cut " + child);
4098	5406	//System.out.println("parent = " + child.parent);
4099	5407	// tmp.addChild(child);
4100		- if (GraphreeD.clipboardIsTempGroup)
	5408	+ if (Grafreed.clipboardIsTempGroup)
4101	5409	tGroup.add/Child/(tmp);
4102	5410	else
4103		- GraphreeD.clipboard = tmp;
	5411	+ Grafreed.clipboard = tmp;
4104	5412	}
4105	5413	else
4106		- if (GraphreeD.clipboardIsTempGroup)
	5414	+ if (Grafreed.clipboardIsTempGroup)
4107	5415	tGroup.add/Child/(child);
4108	5416	else
4109		- GraphreeD.clipboard = child;
	5417	+ Grafreed.clipboard = child;
4110	5418	}
4111	5419
4112	5420	//ResetModel();
..	..	@@ -4138,21 +5446,23 @@
4138	5446	//System.out.println("cut " + elem);
4139	5447	//System.out.println("parent = " + elem.parent);
4140	5448	// tmp.addChild(elem);
4141		- if (GraphreeD.clipboardIsTempGroup)
	5449	+ if (Grafreed.clipboardIsTempGroup)
4142	5450	tGroup.add/Child/(tmp);
4143	5451	else
4144		- GraphreeD.clipboard = tmp;
	5452	+ Grafreed.clipboard = tmp;
4145	5453	}
4146	5454	else
4147		- if (GraphreeD.clipboardIsTempGroup)
	5455	+ if (Grafreed.clipboardIsTempGroup)
4148	5456	tGroup.add/Child/(child);
4149	5457	else
4150		- GraphreeD.clipboard = child;
	5458	+ Grafreed.clipboard = child;
4151	5459	}
4152	5460
4153	5461	}
4154		- if (GraphreeD.clipboardIsTempGroup)
4155		- GraphreeD.clipboard = tGroup;
	5462	+
	5463	+ if (Grafreed.clipboardIsTempGroup)
	5464	+ Grafreed.clipboard = tGroup;
	5465	+
4156	5466	if (cut)
4157	5467	{
4158	5468	ResetModel();
..	..	@@ -4162,11 +5472,15 @@
4162	5472
4163	5473	void paste(boolean expand)
4164	5474	{
4165		- // if (GraphreeD.clipboard == null)
	5475	+ if (Globals.REPLACEONMAKE)
	5476	+ Save();
	5477	+ boolean keep = Globals.REPLACEONMAKE;
	5478	+ Globals.REPLACEONMAKE = false;
	5479	+ // if (GrafreeD.clipboard == null)
4166	5480	// return;
4167	5481	boolean first = true;
4168	5482
4169		- if (GraphreeD.clipboardIsTempGroup)
	5483	+ if (Grafreed.clipboardIsTempGroup)
4170	5484	{
4171	5485	Composite temp;
4172	5486
..	..	@@ -4177,7 +5491,7 @@
4177	5491	temp = (Composite)Applet3D.clipboard.deepCopy();
4178	5492	*/
4179	5493	Object3D elem;
4180		- for (Enumeration e = /temp.children/GraphreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5494	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4181	5495	{
4182	5496	Object3D child = (Object3D)e.nextElement();
4183	5497
..	..	@@ -4191,7 +5505,7 @@
4191	5505	else
4192	5506	elem = child.deepCopy(); // ?
4193	5507	child.parent = keepparent;
4194		- //if (GraphreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
	5508	+ //if (GrafreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
4195	5509	// elem = elem.get(0);
4196	5510	makeSomething(elem, true); // ?? first);
4197	5511	//group.addChild(elem);
..	..	@@ -4211,23 +5525,24 @@
4211	5525	//Object3D cb = Applet3D.clipboard;
4212	5526	//temp.addChild(cb);
4213	5527	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4214		- assert(GraphreeD.clipboard.parent == null);
4215		- Object3D /Composite/ keepparent = GraphreeD.clipboard.get(0).parent;
4216		- GraphreeD.clipboard.get(0).parent = null; // Avoid copy?
4217		- if (LA.isIdentity(GraphreeD.clipboard.toParent))
4218		- makeSomething(expand?GraphreeD.clipboard.get(0).copyExpand():GraphreeD.clipboard.get(0).deepCopy());
	5528	+ assert(Grafreed.clipboard.parent == null);
	5529	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5530	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5531	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5532	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4219	5533	else
4220		- makeSomething(expand?GraphreeD.clipboard.copyExpand():GraphreeD.clipboard.deepCopy());
4221		- GraphreeD.clipboard.get(0).parent = keepparent;
	5534	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5535	+ Grafreed.clipboard.get(0).parent = keepparent;
4222	5536	}
4223	5537
	5538	+ Globals.REPLACEONMAKE = keep;
4224	5539	ResetModel();
4225	5540	refreshContents();
4226	5541	}
4227	5542
4228		- void pasteInto(boolean copyit)
	5543	+ void pasteInto(boolean copyit, boolean clone)
4229	5544	{
4230		-// if (GraphreeD.clipboard == null)
	5545	+// if (GrafreeD.clipboard == null)
4231	5546	// return;
4232	5547
4233	5548	if (group.selection.size() != 1)
..	..	@@ -4254,15 +5569,22 @@
4254	5569	if (copyit)
4255	5570	{
4256	5571	// paste(false);
4257		- CloneClipboard(false); // sept 2014
	5572	+ if (clone)
	5573	+ {
	5574	+ CloneClipboard(false); // sept 2014
	5575	+ }
	5576	+ else
	5577	+ {
	5578	+ paste(false);
	5579	+ }
4258	5580	}
4259	5581	else
4260	5582	{
4261	5583	boolean first = true;
4262	5584
4263		- if (GraphreeD.clipboardIsTempGroup)
	5585	+ if (Grafreed.clipboardIsTempGroup)
4264	5586	{
4265		- Composite temp = (Composite)GraphreeD.clipboard;
	5587	+ Composite temp = (Composite)Grafreed.clipboard;
4266	5588	Object3D copy;
4267	5589	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4268	5590	{
..	..	@@ -4272,7 +5594,7 @@
4272	5594	}
4273	5595	} else
4274	5596	{
4275		- linkSomething(GraphreeD.clipboard); //.get(0));
	5597	+ linkSomething(Grafreed.clipboard); //.get(0));
4276	5598	}
4277	5599	}
4278	5600	}
..	..	@@ -4349,6 +5671,10 @@
4349	5671
4350	5672	void group(Object3D csg, boolean grab)
4351	5673	{
	5674	+ if (Globals.REPLACEONMAKE)
	5675	+ Save();
	5676	+ boolean keep = Globals.REPLACEONMAKE;
	5677	+ Globals.REPLACEONMAKE = false;
4352	5678	if (//false) // why??
4353	5679	!group.selection.isEmpty())
4354	5680	{
..	..	@@ -4462,8 +5788,34 @@
4462	5788	//node.add(csg);
4463	5789	//makeSomething(node);
4464	5790	makeSomething(csg);
	5791	+ Globals.REPLACEONMAKE = keep;
4465	5792	}
4466	5793
	5794	+ void Ungroup(Object3D g)
	5795	+ {
	5796	+ if (Globals.REPLACEONMAKE)
	5797	+ Save();
	5798	+ boolean keep = Globals.REPLACEONMAKE;
	5799	+ Globals.REPLACEONMAKE = false;
	5800	+ if (g instanceof HiddenObject)
	5801	+ {
	5802	+ HiddenObject h = (HiddenObject) g;
	5803	+
	5804	+ for (int i=0; i<h.ActualSize(); i++)
	5805	+ {
	5806	+ objEditor.makeSomething(h.get(i), false);
	5807	+ }
	5808	+ }
	5809	+ else
	5810	+ {
	5811	+ for (int i=0; i<g.Size(); i++)
	5812	+ {
	5813	+ objEditor.makeSomething(g.get(i), false);
	5814	+ }
	5815	+ }
	5816	+ Globals.REPLACEONMAKE = keep;
	5817	+ }
	5818	+
4467	5819	void ungroup()
4468	5820	{
4469	5821	/*
..	..	@@ -4657,21 +6009,6 @@
4657	6009	}
4658	6010	*/
4659	6011
4660		- void ImportGFD()
4661		- {
4662		- FileDialog browser = new FileDialog(objEditor.frame, "Import GraphreeD", FileDialog.LOAD);
4663		- browser.show();
4664		- String filename = browser.getFile();
4665		- if (filename != null && filename.length() > 0)
4666		- {
4667		- String fullname = browser.getDirectory() + filename;
4668		-
4669		- //Object3D readobj =
4670		- objEditor.ReadGFD(fullname, objEditor);
4671		- //makeSomething(readobj);
4672		- }
4673		- }
4674		-
4675	6012	/*
4676	6013	public void Callback(Object obj)
4677	6014	{
..	..	@@ -4695,26 +6032,9 @@
4695	6032	}
4696	6033	*/
4697	6034
4698		- void ImportVRMLX3D()
4699		- {
4700		- if (GraphreeD.standAlone)
4701		- {
4702		- /**/
4703		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4704		- browser.show();
4705		- String filename = browser.getFile();
4706		- if (filename != null && filename.length() > 0)
4707		- {
4708		- String fullname = browser.getDirectory() + filename;
4709		- LoadVRMLX3D(fullname);
4710		- }
4711		- /**/
4712		- }
4713		- }
4714		-
4715	6035	String GetFile(String dialogName)
4716	6036	{
4717		- if (GraphreeD.standAlone)
	6037	+ if (Grafreed.standAlone)
4718	6038	{
4719	6039	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4720	6040	browser.show();
..	..	@@ -4778,10 +6098,48 @@
4778	6098	cButton flashSelectionButton;
4779	6099	cButton editButton;
4780	6100	cButton uneditButton;
	6101	+ JCheckBox allParamsButton;
4781	6102	cButton clearpanelButton;
4782		- cButton allParamsButton;
4783	6103	cButton unselectButton;
4784	6104
	6105	+ cButton restoreCameraButton;
	6106	+
	6107	+ cButton oneStepButton;
	6108	+
	6109	+ cButton groupButton;
	6110	+ cButton ungroupButton;
	6111	+ cButton compositeButton;
	6112	+ cButton switchButton;
	6113	+ cButton loopButton;
	6114	+ cButton textureButton;
	6115	+
	6116	+ cButton skybox1Button;
	6117	+ cButton skybox2Button;
	6118	+ cButton skybox3Button;
	6119	+ cButton skybox4Button;
	6120	+ cButton skybox5Button;
	6121	+ cButton skybox6Button;
	6122	+ cButton skybox7Button;
	6123	+
	6124	+ cButton skybox11Button;
	6125	+ cButton skybox12Button;
	6126	+ cButton skybox13Button;
	6127	+ cButton skybox14Button;
	6128	+ cButton skybox15Button;
	6129	+ cButton skybox16Button;
	6130	+ cButton skybox17Button;
	6131	+
	6132	+ cButton gridButton;
	6133	+ cButton boxButton;
	6134	+ cButton sphereButton;
	6135	+ cButton coneButton;
	6136	+ cButton torusButton;
	6137	+ cButton superButton;
	6138	+ cButton kleinButton;
	6139	+ cButton particlesButton;
	6140	+ cButton overlayButton;
	6141	+ cButton lightButton;
	6142	+
4785	6143	cButton screenfitButton;
4786	6144	cButton screenfitpointButton;
4787	6145	cButton snapobjectButton;
..	..	@@ -4793,14 +6151,6 @@
4793	6151
4794	6152	cButton setsupportButton;
4795	6153
4796		- cButton twoButton;
4797		- cButton sixButton;
4798		- cButton threeButton;
4799		- cButton sevenButton;
4800		- cButton fourButton; // full panel
4801		- cButton oneButton; // full XYZ
4802		- //cButton currentLayout;
4803		-
4804	6154	//
4805	6155	//Composite
4806	6156	Object3D // to do !!
..	..	@@ -4810,9 +6160,11 @@
4810	6160	//JTree jTree;
4811	6161	private MenuItem lookAtItem;
4812	6162	private MenuItem lookFromItem;
4813		- private MenuItem switchItem;
	6163	+ private MenuItem switchViewItem;
4814	6164	private MenuItem cutItem;
4815		- private MenuItem duplicateItem;
	6165	+ private MenuItem undoItem;
	6166	+ private MenuItem redoItem;
	6167	+ private JMenuItem duplicateItem;
4816	6168	private MenuItem cloneItem;
4817	6169	private MenuItem cloneSupportItem;
4818	6170	private MenuItem overwriteGeoItem;
..	..	@@ -4823,8 +6175,9 @@
4823	6175	private MenuItem resetsupportItem;
4824	6176	private MenuItem resetreferencesItem;
4825	6177	private MenuItem linkverticesItem;
	6178	+ private MenuItem relinkverticesItem;
4826	6179	private MenuItem setMasterItem;
4827		- private MenuItem resetMeshItem;
	6180	+ private MenuItem resetAllItem;
4828	6181	private MenuItem stepAllItem;
4829	6182	private MenuItem revertMeshItem;
4830	6183	private MenuItem poseMeshItem;
..	..	@@ -4835,14 +6188,17 @@
4835	6188	private MenuItem mergeGeometriesItem;
4836	6189	private MenuItem copyItem;
4837	6190	private MenuItem pasteItem;
	6191	+ private MenuItem pasteIntoItem;
4838	6192	private MenuItem pasteLinkItem;
4839	6193	private MenuItem pasteCloneItem;
4840	6194	private MenuItem pasteExpandItem;
4841		- private MenuItem clearItem;
	6195	+ private MenuItem deleteItem;
4842	6196	private MenuItem clearAllItem;
4843	6197	private MenuItem genUVItem;
	6198	+ private MenuItem genNormalsMESHItem;
4844	6199	private MenuItem genNormalsCADItem;
4845	6200	private MenuItem genNormalsORGANItem;
	6201	+ private MenuItem genNormalsMINEItem;
4846	6202	private MenuItem stripifyItem;
4847	6203	private MenuItem unstripifyItem;
4848	6204	private MenuItem trimItem;
..	..	@@ -4871,6 +6227,10 @@
4871	6227	private MenuItem showleavesItem;
4872	6228	private MenuItem markleavesItem;
4873	6229	private MenuItem unmarkleavesItem;
	6230	+ private MenuItem rewindleavesItem;
	6231	+ private MenuItem unrewindleavesItem;
	6232	+ private MenuItem randomleavesItem;
	6233	+ private MenuItem unrandomleavesItem;
4874	6234
4875	6235	private MenuItem flipVItem;
4876	6236	private MenuItem unflipVItem;
..	..	@@ -4882,14 +6242,17 @@
4882	6242	private MenuItem panoTexturesItem;
4883	6243
4884	6244	private MenuItem resetCentroidItem;
4885		- private MenuItem transformgeometryItem;
	6245	+ private MenuItem resetCentroidXZItem;
4886	6246	private MenuItem resetTransformItem;
	6247	+ private MenuItem transformGeometryItem;
	6248	+ private MenuItem transformChildrenItem;
	6249	+ private MenuItem hideItem;
4887	6250	private MenuItem grabItem;
4888	6251	private MenuItem backItem;
4889	6252	private MenuItem frontItem;
4890	6253	private MenuItem cameraItem;
4891	6254	private MenuItem compositeItem;
4892		- private MenuItem randomItem;
	6255	+ private MenuItem switchItem;
4893	6256	private MenuItem physicsItem;
4894	6257	private MenuItem frameselectorItem;
4895	6258	private MenuItem scriptNodeItem;
..	..	@@ -4904,6 +6267,7 @@
4904	6267
4905	6268	private MenuItem resetParentItem;
4906	6269	private MenuItem repairParentItem;
	6270	+ private MenuItem repairShadowItem;
4907	6271	private MenuItem sortbysizeItem;
4908	6272	private MenuItem sortbynameItem;
4909	6273
..	..	@@ -4912,6 +6276,8 @@
4912	6276	private MenuItem attachBumpItem;
4913	6277	private MenuItem detachBumpItem;
4914	6278	private MenuItem pigmentBumpItem;
	6279	+ private MenuItem embedTexturesItem;
	6280	+ private MenuItem deEmbedTexturesItem;
4915	6281
4916	6282	private MenuItem particleItem;
4917	6283	private MenuItem ragdollItem;
..	..	@@ -4924,10 +6290,11 @@
4924	6290	private MenuItem coneItem;
4925	6291	private MenuItem torusItem;
4926	6292	private MenuItem superItem;
	6293	+ private MenuItem kleinItem;
4927	6294	private MenuItem blobItem;
4928	6295	private MenuItem latheItem;
4929	6296	private MenuItem bezierItem;
4930		- private MenuItem checkerItem;
	6297	+ private MenuItem overlayItem;
4931	6298	private MenuItem meshItem;
4932	6299	// private MenuItem meshGroupItem;
4933	6300	private MenuItem springItem;
..	..	@@ -4936,6 +6303,7 @@
4936	6303	private MenuItem csgItem;
4937	6304	private MenuItem templateItem;
4938	6305	private MenuItem textureItem;
	6306	+ private MenuItem billboardItem;
4939	6307	private MenuItem shadowXItem;
4940	6308	private MenuItem shadowYItem;
4941	6309	private MenuItem shadowZItem;
..	..	@@ -4948,11 +6316,6 @@
4948	6316	private MenuItem doubleItem;
4949	6317	private MenuItem tripleItem;
4950	6318
4951		- private MenuItem importGFDItem;
4952		- private MenuItem importVRMLX3DItem;
4953		- private MenuItem import3DSItem;
4954		- private MenuItem importOBJItem;
4955		-
4956	6319	private MenuItem computeAOItem;
4957	6320	private MenuItem recompileItem;
4958	6321	private MenuItem editScriptItem;
..	..	@@ -4962,4 +6325,8 @@
4962	6325	private MenuItem analyzeItem;
4963	6326	private MenuItem dumpItem;
4964	6327	//boolean freezemodel = false;
	6328	+
	6329	+ Menu cameraMenu;
	6330	+ MenuItem editCameraItem;
	6331	+ MenuItem restoreCameraItem;
4965	6332	}