~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,351 @@
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", !Grafreed.NIMBUSLAF));
	33	+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
	34	+ skyboxButton.setToolTipText(s);
	35	+ skyboxButton.addActionListener(new ActionListener()
	36	+ {
	37	+ @Override
	38	+ public void actionPerformed(ActionEvent e)
	39	+ {
	40	+ ChangeSkybox(path);
	41	+ }
	42	+ });
	43	+ }
	44	+
	45	+ public void AddTextureButton(String f, String c, final String t, int count, cGridBag row)
	46	+ {
	47	+ cButton textureButton;
	48	+ final String path = "textures/" + f + "/" + c + "/"; // + t;
	49	+ row.add(textureButton = GetButton(path + "icons/" + t, !Grafreed.NIMBUSLAF));
	50	+ textureButton.setToolTipText(c + count);
	51	+ textureButton.addActionListener(new ActionListener()
	52	+ {
	53	+ @Override
	54	+ public void actionPerformed(ActionEvent e)
	55	+ {
	56	+ ChangeTexture(path + t);
	57	+ }
	58	+ });
	59	+ }
	60	+
	61	+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
	62	+ {
	63	+ cGridBag tab0 = new cGridBag().setVertical(true);
	64	+
	65	+ tab0.setName("Urban");
	66	+ skyboxpanel.add(tab0);
	67	+
	68	+ cGridBag row0 = new cGridBag();
	69	+ cGridBag row1 = new cGridBag();
	70	+ cGridBag row2 = new cGridBag();
	71	+ cGridBag row3 = new cGridBag();
	72	+ cGridBag row4 = new cGridBag();
	73	+ cGridBag row5 = new cGridBag();
	74	+ cGridBag row6 = new cGridBag();
	75	+
	76	+ AddSkyboxButton("default", "rgb", row0);
	77	+ //AddSkyboxButton("default", "cornell", row0);
	78	+ AddSkyboxButton("penguins", "dust", row0);
	79	+ AddSkyboxButton("penguins", "tropic", row0);
	80	+ AddSkyboxButton("penguins", "yonder", row0);
	81	+
	82	+ AddSkyboxButton("default", "uffizi", row1);
	83	+ AddSkyboxButton("bridge", "Bridge", row1);
	84	+ AddSkyboxButton("bridge", "Bridge2", row1);
	85	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	86	+
	87	+ AddSkyboxButton("urban", "Parliament", row2);
	88	+ AddSkyboxButton("urban", "Roundabout", row2);
	89	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	90	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	91	+
	92	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	93	+ AddSkyboxButton("urban", "UnionSquare", row3);
	94	+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
	95	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	96	+
	97	+ AddSkyboxButton("park", "Buddha", row4);
	98	+ AddSkyboxButton("park", "CNTower2", row4);
	99	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	100	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	101	+
	102	+ AddSkyboxButton("park", "Park", row5);
	103	+ AddSkyboxButton("park", "Pond", row5);
	104	+ AddSkyboxButton("park", "Skansen", row5);
	105	+ AddSkyboxButton("park", "Skansen2", row5);
	106	+
	107	+ AddSkyboxButton("park", "Skansen3", row6);
	108	+ AddSkyboxButton("park", "Skansen4", row6);
	109	+ AddSkyboxButton("park", "Skansen5", row6);
	110	+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
	111	+
	112	+ tab0.add(row0);
	113	+ tab0.add(row1);
	114	+ tab0.add(row2);
	115	+ tab0.add(row3);
	116	+ tab0.add(row4);
	117	+ tab0.add(row5);
	118	+ tab0.add(row6);
	119	+
	120	+ for (int i=5; --i>=0;)
	121	+ {
	122	+ //oe.toolboxPanel.Return();
	123	+ //tab0.add(new cGridBag());
	124	+ }
	125	+ }
	126	+
	127	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	128	+ {
	129	+ cGridBag tab0 = new cGridBag().setVertical(true);
	130	+
	131	+ tab0.setName("Nature");
	132	+ skyboxpanel.add(tab0);
	133	+
	134	+ cGridBag row0 = new cGridBag();
	135	+ cGridBag row1 = new cGridBag();
	136	+ cGridBag row2 = new cGridBag();
	137	+ cGridBag row3 = new cGridBag();
	138	+ cGridBag row4 = new cGridBag();
	139	+ cGridBag row5 = new cGridBag();
	140	+ cGridBag row6 = new cGridBag();
	141	+
	142	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	143	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	144	+ AddSkyboxButton("beach", "PalmTrees", row0);
	145	+ AddSkyboxButton("beach", "Tenerife", row0);
	146	+
	147	+ AddSkyboxButton("beach", "Tenerife2", row1);
	148	+ AddSkyboxButton("beach", "Tenerife3", row1);
	149	+ AddSkyboxButton("field", "FishPond", row1);
	150	+ AddSkyboxButton("field", "Footballfield", row1);
	151	+
	152	+ AddSkyboxButton("field", "Meadow", row2);
	153	+ AddSkyboxButton("field", "Sorsele", row2);
	154	+ AddSkyboxButton("field", "Sorsele2", row2);
	155	+ AddSkyboxButton("field", "Sorsele3", row2);
	156	+
	157	+ AddSkyboxButton("forest", "Brudslojan", row3);
	158	+ AddSkyboxButton("forest", "Langholmen2", row3);
	159	+ AddSkyboxButton("forest", "Plants", row3);
	160	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	161	+
	162	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	163	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	164	+ AddSkyboxButton("mountain", "Teide", row4);
	165	+ AddSkyboxButton("park", "Tantolunden4", row4);
	166	+
	167	+ AddSkyboxButton("park", "Stairs", row5);
	168	+ AddSkyboxButton("default", "skycube", row6);
	169	+ AddSkyboxButton("rocky", "Langholmen", row5);
	170	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	171	+
	172	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	173	+ AddSkyboxButton("default", "CloudyHills", row6);
	174	+ AddSkyboxButton("daz", "Autumn", row6);
	175	+ AddSkyboxButton("daz", "MountainTrail", row6);
	176	+ /*
	177	+Autumn
	178	+Greenlands
	179	+MountainTrail
	180	+Oasis
	181	+TheRock
	182	+TopOfTheWorld
	183	+Winter
	184	+ */
	185	+
	186	+ tab0.add(row0);
	187	+ tab0.add(row1);
	188	+ tab0.add(row2);
	189	+ tab0.add(row3);
	190	+ tab0.add(row4);
	191	+ tab0.add(row5);
	192	+ tab0.add(row6);
	193	+
	194	+ for (int i=5; --i>=0;)
	195	+ {
	196	+ //oe.toolboxPanel.Return();
	197	+ //tab0.add(new cGridBag());
	198	+ }
	199	+ }
	200	+
	201	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	202	+ {
	203	+ cGridBag tab0 = new cGridBag().setVertical(true);
	204	+
	205	+ tab0.setName("Night");
	206	+ skyboxpanel.add(tab0);
	207	+
	208	+ cGridBag row0 = new cGridBag();
	209	+ cGridBag row1 = new cGridBag();
	210	+ cGridBag row2 = new cGridBag();
	211	+ cGridBag row3 = new cGridBag();
	212	+ cGridBag row4 = new cGridBag();
	213	+ cGridBag row5 = new cGridBag();
	214	+ cGridBag row6 = new cGridBag();
	215	+
	216	+ AddSkyboxButton("night", "NightPath", row0);
	217	+ AddSkyboxButton("night", "PondNight", row0);
	218	+ AddSkyboxButton("night", "Powerlines", row0);
	219	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	220	+
	221	+ AddSkyboxButton("urban", "CNTower", row1);
	222	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	223	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	224	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
	225	+
	226	+ AddSkyboxButton("penguins", "kenon_star", row2);
	227	+ AddSkyboxButton("persson", "corona", row2);
	228	+ AddSkyboxButton("persson", "spaceskybox", row2);
	229	+ AddSkyboxButton("indoors", "Vasa", row2);
	230	+
	231	+ AddSkyboxButton("winter", "Backyard", row3);
	232	+ AddSkyboxButton("winter", "Creek", row3);
	233	+ AddSkyboxButton("winter", "FootballField3", row3);
	234	+ AddSkyboxButton("winter", "Forest", row3);
	235	+
	236	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	237	+ AddSkyboxButton("winter", "House", row4);
	238	+ AddSkyboxButton("winter", "IceLake", row4);
	239	+ AddSkyboxButton("winter", "IceRiver", row4);
	240	+
	241	+ AddSkyboxButton("winter", "Park3", row5);
	242	+ AddSkyboxButton("winter", "PondWinter", row5);
	243	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	244	+ AddSkyboxButton("winter", "Vindelalven", row5);
	245	+
	246	+ AddSkyboxButton("daz", "TheRock", row6);
	247	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	248	+ AddSkyboxButton("daz", "Winter", row6);
	249	+ AddSkyboxButton("mountain", "Ryfjallet", row6);
	250	+
	251	+ tab0.add(row0);
	252	+ tab0.add(row1);
	253	+ tab0.add(row2);
	254	+ tab0.add(row3);
	255	+ tab0.add(row4);
	256	+ tab0.add(row5);
	257	+ tab0.add(row6);
	258	+
	259	+ for (int i=5; --i>=0;)
	260	+ {
	261	+ //oe.toolboxPanel.Return();
	262	+ //tab0.add(new cGridBag());
	263	+ }
	264	+ }
	265	+
	266	+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
	267	+ {
	268	+ cGridBag tab0 = new cGridBag().setVertical(true);
	269	+
	270	+ tab0.setName("Others");
	271	+ skyboxpanel.add(tab0);
	272	+
	273	+ cGridBag row0 = new cGridBag();
	274	+ cGridBag row1 = new cGridBag();
	275	+ cGridBag row2 = new cGridBag();
	276	+ cGridBag row3 = new cGridBag();
	277	+ cGridBag row4 = new cGridBag();
	278	+ cGridBag row5 = new cGridBag();
	279	+ cGridBag row6 = new cGridBag();
	280	+
	281	+ AddSkyboxButton("mayhem", "afterrain", row0);
	282	+ AddSkyboxButton("mayhem", "aqua4", row0);
	283	+ AddSkyboxButton("mayhem", "aqua9", row0);
	284	+ AddSkyboxButton("mayhem", "flame", row0);
	285	+
	286	+ AddSkyboxButton("mayhem", "h2s", row1);
	287	+ AddSkyboxButton("mayhem", "prehistoric", row1);
	288	+ AddSkyboxButton("mayhem", "scorched", row1);
	289	+ AddSkyboxButton("penguins", "desertdawn", row1);
	290	+
	291	+ AddSkyboxButton("persson", "Citadella", row2);
	292	+ AddSkyboxButton("persson", "Citadella2", row2);
	293	+ AddSkyboxButton("persson", "clouds1", row2);
	294	+ AddSkyboxButton("penguins", "wrath", row2);
	295	+
	296	+ AddSkyboxButton("persson", "FishermansBastion", row3);
	297	+ AddSkyboxButton("persson", "HeroesSquare", row3);
	298	+ AddSkyboxButton("indoors", "DallasW", row3);
	299	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
	300	+
	301	+ AddSkyboxButton("persson", "LancellottiChapel", row4);
	302	+ AddSkyboxButton("persson", "PereaBeach1", row4);
	303	+ AddSkyboxButton("persson", "PereaBeach2", row4);
	304	+ AddSkyboxButton("persson", "redeclipse", row4);
	305	+
	306	+ AddSkyboxButton("daz", "Greenlands", row5);
	307	+ AddSkyboxButton("daz", "Oasis", row5);
	308	+ AddSkyboxButton("elyvisions", "arch3", row5);
	309	+ AddSkyboxButton("elyvisions", "calm_sea", row5);
	310	+
	311	+ AddSkyboxButton("elyvisions", "rainbow", row6);
	312	+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
	313	+ AddSkyboxButton("elyvisions", "heaven", row6);
	314	+ AddSkyboxButton("elyvisions", "hot", row6);
	315	+
	316	+ tab0.add(row0);
	317	+ tab0.add(row1);
	318	+ tab0.add(row2);
	319	+ tab0.add(row3);
	320	+ tab0.add(row4);
	321	+ tab0.add(row5);
	322	+ tab0.add(row6);
	323	+
	324	+ for (int i=5; --i>=0;)
	325	+ {
	326	+ //oe.toolboxPanel.Return();
	327	+ //tab0.add(new cGridBag());
	328	+ }
	329	+ }
	330	+
	331	+ public void ChangeSkybox(String skybox)
	332	+ {
	333	+ //cameraView.envyoff = false;
	334	+ group.skyboxname = skybox;
	335	+ group.skyboxext = "jpg";
	336	+ cameraView.repaint();
	337	+ }
	338	+
	339	+ public void CreateSkyboxPanel(cGridBag skyboxPanel)
	340	+ {
	341	+ JTabbedPane skyboxpane = new JTabbedPane();
	342	+
	343	+ AddSkyboxTab0(skyboxpane);
	344	+ AddSkyboxTab1(skyboxpane);
	345	+ AddSkyboxTab2(skyboxpane);
	346	+ AddSkyboxTab3(skyboxpane);
	347	+
	348	+ skyboxPanel.add(skyboxpane);
	349	+ }
	350	+
	351	+ public void ChangeTexture(String texture)
	352	+ {
	353	+ for (int i=0; i<group.selection.size(); i++)
	354	+ {
	355	+ Object3D obj = group.selection.get(i);
	356	+ obj.SetPigmentTexture("@" + texture);
	357	+ }
	358	+
	359	+ refreshContents();
	360	+ }
	361	+
	362	+ public void Show3DView()
	363	+ {
	364	+ // bug
	365	+ //gridPanel.setDividerLocation(1.0);
	366	+ //bigPanel.setDividerLocation(0.0);
	367	+ bigThree.ClearUI();
	368	+ bigThree.add(centralPanel);
	369	+ bigThree.FlushUI();
	370	+ }
	371	+
26	372	//ObjEditor objEditor;
27	373	public void closeUI2()
28	374	{
..	..	@@ -60,6 +406,12 @@
60	406	this.copy = this.group = group;
61	407	//selectees = this.group.selectees;
62	408
	409	+ if (copy.versionlist == null)
	410	+ {
	411	+ copy.versionlist = new Object3D[100];
	412	+ copy.versionindex = -1;
	413	+ }
	414	+
63	415	if(ui)
64	416	SetupUI(objEditor);
65	417	}
..	..	@@ -74,16 +426,28 @@
74	426	this.copy = this.group = copy;
75	427	//selectees = this.group.selectees;
76	428
77		- SetupMenu2(objEditor);
	429	+ SetupMenu2(this); //objEditor);
78	430	SetupUI2(objEditor);
79	431	objEditor.SetupUI(true);
80	432	SetupViews(objEditor);
81	433
82	434	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	435	+
	436	+ if (copy.versionlist == null)
	437	+ {
	438	+ copy.versionlist = new Object3D[100];
	439	+ copy.versionindex = -1;
	440	+
	441	+ Save(true);
	442	+ }
83	443	}
84	444
85	445	void CloneSelection(boolean supports)
86	446	{
	447	+ if (Globals.REPLACEONMAKE)
	448	+ Save();
	449	+ boolean keep = Globals.REPLACEONMAKE;
	450	+ Globals.REPLACEONMAKE = false;
87	451	// Object3D keep = GrafreeD.clipboard;
88	452	//Object3D obj;
89	453	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,18 +458,19 @@
94	458
95	459	makeSomething(clone, i==group.selection.size()-1);
96	460	}
	461	+ Globals.REPLACEONMAKE = keep;
97	462	}
98	463
99	464	void CloneClipboard(boolean supports)
100	465	{
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));
	466	+ assert(Grafreed.clipboard.parent == null);
	467	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	468	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	469	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	470	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
106	471	else
107		- makeSomething(CloneObject(GrafreeD.clipboard, false));
108		- GrafreeD.clipboard.get(0).parent = keepparent;
	472	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	473	+ Grafreed.clipboard.get(0).parent = keepparent;
109	474	}
110	475
111	476	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -119,7 +484,7 @@
119	484	// obj.support = null;
120	485	if (!supports)
121	486	obj.SaveSupports();
122		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	487	+ Object3D clone = (Object3D)Grafreed.clone(obj);
123	488	obj.parent = parent;
124	489	// obj.support = support;
125	490	// clone.support = support; // aout 2013
..	..	@@ -148,30 +513,29 @@
148	513
149	514	//JTextField nameField;
150	515
151		- void SetupMenu2(ObjEditor oe)
	516	+ void SetupMenu2(GroupEditor oe)
