~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -16,6 +16,7 @@
16	16	//import buoy.widget.BFileChooser;
17	17
18	18	class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
	19	+ Grafreed.iResourceCallBack,
19	20	ObjectUI,
20	21	Runnable,
21	22	ActionListener,
..	..	@@ -23,6 +24,360 @@
23	24	DragGestureListener, DragSourceListener, DropTargetListener,
24	25	ItemListener // ListSelectionListener
25	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", !Globals.NIMBUSLAF));
	33	+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
	34	+ skyboxButton.setToolTipText(s.equals("") ? "No background" : 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, !Globals.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", "", 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	+ if (skybox.endsWith("/"))
	334	+ {
	335	+ group.skyboxname = null;
	336	+ group.skyboxext = null;
	337	+ cameraView.repaint();
	338	+ }
	339	+ else
	340	+ {
	341	+ //cameraView.envyoff = false;
	342	+ group.skyboxname = skybox;
	343	+ group.skyboxext = "jpg";
	344	+ cameraView.repaint();
	345	+ }
	346	+ }
	347	+
	348	+ public void CreateSkyboxPanel(cGridBag skyboxPanel)
	349	+ {
	350	+ JTabbedPane skyboxpane = new JTabbedPane(JTabbedPane.LEFT);
	351	+
	352	+ AddSkyboxTab0(skyboxpane);
	353	+ AddSkyboxTab1(skyboxpane);
	354	+ AddSkyboxTab2(skyboxpane);
	355	+ AddSkyboxTab3(skyboxpane);
	356	+
	357	+ skyboxPanel.add(skyboxpane);
	358	+ }
	359	+
	360	+ public void ChangeTexture(String texture)
	361	+ {
	362	+ for (int i=0; i<group.selection.size(); i++)
	363	+ {
	364	+ Object3D obj = group.selection.get(i);
	365	+ obj.SetPigmentTexture("@" + texture);
	366	+ }
	367	+
	368	+ refreshContents();
	369	+ }
	370	+
	371	+ public void Show3DView()
	372	+ {
	373	+ // bug
	374	+ //gridPanel.setDividerLocation(1.0);
	375	+ //bigPanel.setDividerLocation(0.0);
	376	+ bigThree.ClearUI();
	377	+ bigThree.add(centralPanel);
	378	+ bigThree.FlushUI();
	379	+ }
	380	+
26	381	//ObjEditor objEditor;
27	382	public void closeUI2()
28	383	{
..	..	@@ -60,6 +415,16 @@
60	415	this.copy = this.group = group;
61	416	//selectees = this.group.selectees;
62	417
	418	+ assert(false);
	419	+
	420	+// if (copy.versionlist == null)
	421	+// {
	422	+// copy.versionlist = new Object3D[100];
	423	+// copy.versionindex = -1;
	424	+//
	425	+// //Save(true);
	426	+// }
	427	+
63	428	if(ui)
64	429	SetupUI(objEditor);
65	430	}
..	..	@@ -74,16 +439,28 @@
74	439	this.copy = this.group = copy;
75	440	//selectees = this.group.selectees;
76	441
77		- SetupMenu2(objEditor);
	442	+ SetupMenu2(this); //objEditor);
78	443	SetupUI2(objEditor);
79	444	objEditor.SetupUI(true);
80	445	SetupViews(objEditor);
81	446
82	447	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	448	+
	449	+// if (copy.versionlist == null)
	450	+// {
	451	+// copy.versionlist = new Object3D[100];
	452	+// copy.versionindex = -1;
	453	+//
	454	+// //Save(true);
	455	+// }
83	456	}
84	457
85	458	void CloneSelection(boolean supports)
86	459	{
	460	+ if (Globals.REPLACEONMAKE)
	461	+ Save();
	462	+ boolean keep = Globals.REPLACEONMAKE;
	463	+ Globals.REPLACEONMAKE = false;
87	464	// Object3D keep = GrafreeD.clipboard;
88	465	//Object3D obj;
89	466	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,18 +471,19 @@
94	471
95	472	makeSomething(clone, i==group.selection.size()-1);
96	473	}
	474	+ Globals.REPLACEONMAKE = keep;
97	475	}
98	476
99	477	void CloneClipboard(boolean supports)
100	478	{
101		- assert(GrafreeD.clipboard.parent == null);
102		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
103		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
104		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
105		- makeSomething(CloneObject(GrafreeD.clipboard.get(0), false));
	479	+ assert(Grafreed.clipboard.parent == null);
	480	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	481	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	482	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	483	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
106	484	else
107		- makeSomething(CloneObject(GrafreeD.clipboard, false));
108		- GrafreeD.clipboard.get(0).parent = keepparent;
	485	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	486	+ Grafreed.clipboard.get(0).parent = keepparent;
109	487	}
110	488
111	489	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -119,7 +497,7 @@
119	497	// obj.support = null;
120	498	if (!supports)
121	499	obj.SaveSupports();
122		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	500	+ Object3D clone = (Object3D)Grafreed.clone(obj);
123	501	obj.parent = parent;
124	502	// obj.support = support;
125	503	// clone.support = support; // aout 2013
..	..	@@ -148,52 +526,51 @@
148	526
149	527	//JTextField nameField;
150	528
151		- void SetupMenu2(ObjEditor oe)
	529	+ void SetupMenu2(GroupEditor oe)
