~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -16,6 +16,7 @@
16	16	//import buoy.widget.BFileChooser;
17	17
18	18	class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
	19	+ Grafreed.iResourceCallBack,
19	20	ObjectUI,
20	21	Runnable,
21	22	ActionListener,
..	..	@@ -23,6 +24,360 @@
23	24	DragGestureListener, DragSourceListener, DropTargetListener,
24	25	ItemListener // ListSelectionListener
25	26	{
	27	+
	28	+ public void AddSkyboxButton(String f, String s, cGridBag row)
	29	+ {
	30	+ cButton skyboxButton;
	31	+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
	32	+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
	33	+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
	34	+ skyboxButton.setToolTipText(s.equals("") ? "No background" : s);
	35	+ skyboxButton.addActionListener(new ActionListener()
	36	+ {
	37	+ @Override
	38	+ public void actionPerformed(ActionEvent e)
	39	+ {
	40	+ ChangeSkybox(path);
	41	+ }
	42	+ });
	43	+ }
	44	+
	45	+ public void AddTextureButton(String f, String c, final String t, int count, cGridBag row)
	46	+ {
	47	+ cButton textureButton;
	48	+ final String path = "textures/" + f + "/" + c + "/"; // + t;
	49	+ row.add(textureButton = GetButton(path + "icons/" + t, !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", "", row0);
	77	+ //AddSkyboxButton("default", "cornell", row0);
	78	+ AddSkyboxButton("penguins", "dust", row0);
	79	+ AddSkyboxButton("penguins", "tropic", row0);
	80	+ AddSkyboxButton("penguins", "yonder", row0);
	81	+
	82	+ AddSkyboxButton("default", "uffizi", row1);
	83	+ AddSkyboxButton("bridge", "Bridge", row1);
	84	+ AddSkyboxButton("bridge", "Bridge2", row1);
	85	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	86	+
	87	+ AddSkyboxButton("urban", "Parliament", row2);
	88	+ AddSkyboxButton("urban", "Roundabout", row2);
	89	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	90	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	91	+
	92	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	93	+ AddSkyboxButton("urban", "UnionSquare", row3);
	94	+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
	95	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	96	+
	97	+ AddSkyboxButton("park", "Buddha", row4);
	98	+ AddSkyboxButton("park", "CNTower2", row4);
	99	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	100	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	101	+
	102	+ AddSkyboxButton("park", "Park", row5);
	103	+ AddSkyboxButton("park", "Pond", row5);
	104	+ AddSkyboxButton("park", "Skansen", row5);
	105	+ AddSkyboxButton("park", "Skansen2", row5);
	106	+
	107	+ AddSkyboxButton("park", "Skansen3", row6);
	108	+ AddSkyboxButton("park", "Skansen4", row6);
	109	+ AddSkyboxButton("park", "Skansen5", row6);
	110	+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
	111	+
	112	+ tab0.add(row0);
	113	+ tab0.add(row1);
	114	+ tab0.add(row2);
	115	+ tab0.add(row3);
	116	+ tab0.add(row4);
	117	+ tab0.add(row5);
	118	+ tab0.add(row6);
	119	+
	120	+ for (int i=5; --i>=0;)
	121	+ {
	122	+ //oe.toolboxPanel.Return();
	123	+ //tab0.add(new cGridBag());
	124	+ }
	125	+ }
	126	+
	127	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	128	+ {
	129	+ cGridBag tab0 = new cGridBag().setVertical(true);
	130	+
	131	+ tab0.setName("Nature");
	132	+ skyboxpanel.add(tab0);
	133	+
	134	+ cGridBag row0 = new cGridBag();
	135	+ cGridBag row1 = new cGridBag();
	136	+ cGridBag row2 = new cGridBag();
	137	+ cGridBag row3 = new cGridBag();
	138	+ cGridBag row4 = new cGridBag();
	139	+ cGridBag row5 = new cGridBag();
	140	+ cGridBag row6 = new cGridBag();
	141	+
	142	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	143	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	144	+ AddSkyboxButton("beach", "PalmTrees", row0);
	145	+ AddSkyboxButton("beach", "Tenerife", row0);
	146	+
	147	+ AddSkyboxButton("beach", "Tenerife2", row1);
	148	+ AddSkyboxButton("beach", "Tenerife3", row1);
	149	+ AddSkyboxButton("field", "FishPond", row1);
	150	+ AddSkyboxButton("field", "Footballfield", row1);
	151	+
	152	+ AddSkyboxButton("field", "Meadow", row2);
	153	+ AddSkyboxButton("field", "Sorsele", row2);
	154	+ AddSkyboxButton("field", "Sorsele2", row2);
	155	+ AddSkyboxButton("field", "Sorsele3", row2);
	156	+
	157	+ AddSkyboxButton("forest", "Brudslojan", row3);
	158	+ AddSkyboxButton("forest", "Langholmen2", row3);
	159	+ AddSkyboxButton("forest", "Plants", row3);
	160	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	161	+
	162	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	163	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	164	+ AddSkyboxButton("mountain", "Teide", row4);
	165	+ AddSkyboxButton("park", "Tantolunden4", row4);
	166	+
	167	+ AddSkyboxButton("park", "Stairs", row5);
	168	+ AddSkyboxButton("default", "skycube", row6);
	169	+ AddSkyboxButton("rocky", "Langholmen", row5);
	170	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	171	+
	172	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	173	+ AddSkyboxButton("default", "CloudyHills", row6);
	174	+ AddSkyboxButton("daz", "Autumn", row6);
	175	+ AddSkyboxButton("daz", "MountainTrail", row6);
	176	+ /*
	177	+Autumn
	178	+Greenlands
	179	+MountainTrail
	180	+Oasis
	181	+TheRock
	182	+TopOfTheWorld
	183	+Winter
	184	+ */
	185	+
	186	+ tab0.add(row0);
	187	+ tab0.add(row1);
	188	+ tab0.add(row2);
	189	+ tab0.add(row3);
	190	+ tab0.add(row4);
	191	+ tab0.add(row5);
	192	+ tab0.add(row6);
	193	+
	194	+ for (int i=5; --i>=0;)
	195	+ {
	196	+ //oe.toolboxPanel.Return();
	197	+ //tab0.add(new cGridBag());
	198	+ }
	199	+ }
	200	+
	201	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	202	+ {
	203	+ cGridBag tab0 = new cGridBag().setVertical(true);
	204	+
	205	+ tab0.setName("Night");
	206	+ skyboxpanel.add(tab0);
	207	+
	208	+ cGridBag row0 = new cGridBag();
	209	+ cGridBag row1 = new cGridBag();
	210	+ cGridBag row2 = new cGridBag();
	211	+ cGridBag row3 = new cGridBag();
	212	+ cGridBag row4 = new cGridBag();
	213	+ cGridBag row5 = new cGridBag();
	214	+ cGridBag row6 = new cGridBag();
	215	+
	216	+ AddSkyboxButton("night", "NightPath", row0);
	217	+ AddSkyboxButton("night", "PondNight", row0);
	218	+ AddSkyboxButton("night", "Powerlines", row0);
	219	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	220	+
	221	+ AddSkyboxButton("urban", "CNTower", row1);
	222	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	223	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	224	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
	225	+
	226	+ AddSkyboxButton("penguins", "kenon_star", row2);
	227	+ AddSkyboxButton("persson", "corona", row2);
	228	+ AddSkyboxButton("persson", "spaceskybox", row2);
	229	+ AddSkyboxButton("indoors", "Vasa", row2);
	230	+
	231	+ AddSkyboxButton("winter", "Backyard", row3);
	232	+ AddSkyboxButton("winter", "Creek", row3);
	233	+ AddSkyboxButton("winter", "FootballField3", row3);
	234	+ AddSkyboxButton("winter", "Forest", row3);
	235	+
	236	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	237	+ AddSkyboxButton("winter", "House", row4);
	238	+ AddSkyboxButton("winter", "IceLake", row4);
	239	+ AddSkyboxButton("winter", "IceRiver", row4);
	240	+
	241	+ AddSkyboxButton("winter", "Park3", row5);
	242	+ AddSkyboxButton("winter", "PondWinter", row5);
	243	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	244	+ AddSkyboxButton("winter", "Vindelalven", row5);
	245	+
	246	+ AddSkyboxButton("daz", "TheRock", row6);
	247	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	248	+ AddSkyboxButton("daz", "Winter", row6);
	249	+ AddSkyboxButton("mountain", "Ryfjallet", row6);
	250	+
	251	+ tab0.add(row0);
	252	+ tab0.add(row1);
	253	+ tab0.add(row2);
	254	+ tab0.add(row3);
	255	+ tab0.add(row4);
	256	+ tab0.add(row5);
	257	+ tab0.add(row6);
	258	+
	259	+ for (int i=5; --i>=0;)
	260	+ {
	261	+ //oe.toolboxPanel.Return();
	262	+ //tab0.add(new cGridBag());
	263	+ }
	264	+ }
	265	+
	266	+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
	267	+ {
	268	+ cGridBag tab0 = new cGridBag().setVertical(true);
	269	+
	270	+ tab0.setName("Others");
	271	+ skyboxpanel.add(tab0);
	272	+
	273	+ cGridBag row0 = new cGridBag();
	274	+ cGridBag row1 = new cGridBag();
	275	+ cGridBag row2 = new cGridBag();
	276	+ cGridBag row3 = new cGridBag();
	277	+ cGridBag row4 = new cGridBag();
	278	+ cGridBag row5 = new cGridBag();
	279	+ cGridBag row6 = new cGridBag();
	280	+
	281	+ AddSkyboxButton("mayhem", "afterrain", row0);
	282	+ AddSkyboxButton("mayhem", "aqua4", row0);
	283	+ AddSkyboxButton("mayhem", "aqua9", row0);
	284	+ AddSkyboxButton("mayhem", "flame", row0);
	285	+
	286	+ AddSkyboxButton("mayhem", "h2s", row1);
	287	+ AddSkyboxButton("mayhem", "prehistoric", row1);
	288	+ AddSkyboxButton("mayhem", "scorched", row1);
	289	+ AddSkyboxButton("penguins", "desertdawn", row1);
	290	+
	291	+ AddSkyboxButton("persson", "Citadella", row2);
	292	+ AddSkyboxButton("persson", "Citadella2", row2);
	293	+ AddSkyboxButton("persson", "clouds1", row2);
	294	+ AddSkyboxButton("penguins", "wrath", row2);
	295	+
	296	+ AddSkyboxButton("persson", "FishermansBastion", row3);
	297	+ AddSkyboxButton("persson", "HeroesSquare", row3);
	298	+ AddSkyboxButton("indoors", "DallasW", row3);
	299	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
	300	+
	301	+ AddSkyboxButton("persson", "LancellottiChapel", row4);
	302	+ AddSkyboxButton("persson", "PereaBeach1", row4);
	303	+ AddSkyboxButton("persson", "PereaBeach2", row4);
	304	+ AddSkyboxButton("persson", "redeclipse", row4);
	305	+
	306	+ AddSkyboxButton("daz", "Greenlands", row5);
	307	+ AddSkyboxButton("daz", "Oasis", row5);
	308	+ AddSkyboxButton("elyvisions", "arch3", row5);
	309	+ AddSkyboxButton("elyvisions", "calm_sea", row5);
	310	+
	311	+ AddSkyboxButton("elyvisions", "rainbow", row6);
	312	+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
	313	+ AddSkyboxButton("elyvisions", "heaven", row6);
	314	+ AddSkyboxButton("elyvisions", "hot", row6);
	315	+
	316	+ tab0.add(row0);
	317	+ tab0.add(row1);
	318	+ tab0.add(row2);
	319	+ tab0.add(row3);
	320	+ tab0.add(row4);
	321	+ tab0.add(row5);
	322	+ tab0.add(row6);
	323	+
	324	+ for (int i=5; --i>=0;)
	325	+ {
	326	+ //oe.toolboxPanel.Return();
	327	+ //tab0.add(new cGridBag());
	328	+ }
	329	+ }
	330	+
	331	+ public void ChangeSkybox(String skybox)
	332	+ {
	333	+ if (skybox.endsWith("/"))
	334	+ {
	335	+ group.skyboxname = null;
	336	+ group.skyboxext = null;
	337	+ cameraView.repaint();
	338	+ }
	339	+ else
	340	+ {
	341	+ //cameraView.envyoff = false;
	342	+ group.skyboxname = skybox;
	343	+ group.skyboxext = "jpg";
	344	+ cameraView.repaint();
	345	+ }
	346	+ }
	347	+
	348	+ public void CreateSkyboxPanel(cGridBag skyboxPanel)
	349	+ {
	350	+ JTabbedPane skyboxpane = new JTabbedPane();
	351	+
	352	+ AddSkyboxTab0(skyboxpane);
	353	+ AddSkyboxTab1(skyboxpane);
	354	+ AddSkyboxTab2(skyboxpane);
	355	+ AddSkyboxTab3(skyboxpane);
	356	+
	357	+ skyboxPanel.add(skyboxpane);
	358	+ }
	359	+
	360	+ public void ChangeTexture(String texture)
	361	+ {
	362	+ for (int i=0; i<group.selection.size(); i++)
	363	+ {
	364	+ Object3D obj = group.selection.get(i);
	365	+ obj.SetPigmentTexture("@" + texture);
	366	+ }
	367	+
	368	+ refreshContents();
	369	+ }
	370	+
	371	+ public void Show3DView()
	372	+ {
	373	+ // bug
	374	+ //gridPanel.setDividerLocation(1.0);
	375	+ //bigPanel.setDividerLocation(0.0);
	376	+ bigThree.ClearUI();
	377	+ bigThree.add(centralPanel);
	378	+ bigThree.FlushUI();
	379	+ }
	380	+
26	381	//ObjEditor objEditor;
27	382	public void closeUI2()
28	383	{
..	..	@@ -60,6 +415,14 @@
60	415	this.copy = this.group = group;
61	416	//selectees = this.group.selectees;
62	417
	418	+ if (copy.versionlist == null)
	419	+ {
	420	+ copy.versionlist = new Object3D[100];
	421	+ copy.versionindex = -1;
	422	+
	423	+ Save(true);
	424	+ }
	425	+
63	426	if(ui)
64	427	SetupUI(objEditor);
65	428	}
..	..	@@ -74,16 +437,28 @@
74	437	this.copy = this.group = copy;
75	438	//selectees = this.group.selectees;
76	439
77		- SetupMenu2(objEditor);
	440	+ SetupMenu2(this); //objEditor);
78	441	SetupUI2(objEditor);
79	442	objEditor.SetupUI(true);
80	443	SetupViews(objEditor);
81	444
82	445	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	446	+
	447	+ if (copy.versionlist == null)
	448	+ {
	449	+ copy.versionlist = new Object3D[100];
	450	+ copy.versionindex = -1;
	451	+
	452	+ Save(true);
	453	+ }
83	454	}
84	455
85	456	void CloneSelection(boolean supports)
86	457	{
	458	+ if (Globals.REPLACEONMAKE)
	459	+ Save();
	460	+ boolean keep = Globals.REPLACEONMAKE;
	461	+ Globals.REPLACEONMAKE = false;
87	462	// Object3D keep = GrafreeD.clipboard;
88	463	//Object3D obj;
89	464	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,18 +469,19 @@
94	469
95	470	makeSomething(clone, i==group.selection.size()-1);
96	471	}
	472	+ Globals.REPLACEONMAKE = keep;
97	473	}
98	474
99	475	void CloneClipboard(boolean supports)
100	476	{
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));
	477	+ assert(Grafreed.clipboard.parent == null);
	478	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	479	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	480	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	481	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
106	482	else
107		- makeSomething(CloneObject(GrafreeD.clipboard, false));
108		- GrafreeD.clipboard.get(0).parent = keepparent;
	483	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	484	+ Grafreed.clipboard.get(0).parent = keepparent;