152	517	{
153		- oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
154		- //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
155		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
156		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
157		- oe.cameraMenu.add("-");
158		- openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
159		- openWindowItem.addActionListener(this);
160		- editLeafItem.addActionListener(this);
161		- lookAtItem.addActionListener(this);
162		- //lookFromItem.addActinoListener(this);
163		- //switchItem.addActionListener(this);
	518	+ oe.jTree = new cTree();
	519	+
164	520	Menu menu;
165	521	oe.menuBar.add(menu = new Menu("Edit"));
166	522	//editItem = menu.add(new MenuItem("Edit"));
167	523	//editItem.addActionListener(this);
168		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	524	+
	525	+// undoItem = menu.add(new MenuItem("Undo"));
	526	+// undoItem.addActionListener(this);
	527	+// redoItem = menu.add(new MenuItem("Redo"));
	528	+// redoItem.addActionListener(this);
	529	+// menu.add("-");
	530	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
169	531	duplicateItem.addActionListener(this);
170		- menu.add("-");
171	532	cloneItem = menu.add(new MenuItem("Clone"));
172	533	cloneItem.addActionListener(this);
	534	+ if (Globals.ADVANCED)
	535	+ {
173	536	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
174	537	cloneSupportItem.addActionListener(this);
	538	+ }
175	539	menu.add("-");
176	540	cutItem = menu.add(new MenuItem("Cut"));
177	541	cutItem.addActionListener(this);
..	..	@@ -179,27 +543,123 @@
179	543	copyItem.addActionListener(this);
180	544	pasteItem = menu.add(new MenuItem("Paste"));
181	545	pasteItem.addActionListener(this);
	546	+
	547	+ menu.add("-");
	548	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	549	+ pasteIntoItem.addActionListener(this);
182	550	pasteLinkItem = menu.add(new MenuItem("Paste link"));
183	551	pasteLinkItem.addActionListener(this);
184	552	pasteCloneItem = menu.add(new MenuItem("Paste clone"));
185	553	pasteCloneItem.addActionListener(this);
186	554	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
187	555	// pasteExpandItem.addActionListener(this);
188		- clearItem = menu.add(new MenuItem("Clear"));
189		- clearItem.addActionListener(this);
	556	+ menu.add("-");
	557	+ deleteItem = menu.add(new MenuItem("Delete"));
	558	+ deleteItem.addActionListener(this);
	559	+
	560	+ if (Globals.ADVANCED)
	561	+ {
	562	+ // Deletes the cameras...
190	563	clearAllItem = menu.add(new MenuItem("Clear All"));
191	564	clearAllItem.addActionListener(this);
	565	+ }
	566	+
	567	+ menuBar.add(cameraMenu = new Menu("View"));
	568	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	569	+ //zBufferItem.addActionListener(this);
	570	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	571	+ //normalLensItem.addActionListener(this);
	572	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	573	+ restoreCameraItem.addActionListener(this);
	574	+
	575	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	576	+// toggleFullScreenItem.addItemListener(this);
	577	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	578	+// cameraMenu.add("-");
	579	+//
	580	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	581	+// toggleTextureItem.addItemListener(this);
	582	+// toggleTextureItem.setState(CameraPane.textureon);
	583	+//
	584	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	585	+// toggleSwitchItem.addItemListener(this);
	586	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	587	+
	588	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	589	+ toggleHandleItem.addItemListener(this);
	590	+ toggleHandleItem.setState(CameraPane.HANDLES);
	591	+
	592	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	593	+ togglePaintItem.addItemListener(this);
	594	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	595	+
	596	+ if (Globals.ADVANCED)
	597	+ {
	598	+ cameraMenu.add("-");
	599	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	600	+ toggleLiveItem.addItemListener(this);
	601	+ toggleLiveItem.setState(Globals.isLIVE());
192	602
	603	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	604	+ stepItem.addActionListener(this);
	605	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	606	+ // toggleDLItem.addItemListener(this);
	607	+ // toggleDLItem.setState(false);
	608	+
	609	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	610	+ toggleRenderItem.addItemListener(this);
	611	+ toggleRenderItem.setState(!CameraPane.frozen);
	612	+
	613	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	614	+ toggleDebugItem.addItemListener(this);
	615	+ toggleDebugItem.setState(Globals.DEBUG);
	616	+
	617	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	618	+ toggleFrustumItem.addItemListener(this);
	619	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	620	+
	621	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	622	+ toggleFootContactItem.addItemListener(this);
	623	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	624	+
	625	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	626	+ toggleTimelineItem.addItemListener(this);
	627	+ }
	628	+
	629	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	630	+// toggleRootItem.addItemListener(this);
	631	+// toggleRootItem.setState(false);
	632	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	633	+// animationItem.addItemListener(this);
	634	+// animationItem.setState(CameraPane.ANIMATION);
	635	+ cameraMenu.add("-");
	636	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	637	+ editCameraItem.addActionListener(this);
	638	+
	639	+ if (Globals.ADVANCED)
	640	+ {
	641	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	642	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	643	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	644	+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	645	+ oe.cameraMenu.add("-");
	646	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	647	+ openWindowItem.addActionListener(this);
	648	+ editLeafItem.addActionListener(this);
	649	+ lookAtItem.addActionListener(this);
	650	+ //lookFromItem.addActinoListener(this);
	651	+ //switchViewItem.addActionListener(this);
	652	+ }
	653	+
193	654	oe.menuBar.add(menu = new Menu("Setting"));
194		- resetMeshItem = menu.add(new MenuItem("Reset All"));
195		- resetMeshItem.addActionListener(this);
196		- stepAllItem = menu.add(new MenuItem("Step All"));
197		- stepAllItem.addActionListener(this);
	655	+ if (Globals.ADVANCED)
	656	+ {
198	657	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
199	658	revertMeshItem.addActionListener(this);
200	659	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
201	660	resetreferencesItem.addActionListener(this);
202	661	menu.add("-");
	662	+ }
203	663	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
204	664	overwriteGeoItem.addActionListener(this);
205	665	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -211,79 +671,104 @@
211	671	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
212	672	overwriteUVItem.addActionListener(this);
213	673	menu.add("-");
	674	+ if (Globals.ADVANCED)
	675	+ {
214	676	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
215	677	generateMeshItem.addActionListener(this);
216	678	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
217	679	poseMeshItem.addActionListener(this);
218	680	menu.add("-");
	681	+ }
219	682	resetsupportItem = menu.add(new MenuItem("Reset support"));
220	683	resetsupportItem.addActionListener(this);
221	684	linkverticesItem = menu.add(new MenuItem("Link to Support"));
222	685	linkverticesItem.addActionListener(this);
223	686	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
224	687	relinkverticesItem.addActionListener(this);
	688	+
	689	+ if (Globals.ADVANCED)
	690	+ {
225	691	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
226	692	setMasterItem.addActionListener(this);
	693	+ }
227	694
228	695	oe.menuBar.add(menu = new Menu("Group"));
229		- grabItem = menu.add(new MenuItem("Grab"));
230		- grabItem.addActionListener(this);
	696	+// grabItem = menu.add(new MenuItem("Grab"));
	697	+// grabItem.addActionListener(this);
231	698	backItem = menu.add(new MenuItem("Back"));
232	699	backItem.addActionListener(this);
233	700	frontItem = menu.add(new MenuItem("Front"));
234	701	frontItem.addActionListener(this);
235		- compositeItem = menu.add(new MenuItem("Composite"));
236		- compositeItem.addActionListener(this);
237		- hideItem = menu.add(new MenuItem("Hide"));
	702	+// compositeItem = menu.add(new MenuItem("Composite"));
	703	+// compositeItem.addActionListener(this);
	704	+
	705	+ if (Globals.ADVANCED)
	706	+ {
	707	+ hideItem = menu.add(new MenuItem("Hidden Group"));
238	708	hideItem.addActionListener(this);
	709	+ }
239	710	ungroupItem = menu.add(new MenuItem("Ungroup"));
240	711	ungroupItem.addActionListener(this);
241		- menu.add("-");
242		- randomItem = menu.add(new MenuItem("Random"));
243		- randomItem.addActionListener(this);
244		- physicsItem = menu.add(new MenuItem("Physics"));
245		- physicsItem.addActionListener(this);
246		- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
247		- frameselectorItem.addActionListener(this);
	712	+
	713	+// menu.add("-");
	714	+//
	715	+// switchItem = menu.add(new MenuItem("Switch node"));
	716	+// switchItem.addActionListener(this);
	717	+ if (Globals.ADVANCED)
	718	+ {
248	719	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
249	720	switchGeoItem.addActionListener(this);
250	721	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
251	722	switchTransfoItem.addActionListener(this);
252		- morphItem = menu.add(new MenuItem("Morph"));
	723	+ morphItem = menu.add(new MenuItem("Morph Group"));
253	724	morphItem.addActionListener(this);
	725	+
	726	+ menu.add("-");
	727	+ physicsItem = menu.add(new MenuItem("Physics"));
	728	+ physicsItem.addActionListener(this);
	729	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	730	+ frameselectorItem.addActionListener(this);
254	731	scriptNodeItem = menu.add(new MenuItem("Script Node"));
255	732	scriptNodeItem.addActionListener(this);
256		- cameraItem = menu.add(new MenuItem("Camera"));
257		- cameraItem.addActionListener(this);
	733	+ }
258	734
259	735	oe.menuBar.add(menu = new Menu("Object"));
260		- textureItem = menu.add(new MenuItem("Texture"));
261		- textureItem.addActionListener(this);
	736	+// textureItem = menu.add(new MenuItem("Texture"));
	737	+// textureItem.addActionListener(this);
262	738	billboardItem = menu.add(new MenuItem("Billboard"));
263	739	billboardItem.addActionListener(this);
264	740	csgItem = menu.add(new MenuItem("CSG"));
265	741	csgItem.addActionListener(this);
266		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	742	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
267	743	shadowXItem.addActionListener(this);
268		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	744	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
269	745	shadowYItem.addActionListener(this);
270		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	746	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
271	747	shadowZItem.addActionListener(this);
	748	+ attributeItem = menu.add(new MenuItem("Attribute"));
	749	+ attributeItem.addActionListener(this);
	750	+
	751	+ if (Globals.ADVANCED)
	752	+ {
	753	+ menu.add("-");
272	754	linkerItem = menu.add(new MenuItem("Linker"));
273	755	linkerItem.addActionListener(this);
274	756	templateItem = menu.add(new MenuItem("Template"));
275	757	templateItem.addActionListener(this);
276		- attributeItem = menu.add(new MenuItem("Attribute"));
277		- attributeItem.addActionListener(this);
278	758	pointflowItem = menu.add(new MenuItem("Point Flow"));
279	759	pointflowItem.addActionListener(this);
	760	+ }
280	761	menu.add("-");
281	762	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
282	763	resetTransformItem.addActionListener(this);
283	764	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
284	765	resetCentroidItem.addActionListener(this);
285		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
286		- transformgeometryItem.addActionListener(this);
	766	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	767	+ resetCentroidXZItem.addActionListener(this);
	768	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	769	+ transformGeometryItem.addActionListener(this);
	770	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	771	+ transformChildrenItem.addActionListener(this);
287	772
288	773	oe.menuBar.add(menu = new Menu("Geometry"));
289	774	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -294,8 +779,11 @@
294	779	genNormalsCADItem.addActionListener(this);
295	780	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
296	781	genNormalsMESHItem.addActionListener(this);
297		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	782	+ if (Globals.ADVANCED)
	783	+ {
	784	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
298	785	genNormalsMINEItem.addActionListener(this);
	786	+ }
299	787	stripifyItem = menu.add(new MenuItem("Stripify"));
300	788	stripifyItem.addActionListener(this);
301	789	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -317,23 +805,34 @@
317	805	reduce34MeshItem.addActionListener(this);
318	806	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
319	807	increaseMeshItem.addActionListener(this);
320		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
321		- smoothMeshItem.addActionListener(this);
322	808	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
323	809	clipMeshItem.addActionListener(this);
	810	+
	811	+ if (Globals.ADVANCED)
	812	+ {
	813	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	814	+ smoothMeshItem.addActionListener(this);
	815	+ }
324	816
325	817	oe.menuBar.add(menu = new Menu("Attributes"));
326	818	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
327	819	clearMaterialsItem.addActionListener(this);
	820	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	821	+ resetAllItem.addActionListener(this);
	822	+ stepAllItem = menu.add(new MenuItem("Step All"));
	823	+ stepAllItem.addActionListener(this);
328	824	menu.add("-");
329	825	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
330	826	liveleavesItem.addActionListener(this);
331	827	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
332	828	unliveleavesItem.addActionListener(this);
	829	+ if (Globals.ADVANCED)
	830	+ {
333	831	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
334	832	supportleavesItem.addActionListener(this);
335	833	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
336	834	unsupportleavesItem.addActionListener(this);
	835	+ }
337	836	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
338	837	hideleavesItem.addActionListener(this);
339	838	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -342,6 +841,14 @@
342	841	markleavesItem.addActionListener(this);
343	842	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
344	843	unmarkleavesItem.addActionListener(this);
	844	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	845	+ rewindleavesItem.addActionListener(this);
	846	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	847	+ unrewindleavesItem.addActionListener(this);
	848	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	849	+ randomleavesItem.addActionListener(this);
	850	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	851	+ unrandomleavesItem.addActionListener(this);
345	852	menu.add("-");
346	853	flipVItem = menu.add(new MenuItem("Flip V"));
347	854	flipVItem.addActionListener(this);
..	..	@@ -367,53 +874,126 @@
367	874	attachBumpItem.addActionListener(this);
368	875	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
369	876	pigmentBumpItem.addActionListener(this);
	877	+ //embedTexturesItem
370	878	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
371	879	detachPigmentItem.addActionListener(this);
372	880	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
373	881	detachBumpItem.addActionListener(this);
	882	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	883	+ embedTexturesItem.addActionListener(this);
	884	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	885	+ deEmbedTexturesItem.addActionListener(this);
374	886	menu.add("-");
375	887	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
376	888	sortbysizeItem.addActionListener(this);
377	889	sortbynameItem = menu.add(new MenuItem("Sort by name"));
378	890	sortbynameItem.addActionListener(this);
379	891	menu.add("-");
	892	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	893	+ shareGeometriesItem.addActionListener(this);
	894	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	895	+ mergeGeometriesItem.addActionListener(this);
	896	+ if (Globals.ADVANCED)
	897	+ {
	898	+ // Pretty much the same as duplicate and clone.
380	899	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
381	900	extractGeometriesItem.addActionListener(this);
382	901	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
383	902	cloneGeometriesItem.addActionListener(this);
384		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
385		- shareGeometriesItem.addActionListener(this);
386		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
387		- mergeGeometriesItem.addActionListener(this);
	903	+ }
388	904
389	905	oe.menuBar.add(menu = new Menu("Insert"));
390	906	buildCreateMenu(menu);
391	907
392		-
393		- oe.menuBar.add(menu = new Menu("Include"));
394		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
395		- importGFDItem.addActionListener(this);
396		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
397		- importVRMLX3DItem.addActionListener(this);
398		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
399		- importOBJItem.addActionListener(this);
400		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
401		- import3DSItem.addActionListener(this);
402		-
403	908	oe.menuBar.add(menu = new Menu("Tools"));
404	909	buildToolsMenu(menu);
405	910	}
406	911
	912	+ JTabbedPane resourcecontainer;
	913	+ cGridBag currenttab;
	914	+ boolean added; // patch for jar
	915	+
	916	+ int tabcount = 0;
	917	+ int colcount = 0;
	918	+ int rowcount = 0;
	919	+ int texturecount = 0;
	920	+
	921	+ int columns = 5;
	922	+ int rows = 7;
	923	+
	924	+ public void ResourceCallBack(String[] path)
	925	+ {
	926	+// for (int i = 0; i < path.length; i++)
	927	+// System.out.print(path[i] + "/");
	928	+// System.out.println();
	929	+
	930	+ if (//rowcount == 0 \|\|
	931	+ path.length == 1)
	932	+ {
	933	+ currenttab = new cGridBag();
	934	+ added = false;
	935	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	936	+ currenttab.setName(tabname);
	937	+ rowcount = 1;
	938	+ colcount = 0;
	939	+ texturecount = 0;
	940	+ }
	941	+
	942	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	943	+ {
	944	+ if (!added)
	945	+ {
	946	+ added = true;
	947	+ resourcecontainer.add(currenttab);
	948	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	949	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	950	+ }
	951	+
	952	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	953	+
	954	+ if (++colcount >= columns)
	955	+ {
	956	+ colcount = 0;
	957	+ currenttab.Return();
	958	+
	959	+ if (rowcount++ >= rows)
	960	+ {
	961	+ rowcount = 0;
	962	+ }
	963	+ }
	964	+ }
	965	+ else
	966	+ {
	967	+// if (!path[path.length-1].equals("icons"))
	968	+// resourcecontainer.Return();
	969	+ }
	970	+ }
	971	+
	972	+ void CreateTexturePanel(cGridBag container)
	973	+ {
	974	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	975	+ container.add(resourcecontainer);
	976	+
	977	+ Grafreed.ParseResources("textures", this);
	978	+ }
	979	+