152	530	{
153		- if (Globals.ADVANCED)
154		- {
155		- oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
156		- //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
157		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
158		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
159		- oe.cameraMenu.add("-");
160		- openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
161		- openWindowItem.addActionListener(this);
162		- editLeafItem.addActionListener(this);
163		- lookAtItem.addActionListener(this);
164		- //lookFromItem.addActinoListener(this);
165		- //switchItem.addActionListener(this);
166		- }
167		-
	531	+ oe.jTree = new cTree();
	532	+
168	533	Menu menu;
169	534	oe.menuBar.add(menu = new Menu("Edit"));
170	535	//editItem = menu.add(new MenuItem("Edit"));
171	536	//editItem.addActionListener(this);
172		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	537	+
	538	+// undoItem = menu.add(new MenuItem("Undo"));
	539	+// undoItem.addActionListener(this);
	540	+// redoItem = menu.add(new MenuItem("Redo"));
	541	+// redoItem.addActionListener(this);
	542	+// menu.add("-");
	543	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
173	544	duplicateItem.addActionListener(this);
174		- cutItem = menu.add(new MenuItem("Cut"));
	545	+
	546	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
	547	+ cloneItem.addActionListener(this);
	548	+ //if (Globals.ADVANCED)
	549	+ {
	550	+ cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
	551	+ cloneSupportItem.addActionListener(this);
	552	+ }
	553	+ oe.jTree.popup.addSeparator();
	554	+ menu.add("-");
	555	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
175	556	cutItem.addActionListener(this);
176		- copyItem = menu.add(new MenuItem("Copy"));
	557	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
177	558	copyItem.addActionListener(this);
178	559	pasteItem = menu.add(new MenuItem("Paste"));
179	560	pasteItem.addActionListener(this);
180		- menu.add("-");
181		- cloneItem = menu.add(new MenuItem("Clone"));
182		- cloneItem.addActionListener(this);
183		- cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
184		- cloneSupportItem.addActionListener(this);
185		- menu.add("-");
186		- pasteIntoItem = menu.add(new MenuItem("Paste into"));
	561	+
	562	+ oe.jTree.popup.addSeparator();
	563	+ //menu.add("-");
	564	+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
187	565	pasteIntoItem.addActionListener(this);
188		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	566	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
189	567	pasteLinkItem.addActionListener(this);
190		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	568	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
191	569	pasteCloneItem.addActionListener(this);
192		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	570	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
193	571	// pasteExpandItem.addActionListener(this);
194		- menu.add("-");
195		- clearItem = menu.add(new MenuItem("Clear"));
196		- clearItem.addActionListener(this);
	572	+ //menu.add("-");
	573	+ oe.jTree.popup.addSeparator();
197	574
198	575	if (Globals.ADVANCED)
199	576	{
..	..	@@ -201,14 +578,95 @@
201	578	clearAllItem = menu.add(new MenuItem("Clear All"));
202	579	clearAllItem.addActionListener(this);
203	580	}
	581	+
	582	+ menuBar.add(cameraMenu = new Menu("View"));
	583	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	584	+ //zBufferItem.addActionListener(this);
	585	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	586	+ //normalLensItem.addActionListener(this);
	587	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	588	+ restoreCameraItem.addActionListener(this);
	589	+
	590	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	591	+// toggleFullScreenItem.addItemListener(this);
	592	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	593	+// cameraMenu.add("-");
	594	+//
	595	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	596	+// toggleTextureItem.addItemListener(this);
	597	+// toggleTextureItem.setState(CameraPane.textureon);
	598	+//
	599	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	600	+// toggleSwitchItem.addItemListener(this);
	601	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	602	+
	603	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	604	+ toggleHandleItem.addItemListener(this);
	605	+ toggleHandleItem.setState(CameraPane.HANDLES);
	606	+
	607	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	608	+ togglePaintItem.addItemListener(this);
	609	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	610	+
	611	+ if (Globals.ADVANCED)
	612	+ {
	613	+ cameraMenu.add("-");
	614	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	615	+ toggleLiveItem.addItemListener(this);
	616	+ toggleLiveItem.setState(Globals.isLIVE());
204	617
	618	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	619	+ stepItem.addActionListener(this);
	620	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	621	+ // toggleDLItem.addItemListener(this);
	622	+ // toggleDLItem.setState(false);
	623	+
	624	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	625	+ toggleRenderItem.addItemListener(this);
	626	+ toggleRenderItem.setState(!CameraPane.frozen);
	627	+
	628	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	629	+ toggleDebugItem.addItemListener(this);
	630	+ toggleDebugItem.setState(Globals.DEBUG);
	631	+
	632	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	633	+ toggleFrustumItem.addItemListener(this);
	634	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	635	+
	636	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	637	+ toggleFootContactItem.addItemListener(this);
	638	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	639	+
	640	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	641	+ toggleTimelineItem.addItemListener(this);
	642	+ }
	643	+
	644	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	645	+// toggleRootItem.addItemListener(this);
	646	+// toggleRootItem.setState(false);
	647	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	648	+// animationItem.addItemListener(this);
	649	+// animationItem.setState(CameraPane.ANIMATION);
	650	+ cameraMenu.add("-");
	651	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	652	+ editCameraItem.addActionListener(this);
	653	+
	654	+ if (Globals.ADVANCED)
	655	+ {
	656	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	657	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	658	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	659	+ oe.cameraMenu.add("-");
	660	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	661	+ openWindowItem.addActionListener(this);
	662	+ lookAtItem.addActionListener(this);
	663	+ //lookFromItem.addActinoListener(this);
	664	+ //switchViewItem.addActionListener(this);
	665	+ }
	666	+
205	667	oe.menuBar.add(menu = new Menu("Setting"));
206	668	if (Globals.ADVANCED)
207	669	{
208		- resetMeshItem = menu.add(new MenuItem("Reset All"));
209		- resetMeshItem.addActionListener(this);
210		- stepAllItem = menu.add(new MenuItem("Step All"));
211		- stepAllItem.addActionListener(this);
212	670	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
213	671	revertMeshItem.addActionListener(this);
214	672	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
..	..	@@ -247,22 +705,37 @@
247	705	setMasterItem.addActionListener(this);
248	706	}
249	707
250		- oe.menuBar.add(menu = new Menu("Group"));
251		- grabItem = menu.add(new MenuItem("Grab"));
252		- grabItem.addActionListener(this);
	708	+ oe.menuBar.add(menu = new Menu("Order"));
	709	+
253	710	backItem = menu.add(new MenuItem("Back"));
254	711	backItem.addActionListener(this);
255	712	frontItem = menu.add(new MenuItem("Front"));
256	713	frontItem.addActionListener(this);
257		- compositeItem = menu.add(new MenuItem("Composite"));
258		- compositeItem.addActionListener(this);
	714	+// compositeItem = menu.add(new MenuItem("Composite"));
	715	+// compositeItem.addActionListener(this);
	716	+
	717	+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
	718	+ grabItem.addActionListener(this);
	719	+
	720	+ if (Globals.ADVANCED)
	721	+ {
259	722	hideItem = menu.add(new MenuItem("Hidden Group"));
260	723	hideItem.addActionListener(this);
261		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	724	+ }
	725	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
262	726	ungroupItem.addActionListener(this);
263		- menu.add("-");
264		- randomItem = menu.add(new MenuItem("Switch node"));
265		- randomItem.addActionListener(this);
	727	+
	728	+ oe.jTree.popup.addSeparator();
	729	+
	730	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	731	+ deleteItem.addActionListener(this);
	732	+
	733	+// menu.add("-");
	734	+//
	735	+// switchItem = menu.add(new MenuItem("Switch node"));
	736	+// switchItem.addActionListener(this);
	737	+ if (Globals.ADVANCED)
	738	+ {
266	739	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
267	740	switchGeoItem.addActionListener(this);
268	741	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -270,49 +743,59 @@
270	743	morphItem = menu.add(new MenuItem("Morph Group"));
271	744	morphItem.addActionListener(this);
272	745
273		- if (Globals.ADVANCED)
274		- {
	746	+ menu.add("-");
275	747	physicsItem = menu.add(new MenuItem("Physics"));
276	748	physicsItem.addActionListener(this);
277	749	frameselectorItem = menu.add(new MenuItem("Frame Selector"));
278	750	frameselectorItem.addActionListener(this);
279	751	scriptNodeItem = menu.add(new MenuItem("Script Node"));
280	752	scriptNodeItem.addActionListener(this);
281		- cameraItem = menu.add(new MenuItem("Camera"));
282		- cameraItem.addActionListener(this);
283	753	}
284	754
285	755	oe.menuBar.add(menu = new Menu("Object"));
286		- textureItem = menu.add(new MenuItem("Texture"));
287		- textureItem.addActionListener(this);
	756	+// textureItem = menu.add(new MenuItem("Texture"));
	757	+// textureItem.addActionListener(this);
288	758	billboardItem = menu.add(new MenuItem("Billboard"));
289	759	billboardItem.addActionListener(this);
290	760	csgItem = menu.add(new MenuItem("CSG"));
291	761	csgItem.addActionListener(this);
292		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	762	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
293	763	shadowXItem.addActionListener(this);
294		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	764	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
295	765	shadowYItem.addActionListener(this);
296		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	766	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
297	767	shadowZItem.addActionListener(this);
	768	+
298	769	if (Globals.ADVANCED)
299	770	{
300		- linkerItem = menu.add(new MenuItem("Linker"));
301		- linkerItem.addActionListener(this);
302	771	attributeItem = menu.add(new MenuItem("Attribute"));
303	772	attributeItem.addActionListener(this);
	773	+ menu.add("-");
	774	+ linkerItem = menu.add(new MenuItem("Linker"));
	775	+ linkerItem.addActionListener(this);
304	776	templateItem = menu.add(new MenuItem("Template"));
305	777	templateItem.addActionListener(this);
306	778	pointflowItem = menu.add(new MenuItem("Point Flow"));
307	779	pointflowItem.addActionListener(this);
308		- menu.add("-");
309	780	}
	781	+ menu.add("-");
	782	+ textureRatioRItem = menu.add(new MenuItem("Texture Ratio Red"));
	783	+ textureRatioRItem.addActionListener(this);
	784	+ textureRatioGItem = menu.add(new MenuItem("Texture Ratio Green"));
	785	+ textureRatioGItem.addActionListener(this);
	786	+ textureRatioBItem = menu.add(new MenuItem("Texture Ratio Blue"));
	787	+ textureRatioBItem.addActionListener(this);
	788	+ menu.add("-");
310	789	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
311	790	resetTransformItem.addActionListener(this);
312	791	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
313	792	resetCentroidItem.addActionListener(this);
314		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
315		- transformgeometryItem.addActionListener(this);
	793	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XZ"));
	794	+ resetCentroidXZItem.addActionListener(this);
	795	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	796	+ transformGeometryItem.addActionListener(this);
	797	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	798	+ transformChildrenItem.addActionListener(this);
316	799
317	800	oe.menuBar.add(menu = new Menu("Geometry"));
318	801	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -325,7 +808,7 @@
325	808	genNormalsMESHItem.addActionListener(this);
326	809	if (Globals.ADVANCED)
327	810	{
328		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	811	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
329	812	genNormalsMINEItem.addActionListener(this);
330	813	}
331	814	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -359,8 +842,14 @@
359	842	}
360	843
361	844	oe.menuBar.add(menu = new Menu("Attributes"));
	845	+ clearVersionsItem = menu.add(new MenuItem("Clear Versions"));
	846	+ clearVersionsItem.addActionListener(this);
362	847	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
363	848	clearMaterialsItem.addActionListener(this);
	849	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	850	+ resetAllItem.addActionListener(this);
	851	+ stepAllItem = menu.add(new MenuItem("Step All"));
	852	+ stepAllItem.addActionListener(this);
364	853	menu.add("-");
365	854	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
366	855	liveleavesItem.addActionListener(this);
..	..	@@ -377,10 +866,18 @@
377	866	hideleavesItem.addActionListener(this);
378	867	showleavesItem = menu.add(new MenuItem("Show Leaves"));
379	868	showleavesItem.addActionListener(this);
380		- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
	869	+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
381	870	markleavesItem.addActionListener(this);
382		- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
	871	+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
383	872	unmarkleavesItem.addActionListener(this);
	873	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	874	+ rewindleavesItem.addActionListener(this);
	875	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	876	+ unrewindleavesItem.addActionListener(this);
	877	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	878	+ randomleavesItem.addActionListener(this);
	879	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	880	+ unrandomleavesItem.addActionListener(this);
384	881	menu.add("-");
385	882	flipVItem = menu.add(new MenuItem("Flip V"));
386	883	flipVItem.addActionListener(this);
..	..	@@ -406,55 +903,135 @@
406	903	attachBumpItem.addActionListener(this);
407	904	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
408	905	pigmentBumpItem.addActionListener(this);
	906	+ //embedTexturesItem
409	907	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
410	908	detachPigmentItem.addActionListener(this);
411	909	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
412	910	detachBumpItem.addActionListener(this);
	911	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	912	+ embedTexturesItem.addActionListener(this);
	913	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	914	+ deEmbedTexturesItem.addActionListener(this);
413	915	menu.add("-");
414	916	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
415	917	sortbysizeItem.addActionListener(this);
416	918	sortbynameItem = menu.add(new MenuItem("Sort by name"));
417	919	sortbynameItem.addActionListener(this);
	920	+ menu.add("-");
	921	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	922	+ shareGeometriesItem.addActionListener(this);
	923	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	924	+ mergeGeometriesItem.addActionListener(this);
	925	+ menu.add("-");
	926	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	927	+ editLeafItem.addActionListener(this);
418	928	if (Globals.ADVANCED)
419	929	{
420		- menu.add("-");
	930	+ // Pretty much the same as duplicate and clone.
421	931	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
422	932	extractGeometriesItem.addActionListener(this);
423	933	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
424	934	cloneGeometriesItem.addActionListener(this);
425		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
426		- shareGeometriesItem.addActionListener(this);
427		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
428		- mergeGeometriesItem.addActionListener(this);
429	935	}
430	936
431	937	oe.menuBar.add(menu = new Menu("Insert"));
432	938	buildCreateMenu(menu);
433	939
434		- oe.menuBar.add(menu = new Menu("Include"));
435		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
436		- importGFDItem.addActionListener(this);
437		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
438		- importVRMLX3DItem.addActionListener(this);
439		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
440		- importOBJItem.addActionListener(this);
441		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
442		- import3DSItem.addActionListener(this);
443		-
444	940	oe.menuBar.add(menu = new Menu("Tools"));
445	941	buildToolsMenu(menu);
446	942	}
447	943
	944	+ JTabbedPane resourcecontainer;
	945	+ cGridBag currenttab;
	946	+ //boolean added; // patch for jar
	947	+
	948	+ int totalcount = 0;
	949	+
	950	+ int tabcount = 0;
	951	+ int colcount = 0;
	952	+ int rowcount = 0;
	953	+ int texturecount = 0;
	954	+
	955	+ int columns = 5;
	956	+ int rows = 7;
	957	+
	958	+ public void ResourceCallBack(String[] path)
	959	+ {
	960	+// for (int i = 0; i < path.length; i++)
	961	+// System.out.print(path[i] + "/");
	962	+// System.out.println();
	963	+
	964	+ if (//rowcount == 0 \|\|
	965	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	966	+ {
	967	+ currenttab = new cGridBag();
	968	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	969	+ currenttab.setName(tabname);
	970	+ //added = false;
	971	+ resourcecontainer.add(currenttab);
	972	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	973	+ rowcount = 1;
	974	+ colcount = 0;
	975	+ texturecount = 0;
	976	+ }
	977	+
	978	+ if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") \|\| path[2].toLowerCase().endsWith(".png")))
	979	+ {
	980	+ //if (!added)
	981	+ {
	982	+ //added = true;
	983	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	984	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	985	+ }
	986	+
	987	+ AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
	988	+ totalcount++;
	989	+
	990	+ if (++colcount >= columns)
	991	+ {
	992	+ colcount = 0;
	993	+ currenttab.Return();
	994	+
	995	+ if (rowcount++ >= rows)
	996	+ {
	997	+ rowcount = 0;
	998	+ }
	999	+ }
	1000	+ }
	1001	+ else
	1002	+ {
	1003	+// if (!path[path.length-1].equals("icons"))
	1004	+// resourcecontainer.Return();
	1005	+ }
	1006	+ }
	1007	+
	1008	+ void CreateTexturePanel(cGridBag container)
	1009	+ {
	1010	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	1011	+ container.add(resourcecontainer);
	1012	+
	1013	+ Grafreed.ParseResources("textures", this);
	1014	+
	1015	+ // 935. System.out.println("Total = " + totalcount);
	1016	+ }
	1017	+
448	1018	void SetupUI2(ObjEditor oe)
449	1019	{
	1020	+ // June 2019
	1021	+ if (oe == null)
	1022	+ {
	1023	+ //super.SetupUI2(this);
	1024	+ //return;
	1025	+ }
	1026	+
	1027	+ if (copy != group)
	1028	+ {
	1029	+ //super.SetupUI2(this);
	1030	+ }
	1031	+
450	1032	//new Exception().printStackTrace();
451	1033
452	1034	oe.radioPanel = new JPanel(new GridBagLayout());
453		- oe.aConstraints.weightx = 1;
454		- oe.aConstraints.weighty = 0;
455		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
456		- oe.aConstraints.gridwidth = 100;
457		- oe.aConstraints.gridheight = 1;
458	1035	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
459	1036
460	1037	oe.buttonGroup = new ButtonGroup();
..	..	@@ -475,97 +1052,268 @@
475	1052	oe.radioPanel.add(dummyButton);
476	1053	oe.buttonGroup.add(dummyButton);
477	1054	*/
	1055	+ cGridBag versionManagerPanel = new cGridBag();
	1056	+
	1057	+ versionManagerPanel.preferredHeight = 4;
	1058	+
478	1059	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
479	1060
480		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
481		- liveCB.setToolTipText("Enabled animation");
482		- liveCB.addItemListener(this);
	1061	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1062	+ //minButton.setToolTipText("Minimize window");
	1063	+ //minButton.addActionListener(this);
	1064	+
	1065	+ if (Globals.ADVANCED)
	1066	+ {
	1067	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1068	+// maxButton.setToolTipText("Maximize window");
	1069	+// maxButton.addActionListener(this);
	1070	+ }
	1071	+
	1072	+ cButton gcButton;
	1073	+
	1074	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1075	+// gcButton.setToolTipText("Garbage collect");
	1076	+// gcButton.addActionListener(new ActionListener()
	1077	+// {
	1078	+// public void actionPerformed(ActionEvent e)
	1079	+// {
	1080	+// System.gc();
	1081	+// }
	1082	+// });
	1083	+
	1084	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1085	+ collapseButton.setToolTipText("Collapse toolbar");
	1086	+ collapseButton.addActionListener(this);
	1087	+
	1088	+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1089	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1090	+ maximize3DButton.addActionListener(this);
	1091	+
	1092	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1093	+ twoButton.setToolTipText("Show 3D view only");
	1094	+ twoButton.addActionListener(this);
	1095	+ this.fullscreenLayout = twoButton;
	1096	+
	1097	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1098	+ threeButton.setToolTipText("Show controls and 3D view");
	1099	+ threeButton.addActionListener(this);
	1100	+ if (Globals.ADVANCED)
	1101	+ {
	1102	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1103	+ sixButton.setToolTipText("Show 3D view and controls");
	1104	+ sixButton.addActionListener(this);
	1105	+ }
	1106	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1107	+// sevenButton.setToolTipText("3-column layout");
	1108	+// sevenButton.addActionListener(this);
	1109	+ //
	1110	+
	1111	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1112	+ fullButton.setToolTipText("Full-screen window");
	1113	+ fullButton.addActionListener(this);
	1114	+
	1115	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1116	+ screenfitButton.setToolTipText("Screen fit");
	1117	+ screenfitButton.addActionListener(this);
483	1118
484		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1119	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1120	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1121	+ restoreCameraButton.addActionListener(this);
	1122	+
	1123	+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1124	+ saveVersionButton.setToolTipText("Duplicate current version");
	1125	+ saveVersionButton.addActionListener(this);
	1126	+
	1127	+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1128	+ deleteVersionButton.setToolTipText("Delete current version");
	1129	+ deleteVersionButton.addActionListener(this);
	1130	+ deleteVersionButton.setEnabled(false);
	1131	+
	1132	+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1133	+ previousVersionButton.setToolTipText("Previous version");
	1134	+ previousVersionButton.addActionListener(this);
	1135	+ previousVersionButton.setEnabled(false);
	1136	+
	1137	+ cGridBag updown = new cGridBag().setVertical(true);
	1138	+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1139	+ restoreButton.setToolTipText("Undo (restore current version)");
	1140	+ restoreButton.addActionListener(this);
	1141	+ restoreButton.setEnabled(false);
	1142	+
	1143	+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1144	+ replaceButton.setToolTipText("Save (replace current version)");
	1145	+ replaceButton.addActionListener(this);
	1146	+ replaceButton.setEnabled(false);
	1147	+
	1148	+ versionManagerPanel.add(updown);
	1149	+
	1150	+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1151	+ nextVersionButton.setToolTipText("Next version");
	1152	+ nextVersionButton.addActionListener(this);
	1153	+ nextVersionButton.setEnabled(false);
	1154	+
	1155	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
485	1156	oneStepButton.setToolTipText("Animate one step forward");
486	1157	oneStepButton.addActionListener(this);
487	1158
488		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	1159	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1160	+ liveCB.setToolTipText("Enable animation");
	1161	+ liveCB.addItemListener(this);
	1162	+
	1163	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
489	1164	fastCB.setToolTipText("Fast mode");
490	1165	fastCB.addItemListener(this);
491	1166
492		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
493		- trackCB.setToolTipText("Enable tracking");
494		- trackCB.addItemListener(this);
495		-
496		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
497		- screenfitButton.setToolTipText("Screen fit");
498		- screenfitButton.addActionListener(this);
	1167	+ //oe.toolboxPanel.Return();
	1168	+
	1169	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1170	+// trackCB.setToolTipText("Enable tracking");
	1171	+// trackCB.addItemListener(this);
499	1172
500	1173	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
501	1174	// screenfitpointButton.addActionListener(this);
502	1175
503	1176	if (Globals.ADVANCED)
504	1177	{
505		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1178	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
506	1179	snapobjectButton.addActionListener(this);
507	1180	snapobjectButton.setToolTipText("Snap Object");
	1181	+
	1182	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1183	+ fourButton.addActionListener(this);
	1184	+ fourButton.setToolTipText("Show control panel only");
508	1185	}
509	1186
510		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
511		- flashSelectionButton.setToolTipText("Show selection");
512		- flashSelectionButton.addActionListener(this);
	1187	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
513	1188
514		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
515		-
516		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
517		- twoButton.setToolTipText("Show center view only");
518		- twoButton.addActionListener(this);
519		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
520		- fourButton.addActionListener(this);
521		- fourButton.setToolTipText("Show left panel only");
522		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
523		- sixButton.setToolTipText("2-column layout left");
524		- sixButton.addActionListener(this);
525		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
526		- threeButton.setToolTipText("2-column layout right");
527		- threeButton.addActionListener(this);
528		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
529		- sevenButton.setToolTipText("3-column layout");
530		- sevenButton.addActionListener(this);
531		- //
532	1189
533		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
534		- rootButton.setToolTipText("Edit selection in new tab");
	1190	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1191	+ rootButton.setToolTipText("Open selection in new tab");
535	1192	rootButton.addActionListener(this);
536	1193
537		- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1194	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
538	1195	closeButton.setToolTipText("Close tab");
539	1196	closeButton.addActionListener(this);
540	1197	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
541	1198	//clearButton.addActionListener(this);
542		-
543		- cGridBag commandsPanel = new cGridBag();
	1199	+
	1200	+ cGridBag row1 = new cGridBag();
544	1201
545		- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
546		- editButton.setToolTipText("Edit selection");
	1202	+ // INSERT
	1203	+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1204	+ gridButton.setToolTipText("Create ground");
	1205	+ gridButton.addActionListener(this);
	1206	+
	1207	+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1208	+ boxButton.setToolTipText("Create box");
	1209	+ boxButton.addActionListener(this);
	1210	+
	1211	+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1212	+ superButton.setToolTipText("Create superellipsoid");
	1213	+ superButton.addActionListener(this);
	1214	+
	1215	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1216	+ sphereButton.setToolTipText("Create sphere");
	1217	+ sphereButton.addActionListener(this);
	1218	+
	1219	+ row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1220	+ coneButton.setToolTipText("Create cone");
	1221	+ coneButton.addActionListener(this);
	1222	+
	1223	+ row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1224	+ torusButton.setToolTipText("Create torus");
	1225	+ torusButton.addActionListener(this);
	1226	+
	1227	+ if (false) //Globals.ADVANCED)
	1228	+ {
	1229	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1230	+ kleinButton.setToolTipText("Create Klein bottle");
	1231	+ kleinButton.addActionListener(this);
	1232	+ }
	1233	+
	1234	+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1235	+ particlesButton.setToolTipText("Create particle system");
	1236	+ particlesButton.addActionListener(this);
	1237	+
	1238	+ oe.toolboxPanel.add(row1);
	1239	+
	1240	+ cGridBag row2 = new cGridBag();
	1241	+
	1242	+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1243	+ groupButton.setToolTipText("Create group");
	1244	+ groupButton.addActionListener(this);
	1245	+
	1246	+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1247	+ compositeButton.setToolTipText("Create composite");
	1248	+ compositeButton.addActionListener(this);
	1249	+
	1250	+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1251	+ switchButton.setToolTipText("Create item switcher");
	1252	+ switchButton.addActionListener(this);
	1253	+
	1254	+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1255	+ loopButton.setToolTipText("Create loop");
	1256	+ loopButton.addActionListener(this);
	1257	+
	1258	+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1259	+ textureButton.setToolTipText("Create texture");
	1260	+ textureButton.addActionListener(this);
	1261	+
	1262	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1263	+ overlayButton.setToolTipText("Create overlay");
	1264	+ overlayButton.addActionListener(this);
	1265	+
	1266	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1267	+ lightButton.setToolTipText("Create light");
	1268	+ lightButton.addActionListener(this);
	1269	+
	1270	+ oe.toolboxPanel.add(row2);
	1271	+
	1272	+ cGridBag textures = new cGridBag();
	1273	+
	1274	+ CreateTexturePanel(textures);
	1275	+
	1276	+ int tabCount = resourcecontainer.getTabCount();
	1277	+
	1278	+ if (tabCount > 0)
	1279	+ resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
	1280	+
	1281	+ oe.toolboxPanel.add(textures);
	1282	+
	1283	+ textures.preferredHeight = 100;
	1284	+
	1285	+ CreateSkyboxPanel(oe.skyboxPanel);
	1286	+
	1287	+ // EDIT panel
	1288	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1289	+ editButton.setToolTipText("Pin selection controls");
547	1290	editButton.addActionListener(this);
548	1291
549		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
550		- uneditButton.setToolTipText("Unedit selection");
	1292	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1293	+ uneditButton.setToolTipText("Unpin and remove selection controls");
551	1294	uneditButton.addActionListener(this);
552	1295
553		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
554		- allParamsButton.setToolTipText("Edit all params");
	1296	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1297	+ allParamsButton.setToolTipText("Show all controls");
555	1298	allParamsButton.addActionListener(this);
556	1299
557		- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
558		- clearPanelButton.setToolTipText("Clear edit panel");
	1300	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1301	+ clearPanelButton.setToolTipText("Clear all controls");
559	1302	clearPanelButton.addActionListener(this);
560	1303
561		- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
562		- unselectButton.setToolTipText("Unselect");
563		- unselectButton.addActionListener(this);
	1304	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1305	+ //unselectButton.setToolTipText("Unselect");
	1306	+ //unselectButton.addActionListener(this);
564	1307
565		- commandsPanel.preferredHeight = 1;
	1308	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1309	+ flashSelectionButton.setToolTipText("Highlight selection");
	1310	+ flashSelectionButton.addActionListener(this);
566	1311
567		- oe.treePanel.add(commandsPanel);
568		- oe.treePanel.Return();
	1312	+ editCommandsPanel.preferredHeight = 1;
	1313	+
	1314	+ SetPinStates(false);
	1315	+// oe.treePanel.add(commandsPanel);
	1316	+// oe.treePanel.Return();
569	1317
570	1318	// oe.aConstraints.gridx += 1;
571	1319	// oe.aConstraints.weighty = 0;
..	..	@@ -580,34 +1328,24 @@
580	1328
581	1329	cGridBag jSPPanel = new cGridBag();
582	1330
	1331	+ jSPPanel.preferredHeight = 20;
	1332	+
583	1333	JScrollPane jSP;
584	1334	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
585		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1335	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
586	1336	ResetModel();
587	1337
588	1338	oe.treePanel.add(jSPPanel);
589	1339	oe.treePanel.Return();
590	1340
591		- cGridBag copyOptionsPanel = new cGridBag();
592		-
593		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
594		- colorCB.setToolTipText("Copy color when dropped");
595		- colorCB.addItemListener(this);
596		-
597		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
598		- materialCB.setToolTipText("Copy material when dropped");
599		- materialCB.addItemListener(this);
600		-
601		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
602		- textureCB.setToolTipText("Copy texture when dropped");
603		- textureCB.addItemListener(this);
604		-
605		- copyOptionsPanel.preferredHeight = 1;
606		- oe.treePanel.add(copyOptionsPanel);
	1341	+ oe.treePanel.add(versionManagerPanel);
607	1342	oe.treePanel.Return();
	1343	+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1344	+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
	1345	+ versionSliderPane.preferredHeight = 3;
608	1346
609		-// mainPanel.setDividerLocation(0.5); //1.0);
610		-// mainPanel.setResizeWeight(0.5);
	1347	+// mainPanel.setDividerLocation(0.1); //1.0);
	1348	+ mainPanel.setResizeWeight(0.4);
611	1349
612	1350	//jList.addListSelectionListener(this);
613	1351	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -615,7 +1353,7 @@
615	1353	//jTree.setEditable(true);
616	1354	oe.jTree.setDragEnabled(true);
617	1355	//jTree.setPreferredSize(new Dimension(10,10));
618		- jSP.setPreferredSize(new Dimension(100,200));
	1356	+ //jSP.setPreferredSize(new Dimension(100,200));
619	1357
620	1358	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
621	1359
..	..	@@ -627,29 +1365,49 @@
627	1365	dgr.addDragGestureListener(this);
628	1366	}catch(Exception e) {}
629	1367	*/
630		- radio.layout = sevenButton;
	1368	+ radio.layout = threeButton; // sixButton;
631	1369	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
632	1370	}
633	1371
634	1372	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
635	1373	{
	1374	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1375	+ colorCB.setToolTipText("Copy color when dropped");
	1376	+ colorCB.addItemListener(this);
	1377	+
	1378	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1379	+ materialCB.setToolTipText("Copy material when dropped");
	1380	+ materialCB.addItemListener(this);
	1381	+
	1382	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1383	+ textureCB.setToolTipText("Copy texture when dropped");
	1384	+ textureCB.addItemListener(this);
	1385	+
	1386	+ panel.Return();
	1387	+
636	1388	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
637	1389	boxCB.setToolTipText("Display bounding boxes");
638	1390	boxCB.addItemListener(this);
639	1391
640	1392	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
641		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1393	+ zoomBoxCB.setToolTipText("Display only for wheel");
642	1394	zoomBoxCB.addItemListener(this);
643	1395
644		- if (Globals.ADVANCED)
	1396	+ if (true) // Globals.ADVANCED)
645	1397	{
646		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
647		- supportCB.setToolTipText("Enable rigging");
648		- supportCB.addItemListener(this);
	1398	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1399	+// supportCB.setToolTipText("Enable rigging");
	1400	+// supportCB.addItemListener(this);
	1401	+
	1402	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1403	+ freezeCB.setToolTipText("Fast moving camera");
	1404	+ freezeCB.addItemListener(this);
649	1405
650	1406	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
651	1407	// localCB.addItemListener(this);
652	1408
	1409	+ panel.Return();
	1410	+
653	1411	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
654	1412	crowdCB.setToolTipText("Used for crowds");
655	1413	crowdCB.addItemListener(this);
..	..	@@ -658,14 +1416,19 @@
658	1416	smoothCB.setToolTipText("Snapping delay");
659	1417	smoothCB.addItemListener(this);
660	1418
661		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
662		- slowCB.setToolTipText("Smooth interpolation");
663		- slowCB.addItemListener(this);
	1419	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1420	+// slowCB.setToolTipText("Smooth interpolation");
	1421	+// slowCB.addItemListener(this);
	1422	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1423	+ minshaderCB.setToolTipText("Minimal fast shader");
	1424	+ minshaderCB.addItemListener(this);
664	1425
665	1426	// constraints.gridy += 1;
666	1427	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
667	1428	// speakerMocapCB.addItemListener(this);
668	1429
	1430	+ panel.Return();
	1431	+
669	1432	if (false)
670	1433	{
671	1434	// handled in scripts
..	..	@@ -680,67 +1443,126 @@
680	1443	//constraints.gridy += 1;
681	1444	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
682	1445	smoothfocusCB.addItemListener(this);
	1446	+ panel.Return();
683	1447	}
684	1448
685	1449	//constraints.gridx += 1;
686	1450	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
687	1451	// debugCB.addItemListener(this);
688	1452
	1453	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1454	+ trackCB.setToolTipText("Enable tracking target");
	1455	+ trackCB.addItemListener(this);
	1456	+
689	1457	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1458	+ oeilCB.setToolTipText("Move camera when tracking");
690	1459	oeilCB.addItemListener(this);
691	1460
	1461	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1462	+ shadowCB.setToolTipText("When live compute shadows");
	1463	+ shadowCB.addItemListener(this);
	1464	+
	1465	+ panel.Return();
	1466	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1467	+ toggleTextureCB.setToolTipText("Load textures");
	1468	+ toggleTextureCB.addItemListener(this);
	1469	+
	1470	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1471	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1472	+ toggleSwitchCB.addItemListener(this);
	1473	+
	1474	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1475	+ autokeepCB.setToolTipText("On structure change");
	1476	+ autokeepCB.addItemListener(this);
	1477	+
	1478	+ panel.Return();
	1479	+ if (Globals.ADVANCED)
	1480	+ {
692	1481	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
693	1482	lookAtCB.setToolTipText("Look-at target");
694	1483	lookAtCB.addItemListener(this);
	1484	+ }
695	1485
696	1486	}
697	1487
698	1488	cGridBag fill = new cGridBag();
699		-
700	1489	fill.preferredHeight = 200;
	1490	+ cGridBag fill2 = new cGridBag();
	1491	+ fill2.preferredHeight = 200;
	1492	+ cGridBag fill3 = new cGridBag();
	1493	+ fill3.preferredHeight = 200;
701	1494
702	1495	panel.add(fill);
	1496	+ panel.add(fill2);
	1497	+ panel.add(fill3);
703	1498
704	1499	}
705	1500
706	1501	void EditObject(Object3D obj)
707	1502	{
	1503	+ //assert(obj instanceof Composite);
	1504	+
	1505	+// if (obj.versionlist == null)
	1506	+// {
	1507	+// obj.versionlist = new Object3D[100];
	1508	+// obj.versionindex = -1;
	1509	+// }
	1510	+
708	1511	cRadio radioButton = new cRadio(obj.name);
	1512	+
	1513	+ // June 2019. Patch to avoid bug with transparency.
	1514	+ radioButton.hadMaterial = obj.material != null;
	1515	+ if (!radioButton.hadMaterial)
	1516	+ {
	1517	+ obj.material = new cMaterial();
	1518	+ }
	1519	+
709	1520	radioButton.SetObject(obj);
710		- radioButton.layout = sevenButton;
	1521	+ radioButton.layout = threeButton; // sixButton;
711	1522	radioButton.SetCamera(cameraView.renderCamera, false);
712	1523	radioButton.addActionListener(this);
713	1524	radioPanel.add(radioButton);
714	1525	buttonGroup.add(radioButton);
715	1526	radioButton.doClick();
716	1527	}
	1528	+
