~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -23,6 +23,302 @@
23	23	DragGestureListener, DragSourceListener, DropTargetListener,
24	24	ItemListener // ListSelectionListener
25	25	{
	26	+
	27	+ public void AddSkyboxButton(String f, String s, cGridBag row)
	28	+ {
	29	+ cButton skyboxButton;
	30	+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
	31	+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
	32	+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
	33	+ skyboxButton.setToolTipText(s);
	34	+ skyboxButton.addActionListener(new ActionListener()
	35	+ {
	36	+ @Override
	37	+ public void actionPerformed(ActionEvent e)
	38	+ {
	39	+ ChangeSkybox(path);
	40	+ }
	41	+ });
	42	+ }
	43	+
	44	+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
	45	+ {
	46	+ cGridBag tab0 = new cGridBag().setVertical(true);
	47	+
	48	+ tab0.setName("Urban");
	49	+ skyboxpanel.add(tab0);
	50	+
	51	+ cGridBag row0 = new cGridBag();
	52	+ cGridBag row1 = new cGridBag();
	53	+ cGridBag row2 = new cGridBag();
	54	+ cGridBag row3 = new cGridBag();
	55	+ cGridBag row4 = new cGridBag();
	56	+ cGridBag row5 = new cGridBag();
	57	+ cGridBag row6 = new cGridBag();
	58	+
	59	+ AddSkyboxButton("default", "rgb", row0);
	60	+ //AddSkyboxButton("default", "cornell", row0);
	61	+ AddSkyboxButton("penguins", "dust", row0);
	62	+ AddSkyboxButton("penguins", "tropic", row0);
	63	+ AddSkyboxButton("penguins", "yonder", row0);
	64	+
	65	+ AddSkyboxButton("default", "uffizi", row1);
	66	+ AddSkyboxButton("bridge", "Bridge", row1);
	67	+ AddSkyboxButton("bridge", "Bridge2", row1);
	68	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	69	+
	70	+ AddSkyboxButton("urban", "Parliament", row2);
	71	+ AddSkyboxButton("urban", "Roundabout", row2);
	72	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	73	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	74	+
	75	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	76	+ AddSkyboxButton("urban", "UnionSquare", row3);
	77	+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
	78	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	79	+
	80	+ AddSkyboxButton("park", "Buddha", row4);
	81	+ AddSkyboxButton("park", "CNTower2", row4);
	82	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	83	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	84	+
	85	+ AddSkyboxButton("park", "Park", row5);
	86	+ AddSkyboxButton("park", "Pond", row5);
	87	+ AddSkyboxButton("park", "Skansen", row5);
	88	+ AddSkyboxButton("park", "Skansen2", row5);
	89	+
	90	+ AddSkyboxButton("park", "Skansen3", row6);
	91	+ AddSkyboxButton("park", "Skansen4", row6);
	92	+ AddSkyboxButton("park", "Skansen5", row6);
	93	+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
	94	+
	95	+ tab0.add(row0);
	96	+ tab0.add(row1);
	97	+ tab0.add(row2);
	98	+ tab0.add(row3);
	99	+ tab0.add(row4);
	100	+ tab0.add(row5);
	101	+ tab0.add(row6);
	102	+
	103	+ for (int i=5; --i>=0;)
	104	+ {
	105	+ //oe.toolboxPanel.Return();
	106	+ //tab0.add(new cGridBag());
	107	+ }
	108	+ }
	109	+
	110	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	111	+ {
	112	+ cGridBag tab0 = new cGridBag().setVertical(true);
	113	+
	114	+ tab0.setName("Nature");
	115	+ skyboxpanel.add(tab0);
	116	+
	117	+ cGridBag row0 = new cGridBag();
	118	+ cGridBag row1 = new cGridBag();
	119	+ cGridBag row2 = new cGridBag();
	120	+ cGridBag row3 = new cGridBag();
	121	+ cGridBag row4 = new cGridBag();
	122	+ cGridBag row5 = new cGridBag();
	123	+ cGridBag row6 = new cGridBag();
	124	+
	125	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	126	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	127	+ AddSkyboxButton("beach", "PalmTrees", row0);
	128	+ AddSkyboxButton("beach", "Tenerife", row0);
	129	+
	130	+ AddSkyboxButton("beach", "Tenerife2", row1);
	131	+ AddSkyboxButton("beach", "Tenerife3", row1);
	132	+ AddSkyboxButton("field", "FishPond", row1);
	133	+ AddSkyboxButton("field", "Footballfield", row1);
	134	+
	135	+ AddSkyboxButton("field", "Meadow", row2);
	136	+ AddSkyboxButton("field", "Sorsele", row2);
	137	+ AddSkyboxButton("field", "Sorsele2", row2);
	138	+ AddSkyboxButton("field", "Sorsele3", row2);
	139	+
	140	+ AddSkyboxButton("forest", "Brudslojan", row3);
	141	+ AddSkyboxButton("forest", "Langholmen2", row3);
	142	+ AddSkyboxButton("forest", "Plants", row3);
	143	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	144	+
	145	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	146	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	147	+ AddSkyboxButton("mountain", "Teide", row4);
	148	+ AddSkyboxButton("park", "Tantolunden4", row4);
	149	+
	150	+ AddSkyboxButton("park", "Stairs", row5);
	151	+ AddSkyboxButton("default", "skycube", row6);
	152	+ AddSkyboxButton("rocky", "Langholmen", row5);
	153	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	154	+
	155	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	156	+ AddSkyboxButton("default", "CloudyHills", row6);
	157	+ AddSkyboxButton("daz", "Autumn", row6);
	158	+ AddSkyboxButton("daz", "MountainTrail", row6);
	159	+ /*
	160	+Autumn
	161	+Greenlands
	162	+MountainTrail
	163	+Oasis
	164	+TheRock
	165	+TopOfTheWorld
	166	+Winter
	167	+ */
	168	+
	169	+ tab0.add(row0);
	170	+ tab0.add(row1);
	171	+ tab0.add(row2);
	172	+ tab0.add(row3);
	173	+ tab0.add(row4);
	174	+ tab0.add(row5);
	175	+ tab0.add(row6);
	176	+
	177	+ for (int i=5; --i>=0;)
	178	+ {
	179	+ //oe.toolboxPanel.Return();
	180	+ //tab0.add(new cGridBag());
	181	+ }
	182	+ }
	183	+
	184	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	185	+ {
	186	+ cGridBag tab0 = new cGridBag().setVertical(true);
	187	+
	188	+ tab0.setName("Night");
	189	+ skyboxpanel.add(tab0);
	190	+
	191	+ cGridBag row0 = new cGridBag();
	192	+ cGridBag row1 = new cGridBag();
	193	+ cGridBag row2 = new cGridBag();
	194	+ cGridBag row3 = new cGridBag();
	195	+ cGridBag row4 = new cGridBag();
	196	+ cGridBag row5 = new cGridBag();
	197	+ cGridBag row6 = new cGridBag();
	198	+
	199	+ AddSkyboxButton("night", "NightPath", row0);
	200	+ AddSkyboxButton("night", "PondNight", row0);
	201	+ AddSkyboxButton("night", "Powerlines", row0);
	202	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	203	+
	204	+ AddSkyboxButton("urban", "CNTower", row1);
	205	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	206	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	207	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
	208	+
	209	+ AddSkyboxButton("penguins", "kenon_star", row2);
	210	+ AddSkyboxButton("persson", "corona", row2);
	211	+ AddSkyboxButton("persson", "spaceskybox", row2);
	212	+ AddSkyboxButton("indoors", "Vasa", row2);
	213	+
	214	+ AddSkyboxButton("winter", "Backyard", row3);
	215	+ AddSkyboxButton("winter", "Creek", row3);
	216	+ AddSkyboxButton("winter", "FootballField3", row3);
	217	+ AddSkyboxButton("winter", "Forest", row3);
	218	+
	219	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	220	+ AddSkyboxButton("winter", "House", row4);
	221	+ AddSkyboxButton("winter", "IceLake", row4);
	222	+ AddSkyboxButton("winter", "IceRiver", row4);
	223	+
	224	+ AddSkyboxButton("winter", "Park3", row5);
	225	+ AddSkyboxButton("winter", "PondWinter", row5);
	226	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	227	+ AddSkyboxButton("winter", "Vindelalven", row5);
	228	+
	229	+ AddSkyboxButton("daz", "TheRock", row6);
	230	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	231	+ AddSkyboxButton("daz", "Winter", row6);
	232	+ AddSkyboxButton("mountain", "Ryfjallet", row6);
	233	+
	234	+ tab0.add(row0);
	235	+ tab0.add(row1);
	236	+ tab0.add(row2);
	237	+ tab0.add(row3);
	238	+ tab0.add(row4);
	239	+ tab0.add(row5);
	240	+ tab0.add(row6);
	241	+
	242	+ for (int i=5; --i>=0;)
	243	+ {
	244	+ //oe.toolboxPanel.Return();
	245	+ //tab0.add(new cGridBag());
	246	+ }
	247	+ }
	248	+
	249	+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
	250	+ {
	251	+ cGridBag tab0 = new cGridBag().setVertical(true);
	252	+
	253	+ tab0.setName("Others");
	254	+ skyboxpanel.add(tab0);
	255	+
	256	+ cGridBag row0 = new cGridBag();
	257	+ cGridBag row1 = new cGridBag();
	258	+ cGridBag row2 = new cGridBag();
	259	+ cGridBag row3 = new cGridBag();
	260	+ cGridBag row4 = new cGridBag();
	261	+ cGridBag row5 = new cGridBag();
	262	+ cGridBag row6 = new cGridBag();
	263	+
	264	+ AddSkyboxButton("mayhem", "afterrain", row0);
	265	+ AddSkyboxButton("mayhem", "aqua4", row0);
	266	+ AddSkyboxButton("mayhem", "aqua9", row0);
	267	+ AddSkyboxButton("mayhem", "flame", row0);
	268	+
	269	+ AddSkyboxButton("mayhem", "h2s", row1);
	270	+ AddSkyboxButton("mayhem", "prehistoric", row1);
	271	+ AddSkyboxButton("mayhem", "scorched", row1);
	272	+ AddSkyboxButton("penguins", "desertdawn", row1);
	273	+
	274	+ AddSkyboxButton("persson", "Citadella", row2);
	275	+ AddSkyboxButton("persson", "Citadella2", row2);
	276	+ AddSkyboxButton("persson", "clouds1", row2);
	277	+ AddSkyboxButton("penguins", "wrath", row2);
	278	+
	279	+ AddSkyboxButton("persson", "FishermansBastion", row3);
	280	+ AddSkyboxButton("persson", "HeroesSquare", row3);
	281	+ AddSkyboxButton("indoors", "DallasW", row3);
	282	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
	283	+
	284	+ AddSkyboxButton("persson", "LancellottiChapel", row4);
	285	+ AddSkyboxButton("persson", "PereaBeach1", row4);
	286	+ AddSkyboxButton("persson", "PereaBeach2", row4);
	287	+ AddSkyboxButton("persson", "redeclipse", row4);
	288	+
	289	+ AddSkyboxButton("daz", "Greenlands", row5);
	290	+ AddSkyboxButton("daz", "Oasis", row5);
	291	+ AddSkyboxButton("elyvisions", "arch3", row5);
	292	+ AddSkyboxButton("elyvisions", "calm_sea", row5);
	293	+
	294	+ AddSkyboxButton("elyvisions", "rainbow", row6);
	295	+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
	296	+ AddSkyboxButton("elyvisions", "heaven", row6);
	297	+ AddSkyboxButton("elyvisions", "hot", row6);
	298	+
	299	+ tab0.add(row0);
	300	+ tab0.add(row1);
	301	+ tab0.add(row2);
	302	+ tab0.add(row3);
	303	+ tab0.add(row4);
	304	+ tab0.add(row5);
	305	+ tab0.add(row6);
	306	+
	307	+ for (int i=5; --i>=0;)
	308	+ {
	309	+ //oe.toolboxPanel.Return();
	310	+ //tab0.add(new cGridBag());
	311	+ }
	312	+ }
	313	+
	314	+ public void ChangeSkybox(String name)
	315	+ {
	316	+ //cameraView.envyoff = false;
	317	+ group.skyboxname = name;
	318	+ group.skyboxext = "jpg";
	319	+ cameraView.repaint();
	320	+ }
	321	+
26	322	//ObjEditor objEditor;
27	323	public void closeUI2()
28	324	{
..	..	@@ -60,6 +356,12 @@
60	356	this.copy = this.group = group;
61	357	//selectees = this.group.selectees;
62	358
	359	+ if (copy.versions == null)
	360	+ {
	361	+ copy.versions = new byte[100][];
	362	+ copy.versionindex = -1;
	363	+ }
	364	+
63	365	if(ui)
64	366	SetupUI(objEditor);
65	367	}
..	..	@@ -74,16 +376,28 @@
74	376	this.copy = this.group = copy;
75	377	//selectees = this.group.selectees;
76	378
77		- SetupMenu2(objEditor);
	379	+ SetupMenu2(this); //objEditor);
78	380	SetupUI2(objEditor);
79	381	objEditor.SetupUI(true);
80	382	SetupViews(objEditor);
81	383
82	384	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	385	+
	386	+ if (copy.versions == null)
	387	+ {
	388	+ copy.versions = new byte[100][];
	389	+ copy.versionindex = -1;
	390	+
	391	+ Save(true);
	392	+ }
83	393	}
84	394
85	395	void CloneSelection(boolean supports)
86	396	{
	397	+ if (Globals.REPLACEONMAKE)
	398	+ Save();
	399	+ boolean keep = Globals.REPLACEONMAKE;
	400	+ Globals.REPLACEONMAKE = false;
87	401	// Object3D keep = GrafreeD.clipboard;
88	402	//Object3D obj;
89	403	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,18 +408,19 @@
94	408
95	409	makeSomething(clone, i==group.selection.size()-1);
96	410	}
	411	+ Globals.REPLACEONMAKE = keep;
97	412	}
98	413
99	414	void CloneClipboard(boolean supports)
100	415	{
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));
	416	+ assert(Grafreed.clipboard.parent == null);
	417	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	418	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	419	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	420	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