109	485	}
110	486
111	487	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -119,7 +495,7 @@
119	495	// obj.support = null;
120	496	if (!supports)
121	497	obj.SaveSupports();
122		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	498	+ Object3D clone = (Object3D)Grafreed.clone(obj);
123	499	obj.parent = parent;
124	500	// obj.support = support;
125	501	// clone.support = support; // aout 2013
..	..	@@ -148,30 +524,29 @@
148	524
149	525	//JTextField nameField;
150	526
151		- void SetupMenu2(ObjEditor oe)
	527	+ void SetupMenu2(GroupEditor oe)
152	528	{
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);
	529	+ oe.jTree = new cTree();
	530	+
164	531	Menu menu;
165	532	oe.menuBar.add(menu = new Menu("Edit"));
166	533	//editItem = menu.add(new MenuItem("Edit"));
167	534	//editItem.addActionListener(this);
168		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	535	+
	536	+// undoItem = menu.add(new MenuItem("Undo"));
	537	+// undoItem.addActionListener(this);
	538	+// redoItem = menu.add(new MenuItem("Redo"));
	539	+// redoItem.addActionListener(this);
	540	+// menu.add("-");
	541	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
169	542	duplicateItem.addActionListener(this);
170		- menu.add("-");
171	543	cloneItem = menu.add(new MenuItem("Clone"));
172	544	cloneItem.addActionListener(this);
	545	+ if (Globals.ADVANCED)
	546	+ {
173	547	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
174	548	cloneSupportItem.addActionListener(this);
	549	+ }
175	550	menu.add("-");
176	551	cutItem = menu.add(new MenuItem("Cut"));
177	552	cutItem.addActionListener(this);
..	..	@@ -179,27 +554,121 @@
179	554	copyItem.addActionListener(this);
180	555	pasteItem = menu.add(new MenuItem("Paste"));
181	556	pasteItem.addActionListener(this);
	557	+
	558	+ menu.add("-");
	559	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	560	+ pasteIntoItem.addActionListener(this);
182	561	pasteLinkItem = menu.add(new MenuItem("Paste link"));
183	562	pasteLinkItem.addActionListener(this);
184	563	pasteCloneItem = menu.add(new MenuItem("Paste clone"));
185	564	pasteCloneItem.addActionListener(this);
186	565	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
187	566	// pasteExpandItem.addActionListener(this);
188		- clearItem = menu.add(new MenuItem("Clear"));
189		- clearItem.addActionListener(this);
	567	+ menu.add("-");
	568	+ deleteItem = menu.add(new MenuItem("Delete"));
	569	+ deleteItem.addActionListener(this);
	570	+
	571	+ if (Globals.ADVANCED)
	572	+ {
	573	+ // Deletes the cameras...
190	574	clearAllItem = menu.add(new MenuItem("Clear All"));
191	575	clearAllItem.addActionListener(this);
	576	+ }
	577	+
	578	+ menuBar.add(cameraMenu = new Menu("View"));
	579	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	580	+ //zBufferItem.addActionListener(this);
	581	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	582	+ //normalLensItem.addActionListener(this);
	583	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	584	+ restoreCameraItem.addActionListener(this);
	585	+
	586	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	587	+// toggleFullScreenItem.addItemListener(this);
	588	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	589	+// cameraMenu.add("-");
	590	+//
	591	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	592	+// toggleTextureItem.addItemListener(this);
	593	+// toggleTextureItem.setState(CameraPane.textureon);
	594	+//
	595	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	596	+// toggleSwitchItem.addItemListener(this);
	597	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	598	+
	599	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	600	+ toggleHandleItem.addItemListener(this);
	601	+ toggleHandleItem.setState(CameraPane.HANDLES);
	602	+
	603	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	604	+ togglePaintItem.addItemListener(this);
	605	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	606	+
	607	+ if (Globals.ADVANCED)
	608	+ {
	609	+ cameraMenu.add("-");
	610	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	611	+ toggleLiveItem.addItemListener(this);
	612	+ toggleLiveItem.setState(Globals.isLIVE());
192	613
	614	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	615	+ stepItem.addActionListener(this);
	616	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	617	+ // toggleDLItem.addItemListener(this);
	618	+ // toggleDLItem.setState(false);
	619	+
	620	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	621	+ toggleRenderItem.addItemListener(this);
	622	+ toggleRenderItem.setState(!CameraPane.frozen);
	623	+
	624	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	625	+ toggleDebugItem.addItemListener(this);
	626	+ toggleDebugItem.setState(Globals.DEBUG);
	627	+
	628	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	629	+ toggleFrustumItem.addItemListener(this);
	630	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	631	+
	632	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	633	+ toggleFootContactItem.addItemListener(this);
	634	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	635	+
	636	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	637	+ toggleTimelineItem.addItemListener(this);
	638	+ }
	639	+
	640	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	641	+// toggleRootItem.addItemListener(this);
	642	+// toggleRootItem.setState(false);
	643	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	644	+// animationItem.addItemListener(this);
	645	+// animationItem.setState(CameraPane.ANIMATION);
	646	+ cameraMenu.add("-");
	647	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	648	+ editCameraItem.addActionListener(this);
	649	+
	650	+ if (Globals.ADVANCED)
	651	+ {
	652	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	653	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	654	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	655	+ oe.cameraMenu.add("-");
	656	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	657	+ openWindowItem.addActionListener(this);
	658	+ lookAtItem.addActionListener(this);
	659	+ //lookFromItem.addActinoListener(this);
	660	+ //switchViewItem.addActionListener(this);
	661	+ }
	662	+
193	663	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);
	664	+ if (Globals.ADVANCED)
	665	+ {
198	666	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
199	667	revertMeshItem.addActionListener(this);
200	668	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
201	669	resetreferencesItem.addActionListener(this);
202	670	menu.add("-");
	671	+ }
203	672	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
204	673	overwriteGeoItem.addActionListener(this);
205	674	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -211,79 +680,104 @@
211	680	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
212	681	overwriteUVItem.addActionListener(this);
213	682	menu.add("-");
	683	+ if (Globals.ADVANCED)
	684	+ {
214	685	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
215	686	generateMeshItem.addActionListener(this);
216	687	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
217	688	poseMeshItem.addActionListener(this);
218	689	menu.add("-");
	690	+ }
219	691	resetsupportItem = menu.add(new MenuItem("Reset support"));
220	692	resetsupportItem.addActionListener(this);
221	693	linkverticesItem = menu.add(new MenuItem("Link to Support"));
222	694	linkverticesItem.addActionListener(this);
223	695	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
224	696	relinkverticesItem.addActionListener(this);
	697	+
	698	+ if (Globals.ADVANCED)
	699	+ {
225	700	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
226	701	setMasterItem.addActionListener(this);
	702	+ }
227	703
228	704	oe.menuBar.add(menu = new Menu("Group"));
229		- grabItem = menu.add(new MenuItem("Grab"));
230		- grabItem.addActionListener(this);
	705	+// grabItem = menu.add(new MenuItem("Grab"));
	706	+// grabItem.addActionListener(this);
231	707	backItem = menu.add(new MenuItem("Back"));
232	708	backItem.addActionListener(this);
233	709	frontItem = menu.add(new MenuItem("Front"));
234	710	frontItem.addActionListener(this);
235		- compositeItem = menu.add(new MenuItem("Composite"));
236		- compositeItem.addActionListener(this);
237		- hideItem = menu.add(new MenuItem("Hide"));
	711	+// compositeItem = menu.add(new MenuItem("Composite"));
	712	+// compositeItem.addActionListener(this);
	713	+
	714	+ if (Globals.ADVANCED)
	715	+ {
	716	+ hideItem = menu.add(new MenuItem("Hidden Group"));
238	717	hideItem.addActionListener(this);
	718	+ }
239	719	ungroupItem = menu.add(new MenuItem("Ungroup"));
240	720	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);
	721	+
	722	+// menu.add("-");
	723	+//
	724	+// switchItem = menu.add(new MenuItem("Switch node"));
	725	+// switchItem.addActionListener(this);
	726	+ if (Globals.ADVANCED)
	727	+ {
248	728	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
249	729	switchGeoItem.addActionListener(this);
250	730	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
251	731	switchTransfoItem.addActionListener(this);
252		- morphItem = menu.add(new MenuItem("Morph"));
	732	+ morphItem = menu.add(new MenuItem("Morph Group"));
253	733	morphItem.addActionListener(this);
	734	+
	735	+ menu.add("-");
	736	+ physicsItem = menu.add(new MenuItem("Physics"));
	737	+ physicsItem.addActionListener(this);
	738	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	739	+ frameselectorItem.addActionListener(this);
254	740	scriptNodeItem = menu.add(new MenuItem("Script Node"));
255	741	scriptNodeItem.addActionListener(this);
256		- cameraItem = menu.add(new MenuItem("Camera"));
257		- cameraItem.addActionListener(this);
	742	+ }
258	743
259	744	oe.menuBar.add(menu = new Menu("Object"));
260		- textureItem = menu.add(new MenuItem("Texture"));
261		- textureItem.addActionListener(this);
	745	+// textureItem = menu.add(new MenuItem("Texture"));
	746	+// textureItem.addActionListener(this);
262	747	billboardItem = menu.add(new MenuItem("Billboard"));
263	748	billboardItem.addActionListener(this);
264	749	csgItem = menu.add(new MenuItem("CSG"));
265	750	csgItem.addActionListener(this);
266		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	751	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
267	752	shadowXItem.addActionListener(this);
268		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	753	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
269	754	shadowYItem.addActionListener(this);
270		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	755	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
271	756	shadowZItem.addActionListener(this);
	757	+ attributeItem = menu.add(new MenuItem("Attribute"));
	758	+ attributeItem.addActionListener(this);
	759	+
	760	+ if (Globals.ADVANCED)
	761	+ {
	762	+ menu.add("-");
272	763	linkerItem = menu.add(new MenuItem("Linker"));
273	764	linkerItem.addActionListener(this);
274	765	templateItem = menu.add(new MenuItem("Template"));
275	766	templateItem.addActionListener(this);
276		- attributeItem = menu.add(new MenuItem("Attribute"));
277		- attributeItem.addActionListener(this);
278	767	pointflowItem = menu.add(new MenuItem("Point Flow"));
279	768	pointflowItem.addActionListener(this);
	769	+ }
280	770	menu.add("-");
281	771	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
282	772	resetTransformItem.addActionListener(this);
283	773	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
284	774	resetCentroidItem.addActionListener(this);
285		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
286		- transformgeometryItem.addActionListener(this);
	775	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	776	+ resetCentroidXZItem.addActionListener(this);
	777	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	778	+ transformGeometryItem.addActionListener(this);
	779	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	780	+ transformChildrenItem.addActionListener(this);
287	781
288	782	oe.menuBar.add(menu = new Menu("Geometry"));
289	783	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -294,8 +788,11 @@
294	788	genNormalsCADItem.addActionListener(this);
295	789	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
296	790	genNormalsMESHItem.addActionListener(this);
297		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	791	+ if (Globals.ADVANCED)
	792	+ {
	793	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
298	794	genNormalsMINEItem.addActionListener(this);
	795	+ }
299	796	stripifyItem = menu.add(new MenuItem("Stripify"));
300	797	stripifyItem.addActionListener(this);
301	798	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -317,23 +814,34 @@
317	814	reduce34MeshItem.addActionListener(this);
318	815	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
319	816	increaseMeshItem.addActionListener(this);
320		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
321		- smoothMeshItem.addActionListener(this);
322	817	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
323	818	clipMeshItem.addActionListener(this);
	819	+
	820	+ if (Globals.ADVANCED)
	821	+ {
	822	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	823	+ smoothMeshItem.addActionListener(this);
	824	+ }
324	825
325	826	oe.menuBar.add(menu = new Menu("Attributes"));
326	827	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
327	828	clearMaterialsItem.addActionListener(this);
	829	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	830	+ resetAllItem.addActionListener(this);
	831	+ stepAllItem = menu.add(new MenuItem("Step All"));
	832	+ stepAllItem.addActionListener(this);
328	833	menu.add("-");
329	834	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
330	835	liveleavesItem.addActionListener(this);
331	836	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
332	837	unliveleavesItem.addActionListener(this);
	838	+ if (Globals.ADVANCED)
	839	+ {
333	840	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
334	841	supportleavesItem.addActionListener(this);
335	842	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
336	843	unsupportleavesItem.addActionListener(this);
	844	+ }
337	845	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
338	846	hideleavesItem.addActionListener(this);
339	847	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -342,6 +850,14 @@
342	850	markleavesItem.addActionListener(this);
343	851	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
344	852	unmarkleavesItem.addActionListener(this);
	853	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	854	+ rewindleavesItem.addActionListener(this);
	855	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	856	+ unrewindleavesItem.addActionListener(this);
	857	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	858	+ randomleavesItem.addActionListener(this);
	859	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	860	+ unrandomleavesItem.addActionListener(this);
345	861	menu.add("-");
346	862	flipVItem = menu.add(new MenuItem("Flip V"));
347	863	flipVItem.addActionListener(this);
..	..	@@ -367,53 +883,129 @@
367	883	attachBumpItem.addActionListener(this);
368	884	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
369	885	pigmentBumpItem.addActionListener(this);
	886	+ //embedTexturesItem
370	887	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
371	888	detachPigmentItem.addActionListener(this);
372	889	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
373	890	detachBumpItem.addActionListener(this);
	891	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	892	+ embedTexturesItem.addActionListener(this);
	893	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	894	+ deEmbedTexturesItem.addActionListener(this);
374	895	menu.add("-");
375	896	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
376	897	sortbysizeItem.addActionListener(this);
377	898	sortbynameItem = menu.add(new MenuItem("Sort by name"));
378	899	sortbynameItem.addActionListener(this);
379	900	menu.add("-");
	901	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	902	+ shareGeometriesItem.addActionListener(this);
	903	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	904	+ mergeGeometriesItem.addActionListener(this);
	905	+ menu.add("-");
	906	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	907	+ editLeafItem.addActionListener(this);
	908	+ if (Globals.ADVANCED)
	909	+ {
	910	+ // Pretty much the same as duplicate and clone.
380	911	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
381	912	extractGeometriesItem.addActionListener(this);
382	913	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
383	914	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);
	915	+ }
388	916
389	917	oe.menuBar.add(menu = new Menu("Insert"));
390	918	buildCreateMenu(menu);
391	919
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	920	oe.menuBar.add(menu = new Menu("Tools"));
404	921	buildToolsMenu(menu);
405	922	}
406	923
	924	+ JTabbedPane resourcecontainer;
	925	+ cGridBag currenttab;
	926	+ boolean added; // patch for jar
	927	+
	928	+ int tabcount = 0;
	929	+ int colcount = 0;
	930	+ int rowcount = 0;
	931	+ int texturecount = 0;
	932	+
	933	+ int columns = 5;
	934	+ int rows = 7;
	935	+
	936	+ public void ResourceCallBack(String[] path)
	937	+ {
	938	+// for (int i = 0; i < path.length; i++)
	939	+// System.out.print(path[i] + "/");
	940	+// System.out.println();
	941	+
	942	+ if (//rowcount == 0 \|\|
	943	+ path.length == 1)
	944	+ {
	945	+ currenttab = new cGridBag();
	946	+ added = false;
	947	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	948	+ currenttab.setName(tabname);
	949	+ rowcount = 1;
	950	+ colcount = 0;
	951	+ texturecount = 0;
	952	+ }
	953	+
	954	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	955	+ {
	956	+ if (!added)
	957	+ {
	958	+ added = true;
	959	+ resourcecontainer.add(currenttab);
	960	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	961	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	962	+ }
	963	+
	964	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	965	+
	966	+ if (++colcount >= columns)
	967	+ {
	968	+ colcount = 0;
	969	+ currenttab.Return();
	970	+
	971	+ if (rowcount++ >= rows)
	972	+ {
	973	+ rowcount = 0;
	974	+ }
	975	+ }
	976	+ }
	977	+ else
	978	+ {
	979	+// if (!path[path.length-1].equals("icons"))
	980	+// resourcecontainer.Return();
	981	+ }
	982	+ }
	983	+
	984	+ void CreateTexturePanel(cGridBag container)
	985	+ {
	986	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	987	+ container.add(resourcecontainer);
	988	+
	989	+ Grafreed.ParseResources("textures", this);
	990	+ }
	991	+
