~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,57 +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		- cloneItem = menu.add(new MenuItem("Clone"));
	545	+
	546	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
175	547	cloneItem.addActionListener(this);
176		- if (Globals.ADVANCED)
	548	+ //if (Globals.ADVANCED)
177	549	{
178	550	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
179	551	cloneSupportItem.addActionListener(this);
180	552	}
	553	+ oe.jTree.popup.addSeparator();
181	554	menu.add("-");
182		- cutItem = menu.add(new MenuItem("Cut"));
	555	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
183	556	cutItem.addActionListener(this);
184		- copyItem = menu.add(new MenuItem("Copy"));
	557	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
185	558	copyItem.addActionListener(this);
186	559	pasteItem = menu.add(new MenuItem("Paste"));
187	560	pasteItem.addActionListener(this);
188		- menu.add("-");
189	561
190		- menu.add("-");
191		- pasteIntoItem = menu.add(new MenuItem("Paste into"));
	562	+ oe.jTree.popup.addSeparator();
	563	+ //menu.add("-");
	564	+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
192	565	pasteIntoItem.addActionListener(this);
193		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	566	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
194	567	pasteLinkItem.addActionListener(this);
195		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	568	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
196	569	pasteCloneItem.addActionListener(this);
197		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	570	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
198	571	// pasteExpandItem.addActionListener(this);
199		- menu.add("-");
200		- clearItem = menu.add(new MenuItem("Clear"));
201		- clearItem.addActionListener(this);
	572	+ //menu.add("-");
	573	+ oe.jTree.popup.addSeparator();
202	574
203	575	if (Globals.ADVANCED)
204	576	{
..	..	@@ -206,14 +578,95 @@
206	578	clearAllItem = menu.add(new MenuItem("Clear All"));
207	579	clearAllItem.addActionListener(this);
208	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());
209	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	+
210	667	oe.menuBar.add(menu = new Menu("Setting"));
211	668	if (Globals.ADVANCED)
212	669	{
213		- resetMeshItem = menu.add(new MenuItem("Reset All"));
214		- resetMeshItem.addActionListener(this);
215		- stepAllItem = menu.add(new MenuItem("Step All"));
216		- stepAllItem.addActionListener(this);
217	670	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
218	671	revertMeshItem.addActionListener(this);
219	672	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
..	..	@@ -252,22 +705,37 @@
252	705	setMasterItem.addActionListener(this);
253	706	}
254	707
255		- oe.menuBar.add(menu = new Menu("Group"));
256		- grabItem = menu.add(new MenuItem("Grab"));
257		- grabItem.addActionListener(this);
	708	+ oe.menuBar.add(menu = new Menu("Order"));
	709	+
258	710	backItem = menu.add(new MenuItem("Back"));
259	711	backItem.addActionListener(this);
260	712	frontItem = menu.add(new MenuItem("Front"));
261	713	frontItem.addActionListener(this);
262		- compositeItem = menu.add(new MenuItem("Composite"));
263		- 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	+ {
264	722	hideItem = menu.add(new MenuItem("Hidden Group"));
265	723	hideItem.addActionListener(this);
266		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	724	+ }
	725	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