106	421	else
107		- makeSomething(CloneObject(GrafreeD.clipboard, false));
108		- GrafreeD.clipboard.get(0).parent = keepparent;
	422	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	423	+ Grafreed.clipboard.get(0).parent = keepparent;
109	424	}
110	425
111	426	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -119,7 +434,7 @@
119	434	// obj.support = null;
120	435	if (!supports)
121	436	obj.SaveSupports();
122		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	437	+ Object3D clone = (Object3D)Grafreed.clone(obj);
123	438	obj.parent = parent;
124	439	// obj.support = support;
125	440	// clone.support = support; // aout 2013
..	..	@@ -148,30 +463,29 @@
148	463
149	464	//JTextField nameField;
150	465
151		- void SetupMenu2(ObjEditor oe)
	466	+ void SetupMenu2(GroupEditor oe)
152	467	{
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);
	468	+ oe.jTree = new cTree();
	469	+
164	470	Menu menu;
165	471	oe.menuBar.add(menu = new Menu("Edit"));
166	472	//editItem = menu.add(new MenuItem("Edit"));
167	473	//editItem.addActionListener(this);
168		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	474	+
	475	+// undoItem = menu.add(new MenuItem("Undo"));
	476	+// undoItem.addActionListener(this);
	477	+// redoItem = menu.add(new MenuItem("Redo"));
	478	+// redoItem.addActionListener(this);
	479	+// menu.add("-");
	480	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
169	481	duplicateItem.addActionListener(this);
170		- menu.add("-");
171	482	cloneItem = menu.add(new MenuItem("Clone"));
172	483	cloneItem.addActionListener(this);
	484	+ if (Globals.ADVANCED)
	485	+ {
173	486	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
174	487	cloneSupportItem.addActionListener(this);
	488	+ }
175	489	menu.add("-");
176	490	cutItem = menu.add(new MenuItem("Cut"));
177	491	cutItem.addActionListener(this);
..	..	@@ -179,27 +493,123 @@
179	493	copyItem.addActionListener(this);
180	494	pasteItem = menu.add(new MenuItem("Paste"));
181	495	pasteItem.addActionListener(this);
	496	+
	497	+ menu.add("-");
	498	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	499	+ pasteIntoItem.addActionListener(this);
182	500	pasteLinkItem = menu.add(new MenuItem("Paste link"));
183	501	pasteLinkItem.addActionListener(this);
184	502	pasteCloneItem = menu.add(new MenuItem("Paste clone"));
185	503	pasteCloneItem.addActionListener(this);
186	504	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
187	505	// pasteExpandItem.addActionListener(this);
188		- clearItem = menu.add(new MenuItem("Clear"));
189		- clearItem.addActionListener(this);
	506	+ menu.add("-");
	507	+ deleteItem = menu.add(new MenuItem("Delete"));
	508	+ deleteItem.addActionListener(this);
	509	+
	510	+ if (Globals.ADVANCED)
	511	+ {
	512	+ // Deletes the cameras...
190	513	clearAllItem = menu.add(new MenuItem("Clear All"));
191	514	clearAllItem.addActionListener(this);
	515	+ }
	516	+
	517	+ menuBar.add(cameraMenu = new Menu("View"));
	518	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	519	+ //zBufferItem.addActionListener(this);
	520	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	521	+ //normalLensItem.addActionListener(this);
	522	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	523	+ restoreCameraItem.addActionListener(this);
	524	+
	525	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	526	+// toggleFullScreenItem.addItemListener(this);
	527	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	528	+// cameraMenu.add("-");
	529	+//
	530	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	531	+// toggleTextureItem.addItemListener(this);
	532	+// toggleTextureItem.setState(CameraPane.textureon);
	533	+//
	534	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	535	+// toggleSwitchItem.addItemListener(this);
	536	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	537	+
	538	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	539	+ toggleHandleItem.addItemListener(this);
	540	+ toggleHandleItem.setState(CameraPane.HANDLES);
	541	+
	542	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	543	+ togglePaintItem.addItemListener(this);
	544	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	545	+
	546	+ if (Globals.ADVANCED)
	547	+ {
	548	+ cameraMenu.add("-");
	549	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	550	+ toggleLiveItem.addItemListener(this);
	551	+ toggleLiveItem.setState(Globals.isLIVE());
192	552
	553	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	554	+ stepItem.addActionListener(this);
	555	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	556	+ // toggleDLItem.addItemListener(this);
	557	+ // toggleDLItem.setState(false);
	558	+
	559	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	560	+ toggleRenderItem.addItemListener(this);
	561	+ toggleRenderItem.setState(!CameraPane.frozen);
	562	+
	563	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	564	+ toggleDebugItem.addItemListener(this);
	565	+ toggleDebugItem.setState(Globals.DEBUG);
	566	+
	567	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	568	+ toggleFrustumItem.addItemListener(this);
	569	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	570	+
	571	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	572	+ toggleFootContactItem.addItemListener(this);
	573	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	574	+
	575	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	576	+ toggleTimelineItem.addItemListener(this);
	577	+ }
	578	+
	579	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	580	+// toggleRootItem.addItemListener(this);
	581	+// toggleRootItem.setState(false);
	582	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	583	+// animationItem.addItemListener(this);
	584	+// animationItem.setState(CameraPane.ANIMATION);
	585	+ cameraMenu.add("-");
	586	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	587	+ editCameraItem.addActionListener(this);
	588	+
	589	+ if (Globals.ADVANCED)
	590	+ {
	591	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	592	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	593	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	594	+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	595	+ oe.cameraMenu.add("-");
	596	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	597	+ openWindowItem.addActionListener(this);
	598	+ editLeafItem.addActionListener(this);
	599	+ lookAtItem.addActionListener(this);
	600	+ //lookFromItem.addActinoListener(this);
	601	+ //switchViewItem.addActionListener(this);
	602	+ }
	603	+
193	604	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);
	605	+ if (Globals.ADVANCED)
	606	+ {
198	607	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
199	608	revertMeshItem.addActionListener(this);
200	609	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
201	610	resetreferencesItem.addActionListener(this);
202	611	menu.add("-");
	612	+ }
203	613	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
204	614	overwriteGeoItem.addActionListener(this);
205	615	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -211,79 +621,104 @@
211	621	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
212	622	overwriteUVItem.addActionListener(this);
213	623	menu.add("-");
	624	+ if (Globals.ADVANCED)
	625	+ {
214	626	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
215	627	generateMeshItem.addActionListener(this);
216	628	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
217	629	poseMeshItem.addActionListener(this);
218	630	menu.add("-");
	631	+ }
219	632	resetsupportItem = menu.add(new MenuItem("Reset support"));
220	633	resetsupportItem.addActionListener(this);
221	634	linkverticesItem = menu.add(new MenuItem("Link to Support"));
222	635	linkverticesItem.addActionListener(this);
223	636	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
224	637	relinkverticesItem.addActionListener(this);
	638	+
	639	+ if (Globals.ADVANCED)
	640	+ {
225	641	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
226	642	setMasterItem.addActionListener(this);
	643	+ }
227	644
228	645	oe.menuBar.add(menu = new Menu("Group"));
229		- grabItem = menu.add(new MenuItem("Grab"));
230		- grabItem.addActionListener(this);
	646	+// grabItem = menu.add(new MenuItem("Grab"));
	647	+// grabItem.addActionListener(this);
231	648	backItem = menu.add(new MenuItem("Back"));
232	649	backItem.addActionListener(this);
233	650	frontItem = menu.add(new MenuItem("Front"));
234	651	frontItem.addActionListener(this);
235		- compositeItem = menu.add(new MenuItem("Composite"));
236		- compositeItem.addActionListener(this);
237		- hideItem = menu.add(new MenuItem("Hide"));
	652	+// compositeItem = menu.add(new MenuItem("Composite"));
	653	+// compositeItem.addActionListener(this);
	654	+
	655	+ if (Globals.ADVANCED)
	656	+ {
	657	+ hideItem = menu.add(new MenuItem("Hidden Group"));
238	658	hideItem.addActionListener(this);
	659	+ }
239	660	ungroupItem = menu.add(new MenuItem("Ungroup"));
240	661	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);
	662	+
	663	+// menu.add("-");
	664	+//
	665	+// switchItem = menu.add(new MenuItem("Switch node"));
	666	+// switchItem.addActionListener(this);
	667	+ if (Globals.ADVANCED)
	668	+ {
248	669	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
249	670	switchGeoItem.addActionListener(this);
250	671	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
251	672	switchTransfoItem.addActionListener(this);
252		- morphItem = menu.add(new MenuItem("Morph"));
	673	+ morphItem = menu.add(new MenuItem("Morph Group"));
253	674	morphItem.addActionListener(this);
	675	+
	676	+ menu.add("-");
	677	+ physicsItem = menu.add(new MenuItem("Physics"));
	678	+ physicsItem.addActionListener(this);
	679	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	680	+ frameselectorItem.addActionListener(this);
254	681	scriptNodeItem = menu.add(new MenuItem("Script Node"));
255	682	scriptNodeItem.addActionListener(this);
256		- cameraItem = menu.add(new MenuItem("Camera"));
257		- cameraItem.addActionListener(this);
	683	+ }
258	684
259	685	oe.menuBar.add(menu = new Menu("Object"));
260		- textureItem = menu.add(new MenuItem("Texture"));
261		- textureItem.addActionListener(this);
	686	+// textureItem = menu.add(new MenuItem("Texture"));
	687	+// textureItem.addActionListener(this);
262	688	billboardItem = menu.add(new MenuItem("Billboard"));
263	689	billboardItem.addActionListener(this);
264	690	csgItem = menu.add(new MenuItem("CSG"));
265	691	csgItem.addActionListener(this);
266		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	692	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
267	693	shadowXItem.addActionListener(this);
268		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	694	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
269	695	shadowYItem.addActionListener(this);
270		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	696	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
271	697	shadowZItem.addActionListener(this);
	698	+ attributeItem = menu.add(new MenuItem("Attribute"));
	699	+ attributeItem.addActionListener(this);
	700	+
	701	+ if (Globals.ADVANCED)
	702	+ {
	703	+ menu.add("-");
272	704	linkerItem = menu.add(new MenuItem("Linker"));
273	705	linkerItem.addActionListener(this);
274	706	templateItem = menu.add(new MenuItem("Template"));
275	707	templateItem.addActionListener(this);
276		- attributeItem = menu.add(new MenuItem("Attribute"));
277		- attributeItem.addActionListener(this);
278	708	pointflowItem = menu.add(new MenuItem("Point Flow"));
279	709	pointflowItem.addActionListener(this);
	710	+ }
280	711	menu.add("-");
281	712	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
282	713	resetTransformItem.addActionListener(this);
283	714	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
284	715	resetCentroidItem.addActionListener(this);
285		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
286		- transformgeometryItem.addActionListener(this);
	716	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	717	+ resetCentroidXZItem.addActionListener(this);
	718	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	719	+ transformGeometryItem.addActionListener(this);
	720	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	721	+ transformChildrenItem.addActionListener(this);
287	722
288	723	oe.menuBar.add(menu = new Menu("Geometry"));
289	724	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -294,8 +729,11 @@
294	729	genNormalsCADItem.addActionListener(this);
295	730	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
296	731	genNormalsMESHItem.addActionListener(this);
297		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	732	+ if (Globals.ADVANCED)
	733	+ {
	734	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
298	735	genNormalsMINEItem.addActionListener(this);
	736	+ }
299	737	stripifyItem = menu.add(new MenuItem("Stripify"));
300	738	stripifyItem.addActionListener(this);
301	739	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -317,23 +755,34 @@
317	755	reduce34MeshItem.addActionListener(this);
318	756	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
319	757	increaseMeshItem.addActionListener(this);
320		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
321		- smoothMeshItem.addActionListener(this);
322	758	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
323	759	clipMeshItem.addActionListener(this);
	760	+
	761	+ if (Globals.ADVANCED)
	762	+ {
	763	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	764	+ smoothMeshItem.addActionListener(this);
	765	+ }
324	766
325	767	oe.menuBar.add(menu = new Menu("Attributes"));
326	768	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
327	769	clearMaterialsItem.addActionListener(this);
	770	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	771	+ resetAllItem.addActionListener(this);
	772	+ stepAllItem = menu.add(new MenuItem("Step All"));
	773	+ stepAllItem.addActionListener(this);
328	774	menu.add("-");
329	775	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
330	776	liveleavesItem.addActionListener(this);
331	777	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
332	778	unliveleavesItem.addActionListener(this);
	779	+ if (Globals.ADVANCED)
	780	+ {
333	781	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
334	782	supportleavesItem.addActionListener(this);
335	783	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
336	784	unsupportleavesItem.addActionListener(this);
	785	+ }
337	786	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
338	787	hideleavesItem.addActionListener(this);
339	788	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -342,6 +791,14 @@
342	791	markleavesItem.addActionListener(this);
343	792	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
344	793	unmarkleavesItem.addActionListener(this);
	794	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	795	+ rewindleavesItem.addActionListener(this);
	796	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	797	+ unrewindleavesItem.addActionListener(this);
	798	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	799	+ randomleavesItem.addActionListener(this);
	800	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	801	+ unrandomleavesItem.addActionListener(this);
345	802	menu.add("-");
346	803	flipVItem = menu.add(new MenuItem("Flip V"));
347	804	flipVItem.addActionListener(this);
..	..	@@ -367,45 +824,56 @@
367	824	attachBumpItem.addActionListener(this);
368	825	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
369	826	pigmentBumpItem.addActionListener(this);
	827	+ //embedTexturesItem
370	828	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
371	829	detachPigmentItem.addActionListener(this);
372	830	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
373	831	detachBumpItem.addActionListener(this);
	832	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	833	+ embedTexturesItem.addActionListener(this);
	834	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	835	+ deEmbedTexturesItem.addActionListener(this);
