~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,351 @@
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, String c, final String t, int count, cGridBag row)
	46	+ {
	47	+ cButton textureButton;
	48	+ final String path = "textures/" + f + "/" + c + "/"; // + t;
	49	+ row.add(textureButton = GetButton(path + "icons/" + t, !Grafreed.NIMBUSLAF));
	50	+ textureButton.setToolTipText(c + count);
	51	+ textureButton.addActionListener(new ActionListener()
	52	+ {
	53	+ @Override
	54	+ public void actionPerformed(ActionEvent e)
	55	+ {
	56	+ ChangeTexture(path + t);
	57	+ }
	58	+ });
	59	+ }
	60	+
	61	+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
	62	+ {
	63	+ cGridBag tab0 = new cGridBag().setVertical(true);
	64	+
	65	+ tab0.setName("Urban");
	66	+ skyboxpanel.add(tab0);
	67	+
	68	+ cGridBag row0 = new cGridBag();
	69	+ cGridBag row1 = new cGridBag();
	70	+ cGridBag row2 = new cGridBag();
	71	+ cGridBag row3 = new cGridBag();
	72	+ cGridBag row4 = new cGridBag();
	73	+ cGridBag row5 = new cGridBag();
	74	+ cGridBag row6 = new cGridBag();
	75	+
	76	+ AddSkyboxButton("default", "rgb", row0);
	77	+ //AddSkyboxButton("default", "cornell", row0);
	78	+ AddSkyboxButton("penguins", "dust", row0);
	79	+ AddSkyboxButton("penguins", "tropic", row0);
	80	+ AddSkyboxButton("penguins", "yonder", row0);
	81	+
	82	+ AddSkyboxButton("default", "uffizi", row1);
	83	+ AddSkyboxButton("bridge", "Bridge", row1);
	84	+ AddSkyboxButton("bridge", "Bridge2", row1);
	85	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	86	+
	87	+ AddSkyboxButton("urban", "Parliament", row2);
	88	+ AddSkyboxButton("urban", "Roundabout", row2);
	89	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	90	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	91	+
	92	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	93	+ AddSkyboxButton("urban", "UnionSquare", row3);
	94	+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
	95	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	96	+
	97	+ AddSkyboxButton("park", "Buddha", row4);
	98	+ AddSkyboxButton("park", "CNTower2", row4);
	99	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	100	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	101	+
	102	+ AddSkyboxButton("park", "Park", row5);
	103	+ AddSkyboxButton("park", "Pond", row5);
	104	+ AddSkyboxButton("park", "Skansen", row5);
	105	+ AddSkyboxButton("park", "Skansen2", row5);
	106	+
	107	+ AddSkyboxButton("park", "Skansen3", row6);
	108	+ AddSkyboxButton("park", "Skansen4", row6);
	109	+ AddSkyboxButton("park", "Skansen5", row6);
	110	+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
	111	+
	112	+ tab0.add(row0);
	113	+ tab0.add(row1);
	114	+ tab0.add(row2);
	115	+ tab0.add(row3);
	116	+ tab0.add(row4);
	117	+ tab0.add(row5);
	118	+ tab0.add(row6);
	119	+
	120	+ for (int i=5; --i>=0;)
	121	+ {
	122	+ //oe.toolboxPanel.Return();
	123	+ //tab0.add(new cGridBag());
	124	+ }
	125	+ }
	126	+
	127	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	128	+ {
	129	+ cGridBag tab0 = new cGridBag().setVertical(true);
	130	+
	131	+ tab0.setName("Nature");
	132	+ skyboxpanel.add(tab0);
	133	+
	134	+ cGridBag row0 = new cGridBag();
	135	+ cGridBag row1 = new cGridBag();
	136	+ cGridBag row2 = new cGridBag();
	137	+ cGridBag row3 = new cGridBag();
	138	+ cGridBag row4 = new cGridBag();
	139	+ cGridBag row5 = new cGridBag();
	140	+ cGridBag row6 = new cGridBag();
	141	+
	142	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	143	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	144	+ AddSkyboxButton("beach", "PalmTrees", row0);
	145	+ AddSkyboxButton("beach", "Tenerife", row0);
	146	+
	147	+ AddSkyboxButton("beach", "Tenerife2", row1);
	148	+ AddSkyboxButton("beach", "Tenerife3", row1);
	149	+ AddSkyboxButton("field", "FishPond", row1);
	150	+ AddSkyboxButton("field", "Footballfield", row1);
	151	+
	152	+ AddSkyboxButton("field", "Meadow", row2);
	153	+ AddSkyboxButton("field", "Sorsele", row2);
	154	+ AddSkyboxButton("field", "Sorsele2", row2);
	155	+ AddSkyboxButton("field", "Sorsele3", row2);
	156	+
	157	+ AddSkyboxButton("forest", "Brudslojan", row3);
	158	+ AddSkyboxButton("forest", "Langholmen2", row3);
	159	+ AddSkyboxButton("forest", "Plants", row3);
	160	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	161	+
	162	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	163	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	164	+ AddSkyboxButton("mountain", "Teide", row4);
	165	+ AddSkyboxButton("park", "Tantolunden4", row4);
	166	+
	167	+ AddSkyboxButton("park", "Stairs", row5);
	168	+ AddSkyboxButton("default", "skycube", row6);
	169	+ AddSkyboxButton("rocky", "Langholmen", row5);
	170	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	171	+
	172	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	173	+ AddSkyboxButton("default", "CloudyHills", row6);
	174	+ AddSkyboxButton("daz", "Autumn", row6);
	175	+ AddSkyboxButton("daz", "MountainTrail", row6);
	176	+ /*
	177	+Autumn
	178	+Greenlands
	179	+MountainTrail
	180	+Oasis
	181	+TheRock
	182	+TopOfTheWorld
	183	+Winter
	184	+ */
	185	+
	186	+ tab0.add(row0);
	187	+ tab0.add(row1);
	188	+ tab0.add(row2);
	189	+ tab0.add(row3);
	190	+ tab0.add(row4);
	191	+ tab0.add(row5);
	192	+ tab0.add(row6);
	193	+
	194	+ for (int i=5; --i>=0;)
	195	+ {
	196	+ //oe.toolboxPanel.Return();
	197	+ //tab0.add(new cGridBag());
	198	+ }
	199	+ }
	200	+
	201	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	202	+ {
	203	+ cGridBag tab0 = new cGridBag().setVertical(true);
	204	+
	205	+ tab0.setName("Night");
	206	+ skyboxpanel.add(tab0);
	207	+
	208	+ cGridBag row0 = new cGridBag();
	209	+ cGridBag row1 = new cGridBag();
	210	+ cGridBag row2 = new cGridBag();
	211	+ cGridBag row3 = new cGridBag();
	212	+ cGridBag row4 = new cGridBag();
	213	+ cGridBag row5 = new cGridBag();
	214	+ cGridBag row6 = new cGridBag();
	215	+
	216	+ AddSkyboxButton("night", "NightPath", row0);
	217	+ AddSkyboxButton("night", "PondNight", row0);
	218	+ AddSkyboxButton("night", "Powerlines", row0);
	219	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	220	+
	221	+ AddSkyboxButton("urban", "CNTower", row1);
	222	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	223	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	224	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
	225	+
	226	+ AddSkyboxButton("penguins", "kenon_star", row2);
	227	+ AddSkyboxButton("persson", "corona", row2);
	228	+ AddSkyboxButton("persson", "spaceskybox", row2);
	229	+ AddSkyboxButton("indoors", "Vasa", row2);
	230	+
	231	+ AddSkyboxButton("winter", "Backyard", row3);
	232	+ AddSkyboxButton("winter", "Creek", row3);
	233	+ AddSkyboxButton("winter", "FootballField3", row3);
	234	+ AddSkyboxButton("winter", "Forest", row3);
	235	+
	236	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	237	+ AddSkyboxButton("winter", "House", row4);
	238	+ AddSkyboxButton("winter", "IceLake", row4);
	239	+ AddSkyboxButton("winter", "IceRiver", row4);
	240	+
	241	+ AddSkyboxButton("winter", "Park3", row5);
	242	+ AddSkyboxButton("winter", "PondWinter", row5);
	243	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	244	+ AddSkyboxButton("winter", "Vindelalven", row5);
	245	+
	246	+ AddSkyboxButton("daz", "TheRock", row6);
	247	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	248	+ AddSkyboxButton("daz", "Winter", row6);
	249	+ AddSkyboxButton("mountain", "Ryfjallet", row6);
	250	+
	251	+ tab0.add(row0);
	252	+ tab0.add(row1);
	253	+ tab0.add(row2);
	254	+ tab0.add(row3);
	255	+ tab0.add(row4);
	256	+ tab0.add(row5);
	257	+ tab0.add(row6);
	258	+
	259	+ for (int i=5; --i>=0;)
	260	+ {
	261	+ //oe.toolboxPanel.Return();
	262	+ //tab0.add(new cGridBag());
	263	+ }
	264	+ }
	265	+
	266	+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
	267	+ {
	268	+ cGridBag tab0 = new cGridBag().setVertical(true);
	269	+
	270	+ tab0.setName("Others");
	271	+ skyboxpanel.add(tab0);
	272	+
	273	+ cGridBag row0 = new cGridBag();
	274	+ cGridBag row1 = new cGridBag();
	275	+ cGridBag row2 = new cGridBag();
	276	+ cGridBag row3 = new cGridBag();
	277	+ cGridBag row4 = new cGridBag();
	278	+ cGridBag row5 = new cGridBag();
	279	+ cGridBag row6 = new cGridBag();
	280	+
	281	+ AddSkyboxButton("mayhem", "afterrain", row0);
	282	+ AddSkyboxButton("mayhem", "aqua4", row0);
	283	+ AddSkyboxButton("mayhem", "aqua9", row0);
	284	+ AddSkyboxButton("mayhem", "flame", row0);
	285	+
	286	+ AddSkyboxButton("mayhem", "h2s", row1);
	287	+ AddSkyboxButton("mayhem", "prehistoric", row1);
	288	+ AddSkyboxButton("mayhem", "scorched", row1);
	289	+ AddSkyboxButton("penguins", "desertdawn", row1);
	290	+
	291	+ AddSkyboxButton("persson", "Citadella", row2);
	292	+ AddSkyboxButton("persson", "Citadella2", row2);
	293	+ AddSkyboxButton("persson", "clouds1", row2);
	294	+ AddSkyboxButton("penguins", "wrath", row2);
	295	+
	296	+ AddSkyboxButton("persson", "FishermansBastion", row3);
	297	+ AddSkyboxButton("persson", "HeroesSquare", row3);
	298	+ AddSkyboxButton("indoors", "DallasW", row3);
	299	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
	300	+
	301	+ AddSkyboxButton("persson", "LancellottiChapel", row4);
	302	+ AddSkyboxButton("persson", "PereaBeach1", row4);
	303	+ AddSkyboxButton("persson", "PereaBeach2", row4);
	304	+ AddSkyboxButton("persson", "redeclipse", row4);
	305	+
	306	+ AddSkyboxButton("daz", "Greenlands", row5);
	307	+ AddSkyboxButton("daz", "Oasis", row5);
	308	+ AddSkyboxButton("elyvisions", "arch3", row5);
	309	+ AddSkyboxButton("elyvisions", "calm_sea", row5);
	310	+
	311	+ AddSkyboxButton("elyvisions", "rainbow", row6);
	312	+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
	313	+ AddSkyboxButton("elyvisions", "heaven", row6);
	314	+ AddSkyboxButton("elyvisions", "hot", row6);
	315	+
	316	+ tab0.add(row0);
	317	+ tab0.add(row1);
	318	+ tab0.add(row2);
	319	+ tab0.add(row3);
	320	+ tab0.add(row4);
	321	+ tab0.add(row5);
	322	+ tab0.add(row6);
	323	+
	324	+ for (int i=5; --i>=0;)
	325	+ {
	326	+ //oe.toolboxPanel.Return();
	327	+ //tab0.add(new cGridBag());
	328	+ }
	329	+ }
	330	+
	331	+ public void ChangeSkybox(String skybox)
	332	+ {
	333	+ //cameraView.envyoff = false;
	334	+ group.skyboxname = skybox;
	335	+ group.skyboxext = "jpg";
	336	+ cameraView.repaint();
	337	+ }
	338	+
	339	+ public void CreateSkyboxPanel(cGridBag skyboxPanel)
	340	+ {
	341	+ JTabbedPane skyboxpane = new JTabbedPane();
	342	+
	343	+ AddSkyboxTab0(skyboxpane);
	344	+ AddSkyboxTab1(skyboxpane);
	345	+ AddSkyboxTab2(skyboxpane);
	346	+ AddSkyboxTab3(skyboxpane);
	347	+
	348	+ skyboxPanel.add(skyboxpane);
	349	+ }
	350	+
	351	+ public void ChangeTexture(String texture)
	352	+ {
	353	+ for (int i=0; i<group.selection.size(); i++)
	354	+ {
	355	+ Object3D obj = group.selection.get(i);
	356	+ obj.SetPigmentTexture("@" + texture);
	357	+ }
	358	+
	359	+ refreshContents();
	360	+ }
	361	+
	362	+ public void Show3DView()
	363	+ {
	364	+ // bug
	365	+ //gridPanel.setDividerLocation(1.0);
	366	+ //bigPanel.setDividerLocation(0.0);
	367	+ bigThree.ClearUI();
	368	+ bigThree.add(centralPanel);
	369	+ bigThree.FlushUI();
	370	+ }
	371	+
25	372	//ObjEditor objEditor;
26	373	public void closeUI2()
27	374	{
..	..	@@ -59,6 +406,14 @@
59	406	this.copy = this.group = group;
60	407	//selectees = this.group.selectees;
61	408
	409	+ if (copy.versionlist == null)
	410	+ {
	411	+ copy.versionlist = new Object3D[100];
	412	+ copy.versionindex = -1;
	413	+
	414	+ Save(true);
	415	+ }
	416	+
62	417	if(ui)
63	418	SetupUI(objEditor);
64	419	}
..	..	@@ -73,16 +428,28 @@
73	428	this.copy = this.group = copy;
74	429	//selectees = this.group.selectees;
75	430
76		- SetupMenu2(objEditor);
	431	+ SetupMenu2(this); //objEditor);
77	432	SetupUI2(objEditor);
78	433	objEditor.SetupUI(true);
79	434	SetupViews(objEditor);
80	435
81	436	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	437	+
	438	+ if (copy.versionlist == null)
	439	+ {
	440	+ copy.versionlist = new Object3D[100];
	441	+ copy.versionindex = -1;
	442	+
	443	+ Save(true);
	444	+ }
82	445	}
83	446
84	447	void CloneSelection(boolean supports)
85	448	{
	449	+ if (Globals.REPLACEONMAKE)
	450	+ Save();
	451	+ boolean keep = Globals.REPLACEONMAKE;
	452	+ Globals.REPLACEONMAKE = false;
86	453	// Object3D keep = GrafreeD.clipboard;
87	454	//Object3D obj;
88	455	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -93,18 +460,19 @@
93	460
94	461	makeSomething(clone, i==group.selection.size()-1);
95	462	}
	463	+ Globals.REPLACEONMAKE = keep;
96	464	}
97	465
98	466	void CloneClipboard(boolean supports)
99	467	{
100		- assert(GrafreeD.clipboard.parent == null);
101		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
102		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
103		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
104		- makeSomething(CloneObject(GrafreeD.clipboard.get(0), false));
	468	+ assert(Grafreed.clipboard.parent == null);
	469	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	470	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	471	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	472	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
105	473	else
106		- makeSomething(CloneObject(GrafreeD.clipboard, false));
107		- GrafreeD.clipboard.get(0).parent = keepparent;
	474	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	475	+ Grafreed.clipboard.get(0).parent = keepparent;
108	476	}
109	477
110	478	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -118,7 +486,7 @@
118	486	// obj.support = null;
119	487	if (!supports)
120	488	obj.SaveSupports();
121		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	489	+ Object3D clone = (Object3D)Grafreed.clone(obj);
122	490	obj.parent = parent;
123	491	// obj.support = support;
124	492	// clone.support = support; // aout 2013
..	..	@@ -147,30 +515,29 @@
147	515
148	516	//JTextField nameField;
149	517
150		- void SetupMenu2(ObjEditor oe)
	518	+ void SetupMenu2(GroupEditor oe)
151	519	{
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);
	520	+ oe.jTree = new cTree();
	521	+
163	522	Menu menu;
164	523	oe.menuBar.add(menu = new Menu("Edit"));
165	524	//editItem = menu.add(new MenuItem("Edit"));
166	525	//editItem.addActionListener(this);
167		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	526	+
	527	+// undoItem = menu.add(new MenuItem("Undo"));
	528	+// undoItem.addActionListener(this);
	529	+// redoItem = menu.add(new MenuItem("Redo"));
	530	+// redoItem.addActionListener(this);
	531	+// menu.add("-");
	532	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
168	533	duplicateItem.addActionListener(this);
169		- menu.add("-");
170	534	cloneItem = menu.add(new MenuItem("Clone"));
171	535	cloneItem.addActionListener(this);
	536	+ if (Globals.ADVANCED)
	537	+ {
172	538	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
173	539	cloneSupportItem.addActionListener(this);
	540	+ }
174	541	menu.add("-");
175	542	cutItem = menu.add(new MenuItem("Cut"));
176	543	cutItem.addActionListener(this);
..	..	@@ -178,27 +545,121 @@
178	545	copyItem.addActionListener(this);
179	546	pasteItem = menu.add(new MenuItem("Paste"));
180	547	pasteItem.addActionListener(this);
	548	+
	549	+ menu.add("-");
	550	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	551	+ pasteIntoItem.addActionListener(this);
181	552	pasteLinkItem = menu.add(new MenuItem("Paste link"));
182	553	pasteLinkItem.addActionListener(this);
183	554	pasteCloneItem = menu.add(new MenuItem("Paste clone"));
184	555	pasteCloneItem.addActionListener(this);
185	556	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
186	557	// pasteExpandItem.addActionListener(this);
187		- clearItem = menu.add(new MenuItem("Clear"));
188		- clearItem.addActionListener(this);
	558	+ menu.add("-");
	559	+ deleteItem = menu.add(new MenuItem("Delete"));
	560	+ deleteItem.addActionListener(this);
	561	+
	562	+ if (Globals.ADVANCED)
	563	+ {
	564	+ // Deletes the cameras...
189	565	clearAllItem = menu.add(new MenuItem("Clear All"));
190	566	clearAllItem.addActionListener(this);
	567	+ }
	568	+
	569	+ menuBar.add(cameraMenu = new Menu("View"));
	570	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	571	+ //zBufferItem.addActionListener(this);
	572	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	573	+ //normalLensItem.addActionListener(this);
	574	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	575	+ restoreCameraItem.addActionListener(this);
	576	+
	577	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	578	+// toggleFullScreenItem.addItemListener(this);
	579	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	580	+// cameraMenu.add("-");
	581	+//
	582	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	583	+// toggleTextureItem.addItemListener(this);
	584	+// toggleTextureItem.setState(CameraPane.textureon);
	585	+//
	586	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	587	+// toggleSwitchItem.addItemListener(this);
	588	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	589	+
	590	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	591	+ toggleHandleItem.addItemListener(this);
	592	+ toggleHandleItem.setState(CameraPane.HANDLES);
	593	+
	594	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	595	+ togglePaintItem.addItemListener(this);
	596	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	597	+
	598	+ if (Globals.ADVANCED)
	599	+ {
	600	+ cameraMenu.add("-");
	601	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	602	+ toggleLiveItem.addItemListener(this);
	603	+ toggleLiveItem.setState(Globals.isLIVE());
191	604
	605	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	606	+ stepItem.addActionListener(this);
	607	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	608	+ // toggleDLItem.addItemListener(this);
	609	+ // toggleDLItem.setState(false);
	610	+
	611	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	612	+ toggleRenderItem.addItemListener(this);
	613	+ toggleRenderItem.setState(!CameraPane.frozen);
	614	+
	615	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	616	+ toggleDebugItem.addItemListener(this);
	617	+ toggleDebugItem.setState(Globals.DEBUG);
	618	+
	619	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	620	+ toggleFrustumItem.addItemListener(this);
	621	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	622	+
	623	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	624	+ toggleFootContactItem.addItemListener(this);
	625	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	626	+
	627	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	628	+ toggleTimelineItem.addItemListener(this);
	629	+ }
	630	+
	631	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	632	+// toggleRootItem.addItemListener(this);
	633	+// toggleRootItem.setState(false);
	634	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	635	+// animationItem.addItemListener(this);
	636	+// animationItem.setState(CameraPane.ANIMATION);
	637	+ cameraMenu.add("-");
	638	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	639	+ editCameraItem.addActionListener(this);
	640	+
	641	+ if (Globals.ADVANCED)
	642	+ {
	643	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	644	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	645	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	646	+ oe.cameraMenu.add("-");
	647	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	648	+ openWindowItem.addActionListener(this);
	649	+ lookAtItem.addActionListener(this);
	650	+ //lookFromItem.addActinoListener(this);
	651	+ //switchViewItem.addActionListener(this);
	652	+ }
	653	+