407	992	void SetupUI2(ObjEditor oe)
408	993	{
	994	+ // June 2019
	995	+ if (oe == null)
	996	+ {
	997	+ //super.SetupUI2(this);
	998	+ //return;
	999	+ }
	1000	+
	1001	+ if (copy != group)
	1002	+ {
	1003	+ //super.SetupUI2(this);
	1004	+ }
	1005	+
409	1006	//new Exception().printStackTrace();
410	1007
411	1008	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	1009	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
418	1010
419	1011	oe.buttonGroup = new ButtonGroup();
..	..	@@ -434,92 +1026,262 @@
434	1026	oe.radioPanel.add(dummyButton);
435	1027	oe.buttonGroup.add(dummyButton);
436	1028	*/
	1029	+ cGridBag copyOptionsPanel = new cGridBag();
	1030	+
	1031	+ copyOptionsPanel.preferredHeight = 2;
	1032	+
437	1033	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
438	1034
439		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
440		- liveCB.setToolTipText("Enabled animation");
441		- liveCB.addItemListener(this);
442		-
443		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
444		- trackCB.setToolTipText("Enable tracking");
445		- trackCB.addItemListener(this);
446		-
447		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1035	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1036	+ //minButton.setToolTipText("Minimize window");
	1037	+ //minButton.addActionListener(this);
	1038	+
	1039	+ if (Globals.ADVANCED)
	1040	+ {
	1041	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1042	+// maxButton.setToolTipText("Maximize window");
	1043	+// maxButton.addActionListener(this);
	1044	+ }
	1045	+
	1046	+// cButton gcButton;
	1047	+//
	1048	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1049	+// gcButton.setToolTipText("Garbage collect");
	1050	+// gcButton.addActionListener(new ActionListener()
	1051	+// {
	1052	+// public void actionPerformed(ActionEvent e)
	1053	+// {
	1054	+// System.gc();
	1055	+// }
	1056	+// });
	1057	+
	1058	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1059	+ collapseButton.setToolTipText("Collapse toolbar");
	1060	+ collapseButton.addActionListener(this);
	1061	+
	1062	+ oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1063	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1064	+ maximize3DButton.addActionListener(this);
	1065	+
	1066	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1067	+ twoButton.setToolTipText("Show 3D view only");
	1068	+ twoButton.addActionListener(this);
	1069	+ this.fullscreenLayout = twoButton;
	1070	+
	1071	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1072	+ threeButton.setToolTipText("Show controls and 3D view");
	1073	+ threeButton.addActionListener(this);
	1074	+ if (Globals.ADVANCED)
	1075	+ {
	1076	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1077	+ sixButton.setToolTipText("Show 3D view and controls");
	1078	+ sixButton.addActionListener(this);
	1079	+ }
	1080	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1081	+// sevenButton.setToolTipText("3-column layout");
	1082	+// sevenButton.addActionListener(this);
	1083	+ //
	1084	+
	1085	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1086	+ fullButton.setToolTipText("Full-screen window");
	1087	+ fullButton.addActionListener(this);
	1088	+
	1089	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
448	1090	screenfitButton.setToolTipText("Screen fit");
449	1091	screenfitButton.addActionListener(this);
450	1092
	1093	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1094	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1095	+ restoreCameraButton.addActionListener(this);
	1096	+
	1097	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1098	+ saveVersionButton.setToolTipText("Duplicate current version");
	1099	+ saveVersionButton.addActionListener(this);
	1100	+
	1101	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1102	+ deleteVersionButton.setToolTipText("Delete current version");
	1103	+ deleteVersionButton.addActionListener(this);
	1104	+
	1105	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1106	+ previousVersionButton.setToolTipText("Previous version");
	1107	+ previousVersionButton.addActionListener(this);
	1108	+ previousVersionButton.setEnabled(false);
	1109	+
	1110	+ cGridBag updown = new cGridBag().setVertical(true);
	1111	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1112	+ restoreButton.setToolTipText("Undo (restore current version)");
	1113	+ restoreButton.addActionListener(this);
	1114	+ //restoreButton.setEnabled(false);
	1115	+
	1116	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1117	+ replaceButton.setToolTipText("Save (replace current version)");
	1118	+ replaceButton.addActionListener(this);
	1119	+ //replaceButton.setEnabled(false);
	1120	+
	1121	+ copyOptionsPanel.add(updown);
	1122	+
	1123	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1124	+ nextVersionButton.setToolTipText("Next version");
	1125	+ nextVersionButton.addActionListener(this);
	1126	+ nextVersionButton.setEnabled(false);
	1127	+
	1128	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1129	+ oneStepButton.setToolTipText("Animate one step forward");
	1130	+ oneStepButton.addActionListener(this);
	1131	+
	1132	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1133	+ liveCB.setToolTipText("Enable animation");
	1134	+ liveCB.addItemListener(this);
	1135	+
	1136	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	1137	+ fastCB.setToolTipText("Fast mode");
	1138	+ fastCB.addItemListener(this);
	1139	+
	1140	+ //oe.toolboxPanel.Return();
	1141	+
	1142	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1143	+// trackCB.setToolTipText("Enable tracking");
	1144	+// trackCB.addItemListener(this);
	1145	+
451	1146	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
452	1147	// screenfitpointButton.addActionListener(this);
453		-// oe.aConstraints.gridx += 1;
454		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
455		- snapobjectButton.addActionListener(this);
456		- snapobjectButton.setToolTipText("Snap Object");
457		- oe.aConstraints.gridx += 1;
458	1148
459		- //aConstraints.gridx = 0;
460		- //aConstraints.gridy += 1;
461		- oe.aConstraints.weighty = 0;
462		- oe.aConstraints.gridwidth = 1;
463		-
464		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
465		- flashSelectionButton.setToolTipText("Show selection");
466		- flashSelectionButton.addActionListener(this);
467		-
468		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
469		-
470		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
471		- twoButton.setToolTipText("Show center view only");
472		- twoButton.addActionListener(this);
473		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1149	+ if (Globals.ADVANCED)
	1150	+ {
	1151	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1152	+ snapobjectButton.addActionListener(this);
	1153	+ snapobjectButton.setToolTipText("Snap Object");
	1154	+
	1155	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
474	1156	fourButton.addActionListener(this);
475		- fourButton.setToolTipText("Show left panel only");
476		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
477		- sixButton.setToolTipText("2-column layout left");
478		- sixButton.addActionListener(this);
479		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
480		- threeButton.setToolTipText("2-column layout right");
481		- threeButton.addActionListener(this);
482		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
483		- sevenButton.setToolTipText("3-column layout");
484		- sevenButton.addActionListener(this);
485		- //
	1157	+ fourButton.setToolTipText("Show control panel only");
	1158	+ }
486	1159
487		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
488		- rootButton.setToolTipText("Edit selection in new tab");
	1160	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	1161	+
	1162	+
	1163	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1164	+ rootButton.setToolTipText("Open selection in new tab");
489	1165	rootButton.addActionListener(this);
490	1166
491		- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1167	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
492	1168	closeButton.setToolTipText("Close tab");
493	1169	closeButton.addActionListener(this);
494	1170	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
495	1171	//clearButton.addActionListener(this);
496		-
497		- cGridBag commandsPanel = new cGridBag();
	1172	+
	1173	+ cGridBag row1 = new cGridBag();
498	1174
499		- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
500		- editButton.setToolTipText("Edit selection");
	1175	+ // INSERT
	1176	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1177	+ gridButton.setToolTipText("Create ground");
	1178	+ gridButton.addActionListener(this);
	1179	+
	1180	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1181	+ boxButton.setToolTipText("Create box");
	1182	+ boxButton.addActionListener(this);
	1183	+
	1184	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1185	+ sphereButton.setToolTipText("Create sphere");
	1186	+ sphereButton.addActionListener(this);
	1187	+
	1188	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1189	+ coneButton.setToolTipText("Create cone");
	1190	+ coneButton.addActionListener(this);
	1191	+
	1192	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1193	+ torusButton.setToolTipText("Create torus");
	1194	+ torusButton.addActionListener(this);
	1195	+
	1196	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1197	+ superButton.setToolTipText("Create superellipsoid");
	1198	+ superButton.addActionListener(this);
	1199	+
	1200	+ if (Globals.ADVANCED)
	1201	+ {
	1202	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1203	+ kleinButton.setToolTipText("Create Klein bottle");
	1204	+ kleinButton.addActionListener(this);
	1205	+ }
	1206	+
	1207	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1208	+ particlesButton.setToolTipText("Create particle system");
	1209	+ particlesButton.addActionListener(this);
	1210	+
	1211	+ oe.toolboxPanel.add(row1);
	1212	+
	1213	+ cGridBag row2 = new cGridBag();
	1214	+
	1215	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1216	+ groupButton.setToolTipText("Create group");
	1217	+ groupButton.addActionListener(this);
	1218	+
	1219	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1220	+ compositeButton.setToolTipText("Create composite");
	1221	+ compositeButton.addActionListener(this);
	1222	+
	1223	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1224	+ switchButton.setToolTipText("Create item switcher");
	1225	+ switchButton.addActionListener(this);
	1226	+
	1227	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1228	+ loopButton.setToolTipText("Create loop");
	1229	+ loopButton.addActionListener(this);
	1230	+
	1231	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1232	+ textureButton.setToolTipText("Create texture");
	1233	+ textureButton.addActionListener(this);
	1234	+
	1235	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1236	+ overlayButton.setToolTipText("Create overlay");
	1237	+ overlayButton.addActionListener(this);
	1238	+
	1239	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1240	+ lightButton.setToolTipText("Create light");
	1241	+ lightButton.addActionListener(this);
	1242	+
	1243	+ oe.toolboxPanel.add(row2);
	1244	+
	1245	+ cGridBag textures = new cGridBag();
	1246	+
	1247	+ CreateTexturePanel(textures);
	1248	+
	1249	+ oe.toolboxPanel.add(textures);
	1250	+
	1251	+ textures.preferredHeight = 100;
	1252	+
	1253	+ CreateSkyboxPanel(oe.skyboxPanel);
	1254	+
	1255	+ // EDIT panel
	1256	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1257	+ editButton.setToolTipText("Pin selection controls");
501	1258	editButton.addActionListener(this);
502	1259
503		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
504		- uneditButton.setToolTipText("Unedit selection");
	1260	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1261	+ uneditButton.setToolTipText("Unpin and remove selection controls");
505	1262	uneditButton.addActionListener(this);
506	1263
507		- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
508		- clearPanelButton.setToolTipText("Clear edit panel");
509		- clearPanelButton.addActionListener(this);
510		-
511		- commandsPanel.add(allParamsButton = new cButton("A", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
512		- allParamsButton.setToolTipText("All params??");
	1264	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1265	+ allParamsButton.setToolTipText("Show all controls");
513	1266	allParamsButton.addActionListener(this);
514	1267
515		- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
516		- unselectButton.setToolTipText("Unselect");
517		- unselectButton.addActionListener(this);
	1268	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1269	+ clearPanelButton.setToolTipText("Clear all controls");
	1270	+ clearPanelButton.addActionListener(this);
518	1271
519		- commandsPanel.preferredHeight = 1;
	1272	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1273	+ //unselectButton.setToolTipText("Unselect");
	1274	+ //unselectButton.addActionListener(this);
	1275	+
	1276	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1277	+ flashSelectionButton.setToolTipText("Highlight selection");
	1278	+ flashSelectionButton.addActionListener(this);
520	1279
521		- oe.treePanel.add(commandsPanel);
522		- oe.treePanel.Return();
	1280	+ editCommandsPanel.preferredHeight = 1;
	1281	+
	1282	+ SetPinStates(false);
	1283	+// oe.treePanel.add(commandsPanel);
	1284	+// oe.treePanel.Return();
523	1285
524	1286	// oe.aConstraints.gridx += 1;
525	1287	// oe.aConstraints.weighty = 0;
..	..	@@ -536,32 +1298,20 @@
536	1298
537	1299	JScrollPane jSP;
538	1300	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
539		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1301	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
540	1302	ResetModel();
541	1303
542	1304	oe.treePanel.add(jSPPanel);
543	1305	oe.treePanel.Return();
544	1306
545		- cGridBag copyOptionsPanel = new cGridBag();
546		-
547		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
548		- colorCB.setToolTipText("Copy color when dropped");
549		- colorCB.addItemListener(this);
550		-
551		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
552		- materialCB.setToolTipText("Copy material when dropped");
553		- materialCB.addItemListener(this);
554		-
555		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
556		- textureCB.setToolTipText("Copy texture when dropped");
557		- textureCB.addItemListener(this);
558		-
559		- copyOptionsPanel.preferredHeight = 1;
560	1307	oe.treePanel.add(copyOptionsPanel);
561	1308	oe.treePanel.Return();
	1309	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1310	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1311	+ sliderPane.preferredHeight = 1;
562	1312
563		-// mainPanel.setDividerLocation(0.5); //1.0);
564		-// mainPanel.setResizeWeight(0.5);
	1313	+// mainPanel.setDividerLocation(0.1); //1.0);
	1314	+ mainPanel.setResizeWeight(0.4);
565	1315
566	1316	//jList.addListSelectionListener(this);
567	1317	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -569,7 +1319,7 @@
569	1319	//jTree.setEditable(true);
570	1320	oe.jTree.setDragEnabled(true);
571	1321	//jTree.setPreferredSize(new Dimension(10,10));
572		- jSP.setPreferredSize(new Dimension(100,200));
	1322	+ //jSP.setPreferredSize(new Dimension(100,200));
573	1323
574	1324	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
575	1325
..	..	@@ -581,53 +1331,70 @@
581	1331	dgr.addDragGestureListener(this);
582	1332	}catch(Exception e) {}
583	1333	*/
584		- radio.layout = sevenButton;
	1334	+ radio.layout = threeButton; // sixButton;
585	1335	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
586	1336	}
587	1337
588	1338	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
589	1339	{
590		- //constraints.gridx = 0;
591		- //constraints.gridy = 0;
592		- panel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
593		- fastCB.setToolTipText("Fast mode");
594		- fastCB.addItemListener(this);
595		- //constraints.gridy += 1;
596		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
597		- supportCB.setToolTipText("Enabled rigging");
598		- supportCB.addItemListener(this);
	1340	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1341	+ colorCB.setToolTipText("Copy color when dropped");
	1342	+ colorCB.addItemListener(this);
599	1343
600		- // constraints.gridy += 1;
	1344	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1345	+ materialCB.setToolTipText("Copy material when dropped");
	1346	+ materialCB.addItemListener(this);
	1347	+
	1348	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1349	+ textureCB.setToolTipText("Copy texture when dropped");
	1350	+ textureCB.addItemListener(this);
	1351	+
	1352	+ panel.Return();
	1353	+
	1354	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	1355	+ boxCB.setToolTipText("Display bounding boxes");
	1356	+ boxCB.addItemListener(this);
	1357	+
	1358	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	1359	+ zoomBoxCB.setToolTipText("Display only for wheel");
	1360	+ zoomBoxCB.addItemListener(this);
	1361	+
	1362	+ if (true) // Globals.ADVANCED)
	1363	+ {
	1364	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1365	+// supportCB.setToolTipText("Enable rigging");
	1366	+// supportCB.addItemListener(this);
	1367	+
	1368	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1369	+ freezeCB.setToolTipText("Fast moving camera");
	1370	+ freezeCB.addItemListener(this);
	1371	+
601	1372	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
602	1373	// localCB.addItemListener(this);
603	1374
604		- //constraints.gridy += 1;
	1375	+ panel.Return();
	1376	+
605	1377	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
606	1378	crowdCB.setToolTipText("Used for crowds");
607	1379	crowdCB.addItemListener(this);
608	1380
609		- //constraints.gridy += 1;
610	1381	panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
611	1382	smoothCB.setToolTipText("Snapping delay");
612	1383	smoothCB.addItemListener(this);
613	1384
614		- //constraints.gridy += 1;
615		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
616		- slowCB.setToolTipText("Smooth interpolation");
617		- slowCB.addItemListener(this);
618		- //constraints.gridy += 1;
619		- panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
620		- boxCB.setToolTipText("Display bounding boxes");
621		- boxCB.addItemListener(this);
622		- //constraints.gridy += 1;
623		- panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
624		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
625		- zoomBoxCB.addItemListener(this);
626		-
	1385	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1386	+// slowCB.setToolTipText("Smooth interpolation");
	1387	+// slowCB.addItemListener(this);
	1388	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1389	+ minshaderCB.setToolTipText("Minimal fast shader");
	1390	+ minshaderCB.addItemListener(this);
	1391	+
627	1392	// constraints.gridy += 1;
628	1393	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
629	1394	// speakerMocapCB.addItemListener(this);
630	1395
	1396	+ panel.Return();
	1397	+
631	1398	if (false)
632	1399	{
633	1400	// handled in scripts
..	..	@@ -642,42 +1409,93 @@
642	1409	//constraints.gridy += 1;
643	1410	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
644	1411	smoothfocusCB.addItemListener(this);
	1412	+ panel.Return();
645	1413	}
646	1414
647	1415	//constraints.gridx += 1;
648	1416	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
649	1417	// debugCB.addItemListener(this);
650	1418
651		- //constraints.gridy += 1;
	1419	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1420	+ trackCB.setToolTipText("Enable tracking target");
	1421	+ trackCB.addItemListener(this);
	1422	+
652	1423	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1424	+ oeilCB.setToolTipText("Move camera when tracking");
653	1425	oeilCB.addItemListener(this);
654	1426
655		- //constraints.gridy += 1;
	1427	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1428	+ shadowCB.setToolTipText("When live compute shadows");
	1429	+ shadowCB.addItemListener(this);
	1430	+
	1431	+ panel.Return();
	1432	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1433	+ toggleTextureCB.setToolTipText("Load textures");
	1434	+ toggleTextureCB.addItemListener(this);
	1435	+
	1436	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1437	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1438	+ toggleSwitchCB.addItemListener(this);
	1439	+
	1440	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1441	+ autokeepCB.setToolTipText("On structure change");
	1442	+ autokeepCB.addItemListener(this);
	1443	+
	1444	+ panel.Return();
	1445	+ if (Globals.ADVANCED)
	1446	+ {
656	1447	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
657	1448	lookAtCB.setToolTipText("Look-at target");
658	1449	lookAtCB.addItemListener(this);
	1450	+ }
	1451	+
	1452	+ }
659	1453
660	1454	cGridBag fill = new cGridBag();
661		-
662	1455	fill.preferredHeight = 200;
	1456	+ cGridBag fill2 = new cGridBag();
	1457	+ fill2.preferredHeight = 200;
	1458	+ cGridBag fill3 = new cGridBag();
	1459	+ fill3.preferredHeight = 200;
663	1460
664	1461	panel.add(fill);
	1462	+ panel.add(fill2);
	1463	+ panel.add(fill3);
665	1464
666	1465	}
667	1466
668	1467	void EditObject(Object3D obj)
669	1468	{
	1469	+ assert(obj instanceof Composite);
	1470	+
	1471	+// if (obj.versionlist == null)
	1472	+// {
	1473	+// obj.versionlist = new Object3D[100];
	1474	+// obj.versionindex = -1;
	1475	+// }
	1476	+
670	1477	cRadio radioButton = new cRadio(obj.name);
	1478	+
	1479	+ // June 2019. Patch to avoid bug with transparency.
	1480	+ radioButton.hadMaterial = obj.material != null;
	1481	+ if (!radioButton.hadMaterial)
	1482	+ {
	1483	+ obj.material = new cMaterial();
	1484	+ }
	1485	+
671	1486	radioButton.SetObject(obj);
672		- radioButton.layout = sevenButton;
	1487	+ radioButton.layout = threeButton; // sixButton;
673	1488	radioButton.SetCamera(cameraView.renderCamera, false);
674	1489	radioButton.addActionListener(this);
675	1490	radioPanel.add(radioButton);
676	1491	buttonGroup.add(radioButton);
677	1492	radioButton.doClick();
678	1493	}
	1494	+
679	1495	void SetupViews(ObjEditor oe)
680	1496	{
	1497	+ theFrame = this;
	1498	+
681	1499	oe.SetupViews();
682	1500
683	1501	System.out.println("SetupViews");
..	..	@@ -686,23 +1504,30 @@
686	1504	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
687	1505	}
688	1506
689		- JCheckBox liveCB;
690		- JCheckBox supportCB;
691		- JCheckBox localCB;
692		- JCheckBox crowdCB;
693		- JCheckBox smoothCB;
694		- JCheckBox fastCB;
695		- JCheckBox slowCB;
696		- JCheckBox boxCB;
697		- JCheckBox zoomBoxCB;
698		- JCheckBox trackCB;
699		- JCheckBox smoothfocusCB;
	1507	+ cToggleButton liveCB;
	1508	+ cCheckBox supportCB;
	1509	+ cCheckBox localCB;
	1510	+ cCheckBox crowdCB;
	1511	+ cCheckBox smoothCB;
	1512	+ cCheckBox minshaderCB;
	1513	+
	1514	+ cToggleButton fastCB;
	1515	+ cCheckBox slowCB;
	1516	+ cCheckBox boxCB;
	1517	+ cCheckBox zoomBoxCB;
	1518	+ cCheckBox freezeCB;
	1519	+ //cToggleButton trackCB;
	1520	+ cCheckBox trackCB;
	1521	+ cCheckBox smoothfocusCB;
700	1522	// JCheckBox speakerMocapCB;
701		- JCheckBox speakerCameraCB;
702		- JCheckBox speakerFocusCB;
703		- JCheckBox debugCB;
704		- JCheckBox oeilCB;
705		- JCheckBox lookAtCB;
	1523	+ cCheckBox speakerCameraCB;
	1524	+ cCheckBox speakerFocusCB;
	1525	+ cCheckBox debugCB;
	1526	+
	1527	+ cCheckBox oeilCB;
	1528	+ cCheckBox shadowCB;
	1529	+ cCheckBox autokeepCB;
	1530	+ cCheckBox lookAtCB;
706	1531
707	1532	// static int COLOR = 1;
708	1533	// static int MATERIAL = 2;
..	..	@@ -710,9 +1535,9 @@
710	1535
711	1536	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
712	1537
713		- JCheckBox colorCB;
714		- JCheckBox materialCB;
715		- JCheckBox textureCB;
	1538	+ cCheckBox colorCB;
	1539	+ cCheckBox materialCB;
	1540	+ cCheckBox textureCB;
716	1541
717	1542	public void itemStateChanged(ItemEvent e)
718	1543	{
..	..	@@ -740,6 +1565,7 @@
740	1565	} else if(e.getSource() == liveCB)
741	1566	{
742	1567	cameraView.ToggleLive();
	1568	+ refreshContents(false);
743	1569	}
744	1570	else if(e.getSource() == supportCB)
745	1571	{
..	..	@@ -755,6 +1581,12 @@
755	1581	{
756	1582	cameraView.ToggleInertia();
757	1583	cameraView.repaint();
	1584	+ }
	1585	+ else if(e.getSource() == minshaderCB)
	1586	+ {
	1587	+ Globals.MINSHADER ^= true;
	1588	+ cameraView.programInitialized = false;
	1589	+ cameraView.repaint();
758	1590	}
759	1591	else if(e.getSource() == localCB)
760	1592	{
..	..	@@ -804,6 +1636,18 @@
804	1636	{
805	1637	cameraView.ToggleOeil();
806	1638	}
	1639	+ else if(e.getSource() == shadowCB)
	1640	+ {
	1641	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1642	+ }
	1643	+ else if(e.getSource() == freezeCB)
	1644	+ {
	1645	+ Globals.FREEZEONMOVE ^= true;
	1646	+ }
	1647	+ else if(e.getSource() == autokeepCB)
	1648	+ {
	1649	+ Globals.REPLACEONMAKE ^= true;
	1650	+ }
807	1651	else if(e.getSource() == lookAtCB)
808	1652	{
809	1653	cameraView.ToggleLookAt();
..	..	@@ -820,7 +1664,8 @@
820	1664
821	1665	/**/
822	1666	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
823		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1667	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1668	+ TreePath path = objEditor.jTree.getSelectionPath();
824	1669	if ((path == null) \|\| (path.getPathCount() <= 1)) {
825	1670	// We can't move the root node or an empty selection
826	1671	return;
..	..	@@ -883,8 +1728,6 @@
883	1728	}
884	1729	}
885	1730
886		- String string = (String) object;
887		-
888	1731	System.out.println("Transfer = " + object + "; drop : " + target);
889	1732	// if( object instanceof java.io.File[])
890	1733	// {
..	..	@@ -892,7 +1735,11 @@
892	1735	// objEditor.DropFile((java.io.File[]) object, true);
893	1736	// return;
894	1737	// }
895		- if (string.charAt(0) == '/')
	1738	+
	1739	+ String string = object.toString();
	1740	+
	1741	+ // File path for Mac and Windows
	1742	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
896	1743	{
897	1744	// file(s)
898	1745	String[] names = string.split("\n");
..	..	@@ -919,7 +1766,7 @@
919	1766
920	1767	flashIt = false;
921	1768	CameraPane pane = (CameraPane) target;
922		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1769	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
923	1770	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
924	1771
925	1772	if (group.selection.size() == 1)
..	..	@@ -935,23 +1782,33 @@
935	1782
936	1783	assert target == objEditor.jTree;
937	1784	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1785	+ Object3D destinationLeaf;
938	1786	try {
939		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1787	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
940	1788	} catch (Exception e) {
941	1789	System.out.println("destinationPath : " + destinationPath);
942	1790	return;
943	1791	}
944	1792
945		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1793	+ for (int i=group.selection.size(); --i>=0;)
946	1794	{
	1795	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1796	+
	1797	+ // Cannot move into itself
	1798	+ if (child == destinationLeaf)
	1799	+ return;
	1800	+ }
	1801	+
	1802	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1803	+// {
947	1804	loadClipboard(true);
948	1805	objEditor.jTree.setSelectionPath(destinationPath);
949		- pasteInto(false);
950		- } else {
951		- loadClipboard(false);
952		- objEditor.jTree.setSelectionPath(destinationPath);
953		- pasteInto(false); // true); // ???
954		- }
	1806	+ pasteInto(false, false);
	1807	+// } else {
	1808	+// loadClipboard(false);
	1809	+// objEditor.jTree.setSelectionPath(destinationPath);
	1810	+// pasteInto(false, false); // true); // ???
	1811	+// }
955	1812	}
956	1813	public void dropActionChanged(DropTargetDragEvent dtde)
957	1814	// Called if the user has modified the current drop gesture
..	..	@@ -1007,7 +1864,12 @@
1007	1864	TreePath path;
1008	1865
1009	1866	public TransferableTreePath(TreePath tp) {
1010		- path = tp;
	1867	+ Object[] objs = new Object[tp.getPathCount()];
	1868	+ for (int i=0; i<objs.length; i++)
	1869	+ {
	1870	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1871	+ }
	1872	+ path = new TreePath(objs);
1011	1873	}
1012	1874
1013	1875	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1056,85 +1918,107 @@
1056	1918	{
1057	1919	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1058	1920	//heightFieldItem.addActionListener(this);
1059		- gridItem = menu.add(new MenuItem("Grid"));
1060		- gridItem.addActionListener(this);
1061		- rectoidItem = menu.add(new MenuItem("Box"));
1062		- rectoidItem.addActionListener(this);
1063		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1064		- ellipsoidItem.addActionListener(this);
1065		- coneItem = menu.add(new MenuItem("Cone"));
1066		- coneItem.addActionListener(this);
1067		- torusItem = menu.add(new MenuItem("Torus"));
1068		- torusItem.addActionListener(this);
1069		- superItem = menu.add(new MenuItem("Superellipsoid"));
1070		- superItem.addActionListener(this);
	1921	+// gridItem = menu.add(new MenuItem("Grid"));
	1922	+// gridItem.addActionListener(this);
	1923	+// rectoidItem = menu.add(new MenuItem("Box"));
	1924	+// rectoidItem.addActionListener(this);
	1925	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1926	+// ellipsoidItem.addActionListener(this);
	1927	+// coneItem = menu.add(new MenuItem("Cone"));
	1928	+// coneItem.addActionListener(this);
	1929	+// torusItem = menu.add(new MenuItem("Torus"));
	1930	+// torusItem.addActionListener(this);
	1931	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1932	+// superItem.addActionListener(this);
	1933	+
	1934	+ cameraItem = menu.add(new MenuItem("Camera"));
	1935	+ cameraItem.addActionListener(this);
	1936	+
	1937	+ if (!Globals.ADVANCED)
	1938	+ {
1071	1939	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1072	1940	kleinItem.addActionListener(this);
1073		- particleItem = menu.add(new MenuItem("Particle system"));
1074		- particleItem.addActionListener(this);
	1941	+ }
	1942	+
	1943	+// particleItem = menu.add(new MenuItem("Particle system"));
	1944	+// particleItem.addActionListener(this);
	1945	+ if (Globals.ADVANCED)
	1946	+ {
1075	1947	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1076	1948	ragdollItem.addActionListener(this);
1077	1949	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1078	1950	ragdoll2Item.addActionListener(this);
	1951	+ }
1079	1952	menu.add("-");
1080		- meshItem = menu.add(new MenuItem("Mesh"));
	1953	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1081	1954	meshItem.addActionListener(this);
1082	1955	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1083	1956	// meshGroupItem.addActionListener(this);
	1957	+ if (Globals.ADVANCED)
	1958	+ {
1084	1959	springItem = menu.add(new MenuItem("Spring"));
1085	1960	springItem.addActionListener(this);
1086	1961	flagItem = menu.add(new MenuItem("Flag"));
1087	1962	flagItem.addActionListener(this);
1088		- bezierItem = menu.add(new MenuItem("Patch"));
1089		- bezierItem.addActionListener(this);
1090		- checkerItem = menu.add(new MenuItem("Checker"));
1091		- checkerItem.addActionListener(this);
1092	1963	blobItem = menu.add(new MenuItem("Blob"));
1093	1964	blobItem.addActionListener(this);
1094	1965	latheItem = menu.add(new MenuItem("Lathe"));
1095	1966	latheItem.addActionListener(this);
1096		- lightItem = menu.add(new MenuItem("Light"));
1097		- lightItem.addActionListener(this);
	1967	+ }
	1968	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1969	+ bezierItem.addActionListener(this);
	1970	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1971	+// overlayItem.addActionListener(this);
	1972	+// lightItem = menu.add(new MenuItem("Light"));
	1973	+// lightItem.addActionListener(this);
1098	1974	menu.add("-");
1099	1975	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1100	1976	//superLoopItem.addActionListener(this);
1101		- loopItem = menu.add(new MenuItem("Loop"));
1102		- loopItem.addActionListener(this);
	1977	+// loopItem = menu.add(new MenuItem("Loop"));
	1978	+// loopItem.addActionListener(this);
1103	1979	doubleItem = menu.add(new MenuItem("Fork"));
1104	1980	doubleItem.addActionListener(this);
	1981	+ if (Globals.ADVANCED)
	1982	+ {
1105	1983	tripleItem = menu.add(new MenuItem("Trident"));
1106	1984	tripleItem.addActionListener(this);
	1985	+ }
1107	1986	}
1108	1987
1109	1988	void buildToolsMenu(Menu menu)
1110	1989	{
1111	1990	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1112	1991	animationItem.addItemListener(this);
1113		- animationItem.setState(CameraPane.ANIMATION);
	1992	+ animationItem.setState(Globals.ANIMATION);
	1993	+
	1994	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1995	+ archiveItem.addActionListener(this);
1114	1996
1115	1997	menu.add("-");
1116	1998	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1117	1999	parseverticesItem.addActionListener(this);
1118	2000	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1119	2001	textureFieldItem.addActionListener(this);
1120		- alignItem = menu.add(new MenuItem("Align"));
	2002	+ alignItem = menu.add(new MenuItem("Align Objects"));
1121	2003	alignItem.addActionListener(this);
1122		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1123		- mirrorItem.addActionListener(this);
1124	2004	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1125	2005	reduceMorphItem.addActionListener(this);
1126	2006	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1127	2007	reduce34MorphItem.addActionListener(this);
1128		-
1129		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1130		- computeAOItem.addActionListener(this);
1131	2008	menu.add("-");
1132		-
1133	2009	menu.add(memoryItem = new MenuItem("Memory Usage"));
1134	2010	memoryItem.addActionListener(this);
	2011	+ menu.add(computeAOItem = new MenuItem("Compute AO"));
	2012	+ computeAOItem.addActionListener(this);
	2013	+
	2014	+ if (Globals.ADVANCED)
	2015	+ {
	2016	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	2017	+ mirrorItem.addActionListener(this);
	2018	+ menu.add("-");
1135	2019	menu.add(analyzeItem = new MenuItem("Analyze"));
1136	2020	analyzeItem.addActionListener(this);
1137		- menu.add(dumpItem = new MenuItem("Dump"));
	2021	+ menu.add(dumpItem = new MenuItem("Print"));
1138	2022	dumpItem.addActionListener(this);
1139	2023	// menu.add(pathItem = new MenuItem("From-to path"));
1140	2024	// pathItem.addActionListener(this);
..	..	@@ -1152,6 +2036,7 @@
1152	2036	menu.add("-");
1153	2037	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1154	2038	editScriptItem.addActionListener(this);
	2039	+ }
1155	2040	}
1156	2041
1157	2042	void ScreenFit()
..	..	@@ -1274,9 +2159,34 @@
1274	2159	shadow.material = new cMaterial(obj.material);
1275	2160	shadow.material.diffuse = 0.0001f;
1276	2161	shadow.material.specular = 0.0001f;
	2162	+ //shadow.projectedVertices[1].x = 300;
1277	2163
1278	2164	makeSomething(shadow);
1279	2165	}
	2166	+
	2167	+ private void ClearUnpinned()
	2168	+ {
	2169	+ //for (Object3D obj : listUI)
	2170	+ for (int i=listUI.size(); --i>=0;)
	2171	+ {
	2172	+ Object3D obj = listUI.elementAt(i);
	2173	+ if (!obj.pinned)
	2174	+ {
	2175	+ obj.CloseUI();
	2176	+ listUI.remove(i);
	2177	+ }
	2178	+ }
	2179	+ }
	2180	+
	2181	+ private void EditElement(Object3D elem, boolean newWindow)
	2182	+ {
	2183	+ // if (!(elem instanceof Composite))
	2184	+ // newWindow = false;
	2185	+ listUI.add(elem);
	2186	+ elem.openEditWindow(this, newWindow); //, false);
	2187	+ System.out.println("edit : " + elem);
	2188	+ elem.editWindow.refreshContents(true); // ? new
	2189	+ }
1280	2190
1281	2191	/**
1282	2192	* applyExample
..	..	@@ -1480,9 +2390,9 @@
1480	2390
1481	2391	void Overwrite(int mask)
1482	2392	{
1483		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2393	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1484	2394	{
1485		- Object3D content = GrafreeD.clipboard.get(0);
	2395	+ Object3D content = Grafreed.clipboard.get(0);
1486	2396
1487	2397	if (content instanceof cGroup && ((cGroup)content).transientlink )
1488	2398	content = ((cGroup)content).get(0);
..	..	@@ -1521,7 +2431,7 @@
1521	2431	{
1522	2432	ScreenFit();
1523	2433	} else
1524		- if (source == switchItem)
	2434	+ if (source == switchViewItem)
1525	2435	{
1526	2436	cVector v1 = new cVector();
1527	2437	cVector v2 = new cVector();
..	..	@@ -1530,11 +2440,11 @@
1530	2440	objEditor.cameraView.renderCamera.setAim(v2, v1);
1531	2441	objEditor.cameraView.repaint();
1532	2442	} else
1533		- if (source == rectoidItem)
	2443	+ if (source == rectoidItem \|\| source == boxButton)
1534	2444	{
1535	2445	makeSomething(new Box());
1536	2446	} else
1537		- if (source == particleItem)
	2447	+ if (source == particleItem \|\| source == particlesButton)
1538	2448	{
1539	2449	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1540	2450	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1613,27 +2523,27 @@
1613	2523
1614	2524	makeSomething(obj);
1615	2525	} else
1616		- if (source == gridItem)
	2526	+ if (source == gridItem \|\| source == gridButton)
1617	2527	{
1618	2528	makeSomething(new Grid());
1619	2529	} else
1620		- if (source == ellipsoidItem)
	2530	+ if (source == ellipsoidItem \|\| source == sphereButton)
1621	2531	{
1622	2532	makeSomething(new Sphere());
1623	2533	} else
1624		- if (source == coneItem)
	2534	+ if (source == coneItem \|\| source == coneButton)
1625	2535	{
1626	2536	makeSomething(new Cone());
1627	2537	} else
1628		- if (source == torusItem)
	2538	+ if (source == torusItem \|\| source == torusButton)
1629	2539	{
1630	2540	makeSomething(new Torus());
1631	2541	} else
1632		- if (source == superItem)
	2542	+ if (source == superItem \|\| source == superButton)
1633	2543	{
1634	2544	makeSomething(new Superellipsoid());
1635	2545	} else
1636		- if (source == kleinItem)
	2546	+ if (source == kleinItem \|\| source == kleinButton)
1637	2547	{
1638	2548	makeSomething(new Klein());
1639	2549	} else
..	..	@@ -1653,7 +2563,7 @@
1653	2563	{
1654	2564	makeSomething(new BezierSurface());
1655	2565	} else
1656		- if (source == checkerItem)
	2566	+ if (source == overlayItem \|\| source == overlayButton)
1657	2567	{
1658	2568	/*
1659	2569	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1701,10 +2611,27 @@
1701	2611	s.setup();
1702	2612	makeSomething(s);
1703	2613	} else
1704		- if (source == lightItem)
	2614	+ if (source == lightItem \|\| source == lightButton)
1705	2615	{
1706	2616	makeSomething(new Light());
1707	2617	} else
	2618	+// if (source == skybox1Button \|\|
	2619	+// source == skybox2Button \|\|
	2620	+// source == skybox3Button \|\|
	2621	+// source == skybox4Button \|\|
	2622	+// source == skybox5Button \|\|
	2623	+// source == skybox6Button \|\|
	2624	+// source == skybox7Button \|\|
	2625	+// source == skybox11Button \|\|
	2626	+// source == skybox12Button \|\|
	2627	+// source == skybox13Button \|\|
	2628	+// source == skybox14Button \|\|
	2629	+// source == skybox15Button \|\|
	2630	+// source == skybox16Button \|\|
	2631	+// source == skybox17Button)
	2632	+// {
	2633	+// ChangeSkybox(source);
	2634	+// } else
1708	2635	if (source == csgItem)
1709	2636	{
1710	2637	group(new CSG());
..	..	@@ -1751,30 +2678,30 @@
1751	2678
1752	2679	group(g);
1753	2680	} else
1754		- if (source == loopItem)
	2681	+ if (source == loopItem \|\| source == loopButton)
1755	2682	{
1756	2683	Composite csg = new GroupLeaf();
1757	2684	csg.count = 5;
1758	2685	group(csg);
1759		- Composite child = new cGroup();
	2686	+ Composite child = new cGroup("Branch");
1760	2687	csg.addChild(child);
1761	2688	child.addChild(csg);
1762	2689	} else
1763	2690	if (source == doubleItem)
1764	2691	{
1765		- Composite csg = new GroupLeaf();
	2692	+ Composite csg = new GroupLeaf("Fork");
1766	2693	csg.count = 5;
1767	2694	group(csg);
1768		- Composite child = new cGroup();
	2695	+ Composite child = new cGroup("Branch A");
1769	2696	csg.addChild(child);
1770	2697	child.addChild(csg);
1771		- child = new cGroup();
	2698	+ child = new cGroup("Branch B");
1772	2699	csg.addChild(child);
1773	2700	child.addChild(csg);
1774	2701	} else
1775	2702	if (source == tripleItem)
1776	2703	{
1777		- Composite csg = new GroupLeaf();
	2704	+ Composite csg = new GroupLeaf("Trident");
1778	2705	csg.count = 4;
1779	2706	group(csg);
1780	2707	Composite child = new cGroup();
..	..	@@ -1787,27 +2714,10 @@
1787	2714	csg.addChild(child);
1788	2715	child.addChild(csg);
1789	2716	} else
1790		-
1791		- if (source == importGFDItem)
1792		- {
1793		- ImportGFD();
1794		- } else
1795		- if (source == importVRMLX3DItem)
1796		- {
1797		- ImportVRMLX3D();
1798		- } else
1799		- if (source == import3DSItem)
1800		- {
1801		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1802		- } else
1803		- if (source == importOBJItem)
1804		- {
1805		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1806		- } else
1807	2717	if (source == computeAOItem)
1808	2718	{
1809	2719	Globals.drawMode = CameraPane.OCCLUSION;
1810		- Globals.theRenderer.repaint();
	2720	+ cameraView.repaint();
1811	2721	} else
1812	2722	if (source == recompileItem)
1813	2723	{
..	..	@@ -1822,7 +2732,7 @@
1822	2732	if (source == invariantsItem)
1823	2733	{
1824	2734	System.out.println("Invariants:");
1825		- GrafreeD.grafreeD.universe.invariants();
	2735	+ Grafreed.grafreed.universe.invariants();
1826	2736	} else
1827	2737	if (source == memoryItem)
1828	2738	{
..	..	@@ -1841,19 +2751,80 @@
1841	2751	{
1842	2752	DumpObject();
1843	2753	} else
	2754	+ if (source == minButton)
	2755	+ {
	2756	+ Minimize();
	2757	+ } else
	2758	+ if (source == maxButton)
	2759	+ {
	2760	+ Maximize();
	2761	+ } else
	2762	+ if (source == fullButton)
	2763	+ {
	2764	+ ToggleFullScreen();
	2765	+ } else
	2766	+ if (source == collapseButton)
	2767	+ {
	2768	+ this.expandedLayout = radio.layout;
	2769	+ CollapseToolbar();
	2770	+ } else
	2771	+ if (source == maximize3DButton)
	2772	+ {
	2773	+ this.expandedLayout = radio.layout;
	2774	+ radio.layout = twoButton;
	2775	+ Show3DView();
	2776	+ CollapseToolbar();
	2777	+ } else
	2778	+ if (source == previousVersionButton)
	2779	+ {
	2780	+ // Go to previous version
	2781	+ //if (!Undo())
	2782	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2783	+ PreviousVersion();
	2784	+ } else
	2785	+ if (source == restoreButton)
	2786	+ {
	2787	+ // Restore current version
	2788	+ Restore();
	2789	+ //restoreButton.setEnabled(false);
	2790	+ } else
	2791	+ if (source == replaceButton)
	2792	+ {
	2793	+ // Overwrite current version
	2794	+ Replace();
	2795	+ //replaceButton.setEnabled(false);
	2796	+ } else
	2797	+ if (source == nextVersionButton)
	2798	+ {
	2799	+ // Go to next version
	2800	+ NextVersion();
	2801	+ } else
	2802	+ if (source == saveVersionButton)
	2803	+ {
	2804	+ // Save a new version
	2805	+ if (!Save(true))
	2806	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2807	+ } else
	2808	+ if (source == deleteVersionButton)
	2809	+ {
	2810	+ // Delete a new version
	2811	+ DeleteVersion();
	2812	+ } else
	2813	+ if (source == oneStepButton)
	2814	+ {
	2815	+ Globals.ONESTEP = true;
	2816	+ cameraView.repaint();
	2817	+ } else
1844	2818	if (source == screenfitButton)
1845	2819	{
1846		- //Reload(lastConverter, lastFilename, true);
1847	2820	ScreenFit();
1848	2821	} else
1849	2822	if (source == screenfitpointButton)
1850	2823	{
1851		- //Reload(lastConverter, lastFilename, true);
1852	2824	ScreenFitPoint();
1853	2825	} else
1854	2826	if (source == snapobjectButton)
1855	2827	{
1856		- //Reload(lastConverter, lastFilename, true);
1857	2828	SnapObject();
1858	2829	} else
1859	2830	// if (event.getSource() == recompileButton)
..	..	@@ -1890,12 +2861,20 @@
1890	2861	{
1891	2862	loadClipboard(true);
1892	2863	} else
	2864	+ if (source == undoItem)
	2865	+ {
	2866	+ PreviousVersion();
	2867	+ } else
	2868	+ if (source == redoItem)
	2869	+ {
	2870	+ NextVersion();
	2871	+ } else
1893	2872	if (source == duplicateItem)
1894	2873	{
1895		- Object3D keep = GrafreeD.clipboard;
	2874	+ Object3D keep = Grafreed.clipboard;
1896	2875	loadClipboard(false);
1897	2876	paste(false);
1898		- GrafreeD.clipboard = keep;
	2877	+ Grafreed.clipboard = keep;
1899	2878	} else
1900	2879	if (source == cloneItem)
1901	2880	{
..	..	@@ -1913,13 +2892,17 @@
1913	2892	{
1914	2893	paste(false);
1915	2894	} else
	2895	+ if (source == pasteIntoItem)
	2896	+ {
	2897	+ pasteInto(true, false);
	2898	+ } else
1916	2899	if (source == pasteLinkItem)
1917	2900	{
1918		- pasteInto(false);
	2901	+ pasteInto(false, false);
1919	2902	} else
1920	2903	if (source == pasteCloneItem)
1921	2904	{
1922		- pasteInto(true);
	2905	+ pasteInto(true, true);
1923	2906	} else
1924	2907	if (source == pasteExpandItem)
1925	2908	{
..	..	@@ -2111,9 +3094,9 @@
2111	3094	// group.selection.get(0).setMasterThis(content); // should be identity
2112	3095	// refreshContents();
2113	3096	// }
2114		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	3097	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2115	3098	{
2116		- Object3D content = GrafreeD.clipboard.get(0);
	3099	+ Object3D content = Grafreed.clipboard.get(0);
2117	3100
2118	3101	if (content instanceof cGroup && ((cGroup)content).transientlink )
2119	3102	content = ((cGroup)content).get(0);
..	..	@@ -2121,11 +3104,11 @@
2121	3104	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2122	3105	for (int i=0; i<group.selection.size(); i++)
2123	3106	{
2124		- boolean random = CameraPane.RANDOM;
2125		- CameraPane.RANDOM = false; // parse all random nodes
	3107	+ boolean random = CameraPane.SWITCH;
	3108	+ CameraPane.SWITCH = false; // parse all random nodes
2126	3109	group.selection.get(i).linkVerticesThis(content);
2127	3110	// group.selection.get(i).setMasterThis(content); // should be identity
2128		- CameraPane.RANDOM = random;
	3111	+ CameraPane.SWITCH = random;
2129	3112	}
2130	3113	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2131	3114	refreshContents();
..	..	@@ -2135,20 +3118,20 @@
2135	3118	{
2136	3119	for (int i=0; i<group.selection.size(); i++)
2137	3120	{
2138		- boolean random = CameraPane.RANDOM;
2139		- CameraPane.RANDOM = false; // parse all random nodes
	3121	+ boolean random = CameraPane.SWITCH;
	3122	+ CameraPane.SWITCH = false; // parse all random nodes
2140	3123	group.selection.get(i).linkVerticesThis(null);
2141		- CameraPane.RANDOM = random;
	3124	+ CameraPane.SWITCH = random;
2142	3125	}
2143	3126
2144	3127	refreshContents();
2145	3128	} else
2146	3129	if (source == relinkverticesItem)
2147	3130	{
2148		- boolean random = CameraPane.RANDOM;
2149		- CameraPane.RANDOM = false; // parse all random nodes
	3131	+ boolean random = CameraPane.SWITCH;
	3132	+ CameraPane.SWITCH = false; // parse all random nodes
2150	3133	group.selection.RelinkToSupport();
2151		- CameraPane.RANDOM = random;
	3134	+ CameraPane.SWITCH = random;
2152	3135
2153	3136	refreshContents();
2154	3137	} else
..	..	@@ -2163,9 +3146,9 @@
2163	3146	} else
2164	3147	if (source == setMasterItem)
2165	3148	{
2166		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	3149	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2167	3150	{
2168		- Object3D content = GrafreeD.clipboard.get(0);
	3151	+ Object3D content = Grafreed.clipboard.get(0);
2169	3152
2170	3153	if (content instanceof cGroup && ((cGroup)content).transientlink )
2171	3154	content = ((cGroup)content).get(0);
..	..	@@ -2178,9 +3161,9 @@
2178	3161	{
2179	3162	if (group.selection.size() == 1)
2180	3163	{
2181		- if (GrafreeD.clipboard.size() == 1)
	3164	+ if (Grafreed.clipboard.size() == 1)
2182	3165	{
2183		- Object3D content = GrafreeD.clipboard.get(0);
	3166	+ Object3D content = Grafreed.clipboard.get(0);
2184	3167
2185	3168	if (content instanceof cGroup && ((cGroup)content).transientlink )
2186	3169	content = ((cGroup)content).get(0);
..	..	@@ -2197,7 +3180,7 @@
2197	3180	{
2198	3181	RevertMeshes();
2199	3182	} else
2200		- if (source == resetMeshItem)
	3183	+ if (source == resetAllItem)
2201	3184	{
2202	3185	ResetAll();
2203	3186	} else
..	..	@@ -2205,7 +3188,7 @@
2205	3188	{
2206	3189	StepAll();
2207	3190	} else
2208		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3191	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2209	3192	{
2210	3193	//int indices[] = jList.getSelectedIndices();
2211	3194	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2217,9 +3200,9 @@
2217	3200	{
2218	3201	ClearSelection(true);
2219	3202	} else
2220		- if (source == grabItem)
	3203	+ if (source == grabItem \|\| source == groupButton)
2221	3204	{
2222		- group(new cGroup(), true);
	3205	+ group(new cGroup(), false); // true);
2223	3206	} else
2224	3207	if (source == hideItem)
2225	3208	{
..	..	@@ -2237,16 +3220,16 @@
2237	3220	{
2238	3221	makeSomething(new Camera());
2239	3222	} else
2240		- if (source == compositeItem)
	3223	+ if (source == compositeItem \|\| source == compositeButton)
2241	3224	{
2242	3225	group(new Composite());
2243	3226	} else
2244		- if (source == randomItem)
	3227	+ if (source == switchItem \|\| source == switchButton)
2245	3228	{
2246	3229	RandomNode random = new RandomNode();
2247	3230	group(random);
2248	3231	if (random.size() > 0)
2249		- random.name = random.get(0).name + "Rnd";
	3232	+ random.name = random.get(0).name + "Switch";
2250	3233	} else
2251	3234	if (source == physicsItem)
2252	3235	{
..	..	@@ -2343,7 +3326,7 @@
2343	3326	{
2344	3327	group(new cLinker());
2345	3328	} else
2346		- if (source == textureItem)
	3329	+ if (source == textureItem \|\| source == textureButton)
2347	3330	{
2348	3331	group(new TextureNode());
2349	3332	} else
..	..	@@ -2363,17 +3346,30 @@
2363	3346	{
2364	3347	CastShadow(2);
2365	3348	} else
2366		- if (source == ungroupItem)
	3349	+ if (source == ungroupItem \|\| source == ungroupButton)
2367	3350	{
2368		- //ungroup();
	3351	+ boolean hasRoot = false;
	3352	+
2369	3353	for (int i=0; i<group.selection.size(); i++)
2370	3354	{
2371		- Ungroup(group.selection.get(i));
	3355	+ if (group.selection.get(i) == group)
	3356	+ {
	3357	+ hasRoot = true;
	3358	+ break;
	3359	+ }
2372	3360	}
2373	3361
2374		- ClearSelection(false);
2375		-
2376		- refreshContents();
	3362	+ if (!hasRoot)
	3363	+ {
	3364	+ for (int i=0; i<group.selection.size(); i++)
	3365	+ {
	3366	+ Ungroup(group.selection.get(i));
	3367	+ }
	3368	+
	3369	+ ClearSelection(false);
	3370	+
	3371	+ refreshContents();
	3372	+ }
2377	3373	} else
2378	3374	if (source == genUVItem)
2379	3375	{
..	..	@@ -2385,7 +3381,7 @@
2385	3381	} else
2386	3382	if (source == genNormalsMESHItem)
2387	3383	{
2388		- GenNormals(true); // TODO
	3384	+ GenNormalsMESH();
2389	3385	} else
2390	3386	if (source == genNormalsORGANItem)
2391	3387	{
..	..	@@ -2450,6 +3446,22 @@
2450	3446	if (source == unmarkleavesItem)
2451	3447	{
2452	3448	MarkLeaves(false);
	3449	+ } else
	3450	+ if (source == rewindleavesItem)
	3451	+ {
	3452	+ RewindLeaves(true);
	3453	+ } else
	3454	+ if (source == unrewindleavesItem)
	3455	+ {
	3456	+ RewindLeaves(false);
	3457	+ } else
	3458	+ if (source == randomleavesItem)
	3459	+ {
	3460	+ RandomLeaves(true);
	3461	+ } else
	3462	+ if (source == unrandomleavesItem)
	3463	+ {
	3464	+ RandomLeaves(false);
2453	3465	} else
2454	3466	if (source == flipVItem)
2455	3467	{
..	..	@@ -2535,9 +3547,13 @@
2535	3547	{
2536	3548	SmoothMesh();
2537	3549	} else
2538		- if (source == transformgeometryItem)
	3550	+ if (source == transformGeometryItem)
2539	3551	{
2540	3552	TransformGeometry();
	3553	+ } else
	3554	+ if (source == transformChildrenItem)
	3555	+ {
	3556	+ TransformChildren();
2541	3557	} else
2542	3558	if (source == resetTransformItem)
2543	3559	{
..	..	@@ -2545,7 +3561,11 @@
2545	3561	} else
2546	3562	if (source == resetCentroidItem)
2547	3563	{
2548		- ResetCentroid();
	3564	+ ResetCentroid(true);
	3565	+ } else
	3566	+ if (source == resetCentroidXZItem)
	3567	+ {
	3568	+ ResetCentroid(false);
2549	3569	} else
2550	3570	if (source == resetParentItem)
2551	3571	{
..	..	@@ -2650,7 +3670,7 @@
2650	3670	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2651	3671	{
2652	3672	obj = (Object3D)e.nextElement();
2653		- obj.SetBumpTexture(null);
	3673	+ obj.ResetBumpTexture();
2654	3674	}
2655	3675
2656	3676	refreshContents();
..	..	@@ -2666,6 +3686,31 @@
2666	3686
2667	3687	refreshContents();
2668	3688	} else
	3689	+ if (source == embedTexturesItem)
	3690	+ {
	3691	+ Object3D obj;
	3692	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3693	+ {
	3694	+ obj = (Object3D)e.nextElement();
	3695	+ obj.EmbedTextures(true);
	3696	+ }
	3697	+
	3698	+ refreshContents();
	3699	+ } else
	3700	+ if (source == deEmbedTexturesItem)
	3701	+ {
	3702	+ Object3D obj;
	3703	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3704	+ {
	3705	+ obj = (Object3D)e.nextElement();
	3706	+ obj.EmbedTextures(false);
	3707	+ }
	3708	+
	3709	+ CameraPane.texturepigment.clear();
	3710	+ CameraPane.texturebump.clear();
	3711	+
	3712	+ refreshContents();
	3713	+ } else
2669	3714	if (source == flashSelectionButton)
2670	3715	{
2671	3716	CameraPane.flash = true;
..	..	@@ -2677,42 +3722,36 @@
2677	3722	if (source == twoButton)
2678	3723	{
2679	3724	radio.layout = twoButton;
2680		- // bug
2681		- //gridPanel.setDividerLocation(1.0);
2682		- //bigPanel.setDividerLocation(0.0);
2683		-// bigThree.remove(scenePanel);
2684		-// bigThree.remove(centralPanel);
2685		-// bigThree.remove(XYZPanel);
2686		-// aWindowConstraints.gridx = 0;
2687		-// aWindowConstraints.gridy = 0;
2688		-// aWindowConstraints.gridwidth = 1;
2689		-// // aConstraints.gridheight = 3;
2690		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2691		-// aWindowConstraints.weightx = 0;
2692		-// aWindowConstraints.weighty = 1;
2693		-// //bigThree.add(jtp, aWindowConstraints);
2694		-// aWindowConstraints.weightx = 1;
2695		-// aWindowConstraints.gridwidth = 3;
2696		-// // aConstraints.gridheight = 3;
2697		-// aWindowConstraints.gridx = 1;
2698		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
2699		-// bigThree.add(centralPanel, aWindowConstraints);
2700		-// aWindowConstraints.weightx = 0;
2701		-// aWindowConstraints.gridx = 4;
2702		-// aWindowConstraints.gridwidth = 1;
2703		-// // aConstraints.gridheight = 3;
2704		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2705		-// //bigThree.add(XYZPanel, aWindowConstraints);
2706		-// scenePanel.setVisible(false);
2707		-// centralPanel.setVisible(true);
2708		-// XYZPanel.setVisible(false);
2709		- bigThree.ClearUI();
2710		- bigThree.add(centralPanel);
2711		- bigThree.FlushUI();
	3725	+
	3726	+ if (CameraPane.FULLSCREEN)
	3727	+ fullscreenLayout = radio.layout;
	3728	+
	3729	+ Show3DView();
	3730	+
	3731	+ cameraView.requestFocusInWindow();
	3732	+
	3733	+// refreshContents(true);
	3734	+//
	3735	+// try
	3736	+// {
	3737	+// java.awt.Robot bot = new java.awt.Robot();
	3738	+// int mask = InputEvent.BUTTON1_MASK;
	3739	+// bot.mouseMove(100, 100);
	3740	+// bot.mousePress(mask);
	3741	+// bot.mouseRelease(mask);
	3742	+// }
	3743	+// catch (Exception e)
	3744	+// {
	3745	+//
	3746	+// }
	3747	+
2712	3748	} else
2713	3749	if (source == threeButton)
2714	3750	{
2715	3751	radio.layout = threeButton;
	3752	+
	3753	+ if (CameraPane.FULLSCREEN)
	3754	+ fullscreenLayout = radio.layout;
2716	3755
2717	3756	// bigThree.remove(scenePanel);
2718	3757	// bigThree.remove(centralPanel);
..	..	@@ -2742,13 +3781,18 @@
2742	3781	// centralPanel.setVisible(true);
2743	3782	// XYZPanel.setVisible(true);
2744	3783	bigThree.ClearUI();
	3784	+ bigThree.add(scenePanel);
2745	3785	bigThree.add(centralPanel);
2746		- bigThree.add(XYZPanel);
2747	3786	bigThree.FlushUI();
	3787	+
	3788	+ cameraView.requestFocusInWindow();
2748	3789	} else
2749	3790	if (source == fourButton)
2750	3791	{
2751	3792	radio.layout = fourButton;
	3793	+
	3794	+ if (CameraPane.FULLSCREEN)
	3795	+ fullscreenLayout = radio.layout;
2752	3796
2753	3797	// bigThree.remove(scenePanel);
2754	3798	// bigThree.remove(centralPanel);
..	..	@@ -2780,10 +3824,15 @@
2780	3824	bigThree.ClearUI();
2781	3825	bigThree.add(scenePanel);
2782	3826	bigThree.FlushUI();
	3827	+
	3828	+ cameraView.requestFocusInWindow();
2783	3829	} else
2784	3830	if (source == sixButton)
2785	3831	{
2786	3832	radio.layout = sixButton;
	3833	+
	3834	+ if (CameraPane.FULLSCREEN)
	3835	+ fullscreenLayout = radio.layout;
2787	3836
2788	3837	// bigThree.remove(scenePanel);
2789	3838	// bigThree.remove(centralPanel);
..	..	@@ -2813,13 +3862,18 @@
2813	3862	// centralPanel.setVisible(true);
2814	3863	// XYZPanel.setVisible(false);
2815	3864	bigThree.ClearUI();
2816		- bigThree.add(scenePanel);
2817	3865	bigThree.add(centralPanel);
	3866	+ bigThree.add(scenePanel);
2818	3867	bigThree.FlushUI();
	3868	+
	3869	+ cameraView.requestFocusInWindow();
2819	3870	} else
2820	3871	if (source == sevenButton)
2821	3872	{
2822	3873	radio.layout = sevenButton;
	3874	+
	3875	+ if (CameraPane.FULLSCREEN)
	3876	+ fullscreenLayout = radio.layout;
2823	3877
2824	3878	// bigThree.remove(scenePanel);
2825	3879	// bigThree.remove(centralPanel);
..	..	@@ -2853,9 +3907,12 @@
2853	3907	bigThree.add(centralPanel);
2854	3908	bigThree.add(XYZPanel);
2855	3909	bigThree.FlushUI();
	3910	+
	3911	+ cameraView.requestFocusInWindow();
2856	3912	} else
2857	3913	if (source == rootButton)
2858	3914	{
	3915	+ Replace();
2859	3916	Object3D obj;
2860	3917	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2861	3918	{
..	..	@@ -2864,6 +3921,7 @@
2864	3921	EditObject(obj);
2865	3922	}
2866	3923
	3924	+ cameraView.requestFocusInWindow();
2867	3925	refreshContents(true);
2868	3926	} else
2869	3927	if (source == closeButton)
..	..	@@ -2873,22 +3931,37 @@
2873	3931	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2874	3932	{
2875	3933	ab = (cRadio)e.nextElement();
2876		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3934	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2877	3935	{
	3936	+ // Patch to avoid bug with transparency.
	3937	+ if (!ab.hadMaterial)
	3938	+ {
	3939	+ ab.object.material = null;
	3940	+ }
	3941	+
2878	3942	buttonGroup.remove(ab);
2879	3943	radioPanel.remove(ab);
2880	3944
2881		- ab.GetObject().editWindow = null;
	3945	+ //ab.GetObject().editWindow = null;
	3946	+ ab.GetObject().manipWindow = null;
2882	3947	// ab.GetObject().objectUI = null; // ?????????
2883	3948
2884	3949	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2885	3950	break;
2886	3951	}
2887	3952	}
	3953	+
	3954	+ cameraView.requestFocusInWindow();
2888	3955	refreshContents(true);
2889	3956	} else
2890	3957	if (source == editItem \|\| source == editButton)
2891	3958	{
	3959	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3960	+ {
	3961	+ Object3D child = (Object3D)e.nextElement();
	3962	+ child.pinned = true;
	3963	+ }
	3964	+
2892	3965	EditSelection(false);
2893	3966	} else
2894	3967	if (source == uneditButton)
..	..	@@ -2897,13 +3970,14 @@
2897	3970	{
2898	3971	Object3D child = (Object3D)e.nextElement();
2899	3972	if(child.editWindow != null)
2900		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3973	+ child.pinned = false;
2901	3974	child.CloseUI();
2902	3975	listUI.remove(child);
	3976	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2903	3977
2904		- child.editWindow = null; // ???????????
	3978	+ //child.editWindow = null; // ???????????
2905	3979	}
2906		- objEditor.ctrlPanel.validate();
	3980	+ objEditor.ctrlPanel.FlushUI();
2907	3981	//objEditor.jTree.clearSelection();
2908	3982	//objEditor.ResetSliders();
2909	3983	refreshContents(true);
..	..	@@ -2914,16 +3988,18 @@
2914	3988	//copy.ClearUI();
2915	3989	for (Object3D obj : listUI)
2916	3990	{
	3991	+ obj.pinned = false;
2917	3992	obj.CloseUI();
2918	3993	}
2919	3994	listUI.clear();
	3995	+ SetPinStates(group.selection.size() > 0);
2920	3996	refreshContents(true);
2921	3997	} else
2922	3998	if (source == allParamsButton)
2923	3999	{
2924	4000	assert(copy == group);
2925	4001
2926		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4002	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2927	4003
2928	4004	for (Object3D obj : listUI)
2929	4005	{
..	..	@@ -2972,6 +4048,7 @@
2972	4048	}
2973	4049
2974	4050	copy = group;
	4051	+
2975	4052	//Globals.theRenderer.object = group;
2976	4053	if(!useclient)
2977	4054	{
..	..	@@ -2987,20 +4064,61 @@
2987	4064	frontView.object = group;
2988	4065	sideView.object = group;
2989	4066	}
2990		- group.editWindow = this;
	4067	+
	4068	+// fix "+" issue
	4069	+ //group.editWindow = this;
	4070	+ group.manipWindow = this;
	4071	+
2991	4072	/*
2992	4073	currentLayout = radio.layout;
2993	4074	if (currentLayout == null)
2994	4075	currentLayout = sevenButton;
2995	4076	*/
2996	4077	radio.layout.doClick();
	4078	+
	4079	+ assert(copy instanceof Composite);
	4080	+
	4081	+ if (copy.versionlist == null)
	4082	+ {
	4083	+ copy.versionlist = new Object3D[100];
	4084	+ copy.versionindex = -1;
	4085	+
	4086	+ Save(true);
	4087	+ }
	4088	+
	4089	+ SetVersionStates();
	4090	+
	4091	+ ClearUnpinned();
	4092	+
	4093	+ //Grafreed.Assert(group != null);
	4094	+ //Grafreed.Assert(group.selection != null);
	4095	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4096	+ if (group.selection == null \|\| group.selection.size() == 1)
	4097	+ EditSelection(false);
2997	4098	keepparent = group.parent;
2998	4099	// PARENT = NULL or not???
2999	4100	//group.parent = null; // ROOT
3000	4101	//group.attributes = -1;
3001	4102	ResetModel();
	4103	+
	4104	+ cameraView.requestFocusInWindow();
3002	4105	refreshContents(true);
3003		- }
	4106	+ } else if (event.getSource() == editCameraItem)
	4107	+ {
	4108	+ cameraView.ProtectCamera();
	4109	+ cameraView.requestFocusInWindow();
	4110	+ cameraView.repaint();
	4111	+ return;
	4112	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	4113	+ {
	4114	+ cameraView.RevertCamera();
	4115	+ cameraView.requestFocusInWindow();
	4116	+ cameraView.repaint();
	4117	+ return;
	4118	+ // } else if (event.getSource() == textureButton)
	4119	+ // {
	4120	+ // return; // true;
	4121	+ }
3004	4122	else
3005	4123	{
3006	4124	//return super.action(event, arg);
..	..	@@ -3009,7 +4127,6 @@
3009	4127	}
3010	4128
3011	4129	boolean useclient = false;
3012		- cRadio radio;
3013	4130
3014	4131	void ToggleRoot()
3015	4132	{
..	..	@@ -3061,6 +4178,28 @@
3061	4178	refreshContents();
3062	4179	}
3063	4180
	4181	+ void TransformChildren()
	4182	+ {
	4183	+ Object3D obj;
	4184	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4185	+ {
	4186	+ obj = (Object3D)e.nextElement();
	4187	+ obj.KeepTextureMatrices();
	4188	+ obj.TransformChildren();
	4189	+ obj.RestoreTextureMatrices();
	4190	+
	4191	+// if (obj.parent == null)
	4192	+// {
	4193	+// System.out.println("NULL PARENT!");
	4194	+// new Exception().printStackTrace();
	4195	+// }
	4196	+// else
	4197	+// TouchTransform(obj);
	4198	+// //obj.parent.Touch();
	4199	+ }
	4200	+
	4201	+ refreshContents();
	4202	+ }
3064	4203
3065	4204	void ResetTransform()
3066	4205	{
..	..	@@ -3173,7 +4312,7 @@
3173	4312	refreshContents();
3174	4313	}
3175	4314
3176		- void ResetCentroid()
	4315	+ void ResetCentroid(boolean full)
3177	4316	{
3178	4317	Object3D obj;
3179	4318	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3188,12 +4327,16 @@
3188	4327	LA.matIdentity(Object3D.mat);
3189	4328	obj.getBounds(minima, maxima, false);
3190	4329	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3191		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	4330	+ if (full)
	4331	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3192	4332	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3193	4333	obj.TransformMesh(Object3D.mat);
	4334	+
3194	4335	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3195		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	4336	+ if (full)
	4337	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3196	4338	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	4339	+
3197	4340	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3198	4341	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3199	4342	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3222,7 +4365,8 @@
3222	4365
3223	4366	int size = obj.MemorySize();
3224	4367
3225		- System.err.println((size/1024) + " KB is the size of " + obj);
	4368	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4369	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3226	4370	}
3227	4371	}
3228	4372	catch (Exception e)
..	..	@@ -3259,9 +4403,9 @@
3259	4403	obj = (Object3D)e.nextElement();
3260	4404
3261	4405	System.out.println("Object is: " + obj);
3262		- GrafreeD.AnalyzeObject(obj);
	4406	+ Grafreed.AnalyzeObject(obj);