374	836	menu.add("-");
375	837	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
376	838	sortbysizeItem.addActionListener(this);
377	839	sortbynameItem = menu.add(new MenuItem("Sort by name"));
378	840	sortbynameItem.addActionListener(this);
379	841	menu.add("-");
	842	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	843	+ shareGeometriesItem.addActionListener(this);
	844	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	845	+ mergeGeometriesItem.addActionListener(this);
	846	+ if (Globals.ADVANCED)
	847	+ {
	848	+ // Pretty much the same as duplicate and clone.
380	849	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
381	850	extractGeometriesItem.addActionListener(this);
382	851	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
383	852	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);
	853	+ }
388	854
389	855	oe.menuBar.add(menu = new Menu("Insert"));
390	856	buildCreateMenu(menu);
391	857
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	858	oe.menuBar.add(menu = new Menu("Tools"));
404	859	buildToolsMenu(menu);
405	860	}
406	861
	862	+
407	863	void SetupUI2(ObjEditor oe)
408	864	{
	865	+ // June 2019
	866	+ if (oe == null)
	867	+ {
	868	+ //super.SetupUI2(this);
	869	+ //return;
	870	+ }
	871	+
	872	+ if (copy != group)
	873	+ {
	874	+ //super.SetupUI2(this);
	875	+ }
	876	+
409	877	//new Exception().printStackTrace();
410	878
411	879	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -434,92 +902,238 @@
434	902	oe.radioPanel.add(dummyButton);
435	903	oe.buttonGroup.add(dummyButton);
436	904	*/
	905	+ cGridBag copyOptionsPanel = new cGridBag();
	906	+
	907	+ copyOptionsPanel.preferredHeight = 2;
	908	+
437	909	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
438	910
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);
	911	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	912	+ //minButton.setToolTipText("Minimize window");
	913	+ //minButton.addActionListener(this);
	914	+
	915	+ if (Globals.ADVANCED)
	916	+ {
	917	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	918	+ maxButton.setToolTipText("Maximize window");
	919	+ maxButton.addActionListener(this);
	920	+ }
	921	+
	922	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	923	+ fullButton.setToolTipText("Full-screen window");
	924	+ fullButton.addActionListener(this);
	925	+
	926	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
448	927	screenfitButton.setToolTipText("Screen fit");
449	928	screenfitButton.addActionListener(this);
450	929
	930	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	931	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	932	+ restoreCameraButton.addActionListener(this);
	933	+
	934	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	935	+ saveButton.setToolTipText("New version");
	936	+ saveButton.addActionListener(this);
	937	+
	938	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	939	+ undoButton.setToolTipText("Previous version");
	940	+ undoButton.addActionListener(this);
	941	+ undoButton.setEnabled(false);
	942	+
	943	+ cGridBag updown = new cGridBag().setVertical(true);
	944	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	945	+ restoreButton.setToolTipText("Restore current");
	946	+ restoreButton.addActionListener(this);
	947	+ restoreButton.setEnabled(false);
	948	+
	949	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	950	+ replaceButton.setToolTipText("Replace current");
	951	+ replaceButton.addActionListener(this);
	952	+ replaceButton.setEnabled(false);
	953	+
	954	+ copyOptionsPanel.add(updown);
	955	+
	956	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	957	+ redoButton.setToolTipText("Next version");
	958	+ redoButton.addActionListener(this);
	959	+ redoButton.setEnabled(false);
	960	+
	961	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	962	+ liveCB.setToolTipText("Enable animation");
	963	+ liveCB.addItemListener(this);
	964	+
	965	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	966	+ oneStepButton.setToolTipText("Animate one step forward");
	967	+ oneStepButton.addActionListener(this);
	968	+
	969	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	970	+ fastCB.setToolTipText("Fast mode");
	971	+ fastCB.addItemListener(this);
	972	+
	973	+ //oe.toolboxPanel.Return();
	974	+
	975	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	976	+// trackCB.setToolTipText("Enable tracking");
	977	+// trackCB.addItemListener(this);
	978	+
451	979	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
452	980	// 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	981
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);
	982	+ if (Globals.ADVANCED)
	983	+ {
	984	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	985	+ snapobjectButton.addActionListener(this);
	986	+ snapobjectButton.setToolTipText("Snap Object");
	987	+
	988	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
474	989	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");
	990	+ fourButton.setToolTipText("Show control panel only");
	991	+ }
	992	+
	993	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	994	+
	995	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	996	+ twoButton.setToolTipText("Show 3D view only");
	997	+ twoButton.addActionListener(this);
	998	+ this.fullscreenLayout = twoButton;
	999	+
	1000	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1001	+ threeButton.setToolTipText("Show controls and 3D view");
481	1002	threeButton.addActionListener(this);
482		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
483		- sevenButton.setToolTipText("3-column layout");
484		- sevenButton.addActionListener(this);
	1003	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1004	+ sixButton.setToolTipText("Show 3D view and controls");
	1005	+ sixButton.addActionListener(this);
	1006	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1007	+// sevenButton.setToolTipText("3-column layout");
	1008	+// sevenButton.addActionListener(this);
485	1009	//
486	1010
487		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
488		- rootButton.setToolTipText("Edit selection in new tab");
	1011	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1012	+ rootButton.setToolTipText("Open selection in new tab");
489	1013	rootButton.addActionListener(this);
490	1014
491		- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1015	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
492	1016	closeButton.setToolTipText("Close tab");
493	1017	closeButton.addActionListener(this);
494	1018	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
495	1019	//clearButton.addActionListener(this);
496		-
497		- cGridBag commandsPanel = new cGridBag();
	1020	+
	1021	+ cGridBag row1 = new cGridBag();
498	1022
499		- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
500		- editButton.setToolTipText("Edit selection");
	1023	+ // INSERT
	1024	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1025	+ gridButton.setToolTipText("Create grid");
	1026	+ gridButton.addActionListener(this);
	1027	+
	1028	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1029	+ boxButton.setToolTipText("Create box");
	1030	+ boxButton.addActionListener(this);
	1031	+
	1032	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1033	+ sphereButton.setToolTipText("Create sphere");
	1034	+ sphereButton.addActionListener(this);
	1035	+
	1036	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1037	+ coneButton.setToolTipText("Create cone");
	1038	+ coneButton.addActionListener(this);
	1039	+
	1040	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1041	+ torusButton.setToolTipText("Create torus");
	1042	+ torusButton.addActionListener(this);
	1043	+
	1044	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1045	+ superButton.setToolTipText("Create superellipsoid");
	1046	+ superButton.addActionListener(this);
	1047	+
	1048	+ if (Globals.ADVANCED)
	1049	+ {
	1050	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1051	+ kleinButton.setToolTipText("Create Klein bottle");
	1052	+ kleinButton.addActionListener(this);
	1053	+ }
	1054	+
	1055	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1056	+ particlesButton.setToolTipText("Create particle system");
	1057	+ particlesButton.addActionListener(this);
	1058	+
	1059	+ oe.toolboxPanel.add(row1);
	1060	+
	1061	+ cGridBag row2 = new cGridBag();
	1062	+
	1063	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1064	+ groupButton.setToolTipText("Create group");
	1065	+ groupButton.addActionListener(this);
	1066	+
	1067	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1068	+ compositeButton.setToolTipText("Create composite");
	1069	+ compositeButton.addActionListener(this);
	1070	+
	1071	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1072	+ switchButton.setToolTipText("Create item switcher");
	1073	+ switchButton.addActionListener(this);
	1074	+
	1075	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1076	+ loopButton.setToolTipText("Create loop");
	1077	+ loopButton.addActionListener(this);
	1078	+
	1079	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1080	+ textureButton.setToolTipText("Create texture");
	1081	+ textureButton.addActionListener(this);
	1082	+
	1083	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1084	+ overlayButton.setToolTipText("Create overlay");
	1085	+ overlayButton.addActionListener(this);
	1086	+
	1087	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1088	+ lightButton.setToolTipText("Create light");
	1089	+ lightButton.addActionListener(this);
	1090	+
	1091	+ oe.toolboxPanel.add(row2);
	1092	+
	1093	+ // ENVYMAPS
	1094	+ cGridBag skyboxpane = new cGridBag();
	1095	+ skyboxpane.preferredHeight = 100;
	1096	+
	1097	+ oe.toolboxPanel.add(skyboxpane);
	1098	+
	1099	+ JTabbedPane skyboxpanel = new JTabbedPane();
	1100	+ skyboxpane.add(skyboxpanel);
	1101	+
	1102	+ AddSkyboxTab0(skyboxpanel);
	1103	+ AddSkyboxTab1(skyboxpanel);
	1104	+ AddSkyboxTab2(skyboxpanel);
	1105	+ AddSkyboxTab3(skyboxpanel);
	1106	+
	1107	+ // EDIT panel
	1108	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1109	+ editButton.setToolTipText("Pin selection controls");
501	1110	editButton.addActionListener(this);
502	1111
503		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
504		- uneditButton.setToolTipText("Unedit selection");
	1112	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1113	+ uneditButton.setToolTipText("Remove selection controls");
505	1114	uneditButton.addActionListener(this);
506	1115
507		- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1116	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1117	+ allParamsButton.setToolTipText("Show all controle");
	1118	+ allParamsButton.addActionListener(this);
	1119	+
	1120	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
508	1121	clearPanelButton.setToolTipText("Clear edit panel");
509	1122	clearPanelButton.addActionListener(this);
510	1123
511		- commandsPanel.add(allParamsButton = new cButton("A", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
512		- allParamsButton.setToolTipText("All params??");
513		- allParamsButton.addActionListener(this);
514		-
515		- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1124	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
516	1125	unselectButton.setToolTipText("Unselect");
517	1126	unselectButton.addActionListener(this);
518	1127
519		- commandsPanel.preferredHeight = 1;
	1128	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1129	+ flashSelectionButton.setToolTipText("Highlight selection");
	1130	+ flashSelectionButton.addActionListener(this);
520	1131
521		- oe.treePanel.add(commandsPanel);
522		- oe.treePanel.Return();
	1132	+ editCommandsPanel.preferredHeight = 1;
	1133	+
	1134	+ SetPinStates(false);
	1135	+// oe.treePanel.add(commandsPanel);
	1136	+// oe.treePanel.Return();
523	1137
524	1138	// oe.aConstraints.gridx += 1;
525	1139	// oe.aConstraints.weighty = 0;
..	..	@@ -536,32 +1150,20 @@
536	1150
537	1151	JScrollPane jSP;
538	1152	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
539		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1153	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
540	1154	ResetModel();
541	1155
542	1156	oe.treePanel.add(jSPPanel);
543	1157	oe.treePanel.Return();
544	1158
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	1159	oe.treePanel.add(copyOptionsPanel);
561	1160	oe.treePanel.Return();
	1161	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1162	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1163	+ sliderPane.preferredHeight = 1;
562	1164
563		-// mainPanel.setDividerLocation(0.5); //1.0);
564		-// mainPanel.setResizeWeight(0.5);
	1165	+// mainPanel.setDividerLocation(0.1); //1.0);
	1166	+ mainPanel.setResizeWeight(0.4);
565	1167
566	1168	//jList.addListSelectionListener(this);
567	1169	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -569,7 +1171,7 @@
569	1171	//jTree.setEditable(true);
570	1172	oe.jTree.setDragEnabled(true);
571	1173	//jTree.setPreferredSize(new Dimension(10,10));
572		- jSP.setPreferredSize(new Dimension(100,200));
	1174	+ //jSP.setPreferredSize(new Dimension(100,200));
573	1175
574	1176	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
575	1177
..	..	@@ -581,53 +1183,67 @@
581	1183	dgr.addDragGestureListener(this);
582	1184	}catch(Exception e) {}
583	1185	*/
584		- radio.layout = sevenButton;
	1186	+ radio.layout = sixButton; // sevenButton;
585	1187	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
586	1188	}
587	1189
588	1190	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
589	1191	{
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);
	1192	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1193	+ colorCB.setToolTipText("Copy color when dropped");
	1194	+ colorCB.addItemListener(this);
599	1195
600		- // constraints.gridy += 1;
	1196	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1197	+ materialCB.setToolTipText("Copy material when dropped");
	1198	+ materialCB.addItemListener(this);
	1199	+
	1200	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1201	+ textureCB.setToolTipText("Copy texture when dropped");
	1202	+ textureCB.addItemListener(this);
	1203	+
	1204	+ panel.Return();
	1205	+
	1206	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	1207	+ boxCB.setToolTipText("Display bounding boxes");
	1208	+ boxCB.addItemListener(this);
	1209	+
	1210	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	1211	+ zoomBoxCB.setToolTipText("Display only for wheel");
	1212	+ zoomBoxCB.addItemListener(this);
	1213	+
	1214	+ if (true) // Globals.ADVANCED)
	1215	+ {
	1216	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1217	+// supportCB.setToolTipText("Enable rigging");
	1218	+// supportCB.addItemListener(this);
	1219	+
	1220	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1221	+ freezeCB.setToolTipText("Fast moving camera");
	1222	+ freezeCB.addItemListener(this);
	1223	+
601	1224	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
602	1225	// localCB.addItemListener(this);
603	1226
604		- //constraints.gridy += 1;
	1227	+ panel.Return();
	1228	+
605	1229	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
606	1230	crowdCB.setToolTipText("Used for crowds");
607	1231	crowdCB.addItemListener(this);
608	1232
609		- //constraints.gridy += 1;
610	1233	panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
611	1234	smoothCB.setToolTipText("Snapping delay");
612	1235	smoothCB.addItemListener(this);
613	1236
614		- //constraints.gridy += 1;
615	1237	panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
616	1238	slowCB.setToolTipText("Smooth interpolation");
617	1239	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		-
	1240	+
627	1241	// constraints.gridy += 1;
628	1242	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
629	1243	// speakerMocapCB.addItemListener(this);
630	1244
	1245	+ panel.Return();
	1246	+
631	1247	if (false)
632	1248	{
633	1249	// handled in scripts
..	..	@@ -642,42 +1258,85 @@
642	1258	//constraints.gridy += 1;
643	1259	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
644	1260	smoothfocusCB.addItemListener(this);
	1261	+ panel.Return();
645	1262	}
646	1263
647	1264	//constraints.gridx += 1;
648	1265	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
649	1266	// debugCB.addItemListener(this);
650	1267
651		- //constraints.gridy += 1;
	1268	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1269	+ trackCB.setToolTipText("Enable tracking target");
	1270	+ trackCB.addItemListener(this);
	1271	+
652	1272	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1273	+ oeilCB.setToolTipText("Move camera when tracking");
653	1274	oeilCB.addItemListener(this);
654	1275
655		- //constraints.gridy += 1;
	1276	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1277	+ shadowCB.setToolTipText("When live compute shadows");
	1278	+ shadowCB.addItemListener(this);
	1279	+
	1280	+ panel.Return();
	1281	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1282	+ toggleTextureCB.setToolTipText("Load textures");
	1283	+ toggleTextureCB.addItemListener(this);
	1284	+
	1285	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1286	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1287	+ toggleSwitchCB.addItemListener(this);
	1288	+
	1289	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1290	+ autokeepCB.setToolTipText("On structure change");
	1291	+ autokeepCB.addItemListener(this);
	1292	+
	1293	+ panel.Return();
	1294	+ if (Globals.ADVANCED)
	1295	+ {
656	1296	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
657	1297	lookAtCB.setToolTipText("Look-at target");
658	1298	lookAtCB.addItemListener(this);
	1299	+ }
	1300	+
	1301	+ }