267	726	ungroupItem.addActionListener(this);
268		- menu.add("-");
269		- randomItem = menu.add(new MenuItem("Switch node"));
270		- 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	+ {
271	739	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
272	740	switchGeoItem.addActionListener(this);
273	741	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -275,8 +743,6 @@
275	743	morphItem = menu.add(new MenuItem("Morph Group"));
276	744	morphItem.addActionListener(this);
277	745
278		- if (Globals.ADVANCED)
279		- {
280	746	menu.add("-");
281	747	physicsItem = menu.add(new MenuItem("Physics"));
282	748	physicsItem.addActionListener(this);
..	..	@@ -284,30 +750,29 @@
284	750	frameselectorItem.addActionListener(this);
285	751	scriptNodeItem = menu.add(new MenuItem("Script Node"));
286	752	scriptNodeItem.addActionListener(this);
287		- cameraItem = menu.add(new MenuItem("Camera"));
288		- cameraItem.addActionListener(this);
289	753	}
290	754
291	755	oe.menuBar.add(menu = new Menu("Object"));
292		- textureItem = menu.add(new MenuItem("Texture"));
293		- textureItem.addActionListener(this);
	756	+// textureItem = menu.add(new MenuItem("Texture"));
	757	+// textureItem.addActionListener(this);
294	758	billboardItem = menu.add(new MenuItem("Billboard"));
295	759	billboardItem.addActionListener(this);
296	760	csgItem = menu.add(new MenuItem("CSG"));
297	761	csgItem.addActionListener(this);
298		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	762	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
299	763	shadowXItem.addActionListener(this);
300		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	764	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
301	765	shadowYItem.addActionListener(this);
302		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	766	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
303	767	shadowZItem.addActionListener(this);
	768	+ attributeItem = menu.add(new MenuItem("Attribute"));
	769	+ attributeItem.addActionListener(this);
	770	+
304	771	if (Globals.ADVANCED)
305	772	{
306	773	menu.add("-");
307	774	linkerItem = menu.add(new MenuItem("Linker"));
308	775	linkerItem.addActionListener(this);
309		- attributeItem = menu.add(new MenuItem("Attribute"));
310		- attributeItem.addActionListener(this);
311	776	templateItem = menu.add(new MenuItem("Template"));
312	777	templateItem.addActionListener(this);
313	778	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -318,8 +783,12 @@
318	783	resetTransformItem.addActionListener(this);
319	784	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
320	785	resetCentroidItem.addActionListener(this);
321		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
322		- transformgeometryItem.addActionListener(this);
	786	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	787	+ resetCentroidXZItem.addActionListener(this);
	788	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	789	+ transformGeometryItem.addActionListener(this);
	790	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	791	+ transformChildrenItem.addActionListener(this);
323	792
324	793	oe.menuBar.add(menu = new Menu("Geometry"));
325	794	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -332,7 +801,7 @@
332	801	genNormalsMESHItem.addActionListener(this);
333	802	if (Globals.ADVANCED)
334	803	{
335		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	804	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
336	805	genNormalsMINEItem.addActionListener(this);
337	806	}
338	807	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -368,6 +837,10 @@
368	837	oe.menuBar.add(menu = new Menu("Attributes"));
369	838	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
370	839	clearMaterialsItem.addActionListener(this);
	840	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	841	+ resetAllItem.addActionListener(this);
	842	+ stepAllItem = menu.add(new MenuItem("Step All"));
	843	+ stepAllItem.addActionListener(this);
371	844	menu.add("-");
372	845	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
373	846	liveleavesItem.addActionListener(this);
..	..	@@ -384,10 +857,18 @@
384	857	hideleavesItem.addActionListener(this);
385	858	showleavesItem = menu.add(new MenuItem("Show Leaves"));
386	859	showleavesItem.addActionListener(this);
387		- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
	860	+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
388	861	markleavesItem.addActionListener(this);
389		- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
	862	+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
390	863	unmarkleavesItem.addActionListener(this);
	864	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	865	+ rewindleavesItem.addActionListener(this);
	866	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	867	+ unrewindleavesItem.addActionListener(this);
	868	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	869	+ randomleavesItem.addActionListener(this);
	870	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	871	+ unrandomleavesItem.addActionListener(this);
391	872	menu.add("-");
392	873	flipVItem = menu.add(new MenuItem("Flip V"));
393	874	flipVItem.addActionListener(this);
..	..	@@ -413,55 +894,135 @@
413	894	attachBumpItem.addActionListener(this);
414	895	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
415	896	pigmentBumpItem.addActionListener(this);
	897	+ //embedTexturesItem
416	898	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
417	899	detachPigmentItem.addActionListener(this);
418	900	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
419	901	detachBumpItem.addActionListener(this);
	902	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	903	+ embedTexturesItem.addActionListener(this);
	904	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	905	+ deEmbedTexturesItem.addActionListener(this);
420	906	menu.add("-");
421	907	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
422	908	sortbysizeItem.addActionListener(this);
423	909	sortbynameItem = menu.add(new MenuItem("Sort by name"));
424	910	sortbynameItem.addActionListener(this);
	911	+ menu.add("-");
	912	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	913	+ shareGeometriesItem.addActionListener(this);
	914	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	915	+ mergeGeometriesItem.addActionListener(this);
	916	+ menu.add("-");
	917	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	918	+ editLeafItem.addActionListener(this);
425	919	if (Globals.ADVANCED)
426	920	{
427		- menu.add("-");
	921	+ // Pretty much the same as duplicate and clone.
428	922	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
429	923	extractGeometriesItem.addActionListener(this);
430	924	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
431	925	cloneGeometriesItem.addActionListener(this);
432		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
433		- shareGeometriesItem.addActionListener(this);
434		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
435		- mergeGeometriesItem.addActionListener(this);
436	926	}
437	927
438	928	oe.menuBar.add(menu = new Menu("Insert"));
439	929	buildCreateMenu(menu);
440	930
441		- oe.menuBar.add(menu = new Menu("Include"));
442		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
443		- importGFDItem.addActionListener(this);
444		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
445		- importVRMLX3DItem.addActionListener(this);
446		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
447		- importOBJItem.addActionListener(this);
448		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
449		- import3DSItem.addActionListener(this);
450		-
451	931	oe.menuBar.add(menu = new Menu("Tools"));
452	932	buildToolsMenu(menu);
453	933	}
454	934
	935	+ JTabbedPane resourcecontainer;
	936	+ cGridBag currenttab;
	937	+ //boolean added; // patch for jar
	938	+
	939	+ int totalcount = 0;
	940	+
	941	+ int tabcount = 0;
	942	+ int colcount = 0;
	943	+ int rowcount = 0;
	944	+ int texturecount = 0;
	945	+
	946	+ int columns = 5;
	947	+ int rows = 7;
	948	+
	949	+ public void ResourceCallBack(String[] path)
	950	+ {
	951	+// for (int i = 0; i < path.length; i++)
	952	+// System.out.print(path[i] + "/");
	953	+// System.out.println();
	954	+
	955	+ if (//rowcount == 0 \|\|
	956	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	957	+ {
	958	+ currenttab = new cGridBag();
	959	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	960	+ currenttab.setName(tabname);
	961	+ //added = false;
	962	+ resourcecontainer.add(currenttab);
	963	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	964	+ rowcount = 1;
	965	+ colcount = 0;
	966	+ texturecount = 0;
	967	+ }
	968	+
	969	+ if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") \|\| path[2].toLowerCase().endsWith(".png")))
	970	+ {
	971	+ //if (!added)
	972	+ {
	973	+ //added = true;
	974	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	975	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	976	+ }
	977	+
	978	+ AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
	979	+ totalcount++;
	980	+
	981	+ if (++colcount >= columns)
	982	+ {
	983	+ colcount = 0;
	984	+ currenttab.Return();
	985	+
	986	+ if (rowcount++ >= rows)
	987	+ {
	988	+ rowcount = 0;
	989	+ }
	990	+ }
	991	+ }
	992	+ else
	993	+ {
	994	+// if (!path[path.length-1].equals("icons"))
	995	+// resourcecontainer.Return();
	996	+ }
	997	+ }
	998	+
	999	+ void CreateTexturePanel(cGridBag container)
	1000	+ {
	1001	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	1002	+ container.add(resourcecontainer);
	1003	+
	1004	+ Grafreed.ParseResources("textures", this);
	1005	+
	1006	+ // 935. System.out.println("Total = " + totalcount);
	1007	+ }
	1008	+
455	1009	void SetupUI2(ObjEditor oe)
456	1010	{
	1011	+ // June 2019
	1012	+ if (oe == null)
	1013	+ {
	1014	+ //super.SetupUI2(this);
	1015	+ //return;
	1016	+ }
	1017	+
	1018	+ if (copy != group)
	1019	+ {
	1020	+ //super.SetupUI2(this);
	1021	+ }
	1022	+
457	1023	//new Exception().printStackTrace();
458	1024
459	1025	oe.radioPanel = new JPanel(new GridBagLayout());
460		- oe.aConstraints.weightx = 1;
461		- oe.aConstraints.weighty = 0;
462		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
463		- oe.aConstraints.gridwidth = 100;
464		- oe.aConstraints.gridheight = 1;
465	1026	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
466	1027
467	1028	oe.buttonGroup = new ButtonGroup();
..	..	@@ -482,97 +1043,268 @@
482	1043	oe.radioPanel.add(dummyButton);
483	1044	oe.buttonGroup.add(dummyButton);
484	1045	*/
	1046	+ cGridBag versionManagerPanel = new cGridBag();
	1047	+
	1048	+ versionManagerPanel.preferredHeight = 4;
	1049	+
485	1050	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
486	1051
487		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
488		- liveCB.setToolTipText("Enabled animation");
489		- liveCB.addItemListener(this);
	1052	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1053	+ //minButton.setToolTipText("Minimize window");
	1054	+ //minButton.addActionListener(this);
	1055	+
	1056	+ if (Globals.ADVANCED)
	1057	+ {
	1058	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1059	+// maxButton.setToolTipText("Maximize window");
	1060	+// maxButton.addActionListener(this);
	1061	+ }
	1062	+
	1063	+ cButton gcButton;
	1064	+
	1065	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1066	+// gcButton.setToolTipText("Garbage collect");
	1067	+// gcButton.addActionListener(new ActionListener()
	1068	+// {
	1069	+// public void actionPerformed(ActionEvent e)
	1070	+// {
	1071	+// System.gc();
	1072	+// }
	1073	+// });
	1074	+
	1075	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1076	+ collapseButton.setToolTipText("Collapse toolbar");
	1077	+ collapseButton.addActionListener(this);
	1078	+
	1079	+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1080	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1081	+ maximize3DButton.addActionListener(this);
	1082	+
	1083	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1084	+ twoButton.setToolTipText("Show 3D view only");
	1085	+ twoButton.addActionListener(this);
	1086	+ this.fullscreenLayout = twoButton;
	1087	+
	1088	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1089	+ threeButton.setToolTipText("Show controls and 3D view");
	1090	+ threeButton.addActionListener(this);
	1091	+ if (Globals.ADVANCED)
	1092	+ {
	1093	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1094	+ sixButton.setToolTipText("Show 3D view and controls");
	1095	+ sixButton.addActionListener(this);
	1096	+ }
	1097	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1098	+// sevenButton.setToolTipText("3-column layout");
	1099	+// sevenButton.addActionListener(this);
	1100	+ //
	1101	+
	1102	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1103	+ fullButton.setToolTipText("Full-screen window");
	1104	+ fullButton.addActionListener(this);
	1105	+
	1106	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1107	+ screenfitButton.setToolTipText("Screen fit");
	1108	+ screenfitButton.addActionListener(this);
490	1109
491		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1110	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1111	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1112	+ restoreCameraButton.addActionListener(this);
	1113	+
	1114	+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1115	+ saveVersionButton.setToolTipText("Duplicate current version");
	1116	+ saveVersionButton.addActionListener(this);
	1117	+
	1118	+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1119	+ deleteVersionButton.setToolTipText("Delete current version");
	1120	+ deleteVersionButton.addActionListener(this);
	1121	+ deleteVersionButton.setEnabled(false);
	1122	+
	1123	+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1124	+ previousVersionButton.setToolTipText("Previous version");
	1125	+ previousVersionButton.addActionListener(this);
	1126	+ previousVersionButton.setEnabled(false);
	1127	+
	1128	+ cGridBag updown = new cGridBag().setVertical(true);
	1129	+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1130	+ restoreButton.setToolTipText("Undo (restore current version)");
	1131	+ restoreButton.addActionListener(this);
	1132	+ restoreButton.setEnabled(false);
	1133	+
	1134	+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1135	+ replaceButton.setToolTipText("Save (replace current version)");
	1136	+ replaceButton.addActionListener(this);
	1137	+ replaceButton.setEnabled(false);
	1138	+
	1139	+ versionManagerPanel.add(updown);
	1140	+
	1141	+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1142	+ nextVersionButton.setToolTipText("Next version");
	1143	+ nextVersionButton.addActionListener(this);
	1144	+ nextVersionButton.setEnabled(false);
	1145	+
	1146	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
492	1147	oneStepButton.setToolTipText("Animate one step forward");
493	1148	oneStepButton.addActionListener(this);
494	1149
495		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	1150	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1151	+ liveCB.setToolTipText("Enable animation");
	1152	+ liveCB.addItemListener(this);
	1153	+
	1154	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
496	1155	fastCB.setToolTipText("Fast mode");
497	1156	fastCB.addItemListener(this);
498	1157
499		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
500		- trackCB.setToolTipText("Enable tracking");
501		- trackCB.addItemListener(this);
502		-
503		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
504		- screenfitButton.setToolTipText("Screen fit");
505		- screenfitButton.addActionListener(this);
	1158	+ //oe.toolboxPanel.Return();
	1159	+
	1160	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1161	+// trackCB.setToolTipText("Enable tracking");
	1162	+// trackCB.addItemListener(this);
506	1163
507	1164	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
508	1165	// screenfitpointButton.addActionListener(this);
509	1166
510	1167	if (Globals.ADVANCED)
511	1168	{
512		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1169	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
513	1170	snapobjectButton.addActionListener(this);
514	1171	snapobjectButton.setToolTipText("Snap Object");
	1172	+
	1173	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1174	+ fourButton.addActionListener(this);
	1175	+ fourButton.setToolTipText("Show control panel only");
515	1176	}
516	1177
517		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
518		- flashSelectionButton.setToolTipText("Show selection");
519		- flashSelectionButton.addActionListener(this);
	1178	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
520	1179
521		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
522		-
523		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
524		- twoButton.setToolTipText("Show center view only");
525		- twoButton.addActionListener(this);
526		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
527		- fourButton.addActionListener(this);
528		- fourButton.setToolTipText("Show left panel only");
529		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
530		- sixButton.setToolTipText("2-column layout left");
531		- sixButton.addActionListener(this);
532		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
533		- threeButton.setToolTipText("2-column layout right");
534		- threeButton.addActionListener(this);
535		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
536		- sevenButton.setToolTipText("3-column layout");
537		- sevenButton.addActionListener(this);
538		- //
539	1180
540		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
541		- rootButton.setToolTipText("Edit selection in new tab");
	1181	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1182	+ rootButton.setToolTipText("Open selection in new tab");
542	1183	rootButton.addActionListener(this);
543	1184
544		- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1185	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
545	1186	closeButton.setToolTipText("Close tab");
546	1187	closeButton.addActionListener(this);
547	1188	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
548	1189	//clearButton.addActionListener(this);
549		-
550		- cGridBag commandsPanel = new cGridBag();
	1190	+
	1191	+ cGridBag row1 = new cGridBag();
551	1192
552		- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
553		- editButton.setToolTipText("Edit selection");
	1193	+ // INSERT
	1194	+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1195	+ gridButton.setToolTipText("Create ground");
	1196	+ gridButton.addActionListener(this);
	1197	+
	1198	+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1199	+ boxButton.setToolTipText("Create box");
	1200	+ boxButton.addActionListener(this);
	1201	+
	1202	+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1203	+ superButton.setToolTipText("Create superellipsoid");
	1204	+ superButton.addActionListener(this);
	1205	+
	1206	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1207	+ sphereButton.setToolTipText("Create sphere");
	1208	+ sphereButton.addActionListener(this);
	1209	+
	1210	+ row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1211	+ coneButton.setToolTipText("Create cone");
	1212	+ coneButton.addActionListener(this);
	1213	+
	1214	+ row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1215	+ torusButton.setToolTipText("Create torus");
	1216	+ torusButton.addActionListener(this);
	1217	+
	1218	+ if (Globals.ADVANCED)
	1219	+ {
	1220	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1221	+ kleinButton.setToolTipText("Create Klein bottle");
	1222	+ kleinButton.addActionListener(this);
	1223	+ }
	1224	+
	1225	+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1226	+ particlesButton.setToolTipText("Create particle system");
	1227	+ particlesButton.addActionListener(this);
	1228	+
	1229	+ oe.toolboxPanel.add(row1);
	1230	+
	1231	+ cGridBag row2 = new cGridBag();
	1232	+
	1233	+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1234	+ groupButton.setToolTipText("Create group");
	1235	+ groupButton.addActionListener(this);
	1236	+
	1237	+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1238	+ compositeButton.setToolTipText("Create composite");
	1239	+ compositeButton.addActionListener(this);
	1240	+
	1241	+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1242	+ switchButton.setToolTipText("Create item switcher");
	1243	+ switchButton.addActionListener(this);
	1244	+
	1245	+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1246	+ loopButton.setToolTipText("Create loop");
	1247	+ loopButton.addActionListener(this);
	1248	+
	1249	+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1250	+ textureButton.setToolTipText("Create texture");
	1251	+ textureButton.addActionListener(this);
	1252	+
	1253	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1254	+ overlayButton.setToolTipText("Create overlay");
	1255	+ overlayButton.addActionListener(this);
	1256	+
	1257	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1258	+ lightButton.setToolTipText("Create light");
	1259	+ lightButton.addActionListener(this);
	1260	+
	1261	+ oe.toolboxPanel.add(row2);
	1262	+
	1263	+ cGridBag textures = new cGridBag();
	1264	+
	1265	+ CreateTexturePanel(textures);
	1266	+
	1267	+ int tabCount = resourcecontainer.getTabCount();
	1268	+
	1269	+ if (tabCount > 0)
	1270	+ resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
	1271	+
	1272	+ oe.toolboxPanel.add(textures);
	1273	+
	1274	+ textures.preferredHeight = 100;
	1275	+
	1276	+ CreateSkyboxPanel(oe.skyboxPanel);
	1277	+
	1278	+ // EDIT panel
	1279	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1280	+ editButton.setToolTipText("Pin selection controls");
554	1281	editButton.addActionListener(this);
555	1282
556		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
557		- uneditButton.setToolTipText("Unedit selection");
	1283	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1284	+ uneditButton.setToolTipText("Unpin and remove selection controls");
558	1285	uneditButton.addActionListener(this);
559	1286
560		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
561		- allParamsButton.setToolTipText("Edit all params");
	1287	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1288	+ allParamsButton.setToolTipText("Show all controls");
562	1289	allParamsButton.addActionListener(this);
563	1290
564		- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
565		- clearPanelButton.setToolTipText("Clear edit panel");
	1291	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1292	+ clearPanelButton.setToolTipText("Clear all controls");
566	1293	clearPanelButton.addActionListener(this);
567	1294
568		- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
569		- unselectButton.setToolTipText("Unselect");
570		- unselectButton.addActionListener(this);
	1295	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1296	+ //unselectButton.setToolTipText("Unselect");
	1297	+ //unselectButton.addActionListener(this);
571	1298
572		- commandsPanel.preferredHeight = 1;
	1299	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1300	+ flashSelectionButton.setToolTipText("Highlight selection");
	1301	+ flashSelectionButton.addActionListener(this);
573	1302
574		- oe.treePanel.add(commandsPanel);
575		- oe.treePanel.Return();
	1303	+ editCommandsPanel.preferredHeight = 1;
	1304	+
	1305	+ SetPinStates(false);
	1306	+// oe.treePanel.add(commandsPanel);
	1307	+// oe.treePanel.Return();
576	1308
577	1309	// oe.aConstraints.gridx += 1;
578	1310	// oe.aConstraints.weighty = 0;
..	..	@@ -587,34 +1319,24 @@
587	1319
588	1320	cGridBag jSPPanel = new cGridBag();
589	1321
	1322	+ jSPPanel.preferredHeight = 20;
	1323	+
590	1324	JScrollPane jSP;
591	1325	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
592		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1326	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
593	1327	ResetModel();
594	1328
595	1329	oe.treePanel.add(jSPPanel);
596	1330	oe.treePanel.Return();
597	1331
598		- cGridBag copyOptionsPanel = new cGridBag();
599		-
600		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
601		- colorCB.setToolTipText("Copy color when dropped");
602		- colorCB.addItemListener(this);
603		-
604		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
605		- materialCB.setToolTipText("Copy material when dropped");
606		- materialCB.addItemListener(this);
607		-
608		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
609		- textureCB.setToolTipText("Copy texture when dropped");
610		- textureCB.addItemListener(this);
611		-
612		- copyOptionsPanel.preferredHeight = 1;
613		- oe.treePanel.add(copyOptionsPanel);
	1332	+ oe.treePanel.add(versionManagerPanel);
614	1333	oe.treePanel.Return();
	1334	+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1335	+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
	1336	+ versionSliderPane.preferredHeight = 3;
615	1337
616		-// mainPanel.setDividerLocation(0.5); //1.0);
617		-// mainPanel.setResizeWeight(0.5);
	1338	+// mainPanel.setDividerLocation(0.1); //1.0);
	1339	+ mainPanel.setResizeWeight(0.4);
618	1340
619	1341	//jList.addListSelectionListener(this);
620	1342	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -622,7 +1344,7 @@
622	1344	//jTree.setEditable(true);
623	1345	oe.jTree.setDragEnabled(true);
624	1346	//jTree.setPreferredSize(new Dimension(10,10));
625		- jSP.setPreferredSize(new Dimension(100,200));
	1347	+ //jSP.setPreferredSize(new Dimension(100,200));
626	1348
627	1349	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
628	1350
..	..	@@ -634,29 +1356,49 @@
634	1356	dgr.addDragGestureListener(this);
635	1357	}catch(Exception e) {}
636	1358	*/
637		- radio.layout = sevenButton;
	1359	+ radio.layout = threeButton; // sixButton;
638	1360	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
639	1361	}
640	1362
641	1363	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
642	1364	{
	1365	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1366	+ colorCB.setToolTipText("Copy color when dropped");
	1367	+ colorCB.addItemListener(this);
	1368	+
	1369	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1370	+ materialCB.setToolTipText("Copy material when dropped");
	1371	+ materialCB.addItemListener(this);
	1372	+
	1373	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1374	+ textureCB.setToolTipText("Copy texture when dropped");
	1375	+ textureCB.addItemListener(this);
	1376	+
	1377	+ panel.Return();
	1378	+
643	1379	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
644	1380	boxCB.setToolTipText("Display bounding boxes");
645	1381	boxCB.addItemListener(this);
646	1382
647	1383	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
648		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1384	+ zoomBoxCB.setToolTipText("Display only for wheel");
649	1385	zoomBoxCB.addItemListener(this);
650	1386
651		- if (Globals.ADVANCED)
	1387	+ if (true) // Globals.ADVANCED)
652	1388	{
653		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
654		- supportCB.setToolTipText("Enable rigging");
655		- supportCB.addItemListener(this);
	1389	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1390	+// supportCB.setToolTipText("Enable rigging");
	1391	+// supportCB.addItemListener(this);
	1392	+
	1393	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1394	+ freezeCB.setToolTipText("Fast moving camera");
	1395	+ freezeCB.addItemListener(this);
656	1396
657	1397	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
658	1398	// localCB.addItemListener(this);
659	1399
	1400	+ panel.Return();
	1401	+
660	1402	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
661	1403	crowdCB.setToolTipText("Used for crowds");
662	1404	crowdCB.addItemListener(this);
..	..	@@ -665,14 +1407,19 @@
665	1407	smoothCB.setToolTipText("Snapping delay");
666	1408	smoothCB.addItemListener(this);
667	1409
668		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
669		- slowCB.setToolTipText("Smooth interpolation");
670		- slowCB.addItemListener(this);
	1410	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1411	+// slowCB.setToolTipText("Smooth interpolation");
	1412	+// slowCB.addItemListener(this);
	1413	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1414	+ minshaderCB.setToolTipText("Minimal fast shader");
	1415	+ minshaderCB.addItemListener(this);
671	1416
672	1417	// constraints.gridy += 1;
673	1418	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
674	1419	// speakerMocapCB.addItemListener(this);
675	1420
	1421	+ panel.Return();
	1422	+
676	1423	if (false)
677	1424	{
678	1425	// handled in scripts
..	..	@@ -687,67 +1434,126 @@
687	1434	//constraints.gridy += 1;
688	1435	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
689	1436	smoothfocusCB.addItemListener(this);
	1437	+ panel.Return();
690	1438	}
691	1439
692	1440	//constraints.gridx += 1;
693	1441	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
694	1442	// debugCB.addItemListener(this);
695	1443
	1444	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1445	+ trackCB.setToolTipText("Enable tracking target");
	1446	+ trackCB.addItemListener(this);
	1447	+
696	1448	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1449	+ oeilCB.setToolTipText("Move camera when tracking");
697	1450	oeilCB.addItemListener(this);
698	1451
	1452	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1453	+ shadowCB.setToolTipText("When live compute shadows");
	1454	+ shadowCB.addItemListener(this);
	1455	+
	1456	+ panel.Return();
	1457	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1458	+ toggleTextureCB.setToolTipText("Load textures");
	1459	+ toggleTextureCB.addItemListener(this);
	1460	+
	1461	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1462	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1463	+ toggleSwitchCB.addItemListener(this);
	1464	+
	1465	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1466	+ autokeepCB.setToolTipText("On structure change");
	1467	+ autokeepCB.addItemListener(this);
	1468	+
	1469	+ panel.Return();
	1470	+ if (Globals.ADVANCED)
	1471	+ {
699	1472	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
700	1473	lookAtCB.setToolTipText("Look-at target");
701	1474	lookAtCB.addItemListener(this);
	1475	+ }
702	1476
703	1477	}
704	1478
705	1479	cGridBag fill = new cGridBag();
706		-
707	1480	fill.preferredHeight = 200;
	1481	+ cGridBag fill2 = new cGridBag();
	1482	+ fill2.preferredHeight = 200;
	1483	+ cGridBag fill3 = new cGridBag();
	1484	+ fill3.preferredHeight = 200;
708	1485
709	1486	panel.add(fill);
	1487	+ panel.add(fill2);
	1488	+ panel.add(fill3);
710	1489
711	1490	}
712	1491
713	1492	void EditObject(Object3D obj)
714	1493	{
	1494	+ assert(obj instanceof Composite);
	1495	+
	1496	+// if (obj.versionlist == null)
	1497	+// {
	1498	+// obj.versionlist = new Object3D[100];
	1499	+// obj.versionindex = -1;
	1500	+// }
	1501	+
715	1502	cRadio radioButton = new cRadio(obj.name);
	1503	+
	1504	+ // June 2019. Patch to avoid bug with transparency.
	1505	+ radioButton.hadMaterial = obj.material != null;
	1506	+ if (!radioButton.hadMaterial)
	1507	+ {
	1508	+ obj.material = new cMaterial();
	1509	+ }
	1510	+
716	1511	radioButton.SetObject(obj);
717		- radioButton.layout = sevenButton;
	1512	+ radioButton.layout = threeButton; // sixButton;
718	1513	radioButton.SetCamera(cameraView.renderCamera, false);
719	1514	radioButton.addActionListener(this);
720	1515	radioPanel.add(radioButton);
721	1516	buttonGroup.add(radioButton);
722	1517	radioButton.doClick();
723	1518	}
	1519	+
724	1520	void SetupViews(ObjEditor oe)
725	1521	{
	1522	+ theFrame = this;
	1523	+
726	1524	oe.SetupViews();
727	1525
	1526	+ if (Globals.DEBUG)
728	1527	System.out.println("SetupViews");
729	1528	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
730	1529	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
731	1530	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
732	1531	}
733	1532
734		- JCheckBox liveCB;
735		- JCheckBox supportCB;
736		- JCheckBox localCB;
737		- JCheckBox crowdCB;
738		- JCheckBox smoothCB;
739		- JCheckBox fastCB;
740		- JCheckBox slowCB;
741		- JCheckBox boxCB;
742		- JCheckBox zoomBoxCB;
743		- JCheckBox trackCB;
744		- JCheckBox smoothfocusCB;
	1533	+ cToggleButton liveCB;
	1534	+ cCheckBox supportCB;
	1535	+ cCheckBox localCB;
	1536	+ cCheckBox crowdCB;
	1537	+ cCheckBox smoothCB;
	1538	+ cCheckBox minshaderCB;
	1539	+
	1540	+ cToggleButton fastCB;
	1541	+ cCheckBox slowCB;
	1542	+ cCheckBox boxCB;
	1543	+ cCheckBox zoomBoxCB;
	1544	+ cCheckBox freezeCB;
	1545	+ //cToggleButton trackCB;
	1546	+ cCheckBox trackCB;
	1547	+ cCheckBox smoothfocusCB;
745	1548	// JCheckBox speakerMocapCB;
746		- JCheckBox speakerCameraCB;
747		- JCheckBox speakerFocusCB;
748		- JCheckBox debugCB;
749		- JCheckBox oeilCB;
750		- JCheckBox lookAtCB;
	1549	+ cCheckBox speakerCameraCB;
	1550	+ cCheckBox speakerFocusCB;
	1551	+ cCheckBox debugCB;
	1552	+
	1553	+ cCheckBox oeilCB;
	1554	+ cCheckBox shadowCB;
	1555	+ cCheckBox autokeepCB;
	1556	+ cCheckBox lookAtCB;
751	1557
752	1558	// static int COLOR = 1;
753	1559	// static int MATERIAL = 2;
..	..	@@ -755,9 +1561,9 @@
755	1561
756	1562	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
757	1563
758		- JCheckBox colorCB;
759		- JCheckBox materialCB;
760		- JCheckBox textureCB;
	1564	+ cCheckBox colorCB;
	1565	+ cCheckBox materialCB;
	1566	+ cCheckBox textureCB;
761	1567
762	1568	public void itemStateChanged(ItemEvent e)
763	1569	{
..	..	@@ -785,6 +1591,7 @@
785	1591	} else if(e.getSource() == liveCB)
786	1592	{
787	1593	cameraView.ToggleLive();
	1594	+ refreshContents(false);
788	1595	}
789	1596	else if(e.getSource() == supportCB)
790	1597	{
..	..	@@ -800,6 +1607,12 @@
800	1607	{
801	1608	cameraView.ToggleInertia();
802	1609	cameraView.repaint();
	1610	+ }
	1611	+ else if(e.getSource() == minshaderCB)
	1612	+ {
	1613	+ Globals.MINSHADER ^= true;
	1614	+ cameraView.programInitialized = false;
	1615	+ cameraView.repaint();
803	1616	}
804	1617	else if(e.getSource() == localCB)
805	1618	{
..	..	@@ -849,6 +1662,18 @@
849	1662	{
850	1663	cameraView.ToggleOeil();
851	1664	}
	1665	+ else if(e.getSource() == shadowCB)
	1666	+ {
	1667	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1668	+ }
	1669	+ else if(e.getSource() == freezeCB)
	1670	+ {
	1671	+ Globals.FREEZEONMOVE ^= true;
	1672	+ }
	1673	+ else if(e.getSource() == autokeepCB)
	1674	+ {
	1675	+ Globals.REPLACEONMAKE ^= true;
	1676	+ }
852	1677	else if(e.getSource() == lookAtCB)
853	1678	{
854	1679	cameraView.ToggleLookAt();
..	..	@@ -865,7 +1690,8 @@
865	1690
866	1691	/**/
867	1692	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
868		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1693	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1694	+ TreePath path = objEditor.jTree.getSelectionPath();
869	1695	if ((path == null) \|\| (path.getPathCount() <= 1)) {
870	1696	// We can't move the root node or an empty selection
871	1697	return;
..	..	@@ -928,8 +1754,6 @@
928	1754	}
929	1755	}
930	1756
931		- String string = (String) object;
932		-
933	1757	System.out.println("Transfer = " + object + "; drop : " + target);
934	1758	// if( object instanceof java.io.File[])
935	1759	// {
..	..	@@ -937,7 +1761,11 @@
937	1761	// objEditor.DropFile((java.io.File[]) object, true);
938	1762	// return;
939	1763	// }
940		- if (string.charAt(0) == '/')
	1764	+
	1765	+ String string = object.toString();
	1766	+
	1767	+ // File path for Mac and Windows
	1768	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
941	1769	{
942	1770	// file(s)
943	1771	String[] names = string.split("\n");
..	..	@@ -964,7 +1792,7 @@
964	1792
965	1793	flashIt = false;
966	1794	CameraPane pane = (CameraPane) target;
967		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1795	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
968	1796	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
969	1797
970	1798	if (group.selection.size() == 1)
..	..	@@ -980,23 +1808,33 @@
980	1808
981	1809	assert target == objEditor.jTree;
982	1810	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1811	+ Object3D destinationLeaf;
983	1812	try {
984		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1813	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
985	1814	} catch (Exception e) {
986	1815	System.out.println("destinationPath : " + destinationPath);
987	1816	return;
988	1817	}
989	1818
990		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1819	+ for (int i=group.selection.size(); --i>=0;)
991	1820	{
	1821	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1822	+
	1823	+ // Cannot move into itself
	1824	+ if (child == destinationLeaf)
	1825	+ return;
	1826	+ }
	1827	+
	1828	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1829	+// {
992	1830	loadClipboard(true);
993	1831	objEditor.jTree.setSelectionPath(destinationPath);
994	1832	pasteInto(false, false);
995		- } else {
996		- loadClipboard(false);
997		- objEditor.jTree.setSelectionPath(destinationPath);
998		- pasteInto(false, false); // true); // ???
999		- }
	1833	+// } else {
	1834	+// loadClipboard(false);
	1835	+// objEditor.jTree.setSelectionPath(destinationPath);
	1836	+// pasteInto(false, false); // true); // ???
	1837	+// }
1000	1838	}
1001	1839	public void dropActionChanged(DropTargetDragEvent dtde)
1002	1840	// Called if the user has modified the current drop gesture
..	..	@@ -1052,7 +1890,12 @@
1052	1890	TreePath path;
1053	1891
1054	1892	public TransferableTreePath(TreePath tp) {
1055		- path = tp;
	1893	+ Object[] objs = new Object[tp.getPathCount()];
	1894	+ for (int i=0; i<objs.length; i++)
	1895	+ {
	1896	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1897	+ }
	1898	+ path = new TreePath(objs);
1056	1899	}
1057	1900
1058	1901	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1101,22 +1944,30 @@
1101	1944	{
1102	1945	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1103	1946	//heightFieldItem.addActionListener(this);
1104		- gridItem = menu.add(new MenuItem("Grid"));
1105		- gridItem.addActionListener(this);
1106		- rectoidItem = menu.add(new MenuItem("Box"));
1107		- rectoidItem.addActionListener(this);
1108		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1109		- ellipsoidItem.addActionListener(this);
1110		- coneItem = menu.add(new MenuItem("Cone"));
1111		- coneItem.addActionListener(this);
1112		- torusItem = menu.add(new MenuItem("Torus"));
1113		- torusItem.addActionListener(this);
1114		- superItem = menu.add(new MenuItem("Superellipsoid"));
1115		- superItem.addActionListener(this);
	1947	+// gridItem = menu.add(new MenuItem("Grid"));
	1948	+// gridItem.addActionListener(this);
	1949	+// rectoidItem = menu.add(new MenuItem("Box"));
	1950	+// rectoidItem.addActionListener(this);
	1951	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1952	+// ellipsoidItem.addActionListener(this);
	1953	+// coneItem = menu.add(new MenuItem("Cone"));
	1954	+// coneItem.addActionListener(this);
	1955	+// torusItem = menu.add(new MenuItem("Torus"));
	1956	+// torusItem.addActionListener(this);
	1957	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1958	+// superItem.addActionListener(this);
	1959	+
	1960	+ cameraItem = menu.add(new MenuItem("Camera"));
	1961	+ cameraItem.addActionListener(this);
	1962	+
	1963	+ if (!Globals.ADVANCED)
	1964	+ {
1116	1965	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1117	1966	kleinItem.addActionListener(this);
1118		- particleItem = menu.add(new MenuItem("Particle system"));
1119		- particleItem.addActionListener(this);
	1967	+ }
	1968	+
	1969	+// particleItem = menu.add(new MenuItem("Particle system"));
	1970	+// particleItem.addActionListener(this);
1120	1971	if (Globals.ADVANCED)
1121	1972	{
1122	1973	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1142,15 +1993,15 @@
1142	1993	}
1143	1994	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1144	1995	bezierItem.addActionListener(this);
1145		- overlayItem = menu.add(new MenuItem("Overlay"));
1146		- overlayItem.addActionListener(this);
1147		- lightItem = menu.add(new MenuItem("Light"));
1148		- lightItem.addActionListener(this);
	1996	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1997	+// overlayItem.addActionListener(this);
	1998	+// lightItem = menu.add(new MenuItem("Light"));
	1999	+// lightItem.addActionListener(this);
1149	2000	menu.add("-");
1150	2001	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1151	2002	//superLoopItem.addActionListener(this);
1152		- loopItem = menu.add(new MenuItem("Loop"));
1153		- loopItem.addActionListener(this);
	2003	+// loopItem = menu.add(new MenuItem("Loop"));
	2004	+// loopItem.addActionListener(this);
1154	2005	doubleItem = menu.add(new MenuItem("Fork"));
1155	2006	doubleItem.addActionListener(this);
1156	2007	if (Globals.ADVANCED)
..	..	@@ -1166,6 +2017,9 @@
1166	2017	animationItem.addItemListener(this);
1167	2018	animationItem.setState(Globals.ANIMATION);
1168	2019
	2020	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	2021	+ archiveItem.addActionListener(this);
	2022	+
1169	2023	menu.add("-");
1170	2024	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1171	2025	parseverticesItem.addActionListener(this);
..	..	@@ -1178,6 +2032,8 @@
1178	2032	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1179	2033	reduce34MorphItem.addActionListener(this);
1180	2034	menu.add("-");
	2035	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	2036	+ memoryItem.addActionListener(this);
1181	2037	menu.add(computeAOItem = new MenuItem("Compute AO"));
1182	2038	computeAOItem.addActionListener(this);
1183	2039
..	..	@@ -1186,11 +2042,9 @@
1186	2042	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1187	2043	mirrorItem.addActionListener(this);
1188	2044	menu.add("-");
1189		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1190		- memoryItem.addActionListener(this);
1191	2045	menu.add(analyzeItem = new MenuItem("Analyze"));
1192	2046	analyzeItem.addActionListener(this);
1193		- menu.add(dumpItem = new MenuItem("Dump"));
	2047	+ menu.add(dumpItem = new MenuItem("Print"));
1194	2048	dumpItem.addActionListener(this);
1195	2049	// menu.add(pathItem = new MenuItem("From-to path"));
1196	2050	// pathItem.addActionListener(this);
..	..	@@ -1331,9 +2185,38 @@
1331	2185	shadow.material = new cMaterial(obj.material);
1332	2186	shadow.material.diffuse = 0.0001f;
1333	2187	shadow.material.specular = 0.0001f;
	2188	+ shadow.material.opacity = 0.75f;
	2189	+
	2190	+ AllocProjectedVertices(shadow);
	2191	+
	2192	+ shadow.projectedVertices[1].x = 300;
1334	2193
1335	2194	makeSomething(shadow);
1336	2195	}
	2196	+
	2197	+ private void ClearUnpinned()
	2198	+ {
	2199	+ //for (Object3D obj : listUI)
	2200	+ for (int i=listUI.size(); --i>=0;)
	2201	+ {
	2202	+ Object3D obj = listUI.elementAt(i);
	2203	+ if (!obj.pinned)
	2204	+ {
	2205	+ obj.CloseUI();
	2206	+ listUI.remove(i);
	2207	+ }
	2208	+ }
	2209	+ }
	2210	+
	2211	+ private void EditElement(Object3D elem, boolean newWindow)
	2212	+ {
	2213	+ // if (!(elem instanceof Composite))
	2214	+ // newWindow = false;
	2215	+ listUI.add(elem);
	2216	+ elem.openEditWindow(this, newWindow); //, false);
	2217	+ System.out.println("edit : " + elem);
	2218	+ elem.editWindow.refreshContents(true); // ? new
	2219	+ }
1337	2220
1338	2221	/**
1339	2222	* applyExample
..	..	@@ -1537,9 +2420,9 @@
1537	2420
1538	2421	void Overwrite(int mask)
1539	2422	{
1540		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2423	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1541	2424	{
1542		- Object3D content = GrafreeD.clipboard.get(0);
	2425	+ Object3D content = Grafreed.clipboard.get(0);
1543	2426
1544	2427	if (content instanceof cGroup && ((cGroup)content).transientlink )
1545	2428	content = ((cGroup)content).get(0);
..	..	@@ -1578,7 +2461,7 @@
1578	2461	{
1579	2462	ScreenFit();
1580	2463	} else
1581		- if (source == switchItem)
	2464	+ if (source == switchViewItem)
1582	2465	{
1583	2466	cVector v1 = new cVector();
1584	2467	cVector v2 = new cVector();
..	..	@@ -1587,11 +2470,11 @@
1587	2470	objEditor.cameraView.renderCamera.setAim(v2, v1);
1588	2471	objEditor.cameraView.repaint();
1589	2472	} else
1590		- if (source == rectoidItem)
	2473	+ if (source == rectoidItem \|\| source == boxButton)
1591	2474	{
1592	2475	makeSomething(new Box());
1593	2476	} else
1594		- if (source == particleItem)
	2477	+ if (source == particleItem \|\| source == particlesButton)
1595	2478	{
1596	2479	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1597	2480	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1670,27 +2553,27 @@
1670	2553
1671	2554	makeSomething(obj);
1672	2555	} else
1673		- if (source == gridItem)
	2556	+ if (source == gridItem \|\| source == gridButton)
1674	2557	{
1675	2558	makeSomething(new Grid());
1676	2559	} else
1677		- if (source == ellipsoidItem)
	2560	+ if (source == ellipsoidItem \|\| source == sphereButton)
1678	2561	{
1679	2562	makeSomething(new Sphere());
1680	2563	} else
1681		- if (source == coneItem)
	2564	+ if (source == coneItem \|\| source == coneButton)
1682	2565	{
1683	2566	makeSomething(new Cone());
1684	2567	} else
1685		- if (source == torusItem)
	2568	+ if (source == torusItem \|\| source == torusButton)
1686	2569	{
1687	2570	makeSomething(new Torus());
1688	2571	} else
1689		- if (source == superItem)
	2572	+ if (source == superItem \|\| source == superButton)
1690	2573	{
1691	2574	makeSomething(new Superellipsoid());
1692	2575	} else
1693		- if (source == kleinItem)
	2576	+ if (source == kleinItem \|\| source == kleinButton)
1694	2577	{
1695	2578	makeSomething(new Klein());
1696	2579	} else
..	..	@@ -1710,7 +2593,7 @@
1710	2593	{
1711	2594	makeSomething(new BezierSurface());
1712	2595	} else
1713		- if (source == overlayItem)
	2596	+ if (source == overlayItem \|\| source == overlayButton)
1714	2597	{
1715	2598	/*
1716	2599	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1758,10 +2641,27 @@
1758	2641	s.setup();
1759	2642	makeSomething(s);
1760	2643	} else
1761		- if (source == lightItem)
	2644	+ if (source == lightItem \|\| source == lightButton)
1762	2645	{
1763	2646	makeSomething(new Light());
1764	2647	} else
	2648	+// if (source == skybox1Button \|\|
	2649	+// source == skybox2Button \|\|
	2650	+// source == skybox3Button \|\|
	2651	+// source == skybox4Button \|\|
	2652	+// source == skybox5Button \|\|
	2653	+// source == skybox6Button \|\|
	2654	+// source == skybox7Button \|\|
	2655	+// source == skybox11Button \|\|
	2656	+// source == skybox12Button \|\|
	2657	+// source == skybox13Button \|\|
	2658	+// source == skybox14Button \|\|
	2659	+// source == skybox15Button \|\|
	2660	+// source == skybox16Button \|\|
	2661	+// source == skybox17Button)
	2662	+// {
	2663	+// ChangeSkybox(source);
	2664	+// } else
1765	2665	if (source == csgItem)
1766	2666	{
1767	2667	group(new CSG());
..	..	@@ -1808,30 +2708,38 @@
1808	2708
1809	2709	group(g);
1810	2710	} else
1811		- if (source == loopItem)
	2711	+ if (source == loopItem \|\| source == loopButton)
1812	2712	{
	2713	+ if (!group.selection.isEmpty())
	2714	+ {
1813	2715	Composite csg = new GroupLeaf();
1814	2716	csg.count = 5;
1815		- group(csg);
1816		- Composite child = new cGroup();
	2717	+ Composite child = new cGroup("Branch");
1817	2718	csg.addChild(child);
1818	2719	child.addChild(csg);
	2720	+ group(csg);
	2721	+ }
1819	2722	} else
1820	2723	if (source == doubleItem)
1821	2724	{
1822		- Composite csg = new GroupLeaf();
	2725	+ if (!group.selection.isEmpty())
	2726	+ {
	2727	+ Composite csg = new GroupLeaf("Fork");
1823	2728	csg.count = 5;
	2729	+ Composite child = new cGroup("Branch A");
	2730	+ csg.addChild(child);
	2731	+ child.addChild(csg);
	2732	+ child = new cGroup("Branch B");
	2733	+ csg.addChild(child);
	2734	+ child.addChild(csg);
1824	2735	group(csg);
1825		- Composite child = new cGroup();
1826		- csg.addChild(child);
1827		- child.addChild(csg);
1828		- child = new cGroup();
1829		- csg.addChild(child);
1830		- child.addChild(csg);
	2736	+ }
1831	2737	} else
1832	2738	if (source == tripleItem)
1833	2739	{
1834		- Composite csg = new GroupLeaf();
	2740	+ if (!group.selection.isEmpty())
	2741	+ {
	2742	+ Composite csg = new GroupLeaf("Trident");
1835	2743	csg.count = 4;
1836	2744	group(csg);
1837	2745	Composite child = new cGroup();
..	..	@@ -1843,28 +2751,12 @@
1843	2751	child = new cGroup();
1844	2752	csg.addChild(child);
1845	2753	child.addChild(csg);
1846		- } else
1847		-
1848		- if (source == importGFDItem)
1849		- {
1850		- ImportGFD();
1851		- } else
1852		- if (source == importVRMLX3DItem)
1853		- {
1854		- ImportVRMLX3D();
1855		- } else
1856		- if (source == import3DSItem)
1857		- {
1858		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1859		- } else
1860		- if (source == importOBJItem)
1861		- {
1862		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	2754	+ }
1863	2755	} else
1864	2756	if (source == computeAOItem)
1865	2757	{
1866	2758	Globals.drawMode = CameraPane.OCCLUSION;
1867		- Globals.theRenderer.repaint();
	2759	+ cameraView.repaint();
1868	2760	} else
1869	2761	if (source == recompileItem)
1870	2762	{
..	..	@@ -1879,7 +2771,7 @@
1879	2771	if (source == invariantsItem)
1880	2772	{
1881	2773	System.out.println("Invariants:");
1882		- GrafreeD.grafreeD.universe.invariants();
	2774	+ Grafreed.grafreed.universe.invariants();
1883	2775	} else
1884	2776	if (source == memoryItem)
1885	2777	{
..	..	@@ -1898,6 +2790,65 @@
1898	2790	{
1899	2791	DumpObject();
1900	2792	} else
	2793	+ if (source == minButton)
	2794	+ {
	2795	+ Minimize();
	2796	+ } else
	2797	+ if (source == maxButton)
	2798	+ {
	2799	+ Maximize();
	2800	+ } else
	2801	+ if (source == fullButton)
	2802	+ {
	2803	+ ToggleFullScreen();
	2804	+ } else
	2805	+ if (source == collapseButton)
	2806	+ {
	2807	+ this.expandedLayout = radio.layout;
	2808	+ CollapseToolbar();
	2809	+ } else
	2810	+ if (source == maximize3DButton)
	2811	+ {
	2812	+ this.expandedLayout = radio.layout;
	2813	+ radio.layout = twoButton;
	2814	+ Show3DView();
	2815	+ CollapseToolbar();
	2816	+ } else
	2817	+ if (source == previousVersionButton)
	2818	+ {
	2819	+ // Go to previous version
	2820	+ //if (!Undo())
	2821	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2822	+ PreviousVersion();
	2823	+ } else
	2824	+ if (source == restoreButton)
	2825	+ {
	2826	+ // Restore current version
	2827	+ Restore();
	2828	+ //restoreButton.setEnabled(false);
	2829	+ } else
	2830	+ if (source == replaceButton)
	2831	+ {
	2832	+ // Overwrite current version
	2833	+ Replace();
	2834	+ //replaceButton.setEnabled(false);
	2835	+ } else
	2836	+ if (source == nextVersionButton)
	2837	+ {
	2838	+ // Go to next version
	2839	+ NextVersion();
	2840	+ } else
	2841	+ if (source == saveVersionButton)
	2842	+ {
	2843	+ // Save a new version
	2844	+ if (!Save(true))
	2845	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2846	+ } else
	2847	+ if (source == deleteVersionButton)
	2848	+ {
	2849	+ // Delete a new version
	2850	+ DeleteVersion();
	2851	+ } else
1901	2852	if (source == oneStepButton)
1902	2853	{
1903	2854	Globals.ONESTEP = true;
..	..	@@ -1905,17 +2856,14 @@
1905	2856	} else
1906	2857	if (source == screenfitButton)
1907	2858	{
1908		- //Reload(lastConverter, lastFilename, true);
1909	2859	ScreenFit();
1910	2860	} else
1911	2861	if (source == screenfitpointButton)
1912	2862	{
1913		- //Reload(lastConverter, lastFilename, true);
1914	2863	ScreenFitPoint();
1915	2864	} else
1916	2865	if (source == snapobjectButton)
1917	2866	{
1918		- //Reload(lastConverter, lastFilename, true);
1919	2867	SnapObject();
1920	2868	} else
1921	2869	// if (event.getSource() == recompileButton)
..	..	@@ -1952,12 +2900,20 @@
1952	2900	{
1953	2901	loadClipboard(true);
1954	2902	} else
	2903	+ if (source == undoItem)
	2904	+ {
	2905	+ PreviousVersion();
	2906	+ } else
	2907	+ if (source == redoItem)
	2908	+ {
	2909	+ NextVersion();
	2910	+ } else
1955	2911	if (source == duplicateItem)
1956	2912	{
1957		- Object3D keep = GrafreeD.clipboard;
	2913	+ Object3D keep = Grafreed.clipboard;
1958	2914	loadClipboard(false);
1959	2915	paste(false);
1960		- GrafreeD.clipboard = keep;
	2916	+ Grafreed.clipboard = keep;
1961	2917	} else
1962	2918	if (source == cloneItem)
1963	2919	{
..	..	@@ -2177,9 +3133,9 @@
2177	3133	// group.selection.get(0).setMasterThis(content); // should be identity
2178	3134	// refreshContents();
2179	3135	// }
2180		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	3136	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2181	3137	{
2182		- Object3D content = GrafreeD.clipboard.get(0);
	3138	+ Object3D content = Grafreed.clipboard.get(0);
2183	3139
2184	3140	if (content instanceof cGroup && ((cGroup)content).transientlink )
2185	3141	content = ((cGroup)content).get(0);
..	..	@@ -2229,9 +3185,9 @@
2229	3185	} else
2230	3186	if (source == setMasterItem)
2231	3187	{
2232		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	3188	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2233	3189	{
2234		- Object3D content = GrafreeD.clipboard.get(0);
	3190	+ Object3D content = Grafreed.clipboard.get(0);
2235	3191
2236	3192	if (content instanceof cGroup && ((cGroup)content).transientlink )
2237	3193	content = ((cGroup)content).get(0);
..	..	@@ -2244,9 +3200,9 @@
2244	3200	{
2245	3201	if (group.selection.size() == 1)
2246	3202	{
2247		- if (GrafreeD.clipboard.size() == 1)
	3203	+ if (Grafreed.clipboard.size() == 1)
2248	3204	{
2249		- Object3D content = GrafreeD.clipboard.get(0);
	3205	+ Object3D content = Grafreed.clipboard.get(0);
2250	3206
2251	3207	if (content instanceof cGroup && ((cGroup)content).transientlink )
2252	3208	content = ((cGroup)content).get(0);
..	..	@@ -2263,7 +3219,7 @@
2263	3219	{
2264	3220	RevertMeshes();
2265	3221	} else
2266		- if (source == resetMeshItem)
	3222	+ if (source == resetAllItem)
2267	3223	{
2268	3224	ResetAll();
2269	3225	} else
..	..	@@ -2271,7 +3227,7 @@
2271	3227	{
2272	3228	StepAll();
2273	3229	} else
2274		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3230	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2275	3231	{
2276	3232	//int indices[] = jList.getSelectedIndices();
2277	3233	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2283,9 +3239,9 @@
2283	3239	{
2284	3240	ClearSelection(true);
2285	3241	} else
2286		- if (source == grabItem)
	3242	+ if (source == grabItem \|\| source == groupButton)
2287	3243	{
2288		- group(new cGroup(), true);
	3244	+ group(new cGroup(), false); // true);
2289	3245	} else
2290	3246	if (source == hideItem)
2291	3247	{
..	..	@@ -2303,11 +3259,11 @@
2303	3259	{
2304	3260	makeSomething(new Camera());
2305	3261	} else
2306		- if (source == compositeItem)
	3262	+ if (source == compositeItem \|\| source == compositeButton)
2307	3263	{
2308	3264	group(new Composite());
2309	3265	} else
2310		- if (source == randomItem)
	3266	+ if (source == switchItem \|\| source == switchButton)
2311	3267	{
2312	3268	RandomNode random = new RandomNode();
2313	3269	group(random);
..	..	@@ -2409,7 +3365,7 @@
2409	3365	{
2410	3366	group(new cLinker());
2411	3367	} else
2412		- if (source == textureItem)
	3368	+ if (source == textureItem \|\| source == textureButton)
2413	3369	{
2414	3370	group(new TextureNode());
2415	3371	} else
..	..	@@ -2429,17 +3385,42 @@
2429	3385	{
2430	3386	CastShadow(2);
2431	3387	} else
2432		- if (source == ungroupItem)
	3388	+ if (source == ungroupItem \|\| source == ungroupButton)
2433	3389	{
2434		- //ungroup();
	3390	+ boolean canUngroup = true;
	3391	+
2435	3392	for (int i=0; i<group.selection.size(); i++)
2436	3393	{
2437		- Ungroup(group.selection.get(i));
	3394	+ Object3D selectedItem = group.selection.get(i);
	3395	+
	3396	+ if (selectedItem.Size() == 0)
	3397	+ {
	3398	+ // Cannot ungroup leaves
	3399	+ canUngroup = false;
	3400	+ break;
	3401	+ }
	3402	+
	3403	+ if (selectedItem == group)
	3404	+ {
	3405	+ // Cannot ungroup root
	3406	+ canUngroup = false;
	3407	+ break;
	3408	+ }
2438	3409	}
2439	3410
2440		- ClearSelection(false);
2441		-
2442		- refreshContents();
	3411	+ if (canUngroup)
	3412	+ {
	3413	+ for (int i=0; i<group.selection.size(); i++)
	3414	+ {
	3415	+ Object3D selectedItem = group.selection.get(i);
	3416	+
	3417	+ Ungroup(selectedItem);
	3418	+ }
	3419	+
	3420	+ ClearSelection(false);
	3421	+
	3422	+ refreshContents();
	3423	+ }
2443	3424	} else
2444	3425	if (source == genUVItem)
2445	3426	{
..	..	@@ -2451,7 +3432,7 @@
2451	3432	} else
2452	3433	if (source == genNormalsMESHItem)
2453	3434	{
2454		- GenNormals(true); // TODO
	3435	+ GenNormalsMESH();
2455	3436	} else
2456	3437	if (source == genNormalsORGANItem)
2457	3438	{
..	..	@@ -2516,6 +3497,22 @@
2516	3497	if (source == unmarkleavesItem)
2517	3498	{
2518	3499	MarkLeaves(false);
	3500	+ } else
	3501	+ if (source == rewindleavesItem)
	3502	+ {
	3503	+ RewindLeaves(true);
	3504	+ } else
	3505	+ if (source == unrewindleavesItem)
	3506	+ {
	3507	+ RewindLeaves(false);
	3508	+ } else
	3509	+ if (source == randomleavesItem)
	3510	+ {
	3511	+ RandomLeaves(true);
	3512	+ } else
	3513	+ if (source == unrandomleavesItem)
	3514	+ {
	3515	+ RandomLeaves(false);
2519	3516	} else
2520	3517	if (source == flipVItem)
2521	3518	{
..	..	@@ -2601,9 +3598,13 @@
2601	3598	{
2602	3599	SmoothMesh();
2603	3600	} else
2604		- if (source == transformgeometryItem)
	3601	+ if (source == transformGeometryItem)
2605	3602	{
2606	3603	TransformGeometry();
	3604	+ } else
	3605	+ if (source == transformChildrenItem)
	3606	+ {
	3607	+ TransformChildren();
2607	3608	} else
2608	3609	if (source == resetTransformItem)
2609	3610	{
..	..	@@ -2611,7 +3612,11 @@
2611	3612	} else
2612	3613	if (source == resetCentroidItem)
2613	3614	{
2614		- ResetCentroid();
	3615	+ ResetCentroid(true);
	3616	+ } else
	3617	+ if (source == resetCentroidXZItem)
	3618	+ {
	3619	+ ResetCentroid(false);
2615	3620	} else
2616	3621	if (source == resetParentItem)
2617	3622	{
..	..	@@ -2716,7 +3721,7 @@
2716	3721	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2717	3722	{
2718	3723	obj = (Object3D)e.nextElement();
2719		- obj.SetBumpTexture(null);
	3724	+ obj.ResetBumpTexture();
2720	3725	}
2721	3726
2722	3727	refreshContents();
..	..	@@ -2732,6 +3737,31 @@
2732	3737
2733	3738	refreshContents();
2734	3739	} else
	3740	+ if (source == embedTexturesItem)
	3741	+ {
	3742	+ Object3D obj;
	3743	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3744	+ {
	3745	+ obj = (Object3D)e.nextElement();
	3746	+ obj.EmbedTextures(true);
	3747	+ }
	3748	+
	3749	+ refreshContents();
	3750	+ } else
	3751	+ if (source == deEmbedTexturesItem)
	3752	+ {
	3753	+ Object3D obj;
	3754	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3755	+ {
	3756	+ obj = (Object3D)e.nextElement();
	3757	+ obj.EmbedTextures(false);
	3758	+ }
	3759	+
	3760	+ CameraPane.texturepigment.clear();
	3761	+ CameraPane.texturebump.clear();
	3762	+
	3763	+ refreshContents();
	3764	+ } else
2735	3765	if (source == flashSelectionButton)
2736	3766	{
2737	3767	CameraPane.flash = true;
..	..	@@ -2743,42 +3773,36 @@
2743	3773	if (source == twoButton)
2744	3774	{
2745	3775	radio.layout = twoButton;
2746		- // bug
2747		- //gridPanel.setDividerLocation(1.0);
2748		- //bigPanel.setDividerLocation(0.0);
2749		-// bigThree.remove(scenePanel);
2750		-// bigThree.remove(centralPanel);
2751		-// bigThree.remove(XYZPanel);
2752		-// aWindowConstraints.gridx = 0;
2753		-// aWindowConstraints.gridy = 0;
2754		-// aWindowConstraints.gridwidth = 1;
2755		-// // aConstraints.gridheight = 3;
2756		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2757		-// aWindowConstraints.weightx = 0;
2758		-// aWindowConstraints.weighty = 1;
2759		-// //bigThree.add(jtp, aWindowConstraints);
2760		-// aWindowConstraints.weightx = 1;
2761		-// aWindowConstraints.gridwidth = 3;
2762		-// // aConstraints.gridheight = 3;
2763		-// aWindowConstraints.gridx = 1;
2764		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
2765		-// bigThree.add(centralPanel, aWindowConstraints);
2766		-// aWindowConstraints.weightx = 0;
2767		-// aWindowConstraints.gridx = 4;
2768		-// aWindowConstraints.gridwidth = 1;
2769		-// // aConstraints.gridheight = 3;
2770		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2771		-// //bigThree.add(XYZPanel, aWindowConstraints);
2772		-// scenePanel.setVisible(false);
2773		-// centralPanel.setVisible(true);
2774		-// XYZPanel.setVisible(false);
2775		- bigThree.ClearUI();
2776		- bigThree.add(centralPanel);
2777		- bigThree.FlushUI();
	3776	+
	3777	+ if (CameraPane.FULLSCREEN)
	3778	+ fullscreenLayout = radio.layout;
	3779	+
	3780	+ Show3DView();
	3781	+
	3782	+ cameraView.requestFocusInWindow();
	3783	+
	3784	+// refreshContents(true);
	3785	+//
	3786	+// try
	3787	+// {
	3788	+// java.awt.Robot bot = new java.awt.Robot();
	3789	+// int mask = InputEvent.BUTTON1_MASK;
	3790	+// bot.mouseMove(100, 100);
	3791	+// bot.mousePress(mask);
	3792	+// bot.mouseRelease(mask);
	3793	+// }
	3794	+// catch (Exception e)
	3795	+// {
	3796	+//
	3797	+// }
	3798	+
2778	3799	} else
2779	3800	if (source == threeButton)
2780	3801	{
2781	3802	radio.layout = threeButton;
	3803	+
	3804	+ if (CameraPane.FULLSCREEN)
	3805	+ fullscreenLayout = radio.layout;
2782	3806
2783	3807	// bigThree.remove(scenePanel);
2784	3808	// bigThree.remove(centralPanel);
..	..	@@ -2808,13 +3832,18 @@
2808	3832	// centralPanel.setVisible(true);
2809	3833	// XYZPanel.setVisible(true);
2810	3834	bigThree.ClearUI();
	3835	+ bigThree.add(scenePanel);
2811	3836	bigThree.add(centralPanel);
2812		- bigThree.add(XYZPanel);
2813	3837	bigThree.FlushUI();
	3838	+
	3839	+ cameraView.requestFocusInWindow();
2814	3840	} else
2815	3841	if (source == fourButton)
2816	3842	{
2817	3843	radio.layout = fourButton;
	3844	+
	3845	+ if (CameraPane.FULLSCREEN)
	3846	+ fullscreenLayout = radio.layout;
2818	3847
2819	3848	// bigThree.remove(scenePanel);
2820	3849	// bigThree.remove(centralPanel);
..	..	@@ -2846,10 +3875,15 @@
2846	3875	bigThree.ClearUI();
2847	3876	bigThree.add(scenePanel);
2848	3877	bigThree.FlushUI();
	3878	+
	3879	+ cameraView.requestFocusInWindow();
2849	3880	} else
2850	3881	if (source == sixButton)
2851	3882	{
2852	3883	radio.layout = sixButton;
	3884	+
	3885	+ if (CameraPane.FULLSCREEN)
	3886	+ fullscreenLayout = radio.layout;
2853	3887
2854	3888	// bigThree.remove(scenePanel);
2855	3889	// bigThree.remove(centralPanel);
..	..	@@ -2879,13 +3913,18 @@
2879	3913	// centralPanel.setVisible(true);
2880	3914	// XYZPanel.setVisible(false);
2881	3915	bigThree.ClearUI();
2882		- bigThree.add(scenePanel);
2883	3916	bigThree.add(centralPanel);
	3917	+ bigThree.add(scenePanel);
2884	3918	bigThree.FlushUI();
	3919	+
	3920	+ cameraView.requestFocusInWindow();
2885	3921	} else
2886	3922	if (source == sevenButton)
2887	3923	{
2888	3924	radio.layout = sevenButton;
	3925	+
	3926	+ if (CameraPane.FULLSCREEN)
	3927	+ fullscreenLayout = radio.layout;
2889	3928
2890	3929	// bigThree.remove(scenePanel);
2891	3930	// bigThree.remove(centralPanel);
..	..	@@ -2919,9 +3958,12 @@
2919	3958	bigThree.add(centralPanel);
2920	3959	bigThree.add(XYZPanel);
2921	3960	bigThree.FlushUI();
	3961	+
	3962	+ cameraView.requestFocusInWindow();
2922	3963	} else
2923	3964	if (source == rootButton)
2924	3965	{
	3966	+ Replace();
2925	3967	Object3D obj;
2926	3968	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2927	3969	{
..	..	@@ -2930,31 +3972,49 @@
2930	3972	EditObject(obj);
2931	3973	}
2932	3974
	3975	+ cameraView.requestFocusInWindow();
2933	3976	refreshContents(true);
2934	3977	} else
2935	3978	if (source == closeButton)
2936	3979	{
2937	3980	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	3981	+ Replace();
	3982	+
2938	3983	cRadio ab;
2939	3984	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2940	3985	{
2941	3986	ab = (cRadio)e.nextElement();
2942		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3987	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2943	3988	{
	3989	+ // Patch to avoid bug with transparency.
	3990	+ if (!ab.hadMaterial)
	3991	+ {
	3992	+ ab.object.material = null;
	3993	+ }
	3994	+
2944	3995	buttonGroup.remove(ab);
2945	3996	radioPanel.remove(ab);
2946	3997
2947		- ab.GetObject().editWindow = null;
	3998	+ //ab.GetObject().editWindow = null;
	3999	+ ab.GetObject().manipWindow = null;
2948	4000	// ab.GetObject().objectUI = null; // ?????????
2949	4001
2950	4002	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2951	4003	break;
2952	4004	}
2953	4005	}
	4006	+
	4007	+ cameraView.requestFocusInWindow();
2954	4008	refreshContents(true);
2955	4009	} else
2956	4010	if (source == editItem \|\| source == editButton)
2957	4011	{
	4012	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4013	+ {
	4014	+ Object3D child = (Object3D)e.nextElement();
	4015	+ child.pinned = true;
	4016	+ }
	4017	+
2958	4018	EditSelection(false);
2959	4019	} else
2960	4020	if (source == uneditButton)
..	..	@@ -2963,11 +4023,12 @@
2963	4023	{
2964	4024	Object3D child = (Object3D)e.nextElement();
2965	4025	if(child.editWindow != null)
2966		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4026	+ child.pinned = false;
2967	4027	child.CloseUI();
2968	4028	listUI.remove(child);
	4029	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2969	4030
2970		- child.editWindow = null; // ???????????
	4031	+ //child.editWindow = null; // ???????????
2971	4032	}
2972	4033	objEditor.ctrlPanel.FlushUI();
2973	4034	//objEditor.jTree.clearSelection();
..	..	@@ -2980,16 +4041,18 @@
2980	4041	//copy.ClearUI();
2981	4042	for (Object3D obj : listUI)
2982	4043	{
	4044	+ obj.pinned = false;
2983	4045	obj.CloseUI();
2984	4046	}
2985	4047	listUI.clear();
	4048	+ SetPinStates(group.selection.size() > 0);
2986	4049	refreshContents(true);
2987	4050	} else
2988	4051	if (source == allParamsButton)
2989	4052	{
2990	4053	assert(copy == group);
2991	4054
2992		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4055	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2993	4056
2994	4057	for (Object3D obj : listUI)
2995	4058	{
..	..	@@ -3015,6 +4078,8 @@
3015	4078	} else
3016	4079	if(source instanceof cRadio)
3017	4080	{
	4081	+ Replace();
	4082	+
3018	4083	group.parent = keepparent;
3019	4084	group.attributes = 0;
3020	4085	//group.editWindow = null;
..	..	@@ -3038,6 +4103,7 @@
3038	4103	}
3039	4104
3040	4105	copy = group;
	4106	+
3041	4107	//Globals.theRenderer.object = group;
3042	4108	if(!useclient)
3043	4109	{
..	..	@@ -3053,20 +4119,72 @@
3053	4119	frontView.object = group;
3054	4120	sideView.object = group;
3055	4121	}
3056		- group.editWindow = this;
	4122	+
	4123	+// fix "+" issue
	4124	+ //group.editWindow = this;
	4125	+ group.manipWindow = this;
	4126	+
3057	4127	/*
3058	4128	currentLayout = radio.layout;
3059	4129	if (currentLayout == null)
3060	4130	currentLayout = sevenButton;
3061	4131	*/
3062	4132	radio.layout.doClick();
	4133	+
	4134	+ assert(copy instanceof Composite);
	4135	+
	4136	+ if (copy.versionlist == null)
	4137	+ {
	4138	+ copy.versionindex = -1;
	4139	+
	4140	+ // Cannot work with loops
	4141	+ // To fix this issue, we first mark all nodes above the root,
	4142	+ // and check if any of these nodes are reachable below the root.
	4143	+ Grafreed.grafreed.universe.TagObjects(copy, true);
	4144	+
	4145	+ if (!copy.HasTags())
	4146	+ {
	4147	+ copy.versionlist = new Object3D[100];
	4148	+
	4149	+ Save(true);
	4150	+ }
	4151	+
	4152	+ Grafreed.grafreed.universe.TagObjects(copy, false);
	4153	+ }
	4154	+
	4155	+ SetVersionStates();
	4156	+
	4157	+ ClearUnpinned();
	4158	+
	4159	+ //Grafreed.Assert(group != null);
	4160	+ //Grafreed.Assert(group.selection != null);
	4161	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4162	+ if (group.selection == null \|\| group.selection.size() == 1)
	4163	+ EditSelection(false);
3063	4164	keepparent = group.parent;
3064	4165	// PARENT = NULL or not???
3065	4166	//group.parent = null; // ROOT
3066	4167	//group.attributes = -1;
3067	4168	ResetModel();
	4169	+
	4170	+ cameraView.requestFocusInWindow();
3068	4171	refreshContents(true);
3069		- }
	4172	+ } else if (event.getSource() == editCameraItem)
	4173	+ {
	4174	+ cameraView.ProtectCamera();
	4175	+ cameraView.requestFocusInWindow();
	4176	+ cameraView.repaint();
	4177	+ return;
	4178	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	4179	+ {
	4180	+ cameraView.RevertCamera();
	4181	+ cameraView.requestFocusInWindow();
	4182	+ cameraView.repaint();
	4183	+ return;
	4184	+ // } else if (event.getSource() == textureButton)
	4185	+ // {
	4186	+ // return; // true;
	4187	+ }
3070	4188	else
3071	4189	{
3072	4190	//return super.action(event, arg);
..	..	@@ -3075,7 +4193,6 @@
3075	4193	}
3076	4194
3077	4195	boolean useclient = false;
3078		- cRadio radio;
3079	4196
3080	4197	void ToggleRoot()
3081	4198	{
..	..	@@ -3127,6 +4244,28 @@
3127	4244	refreshContents();
3128	4245	}
3129	4246
	4247	+ void TransformChildren()
	4248	+ {
	4249	+ Object3D obj;
	4250	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4251	+ {
	4252	+ obj = (Object3D)e.nextElement();
	4253	+ obj.KeepTextureMatrices();
	4254	+ obj.TransformChildren();
	4255	+ obj.RestoreTextureMatrices();
	4256	+
	4257	+// if (obj.parent == null)
	4258	+// {
	4259	+// System.out.println("NULL PARENT!");
	4260	+// new Exception().printStackTrace();
	4261	+// }
	4262	+// else
	4263	+// TouchTransform(obj);
	4264	+// //obj.parent.Touch();
	4265	+ }
	4266	+
	4267	+ refreshContents();
	4268	+ }
3130	4269
3131	4270	void ResetTransform()
3132	4271	{
..	..	@@ -3158,7 +4297,7 @@
3158	4297	TouchTransform(obj);
3159	4298	continue;
3160	4299	}
3161		- if ((mask&2) != 0) // Scale
	4300	+ if ((mask&2) != 0) // Scale/rotation
3162	4301	{
3163	4302	obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
3164	4303	obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
..	..	@@ -3166,10 +4305,6 @@
3166	4305	obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
3167	4306	obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
3168	4307	obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
3169		- }
3170		- if ((mask&4) != 0) // Rotation
3171		- {
3172		- // ?
3173	4308	}
3174	4309	if ((mask&1) != 0) // Translation
3175	4310	{
..	..	@@ -3239,7 +4374,7 @@
3239	4374	refreshContents();
3240	4375	}
3241	4376
3242		- void ResetCentroid()
	4377	+ void ResetCentroid(boolean full)
3243	4378	{
3244	4379	Object3D obj;
3245	4380	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3254,12 +4389,16 @@
3254	4389	LA.matIdentity(Object3D.mat);
3255	4390	obj.getBounds(minima, maxima, false);
3256	4391	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3257		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	4392	+ if (full)
	4393	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3258	4394	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3259	4395	obj.TransformMesh(Object3D.mat);
	4396	+
3260	4397	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3261		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	4398	+ if (full)
	4399	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3262	4400	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	4401	+
3263	4402	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3264	4403	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3265	4404	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3288,7 +4427,8 @@
3288	4427
3289	4428	int size = obj.MemorySize();
3290	4429
3291		- System.err.println((size/1024) + " KB is the size of " + obj);
	4430	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4431	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3292	4432	}
3293	4433	}
3294	4434	catch (Exception e)
..	..	@@ -3325,9 +4465,9 @@
3325	4465	obj = (Object3D)e.nextElement();
3326	4466
3327	4467	System.out.println("Object is: " + obj);
3328		- GrafreeD.AnalyzeObject(obj);
	4468	+ Grafreed.AnalyzeObject(obj);