3263	4407	System.out.println("Boundary rep: " + obj.bRep);
3264		- GrafreeD.AnalyzeObject(obj.bRep);
	4408	+ Grafreed.AnalyzeObject(obj.bRep);
3265	4409
3266	4410	// System.err.println((size/1024) + " KB is the size of " + obj);
3267	4411	}
..	..	@@ -3303,6 +4447,13 @@
3303	4447	void GenNormals(boolean crease)
3304	4448	{
3305	4449	group.GenNormalsS(crease);
	4450	+
	4451	+ refreshContents();
	4452	+ }
	4453	+
	4454	+ void GenNormalsMESH()
	4455	+ {
	4456	+ group.GenNormalsMeshS();
3306	4457
3307	4458	refreshContents();
3308	4459	}
..	..	@@ -3475,8 +4626,8 @@
3475	4626
3476	4627	void ParseVertices()
3477	4628	{
3478		- boolean epsequal = GrafreeD.epsequal;
3479		- GrafreeD.epsequal = true;
	4629	+ boolean epsequal = Grafreed.epsequal;
	4630	+ Grafreed.epsequal = true;
3480	4631
3481	4632	for (int i=0; i<group.selection.size(); i++)
3482	4633	{
..	..	@@ -3501,7 +4652,7 @@
3501	4652	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3502	4653	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3503	4654
3504		- g.add(GrafreeD.clipboard);
	4655	+ g.add(Grafreed.clipboard);
3505	4656
3506	4657	buffer.add(g);
3507	4658	}
..	..	@@ -3516,7 +4667,7 @@
3516	4667	makeSomething(buffer, i==group.selection.size()-1);
3517	4668	}
3518	4669
3519		- GrafreeD.epsequal = epsequal;
	4670	+ Grafreed.epsequal = epsequal;