407	980	void SetupUI2(ObjEditor oe)
408	981	{
	982	+ // June 2019
	983	+ if (oe == null)
	984	+ {
	985	+ //super.SetupUI2(this);
	986	+ //return;
	987	+ }
	988	+
	989	+ if (copy != group)
	990	+ {
	991	+ //super.SetupUI2(this);
	992	+ }
	993	+
409	994	//new Exception().printStackTrace();
410	995
411	996	oe.radioPanel = new JPanel(new GridBagLayout());
412		- oe.aConstraints.weightx = 1;
413		- oe.aConstraints.weighty = 0;
414		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
415		- oe.aConstraints.gridwidth = 100;
416		- oe.aConstraints.gridheight = 1;
417	997	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
418	998
419	999	oe.buttonGroup = new ButtonGroup();
..	..	@@ -434,110 +1014,263 @@
434	1014	oe.radioPanel.add(dummyButton);
435	1015	oe.buttonGroup.add(dummyButton);
436	1016	*/
437		- aConstraints.gridy += 1;
	1017	+ cGridBag copyOptionsPanel = new cGridBag();
	1018	+
	1019	+ copyOptionsPanel.preferredHeight = 2;
438	1020
439	1021	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
440	1022
441		- oe.aConstraints.gridwidth = 1;
442		- oe.aConstraints.gridx = 0;
	1023	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1024	+ //minButton.setToolTipText("Minimize window");
	1025	+ //minButton.addActionListener(this);
443	1026
444		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
445		- liveCB.setToolTipText("Enabled animation");
446		- liveCB.addItemListener(this);
447		-
448		- oe.aConstraints.gridx += 1;
449		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK), oe.aConstraints);
450		- trackCB.setToolTipText("Enable tracking");
451		- trackCB.addItemListener(this);
452		-
453		- oe.aConstraints.gridx += 1;
454		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	1027	+ if (Globals.ADVANCED)
	1028	+ {
	1029	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1030	+ maxButton.setToolTipText("Maximize window");
	1031	+ maxButton.addActionListener(this);
	1032	+ }
	1033	+
	1034	+ cButton gcButton;
	1035	+
	1036	+ oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1037	+ gcButton.setToolTipText("Garbage collect");
	1038	+ gcButton.addActionListener(new ActionListener()
	1039	+ {
	1040	+ public void actionPerformed(ActionEvent e)
	1041	+ {
	1042	+ System.gc();
	1043	+ }
	1044	+ });
	1045	+
	1046	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1047	+ collapseButton.setToolTipText("Collapse toolbar");
	1048	+ collapseButton.addActionListener(this);
	1049	+
	1050	+ oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1051	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1052	+ maximize3DButton.addActionListener(this);
	1053	+
	1054	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1055	+ twoButton.setToolTipText("Show 3D view only");
	1056	+ twoButton.addActionListener(this);
	1057	+ this.fullscreenLayout = twoButton;
	1058	+
	1059	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1060	+ threeButton.setToolTipText("Show controls and 3D view");
	1061	+ threeButton.addActionListener(this);
	1062	+ if (Globals.ADVANCED)
	1063	+ {
	1064	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1065	+ sixButton.setToolTipText("Show 3D view and controls");
	1066	+ sixButton.addActionListener(this);
	1067	+ }
	1068	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1069	+// sevenButton.setToolTipText("3-column layout");
	1070	+// sevenButton.addActionListener(this);
	1071	+ //
	1072	+
	1073	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1074	+ fullButton.setToolTipText("Full-screen window");
	1075	+ fullButton.addActionListener(this);
	1076	+
	1077	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
455	1078	screenfitButton.setToolTipText("Screen fit");
456	1079	screenfitButton.addActionListener(this);
457		- oe.aConstraints.gridx += 1;
	1080	+
	1081	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1082	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1083	+ restoreCameraButton.addActionListener(this);
	1084	+
	1085	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1086	+ saveVersionButton.setToolTipText("Duplicate current version");
	1087	+ saveVersionButton.addActionListener(this);
	1088	+
	1089	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1090	+ deleteVersionButton.setToolTipText("Delete current version");
	1091	+ deleteVersionButton.addActionListener(this);
	1092	+
	1093	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1094	+ previousVersionButton.setToolTipText("Previous version");
	1095	+ previousVersionButton.addActionListener(this);
	1096	+ previousVersionButton.setEnabled(false);
	1097	+
	1098	+ cGridBag updown = new cGridBag().setVertical(true);
	1099	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1100	+ restoreButton.setToolTipText("Undo (restore current version)");
	1101	+ restoreButton.addActionListener(this);
	1102	+ //restoreButton.setEnabled(false);
	1103	+
	1104	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1105	+ replaceButton.setToolTipText("Save (replace current version)");
	1106	+ replaceButton.addActionListener(this);
	1107	+ //replaceButton.setEnabled(false);
	1108	+
	1109	+ copyOptionsPanel.add(updown);
	1110	+
	1111	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1112	+ nextVersionButton.setToolTipText("Next version");
	1113	+ nextVersionButton.addActionListener(this);
	1114	+ nextVersionButton.setEnabled(false);
	1115	+
	1116	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1117	+ oneStepButton.setToolTipText("Animate one step forward");
	1118	+ oneStepButton.addActionListener(this);
	1119	+
	1120	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1121	+ liveCB.setToolTipText("Enable animation");
	1122	+ liveCB.addItemListener(this);
	1123	+
	1124	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	1125	+ fastCB.setToolTipText("Fast mode");
	1126	+ fastCB.addItemListener(this);
	1127	+
	1128	+ //oe.toolboxPanel.Return();
	1129	+
	1130	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1131	+// trackCB.setToolTipText("Enable tracking");
	1132	+// trackCB.addItemListener(this);
	1133	+
458	1134	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
459	1135	// screenfitpointButton.addActionListener(this);
460		-// oe.aConstraints.gridx += 1;
461		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
462		- snapobjectButton.addActionListener(this);
463		- snapobjectButton.setToolTipText("Snap Object");
464		- oe.aConstraints.gridx += 1;
465	1136
466		- //aConstraints.gridx = 0;
467		- //aConstraints.gridy += 1;
468		- oe.aConstraints.weighty = 0;
469		- oe.aConstraints.gridwidth = 1;
470		-
471		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
472		- flashSelectionButton.setToolTipText("Show selection");
473		- flashSelectionButton.addActionListener(this);
474		-
475		- oe.toolbarPanel.add(new cButton(" ", false));
476		-
477		- oe.aConstraints.gridx += 1;
478		- oe.aConstraints.weighty = 0;
479		- oe.aConstraints.gridwidth = 1;
480		-
481		- //
482		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
483		- twoButton.setToolTipText("Show center view only");
484		- twoButton.addActionListener(this);
485		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	1137	+ if (Globals.ADVANCED)
	1138	+ {
	1139	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1140	+ snapobjectButton.addActionListener(this);
	1141	+ snapobjectButton.setToolTipText("Snap Object");
	1142	+
	1143	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
486	1144	fourButton.addActionListener(this);
487		- fourButton.setToolTipText("Show left panel only");
488		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
489		- sixButton.setToolTipText("2-column layout left");
490		- sixButton.addActionListener(this);
491		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
492		- threeButton.setToolTipText("2-column layout right");
493		- threeButton.addActionListener(this);
494		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
495		- sevenButton.setToolTipText("3-column layout");
496		- sevenButton.addActionListener(this);
497		- //
	1145	+ fourButton.setToolTipText("Show control panel only");
	1146	+ }
498	1147
499		- oe.toolbarPanel.add(rootButton = new cButton(" o o o ")); //, oe.aConstraints);
500		- rootButton.setToolTipText("Edit object in new tab");
	1148	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	1149	+
	1150	+
	1151	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1152	+ rootButton.setToolTipText("Open selection in new tab");
501	1153	rootButton.addActionListener(this);
502		- oe.aConstraints.gridx += 1;
503		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	1154	+
	1155	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
504	1156	closeButton.setToolTipText("Close tab");
505	1157	closeButton.addActionListener(this);
506	1158	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
507	1159	//clearButton.addActionListener(this);
508		- oe.aConstraints.gridx += 1;
509		-
510		- oe.aConstraints.gridx = 1; //
511		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
512		- editButton.addActionListener(this);
513		- oe.aConstraints.gridx += 1;
514		- oe.aConstraints.weighty = 0;
515		- oe.aConstraints.gridwidth = 1;
516	1160
517		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	1161	+ cGridBag row1 = new cGridBag();
	1162	+
	1163	+ // INSERT
	1164	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1165	+ gridButton.setToolTipText("Create grid");
	1166	+ gridButton.addActionListener(this);
	1167	+
	1168	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1169	+ boxButton.setToolTipText("Create box");
	1170	+ boxButton.addActionListener(this);
	1171	+
	1172	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1173	+ sphereButton.setToolTipText("Create sphere");
	1174	+ sphereButton.addActionListener(this);
	1175	+
	1176	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1177	+ coneButton.setToolTipText("Create cone");
	1178	+ coneButton.addActionListener(this);
	1179	+
	1180	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1181	+ torusButton.setToolTipText("Create torus");
	1182	+ torusButton.addActionListener(this);
	1183	+
	1184	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1185	+ superButton.setToolTipText("Create superellipsoid");
	1186	+ superButton.addActionListener(this);
	1187	+
	1188	+ if (Globals.ADVANCED)
	1189	+ {
	1190	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1191	+ kleinButton.setToolTipText("Create Klein bottle");
	1192	+ kleinButton.addActionListener(this);
	1193	+ }
	1194	+
	1195	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1196	+ particlesButton.setToolTipText("Create particle system");
	1197	+ particlesButton.addActionListener(this);
	1198	+
	1199	+ oe.toolboxPanel.add(row1);
	1200	+
	1201	+ cGridBag row2 = new cGridBag();
	1202	+
	1203	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1204	+ groupButton.setToolTipText("Create group");
	1205	+ groupButton.addActionListener(this);
	1206	+
	1207	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1208	+ compositeButton.setToolTipText("Create composite");
	1209	+ compositeButton.addActionListener(this);
	1210	+
	1211	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1212	+ switchButton.setToolTipText("Create item switcher");
	1213	+ switchButton.addActionListener(this);
	1214	+
	1215	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1216	+ loopButton.setToolTipText("Create loop");
	1217	+ loopButton.addActionListener(this);
	1218	+
	1219	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1220	+ textureButton.setToolTipText("Create texture");
	1221	+ textureButton.addActionListener(this);
	1222	+
	1223	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1224	+ overlayButton.setToolTipText("Create overlay");
	1225	+ overlayButton.addActionListener(this);
	1226	+
	1227	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1228	+ lightButton.setToolTipText("Create light");
	1229	+ lightButton.addActionListener(this);
	1230	+
	1231	+ oe.toolboxPanel.add(row2);
	1232	+
	1233	+ cGridBag textures = new cGridBag();
	1234	+
	1235	+ CreateTexturePanel(textures);
	1236	+
	1237	+ oe.toolboxPanel.add(textures);
	1238	+
	1239	+ textures.preferredHeight = 100;
	1240	+
	1241	+ CreateSkyboxPanel(oe.skyboxPanel);
	1242	+
	1243	+ // EDIT panel
	1244	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1245	+ editButton.setToolTipText("Pin selection controls");
	1246	+ editButton.addActionListener(this);
	1247	+
	1248	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1249	+ uneditButton.setToolTipText("Unpin and remove selection controls");
518	1250	uneditButton.addActionListener(this);
519	1251
520		- oe.aConstraints.gridx += 1;
521		- oe.aConstraints.weighty = 0;
522		- oe.aConstraints.gridwidth = 1;
523		-
524		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
525		- clearPanelButton.addActionListener(this);
526		-
527		- oe.aConstraints.gridx += 1;
528		- oe.aConstraints.weighty = 0;
529		- oe.aConstraints.gridwidth = 1;
530		-
531		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	1252	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1253	+ allParamsButton.setToolTipText("Show all controls");
532	1254	allParamsButton.addActionListener(this);
533	1255
534		- oe.aConstraints.gridx += 1;
535		- oe.aConstraints.weighty = 0;
536		- oe.aConstraints.gridwidth = 1;
537		-
538		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
539		- unselectButton.addActionListener(this);
	1256	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1257	+ clearPanelButton.setToolTipText("Clear all controls");
	1258	+ clearPanelButton.addActionListener(this);
540	1259
	1260	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1261	+ //unselectButton.setToolTipText("Unselect");
	1262	+ //unselectButton.addActionListener(this);
	1263	+
	1264	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1265	+ flashSelectionButton.setToolTipText("Highlight selection");
	1266	+ flashSelectionButton.addActionListener(this);
	1267	+
	1268	+ editCommandsPanel.preferredHeight = 1;
	1269	+
	1270	+ SetPinStates(false);
	1271	+// oe.treePanel.add(commandsPanel);
	1272	+// oe.treePanel.Return();
	1273	+
541	1274	// oe.aConstraints.gridx += 1;
542	1275	// oe.aConstraints.weighty = 0;
543	1276	// oe.aConstraints.gridwidth = 1;
..	..	@@ -549,47 +1282,32 @@
549	1282	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
550	1283	// gcButton.addActionListener(this);
551	1284
552		- oe.aConstraints.gridx = 0;
553		- oe.aConstraints.gridy += 1;
554		-
555		- //ctrlPanel.add(objList = new List(5, true));
556		- oe.aConstraints.gridwidth = 100;
557		- // oe.aConstraints.gridheight = 100;
558		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
559		- oe.aConstraints.gridheight = 1;
560		- oe.aConstraints.weighty = 0.5;
561		- oe.aConstraints.gridx = 0;
562		- JScrollPane jSP;
	1285	+ cGridBag jSPPanel = new cGridBag();
	1286	+
	1287	+ JScrollPane jSP;
563	1288	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
564		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	1289	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
565	1290	ResetModel();
566		- oe.aConstraints.weighty = 0.5;
567		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
568		- oe.aConstraints.gridy += 1;
569		- oe.aConstraints.gridwidth = 1;
570		-
571		- oe.aConstraints.weighty = 0;
572		- oe.aConstraints.gridwidth = 2;
573		-
574		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
575		- colorCB.addItemListener(this);
576		- oe.aConstraints.gridx += 2;
577		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
578		- materialCB.addItemListener(this);
579		- oe.aConstraints.gridx += 2;
580		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
581		- textureCB.addItemListener(this);
582		-
583		- oe.aConstraints.gridx = 0;
584		- oe.aConstraints.gridy += 1;
585	1291
	1292	+ oe.treePanel.add(jSPPanel);
	1293	+ oe.treePanel.Return();
	1294	+
	1295	+ oe.treePanel.add(copyOptionsPanel);
	1296	+ oe.treePanel.Return();
	1297	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1298	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1299	+ sliderPane.preferredHeight = 1;
	1300	+
	1301	+// mainPanel.setDividerLocation(0.1); //1.0);
	1302	+ mainPanel.setResizeWeight(0.4);
	1303	+