192	654	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);
	655	+ if (Globals.ADVANCED)
	656	+ {
197	657	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
198	658	revertMeshItem.addActionListener(this);
199	659	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
200	660	resetreferencesItem.addActionListener(this);
201	661	menu.add("-");
	662	+ }
202	663	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
203	664	overwriteGeoItem.addActionListener(this);
204	665	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -210,73 +671,104 @@
210	671	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211	672	overwriteUVItem.addActionListener(this);
212	673	menu.add("-");
	674	+ if (Globals.ADVANCED)
	675	+ {
213	676	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214	677	generateMeshItem.addActionListener(this);
215	678	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216	679	poseMeshItem.addActionListener(this);
217	680	menu.add("-");
	681	+ }
218	682	resetsupportItem = menu.add(new MenuItem("Reset support"));
219	683	resetsupportItem.addActionListener(this);
220	684	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	685	linkverticesItem.addActionListener(this);
	686	+ relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
	687	+ relinkverticesItem.addActionListener(this);
	688	+
	689	+ if (Globals.ADVANCED)
	690	+ {
222	691	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
223	692	setMasterItem.addActionListener(this);
	693	+ }
224	694
225	695	oe.menuBar.add(menu = new Menu("Group"));
226		- grabItem = menu.add(new MenuItem("Grab"));
227		- grabItem.addActionListener(this);
	696	+// grabItem = menu.add(new MenuItem("Grab"));
	697	+// grabItem.addActionListener(this);
228	698	backItem = menu.add(new MenuItem("Back"));
229	699	backItem.addActionListener(this);
230	700	frontItem = menu.add(new MenuItem("Front"));
231	701	frontItem.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);
	702	+// compositeItem = menu.add(new MenuItem("Composite"));
	703	+// compositeItem.addActionListener(this);
	704	+
	705	+ if (Globals.ADVANCED)
	706	+ {
	707	+ hideItem = menu.add(new MenuItem("Hidden Group"));
	708	+ hideItem.addActionListener(this);
	709	+ }
	710	+ ungroupItem = menu.add(new MenuItem("Ungroup"));
	711	+ ungroupItem.addActionListener(this);
	712	+
	713	+// menu.add("-");
	714	+//
	715	+// switchItem = menu.add(new MenuItem("Switch node"));
	716	+// switchItem.addActionListener(this);
	717	+ if (Globals.ADVANCED)
	718	+ {
241	719	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
242	720	switchGeoItem.addActionListener(this);
243	721	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
244	722	switchTransfoItem.addActionListener(this);
245		- morphItem = menu.add(new MenuItem("Morph"));
	723	+ morphItem = menu.add(new MenuItem("Morph Group"));
246	724	morphItem.addActionListener(this);
	725	+
	726	+ menu.add("-");
	727	+ physicsItem = menu.add(new MenuItem("Physics"));
	728	+ physicsItem.addActionListener(this);
	729	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	730	+ frameselectorItem.addActionListener(this);
247	731	scriptNodeItem = menu.add(new MenuItem("Script Node"));
248	732	scriptNodeItem.addActionListener(this);
249		- cameraItem = menu.add(new MenuItem("Camera"));
250		- cameraItem.addActionListener(this);
	733	+ }
251	734
252	735	oe.menuBar.add(menu = new Menu("Object"));
253		- textureItem = menu.add(new MenuItem("Texture"));
254		- textureItem.addActionListener(this);
	736	+// textureItem = menu.add(new MenuItem("Texture"));
	737	+// textureItem.addActionListener(this);
	738	+ billboardItem = menu.add(new MenuItem("Billboard"));
	739	+ billboardItem.addActionListener(this);
255	740	csgItem = menu.add(new MenuItem("CSG"));
256	741	csgItem.addActionListener(this);
257		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	742	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
258	743	shadowXItem.addActionListener(this);
259		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	744	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
260	745	shadowYItem.addActionListener(this);
261		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	746	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
262	747	shadowZItem.addActionListener(this);
	748	+ attributeItem = menu.add(new MenuItem("Attribute"));
	749	+ attributeItem.addActionListener(this);
	750	+
	751	+ if (Globals.ADVANCED)
	752	+ {
	753	+ menu.add("-");
263	754	linkerItem = menu.add(new MenuItem("Linker"));
264	755	linkerItem.addActionListener(this);
265	756	templateItem = menu.add(new MenuItem("Template"));
266	757	templateItem.addActionListener(this);
267		- attributeItem = menu.add(new MenuItem("Attribute"));
268		- attributeItem.addActionListener(this);
269	758	pointflowItem = menu.add(new MenuItem("Point Flow"));
270	759	pointflowItem.addActionListener(this);
	760	+ }
271	761	menu.add("-");
272		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
273		- transformgeometryItem.addActionListener(this);
274	762	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
275	763	resetTransformItem.addActionListener(this);
276	764	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
277	765	resetCentroidItem.addActionListener(this);
278		- ungroupItem = menu.add(new MenuItem("Ungroup"));
279		- ungroupItem.addActionListener(this);
	766	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	767	+ resetCentroidXZItem.addActionListener(this);
	768	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	769	+ transformGeometryItem.addActionListener(this);
	770	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	771	+ transformChildrenItem.addActionListener(this);
280	772
281	773	oe.menuBar.add(menu = new Menu("Geometry"));
282	774	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -287,6 +779,11 @@
287	779	genNormalsCADItem.addActionListener(this);
288	780	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
289	781	genNormalsMESHItem.addActionListener(this);
	782	+ if (Globals.ADVANCED)
	783	+ {
	784	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
	785	+ genNormalsMINEItem.addActionListener(this);
	786	+ }
290	787	stripifyItem = menu.add(new MenuItem("Stripify"));
291	788	stripifyItem.addActionListener(this);
292	789	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -308,23 +805,34 @@
308	805	reduce34MeshItem.addActionListener(this);
309	806	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
310	807	increaseMeshItem.addActionListener(this);
311		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
312		- smoothMeshItem.addActionListener(this);
313	808	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
314	809	clipMeshItem.addActionListener(this);
	810	+
	811	+ if (Globals.ADVANCED)
	812	+ {
	813	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	814	+ smoothMeshItem.addActionListener(this);
	815	+ }
315	816
316	817	oe.menuBar.add(menu = new Menu("Attributes"));
317	818	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
318	819	clearMaterialsItem.addActionListener(this);
	820	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	821	+ resetAllItem.addActionListener(this);
	822	+ stepAllItem = menu.add(new MenuItem("Step All"));
	823	+ stepAllItem.addActionListener(this);
319	824	menu.add("-");
320	825	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
321	826	liveleavesItem.addActionListener(this);
322	827	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
323	828	unliveleavesItem.addActionListener(this);
	829	+ if (Globals.ADVANCED)
	830	+ {
324	831	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
325	832	supportleavesItem.addActionListener(this);
326	833	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
327	834	unsupportleavesItem.addActionListener(this);
	835	+ }
328	836	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
329	837	hideleavesItem.addActionListener(this);
330	838	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -333,6 +841,14 @@
333	841	markleavesItem.addActionListener(this);
334	842	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
335	843	unmarkleavesItem.addActionListener(this);
	844	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	845	+ rewindleavesItem.addActionListener(this);
	846	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	847	+ unrewindleavesItem.addActionListener(this);
	848	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	849	+ randomleavesItem.addActionListener(this);
	850	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	851	+ unrandomleavesItem.addActionListener(this);
336	852	menu.add("-");
337	853	flipVItem = menu.add(new MenuItem("Flip V"));
338	854	flipVItem.addActionListener(this);
..	..	@@ -358,53 +874,129 @@
358	874	attachBumpItem.addActionListener(this);
359	875	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
360	876	pigmentBumpItem.addActionListener(this);
	877	+ //embedTexturesItem
361	878	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
362	879	detachPigmentItem.addActionListener(this);
363	880	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
364	881	detachBumpItem.addActionListener(this);
	882	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	883	+ embedTexturesItem.addActionListener(this);
	884	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	885	+ deEmbedTexturesItem.addActionListener(this);
365	886	menu.add("-");
366	887	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
367	888	sortbysizeItem.addActionListener(this);
368	889	sortbynameItem = menu.add(new MenuItem("Sort by name"));
369	890	sortbynameItem.addActionListener(this);
370	891	menu.add("-");
	892	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	893	+ shareGeometriesItem.addActionListener(this);
	894	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	895	+ mergeGeometriesItem.addActionListener(this);
	896	+ menu.add("-");
	897	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	898	+ editLeafItem.addActionListener(this);
	899	+ if (Globals.ADVANCED)
	900	+ {
	901	+ // Pretty much the same as duplicate and clone.
371	902	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
372	903	extractGeometriesItem.addActionListener(this);
373	904	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
374	905	cloneGeometriesItem.addActionListener(this);
375		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
376		- shareGeometriesItem.addActionListener(this);
377		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
378		- mergeGeometriesItem.addActionListener(this);
	906	+ }
379	907
380	908	oe.menuBar.add(menu = new Menu("Insert"));
381	909	buildCreateMenu(menu);
382	910
383		-
384		- oe.menuBar.add(menu = new Menu("Include"));
385		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
386		- importGFDItem.addActionListener(this);
387		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
388		- importVRMLX3DItem.addActionListener(this);
389		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
390		- importOBJItem.addActionListener(this);
391		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
392		- import3DSItem.addActionListener(this);
393		-
394	911	oe.menuBar.add(menu = new Menu("Tools"));
395	912	buildToolsMenu(menu);
396	913	}
397	914
	915	+ JTabbedPane resourcecontainer;
	916	+ cGridBag currenttab;
	917	+ boolean added; // patch for jar
	918	+
	919	+ int tabcount = 0;
	920	+ int colcount = 0;
	921	+ int rowcount = 0;
	922	+ int texturecount = 0;
	923	+
	924	+ int columns = 5;
	925	+ int rows = 7;
	926	+
	927	+ public void ResourceCallBack(String[] path)
	928	+ {
	929	+// for (int i = 0; i < path.length; i++)
	930	+// System.out.print(path[i] + "/");
	931	+// System.out.println();
	932	+
	933	+ if (//rowcount == 0 \|\|
	934	+ path.length == 1)
	935	+ {
	936	+ currenttab = new cGridBag();
	937	+ added = false;
	938	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	939	+ currenttab.setName(tabname);
	940	+ rowcount = 1;
	941	+ colcount = 0;
	942	+ texturecount = 0;
	943	+ }
	944	+
	945	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	946	+ {
	947	+ if (!added)
	948	+ {
	949	+ added = true;
	950	+ resourcecontainer.add(currenttab);
	951	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	952	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	953	+ }
	954	+
	955	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	956	+
	957	+ if (++colcount >= columns)
	958	+ {
	959	+ colcount = 0;
	960	+ currenttab.Return();
	961	+
	962	+ if (rowcount++ >= rows)
	963	+ {
	964	+ rowcount = 0;
	965	+ }
	966	+ }
	967	+ }
	968	+ else
	969	+ {
	970	+// if (!path[path.length-1].equals("icons"))
	971	+// resourcecontainer.Return();
	972	+ }
	973	+ }
	974	+
	975	+ void CreateTexturePanel(cGridBag container)
	976	+ {
	977	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	978	+ container.add(resourcecontainer);
	979	+
	980	+ Grafreed.ParseResources("textures", this);
	981	+ }
	982	+
398	983	void SetupUI2(ObjEditor oe)
399	984	{
	985	+ // June 2019
	986	+ if (oe == null)
	987	+ {
	988	+ //super.SetupUI2(this);
	989	+ //return;
	990	+ }
	991	+
	992	+ if (copy != group)
	993	+ {
	994	+ //super.SetupUI2(this);
	995	+ }
	996	+
400	997	//new Exception().printStackTrace();
401	998
402	999	oe.radioPanel = new JPanel(new GridBagLayout());
403		- oe.aConstraints.weightx = 1;
404		- oe.aConstraints.weighty = 0;
405		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
406		- oe.aConstraints.gridwidth = 100;
407		- oe.aConstraints.gridheight = 1;
408	1000	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
409	1001
410	1002	oe.buttonGroup = new ButtonGroup();
..	..	@@ -425,150 +1017,263 @@
425	1017	oe.radioPanel.add(dummyButton);
426	1018	oe.buttonGroup.add(dummyButton);
427	1019	*/
428		- aConstraints.gridy += 1;
429		- oe.aConstraints.gridwidth = 1;
430		- oe.aConstraints.gridx = 0;
	1020	+ cGridBag copyOptionsPanel = new cGridBag();
	1021	+
	1022	+ copyOptionsPanel.preferredHeight = 2;
431	1023
432		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
	1024	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
	1025	+
	1026	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1027	+ //minButton.setToolTipText("Minimize window");
	1028	+ //minButton.addActionListener(this);
	1029	+
	1030	+ if (Globals.ADVANCED)
	1031	+ {
	1032	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1033	+// maxButton.setToolTipText("Maximize window");
	1034	+// maxButton.addActionListener(this);
	1035	+ }
	1036	+
	1037	+// cButton gcButton;
	1038	+//
	1039	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1040	+// gcButton.setToolTipText("Garbage collect");
	1041	+// gcButton.addActionListener(new ActionListener()
	1042	+// {
	1043	+// public void actionPerformed(ActionEvent e)
	1044	+// {
	1045	+// System.gc();
	1046	+// }
	1047	+// });
	1048	+
	1049	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1050	+ collapseButton.setToolTipText("Collapse toolbar");
	1051	+ collapseButton.addActionListener(this);
	1052	+
	1053	+ oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1054	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1055	+ maximize3DButton.addActionListener(this);
	1056	+
	1057	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1058	+ twoButton.setToolTipText("Show 3D view only");
	1059	+ twoButton.addActionListener(this);
	1060	+ this.fullscreenLayout = twoButton;
	1061	+
	1062	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1063	+ threeButton.setToolTipText("Show controls and 3D view");
	1064	+ threeButton.addActionListener(this);
	1065	+ if (Globals.ADVANCED)
	1066	+ {
	1067	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1068	+ sixButton.setToolTipText("Show 3D view and controls");
	1069	+ sixButton.addActionListener(this);
	1070	+ }
	1071	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1072	+// sevenButton.setToolTipText("3-column layout");
	1073	+// sevenButton.addActionListener(this);
	1074	+ //
	1075	+
	1076	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1077	+ fullButton.setToolTipText("Full-screen window");
	1078	+ fullButton.addActionListener(this);
	1079	+
	1080	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1081	+ screenfitButton.setToolTipText("Screen fit");
	1082	+ screenfitButton.addActionListener(this);
	1083	+
	1084	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1085	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1086	+ restoreCameraButton.addActionListener(this);
	1087	+
	1088	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1089	+ saveVersionButton.setToolTipText("Duplicate current version");
	1090	+ saveVersionButton.addActionListener(this);
	1091	+
	1092	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1093	+ deleteVersionButton.setToolTipText("Delete current version");
	1094	+ deleteVersionButton.addActionListener(this);
	1095	+
	1096	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1097	+ previousVersionButton.setToolTipText("Previous version");
	1098	+ previousVersionButton.addActionListener(this);
	1099	+ previousVersionButton.setEnabled(false);
	1100	+
	1101	+ cGridBag updown = new cGridBag().setVertical(true);
	1102	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1103	+ restoreButton.setToolTipText("Undo (restore current version)");
	1104	+ restoreButton.addActionListener(this);
	1105	+ //restoreButton.setEnabled(false);
	1106	+
	1107	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1108	+ replaceButton.setToolTipText("Save (replace current version)");
	1109	+ replaceButton.addActionListener(this);
	1110	+ //replaceButton.setEnabled(false);
	1111	+
	1112	+ copyOptionsPanel.add(updown);
	1113	+
	1114	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1115	+ nextVersionButton.setToolTipText("Next version");
	1116	+ nextVersionButton.addActionListener(this);
	1117	+ nextVersionButton.setEnabled(false);
	1118	+
	1119	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1120	+ oneStepButton.setToolTipText("Animate one step forward");
	1121	+ oneStepButton.addActionListener(this);
	1122	+
	1123	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1124	+ liveCB.setToolTipText("Enable animation");
433	1125	liveCB.addItemListener(this);
434	1126
435		- oe.aConstraints.gridx += 1;
436		- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
437		- supportCB.addItemListener(this);
438		-
439		- // oe.aConstraints.gridx += 1;
440		- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
441		- // localCB.addItemListener(this);
442		-
443		- oe.aConstraints.gridx += 1;
444		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", CameraPane.CROWD), oe.aConstraints);
445		- crowdCB.addItemListener(this);
446		-
447		- oe.aConstraints.gridx += 1;
448		- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
449		- smoothCB.addItemListener(this);
450		-
451		- oe.aConstraints.gridx += 1;
452		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
	1127	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	1128	+ fastCB.setToolTipText("Fast mode");
453	1129	fastCB.addItemListener(this);
454		- oe.aConstraints.gridx += 1;
455		- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
456		- slowCB.addItemListener(this);
457		- oe.aConstraints.gridx += 1;
458		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.FAST), oe.aConstraints);
459		- boxCB.addItemListener(this);
	1130	+
	1131	+ //oe.toolboxPanel.Return();
	1132	+
	1133	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1134	+// trackCB.setToolTipText("Enable tracking");
	1135	+// trackCB.addItemListener(this);
460	1136
461		-// oe.aConstraints.gridx += 1;
462		-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
463		-// speakerMocapCB.addItemListener(this);
464		-
465		- if (false)
466		- {
467		- // handled in scripts
468		- oe.aConstraints.gridx += 1;
469		- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
470		- speakerCameraCB.addItemListener(this);
471		-
472		- oe.aConstraints.gridx += 1;
473		- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
474		- speakerFocusCB.addItemListener(this);
475		-
476		- oe.aConstraints.gridx += 1;
477		- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
478		- smoothfocusCB.addItemListener(this);
479		- }
480		-
481		-//oe.aConstraints.gridx += 1;
482		-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
483		-// debugCB.addItemListener(this);
484		-
485		- oe.aConstraints.gridx += 1;
486		- oe.toolbarPanel.add(oeilCB = new cCheckBox("O", CameraPane.OEIL), oe.aConstraints);
487		- oeilCB.addItemListener(this);
488		-
489		- oe.aConstraints.gridx += 1;
490		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("T", CameraPane.LOOKAT), oe.aConstraints);
491		- lookAtCB.addItemListener(this);
492		-
493		- oe.aConstraints.gridx += 1;
494		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
495		- trackCB.addItemListener(this);
496		-
497		- oe.aConstraints.gridx += 1;
498		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
499		- screenfitButton.addActionListener(this);
500		- oe.aConstraints.gridx += 1;
501	1137	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
502	1138	// screenfitpointButton.addActionListener(this);
503		-// oe.aConstraints.gridx += 1;
504		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
505		- snapobjectButton.addActionListener(this);
506		- oe.aConstraints.gridx += 1;
507	1139
508		- //aConstraints.gridx = 0;
509		- //aConstraints.gridy += 1;
510		- oe.aConstraints.weighty = 0;
511		- oe.aConstraints.gridwidth = 1;
512		-
513		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
514		- flashSelectionButton.addActionListener(this);
515		- oe.aConstraints.gridx += 1;
516		- oe.aConstraints.weighty = 0;
517		- oe.aConstraints.gridwidth = 1;
518		-
519		- //
520		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
521		- twoButton.addActionListener(this);
522		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	1140	+ if (Globals.ADVANCED)
	1141	+ {
	1142	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1143	+ snapobjectButton.addActionListener(this);
	1144	+ snapobjectButton.setToolTipText("Snap Object");
	1145	+
	1146	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
523	1147	fourButton.addActionListener(this);
524		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
525		- sixButton.addActionListener(this);
526		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
527		- threeButton.addActionListener(this);
528		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
529		- sevenButton.addActionListener(this);
530		- //
	1148	+ fourButton.setToolTipText("Show control panel only");
	1149	+ }
531	1150
532		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	1151	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	1152	+
	1153	+
	1154	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1155	+ rootButton.setToolTipText("Open selection in new tab");
533	1156	rootButton.addActionListener(this);
534		- oe.aConstraints.gridx += 1;
535		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	1157	+
	1158	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1159	+ closeButton.setToolTipText("Close tab");