3520	4671
3521	4672	refreshContents();
3522	4673	}
..	..	@@ -3534,7 +4685,16 @@
3534	4685	String pigment = Object3D.GetPigment(tex);
3535	4686	//String bump = Object3D.GetBump(tex);
3536	4687
3537		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4688	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4689	+
	4690	+ try
	4691	+ {
	4692	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
	4693	+ }
	4694	+ catch (Exception e)
	4695	+ {
	4696	+ System.err.println("FAIL: " + node);
	4697	+ }
3538	4698
3539	4699	double s = v.s;
3540	4700
..	..	@@ -3622,11 +4782,11 @@
3622	4782
3623	4783	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3624	4784
3625		- boolean random = CameraPane.RANDOM;
3626		- CameraPane.RANDOM = false; // parse all random nodes
	4785	+ boolean random = CameraPane.SWITCH;
	4786	+ CameraPane.SWITCH = false; // parse all random nodes
3627	4787	lowres.linkVerticesThis(null);
3628	4788	lowres.linkVerticesThis(sn);
3629		- CameraPane.RANDOM = random;
	4789	+ CameraPane.SWITCH = random;
3630	4790
3631	4791	System.err.flush();
3632	4792
..	..	@@ -3666,7 +4826,7 @@
3666	4826	return;
3667	4827
3668	4828	Object3D poses = group.selection.get(0);
3669		- Object3D ref = GrafreeD.clipboard.get(0);
	4829	+ Object3D ref = Grafreed.clipboard.get(0);