717	1529	void SetupViews(ObjEditor oe)
718	1530	{
	1531	+ theFrame = this;
	1532	+
719	1533	oe.SetupViews();
720	1534
	1535	+ if (Globals.DEBUG)
721	1536	System.out.println("SetupViews");
722	1537	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
723	1538	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
724	1539	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
725	1540	}
726	1541
727		- JCheckBox liveCB;
728		- JCheckBox supportCB;
729		- JCheckBox localCB;
730		- JCheckBox crowdCB;
731		- JCheckBox smoothCB;
732		- JCheckBox fastCB;
733		- JCheckBox slowCB;
734		- JCheckBox boxCB;
735		- JCheckBox zoomBoxCB;
736		- JCheckBox trackCB;
737		- JCheckBox smoothfocusCB;
	1542	+ cToggleButton liveCB;
	1543	+ cCheckBox supportCB;
	1544	+ cCheckBox localCB;
	1545	+ cCheckBox crowdCB;
	1546	+ cCheckBox smoothCB;
	1547	+ cCheckBox minshaderCB;
	1548	+
	1549	+ cToggleButton fastCB;
	1550	+ cCheckBox slowCB;
	1551	+ cCheckBox boxCB;
	1552	+ cCheckBox zoomBoxCB;
	1553	+ cCheckBox freezeCB;
	1554	+ //cToggleButton trackCB;
	1555	+ cCheckBox trackCB;
	1556	+ cCheckBox smoothfocusCB;
738	1557	// JCheckBox speakerMocapCB;
739		- JCheckBox speakerCameraCB;
740		- JCheckBox speakerFocusCB;
741		- JCheckBox debugCB;
742		- JCheckBox oeilCB;
743		- JCheckBox lookAtCB;
	1558	+ cCheckBox speakerCameraCB;
	1559	+ cCheckBox speakerFocusCB;
	1560	+ cCheckBox debugCB;
	1561	+
	1562	+ cCheckBox oeilCB;
	1563	+ cCheckBox shadowCB;
	1564	+ cCheckBox autokeepCB;
	1565	+ cCheckBox lookAtCB;
744	1566
745	1567	// static int COLOR = 1;
746	1568	// static int MATERIAL = 2;
..	..	@@ -748,9 +1570,9 @@
748	1570
749	1571	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
750	1572
751		- JCheckBox colorCB;
752		- JCheckBox materialCB;
753		- JCheckBox textureCB;
	1573	+ cCheckBox colorCB;
	1574	+ cCheckBox materialCB;
	1575	+ cCheckBox textureCB;