586	1304	//jList.addListSelectionListener(this);
587	1305	oe.jTree.addTreeSelectionListener(this);
588	1306	//jTree.setRootVisible(false);
589	1307	//jTree.setEditable(true);
590	1308	oe.jTree.setDragEnabled(true);
591	1309	//jTree.setPreferredSize(new Dimension(10,10));
592		- jSP.setPreferredSize(new Dimension(100,200));
	1310	+ //jSP.setPreferredSize(new Dimension(100,200));
593	1311
594	1312	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
595	1313
..	..	@@ -601,53 +1319,70 @@
601	1319	dgr.addDragGestureListener(this);
602	1320	}catch(Exception e) {}
603	1321	*/
604		- radio.layout = sevenButton;
	1322	+ radio.layout = threeButton; // sixButton;
605	1323	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
606	1324	}
607	1325
608	1326	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
609	1327	{
610		- //constraints.gridx = 0;
611		- //constraints.gridy = 0;
612		- panel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
613		- fastCB.setToolTipText("Fast mode");
614		- fastCB.addItemListener(this);
615		- //constraints.gridy += 1;
616		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
617		- supportCB.setToolTipText("Enabled rigging");
618		- supportCB.addItemListener(this);
	1328	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1329	+ colorCB.setToolTipText("Copy color when dropped");
	1330	+ colorCB.addItemListener(this);
619	1331
620		- // constraints.gridy += 1;
	1332	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1333	+ materialCB.setToolTipText("Copy material when dropped");
	1334	+ materialCB.addItemListener(this);
	1335	+
	1336	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1337	+ textureCB.setToolTipText("Copy texture when dropped");
	1338	+ textureCB.addItemListener(this);
	1339	+
	1340	+ panel.Return();
	1341	+
	1342	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	1343	+ boxCB.setToolTipText("Display bounding boxes");
	1344	+ boxCB.addItemListener(this);
	1345	+
	1346	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	1347	+ zoomBoxCB.setToolTipText("Display only for wheel");
	1348	+ zoomBoxCB.addItemListener(this);
	1349	+
	1350	+ if (true) // Globals.ADVANCED)
	1351	+ {
	1352	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1353	+// supportCB.setToolTipText("Enable rigging");
	1354	+// supportCB.addItemListener(this);
	1355	+
	1356	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1357	+ freezeCB.setToolTipText("Fast moving camera");
	1358	+ freezeCB.addItemListener(this);
	1359	+
621	1360	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
622	1361	// localCB.addItemListener(this);
623	1362
624		- //constraints.gridy += 1;
	1363	+ panel.Return();
	1364	+
625	1365	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
626	1366	crowdCB.setToolTipText("Used for crowds");
627	1367	crowdCB.addItemListener(this);
628	1368
629		- //constraints.gridy += 1;
630	1369	panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
631	1370	smoothCB.setToolTipText("Snapping delay");
632	1371	smoothCB.addItemListener(this);
633	1372
634		- //constraints.gridy += 1;
635		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
636		- slowCB.setToolTipText("Smooth interpolation");
637		- slowCB.addItemListener(this);
638		- //constraints.gridy += 1;
639		- panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
640		- boxCB.setToolTipText("Display bounding boxes");
641		- boxCB.addItemListener(this);
642		- //constraints.gridy += 1;
643		- panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
644		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
645		- zoomBoxCB.addItemListener(this);
646		-
	1373	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1374	+// slowCB.setToolTipText("Smooth interpolation");
	1375	+// slowCB.addItemListener(this);
	1376	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1377	+ minshaderCB.setToolTipText("Minimal fast shader");
	1378	+ minshaderCB.addItemListener(this);
	1379	+
647	1380	// constraints.gridy += 1;
648	1381	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
649	1382	// speakerMocapCB.addItemListener(this);
650	1383
	1384	+ panel.Return();
	1385	+
651	1386	if (false)
652	1387	{
653	1388	// handled in scripts
..	..	@@ -662,36 +1397,85 @@
662	1397	//constraints.gridy += 1;
663	1398	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
664	1399	smoothfocusCB.addItemListener(this);
	1400	+ panel.Return();
665	1401	}
666	1402
667	1403	//constraints.gridx += 1;
668	1404	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
669	1405	// debugCB.addItemListener(this);
670	1406
671		- //constraints.gridy += 1;
	1407	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1408	+ trackCB.setToolTipText("Enable tracking target");
	1409	+ trackCB.addItemListener(this);
	1410	+
672	1411	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1412	+ oeilCB.setToolTipText("Move camera when tracking");
673	1413	oeilCB.addItemListener(this);
674	1414
675		- //constraints.gridy += 1;
	1415	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1416	+ shadowCB.setToolTipText("When live compute shadows");
	1417	+ shadowCB.addItemListener(this);
	1418	+
	1419	+ panel.Return();
	1420	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1421	+ toggleTextureCB.setToolTipText("Load textures");
	1422	+ toggleTextureCB.addItemListener(this);
	1423	+
	1424	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1425	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1426	+ toggleSwitchCB.addItemListener(this);
	1427	+
	1428	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1429	+ autokeepCB.setToolTipText("On structure change");
	1430	+ autokeepCB.addItemListener(this);
	1431	+
	1432	+ panel.Return();
	1433	+ if (Globals.ADVANCED)
	1434	+ {
676	1435	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
677	1436	lookAtCB.setToolTipText("Look-at target");
678	1437	lookAtCB.addItemListener(this);
	1438	+ }
	1439	+
	1440	+ }
	1441	+
	1442	+ cGridBag fill = new cGridBag();
	1443	+ fill.preferredHeight = 200;
	1444	+ cGridBag fill2 = new cGridBag();
	1445	+ fill2.preferredHeight = 200;
	1446	+ cGridBag fill3 = new cGridBag();
	1447	+ fill3.preferredHeight = 200;
	1448	+
	1449	+ panel.add(fill);
	1450	+ panel.add(fill2);
	1451	+ panel.add(fill3);
679	1452
680	1453	}
681	1454
682	1455	void EditObject(Object3D obj)
683	1456	{
684	1457	cRadio radioButton = new cRadio(obj.name);
	1458	+
	1459	+ // June 2019. Patch to avoid bug with transparency.
	1460	+ radioButton.hadMaterial = obj.material != null;
	1461	+ if (!radioButton.hadMaterial)
	1462	+ {
	1463	+ obj.material = new cMaterial();
	1464	+ }
	1465	+
685	1466	radioButton.SetObject(obj);
686		- radioButton.layout = sevenButton;
	1467	+ radioButton.layout = threeButton; // sixButton;
687	1468	radioButton.SetCamera(cameraView.renderCamera, false);
688	1469	radioButton.addActionListener(this);
689	1470	radioPanel.add(radioButton);
690	1471	buttonGroup.add(radioButton);
691	1472	radioButton.doClick();
692	1473	}
	1474	+
693	1475	void SetupViews(ObjEditor oe)
694	1476	{
	1477	+ theFrame = this;
	1478	+
695	1479	oe.SetupViews();
696	1480
697	1481	System.out.println("SetupViews");
..	..	@@ -700,23 +1484,30 @@
700	1484	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
701	1485	}
702	1486
703		- JCheckBox liveCB;
704		- JCheckBox supportCB;
705		- JCheckBox localCB;
706		- JCheckBox crowdCB;
707		- JCheckBox smoothCB;
708		- JCheckBox fastCB;
709		- JCheckBox slowCB;
710		- JCheckBox boxCB;
711		- JCheckBox zoomBoxCB;
712		- JCheckBox trackCB;
713		- JCheckBox smoothfocusCB;
	1487	+ cToggleButton liveCB;
	1488	+ cCheckBox supportCB;
	1489	+ cCheckBox localCB;
	1490	+ cCheckBox crowdCB;
	1491	+ cCheckBox smoothCB;
	1492	+ cCheckBox minshaderCB;
	1493	+
	1494	+ cToggleButton fastCB;
	1495	+ cCheckBox slowCB;
	1496	+ cCheckBox boxCB;
	1497	+ cCheckBox zoomBoxCB;
	1498	+ cCheckBox freezeCB;
	1499	+ //cToggleButton trackCB;
	1500	+ cCheckBox trackCB;
	1501	+ cCheckBox smoothfocusCB;
714	1502	// JCheckBox speakerMocapCB;
715		- JCheckBox speakerCameraCB;
716		- JCheckBox speakerFocusCB;
717		- JCheckBox debugCB;
718		- JCheckBox oeilCB;
719		- JCheckBox lookAtCB;
	1503	+ cCheckBox speakerCameraCB;
	1504	+ cCheckBox speakerFocusCB;
	1505	+ cCheckBox debugCB;
	1506	+
	1507	+ cCheckBox oeilCB;
	1508	+ cCheckBox shadowCB;
	1509	+ cCheckBox autokeepCB;
	1510	+ cCheckBox lookAtCB;
720	1511
721	1512	// static int COLOR = 1;
722	1513	// static int MATERIAL = 2;
..	..	@@ -724,9 +1515,9 @@
724	1515
725	1516	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
726	1517
727		- JCheckBox colorCB;
728		- JCheckBox materialCB;
729		- JCheckBox textureCB;
	1518	+ cCheckBox colorCB;
	1519	+ cCheckBox materialCB;
	1520	+ cCheckBox textureCB;
730	1521
731	1522	public void itemStateChanged(ItemEvent e)
732	1523	{
..	..	@@ -754,6 +1545,7 @@
754	1545	} else if(e.getSource() == liveCB)
755	1546	{
756	1547	cameraView.ToggleLive();
	1548	+ refreshContents(false);
757	1549	}
758	1550	else if(e.getSource() == supportCB)
759	1551	{
..	..	@@ -769,6 +1561,12 @@
769	1561	{
770	1562	cameraView.ToggleInertia();
771	1563	cameraView.repaint();
	1564	+ }
	1565	+ else if(e.getSource() == minshaderCB)
	1566	+ {
	1567	+ Globals.MINSHADER ^= true;
	1568	+ cameraView.programInitialized = false;
	1569	+ cameraView.repaint();
772	1570	}
773	1571	else if(e.getSource() == localCB)
774	1572	{
..	..	@@ -818,6 +1616,18 @@
818	1616	{
819	1617	cameraView.ToggleOeil();
820	1618	}
	1619	+ else if(e.getSource() == shadowCB)
	1620	+ {
	1621	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1622	+ }
	1623	+ else if(e.getSource() == freezeCB)
	1624	+ {
	1625	+ Globals.FREEZEONMOVE ^= true;
	1626	+ }
	1627	+ else if(e.getSource() == autokeepCB)
	1628	+ {
	1629	+ Globals.REPLACEONMAKE ^= true;
	1630	+ }
821	1631	else if(e.getSource() == lookAtCB)
822	1632	{
823	1633	cameraView.ToggleLookAt();
..	..	@@ -834,7 +1644,8 @@
834	1644
835	1645	/**/
836	1646	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
837		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1647	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1648	+ TreePath path = objEditor.jTree.getSelectionPath();
838	1649	if ((path == null) \|\| (path.getPathCount() <= 1)) {
839	1650	// We can't move the root node or an empty selection
840	1651	return;
..	..	@@ -897,8 +1708,6 @@
897	1708	}
898	1709	}
899	1710
900		- String string = (String) object;
901		-
902	1711	System.out.println("Transfer = " + object + "; drop : " + target);
903	1712	// if( object instanceof java.io.File[])
904	1713	// {
..	..	@@ -906,7 +1715,11 @@
906	1715	// objEditor.DropFile((java.io.File[]) object, true);
907	1716	// return;
908	1717	// }
909		- if (string.charAt(0) == '/')
	1718	+
	1719	+ String string = object.toString();
	1720	+
	1721	+ // File path for Mac and Windows
	1722	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
910	1723	{
911	1724	// file(s)
912	1725	String[] names = string.split("\n");
..	..	@@ -933,7 +1746,7 @@
933	1746
934	1747	flashIt = false;
935	1748	CameraPane pane = (CameraPane) target;
936		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1749	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
937	1750	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
938	1751
939	1752	if (group.selection.size() == 1)
..	..	@@ -949,23 +1762,33 @@
949	1762
950	1763	assert target == objEditor.jTree;
951	1764	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1765	+ Object3D destinationLeaf;
952	1766	try {
953		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1767	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
954	1768	} catch (Exception e) {
955	1769	System.out.println("destinationPath : " + destinationPath);
956	1770	return;
957	1771	}
958	1772
959		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1773	+ for (int i=group.selection.size(); --i>=0;)
960	1774	{
	1775	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1776	+
	1777	+ // Cannot move into itself
	1778	+ if (child == destinationLeaf)
	1779	+ return;
	1780	+ }
	1781	+
	1782	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1783	+// {
961	1784	loadClipboard(true);
962	1785	objEditor.jTree.setSelectionPath(destinationPath);
963		- pasteInto(false);
964		- } else {
965		- loadClipboard(false);
966		- objEditor.jTree.setSelectionPath(destinationPath);
967		- pasteInto(false); // true); // ???
968		- }
	1786	+ pasteInto(false, false);
	1787	+// } else {
	1788	+// loadClipboard(false);
	1789	+// objEditor.jTree.setSelectionPath(destinationPath);
	1790	+// pasteInto(false, false); // true); // ???
	1791	+// }
969	1792	}
970	1793	public void dropActionChanged(DropTargetDragEvent dtde)
971	1794	// Called if the user has modified the current drop gesture
..	..	@@ -1021,7 +1844,12 @@
1021	1844	TreePath path;
1022	1845
1023	1846	public TransferableTreePath(TreePath tp) {
1024		- path = tp;
	1847	+ Object[] objs = new Object[tp.getPathCount()];
	1848	+ for (int i=0; i<objs.length; i++)
	1849	+ {
	1850	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1851	+ }
	1852	+ path = new TreePath(objs);
1025	1853	}
1026	1854
1027	1855	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1070,85 +1898,107 @@
1070	1898	{
1071	1899	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1072	1900	//heightFieldItem.addActionListener(this);
1073		- gridItem = menu.add(new MenuItem("Grid"));
1074		- gridItem.addActionListener(this);
1075		- rectoidItem = menu.add(new MenuItem("Box"));
1076		- rectoidItem.addActionListener(this);
1077		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1078		- ellipsoidItem.addActionListener(this);
1079		- coneItem = menu.add(new MenuItem("Cone"));
1080		- coneItem.addActionListener(this);
1081		- torusItem = menu.add(new MenuItem("Torus"));
1082		- torusItem.addActionListener(this);
1083		- superItem = menu.add(new MenuItem("Superellipsoid"));
1084		- superItem.addActionListener(this);
	1901	+// gridItem = menu.add(new MenuItem("Grid"));
	1902	+// gridItem.addActionListener(this);
	1903	+// rectoidItem = menu.add(new MenuItem("Box"));
	1904	+// rectoidItem.addActionListener(this);
	1905	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1906	+// ellipsoidItem.addActionListener(this);
	1907	+// coneItem = menu.add(new MenuItem("Cone"));
	1908	+// coneItem.addActionListener(this);
	1909	+// torusItem = menu.add(new MenuItem("Torus"));
	1910	+// torusItem.addActionListener(this);
	1911	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1912	+// superItem.addActionListener(this);
	1913	+
	1914	+ cameraItem = menu.add(new MenuItem("Camera"));
	1915	+ cameraItem.addActionListener(this);
	1916	+
	1917	+ if (!Globals.ADVANCED)
	1918	+ {
1085	1919	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1086	1920	kleinItem.addActionListener(this);
1087		- particleItem = menu.add(new MenuItem("Particle system"));
1088		- particleItem.addActionListener(this);
	1921	+ }
	1922	+
	1923	+// particleItem = menu.add(new MenuItem("Particle system"));
	1924	+// particleItem.addActionListener(this);
	1925	+ if (Globals.ADVANCED)
	1926	+ {
1089	1927	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1090	1928	ragdollItem.addActionListener(this);
1091	1929	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1092	1930	ragdoll2Item.addActionListener(this);
	1931	+ }
1093	1932	menu.add("-");
1094		- meshItem = menu.add(new MenuItem("Mesh"));
	1933	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1095	1934	meshItem.addActionListener(this);
1096	1935	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1097	1936	// meshGroupItem.addActionListener(this);
	1937	+ if (Globals.ADVANCED)
	1938	+ {
1098	1939	springItem = menu.add(new MenuItem("Spring"));
1099	1940	springItem.addActionListener(this);
1100	1941	flagItem = menu.add(new MenuItem("Flag"));
1101	1942	flagItem.addActionListener(this);
1102		- bezierItem = menu.add(new MenuItem("Patch"));
1103		- bezierItem.addActionListener(this);
1104		- checkerItem = menu.add(new MenuItem("Checker"));
1105		- checkerItem.addActionListener(this);
1106	1943	blobItem = menu.add(new MenuItem("Blob"));
1107	1944	blobItem.addActionListener(this);
1108	1945	latheItem = menu.add(new MenuItem("Lathe"));
1109	1946	latheItem.addActionListener(this);
1110		- lightItem = menu.add(new MenuItem("Light"));
1111		- lightItem.addActionListener(this);
	1947	+ }
	1948	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1949	+ bezierItem.addActionListener(this);
	1950	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1951	+// overlayItem.addActionListener(this);
	1952	+// lightItem = menu.add(new MenuItem("Light"));
	1953	+// lightItem.addActionListener(this);
1112	1954	menu.add("-");
1113	1955	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1114	1956	//superLoopItem.addActionListener(this);
1115		- loopItem = menu.add(new MenuItem("Loop"));
1116		- loopItem.addActionListener(this);
	1957	+// loopItem = menu.add(new MenuItem("Loop"));
	1958	+// loopItem.addActionListener(this);
1117	1959	doubleItem = menu.add(new MenuItem("Fork"));
1118	1960	doubleItem.addActionListener(this);
	1961	+ if (Globals.ADVANCED)
	1962	+ {
1119	1963	tripleItem = menu.add(new MenuItem("Trident"));
1120	1964	tripleItem.addActionListener(this);
	1965	+ }
1121	1966	}
1122	1967
1123	1968	void buildToolsMenu(Menu menu)
1124	1969	{
1125	1970	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1126	1971	animationItem.addItemListener(this);
1127		- animationItem.setState(CameraPane.ANIMATION);
	1972	+ animationItem.setState(Globals.ANIMATION);
	1973	+
	1974	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1975	+ archiveItem.addActionListener(this);
1128	1976
1129	1977	menu.add("-");
1130	1978	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1131	1979	parseverticesItem.addActionListener(this);
1132	1980	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1133	1981	textureFieldItem.addActionListener(this);
1134		- alignItem = menu.add(new MenuItem("Align"));
	1982	+ alignItem = menu.add(new MenuItem("Align Objects"));
1135	1983	alignItem.addActionListener(this);
1136		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1137		- mirrorItem.addActionListener(this);
1138	1984	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1139	1985	reduceMorphItem.addActionListener(this);
1140	1986	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1141	1987	reduce34MorphItem.addActionListener(this);
1142		-
1143		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1144		- computeAOItem.addActionListener(this);
1145	1988	menu.add("-");
1146		-
1147	1989	menu.add(memoryItem = new MenuItem("Memory Usage"));
1148	1990	memoryItem.addActionListener(this);
	1991	+ menu.add(computeAOItem = new MenuItem("Compute AO"));
	1992	+ computeAOItem.addActionListener(this);
	1993	+
	1994	+ if (Globals.ADVANCED)
	1995	+ {
	1996	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1997	+ mirrorItem.addActionListener(this);
	1998	+ menu.add("-");
1149	1999	menu.add(analyzeItem = new MenuItem("Analyze"));
1150	2000	analyzeItem.addActionListener(this);
1151		- menu.add(dumpItem = new MenuItem("Dump"));
	2001	+ menu.add(dumpItem = new MenuItem("Print"));
1152	2002	dumpItem.addActionListener(this);
1153	2003	// menu.add(pathItem = new MenuItem("From-to path"));
1154	2004	// pathItem.addActionListener(this);
..	..	@@ -1166,6 +2016,7 @@
1166	2016	menu.add("-");
1167	2017	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1168	2018	editScriptItem.addActionListener(this);
	2019	+ }
1169	2020	}
1170	2021
1171	2022	void ScreenFit()
..	..	@@ -1288,9 +2139,34 @@
1288	2139	shadow.material = new cMaterial(obj.material);
1289	2140	shadow.material.diffuse = 0.0001f;
1290	2141	shadow.material.specular = 0.0001f;
	2142	+ //shadow.projectedVertices[1].x = 300;
1291	2143
1292	2144	makeSomething(shadow);
1293	2145	}
	2146	+
	2147	+ private void ClearUnpinned()
	2148	+ {
	2149	+ //for (Object3D obj : listUI)
	2150	+ for (int i=listUI.size(); --i>=0;)
	2151	+ {
	2152	+ Object3D obj = listUI.elementAt(i);
	2153	+ if (!obj.pinned)
	2154	+ {
	2155	+ obj.CloseUI();
	2156	+ listUI.remove(i);
	2157	+ }
	2158	+ }
	2159	+ }
	2160	+
	2161	+ private void EditElement(Object3D elem, boolean newWindow)
	2162	+ {
	2163	+ // if (!(elem instanceof Composite))
	2164	+ // newWindow = false;
	2165	+ listUI.add(elem);
	2166	+ elem.openEditWindow(this, newWindow); //, false);
	2167	+ System.out.println("edit : " + elem);
	2168	+ elem.editWindow.refreshContents(true); // ? new
	2169	+ }