3670	4830
3671	4831	Object3D newgroup = new Object3D("Po:" + poses.name);
3672	4832
..	..	@@ -3860,9 +5020,9 @@
3860	5020
3861	5021	void ClipMesh()
3862	5022	{
3863		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	5023	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3864	5024	{
3865		- Object3D content = GrafreeD.clipboard.get(0);
	5025	+ Object3D content = Grafreed.clipboard.get(0);
3866	5026
3867	5027	if (content instanceof cGroup && ((cGroup)content).transientlink )
3868	5028	content = ((cGroup)content).get(0);
..	..	@@ -3871,7 +5031,7 @@
3871	5031	// {
3872	5032	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3873	5033	// }
3874		- group.selection.ClipMesh(GrafreeD.clipboard);
	5034	+ group.selection.ClipMesh(Grafreed.clipboard);
3875	5035	}
3876	5036	// group.selection.ClipMesh(GrafreeD.clipboard);
3877	5037	System.out.println("DONE.");
..	..	@@ -3918,6 +5078,18 @@
3918	5078	void MarkLeaves(boolean hide)
3919	5079	{
3920	5080	group.selection.MarkLeaves(hide);
	5081	+ refreshContents();
	5082	+ }
	5083	+
	5084	+ void RewindLeaves(boolean hide)
	5085	+ {
	5086	+ group.selection.RewindLeaves(hide);
	5087	+ refreshContents();
	5088	+ }
	5089	+
	5090	+ void RandomLeaves(boolean hide)
	5091	+ {
	5092	+ group.selection.RandomLeaves(hide);
3921	5093	refreshContents();
3922	5094	}
3923	5095
..	..	@@ -3992,28 +5164,25 @@
3992	5164	// }
3993	5165	// }
3994	5166
3995		- static boolean allparams = true;
3996		-
3997		- static Vector<Object3D> listUI = new Vector<Object3D>();
3998		-
3999	5167	void EditSelection(boolean newWindow)
4000	5168	{
	5169	+ if (group.selection == null)
	5170	+ {
	5171	+ EditElement(group, newWindow); // ? new
	5172	+ return;
	5173	+ }
	5174	+
4001	5175	// aConstraints.gridy = 0;
4002	5176	for (int i=0; i<group.selection.size(); i++)
4003	5177	{
4004	5178	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4005	5179	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4006		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5180	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4007	5181
4008	5182	Object3D elem = (Object3D)group.selection.elementAt(i);
4009		- if(elem != group)
	5183	+ if(elem != group \|\| !newWindow)
4010	5184	{
4011		- // if (!(elem instanceof Composite))
4012		- // newWindow = false;
4013		- listUI.add(elem);
4014		- elem.openEditWindow(this, newWindow); //, false);
4015		- System.out.println("edit : " + elem);
4016		- elem.editWindow.refreshContents(true); // ? new
	5185	+ EditElement(elem, newWindow); // ? new
4017	5186	}
4018	5187	}
4019	5188	}
..	..	@@ -4076,9 +5245,7 @@
4076	5245
4077	5246	freezemodel = false;
4078	5247	}
4079		-
4080		- boolean flashIt = true;
4081		-
	5248	+