659	1302
660	1303	cGridBag fill = new cGridBag();
661		-
662	1304	fill.preferredHeight = 200;
	1305	+ cGridBag fill2 = new cGridBag();
	1306	+ fill2.preferredHeight = 200;
	1307	+ cGridBag fill3 = new cGridBag();
	1308	+ fill3.preferredHeight = 200;
663	1309
664	1310	panel.add(fill);
	1311	+ panel.add(fill2);
	1312	+ panel.add(fill3);
665	1313
666	1314	}
667	1315
668	1316	void EditObject(Object3D obj)
669	1317	{
670	1318	cRadio radioButton = new cRadio(obj.name);
	1319	+
	1320	+ // June 2019. Patch to avoid bug with transparency.
	1321	+ radioButton.hadMaterial = obj.material != null;
	1322	+ if (!radioButton.hadMaterial)
	1323	+ {
	1324	+ obj.material = new cMaterial();
	1325	+ }
	1326	+
671	1327	radioButton.SetObject(obj);
672		- radioButton.layout = sevenButton;
	1328	+ radioButton.layout = sixButton; // sevenButton;
673	1329	radioButton.SetCamera(cameraView.renderCamera, false);
674	1330	radioButton.addActionListener(this);
675	1331	radioPanel.add(radioButton);
676	1332	buttonGroup.add(radioButton);
677	1333	radioButton.doClick();
678	1334	}
	1335	+
679	1336	void SetupViews(ObjEditor oe)
680	1337	{
	1338	+ theFrame = this;
	1339	+
681	1340	oe.SetupViews();
682	1341
683	1342	System.out.println("SetupViews");
..	..	@@ -686,23 +1345,28 @@
686	1345	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
687	1346	}
688	1347
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;
	1348	+ cToggleButton liveCB;
	1349	+ cCheckBox supportCB;
	1350	+ cCheckBox localCB;
	1351	+ cCheckBox crowdCB;
	1352	+ cCheckBox smoothCB;
	1353	+ cToggleButton fastCB;
	1354	+ cCheckBox slowCB;
	1355	+ cCheckBox boxCB;
	1356	+ cCheckBox zoomBoxCB;
	1357	+ cCheckBox freezeCB;
	1358	+ //cToggleButton trackCB;
	1359	+ cCheckBox trackCB;
	1360	+ cCheckBox smoothfocusCB;
700	1361	// JCheckBox speakerMocapCB;
701		- JCheckBox speakerCameraCB;
702		- JCheckBox speakerFocusCB;
703		- JCheckBox debugCB;
704		- JCheckBox oeilCB;
705		- JCheckBox lookAtCB;
	1362	+ cCheckBox speakerCameraCB;
	1363	+ cCheckBox speakerFocusCB;
	1364	+ cCheckBox debugCB;
	1365	+
	1366	+ cCheckBox oeilCB;
	1367	+ cCheckBox shadowCB;
	1368	+ cCheckBox autokeepCB;
	1369	+ cCheckBox lookAtCB;
706	1370
707	1371	// static int COLOR = 1;
708	1372	// static int MATERIAL = 2;
..	..	@@ -710,9 +1374,9 @@
710	1374
711	1375	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
712	1376
713		- JCheckBox colorCB;
714		- JCheckBox materialCB;
715		- JCheckBox textureCB;
	1377	+ cCheckBox colorCB;
	1378	+ cCheckBox materialCB;
	1379	+ cCheckBox textureCB;
716	1380
717	1381	public void itemStateChanged(ItemEvent e)
718	1382	{
..	..	@@ -740,6 +1404,7 @@
740	1404	} else if(e.getSource() == liveCB)
741	1405	{
742	1406	cameraView.ToggleLive();
	1407	+ refreshContents(false);
743	1408	}
744	1409	else if(e.getSource() == supportCB)
745	1410	{
..	..	@@ -804,6 +1469,18 @@
804	1469	{
805	1470	cameraView.ToggleOeil();
806	1471	}
	1472	+ else if(e.getSource() == shadowCB)
	1473	+ {
	1474	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1475	+ }
	1476	+ else if(e.getSource() == freezeCB)
	1477	+ {
	1478	+ Globals.FREEZEONMOVE ^= true;
	1479	+ }
	1480	+ else if(e.getSource() == autokeepCB)
	1481	+ {
	1482	+ Globals.REPLACEONMAKE ^= true;
	1483	+ }
807	1484	else if(e.getSource() == lookAtCB)
808	1485	{
809	1486	cameraView.ToggleLookAt();
..	..	@@ -820,7 +1497,8 @@
820	1497
821	1498	/**/
822	1499	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
823		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1500	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1501	+ TreePath path = objEditor.jTree.getSelectionPath();
824	1502	if ((path == null) \|\| (path.getPathCount() <= 1)) {
825	1503	// We can't move the root node or an empty selection
826	1504	return;
..	..	@@ -883,8 +1561,6 @@
883	1561	}
884	1562	}
885	1563
886		- String string = (String) object;
887		-
888	1564	System.out.println("Transfer = " + object + "; drop : " + target);
889	1565	// if( object instanceof java.io.File[])
890	1566	// {
..	..	@@ -892,7 +1568,11 @@
892	1568	// objEditor.DropFile((java.io.File[]) object, true);
893	1569	// return;
894	1570	// }
895		- if (string.charAt(0) == '/')
	1571	+
	1572	+ String string = object.toString();
	1573	+
	1574	+ // File path for Mac and Windows
	1575	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
896	1576	{
897	1577	// file(s)
898	1578	String[] names = string.split("\n");
..	..	@@ -919,7 +1599,7 @@
919	1599
920	1600	flashIt = false;
921	1601	CameraPane pane = (CameraPane) target;
922		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1602	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
923	1603	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
924	1604
925	1605	if (group.selection.size() == 1)
..	..	@@ -935,23 +1615,33 @@
935	1615
936	1616	assert target == objEditor.jTree;
937	1617	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1618	+ Object3D destinationLeaf;
938	1619	try {
939		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1620	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
940	1621	} catch (Exception e) {
941	1622	System.out.println("destinationPath : " + destinationPath);
942	1623	return;
943	1624	}
944	1625
945		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1626	+ for (int i=group.selection.size(); --i>=0;)
946	1627	{
	1628	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1629	+
	1630	+ // Cannot move into itself
	1631	+ if (child == destinationLeaf)
	1632	+ return;
	1633	+ }
	1634	+
	1635	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1636	+// {
947	1637	loadClipboard(true);
948	1638	objEditor.jTree.setSelectionPath(destinationPath);
949		- pasteInto(false);
950		- } else {
951		- loadClipboard(false);
952		- objEditor.jTree.setSelectionPath(destinationPath);
953		- pasteInto(false); // true); // ???
954		- }
	1639	+ pasteInto(false, false);
	1640	+// } else {
	1641	+// loadClipboard(false);
	1642	+// objEditor.jTree.setSelectionPath(destinationPath);
	1643	+// pasteInto(false, false); // true); // ???
	1644	+// }
955	1645	}
956	1646	public void dropActionChanged(DropTargetDragEvent dtde)
957	1647	// Called if the user has modified the current drop gesture
..	..	@@ -1056,85 +1746,107 @@
1056	1746	{
1057	1747	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1058	1748	//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);
	1749	+// gridItem = menu.add(new MenuItem("Grid"));
	1750	+// gridItem.addActionListener(this);
	1751	+// rectoidItem = menu.add(new MenuItem("Box"));
	1752	+// rectoidItem.addActionListener(this);
	1753	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1754	+// ellipsoidItem.addActionListener(this);
	1755	+// coneItem = menu.add(new MenuItem("Cone"));
	1756	+// coneItem.addActionListener(this);
	1757	+// torusItem = menu.add(new MenuItem("Torus"));
	1758	+// torusItem.addActionListener(this);
	1759	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1760	+// superItem.addActionListener(this);
	1761	+
	1762	+ cameraItem = menu.add(new MenuItem("Camera"));
	1763	+ cameraItem.addActionListener(this);
	1764	+
	1765	+ if (!Globals.ADVANCED)
	1766	+ {
1071	1767	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1072	1768	kleinItem.addActionListener(this);
1073		- particleItem = menu.add(new MenuItem("Particle system"));
1074		- particleItem.addActionListener(this);
	1769	+ }
	1770	+
	1771	+// particleItem = menu.add(new MenuItem("Particle system"));
	1772	+// particleItem.addActionListener(this);
	1773	+ if (Globals.ADVANCED)
	1774	+ {
1075	1775	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1076	1776	ragdollItem.addActionListener(this);
1077	1777	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1078	1778	ragdoll2Item.addActionListener(this);
	1779	+ }
1079	1780	menu.add("-");
1080		- meshItem = menu.add(new MenuItem("Mesh"));
	1781	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1081	1782	meshItem.addActionListener(this);
1082	1783	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1083	1784	// meshGroupItem.addActionListener(this);
	1785	+ if (Globals.ADVANCED)
	1786	+ {
1084	1787	springItem = menu.add(new MenuItem("Spring"));
1085	1788	springItem.addActionListener(this);
1086	1789	flagItem = menu.add(new MenuItem("Flag"));
1087	1790	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	1791	blobItem = menu.add(new MenuItem("Blob"));
1093	1792	blobItem.addActionListener(this);
1094	1793	latheItem = menu.add(new MenuItem("Lathe"));
1095	1794	latheItem.addActionListener(this);
1096		- lightItem = menu.add(new MenuItem("Light"));
1097		- lightItem.addActionListener(this);
	1795	+ }
	1796	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1797	+ bezierItem.addActionListener(this);
	1798	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1799	+// overlayItem.addActionListener(this);
	1800	+// lightItem = menu.add(new MenuItem("Light"));
	1801	+// lightItem.addActionListener(this);
1098	1802	menu.add("-");
1099	1803	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1100	1804	//superLoopItem.addActionListener(this);
1101		- loopItem = menu.add(new MenuItem("Loop"));
1102		- loopItem.addActionListener(this);
	1805	+// loopItem = menu.add(new MenuItem("Loop"));
	1806	+// loopItem.addActionListener(this);
1103	1807	doubleItem = menu.add(new MenuItem("Fork"));
1104	1808	doubleItem.addActionListener(this);
	1809	+ if (Globals.ADVANCED)
	1810	+ {
1105	1811	tripleItem = menu.add(new MenuItem("Trident"));
1106	1812	tripleItem.addActionListener(this);
	1813	+ }
1107	1814	}
1108	1815
1109	1816	void buildToolsMenu(Menu menu)
1110	1817	{
1111	1818	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1112	1819	animationItem.addItemListener(this);
1113		- animationItem.setState(CameraPane.ANIMATION);
	1820	+ animationItem.setState(Globals.ANIMATION);
	1821	+
	1822	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1823	+ archiveItem.addActionListener(this);
1114	1824
1115	1825	menu.add("-");
1116	1826	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1117	1827	parseverticesItem.addActionListener(this);
1118	1828	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1119	1829	textureFieldItem.addActionListener(this);
1120		- alignItem = menu.add(new MenuItem("Align"));
	1830	+ alignItem = menu.add(new MenuItem("Align Objects"));
1121	1831	alignItem.addActionListener(this);
1122		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1123		- mirrorItem.addActionListener(this);
1124	1832	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1125	1833	reduceMorphItem.addActionListener(this);
1126	1834	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1127	1835	reduce34MorphItem.addActionListener(this);
1128		-
1129		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1130		- computeAOItem.addActionListener(this);
1131	1836	menu.add("-");
1132		-
1133	1837	menu.add(memoryItem = new MenuItem("Memory Usage"));
1134	1838	memoryItem.addActionListener(this);
	1839	+ menu.add(computeAOItem = new MenuItem("Compute AO"));
	1840	+ computeAOItem.addActionListener(this);
	1841	+
	1842	+ if (Globals.ADVANCED)
	1843	+ {
	1844	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1845	+ mirrorItem.addActionListener(this);
	1846	+ menu.add("-");
1135	1847	menu.add(analyzeItem = new MenuItem("Analyze"));
1136	1848	analyzeItem.addActionListener(this);
1137		- menu.add(dumpItem = new MenuItem("Dump"));
	1849	+ menu.add(dumpItem = new MenuItem("Print"));
1138	1850	dumpItem.addActionListener(this);
1139	1851	// menu.add(pathItem = new MenuItem("From-to path"));
1140	1852	// pathItem.addActionListener(this);
..	..	@@ -1152,6 +1864,7 @@
1152	1864	menu.add("-");
1153	1865	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1154	1866	editScriptItem.addActionListener(this);
	1867	+ }
1155	1868	}
1156	1869
1157	1870	void ScreenFit()
..	..	@@ -1274,9 +1987,34 @@
1274	1987	shadow.material = new cMaterial(obj.material);
1275	1988	shadow.material.diffuse = 0.0001f;
1276	1989	shadow.material.specular = 0.0001f;
	1990	+ //shadow.projectedVertices[1].x = 300;
