~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,58 +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		- importOBJItem = menu.add(new MenuItem("OBJ file..."));
443		- importOBJItem.addActionListener(this);
444		- menu.add("-");
445		- import3DSItem = menu.add(new MenuItem("3DS file..."));
446		- import3DSItem.addActionListener(this);
447		- menu.add("-");
448		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
449		- importVRMLX3DItem.addActionListener(this);
450		- menu.add("-");
451		- importGFDItem = menu.add(new MenuItem("GrafreeD file..."));
452		- importGFDItem.addActionListener(this);
453		-
454	931	oe.menuBar.add(menu = new Menu("Tools"));
455	932	buildToolsMenu(menu);
456	933	}
457	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	+
458	1009	void SetupUI2(ObjEditor oe)
459	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	+
460	1023	//new Exception().printStackTrace();
461	1024
462	1025	oe.radioPanel = new JPanel(new GridBagLayout());
463		- oe.aConstraints.weightx = 1;
464		- oe.aConstraints.weighty = 0;
465		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
466		- oe.aConstraints.gridwidth = 100;
467		- oe.aConstraints.gridheight = 1;
468	1026	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
469	1027
470	1028	oe.buttonGroup = new ButtonGroup();
..	..	@@ -485,97 +1043,268 @@
485	1043	oe.radioPanel.add(dummyButton);
486	1044	oe.buttonGroup.add(dummyButton);
487	1045	*/
	1046	+ cGridBag versionManagerPanel = new cGridBag();
	1047	+
	1048	+ versionManagerPanel.preferredHeight = 4;
	1049	+
488	1050	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
489	1051
490		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
491		- liveCB.setToolTipText("Enabled animation");
492		- 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);
493	1109
494		- 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);
495	1147	oneStepButton.setToolTipText("Animate one step forward");
496	1148	oneStepButton.addActionListener(this);
497	1149
498		- 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);
499	1155	fastCB.setToolTipText("Fast mode");
500	1156	fastCB.addItemListener(this);
501	1157
502		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
503		- trackCB.setToolTipText("Enable tracking");
504		- trackCB.addItemListener(this);
505		-
506		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
507		- screenfitButton.setToolTipText("Screen fit");
508		- 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);
509	1163
510	1164	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
511	1165	// screenfitpointButton.addActionListener(this);
512	1166
513	1167	if (Globals.ADVANCED)
514	1168	{
515		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1169	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
516	1170	snapobjectButton.addActionListener(this);
517	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");
518	1176	}
519	1177
520		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
521		- flashSelectionButton.setToolTipText("Show selection");
522		- flashSelectionButton.addActionListener(this);
	1178	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
523	1179
524		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
525		-
526		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
527		- twoButton.setToolTipText("Show center view only");
528		- twoButton.addActionListener(this);
529		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
530		- fourButton.addActionListener(this);
531		- fourButton.setToolTipText("Show left panel only");
532		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
533		- sixButton.setToolTipText("2-column layout left");
534		- sixButton.addActionListener(this);
535		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
536		- threeButton.setToolTipText("2-column layout right");
537		- threeButton.addActionListener(this);
538		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
539		- sevenButton.setToolTipText("3-column layout");
540		- sevenButton.addActionListener(this);
541		- //
542	1180
543		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
544		- 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");
545	1183	rootButton.addActionListener(this);
546	1184
547		- 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);
548	1186	closeButton.setToolTipText("Close tab");
549	1187	closeButton.addActionListener(this);
550	1188	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
551	1189	//clearButton.addActionListener(this);
552		-
553		- cGridBag commandsPanel = new cGridBag();
	1190	+
	1191	+ cGridBag row1 = new cGridBag();
554	1192
555		- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
556		- 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");
557	1281	editButton.addActionListener(this);
558	1282
559		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
560		- uneditButton.setToolTipText("Unedit selection");
	1283	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1284	+ uneditButton.setToolTipText("Unpin and remove selection controls");
561	1285	uneditButton.addActionListener(this);
562	1286
563		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
564		- allParamsButton.setToolTipText("Edit all params");
	1287	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1288	+ allParamsButton.setToolTipText("Show all controls");
565	1289	allParamsButton.addActionListener(this);
566	1290
567		- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
568		- clearPanelButton.setToolTipText("Clear edit panel");
	1291	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1292	+ clearPanelButton.setToolTipText("Clear all controls");
569	1293	clearPanelButton.addActionListener(this);
570	1294
571		- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
572		- unselectButton.setToolTipText("Unselect");
573		- unselectButton.addActionListener(this);
	1295	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1296	+ //unselectButton.setToolTipText("Unselect");
	1297	+ //unselectButton.addActionListener(this);
574	1298
575		- 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);
576	1302
577		- oe.treePanel.add(commandsPanel);
578		- oe.treePanel.Return();
	1303	+ editCommandsPanel.preferredHeight = 1;
	1304	+
	1305	+ SetPinStates(false);
	1306	+// oe.treePanel.add(commandsPanel);
	1307	+// oe.treePanel.Return();
579	1308
580	1309	// oe.aConstraints.gridx += 1;
581	1310	// oe.aConstraints.weighty = 0;
..	..	@@ -590,34 +1319,24 @@
590	1319
591	1320	cGridBag jSPPanel = new cGridBag();
592	1321
	1322	+ jSPPanel.preferredHeight = 20;
	1323	+
593	1324	JScrollPane jSP;
594	1325	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
595		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1326	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
596	1327	ResetModel();
597	1328
598	1329	oe.treePanel.add(jSPPanel);
599	1330	oe.treePanel.Return();
600	1331
601		- cGridBag copyOptionsPanel = new cGridBag();
602		-
603		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
604		- colorCB.setToolTipText("Copy color when dropped");
605		- colorCB.addItemListener(this);
606		-
607		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
608		- materialCB.setToolTipText("Copy material when dropped");
609		- materialCB.addItemListener(this);
610		-
611		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
612		- textureCB.setToolTipText("Copy texture when dropped");
613		- textureCB.addItemListener(this);
614		-
615		- copyOptionsPanel.preferredHeight = 1;
616		- oe.treePanel.add(copyOptionsPanel);
	1332	+ oe.treePanel.add(versionManagerPanel);
617	1333	oe.treePanel.Return();
	1334	+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1335	+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
	1336	+ versionSliderPane.preferredHeight = 3;
618	1337
619		-// mainPanel.setDividerLocation(0.5); //1.0);
620		-// mainPanel.setResizeWeight(0.5);
	1338	+// mainPanel.setDividerLocation(0.1); //1.0);
	1339	+ mainPanel.setResizeWeight(0.4);
621	1340
622	1341	//jList.addListSelectionListener(this);
623	1342	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -625,7 +1344,7 @@
625	1344	//jTree.setEditable(true);
626	1345	oe.jTree.setDragEnabled(true);
627	1346	//jTree.setPreferredSize(new Dimension(10,10));
628		- jSP.setPreferredSize(new Dimension(100,200));
	1347	+ //jSP.setPreferredSize(new Dimension(100,200));
629	1348
630	1349	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
631	1350
..	..	@@ -637,29 +1356,49 @@
637	1356	dgr.addDragGestureListener(this);
638	1357	}catch(Exception e) {}
639	1358	*/
640		- radio.layout = sevenButton;
	1359	+ radio.layout = threeButton; // sixButton;
641	1360	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
642	1361	}
643	1362
644	1363	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
645	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	+
646	1379	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
647	1380	boxCB.setToolTipText("Display bounding boxes");
648	1381	boxCB.addItemListener(this);
649	1382
650	1383	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
651		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1384	+ zoomBoxCB.setToolTipText("Display only for wheel");
652	1385	zoomBoxCB.addItemListener(this);
653	1386
654		- if (Globals.ADVANCED)
	1387	+ if (true) // Globals.ADVANCED)
655	1388	{
656		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
657		- supportCB.setToolTipText("Enable rigging");
658		- 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);
659	1396
660	1397	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
661	1398	// localCB.addItemListener(this);
662	1399
	1400	+ panel.Return();
	1401	+
663	1402	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
664	1403	crowdCB.setToolTipText("Used for crowds");
665	1404	crowdCB.addItemListener(this);
..	..	@@ -668,14 +1407,19 @@
668	1407	smoothCB.setToolTipText("Snapping delay");
669	1408	smoothCB.addItemListener(this);
670	1409
671		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
672		- slowCB.setToolTipText("Smooth interpolation");
673		- 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);
674	1416
675	1417	// constraints.gridy += 1;
676	1418	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
677	1419	// speakerMocapCB.addItemListener(this);
678	1420
	1421	+ panel.Return();
	1422	+