4082	5249	public void valueChanged(TreeSelectionEvent e)
4083	5250	//public boolean handleEvent(Event event)
4084	5251	{
..	..	@@ -4088,7 +5255,8 @@
4088	5255	//new Exception().printStackTrace();
4089	5256
4090	5257	freezemodel = true;
4091		-
	5258	+ ClearUnpinned();
	5259	+
4092	5260	/**/
4093	5261	//switch (event.id)
4094	5262	{
..	..	@@ -4096,7 +5264,6 @@
4096	5264	//case 702: // Event.LIST_DESELECT
4097	5265	group.deselectAll();
4098	5266	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4099		- objEditor.ClearInfo(); // .GetMaterial());
4100	5267	if (tps != null)
4101	5268	{
4102	5269	for (int i=0; i < tps.length; i++)
..	..	@@ -4105,10 +5272,8 @@
4105	5272
4106	5273	//if (child.parent != null)
4107	5274	//child.parent.addSelectee(child);
	5275	+ objEditor.SetMaterial(child);
4108	5276	group.addSelectee(child);
4109		- objEditor.SetMaterial(child); // .GetMaterial());
4110		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4111		- System.err.println("info : " + child.GetPath());
4112	5277	}
4113	5278	}
4114	5279	// else
..	..	@@ -4118,20 +5283,28 @@
4118	5283	// System.err.println("info : " + group.GetPath());
4119	5284	// }
4120	5285
4121		- objEditor.SetText(); // jan 2014
4122		-
4123		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	5286	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4124	5287	CameraPane.flash = true;
4125	5288
4126		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5289	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4127	5290	// a camera
4128	5291	{
4129		- CameraPane.camerachangeframe = 0; // don't refuse it
4130		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5292	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5293	+ {
	5294	+ CameraPane.camerachangeframe = 0; // don't refuse it
	5295	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5296	+ }
4131	5297	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4132	5298	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4133	5299	}
4134	5300
	5301	+ if (tps != null && tps.length == 1)
	5302	+ {
	5303	+ EditSelection(false);
	5304	+ }
	5305	+
	5306	+ SetPinStates(tps != null && tps.length > 0);
	5307	+
4135	5308	refreshContents();
4136	5309	//return true;
4137	5310	}
..	..	@@ -4140,6 +5313,50 @@
4140	5313
4141	5314	freezemodel = false;
4142	5315	}
	5316	+
	5317	+ void SetPinStates(boolean enabled)
	5318	+ {
	5319	+ editButton.setEnabled(enabled);
	5320	+ uneditButton.setEnabled(enabled);
	5321	+ //unselectButton.setEnabled(enabled);
	5322	+ flashSelectionButton.setEnabled(enabled);
	5323	+
	5324	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5325	+
	5326	+ boolean allComposites = true;
	5327	+
	5328	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5329	+ {
	5330	+ if (!(e.nextElement() instanceof Composite))
	5331	+ {
	5332	+ allComposites = false;
	5333	+ break;
	5334	+ }
	5335	+ }
	5336	+
	5337	+ rootButton.setEnabled(allComposites);
	5338	+ }
	5339	+
	5340	+ void refreshContents(boolean cp)
	5341	+ {
	5342	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5343	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5344	+ {
	5345	+ objEditor.ClearInfo(); // .GetMaterial());
	5346	+
	5347	+ for (int i=0; i < group.selection.Size(); i++)
	5348	+ {
	5349	+ Object3D child = (Object3D) group.selection.get(i);
	5350	+
	5351	+ objEditor.AddInfo(child, this, true);
	5352	+// System.err.println("info : " + child.GetPath());
	5353	+ }
	5354	+
	5355	+ objEditor.SetText(); // jan 2014
	5356	+ }
	5357	+
	5358	+ super.refreshContents(cp);
	5359	+ }