536	1160	closeButton.addActionListener(this);
537	1161	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
538	1162	//clearButton.addActionListener(this);
539		- oe.aConstraints.gridx += 1;
540		-
541		- oe.aConstraints.gridx = 1; //
542		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
543		- editButton.addActionListener(this);
544		- oe.aConstraints.gridx += 1;
545		- oe.aConstraints.weighty = 0;
546		- oe.aConstraints.gridwidth = 1;
547	1163
548		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	1164	+ cGridBag row1 = new cGridBag();
	1165	+
	1166	+ // INSERT
	1167	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1168	+ gridButton.setToolTipText("Create ground");
	1169	+ gridButton.addActionListener(this);
	1170	+
	1171	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1172	+ boxButton.setToolTipText("Create box");
	1173	+ boxButton.addActionListener(this);
	1174	+
	1175	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1176	+ sphereButton.setToolTipText("Create sphere");
	1177	+ sphereButton.addActionListener(this);
	1178	+
	1179	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1180	+ coneButton.setToolTipText("Create cone");
	1181	+ coneButton.addActionListener(this);
	1182	+
	1183	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1184	+ torusButton.setToolTipText("Create torus");
	1185	+ torusButton.addActionListener(this);
	1186	+
	1187	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1188	+ superButton.setToolTipText("Create superellipsoid");
	1189	+ superButton.addActionListener(this);
	1190	+
	1191	+ if (Globals.ADVANCED)
	1192	+ {
	1193	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1194	+ kleinButton.setToolTipText("Create Klein bottle");
	1195	+ kleinButton.addActionListener(this);
	1196	+ }
	1197	+
	1198	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1199	+ particlesButton.setToolTipText("Create particle system");
	1200	+ particlesButton.addActionListener(this);
	1201	+
	1202	+ oe.toolboxPanel.add(row1);
	1203	+
	1204	+ cGridBag row2 = new cGridBag();
	1205	+
	1206	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1207	+ groupButton.setToolTipText("Create group");
	1208	+ groupButton.addActionListener(this);
	1209	+
	1210	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1211	+ compositeButton.setToolTipText("Create composite");
	1212	+ compositeButton.addActionListener(this);
	1213	+
	1214	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1215	+ switchButton.setToolTipText("Create item switcher");
	1216	+ switchButton.addActionListener(this);
	1217	+
	1218	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1219	+ loopButton.setToolTipText("Create loop");
	1220	+ loopButton.addActionListener(this);
	1221	+
	1222	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1223	+ textureButton.setToolTipText("Create texture");
	1224	+ textureButton.addActionListener(this);
	1225	+
	1226	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1227	+ overlayButton.setToolTipText("Create overlay");
	1228	+ overlayButton.addActionListener(this);
	1229	+
	1230	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1231	+ lightButton.setToolTipText("Create light");
	1232	+ lightButton.addActionListener(this);
	1233	+
	1234	+ oe.toolboxPanel.add(row2);
	1235	+
	1236	+ cGridBag textures = new cGridBag();
	1237	+
	1238	+ CreateTexturePanel(textures);
	1239	+
	1240	+ oe.toolboxPanel.add(textures);
	1241	+
	1242	+ textures.preferredHeight = 100;
	1243	+
	1244	+ CreateSkyboxPanel(oe.skyboxPanel);
	1245	+
	1246	+ // EDIT panel
	1247	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1248	+ editButton.setToolTipText("Pin selection controls");
	1249	+ editButton.addActionListener(this);
	1250	+
	1251	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1252	+ uneditButton.setToolTipText("Unpin and remove selection controls");
549	1253	uneditButton.addActionListener(this);
550	1254
551		- oe.aConstraints.gridx += 1;
552		- oe.aConstraints.weighty = 0;
553		- oe.aConstraints.gridwidth = 1;
554		-
555		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
556		- clearPanelButton.addActionListener(this);
557		-
558		- oe.aConstraints.gridx += 1;
559		- oe.aConstraints.weighty = 0;
560		- oe.aConstraints.gridwidth = 1;
561		-
562		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	1255	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1256	+ allParamsButton.setToolTipText("Show all controls");
563	1257	allParamsButton.addActionListener(this);
564	1258
565		- oe.aConstraints.gridx += 1;
566		- oe.aConstraints.weighty = 0;
567		- oe.aConstraints.gridwidth = 1;
568		-
569		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
570		- unselectButton.addActionListener(this);
	1259	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1260	+ clearPanelButton.setToolTipText("Clear all controls");
	1261	+ clearPanelButton.addActionListener(this);
571	1262
	1263	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1264	+ //unselectButton.setToolTipText("Unselect");
	1265	+ //unselectButton.addActionListener(this);
	1266	+
	1267	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1268	+ flashSelectionButton.setToolTipText("Highlight selection");
	1269	+ flashSelectionButton.addActionListener(this);
	1270	+
	1271	+ editCommandsPanel.preferredHeight = 1;
	1272	+
	1273	+ SetPinStates(false);
	1274	+// oe.treePanel.add(commandsPanel);
	1275	+// oe.treePanel.Return();
	1276	+
572	1277	// oe.aConstraints.gridx += 1;
573	1278	// oe.aConstraints.weighty = 0;
574	1279	// oe.aConstraints.gridwidth = 1;
..	..	@@ -580,47 +1285,32 @@
580	1285	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
581	1286	// gcButton.addActionListener(this);
582	1287
583		- oe.aConstraints.gridx = 0;
584		- oe.aConstraints.gridy += 1;
585		-
586		- //ctrlPanel.add(objList = new List(5, true));
587		- oe.aConstraints.gridwidth = 100;
588		- // oe.aConstraints.gridheight = 100;
589		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
590		- oe.aConstraints.gridheight = 1;
591		- oe.aConstraints.weighty = 0.5;
592		- oe.aConstraints.gridx = 0;
593		- JScrollPane jSP;
	1288	+ cGridBag jSPPanel = new cGridBag();
	1289	+
	1290	+ JScrollPane jSP;
594	1291	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
595		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	1292	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
596	1293	ResetModel();
597		- oe.aConstraints.weighty = 0.5;
598		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
599		- oe.aConstraints.gridy += 1;
600		- oe.aConstraints.gridwidth = 1;
601		-
602		- oe.aConstraints.weighty = 0;
603		- oe.aConstraints.gridwidth = 2;
604		-
605		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
606		- colorCB.addItemListener(this);
607		- oe.aConstraints.gridx += 2;
608		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
609		- materialCB.addItemListener(this);
610		- oe.aConstraints.gridx += 2;
611		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
612		- textureCB.addItemListener(this);
613		-
614		- oe.aConstraints.gridx = 0;
615		- oe.aConstraints.gridy += 1;
616	1294
	1295	+ oe.treePanel.add(jSPPanel);
	1296	+ oe.treePanel.Return();
	1297	+
	1298	+ oe.treePanel.add(copyOptionsPanel);
	1299	+ oe.treePanel.Return();
	1300	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1301	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1302	+ sliderPane.preferredHeight = 1;
	1303	+
	1304	+// mainPanel.setDividerLocation(0.1); //1.0);
	1305	+ mainPanel.setResizeWeight(0.4);
	1306	+
617	1307	//jList.addListSelectionListener(this);
618	1308	oe.jTree.addTreeSelectionListener(this);
619	1309	//jTree.setRootVisible(false);
620	1310	//jTree.setEditable(true);
621	1311	oe.jTree.setDragEnabled(true);
622	1312	//jTree.setPreferredSize(new Dimension(10,10));
623		- jSP.setPreferredSize(new Dimension(100,200));
	1313	+ //jSP.setPreferredSize(new Dimension(100,200));
624	1314
625	1315	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
626	1316
..	..	@@ -632,23 +1322,171 @@
632	1322	dgr.addDragGestureListener(this);
633	1323	}catch(Exception e) {}
634	1324	*/
635		- radio.layout = sevenButton;
	1325	+ radio.layout = threeButton; // sixButton;
636	1326	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
637	1327	}
	1328	+
	1329	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	1330	+ {
	1331	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1332	+ colorCB.setToolTipText("Copy color when dropped");
	1333	+ colorCB.addItemListener(this);
	1334	+
	1335	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1336	+ materialCB.setToolTipText("Copy material when dropped");
	1337	+ materialCB.addItemListener(this);
	1338	+
	1339	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1340	+ textureCB.setToolTipText("Copy texture when dropped");
	1341	+ textureCB.addItemListener(this);
	1342	+
	1343	+ panel.Return();
	1344	+
	1345	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	1346	+ boxCB.setToolTipText("Display bounding boxes");
	1347	+ boxCB.addItemListener(this);
	1348	+
	1349	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	1350	+ zoomBoxCB.setToolTipText("Display only for wheel");
	1351	+ zoomBoxCB.addItemListener(this);
	1352	+
	1353	+ if (true) // Globals.ADVANCED)
	1354	+ {
	1355	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1356	+// supportCB.setToolTipText("Enable rigging");
	1357	+// supportCB.addItemListener(this);
	1358	+
	1359	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1360	+ freezeCB.setToolTipText("Fast moving camera");
	1361	+ freezeCB.addItemListener(this);
	1362	+
	1363	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	1364	+ // localCB.addItemListener(this);
	1365	+
	1366	+ panel.Return();
	1367	+
	1368	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	1369	+ crowdCB.setToolTipText("Used for crowds");
	1370	+ crowdCB.addItemListener(this);
	1371	+
	1372	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	1373	+ smoothCB.setToolTipText("Snapping delay");
	1374	+ smoothCB.addItemListener(this);
	1375	+
	1376	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1377	+// slowCB.setToolTipText("Smooth interpolation");
	1378	+// slowCB.addItemListener(this);
	1379	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1380	+ minshaderCB.setToolTipText("Minimal fast shader");
	1381	+ minshaderCB.addItemListener(this);
	1382	+
	1383	+// constraints.gridy += 1;
	1384	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	1385	+// speakerMocapCB.addItemListener(this);
	1386	+
	1387	+ panel.Return();
	1388	+
	1389	+ if (false)
	1390	+ {
	1391	+ // handled in scripts
	1392	+ //constraints.gridy += 1;
	1393	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	1394	+ speakerCameraCB.addItemListener(this);
	1395	+
	1396	+ //constraints.gridy += 1;
	1397	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	1398	+ speakerFocusCB.addItemListener(this);
	1399	+
	1400	+ //constraints.gridy += 1;
	1401	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	1402	+ smoothfocusCB.addItemListener(this);
	1403	+ panel.Return();
	1404	+ }
	1405	+
	1406	+//constraints.gridx += 1;
	1407	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	1408	+// debugCB.addItemListener(this);
	1409	+
	1410	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1411	+ trackCB.setToolTipText("Enable tracking target");
	1412	+ trackCB.addItemListener(this);
	1413	+
	1414	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1415	+ oeilCB.setToolTipText("Move camera when tracking");
	1416	+ oeilCB.addItemListener(this);
	1417	+
	1418	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1419	+ shadowCB.setToolTipText("When live compute shadows");
	1420	+ shadowCB.addItemListener(this);
	1421	+
	1422	+ panel.Return();
	1423	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1424	+ toggleTextureCB.setToolTipText("Load textures");
	1425	+ toggleTextureCB.addItemListener(this);
	1426	+
	1427	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1428	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1429	+ toggleSwitchCB.addItemListener(this);
	1430	+
	1431	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1432	+ autokeepCB.setToolTipText("On structure change");
	1433	+ autokeepCB.addItemListener(this);
	1434	+
	1435	+ panel.Return();
	1436	+ if (Globals.ADVANCED)
	1437	+ {
	1438	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	1439	+ lookAtCB.setToolTipText("Look-at target");
	1440	+ lookAtCB.addItemListener(this);
	1441	+ }
	1442	+
	1443	+ }
	1444	+
	1445	+ cGridBag fill = new cGridBag();
	1446	+ fill.preferredHeight = 200;
	1447	+ cGridBag fill2 = new cGridBag();
	1448	+ fill2.preferredHeight = 200;
	1449	+ cGridBag fill3 = new cGridBag();
	1450	+ fill3.preferredHeight = 200;
	1451	+
	1452	+ panel.add(fill);
	1453	+ panel.add(fill2);
	1454	+ panel.add(fill3);
	1455	+
	1456	+ }
638	1457
639	1458	void EditObject(Object3D obj)
640	1459	{
641		- cRadio dummyButton = new cRadio(obj.name);
642		- dummyButton.SetObject(obj);
643		- dummyButton.layout = sevenButton;
644		- dummyButton.SetCamera(cameraView.renderCamera, false);
645		- dummyButton.addActionListener(this);
646		- radioPanel.add(dummyButton);
647		- buttonGroup.add(dummyButton);
648		- dummyButton.doClick();
	1460	+ assert(obj instanceof Composite);
	1461	+
	1462	+ if (obj.versionlist == null)
	1463	+ {
	1464	+ obj.versionlist = new Object3D[100];
	1465	+ obj.versionindex = -1;
	1466	+ }
	1467	+
	1468	+ cRadio radioButton = new cRadio(obj.name);
	1469	+
	1470	+ // June 2019. Patch to avoid bug with transparency.
	1471	+ radioButton.hadMaterial = obj.material != null;
	1472	+ if (!radioButton.hadMaterial)
	1473	+ {
	1474	+ obj.material = new cMaterial();
	1475	+ }
	1476	+
	1477	+ radioButton.SetObject(obj);
	1478	+ radioButton.layout = threeButton; // sixButton;
	1479	+ radioButton.SetCamera(cameraView.renderCamera, false);
	1480	+ radioButton.addActionListener(this);
	1481	+ radioPanel.add(radioButton);
	1482	+ buttonGroup.add(radioButton);
	1483	+ radioButton.doClick();
649	1484	}
	1485	+
650	1486	void SetupViews(ObjEditor oe)
651	1487	{
	1488	+ theFrame = this;
	1489	+
652	1490	oe.SetupViews();
653	1491
654	1492	System.out.println("SetupViews");
..	..	@@ -657,22 +1495,30 @@
657	1495	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
658	1496	}
659	1497
660		- JCheckBox liveCB;
661		- JCheckBox supportCB;
662		- JCheckBox localCB;
663		- JCheckBox crowdCB;
664		- JCheckBox smoothCB;
665		- JCheckBox fastCB;
666		- JCheckBox slowCB;
667		- JCheckBox boxCB;
668		- JCheckBox trackCB;
669		- JCheckBox smoothfocusCB;
	1498	+ cToggleButton liveCB;
	1499	+ cCheckBox supportCB;
	1500	+ cCheckBox localCB;
	1501	+ cCheckBox crowdCB;
	1502	+ cCheckBox smoothCB;
	1503	+ cCheckBox minshaderCB;
	1504	+
	1505	+ cToggleButton fastCB;
	1506	+ cCheckBox slowCB;
	1507	+ cCheckBox boxCB;
	1508	+ cCheckBox zoomBoxCB;
	1509	+ cCheckBox freezeCB;
	1510	+ //cToggleButton trackCB;
	1511	+ cCheckBox trackCB;
	1512	+ cCheckBox smoothfocusCB;
670	1513	// JCheckBox speakerMocapCB;
671		- JCheckBox speakerCameraCB;
672		- JCheckBox speakerFocusCB;
673		- JCheckBox debugCB;
674		- JCheckBox oeilCB;
675		- JCheckBox lookAtCB;
	1514	+ cCheckBox speakerCameraCB;
	1515	+ cCheckBox speakerFocusCB;
	1516	+ cCheckBox debugCB;
	1517	+
	1518	+ cCheckBox oeilCB;
	1519	+ cCheckBox shadowCB;
	1520	+ cCheckBox autokeepCB;
	1521	+ cCheckBox lookAtCB;
676	1522
677	1523	// static int COLOR = 1;
678	1524	// static int MATERIAL = 2;
..	..	@@ -680,9 +1526,9 @@
680	1526
681	1527	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
682	1528
683		- JCheckBox colorCB;
684		- JCheckBox materialCB;
685		- JCheckBox textureCB;
	1529	+ cCheckBox colorCB;
	1530	+ cCheckBox materialCB;
	1531	+ cCheckBox textureCB;
686	1532
687	1533	public void itemStateChanged(ItemEvent e)
688	1534	{
..	..	@@ -707,10 +1553,10 @@
707	1553	dropAttributes \|= Object3D.TEXTURE;
708	1554	else
709	1555	dropAttributes &= ~Object3D.TEXTURE;
710		- }
711		- else if(e.getSource() == liveCB)
	1556	+ } else if(e.getSource() == liveCB)