3329	4469	System.out.println("Boundary rep: " + obj.bRep);
3330		- GrafreeD.AnalyzeObject(obj.bRep);
	4470	+ Grafreed.AnalyzeObject(obj.bRep);
3331	4471
3332	4472	// System.err.println((size/1024) + " KB is the size of " + obj);
3333	4473	}
..	..	@@ -3369,6 +4509,13 @@
3369	4509	void GenNormals(boolean crease)
3370	4510	{
3371	4511	group.GenNormalsS(crease);
	4512	+
	4513	+ refreshContents();
	4514	+ }
	4515	+
	4516	+ void GenNormalsMESH()
	4517	+ {
	4518	+ group.GenNormalsMeshS();
3372	4519
3373	4520	refreshContents();
3374	4521	}
..	..	@@ -3541,8 +4688,8 @@
3541	4688
3542	4689	void ParseVertices()
3543	4690	{
3544		- boolean epsequal = GrafreeD.epsequal;
3545		- GrafreeD.epsequal = true;
	4691	+ boolean epsequal = Grafreed.epsequal;
	4692	+ Grafreed.epsequal = true;
3546	4693
3547	4694	for (int i=0; i<group.selection.size(); i++)
3548	4695	{
..	..	@@ -3567,7 +4714,7 @@
3567	4714	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3568	4715	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3569	4716
3570		- g.add(GrafreeD.clipboard);
	4717	+ g.add(Grafreed.clipboard);
3571	4718
3572	4719	buffer.add(g);
3573	4720	}
..	..	@@ -3582,7 +4729,7 @@
3582	4729	makeSomething(buffer, i==group.selection.size()-1);
3583	4730	}
3584	4731
3585		- GrafreeD.epsequal = epsequal;
	4732	+ Grafreed.epsequal = epsequal;