754	1576
755	1577	public void itemStateChanged(ItemEvent e)
756	1578	{
..	..	@@ -778,6 +1600,7 @@
778	1600	} else if(e.getSource() == liveCB)
779	1601	{
780	1602	cameraView.ToggleLive();
	1603	+ refreshContents(false);
781	1604	}
782	1605	else if(e.getSource() == supportCB)
783	1606	{
..	..	@@ -793,6 +1616,12 @@
793	1616	{
794	1617	cameraView.ToggleInertia();
795	1618	cameraView.repaint();
	1619	+ }
	1620	+ else if(e.getSource() == minshaderCB)
	1621	+ {
	1622	+ Globals.MINSHADER ^= true;
	1623	+ cameraView.programInitialized = false;
	1624	+ cameraView.repaint();
796	1625	}
797	1626	else if(e.getSource() == localCB)
798	1627	{
..	..	@@ -842,6 +1671,18 @@
842	1671	{
843	1672	cameraView.ToggleOeil();
844	1673	}
	1674	+ else if(e.getSource() == shadowCB)
	1675	+ {
	1676	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1677	+ }
	1678	+ else if(e.getSource() == freezeCB)
	1679	+ {
	1680	+ Globals.FREEZEONMOVE ^= true;
	1681	+ }
	1682	+ else if(e.getSource() == autokeepCB)
	1683	+ {
	1684	+ Globals.REPLACEONMAKE ^= true;
	1685	+ }
845	1686	else if(e.getSource() == lookAtCB)
846	1687	{
847	1688	cameraView.ToggleLookAt();
..	..	@@ -858,7 +1699,8 @@
858	1699
859	1700	/**/
860	1701	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
861		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1702	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1703	+ TreePath path = objEditor.jTree.getSelectionPath();
862	1704	if ((path == null) \|\| (path.getPathCount() <= 1)) {
863	1705	// We can't move the root node or an empty selection
864	1706	return;
..	..	@@ -921,8 +1763,6 @@
921	1763	}
922	1764	}
923	1765
924		- String string = (String) object;
925		-
926	1766	System.out.println("Transfer = " + object + "; drop : " + target);
927	1767	// if( object instanceof java.io.File[])
928	1768	// {
..	..	@@ -930,7 +1770,11 @@
930	1770	// objEditor.DropFile((java.io.File[]) object, true);
931	1771	// return;
932	1772	// }
933		- if (string.charAt(0) == '/')
	1773	+
	1774	+ String string = object.toString();
	1775	+
	1776	+ // File path for Mac and Windows
	1777	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
934	1778	{
935	1779	// file(s)
936	1780	String[] names = string.split("\n");
..	..	@@ -957,7 +1801,7 @@
957	1801
958	1802	flashIt = false;
959	1803	CameraPane pane = (CameraPane) target;
960		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1804	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
961	1805	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
962	1806
963	1807	if (group.selection.size() == 1)
..	..	@@ -973,23 +1817,33 @@
973	1817
974	1818	assert target == objEditor.jTree;
975	1819	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1820	+ Object3D destinationLeaf;
976	1821	try {
977		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1822	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
978	1823	} catch (Exception e) {
979	1824	System.out.println("destinationPath : " + destinationPath);
980	1825	return;
981	1826	}
982	1827
983		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1828	+ for (int i=group.selection.size(); --i>=0;)
984	1829	{
	1830	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1831	+
	1832	+ // Cannot move into itself
	1833	+ if (child == destinationLeaf)
	1834	+ return;
	1835	+ }
	1836	+
	1837	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1838	+// {
985	1839	loadClipboard(true);
986	1840	objEditor.jTree.setSelectionPath(destinationPath);
987	1841	pasteInto(false, false);
988		- } else {
989		- loadClipboard(false);
990		- objEditor.jTree.setSelectionPath(destinationPath);
991		- pasteInto(false, false); // true); // ???
992		- }
	1842	+// } else {
	1843	+// loadClipboard(false);
	1844	+// objEditor.jTree.setSelectionPath(destinationPath);
	1845	+// pasteInto(false, false); // true); // ???
	1846	+// }
993	1847	}
994	1848	public void dropActionChanged(DropTargetDragEvent dtde)
995	1849	// Called if the user has modified the current drop gesture
..	..	@@ -1045,7 +1899,12 @@
1045	1899	TreePath path;
1046	1900
1047	1901	public TransferableTreePath(TreePath tp) {
1048		- path = tp;
	1902	+ Object[] objs = new Object[tp.getPathCount()];
	1903	+ for (int i=0; i<objs.length; i++)
	1904	+ {
	1905	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1906	+ }
	1907	+ path = new TreePath(objs);
1049	1908	}
1050	1909
1051	1910	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1094,22 +1953,30 @@
1094	1953	{
1095	1954	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1096	1955	//heightFieldItem.addActionListener(this);
1097		- gridItem = menu.add(new MenuItem("Grid"));
1098		- gridItem.addActionListener(this);
1099		- rectoidItem = menu.add(new MenuItem("Box"));
1100		- rectoidItem.addActionListener(this);
1101		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1102		- ellipsoidItem.addActionListener(this);
1103		- coneItem = menu.add(new MenuItem("Cone"));
1104		- coneItem.addActionListener(this);
1105		- torusItem = menu.add(new MenuItem("Torus"));
1106		- torusItem.addActionListener(this);
1107		- superItem = menu.add(new MenuItem("Superellipsoid"));
1108		- superItem.addActionListener(this);
	1956	+// gridItem = menu.add(new MenuItem("Grid"));
	1957	+// gridItem.addActionListener(this);
	1958	+// rectoidItem = menu.add(new MenuItem("Box"));
	1959	+// rectoidItem.addActionListener(this);
	1960	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1961	+// ellipsoidItem.addActionListener(this);
	1962	+// coneItem = menu.add(new MenuItem("Cone"));
	1963	+// coneItem.addActionListener(this);
	1964	+// torusItem = menu.add(new MenuItem("Torus"));
	1965	+// torusItem.addActionListener(this);
	1966	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1967	+// superItem.addActionListener(this);
	1968	+
	1969	+ cameraItem = menu.add(new MenuItem("Camera"));
	1970	+ cameraItem.addActionListener(this);
	1971	+
	1972	+ if (!Globals.ADVANCED)
	1973	+ {
1109	1974	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1110	1975	kleinItem.addActionListener(this);
1111		- particleItem = menu.add(new MenuItem("Particle system"));
1112		- particleItem.addActionListener(this);
	1976	+ }
	1977	+
	1978	+// particleItem = menu.add(new MenuItem("Particle system"));
	1979	+// particleItem.addActionListener(this);
1113	1980	if (Globals.ADVANCED)
1114	1981	{
1115	1982	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1135,15 +2002,15 @@
1135	2002	}
1136	2003	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1137	2004	bezierItem.addActionListener(this);
1138		- overlayItem = menu.add(new MenuItem("Overlay"));
1139		- overlayItem.addActionListener(this);
1140		- lightItem = menu.add(new MenuItem("Light"));
1141		- lightItem.addActionListener(this);
	2005	+// overlayItem = menu.add(new MenuItem("Overlay"));
	2006	+// overlayItem.addActionListener(this);
	2007	+// lightItem = menu.add(new MenuItem("Light"));
	2008	+// lightItem.addActionListener(this);
1142	2009	menu.add("-");
1143	2010	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1144	2011	//superLoopItem.addActionListener(this);
1145		- loopItem = menu.add(new MenuItem("Loop"));
1146		- loopItem.addActionListener(this);
	2012	+// loopItem = menu.add(new MenuItem("Loop"));
	2013	+// loopItem.addActionListener(this);
1147	2014	doubleItem = menu.add(new MenuItem("Fork"));
1148	2015	doubleItem.addActionListener(this);
1149	2016	if (Globals.ADVANCED)
..	..	@@ -1159,18 +2026,23 @@
1159	2026	animationItem.addItemListener(this);
1160	2027	animationItem.setState(Globals.ANIMATION);
1161	2028
	2029	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	2030	+ archiveItem.addActionListener(this);
	2031	+
1162	2032	menu.add("-");
1163	2033	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1164	2034	parseverticesItem.addActionListener(this);
1165	2035	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1166	2036	textureFieldItem.addActionListener(this);
1167		- alignItem = menu.add(new MenuItem("Align Object"));
	2037	+ alignItem = menu.add(new MenuItem("Align Objects"));
1168	2038	alignItem.addActionListener(this);
1169	2039	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1170	2040	reduceMorphItem.addActionListener(this);
1171	2041	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1172	2042	reduce34MorphItem.addActionListener(this);
1173		-
	2043	+ menu.add("-");
	2044	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	2045	+ memoryItem.addActionListener(this);
1174	2046	menu.add(computeAOItem = new MenuItem("Compute AO"));
1175	2047	computeAOItem.addActionListener(this);
1176	2048
..	..	@@ -1179,11 +2051,9 @@
1179	2051	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1180	2052	mirrorItem.addActionListener(this);
1181	2053	menu.add("-");
1182		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1183		- memoryItem.addActionListener(this);
1184	2054	menu.add(analyzeItem = new MenuItem("Analyze"));
1185	2055	analyzeItem.addActionListener(this);
1186		- menu.add(dumpItem = new MenuItem("Dump"));
	2056	+ menu.add(dumpItem = new MenuItem("Print"));
1187	2057	dumpItem.addActionListener(this);
1188	2058	// menu.add(pathItem = new MenuItem("From-to path"));
1189	2059	// pathItem.addActionListener(this);
..	..	@@ -1266,24 +2136,24 @@
1266	2136	switch(axis)
1267	2137	{
1268	2138	case 0 :
1269		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1270		- vert2.x = minima.x; vert2.y = maxima.y; vert2.z = minima.z;
1271		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1272		- vert4.x = minima.x; vert4.y = maxima.y; vert4.z = maxima.z;
	2139	+ vert1.x = minima.x + 0.001f; vert1.y = minima.y; vert1.z = minima.z;
	2140	+ vert2.x = minima.x + 0.001f; vert2.y = maxima.y; vert2.z = minima.z;
	2141	+ vert3.x = minima.x + 0.001f; vert3.y = minima.y; vert3.z = maxima.z;
	2142	+ vert4.x = minima.x + 0.001f; vert4.y = maxima.y; vert4.z = maxima.z;
1273	2143	norm = cVector.X;
1274	2144	break;
1275	2145	case 1 :
1276		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1277		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1278		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1279		- vert4.x = maxima.x; vert4.y = minima.y; vert4.z = maxima.z;
	2146	+ vert1.x = minima.x; vert1.y = minima.y + 0.001f; vert1.z = minima.z;
	2147	+ vert2.x = maxima.x; vert2.y = minima.y + 0.001f; vert2.z = minima.z;
	2148	+ vert3.x = minima.x; vert3.y = minima.y + 0.001f; vert3.z = maxima.z;
	2149	+ vert4.x = maxima.x; vert4.y = minima.y + 0.001f; vert4.z = maxima.z;
1280	2150	norm = cVector.Y;
1281	2151	break;
1282	2152	case 2 :
1283		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1284		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1285		- vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z;
1286		- vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z;
	2153	+ vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z + 0.001f;
	2154	+ vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z + 0.001f;
	2155	+ vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z + 0.001f;
	2156	+ vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z + 0.001f;
1287	2157	norm = cVector.Z;
1288	2158	break;
1289	2159	}
..	..	@@ -1324,9 +2194,38 @@
1324	2194	shadow.material = new cMaterial(obj.material);
1325	2195	shadow.material.diffuse = 0.0001f;
1326	2196	shadow.material.specular = 0.0001f;
	2197	+ shadow.material.opacity = 0.75f;
	2198	+
	2199	+ AllocProjectedVertices(shadow);
	2200	+
	2201	+ shadow.projectedVertices[1].x = 300;
1327	2202
1328	2203	makeSomething(shadow);
1329	2204	}
	2205	+
	2206	+ private void ClearUnpinned()
	2207	+ {
	2208	+ //for (Object3D obj : listUI)
	2209	+ for (int i=listUI.size(); --i>=0;)
	2210	+ {
	2211	+ Object3D obj = listUI.elementAt(i);
	2212	+ if (!obj.pinned)
	2213	+ {
	2214	+ obj.CloseUI();
	2215	+ listUI.remove(i);
	2216	+ }
	2217	+ }
	2218	+ }
	2219	+
	2220	+ private void EditElement(Object3D elem, boolean newWindow)
	2221	+ {
	2222	+ // if (!(elem instanceof Composite))
	2223	+ // newWindow = false;
	2224	+ listUI.add(elem);
	2225	+ elem.openEditWindow(this, newWindow); //, false);
	2226	+ System.out.println("edit : " + elem);
	2227	+ elem.editWindow.refreshContents(true); // ? new
	2228	+ }
1330	2229
1331	2230	/**
1332	2231	* applyExample
..	..	@@ -1530,9 +2429,9 @@
1530	2429
1531	2430	void Overwrite(int mask)
1532	2431	{
1533		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2432	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1534	2433	{
1535		- Object3D content = GrafreeD.clipboard.get(0);
	2434	+ Object3D content = Grafreed.clipboard.get(0);
1536	2435
1537	2436	if (content instanceof cGroup && ((cGroup)content).transientlink )
1538	2437	content = ((cGroup)content).get(0);
..	..	@@ -1571,7 +2470,7 @@
1571	2470	{
1572	2471	ScreenFit();
1573	2472	} else
1574		- if (source == switchItem)
	2473	+ if (source == switchViewItem)
1575	2474	{
1576	2475	cVector v1 = new cVector();
1577	2476	cVector v2 = new cVector();
..	..	@@ -1580,11 +2479,11 @@
1580	2479	objEditor.cameraView.renderCamera.setAim(v2, v1);
1581	2480	objEditor.cameraView.repaint();
1582	2481	} else
1583		- if (source == rectoidItem)
	2482	+ if (source == rectoidItem \|\| source == boxButton)
1584	2483	{
1585	2484	makeSomething(new Box());
1586	2485	} else
1587		- if (source == particleItem)
	2486	+ if (source == particleItem \|\| source == particlesButton)
1588	2487	{
1589	2488	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1590	2489	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1663,27 +2562,27 @@
1663	2562
1664	2563	makeSomething(obj);
1665	2564	} else
1666		- if (source == gridItem)
	2565	+ if (source == gridItem \|\| source == gridButton)
1667	2566	{
1668	2567	makeSomething(new Grid());
1669	2568	} else
1670		- if (source == ellipsoidItem)
	2569	+ if (source == ellipsoidItem \|\| source == sphereButton)
1671	2570	{
1672	2571	makeSomething(new Sphere());
1673	2572	} else
1674		- if (source == coneItem)
	2573	+ if (source == coneItem \|\| source == coneButton)
1675	2574	{
1676	2575	makeSomething(new Cone());
1677	2576	} else
1678		- if (source == torusItem)
	2577	+ if (source == torusItem \|\| source == torusButton)
1679	2578	{
1680	2579	makeSomething(new Torus());
1681	2580	} else
1682		- if (source == superItem)
	2581	+ if (source == superItem \|\| source == superButton)
1683	2582	{
1684	2583	makeSomething(new Superellipsoid());
1685	2584	} else
1686		- if (source == kleinItem)
	2585	+ if (source == kleinItem \|\| source == kleinButton)
1687	2586	{
1688	2587	makeSomething(new Klein());
1689	2588	} else
..	..	@@ -1703,7 +2602,7 @@
1703	2602	{
1704	2603	makeSomething(new BezierSurface());
1705	2604	} else
1706		- if (source == overlayItem)
	2605	+ if (source == overlayItem \|\| source == overlayButton)
1707	2606	{
1708	2607	/*
1709	2608	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1751,10 +2650,27 @@
1751	2650	s.setup();
1752	2651	makeSomething(s);
1753	2652	} else
1754		- if (source == lightItem)
	2653	+ if (source == lightItem \|\| source == lightButton)
1755	2654	{
1756	2655	makeSomething(new Light());
1757	2656	} else
	2657	+// if (source == skybox1Button \|\|
	2658	+// source == skybox2Button \|\|
	2659	+// source == skybox3Button \|\|
	2660	+// source == skybox4Button \|\|
	2661	+// source == skybox5Button \|\|
	2662	+// source == skybox6Button \|\|
	2663	+// source == skybox7Button \|\|
	2664	+// source == skybox11Button \|\|
	2665	+// source == skybox12Button \|\|
	2666	+// source == skybox13Button \|\|
	2667	+// source == skybox14Button \|\|
	2668	+// source == skybox15Button \|\|
	2669	+// source == skybox16Button \|\|
	2670	+// source == skybox17Button)
	2671	+// {
	2672	+// ChangeSkybox(source);
	2673	+// } else
1758	2674	if (source == csgItem)
1759	2675	{
1760	2676	group(new CSG());
..	..	@@ -1801,30 +2717,38 @@
1801	2717
1802	2718	group(g);
1803	2719	} else
1804		- if (source == loopItem)
	2720	+ if (source == loopItem \|\| source == loopButton)
1805	2721	{
	2722	+ if (!group.selection.isEmpty())
	2723	+ {
1806	2724	Composite csg = new GroupLeaf();
1807	2725	csg.count = 5;
1808		- group(csg);
1809		- Composite child = new cGroup();
	2726	+ Composite child = new cGroup("Branch");
1810	2727	csg.addChild(child);
1811	2728	child.addChild(csg);
	2729	+ group(csg);
	2730	+ }
1812	2731	} else
1813	2732	if (source == doubleItem)
1814	2733	{
1815		- Composite csg = new GroupLeaf();
	2734	+ if (!group.selection.isEmpty())
	2735	+ {
	2736	+ Composite csg = new GroupLeaf("Fork");
1816	2737	csg.count = 5;
	2738	+ Composite child = new cGroup("Branch A");
	2739	+ csg.addChild(child);
	2740	+ child.addChild(csg);
	2741	+ child = new cGroup("Branch B");
	2742	+ csg.addChild(child);
	2743	+ child.addChild(csg);
1817	2744	group(csg);
1818		- Composite child = new cGroup();
1819		- csg.addChild(child);
1820		- child.addChild(csg);
1821		- child = new cGroup();
1822		- csg.addChild(child);
1823		- child.addChild(csg);
	2745	+ }
1824	2746	} else
1825	2747	if (source == tripleItem)
1826	2748	{
1827		- Composite csg = new GroupLeaf();
	2749	+ if (!group.selection.isEmpty())
	2750	+ {
	2751	+ Composite csg = new GroupLeaf("Trident");
1828	2752	csg.count = 4;
1829	2753	group(csg);
1830	2754	Composite child = new cGroup();
..	..	@@ -1836,28 +2760,12 @@
1836	2760	child = new cGroup();
1837	2761	csg.addChild(child);
1838	2762	child.addChild(csg);
1839		- } else
1840		-
1841		- if (source == importGFDItem)
1842		- {
1843		- ImportGFD();
1844		- } else
1845		- if (source == importVRMLX3DItem)
1846		- {
1847		- ImportVRMLX3D();
1848		- } else
1849		- if (source == import3DSItem)
1850		- {
1851		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1852		- } else
1853		- if (source == importOBJItem)
1854		- {
1855		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	2763	+ }
1856	2764	} else
1857	2765	if (source == computeAOItem)
1858	2766	{
1859	2767	Globals.drawMode = CameraPane.OCCLUSION;
1860		- Globals.theRenderer.repaint();
	2768	+ cameraView.repaint();
1861	2769	} else
1862	2770	if (source == recompileItem)
1863	2771	{
..	..	@@ -1872,7 +2780,7 @@
1872	2780	if (source == invariantsItem)
1873	2781	{
1874	2782	System.out.println("Invariants:");
1875		- GrafreeD.grafreeD.universe.invariants();
	2783	+ Grafreed.grafreed.universe.invariants();
1876	2784	} else
1877	2785	if (source == memoryItem)
1878	2786	{
..	..	@@ -1891,6 +2799,65 @@
1891	2799	{
1892	2800	DumpObject();
1893	2801	} else
	2802	+ if (source == minButton)
	2803	+ {
	2804	+ Minimize();
	2805	+ } else
	2806	+ if (source == maxButton)
	2807	+ {
	2808	+ Maximize();
	2809	+ } else
	2810	+ if (source == fullButton)
	2811	+ {
	2812	+ ToggleFullScreen();
	2813	+ } else
	2814	+ if (source == collapseButton)
	2815	+ {
	2816	+ this.expandedLayout = radio.layout;
	2817	+ CollapseToolbar();
	2818	+ } else
	2819	+ if (source == maximize3DButton)
	2820	+ {
	2821	+ this.expandedLayout = radio.layout;
	2822	+ radio.layout = twoButton;
	2823	+ Show3DView();
	2824	+ CollapseToolbar();
	2825	+ } else
	2826	+ if (source == previousVersionButton)
	2827	+ {
	2828	+ // Go to previous version
	2829	+ //if (!Undo())
	2830	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2831	+ PreviousVersion();
	2832	+ } else
	2833	+ if (source == restoreButton)
	2834	+ {
	2835	+ // Restore current version
	2836	+ Restore();
	2837	+ //restoreButton.setEnabled(false);
	2838	+ } else
	2839	+ if (source == replaceButton)
	2840	+ {
	2841	+ // Overwrite current version
	2842	+ Replace();
	2843	+ //replaceButton.setEnabled(false);
	2844	+ } else
	2845	+ if (source == nextVersionButton)
	2846	+ {
	2847	+ // Go to next version
	2848	+ NextVersion();
	2849	+ } else
	2850	+ if (source == saveVersionButton)
	2851	+ {
	2852	+ // Save a new version
	2853	+ if (!Save(true))
	2854	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2855	+ } else
	2856	+ if (source == deleteVersionButton)
	2857	+ {
	2858	+ // Delete a new version
	2859	+ DeleteVersion();
	2860	+ } else
1894	2861	if (source == oneStepButton)
1895	2862	{
1896	2863	Globals.ONESTEP = true;
..	..	@@ -1898,17 +2865,14 @@
1898	2865	} else
1899	2866	if (source == screenfitButton)
1900	2867	{
1901		- //Reload(lastConverter, lastFilename, true);
1902	2868	ScreenFit();
1903	2869	} else
1904	2870	if (source == screenfitpointButton)
1905	2871	{
1906		- //Reload(lastConverter, lastFilename, true);
1907	2872	ScreenFitPoint();
1908	2873	} else
1909	2874	if (source == snapobjectButton)
1910	2875	{
1911		- //Reload(lastConverter, lastFilename, true);
1912	2876	SnapObject();
1913	2877	} else
1914	2878	// if (event.getSource() == recompileButton)
..	..	@@ -1945,12 +2909,20 @@
1945	2909	{
1946	2910	loadClipboard(true);
1947	2911	} else
	2912	+ if (source == undoItem)
	2913	+ {
	2914	+ PreviousVersion();
	2915	+ } else
	2916	+ if (source == redoItem)
	2917	+ {
	2918	+ NextVersion();
	2919	+ } else
1948	2920	if (source == duplicateItem)
1949	2921	{
1950		- Object3D keep = GrafreeD.clipboard;
	2922	+ Object3D keep = Grafreed.clipboard;
1951	2923	loadClipboard(false);
1952	2924	paste(false);
1953		- GrafreeD.clipboard = keep;
	2925	+ Grafreed.clipboard = keep;
1954	2926	} else
1955	2927	if (source == cloneItem)
1956	2928	{
..	..	@@ -2170,9 +3142,9 @@
2170	3142	// group.selection.get(0).setMasterThis(content); // should be identity
2171	3143	// refreshContents();
2172	3144	// }
2173		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	3145	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2174	3146	{
2175		- Object3D content = GrafreeD.clipboard.get(0);
	3147	+ Object3D content = Grafreed.clipboard.get(0);
2176	3148
2177	3149	if (content instanceof cGroup && ((cGroup)content).transientlink )
2178	3150	content = ((cGroup)content).get(0);
..	..	@@ -2222,9 +3194,9 @@
2222	3194	} else
2223	3195	if (source == setMasterItem)
2224	3196	{
2225		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	3197	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2226	3198	{
2227		- Object3D content = GrafreeD.clipboard.get(0);
	3199	+ Object3D content = Grafreed.clipboard.get(0);
2228	3200
2229	3201	if (content instanceof cGroup && ((cGroup)content).transientlink )
2230	3202	content = ((cGroup)content).get(0);
..	..	@@ -2237,9 +3209,9 @@
2237	3209	{
2238	3210	if (group.selection.size() == 1)
2239	3211	{
2240		- if (GrafreeD.clipboard.size() == 1)
	3212	+ if (Grafreed.clipboard.size() == 1)
2241	3213	{
2242		- Object3D content = GrafreeD.clipboard.get(0);
	3214	+ Object3D content = Grafreed.clipboard.get(0);
2243	3215
2244	3216	if (content instanceof cGroup && ((cGroup)content).transientlink )
2245	3217	content = ((cGroup)content).get(0);
..	..	@@ -2256,7 +3228,7 @@
2256	3228	{
2257	3229	RevertMeshes();
2258	3230	} else
2259		- if (source == resetMeshItem)
	3231	+ if (source == resetAllItem)
2260	3232	{
2261	3233	ResetAll();
2262	3234	} else
..	..	@@ -2264,7 +3236,7 @@
2264	3236	{
2265	3237	StepAll();
2266	3238	} else
2267		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3239	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2268	3240	{
2269	3241	//int indices[] = jList.getSelectedIndices();
2270	3242	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2276,9 +3248,9 @@
2276	3248	{
2277	3249	ClearSelection(true);
2278	3250	} else
2279		- if (source == grabItem)
	3251	+ if (source == grabItem \|\| source == groupButton)
2280	3252	{
2281		- group(new cGroup(), true);
	3253	+ group(new cGroup(), false); // true);
2282	3254	} else
2283	3255	if (source == hideItem)
2284	3256	{
..	..	@@ -2296,11 +3268,11 @@
2296	3268	{
2297	3269	makeSomething(new Camera());
2298	3270	} else
2299		- if (source == compositeItem)
	3271	+ if (source == compositeItem \|\| source == compositeButton)
2300	3272	{
2301	3273	group(new Composite());
2302	3274	} else
2303		- if (source == randomItem)
	3275	+ if (source == switchItem \|\| source == switchButton)
2304	3276	{
2305	3277	RandomNode random = new RandomNode();
2306	3278	group(random);
..	..	@@ -2402,7 +3374,7 @@
2402	3374	{
2403	3375	group(new cLinker());
2404	3376	} else
2405		- if (source == textureItem)
	3377	+ if (source == textureItem \|\| source == textureButton)
2406	3378	{
2407	3379	group(new TextureNode());
2408	3380	} else
..	..	@@ -2422,17 +3394,42 @@
2422	3394	{
2423	3395	CastShadow(2);
2424	3396	} else
2425		- if (source == ungroupItem)
	3397	+ if (source == ungroupItem \|\| source == ungroupButton)
2426	3398	{
2427		- //ungroup();
	3399	+ boolean canUngroup = true;
	3400	+
2428	3401	for (int i=0; i<group.selection.size(); i++)
2429	3402	{
2430		- Ungroup(group.selection.get(i));
	3403	+ Object3D selectedItem = group.selection.get(i);
	3404	+
	3405	+ if (selectedItem.Size() == 0)
	3406	+ {
	3407	+ // Cannot ungroup leaves
	3408	+ canUngroup = false;
	3409	+ break;
	3410	+ }
	3411	+
	3412	+ if (selectedItem == group)
	3413	+ {
	3414	+ // Cannot ungroup root
	3415	+ canUngroup = false;
	3416	+ break;
	3417	+ }
2431	3418	}
2432	3419
2433		- ClearSelection(false);
2434		-
2435		- refreshContents();
	3420	+ if (canUngroup)
	3421	+ {
	3422	+ for (int i=0; i<group.selection.size(); i++)
	3423	+ {
	3424	+ Object3D selectedItem = group.selection.get(i);
	3425	+
	3426	+ Ungroup(selectedItem);
	3427	+ }
	3428	+
	3429	+ ClearSelection(false);
	3430	+
	3431	+ refreshContents();
	3432	+ }
2436	3433	} else
2437	3434	if (source == genUVItem)
2438	3435	{
..	..	@@ -2444,7 +3441,7 @@
2444	3441	} else
2445	3442	if (source == genNormalsMESHItem)
2446	3443	{
2447		- GenNormals(true); // TODO
	3444	+ GenNormalsMESH();
2448	3445	} else
2449	3446	if (source == genNormalsORGANItem)
2450	3447	{
..	..	@@ -2478,6 +3475,10 @@
2478	3475	{
2479	3476	ClearMaterials();
2480	3477	} else
	3478	+ if (source == clearVersionsItem)
	3479	+ {
	3480	+ ClearVersions();
	3481	+ } else
2481	3482	if (source == liveleavesItem)
2482	3483	{
2483	3484	LiveLeaves(true);
..	..	@@ -2509,6 +3510,22 @@
2509	3510	if (source == unmarkleavesItem)
2510	3511	{
2511	3512	MarkLeaves(false);
	3513	+ } else
	3514	+ if (source == rewindleavesItem)
	3515	+ {
	3516	+ RewindLeaves(true);
	3517	+ } else
	3518	+ if (source == unrewindleavesItem)
	3519	+ {
	3520	+ RewindLeaves(false);
	3521	+ } else
	3522	+ if (source == randomleavesItem)
	3523	+ {
	3524	+ RandomLeaves(true);
	3525	+ } else
	3526	+ if (source == unrandomleavesItem)
	3527	+ {
	3528	+ RandomLeaves(false);
2512	3529	} else
2513	3530	if (source == flipVItem)
2514	3531	{
..	..	@@ -2594,9 +3611,25 @@
2594	3611	{
2595	3612	SmoothMesh();
2596	3613	} else
2597		- if (source == transformgeometryItem)
	3614	+ if (source == transformGeometryItem)
2598	3615	{
2599	3616	TransformGeometry();
	3617	+ } else
	3618	+ if (source == transformChildrenItem)
	3619	+ {
	3620	+ TransformChildren();
	3621	+ } else
	3622	+ if (source == textureRatioRItem)
	3623	+ {
	3624	+ TextureRatio(0);
	3625	+ } else
	3626	+ if (source == textureRatioGItem)
	3627	+ {
	3628	+ TextureRatio(1);
	3629	+ } else
	3630	+ if (source == textureRatioBItem)
	3631	+ {
	3632	+ TextureRatio(2);
2600	3633	} else
2601	3634	if (source == resetTransformItem)
2602	3635	{
..	..	@@ -2604,7 +3637,11 @@
2604	3637	} else
2605	3638	if (source == resetCentroidItem)
2606	3639	{
2607		- ResetCentroid();
	3640	+ ResetCentroid(true);
	3641	+ } else
	3642	+ if (source == resetCentroidXZItem)
	3643	+ {
	3644	+ ResetCentroid(false);
2608	3645	} else
2609	3646	if (source == resetParentItem)
2610	3647	{
..	..	@@ -2709,7 +3746,7 @@
2709	3746	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2710	3747	{
2711	3748	obj = (Object3D)e.nextElement();
2712		- obj.SetBumpTexture(null);
	3749	+ obj.ResetBumpTexture();
2713	3750	}
2714	3751
2715	3752	refreshContents();
..	..	@@ -2725,6 +3762,31 @@
2725	3762
2726	3763	refreshContents();
2727	3764	} else
	3765	+ if (source == embedTexturesItem)
	3766	+ {
	3767	+ Object3D obj;
	3768	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3769	+ {
	3770	+ obj = (Object3D)e.nextElement();
	3771	+ obj.EmbedTextures(true);
	3772	+ }
	3773	+
	3774	+ refreshContents();
	3775	+ } else
	3776	+ if (source == deEmbedTexturesItem)
	3777	+ {
	3778	+ Object3D obj;
	3779	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3780	+ {
	3781	+ obj = (Object3D)e.nextElement();
	3782	+ obj.EmbedTextures(false);
	3783	+ }
	3784	+
	3785	+ CameraPane.texturepigment.clear();
	3786	+ CameraPane.texturebump.clear();
	3787	+
	3788	+ refreshContents();
	3789	+ } else
2728	3790	if (source == flashSelectionButton)
2729	3791	{
2730	3792	CameraPane.flash = true;
..	..	@@ -2736,42 +3798,36 @@
2736	3798	if (source == twoButton)
2737	3799	{
2738	3800	radio.layout = twoButton;
2739		- // bug
2740		- //gridPanel.setDividerLocation(1.0);
2741		- //bigPanel.setDividerLocation(0.0);
2742		-// bigThree.remove(scenePanel);
2743		-// bigThree.remove(centralPanel);
2744		-// bigThree.remove(XYZPanel);
2745		-// aWindowConstraints.gridx = 0;
2746		-// aWindowConstraints.gridy = 0;
2747		-// aWindowConstraints.gridwidth = 1;
2748		-// // aConstraints.gridheight = 3;
2749		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2750		-// aWindowConstraints.weightx = 0;
2751		-// aWindowConstraints.weighty = 1;
2752		-// //bigThree.add(jtp, aWindowConstraints);
2753		-// aWindowConstraints.weightx = 1;
2754		-// aWindowConstraints.gridwidth = 3;
2755		-// // aConstraints.gridheight = 3;
2756		-// aWindowConstraints.gridx = 1;
2757		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
2758		-// bigThree.add(centralPanel, aWindowConstraints);
2759		-// aWindowConstraints.weightx = 0;
2760		-// aWindowConstraints.gridx = 4;
2761		-// aWindowConstraints.gridwidth = 1;
2762		-// // aConstraints.gridheight = 3;
2763		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2764		-// //bigThree.add(XYZPanel, aWindowConstraints);
2765		-// scenePanel.setVisible(false);
2766		-// centralPanel.setVisible(true);
2767		-// XYZPanel.setVisible(false);
2768		- bigThree.ClearUI();
2769		- bigThree.add(centralPanel);
2770		- bigThree.FlushUI();
	3801	+
	3802	+ if (CameraPane.FULLSCREEN)
	3803	+ fullscreenLayout = radio.layout;
	3804	+
	3805	+ Show3DView();
	3806	+
	3807	+ cameraView.requestFocusInWindow();
	3808	+
	3809	+// refreshContents(true);
	3810	+//
	3811	+// try
	3812	+// {
	3813	+// java.awt.Robot bot = new java.awt.Robot();
	3814	+// int mask = InputEvent.BUTTON1_MASK;
	3815	+// bot.mouseMove(100, 100);
	3816	+// bot.mousePress(mask);
	3817	+// bot.mouseRelease(mask);
	3818	+// }
	3819	+// catch (Exception e)
	3820	+// {
	3821	+//
	3822	+// }
	3823	+
2771	3824	} else
2772	3825	if (source == threeButton)
2773	3826	{
2774	3827	radio.layout = threeButton;
	3828	+
	3829	+ if (CameraPane.FULLSCREEN)
	3830	+ fullscreenLayout = radio.layout;
2775	3831
2776	3832	// bigThree.remove(scenePanel);
2777	3833	// bigThree.remove(centralPanel);
..	..	@@ -2801,13 +3857,18 @@
2801	3857	// centralPanel.setVisible(true);
2802	3858	// XYZPanel.setVisible(true);
2803	3859	bigThree.ClearUI();
	3860	+ bigThree.add(scenePanel);
2804	3861	bigThree.add(centralPanel);
2805		- bigThree.add(XYZPanel);
2806	3862	bigThree.FlushUI();
	3863	+
	3864	+ cameraView.requestFocusInWindow();
2807	3865	} else
2808	3866	if (source == fourButton)
2809	3867	{
2810	3868	radio.layout = fourButton;
	3869	+
	3870	+ if (CameraPane.FULLSCREEN)
	3871	+ fullscreenLayout = radio.layout;
2811	3872
2812	3873	// bigThree.remove(scenePanel);
2813	3874	// bigThree.remove(centralPanel);
..	..	@@ -2839,10 +3900,15 @@
2839	3900	bigThree.ClearUI();
2840	3901	bigThree.add(scenePanel);
2841	3902	bigThree.FlushUI();
	3903	+
	3904	+ cameraView.requestFocusInWindow();
2842	3905	} else
2843	3906	if (source == sixButton)
2844	3907	{
2845	3908	radio.layout = sixButton;
	3909	+
	3910	+ if (CameraPane.FULLSCREEN)
	3911	+ fullscreenLayout = radio.layout;
2846	3912
2847	3913	// bigThree.remove(scenePanel);
2848	3914	// bigThree.remove(centralPanel);
..	..	@@ -2872,13 +3938,18 @@
2872	3938	// centralPanel.setVisible(true);
2873	3939	// XYZPanel.setVisible(false);
2874	3940	bigThree.ClearUI();
2875		- bigThree.add(scenePanel);
2876	3941	bigThree.add(centralPanel);
	3942	+ bigThree.add(scenePanel);
2877	3943	bigThree.FlushUI();
	3944	+
	3945	+ cameraView.requestFocusInWindow();
2878	3946	} else
2879	3947	if (source == sevenButton)
2880	3948	{
2881	3949	radio.layout = sevenButton;
	3950	+
	3951	+ if (CameraPane.FULLSCREEN)
	3952	+ fullscreenLayout = radio.layout;
2882	3953
2883	3954	// bigThree.remove(scenePanel);
2884	3955	// bigThree.remove(centralPanel);
..	..	@@ -2912,9 +3983,12 @@
2912	3983	bigThree.add(centralPanel);
2913	3984	bigThree.add(XYZPanel);
2914	3985	bigThree.FlushUI();
	3986	+
	3987	+ cameraView.requestFocusInWindow();
2915	3988	} else
2916	3989	if (source == rootButton)
2917	3990	{
	3991	+ Replace();
2918	3992	Object3D obj;
2919	3993	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2920	3994	{
..	..	@@ -2923,31 +3997,50 @@
2923	3997	EditObject(obj);
2924	3998	}
2925	3999
	4000	+ cameraView.requestFocusInWindow();
2926	4001	refreshContents(true);
2927	4002	} else
2928	4003	if (source == closeButton)
2929	4004	{
2930	4005	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	4006	+ if (copy.versionlist != null)
	4007	+ Replace();
	4008	+
2931	4009	cRadio ab;
2932	4010	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2933	4011	{
2934	4012	ab = (cRadio)e.nextElement();
2935		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	4013	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2936	4014	{
	4015	+ // Patch to avoid bug with transparency.
	4016	+ if (!ab.hadMaterial)
	4017	+ {
	4018	+ ab.object.material = null;
	4019	+ }
	4020	+
2937	4021	buttonGroup.remove(ab);
2938	4022	radioPanel.remove(ab);
2939	4023
2940		- ab.GetObject().editWindow = null;
	4024	+ //ab.GetObject().editWindow = null;
	4025	+ ab.GetObject().manipWindow = null;
2941	4026	// ab.GetObject().objectUI = null; // ?????????
2942	4027
2943	4028	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2944	4029	break;
2945	4030	}
2946	4031	}
	4032	+
	4033	+ cameraView.requestFocusInWindow();
2947	4034	refreshContents(true);
2948	4035	} else
2949	4036	if (source == editItem \|\| source == editButton)
2950	4037	{
	4038	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4039	+ {
	4040	+ Object3D child = (Object3D)e.nextElement();
	4041	+ child.pinned = true;
	4042	+ }
	4043	+
2951	4044	EditSelection(false);
2952	4045	} else
2953	4046	if (source == uneditButton)
..	..	@@ -2956,11 +4049,12 @@
2956	4049	{
2957	4050	Object3D child = (Object3D)e.nextElement();
2958	4051	if(child.editWindow != null)
2959		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4052	+ child.pinned = false;
2960	4053	child.CloseUI();
2961	4054	listUI.remove(child);
	4055	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2962	4056
2963		- child.editWindow = null; // ???????????
	4057	+ //child.editWindow = null; // ???????????
2964	4058	}
2965	4059	objEditor.ctrlPanel.FlushUI();
2966	4060	//objEditor.jTree.clearSelection();
..	..	@@ -2973,16 +4067,18 @@
2973	4067	//copy.ClearUI();
2974	4068	for (Object3D obj : listUI)
2975	4069	{
	4070	+ obj.pinned = false;
2976	4071	obj.CloseUI();
2977	4072	}
2978	4073	listUI.clear();
	4074	+ SetPinStates(group.selection.size() > 0);
2979	4075	refreshContents(true);
2980	4076	} else
2981	4077	if (source == allParamsButton)
2982	4078	{
2983	4079	assert(copy == group);
2984	4080
2985		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4081	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2986	4082
2987	4083	for (Object3D obj : listUI)
2988	4084	{
..	..	@@ -3008,6 +4104,9 @@
3008	4104	} else
3009	4105	if(source instanceof cRadio)
3010	4106	{
	4107	+ if (copy.versionlist != null)
	4108	+ Replace();
	4109	+
3011	4110	group.parent = keepparent;
3012	4111	group.attributes = 0;
3013	4112	//group.editWindow = null;
..	..	@@ -3031,6 +4130,7 @@
3031	4130	}
3032	4131
3033	4132	copy = group;
	4133	+
3034	4134	//Globals.theRenderer.object = group;
3035	4135	if(!useclient)
3036	4136	{
..	..	@@ -3046,20 +4146,74 @@
3046	4146	frontView.object = group;
3047	4147	sideView.object = group;
3048	4148	}
3049		- group.editWindow = this;
	4149	+
	4150	+// fix "+" issue
	4151	+ //group.editWindow = this;
	4152	+ group.manipWindow = this;
	4153	+
3050	4154	/*
3051	4155	currentLayout = radio.layout;
3052	4156	if (currentLayout == null)
3053	4157	currentLayout = sevenButton;
3054	4158	*/
3055	4159	radio.layout.doClick();
	4160	+
	4161	+ //assert(copy instanceof Composite);
	4162	+
	4163	+ if (copy.versionlist == null)
	4164	+ {
	4165	+ copy.versionindex = -1;
	4166	+
	4167	+ // Cannot work with loops
	4168	+ // To fix this issue, we first mark all nodes above the root,
	4169	+ // and check if any of these nodes are reachable below the root.
	4170	+ Grafreed.grafreed.universe.TagObjects(copy, true);
	4171	+
	4172	+ if (copy instanceof Composite && copy.versionlist == null && !copy.HasTags())
	4173	+ {
	4174	+ copy.versionlist = new Object3D[100];
	4175	+
	4176	+ //Save(true);
	4177	+ }
	4178	+ else
	4179	+ copy.versionindex = -2;
	4180	+
	4181	+ Grafreed.grafreed.universe.TagObjects(copy, false);
	4182	+ }
	4183	+
	4184	+ SetVersionStates();
	4185	+
	4186	+ ClearUnpinned();
	4187	+
	4188	+ //Grafreed.Assert(group != null);
	4189	+ //Grafreed.Assert(group.selection != null);
	4190	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4191	+ if (group.selection == null \|\| group.selection.size() == 1)
	4192	+ EditSelection(false);
3056	4193	keepparent = group.parent;
3057	4194	// PARENT = NULL or not???
3058	4195	//group.parent = null; // ROOT
3059	4196	//group.attributes = -1;
3060	4197	ResetModel();
	4198	+
	4199	+ cameraView.requestFocusInWindow();
3061	4200	refreshContents(true);
3062		- }
	4201	+ } else if (event.getSource() == editCameraItem)
	4202	+ {
	4203	+ cameraView.ProtectCamera();
	4204	+ cameraView.requestFocusInWindow();
	4205	+ cameraView.repaint();
	4206	+ return;
	4207	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	4208	+ {
	4209	+ cameraView.RevertCamera();
	4210	+ cameraView.requestFocusInWindow();
	4211	+ cameraView.repaint();
	4212	+ return;
	4213	+ // } else if (event.getSource() == textureButton)
	4214	+ // {
	4215	+ // return; // true;
	4216	+ }
3063	4217	else
3064	4218	{
3065	4219	//return super.action(event, arg);
..	..	@@ -3068,7 +4222,6 @@
3068	4222	}
3069	4223
3070	4224	boolean useclient = false;
3071		- cRadio radio;
3072	4225
3073	4226	void ToggleRoot()
3074	4227	{
..	..	@@ -3120,6 +4273,40 @@
3120	4273	refreshContents();
3121	4274	}
3122	4275
	4276	+ void TransformChildren()
	4277	+ {
	4278	+ Object3D obj;
	4279	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4280	+ {
	4281	+ obj = (Object3D)e.nextElement();
	4282	+ obj.KeepTextureMatrices();
	4283	+ obj.TransformChildren();
	4284	+ obj.RestoreTextureMatrices();
	4285	+
	4286	+// if (obj.parent == null)
	4287	+// {
	4288	+// System.out.println("NULL PARENT!");
	4289	+// new Exception().printStackTrace();
	4290	+// }
	4291	+// else
	4292	+// TouchTransform(obj);
	4293	+// //obj.parent.Touch();
	4294	+ }
	4295	+
	4296	+ refreshContents();
	4297	+ }
	4298	+
	4299	+ void TextureRatio(int axis)
	4300	+ {
	4301	+ Object3D obj;
	4302	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4303	+ {
	4304	+ obj = (Object3D)e.nextElement();
	4305	+ obj.TextureRatio(axis);
	4306	+ }
	4307	+
	4308	+ refreshContents();
	4309	+ }
3123	4310
3124	4311	void ResetTransform()
3125	4312	{
..	..	@@ -3136,42 +4323,8 @@
3136	4323	if (obj.toParent == null)
3137	4324	continue;
3138	4325
3139		- if (mask == -1)
3140		- {
3141		- if (obj instanceof Camera) // jan 2014
3142		- {
3143		- LA.matIdentity(obj.toParent);
3144		- LA.matIdentity(obj.fromParent);
3145		- }
3146		- else
3147		- {
3148		- obj.toParent = null; // jan 2014 LA.matIdentity(obj.toParent);
3149		- obj.fromParent = null; // LA.matIdentity(obj.fromParent);
3150		- }
3151		- TouchTransform(obj);
3152		- continue;
3153		- }
3154		- if ((mask&2) != 0) // Scale
3155		- {
3156		- obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
3157		- obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
3158		- obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
3159		- obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
3160		- obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
3161		- obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
3162		- }
3163		- if ((mask&4) != 0) // Rotation
3164		- {
3165		- // ?
3166		- }
3167		- if ((mask&1) != 0) // Translation
3168		- {
3169		- if (obj.toParent != null)
3170		- {
3171		- obj.toParent[3][0] = obj.toParent[3][1] = obj.toParent[3][2] = 0;
3172		- obj.fromParent[3][0] = obj.fromParent[3][1] = obj.fromParent[3][2] = 0;
3173		- }
3174		- }
	4326	+ obj.ResetTransform(mask);
	4327	+
3175	4328	if (obj.parent == null)
3176	4329	{
3177	4330	System.out.println("NULL PARENT!");
..	..	@@ -3232,7 +4385,7 @@
3232	4385	refreshContents();
3233	4386	}
3234	4387
3235		- void ResetCentroid()
	4388	+ void ResetCentroid(boolean full)
3236	4389	{
3237	4390	Object3D obj;
3238	4391	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3247,12 +4400,16 @@
3247	4400	LA.matIdentity(Object3D.mat);
3248	4401	obj.getBounds(minima, maxima, false);
3249	4402	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3250		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	4403	+ if (full)
	4404	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3251	4405	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3252	4406	obj.TransformMesh(Object3D.mat);
	4407	+
3253	4408	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3254		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	4409	+ if (full)
	4410	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3255	4411	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	4412	+
3256	4413	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3257	4414	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3258	4415	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3281,7 +4438,8 @@
3281	4438
3282	4439	int size = obj.MemorySize();
3283	4440
3284		- System.err.println((size/1024) + " KB is the size of " + obj);
	4441	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4442	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3285	4443	}
3286	4444	}
3287	4445	catch (Exception e)
..	..	@@ -3318,9 +4476,9 @@
3318	4476	obj = (Object3D)e.nextElement();
3319	4477
3320	4478	System.out.println("Object is: " + obj);
3321		- GrafreeD.AnalyzeObject(obj);
	4479	+ Grafreed.AnalyzeObject(obj);
3322	4480	System.out.println("Boundary rep: " + obj.bRep);
3323		- GrafreeD.AnalyzeObject(obj.bRep);
	4481	+ Grafreed.AnalyzeObject(obj.bRep);
3324	4482
3325	4483	// System.err.println((size/1024) + " KB is the size of " + obj);
3326	4484	}
..	..	@@ -3362,6 +4520,13 @@
3362	4520	void GenNormals(boolean crease)
3363	4521	{
3364	4522	group.GenNormalsS(crease);
	4523	+
	4524	+ refreshContents();
	4525	+ }
	4526	+
	4527	+ void GenNormalsMESH()
	4528	+ {
	4529	+ group.GenNormalsMeshS();
3365	4530
3366	4531	refreshContents();
3367	4532	}
..	..	@@ -3534,8 +4699,8 @@
3534	4699
3535	4700	void ParseVertices()
3536	4701	{
3537		- boolean epsequal = GrafreeD.epsequal;
3538		- GrafreeD.epsequal = true;
	4702	+ boolean epsequal = Grafreed.epsequal;
	4703	+ Grafreed.epsequal = true;
3539	4704
3540	4705	for (int i=0; i<group.selection.size(); i++)
3541	4706	{
..	..	@@ -3560,7 +4725,7 @@
3560	4725	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3561	4726	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3562	4727
3563		- g.add(GrafreeD.clipboard);
	4728	+ g.add(Grafreed.clipboard);
3564	4729
3565	4730	buffer.add(g);
3566	4731	}
..	..	@@ -3575,7 +4740,7 @@
3575	4740	makeSomething(buffer, i==group.selection.size()-1);
3576	4741	}
3577	4742
3578		- GrafreeD.epsequal = epsequal;
	4743	+ Grafreed.epsequal = epsequal;