712	1557	{
713	1558	cameraView.ToggleLive();
	1559	+ refreshContents(false);
714	1560	}
715	1561	else if(e.getSource() == supportCB)
716	1562	{
..	..	@@ -726,6 +1572,12 @@
726	1572	{
727	1573	cameraView.ToggleInertia();
728	1574	cameraView.repaint();
	1575	+ }
	1576	+ else if(e.getSource() == minshaderCB)
	1577	+ {
	1578	+ Globals.MINSHADER ^= true;
	1579	+ cameraView.programInitialized = false;
	1580	+ cameraView.repaint();
729	1581	}
730	1582	else if(e.getSource() == localCB)
731	1583	{
..	..	@@ -745,6 +1597,10 @@
745	1597	Recompile();
746	1598	cameraView.repaint();
747	1599	// refreshContents();
	1600	+ }
	1601	+ else if(e.getSource() == zoomBoxCB)
	1602	+ {
	1603	+ cameraView.ToggleZoomBoxMode();
748	1604	}
749	1605	else if(e.getSource() == smoothfocusCB)
750	1606	{
..	..	@@ -771,6 +1627,18 @@
771	1627	{
772	1628	cameraView.ToggleOeil();
773	1629	}
	1630	+ else if(e.getSource() == shadowCB)
	1631	+ {
	1632	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1633	+ }
	1634	+ else if(e.getSource() == freezeCB)
	1635	+ {
	1636	+ Globals.FREEZEONMOVE ^= true;
	1637	+ }
	1638	+ else if(e.getSource() == autokeepCB)
	1639	+ {
	1640	+ Globals.REPLACEONMAKE ^= true;
	1641	+ }
774	1642	else if(e.getSource() == lookAtCB)
775	1643	{
776	1644	cameraView.ToggleLookAt();
..	..	@@ -787,7 +1655,8 @@
787	1655
788	1656	/**/
789	1657	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
790		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1658	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1659	+ TreePath path = objEditor.jTree.getSelectionPath();
791	1660	if ((path == null) \|\| (path.getPathCount() <= 1)) {
792	1661	// We can't move the root node or an empty selection
793	1662	return;
..	..	@@ -850,8 +1719,6 @@
850	1719	}
851	1720	}
852	1721
853		- String string = (String) object;
854		-
855	1722	System.out.println("Transfer = " + object + "; drop : " + target);
856	1723	// if( object instanceof java.io.File[])
857	1724	// {
..	..	@@ -859,7 +1726,11 @@
859	1726	// objEditor.DropFile((java.io.File[]) object, true);
860	1727	// return;
861	1728	// }
862		- if (string.charAt(0) == '/')
	1729	+
	1730	+ String string = object.toString();
	1731	+
	1732	+ // File path for Mac and Windows
	1733	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
863	1734	{
864	1735	// file(s)
865	1736	String[] names = string.split("\n");
..	..	@@ -886,7 +1757,7 @@
886	1757
887	1758	flashIt = false;
888	1759	CameraPane pane = (CameraPane) target;
889		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1760	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
890	1761	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
891	1762
892	1763	if (group.selection.size() == 1)
..	..	@@ -902,23 +1773,33 @@
902	1773
903	1774	assert target == objEditor.jTree;
904	1775	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1776	+ Object3D destinationLeaf;
905	1777	try {
906		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1778	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
907	1779	} catch (Exception e) {
908	1780	System.out.println("destinationPath : " + destinationPath);
909	1781	return;
910	1782	}
911	1783
912		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1784	+ for (int i=group.selection.size(); --i>=0;)
913	1785	{
	1786	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1787	+
	1788	+ // Cannot move into itself
	1789	+ if (child == destinationLeaf)
	1790	+ return;
	1791	+ }
	1792	+
	1793	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1794	+// {
914	1795	loadClipboard(true);
915	1796	objEditor.jTree.setSelectionPath(destinationPath);
916		- pasteInto(false);
917		- } else {
918		- loadClipboard(false);
919		- objEditor.jTree.setSelectionPath(destinationPath);
920		- pasteInto(false); // true); // ???
921		- }
	1797	+ pasteInto(false, false);
	1798	+// } else {
	1799	+// loadClipboard(false);
	1800	+// objEditor.jTree.setSelectionPath(destinationPath);
	1801	+// pasteInto(false, false); // true); // ???
	1802	+// }
922	1803	}
923	1804	public void dropActionChanged(DropTargetDragEvent dtde)
924	1805	// Called if the user has modified the current drop gesture
..	..	@@ -974,7 +1855,12 @@
974	1855	TreePath path;
975	1856
976	1857	public TransferableTreePath(TreePath tp) {
977		- path = tp;
	1858	+ Object[] objs = new Object[tp.getPathCount()];
	1859	+ for (int i=0; i<objs.length; i++)
	1860	+ {
	1861	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1862	+ }
	1863	+ path = new TreePath(objs);
978	1864	}
979	1865
980	1866	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1023,83 +1909,107 @@
1023	1909	{
1024	1910	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1025	1911	//heightFieldItem.addActionListener(this);
1026		- gridItem = menu.add(new MenuItem("Grid"));
1027		- gridItem.addActionListener(this);
1028		- rectoidItem = menu.add(new MenuItem("Box"));
1029		- rectoidItem.addActionListener(this);
1030		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1031		- ellipsoidItem.addActionListener(this);
1032		- coneItem = menu.add(new MenuItem("Cone"));
1033		- coneItem.addActionListener(this);
1034		- torusItem = menu.add(new MenuItem("Torus"));
1035		- torusItem.addActionListener(this);
1036		- superItem = menu.add(new MenuItem("Superellipsoid"));
1037		- superItem.addActionListener(this);
1038		- particleItem = menu.add(new MenuItem("Particle system"));
1039		- particleItem.addActionListener(this);
	1912	+// gridItem = menu.add(new MenuItem("Grid"));
	1913	+// gridItem.addActionListener(this);
	1914	+// rectoidItem = menu.add(new MenuItem("Box"));
	1915	+// rectoidItem.addActionListener(this);
	1916	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1917	+// ellipsoidItem.addActionListener(this);
	1918	+// coneItem = menu.add(new MenuItem("Cone"));
	1919	+// coneItem.addActionListener(this);
	1920	+// torusItem = menu.add(new MenuItem("Torus"));
	1921	+// torusItem.addActionListener(this);
	1922	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1923	+// superItem.addActionListener(this);
	1924	+
	1925	+ cameraItem = menu.add(new MenuItem("Camera"));
	1926	+ cameraItem.addActionListener(this);
	1927	+
	1928	+ if (!Globals.ADVANCED)
	1929	+ {
	1930	+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
	1931	+ kleinItem.addActionListener(this);
	1932	+ }
	1933	+
	1934	+// particleItem = menu.add(new MenuItem("Particle system"));
	1935	+// particleItem.addActionListener(this);
	1936	+ if (Globals.ADVANCED)
	1937	+ {
1040	1938	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1041	1939	ragdollItem.addActionListener(this);
1042	1940	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1043	1941	ragdoll2Item.addActionListener(this);
	1942	+ }
1044	1943	menu.add("-");
1045		- meshItem = menu.add(new MenuItem("Mesh"));
	1944	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1046	1945	meshItem.addActionListener(this);
1047	1946	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1048	1947	// meshGroupItem.addActionListener(this);
	1948	+ if (Globals.ADVANCED)
	1949	+ {
1049	1950	springItem = menu.add(new MenuItem("Spring"));
1050	1951	springItem.addActionListener(this);
1051	1952	flagItem = menu.add(new MenuItem("Flag"));
1052	1953	flagItem.addActionListener(this);
1053		- bezierItem = menu.add(new MenuItem("Patch"));
1054		- bezierItem.addActionListener(this);
1055		- checkerItem = menu.add(new MenuItem("Checker"));
1056		- checkerItem.addActionListener(this);
1057	1954	blobItem = menu.add(new MenuItem("Blob"));
1058	1955	blobItem.addActionListener(this);
1059	1956	latheItem = menu.add(new MenuItem("Lathe"));
1060	1957	latheItem.addActionListener(this);
1061		- lightItem = menu.add(new MenuItem("Light"));
1062		- lightItem.addActionListener(this);
	1958	+ }
	1959	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1960	+ bezierItem.addActionListener(this);
	1961	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1962	+// overlayItem.addActionListener(this);
	1963	+// lightItem = menu.add(new MenuItem("Light"));
	1964	+// lightItem.addActionListener(this);
1063	1965	menu.add("-");
1064	1966	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1065	1967	//superLoopItem.addActionListener(this);
1066		- loopItem = menu.add(new MenuItem("Loop"));
1067		- loopItem.addActionListener(this);
	1968	+// loopItem = menu.add(new MenuItem("Loop"));
	1969	+// loopItem.addActionListener(this);
1068	1970	doubleItem = menu.add(new MenuItem("Fork"));
1069	1971	doubleItem.addActionListener(this);
	1972	+ if (Globals.ADVANCED)
	1973	+ {
1070	1974	tripleItem = menu.add(new MenuItem("Trident"));
1071	1975	tripleItem.addActionListener(this);
	1976	+ }
1072	1977	}
1073	1978
1074	1979	void buildToolsMenu(Menu menu)
1075	1980	{
1076	1981	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1077	1982	animationItem.addItemListener(this);
1078		- animationItem.setState(CameraPane.ANIMATION);
	1983	+ animationItem.setState(Globals.ANIMATION);
	1984	+
	1985	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1986	+ archiveItem.addActionListener(this);
1079	1987
1080	1988	menu.add("-");
1081	1989	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1082	1990	parseverticesItem.addActionListener(this);
1083	1991	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1084	1992	textureFieldItem.addActionListener(this);
1085		- alignItem = menu.add(new MenuItem("Align"));
	1993	+ alignItem = menu.add(new MenuItem("Align Objects"));
1086	1994	alignItem.addActionListener(this);
1087		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1088		- mirrorItem.addActionListener(this);
1089	1995	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1090	1996	reduceMorphItem.addActionListener(this);
1091	1997	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1092	1998	reduce34MorphItem.addActionListener(this);
1093		-
1094		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1095		- computeAOItem.addActionListener(this);
1096	1999	menu.add("-");
1097		-
1098	2000	menu.add(memoryItem = new MenuItem("Memory Usage"));
1099	2001	memoryItem.addActionListener(this);
	2002	+ menu.add(computeAOItem = new MenuItem("Compute AO"));
	2003	+ computeAOItem.addActionListener(this);
	2004	+
	2005	+ if (Globals.ADVANCED)
	2006	+ {
	2007	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	2008	+ mirrorItem.addActionListener(this);
	2009	+ menu.add("-");
1100	2010	menu.add(analyzeItem = new MenuItem("Analyze"));
1101	2011	analyzeItem.addActionListener(this);
1102		- menu.add(dumpItem = new MenuItem("Dump"));
	2012	+ menu.add(dumpItem = new MenuItem("Print"));
1103	2013	dumpItem.addActionListener(this);
1104	2014	// menu.add(pathItem = new MenuItem("From-to path"));
1105	2015	// pathItem.addActionListener(this);
..	..	@@ -1108,6 +2018,8 @@
1108	2018	resetParentItem.addActionListener(this);
1109	2019	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1110	2020	repairParentItem.addActionListener(this);
	2021	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	2022	+ repairShadowItem.addActionListener(this);
1111	2023	menu.add(invariantsItem = new MenuItem("Invariants"));
1112	2024	invariantsItem.addActionListener(this);
1113	2025	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1115,6 +2027,7 @@
1115	2027	menu.add("-");
1116	2028	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1117	2029	editScriptItem.addActionListener(this);
	2030	+ }
1118	2031	}
1119	2032
1120	2033	void ScreenFit()
..	..	@@ -1237,9 +2150,34 @@
1237	2150	shadow.material = new cMaterial(obj.material);
1238	2151	shadow.material.diffuse = 0.0001f;
1239	2152	shadow.material.specular = 0.0001f;
	2153	+ //shadow.projectedVertices[1].x = 300;
1240	2154
1241	2155	makeSomething(shadow);
1242	2156	}
	2157	+
	2158	+ private void ClearUnpinned()
	2159	+ {
	2160	+ //for (Object3D obj : listUI)
	2161	+ for (int i=listUI.size(); --i>=0;)
	2162	+ {
	2163	+ Object3D obj = listUI.elementAt(i);
	2164	+ if (!obj.pinned)
	2165	+ {
	2166	+ obj.CloseUI();
	2167	+ listUI.remove(i);
	2168	+ }
	2169	+ }
	2170	+ }
	2171	+
	2172	+ private void EditElement(Object3D elem, boolean newWindow)
	2173	+ {
	2174	+ // if (!(elem instanceof Composite))
	2175	+ // newWindow = false;
	2176	+ listUI.add(elem);
	2177	+ elem.openEditWindow(this, newWindow); //, false);
	2178	+ System.out.println("edit : " + elem);
	2179	+ elem.editWindow.refreshContents(true); // ? new
	2180	+ }
1243	2181
1244	2182	/**
1245	2183	* applyExample
..	..	@@ -1443,9 +2381,9 @@
1443	2381
1444	2382	void Overwrite(int mask)
1445	2383	{
1446		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2384	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1447	2385	{
1448		- Object3D content = GrafreeD.clipboard.get(0);
	2386	+ Object3D content = Grafreed.clipboard.get(0);
1449	2387
1450	2388	if (content instanceof cGroup && ((cGroup)content).transientlink )
1451	2389	content = ((cGroup)content).get(0);
..	..	@@ -1468,6 +2406,7 @@
1468	2406	//
1469	2407	public void actionPerformed(ActionEvent event) // , Object arg)
1470	2408	{
	2409	+ Object source = event.getSource();
1471	2410	/*
1472	2411	if (event.getSource() == nameField)
1473	2412	{
..	..	@@ -1479,11 +2418,11 @@
1479	2418	}
1480	2419	else
1481	2420	*/
1482		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	2421	+ if (source == lookAtItem \|\| source == lookFromItem)
1483	2422	{
1484	2423	ScreenFit();
1485	2424	} else
1486		- if (event.getSource() == switchItem)
	2425	+ if (source == switchViewItem)
1487	2426	{
1488	2427	cVector v1 = new cVector();
1489	2428	cVector v2 = new cVector();
..	..	@@ -1492,11 +2431,11 @@
1492	2431	objEditor.cameraView.renderCamera.setAim(v2, v1);
1493	2432	objEditor.cameraView.repaint();
1494	2433	} else
1495		- if (event.getSource() == rectoidItem)
	2434	+ if (source == rectoidItem \|\| source == boxButton)
1496	2435	{
1497	2436	makeSomething(new Box());
1498	2437	} else
1499		- if (event.getSource() == particleItem)
	2438	+ if (source == particleItem \|\| source == particlesButton)
1500	2439	{
1501	2440	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1502	2441	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1517,9 +2456,9 @@
1517	2456	applyExample(particleGeom, "SMOKE");
1518	2457	makeSomething(particleGeom);
1519	2458	} else
1520		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	2459	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1521	2460	{
1522		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	2461	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1523	2462
1524	2463	ragdoll.toParent = LA.newMatrix();
1525	2464	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1537,7 +2476,7 @@
1537	2476	} else
1538	2477	/*
1539	2478	*/
1540		- if (event.getSource() == heightFieldItem)
	2479	+ if (source == heightFieldItem)
1541	2480	{
1542	2481	Object3D obj = new Object3D();
1543	2482
..	..	@@ -1575,27 +2514,31 @@
1575	2514
1576	2515	makeSomething(obj);
1577	2516	} else
1578		- if (event.getSource() == gridItem)
	2517	+ if (source == gridItem \|\| source == gridButton)
1579	2518	{
1580	2519	makeSomething(new Grid());
1581	2520	} else
1582		- if (event.getSource() == ellipsoidItem)
	2521	+ if (source == ellipsoidItem \|\| source == sphereButton)
1583	2522	{
1584	2523	makeSomething(new Sphere());
1585	2524	} else
1586		- if (event.getSource() == coneItem)
	2525	+ if (source == coneItem \|\| source == coneButton)
1587	2526	{
1588	2527	makeSomething(new Cone());
1589	2528	} else
1590		- if (event.getSource() == torusItem)
	2529	+ if (source == torusItem \|\| source == torusButton)
1591	2530	{
1592	2531	makeSomething(new Torus());
1593	2532	} else
1594		- if (event.getSource() == superItem)
	2533	+ if (source == superItem \|\| source == superButton)
1595	2534	{
1596	2535	makeSomething(new Superellipsoid());
1597	2536	} else
1598		- if (event.getSource() == blobItem)
	2537	+ if (source == kleinItem \|\| source == kleinButton)
	2538	+ {
	2539	+ makeSomething(new Klein());
	2540	+ } else
	2541	+ if (source == blobItem)
1599	2542	{
1600	2543	Blob blob = new Blob();
1601	2544	BlobComponent comp = new BlobComponent();
..	..	@@ -1603,15 +2546,15 @@
1603	2546	//blob.retile();
1604	2547	makeSomething(blob);
1605	2548	} else
1606		- if (event.getSource() == latheItem)
	2549	+ if (source == latheItem)
1607	2550	{
1608	2551	makeSomething(new Lathe());
1609	2552	} else
1610		- if (event.getSource() == bezierItem)
	2553	+ if (source == bezierItem)
1611	2554	{
1612	2555	makeSomething(new BezierSurface());
1613	2556	} else
1614		- if (event.getSource() == checkerItem)
	2557	+ if (source == overlayItem \|\| source == overlayButton)
1615	2558	{
1616	2559	/*
1617	2560	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1626,7 +2569,7 @@
1626	2569	*/
1627	2570	makeSomething(new Checker());
1628	2571	} else
1629		- if (event.getSource() == meshItem)
	2572	+ if (source == meshItem)
1630	2573	{
1631	2574	Object3D itemtomake = new Object3D();
1632	2575	Object3D child;
..	..	@@ -1647,35 +2590,52 @@
1647	2590	makeSomething(child);
1648	2591	}
1649	2592	} else
1650		- if (event.getSource() == springItem)
	2593	+ if (source == springItem)
1651	2594	{
1652	2595	cSpring s = new cSpring();
1653	2596	s.setup();
1654	2597	makeSomething(s);
1655	2598	} else
1656		- if (event.getSource() == flagItem)
	2599	+ if (source == flagItem)
1657	2600	{
1658	2601	cSpring s = new cFlag();
1659	2602	s.setup();
1660	2603	makeSomething(s);
1661	2604	} else
1662		- if (event.getSource() == lightItem)
	2605	+ if (source == lightItem \|\| source == lightButton)
1663	2606	{
1664	2607	makeSomething(new Light());
1665	2608	} else
1666		- if (event.getSource() == csgItem)
	2609	+// if (source == skybox1Button \|\|
	2610	+// source == skybox2Button \|\|
	2611	+// source == skybox3Button \|\|
	2612	+// source == skybox4Button \|\|
	2613	+// source == skybox5Button \|\|
	2614	+// source == skybox6Button \|\|
	2615	+// source == skybox7Button \|\|
	2616	+// source == skybox11Button \|\|
	2617	+// source == skybox12Button \|\|
	2618	+// source == skybox13Button \|\|
	2619	+// source == skybox14Button \|\|
	2620	+// source == skybox15Button \|\|
	2621	+// source == skybox16Button \|\|
	2622	+// source == skybox17Button)
	2623	+// {
	2624	+// ChangeSkybox(source);
	2625	+// } else
	2626	+ if (source == csgItem)
1667	2627	{
1668	2628	group(new CSG());
1669	2629	} else
1670		- if (event.getSource() == templateItem)
	2630	+ if (source == templateItem)
1671	2631	{
1672	2632	group(new cTemplate());
1673	2633	} else
1674		- if (event.getSource() == attributeItem)
	2634	+ if (source == attributeItem)
1675	2635	{
1676	2636	makeSomething(new Attribute());
1677	2637	} else
1678		- if (event.getSource() == pointflowItem)
	2638	+ if (source == pointflowItem)
1679	2639	{
1680	2640	makeSomething(new PointFlow());
1681	2641	} else
..	..	@@ -1687,7 +2647,7 @@
1687	2647	} else
1688	2648	*/
1689	2649
1690		- if (event.getSource() == superLoopItem)
	2650	+ if (source == superLoopItem)
1691	2651	{
1692	2652	Composite g = new cGroup();
1693	2653	for (int i=0; i<15; i++)
..	..	@@ -1709,30 +2669,30 @@
1709	2669
1710	2670	group(g);
1711	2671	} else
1712		- if (event.getSource() == loopItem)
	2672	+ if (source == loopItem \|\| source == loopButton)
1713	2673	{
1714	2674	Composite csg = new GroupLeaf();
1715	2675	csg.count = 5;
1716	2676	group(csg);
1717		- Composite child = new cGroup();
	2677	+ Composite child = new cGroup("Branch");
1718	2678	csg.addChild(child);
1719	2679	child.addChild(csg);
1720	2680	} else
1721		- if (event.getSource() == doubleItem)
	2681	+ if (source == doubleItem)
1722	2682	{
1723		- Composite csg = new GroupLeaf();
	2683	+ Composite csg = new GroupLeaf("Fork");
1724	2684	csg.count = 5;
1725	2685	group(csg);
1726		- Composite child = new cGroup();
	2686	+ Composite child = new cGroup("Branch A");
1727	2687	csg.addChild(child);
1728	2688	child.addChild(csg);
1729		- child = new cGroup();
	2689	+ child = new cGroup("Branch B");
1730	2690	csg.addChild(child);
1731	2691	child.addChild(csg);
1732	2692	} else
1733		- if (event.getSource() == tripleItem)
	2693	+ if (source == tripleItem)
1734	2694	{
1735		- Composite csg = new GroupLeaf();
	2695	+ Composite csg = new GroupLeaf("Trident");
1736	2696	csg.count = 4;
1737	2697	group(csg);
1738	2698	Composite child = new cGroup();
..	..	@@ -1745,73 +2705,117 @@
1745	2705	csg.addChild(child);
1746	2706	child.addChild(csg);
1747	2707	} else
1748		-
1749		- if (event.getSource() == importGFDItem)
	2708	+ if (source == computeAOItem)
1750	2709	{
1751		- ImportGFD();
	2710	+ Globals.drawMode = CameraPane.OCCLUSION;
	2711	+ cameraView.repaint();
1752	2712	} else
1753		- if (event.getSource() == importVRMLX3DItem)
1754		- {
1755		- ImportVRMLX3D();
1756		- } else
1757		- if (event.getSource() == import3DSItem)
1758		- {
1759		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1760		- } else
1761		- if (event.getSource() == importOBJItem)
1762		- {
1763		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1764		- } else
1765		- if (event.getSource() == computeAOItem)
1766		- {
1767		- CameraPane.drawMode = CameraPane.OCCLUSION;
1768		- CameraPane.theRenderer.repaint();
1769		- } else
1770		- if (event.getSource() == recompileItem)
	2713	+ if (source == recompileItem)
1771	2714	{
1772	2715	Recompile();
1773	2716	refreshContents();
1774	2717	} else
1775		- if (event.getSource() == editScriptItem)
	2718	+ if (source == editScriptItem)
1776	2719	{
1777	2720	OpenDialog();
1778	2721	refreshContents();
1779	2722	} else
1780		- if (event.getSource() == invariantsItem)
	2723	+ if (source == invariantsItem)
1781	2724	{
1782	2725	System.out.println("Invariants:");
1783		- GrafreeD.theApplet3D.universe.invariants();
	2726	+ Grafreed.grafreed.universe.invariants();
1784	2727	} else
1785		- if (event.getSource() == memoryItem)
	2728	+ if (source == memoryItem)
1786	2729	{
1787	2730	//System.out.println("Invariants:");
1788	2731	PrintMemory();
1789	2732	} else
1790		- if (event.getSource() == pathItem)
	2733	+ if (source == pathItem)
1791	2734	{
1792	2735	PrintPath();
1793	2736	} else
1794		- if (event.getSource() == analyzeItem)
	2737	+ if (source == analyzeItem)
1795	2738	{
1796	2739	AnalyzeObject();
1797	2740	} else
1798		- if (event.getSource() == dumpItem)
	2741	+ if (source == dumpItem)
1799	2742	{
1800	2743	DumpObject();
1801	2744	} else
1802		- if (event.getSource() == screenfitButton)
	2745	+ if (source == minButton)
1803	2746	{
1804		- //Reload(lastConverter, lastFilename, true);
	2747	+ Minimize();
	2748	+ } else
	2749	+ if (source == maxButton)
	2750	+ {
	2751	+ Maximize();
	2752	+ } else
	2753	+ if (source == fullButton)
	2754	+ {
	2755	+ ToggleFullScreen();
	2756	+ } else
	2757	+ if (source == collapseButton)
	2758	+ {
	2759	+ this.expandedLayout = radio.layout;
	2760	+ CollapseToolbar();
	2761	+ } else
	2762	+ if (source == maximize3DButton)
	2763	+ {
	2764	+ this.expandedLayout = radio.layout;
	2765	+ radio.layout = twoButton;
	2766	+ Show3DView();
	2767	+ CollapseToolbar();
	2768	+ } else
	2769	+ if (source == previousVersionButton)
	2770	+ {
	2771	+ // Go to previous version
	2772	+ //if (!Undo())
	2773	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2774	+ PreviousVersion();
	2775	+ } else
	2776	+ if (source == restoreButton)
	2777	+ {
	2778	+ // Restore current version
	2779	+ Restore();
	2780	+ //restoreButton.setEnabled(false);
	2781	+ } else
	2782	+ if (source == replaceButton)
	2783	+ {
	2784	+ // Overwrite current version
	2785	+ Replace();
	2786	+ //replaceButton.setEnabled(false);
	2787	+ } else
	2788	+ if (source == nextVersionButton)
	2789	+ {
	2790	+ // Go to next version
	2791	+ NextVersion();
	2792	+ } else
	2793	+ if (source == saveVersionButton)
	2794	+ {
	2795	+ // Save a new version
	2796	+ if (!Save(true))
	2797	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2798	+ } else
	2799	+ if (source == deleteVersionButton)
	2800	+ {
	2801	+ // Delete a new version
	2802	+ DeleteVersion();
	2803	+ } else
	2804	+ if (source == oneStepButton)
	2805	+ {
	2806	+ Globals.ONESTEP = true;
	2807	+ cameraView.repaint();
	2808	+ } else
	2809	+ if (source == screenfitButton)
	2810	+ {
1805	2811	ScreenFit();
1806	2812	} else
1807		- if (event.getSource() == screenfitpointButton)
	2813	+ if (source == screenfitpointButton)
1808	2814	{
1809		- //Reload(lastConverter, lastFilename, true);
1810	2815	ScreenFitPoint();
1811	2816	} else
1812		- if (event.getSource() == snapobjectButton)
	2817	+ if (source == snapobjectButton)