1277	1991
1278	1992	makeSomething(shadow);
1279	1993	}
	1994	+
	1995	+ private void ClearUnpinned()
	1996	+ {
	1997	+ //for (Object3D obj : listUI)
	1998	+ for (int i=listUI.size(); --i>=0;)
	1999	+ {
	2000	+ Object3D obj = listUI.elementAt(i);
	2001	+ if (!obj.pinned)
	2002	+ {
	2003	+ obj.CloseUI();
	2004	+ listUI.remove(i);
	2005	+ }
	2006	+ }
	2007	+ }
	2008	+
	2009	+ private void EditElement(Object3D elem, boolean newWindow)
	2010	+ {
	2011	+ // if (!(elem instanceof Composite))
	2012	+ // newWindow = false;
	2013	+ listUI.add(elem);
	2014	+ elem.openEditWindow(this, newWindow); //, false);
	2015	+ System.out.println("edit : " + elem);
	2016	+ elem.editWindow.refreshContents(true); // ? new
	2017	+ }
1280	2018
1281	2019	/**
1282	2020	* applyExample
..	..	@@ -1480,9 +2218,9 @@
1480	2218
1481	2219	void Overwrite(int mask)
1482	2220	{
1483		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2221	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1484	2222	{
1485		- Object3D content = GrafreeD.clipboard.get(0);
	2223	+ Object3D content = Grafreed.clipboard.get(0);
1486	2224
1487	2225	if (content instanceof cGroup && ((cGroup)content).transientlink )
1488	2226	content = ((cGroup)content).get(0);
..	..	@@ -1521,7 +2259,7 @@
1521	2259	{
1522	2260	ScreenFit();
1523	2261	} else
1524		- if (source == switchItem)
	2262	+ if (source == switchViewItem)
1525	2263	{
1526	2264	cVector v1 = new cVector();
1527	2265	cVector v2 = new cVector();
..	..	@@ -1530,11 +2268,11 @@
1530	2268	objEditor.cameraView.renderCamera.setAim(v2, v1);
1531	2269	objEditor.cameraView.repaint();
1532	2270	} else
1533		- if (source == rectoidItem)
	2271	+ if (source == rectoidItem \|\| source == boxButton)
1534	2272	{
1535	2273	makeSomething(new Box());
1536	2274	} else
1537		- if (source == particleItem)
	2275	+ if (source == particleItem \|\| source == particlesButton)
1538	2276	{
1539	2277	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1540	2278	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1613,27 +2351,27 @@
1613	2351
1614	2352	makeSomething(obj);
1615	2353	} else
1616		- if (source == gridItem)
	2354	+ if (source == gridItem \|\| source == gridButton)
1617	2355	{
1618	2356	makeSomething(new Grid());
1619	2357	} else
1620		- if (source == ellipsoidItem)
	2358	+ if (source == ellipsoidItem \|\| source == sphereButton)
1621	2359	{
1622	2360	makeSomething(new Sphere());
1623	2361	} else
1624		- if (source == coneItem)
	2362	+ if (source == coneItem \|\| source == coneButton)
1625	2363	{
1626	2364	makeSomething(new Cone());
1627	2365	} else
1628		- if (source == torusItem)
	2366	+ if (source == torusItem \|\| source == torusButton)
1629	2367	{
1630	2368	makeSomething(new Torus());
1631	2369	} else
1632		- if (source == superItem)
	2370	+ if (source == superItem \|\| source == superButton)
1633	2371	{
1634	2372	makeSomething(new Superellipsoid());
1635	2373	} else
1636		- if (source == kleinItem)
	2374	+ if (source == kleinItem \|\| source == kleinButton)
1637	2375	{
1638	2376	makeSomething(new Klein());
1639	2377	} else
..	..	@@ -1653,7 +2391,7 @@
1653	2391	{
1654	2392	makeSomething(new BezierSurface());
1655	2393	} else
1656		- if (source == checkerItem)
	2394	+ if (source == overlayItem \|\| source == overlayButton)
1657	2395	{
1658	2396	/*
1659	2397	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1701,10 +2439,27 @@
1701	2439	s.setup();
1702	2440	makeSomething(s);
1703	2441	} else
1704		- if (source == lightItem)
	2442	+ if (source == lightItem \|\| source == lightButton)
1705	2443	{
1706	2444	makeSomething(new Light());
1707	2445	} else
	2446	+// if (source == skybox1Button \|\|
	2447	+// source == skybox2Button \|\|
	2448	+// source == skybox3Button \|\|
	2449	+// source == skybox4Button \|\|
	2450	+// source == skybox5Button \|\|
	2451	+// source == skybox6Button \|\|
	2452	+// source == skybox7Button \|\|
	2453	+// source == skybox11Button \|\|
	2454	+// source == skybox12Button \|\|
	2455	+// source == skybox13Button \|\|
	2456	+// source == skybox14Button \|\|
	2457	+// source == skybox15Button \|\|
	2458	+// source == skybox16Button \|\|
	2459	+// source == skybox17Button)
	2460	+// {
	2461	+// ChangeSkybox(source);
	2462	+// } else
1708	2463	if (source == csgItem)
1709	2464	{
1710	2465	group(new CSG());
..	..	@@ -1751,30 +2506,30 @@
1751	2506
1752	2507	group(g);
1753	2508	} else
1754		- if (source == loopItem)
	2509	+ if (source == loopItem \|\| source == loopButton)
1755	2510	{
1756	2511	Composite csg = new GroupLeaf();
1757	2512	csg.count = 5;
1758	2513	group(csg);
1759		- Composite child = new cGroup();
	2514	+ Composite child = new cGroup("Branch");
1760	2515	csg.addChild(child);
1761	2516	child.addChild(csg);
1762	2517	} else
1763	2518	if (source == doubleItem)
1764	2519	{
1765		- Composite csg = new GroupLeaf();
	2520	+ Composite csg = new GroupLeaf("Fork");
1766	2521	csg.count = 5;
1767	2522	group(csg);
1768		- Composite child = new cGroup();
	2523	+ Composite child = new cGroup("Branch A");
1769	2524	csg.addChild(child);
1770	2525	child.addChild(csg);
1771		- child = new cGroup();
	2526	+ child = new cGroup("Branch B");
1772	2527	csg.addChild(child);
1773	2528	child.addChild(csg);
1774	2529	} else
1775	2530	if (source == tripleItem)
1776	2531	{
1777		- Composite csg = new GroupLeaf();
	2532	+ Composite csg = new GroupLeaf("Trident");
1778	2533	csg.count = 4;
1779	2534	group(csg);
1780	2535	Composite child = new cGroup();
..	..	@@ -1787,27 +2542,10 @@
1787	2542	csg.addChild(child);
1788	2543	child.addChild(csg);
1789	2544	} 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	2545	if (source == computeAOItem)
1808	2546	{
1809	2547	Globals.drawMode = CameraPane.OCCLUSION;
1810		- Globals.theRenderer.repaint();
	2548	+ cameraView.repaint();
1811	2549	} else
1812	2550	if (source == recompileItem)
1813	2551	{
..	..	@@ -1822,7 +2560,7 @@
1822	2560	if (source == invariantsItem)
1823	2561	{
1824	2562	System.out.println("Invariants:");
1825		- GrafreeD.grafreeD.universe.invariants();
	2563	+ Grafreed.grafreeD.universe.invariants();
1826	2564	} else
1827	2565	if (source == memoryItem)
1828	2566	{
..	..	@@ -1841,19 +2579,61 @@
1841	2579	{
1842	2580	DumpObject();
1843	2581	} else
	2582	+ if (source == minButton)
	2583	+ {
	2584	+ Minimize();
	2585	+ } else
	2586	+ if (source == maxButton)
	2587	+ {
	2588	+ Maximize();
	2589	+ } else
	2590	+ if (source == fullButton)
	2591	+ {
	2592	+ ToggleFullScreen();
	2593	+ } else
	2594	+ if (source == undoButton)
	2595	+ {
	2596	+ // Go to previous version
	2597	+ //if (!Undo())
	2598	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2599	+ Undo();
	2600	+ } else
	2601	+ if (source == restoreButton)
	2602	+ {
	2603	+ // Restore current version
	2604	+ Restore();
	2605	+ } else
	2606	+ if (source == replaceButton)
	2607	+ {
	2608	+ // Overwrite current version
	2609	+ Replace();
	2610	+ } else
	2611	+ if (source == redoButton)
	2612	+ {
	2613	+ // Go to next version
	2614	+ Redo();
	2615	+ } else
	2616	+ if (source == saveButton)
	2617	+ {
	2618	+ // Save a new version
	2619	+ if (!Save(true))
	2620	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2621	+ } else
	2622	+ if (source == oneStepButton)
	2623	+ {
	2624	+ Globals.ONESTEP = true;
	2625	+ cameraView.repaint();
	2626	+ } else
1844	2627	if (source == screenfitButton)
1845	2628	{
1846		- //Reload(lastConverter, lastFilename, true);
1847	2629	ScreenFit();
1848	2630	} else
1849	2631	if (source == screenfitpointButton)
1850	2632	{
1851		- //Reload(lastConverter, lastFilename, true);
1852	2633	ScreenFitPoint();
1853	2634	} else
1854	2635	if (source == snapobjectButton)
1855	2636	{
1856		- //Reload(lastConverter, lastFilename, true);
1857	2637	SnapObject();
1858	2638	} else
1859	2639	// if (event.getSource() == recompileButton)
..	..	@@ -1890,12 +2670,20 @@
1890	2670	{
1891	2671	loadClipboard(true);
1892	2672	} else
	2673	+ if (source == undoItem)
	2674	+ {
	2675	+ Undo();
	2676	+ } else
	2677	+ if (source == redoItem)
	2678	+ {
	2679	+ Redo();
	2680	+ } else
1893	2681	if (source == duplicateItem)
1894	2682	{
1895		- Object3D keep = GrafreeD.clipboard;
	2683	+ Object3D keep = Grafreed.clipboard;
1896	2684	loadClipboard(false);
1897	2685	paste(false);
1898		- GrafreeD.clipboard = keep;
	2686	+ Grafreed.clipboard = keep;
1899	2687	} else
1900	2688	if (source == cloneItem)
1901	2689	{
..	..	@@ -1913,13 +2701,17 @@
1913	2701	{
1914	2702	paste(false);
1915	2703	} else
	2704	+ if (source == pasteIntoItem)
	2705	+ {
	2706	+ pasteInto(true, false);
	2707	+ } else
1916	2708	if (source == pasteLinkItem)
1917	2709	{
1918		- pasteInto(false);
	2710	+ pasteInto(false, false);
1919	2711	} else
1920	2712	if (source == pasteCloneItem)
1921	2713	{
1922		- pasteInto(true);
	2714	+ pasteInto(true, true);
1923	2715	} else
1924	2716	if (source == pasteExpandItem)
1925	2717	{
..	..	@@ -2111,9 +2903,9 @@
2111	2903	// group.selection.get(0).setMasterThis(content); // should be identity
2112	2904	// refreshContents();
2113	2905	// }
2114		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2906	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2115	2907	{
2116		- Object3D content = GrafreeD.clipboard.get(0);
	2908	+ Object3D content = Grafreed.clipboard.get(0);
2117	2909
2118	2910	if (content instanceof cGroup && ((cGroup)content).transientlink )
2119	2911	content = ((cGroup)content).get(0);
..	..	@@ -2121,11 +2913,11 @@
2121	2913	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2122	2914	for (int i=0; i<group.selection.size(); i++)
2123	2915	{
2124		- boolean random = CameraPane.RANDOM;
2125		- CameraPane.RANDOM = false; // parse all random nodes
	2916	+ boolean random = CameraPane.SWITCH;
	2917	+ CameraPane.SWITCH = false; // parse all random nodes
2126	2918	group.selection.get(i).linkVerticesThis(content);
2127	2919	// group.selection.get(i).setMasterThis(content); // should be identity
2128		- CameraPane.RANDOM = random;
	2920	+ CameraPane.SWITCH = random;
2129	2921	}
2130	2922	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2131	2923	refreshContents();
..	..	@@ -2135,20 +2927,20 @@
2135	2927	{
2136	2928	for (int i=0; i<group.selection.size(); i++)
2137	2929	{
2138		- boolean random = CameraPane.RANDOM;
2139		- CameraPane.RANDOM = false; // parse all random nodes
	2930	+ boolean random = CameraPane.SWITCH;
	2931	+ CameraPane.SWITCH = false; // parse all random nodes
2140	2932	group.selection.get(i).linkVerticesThis(null);
2141		- CameraPane.RANDOM = random;
	2933	+ CameraPane.SWITCH = random;
2142	2934	}
2143	2935
2144	2936	refreshContents();
2145	2937	} else
2146	2938	if (source == relinkverticesItem)
2147	2939	{
2148		- boolean random = CameraPane.RANDOM;
2149		- CameraPane.RANDOM = false; // parse all random nodes
	2940	+ boolean random = CameraPane.SWITCH;
	2941	+ CameraPane.SWITCH = false; // parse all random nodes
2150	2942	group.selection.RelinkToSupport();
2151		- CameraPane.RANDOM = random;
	2943	+ CameraPane.SWITCH = random;
2152	2944
2153	2945	refreshContents();
2154	2946	} else
..	..	@@ -2163,9 +2955,9 @@
2163	2955	} else
2164	2956	if (source == setMasterItem)
2165	2957	{
2166		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2958	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2167	2959	{
2168		- Object3D content = GrafreeD.clipboard.get(0);
	2960	+ Object3D content = Grafreed.clipboard.get(0);
2169	2961
2170	2962	if (content instanceof cGroup && ((cGroup)content).transientlink )
2171	2963	content = ((cGroup)content).get(0);
..	..	@@ -2178,9 +2970,9 @@
2178	2970	{
2179	2971	if (group.selection.size() == 1)
2180	2972	{
2181		- if (GrafreeD.clipboard.size() == 1)
	2973	+ if (Grafreed.clipboard.size() == 1)
2182	2974	{
2183		- Object3D content = GrafreeD.clipboard.get(0);
	2975	+ Object3D content = Grafreed.clipboard.get(0);
2184	2976
2185	2977	if (content instanceof cGroup && ((cGroup)content).transientlink )
2186	2978	content = ((cGroup)content).get(0);
..	..	@@ -2197,7 +2989,7 @@
2197	2989	{
2198	2990	RevertMeshes();
2199	2991	} else
2200		- if (source == resetMeshItem)
	2992	+ if (source == resetAllItem)
2201	2993	{
2202	2994	ResetAll();
2203	2995	} else
..	..	@@ -2205,7 +2997,7 @@
2205	2997	{
2206	2998	StepAll();
2207	2999	} else
2208		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3000	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2209	3001	{
2210	3002	//int indices[] = jList.getSelectedIndices();
2211	3003	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2217,9 +3009,9 @@
2217	3009	{
2218	3010	ClearSelection(true);
2219	3011	} else
2220		- if (source == grabItem)
	3012	+ if (source == grabItem \|\| source == groupButton)
2221	3013	{
2222		- group(new cGroup(), true);
	3014	+ group(new cGroup(), false); // true);
2223	3015	} else
2224	3016	if (source == hideItem)
2225	3017	{
..	..	@@ -2237,16 +3029,16 @@
2237	3029	{
2238	3030	makeSomething(new Camera());
2239	3031	} else
2240		- if (source == compositeItem)
	3032	+ if (source == compositeItem \|\| source == compositeButton)
2241	3033	{
2242	3034	group(new Composite());
2243	3035	} else
2244		- if (source == randomItem)
	3036	+ if (source == switchItem \|\| source == switchButton)
2245	3037	{
2246	3038	RandomNode random = new RandomNode();
2247	3039	group(random);
2248	3040	if (random.size() > 0)
2249		- random.name = random.get(0).name + "Rnd";
	3041	+ random.name = random.get(0).name + "Switch";
2250	3042	} else
2251	3043	if (source == physicsItem)
2252	3044	{
..	..	@@ -2343,7 +3135,7 @@
2343	3135	{
2344	3136	group(new cLinker());
2345	3137	} else
2346		- if (source == textureItem)
	3138	+ if (source == textureItem \|\| source == textureButton)
2347	3139	{
2348	3140	group(new TextureNode());
2349	3141	} else
..	..	@@ -2363,17 +3155,30 @@
2363	3155	{
2364	3156	CastShadow(2);
2365	3157	} else
2366		- if (source == ungroupItem)
	3158	+ if (source == ungroupItem \|\| source == ungroupButton)
2367	3159	{
2368		- //ungroup();
	3160	+ boolean hasRoot = false;
	3161	+
2369	3162	for (int i=0; i<group.selection.size(); i++)
2370	3163	{
2371		- Ungroup(group.selection.get(i));
	3164	+ if (group.selection.get(i) == group)
	3165	+ {
	3166	+ hasRoot = true;
	3167	+ break;
	3168	+ }
2372	3169	}
2373	3170
2374		- ClearSelection(false);
2375		-
2376		- refreshContents();
	3171	+ if (!hasRoot)
	3172	+ {
	3173	+ for (int i=0; i<group.selection.size(); i++)
	3174	+ {
	3175	+ Ungroup(group.selection.get(i));
	3176	+ }
	3177	+
	3178	+ ClearSelection(false);
	3179	+
	3180	+ refreshContents();
	3181	+ }
2377	3182	} else
2378	3183	if (source == genUVItem)
2379	3184	{
..	..	@@ -2385,7 +3190,7 @@
2385	3190	} else
2386	3191	if (source == genNormalsMESHItem)
2387	3192	{
2388		- GenNormals(true); // TODO
	3193	+ GenNormalsMESH();
2389	3194	} else
2390	3195	if (source == genNormalsORGANItem)
2391	3196	{
..	..	@@ -2450,6 +3255,22 @@
2450	3255	if (source == unmarkleavesItem)
2451	3256	{
2452	3257	MarkLeaves(false);
	3258	+ } else
	3259	+ if (source == rewindleavesItem)
	3260	+ {
	3261	+ RewindLeaves(true);
	3262	+ } else
	3263	+ if (source == unrewindleavesItem)
	3264	+ {
	3265	+ RewindLeaves(false);
	3266	+ } else
	3267	+ if (source == randomleavesItem)
	3268	+ {
	3269	+ RandomLeaves(true);
	3270	+ } else
	3271	+ if (source == unrandomleavesItem)
	3272	+ {
	3273	+ RandomLeaves(false);
2453	3274	} else
2454	3275	if (source == flipVItem)
2455	3276	{
..	..	@@ -2535,9 +3356,13 @@
2535	3356	{
2536	3357	SmoothMesh();
2537	3358	} else
2538		- if (source == transformgeometryItem)
	3359	+ if (source == transformGeometryItem)
2539	3360	{
2540	3361	TransformGeometry();
	3362	+ } else
	3363	+ if (source == transformChildrenItem)
	3364	+ {
	3365	+ TransformChildren();
2541	3366	} else
2542	3367	if (source == resetTransformItem)
2543	3368	{
..	..	@@ -2545,7 +3370,11 @@
2545	3370	} else
2546	3371	if (source == resetCentroidItem)
2547	3372	{
2548		- ResetCentroid();
	3373	+ ResetCentroid(true);
	3374	+ } else
	3375	+ if (source == resetCentroidXZItem)
	3376	+ {
	3377	+ ResetCentroid(false);
2549	3378	} else
2550	3379	if (source == resetParentItem)
2551	3380	{
..	..	@@ -2650,7 +3479,7 @@
2650	3479	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2651	3480	{
2652	3481	obj = (Object3D)e.nextElement();
2653		- obj.SetBumpTexture(null);
	3482	+ obj.ResetBumpTexture();
2654	3483	}
2655	3484
2656	3485	refreshContents();
..	..	@@ -2666,6 +3495,31 @@
2666	3495
2667	3496	refreshContents();
2668	3497	} else
	3498	+ if (source == embedTexturesItem)
	3499	+ {
	3500	+ Object3D obj;
	3501	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3502	+ {
	3503	+ obj = (Object3D)e.nextElement();
	3504	+ obj.EmbedTextures(true);
	3505	+ }
	3506	+
	3507	+ refreshContents();
	3508	+ } else
	3509	+ if (source == deEmbedTexturesItem)
	3510	+ {
	3511	+ Object3D obj;
	3512	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3513	+ {
	3514	+ obj = (Object3D)e.nextElement();
	3515	+ obj.EmbedTextures(false);
	3516	+ }
	3517	+
	3518	+ CameraPane.texturepigment.clear();
	3519	+ CameraPane.texturebump.clear();
	3520	+
	3521	+ refreshContents();
	3522	+ } else
2669	3523	if (source == flashSelectionButton)
2670	3524	{
2671	3525	CameraPane.flash = true;
..	..	@@ -2677,6 +3531,10 @@
2677	3531	if (source == twoButton)
2678	3532	{
2679	3533	radio.layout = twoButton;
	3534	+
	3535	+ if (CameraPane.FULLSCREEN)
	3536	+ fullscreenLayout = radio.layout;
	3537	+
2680	3538	// bug
2681	3539	//gridPanel.setDividerLocation(1.0);
2682	3540	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2709,10 +3567,31 @@
2709	3567	bigThree.ClearUI();
2710	3568	bigThree.add(centralPanel);
2711	3569	bigThree.FlushUI();
	3570	+
	3571	+ cameraView.requestFocusInWindow();
	3572	+
	3573	+// refreshContents(true);
	3574	+//
	3575	+// try
	3576	+// {
	3577	+// java.awt.Robot bot = new java.awt.Robot();
	3578	+// int mask = InputEvent.BUTTON1_MASK;
	3579	+// bot.mouseMove(100, 100);
	3580	+// bot.mousePress(mask);
	3581	+// bot.mouseRelease(mask);
	3582	+// }
	3583	+// catch (Exception e)
	3584	+// {
	3585	+//
	3586	+// }
	3587	+
2712	3588	} else
2713	3589	if (source == threeButton)
2714	3590	{
2715	3591	radio.layout = threeButton;
	3592	+
	3593	+ if (CameraPane.FULLSCREEN)
	3594	+ fullscreenLayout = radio.layout;
2716	3595
2717	3596	// bigThree.remove(scenePanel);
2718	3597	// bigThree.remove(centralPanel);
..	..	@@ -2742,13 +3621,18 @@
2742	3621	// centralPanel.setVisible(true);
2743	3622	// XYZPanel.setVisible(true);
2744	3623	bigThree.ClearUI();
	3624	+ bigThree.add(scenePanel);
2745	3625	bigThree.add(centralPanel);
2746		- bigThree.add(XYZPanel);
2747	3626	bigThree.FlushUI();
	3627	+
	3628	+ cameraView.requestFocusInWindow();
2748	3629	} else
2749	3630	if (source == fourButton)
2750	3631	{
2751	3632	radio.layout = fourButton;
	3633	+
	3634	+ if (CameraPane.FULLSCREEN)
	3635	+ fullscreenLayout = radio.layout;
2752	3636
2753	3637	// bigThree.remove(scenePanel);
2754	3638	// bigThree.remove(centralPanel);
..	..	@@ -2780,10 +3664,15 @@
2780	3664	bigThree.ClearUI();
2781	3665	bigThree.add(scenePanel);
2782	3666	bigThree.FlushUI();
	3667	+
	3668	+ cameraView.requestFocusInWindow();
2783	3669	} else
2784	3670	if (source == sixButton)
2785	3671	{
2786	3672	radio.layout = sixButton;
	3673	+
	3674	+ if (CameraPane.FULLSCREEN)
	3675	+ fullscreenLayout = radio.layout;
2787	3676
2788	3677	// bigThree.remove(scenePanel);
2789	3678	// bigThree.remove(centralPanel);
..	..	@@ -2813,13 +3702,18 @@
2813	3702	// centralPanel.setVisible(true);
2814	3703	// XYZPanel.setVisible(false);
2815	3704	bigThree.ClearUI();
2816		- bigThree.add(scenePanel);
2817	3705	bigThree.add(centralPanel);
	3706	+ bigThree.add(scenePanel);
2818	3707	bigThree.FlushUI();
	3708	+
	3709	+ cameraView.requestFocusInWindow();
2819	3710	} else
2820	3711	if (source == sevenButton)
2821	3712	{
2822	3713	radio.layout = sevenButton;
	3714	+
	3715	+ if (CameraPane.FULLSCREEN)
	3716	+ fullscreenLayout = radio.layout;
2823	3717
2824	3718	// bigThree.remove(scenePanel);
2825	3719	// bigThree.remove(centralPanel);
..	..	@@ -2853,6 +3747,8 @@
2853	3747	bigThree.add(centralPanel);
2854	3748	bigThree.add(XYZPanel);
2855	3749	bigThree.FlushUI();
	3750	+
	3751	+ cameraView.requestFocusInWindow();
2856	3752	} else
2857	3753	if (source == rootButton)
2858	3754	{
..	..	@@ -2864,6 +3760,7 @@
2864	3760	EditObject(obj);
2865	3761	}
2866	3762
	3763	+ cameraView.requestFocusInWindow();
2867	3764	refreshContents(true);
2868	3765	} else
2869	3766	if (source == closeButton)
..	..	@@ -2873,22 +3770,37 @@
2873	3770	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2874	3771	{
2875	3772	ab = (cRadio)e.nextElement();
2876		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3773	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2877	3774	{
	3775	+ // Patch to avoid bug with transparency.
	3776	+ if (!ab.hadMaterial)
	3777	+ {
	3778	+ ab.object.material = null;
	3779	+ }
	3780	+
2878	3781	buttonGroup.remove(ab);
2879	3782	radioPanel.remove(ab);
2880	3783
2881		- ab.GetObject().editWindow = null;
	3784	+ //ab.GetObject().editWindow = null;
	3785	+ ab.GetObject().manipWindow = null;
2882	3786	// ab.GetObject().objectUI = null; // ?????????
2883	3787
2884	3788	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2885	3789	break;
2886	3790	}
2887	3791	}
	3792	+
	3793	+ cameraView.requestFocusInWindow();
2888	3794	refreshContents(true);
2889	3795	} else
2890	3796	if (source == editItem \|\| source == editButton)
2891	3797	{
	3798	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3799	+ {
	3800	+ Object3D child = (Object3D)e.nextElement();
	3801	+ child.pinned = true;
	3802	+ }
	3803	+
2892	3804	EditSelection(false);
2893	3805	} else
2894	3806	if (source == uneditButton)
..	..	@@ -2898,12 +3810,13 @@
2898	3810	Object3D child = (Object3D)e.nextElement();
2899	3811	if(child.editWindow != null)
2900	3812	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3813	+ child.pinned = false;
2901	3814	child.CloseUI();
2902	3815	listUI.remove(child);
2903	3816
2904		- child.editWindow = null; // ???????????
	3817	+ //child.editWindow = null; // ???????????
2905	3818	}
2906		- objEditor.ctrlPanel.validate();
	3819	+ objEditor.ctrlPanel.FlushUI();
2907	3820	//objEditor.jTree.clearSelection();
2908	3821	//objEditor.ResetSliders();
2909	3822	refreshContents(true);
..	..	@@ -2914,6 +3827,7 @@
2914	3827	//copy.ClearUI();
2915	3828	for (Object3D obj : listUI)
2916	3829	{
	3830	+ obj.pinned = false;
2917	3831	obj.CloseUI();
2918	3832	}
2919	3833	listUI.clear();
..	..	@@ -2923,7 +3837,7 @@
2923	3837	{
2924	3838	assert(copy == group);
2925	3839
2926		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3840	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2927	3841
2928	3842	for (Object3D obj : listUI)
2929	3843	{
..	..	@@ -2972,6 +3886,9 @@
2972	3886	}
2973	3887
2974	3888	copy = group;
	3889	+
	3890	+ SetUndoStates();
	3891	+
2975	3892	//Globals.theRenderer.object = group;
2976	3893	if(!useclient)
2977	3894	{
..	..	@@ -2987,20 +3904,46 @@
2987	3904	frontView.object = group;
2988	3905	sideView.object = group;
2989	3906	}
2990		- group.editWindow = this;
	3907	+
	3908	+// fix "+" issue
	3909	+ //group.editWindow = this;
	3910	+ group.manipWindow = this;
	3911	+
2991	3912	/*
2992	3913	currentLayout = radio.layout;
2993	3914	if (currentLayout == null)
2994	3915	currentLayout = sevenButton;
2995	3916	*/
2996	3917	radio.layout.doClick();
	3918	+
	3919	+ ClearUnpinned();
	3920	+ //Grafreed.Assert(group != null);
	3921	+ //Grafreed.Assert(group.selection != null);
	3922	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	3923	+ if (group.selection == null \|\| group.selection.size() == 1)
	3924	+ EditSelection(false);