679	1423	if (false)
680	1424	{
681	1425	// handled in scripts
..	..	@@ -690,67 +1434,126 @@
690	1434	//constraints.gridy += 1;
691	1435	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
692	1436	smoothfocusCB.addItemListener(this);
	1437	+ panel.Return();
693	1438	}
694	1439
695	1440	//constraints.gridx += 1;
696	1441	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
697	1442	// debugCB.addItemListener(this);
698	1443
	1444	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1445	+ trackCB.setToolTipText("Enable tracking target");
	1446	+ trackCB.addItemListener(this);
	1447	+
699	1448	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1449	+ oeilCB.setToolTipText("Move camera when tracking");
700	1450	oeilCB.addItemListener(this);
701	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	+ {
702	1472	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
703	1473	lookAtCB.setToolTipText("Look-at target");
704	1474	lookAtCB.addItemListener(this);
	1475	+ }
705	1476
706	1477	}
707	1478
708	1479	cGridBag fill = new cGridBag();
709		-
710	1480	fill.preferredHeight = 200;
	1481	+ cGridBag fill2 = new cGridBag();
	1482	+ fill2.preferredHeight = 200;
	1483	+ cGridBag fill3 = new cGridBag();
	1484	+ fill3.preferredHeight = 200;
711	1485
712	1486	panel.add(fill);
	1487	+ panel.add(fill2);
	1488	+ panel.add(fill3);
713	1489
714	1490	}
715	1491
716	1492	void EditObject(Object3D obj)
717	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	+
718	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	+
719	1511	radioButton.SetObject(obj);
720		- radioButton.layout = sevenButton;
	1512	+ radioButton.layout = threeButton; // sixButton;
721	1513	radioButton.SetCamera(cameraView.renderCamera, false);
722	1514	radioButton.addActionListener(this);
723	1515	radioPanel.add(radioButton);
724	1516	buttonGroup.add(radioButton);
725	1517	radioButton.doClick();
726	1518	}
	1519	+
727	1520	void SetupViews(ObjEditor oe)
728	1521	{
	1522	+ theFrame = this;
	1523	+
729	1524	oe.SetupViews();
730	1525
	1526	+ if (Globals.DEBUG)
731	1527	System.out.println("SetupViews");
732	1528	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
733	1529	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
734	1530	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
735	1531	}
736	1532
737		- JCheckBox liveCB;
738		- JCheckBox supportCB;
739		- JCheckBox localCB;
740		- JCheckBox crowdCB;
741		- JCheckBox smoothCB;
742		- JCheckBox fastCB;
743		- JCheckBox slowCB;
744		- JCheckBox boxCB;
745		- JCheckBox zoomBoxCB;
746		- JCheckBox trackCB;
747		- 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;
748	1548	// JCheckBox speakerMocapCB;
749		- JCheckBox speakerCameraCB;
750		- JCheckBox speakerFocusCB;
751		- JCheckBox debugCB;
752		- JCheckBox oeilCB;
753		- JCheckBox lookAtCB;
	1549	+ cCheckBox speakerCameraCB;
	1550	+ cCheckBox speakerFocusCB;
	1551	+ cCheckBox debugCB;
	1552	+
	1553	+ cCheckBox oeilCB;
	1554	+ cCheckBox shadowCB;
	1555	+ cCheckBox autokeepCB;
	1556	+ cCheckBox lookAtCB;
754	1557
755	1558	// static int COLOR = 1;
756	1559	// static int MATERIAL = 2;
..	..	@@ -758,9 +1561,9 @@
758	1561
759	1562	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
760	1563
761		- JCheckBox colorCB;
762		- JCheckBox materialCB;
763		- JCheckBox textureCB;
	1564	+ cCheckBox colorCB;
	1565	+ cCheckBox materialCB;
	1566	+ cCheckBox textureCB;
764	1567
765	1568	public void itemStateChanged(ItemEvent e)
766	1569	{
..	..	@@ -788,6 +1591,7 @@
788	1591	} else if(e.getSource() == liveCB)
789	1592	{
790	1593	cameraView.ToggleLive();
	1594	+ refreshContents(false);
791	1595	}
792	1596	else if(e.getSource() == supportCB)
793	1597	{
..	..	@@ -803,6 +1607,12 @@
803	1607	{
804	1608	cameraView.ToggleInertia();
805	1609	cameraView.repaint();
	1610	+ }
	1611	+ else if(e.getSource() == minshaderCB)
	1612	+ {
	1613	+ Globals.MINSHADER ^= true;
	1614	+ cameraView.programInitialized = false;
	1615	+ cameraView.repaint();
806	1616	}
807	1617	else if(e.getSource() == localCB)
808	1618	{
..	..	@@ -852,6 +1662,18 @@
852	1662	{
853	1663	cameraView.ToggleOeil();
854	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	+ }
855	1677	else if(e.getSource() == lookAtCB)
856	1678	{
857	1679	cameraView.ToggleLookAt();
..	..	@@ -868,7 +1690,8 @@
868	1690
869	1691	/**/
870	1692	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
871		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1693	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1694	+ TreePath path = objEditor.jTree.getSelectionPath();
872	1695	if ((path == null) \|\| (path.getPathCount() <= 1)) {
873	1696	// We can't move the root node or an empty selection
874	1697	return;
..	..	@@ -931,8 +1754,6 @@
931	1754	}
932	1755	}
933	1756
934		- String string = (String) object;
935		-
936	1757	System.out.println("Transfer = " + object + "; drop : " + target);
937	1758	// if( object instanceof java.io.File[])
938	1759	// {
..	..	@@ -940,7 +1761,11 @@
940	1761	// objEditor.DropFile((java.io.File[]) object, true);
941	1762	// return;
942	1763	// }
943		- 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) == ':')
944	1769	{
945	1770	// file(s)
946	1771	String[] names = string.split("\n");
..	..	@@ -967,7 +1792,7 @@
967	1792
968	1793	flashIt = false;
969	1794	CameraPane pane = (CameraPane) target;
970		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1795	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
971	1796	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
972	1797
973	1798	if (group.selection.size() == 1)
..	..	@@ -983,23 +1808,33 @@
983	1808
984	1809	assert target == objEditor.jTree;
985	1810	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1811	+ Object3D destinationLeaf;
986	1812	try {
987		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1813	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
988	1814	} catch (Exception e) {
989	1815	System.out.println("destinationPath : " + destinationPath);
990	1816	return;
991	1817	}
992	1818
993		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1819	+ for (int i=group.selection.size(); --i>=0;)
994	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	+// {
995	1830	loadClipboard(true);
996	1831	objEditor.jTree.setSelectionPath(destinationPath);
997	1832	pasteInto(false, false);
998		- } else {
999		- loadClipboard(false);
1000		- objEditor.jTree.setSelectionPath(destinationPath);
1001		- pasteInto(false, false); // true); // ???
1002		- }
	1833	+// } else {
	1834	+// loadClipboard(false);
	1835	+// objEditor.jTree.setSelectionPath(destinationPath);
	1836	+// pasteInto(false, false); // true); // ???
	1837	+// }
1003	1838	}
1004	1839	public void dropActionChanged(DropTargetDragEvent dtde)
1005	1840	// Called if the user has modified the current drop gesture
..	..	@@ -1055,7 +1890,12 @@
1055	1890	TreePath path;
1056	1891
1057	1892	public TransferableTreePath(TreePath tp) {
1058		- 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);
1059	1899	}
1060	1900
1061	1901	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1104,22 +1944,30 @@
1104	1944	{
1105	1945	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1106	1946	//heightFieldItem.addActionListener(this);
1107		- gridItem = menu.add(new MenuItem("Grid"));
1108		- gridItem.addActionListener(this);
1109		- rectoidItem = menu.add(new MenuItem("Box"));
1110		- rectoidItem.addActionListener(this);
1111		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1112		- ellipsoidItem.addActionListener(this);
1113		- coneItem = menu.add(new MenuItem("Cone"));
1114		- coneItem.addActionListener(this);
1115		- torusItem = menu.add(new MenuItem("Torus"));
1116		- torusItem.addActionListener(this);
1117		- superItem = menu.add(new MenuItem("Superellipsoid"));
1118		- 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	+ {
1119	1965	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1120	1966	kleinItem.addActionListener(this);
1121		- particleItem = menu.add(new MenuItem("Particle system"));
1122		- particleItem.addActionListener(this);
	1967	+ }
	1968	+
	1969	+// particleItem = menu.add(new MenuItem("Particle system"));
	1970	+// particleItem.addActionListener(this);
1123	1971	if (Globals.ADVANCED)
1124	1972	{
1125	1973	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1145,15 +1993,15 @@
1145	1993	}
1146	1994	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1147	1995	bezierItem.addActionListener(this);
1148		- overlayItem = menu.add(new MenuItem("Overlay"));
1149		- overlayItem.addActionListener(this);
1150		- lightItem = menu.add(new MenuItem("Light"));
1151		- 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);
1152	2000	menu.add("-");
1153	2001	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1154	2002	//superLoopItem.addActionListener(this);
1155		- loopItem = menu.add(new MenuItem("Loop"));
1156		- loopItem.addActionListener(this);
	2003	+// loopItem = menu.add(new MenuItem("Loop"));
	2004	+// loopItem.addActionListener(this);