1813	2818	{
1814		- //Reload(lastConverter, lastFilename, true);
1815	2819	SnapObject();
1816	2820	} else
1817	2821	// if (event.getSource() == recompileButton)
..	..	@@ -1820,13 +2824,13 @@
1820	2824	// Recompile();
1821	2825	// refreshContents();
1822	2826	// } else
1823		- if (event.getSource() == gcButton)
	2827	+ if (source == gcButton)
1824	2828	{
1825	2829	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1826	2830	System.gc();
1827	2831	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1828	2832	} else
1829		- if (event.getSource() == editLeafItem)
	2833	+ if (source == editLeafItem)
1830	2834	{
1831	2835	Object3D obj;
1832	2836	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1840,62 +2844,74 @@
1840	2844	}
1841	2845	refreshContents(true);
1842	2846	} else
1843		- if (event.getSource() == openWindowItem)
	2847	+ if (source == openWindowItem)
1844	2848	{
1845	2849	EditSelection(true);
1846	2850	} else
1847		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2851	+ if (source == cutItem \|\| source == clearButton)
1848	2852	{
1849	2853	loadClipboard(true);
1850	2854	} else
1851		- if (event.getSource() == duplicateItem)
	2855	+ if (source == undoItem)
1852	2856	{
1853		- Object3D keep = GrafreeD.clipboard;
	2857	+ PreviousVersion();
	2858	+ } else
	2859	+ if (source == redoItem)
	2860	+ {
	2861	+ NextVersion();
	2862	+ } else
	2863	+ if (source == duplicateItem)
	2864	+ {
	2865	+ Object3D keep = Grafreed.clipboard;
1854	2866	loadClipboard(false);
1855	2867	paste(false);
1856		- GrafreeD.clipboard = keep;
	2868	+ Grafreed.clipboard = keep;
1857	2869	} else
1858		- if (event.getSource() == cloneItem)
	2870	+ if (source == cloneItem)
1859	2871	{
1860	2872	CloneSelection(false);
1861	2873	} else
1862		- if (event.getSource() == cloneSupportItem)
	2874	+ if (source == cloneSupportItem)
1863	2875	{
1864	2876	CloneSelection(true);
1865	2877	} else
1866		- if (event.getSource() == copyItem)
	2878	+ if (source == copyItem)
1867	2879	{
1868	2880	loadClipboard(false);
1869	2881	} else
1870		- if (event.getSource() == pasteItem)
	2882	+ if (source == pasteItem)
1871	2883	{
1872	2884	paste(false);
1873	2885	} else
1874		- if (event.getSource() == pasteLinkItem)
	2886	+ if (source == pasteIntoItem)
1875	2887	{
1876		- pasteInto(false);
	2888	+ pasteInto(true, false);
1877	2889	} else
1878		- if (event.getSource() == pasteCloneItem)
	2890	+ if (source == pasteLinkItem)
1879	2891	{
1880		- pasteInto(true);
	2892	+ pasteInto(false, false);
1881	2893	} else
1882		- if (event.getSource() == pasteExpandItem)
	2894	+ if (source == pasteCloneItem)
	2895	+ {
	2896	+ pasteInto(true, true);
	2897	+ } else
	2898	+ if (source == pasteExpandItem)
1883	2899	{
1884	2900	paste(true);
1885	2901	} else
1886		- if (event.getSource() == synchronizeItem)
	2902	+ if (source == synchronizeItem)
1887	2903	{
1888	2904	Overwrite(Object3D.TRANSFORM);
1889	2905	} else
1890		- if (event.getSource() == overwriteNameItem)
	2906	+ if (source == overwriteNameItem)
1891	2907	{
1892	2908	Overwrite(Object3D.NAME);
1893	2909	} else
1894		- if (event.getSource() == overwriteUVItem)
	2910	+ if (source == overwriteUVItem)
1895	2911	{
1896	2912	Overwrite(Object3D.UV);
1897	2913	} else
1898		- if (event.getSource() == overwriteMatItem)
	2914	+ if (source == overwriteMatItem)