3579	4744
3580	4745	refreshContents();
3581	4746	}
..	..	@@ -3593,7 +4758,16 @@
3593	4758	String pigment = Object3D.GetPigment(tex);
3594	4759	//String bump = Object3D.GetBump(tex);
3595	4760
3596		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4761	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4762	+
	4763	+ try
	4764	+ {
	4765	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
	4766	+ }
	4767	+ catch (Exception e)
	4768	+ {
	4769	+ System.err.println("FAIL: " + node);
	4770	+ }
3597	4771
3598	4772	double s = v.s;
3599	4773
..	..	@@ -3658,6 +4832,12 @@
3658	4832	for (int i=0; i<group.selection.size(); i++)
3659	4833	{
3660	4834	Object3D obj = group.selection.get(i);
	4835	+
	4836	+ if (obj.toParent == null)
	4837	+ {
	4838	+ obj.toParent = LA.newMatrix();
	4839	+ obj.fromParent = LA.newMatrix();
	4840	+ }
3661	4841
3662	4842	LA.matTranslate(obj.toParent, i * scale, 0, 0);
3663	4843	LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
..	..	@@ -3725,7 +4905,7 @@
3725	4905	return;
3726	4906
3727	4907	Object3D poses = group.selection.get(0);
3728		- Object3D ref = GrafreeD.clipboard.get(0);
	4908	+ Object3D ref = Grafreed.clipboard.get(0);
3729	4909
3730	4910	Object3D newgroup = new Object3D("Po:" + poses.name);
3731	4911
..	..	@@ -3919,9 +5099,9 @@
3919	5099
3920	5100	void ClipMesh()
3921	5101	{
3922		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	5102	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3923	5103	{
3924		- Object3D content = GrafreeD.clipboard.get(0);
	5104	+ Object3D content = Grafreed.clipboard.get(0);
3925	5105
3926	5106	if (content instanceof cGroup && ((cGroup)content).transientlink )
3927	5107	content = ((cGroup)content).get(0);
..	..	@@ -3930,7 +5110,7 @@
3930	5110	// {
3931	5111	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3932	5112	// }
3933		- group.selection.ClipMesh(GrafreeD.clipboard);
	5113	+ group.selection.ClipMesh(Grafreed.clipboard);
3934	5114	}
3935	5115	// group.selection.ClipMesh(GrafreeD.clipboard);
3936	5116	System.out.println("DONE.");
..	..	@@ -3947,6 +5127,12 @@
3947	5127	void ClearMaterials()
3948	5128	{
3949	5129	group.selection.ClearMaterials();
	5130	+ refreshContents();
	5131	+ }
	5132	+
	5133	+ void ClearVersions()
	5134	+ {
	5135	+ group.selection.ClearVersions();
3950	5136	refreshContents();
3951	5137	}
3952	5138
..	..	@@ -3977,6 +5163,18 @@
3977	5163	void MarkLeaves(boolean hide)
3978	5164	{
3979	5165	group.selection.MarkLeaves(hide);
	5166	+ refreshContents();
	5167	+ }
	5168	+
	5169	+ void RewindLeaves(boolean hide)
	5170	+ {
	5171	+ group.selection.RewindLeaves(hide);
	5172	+ refreshContents();
	5173	+ }
	5174	+
	5175	+ void RandomLeaves(boolean hide)
	5176	+ {
	5177	+ group.selection.RandomLeaves(hide);
3980	5178	refreshContents();
3981	5179	}
3982	5180
..	..	@@ -4051,28 +5249,25 @@
4051	5249	// }
4052	5250	// }
4053	5251
4054		- static boolean allparams = true;
4055		-
4056		- static Vector<Object3D> listUI = new Vector<Object3D>();
4057		-
4058	5252	void EditSelection(boolean newWindow)
4059	5253	{
	5254	+ if (group.selection == null)
	5255	+ {
	5256	+ EditElement(group, newWindow); // ? new
	5257	+ return;
	5258	+ }
	5259	+
4060	5260	// aConstraints.gridy = 0;
4061	5261	for (int i=0; i<group.selection.size(); i++)
4062	5262	{
4063	5263	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4064	5264	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4065		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5265	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4066	5266
4067	5267	Object3D elem = (Object3D)group.selection.elementAt(i);
4068		- if(elem != group)
	5268	+ if(elem != group \|\| !newWindow)
4069	5269	{
4070		- // if (!(elem instanceof Composite))
4071		- // newWindow = false;
4072		- listUI.add(elem);
4073		- elem.openEditWindow(this, newWindow); //, false);
4074		- System.out.println("edit : " + elem);
4075		- elem.editWindow.refreshContents(true); // ? new
	5270	+ EditElement(elem, newWindow); // ? new
4076	5271	}
4077	5272	}
4078	5273	}
..	..	@@ -4135,9 +5330,7 @@
4135	5330
4136	5331	freezemodel = false;
4137	5332	}
4138		-
4139		- boolean flashIt = true;
4140		-
	5333	+
4141	5334	public void valueChanged(TreeSelectionEvent e)
4142	5335	//public boolean handleEvent(Event event)
4143	5336	{
..	..	@@ -4147,7 +5340,8 @@
4147	5340	//new Exception().printStackTrace();
4148	5341
4149	5342	freezemodel = true;
4150		-
	5343	+ ClearUnpinned();
	5344	+
4151	5345	/**/
4152	5346	//switch (event.id)
4153	5347	{
..	..	@@ -4155,7 +5349,6 @@
4155	5349	//case 702: // Event.LIST_DESELECT
4156	5350	group.deselectAll();
4157	5351	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4158		- objEditor.ClearInfo(); // .GetMaterial());
4159	5352	if (tps != null)
4160	5353	{
4161	5354	for (int i=0; i < tps.length; i++)
..	..	@@ -4164,10 +5357,8 @@
4164	5357
4165	5358	//if (child.parent != null)
4166	5359	//child.parent.addSelectee(child);
	5360	+ objEditor.SetMaterial(child);
4167	5361	group.addSelectee(child);
4168		- objEditor.SetMaterial(child); // .GetMaterial());
4169		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4170		- System.err.println("info : " + child.GetPath());
4171	5362	}
4172	5363	}
4173	5364	// else
..	..	@@ -4177,20 +5368,28 @@
4177	5368	// System.err.println("info : " + group.GetPath());
4178	5369	// }
4179	5370
4180		- objEditor.SetText(); // jan 2014
4181		-
4182		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	5371	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4183	5372	CameraPane.flash = true;
4184	5373
4185		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5374	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4186	5375	// a camera
4187	5376	{
4188		- CameraPane.camerachangeframe = 0; // don't refuse it
4189		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5377	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5378	+ {
	5379	+ CameraPane.camerachangeframe = 0; // don't refuse it
	5380	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5381	+ }
4190	5382	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4191	5383	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4192	5384	}
4193	5385
	5386	+ if (tps != null && tps.length == 1)
	5387	+ {
	5388	+ EditSelection(false);
	5389	+ }
	5390	+
	5391	+ SetPinStates(tps != null && tps.length > 0);
	5392	+
4194	5393	refreshContents();
4195	5394	//return true;
4196	5395	}
..	..	@@ -4199,6 +5398,53 @@
4199	5398
4200	5399	freezemodel = false;
4201	5400	}
	5401	+
	5402	+ void SetPinStates(boolean enabled)
	5403	+ {
	5404	+ editButton.setEnabled(enabled);
	5405	+ uneditButton.setEnabled(enabled);
	5406	+ //unselectButton.setEnabled(enabled);
	5407	+ flashSelectionButton.setEnabled(enabled);
	5408	+
	5409	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5410	+
	5411	+ boolean allComposites = true;
	5412	+
	5413	+ if (group.selection != null)
	5414	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5415	+ {
	5416	+ Object next = e.nextElement();
	5417	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5418	+ {
	5419	+ allComposites = false;
	5420	+ break;
	5421	+ }
	5422	+ }
	5423	+
	5424	+ rootButton.setEnabled(true); // allComposites);
	5425	+ }
	5426	+
	5427	+ void refreshContents(boolean cp)
	5428	+ {
	5429	+ if (Globals.ADVANCED)
	5430	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5431	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5432	+ {
	5433	+ objEditor.ClearInfo(); // .GetMaterial());
	5434	+
	5435	+ for (int i=0; i < group.selection.Size(); i++)
	5436	+ {
	5437	+ Object3D child = (Object3D) group.selection.get(i);
	5438	+
	5439	+ objEditor.AddInfo(child, this, true);
	5440	+// System.err.println("info : " + child.GetPath());
	5441	+ }
	5442	+
	5443	+ objEditor.SetText(); // jan 2014
	5444	+ }
	5445	+
	5446	+ super.refreshContents(cp);
	5447	+ }