1157	2005	doubleItem = menu.add(new MenuItem("Fork"));
1158	2006	doubleItem.addActionListener(this);
1159	2007	if (Globals.ADVANCED)
..	..	@@ -1169,6 +2017,9 @@
1169	2017	animationItem.addItemListener(this);
1170	2018	animationItem.setState(Globals.ANIMATION);
1171	2019
	2020	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	2021	+ archiveItem.addActionListener(this);
	2022	+
1172	2023	menu.add("-");
1173	2024	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1174	2025	parseverticesItem.addActionListener(this);
..	..	@@ -1181,6 +2032,8 @@
1181	2032	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1182	2033	reduce34MorphItem.addActionListener(this);
1183	2034	menu.add("-");
	2035	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	2036	+ memoryItem.addActionListener(this);
1184	2037	menu.add(computeAOItem = new MenuItem("Compute AO"));
1185	2038	computeAOItem.addActionListener(this);
1186	2039
..	..	@@ -1189,11 +2042,9 @@
1189	2042	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1190	2043	mirrorItem.addActionListener(this);
1191	2044	menu.add("-");
1192		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1193		- memoryItem.addActionListener(this);
1194	2045	menu.add(analyzeItem = new MenuItem("Analyze"));
1195	2046	analyzeItem.addActionListener(this);
1196		- menu.add(dumpItem = new MenuItem("Dump"));
	2047	+ menu.add(dumpItem = new MenuItem("Print"));
1197	2048	dumpItem.addActionListener(this);
1198	2049	// menu.add(pathItem = new MenuItem("From-to path"));
1199	2050	// pathItem.addActionListener(this);
..	..	@@ -1334,9 +2185,38 @@
1334	2185	shadow.material = new cMaterial(obj.material);
1335	2186	shadow.material.diffuse = 0.0001f;
1336	2187	shadow.material.specular = 0.0001f;
	2188	+ shadow.material.opacity = 0.75f;
	2189	+
	2190	+ AllocProjectedVertices(shadow);
	2191	+
	2192	+ shadow.projectedVertices[1].x = 300;