1899	2915	{
1900	2916	/* july 2015
1901	2917	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1915,7 +2931,7 @@
1915	2931
1916	2932	Overwrite(dropAttributes);
1917	2933	}
1918		- if (event.getSource() == overwriteGeoItem)
	2934	+ if (source == overwriteGeoItem)
1919	2935	{
1920	2936	Overwrite(Object3D.GEOMETRY);
1921	2937	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1932,7 +2948,7 @@
1932	2948	// refreshContents();
1933	2949	// }
1934	2950	} else
1935		- if (event.getSource() == generateMeshItem)
	2951	+ if (source == generateMeshItem)
1936	2952	{
1937	2953	//if (group.selection.size() == 1)
1938	2954	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1943,7 +2959,7 @@
1943	2959	ResetModel();
1944	2960	refreshContents();
1945	2961	} else
1946		- if (event.getSource() == extractGeometriesItem)
	2962	+ if (source == extractGeometriesItem)
1947	2963	{
1948	2964	boolean one = false;
1949	2965
..	..	@@ -1970,7 +2986,7 @@
1970	2986	ResetModel();
1971	2987	refreshContents();
1972	2988	} else
1973		- if (event.getSource() == cloneGeometriesItem)
	2989	+ if (source == cloneGeometriesItem)
1974	2990	{
1975	2991	boolean one = false;
1976	2992
..	..	@@ -1996,32 +3012,37 @@
1996	3012	ResetModel();
1997	3013	refreshContents();
1998	3014	} else
1999		- if (event.getSource() == shareGeometriesItem)
	3015	+ if (source == shareGeometriesItem)
2000	3016	{
2001	3017	boolean one = false;
2002	3018
2003	3019	if (group.selection.size() == 1)
2004	3020	one = true;
2005	3021
	3022	+ Object3D merge = null;
	3023	+
2006	3024	Object3D content = new cGroup();
2007	3025
2008	3026	for (int i=0; i<group.selection.size(); i++)
2009	3027	{
2010		- Object3D sel = new Merge(group.selection.get(i));
	3028	+ merge = new Merge(group.selection.get(i));
2011	3029
2012	3030	if (one)
2013		- makeSomething(sel, false);
	3031	+ makeSomething(merge, false);
2014	3032	else
2015		- content.addChild(sel);
	3033	+ content.addChild(merge);
2016	3034	}
2017	3035
2018	3036	if (!one)
2019		- makeSomething(content, false);
2020		-
2021		- ResetModel();
2022		- refreshContents();
	3037	+ makeSomething(content, true);
	3038	+ else
	3039	+ {
	3040	+ ResetModel();
	3041	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	3042	+ refreshContents();
	3043	+ }
2023	3044	} else
2024		- if (event.getSource() == mergeGeometriesItem)
	3045	+ if (source == mergeGeometriesItem)
2025	3046	{
2026	3047	boolean one = false;
2027	3048
..	..	@@ -2051,7 +3072,7 @@
2051	3072	ResetModel();
2052	3073	refreshContents();
2053	3074	} else
2054		- if (event.getSource() == linkverticesItem)
	3075	+ if (source == linkverticesItem)
2055	3076	{
2056	3077	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2057	3078	// {
..	..	@@ -2064,39 +3085,48 @@
2064	3085	// group.selection.get(0).setMasterThis(content); // should be identity
2065	3086	// refreshContents();
2066	3087	// }
2067		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	3088	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2068	3089	{
2069		- Object3D content = GrafreeD.clipboard.get(0);
	3090	+ Object3D content = Grafreed.clipboard.get(0);
2070	3091
2071	3092	if (content instanceof cGroup && ((cGroup)content).transientlink )
2072	3093	content = ((cGroup)content).get(0);
2073	3094
2074		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	3095	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2075	3096	for (int i=0; i<group.selection.size(); i++)
2076	3097	{
2077		- boolean random = CameraPane.RANDOM;
2078		- CameraPane.RANDOM = false; // parse all random nodes
	3098	+ boolean random = CameraPane.SWITCH;
	3099	+ CameraPane.SWITCH = false; // parse all random nodes
2079	3100	group.selection.get(i).linkVerticesThis(content);
2080	3101	// group.selection.get(i).setMasterThis(content); // should be identity
2081		- CameraPane.RANDOM = random;
	3102	+ CameraPane.SWITCH = random;
2082	3103	}
2083		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	3104	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2084	3105	refreshContents();
2085	3106	}
2086	3107	} else
2087		- if (event.getSource() == resetsupportItem)
	3108	+ if (source == resetsupportItem)
2088	3109	{
2089	3110	for (int i=0; i<group.selection.size(); i++)
2090	3111	{
2091		- boolean random = CameraPane.RANDOM;
2092		- CameraPane.RANDOM = false; // parse all random nodes
	3112	+ boolean random = CameraPane.SWITCH;
	3113	+ CameraPane.SWITCH = false; // parse all random nodes
2093	3114	group.selection.get(i).linkVerticesThis(null);
2094		- CameraPane.RANDOM = random;
	3115	+ CameraPane.SWITCH = random;
2095	3116	}
2096	3117
2097	3118	refreshContents();
2098	3119	} else
2099		- if (event.getSource() == resetreferencesItem)
	3120	+ if (source == relinkverticesItem)
	3121	+ {
	3122	+ boolean random = CameraPane.SWITCH;
	3123	+ CameraPane.SWITCH = false; // parse all random nodes
	3124	+ group.selection.RelinkToSupport();
	3125	+ CameraPane.SWITCH = random;
	3126	+
	3127	+ refreshContents();
	3128	+ } else
	3129	+ if (source == resetreferencesItem)
2100	3130	{
2101	3131	for (int i=0; i<group.selection.size(); i++)
2102	3132	{
..	..	@@ -2105,11 +3135,11 @@
2105	3135
2106	3136	refreshContents();
2107	3137	} else
2108		- if (event.getSource() == setMasterItem)
	3138	+ if (source == setMasterItem)
2109	3139	{
2110		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	3140	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2111	3141	{
2112		- Object3D content = GrafreeD.clipboard.get(0);
	3142	+ Object3D content = Grafreed.clipboard.get(0);
2113	3143
2114	3144	if (content instanceof cGroup && ((cGroup)content).transientlink )
2115	3145	content = ((cGroup)content).get(0);
..	..	@@ -2118,13 +3148,13 @@
2118	3148	refreshContents();
2119	3149	}
2120	3150	} else
2121		- if (event.getSource() == poseMeshItem)
	3151	+ if (source == poseMeshItem)
2122	3152	{
2123	3153	if (group.selection.size() == 1)
2124	3154	{
2125		- if (GrafreeD.clipboard.size() == 1)
	3155	+ if (Grafreed.clipboard.size() == 1)
2126	3156	{
2127		- Object3D content = GrafreeD.clipboard.get(0);
	3157	+ Object3D content = Grafreed.clipboard.get(0);
2128	3158
2129	3159	if (content instanceof cGroup && ((cGroup)content).transientlink )
2130	3160	content = ((cGroup)content).get(0);
..	..	@@ -2137,19 +3167,19 @@
2137	3167	}
2138	3168
2139	3169	} else
2140		- if (event.getSource() == revertMeshItem)
	3170	+ if (source == revertMeshItem)
2141	3171	{
2142	3172	RevertMeshes();
2143	3173	} else
2144		- if (event.getSource() == resetMeshItem)
	3174	+ if (source == resetAllItem)
2145	3175	{
2146	3176	ResetAll();
2147	3177	} else
2148		- if (event.getSource() == stepAllItem)
	3178	+ if (source == stepAllItem)
2149	3179	{
2150	3180	StepAll();
2151	3181	} else
2152		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	3182	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2153	3183	{
2154	3184	//int indices[] = jList.getSelectedIndices();
2155	3185	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2157,42 +3187,46 @@
2157	3187
2158	3188	ClearSelection(false);
2159	3189	} else
2160		- if (event.getSource() == clearAllItem)
	3190	+ if (source == clearAllItem)
2161	3191	{
2162	3192	ClearSelection(true);
2163	3193	} else
2164		- if (event.getSource() == grabItem)
	3194	+ if (source == grabItem \|\| source == groupButton)
2165	3195	{
2166		- group(new cGroup(), true);
	3196	+ group(new cGroup(), false); // true);
2167	3197	} else
2168		- if (event.getSource() == frontItem)
	3198	+ if (source == hideItem)
	3199	+ {
	3200	+ group(new HiddenObject());
	3201	+ } else
	3202	+ if (source == frontItem)
2169	3203	{
2170	3204	front();
2171	3205	} else
2172		- if (event.getSource() == backItem)
	3206	+ if (source == backItem)
2173	3207	{
2174	3208	back();
2175	3209	} else
2176		- if (event.getSource() == cameraItem)
	3210	+ if (source == cameraItem)
2177	3211	{
2178	3212	makeSomething(new Camera());
2179	3213	} else
2180		- if (event.getSource() == compositeItem)
	3214	+ if (source == compositeItem \|\| source == compositeButton)
2181	3215	{
2182	3216	group(new Composite());
2183	3217	} else
2184		- if (event.getSource() == randomItem)
	3218	+ if (source == switchItem \|\| source == switchButton)
2185	3219	{
2186	3220	RandomNode random = new RandomNode();
2187	3221	group(random);
2188	3222	if (random.size() > 0)
2189		- random.name = random.get(0).name + "Rnd";
	3223	+ random.name = random.get(0).name + "Switch";
2190	3224	} else
2191		- if (event.getSource() == physicsItem)
	3225	+ if (source == physicsItem)
2192	3226	{
2193	3227	group(new PhysicsNode());
2194	3228	} else
2195		- if (event.getSource() == frameselectorItem)
	3229	+ if (source == frameselectorItem)
2196	3230	{
2197	3231	for (int i=0; i<group.selection.size(); i++)
2198	3232	{
..	..	@@ -2204,7 +3238,7 @@
2204	3238	ResetModel();
2205	3239	refreshContents();
2206	3240	} else
2207		- if (event.getSource() == switchGeoItem)
	3241	+ if (source == switchGeoItem)
2208	3242	{
2209	3243	for (int i=0; i<group.selection.size(); i++)
2210	3244	{
..	..	@@ -2216,7 +3250,7 @@
2216	3250	ResetModel();
2217	3251	refreshContents();
2218	3252	} else
2219		- if (event.getSource() == switchTransfoItem)
	3253	+ if (source == switchTransfoItem)
2220	3254	{
2221	3255	for (int i=0; i<group.selection.size(); i++)
2222	3256	{
..	..	@@ -2228,7 +3262,7 @@
2228	3262	ResetModel();
2229	3263	refreshContents();
2230	3264	} else
2231		- if (event.getSource() == morphItem)
	3265	+ if (source == morphItem)
2232	3266	{
2233	3267	for (int i=0; i<group.selection.size(); i++)
2234	3268	{
..	..	@@ -2240,7 +3274,7 @@
2240	3274	ResetModel();
2241	3275	refreshContents();
2242	3276	} else
2243		- if (event.getSource() == scriptNodeItem)
	3277	+ if (source == scriptNodeItem)
2244	3278	{
2245	3279	boolean atleastone = false;
2246	3280
..	..	@@ -2279,199 +3313,252 @@
2279	3313	}
2280	3314	}
2281	3315	} else
2282		- if (event.getSource() == linkerItem)
	3316	+ if (source == linkerItem)
2283	3317	{
2284	3318	group(new cLinker());
2285	3319	} else
2286		- if (event.getSource() == textureItem)
	3320	+ if (source == textureItem \|\| source == textureButton)
2287	3321	{
2288	3322	group(new TextureNode());
2289	3323	} else
2290		- if (event.getSource() == shadowXItem)
	3324	+ if (source == billboardItem)
	3325	+ {
	3326	+ group(new BillboardNode());
	3327	+ } else
	3328	+ if (source == shadowXItem)
2291	3329	{
2292	3330	CastShadow(0);
2293	3331	} else
2294		- if (event.getSource() == shadowYItem)
	3332	+ if (source == shadowYItem)
2295	3333	{
2296	3334	CastShadow(1);
2297	3335	} else
2298		- if (event.getSource() == shadowZItem)
	3336	+ if (source == shadowZItem)
2299	3337	{
2300	3338	CastShadow(2);
2301	3339	} else
2302		- if (event.getSource() == ungroupItem)
	3340	+ if (source == ungroupItem \|\| source == ungroupButton)
2303	3341	{
2304		- ungroup();
	3342	+ boolean hasRoot = false;
	3343	+
	3344	+ for (int i=0; i<group.selection.size(); i++)
	3345	+ {
	3346	+ if (group.selection.get(i) == group)
	3347	+ {
	3348	+ hasRoot = true;
	3349	+ break;
	3350	+ }
	3351	+ }
	3352	+
	3353	+ if (!hasRoot)
	3354	+ {
	3355	+ for (int i=0; i<group.selection.size(); i++)
	3356	+ {
	3357	+ Ungroup(group.selection.get(i));
	3358	+ }
	3359	+
	3360	+ ClearSelection(false);
	3361	+
	3362	+ refreshContents();
	3363	+ }
2305	3364	} else
2306		- if (event.getSource() == genUVItem)
	3365	+ if (source == genUVItem)
2307	3366	{
2308	3367	GenUV();
2309	3368	} else
2310		- if (event.getSource() == genNormalsCADItem)
	3369	+ if (source == genNormalsCADItem)
2311	3370	{
2312	3371	GenNormals(true);
2313	3372	} else
2314		- if (event.getSource() == genNormalsMESHItem)
	3373	+ if (source == genNormalsMESHItem)
2315	3374	{
2316		- GenNormals(true); // TODO
	3375	+ GenNormalsMESH();
2317	3376	} else
2318		- if (event.getSource() == genNormalsORGANItem)
	3377	+ if (source == genNormalsORGANItem)
2319	3378	{
2320	3379	GenNormals(false);
2321	3380	} else
2322		- if (event.getSource() == stripifyItem)
	3381	+ if (source == genNormalsMINEItem)
	3382	+ {
	3383	+ GenNormalsMINE();
	3384	+ } else
	3385	+ if (source == stripifyItem)
2323	3386	{
2324	3387	Stripify();
2325	3388	} else
2326		- if (event.getSource() == unstripifyItem)
	3389	+ if (source == unstripifyItem)
2327	3390	{
2328	3391	Unstripify();
2329	3392	} else
2330		- if (event.getSource() == trimItem)
	3393	+ if (source == trimItem)
2331	3394	{
2332	3395	Trim();
2333	3396	} else
2334		- if (event.getSource() == untrimItem)
	3397	+ if (source == untrimItem)
2335	3398	{
2336	3399	Untrim();
2337	3400	} else
2338		- if (event.getSource() == clearColorsItem)
	3401	+ if (source == clearColorsItem)
2339	3402	{
2340	3403	ClearColors();
2341	3404	} else
2342		- if (event.getSource() == clearMaterialsItem)
	3405	+ if (source == clearMaterialsItem)
2343	3406	{
2344	3407	ClearMaterials();
2345	3408	} else
2346		- if (event.getSource() == liveleavesItem)
	3409	+ if (source == liveleavesItem)
2347	3410	{
2348	3411	LiveLeaves(true);
2349	3412	} else
2350		- if (event.getSource() == unliveleavesItem)
	3413	+ if (source == unliveleavesItem)
2351	3414	{
2352	3415	LiveLeaves(false);
2353	3416	} else
2354		- if (event.getSource() == supportleavesItem)
	3417	+ if (source == supportleavesItem)
2355	3418	{
2356	3419	SupportLeaves(true);
2357	3420	} else
2358		- if (event.getSource() == unsupportleavesItem)
	3421	+ if (source == unsupportleavesItem)
2359	3422	{
2360	3423	SupportLeaves(false);
2361	3424	} else
2362		- if (event.getSource() == hideleavesItem)
	3425	+ if (source == hideleavesItem)
2363	3426	{
2364	3427	HideLeaves(true);
2365	3428	} else
2366		- if (event.getSource() == showleavesItem)
	3429	+ if (source == showleavesItem)
2367	3430	{
2368	3431	HideLeaves(false);
2369	3432	} else
2370		- if (event.getSource() == markleavesItem)
	3433	+ if (source == markleavesItem)
2371	3434	{
2372	3435	MarkLeaves(true);
2373	3436	} else
2374		- if (event.getSource() == unmarkleavesItem)
	3437	+ if (source == unmarkleavesItem)
2375	3438	{
2376	3439	MarkLeaves(false);
2377	3440	} else
2378		- if (event.getSource() == flipVItem)
	3441	+ if (source == rewindleavesItem)
	3442	+ {
	3443	+ RewindLeaves(true);
	3444	+ } else
	3445	+ if (source == unrewindleavesItem)
	3446	+ {
	3447	+ RewindLeaves(false);
	3448	+ } else
	3449	+ if (source == randomleavesItem)
	3450	+ {
	3451	+ RandomLeaves(true);
	3452	+ } else
	3453	+ if (source == unrandomleavesItem)
	3454	+ {
	3455	+ RandomLeaves(false);
	3456	+ } else
	3457	+ if (source == flipVItem)
2379	3458	{
2380	3459	FlipV(true);
2381	3460	} else
2382		- if (event.getSource() == unflipVItem)
	3461	+ if (source == unflipVItem)
2383	3462	{
2384	3463	FlipV(false);
2385	3464	} else
2386		- if (event.getSource() == lowTexturesItem)
	3465	+ if (source == lowTexturesItem)
2387	3466	{
2388	3467	SetTexRes(0);
2389	3468	} else
2390		- if (event.getSource() == normalTexturesItem)
	3469	+ if (source == normalTexturesItem)
2391	3470	{
2392	3471	SetTexRes(1);
2393	3472	} else
2394		- if (event.getSource() == highTexturesItem)
	3473	+ if (source == highTexturesItem)
2395	3474	{
2396	3475	SetTexRes(2);
2397	3476	} else
2398		- if (event.getSource() == veryhighTexturesItem)
	3477	+ if (source == veryhighTexturesItem)
2399	3478	{
2400	3479	SetTexRes(3);
2401	3480	} else
2402		- if (event.getSource() == maxTexturesItem)
	3481	+ if (source == maxTexturesItem)
2403	3482	{
2404	3483	SetTexRes(4);
2405	3484	} else
2406		- if (event.getSource() == panoTexturesItem)
	3485	+ if (source == panoTexturesItem)
2407	3486	{
2408	3487	SetTexRes(5);
2409	3488	} else
2410		- if (event.getSource() == reverseNormalsItem)
	3489	+ if (source == reverseNormalsItem)
2411	3490	{
2412	3491	ReverseNormals();
2413	3492	} else
2414		- if (event.getSource() == parseverticesItem)
	3493	+ if (source == parseverticesItem)
2415	3494	{
2416	3495	ParseVertices();
2417	3496	} else
2418		- if (event.getSource() == textureFieldItem)
	3497	+ if (source == textureFieldItem)
2419	3498	{
2420	3499	TextureVertices();
2421	3500	} else
2422		- if (event.getSource() == alignItem)
	3501	+ if (source == alignItem)
2423	3502	{
2424	3503	Align();
2425	3504	} else
2426		- if (event.getSource() == mirrorItem)
	3505	+ if (source == mirrorItem)
2427	3506	{
2428	3507	MirrorPoses();
2429	3508	} else
2430		- if (event.getSource() == reduceMorphItem)
	3509	+ if (source == reduceMorphItem)
2431	3510	{
2432	3511	MeshReduction(false);
2433	3512	} else
2434		- if (event.getSource() == reduce34MorphItem)
	3513	+ if (source == reduce34MorphItem)
2435	3514	{
2436	3515	MeshReduction(true);
2437	3516	} else
2438		- if (event.getSource() == reverseTrianglesItem)
	3517	+ if (source == reverseTrianglesItem)
2439	3518	{
2440	3519	ReverseTriangles();
2441	3520	} else
2442		- if (event.getSource() == reduceMeshItem)
	3521	+ if (source == reduceMeshItem)
2443	3522	{
2444	3523	ReduceMesh(false);
2445	3524	} else
2446		- if (event.getSource() == reduce34MeshItem)
	3525	+ if (source == reduce34MeshItem)
2447	3526	{
2448	3527	ReduceMesh(true);
2449	3528	} else
2450		- if (event.getSource() == increaseMeshItem)
	3529	+ if (source == increaseMeshItem)
2451	3530	{
2452	3531	IncreaseMesh();
2453	3532	} else
2454		- if (event.getSource() == clipMeshItem)
	3533	+ if (source == clipMeshItem)
2455	3534	{
2456	3535	ClipMesh();
2457	3536	} else
2458		- if (event.getSource() == smoothMeshItem)
	3537	+ if (source == smoothMeshItem)
2459	3538	{
2460	3539	SmoothMesh();
2461	3540	} else
2462		- if (event.getSource() == transformgeometryItem)
	3541	+ if (source == transformGeometryItem)
2463	3542	{
2464	3543	TransformGeometry();
2465	3544	} else
2466		- if (event.getSource() == resetTransformItem)
	3545	+ if (source == transformChildrenItem)
	3546	+ {
	3547	+ TransformChildren();
	3548	+ } else
	3549	+ if (source == resetTransformItem)
2467	3550	{
2468	3551	ResetTransform();
2469	3552	} else
2470		- if (event.getSource() == resetCentroidItem)
	3553	+ if (source == resetCentroidItem)
2471	3554	{
2472		- ResetCentroid();
	3555	+ ResetCentroid(true);
2473	3556	} else
2474		- if (event.getSource() == resetParentItem)
	3557	+ if (source == resetCentroidXZItem)
	3558	+ {
	3559	+ ResetCentroid(false);
	3560	+ } else
	3561	+ if (source == resetParentItem)
2475	3562	{
2476	3563	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2477	3564	{
..	..	@@ -2481,7 +3568,7 @@
2481	3568
2482	3569	refreshContents();
2483	3570	} else
2484		- if (event.getSource() == repairParentItem)
	3571	+ if (source == repairParentItem)
2485	3572	{
2486	3573	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2487	3574	{
..	..	@@ -2495,7 +3582,21 @@
2495	3582
2496	3583	refreshContents();
2497	3584	} else
2498		- if (event.getSource() == sortbysizeItem)
	3585	+ if (source == repairShadowItem)
	3586	+ {
	3587	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3588	+ {
	3589	+ Object3D obj = (Object3D)e.nextElement();
	3590	+ obj.RepairShadow();
	3591	+// for (int i=0; i<obj.size(); i++)
	3592	+// {
	3593	+// obj.get(i).parent = obj;
	3594	+// }
	3595	+ }
	3596	+
	3597	+ refreshContents();
	3598	+ } else
	3599	+ if (source == sortbysizeItem)
2499	3600	{
2500	3601	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2501	3602	{
..	..	@@ -2507,7 +3608,7 @@
2507	3608	ResetModel();
2508	3609	refreshContents();
2509	3610	} else
2510		- if (event.getSource() == sortbynameItem)
	3611	+ if (source == sortbynameItem)
2511	3612	{
2512	3613	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2513	3614	{
..	..	@@ -2519,7 +3620,7 @@
2519	3620	ResetModel();
2520	3621	refreshContents();
2521	3622	} else
2522		- if (event.getSource() == attachPigmentItem)
	3623	+ if (source == attachPigmentItem)
2523	3624	{
2524	3625	String texture = GetFile("Attach pigment");
2525	3626	Object3D obj;
..	..	@@ -2531,7 +3632,7 @@
2531	3632
2532	3633	refreshContents();
2533	3634	} else
2534		- if (event.getSource() == detachPigmentItem)
	3635	+ if (source == detachPigmentItem)
2535	3636	{
2536	3637	Object3D obj;
2537	3638	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2542,7 +3643,7 @@
2542	3643
2543	3644	refreshContents();
2544	3645	} else
2545		- if (event.getSource() == attachBumpItem)
	3646	+ if (source == attachBumpItem)
2546	3647	{
2547	3648	String texture = GetFile("Attach bump");
2548	3649	Object3D obj;
..	..	@@ -2554,18 +3655,18 @@
2554	3655
2555	3656	refreshContents();
2556	3657	} else
2557		- if (event.getSource() == detachBumpItem)
	3658	+ if (source == detachBumpItem)
2558	3659	{
2559	3660	Object3D obj;
2560	3661	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2561	3662	{
2562	3663	obj = (Object3D)e.nextElement();
2563		- obj.SetBumpTexture(null);
	3664	+ obj.ResetBumpTexture();
2564	3665	}
2565	3666
2566	3667	refreshContents();
2567	3668	} else
2568		- if (event.getSource() == pigmentBumpItem)
	3669	+ if (source == pigmentBumpItem)
2569	3670	{
2570	3671	Object3D obj;
2571	3672	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2576,159 +3677,233 @@
2576	3677
2577	3678	refreshContents();
2578	3679	} else
2579		- if (event.getSource() == flashSelectionButton)
	3680	+ if (source == embedTexturesItem)
	3681	+ {
	3682	+ Object3D obj;
	3683	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3684	+ {
	3685	+ obj = (Object3D)e.nextElement();
	3686	+ obj.EmbedTextures(true);
	3687	+ }
	3688	+
	3689	+ refreshContents();
	3690	+ } else
	3691	+ if (source == deEmbedTexturesItem)
	3692	+ {
	3693	+ Object3D obj;
	3694	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3695	+ {
	3696	+ obj = (Object3D)e.nextElement();
	3697	+ obj.EmbedTextures(false);
	3698	+ }
	3699	+
	3700	+ CameraPane.texturepigment.clear();
	3701	+ CameraPane.texturebump.clear();
	3702	+
	3703	+ refreshContents();
	3704	+ } else
	3705	+ if (source == flashSelectionButton)
2580	3706	{
2581	3707	CameraPane.flash = true;
2582	3708	refreshContents();
2583	3709	} else
2584		- if (event.getSource() == oneButton)
	3710	+ if (source == oneButton)
2585	3711	{
2586	3712	} else
2587		- if (event.getSource() == twoButton)
	3713	+ if (source == twoButton)
2588	3714	{
2589	3715	radio.layout = twoButton;
2590		- // bug
2591		- //gridPanel.setDividerLocation(1.0);
2592		- //bigPanel.setDividerLocation(0.0);
2593		- bigThree.remove(jtp);
2594		- bigThree.remove(cameraPanel);
2595		- bigThree.remove(XYZPanel);
2596		- aWindowConstraints.gridx = 0;
2597		- aWindowConstraints.gridy = 0;
2598		- aWindowConstraints.gridwidth = 1;
2599		- // aConstraints.gridheight = 3;
2600		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2601		- aWindowConstraints.weightx = 0;
2602		- aWindowConstraints.weighty = 1;
2603		- //bigThree.add(jtp, aWindowConstraints);
2604		- aWindowConstraints.weightx = 1;
2605		- aWindowConstraints.gridwidth = 3;
2606		- // aConstraints.gridheight = 3;
2607		- aWindowConstraints.gridx = 1;
2608		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2609		- bigThree.add(cameraPanel, aWindowConstraints);
2610		- aWindowConstraints.weightx = 0;
2611		- aWindowConstraints.gridx = 4;
2612		- aWindowConstraints.gridwidth = 1;
2613		- // aConstraints.gridheight = 3;
2614		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2615		- //bigThree.add(XYZPanel, aWindowConstraints);
2616		- bigThree.revalidate();
	3716	+
	3717	+ if (CameraPane.FULLSCREEN)
	3718	+ fullscreenLayout = radio.layout;
	3719	+
	3720	+ Show3DView();
	3721	+
	3722	+ cameraView.requestFocusInWindow();
	3723	+
	3724	+// refreshContents(true);
	3725	+//
	3726	+// try
	3727	+// {
	3728	+// java.awt.Robot bot = new java.awt.Robot();
	3729	+// int mask = InputEvent.BUTTON1_MASK;
	3730	+// bot.mouseMove(100, 100);
	3731	+// bot.mousePress(mask);
	3732	+// bot.mouseRelease(mask);
	3733	+// }
	3734	+// catch (Exception e)
	3735	+// {
	3736	+//
	3737	+// }
	3738	+
2617	3739	} else
2618		- if (event.getSource() == threeButton)
	3740	+ if (source == threeButton)
2619	3741	{
2620	3742	radio.layout = threeButton;
2621		- bigThree.remove(jtp);
2622		- bigThree.remove(cameraPanel);
2623		- bigThree.remove(XYZPanel);
2624		- aWindowConstraints.gridx = 0;
2625		- aWindowConstraints.gridy = 0;
2626		- aWindowConstraints.gridwidth = 1;
2627		- // aConstraints.gridheight = 3;
2628		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2629		- aWindowConstraints.weightx = 0;
2630		- aWindowConstraints.weighty = 1;
2631		- //bigThree.add(jtp, aWindowConstraints);
2632		- aWindowConstraints.weightx = 1;
2633		- aWindowConstraints.gridwidth = 3;
2634		- // aConstraints.gridheight = 3;
2635		- aWindowConstraints.gridx = 1;
2636		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2637		- bigThree.add(cameraPanel, aWindowConstraints);
2638		- aWindowConstraints.weightx = 0;
2639		- aWindowConstraints.gridx = 4;
2640		- aWindowConstraints.gridwidth = 1;
2641		- // aConstraints.gridheight = 3;
2642		- aConstraints.fill = GridBagConstraints.VERTICAL;
2643		- bigThree.add(XYZPanel, aWindowConstraints);
2644		- bigThree.revalidate();
	3743	+
	3744	+ if (CameraPane.FULLSCREEN)
	3745	+ fullscreenLayout = radio.layout;
	3746	+
	3747	+// bigThree.remove(scenePanel);
	3748	+// bigThree.remove(centralPanel);
	3749	+// bigThree.remove(XYZPanel);
	3750	+// aWindowConstraints.gridx = 0;
	3751	+// aWindowConstraints.gridy = 0;
	3752	+// aWindowConstraints.gridwidth = 1;
	3753	+// // aConstraints.gridheight = 3;
	3754	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3755	+// aWindowConstraints.weightx = 0;
	3756	+// aWindowConstraints.weighty = 1;
	3757	+// //bigThree.add(jtp, aWindowConstraints);
	3758	+// aWindowConstraints.weightx = 1;
	3759	+// aWindowConstraints.gridwidth = 3;
	3760	+// // aConstraints.gridheight = 3;
	3761	+// aWindowConstraints.gridx = 1;
	3762	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3763	+// bigThree.add(centralPanel, aWindowConstraints);
	3764	+// aWindowConstraints.weightx = 0;
	3765	+// aWindowConstraints.gridx = 4;
	3766	+// aWindowConstraints.gridwidth = 1;
	3767	+// // aConstraints.gridheight = 3;
	3768	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	3769	+// bigThree.add(XYZPanel, aWindowConstraints);
	3770	+// bigThree.validate();
	3771	+// scenePanel.setVisible(false);
	3772	+// centralPanel.setVisible(true);
	3773	+// XYZPanel.setVisible(true);
	3774	+ bigThree.ClearUI();
	3775	+ bigThree.add(scenePanel);
	3776	+ bigThree.add(centralPanel);
	3777	+ bigThree.FlushUI();
	3778	+
	3779	+ cameraView.requestFocusInWindow();
2645	3780	} else
2646		- if (event.getSource() == fourButton)
	3781	+ if (source == fourButton)
2647	3782	{
2648	3783	radio.layout = fourButton;
2649		- bigThree.remove(jtp);
2650		- bigThree.remove(cameraPanel);
2651		- bigThree.remove(XYZPanel);
2652		- aWindowConstraints.gridx = 0;
2653		- aWindowConstraints.gridy = 0;
2654		- aWindowConstraints.gridwidth = 1;
2655		- // aWindowConstraints.gridheight = 3;
2656		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2657		- aWindowConstraints.weightx = 1;
2658		- aWindowConstraints.weighty = 1;
2659		- bigThree.add(jtp, aWindowConstraints);
2660		- aWindowConstraints.weightx = 1;
2661		- aWindowConstraints.gridwidth = 3;
2662		- // aConstraints.gridheight = 3;
2663		- aWindowConstraints.gridx = 1;
2664		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2665		- //bigThree.add(cameraPanel, aWindowConstraints);
2666		- aWindowConstraints.weightx = 0;
2667		- aWindowConstraints.gridx = 4;
2668		- aWindowConstraints.gridwidth = 1;
2669		- // aWindowConstraints.gridheight = 3;
2670		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2671		- //bigThree.add(XYZPanel, aWindowConstraints);
2672		- bigThree.revalidate();
	3784	+
	3785	+ if (CameraPane.FULLSCREEN)
	3786	+ fullscreenLayout = radio.layout;
	3787	+
	3788	+// bigThree.remove(scenePanel);
	3789	+// bigThree.remove(centralPanel);
	3790	+// bigThree.remove(XYZPanel);
	3791	+// aWindowConstraints.gridx = 0;
	3792	+// aWindowConstraints.gridy = 0;
	3793	+// aWindowConstraints.gridwidth = 1;
	3794	+// // aWindowConstraints.gridheight = 3;
	3795	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3796	+// aWindowConstraints.weightx = 1;
	3797	+// aWindowConstraints.weighty = 1;
	3798	+// bigThree.add(scenePanel, aWindowConstraints);
	3799	+// aWindowConstraints.weightx = 1;
	3800	+// aWindowConstraints.gridwidth = 3;
	3801	+// // aConstraints.gridheight = 3;
	3802	+// aWindowConstraints.gridx = 1;
	3803	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3804	+// //bigThree.add(cameraPanel, aWindowConstraints);
	3805	+// aWindowConstraints.weightx = 0;
	3806	+// aWindowConstraints.gridx = 4;
	3807	+// aWindowConstraints.gridwidth = 1;
	3808	+// // aWindowConstraints.gridheight = 3;
	3809	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3810	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3811	+// bigThree.validate();
	3812	+// scenePanel.setVisible(true);
	3813	+// centralPanel.setVisible(false);
	3814	+// XYZPanel.setVisible(false);
	3815	+ bigThree.ClearUI();
	3816	+ bigThree.add(scenePanel);
	3817	+ bigThree.FlushUI();
	3818	+
	3819	+ cameraView.requestFocusInWindow();
2673	3820	} else
2674		- if (event.getSource() == sixButton)
	3821	+ if (source == sixButton)
2675	3822	{
2676	3823	radio.layout = sixButton;
2677		- bigThree.remove(jtp);
2678		- bigThree.remove(cameraPanel);
2679		- bigThree.remove(XYZPanel);
2680		- aWindowConstraints.gridx = 0;
2681		- aWindowConstraints.gridy = 0;
2682		- aWindowConstraints.gridwidth = 1;
2683		- // aConstraints.gridheight = 3;
2684		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2685		- aWindowConstraints.weightx = 0;
2686		- aWindowConstraints.weighty = 1;
2687		- bigThree.add(jtp, aWindowConstraints);
2688		- aWindowConstraints.weightx = 1;
2689		- aWindowConstraints.gridwidth = 3;
2690		- // aWindowConstraints.gridheight = 3;
2691		- aWindowConstraints.gridx = 1;
2692		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2693		- bigThree.add(cameraPanel, aWindowConstraints);
2694		- aWindowConstraints.weightx = 0;
2695		- aWindowConstraints.gridx = 4;
2696		- aWindowConstraints.gridwidth = 1;
2697		- // aWindowConstraints.gridheight = 3;
2698		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2699		- //bigThree.add(XYZPanel, aConstraints);
2700		- bigThree.revalidate();
	3824	+
	3825	+ if (CameraPane.FULLSCREEN)
	3826	+ fullscreenLayout = radio.layout;
	3827	+
	3828	+// bigThree.remove(scenePanel);
	3829	+// bigThree.remove(centralPanel);
	3830	+// bigThree.remove(XYZPanel);
	3831	+// aWindowConstraints.gridx = 0;
	3832	+// aWindowConstraints.gridy = 0;
	3833	+// aWindowConstraints.gridwidth = 1;
	3834	+// // aConstraints.gridheight = 3;
	3835	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3836	+// aWindowConstraints.weightx = 0;
	3837	+// aWindowConstraints.weighty = 1;
	3838	+// bigThree.add(scenePanel, aWindowConstraints);
	3839	+// aWindowConstraints.weightx = 1;
	3840	+// aWindowConstraints.gridwidth = 3;
	3841	+// // aWindowConstraints.gridheight = 3;
	3842	+// aWindowConstraints.gridx = 1;
	3843	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3844	+// bigThree.add(centralPanel, aWindowConstraints);
	3845	+// aWindowConstraints.weightx = 0;
	3846	+// aWindowConstraints.gridx = 4;
	3847	+// aWindowConstraints.gridwidth = 1;
	3848	+// // aWindowConstraints.gridheight = 3;
	3849	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3850	+// //bigThree.add(XYZPanel, aConstraints);
	3851	+// bigThree.validate();
	3852	+// scenePanel.setVisible(true);
	3853	+// centralPanel.setVisible(true);
	3854	+// XYZPanel.setVisible(false);
	3855	+ bigThree.ClearUI();
	3856	+ bigThree.add(centralPanel);
	3857	+ bigThree.add(scenePanel);
	3858	+ bigThree.FlushUI();
	3859	+
	3860	+ cameraView.requestFocusInWindow();
2701	3861	} else
2702		- if (event.getSource() == sevenButton)
	3862	+ if (source == sevenButton)
2703	3863	{
2704	3864	radio.layout = sevenButton;
2705		- bigThree.remove(jtp);
2706		- bigThree.remove(cameraPanel);
2707		- bigThree.remove(XYZPanel);
2708		- aWindowConstraints.gridx = 0;
2709		- aWindowConstraints.gridy = 0;
2710		- aWindowConstraints.gridwidth = 1;
2711		- // aWindowConstraints.gridheight = 3;
2712		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2713		- aWindowConstraints.weightx = 0;
2714		- aWindowConstraints.weighty = 1;
2715		- bigThree.add(jtp, aWindowConstraints);
2716		- aWindowConstraints.weightx = 1;
2717		- aWindowConstraints.gridwidth = 3;
2718		- // aWindowConstraints.gridheight = 3;
2719		- aWindowConstraints.gridx = 1;
2720		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2721		- bigThree.add(cameraPanel, aWindowConstraints);
2722		- aWindowConstraints.weightx = 0;
2723		- aWindowConstraints.gridx = 4;
2724		- aWindowConstraints.gridwidth = 1;
2725		- // aConstraints.gridheight = 3;
2726		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2727		- bigThree.add(XYZPanel, aWindowConstraints);
2728		- bigThree.revalidate();
	3865	+
	3866	+ if (CameraPane.FULLSCREEN)
	3867	+ fullscreenLayout = radio.layout;
	3868	+
	3869	+// bigThree.remove(scenePanel);
	3870	+// bigThree.remove(centralPanel);
	3871	+// bigThree.remove(XYZPanel);
	3872	+// aWindowConstraints.gridx = 0;
	3873	+// aWindowConstraints.gridy = 0;
	3874	+// aWindowConstraints.gridwidth = 1;
	3875	+// // aWindowConstraints.gridheight = 3;
	3876	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3877	+// aWindowConstraints.weightx = 0;
	3878	+// aWindowConstraints.weighty = 1;
	3879	+// bigThree.add(scenePanel, aWindowConstraints);
	3880	+// aWindowConstraints.weightx = 1;
	3881	+// aWindowConstraints.gridwidth = 3;
	3882	+// // aWindowConstraints.gridheight = 3;
	3883	+// aWindowConstraints.gridx = 1;
	3884	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3885	+// bigThree.add(centralPanel, aWindowConstraints);
	3886	+// aWindowConstraints.weightx = 0;
	3887	+// aWindowConstraints.gridx = 4;
	3888	+// aWindowConstraints.gridwidth = 1;
	3889	+// // aConstraints.gridheight = 3;
	3890	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3891	+// bigThree.add(XYZPanel, aWindowConstraints);
	3892	+// bigThree.validate();
	3893	+// scenePanel.setVisible(true);
	3894	+// centralPanel.setVisible(true);
	3895	+// XYZPanel.setVisible(true);
	3896	+ bigThree.ClearUI();
	3897	+ bigThree.add(scenePanel);
	3898	+ bigThree.add(centralPanel);
	3899	+ bigThree.add(XYZPanel);
	3900	+ bigThree.FlushUI();
	3901	+
	3902	+ cameraView.requestFocusInWindow();
2729	3903	} else
2730		- if (event.getSource() == rootButton)
	3904	+ if (source == rootButton)
2731	3905	{
	3906	+ Replace();
2732	3907	Object3D obj;
2733	3908	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2734	3909	{
..	..	@@ -2737,66 +3912,85 @@
2737	3912	EditObject(obj);
2738	3913	}
2739	3914
	3915	+ cameraView.requestFocusInWindow();
2740	3916	refreshContents(true);
2741	3917	} else
2742		- if (event.getSource() == closeButton)
	3918	+ if (source == closeButton)
2743	3919	{
2744	3920	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2745	3921	cRadio ab;
2746	3922	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2747	3923	{
2748	3924	ab = (cRadio)e.nextElement();
2749		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3925	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2750	3926	{
	3927	+ // Patch to avoid bug with transparency.
	3928	+ if (!ab.hadMaterial)
	3929	+ {
	3930	+ ab.object.material = null;
	3931	+ }
	3932	+
2751	3933	buttonGroup.remove(ab);
2752	3934	radioPanel.remove(ab);
2753	3935
2754		- ab.GetObject().editWindow = null;
	3936	+ //ab.GetObject().editWindow = null;
	3937	+ ab.GetObject().manipWindow = null;
2755	3938	// ab.GetObject().objectUI = null; // ?????????
2756	3939
2757	3940	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2758	3941	break;
2759	3942	}
2760	3943	}
	3944	+
	3945	+ cameraView.requestFocusInWindow();
2761	3946	refreshContents(true);
2762	3947	} else
2763		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3948	+ if (source == editItem \|\| source == editButton)
2764	3949	{
	3950	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3951	+ {
	3952	+ Object3D child = (Object3D)e.nextElement();
	3953	+ child.pinned = true;
	3954	+ }
	3955	+
2765	3956	EditSelection(false);
2766	3957	} else
2767		- if (event.getSource() == uneditButton)
	3958	+ if (source == uneditButton)
2768	3959	{
2769	3960	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2770	3961	{
2771	3962	Object3D child = (Object3D)e.nextElement();
2772	3963	if(child.editWindow != null)
2773		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3964	+ child.pinned = false;
2774	3965	child.CloseUI();
2775	3966	listUI.remove(child);
	3967	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2776	3968
2777		- child.editWindow = null; // ???????????
	3969	+ //child.editWindow = null; // ???????????
2778	3970	}
2779		- objEditor.ctrlPanel.revalidate();
	3971	+ objEditor.ctrlPanel.FlushUI();
2780	3972	//objEditor.jTree.clearSelection();
2781	3973	//objEditor.ResetSliders();
2782	3974	refreshContents(true);
2783	3975	} else
2784		- if (event.getSource() == clearPanelButton)
	3976	+ if (source == clearPanelButton)
2785	3977	{
2786	3978	assert(copy == group);
2787	3979	//copy.ClearUI();
2788	3980	for (Object3D obj : listUI)
2789	3981	{
	3982	+ obj.pinned = false;
2790	3983	obj.CloseUI();
2791	3984	}
2792	3985	listUI.clear();
	3986	+ SetPinStates(group.selection.size() > 0);
2793	3987	refreshContents(true);
2794	3988	} else
2795		- if (event.getSource() == allParamsButton)
	3989	+ if (source == allParamsButton)
2796	3990	{
2797	3991	assert(copy == group);
2798	3992
2799		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3993	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2800	3994
2801	3995	for (Object3D obj : listUI)
2802	3996	{
..	..	@@ -2813,19 +4007,19 @@
2813	4007
2814	4008	refreshContents(true);
2815	4009	} else
2816		- if (event.getSource() == unselectButton)
	4010	+ if (source == unselectButton)
2817	4011	{
2818	4012	objEditor.jTree.clearSelection();
2819	4013	// ?? oct 2012 GrafreeD.clipboard.clear();
2820	4014	objEditor.ResetSliders();
2821	4015	refreshContents(true);
2822	4016	} else
2823		- if(event.getSource() instanceof cRadio)
	4017	+ if(source instanceof cRadio)
2824	4018	{
2825	4019	group.parent = keepparent;
2826	4020	group.attributes = 0;
2827	4021	//group.editWindow = null;
2828		- /cRadio/ radio = (cRadio)event.getSource();
	4022	+ /cRadio/ radio = (cRadio)source;
2829	4023	Object3D obj = radio.GetObject();
2830	4024	System.out.println("Edit " + obj);
2831	4025	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2845,7 +4039,8 @@
2845	4039	}
2846	4040
2847	4041	copy = group;
2848		- //CameraPane.theRenderer.object = group;
	4042	+
	4043	+ //Globals.theRenderer.object = group;
2849	4044	if(!useclient)
2850	4045	{
2851	4046	cameraView.renderCamera = radio.camera;
..	..	@@ -2854,25 +4049,57 @@
2854	4049	cameraView.cameras[cameraView.cameracount] = radio.camera;
2855	4050	cameraView.targetLookAt.set(radio.camera.lookAt);
2856	4051	cameraView.object = group;
2857		- cameraView.lighttouched = true;
	4052	+ //cameraView.lighttouched = true;
	4053	+ Globals.lighttouched = true;
2858	4054	topView.object = group;
2859	4055	frontView.object = group;
2860	4056	sideView.object = group;
2861	4057	}
2862		- group.editWindow = this;
	4058	+
	4059	+// fix "+" issue
	4060	+ //group.editWindow = this;
	4061	+ group.manipWindow = this;
	4062	+
2863	4063	/*
2864	4064	currentLayout = radio.layout;
2865	4065	if (currentLayout == null)
2866	4066	currentLayout = sevenButton;
2867	4067	*/
2868	4068	radio.layout.doClick();
	4069	+
	4070	+ SetUndoStates();
	4071	+
	4072	+ ClearUnpinned();
	4073	+
	4074	+ //Grafreed.Assert(group != null);
	4075	+ //Grafreed.Assert(group.selection != null);
	4076	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4077	+ if (group.selection == null \|\| group.selection.size() == 1)
	4078	+ EditSelection(false);
2869	4079	keepparent = group.parent;
2870	4080	// PARENT = NULL or not???
2871	4081	//group.parent = null; // ROOT
2872	4082	//group.attributes = -1;
2873	4083	ResetModel();
	4084	+
	4085	+ cameraView.requestFocusInWindow();
2874	4086	refreshContents(true);
2875		- }
	4087	+ } else if (event.getSource() == editCameraItem)
	4088	+ {
	4089	+ cameraView.ProtectCamera();
	4090	+ cameraView.requestFocusInWindow();
	4091	+ cameraView.repaint();
	4092	+ return;
	4093	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	4094	+ {
	4095	+ cameraView.RevertCamera();
	4096	+ cameraView.requestFocusInWindow();
	4097	+ cameraView.repaint();
	4098	+ return;
	4099	+ // } else if (event.getSource() == textureButton)
	4100	+ // {
	4101	+ // return; // true;
	4102	+ }
2876	4103	else
2877	4104	{
2878	4105	//return super.action(event, arg);
..	..	@@ -2881,7 +4108,6 @@
2881	4108	}
2882	4109
2883	4110	boolean useclient = false;
2884		- cRadio radio;
2885	4111
2886	4112	void ToggleRoot()
2887	4113	{
..	..	@@ -2890,7 +4116,7 @@
2890	4116	if (useclient)
2891	4117	{
2892	4118	cameraView.object = client;
2893		- cameraView.lighttouched = true;
	4119	+ Globals.lighttouched = true;
2894	4120	//topView.object = client;
2895	4121	//frontView.object = client;
2896	4122	//sideView.object = client;
..	..	@@ -2898,7 +4124,7 @@
2898	4124	else
2899	4125	{
2900	4126	cameraView.object = group;
2901		- cameraView.lighttouched = true;
	4127	+ Globals.lighttouched = true;
2902	4128	//topView.object = group;
2903	4129	//frontView.object = group;
2904	4130	//sideView.object = group;
..	..	@@ -2933,6 +4159,28 @@
2933	4159	refreshContents();
2934	4160	}
2935	4161
	4162	+ void TransformChildren()
	4163	+ {
	4164	+ Object3D obj;
	4165	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4166	+ {
	4167	+ obj = (Object3D)e.nextElement();
	4168	+ obj.KeepTextureMatrices();
	4169	+ obj.TransformChildren();
	4170	+ obj.RestoreTextureMatrices();
	4171	+
	4172	+// if (obj.parent == null)
	4173	+// {
	4174	+// System.out.println("NULL PARENT!");
	4175	+// new Exception().printStackTrace();
	4176	+// }
	4177	+// else
	4178	+// TouchTransform(obj);
	4179	+// //obj.parent.Touch();
	4180	+ }
	4181	+
	4182	+ refreshContents();
	4183	+ }
2936	4184
2937	4185	void ResetTransform()
2938	4186	{
..	..	@@ -3045,7 +4293,7 @@
3045	4293	refreshContents();
3046	4294	}
3047	4295
3048		- void ResetCentroid()
	4296	+ void ResetCentroid(boolean full)
3049	4297	{
3050	4298	Object3D obj;
3051	4299	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3060,12 +4308,16 @@
3060	4308	LA.matIdentity(Object3D.mat);
3061	4309	obj.getBounds(minima, maxima, false);
3062	4310	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3063		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	4311	+ if (full)
	4312	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3064	4313	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3065	4314	obj.TransformMesh(Object3D.mat);
	4315	+
3066	4316	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3067		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	4317	+ if (full)
	4318	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3068	4319	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	4320	+
3069	4321	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3070	4322	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3071	4323	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3094,7 +4346,8 @@
3094	4346
3095	4347	int size = obj.MemorySize();
3096	4348
3097		- System.err.println((size/1024) + " KB is the size of " + obj);
	4349	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4350	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3098	4351	}
3099	4352	}
3100	4353	catch (Exception e)
..	..	@@ -3131,9 +4384,9 @@
3131	4384	obj = (Object3D)e.nextElement();
3132	4385
3133	4386	System.out.println("Object is: " + obj);
3134		- GrafreeD.AnalyzeObject(obj);
	4387	+ Grafreed.AnalyzeObject(obj);
3135	4388	System.out.println("Boundary rep: " + obj.bRep);
3136		- GrafreeD.AnalyzeObject(obj.bRep);
	4389	+ Grafreed.AnalyzeObject(obj.bRep);
3137	4390
3138	4391	// System.err.println((size/1024) + " KB is the size of " + obj);
3139	4392	}
..	..	@@ -3175,6 +4428,20 @@
3175	4428	void GenNormals(boolean crease)
3176	4429	{
3177	4430	group.GenNormalsS(crease);
	4431	+
	4432	+ refreshContents();
	4433	+ }
	4434	+
	4435	+ void GenNormalsMESH()
	4436	+ {
	4437	+ group.GenNormalsMeshS();
	4438	+
	4439	+ refreshContents();
	4440	+ }
	4441	+
	4442	+ void GenNormalsMINE()
	4443	+ {
	4444	+ group.selection.GenNormalsMINE();
3178	4445
3179	4446	refreshContents();
3180	4447	}
..	..	@@ -3340,8 +4607,8 @@
3340	4607
3341	4608	void ParseVertices()
3342	4609	{
3343		- boolean epsequal = GrafreeD.epsequal;
3344		- GrafreeD.epsequal = true;
	4610	+ boolean epsequal = Grafreed.epsequal;
	4611	+ Grafreed.epsequal = true;
3345	4612
3346	4613	for (int i=0; i<group.selection.size(); i++)
3347	4614	{
..	..	@@ -3366,7 +4633,7 @@
3366	4633	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3367	4634	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3368	4635
3369		- g.add(GrafreeD.clipboard);
	4636	+ g.add(Grafreed.clipboard);
3370	4637
3371	4638	buffer.add(g);
3372	4639	}
..	..	@@ -3381,7 +4648,7 @@
3381	4648	makeSomething(buffer, i==group.selection.size()-1);
3382	4649	}
3383	4650
3384		- GrafreeD.epsequal = epsequal;
	4651	+ Grafreed.epsequal = epsequal;
3385	4652
3386	4653	refreshContents();
3387	4654	}
..	..	@@ -3399,7 +4666,16 @@
3399	4666	String pigment = Object3D.GetPigment(tex);
3400	4667	//String bump = Object3D.GetBump(tex);
3401	4668
3402		- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
	4669	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4670	+
	4671	+ try
	4672	+ {
	4673	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
	4674	+ }
	4675	+ catch (Exception e)
	4676	+ {
	4677	+ System.err.println("FAIL: " + node);
	4678	+ }