2997	3925	keepparent = group.parent;
2998	3926	// PARENT = NULL or not???
2999	3927	//group.parent = null; // ROOT
3000	3928	//group.attributes = -1;
3001	3929	ResetModel();
	3930	+
	3931	+ cameraView.requestFocusInWindow();
3002	3932	refreshContents(true);
3003		- }
	3933	+ } else if (event.getSource() == editCameraItem)
	3934	+ {
	3935	+ cameraView.ProtectCamera();
	3936	+ cameraView.repaint();
	3937	+ return;
	3938	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3939	+ {
	3940	+ cameraView.RevertCamera();
	3941	+ cameraView.repaint();
	3942	+ return;
	3943	+ // } else if (event.getSource() == textureButton)
	3944	+ // {
	3945	+ // return; // true;
	3946	+ }
3004	3947	else
3005	3948	{
3006	3949	//return super.action(event, arg);
..	..	@@ -3009,7 +3952,6 @@
3009	3952	}
3010	3953
3011	3954	boolean useclient = false;
3012		- cRadio radio;
3013	3955
3014	3956	void ToggleRoot()
3015	3957	{
..	..	@@ -3061,6 +4003,28 @@
3061	4003	refreshContents();
3062	4004	}
3063	4005
	4006	+ void TransformChildren()
	4007	+ {
	4008	+ Object3D obj;
	4009	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4010	+ {
	4011	+ obj = (Object3D)e.nextElement();
	4012	+ obj.KeepTextureMatrices();
	4013	+ obj.TransformChildren();
	4014	+ obj.RestoreTextureMatrices();
	4015	+
	4016	+// if (obj.parent == null)
	4017	+// {
	4018	+// System.out.println("NULL PARENT!");
	4019	+// new Exception().printStackTrace();
	4020	+// }
	4021	+// else
	4022	+// TouchTransform(obj);
	4023	+// //obj.parent.Touch();
	4024	+ }
	4025	+
	4026	+ refreshContents();
	4027	+ }
3064	4028
3065	4029	void ResetTransform()
3066	4030	{
..	..	@@ -3173,7 +4137,7 @@
3173	4137	refreshContents();
3174	4138	}
3175	4139
3176		- void ResetCentroid()
	4140	+ void ResetCentroid(boolean full)
3177	4141	{
3178	4142	Object3D obj;
3179	4143	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3188,12 +4152,16 @@
3188	4152	LA.matIdentity(Object3D.mat);
3189	4153	obj.getBounds(minima, maxima, false);
3190	4154	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3191		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	4155	+ if (full)
	4156	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3192	4157	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3193	4158	obj.TransformMesh(Object3D.mat);
	4159	+
3194	4160	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3195		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	4161	+ if (full)
	4162	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3196	4163	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	4164	+
3197	4165	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3198	4166	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3199	4167	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3222,7 +4190,8 @@
3222	4190
3223	4191	int size = obj.MemorySize();
3224	4192
3225		- System.err.println((size/1024) + " KB is the size of " + obj);
	4193	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4194	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3226	4195	}
3227	4196	}
3228	4197	catch (Exception e)
..	..	@@ -3259,9 +4228,9 @@
3259	4228	obj = (Object3D)e.nextElement();
3260	4229
3261	4230	System.out.println("Object is: " + obj);
3262		- GrafreeD.AnalyzeObject(obj);
	4231	+ Grafreed.AnalyzeObject(obj);