1337	2193
1338	2194	makeSomething(shadow);
1339	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	+ }
1340	2220
1341	2221	/**
1342	2222	* applyExample
..	..	@@ -1540,9 +2420,9 @@
1540	2420
1541	2421	void Overwrite(int mask)
1542	2422	{
1543		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2423	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1544	2424	{
1545		- Object3D content = GrafreeD.clipboard.get(0);
	2425	+ Object3D content = Grafreed.clipboard.get(0);
1546	2426
1547	2427	if (content instanceof cGroup && ((cGroup)content).transientlink )
1548	2428	content = ((cGroup)content).get(0);
..	..	@@ -1581,7 +2461,7 @@
1581	2461	{
1582	2462	ScreenFit();
1583	2463	} else
1584		- if (source == switchItem)
	2464	+ if (source == switchViewItem)
1585	2465	{
1586	2466	cVector v1 = new cVector();
1587	2467	cVector v2 = new cVector();
..	..	@@ -1590,11 +2470,11 @@
1590	2470	objEditor.cameraView.renderCamera.setAim(v2, v1);
1591	2471	objEditor.cameraView.repaint();
1592	2472	} else
1593		- if (source == rectoidItem)
	2473	+ if (source == rectoidItem \|\| source == boxButton)
1594	2474	{
1595	2475	makeSomething(new Box());
1596	2476	} else
1597		- if (source == particleItem)
	2477	+ if (source == particleItem \|\| source == particlesButton)
1598	2478	{
1599	2479	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1600	2480	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1673,27 +2553,27 @@
1673	2553
1674	2554	makeSomething(obj);
1675	2555	} else
1676		- if (source == gridItem)
	2556	+ if (source == gridItem \|\| source == gridButton)
1677	2557	{
1678	2558	makeSomething(new Grid());
1679	2559	} else
1680		- if (source == ellipsoidItem)
	2560	+ if (source == ellipsoidItem \|\| source == sphereButton)
1681	2561	{
1682	2562	makeSomething(new Sphere());
1683	2563	} else
1684		- if (source == coneItem)
	2564	+ if (source == coneItem \|\| source == coneButton)
1685	2565	{
1686	2566	makeSomething(new Cone());
1687	2567	} else
1688		- if (source == torusItem)
	2568	+ if (source == torusItem \|\| source == torusButton)
1689	2569	{
1690	2570	makeSomething(new Torus());
1691	2571	} else
1692		- if (source == superItem)
	2572	+ if (source == superItem \|\| source == superButton)
1693	2573	{
1694	2574	makeSomething(new Superellipsoid());
1695	2575	} else
1696		- if (source == kleinItem)
	2576	+ if (source == kleinItem \|\| source == kleinButton)
1697	2577	{
1698	2578	makeSomething(new Klein());
1699	2579	} else
..	..	@@ -1713,7 +2593,7 @@
1713	2593	{
1714	2594	makeSomething(new BezierSurface());
1715	2595	} else
1716		- if (source == overlayItem)
	2596	+ if (source == overlayItem \|\| source == overlayButton)
1717	2597	{
1718	2598	/*
1719	2599	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1761,10 +2641,27 @@
1761	2641	s.setup();
1762	2642	makeSomething(s);
1763	2643	} else
1764		- if (source == lightItem)
	2644	+ if (source == lightItem \|\| source == lightButton)
1765	2645	{
1766	2646	makeSomething(new Light());
1767	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
1768	2665	if (source == csgItem)
1769	2666	{
1770	2667	group(new CSG());
..	..	@@ -1811,30 +2708,38 @@
1811	2708
1812	2709	group(g);
1813	2710	} else
1814		- if (source == loopItem)
	2711	+ if (source == loopItem \|\| source == loopButton)
1815	2712	{
	2713	+ if (!group.selection.isEmpty())
	2714	+ {
1816	2715	Composite csg = new GroupLeaf();
1817	2716	csg.count = 5;
1818		- group(csg);
1819		- Composite child = new cGroup();
	2717	+ Composite child = new cGroup("Branch");
1820	2718	csg.addChild(child);
1821	2719	child.addChild(csg);
	2720	+ group(csg);
	2721	+ }
1822	2722	} else
1823	2723	if (source == doubleItem)
1824	2724	{
1825		- Composite csg = new GroupLeaf();
	2725	+ if (!group.selection.isEmpty())
	2726	+ {
	2727	+ Composite csg = new GroupLeaf("Fork");
1826	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);
1827	2735	group(csg);
1828		- Composite child = new cGroup();
1829		- csg.addChild(child);
1830		- child.addChild(csg);
1831		- child = new cGroup();
1832		- csg.addChild(child);
1833		- child.addChild(csg);
	2736	+ }
1834	2737	} else
1835	2738	if (source == tripleItem)
1836	2739	{
1837		- Composite csg = new GroupLeaf();
	2740	+ if (!group.selection.isEmpty())
	2741	+ {
	2742	+ Composite csg = new GroupLeaf("Trident");
1838	2743	csg.count = 4;
1839	2744	group(csg);
1840	2745	Composite child = new cGroup();
..	..	@@ -1846,36 +2751,12 @@
1846	2751	child = new cGroup();
1847	2752	csg.addChild(child);
1848	2753	child.addChild(csg);
1849		- } else
1850		-
1851		- if (source == importGFDItem)
1852		- {
1853		- ImportGFD();
1854		- } else
1855		- if (source == importVRMLX3DItem)
1856		- {
1857		- ImportVRMLX3D();
1858		- } else
1859		- if (source == import3DSItem)
1860		- {
1861		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1862		- } else
1863		- if (source == importOBJItem)
1864		- {
1865		- //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1866		- FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
1867		- browser.setVisible(true);
1868		- String filename = browser.getFile();
1869		- if (filename != null && filename.length() > 0)
1870		- {
1871		- String fullname = browser.getDirectory() + filename;
1872		- makeSomething(ReadOBJ(fullname), true);
1873		- }
	2754	+ }
1874	2755	} else
1875	2756	if (source == computeAOItem)
1876	2757	{
1877	2758	Globals.drawMode = CameraPane.OCCLUSION;
1878		- Globals.theRenderer.repaint();
	2759	+ cameraView.repaint();
1879	2760	} else
1880	2761	if (source == recompileItem)
1881	2762	{
..	..	@@ -1890,7 +2771,7 @@
1890	2771	if (source == invariantsItem)
1891	2772	{
1892	2773	System.out.println("Invariants:");
1893		- GrafreeD.grafreeD.universe.invariants();
	2774	+ Grafreed.grafreed.universe.invariants();
1894	2775	} else
1895	2776	if (source == memoryItem)
1896	2777	{
..	..	@@ -1909,6 +2790,65 @@
1909	2790	{
1910	2791	DumpObject();
1911	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
1912	2852	if (source == oneStepButton)
1913	2853	{
1914	2854	Globals.ONESTEP = true;
..	..	@@ -1916,17 +2856,14 @@
1916	2856	} else
1917	2857	if (source == screenfitButton)
1918	2858	{
1919		- //Reload(lastConverter, lastFilename, true);
1920	2859	ScreenFit();
1921	2860	} else
1922	2861	if (source == screenfitpointButton)
1923	2862	{
1924		- //Reload(lastConverter, lastFilename, true);
1925	2863	ScreenFitPoint();
1926	2864	} else
1927	2865	if (source == snapobjectButton)
1928	2866	{
1929		- //Reload(lastConverter, lastFilename, true);
1930	2867	SnapObject();
1931	2868	} else
1932	2869	// if (event.getSource() == recompileButton)
..	..	@@ -1963,12 +2900,20 @@
1963	2900	{
1964	2901	loadClipboard(true);
1965	2902	} else
	2903	+ if (source == undoItem)
	2904	+ {
	2905	+ PreviousVersion();
	2906	+ } else
	2907	+ if (source == redoItem)
	2908	+ {
	2909	+ NextVersion();
	2910	+ } else
1966	2911	if (source == duplicateItem)
1967	2912	{
1968		- Object3D keep = GrafreeD.clipboard;
	2913	+ Object3D keep = Grafreed.clipboard;
1969	2914	loadClipboard(false);
1970	2915	paste(false);
1971		- GrafreeD.clipboard = keep;
	2916	+ Grafreed.clipboard = keep;
1972	2917	} else
1973	2918	if (source == cloneItem)
1974	2919	{
..	..	@@ -2188,9 +3133,9 @@
2188	3133	// group.selection.get(0).setMasterThis(content); // should be identity
2189	3134	// refreshContents();
2190	3135	// }
2191		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	3136	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2192	3137	{
2193		- Object3D content = GrafreeD.clipboard.get(0);
	3138	+ Object3D content = Grafreed.clipboard.get(0);
2194	3139
2195	3140	if (content instanceof cGroup && ((cGroup)content).transientlink )
2196	3141	content = ((cGroup)content).get(0);
..	..	@@ -2240,9 +3185,9 @@
2240	3185	} else
2241	3186	if (source == setMasterItem)
2242	3187	{
2243		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	3188	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2244	3189	{
2245		- Object3D content = GrafreeD.clipboard.get(0);
	3190	+ Object3D content = Grafreed.clipboard.get(0);
2246	3191
2247	3192	if (content instanceof cGroup && ((cGroup)content).transientlink )
2248	3193	content = ((cGroup)content).get(0);
..	..	@@ -2255,9 +3200,9 @@
2255	3200	{
2256	3201	if (group.selection.size() == 1)
2257	3202	{
2258		- if (GrafreeD.clipboard.size() == 1)
	3203	+ if (Grafreed.clipboard.size() == 1)
2259	3204	{
2260		- Object3D content = GrafreeD.clipboard.get(0);
	3205	+ Object3D content = Grafreed.clipboard.get(0);
2261	3206
2262	3207	if (content instanceof cGroup && ((cGroup)content).transientlink )
2263	3208	content = ((cGroup)content).get(0);
..	..	@@ -2274,7 +3219,7 @@
2274	3219	{
2275	3220	RevertMeshes();
2276	3221	} else
2277		- if (source == resetMeshItem)
	3222	+ if (source == resetAllItem)
2278	3223	{
2279	3224	ResetAll();
2280	3225	} else
..	..	@@ -2282,7 +3227,7 @@
2282	3227	{
2283	3228	StepAll();
2284	3229	} else
2285		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3230	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2286	3231	{
2287	3232	//int indices[] = jList.getSelectedIndices();
2288	3233	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2294,9 +3239,9 @@
2294	3239	{
2295	3240	ClearSelection(true);
2296	3241	} else
2297		- if (source == grabItem)
	3242	+ if (source == grabItem \|\| source == groupButton)
2298	3243	{
2299		- group(new cGroup(), true);
	3244	+ group(new cGroup(), false); // true);
2300	3245	} else
2301	3246	if (source == hideItem)
2302	3247	{
..	..	@@ -2314,11 +3259,11 @@
2314	3259	{
2315	3260	makeSomething(new Camera());
2316	3261	} else
2317		- if (source == compositeItem)
	3262	+ if (source == compositeItem \|\| source == compositeButton)
2318	3263	{
2319	3264	group(new Composite());
2320	3265	} else
2321		- if (source == randomItem)
	3266	+ if (source == switchItem \|\| source == switchButton)
2322	3267	{
2323	3268	RandomNode random = new RandomNode();
2324	3269	group(random);
..	..	@@ -2420,7 +3365,7 @@
2420	3365	{
2421	3366	group(new cLinker());
2422	3367	} else
2423		- if (source == textureItem)
	3368	+ if (source == textureItem \|\| source == textureButton)
2424	3369	{
2425	3370	group(new TextureNode());
2426	3371	} else
..	..	@@ -2440,17 +3385,42 @@
2440	3385	{
2441	3386	CastShadow(2);
2442	3387	} else
2443		- if (source == ungroupItem)
	3388	+ if (source == ungroupItem \|\| source == ungroupButton)
2444	3389	{
2445		- //ungroup();
	3390	+ boolean canUngroup = true;
	3391	+
2446	3392	for (int i=0; i<group.selection.size(); i++)
2447	3393	{
2448		- 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	+ }
2449	3409	}
2450	3410
2451		- ClearSelection(false);
2452		-
2453		- 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	+ }
2454	3424	} else
2455	3425	if (source == genUVItem)
2456	3426	{
..	..	@@ -2462,7 +3432,7 @@
2462	3432	} else
2463	3433	if (source == genNormalsMESHItem)
2464	3434	{
2465		- GenNormals(true); // TODO
	3435	+ GenNormalsMESH();
2466	3436	} else
2467	3437	if (source == genNormalsORGANItem)
2468	3438	{
..	..	@@ -2527,6 +3497,22 @@
2527	3497	if (source == unmarkleavesItem)
2528	3498	{
2529	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);
2530	3516	} else
2531	3517	if (source == flipVItem)
2532	3518	{
..	..	@@ -2612,9 +3598,13 @@
2612	3598	{
2613	3599	SmoothMesh();
2614	3600	} else
2615		- if (source == transformgeometryItem)
	3601	+ if (source == transformGeometryItem)
2616	3602	{
2617	3603	TransformGeometry();
	3604	+ } else
	3605	+ if (source == transformChildrenItem)
	3606	+ {
	3607	+ TransformChildren();
2618	3608	} else
2619	3609	if (source == resetTransformItem)
2620	3610	{
..	..	@@ -2622,7 +3612,11 @@
2622	3612	} else
2623	3613	if (source == resetCentroidItem)
2624	3614	{
2625		- ResetCentroid();
	3615	+ ResetCentroid(true);
	3616	+ } else
	3617	+ if (source == resetCentroidXZItem)
	3618	+ {
	3619	+ ResetCentroid(false);
2626	3620	} else
2627	3621	if (source == resetParentItem)
2628	3622	{
..	..	@@ -2727,7 +3721,7 @@
2727	3721	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2728	3722	{
2729	3723	obj = (Object3D)e.nextElement();
2730		- obj.SetBumpTexture(null);
	3724	+ obj.ResetBumpTexture();
2731	3725	}
2732	3726
2733	3727	refreshContents();
..	..	@@ -2743,6 +3737,31 @@
2743	3737
2744	3738	refreshContents();
2745	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
2746	3765	if (source == flashSelectionButton)
2747	3766	{
2748	3767	CameraPane.flash = true;
..	..	@@ -2754,42 +3773,36 @@
2754	3773	if (source == twoButton)
2755	3774	{
2756	3775	radio.layout = twoButton;
2757		- // bug
2758		- //gridPanel.setDividerLocation(1.0);
2759		- //bigPanel.setDividerLocation(0.0);
2760		-// bigThree.remove(scenePanel);
2761		-// bigThree.remove(centralPanel);
2762		-// bigThree.remove(XYZPanel);
2763		-// aWindowConstraints.gridx = 0;
2764		-// aWindowConstraints.gridy = 0;
2765		-// aWindowConstraints.gridwidth = 1;
2766		-// // aConstraints.gridheight = 3;
2767		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2768		-// aWindowConstraints.weightx = 0;
2769		-// aWindowConstraints.weighty = 1;
2770		-// //bigThree.add(jtp, aWindowConstraints);
2771		-// aWindowConstraints.weightx = 1;
2772		-// aWindowConstraints.gridwidth = 3;
2773		-// // aConstraints.gridheight = 3;
2774		-// aWindowConstraints.gridx = 1;
2775		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
2776		-// bigThree.add(centralPanel, aWindowConstraints);
2777		-// aWindowConstraints.weightx = 0;
2778		-// aWindowConstraints.gridx = 4;
2779		-// aWindowConstraints.gridwidth = 1;
2780		-// // aConstraints.gridheight = 3;
2781		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2782		-// //bigThree.add(XYZPanel, aWindowConstraints);
2783		-// scenePanel.setVisible(false);
2784		-// centralPanel.setVisible(true);
2785		-// XYZPanel.setVisible(false);
2786		- bigThree.ClearUI();
2787		- bigThree.add(centralPanel);
2788		- 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	+
2789	3799	} else
2790	3800	if (source == threeButton)
2791	3801	{
2792	3802	radio.layout = threeButton;
	3803	+
	3804	+ if (CameraPane.FULLSCREEN)
	3805	+ fullscreenLayout = radio.layout;
2793	3806
2794	3807	// bigThree.remove(scenePanel);
2795	3808	// bigThree.remove(centralPanel);
..	..	@@ -2819,13 +3832,18 @@
2819	3832	// centralPanel.setVisible(true);
2820	3833	// XYZPanel.setVisible(true);
2821	3834	bigThree.ClearUI();
	3835	+ bigThree.add(scenePanel);
2822	3836	bigThree.add(centralPanel);
2823		- bigThree.add(XYZPanel);
2824	3837	bigThree.FlushUI();
	3838	+
	3839	+ cameraView.requestFocusInWindow();
2825	3840	} else
2826	3841	if (source == fourButton)
2827	3842	{
2828	3843	radio.layout = fourButton;
	3844	+
	3845	+ if (CameraPane.FULLSCREEN)
	3846	+ fullscreenLayout = radio.layout;
2829	3847
2830	3848	// bigThree.remove(scenePanel);
2831	3849	// bigThree.remove(centralPanel);
..	..	@@ -2857,10 +3875,15 @@
2857	3875	bigThree.ClearUI();
2858	3876	bigThree.add(scenePanel);
2859	3877	bigThree.FlushUI();
	3878	+
	3879	+ cameraView.requestFocusInWindow();
2860	3880	} else
2861	3881	if (source == sixButton)
2862	3882	{
2863	3883	radio.layout = sixButton;
	3884	+
	3885	+ if (CameraPane.FULLSCREEN)
	3886	+ fullscreenLayout = radio.layout;
2864	3887
2865	3888	// bigThree.remove(scenePanel);
2866	3889	// bigThree.remove(centralPanel);
..	..	@@ -2890,13 +3913,18 @@
2890	3913	// centralPanel.setVisible(true);
2891	3914	// XYZPanel.setVisible(false);
2892	3915	bigThree.ClearUI();
2893		- bigThree.add(scenePanel);
2894	3916	bigThree.add(centralPanel);
	3917	+ bigThree.add(scenePanel);
2895	3918	bigThree.FlushUI();
	3919	+
	3920	+ cameraView.requestFocusInWindow();
2896	3921	} else
2897	3922	if (source == sevenButton)
2898	3923	{
2899	3924	radio.layout = sevenButton;
	3925	+
	3926	+ if (CameraPane.FULLSCREEN)
	3927	+ fullscreenLayout = radio.layout;
2900	3928
2901	3929	// bigThree.remove(scenePanel);
2902	3930	// bigThree.remove(centralPanel);
..	..	@@ -2930,9 +3958,12 @@
2930	3958	bigThree.add(centralPanel);
2931	3959	bigThree.add(XYZPanel);
2932	3960	bigThree.FlushUI();
	3961	+
	3962	+ cameraView.requestFocusInWindow();
2933	3963	} else
2934	3964	if (source == rootButton)
2935	3965	{
	3966	+ Replace();
2936	3967	Object3D obj;
2937	3968	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2938	3969	{
..	..	@@ -2941,31 +3972,49 @@
2941	3972	EditObject(obj);
2942	3973	}
2943	3974
	3975	+ cameraView.requestFocusInWindow();
2944	3976	refreshContents(true);
2945	3977	} else
2946	3978	if (source == closeButton)
2947	3979	{
2948	3980	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	3981	+ Replace();
	3982	+
2949	3983	cRadio ab;
2950	3984	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2951	3985	{
2952	3986	ab = (cRadio)e.nextElement();
2953		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3987	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2954	3988	{
	3989	+ // Patch to avoid bug with transparency.
	3990	+ if (!ab.hadMaterial)
	3991	+ {
	3992	+ ab.object.material = null;
	3993	+ }
	3994	+
2955	3995	buttonGroup.remove(ab);
2956	3996	radioPanel.remove(ab);
2957	3997
2958		- ab.GetObject().editWindow = null;
	3998	+ //ab.GetObject().editWindow = null;
	3999	+ ab.GetObject().manipWindow = null;
2959	4000	// ab.GetObject().objectUI = null; // ?????????
2960	4001
2961	4002	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2962	4003	break;
2963	4004	}
2964	4005	}
	4006	+
	4007	+ cameraView.requestFocusInWindow();
2965	4008	refreshContents(true);
2966	4009	} else
2967	4010	if (source == editItem \|\| source == editButton)
2968	4011	{
	4012	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4013	+ {
	4014	+ Object3D child = (Object3D)e.nextElement();
	4015	+ child.pinned = true;
	4016	+ }
	4017	+
2969	4018	EditSelection(false);
2970	4019	} else
2971	4020	if (source == uneditButton)
..	..	@@ -2974,11 +4023,12 @@
2974	4023	{
2975	4024	Object3D child = (Object3D)e.nextElement();
2976	4025	if(child.editWindow != null)
2977		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4026	+ child.pinned = false;
2978	4027	child.CloseUI();
2979	4028	listUI.remove(child);
	4029	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2980	4030
2981		- child.editWindow = null; // ???????????
	4031	+ //child.editWindow = null; // ???????????
2982	4032	}
2983	4033	objEditor.ctrlPanel.FlushUI();
2984	4034	//objEditor.jTree.clearSelection();
..	..	@@ -2991,16 +4041,18 @@
2991	4041	//copy.ClearUI();
2992	4042	for (Object3D obj : listUI)
2993	4043	{
	4044	+ obj.pinned = false;
2994	4045	obj.CloseUI();
2995	4046	}
2996	4047	listUI.clear();
	4048	+ SetPinStates(group.selection.size() > 0);
2997	4049	refreshContents(true);
2998	4050	} else
2999	4051	if (source == allParamsButton)
3000	4052	{
3001	4053	assert(copy == group);
3002	4054
3003		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4055	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3004	4056
3005	4057	for (Object3D obj : listUI)
3006	4058	{
..	..	@@ -3026,6 +4078,8 @@
3026	4078	} else
3027	4079	if(source instanceof cRadio)
3028	4080	{
	4081	+ Replace();
	4082	+
3029	4083	group.parent = keepparent;
3030	4084	group.attributes = 0;
3031	4085	//group.editWindow = null;
..	..	@@ -3049,6 +4103,7 @@
3049	4103	}
3050	4104
3051	4105	copy = group;
	4106	+
3052	4107	//Globals.theRenderer.object = group;
3053	4108	if(!useclient)
3054	4109	{
..	..	@@ -3064,20 +4119,72 @@
3064	4119	frontView.object = group;
3065	4120	sideView.object = group;
3066	4121	}
3067		- group.editWindow = this;
	4122	+
	4123	+// fix "+" issue
	4124	+ //group.editWindow = this;
	4125	+ group.manipWindow = this;
	4126	+
3068	4127	/*
3069	4128	currentLayout = radio.layout;
3070	4129	if (currentLayout == null)
3071	4130	currentLayout = sevenButton;
3072	4131	*/
3073	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);
3074	4164	keepparent = group.parent;
3075	4165	// PARENT = NULL or not???
3076	4166	//group.parent = null; // ROOT
3077	4167	//group.attributes = -1;
3078	4168	ResetModel();
	4169	+
	4170	+ cameraView.requestFocusInWindow();