3403	4679
3404	4680	double s = v.s;
3405	4681
..	..	@@ -3447,12 +4723,26 @@
3447	4723
3448	4724	void Align()
3449	4725	{
	4726	+ if (group.selection.size() == 0)
	4727	+ return;
	4728	+
	4729	+ cVector bbmin = new cVector();
	4730	+ cVector bbmax = new cVector();
	4731	+
	4732	+ group.selection.get(0).getBounds(bbmin, bbmax, true);
	4733	+
	4734	+ double dx = bbmax.x - bbmin.x;
	4735	+ double dy = bbmax.y - bbmin.y;
	4736	+ double dz = bbmax.z - bbmin.z;
	4737	+
	4738	+ double scale = Math.sqrt(dxdx + dydy + dz*dz);
	4739	+
3450	4740	for (int i=0; i<group.selection.size(); i++)
3451	4741	{
3452	4742	Object3D obj = group.selection.get(i);
3453	4743
3454		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3455		- LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
	4744	+ LA.matTranslate(obj.toParent, i * scale, 0, 0);
	4745	+ LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3456	4746	}
3457	4747
3458	4748	refreshContents();
..	..	@@ -3473,11 +4763,11 @@
3473	4763
3474	4764	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3475	4765
3476		- boolean random = CameraPane.RANDOM;
3477		- CameraPane.RANDOM = false; // parse all random nodes
	4766	+ boolean random = CameraPane.SWITCH;
	4767	+ CameraPane.SWITCH = false; // parse all random nodes
3478	4768	lowres.linkVerticesThis(null);
3479	4769	lowres.linkVerticesThis(sn);
3480		- CameraPane.RANDOM = random;
	4770	+ CameraPane.SWITCH = random;
3481	4771
3482	4772	System.err.flush();
3483	4773
..	..	@@ -3517,7 +4807,7 @@
3517	4807	return;
3518	4808
3519	4809	Object3D poses = group.selection.get(0);
3520		- Object3D ref = GrafreeD.clipboard.get(0);
	4810	+ Object3D ref = Grafreed.clipboard.get(0);
3521	4811
3522	4812	Object3D newgroup = new Object3D("Po:" + poses.name);
3523	4813
..	..	@@ -3686,7 +4976,7 @@
3686	4976	group.selection.RelinkToSupport(); // july 2014
3687	4977	System.out.println("DONE.");
3688	4978	refreshContents();
3689		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	4979	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3690	4980	}
3691	4981
3692	4982	void ReduceMesh(boolean reduction34)
..	..	@@ -3711,9 +5001,9 @@
3711	5001
3712	5002	void ClipMesh()
3713	5003	{
3714		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	5004	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3715	5005	{
3716		- Object3D content = GrafreeD.clipboard.get(0);
	5006	+ Object3D content = Grafreed.clipboard.get(0);
3717	5007
3718	5008	if (content instanceof cGroup && ((cGroup)content).transientlink )
3719	5009	content = ((cGroup)content).get(0);
..	..	@@ -3722,7 +5012,7 @@
3722	5012	// {
3723	5013	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3724	5014	// }
3725		- group.selection.ClipMesh(GrafreeD.clipboard);
	5015	+ group.selection.ClipMesh(Grafreed.clipboard);
3726	5016	}
3727	5017	// group.selection.ClipMesh(GrafreeD.clipboard);
3728	5018	System.out.println("DONE.");
..	..	@@ -3769,6 +5059,18 @@
3769	5059	void MarkLeaves(boolean hide)
3770	5060	{
3771	5061	group.selection.MarkLeaves(hide);
	5062	+ refreshContents();
	5063	+ }
	5064	+
	5065	+ void RewindLeaves(boolean hide)
	5066	+ {
	5067	+ group.selection.RewindLeaves(hide);
	5068	+ refreshContents();
	5069	+ }
	5070	+
	5071	+ void RandomLeaves(boolean hide)
	5072	+ {
	5073	+ group.selection.RandomLeaves(hide);
3772	5074	refreshContents();
3773	5075	}
3774	5076
..	..	@@ -3843,28 +5145,25 @@
3843	5145	// }
3844	5146	// }
3845	5147
3846		- static boolean allparams = true;
3847		-
3848		- static Vector<Object3D> listUI = new Vector<Object3D>();
3849		-
3850	5148	void EditSelection(boolean newWindow)
3851	5149	{
	5150	+ if (group.selection == null)
	5151	+ {
	5152	+ EditElement(group, newWindow); // ? new
	5153	+ return;
	5154	+ }
	5155	+
3852	5156	// aConstraints.gridy = 0;
3853	5157	for (int i=0; i<group.selection.size(); i++)
3854	5158	{
3855	5159	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
3856	5160	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3857		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5161	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3858	5162
3859	5163	Object3D elem = (Object3D)group.selection.elementAt(i);
3860		- if(elem != group)
	5164	+ if(elem != group \|\| !newWindow)
3861	5165	{
3862		- // if (!(elem instanceof Composite))
3863		- // newWindow = false;
3864		- listUI.add(elem);
3865		- elem.openEditWindow(this, newWindow); //, false);
3866		- System.out.println("edit : " + elem);
3867		- elem.editWindow.refreshContents(true); // ? new
	5166	+ EditElement(elem, newWindow); // ? new
3868	5167	}
3869	5168	}
3870	5169	}
..	..	@@ -3927,9 +5226,7 @@
3927	5226
3928	5227	freezemodel = false;
3929	5228	}
3930		-
3931		- boolean flashIt = true;
3932		-
	5229	+