3586	4733
3587	4734	refreshContents();
3588	4735	}
..	..	@@ -3600,7 +4747,16 @@
3600	4747	String pigment = Object3D.GetPigment(tex);
3601	4748	//String bump = Object3D.GetBump(tex);
3602	4749
3603		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4750	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4751	+
	4752	+ try
	4753	+ {
	4754	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
	4755	+ }
	4756	+ catch (Exception e)
	4757	+ {
	4758	+ System.err.println("FAIL: " + node);
	4759	+ }
3604	4760
3605	4761	double s = v.s;
3606	4762
..	..	@@ -3732,7 +4888,7 @@
3732	4888	return;
3733	4889
3734	4890	Object3D poses = group.selection.get(0);
3735		- Object3D ref = GrafreeD.clipboard.get(0);
	4891	+ Object3D ref = Grafreed.clipboard.get(0);
3736	4892
3737	4893	Object3D newgroup = new Object3D("Po:" + poses.name);
3738	4894
..	..	@@ -3926,9 +5082,9 @@
3926	5082
3927	5083	void ClipMesh()
3928	5084	{
3929		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	5085	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3930	5086	{
3931		- Object3D content = GrafreeD.clipboard.get(0);
	5087	+ Object3D content = Grafreed.clipboard.get(0);
3932	5088
3933	5089	if (content instanceof cGroup && ((cGroup)content).transientlink )
3934	5090	content = ((cGroup)content).get(0);
..	..	@@ -3937,7 +5093,7 @@
3937	5093	// {
3938	5094	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3939	5095	// }
3940		- group.selection.ClipMesh(GrafreeD.clipboard);
	5096	+ group.selection.ClipMesh(Grafreed.clipboard);
3941	5097	}
3942	5098	// group.selection.ClipMesh(GrafreeD.clipboard);
3943	5099	System.out.println("DONE.");
..	..	@@ -3984,6 +5140,18 @@
3984	5140	void MarkLeaves(boolean hide)
3985	5141	{
3986	5142	group.selection.MarkLeaves(hide);
	5143	+ refreshContents();
	5144	+ }
	5145	+
	5146	+ void RewindLeaves(boolean hide)
	5147	+ {
	5148	+ group.selection.RewindLeaves(hide);
	5149	+ refreshContents();
	5150	+ }
	5151	+
	5152	+ void RandomLeaves(boolean hide)
	5153	+ {
	5154	+ group.selection.RandomLeaves(hide);
3987	5155	refreshContents();
3988	5156	}
3989	5157
..	..	@@ -4058,28 +5226,25 @@
4058	5226	// }
4059	5227	// }
4060	5228
4061		- static boolean allparams = true;
4062		-
4063		- static Vector<Object3D> listUI = new Vector<Object3D>();
4064		-
4065	5229	void EditSelection(boolean newWindow)
4066	5230	{
	5231	+ if (group.selection == null)
	5232	+ {
	5233	+ EditElement(group, newWindow); // ? new
	5234	+ return;
	5235	+ }
	5236	+
4067	5237	// aConstraints.gridy = 0;
4068	5238	for (int i=0; i<group.selection.size(); i++)
4069	5239	{
4070	5240	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4071	5241	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4072		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5242	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4073	5243
4074	5244	Object3D elem = (Object3D)group.selection.elementAt(i);
4075		- if(elem != group)
	5245	+ if(elem != group \|\| !newWindow)
4076	5246	{
4077		- // if (!(elem instanceof Composite))
4078		- // newWindow = false;
4079		- listUI.add(elem);
4080		- elem.openEditWindow(this, newWindow); //, false);
4081		- System.out.println("edit : " + elem);
4082		- elem.editWindow.refreshContents(true); // ? new
	5247	+ EditElement(elem, newWindow); // ? new
4083	5248	}
4084	5249	}
4085	5250	}
..	..	@@ -4142,9 +5307,7 @@
4142	5307
4143	5308	freezemodel = false;
4144	5309	}
4145		-
4146		- boolean flashIt = true;
4147		-
	5310	+