3079	4171	refreshContents(true);
3080		- }
	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	+ }
3081	4188	else
3082	4189	{
3083	4190	//return super.action(event, arg);
..	..	@@ -3086,7 +4193,6 @@
3086	4193	}
3087	4194
3088	4195	boolean useclient = false;
3089		- cRadio radio;
3090	4196
3091	4197	void ToggleRoot()
3092	4198	{
..	..	@@ -3138,6 +4244,28 @@
3138	4244	refreshContents();
3139	4245	}
3140	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	+ }
3141	4269
3142	4270	void ResetTransform()
3143	4271	{
..	..	@@ -3169,7 +4297,7 @@
3169	4297	TouchTransform(obj);
3170	4298	continue;
3171	4299	}
3172		- if ((mask&2) != 0) // Scale
	4300	+ if ((mask&2) != 0) // Scale/rotation
3173	4301	{
3174	4302	obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
3175	4303	obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
..	..	@@ -3177,10 +4305,6 @@
3177	4305	obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
3178	4306	obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
3179	4307	obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
3180		- }
3181		- if ((mask&4) != 0) // Rotation
3182		- {
3183		- // ?
3184	4308	}
3185	4309	if ((mask&1) != 0) // Translation
3186	4310	{
..	..	@@ -3250,7 +4374,7 @@
3250	4374	refreshContents();
3251	4375	}
3252	4376
3253		- void ResetCentroid()
	4377	+ void ResetCentroid(boolean full)