1294	2170
1295	2171	/**
1296	2172	* applyExample
..	..	@@ -1494,9 +2370,9 @@
1494	2370
1495	2371	void Overwrite(int mask)
1496	2372	{
1497		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2373	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1498	2374	{
1499		- Object3D content = GrafreeD.clipboard.get(0);
	2375	+ Object3D content = Grafreed.clipboard.get(0);
1500	2376
1501	2377	if (content instanceof cGroup && ((cGroup)content).transientlink )
1502	2378	content = ((cGroup)content).get(0);
..	..	@@ -1535,7 +2411,7 @@
1535	2411	{
1536	2412	ScreenFit();
1537	2413	} else
1538		- if (source == switchItem)
	2414	+ if (source == switchViewItem)
1539	2415	{
1540	2416	cVector v1 = new cVector();
1541	2417	cVector v2 = new cVector();
..	..	@@ -1544,11 +2420,11 @@
1544	2420	objEditor.cameraView.renderCamera.setAim(v2, v1);
1545	2421	objEditor.cameraView.repaint();
1546	2422	} else
1547		- if (source == rectoidItem)
	2423	+ if (source == rectoidItem \|\| source == boxButton)
1548	2424	{
1549	2425	makeSomething(new Box());
1550	2426	} else
1551		- if (source == particleItem)
	2427	+ if (source == particleItem \|\| source == particlesButton)
1552	2428	{
1553	2429	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1554	2430	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1627,27 +2503,27 @@
1627	2503
1628	2504	makeSomething(obj);
1629	2505	} else
1630		- if (source == gridItem)
	2506	+ if (source == gridItem \|\| source == gridButton)
1631	2507	{
1632	2508	makeSomething(new Grid());
1633	2509	} else
1634		- if (source == ellipsoidItem)
	2510	+ if (source == ellipsoidItem \|\| source == sphereButton)
1635	2511	{
1636	2512	makeSomething(new Sphere());
1637	2513	} else
1638		- if (source == coneItem)
	2514	+ if (source == coneItem \|\| source == coneButton)
1639	2515	{
1640	2516	makeSomething(new Cone());
1641	2517	} else
1642		- if (source == torusItem)
	2518	+ if (source == torusItem \|\| source == torusButton)
1643	2519	{
1644	2520	makeSomething(new Torus());
1645	2521	} else
1646		- if (source == superItem)
	2522	+ if (source == superItem \|\| source == superButton)
1647	2523	{
1648	2524	makeSomething(new Superellipsoid());
1649	2525	} else
1650		- if (source == kleinItem)
	2526	+ if (source == kleinItem \|\| source == kleinButton)
1651	2527	{
1652	2528	makeSomething(new Klein());
1653	2529	} else
..	..	@@ -1667,7 +2543,7 @@
1667	2543	{
1668	2544	makeSomething(new BezierSurface());
1669	2545	} else
1670		- if (source == checkerItem)
	2546	+ if (source == overlayItem \|\| source == overlayButton)
1671	2547	{
1672	2548	/*
1673	2549	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1715,10 +2591,27 @@
1715	2591	s.setup();
1716	2592	makeSomething(s);
1717	2593	} else
1718		- if (source == lightItem)
	2594	+ if (source == lightItem \|\| source == lightButton)
1719	2595	{
1720	2596	makeSomething(new Light());
1721	2597	} else
	2598	+// if (source == skybox1Button \|\|
	2599	+// source == skybox2Button \|\|
	2600	+// source == skybox3Button \|\|
	2601	+// source == skybox4Button \|\|
	2602	+// source == skybox5Button \|\|
	2603	+// source == skybox6Button \|\|
	2604	+// source == skybox7Button \|\|
	2605	+// source == skybox11Button \|\|
	2606	+// source == skybox12Button \|\|
	2607	+// source == skybox13Button \|\|
	2608	+// source == skybox14Button \|\|
	2609	+// source == skybox15Button \|\|
	2610	+// source == skybox16Button \|\|
	2611	+// source == skybox17Button)
	2612	+// {
	2613	+// ChangeSkybox(source);
	2614	+// } else
1722	2615	if (source == csgItem)
1723	2616	{
1724	2617	group(new CSG());
..	..	@@ -1765,30 +2658,30 @@
1765	2658
1766	2659	group(g);
1767	2660	} else
1768		- if (source == loopItem)
	2661	+ if (source == loopItem \|\| source == loopButton)
1769	2662	{
1770	2663	Composite csg = new GroupLeaf();
1771	2664	csg.count = 5;
1772	2665	group(csg);
1773		- Composite child = new cGroup();
	2666	+ Composite child = new cGroup("Branch");
1774	2667	csg.addChild(child);
1775	2668	child.addChild(csg);
1776	2669	} else
1777	2670	if (source == doubleItem)
1778	2671	{
1779		- Composite csg = new GroupLeaf();
	2672	+ Composite csg = new GroupLeaf("Fork");
1780	2673	csg.count = 5;
1781	2674	group(csg);
1782		- Composite child = new cGroup();
	2675	+ Composite child = new cGroup("Branch A");
1783	2676	csg.addChild(child);
1784	2677	child.addChild(csg);
1785		- child = new cGroup();
	2678	+ child = new cGroup("Branch B");
1786	2679	csg.addChild(child);
1787	2680	child.addChild(csg);
1788	2681	} else
1789	2682	if (source == tripleItem)
1790	2683	{
1791		- Composite csg = new GroupLeaf();
	2684	+ Composite csg = new GroupLeaf("Trident");
1792	2685	csg.count = 4;
1793	2686	group(csg);
1794	2687	Composite child = new cGroup();
..	..	@@ -1801,27 +2694,10 @@
1801	2694	csg.addChild(child);
1802	2695	child.addChild(csg);
1803	2696	} else
1804		-
1805		- if (source == importGFDItem)
1806		- {
1807		- ImportGFD();
1808		- } else
1809		- if (source == importVRMLX3DItem)
1810		- {
1811		- ImportVRMLX3D();
1812		- } else
1813		- if (source == import3DSItem)
1814		- {
1815		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1816		- } else
1817		- if (source == importOBJItem)
1818		- {
1819		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1820		- } else
1821	2697	if (source == computeAOItem)
1822	2698	{
1823	2699	Globals.drawMode = CameraPane.OCCLUSION;
1824		- Globals.theRenderer.repaint();
	2700	+ cameraView.repaint();
1825	2701	} else
1826	2702	if (source == recompileItem)
1827	2703	{
..	..	@@ -1836,7 +2712,7 @@
1836	2712	if (source == invariantsItem)
1837	2713	{
1838	2714	System.out.println("Invariants:");
1839		- GrafreeD.grafreeD.universe.invariants();
	2715	+ Grafreed.grafreed.universe.invariants();
1840	2716	} else
1841	2717	if (source == memoryItem)
1842	2718	{
..	..	@@ -1855,19 +2731,80 @@
1855	2731	{
1856	2732	DumpObject();
1857	2733	} else
	2734	+ if (source == minButton)
	2735	+ {
	2736	+ Minimize();
	2737	+ } else
	2738	+ if (source == maxButton)
	2739	+ {
	2740	+ Maximize();
	2741	+ } else
	2742	+ if (source == fullButton)
	2743	+ {
	2744	+ ToggleFullScreen();
	2745	+ } else
	2746	+ if (source == collapseButton)
	2747	+ {
	2748	+ this.expandedLayout = radio.layout;
	2749	+ CollapseToolbar();
	2750	+ } else
	2751	+ if (source == maximize3DButton)
	2752	+ {
	2753	+ this.expandedLayout = radio.layout;
	2754	+ radio.layout = twoButton;
	2755	+ Show3DView();
	2756	+ CollapseToolbar();
	2757	+ } else
	2758	+ if (source == previousVersionButton)
	2759	+ {
	2760	+ // Go to previous version
	2761	+ //if (!Undo())
	2762	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2763	+ PreviousVersion();
	2764	+ } else
	2765	+ if (source == restoreButton)
	2766	+ {
	2767	+ // Restore current version
	2768	+ Restore();
	2769	+ //restoreButton.setEnabled(false);
	2770	+ } else
	2771	+ if (source == replaceButton)
	2772	+ {
	2773	+ // Overwrite current version
	2774	+ Replace();
	2775	+ //replaceButton.setEnabled(false);
	2776	+ } else
	2777	+ if (source == nextVersionButton)
	2778	+ {
	2779	+ // Go to next version
	2780	+ NextVersion();
	2781	+ } else
	2782	+ if (source == saveVersionButton)
	2783	+ {
	2784	+ // Save a new version
	2785	+ if (!Save(true))
	2786	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2787	+ } else
	2788	+ if (source == deleteVersionButton)
	2789	+ {
	2790	+ // Delete a new version
	2791	+ DeleteVersion();
	2792	+ } else
	2793	+ if (source == oneStepButton)
	2794	+ {
	2795	+ Globals.ONESTEP = true;
	2796	+ cameraView.repaint();
	2797	+ } else
1858	2798	if (source == screenfitButton)
1859	2799	{
1860		- //Reload(lastConverter, lastFilename, true);
1861	2800	ScreenFit();
1862	2801	} else
1863	2802	if (source == screenfitpointButton)
1864	2803	{
1865		- //Reload(lastConverter, lastFilename, true);
1866	2804	ScreenFitPoint();
1867	2805	} else
1868	2806	if (source == snapobjectButton)
1869	2807	{
1870		- //Reload(lastConverter, lastFilename, true);
1871	2808	SnapObject();
1872	2809	} else
1873	2810	// if (event.getSource() == recompileButton)
..	..	@@ -1904,12 +2841,20 @@
1904	2841	{
1905	2842	loadClipboard(true);
1906	2843	} else
	2844	+ if (source == undoItem)
	2845	+ {
	2846	+ PreviousVersion();
	2847	+ } else
	2848	+ if (source == redoItem)
	2849	+ {
	2850	+ NextVersion();
	2851	+ } else
1907	2852	if (source == duplicateItem)
1908	2853	{
1909		- Object3D keep = GrafreeD.clipboard;
	2854	+ Object3D keep = Grafreed.clipboard;
1910	2855	loadClipboard(false);
1911	2856	paste(false);
1912		- GrafreeD.clipboard = keep;
	2857	+ Grafreed.clipboard = keep;
1913	2858	} else
1914	2859	if (source == cloneItem)
1915	2860	{
..	..	@@ -1927,13 +2872,17 @@
1927	2872	{
1928	2873	paste(false);
1929	2874	} else
	2875	+ if (source == pasteIntoItem)
	2876	+ {
	2877	+ pasteInto(true, false);
	2878	+ } else
1930	2879	if (source == pasteLinkItem)
1931	2880	{
1932		- pasteInto(false);
	2881	+ pasteInto(false, false);
1933	2882	} else
1934	2883	if (source == pasteCloneItem)
1935	2884	{
1936		- pasteInto(true);
	2885	+ pasteInto(true, true);
1937	2886	} else
1938	2887	if (source == pasteExpandItem)
1939	2888	{
..	..	@@ -2125,9 +3074,9 @@
2125	3074	// group.selection.get(0).setMasterThis(content); // should be identity
2126	3075	// refreshContents();
2127	3076	// }
2128		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	3077	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2129	3078	{
2130		- Object3D content = GrafreeD.clipboard.get(0);
	3079	+ Object3D content = Grafreed.clipboard.get(0);
2131	3080
2132	3081	if (content instanceof cGroup && ((cGroup)content).transientlink )
2133	3082	content = ((cGroup)content).get(0);
..	..	@@ -2135,11 +3084,11 @@
2135	3084	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2136	3085	for (int i=0; i<group.selection.size(); i++)
2137	3086	{
2138		- boolean random = CameraPane.RANDOM;
2139		- CameraPane.RANDOM = false; // parse all random nodes
	3087	+ boolean random = CameraPane.SWITCH;
	3088	+ CameraPane.SWITCH = false; // parse all random nodes
2140	3089	group.selection.get(i).linkVerticesThis(content);
2141	3090	// group.selection.get(i).setMasterThis(content); // should be identity
2142		- CameraPane.RANDOM = random;
	3091	+ CameraPane.SWITCH = random;
2143	3092	}
2144	3093	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2145	3094	refreshContents();
..	..	@@ -2149,20 +3098,20 @@
2149	3098	{
2150	3099	for (int i=0; i<group.selection.size(); i++)
2151	3100	{
2152		- boolean random = CameraPane.RANDOM;
2153		- CameraPane.RANDOM = false; // parse all random nodes
	3101	+ boolean random = CameraPane.SWITCH;
	3102	+ CameraPane.SWITCH = false; // parse all random nodes
2154	3103	group.selection.get(i).linkVerticesThis(null);
2155		- CameraPane.RANDOM = random;
	3104	+ CameraPane.SWITCH = random;
2156	3105	}
2157	3106
2158	3107	refreshContents();
2159	3108	} else
2160	3109	if (source == relinkverticesItem)
2161	3110	{
2162		- boolean random = CameraPane.RANDOM;
2163		- CameraPane.RANDOM = false; // parse all random nodes
	3111	+ boolean random = CameraPane.SWITCH;
	3112	+ CameraPane.SWITCH = false; // parse all random nodes
2164	3113	group.selection.RelinkToSupport();
2165		- CameraPane.RANDOM = random;
	3114	+ CameraPane.SWITCH = random;
2166	3115
2167	3116	refreshContents();
2168	3117	} else
..	..	@@ -2177,9 +3126,9 @@
2177	3126	} else
2178	3127	if (source == setMasterItem)
2179	3128	{
2180		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	3129	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2181	3130	{
2182		- Object3D content = GrafreeD.clipboard.get(0);
	3131	+ Object3D content = Grafreed.clipboard.get(0);
2183	3132
2184	3133	if (content instanceof cGroup && ((cGroup)content).transientlink )
2185	3134	content = ((cGroup)content).get(0);
..	..	@@ -2192,9 +3141,9 @@
2192	3141	{
2193	3142	if (group.selection.size() == 1)
2194	3143	{
2195		- if (GrafreeD.clipboard.size() == 1)
	3144	+ if (Grafreed.clipboard.size() == 1)
2196	3145	{
2197		- Object3D content = GrafreeD.clipboard.get(0);
	3146	+ Object3D content = Grafreed.clipboard.get(0);
2198	3147
2199	3148	if (content instanceof cGroup && ((cGroup)content).transientlink )
2200	3149	content = ((cGroup)content).get(0);
..	..	@@ -2211,7 +3160,7 @@
2211	3160	{
2212	3161	RevertMeshes();
2213	3162	} else
2214		- if (source == resetMeshItem)
	3163	+ if (source == resetAllItem)
2215	3164	{
2216	3165	ResetAll();
2217	3166	} else
..	..	@@ -2219,7 +3168,7 @@
2219	3168	{
2220	3169	StepAll();
2221	3170	} else
2222		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3171	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2223	3172	{
2224	3173	//int indices[] = jList.getSelectedIndices();
2225	3174	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2231,9 +3180,9 @@
2231	3180	{
2232	3181	ClearSelection(true);
2233	3182	} else
2234		- if (source == grabItem)
	3183	+ if (source == grabItem \|\| source == groupButton)
2235	3184	{
2236		- group(new cGroup(), true);
	3185	+ group(new cGroup(), false); // true);
2237	3186	} else
2238	3187	if (source == hideItem)
2239	3188	{
..	..	@@ -2251,16 +3200,16 @@
2251	3200	{
2252	3201	makeSomething(new Camera());
2253	3202	} else
2254		- if (source == compositeItem)
	3203	+ if (source == compositeItem \|\| source == compositeButton)
2255	3204	{
2256	3205	group(new Composite());
2257	3206	} else
2258		- if (source == randomItem)
	3207	+ if (source == switchItem \|\| source == switchButton)
2259	3208	{
2260	3209	RandomNode random = new RandomNode();
2261	3210	group(random);
2262	3211	if (random.size() > 0)
2263		- random.name = random.get(0).name + "Rnd";
	3212	+ random.name = random.get(0).name + "Switch";
2264	3213	} else
2265	3214	if (source == physicsItem)
2266	3215	{
..	..	@@ -2357,7 +3306,7 @@
2357	3306	{
2358	3307	group(new cLinker());
2359	3308	} else
2360		- if (source == textureItem)
	3309	+ if (source == textureItem \|\| source == textureButton)
2361	3310	{
2362	3311	group(new TextureNode());
2363	3312	} else
..	..	@@ -2377,17 +3326,30 @@
2377	3326	{
2378	3327	CastShadow(2);
2379	3328	} else
2380		- if (source == ungroupItem)
	3329	+ if (source == ungroupItem \|\| source == ungroupButton)
2381	3330	{
2382		- //ungroup();
	3331	+ boolean hasRoot = false;
	3332	+
2383	3333	for (int i=0; i<group.selection.size(); i++)
2384	3334	{
2385		- Ungroup(group.selection.get(i));
	3335	+ if (group.selection.get(i) == group)
	3336	+ {
	3337	+ hasRoot = true;
	3338	+ break;
	3339	+ }
2386	3340	}
2387	3341
2388		- ClearSelection(false);
2389		-
2390		- refreshContents();
	3342	+ if (!hasRoot)
	3343	+ {
	3344	+ for (int i=0; i<group.selection.size(); i++)
	3345	+ {
	3346	+ Ungroup(group.selection.get(i));
	3347	+ }
	3348	+
	3349	+ ClearSelection(false);
	3350	+
	3351	+ refreshContents();
	3352	+ }
2391	3353	} else
2392	3354	if (source == genUVItem)
2393	3355	{
..	..	@@ -2399,7 +3361,7 @@
2399	3361	} else
2400	3362	if (source == genNormalsMESHItem)
2401	3363	{
2402		- GenNormals(true); // TODO
	3364	+ GenNormalsMESH();
2403	3365	} else
2404	3366	if (source == genNormalsORGANItem)
2405	3367	{
..	..	@@ -2464,6 +3426,22 @@
2464	3426	if (source == unmarkleavesItem)
2465	3427	{
2466	3428	MarkLeaves(false);
	3429	+ } else
	3430	+ if (source == rewindleavesItem)
	3431	+ {
	3432	+ RewindLeaves(true);
	3433	+ } else
	3434	+ if (source == unrewindleavesItem)
	3435	+ {
	3436	+ RewindLeaves(false);
	3437	+ } else
	3438	+ if (source == randomleavesItem)
	3439	+ {
	3440	+ RandomLeaves(true);
	3441	+ } else
	3442	+ if (source == unrandomleavesItem)
	3443	+ {
	3444	+ RandomLeaves(false);
2467	3445	} else
2468	3446	if (source == flipVItem)
2469	3447	{
..	..	@@ -2549,9 +3527,13 @@
2549	3527	{
2550	3528	SmoothMesh();
2551	3529	} else
2552		- if (source == transformgeometryItem)
	3530	+ if (source == transformGeometryItem)
2553	3531	{
2554	3532	TransformGeometry();
	3533	+ } else
	3534	+ if (source == transformChildrenItem)
	3535	+ {
	3536	+ TransformChildren();
2555	3537	} else
2556	3538	if (source == resetTransformItem)
2557	3539	{
..	..	@@ -2559,7 +3541,11 @@
2559	3541	} else
2560	3542	if (source == resetCentroidItem)
2561	3543	{
2562		- ResetCentroid();
	3544	+ ResetCentroid(true);
	3545	+ } else
	3546	+ if (source == resetCentroidXZItem)
	3547	+ {
	3548	+ ResetCentroid(false);
2563	3549	} else
2564	3550	if (source == resetParentItem)
2565	3551	{
..	..	@@ -2664,7 +3650,7 @@
2664	3650	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2665	3651	{
2666	3652	obj = (Object3D)e.nextElement();
2667		- obj.SetBumpTexture(null);
	3653	+ obj.ResetBumpTexture();
2668	3654	}
2669	3655
2670	3656	refreshContents();
..	..	@@ -2680,6 +3666,31 @@
2680	3666
2681	3667	refreshContents();
2682	3668	} else
	3669	+ if (source == embedTexturesItem)
	3670	+ {
	3671	+ Object3D obj;
	3672	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3673	+ {
	3674	+ obj = (Object3D)e.nextElement();
	3675	+ obj.EmbedTextures(true);
	3676	+ }
	3677	+
	3678	+ refreshContents();
	3679	+ } else
	3680	+ if (source == deEmbedTexturesItem)
	3681	+ {
	3682	+ Object3D obj;
	3683	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3684	+ {
	3685	+ obj = (Object3D)e.nextElement();
	3686	+ obj.EmbedTextures(false);
	3687	+ }
	3688	+
	3689	+ CameraPane.texturepigment.clear();
	3690	+ CameraPane.texturebump.clear();
	3691	+
	3692	+ refreshContents();
	3693	+ } else
2683	3694	if (source == flashSelectionButton)
2684	3695	{
2685	3696	CameraPane.flash = true;
..	..	@@ -2691,42 +3702,36 @@
2691	3702	if (source == twoButton)
2692	3703	{
2693	3704	radio.layout = twoButton;
2694		- // bug
2695		- //gridPanel.setDividerLocation(1.0);
2696		- //bigPanel.setDividerLocation(0.0);
2697		-// bigThree.remove(scenePanel);
2698		-// bigThree.remove(centralPanel);
2699		-// bigThree.remove(XYZPanel);
2700		-// aWindowConstraints.gridx = 0;
2701		-// aWindowConstraints.gridy = 0;
2702		-// aWindowConstraints.gridwidth = 1;
2703		-// // aConstraints.gridheight = 3;
2704		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2705		-// aWindowConstraints.weightx = 0;
2706		-// aWindowConstraints.weighty = 1;
2707		-// //bigThree.add(jtp, aWindowConstraints);
2708		-// aWindowConstraints.weightx = 1;
2709		-// aWindowConstraints.gridwidth = 3;
2710		-// // aConstraints.gridheight = 3;
2711		-// aWindowConstraints.gridx = 1;
2712		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
2713		-// bigThree.add(centralPanel, aWindowConstraints);
2714		-// aWindowConstraints.weightx = 0;
2715		-// aWindowConstraints.gridx = 4;
2716		-// aWindowConstraints.gridwidth = 1;
2717		-// // aConstraints.gridheight = 3;
2718		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2719		-// //bigThree.add(XYZPanel, aWindowConstraints);
2720		-// scenePanel.setVisible(false);
2721		-// centralPanel.setVisible(true);
2722		-// XYZPanel.setVisible(false);
2723		- bigThree.ClearUI();
2724		- bigThree.add(centralPanel);
2725		- bigThree.FlushUI();
	3705	+
	3706	+ if (CameraPane.FULLSCREEN)
	3707	+ fullscreenLayout = radio.layout;
	3708	+
	3709	+ Show3DView();
	3710	+
	3711	+ cameraView.requestFocusInWindow();
	3712	+
	3713	+// refreshContents(true);
	3714	+//
	3715	+// try
	3716	+// {
	3717	+// java.awt.Robot bot = new java.awt.Robot();
	3718	+// int mask = InputEvent.BUTTON1_MASK;
	3719	+// bot.mouseMove(100, 100);
	3720	+// bot.mousePress(mask);
	3721	+// bot.mouseRelease(mask);
	3722	+// }
	3723	+// catch (Exception e)
	3724	+// {
	3725	+//
	3726	+// }
	3727	+
2726	3728	} else
2727	3729	if (source == threeButton)
2728	3730	{
2729	3731	radio.layout = threeButton;
	3732	+
	3733	+ if (CameraPane.FULLSCREEN)
	3734	+ fullscreenLayout = radio.layout;
2730	3735
2731	3736	// bigThree.remove(scenePanel);
2732	3737	// bigThree.remove(centralPanel);
..	..	@@ -2756,13 +3761,18 @@
2756	3761	// centralPanel.setVisible(true);
2757	3762	// XYZPanel.setVisible(true);
2758	3763	bigThree.ClearUI();
	3764	+ bigThree.add(scenePanel);
2759	3765	bigThree.add(centralPanel);
2760		- bigThree.add(XYZPanel);
2761	3766	bigThree.FlushUI();
	3767	+
	3768	+ cameraView.requestFocusInWindow();
2762	3769	} else
2763	3770	if (source == fourButton)
2764	3771	{
2765	3772	radio.layout = fourButton;
	3773	+
	3774	+ if (CameraPane.FULLSCREEN)
	3775	+ fullscreenLayout = radio.layout;
2766	3776
2767	3777	// bigThree.remove(scenePanel);
2768	3778	// bigThree.remove(centralPanel);
..	..	@@ -2794,10 +3804,15 @@
2794	3804	bigThree.ClearUI();
2795	3805	bigThree.add(scenePanel);
2796	3806	bigThree.FlushUI();
	3807	+
	3808	+ cameraView.requestFocusInWindow();
2797	3809	} else
2798	3810	if (source == sixButton)
2799	3811	{
2800	3812	radio.layout = sixButton;
	3813	+
	3814	+ if (CameraPane.FULLSCREEN)
	3815	+ fullscreenLayout = radio.layout;
2801	3816
2802	3817	// bigThree.remove(scenePanel);
2803	3818	// bigThree.remove(centralPanel);
..	..	@@ -2827,13 +3842,18 @@
2827	3842	// centralPanel.setVisible(true);
2828	3843	// XYZPanel.setVisible(false);
2829	3844	bigThree.ClearUI();
2830		- bigThree.add(scenePanel);
2831	3845	bigThree.add(centralPanel);
	3846	+ bigThree.add(scenePanel);
2832	3847	bigThree.FlushUI();
	3848	+
	3849	+ cameraView.requestFocusInWindow();
2833	3850	} else
2834	3851	if (source == sevenButton)
2835	3852	{
2836	3853	radio.layout = sevenButton;
	3854	+
	3855	+ if (CameraPane.FULLSCREEN)
	3856	+ fullscreenLayout = radio.layout;
2837	3857
2838	3858	// bigThree.remove(scenePanel);
2839	3859	// bigThree.remove(centralPanel);
..	..	@@ -2867,6 +3887,8 @@
2867	3887	bigThree.add(centralPanel);
2868	3888	bigThree.add(XYZPanel);
2869	3889	bigThree.FlushUI();
	3890	+
	3891	+ cameraView.requestFocusInWindow();
2870	3892	} else
2871	3893	if (source == rootButton)
2872	3894	{
..	..	@@ -2878,6 +3900,7 @@
2878	3900	EditObject(obj);
2879	3901	}
2880	3902
	3903	+ cameraView.requestFocusInWindow();
2881	3904	refreshContents(true);
2882	3905	} else
2883	3906	if (source == closeButton)
..	..	@@ -2887,22 +3910,37 @@
2887	3910	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2888	3911	{
2889	3912	ab = (cRadio)e.nextElement();
2890		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3913	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2891	3914	{
	3915	+ // Patch to avoid bug with transparency.
	3916	+ if (!ab.hadMaterial)
	3917	+ {
	3918	+ ab.object.material = null;
	3919	+ }
	3920	+
2892	3921	buttonGroup.remove(ab);
2893	3922	radioPanel.remove(ab);
2894	3923
2895		- ab.GetObject().editWindow = null;
	3924	+ //ab.GetObject().editWindow = null;
	3925	+ ab.GetObject().manipWindow = null;
2896	3926	// ab.GetObject().objectUI = null; // ?????????
2897	3927
2898	3928	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2899	3929	break;
2900	3930	}
2901	3931	}
	3932	+
	3933	+ cameraView.requestFocusInWindow();
2902	3934	refreshContents(true);
2903	3935	} else
2904	3936	if (source == editItem \|\| source == editButton)
2905	3937	{
	3938	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3939	+ {
	3940	+ Object3D child = (Object3D)e.nextElement();
	3941	+ child.pinned = true;
	3942	+ }
	3943	+
2906	3944	EditSelection(false);
2907	3945	} else
2908	3946	if (source == uneditButton)
..	..	@@ -2911,13 +3949,14 @@
2911	3949	{
2912	3950	Object3D child = (Object3D)e.nextElement();
2913	3951	if(child.editWindow != null)
2914		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3952	+ child.pinned = false;
2915	3953	child.CloseUI();
2916	3954	listUI.remove(child);
	3955	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2917	3956
2918		- child.editWindow = null; // ???????????
	3957	+ //child.editWindow = null; // ???????????
2919	3958	}
2920		- objEditor.ctrlPanel.validate();
	3959	+ objEditor.ctrlPanel.FlushUI();
2921	3960	//objEditor.jTree.clearSelection();
2922	3961	//objEditor.ResetSliders();
2923	3962	refreshContents(true);
..	..	@@ -2928,16 +3967,18 @@
2928	3967	//copy.ClearUI();
2929	3968	for (Object3D obj : listUI)
2930	3969	{
	3970	+ obj.pinned = false;
2931	3971	obj.CloseUI();
2932	3972	}
2933	3973	listUI.clear();
	3974	+ SetPinStates(group.selection.size() > 0);
2934	3975	refreshContents(true);
2935	3976	} else
2936	3977	if (source == allParamsButton)
2937	3978	{
2938	3979	assert(copy == group);
2939	3980
2940		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3981	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2941	3982
2942	3983	for (Object3D obj : listUI)
2943	3984	{
..	..	@@ -2986,6 +4027,9 @@
2986	4027	}
2987	4028
2988	4029	copy = group;
	4030	+
	4031	+ SetUndoStates();
	4032	+
2989	4033	//Globals.theRenderer.object = group;
2990	4034	if(!useclient)
2991	4035	{
..	..	@@ -3001,20 +4045,49 @@
3001	4045	frontView.object = group;
3002	4046	sideView.object = group;
3003	4047	}
3004		- group.editWindow = this;
	4048	+
	4049	+// fix "+" issue
	4050	+ //group.editWindow = this;
	4051	+ group.manipWindow = this;
	4052	+
3005	4053	/*
3006	4054	currentLayout = radio.layout;
3007	4055	if (currentLayout == null)
3008	4056	currentLayout = sevenButton;
3009	4057	*/
3010	4058	radio.layout.doClick();
	4059	+
	4060	+ ClearUnpinned();
	4061	+
	4062	+ //Grafreed.Assert(group != null);
	4063	+ //Grafreed.Assert(group.selection != null);
	4064	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4065	+ if (group.selection == null \|\| group.selection.size() == 1)
	4066	+ EditSelection(false);