4148	5311	public void valueChanged(TreeSelectionEvent e)
4149	5312	//public boolean handleEvent(Event event)
4150	5313	{
..	..	@@ -4154,7 +5317,8 @@
4154	5317	//new Exception().printStackTrace();
4155	5318
4156	5319	freezemodel = true;
4157		-
	5320	+ ClearUnpinned();
	5321	+
4158	5322	/**/
4159	5323	//switch (event.id)
4160	5324	{
..	..	@@ -4162,7 +5326,6 @@
4162	5326	//case 702: // Event.LIST_DESELECT
4163	5327	group.deselectAll();
4164	5328	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4165		- objEditor.ClearInfo(); // .GetMaterial());
4166	5329	if (tps != null)
4167	5330	{
4168	5331	for (int i=0; i < tps.length; i++)
..	..	@@ -4171,10 +5334,8 @@
4171	5334
4172	5335	//if (child.parent != null)
4173	5336	//child.parent.addSelectee(child);
	5337	+ objEditor.SetMaterial(child);
4174	5338	group.addSelectee(child);
4175		- objEditor.SetMaterial(child); // .GetMaterial());
4176		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4177		- System.err.println("info : " + child.GetPath());
4178	5339	}
4179	5340	}
4180	5341	// else
..	..	@@ -4184,20 +5345,28 @@
4184	5345	// System.err.println("info : " + group.GetPath());
4185	5346	// }
4186	5347
4187		- objEditor.SetText(); // jan 2014
4188		-
4189		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	5348	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4190	5349	CameraPane.flash = true;
4191	5350
4192		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5351	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4193	5352	// a camera
4194	5353	{
4195		- CameraPane.camerachangeframe = 0; // don't refuse it
4196		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5354	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5355	+ {
	5356	+ CameraPane.camerachangeframe = 0; // don't refuse it
	5357	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5358	+ }
4197	5359	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4198	5360	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4199	5361	}
4200	5362
	5363	+ if (tps != null && tps.length == 1)
	5364	+ {
	5365	+ EditSelection(false);
	5366	+ }
	5367	+
	5368	+ SetPinStates(tps != null && tps.length > 0);
	5369	+
4201	5370	refreshContents();
4202	5371	//return true;
4203	5372	}
..	..	@@ -4206,6 +5375,53 @@
4206	5375
4207	5376	freezemodel = false;
4208	5377	}
	5378	+
	5379	+ void SetPinStates(boolean enabled)
	5380	+ {
	5381	+ editButton.setEnabled(enabled);
	5382	+ uneditButton.setEnabled(enabled);
	5383	+ //unselectButton.setEnabled(enabled);
	5384	+ flashSelectionButton.setEnabled(enabled);
	5385	+
	5386	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5387	+
	5388	+ boolean allComposites = true;
	5389	+
	5390	+ if (group.selection != null)
	5391	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5392	+ {
	5393	+ Object next = e.nextElement();
	5394	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5395	+ {
	5396	+ allComposites = false;
	5397	+ break;
	5398	+ }
	5399	+ }
	5400	+
	5401	+ rootButton.setEnabled(allComposites);
	5402	+ }
	5403	+
	5404	+ void refreshContents(boolean cp)
	5405	+ {
	5406	+ if (Globals.ADVANCED)
	5407	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5408	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5409	+ {
	5410	+ objEditor.ClearInfo(); // .GetMaterial());
	5411	+
	5412	+ for (int i=0; i < group.selection.Size(); i++)
	5413	+ {
	5414	+ Object3D child = (Object3D) group.selection.get(i);
	5415	+
	5416	+ objEditor.AddInfo(child, this, true);
	5417	+// System.err.println("info : " + child.GetPath());
	5418	+ }
	5419	+
	5420	+ objEditor.SetText(); // jan 2014
	5421	+ }
	5422	+
	5423	+ super.refreshContents(cp);
	5424	+ }