3933	5230	public void valueChanged(TreeSelectionEvent e)
3934	5231	//public boolean handleEvent(Event event)
3935	5232	{
..	..	@@ -3939,7 +5236,8 @@
3939	5236	//new Exception().printStackTrace();
3940	5237
3941	5238	freezemodel = true;
3942		-
	5239	+ ClearUnpinned();
	5240	+
3943	5241	/**/
3944	5242	//switch (event.id)
3945	5243	{
..	..	@@ -3947,7 +5245,6 @@
3947	5245	//case 702: // Event.LIST_DESELECT
3948	5246	group.deselectAll();
3949	5247	TreePath tps[] = objEditor.jTree.getSelectionPaths();
3950		- objEditor.ClearInfo(); // .GetMaterial());
3951	5248	if (tps != null)
3952	5249	{
3953	5250	for (int i=0; i < tps.length; i++)
..	..	@@ -3956,33 +5253,39 @@
3956	5253
3957	5254	//if (child.parent != null)
3958	5255	//child.parent.addSelectee(child);
	5256	+ objEditor.SetMaterial(child);
3959	5257	group.addSelectee(child);
3960		- objEditor.SetMaterial(child); // .GetMaterial());
3961		- objEditor.AddInfo(child, this, true); // .GetMaterial());
3962		- System.err.println("info : " + child.GetPath());
3963	5258	}
3964	5259	}
3965		- else
3966		- {
3967		- objEditor.SetMaterial(group); // .GetMaterial());
3968		- objEditor.AddInfo(group, this, true); // .GetMaterial());
3969		- System.err.println("info : " + group.GetPath());
3970		- }
	5260	+// else
	5261	+// {
	5262	+// objEditor.SetMaterial(group); // .GetMaterial());
	5263	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	5264	+// System.err.println("info : " + group.GetPath());
	5265	+// }
3971	5266
3972		- objEditor.SetText(); // jan 2014
3973		-
3974		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	5267	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
3975	5268	CameraPane.flash = true;
3976	5269
3977		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5270	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
3978	5271	// a camera
3979	5272	{
3980		- CameraPane.camerachangeframe = 0; // don't refuse it
3981		- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
3982		- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
3983		- // CameraPane.theRenderer.eyeCamera = CameraPane.theRenderer.manipCamera;
	5273	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5274	+ {
	5275	+ CameraPane.camerachangeframe = 0; // don't refuse it
	5276	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5277	+ }
	5278	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	5279	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
3984	5280	}
3985	5281
	5282	+ if (tps != null && tps.length == 1)
	5283	+ {
	5284	+ EditSelection(false);
	5285	+ }
	5286	+
	5287	+ SetPinStates(tps != null && tps.length > 0);
	5288	+
3986	5289	refreshContents();
3987	5290	//return true;
3988	5291	}
..	..	@@ -3991,6 +5294,50 @@
3991	5294
3992	5295	freezemodel = false;
3993	5296	}
	5297	+
	5298	+ void SetPinStates(boolean enabled)
	5299	+ {
	5300	+ editButton.setEnabled(enabled);
	5301	+ uneditButton.setEnabled(enabled);
	5302	+ //unselectButton.setEnabled(enabled);
	5303	+ flashSelectionButton.setEnabled(enabled);
	5304	+
	5305	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5306	+
	5307	+ boolean allComposites = true;
	5308	+
	5309	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5310	+ {
	5311	+ if (!(e.nextElement() instanceof Composite))
	5312	+ {
	5313	+ allComposites = false;
	5314	+ break;
	5315	+ }
	5316	+ }
	5317	+
	5318	+ rootButton.setEnabled(allComposites);
	5319	+ }
	5320	+
	5321	+ void refreshContents(boolean cp)
	5322	+ {
	5323	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5324	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5325	+ {
	5326	+ objEditor.ClearInfo(); // .GetMaterial());
	5327	+
	5328	+ for (int i=0; i < group.selection.Size(); i++)
	5329	+ {
	5330	+ Object3D child = (Object3D) group.selection.get(i);
	5331	+
	5332	+ objEditor.AddInfo(child, this, true);
	5333	+// System.err.println("info : " + child.GetPath());
	5334	+ }
	5335	+
	5336	+ objEditor.SetText(); // jan 2014
	5337	+ }
	5338	+
	5339	+ super.refreshContents(cp);
	5340	+ }
3994	5341
3995	5342	void linkSomething(Object3D thing)
3996	5343	{
..	..	@@ -4062,16 +5409,19 @@
4062	5409	{
4063	5410	if (group.selection.isEmpty())
4064	5411	return;
4065		- GrafreeD.clipboardIsTempGroup = false;
	5412	+
	5413	+ Grafreed.clipboardIsTempGroup = false;
4066	5414	Composite tGroup = null;
4067	5415	if (group.selection.size() > 0) // 1)
4068	5416	{
4069	5417	tGroup = new cGroup();
4070		- GrafreeD.clipboardIsTempGroup = true;
	5418	+ Grafreed.clipboardIsTempGroup = true;
4071	5419	}
4072	5420
4073	5421	if (cut)
4074	5422	{
	5423	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5424	+// Save();
4075	5425	//int indices[] = jList.getSelectedIndices();
4076	5426	//for (int i = indices.length - 1; i >= 0; i--)
4077	5427	//jList.remove(indices[i]);
..	..	@@ -4107,16 +5457,16 @@
4107	5457	//System.out.println("cut " + child);
4108	5458	//System.out.println("parent = " + child.parent);
4109	5459	// tmp.addChild(child);
4110		- if (GrafreeD.clipboardIsTempGroup)
	5460	+ if (Grafreed.clipboardIsTempGroup)
4111	5461	tGroup.add/Child/(tmp);
4112	5462	else
4113		- GrafreeD.clipboard = tmp;
	5463	+ Grafreed.clipboard = tmp;
4114	5464	}
4115	5465	else
4116		- if (GrafreeD.clipboardIsTempGroup)
	5466	+ if (Grafreed.clipboardIsTempGroup)
4117	5467	tGroup.add/Child/(child);
4118	5468	else
4119		- GrafreeD.clipboard = child;
	5469	+ Grafreed.clipboard = child;
4120	5470	}
4121	5471
4122	5472	//ResetModel();
..	..	@@ -4148,21 +5498,23 @@
4148	5498	//System.out.println("cut " + elem);
4149	5499	//System.out.println("parent = " + elem.parent);
4150	5500	// tmp.addChild(elem);
4151		- if (GrafreeD.clipboardIsTempGroup)
	5501	+ if (Grafreed.clipboardIsTempGroup)
4152	5502	tGroup.add/Child/(tmp);
4153	5503	else
4154		- GrafreeD.clipboard = tmp;
	5504	+ Grafreed.clipboard = tmp;
4155	5505	}
4156	5506	else
4157		- if (GrafreeD.clipboardIsTempGroup)
	5507	+ if (Grafreed.clipboardIsTempGroup)
4158	5508	tGroup.add/Child/(child);
4159	5509	else
4160		- GrafreeD.clipboard = child;
	5510	+ Grafreed.clipboard = child;
4161	5511	}
4162	5512
4163	5513	}
4164		- if (GrafreeD.clipboardIsTempGroup)
4165		- GrafreeD.clipboard = tGroup;
	5514	+
	5515	+ if (Grafreed.clipboardIsTempGroup)
	5516	+ Grafreed.clipboard = tGroup;
	5517	+
4166	5518	if (cut)
4167	5519	{
4168	5520	ResetModel();
..	..	@@ -4172,11 +5524,15 @@
4172	5524
4173	5525	void paste(boolean expand)
4174	5526	{
	5527	+ if (Globals.REPLACEONMAKE)
	5528	+ Save();
	5529	+ boolean keep = Globals.REPLACEONMAKE;
	5530	+ Globals.REPLACEONMAKE = false;
4175	5531	// if (GrafreeD.clipboard == null)
4176	5532	// return;
4177	5533	boolean first = true;
4178	5534
4179		- if (GrafreeD.clipboardIsTempGroup)
	5535	+ if (Grafreed.clipboardIsTempGroup)
4180	5536	{
4181	5537	Composite temp;
4182	5538
..	..	@@ -4187,7 +5543,7 @@
4187	5543	temp = (Composite)Applet3D.clipboard.deepCopy();
4188	5544	*/
4189	5545	Object3D elem;
4190		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5546	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4191	5547	{
4192	5548	Object3D child = (Object3D)e.nextElement();
4193	5549
..	..	@@ -4221,21 +5577,22 @@
4221	5577	//Object3D cb = Applet3D.clipboard;
4222	5578	//temp.addChild(cb);
4223	5579	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4224		- assert(GrafreeD.clipboard.parent == null);
4225		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4226		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4227		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4228		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	5580	+ assert(Grafreed.clipboard.parent == null);
	5581	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5582	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5583	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5584	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4229	5585	else
4230		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4231		- GrafreeD.clipboard.get(0).parent = keepparent;
	5586	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5587	+ Grafreed.clipboard.get(0).parent = keepparent;
4232	5588	}
4233	5589
	5590	+ Globals.REPLACEONMAKE = keep;
4234	5591	ResetModel();
4235	5592	refreshContents();
4236	5593	}
4237	5594
4238		- void pasteInto(boolean copyit)
	5595	+ void pasteInto(boolean copyit, boolean clone)
4239	5596	{
4240	5597	// if (GrafreeD.clipboard == null)
4241	5598	// return;
..	..	@@ -4264,15 +5621,22 @@
4264	5621	if (copyit)
4265	5622	{
4266	5623	// paste(false);
4267		- CloneClipboard(false); // sept 2014
	5624	+ if (clone)
	5625	+ {
	5626	+ CloneClipboard(false); // sept 2014
	5627	+ }
	5628	+ else
	5629	+ {
	5630	+ paste(false);
	5631	+ }
4268	5632	}
4269	5633	else
4270	5634	{
4271	5635	boolean first = true;
4272	5636
4273		- if (GrafreeD.clipboardIsTempGroup)
	5637	+ if (Grafreed.clipboardIsTempGroup)
4274	5638	{
4275		- Composite temp = (Composite)GrafreeD.clipboard;
	5639	+ Composite temp = (Composite)Grafreed.clipboard;
4276	5640	Object3D copy;
4277	5641	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4278	5642	{
..	..	@@ -4282,7 +5646,7 @@
4282	5646	}
4283	5647	} else
4284	5648	{
4285		- linkSomething(GrafreeD.clipboard); //.get(0));
	5649	+ linkSomething(Grafreed.clipboard); //.get(0));
4286	5650	}
4287	5651	}
4288	5652	}
..	..	@@ -4359,6 +5723,10 @@
4359	5723
4360	5724	void group(Object3D csg, boolean grab)
4361	5725	{
	5726	+ if (Globals.REPLACEONMAKE)
	5727	+ Save();
	5728	+ boolean keep = Globals.REPLACEONMAKE;
	5729	+ Globals.REPLACEONMAKE = false;
4362	5730	if (//false) // why??
4363	5731	!group.selection.isEmpty())
4364	5732	{
..	..	@@ -4472,8 +5840,34 @@
4472	5840	//node.add(csg);
4473	5841	//makeSomething(node);
4474	5842	makeSomething(csg);
	5843	+ Globals.REPLACEONMAKE = keep;
4475	5844	}
4476	5845
	5846	+ void Ungroup(Object3D g)
	5847	+ {
	5848	+ if (Globals.REPLACEONMAKE)
	5849	+ Save();
	5850	+ boolean keep = Globals.REPLACEONMAKE;
	5851	+ Globals.REPLACEONMAKE = false;
	5852	+ if (g instanceof HiddenObject)
	5853	+ {
	5854	+ HiddenObject h = (HiddenObject) g;
	5855	+
	5856	+ for (int i=0; i<h.ActualSize(); i++)
	5857	+ {
	5858	+ objEditor.makeSomething(h.get(i), false);
	5859	+ }
	5860	+ }
	5861	+ else
	5862	+ {
	5863	+ for (int i=0; i<g.Size(); i++)
	5864	+ {
	5865	+ objEditor.makeSomething(g.get(i), false);
	5866	+ }
	5867	+ }
	5868	+ Globals.REPLACEONMAKE = keep;
	5869	+ }
	5870	+
4477	5871	void ungroup()
4478	5872	{
4479	5873	/*
..	..	@@ -4667,21 +6061,6 @@
4667	6061	}
4668	6062	*/
4669	6063
4670		- void ImportGFD()
4671		- {
4672		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4673		- browser.show();
4674		- String filename = browser.getFile();
4675		- if (filename != null && filename.length() > 0)
4676		- {
4677		- String fullname = browser.getDirectory() + filename;
4678		-
4679		- //Object3D readobj =
4680		- objEditor.ReadGFD(fullname, objEditor);
4681		- //makeSomething(readobj);
4682		- }
4683		- }
4684		-
4685	6064	/*
4686	6065	public void Callback(Object obj)
4687	6066	{
..	..	@@ -4705,26 +6084,9 @@
4705	6084	}
4706	6085	*/
4707	6086
4708		- void ImportVRMLX3D()
4709		- {
4710		- if (GrafreeD.standAlone)
4711		- {
4712		- /**/
4713		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4714		- browser.show();
4715		- String filename = browser.getFile();
4716		- if (filename != null && filename.length() > 0)
4717		- {
4718		- String fullname = browser.getDirectory() + filename;
4719		- LoadVRMLX3D(fullname);
4720		- }
4721		- /**/
4722		- }
4723		- }
4724		-
4725	6087	String GetFile(String dialogName)
4726	6088	{
4727		- if (GrafreeD.standAlone)
	6089	+ if (Grafreed.standAlone)
4728	6090	{
4729	6091	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4730	6092	browser.show();
..	..	@@ -4788,10 +6150,48 @@
4788	6150	cButton flashSelectionButton;
4789	6151	cButton editButton;
4790	6152	cButton uneditButton;
	6153	+ JCheckBox allParamsButton;
4791	6154	cButton clearpanelButton;
4792		- cButton allParamsButton;
4793	6155	cButton unselectButton;
4794	6156
	6157	+ cButton restoreCameraButton;
	6158	+
	6159	+ cButton oneStepButton;
	6160	+
	6161	+ cButton groupButton;
	6162	+ cButton ungroupButton;
	6163	+ cButton compositeButton;
	6164	+ cButton switchButton;
	6165	+ cButton loopButton;
	6166	+ cButton textureButton;
	6167	+
	6168	+ cButton skybox1Button;
	6169	+ cButton skybox2Button;
	6170	+ cButton skybox3Button;
	6171	+ cButton skybox4Button;
	6172	+ cButton skybox5Button;
	6173	+ cButton skybox6Button;
	6174	+ cButton skybox7Button;
	6175	+
	6176	+ cButton skybox11Button;
	6177	+ cButton skybox12Button;
	6178	+ cButton skybox13Button;
	6179	+ cButton skybox14Button;
	6180	+ cButton skybox15Button;
	6181	+ cButton skybox16Button;
	6182	+ cButton skybox17Button;
	6183	+
	6184	+ cButton gridButton;
	6185	+ cButton boxButton;
	6186	+ cButton sphereButton;
	6187	+ cButton coneButton;
	6188	+ cButton torusButton;
	6189	+ cButton superButton;
	6190	+ cButton kleinButton;
	6191	+ cButton particlesButton;
	6192	+ cButton overlayButton;
	6193	+ cButton lightButton;
	6194	+
4795	6195	cButton screenfitButton;
4796	6196	cButton screenfitpointButton;
4797	6197	cButton snapobjectButton;
..	..	@@ -4803,14 +6203,6 @@
4803	6203
4804	6204	cButton setsupportButton;
4805	6205
4806		- cButton twoButton;
4807		- cButton sixButton;
4808		- cButton threeButton;
4809		- cButton sevenButton;
4810		- cButton fourButton; // full panel
4811		- cButton oneButton; // full XYZ
4812		- //cButton currentLayout;
4813		-
4814	6206	//
4815	6207	//Composite
4816	6208	Object3D // to do !!
..	..	@@ -4820,9 +6212,11 @@
4820	6212	//JTree jTree;
4821	6213	private MenuItem lookAtItem;
4822	6214	private MenuItem lookFromItem;
4823		- private MenuItem switchItem;
	6215	+ private MenuItem switchViewItem;
4824	6216	private MenuItem cutItem;
4825		- private MenuItem duplicateItem;
	6217	+ private MenuItem undoItem;
	6218	+ private MenuItem redoItem;
	6219	+ private JMenuItem duplicateItem;
4826	6220	private MenuItem cloneItem;
4827	6221	private MenuItem cloneSupportItem;
4828	6222	private MenuItem overwriteGeoItem;
..	..	@@ -4833,8 +6227,9 @@
4833	6227	private MenuItem resetsupportItem;
4834	6228	private MenuItem resetreferencesItem;
4835	6229	private MenuItem linkverticesItem;
	6230	+ private MenuItem relinkverticesItem;
4836	6231	private MenuItem setMasterItem;
4837		- private MenuItem resetMeshItem;
	6232	+ private MenuItem resetAllItem;
4838	6233	private MenuItem stepAllItem;
4839	6234	private MenuItem revertMeshItem;
4840	6235	private MenuItem poseMeshItem;
..	..	@@ -4845,15 +6240,17 @@
4845	6240	private MenuItem mergeGeometriesItem;
4846	6241	private MenuItem copyItem;
4847	6242	private MenuItem pasteItem;
	6243	+ private MenuItem pasteIntoItem;
4848	6244	private MenuItem pasteLinkItem;
4849	6245	private MenuItem pasteCloneItem;
4850	6246	private MenuItem pasteExpandItem;
4851		- private MenuItem clearItem;
	6247	+ private MenuItem deleteItem;
4852	6248	private MenuItem clearAllItem;
4853	6249	private MenuItem genUVItem;
4854	6250	private MenuItem genNormalsMESHItem;
4855	6251	private MenuItem genNormalsCADItem;
4856	6252	private MenuItem genNormalsORGANItem;
	6253	+ private MenuItem genNormalsMINEItem;
4857	6254	private MenuItem stripifyItem;
4858	6255	private MenuItem unstripifyItem;
4859	6256	private MenuItem trimItem;
..	..	@@ -4882,6 +6279,10 @@
4882	6279	private MenuItem showleavesItem;
4883	6280	private MenuItem markleavesItem;
4884	6281	private MenuItem unmarkleavesItem;
	6282	+ private MenuItem rewindleavesItem;
	6283	+ private MenuItem unrewindleavesItem;
	6284	+ private MenuItem randomleavesItem;
	6285	+ private MenuItem unrandomleavesItem;
4885	6286
4886	6287	private MenuItem flipVItem;
4887	6288	private MenuItem unflipVItem;
..	..	@@ -4893,14 +6294,17 @@
4893	6294	private MenuItem panoTexturesItem;
4894	6295
4895	6296	private MenuItem resetCentroidItem;
4896		- private MenuItem transformgeometryItem;
	6297	+ private MenuItem resetCentroidXZItem;
4897	6298	private MenuItem resetTransformItem;
	6299	+ private MenuItem transformGeometryItem;
	6300	+ private MenuItem transformChildrenItem;
	6301	+ private MenuItem hideItem;
4898	6302	private MenuItem grabItem;
4899	6303	private MenuItem backItem;
4900	6304	private MenuItem frontItem;
4901	6305	private MenuItem cameraItem;
4902	6306	private MenuItem compositeItem;
4903		- private MenuItem randomItem;
	6307	+ private MenuItem switchItem;
4904	6308	private MenuItem physicsItem;
4905	6309	private MenuItem frameselectorItem;
4906	6310	private MenuItem scriptNodeItem;
..	..	@@ -4915,6 +6319,7 @@
4915	6319
4916	6320	private MenuItem resetParentItem;
4917	6321	private MenuItem repairParentItem;
	6322	+ private MenuItem repairShadowItem;
4918	6323	private MenuItem sortbysizeItem;
4919	6324	private MenuItem sortbynameItem;
4920	6325
..	..	@@ -4923,6 +6328,8 @@
4923	6328	private MenuItem attachBumpItem;
4924	6329	private MenuItem detachBumpItem;
4925	6330	private MenuItem pigmentBumpItem;
	6331	+ private MenuItem embedTexturesItem;
	6332	+ private MenuItem deEmbedTexturesItem;
4926	6333
4927	6334	private MenuItem particleItem;
4928	6335	private MenuItem ragdollItem;
..	..	@@ -4935,10 +6342,11 @@
4935	6342	private MenuItem coneItem;
4936	6343	private MenuItem torusItem;
4937	6344	private MenuItem superItem;
	6345	+ private MenuItem kleinItem;
4938	6346	private MenuItem blobItem;
4939	6347	private MenuItem latheItem;
4940	6348	private MenuItem bezierItem;
4941		- private MenuItem checkerItem;
	6349	+ private MenuItem overlayItem;
4942	6350	private MenuItem meshItem;
4943	6351	// private MenuItem meshGroupItem;
4944	6352	private MenuItem springItem;
..	..	@@ -4947,6 +6355,7 @@
4947	6355	private MenuItem csgItem;
4948	6356	private MenuItem templateItem;
4949	6357	private MenuItem textureItem;
	6358	+ private MenuItem billboardItem;
4950	6359	private MenuItem shadowXItem;
4951	6360	private MenuItem shadowYItem;
4952	6361	private MenuItem shadowZItem;
..	..	@@ -4959,11 +6368,6 @@
4959	6368	private MenuItem doubleItem;
4960	6369	private MenuItem tripleItem;
4961	6370
4962		- private MenuItem importGFDItem;
4963		- private MenuItem importVRMLX3DItem;
4964		- private MenuItem import3DSItem;
4965		- private MenuItem importOBJItem;
4966		-
4967	6371	private MenuItem computeAOItem;
4968	6372	private MenuItem recompileItem;
4969	6373	private MenuItem editScriptItem;
..	..	@@ -4973,4 +6377,8 @@
4973	6377	private MenuItem analyzeItem;
4974	6378	private MenuItem dumpItem;
4975	6379	//boolean freezemodel = false;
	6380	+
	6381	+ Menu cameraMenu;
	6382	+ MenuItem editCameraItem;
	6383	+ MenuItem restoreCameraItem;
4976	6384	}