3011	4067	keepparent = group.parent;
3012	4068	// PARENT = NULL or not???
3013	4069	//group.parent = null; // ROOT
3014	4070	//group.attributes = -1;
3015	4071	ResetModel();
	4072	+
	4073	+ cameraView.requestFocusInWindow();
3016	4074	refreshContents(true);
3017		- }
	4075	+ } else if (event.getSource() == editCameraItem)
	4076	+ {
	4077	+ cameraView.ProtectCamera();
	4078	+ cameraView.requestFocusInWindow();
	4079	+ cameraView.repaint();
	4080	+ return;
	4081	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	4082	+ {
	4083	+ cameraView.RevertCamera();
	4084	+ cameraView.requestFocusInWindow();
	4085	+ cameraView.repaint();
	4086	+ return;
	4087	+ // } else if (event.getSource() == textureButton)
	4088	+ // {
	4089	+ // return; // true;
	4090	+ }
3018	4091	else
3019	4092	{
3020	4093	//return super.action(event, arg);
..	..	@@ -3023,7 +4096,6 @@
3023	4096	}
3024	4097
3025	4098	boolean useclient = false;
3026		- cRadio radio;
3027	4099
3028	4100	void ToggleRoot()
3029	4101	{
..	..	@@ -3075,6 +4147,28 @@
3075	4147	refreshContents();
3076	4148	}
3077	4149
	4150	+ void TransformChildren()
	4151	+ {
	4152	+ Object3D obj;
	4153	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4154	+ {
	4155	+ obj = (Object3D)e.nextElement();
	4156	+ obj.KeepTextureMatrices();
	4157	+ obj.TransformChildren();
	4158	+ obj.RestoreTextureMatrices();
	4159	+
	4160	+// if (obj.parent == null)
	4161	+// {
	4162	+// System.out.println("NULL PARENT!");
	4163	+// new Exception().printStackTrace();
	4164	+// }
	4165	+// else
	4166	+// TouchTransform(obj);
	4167	+// //obj.parent.Touch();
	4168	+ }
	4169	+
	4170	+ refreshContents();
	4171	+ }
3078	4172
3079	4173	void ResetTransform()
3080	4174	{
..	..	@@ -3187,7 +4281,7 @@
3187	4281	refreshContents();
3188	4282	}
3189	4283
3190		- void ResetCentroid()
	4284	+ void ResetCentroid(boolean full)
3191	4285	{
3192	4286	Object3D obj;
3193	4287	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3202,12 +4296,16 @@
3202	4296	LA.matIdentity(Object3D.mat);
3203	4297	obj.getBounds(minima, maxima, false);
3204	4298	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3205		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	4299	+ if (full)
	4300	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3206	4301	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3207	4302	obj.TransformMesh(Object3D.mat);
	4303	+
3208	4304	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3209		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	4305	+ if (full)
	4306	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3210	4307	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	4308	+
3211	4309	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3212	4310	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3213	4311	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3236,7 +4334,8 @@
3236	4334
3237	4335	int size = obj.MemorySize();
3238	4336
3239		- System.err.println((size/1024) + " KB is the size of " + obj);
	4337	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4338	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3240	4339	}
3241	4340	}
3242	4341	catch (Exception e)
..	..	@@ -3273,9 +4372,9 @@
3273	4372	obj = (Object3D)e.nextElement();
3274	4373
3275	4374	System.out.println("Object is: " + obj);
3276		- GrafreeD.AnalyzeObject(obj);
	4375	+ Grafreed.AnalyzeObject(obj);