4202	5448
4203	5449	void linkSomething(Object3D thing)
4204	5450	{
..	..	@@ -4270,16 +5516,19 @@
4270	5516	{
4271	5517	if (group.selection.isEmpty())
4272	5518	return;
4273		- GrafreeD.clipboardIsTempGroup = false;
	5519	+
	5520	+ Grafreed.clipboardIsTempGroup = false;
4274	5521	Composite tGroup = null;
4275	5522	if (group.selection.size() > 0) // 1)
4276	5523	{
4277	5524	tGroup = new cGroup();
4278		- GrafreeD.clipboardIsTempGroup = true;
	5525	+ Grafreed.clipboardIsTempGroup = true;
4279	5526	}
4280	5527
4281	5528	if (cut)
4282	5529	{
	5530	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5531	+// Save();
4283	5532	//int indices[] = jList.getSelectedIndices();
4284	5533	//for (int i = indices.length - 1; i >= 0; i--)
4285	5534	//jList.remove(indices[i]);
..	..	@@ -4315,16 +5564,16 @@
4315	5564	//System.out.println("cut " + child);
4316	5565	//System.out.println("parent = " + child.parent);
4317	5566	// tmp.addChild(child);
4318		- if (GrafreeD.clipboardIsTempGroup)
	5567	+ if (Grafreed.clipboardIsTempGroup)
4319	5568	tGroup.add/Child/(tmp);
4320	5569	else
4321		- GrafreeD.clipboard = tmp;
	5570	+ Grafreed.clipboard = tmp;
4322	5571	}
4323	5572	else
4324		- if (GrafreeD.clipboardIsTempGroup)
	5573	+ if (Grafreed.clipboardIsTempGroup)
4325	5574	tGroup.add/Child/(child);
4326	5575	else
4327		- GrafreeD.clipboard = child;
	5576	+ Grafreed.clipboard = child;
4328	5577	}
4329	5578
4330	5579	//ResetModel();
..	..	@@ -4356,21 +5605,23 @@
4356	5605	//System.out.println("cut " + elem);
4357	5606	//System.out.println("parent = " + elem.parent);
4358	5607	// tmp.addChild(elem);
4359		- if (GrafreeD.clipboardIsTempGroup)
	5608	+ if (Grafreed.clipboardIsTempGroup)
4360	5609	tGroup.add/Child/(tmp);
4361	5610	else
4362		- GrafreeD.clipboard = tmp;
	5611	+ Grafreed.clipboard = tmp;
4363	5612	}
4364	5613	else
4365		- if (GrafreeD.clipboardIsTempGroup)
	5614	+ if (Grafreed.clipboardIsTempGroup)