3254	4378	{
3255	4379	Object3D obj;
3256	4380	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3265,12 +4389,16 @@
3265	4389	LA.matIdentity(Object3D.mat);
3266	4390	obj.getBounds(minima, maxima, false);
3267	4391	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3268		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	4392	+ if (full)
	4393	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3269	4394	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3270	4395	obj.TransformMesh(Object3D.mat);
	4396	+
3271	4397	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3272		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	4398	+ if (full)
	4399	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3273	4400	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	4401	+
3274	4402	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3275	4403	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3276	4404	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3299,7 +4427,8 @@
3299	4427
3300	4428	int size = obj.MemorySize();
3301	4429
3302		- 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)");
3303	4432	}
3304	4433	}
3305	4434	catch (Exception e)
..	..	@@ -3336,9 +4465,9 @@
3336	4465	obj = (Object3D)e.nextElement();
3337	4466
3338	4467	System.out.println("Object is: " + obj);
3339		- GrafreeD.AnalyzeObject(obj);
	4468	+ Grafreed.AnalyzeObject(obj);
3340	4469	System.out.println("Boundary rep: " + obj.bRep);
3341		- GrafreeD.AnalyzeObject(obj.bRep);
	4470	+ Grafreed.AnalyzeObject(obj.bRep);
3342	4471
3343	4472	// System.err.println((size/1024) + " KB is the size of " + obj);
3344	4473	}
..	..	@@ -3380,6 +4509,13 @@
3380	4509	void GenNormals(boolean crease)
3381	4510	{
3382	4511	group.GenNormalsS(crease);
	4512	+
	4513	+ refreshContents();
	4514	+ }
	4515	+
	4516	+ void GenNormalsMESH()
	4517	+ {
	4518	+ group.GenNormalsMeshS();
3383	4519
3384	4520	refreshContents();
3385	4521	}
..	..	@@ -3552,8 +4688,8 @@
3552	4688
3553	4689	void ParseVertices()
3554	4690	{
3555		- boolean epsequal = GrafreeD.epsequal;
3556		- GrafreeD.epsequal = true;
	4691	+ boolean epsequal = Grafreed.epsequal;
	4692	+ Grafreed.epsequal = true;
3557	4693
3558	4694	for (int i=0; i<group.selection.size(); i++)
3559	4695	{
..	..	@@ -3578,7 +4714,7 @@
3578	4714	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3579	4715	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3580	4716
3581		- g.add(GrafreeD.clipboard);
	4717	+ g.add(Grafreed.clipboard);
3582	4718
3583	4719	buffer.add(g);
3584	4720	}
..	..	@@ -3593,7 +4729,7 @@
3593	4729	makeSomething(buffer, i==group.selection.size()-1);
3594	4730	}
3595	4731
3596		- GrafreeD.epsequal = epsequal;
	4732	+ Grafreed.epsequal = epsequal;
3597	4733
3598	4734	refreshContents();
3599	4735	}
..	..	@@ -3611,7 +4747,16 @@
3611	4747	String pigment = Object3D.GetPigment(tex);
3612	4748	//String bump = Object3D.GetBump(tex);
3613	4749
3614		- 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	+ }
3615	4760
3616	4761	double s = v.s;
3617	4762
..	..	@@ -3743,7 +4888,7 @@
3743	4888	return;
3744	4889
3745	4890	Object3D poses = group.selection.get(0);
3746		- Object3D ref = GrafreeD.clipboard.get(0);
	4891	+ Object3D ref = Grafreed.clipboard.get(0);
3747	4892
3748	4893	Object3D newgroup = new Object3D("Po:" + poses.name);
3749	4894
..	..	@@ -3937,9 +5082,9 @@
3937	5082
3938	5083	void ClipMesh()
3939	5084	{
3940		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	5085	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3941	5086	{
3942		- Object3D content = GrafreeD.clipboard.get(0);
	5087	+ Object3D content = Grafreed.clipboard.get(0);
3943	5088
3944	5089	if (content instanceof cGroup && ((cGroup)content).transientlink )
3945	5090	content = ((cGroup)content).get(0);
..	..	@@ -3948,7 +5093,7 @@
3948	5093	// {
3949	5094	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3950	5095	// }
3951		- group.selection.ClipMesh(GrafreeD.clipboard);
	5096	+ group.selection.ClipMesh(Grafreed.clipboard);
3952	5097	}
3953	5098	// group.selection.ClipMesh(GrafreeD.clipboard);
3954	5099	System.out.println("DONE.");
..	..	@@ -3995,6 +5140,18 @@
3995	5140	void MarkLeaves(boolean hide)
3996	5141	{
3997	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);
3998	5155	refreshContents();
3999	5156	}
4000	5157
..	..	@@ -4069,28 +5226,25 @@
4069	5226	// }
4070	5227	// }
4071	5228
4072		- static boolean allparams = true;
4073		-
4074		- static Vector<Object3D> listUI = new Vector<Object3D>();
4075		-
4076	5229	void EditSelection(boolean newWindow)
4077	5230	{
	5231	+ if (group.selection == null)
	5232	+ {
	5233	+ EditElement(group, newWindow); // ? new
	5234	+ return;
	5235	+ }
	5236	+
4078	5237	// aConstraints.gridy = 0;
4079	5238	for (int i=0; i<group.selection.size(); i++)
4080	5239	{
4081	5240	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4082	5241	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4083		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5242	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4084	5243
4085	5244	Object3D elem = (Object3D)group.selection.elementAt(i);
4086		- if(elem != group)
	5245	+ if(elem != group \|\| !newWindow)
4087	5246	{
4088		- // if (!(elem instanceof Composite))
4089		- // newWindow = false;
4090		- listUI.add(elem);
4091		- elem.openEditWindow(this, newWindow); //, false);
4092		- System.out.println("edit : " + elem);
4093		- elem.editWindow.refreshContents(true); // ? new
	5247	+ EditElement(elem, newWindow); // ? new
4094	5248	}
4095	5249	}
4096	5250	}
..	..	@@ -4153,9 +5307,7 @@
4153	5307
4154	5308	freezemodel = false;
4155	5309	}
4156		-
4157		- boolean flashIt = true;
4158		-
	5310	+