3277	4376	System.out.println("Boundary rep: " + obj.bRep);
3278		- GrafreeD.AnalyzeObject(obj.bRep);
	4377	+ Grafreed.AnalyzeObject(obj.bRep);
3279	4378
3280	4379	// System.err.println((size/1024) + " KB is the size of " + obj);
3281	4380	}
..	..	@@ -3317,6 +4416,13 @@
3317	4416	void GenNormals(boolean crease)
3318	4417	{
3319	4418	group.GenNormalsS(crease);
	4419	+
	4420	+ refreshContents();
	4421	+ }
	4422	+
	4423	+ void GenNormalsMESH()
	4424	+ {
	4425	+ group.GenNormalsMeshS();
3320	4426
3321	4427	refreshContents();
3322	4428	}
..	..	@@ -3489,8 +4595,8 @@
3489	4595
3490	4596	void ParseVertices()
3491	4597	{
3492		- boolean epsequal = GrafreeD.epsequal;
3493		- GrafreeD.epsequal = true;
	4598	+ boolean epsequal = Grafreed.epsequal;
	4599	+ Grafreed.epsequal = true;
3494	4600
3495	4601	for (int i=0; i<group.selection.size(); i++)
3496	4602	{
..	..	@@ -3515,7 +4621,7 @@
3515	4621	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3516	4622	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3517	4623
3518		- g.add(GrafreeD.clipboard);
	4624	+ g.add(Grafreed.clipboard);
3519	4625
3520	4626	buffer.add(g);
3521	4627	}
..	..	@@ -3530,7 +4636,7 @@
3530	4636	makeSomething(buffer, i==group.selection.size()-1);
3531	4637	}
3532	4638
3533		- GrafreeD.epsequal = epsequal;
	4639	+ Grafreed.epsequal = epsequal;
3534	4640
3535	4641	refreshContents();
3536	4642	}
..	..	@@ -3548,7 +4654,16 @@
3548	4654	String pigment = Object3D.GetPigment(tex);
3549	4655	//String bump = Object3D.GetBump(tex);
3550	4656
3551		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4657	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4658	+
	4659	+ try
	4660	+ {
	4661	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
	4662	+ }
	4663	+ catch (Exception e)
	4664	+ {
	4665	+ System.err.println("FAIL: " + node);
	4666	+ }
3552	4667
3553	4668	double s = v.s;
3554	4669
..	..	@@ -3636,11 +4751,11 @@
3636	4751
3637	4752	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3638	4753
3639		- boolean random = CameraPane.RANDOM;
3640		- CameraPane.RANDOM = false; // parse all random nodes
	4754	+ boolean random = CameraPane.SWITCH;
	4755	+ CameraPane.SWITCH = false; // parse all random nodes
3641	4756	lowres.linkVerticesThis(null);
3642	4757	lowres.linkVerticesThis(sn);
3643		- CameraPane.RANDOM = random;
	4758	+ CameraPane.SWITCH = random;
3644	4759
3645	4760	System.err.flush();
3646	4761
..	..	@@ -3680,7 +4795,7 @@
3680	4795	return;
3681	4796
3682	4797	Object3D poses = group.selection.get(0);
3683		- Object3D ref = GrafreeD.clipboard.get(0);
	4798	+ Object3D ref = Grafreed.clipboard.get(0);
3684	4799
3685	4800	Object3D newgroup = new Object3D("Po:" + poses.name);
3686	4801
..	..	@@ -3874,9 +4989,9 @@
3874	4989
3875	4990	void ClipMesh()
3876	4991	{
3877		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4992	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3878	4993	{
3879		- Object3D content = GrafreeD.clipboard.get(0);
	4994	+ Object3D content = Grafreed.clipboard.get(0);
3880	4995
3881	4996	if (content instanceof cGroup && ((cGroup)content).transientlink )
3882	4997	content = ((cGroup)content).get(0);
..	..	@@ -3885,7 +5000,7 @@
3885	5000	// {
3886	5001	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3887	5002	// }
3888		- group.selection.ClipMesh(GrafreeD.clipboard);
	5003	+ group.selection.ClipMesh(Grafreed.clipboard);
3889	5004	}
3890	5005	// group.selection.ClipMesh(GrafreeD.clipboard);
3891	5006	System.out.println("DONE.");
..	..	@@ -3932,6 +5047,18 @@
3932	5047	void MarkLeaves(boolean hide)
3933	5048	{
3934	5049	group.selection.MarkLeaves(hide);
	5050	+ refreshContents();
	5051	+ }
	5052	+
	5053	+ void RewindLeaves(boolean hide)
	5054	+ {
	5055	+ group.selection.RewindLeaves(hide);
	5056	+ refreshContents();
	5057	+ }
	5058	+
	5059	+ void RandomLeaves(boolean hide)
	5060	+ {
	5061	+ group.selection.RandomLeaves(hide);
3935	5062	refreshContents();
3936	5063	}
3937	5064
..	..	@@ -4006,28 +5133,25 @@
4006	5133	// }
4007	5134	// }
4008	5135
4009		- static boolean allparams = true;
4010		-
4011		- static Vector<Object3D> listUI = new Vector<Object3D>();
4012		-
4013	5136	void EditSelection(boolean newWindow)
4014	5137	{
	5138	+ if (group.selection == null)
	5139	+ {
	5140	+ EditElement(group, newWindow); // ? new
	5141	+ return;
	5142	+ }
	5143	+
4015	5144	// aConstraints.gridy = 0;
4016	5145	for (int i=0; i<group.selection.size(); i++)
4017	5146	{
4018	5147	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4019	5148	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4020		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5149	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4021	5150
4022	5151	Object3D elem = (Object3D)group.selection.elementAt(i);
4023		- if(elem != group)
	5152	+ if(elem != group \|\| !newWindow)
4024	5153	{
4025		- // if (!(elem instanceof Composite))
4026		- // newWindow = false;
4027		- listUI.add(elem);
4028		- elem.openEditWindow(this, newWindow); //, false);
4029		- System.out.println("edit : " + elem);
4030		- elem.editWindow.refreshContents(true); // ? new
	5154	+ EditElement(elem, newWindow); // ? new
4031	5155	}
4032	5156	}
4033	5157	}
..	..	@@ -4090,9 +5214,7 @@
4090	5214
4091	5215	freezemodel = false;
4092	5216	}
4093		-
4094		- boolean flashIt = true;
4095		-
	5217	+
4096	5218	public void valueChanged(TreeSelectionEvent e)
4097	5219	//public boolean handleEvent(Event event)
4098	5220	{
..	..	@@ -4102,7 +5224,8 @@
4102	5224	//new Exception().printStackTrace();
4103	5225
4104	5226	freezemodel = true;
4105		-
	5227	+ ClearUnpinned();
	5228	+
4106	5229	/**/
4107	5230	//switch (event.id)
4108	5231	{
..	..	@@ -4110,7 +5233,6 @@
4110	5233	//case 702: // Event.LIST_DESELECT
4111	5234	group.deselectAll();
4112	5235	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4113		- objEditor.ClearInfo(); // .GetMaterial());
4114	5236	if (tps != null)
4115	5237	{
4116	5238	for (int i=0; i < tps.length; i++)
..	..	@@ -4119,33 +5241,39 @@
4119	5241
4120	5242	//if (child.parent != null)
4121	5243	//child.parent.addSelectee(child);
	5244	+ objEditor.SetMaterial(child);
4122	5245	group.addSelectee(child);
4123		- objEditor.SetMaterial(child); // .GetMaterial());
4124		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4125		- System.err.println("info : " + child.GetPath());
4126	5246	}
4127	5247	}
4128		- else
4129		- {
4130		- objEditor.SetMaterial(group); // .GetMaterial());
4131		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4132		- System.err.println("info : " + group.GetPath());
4133		- }
	5248	+// else
	5249	+// {
	5250	+// objEditor.SetMaterial(group); // .GetMaterial());
	5251	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	5252	+// System.err.println("info : " + group.GetPath());
	5253	+// }
4134	5254
4135		- objEditor.SetText(); // jan 2014
4136		-
4137		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	5255	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4138	5256	CameraPane.flash = true;
4139	5257
4140		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5258	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4141	5259	// a camera
4142	5260	{
4143		- CameraPane.camerachangeframe = 0; // don't refuse it
4144		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5261	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5262	+ {
	5263	+ CameraPane.camerachangeframe = 0; // don't refuse it
	5264	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5265	+ }
4145	5266	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4146	5267	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4147	5268	}
4148	5269
	5270	+ if (tps != null && tps.length == 1)
	5271	+ {
	5272	+ EditSelection(false);
	5273	+ }
	5274	+
	5275	+ SetPinStates(tps != null && tps.length > 0);
	5276	+
4149	5277	refreshContents();
4150	5278	//return true;
4151	5279	}
..	..	@@ -4154,6 +5282,37 @@
4154	5282
4155	5283	freezemodel = false;
4156	5284	}
	5285	+
	5286	+ void SetPinStates(boolean enabled)
	5287	+ {
	5288	+ editButton.setEnabled(enabled);
	5289	+ uneditButton.setEnabled(enabled);
	5290	+ //unselectButton.setEnabled(enabled);
	5291	+ flashSelectionButton.setEnabled(enabled);
	5292	+
	5293	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5294	+ }
	5295	+
	5296	+ void refreshContents(boolean cp)
	5297	+ {
	5298	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5299	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5300	+ {
	5301	+ objEditor.ClearInfo(); // .GetMaterial());
	5302	+
	5303	+ for (int i=0; i < group.selection.Size(); i++)
	5304	+ {
	5305	+ Object3D child = (Object3D) group.selection.get(i);
	5306	+
	5307	+ objEditor.AddInfo(child, this, true);
	5308	+// System.err.println("info : " + child.GetPath());
	5309	+ }
	5310	+
	5311	+ objEditor.SetText(); // jan 2014
	5312	+ }
	5313	+
	5314	+ super.refreshContents(cp);
	5315	+ }