4209	5425
4210	5426	void linkSomething(Object3D thing)
4211	5427	{
..	..	@@ -4277,16 +5493,19 @@
4277	5493	{
4278	5494	if (group.selection.isEmpty())
4279	5495	return;
4280		- GrafreeD.clipboardIsTempGroup = false;
	5496	+
	5497	+ Grafreed.clipboardIsTempGroup = false;
4281	5498	Composite tGroup = null;
4282	5499	if (group.selection.size() > 0) // 1)
4283	5500	{
4284	5501	tGroup = new cGroup();
4285		- GrafreeD.clipboardIsTempGroup = true;
	5502	+ Grafreed.clipboardIsTempGroup = true;
4286	5503	}
4287	5504
4288	5505	if (cut)
4289	5506	{
	5507	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5508	+// Save();
4290	5509	//int indices[] = jList.getSelectedIndices();
4291	5510	//for (int i = indices.length - 1; i >= 0; i--)
4292	5511	//jList.remove(indices[i]);
..	..	@@ -4322,16 +5541,16 @@
4322	5541	//System.out.println("cut " + child);
4323	5542	//System.out.println("parent = " + child.parent);
4324	5543	// tmp.addChild(child);
4325		- if (GrafreeD.clipboardIsTempGroup)
	5544	+ if (Grafreed.clipboardIsTempGroup)
4326	5545	tGroup.add/Child/(tmp);
4327	5546	else
4328		- GrafreeD.clipboard = tmp;
	5547	+ Grafreed.clipboard = tmp;
4329	5548	}
4330	5549	else
4331		- if (GrafreeD.clipboardIsTempGroup)
	5550	+ if (Grafreed.clipboardIsTempGroup)
4332	5551	tGroup.add/Child/(child);
4333	5552	else
4334		- GrafreeD.clipboard = child;
	5553	+ Grafreed.clipboard = child;
4335	5554	}
4336	5555
4337	5556	//ResetModel();
..	..	@@ -4363,21 +5582,23 @@
4363	5582	//System.out.println("cut " + elem);
4364	5583	//System.out.println("parent = " + elem.parent);
4365	5584	// tmp.addChild(elem);
4366		- if (GrafreeD.clipboardIsTempGroup)
	5585	+ if (Grafreed.clipboardIsTempGroup)
4367	5586	tGroup.add/Child/(tmp);
4368	5587	else
4369		- GrafreeD.clipboard = tmp;
	5588	+ Grafreed.clipboard = tmp;
4370	5589	}
4371	5590	else
4372		- if (GrafreeD.clipboardIsTempGroup)
	5591	+ if (Grafreed.clipboardIsTempGroup)