3263	4232	System.out.println("Boundary rep: " + obj.bRep);
3264		- GrafreeD.AnalyzeObject(obj.bRep);
	4233	+ Grafreed.AnalyzeObject(obj.bRep);
3265	4234
3266	4235	// System.err.println((size/1024) + " KB is the size of " + obj);
3267	4236	}
..	..	@@ -3303,6 +4272,13 @@
3303	4272	void GenNormals(boolean crease)
3304	4273	{
3305	4274	group.GenNormalsS(crease);
	4275	+
	4276	+ refreshContents();
	4277	+ }
	4278	+
	4279	+ void GenNormalsMESH()
	4280	+ {
	4281	+ group.GenNormalsMeshS();
3306	4282
3307	4283	refreshContents();
3308	4284	}
..	..	@@ -3475,8 +4451,8 @@
3475	4451
3476	4452	void ParseVertices()
3477	4453	{
3478		- boolean epsequal = GrafreeD.epsequal;
3479		- GrafreeD.epsequal = true;
	4454	+ boolean epsequal = Grafreed.epsequal;
	4455	+ Grafreed.epsequal = true;
3480	4456
3481	4457	for (int i=0; i<group.selection.size(); i++)
3482	4458	{
..	..	@@ -3501,7 +4477,7 @@
3501	4477	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3502	4478	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3503	4479
3504		- g.add(GrafreeD.clipboard);
	4480	+ g.add(Grafreed.clipboard);
3505	4481
3506	4482	buffer.add(g);
3507	4483	}
..	..	@@ -3516,7 +4492,7 @@
3516	4492	makeSomething(buffer, i==group.selection.size()-1);
3517	4493	}
3518	4494
3519		- GrafreeD.epsequal = epsequal;
	4495	+ Grafreed.epsequal = epsequal;
3520	4496
3521	4497	refreshContents();
3522	4498	}
..	..	@@ -3534,7 +4510,16 @@
3534	4510	String pigment = Object3D.GetPigment(tex);
3535	4511	//String bump = Object3D.GetBump(tex);
3536	4512
3537		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4513	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4514	+
	4515	+ try
	4516	+ {
	4517	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
	4518	+ }
	4519	+ catch (Exception e)
	4520	+ {
	4521	+ System.err.println("FAIL: " + node);
	4522	+ }
3538	4523
3539	4524	double s = v.s;
3540	4525
..	..	@@ -3622,11 +4607,11 @@
3622	4607
3623	4608	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3624	4609
3625		- boolean random = CameraPane.RANDOM;
3626		- CameraPane.RANDOM = false; // parse all random nodes
	4610	+ boolean random = CameraPane.SWITCH;
	4611	+ CameraPane.SWITCH = false; // parse all random nodes
3627	4612	lowres.linkVerticesThis(null);
3628	4613	lowres.linkVerticesThis(sn);
3629		- CameraPane.RANDOM = random;
	4614	+ CameraPane.SWITCH = random;
3630	4615
3631	4616	System.err.flush();
3632	4617
..	..	@@ -3666,7 +4651,7 @@
3666	4651	return;
3667	4652
3668	4653	Object3D poses = group.selection.get(0);
3669		- Object3D ref = GrafreeD.clipboard.get(0);
	4654	+ Object3D ref = Grafreed.clipboard.get(0);
3670	4655
3671	4656	Object3D newgroup = new Object3D("Po:" + poses.name);
3672	4657
..	..	@@ -3860,9 +4845,9 @@
3860	4845
3861	4846	void ClipMesh()
3862	4847	{
3863		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4848	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3864	4849	{
3865		- Object3D content = GrafreeD.clipboard.get(0);
	4850	+ Object3D content = Grafreed.clipboard.get(0);
3866	4851
3867	4852	if (content instanceof cGroup && ((cGroup)content).transientlink )
3868	4853	content = ((cGroup)content).get(0);
..	..	@@ -3871,7 +4856,7 @@
3871	4856	// {
3872	4857	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3873	4858	// }
3874		- group.selection.ClipMesh(GrafreeD.clipboard);
	4859	+ group.selection.ClipMesh(Grafreed.clipboard);
3875	4860	}
3876	4861	// group.selection.ClipMesh(GrafreeD.clipboard);
3877	4862	System.out.println("DONE.");
..	..	@@ -3918,6 +4903,18 @@
3918	4903	void MarkLeaves(boolean hide)
3919	4904	{
3920	4905	group.selection.MarkLeaves(hide);
	4906	+ refreshContents();
	4907	+ }
	4908	+
	4909	+ void RewindLeaves(boolean hide)
	4910	+ {
	4911	+ group.selection.RewindLeaves(hide);
	4912	+ refreshContents();
	4913	+ }
	4914	+
	4915	+ void RandomLeaves(boolean hide)
	4916	+ {
	4917	+ group.selection.RandomLeaves(hide);
3921	4918	refreshContents();
3922	4919	}
3923	4920
..	..	@@ -3992,28 +4989,25 @@
3992	4989	// }
3993	4990	// }
3994	4991
3995		- static boolean allparams = true;
3996		-
3997		- static Vector<Object3D> listUI = new Vector<Object3D>();
3998		-
3999	4992	void EditSelection(boolean newWindow)
4000	4993	{
	4994	+ if (group.selection == null)
	4995	+ {
	4996	+ EditElement(group, newWindow); // ? new
	4997	+ return;
	4998	+ }
	4999	+
4001	5000	// aConstraints.gridy = 0;
4002	5001	for (int i=0; i<group.selection.size(); i++)
4003	5002	{
4004	5003	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4005	5004	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4006		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5005	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4007	5006
4008	5007	Object3D elem = (Object3D)group.selection.elementAt(i);
4009		- if(elem != group)
	5008	+ if(elem != group \|\| !newWindow)
4010	5009	{
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
	5010	+ EditElement(elem, newWindow); // ? new
4017	5011	}
4018	5012	}
4019	5013	}
..	..	@@ -4088,7 +5082,8 @@
4088	5082	//new Exception().printStackTrace();
4089	5083
4090	5084	freezemodel = true;
4091		-
	5085	+ ClearUnpinned();
	5086	+
4092	5087	/**/
4093	5088	//switch (event.id)
4094	5089	{
..	..	@@ -4096,7 +5091,6 @@
4096	5091	//case 702: // Event.LIST_DESELECT
4097	5092	group.deselectAll();
4098	5093	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4099		- objEditor.ClearInfo(); // .GetMaterial());
4100	5094	if (tps != null)
4101	5095	{
4102	5096	for (int i=0; i < tps.length; i++)
..	..	@@ -4105,10 +5099,8 @@
4105	5099
4106	5100	//if (child.parent != null)
4107	5101	//child.parent.addSelectee(child);
	5102	+ objEditor.SetMaterial(child);
4108	5103	group.addSelectee(child);
4109		- objEditor.SetMaterial(child); // .GetMaterial());
4110		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4111		- System.err.println("info : " + child.GetPath());
4112	5104	}
4113	5105	}
4114	5106	// else
..	..	@@ -4118,20 +5110,28 @@
4118	5110	// System.err.println("info : " + group.GetPath());
4119	5111	// }
4120	5112
4121		- objEditor.SetText(); // jan 2014
4122		-
4123		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	5113	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4124	5114	CameraPane.flash = true;
4125	5115
4126		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5116	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4127	5117	// a camera
4128	5118	{
4129		- CameraPane.camerachangeframe = 0; // don't refuse it
4130		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5119	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5120	+ {
	5121	+ CameraPane.camerachangeframe = 0; // don't refuse it
	5122	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5123	+ }
4131	5124	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4132	5125	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4133	5126	}
4134	5127
	5128	+ if (tps != null && tps.length == 1)
	5129	+ {
	5130	+ EditSelection(false);
	5131	+ }
	5132	+
	5133	+ SetPinStates(tps != null && tps.length > 0);
	5134	+
4135	5135	refreshContents();
4136	5136	//return true;
4137	5137	}
..	..	@@ -4140,6 +5140,35 @@
4140	5140
4141	5141	freezemodel = false;
4142	5142	}
	5143	+
	5144	+ void SetPinStates(boolean enabled)
	5145	+ {
	5146	+ editButton.setEnabled(enabled);
	5147	+ uneditButton.setEnabled(enabled);
	5148	+ unselectButton.setEnabled(enabled);
	5149	+ flashSelectionButton.setEnabled(enabled);
	5150	+ }
	5151	+
	5152	+ void refreshContents(boolean cp)
	5153	+ {
	5154	+ if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5155	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5156	+ {
	5157	+ objEditor.ClearInfo(); // .GetMaterial());
	5158	+
	5159	+ for (int i=0; i < group.selection.Size(); i++)
	5160	+ {
	5161	+ Object3D child = (Object3D) group.selection.get(i);
	5162	+
	5163	+ objEditor.AddInfo(child, this, true);
	5164	+ System.err.println("info : " + child.GetPath());
	5165	+ }
	5166	+
	5167	+ objEditor.SetText(); // jan 2014
	5168	+ }
	5169	+
	5170	+ super.refreshContents(cp);
	5171	+ }