4157	5316
4158	5317	void linkSomething(Object3D thing)
4159	5318	{
..	..	@@ -4225,16 +5384,19 @@
4225	5384	{
4226	5385	if (group.selection.isEmpty())
4227	5386	return;
4228		- GrafreeD.clipboardIsTempGroup = false;
	5387	+
	5388	+ Grafreed.clipboardIsTempGroup = false;
4229	5389	Composite tGroup = null;
4230	5390	if (group.selection.size() > 0) // 1)
4231	5391	{
4232	5392	tGroup = new cGroup();
4233		- GrafreeD.clipboardIsTempGroup = true;
	5393	+ Grafreed.clipboardIsTempGroup = true;
4234	5394	}
4235	5395
4236	5396	if (cut)
4237	5397	{
	5398	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5399	+// Save();
4238	5400	//int indices[] = jList.getSelectedIndices();
4239	5401	//for (int i = indices.length - 1; i >= 0; i--)
4240	5402	//jList.remove(indices[i]);
..	..	@@ -4270,16 +5432,16 @@
4270	5432	//System.out.println("cut " + child);
4271	5433	//System.out.println("parent = " + child.parent);
4272	5434	// tmp.addChild(child);
4273		- if (GrafreeD.clipboardIsTempGroup)
	5435	+ if (Grafreed.clipboardIsTempGroup)
4274	5436	tGroup.add/Child/(tmp);
4275	5437	else
4276		- GrafreeD.clipboard = tmp;
	5438	+ Grafreed.clipboard = tmp;
4277	5439	}
4278	5440	else
4279		- if (GrafreeD.clipboardIsTempGroup)
	5441	+ if (Grafreed.clipboardIsTempGroup)
4280	5442	tGroup.add/Child/(child);
4281	5443	else
4282		- GrafreeD.clipboard = child;
	5444	+ Grafreed.clipboard = child;
4283	5445	}
4284	5446
4285	5447	//ResetModel();
..	..	@@ -4311,21 +5473,23 @@
4311	5473	//System.out.println("cut " + elem);
4312	5474	//System.out.println("parent = " + elem.parent);
4313	5475	// tmp.addChild(elem);
4314		- if (GrafreeD.clipboardIsTempGroup)
	5476	+ if (Grafreed.clipboardIsTempGroup)
4315	5477	tGroup.add/Child/(tmp);
4316	5478	else
4317		- GrafreeD.clipboard = tmp;
	5479	+ Grafreed.clipboard = tmp;
4318	5480	}
4319	5481	else
4320		- if (GrafreeD.clipboardIsTempGroup)
	5482	+ if (Grafreed.clipboardIsTempGroup)
4321	5483	tGroup.add/Child/(child);
4322	5484	else
4323		- GrafreeD.clipboard = child;
	5485	+ Grafreed.clipboard = child;
4324	5486	}
4325	5487
4326	5488	}
4327		- if (GrafreeD.clipboardIsTempGroup)
4328		- GrafreeD.clipboard = tGroup;
	5489	+
	5490	+ if (Grafreed.clipboardIsTempGroup)
	5491	+ Grafreed.clipboard = tGroup;
	5492	+
4329	5493	if (cut)
4330	5494	{
4331	5495	ResetModel();
..	..	@@ -4335,11 +5499,15 @@
4335	5499
4336	5500	void paste(boolean expand)
4337	5501	{
	5502	+ if (Globals.REPLACEONMAKE)
	5503	+ Save();
	5504	+ boolean keep = Globals.REPLACEONMAKE;
	5505	+ Globals.REPLACEONMAKE = false;
4338	5506	// if (GrafreeD.clipboard == null)
4339	5507	// return;
4340	5508	boolean first = true;
4341	5509
4342		- if (GrafreeD.clipboardIsTempGroup)
	5510	+ if (Grafreed.clipboardIsTempGroup)
4343	5511	{
4344	5512	Composite temp;
4345	5513
..	..	@@ -4350,7 +5518,7 @@
4350	5518	temp = (Composite)Applet3D.clipboard.deepCopy();
4351	5519	*/
4352	5520	Object3D elem;
4353		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5521	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4354	5522	{
4355	5523	Object3D child = (Object3D)e.nextElement();
4356	5524
..	..	@@ -4384,21 +5552,22 @@
4384	5552	//Object3D cb = Applet3D.clipboard;
4385	5553	//temp.addChild(cb);
4386	5554	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4387		- assert(GrafreeD.clipboard.parent == null);
4388		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4389		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4390		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4391		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	5555	+ assert(Grafreed.clipboard.parent == null);
	5556	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5557	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5558	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5559	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4392	5560	else
4393		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4394		- GrafreeD.clipboard.get(0).parent = keepparent;
	5561	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5562	+ Grafreed.clipboard.get(0).parent = keepparent;
4395	5563	}
4396	5564
	5565	+ Globals.REPLACEONMAKE = keep;
4397	5566	ResetModel();
4398	5567	refreshContents();
4399	5568	}
4400	5569
4401		- void pasteInto(boolean copyit)
	5570	+ void pasteInto(boolean copyit, boolean clone)
4402	5571	{
4403	5572	// if (GrafreeD.clipboard == null)
4404	5573	// return;
..	..	@@ -4427,15 +5596,22 @@
4427	5596	if (copyit)
4428	5597	{
4429	5598	// paste(false);
4430		- CloneClipboard(false); // sept 2014
	5599	+ if (clone)
	5600	+ {
	5601	+ CloneClipboard(false); // sept 2014
	5602	+ }
	5603	+ else
	5604	+ {
	5605	+ paste(false);
	5606	+ }
4431	5607	}
4432	5608	else
4433	5609	{
4434	5610	boolean first = true;
4435	5611
4436		- if (GrafreeD.clipboardIsTempGroup)
	5612	+ if (Grafreed.clipboardIsTempGroup)
4437	5613	{
4438		- Composite temp = (Composite)GrafreeD.clipboard;
	5614	+ Composite temp = (Composite)Grafreed.clipboard;
4439	5615	Object3D copy;
4440	5616	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4441	5617	{
..	..	@@ -4445,7 +5621,7 @@
4445	5621	}
4446	5622	} else
4447	5623	{
4448		- linkSomething(GrafreeD.clipboard); //.get(0));
	5624	+ linkSomething(Grafreed.clipboard); //.get(0));
4449	5625	}
4450	5626	}
4451	5627	}
..	..	@@ -4522,6 +5698,10 @@
4522	5698
4523	5699	void group(Object3D csg, boolean grab)
4524	5700	{
	5701	+ if (Globals.REPLACEONMAKE)
	5702	+ Save();
	5703	+ boolean keep = Globals.REPLACEONMAKE;
	5704	+ Globals.REPLACEONMAKE = false;
4525	5705	if (//false) // why??
4526	5706	!group.selection.isEmpty())
4527	5707	{
..	..	@@ -4635,10 +5815,15 @@
4635	5815	//node.add(csg);
4636	5816	//makeSomething(node);
4637	5817	makeSomething(csg);
	5818	+ Globals.REPLACEONMAKE = keep;
4638	5819	}
4639	5820
4640	5821	void Ungroup(Object3D g)
4641	5822	{
	5823	+ if (Globals.REPLACEONMAKE)
	5824	+ Save();
	5825	+ boolean keep = Globals.REPLACEONMAKE;
	5826	+ Globals.REPLACEONMAKE = false;
4642	5827	if (g instanceof HiddenObject)
4643	5828	{
4644	5829	HiddenObject h = (HiddenObject) g;
..	..	@@ -4655,6 +5840,7 @@
4655	5840	objEditor.makeSomething(g.get(i), false);
4656	5841	}
4657	5842	}
	5843	+ Globals.REPLACEONMAKE = keep;
4658	5844	}
4659	5845
4660	5846	void ungroup()
..	..	@@ -4850,21 +6036,6 @@
4850	6036	}
4851	6037	*/
4852	6038
4853		- void ImportGFD()
4854		- {
4855		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4856		- browser.show();
4857		- String filename = browser.getFile();
4858		- if (filename != null && filename.length() > 0)
4859		- {
4860		- String fullname = browser.getDirectory() + filename;
4861		-
4862		- //Object3D readobj =
4863		- objEditor.ReadGFD(fullname, objEditor);
4864		- //makeSomething(readobj);
4865		- }
4866		- }
4867		-
4868	6039	/*
4869	6040	public void Callback(Object obj)
4870	6041	{
..	..	@@ -4888,26 +6059,9 @@
4888	6059	}
4889	6060	*/
4890	6061
4891		- void ImportVRMLX3D()
4892		- {
4893		- if (GrafreeD.standAlone)
4894		- {
4895		- /**/
4896		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4897		- browser.show();
4898		- String filename = browser.getFile();
4899		- if (filename != null && filename.length() > 0)
4900		- {
4901		- String fullname = browser.getDirectory() + filename;
4902		- LoadVRMLX3D(fullname);
4903		- }
4904		- /**/
4905		- }
4906		- }
4907		-
4908	6062	String GetFile(String dialogName)
4909	6063	{
4910		- if (GrafreeD.standAlone)
	6064	+ if (Grafreed.standAlone)
4911	6065	{
4912	6066	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4913	6067	browser.show();
..	..	@@ -4971,10 +6125,48 @@
4971	6125	cButton flashSelectionButton;
4972	6126	cButton editButton;
4973	6127	cButton uneditButton;
	6128	+ JCheckBox allParamsButton;
4974	6129	cButton clearpanelButton;
4975		- cButton allParamsButton;
4976	6130	cButton unselectButton;
4977	6131
	6132	+ cButton restoreCameraButton;
	6133	+
	6134	+ cButton oneStepButton;
	6135	+
	6136	+ cButton groupButton;
	6137	+ cButton ungroupButton;
	6138	+ cButton compositeButton;
	6139	+ cButton switchButton;
	6140	+ cButton loopButton;
	6141	+ cButton textureButton;
	6142	+
	6143	+ cButton skybox1Button;
	6144	+ cButton skybox2Button;
	6145	+ cButton skybox3Button;
	6146	+ cButton skybox4Button;
	6147	+ cButton skybox5Button;
	6148	+ cButton skybox6Button;
	6149	+ cButton skybox7Button;
	6150	+
	6151	+ cButton skybox11Button;
	6152	+ cButton skybox12Button;
	6153	+ cButton skybox13Button;
	6154	+ cButton skybox14Button;
	6155	+ cButton skybox15Button;
	6156	+ cButton skybox16Button;
	6157	+ cButton skybox17Button;
	6158	+
	6159	+ cButton gridButton;
	6160	+ cButton boxButton;
	6161	+ cButton sphereButton;
	6162	+ cButton coneButton;
	6163	+ cButton torusButton;
	6164	+ cButton superButton;
	6165	+ cButton kleinButton;
	6166	+ cButton particlesButton;
	6167	+ cButton overlayButton;
	6168	+ cButton lightButton;
	6169	+
4978	6170	cButton screenfitButton;
4979	6171	cButton screenfitpointButton;
4980	6172	cButton snapobjectButton;
..	..	@@ -4986,14 +6178,6 @@
4986	6178
4987	6179	cButton setsupportButton;
4988	6180
4989		- cButton twoButton;
4990		- cButton sixButton;
4991		- cButton threeButton;
4992		- cButton sevenButton;
4993		- cButton fourButton; // full panel
4994		- cButton oneButton; // full XYZ
4995		- //cButton currentLayout;
4996		-
4997	6181	//
4998	6182	//Composite
4999	6183	Object3D // to do !!
..	..	@@ -5003,9 +6187,11 @@
5003	6187	//JTree jTree;
5004	6188	private MenuItem lookAtItem;
5005	6189	private MenuItem lookFromItem;
5006		- private MenuItem switchItem;
	6190	+ private MenuItem switchViewItem;
5007	6191	private MenuItem cutItem;
5008		- private MenuItem duplicateItem;
	6192	+ private MenuItem undoItem;
	6193	+ private MenuItem redoItem;
	6194	+ private JMenuItem duplicateItem;
5009	6195	private MenuItem cloneItem;
5010	6196	private MenuItem cloneSupportItem;
5011	6197	private MenuItem overwriteGeoItem;
..	..	@@ -5018,7 +6204,7 @@
5018	6204	private MenuItem linkverticesItem;
5019	6205	private MenuItem relinkverticesItem;
5020	6206	private MenuItem setMasterItem;
5021		- private MenuItem resetMeshItem;
	6207	+ private MenuItem resetAllItem;
5022	6208	private MenuItem stepAllItem;
5023	6209	private MenuItem revertMeshItem;
5024	6210	private MenuItem poseMeshItem;
..	..	@@ -5029,10 +6215,11 @@
5029	6215	private MenuItem mergeGeometriesItem;
5030	6216	private MenuItem copyItem;
5031	6217	private MenuItem pasteItem;
	6218	+ private MenuItem pasteIntoItem;
5032	6219	private MenuItem pasteLinkItem;
5033	6220	private MenuItem pasteCloneItem;
5034	6221	private MenuItem pasteExpandItem;
5035		- private MenuItem clearItem;
	6222	+ private MenuItem deleteItem;
5036	6223	private MenuItem clearAllItem;
5037	6224	private MenuItem genUVItem;
5038	6225	private MenuItem genNormalsMESHItem;
..	..	@@ -5067,6 +6254,10 @@
5067	6254	private MenuItem showleavesItem;
5068	6255	private MenuItem markleavesItem;
5069	6256	private MenuItem unmarkleavesItem;
	6257	+ private MenuItem rewindleavesItem;
	6258	+ private MenuItem unrewindleavesItem;
	6259	+ private MenuItem randomleavesItem;
	6260	+ private MenuItem unrandomleavesItem;
5070	6261
5071	6262	private MenuItem flipVItem;
5072	6263	private MenuItem unflipVItem;
..	..	@@ -5078,15 +6269,17 @@
5078	6269	private MenuItem panoTexturesItem;
5079	6270
5080	6271	private MenuItem resetCentroidItem;
5081		- private MenuItem transformgeometryItem;
	6272	+ private MenuItem resetCentroidXZItem;
5082	6273	private MenuItem resetTransformItem;
	6274	+ private MenuItem transformGeometryItem;
	6275	+ private MenuItem transformChildrenItem;
5083	6276	private MenuItem hideItem;
5084	6277	private MenuItem grabItem;
5085	6278	private MenuItem backItem;
5086	6279	private MenuItem frontItem;
5087	6280	private MenuItem cameraItem;
5088	6281	private MenuItem compositeItem;
5089		- private MenuItem randomItem;
	6282	+ private MenuItem switchItem;
5090	6283	private MenuItem physicsItem;
5091	6284	private MenuItem frameselectorItem;
5092	6285	private MenuItem scriptNodeItem;
..	..	@@ -5110,6 +6303,8 @@
5110	6303	private MenuItem attachBumpItem;
5111	6304	private MenuItem detachBumpItem;
5112	6305	private MenuItem pigmentBumpItem;
	6306	+ private MenuItem embedTexturesItem;
	6307	+ private MenuItem deEmbedTexturesItem;
5113	6308
5114	6309	private MenuItem particleItem;
5115	6310	private MenuItem ragdollItem;
..	..	@@ -5126,7 +6321,7 @@
5126	6321	private MenuItem blobItem;
5127	6322	private MenuItem latheItem;
5128	6323	private MenuItem bezierItem;
5129		- private MenuItem checkerItem;
	6324	+ private MenuItem overlayItem;
5130	6325	private MenuItem meshItem;
5131	6326	// private MenuItem meshGroupItem;
5132	6327	private MenuItem springItem;
..	..	@@ -5148,11 +6343,6 @@
5148	6343	private MenuItem doubleItem;
5149	6344	private MenuItem tripleItem;
5150	6345
5151		- private MenuItem importGFDItem;
5152		- private MenuItem importVRMLX3DItem;
5153		- private MenuItem import3DSItem;
5154		- private MenuItem importOBJItem;
5155		-
5156	6346	private MenuItem computeAOItem;
5157	6347	private MenuItem recompileItem;
5158	6348	private MenuItem editScriptItem;
..	..	@@ -5162,4 +6352,8 @@
5162	6352	private MenuItem analyzeItem;
5163	6353	private MenuItem dumpItem;
5164	6354	//boolean freezemodel = false;
	6355	+
	6356	+ Menu cameraMenu;
	6357	+ MenuItem editCameraItem;
	6358	+ MenuItem restoreCameraItem;
5165	6359	}