4159	5311	public void valueChanged(TreeSelectionEvent e)
4160	5312	//public boolean handleEvent(Event event)
4161	5313	{
..	..	@@ -4165,7 +5317,8 @@
4165	5317	//new Exception().printStackTrace();
4166	5318
4167	5319	freezemodel = true;
4168		-
	5320	+ ClearUnpinned();
	5321	+
4169	5322	/**/
4170	5323	//switch (event.id)
4171	5324	{
..	..	@@ -4173,7 +5326,6 @@
4173	5326	//case 702: // Event.LIST_DESELECT
4174	5327	group.deselectAll();
4175	5328	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4176		- objEditor.ClearInfo(); // .GetMaterial());
4177	5329	if (tps != null)
4178	5330	{
4179	5331	for (int i=0; i < tps.length; i++)
..	..	@@ -4182,10 +5334,8 @@
4182	5334
4183	5335	//if (child.parent != null)
4184	5336	//child.parent.addSelectee(child);
	5337	+ objEditor.SetMaterial(child);
4185	5338	group.addSelectee(child);
4186		- objEditor.SetMaterial(child); // .GetMaterial());
4187		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4188		- System.err.println("info : " + child.GetPath());
4189	5339	}
4190	5340	}
4191	5341	// else
..	..	@@ -4195,20 +5345,28 @@
4195	5345	// System.err.println("info : " + group.GetPath());
4196	5346	// }
4197	5347
4198		- objEditor.SetText(); // jan 2014
4199		-
4200		- 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))
4201	5349	CameraPane.flash = true;
4202	5350
4203		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5351	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4204	5352	// a camera
4205	5353	{
4206		- CameraPane.camerachangeframe = 0; // don't refuse it
4207		- 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	+ }
4208	5359	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4209	5360	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4210	5361	}
4211	5362
	5363	+ if (tps != null && tps.length == 1)
	5364	+ {
	5365	+ EditSelection(false);
	5366	+ }
	5367	+
	5368	+ SetPinStates(tps != null && tps.length > 0);
	5369	+
4212	5370	refreshContents();
4213	5371	//return true;
4214	5372	}
..	..	@@ -4217,6 +5375,53 @@
4217	5375
4218	5376	freezemodel = false;
4219	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	+ }
4220	5425
4221	5426	void linkSomething(Object3D thing)
4222	5427	{
..	..	@@ -4288,16 +5493,19 @@
4288	5493	{
4289	5494	if (group.selection.isEmpty())
4290	5495	return;
4291		- GrafreeD.clipboardIsTempGroup = false;
	5496	+
	5497	+ Grafreed.clipboardIsTempGroup = false;
4292	5498	Composite tGroup = null;
4293	5499	if (group.selection.size() > 0) // 1)
4294	5500	{
4295	5501	tGroup = new cGroup();
4296		- GrafreeD.clipboardIsTempGroup = true;
	5502	+ Grafreed.clipboardIsTempGroup = true;
4297	5503	}
4298	5504
4299	5505	if (cut)
4300	5506	{
	5507	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5508	+// Save();
4301	5509	//int indices[] = jList.getSelectedIndices();
4302	5510	//for (int i = indices.length - 1; i >= 0; i--)
4303	5511	//jList.remove(indices[i]);
..	..	@@ -4333,16 +5541,16 @@
4333	5541	//System.out.println("cut " + child);
4334	5542	//System.out.println("parent = " + child.parent);
4335	5543	// tmp.addChild(child);
4336		- if (GrafreeD.clipboardIsTempGroup)
	5544	+ if (Grafreed.clipboardIsTempGroup)
4337	5545	tGroup.add/Child/(tmp);
4338	5546	else
4339		- GrafreeD.clipboard = tmp;
	5547	+ Grafreed.clipboard = tmp;
4340	5548	}
4341	5549	else
4342		- if (GrafreeD.clipboardIsTempGroup)
	5550	+ if (Grafreed.clipboardIsTempGroup)
4343	5551	tGroup.add/Child/(child);
4344	5552	else
4345		- GrafreeD.clipboard = child;
	5553	+ Grafreed.clipboard = child;
4346	5554	}
4347	5555
4348	5556	//ResetModel();
..	..	@@ -4374,21 +5582,23 @@
4374	5582	//System.out.println("cut " + elem);
4375	5583	//System.out.println("parent = " + elem.parent);
4376	5584	// tmp.addChild(elem);
4377		- if (GrafreeD.clipboardIsTempGroup)
	5585	+ if (Grafreed.clipboardIsTempGroup)
4378	5586	tGroup.add/Child/(tmp);
4379	5587	else
4380		- GrafreeD.clipboard = tmp;
	5588	+ Grafreed.clipboard = tmp;
4381	5589	}
4382	5590	else
4383		- if (GrafreeD.clipboardIsTempGroup)
	5591	+ if (Grafreed.clipboardIsTempGroup)
4384	5592	tGroup.add/Child/(child);
4385	5593	else
4386		- GrafreeD.clipboard = child;
	5594	+ Grafreed.clipboard = child;
4387	5595	}
4388	5596
4389	5597	}
4390		- if (GrafreeD.clipboardIsTempGroup)
4391		- GrafreeD.clipboard = tGroup;
	5598	+
	5599	+ if (Grafreed.clipboardIsTempGroup)
	5600	+ Grafreed.clipboard = tGroup;
	5601	+
4392	5602	if (cut)
4393	5603	{
4394	5604	ResetModel();
..	..	@@ -4398,11 +5608,15 @@
4398	5608
4399	5609	void paste(boolean expand)
4400	5610	{
	5611	+ if (Globals.REPLACEONMAKE)
	5612	+ Save();
	5613	+ boolean keep = Globals.REPLACEONMAKE;
	5614	+ Globals.REPLACEONMAKE = false;
4401	5615	// if (GrafreeD.clipboard == null)
4402	5616	// return;
4403	5617	boolean first = true;
4404	5618
4405		- if (GrafreeD.clipboardIsTempGroup)
	5619	+ if (Grafreed.clipboardIsTempGroup)
4406	5620	{
4407	5621	Composite temp;
4408	5622
..	..	@@ -4413,7 +5627,7 @@
4413	5627	temp = (Composite)Applet3D.clipboard.deepCopy();
4414	5628	*/
4415	5629	Object3D elem;
4416		- 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))
4417	5631	{
4418	5632	Object3D child = (Object3D)e.nextElement();
4419	5633
..	..	@@ -4447,16 +5661,17 @@
4447	5661	//Object3D cb = Applet3D.clipboard;
4448	5662	//temp.addChild(cb);
4449	5663	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4450		- assert(GrafreeD.clipboard.parent == null);
4451		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4452		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4453		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4454		- 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());
4455	5669	else
4456		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4457		- GrafreeD.clipboard.get(0).parent = keepparent;
	5670	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5671	+ Grafreed.clipboard.get(0).parent = keepparent;
4458	5672	}
4459	5673
	5674	+ Globals.REPLACEONMAKE = keep;