4143	5172
4144	5173	void linkSomething(Object3D thing)
4145	5174	{
..	..	@@ -4211,16 +5240,19 @@
4211	5240	{
4212	5241	if (group.selection.isEmpty())
4213	5242	return;
4214		- GrafreeD.clipboardIsTempGroup = false;
	5243	+
	5244	+ Grafreed.clipboardIsTempGroup = false;
4215	5245	Composite tGroup = null;
4216	5246	if (group.selection.size() > 0) // 1)
4217	5247	{
4218	5248	tGroup = new cGroup();
4219		- GrafreeD.clipboardIsTempGroup = true;
	5249	+ Grafreed.clipboardIsTempGroup = true;
4220	5250	}
4221	5251
4222	5252	if (cut)
4223	5253	{
	5254	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5255	+// Save();
4224	5256	//int indices[] = jList.getSelectedIndices();
4225	5257	//for (int i = indices.length - 1; i >= 0; i--)
4226	5258	//jList.remove(indices[i]);
..	..	@@ -4256,16 +5288,16 @@
4256	5288	//System.out.println("cut " + child);
4257	5289	//System.out.println("parent = " + child.parent);
4258	5290	// tmp.addChild(child);
4259		- if (GrafreeD.clipboardIsTempGroup)
	5291	+ if (Grafreed.clipboardIsTempGroup)
4260	5292	tGroup.add/Child/(tmp);
4261	5293	else
4262		- GrafreeD.clipboard = tmp;
	5294	+ Grafreed.clipboard = tmp;
4263	5295	}
4264	5296	else
4265		- if (GrafreeD.clipboardIsTempGroup)
	5297	+ if (Grafreed.clipboardIsTempGroup)
4266	5298	tGroup.add/Child/(child);
4267	5299	else
4268		- GrafreeD.clipboard = child;
	5300	+ Grafreed.clipboard = child;
4269	5301	}
4270	5302
4271	5303	//ResetModel();
..	..	@@ -4297,21 +5329,23 @@
4297	5329	//System.out.println("cut " + elem);
4298	5330	//System.out.println("parent = " + elem.parent);
4299	5331	// tmp.addChild(elem);
4300		- if (GrafreeD.clipboardIsTempGroup)
	5332	+ if (Grafreed.clipboardIsTempGroup)
4301	5333	tGroup.add/Child/(tmp);
4302	5334	else
4303		- GrafreeD.clipboard = tmp;
	5335	+ Grafreed.clipboard = tmp;
4304	5336	}
4305	5337	else
4306		- if (GrafreeD.clipboardIsTempGroup)
	5338	+ if (Grafreed.clipboardIsTempGroup)
4307	5339	tGroup.add/Child/(child);
4308	5340	else
4309		- GrafreeD.clipboard = child;
	5341	+ Grafreed.clipboard = child;
4310	5342	}
4311	5343
4312	5344	}
4313		- if (GrafreeD.clipboardIsTempGroup)
4314		- GrafreeD.clipboard = tGroup;
	5345	+
	5346	+ if (Grafreed.clipboardIsTempGroup)
	5347	+ Grafreed.clipboard = tGroup;
	5348	+
4315	5349	if (cut)
4316	5350	{
4317	5351	ResetModel();
..	..	@@ -4321,11 +5355,15 @@
4321	5355
4322	5356	void paste(boolean expand)
4323	5357	{
	5358	+ if (Globals.REPLACEONMAKE)
	5359	+ Save();
	5360	+ boolean keep = Globals.REPLACEONMAKE;
	5361	+ Globals.REPLACEONMAKE = false;
4324	5362	// if (GrafreeD.clipboard == null)
4325	5363	// return;
4326	5364	boolean first = true;
4327	5365
4328		- if (GrafreeD.clipboardIsTempGroup)
	5366	+ if (Grafreed.clipboardIsTempGroup)
4329	5367	{
4330	5368	Composite temp;
4331	5369
..	..	@@ -4336,7 +5374,7 @@
4336	5374	temp = (Composite)Applet3D.clipboard.deepCopy();
4337	5375	*/
4338	5376	Object3D elem;
4339		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5377	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4340	5378	{
4341	5379	Object3D child = (Object3D)e.nextElement();
4342	5380
..	..	@@ -4370,21 +5408,22 @@
4370	5408	//Object3D cb = Applet3D.clipboard;
4371	5409	//temp.addChild(cb);
4372	5410	//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());
	5411	+ assert(Grafreed.clipboard.parent == null);
	5412	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5413	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5414	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5415	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4378	5416	else
4379		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4380		- GrafreeD.clipboard.get(0).parent = keepparent;
	5417	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5418	+ Grafreed.clipboard.get(0).parent = keepparent;
4381	5419	}
4382	5420
	5421	+ Globals.REPLACEONMAKE = keep;
4383	5422	ResetModel();
4384	5423	refreshContents();
4385	5424	}
4386	5425
4387		- void pasteInto(boolean copyit)
	5426	+ void pasteInto(boolean copyit, boolean clone)
4388	5427	{
4389	5428	// if (GrafreeD.clipboard == null)
4390	5429	// return;
..	..	@@ -4413,15 +5452,22 @@
4413	5452	if (copyit)
4414	5453	{
4415	5454	// paste(false);
4416		- CloneClipboard(false); // sept 2014
	5455	+ if (clone)
	5456	+ {
	5457	+ CloneClipboard(false); // sept 2014
	5458	+ }
	5459	+ else
	5460	+ {
	5461	+ paste(false);
	5462	+ }
4417	5463	}
4418	5464	else
4419	5465	{
4420	5466	boolean first = true;
4421	5467
4422		- if (GrafreeD.clipboardIsTempGroup)
	5468	+ if (Grafreed.clipboardIsTempGroup)
4423	5469	{
4424		- Composite temp = (Composite)GrafreeD.clipboard;
	5470	+ Composite temp = (Composite)Grafreed.clipboard;
4425	5471	Object3D copy;
4426	5472	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4427	5473	{
..	..	@@ -4431,7 +5477,7 @@
4431	5477	}
4432	5478	} else
4433	5479	{
4434		- linkSomething(GrafreeD.clipboard); //.get(0));
	5480	+ linkSomething(Grafreed.clipboard); //.get(0));
4435	5481	}
4436	5482	}
4437	5483	}
..	..	@@ -4508,6 +5554,10 @@
4508	5554
4509	5555	void group(Object3D csg, boolean grab)
4510	5556	{
	5557	+ if (Globals.REPLACEONMAKE)
	5558	+ Save();
	5559	+ boolean keep = Globals.REPLACEONMAKE;
	5560	+ Globals.REPLACEONMAKE = false;
4511	5561	if (//false) // why??
4512	5562	!group.selection.isEmpty())
4513	5563	{
..	..	@@ -4621,10 +5671,15 @@
4621	5671	//node.add(csg);
4622	5672	//makeSomething(node);
4623	5673	makeSomething(csg);
	5674	+ Globals.REPLACEONMAKE = keep;
4624	5675	}
4625	5676
4626	5677	void Ungroup(Object3D g)
4627	5678	{
	5679	+ if (Globals.REPLACEONMAKE)
	5680	+ Save();
	5681	+ boolean keep = Globals.REPLACEONMAKE;
	5682	+ Globals.REPLACEONMAKE = false;
4628	5683	if (g instanceof HiddenObject)
4629	5684	{
4630	5685	HiddenObject h = (HiddenObject) g;
..	..	@@ -4641,6 +5696,7 @@
4641	5696	objEditor.makeSomething(g.get(i), false);
4642	5697	}
4643	5698	}
	5699	+ Globals.REPLACEONMAKE = keep;
4644	5700	}
4645	5701
4646	5702	void ungroup()
..	..	@@ -4836,21 +5892,6 @@
4836	5892	}
4837	5893	*/
4838	5894
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	5895	/*
4855	5896	public void Callback(Object obj)
4856	5897	{
..	..	@@ -4874,26 +5915,9 @@
4874	5915	}
4875	5916	*/
4876	5917
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	5918	String GetFile(String dialogName)
4895	5919	{
4896		- if (GrafreeD.standAlone)
	5920	+ if (Grafreed.standAlone)
4897	5921	{
4898	5922	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4899	5923	browser.show();
..	..	@@ -4957,10 +5981,49 @@
4957	5981	cButton flashSelectionButton;
4958	5982	cButton editButton;
4959	5983	cButton uneditButton;
	5984	+ JCheckBox allParamsButton;
4960	5985	cButton clearpanelButton;
4961		- cButton allParamsButton;
4962	5986	cButton unselectButton;
4963	5987
	5988	+ cButton restoreCameraButton;
	5989	+
	5990	+ cButton saveButton;
	5991	+ cButton oneStepButton;
	5992	+
	5993	+ cButton groupButton;
	5994	+ cButton ungroupButton;
	5995	+ cButton compositeButton;
	5996	+ cButton switchButton;
	5997	+ cButton loopButton;
	5998	+ cButton textureButton;
	5999	+
	6000	+ cButton skybox1Button;
	6001	+ cButton skybox2Button;
	6002	+ cButton skybox3Button;
	6003	+ cButton skybox4Button;
	6004	+ cButton skybox5Button;
	6005	+ cButton skybox6Button;
	6006	+ cButton skybox7Button;
	6007	+
	6008	+ cButton skybox11Button;
	6009	+ cButton skybox12Button;
	6010	+ cButton skybox13Button;
	6011	+ cButton skybox14Button;
	6012	+ cButton skybox15Button;
	6013	+ cButton skybox16Button;
	6014	+ cButton skybox17Button;
	6015	+
	6016	+ cButton gridButton;
	6017	+ cButton boxButton;
	6018	+ cButton sphereButton;
	6019	+ cButton coneButton;
	6020	+ cButton torusButton;
	6021	+ cButton superButton;
	6022	+ cButton kleinButton;
	6023	+ cButton particlesButton;
	6024	+ cButton overlayButton;
	6025	+ cButton lightButton;
	6026	+
4964	6027	cButton screenfitButton;
4965	6028	cButton screenfitpointButton;
4966	6029	cButton snapobjectButton;
..	..	@@ -4972,14 +6035,6 @@
4972	6035
4973	6036	cButton setsupportButton;
4974	6037
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	6038	//
4984	6039	//Composite
4985	6040	Object3D // to do !!
..	..	@@ -4989,9 +6044,11 @@
4989	6044	//JTree jTree;
4990	6045	private MenuItem lookAtItem;
4991	6046	private MenuItem lookFromItem;
4992		- private MenuItem switchItem;
	6047	+ private MenuItem switchViewItem;
4993	6048	private MenuItem cutItem;
4994		- private MenuItem duplicateItem;
	6049	+ private MenuItem undoItem;
	6050	+ private MenuItem redoItem;
	6051	+ private JMenuItem duplicateItem;
4995	6052	private MenuItem cloneItem;
4996	6053	private MenuItem cloneSupportItem;
4997	6054	private MenuItem overwriteGeoItem;
..	..	@@ -5004,7 +6061,7 @@
5004	6061	private MenuItem linkverticesItem;
5005	6062	private MenuItem relinkverticesItem;
5006	6063	private MenuItem setMasterItem;
5007		- private MenuItem resetMeshItem;
	6064	+ private MenuItem resetAllItem;
5008	6065	private MenuItem stepAllItem;
5009	6066	private MenuItem revertMeshItem;
5010	6067	private MenuItem poseMeshItem;
..	..	@@ -5015,10 +6072,11 @@
5015	6072	private MenuItem mergeGeometriesItem;
5016	6073	private MenuItem copyItem;
5017	6074	private MenuItem pasteItem;
	6075	+ private MenuItem pasteIntoItem;
5018	6076	private MenuItem pasteLinkItem;
5019	6077	private MenuItem pasteCloneItem;
5020	6078	private MenuItem pasteExpandItem;
5021		- private MenuItem clearItem;
	6079	+ private MenuItem deleteItem;
5022	6080	private MenuItem clearAllItem;
5023	6081	private MenuItem genUVItem;
5024	6082	private MenuItem genNormalsMESHItem;
..	..	@@ -5053,6 +6111,10 @@
5053	6111	private MenuItem showleavesItem;
5054	6112	private MenuItem markleavesItem;
5055	6113	private MenuItem unmarkleavesItem;
	6114	+ private MenuItem rewindleavesItem;
	6115	+ private MenuItem unrewindleavesItem;
	6116	+ private MenuItem randomleavesItem;
	6117	+ private MenuItem unrandomleavesItem;
5056	6118
5057	6119	private MenuItem flipVItem;
5058	6120	private MenuItem unflipVItem;
..	..	@@ -5064,15 +6126,17 @@
5064	6126	private MenuItem panoTexturesItem;
5065	6127
5066	6128	private MenuItem resetCentroidItem;
5067		- private MenuItem transformgeometryItem;
	6129	+ private MenuItem resetCentroidXZItem;
5068	6130	private MenuItem resetTransformItem;
	6131	+ private MenuItem transformGeometryItem;
	6132	+ private MenuItem transformChildrenItem;
5069	6133	private MenuItem hideItem;
5070	6134	private MenuItem grabItem;
5071	6135	private MenuItem backItem;
5072	6136	private MenuItem frontItem;
5073	6137	private MenuItem cameraItem;
5074	6138	private MenuItem compositeItem;
5075		- private MenuItem randomItem;
	6139	+ private MenuItem switchItem;
5076	6140	private MenuItem physicsItem;
5077	6141	private MenuItem frameselectorItem;
5078	6142	private MenuItem scriptNodeItem;
..	..	@@ -5096,6 +6160,8 @@
5096	6160	private MenuItem attachBumpItem;
5097	6161	private MenuItem detachBumpItem;
5098	6162	private MenuItem pigmentBumpItem;
	6163	+ private MenuItem embedTexturesItem;
	6164	+ private MenuItem deEmbedTexturesItem;
5099	6165
5100	6166	private MenuItem particleItem;
5101	6167	private MenuItem ragdollItem;
..	..	@@ -5112,7 +6178,7 @@
5112	6178	private MenuItem blobItem;
5113	6179	private MenuItem latheItem;
5114	6180	private MenuItem bezierItem;
5115		- private MenuItem checkerItem;
	6181	+ private MenuItem overlayItem;
5116	6182	private MenuItem meshItem;
5117	6183	// private MenuItem meshGroupItem;
5118	6184	private MenuItem springItem;
..	..	@@ -5134,11 +6200,6 @@
5134	6200	private MenuItem doubleItem;
5135	6201	private MenuItem tripleItem;
5136	6202
5137		- private MenuItem importGFDItem;
5138		- private MenuItem importVRMLX3DItem;
5139		- private MenuItem import3DSItem;
5140		- private MenuItem importOBJItem;
5141		-
5142	6203	private MenuItem computeAOItem;
5143	6204	private MenuItem recompileItem;
5144	6205	private MenuItem editScriptItem;
..	..	@@ -5148,4 +6209,8 @@
5148	6209	private MenuItem analyzeItem;
5149	6210	private MenuItem dumpItem;
5150	6211	//boolean freezemodel = false;
	6212	+
	6213	+ Menu cameraMenu;
	6214	+ MenuItem editCameraItem;
	6215	+ MenuItem restoreCameraItem;
5151	6216	}