4366	5615	tGroup.add/Child/(child);
4367	5616	else
4368		- GrafreeD.clipboard = child;
	5617	+ Grafreed.clipboard = child;
4369	5618	}
4370	5619
4371	5620	}
4372		- if (GrafreeD.clipboardIsTempGroup)
4373		- GrafreeD.clipboard = tGroup;
	5621	+
	5622	+ if (Grafreed.clipboardIsTempGroup)
	5623	+ Grafreed.clipboard = tGroup;
	5624	+
4374	5625	if (cut)
4375	5626	{
4376	5627	ResetModel();
..	..	@@ -4380,11 +5631,15 @@
4380	5631
4381	5632	void paste(boolean expand)
4382	5633	{
	5634	+ if (Globals.REPLACEONMAKE)
	5635	+ Save();
	5636	+ boolean keep = Globals.REPLACEONMAKE;
	5637	+ Globals.REPLACEONMAKE = false;
4383	5638	// if (GrafreeD.clipboard == null)
4384	5639	// return;
4385	5640	boolean first = true;
4386	5641
4387		- if (GrafreeD.clipboardIsTempGroup)
	5642	+ if (Grafreed.clipboardIsTempGroup)
4388	5643	{
4389	5644	Composite temp;
4390	5645
..	..	@@ -4395,7 +5650,7 @@
4395	5650	temp = (Composite)Applet3D.clipboard.deepCopy();
4396	5651	*/
4397	5652	Object3D elem;
4398		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5653	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4399	5654	{
4400	5655	Object3D child = (Object3D)e.nextElement();
4401	5656
..	..	@@ -4429,16 +5684,17 @@
4429	5684	//Object3D cb = Applet3D.clipboard;
4430	5685	//temp.addChild(cb);
4431	5686	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4432		- assert(GrafreeD.clipboard.parent == null);
4433		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4434		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4435		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4436		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	5687	+ assert(Grafreed.clipboard.parent == null);
	5688	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5689	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5690	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5691	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4437	5692	else
4438		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4439		- GrafreeD.clipboard.get(0).parent = keepparent;
	5693	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5694	+ Grafreed.clipboard.get(0).parent = keepparent;
4440	5695	}
4441	5696
	5697	+ Globals.REPLACEONMAKE = keep;
4442	5698	ResetModel();
4443	5699	refreshContents();
4444	5700	}
..	..	@@ -4485,9 +5741,9 @@
4485	5741	{
4486	5742	boolean first = true;
4487	5743
4488		- if (GrafreeD.clipboardIsTempGroup)
	5744	+ if (Grafreed.clipboardIsTempGroup)
4489	5745	{
4490		- Composite temp = (Composite)GrafreeD.clipboard;
	5746	+ Composite temp = (Composite)Grafreed.clipboard;
4491	5747	Object3D copy;
4492	5748	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4493	5749	{
..	..	@@ -4497,7 +5753,7 @@
4497	5753	}
4498	5754	} else
4499	5755	{
4500		- linkSomething(GrafreeD.clipboard); //.get(0));
	5756	+ linkSomething(Grafreed.clipboard); //.get(0));
4501	5757	}
4502	5758	}
4503	5759	}
..	..	@@ -4574,6 +5830,10 @@
4574	5830
4575	5831	void group(Object3D csg, boolean grab)
4576	5832	{
	5833	+ if (Globals.REPLACEONMAKE)
	5834	+ Save();
	5835	+ boolean keep = Globals.REPLACEONMAKE;
	5836	+ Globals.REPLACEONMAKE = false;
4577	5837	if (//false) // why??
4578	5838	!group.selection.isEmpty())
4579	5839	{
..	..	@@ -4687,10 +5947,15 @@
4687	5947	//node.add(csg);
4688	5948	//makeSomething(node);
4689	5949	makeSomething(csg);
	5950	+ Globals.REPLACEONMAKE = keep;
4690	5951	}
4691	5952
4692	5953	void Ungroup(Object3D g)
4693	5954	{
	5955	+ if (Globals.REPLACEONMAKE)
	5956	+ Save();
	5957	+ boolean keep = Globals.REPLACEONMAKE;
	5958	+ Globals.REPLACEONMAKE = false;
4694	5959	if (g instanceof HiddenObject)
4695	5960	{
4696	5961	HiddenObject h = (HiddenObject) g;
..	..	@@ -4707,6 +5972,7 @@
4707	5972	objEditor.makeSomething(g.get(i), false);
4708	5973	}
4709	5974	}
	5975	+ Globals.REPLACEONMAKE = keep;
4710	5976	}
4711	5977
4712	5978	void ungroup()
..	..	@@ -4902,21 +6168,6 @@
4902	6168	}
4903	6169	*/
4904	6170
4905		- void ImportGFD()
4906		- {
4907		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4908		- browser.show();
4909		- String filename = browser.getFile();
4910		- if (filename != null && filename.length() > 0)
4911		- {
4912		- String fullname = browser.getDirectory() + filename;
4913		-
4914		- //Object3D readobj =
4915		- objEditor.ReadGFD(fullname, objEditor);
4916		- //makeSomething(readobj);
4917		- }
4918		- }
4919		-
4920	6171	/*
4921	6172	public void Callback(Object obj)
4922	6173	{
..	..	@@ -4940,26 +6191,9 @@
4940	6191	}
4941	6192	*/
4942	6193
4943		- void ImportVRMLX3D()
4944		- {
4945		- if (GrafreeD.standAlone)
4946		- {
4947		- /**/
4948		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4949		- browser.show();
4950		- String filename = browser.getFile();
4951		- if (filename != null && filename.length() > 0)
4952		- {
4953		- String fullname = browser.getDirectory() + filename;
4954		- LoadVRMLX3D(fullname);
4955		- }
4956		- /**/
4957		- }
4958		- }
4959		-
4960	6194	String GetFile(String dialogName)
4961	6195	{
4962		- if (GrafreeD.standAlone)
	6196	+ if (Grafreed.standAlone)
4963	6197	{
4964	6198	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4965	6199	browser.show();
..	..	@@ -5027,7 +6261,43 @@
5027	6261	cButton clearpanelButton;
5028	6262	cButton unselectButton;
5029	6263
	6264	+ cButton restoreCameraButton;
	6265	+
5030	6266	cButton oneStepButton;
	6267	+
	6268	+ cButton groupButton;
	6269	+ cButton ungroupButton;
	6270	+ cButton compositeButton;
	6271	+ cButton switchButton;
	6272	+ cButton loopButton;
	6273	+ cButton textureButton;
	6274	+
	6275	+ cButton skybox1Button;
	6276	+ cButton skybox2Button;
	6277	+ cButton skybox3Button;
	6278	+ cButton skybox4Button;
	6279	+ cButton skybox5Button;
	6280	+ cButton skybox6Button;
	6281	+ cButton skybox7Button;
	6282	+
	6283	+ cButton skybox11Button;
	6284	+ cButton skybox12Button;
	6285	+ cButton skybox13Button;
	6286	+ cButton skybox14Button;
	6287	+ cButton skybox15Button;
	6288	+ cButton skybox16Button;
	6289	+ cButton skybox17Button;
	6290	+
	6291	+ cButton gridButton;
	6292	+ cButton boxButton;
	6293	+ cButton sphereButton;
	6294	+ cButton coneButton;
	6295	+ cButton torusButton;
	6296	+ cButton superButton;
	6297	+ cButton kleinButton;
	6298	+ cButton particlesButton;
	6299	+ cButton overlayButton;
	6300	+ cButton lightButton;
5031	6301
5032	6302	cButton screenfitButton;
5033	6303	cButton screenfitpointButton;
..	..	@@ -5040,14 +6310,6 @@
5040	6310
5041	6311	cButton setsupportButton;
5042	6312
5043		- cButton twoButton;
5044		- cButton sixButton;
5045		- cButton threeButton;
5046		- cButton sevenButton;
5047		- cButton fourButton; // full panel
5048		- cButton oneButton; // full XYZ
5049		- //cButton currentLayout;
5050		-
5051	6313	//
5052	6314	//Composite
5053	6315	Object3D // to do !!
..	..	@@ -5057,10 +6319,12 @@
5057	6319	//JTree jTree;
5058	6320	private MenuItem lookAtItem;
5059	6321	private MenuItem lookFromItem;
5060		- private MenuItem switchItem;
5061		- private MenuItem cutItem;
5062		- private MenuItem duplicateItem;
5063		- private MenuItem cloneItem;
	6322	+ private MenuItem switchViewItem;
	6323	+ private JMenuItem cutItem;
	6324	+ private MenuItem undoItem;
	6325	+ private MenuItem redoItem;
	6326	+ private JMenuItem duplicateItem;
	6327	+ private JMenuItem cloneItem;
5064	6328	private MenuItem cloneSupportItem;
5065	6329	private MenuItem overwriteGeoItem;
5066	6330	private MenuItem overwriteMatItem;
..	..	@@ -5072,7 +6336,7 @@
5072	6336	private MenuItem linkverticesItem;
5073	6337	private MenuItem relinkverticesItem;
5074	6338	private MenuItem setMasterItem;
5075		- private MenuItem resetMeshItem;
	6339	+ private MenuItem resetAllItem;
5076	6340	private MenuItem stepAllItem;
5077	6341	private MenuItem revertMeshItem;
5078	6342	private MenuItem poseMeshItem;
..	..	@@ -5081,13 +6345,13 @@
5081	6345	private MenuItem cloneGeometriesItem;
5082	6346	private MenuItem shareGeometriesItem;
5083	6347	private MenuItem mergeGeometriesItem;
5084		- private MenuItem copyItem;
	6348	+ private JMenuItem copyItem;
5085	6349	private MenuItem pasteItem;
5086		- private MenuItem pasteIntoItem;
5087		- private MenuItem pasteLinkItem;
5088		- private MenuItem pasteCloneItem;
5089		- private MenuItem pasteExpandItem;
5090		- private MenuItem clearItem;
	6350	+ private JMenuItem pasteIntoItem;
	6351	+ private JMenuItem pasteLinkItem;
	6352	+ private JMenuItem pasteCloneItem;
	6353	+ private JMenuItem pasteExpandItem;
	6354	+ private JMenuItem deleteItem;
5091	6355	private MenuItem clearAllItem;
5092	6356	private MenuItem genUVItem;
5093	6357	private MenuItem genNormalsMESHItem;
..	..	@@ -5113,6 +6377,7 @@
5113	6377	private MenuItem clipMeshItem;
5114	6378	private MenuItem smoothMeshItem;
5115	6379	private MenuItem clearMaterialsItem;
	6380	+ private MenuItem clearVersionsItem;
5116	6381
5117	6382	private MenuItem liveleavesItem;
5118	6383	private MenuItem unliveleavesItem;
..	..	@@ -5122,6 +6387,10 @@
5122	6387	private MenuItem showleavesItem;
5123	6388	private MenuItem markleavesItem;
5124	6389	private MenuItem unmarkleavesItem;
	6390	+ private MenuItem rewindleavesItem;
	6391	+ private MenuItem unrewindleavesItem;
	6392	+ private MenuItem randomleavesItem;
	6393	+ private MenuItem unrandomleavesItem;
5125	6394
5126	6395	private MenuItem flipVItem;
5127	6396	private MenuItem unflipVItem;
..	..	@@ -5132,16 +6401,21 @@
5132	6401	private MenuItem maxTexturesItem;
5133	6402	private MenuItem panoTexturesItem;
5134	6403
	6404	+ private MenuItem textureRatioRItem;
	6405	+ private MenuItem textureRatioGItem;
	6406	+ private MenuItem textureRatioBItem;
5135	6407	private MenuItem resetCentroidItem;
5136		- private MenuItem transformgeometryItem;
	6408	+ private MenuItem resetCentroidXZItem;
5137	6409	private MenuItem resetTransformItem;
	6410	+ private MenuItem transformGeometryItem;
	6411	+ private MenuItem transformChildrenItem;
5138	6412	private MenuItem hideItem;
5139		- private MenuItem grabItem;
	6413	+ private JMenuItem grabItem;
5140	6414	private MenuItem backItem;
5141	6415	private MenuItem frontItem;
5142	6416	private MenuItem cameraItem;
5143	6417	private MenuItem compositeItem;
5144		- private MenuItem randomItem;
	6418	+ private MenuItem switchItem;
5145	6419	private MenuItem physicsItem;
5146	6420	private MenuItem frameselectorItem;
5147	6421	private MenuItem scriptNodeItem;
..	..	@@ -5149,7 +6423,7 @@
5149	6423	private MenuItem switchTransfoItem;
5150	6424	private MenuItem morphItem;
5151	6425	private MenuItem linkerItem;
5152		- private MenuItem ungroupItem;
	6426	+ private JMenuItem ungroupItem;
5153	6427	private MenuItem editItem;
5154	6428	private MenuItem openWindowItem;
5155	6429	private MenuItem editLeafItem;
..	..	@@ -5165,6 +6439,8 @@
5165	6439	private MenuItem attachBumpItem;
5166	6440	private MenuItem detachBumpItem;
5167	6441	private MenuItem pigmentBumpItem;
	6442	+ private MenuItem embedTexturesItem;
	6443	+ private MenuItem deEmbedTexturesItem;
5168	6444
5169	6445	private MenuItem particleItem;
5170	6446	private MenuItem ragdollItem;
..	..	@@ -5203,11 +6479,6 @@
5203	6479	private MenuItem doubleItem;
5204	6480	private MenuItem tripleItem;
5205	6481
5206		- private MenuItem importGFDItem;
5207		- private MenuItem importVRMLX3DItem;
5208		- private MenuItem import3DSItem;
5209		- private MenuItem importOBJItem;
5210		-
5211	6482	private MenuItem computeAOItem;
5212	6483	private MenuItem recompileItem;
5213	6484	private MenuItem editScriptItem;
..	..	@@ -5217,4 +6488,8 @@
5217	6488	private MenuItem analyzeItem;
5218	6489	private MenuItem dumpItem;
5219	6490	//boolean freezemodel = false;
	6491	+
	6492	+ Menu cameraMenu;
	6493	+ MenuItem editCameraItem;
	6494	+ MenuItem restoreCameraItem;
5220	6495	}