4460	5675	ResetModel();
4461	5676	refreshContents();
4462	5677	}
..	..	@@ -4503,9 +5718,9 @@
4503	5718	{
4504	5719	boolean first = true;
4505	5720
4506		- if (GrafreeD.clipboardIsTempGroup)
	5721	+ if (Grafreed.clipboardIsTempGroup)
4507	5722	{
4508		- Composite temp = (Composite)GrafreeD.clipboard;
	5723	+ Composite temp = (Composite)Grafreed.clipboard;
4509	5724	Object3D copy;
4510	5725	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4511	5726	{
..	..	@@ -4515,7 +5730,7 @@
4515	5730	}
4516	5731	} else
4517	5732	{
4518		- linkSomething(GrafreeD.clipboard); //.get(0));
	5733	+ linkSomething(Grafreed.clipboard); //.get(0));
4519	5734	}
4520	5735	}
4521	5736	}
..	..	@@ -4592,6 +5807,10 @@
4592	5807
4593	5808	void group(Object3D csg, boolean grab)
4594	5809	{
	5810	+ if (Globals.REPLACEONMAKE)
	5811	+ Save();
	5812	+ boolean keep = Globals.REPLACEONMAKE;
	5813	+ Globals.REPLACEONMAKE = false;
4595	5814	if (//false) // why??
4596	5815	!group.selection.isEmpty())
4597	5816	{
..	..	@@ -4705,10 +5924,15 @@
4705	5924	//node.add(csg);
4706	5925	//makeSomething(node);
4707	5926	makeSomething(csg);
	5927	+ Globals.REPLACEONMAKE = keep;
4708	5928	}
4709	5929
4710	5930	void Ungroup(Object3D g)
4711	5931	{
	5932	+ if (Globals.REPLACEONMAKE)
	5933	+ Save();
	5934	+ boolean keep = Globals.REPLACEONMAKE;
	5935	+ Globals.REPLACEONMAKE = false;
4712	5936	if (g instanceof HiddenObject)
4713	5937	{
4714	5938	HiddenObject h = (HiddenObject) g;
..	..	@@ -4725,6 +5949,7 @@
4725	5949	objEditor.makeSomething(g.get(i), false);
4726	5950	}
4727	5951	}
	5952	+ Globals.REPLACEONMAKE = keep;
4728	5953	}
4729	5954
4730	5955	void ungroup()
..	..	@@ -4920,21 +6145,6 @@
4920	6145	}
4921	6146	*/
4922	6147
4923		- void ImportGFD()
4924		- {
4925		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4926		- browser.show();
4927		- String filename = browser.getFile();
4928		- if (filename != null && filename.length() > 0)
4929		- {
4930		- String fullname = browser.getDirectory() + filename;
4931		-
4932		- //Object3D readobj =
4933		- objEditor.ReadGFD(fullname, objEditor);
4934		- //makeSomething(readobj);
4935		- }
4936		- }
4937		-
4938	6148	/*
4939	6149	public void Callback(Object obj)
4940	6150	{
..	..	@@ -4958,26 +6168,9 @@
4958	6168	}
4959	6169	*/
4960	6170
4961		- void ImportVRMLX3D()
4962		- {
4963		- if (GrafreeD.standAlone)
4964		- {
4965		- /**/
4966		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4967		- browser.show();
4968		- String filename = browser.getFile();
4969		- if (filename != null && filename.length() > 0)
4970		- {
4971		- String fullname = browser.getDirectory() + filename;
4972		- LoadVRMLX3D(fullname);
4973		- }
4974		- /**/
4975		- }
4976		- }
4977		-
4978	6171	String GetFile(String dialogName)
4979	6172	{
4980		- if (GrafreeD.standAlone)
	6173	+ if (Grafreed.standAlone)
4981	6174	{
4982	6175	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4983	6176	browser.show();
..	..	@@ -5045,7 +6238,43 @@
5045	6238	cButton clearpanelButton;
5046	6239	cButton unselectButton;
5047	6240
	6241	+ cButton restoreCameraButton;
	6242	+
5048	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;
5049	6278
5050	6279	cButton screenfitButton;
5051	6280	cButton screenfitpointButton;
..	..	@@ -5058,14 +6287,6 @@
5058	6287
5059	6288	cButton setsupportButton;
5060	6289
5061		- cButton twoButton;
5062		- cButton sixButton;
5063		- cButton threeButton;
5064		- cButton sevenButton;
5065		- cButton fourButton; // full panel
5066		- cButton oneButton; // full XYZ
5067		- //cButton currentLayout;
5068		-
5069	6290	//
5070	6291	//Composite
5071	6292	Object3D // to do !!
..	..	@@ -5075,10 +6296,12 @@
5075	6296	//JTree jTree;
5076	6297	private MenuItem lookAtItem;
5077	6298	private MenuItem lookFromItem;
5078		- private MenuItem switchItem;
5079		- private MenuItem cutItem;
5080		- private MenuItem duplicateItem;
5081		- 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;
5082	6305	private MenuItem cloneSupportItem;
5083	6306	private MenuItem overwriteGeoItem;
5084	6307	private MenuItem overwriteMatItem;
..	..	@@ -5090,7 +6313,7 @@
5090	6313	private MenuItem linkverticesItem;
5091	6314	private MenuItem relinkverticesItem;
5092	6315	private MenuItem setMasterItem;
5093		- private MenuItem resetMeshItem;
	6316	+ private MenuItem resetAllItem;
5094	6317	private MenuItem stepAllItem;
5095	6318	private MenuItem revertMeshItem;
5096	6319	private MenuItem poseMeshItem;
..	..	@@ -5099,13 +6322,13 @@
5099	6322	private MenuItem cloneGeometriesItem;
5100	6323	private MenuItem shareGeometriesItem;
5101	6324	private MenuItem mergeGeometriesItem;
5102		- private MenuItem copyItem;
	6325	+ private JMenuItem copyItem;
5103	6326	private MenuItem pasteItem;
5104		- private MenuItem pasteIntoItem;
5105		- private MenuItem pasteLinkItem;
5106		- private MenuItem pasteCloneItem;
5107		- private MenuItem pasteExpandItem;
5108		- private MenuItem clearItem;
	6327	+ private JMenuItem pasteIntoItem;
	6328	+ private JMenuItem pasteLinkItem;
	6329	+ private JMenuItem pasteCloneItem;
	6330	+ private JMenuItem pasteExpandItem;
	6331	+ private JMenuItem deleteItem;
5109	6332	private MenuItem clearAllItem;
5110	6333	private MenuItem genUVItem;
5111	6334	private MenuItem genNormalsMESHItem;
..	..	@@ -5140,6 +6363,10 @@
5140	6363	private MenuItem showleavesItem;
5141	6364	private MenuItem markleavesItem;
5142	6365	private MenuItem unmarkleavesItem;
	6366	+ private MenuItem rewindleavesItem;
	6367	+ private MenuItem unrewindleavesItem;
	6368	+ private MenuItem randomleavesItem;
	6369	+ private MenuItem unrandomleavesItem;
5143	6370
5144	6371	private MenuItem flipVItem;
5145	6372	private MenuItem unflipVItem;
..	..	@@ -5151,15 +6378,17 @@
5151	6378	private MenuItem panoTexturesItem;
5152	6379
5153	6380	private MenuItem resetCentroidItem;
5154		- private MenuItem transformgeometryItem;
	6381	+ private MenuItem resetCentroidXZItem;
5155	6382	private MenuItem resetTransformItem;
	6383	+ private MenuItem transformGeometryItem;
	6384	+ private MenuItem transformChildrenItem;
5156	6385	private MenuItem hideItem;
5157		- private MenuItem grabItem;
	6386	+ private JMenuItem grabItem;
5158	6387	private MenuItem backItem;
5159	6388	private MenuItem frontItem;
5160	6389	private MenuItem cameraItem;
5161	6390	private MenuItem compositeItem;
5162		- private MenuItem randomItem;
	6391	+ private MenuItem switchItem;
5163	6392	private MenuItem physicsItem;
5164	6393	private MenuItem frameselectorItem;
5165	6394	private MenuItem scriptNodeItem;
..	..	@@ -5167,7 +6396,7 @@
5167	6396	private MenuItem switchTransfoItem;
5168	6397	private MenuItem morphItem;
5169	6398	private MenuItem linkerItem;
5170		- private MenuItem ungroupItem;
	6399	+ private JMenuItem ungroupItem;
5171	6400	private MenuItem editItem;
5172	6401	private MenuItem openWindowItem;
5173	6402	private MenuItem editLeafItem;
..	..	@@ -5183,6 +6412,8 @@
5183	6412	private MenuItem attachBumpItem;
5184	6413	private MenuItem detachBumpItem;
5185	6414	private MenuItem pigmentBumpItem;
	6415	+ private MenuItem embedTexturesItem;
	6416	+ private MenuItem deEmbedTexturesItem;
5186	6417
5187	6418	private MenuItem particleItem;
5188	6419	private MenuItem ragdollItem;
..	..	@@ -5221,11 +6452,6 @@
5221	6452	private MenuItem doubleItem;
5222	6453	private MenuItem tripleItem;
5223	6454
5224		- private MenuItem importGFDItem;
5225		- private MenuItem importVRMLX3DItem;
5226		- private MenuItem import3DSItem;
5227		- private MenuItem importOBJItem;
5228		-
5229	6455	private MenuItem computeAOItem;
5230	6456	private MenuItem recompileItem;
5231	6457	private MenuItem editScriptItem;
..	..	@@ -5235,4 +6461,8 @@
5235	6461	private MenuItem analyzeItem;
5236	6462	private MenuItem dumpItem;
5237	6463	//boolean freezemodel = false;
	6464	+
	6465	+ Menu cameraMenu;
	6466	+ MenuItem editCameraItem;
	6467	+ MenuItem restoreCameraItem;
5238	6468	}