4143	5360
4144	5361	void linkSomething(Object3D thing)
4145	5362	{
..	..	@@ -4211,16 +5428,19 @@
4211	5428	{
4212	5429	if (group.selection.isEmpty())
4213	5430	return;
4214		- GrafreeD.clipboardIsTempGroup = false;
	5431	+
	5432	+ Grafreed.clipboardIsTempGroup = false;
4215	5433	Composite tGroup = null;
4216	5434	if (group.selection.size() > 0) // 1)
4217	5435	{
4218	5436	tGroup = new cGroup();
4219		- GrafreeD.clipboardIsTempGroup = true;
	5437	+ Grafreed.clipboardIsTempGroup = true;
4220	5438	}
4221	5439
4222	5440	if (cut)
4223	5441	{
	5442	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5443	+// Save();
4224	5444	//int indices[] = jList.getSelectedIndices();
4225	5445	//for (int i = indices.length - 1; i >= 0; i--)
4226	5446	//jList.remove(indices[i]);
..	..	@@ -4256,16 +5476,16 @@
4256	5476	//System.out.println("cut " + child);
4257	5477	//System.out.println("parent = " + child.parent);
4258	5478	// tmp.addChild(child);
4259		- if (GrafreeD.clipboardIsTempGroup)
	5479	+ if (Grafreed.clipboardIsTempGroup)
4260	5480	tGroup.add/Child/(tmp);
4261	5481	else
4262		- GrafreeD.clipboard = tmp;
	5482	+ Grafreed.clipboard = tmp;
4263	5483	}
4264	5484	else
4265		- if (GrafreeD.clipboardIsTempGroup)
	5485	+ if (Grafreed.clipboardIsTempGroup)
4266	5486	tGroup.add/Child/(child);
4267	5487	else
4268		- GrafreeD.clipboard = child;
	5488	+ Grafreed.clipboard = child;
4269	5489	}
4270	5490
4271	5491	//ResetModel();
..	..	@@ -4297,21 +5517,23 @@
4297	5517	//System.out.println("cut " + elem);
4298	5518	//System.out.println("parent = " + elem.parent);
4299	5519	// tmp.addChild(elem);
4300		- if (GrafreeD.clipboardIsTempGroup)
	5520	+ if (Grafreed.clipboardIsTempGroup)
4301	5521	tGroup.add/Child/(tmp);
4302	5522	else
4303		- GrafreeD.clipboard = tmp;
	5523	+ Grafreed.clipboard = tmp;
4304	5524	}
4305	5525	else
4306		- if (GrafreeD.clipboardIsTempGroup)
	5526	+ if (Grafreed.clipboardIsTempGroup)
4307	5527	tGroup.add/Child/(child);
4308	5528	else
4309		- GrafreeD.clipboard = child;
	5529	+ Grafreed.clipboard = child;
4310	5530	}
4311	5531
4312	5532	}
4313		- if (GrafreeD.clipboardIsTempGroup)
4314		- GrafreeD.clipboard = tGroup;
	5533	+
	5534	+ if (Grafreed.clipboardIsTempGroup)
	5535	+ Grafreed.clipboard = tGroup;
	5536	+
4315	5537	if (cut)
4316	5538	{
4317	5539	ResetModel();
..	..	@@ -4321,11 +5543,15 @@
4321	5543
4322	5544	void paste(boolean expand)
4323	5545	{
	5546	+ if (Globals.REPLACEONMAKE)
	5547	+ Save();
	5548	+ boolean keep = Globals.REPLACEONMAKE;
	5549	+ Globals.REPLACEONMAKE = false;
4324	5550	// if (GrafreeD.clipboard == null)
4325	5551	// return;
4326	5552	boolean first = true;
4327	5553
4328		- if (GrafreeD.clipboardIsTempGroup)
	5554	+ if (Grafreed.clipboardIsTempGroup)
4329	5555	{
4330	5556	Composite temp;
4331	5557
..	..	@@ -4336,7 +5562,7 @@
4336	5562	temp = (Composite)Applet3D.clipboard.deepCopy();
4337	5563	*/
4338	5564	Object3D elem;
4339		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5565	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4340	5566	{
4341	5567	Object3D child = (Object3D)e.nextElement();
4342	5568
..	..	@@ -4370,21 +5596,22 @@
4370	5596	//Object3D cb = Applet3D.clipboard;
4371	5597	//temp.addChild(cb);
4372	5598	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4373		- assert(GrafreeD.clipboard.parent == null);
4374		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4375		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4376		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4377		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	5599	+ assert(Grafreed.clipboard.parent == null);
	5600	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5601	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5602	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5603	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4378	5604	else
4379		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4380		- GrafreeD.clipboard.get(0).parent = keepparent;
	5605	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5606	+ Grafreed.clipboard.get(0).parent = keepparent;
4381	5607	}
4382	5608
	5609	+ Globals.REPLACEONMAKE = keep;
4383	5610	ResetModel();
4384	5611	refreshContents();
4385	5612	}
4386	5613
4387		- void pasteInto(boolean copyit)
	5614	+ void pasteInto(boolean copyit, boolean clone)
4388	5615	{
4389	5616	// if (GrafreeD.clipboard == null)
4390	5617	// return;
..	..	@@ -4413,15 +5640,22 @@
4413	5640	if (copyit)
4414	5641	{
4415	5642	// paste(false);
4416		- CloneClipboard(false); // sept 2014
	5643	+ if (clone)
	5644	+ {
	5645	+ CloneClipboard(false); // sept 2014
	5646	+ }
	5647	+ else
	5648	+ {
	5649	+ paste(false);
	5650	+ }
4417	5651	}
4418	5652	else
4419	5653	{
4420	5654	boolean first = true;
4421	5655
4422		- if (GrafreeD.clipboardIsTempGroup)
	5656	+ if (Grafreed.clipboardIsTempGroup)
4423	5657	{
4424		- Composite temp = (Composite)GrafreeD.clipboard;
	5658	+ Composite temp = (Composite)Grafreed.clipboard;
4425	5659	Object3D copy;
4426	5660	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4427	5661	{
..	..	@@ -4431,7 +5665,7 @@
4431	5665	}
4432	5666	} else
4433	5667	{
4434		- linkSomething(GrafreeD.clipboard); //.get(0));
	5668	+ linkSomething(Grafreed.clipboard); //.get(0));
4435	5669	}
4436	5670	}
4437	5671	}
..	..	@@ -4508,6 +5742,10 @@
4508	5742
4509	5743	void group(Object3D csg, boolean grab)
4510	5744	{
	5745	+ if (Globals.REPLACEONMAKE)
	5746	+ Save();
	5747	+ boolean keep = Globals.REPLACEONMAKE;
	5748	+ Globals.REPLACEONMAKE = false;
4511	5749	if (//false) // why??
4512	5750	!group.selection.isEmpty())
4513	5751	{
..	..	@@ -4621,10 +5859,15 @@
4621	5859	//node.add(csg);
4622	5860	//makeSomething(node);
4623	5861	makeSomething(csg);
	5862	+ Globals.REPLACEONMAKE = keep;
4624	5863	}
4625	5864
4626	5865	void Ungroup(Object3D g)
4627	5866	{
	5867	+ if (Globals.REPLACEONMAKE)
	5868	+ Save();
	5869	+ boolean keep = Globals.REPLACEONMAKE;
	5870	+ Globals.REPLACEONMAKE = false;
4628	5871	if (g instanceof HiddenObject)
4629	5872	{
4630	5873	HiddenObject h = (HiddenObject) g;
..	..	@@ -4641,6 +5884,7 @@
4641	5884	objEditor.makeSomething(g.get(i), false);
4642	5885	}
4643	5886	}
	5887	+ Globals.REPLACEONMAKE = keep;
4644	5888	}
4645	5889
4646	5890	void ungroup()
..	..	@@ -4836,21 +6080,6 @@
4836	6080	}
4837	6081	*/
4838	6082
4839		- void ImportGFD()
4840		- {
4841		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4842		- browser.show();
4843		- String filename = browser.getFile();
4844		- if (filename != null && filename.length() > 0)
4845		- {
4846		- String fullname = browser.getDirectory() + filename;
4847		-
4848		- //Object3D readobj =
4849		- objEditor.ReadGFD(fullname, objEditor);
4850		- //makeSomething(readobj);
4851		- }
4852		- }
4853		-
4854	6083	/*
4855	6084	public void Callback(Object obj)
4856	6085	{
..	..	@@ -4874,26 +6103,9 @@
4874	6103	}
4875	6104	*/
4876	6105
4877		- void ImportVRMLX3D()
4878		- {
4879		- if (GrafreeD.standAlone)
4880		- {
4881		- /**/
4882		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4883		- browser.show();
4884		- String filename = browser.getFile();
4885		- if (filename != null && filename.length() > 0)
4886		- {
4887		- String fullname = browser.getDirectory() + filename;
4888		- LoadVRMLX3D(fullname);
4889		- }
4890		- /**/
4891		- }
4892		- }
4893		-
4894	6106	String GetFile(String dialogName)
4895	6107	{
4896		- if (GrafreeD.standAlone)
	6108	+ if (Grafreed.standAlone)
4897	6109	{
4898	6110	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4899	6111	browser.show();
..	..	@@ -4957,10 +6169,48 @@
4957	6169	cButton flashSelectionButton;
4958	6170	cButton editButton;
4959	6171	cButton uneditButton;
	6172	+ JCheckBox allParamsButton;
4960	6173	cButton clearpanelButton;
4961		- cButton allParamsButton;
4962	6174	cButton unselectButton;
4963	6175
	6176	+ cButton restoreCameraButton;
	6177	+
	6178	+ cButton oneStepButton;
	6179	+
	6180	+ cButton groupButton;
	6181	+ cButton ungroupButton;
	6182	+ cButton compositeButton;
	6183	+ cButton switchButton;
	6184	+ cButton loopButton;
	6185	+ cButton textureButton;
	6186	+
	6187	+ cButton skybox1Button;
	6188	+ cButton skybox2Button;
	6189	+ cButton skybox3Button;
	6190	+ cButton skybox4Button;
	6191	+ cButton skybox5Button;
	6192	+ cButton skybox6Button;
	6193	+ cButton skybox7Button;
	6194	+
	6195	+ cButton skybox11Button;
	6196	+ cButton skybox12Button;
	6197	+ cButton skybox13Button;
	6198	+ cButton skybox14Button;
	6199	+ cButton skybox15Button;
	6200	+ cButton skybox16Button;
	6201	+ cButton skybox17Button;
	6202	+
	6203	+ cButton gridButton;
	6204	+ cButton boxButton;
	6205	+ cButton sphereButton;
	6206	+ cButton coneButton;
	6207	+ cButton torusButton;
	6208	+ cButton superButton;
	6209	+ cButton kleinButton;
	6210	+ cButton particlesButton;
	6211	+ cButton overlayButton;
	6212	+ cButton lightButton;
	6213	+
4964	6214	cButton screenfitButton;
4965	6215	cButton screenfitpointButton;
4966	6216	cButton snapobjectButton;
..	..	@@ -4972,14 +6222,6 @@
4972	6222
4973	6223	cButton setsupportButton;
4974	6224
4975		- cButton twoButton;
4976		- cButton sixButton;
4977		- cButton threeButton;
4978		- cButton sevenButton;
4979		- cButton fourButton; // full panel
4980		- cButton oneButton; // full XYZ
4981		- //cButton currentLayout;
4982		-
4983	6225	//
4984	6226	//Composite
4985	6227	Object3D // to do !!
..	..	@@ -4989,9 +6231,11 @@
4989	6231	//JTree jTree;
4990	6232	private MenuItem lookAtItem;
4991	6233	private MenuItem lookFromItem;
4992		- private MenuItem switchItem;
	6234	+ private MenuItem switchViewItem;
4993	6235	private MenuItem cutItem;
4994		- private MenuItem duplicateItem;
	6236	+ private MenuItem undoItem;
	6237	+ private MenuItem redoItem;
	6238	+ private JMenuItem duplicateItem;
4995	6239	private MenuItem cloneItem;
4996	6240	private MenuItem cloneSupportItem;
4997	6241	private MenuItem overwriteGeoItem;
..	..	@@ -5004,7 +6248,7 @@
5004	6248	private MenuItem linkverticesItem;
5005	6249	private MenuItem relinkverticesItem;
5006	6250	private MenuItem setMasterItem;
5007		- private MenuItem resetMeshItem;
	6251	+ private MenuItem resetAllItem;
5008	6252	private MenuItem stepAllItem;
5009	6253	private MenuItem revertMeshItem;
5010	6254	private MenuItem poseMeshItem;
..	..	@@ -5015,10 +6259,11 @@
5015	6259	private MenuItem mergeGeometriesItem;
5016	6260	private MenuItem copyItem;
5017	6261	private MenuItem pasteItem;
	6262	+ private MenuItem pasteIntoItem;
5018	6263	private MenuItem pasteLinkItem;
5019	6264	private MenuItem pasteCloneItem;
5020	6265	private MenuItem pasteExpandItem;
5021		- private MenuItem clearItem;
	6266	+ private MenuItem deleteItem;
5022	6267	private MenuItem clearAllItem;
5023	6268	private MenuItem genUVItem;
5024	6269	private MenuItem genNormalsMESHItem;
..	..	@@ -5053,6 +6298,10 @@
5053	6298	private MenuItem showleavesItem;
5054	6299	private MenuItem markleavesItem;
5055	6300	private MenuItem unmarkleavesItem;
	6301	+ private MenuItem rewindleavesItem;
	6302	+ private MenuItem unrewindleavesItem;
	6303	+ private MenuItem randomleavesItem;
	6304	+ private MenuItem unrandomleavesItem;
5056	6305
5057	6306	private MenuItem flipVItem;
5058	6307	private MenuItem unflipVItem;
..	..	@@ -5064,15 +6313,17 @@
5064	6313	private MenuItem panoTexturesItem;
5065	6314
5066	6315	private MenuItem resetCentroidItem;
5067		- private MenuItem transformgeometryItem;
	6316	+ private MenuItem resetCentroidXZItem;
5068	6317	private MenuItem resetTransformItem;
	6318	+ private MenuItem transformGeometryItem;
	6319	+ private MenuItem transformChildrenItem;
5069	6320	private MenuItem hideItem;
5070	6321	private MenuItem grabItem;
5071	6322	private MenuItem backItem;
5072	6323	private MenuItem frontItem;
5073	6324	private MenuItem cameraItem;
5074	6325	private MenuItem compositeItem;
5075		- private MenuItem randomItem;
	6326	+ private MenuItem switchItem;
5076	6327	private MenuItem physicsItem;
5077	6328	private MenuItem frameselectorItem;
5078	6329	private MenuItem scriptNodeItem;
..	..	@@ -5096,6 +6347,8 @@
5096	6347	private MenuItem attachBumpItem;
5097	6348	private MenuItem detachBumpItem;
5098	6349	private MenuItem pigmentBumpItem;
	6350	+ private MenuItem embedTexturesItem;
	6351	+ private MenuItem deEmbedTexturesItem;
5099	6352
5100	6353	private MenuItem particleItem;
5101	6354	private MenuItem ragdollItem;
..	..	@@ -5112,7 +6365,7 @@
5112	6365	private MenuItem blobItem;
5113	6366	private MenuItem latheItem;
5114	6367	private MenuItem bezierItem;
5115		- private MenuItem checkerItem;
	6368	+ private MenuItem overlayItem;
5116	6369	private MenuItem meshItem;
5117	6370	// private MenuItem meshGroupItem;
5118	6371	private MenuItem springItem;
..	..	@@ -5134,11 +6387,6 @@
5134	6387	private MenuItem doubleItem;
5135	6388	private MenuItem tripleItem;
5136	6389
5137		- private MenuItem importGFDItem;
5138		- private MenuItem importVRMLX3DItem;
5139		- private MenuItem import3DSItem;
5140		- private MenuItem importOBJItem;
5141		-
5142	6390	private MenuItem computeAOItem;
5143	6391	private MenuItem recompileItem;
5144	6392	private MenuItem editScriptItem;
..	..	@@ -5148,4 +6396,8 @@
5148	6396	private MenuItem analyzeItem;
5149	6397	private MenuItem dumpItem;
5150	6398	//boolean freezemodel = false;
	6399	+
	6400	+ Menu cameraMenu;
	6401	+ MenuItem editCameraItem;
	6402	+ MenuItem restoreCameraItem;
5151	6403	}