4373	5592	tGroup.add/Child/(child);
4374	5593	else
4375		- GrafreeD.clipboard = child;
	5594	+ Grafreed.clipboard = child;
4376	5595	}
4377	5596
4378	5597	}
4379		- if (GrafreeD.clipboardIsTempGroup)
4380		- GrafreeD.clipboard = tGroup;
	5598	+
	5599	+ if (Grafreed.clipboardIsTempGroup)
	5600	+ Grafreed.clipboard = tGroup;
	5601	+
4381	5602	if (cut)
4382	5603	{
4383	5604	ResetModel();
..	..	@@ -4387,11 +5608,15 @@
4387	5608
4388	5609	void paste(boolean expand)
4389	5610	{
	5611	+ if (Globals.REPLACEONMAKE)
	5612	+ Save();
	5613	+ boolean keep = Globals.REPLACEONMAKE;
	5614	+ Globals.REPLACEONMAKE = false;
4390	5615	// if (GrafreeD.clipboard == null)
4391	5616	// return;
4392	5617	boolean first = true;
4393	5618
4394		- if (GrafreeD.clipboardIsTempGroup)
	5619	+ if (Grafreed.clipboardIsTempGroup)
4395	5620	{
4396	5621	Composite temp;
4397	5622
..	..	@@ -4402,7 +5627,7 @@
4402	5627	temp = (Composite)Applet3D.clipboard.deepCopy();
4403	5628	*/
4404	5629	Object3D elem;
4405		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5630	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4406	5631	{
4407	5632	Object3D child = (Object3D)e.nextElement();
4408	5633
..	..	@@ -4436,16 +5661,17 @@
4436	5661	//Object3D cb = Applet3D.clipboard;
4437	5662	//temp.addChild(cb);
4438	5663	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4439		- assert(GrafreeD.clipboard.parent == null);
4440		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4441		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4442		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4443		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	5664	+ assert(Grafreed.clipboard.parent == null);
	5665	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5666	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5667	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5668	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4444	5669	else
4445		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4446		- GrafreeD.clipboard.get(0).parent = keepparent;
	5670	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5671	+ Grafreed.clipboard.get(0).parent = keepparent;
4447	5672	}
4448	5673
	5674	+ Globals.REPLACEONMAKE = keep;
4449	5675	ResetModel();
4450	5676	refreshContents();
4451	5677	}
..	..	@@ -4492,9 +5718,9 @@
4492	5718	{
4493	5719	boolean first = true;
4494	5720
4495		- if (GrafreeD.clipboardIsTempGroup)
	5721	+ if (Grafreed.clipboardIsTempGroup)
4496	5722	{
4497		- Composite temp = (Composite)GrafreeD.clipboard;
	5723	+ Composite temp = (Composite)Grafreed.clipboard;
4498	5724	Object3D copy;
4499	5725	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4500	5726	{
..	..	@@ -4504,7 +5730,7 @@
4504	5730	}
4505	5731	} else
4506	5732	{
4507		- linkSomething(GrafreeD.clipboard); //.get(0));
	5733	+ linkSomething(Grafreed.clipboard); //.get(0));
4508	5734	}
4509	5735	}
4510	5736	}
..	..	@@ -4581,6 +5807,10 @@
4581	5807
4582	5808	void group(Object3D csg, boolean grab)
4583	5809	{
	5810	+ if (Globals.REPLACEONMAKE)
	5811	+ Save();
	5812	+ boolean keep = Globals.REPLACEONMAKE;
	5813	+ Globals.REPLACEONMAKE = false;
4584	5814	if (//false) // why??
4585	5815	!group.selection.isEmpty())
4586	5816	{
..	..	@@ -4694,10 +5924,15 @@
4694	5924	//node.add(csg);
4695	5925	//makeSomething(node);
4696	5926	makeSomething(csg);
	5927	+ Globals.REPLACEONMAKE = keep;
4697	5928	}
4698	5929
4699	5930	void Ungroup(Object3D g)
4700	5931	{
	5932	+ if (Globals.REPLACEONMAKE)
	5933	+ Save();
	5934	+ boolean keep = Globals.REPLACEONMAKE;
	5935	+ Globals.REPLACEONMAKE = false;
4701	5936	if (g instanceof HiddenObject)
4702	5937	{
4703	5938	HiddenObject h = (HiddenObject) g;
..	..	@@ -4714,6 +5949,7 @@
4714	5949	objEditor.makeSomething(g.get(i), false);
4715	5950	}
4716	5951	}
	5952	+ Globals.REPLACEONMAKE = keep;
4717	5953	}
4718	5954
4719	5955	void ungroup()
..	..	@@ -4909,21 +6145,6 @@
4909	6145	}
4910	6146	*/
4911	6147
4912		- void ImportGFD()
4913		- {
4914		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4915		- browser.show();
4916		- String filename = browser.getFile();
4917		- if (filename != null && filename.length() > 0)
4918		- {
4919		- String fullname = browser.getDirectory() + filename;
4920		-
4921		- //Object3D readobj =
4922		- objEditor.ReadGFD(fullname, objEditor);
4923		- //makeSomething(readobj);
4924		- }
4925		- }
4926		-
4927	6148	/*
4928	6149	public void Callback(Object obj)
4929	6150	{
..	..	@@ -4947,26 +6168,9 @@
4947	6168	}
4948	6169	*/
4949	6170
4950		- void ImportVRMLX3D()
4951		- {
4952		- if (GrafreeD.standAlone)
4953		- {
4954		- /**/
4955		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4956		- browser.show();
4957		- String filename = browser.getFile();
4958		- if (filename != null && filename.length() > 0)
4959		- {
4960		- String fullname = browser.getDirectory() + filename;
4961		- LoadVRMLX3D(fullname);
4962		- }
4963		- /**/
4964		- }
4965		- }
4966		-
4967	6171	String GetFile(String dialogName)
4968	6172	{
4969		- if (GrafreeD.standAlone)
	6173	+ if (Grafreed.standAlone)
4970	6174	{
4971	6175	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4972	6176	browser.show();
..	..	@@ -5034,7 +6238,43 @@
5034	6238	cButton clearpanelButton;
5035	6239	cButton unselectButton;
5036	6240
	6241	+ cButton restoreCameraButton;
	6242	+
5037	6243	cButton oneStepButton;
	6244	+
	6245	+ cButton groupButton;
	6246	+ cButton ungroupButton;
	6247	+ cButton compositeButton;
	6248	+ cButton switchButton;
	6249	+ cButton loopButton;
	6250	+ cButton textureButton;
	6251	+
	6252	+ cButton skybox1Button;
	6253	+ cButton skybox2Button;
	6254	+ cButton skybox3Button;
	6255	+ cButton skybox4Button;
	6256	+ cButton skybox5Button;
	6257	+ cButton skybox6Button;
	6258	+ cButton skybox7Button;
	6259	+
	6260	+ cButton skybox11Button;
	6261	+ cButton skybox12Button;
	6262	+ cButton skybox13Button;
	6263	+ cButton skybox14Button;
	6264	+ cButton skybox15Button;
	6265	+ cButton skybox16Button;
	6266	+ cButton skybox17Button;
	6267	+
	6268	+ cButton gridButton;
	6269	+ cButton boxButton;
	6270	+ cButton sphereButton;
	6271	+ cButton coneButton;
	6272	+ cButton torusButton;
	6273	+ cButton superButton;
	6274	+ cButton kleinButton;
	6275	+ cButton particlesButton;
	6276	+ cButton overlayButton;
	6277	+ cButton lightButton;
5038	6278
5039	6279	cButton screenfitButton;
5040	6280	cButton screenfitpointButton;
..	..	@@ -5047,14 +6287,6 @@
5047	6287
5048	6288	cButton setsupportButton;
5049	6289
5050		- cButton twoButton;
5051		- cButton sixButton;
5052		- cButton threeButton;
5053		- cButton sevenButton;
5054		- cButton fourButton; // full panel
5055		- cButton oneButton; // full XYZ
5056		- //cButton currentLayout;
5057		-
5058	6290	//
5059	6291	//Composite
5060	6292	Object3D // to do !!
..	..	@@ -5064,10 +6296,12 @@
5064	6296	//JTree jTree;
5065	6297	private MenuItem lookAtItem;
5066	6298	private MenuItem lookFromItem;
5067		- private MenuItem switchItem;
5068		- private MenuItem cutItem;
5069		- private MenuItem duplicateItem;
5070		- private MenuItem cloneItem;
	6299	+ private MenuItem switchViewItem;
	6300	+ private JMenuItem cutItem;
	6301	+ private MenuItem undoItem;
	6302	+ private MenuItem redoItem;
	6303	+ private JMenuItem duplicateItem;
	6304	+ private JMenuItem cloneItem;
5071	6305	private MenuItem cloneSupportItem;
5072	6306	private MenuItem overwriteGeoItem;
5073	6307	private MenuItem overwriteMatItem;
..	..	@@ -5079,7 +6313,7 @@
5079	6313	private MenuItem linkverticesItem;
5080	6314	private MenuItem relinkverticesItem;
5081	6315	private MenuItem setMasterItem;
5082		- private MenuItem resetMeshItem;
	6316	+ private MenuItem resetAllItem;
5083	6317	private MenuItem stepAllItem;
5084	6318	private MenuItem revertMeshItem;
5085	6319	private MenuItem poseMeshItem;
..	..	@@ -5088,13 +6322,13 @@
5088	6322	private MenuItem cloneGeometriesItem;
5089	6323	private MenuItem shareGeometriesItem;
5090	6324	private MenuItem mergeGeometriesItem;
5091		- private MenuItem copyItem;
	6325	+ private JMenuItem copyItem;
5092	6326	private MenuItem pasteItem;
5093		- private MenuItem pasteIntoItem;
5094		- private MenuItem pasteLinkItem;
5095		- private MenuItem pasteCloneItem;
5096		- private MenuItem pasteExpandItem;
5097		- private MenuItem clearItem;
	6327	+ private JMenuItem pasteIntoItem;
	6328	+ private JMenuItem pasteLinkItem;
	6329	+ private JMenuItem pasteCloneItem;
	6330	+ private JMenuItem pasteExpandItem;
	6331	+ private JMenuItem deleteItem;
5098	6332	private MenuItem clearAllItem;
5099	6333	private MenuItem genUVItem;
5100	6334	private MenuItem genNormalsMESHItem;
..	..	@@ -5129,6 +6363,10 @@
5129	6363	private MenuItem showleavesItem;
5130	6364	private MenuItem markleavesItem;
5131	6365	private MenuItem unmarkleavesItem;
	6366	+ private MenuItem rewindleavesItem;
	6367	+ private MenuItem unrewindleavesItem;
	6368	+ private MenuItem randomleavesItem;
	6369	+ private MenuItem unrandomleavesItem;
5132	6370
5133	6371	private MenuItem flipVItem;
5134	6372	private MenuItem unflipVItem;
..	..	@@ -5140,15 +6378,17 @@
5140	6378	private MenuItem panoTexturesItem;
5141	6379
5142	6380	private MenuItem resetCentroidItem;
5143		- private MenuItem transformgeometryItem;
	6381	+ private MenuItem resetCentroidXZItem;
5144	6382	private MenuItem resetTransformItem;
	6383	+ private MenuItem transformGeometryItem;
	6384	+ private MenuItem transformChildrenItem;
5145	6385	private MenuItem hideItem;
5146		- private MenuItem grabItem;
	6386	+ private JMenuItem grabItem;
5147	6387	private MenuItem backItem;
5148	6388	private MenuItem frontItem;
5149	6389	private MenuItem cameraItem;
5150	6390	private MenuItem compositeItem;
5151		- private MenuItem randomItem;
	6391	+ private MenuItem switchItem;
5152	6392	private MenuItem physicsItem;
5153	6393	private MenuItem frameselectorItem;
5154	6394	private MenuItem scriptNodeItem;
..	..	@@ -5156,7 +6396,7 @@
5156	6396	private MenuItem switchTransfoItem;
5157	6397	private MenuItem morphItem;
5158	6398	private MenuItem linkerItem;
5159		- private MenuItem ungroupItem;
	6399	+ private JMenuItem ungroupItem;
5160	6400	private MenuItem editItem;
5161	6401	private MenuItem openWindowItem;
5162	6402	private MenuItem editLeafItem;
..	..	@@ -5172,6 +6412,8 @@
5172	6412	private MenuItem attachBumpItem;
5173	6413	private MenuItem detachBumpItem;
5174	6414	private MenuItem pigmentBumpItem;
	6415	+ private MenuItem embedTexturesItem;
	6416	+ private MenuItem deEmbedTexturesItem;
5175	6417
5176	6418	private MenuItem particleItem;
5177	6419	private MenuItem ragdollItem;
..	..	@@ -5210,11 +6452,6 @@
5210	6452	private MenuItem doubleItem;
5211	6453	private MenuItem tripleItem;
5212	6454
5213		- private MenuItem importGFDItem;
5214		- private MenuItem importVRMLX3DItem;
5215		- private MenuItem import3DSItem;
5216		- private MenuItem importOBJItem;
5217		-
5218	6455	private MenuItem computeAOItem;
5219	6456	private MenuItem recompileItem;
5220	6457	private MenuItem editScriptItem;
..	..	@@ -5224,4 +6461,8 @@
5224	6461	private MenuItem analyzeItem;
5225	6462	private MenuItem dumpItem;
5226	6463	//boolean freezemodel = false;
	6464	+
	6465	+ Menu cameraMenu;
	6466	+ MenuItem editCameraItem;
	6467	+ MenuItem restoreCameraItem;
5227	6468	}