~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,96 +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(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
444		- fastCB.setToolTipText("Fast mode");
445		- fastCB.addItemListener(this);
446		-
447		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
448		- trackCB.setToolTipText("Enable tracking");
449		- trackCB.addItemListener(this);
450		-
451		- 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);
452	927	screenfitButton.setToolTipText("Screen fit");
453	928	screenfitButton.addActionListener(this);
454	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	+
455	979	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
456	980	// screenfitpointButton.addActionListener(this);
457		-// oe.aConstraints.gridx += 1;
458		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
459		- snapobjectButton.addActionListener(this);
460		- snapobjectButton.setToolTipText("Snap Object");
461		- oe.aConstraints.gridx += 1;
462	981
463		- //aConstraints.gridx = 0;
464		- //aConstraints.gridy += 1;
465		- oe.aConstraints.weighty = 0;
466		- oe.aConstraints.gridwidth = 1;
467		-
468		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
469		- flashSelectionButton.setToolTipText("Show selection");
470		- flashSelectionButton.addActionListener(this);
471		-
472		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
473		-
474		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
475		- twoButton.setToolTipText("Show center view only");
476		- twoButton.addActionListener(this);
477		- 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);
478	989	fourButton.addActionListener(this);
479		- fourButton.setToolTipText("Show left panel only");
480		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
481		- sixButton.setToolTipText("2-column layout left");
482		- sixButton.addActionListener(this);
483		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
484		- 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");
485	1002	threeButton.addActionListener(this);
486		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
487		- sevenButton.setToolTipText("3-column layout");
488		- 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);
489	1009	//
490	1010
491		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
492		- 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");
493	1013	rootButton.addActionListener(this);
494	1014
495		- 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);
496	1016	closeButton.setToolTipText("Close tab");
497	1017	closeButton.addActionListener(this);
498	1018	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
499	1019	//clearButton.addActionListener(this);
500		-
501		- cGridBag commandsPanel = new cGridBag();
	1020	+
	1021	+ cGridBag row1 = new cGridBag();
502	1022
503		- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
504		- 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");
505	1110	editButton.addActionListener(this);
506	1111
507		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
508		- uneditButton.setToolTipText("Unedit selection");
	1112	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1113	+ uneditButton.setToolTipText("Remove selection controls");
509	1114	uneditButton.addActionListener(this);
510	1115
511		- 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);
512	1121	clearPanelButton.setToolTipText("Clear edit panel");
513	1122	clearPanelButton.addActionListener(this);
514	1123
515		- commandsPanel.add(allParamsButton = new cButton("A", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
516		- allParamsButton.setToolTipText("All params??");
517		- allParamsButton.addActionListener(this);
518		-
519		- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1124	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
520	1125	unselectButton.setToolTipText("Unselect");
521	1126	unselectButton.addActionListener(this);
522	1127
523		- 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);
524	1131
525		- oe.treePanel.add(commandsPanel);
526		- oe.treePanel.Return();
	1132	+ editCommandsPanel.preferredHeight = 1;
	1133	+
	1134	+ SetPinStates(false);
	1135	+// oe.treePanel.add(commandsPanel);
	1136	+// oe.treePanel.Return();
527	1137
528	1138	// oe.aConstraints.gridx += 1;
529	1139	// oe.aConstraints.weighty = 0;
..	..	@@ -540,32 +1150,20 @@
540	1150
541	1151	JScrollPane jSP;
542	1152	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
543		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1153	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
544	1154	ResetModel();
545	1155
546	1156	oe.treePanel.add(jSPPanel);
547	1157	oe.treePanel.Return();
548	1158
549		- cGridBag copyOptionsPanel = new cGridBag();
550		-
551		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
552		- colorCB.setToolTipText("Copy color when dropped");
553		- colorCB.addItemListener(this);
554		-
555		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
556		- materialCB.setToolTipText("Copy material when dropped");
557		- materialCB.addItemListener(this);
558		-
559		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
560		- textureCB.setToolTipText("Copy texture when dropped");
561		- textureCB.addItemListener(this);
562		-
563		- copyOptionsPanel.preferredHeight = 1;
564	1159	oe.treePanel.add(copyOptionsPanel);
565	1160	oe.treePanel.Return();
	1161	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1162	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1163	+ sliderPane.preferredHeight = 1;
566	1164
567		-// mainPanel.setDividerLocation(0.5); //1.0);
568		-// mainPanel.setResizeWeight(0.5);
	1165	+// mainPanel.setDividerLocation(0.1); //1.0);
	1166	+ mainPanel.setResizeWeight(0.4);
569	1167
570	1168	//jList.addListSelectionListener(this);
571	1169	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -573,7 +1171,7 @@
573	1171	//jTree.setEditable(true);
574	1172	oe.jTree.setDragEnabled(true);
575	1173	//jTree.setPreferredSize(new Dimension(10,10));
576		- jSP.setPreferredSize(new Dimension(100,200));
	1174	+ //jSP.setPreferredSize(new Dimension(100,200));
577	1175
578	1176	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
579	1177
..	..	@@ -585,19 +1183,49 @@
585	1183	dgr.addDragGestureListener(this);
586	1184	}catch(Exception e) {}
587	1185	*/
588		- radio.layout = sevenButton;
	1186	+ radio.layout = sixButton; // sevenButton;
589	1187	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
590	1188	}
591	1189
592	1190	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
593	1191	{
594		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
595		- supportCB.setToolTipText("Enabled rigging");
596		- 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);
	1195	+
	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);
597	1223
598	1224	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
599	1225	// localCB.addItemListener(this);
600	1226
	1227	+ panel.Return();
	1228	+
601	1229	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
602	1230	crowdCB.setToolTipText("Used for crowds");
603	1231	crowdCB.addItemListener(this);
..	..	@@ -606,22 +1234,19 @@
606	1234	smoothCB.setToolTipText("Snapping delay");
607	1235	smoothCB.addItemListener(this);
608	1236
609		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
610		- slowCB.setToolTipText("Smooth interpolation");
611		- slowCB.addItemListener(this);
	1237	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1238	+// slowCB.setToolTipText("Smooth interpolation");
	1239	+// slowCB.addItemListener(this);
	1240	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1241	+ minshaderCB.setToolTipText("Minimal fast shader");
	1242	+ minshaderCB.addItemListener(this);
612	1243
613		- panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
614		- boxCB.setToolTipText("Display bounding boxes");
615		- boxCB.addItemListener(this);
616		-
617		- panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
618		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
619		- zoomBoxCB.addItemListener(this);
620		-
621	1244	// constraints.gridy += 1;
622	1245	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
623	1246	// speakerMocapCB.addItemListener(this);
624	1247
	1248	+ panel.Return();
	1249	+
625	1250	if (false)
626	1251	{
627	1252	// handled in scripts
..	..	@@ -636,40 +1261,85 @@
636	1261	//constraints.gridy += 1;
637	1262	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
638	1263	smoothfocusCB.addItemListener(this);
	1264	+ panel.Return();
639	1265	}
640	1266
641	1267	//constraints.gridx += 1;
642	1268	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
643	1269	// debugCB.addItemListener(this);
644	1270
	1271	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1272	+ trackCB.setToolTipText("Enable tracking target");
	1273	+ trackCB.addItemListener(this);
	1274	+
645	1275	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1276	+ oeilCB.setToolTipText("Move camera when tracking");
646	1277	oeilCB.addItemListener(this);
647	1278
	1279	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1280	+ shadowCB.setToolTipText("When live compute shadows");
	1281	+ shadowCB.addItemListener(this);
	1282	+
	1283	+ panel.Return();
	1284	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1285	+ toggleTextureCB.setToolTipText("Load textures");
	1286	+ toggleTextureCB.addItemListener(this);
	1287	+
	1288	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1289	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1290	+ toggleSwitchCB.addItemListener(this);
	1291	+
	1292	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1293	+ autokeepCB.setToolTipText("On structure change");
	1294	+ autokeepCB.addItemListener(this);
	1295	+
	1296	+ panel.Return();
	1297	+ if (Globals.ADVANCED)
	1298	+ {
648	1299	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
649	1300	lookAtCB.setToolTipText("Look-at target");
650	1301	lookAtCB.addItemListener(this);
	1302	+ }
	1303	+
	1304	+ }
651	1305
652	1306	cGridBag fill = new cGridBag();
653		-
654	1307	fill.preferredHeight = 200;
	1308	+ cGridBag fill2 = new cGridBag();
	1309	+ fill2.preferredHeight = 200;
	1310	+ cGridBag fill3 = new cGridBag();
	1311	+ fill3.preferredHeight = 200;
655	1312
656	1313	panel.add(fill);
	1314	+ panel.add(fill2);
	1315	+ panel.add(fill3);
657	1316
658	1317	}
659	1318
660	1319	void EditObject(Object3D obj)
661	1320	{
662	1321	cRadio radioButton = new cRadio(obj.name);
	1322	+
	1323	+ // June 2019. Patch to avoid bug with transparency.
	1324	+ radioButton.hadMaterial = obj.material != null;
	1325	+ if (!radioButton.hadMaterial)
	1326	+ {
	1327	+ obj.material = new cMaterial();
	1328	+ }
	1329	+
663	1330	radioButton.SetObject(obj);
664		- radioButton.layout = sevenButton;
	1331	+ radioButton.layout = sixButton; // sevenButton;
665	1332	radioButton.SetCamera(cameraView.renderCamera, false);
666	1333	radioButton.addActionListener(this);
667	1334	radioPanel.add(radioButton);
668	1335	buttonGroup.add(radioButton);
669	1336	radioButton.doClick();
670	1337	}
	1338	+
671	1339	void SetupViews(ObjEditor oe)
672	1340	{
	1341	+ theFrame = this;
	1342	+
673	1343	oe.SetupViews();
674	1344
675	1345	System.out.println("SetupViews");
..	..	@@ -678,23 +1348,30 @@
678	1348	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
679	1349	}
680	1350
681		- JCheckBox liveCB;
682		- JCheckBox supportCB;
683		- JCheckBox localCB;
684		- JCheckBox crowdCB;
685		- JCheckBox smoothCB;
686		- JCheckBox fastCB;
687		- JCheckBox slowCB;
688		- JCheckBox boxCB;
689		- JCheckBox zoomBoxCB;
690		- JCheckBox trackCB;
691		- JCheckBox smoothfocusCB;
	1351	+ cToggleButton liveCB;
	1352	+ cCheckBox supportCB;
	1353	+ cCheckBox localCB;
	1354	+ cCheckBox crowdCB;
	1355	+ cCheckBox smoothCB;
	1356	+ cCheckBox minshaderCB;
	1357	+
	1358	+ cToggleButton fastCB;
	1359	+ cCheckBox slowCB;
	1360	+ cCheckBox boxCB;
	1361	+ cCheckBox zoomBoxCB;
	1362	+ cCheckBox freezeCB;
	1363	+ //cToggleButton trackCB;
	1364	+ cCheckBox trackCB;
	1365	+ cCheckBox smoothfocusCB;
692	1366	// JCheckBox speakerMocapCB;
693		- JCheckBox speakerCameraCB;
694		- JCheckBox speakerFocusCB;
695		- JCheckBox debugCB;
696		- JCheckBox oeilCB;
697		- JCheckBox lookAtCB;
	1367	+ cCheckBox speakerCameraCB;
	1368	+ cCheckBox speakerFocusCB;
	1369	+ cCheckBox debugCB;
	1370	+
	1371	+ cCheckBox oeilCB;
	1372	+ cCheckBox shadowCB;
	1373	+ cCheckBox autokeepCB;
	1374	+ cCheckBox lookAtCB;
698	1375
699	1376	// static int COLOR = 1;
700	1377	// static int MATERIAL = 2;
..	..	@@ -702,9 +1379,9 @@
702	1379
703	1380	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
704	1381
705		- JCheckBox colorCB;
706		- JCheckBox materialCB;
707		- JCheckBox textureCB;
	1382	+ cCheckBox colorCB;
	1383	+ cCheckBox materialCB;
	1384	+ cCheckBox textureCB;
708	1385
709	1386	public void itemStateChanged(ItemEvent e)
710	1387	{
..	..	@@ -732,6 +1409,7 @@
732	1409	} else if(e.getSource() == liveCB)
733	1410	{
734	1411	cameraView.ToggleLive();
	1412	+ refreshContents(false);
735	1413	}
736	1414	else if(e.getSource() == supportCB)
737	1415	{
..	..	@@ -747,6 +1425,12 @@
747	1425	{
748	1426	cameraView.ToggleInertia();
749	1427	cameraView.repaint();
	1428	+ }
	1429	+ else if(e.getSource() == minshaderCB)
	1430	+ {
	1431	+ Globals.MINSHADER ^= true;
	1432	+ cameraView.programInitialized = false;
	1433	+ cameraView.repaint();
750	1434	}
751	1435	else if(e.getSource() == localCB)
752	1436	{
..	..	@@ -796,6 +1480,18 @@
796	1480	{
797	1481	cameraView.ToggleOeil();
798	1482	}
	1483	+ else if(e.getSource() == shadowCB)
	1484	+ {
	1485	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1486	+ }
	1487	+ else if(e.getSource() == freezeCB)
	1488	+ {
	1489	+ Globals.FREEZEONMOVE ^= true;
	1490	+ }
	1491	+ else if(e.getSource() == autokeepCB)
	1492	+ {
	1493	+ Globals.REPLACEONMAKE ^= true;
	1494	+ }
799	1495	else if(e.getSource() == lookAtCB)
800	1496	{
801	1497	cameraView.ToggleLookAt();
..	..	@@ -812,7 +1508,8 @@
812	1508
813	1509	/**/
814	1510	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
815		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1511	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1512	+ TreePath path = objEditor.jTree.getSelectionPath();
816	1513	if ((path == null) \|\| (path.getPathCount() <= 1)) {
817	1514	// We can't move the root node or an empty selection
818	1515	return;
..	..	@@ -875,8 +1572,6 @@
875	1572	}
876	1573	}
877	1574
878		- String string = (String) object;
879		-
880	1575	System.out.println("Transfer = " + object + "; drop : " + target);
881	1576	// if( object instanceof java.io.File[])
882	1577	// {
..	..	@@ -884,7 +1579,11 @@
884	1579	// objEditor.DropFile((java.io.File[]) object, true);
885	1580	// return;
886	1581	// }
887		- if (string.charAt(0) == '/')
	1582	+
	1583	+ String string = object.toString();
	1584	+
	1585	+ // File path for Mac and Windows
	1586	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
888	1587	{
889	1588	// file(s)
890	1589	String[] names = string.split("\n");
..	..	@@ -911,7 +1610,7 @@
911	1610
912	1611	flashIt = false;
913	1612	CameraPane pane = (CameraPane) target;
914		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1613	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
915	1614	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
916	1615
917	1616	if (group.selection.size() == 1)
..	..	@@ -927,23 +1626,33 @@
927	1626
928	1627	assert target == objEditor.jTree;
929	1628	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1629	+ Object3D destinationLeaf;
930	1630	try {
931		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1631	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
932	1632	} catch (Exception e) {
933	1633	System.out.println("destinationPath : " + destinationPath);
934	1634	return;
935	1635	}
936	1636
937		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1637	+ for (int i=group.selection.size(); --i>=0;)
938	1638	{
	1639	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1640	+
	1641	+ // Cannot move into itself
	1642	+ if (child == destinationLeaf)
	1643	+ return;
	1644	+ }
	1645	+
	1646	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1647	+// {
939	1648	loadClipboard(true);
940	1649	objEditor.jTree.setSelectionPath(destinationPath);
941		- pasteInto(false);
942		- } else {
943		- loadClipboard(false);
944		- objEditor.jTree.setSelectionPath(destinationPath);
945		- pasteInto(false); // true); // ???
946		- }
	1650	+ pasteInto(false, false);
	1651	+// } else {
	1652	+// loadClipboard(false);
	1653	+// objEditor.jTree.setSelectionPath(destinationPath);
	1654	+// pasteInto(false, false); // true); // ???
	1655	+// }
947	1656	}
948	1657	public void dropActionChanged(DropTargetDragEvent dtde)
949	1658	// Called if the user has modified the current drop gesture
..	..	@@ -1048,54 +1757,71 @@
1048	1757	{
1049	1758	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1050	1759	//heightFieldItem.addActionListener(this);
1051		- gridItem = menu.add(new MenuItem("Grid"));
1052		- gridItem.addActionListener(this);
1053		- rectoidItem = menu.add(new MenuItem("Box"));
1054		- rectoidItem.addActionListener(this);
1055		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1056		- ellipsoidItem.addActionListener(this);
1057		- coneItem = menu.add(new MenuItem("Cone"));
1058		- coneItem.addActionListener(this);
1059		- torusItem = menu.add(new MenuItem("Torus"));
1060		- torusItem.addActionListener(this);
1061		- superItem = menu.add(new MenuItem("Superellipsoid"));
1062		- superItem.addActionListener(this);
	1760	+// gridItem = menu.add(new MenuItem("Grid"));
	1761	+// gridItem.addActionListener(this);
	1762	+// rectoidItem = menu.add(new MenuItem("Box"));
	1763	+// rectoidItem.addActionListener(this);
	1764	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1765	+// ellipsoidItem.addActionListener(this);
	1766	+// coneItem = menu.add(new MenuItem("Cone"));
	1767	+// coneItem.addActionListener(this);
	1768	+// torusItem = menu.add(new MenuItem("Torus"));
	1769	+// torusItem.addActionListener(this);
	1770	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1771	+// superItem.addActionListener(this);
	1772	+
	1773	+ cameraItem = menu.add(new MenuItem("Camera"));
	1774	+ cameraItem.addActionListener(this);
	1775	+
	1776	+ if (!Globals.ADVANCED)
	1777	+ {
1063	1778	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1064	1779	kleinItem.addActionListener(this);
1065		- particleItem = menu.add(new MenuItem("Particle system"));
1066		- particleItem.addActionListener(this);
	1780	+ }
	1781	+
	1782	+// particleItem = menu.add(new MenuItem("Particle system"));
	1783	+// particleItem.addActionListener(this);
	1784	+ if (Globals.ADVANCED)
	1785	+ {
1067	1786	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1068	1787	ragdollItem.addActionListener(this);
1069	1788	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1070	1789	ragdoll2Item.addActionListener(this);
	1790	+ }
1071	1791	menu.add("-");
1072		- meshItem = menu.add(new MenuItem("Mesh"));
	1792	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1073	1793	meshItem.addActionListener(this);
1074	1794	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1075	1795	// meshGroupItem.addActionListener(this);
	1796	+ if (Globals.ADVANCED)
	1797	+ {
1076	1798	springItem = menu.add(new MenuItem("Spring"));
1077	1799	springItem.addActionListener(this);
1078	1800	flagItem = menu.add(new MenuItem("Flag"));
1079	1801	flagItem.addActionListener(this);
1080		- bezierItem = menu.add(new MenuItem("Patch"));
1081		- bezierItem.addActionListener(this);
1082		- checkerItem = menu.add(new MenuItem("Checker"));
1083		- checkerItem.addActionListener(this);
1084	1802	blobItem = menu.add(new MenuItem("Blob"));
1085	1803	blobItem.addActionListener(this);
1086	1804	latheItem = menu.add(new MenuItem("Lathe"));
1087	1805	latheItem.addActionListener(this);
1088		- lightItem = menu.add(new MenuItem("Light"));
1089		- lightItem.addActionListener(this);
	1806	+ }
	1807	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1808	+ bezierItem.addActionListener(this);
	1809	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1810	+// overlayItem.addActionListener(this);
	1811	+// lightItem = menu.add(new MenuItem("Light"));
	1812	+// lightItem.addActionListener(this);
1090	1813	menu.add("-");
1091	1814	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1092	1815	//superLoopItem.addActionListener(this);
1093		- loopItem = menu.add(new MenuItem("Loop"));
1094		- loopItem.addActionListener(this);
	1816	+// loopItem = menu.add(new MenuItem("Loop"));
	1817	+// loopItem.addActionListener(this);
1095	1818	doubleItem = menu.add(new MenuItem("Fork"));
1096	1819	doubleItem.addActionListener(this);
	1820	+ if (Globals.ADVANCED)
	1821	+ {
1097	1822	tripleItem = menu.add(new MenuItem("Trident"));
1098	1823	tripleItem.addActionListener(this);
	1824	+ }
1099	1825	}
1100	1826
1101	1827	void buildToolsMenu(Menu menu)
..	..	@@ -1104,29 +1830,34 @@
1104	1830	animationItem.addItemListener(this);
1105	1831	animationItem.setState(Globals.ANIMATION);
1106	1832
	1833	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1834	+ archiveItem.addActionListener(this);
	1835	+
1107	1836	menu.add("-");
1108	1837	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1109	1838	parseverticesItem.addActionListener(this);
1110	1839	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1111	1840	textureFieldItem.addActionListener(this);
1112		- alignItem = menu.add(new MenuItem("Align"));
	1841	+ alignItem = menu.add(new MenuItem("Align Objects"));
1113	1842	alignItem.addActionListener(this);
1114		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1115		- mirrorItem.addActionListener(this);
1116	1843	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1117	1844	reduceMorphItem.addActionListener(this);
1118	1845	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1119	1846	reduce34MorphItem.addActionListener(this);
1120		-
1121		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1122		- computeAOItem.addActionListener(this);
1123	1847	menu.add("-");
1124		-
1125	1848	menu.add(memoryItem = new MenuItem("Memory Usage"));
1126	1849	memoryItem.addActionListener(this);
	1850	+ menu.add(computeAOItem = new MenuItem("Compute AO"));
	1851	+ computeAOItem.addActionListener(this);
	1852	+
	1853	+ if (Globals.ADVANCED)
	1854	+ {
	1855	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1856	+ mirrorItem.addActionListener(this);
	1857	+ menu.add("-");
1127	1858	menu.add(analyzeItem = new MenuItem("Analyze"));
1128	1859	analyzeItem.addActionListener(this);
1129		- menu.add(dumpItem = new MenuItem("Dump"));
	1860	+ menu.add(dumpItem = new MenuItem("Print"));
1130	1861	dumpItem.addActionListener(this);
1131	1862	// menu.add(pathItem = new MenuItem("From-to path"));
1132	1863	// pathItem.addActionListener(this);
..	..	@@ -1144,6 +1875,7 @@
1144	1875	menu.add("-");
1145	1876	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1146	1877	editScriptItem.addActionListener(this);
	1878	+ }
1147	1879	}
1148	1880
1149	1881	void ScreenFit()
..	..	@@ -1266,9 +1998,34 @@
1266	1998	shadow.material = new cMaterial(obj.material);
1267	1999	shadow.material.diffuse = 0.0001f;
1268	2000	shadow.material.specular = 0.0001f;
	2001	+ //shadow.projectedVertices[1].x = 300;
1269	2002
1270	2003	makeSomething(shadow);
1271	2004	}
	2005	+
	2006	+ private void ClearUnpinned()
	2007	+ {
	2008	+ //for (Object3D obj : listUI)
	2009	+ for (int i=listUI.size(); --i>=0;)
	2010	+ {
	2011	+ Object3D obj = listUI.elementAt(i);
	2012	+ if (!obj.pinned)
	2013	+ {
	2014	+ obj.CloseUI();
	2015	+ listUI.remove(i);
	2016	+ }
	2017	+ }
	2018	+ }
	2019	+
	2020	+ private void EditElement(Object3D elem, boolean newWindow)
	2021	+ {
	2022	+ // if (!(elem instanceof Composite))
	2023	+ // newWindow = false;
	2024	+ listUI.add(elem);
	2025	+ elem.openEditWindow(this, newWindow); //, false);
	2026	+ System.out.println("edit : " + elem);
	2027	+ elem.editWindow.refreshContents(true); // ? new
	2028	+ }
1272	2029
1273	2030	/**
1274	2031	* applyExample
..	..	@@ -1472,9 +2229,9 @@
1472	2229
1473	2230	void Overwrite(int mask)
1474	2231	{
1475		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2232	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1476	2233	{
1477		- Object3D content = GrafreeD.clipboard.get(0);
	2234	+ Object3D content = Grafreed.clipboard.get(0);
1478	2235
1479	2236	if (content instanceof cGroup && ((cGroup)content).transientlink )
1480	2237	content = ((cGroup)content).get(0);
..	..	@@ -1513,7 +2270,7 @@
1513	2270	{
1514	2271	ScreenFit();
1515	2272	} else
1516		- if (source == switchItem)
	2273	+ if (source == switchViewItem)
1517	2274	{
1518	2275	cVector v1 = new cVector();
1519	2276	cVector v2 = new cVector();
..	..	@@ -1522,11 +2279,11 @@
1522	2279	objEditor.cameraView.renderCamera.setAim(v2, v1);
1523	2280	objEditor.cameraView.repaint();
1524	2281	} else
1525		- if (source == rectoidItem)
	2282	+ if (source == rectoidItem \|\| source == boxButton)
1526	2283	{
1527	2284	makeSomething(new Box());
1528	2285	} else
1529		- if (source == particleItem)
	2286	+ if (source == particleItem \|\| source == particlesButton)
1530	2287	{
1531	2288	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1532	2289	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1605,27 +2362,27 @@
1605	2362
1606	2363	makeSomething(obj);
1607	2364	} else
1608		- if (source == gridItem)
	2365	+ if (source == gridItem \|\| source == gridButton)
1609	2366	{
1610	2367	makeSomething(new Grid());
1611	2368	} else
1612		- if (source == ellipsoidItem)
	2369	+ if (source == ellipsoidItem \|\| source == sphereButton)
1613	2370	{
1614	2371	makeSomething(new Sphere());
1615	2372	} else
1616		- if (source == coneItem)
	2373	+ if (source == coneItem \|\| source == coneButton)
1617	2374	{
1618	2375	makeSomething(new Cone());
1619	2376	} else
1620		- if (source == torusItem)
	2377	+ if (source == torusItem \|\| source == torusButton)
1621	2378	{
1622	2379	makeSomething(new Torus());
1623	2380	} else
1624		- if (source == superItem)
	2381	+ if (source == superItem \|\| source == superButton)
1625	2382	{
1626	2383	makeSomething(new Superellipsoid());
1627	2384	} else
1628		- if (source == kleinItem)
	2385	+ if (source == kleinItem \|\| source == kleinButton)
1629	2386	{
1630	2387	makeSomething(new Klein());
1631	2388	} else
..	..	@@ -1645,7 +2402,7 @@
1645	2402	{
1646	2403	makeSomething(new BezierSurface());
1647	2404	} else
1648		- if (source == checkerItem)
	2405	+ if (source == overlayItem \|\| source == overlayButton)
1649	2406	{
1650	2407	/*
1651	2408	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1693,10 +2450,27 @@
1693	2450	s.setup();
1694	2451	makeSomething(s);
1695	2452	} else
1696		- if (source == lightItem)
	2453	+ if (source == lightItem \|\| source == lightButton)
1697	2454	{
1698	2455	makeSomething(new Light());
1699	2456	} else
	2457	+// if (source == skybox1Button \|\|
	2458	+// source == skybox2Button \|\|
	2459	+// source == skybox3Button \|\|
	2460	+// source == skybox4Button \|\|
	2461	+// source == skybox5Button \|\|
	2462	+// source == skybox6Button \|\|
	2463	+// source == skybox7Button \|\|
	2464	+// source == skybox11Button \|\|
	2465	+// source == skybox12Button \|\|
	2466	+// source == skybox13Button \|\|
	2467	+// source == skybox14Button \|\|
	2468	+// source == skybox15Button \|\|
	2469	+// source == skybox16Button \|\|
	2470	+// source == skybox17Button)
	2471	+// {
	2472	+// ChangeSkybox(source);
	2473	+// } else
1700	2474	if (source == csgItem)
1701	2475	{
1702	2476	group(new CSG());
..	..	@@ -1743,30 +2517,30 @@
1743	2517
1744	2518	group(g);
1745	2519	} else
1746		- if (source == loopItem)
	2520	+ if (source == loopItem \|\| source == loopButton)
1747	2521	{
1748	2522	Composite csg = new GroupLeaf();
1749	2523	csg.count = 5;
1750	2524	group(csg);
1751		- Composite child = new cGroup();
	2525	+ Composite child = new cGroup("Branch");
1752	2526	csg.addChild(child);
1753	2527	child.addChild(csg);
1754	2528	} else
1755	2529	if (source == doubleItem)
1756	2530	{
1757		- Composite csg = new GroupLeaf();
	2531	+ Composite csg = new GroupLeaf("Fork");
1758	2532	csg.count = 5;
1759	2533	group(csg);
1760		- Composite child = new cGroup();
	2534	+ Composite child = new cGroup("Branch A");
1761	2535	csg.addChild(child);
1762	2536	child.addChild(csg);
1763		- child = new cGroup();
	2537	+ child = new cGroup("Branch B");
1764	2538	csg.addChild(child);
1765	2539	child.addChild(csg);
1766	2540	} else
1767	2541	if (source == tripleItem)
1768	2542	{
1769		- Composite csg = new GroupLeaf();
	2543	+ Composite csg = new GroupLeaf("Trident");
1770	2544	csg.count = 4;
1771	2545	group(csg);
1772	2546	Composite child = new cGroup();
..	..	@@ -1779,27 +2553,10 @@
1779	2553	csg.addChild(child);
1780	2554	child.addChild(csg);
1781	2555	} else
1782		-
1783		- if (source == importGFDItem)
1784		- {
1785		- ImportGFD();
1786		- } else
1787		- if (source == importVRMLX3DItem)
1788		- {
1789		- ImportVRMLX3D();
1790		- } else
1791		- if (source == import3DSItem)
1792		- {
1793		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1794		- } else
1795		- if (source == importOBJItem)
1796		- {
1797		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1798		- } else
1799	2556	if (source == computeAOItem)
1800	2557	{
1801	2558	Globals.drawMode = CameraPane.OCCLUSION;
1802		- Globals.theRenderer.repaint();
	2559	+ cameraView.repaint();
1803	2560	} else
1804	2561	if (source == recompileItem)
1805	2562	{
..	..	@@ -1814,7 +2571,7 @@
1814	2571	if (source == invariantsItem)
1815	2572	{
1816	2573	System.out.println("Invariants:");
1817		- GrafreeD.grafreeD.universe.invariants();
	2574	+ Grafreed.grafreeD.universe.invariants();
1818	2575	} else
1819	2576	if (source == memoryItem)
1820	2577	{
..	..	@@ -1833,19 +2590,61 @@
1833	2590	{
1834	2591	DumpObject();
1835	2592	} else
	2593	+ if (source == minButton)
	2594	+ {
	2595	+ Minimize();
	2596	+ } else
	2597	+ if (source == maxButton)
	2598	+ {
	2599	+ Maximize();
	2600	+ } else
	2601	+ if (source == fullButton)
	2602	+ {
	2603	+ ToggleFullScreen();
	2604	+ } else
	2605	+ if (source == undoButton)
	2606	+ {
	2607	+ // Go to previous version
	2608	+ //if (!Undo())
	2609	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2610	+ Undo();
	2611	+ } else
	2612	+ if (source == restoreButton)
	2613	+ {
	2614	+ // Restore current version
	2615	+ Restore();
	2616	+ } else
	2617	+ if (source == replaceButton)
	2618	+ {
	2619	+ // Overwrite current version
	2620	+ Replace();
	2621	+ } else
	2622	+ if (source == redoButton)
	2623	+ {
	2624	+ // Go to next version
	2625	+ Redo();
	2626	+ } else
	2627	+ if (source == saveButton)
	2628	+ {
	2629	+ // Save a new version
	2630	+ if (!Save(true))
	2631	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2632	+ } else
	2633	+ if (source == oneStepButton)
	2634	+ {
	2635	+ Globals.ONESTEP = true;
	2636	+ cameraView.repaint();
	2637	+ } else
1836	2638	if (source == screenfitButton)
1837	2639	{
1838		- //Reload(lastConverter, lastFilename, true);
1839	2640	ScreenFit();
1840	2641	} else
1841	2642	if (source == screenfitpointButton)
1842	2643	{
1843		- //Reload(lastConverter, lastFilename, true);
1844	2644	ScreenFitPoint();
1845	2645	} else
1846	2646	if (source == snapobjectButton)
1847	2647	{
1848		- //Reload(lastConverter, lastFilename, true);
1849	2648	SnapObject();
1850	2649	} else
1851	2650	// if (event.getSource() == recompileButton)
..	..	@@ -1882,12 +2681,20 @@
1882	2681	{
1883	2682	loadClipboard(true);
1884	2683	} else
	2684	+ if (source == undoItem)
	2685	+ {
	2686	+ Undo();
	2687	+ } else
	2688	+ if (source == redoItem)
	2689	+ {
	2690	+ Redo();
	2691	+ } else
1885	2692	if (source == duplicateItem)
1886	2693	{
1887		- Object3D keep = GrafreeD.clipboard;
	2694	+ Object3D keep = Grafreed.clipboard;
1888	2695	loadClipboard(false);
1889	2696	paste(false);
1890		- GrafreeD.clipboard = keep;
	2697	+ Grafreed.clipboard = keep;
1891	2698	} else
1892	2699	if (source == cloneItem)
1893	2700	{
..	..	@@ -1905,13 +2712,17 @@
1905	2712	{
1906	2713	paste(false);
1907	2714	} else
	2715	+ if (source == pasteIntoItem)
	2716	+ {
	2717	+ pasteInto(true, false);
	2718	+ } else
1908	2719	if (source == pasteLinkItem)
1909	2720	{
1910		- pasteInto(false);
	2721	+ pasteInto(false, false);
1911	2722	} else
1912	2723	if (source == pasteCloneItem)
1913	2724	{
1914		- pasteInto(true);
	2725	+ pasteInto(true, true);
1915	2726	} else
1916	2727	if (source == pasteExpandItem)
1917	2728	{
..	..	@@ -2103,9 +2914,9 @@
2103	2914	// group.selection.get(0).setMasterThis(content); // should be identity
2104	2915	// refreshContents();
2105	2916	// }
2106		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2917	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2107	2918	{
2108		- Object3D content = GrafreeD.clipboard.get(0);
	2919	+ Object3D content = Grafreed.clipboard.get(0);
2109	2920
2110	2921	if (content instanceof cGroup && ((cGroup)content).transientlink )
2111	2922	content = ((cGroup)content).get(0);
..	..	@@ -2113,11 +2924,11 @@
2113	2924	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2114	2925	for (int i=0; i<group.selection.size(); i++)
2115	2926	{
2116		- boolean random = CameraPane.RANDOM;
2117		- CameraPane.RANDOM = false; // parse all random nodes
	2927	+ boolean random = CameraPane.SWITCH;
	2928	+ CameraPane.SWITCH = false; // parse all random nodes
2118	2929	group.selection.get(i).linkVerticesThis(content);
2119	2930	// group.selection.get(i).setMasterThis(content); // should be identity
2120		- CameraPane.RANDOM = random;
	2931	+ CameraPane.SWITCH = random;
2121	2932	}
2122	2933	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2123	2934	refreshContents();
..	..	@@ -2127,20 +2938,20 @@
2127	2938	{
2128	2939	for (int i=0; i<group.selection.size(); i++)
2129	2940	{
2130		- boolean random = CameraPane.RANDOM;
2131		- CameraPane.RANDOM = false; // parse all random nodes
	2941	+ boolean random = CameraPane.SWITCH;
	2942	+ CameraPane.SWITCH = false; // parse all random nodes
2132	2943	group.selection.get(i).linkVerticesThis(null);
2133		- CameraPane.RANDOM = random;
	2944	+ CameraPane.SWITCH = random;
2134	2945	}
2135	2946
2136	2947	refreshContents();
2137	2948	} else
2138	2949	if (source == relinkverticesItem)
2139	2950	{
2140		- boolean random = CameraPane.RANDOM;
2141		- CameraPane.RANDOM = false; // parse all random nodes
	2951	+ boolean random = CameraPane.SWITCH;
	2952	+ CameraPane.SWITCH = false; // parse all random nodes
2142	2953	group.selection.RelinkToSupport();
2143		- CameraPane.RANDOM = random;
	2954	+ CameraPane.SWITCH = random;
2144	2955
2145	2956	refreshContents();
2146	2957	} else
..	..	@@ -2155,9 +2966,9 @@
2155	2966	} else
2156	2967	if (source == setMasterItem)
2157	2968	{
2158		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2969	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2159	2970	{
2160		- Object3D content = GrafreeD.clipboard.get(0);
	2971	+ Object3D content = Grafreed.clipboard.get(0);
2161	2972
2162	2973	if (content instanceof cGroup && ((cGroup)content).transientlink )
2163	2974	content = ((cGroup)content).get(0);
..	..	@@ -2170,9 +2981,9 @@
2170	2981	{
2171	2982	if (group.selection.size() == 1)
2172	2983	{
2173		- if (GrafreeD.clipboard.size() == 1)
	2984	+ if (Grafreed.clipboard.size() == 1)
2174	2985	{
2175		- Object3D content = GrafreeD.clipboard.get(0);
	2986	+ Object3D content = Grafreed.clipboard.get(0);
2176	2987
2177	2988	if (content instanceof cGroup && ((cGroup)content).transientlink )
2178	2989	content = ((cGroup)content).get(0);
..	..	@@ -2189,7 +3000,7 @@
2189	3000	{
2190	3001	RevertMeshes();
2191	3002	} else
2192		- if (source == resetMeshItem)
	3003	+ if (source == resetAllItem)
2193	3004	{
2194	3005	ResetAll();
2195	3006	} else
..	..	@@ -2197,7 +3008,7 @@
2197	3008	{
2198	3009	StepAll();
2199	3010	} else
2200		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3011	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2201	3012	{
2202	3013	//int indices[] = jList.getSelectedIndices();
2203	3014	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2209,9 +3020,9 @@
2209	3020	{
2210	3021	ClearSelection(true);
2211	3022	} else
2212		- if (source == grabItem)
	3023	+ if (source == grabItem \|\| source == groupButton)
2213	3024	{
2214		- group(new cGroup(), true);
	3025	+ group(new cGroup(), false); // true);
2215	3026	} else
2216	3027	if (source == hideItem)
2217	3028	{
..	..	@@ -2229,16 +3040,16 @@
2229	3040	{
2230	3041	makeSomething(new Camera());
2231	3042	} else
2232		- if (source == compositeItem)
	3043	+ if (source == compositeItem \|\| source == compositeButton)
2233	3044	{
2234	3045	group(new Composite());
2235	3046	} else
2236		- if (source == randomItem)
	3047	+ if (source == switchItem \|\| source == switchButton)
2237	3048	{
2238	3049	RandomNode random = new RandomNode();
2239	3050	group(random);
2240	3051	if (random.size() > 0)
2241		- random.name = random.get(0).name + "Rnd";
	3052	+ random.name = random.get(0).name + "Switch";
2242	3053	} else
2243	3054	if (source == physicsItem)
2244	3055	{
..	..	@@ -2335,7 +3146,7 @@
2335	3146	{
2336	3147	group(new cLinker());
2337	3148	} else
2338		- if (source == textureItem)
	3149	+ if (source == textureItem \|\| source == textureButton)
2339	3150	{
2340	3151	group(new TextureNode());
2341	3152	} else
..	..	@@ -2355,17 +3166,30 @@
2355	3166	{
2356	3167	CastShadow(2);
2357	3168	} else
2358		- if (source == ungroupItem)
	3169	+ if (source == ungroupItem \|\| source == ungroupButton)
2359	3170	{
2360		- //ungroup();
	3171	+ boolean hasRoot = false;
	3172	+
2361	3173	for (int i=0; i<group.selection.size(); i++)
2362	3174	{
2363		- Ungroup(group.selection.get(i));
	3175	+ if (group.selection.get(i) == group)
	3176	+ {
	3177	+ hasRoot = true;
	3178	+ break;
	3179	+ }
2364	3180	}
2365	3181
2366		- ClearSelection(false);
2367		-
2368		- refreshContents();
	3182	+ if (!hasRoot)
	3183	+ {
	3184	+ for (int i=0; i<group.selection.size(); i++)
	3185	+ {
	3186	+ Ungroup(group.selection.get(i));
	3187	+ }
	3188	+
	3189	+ ClearSelection(false);
	3190	+
	3191	+ refreshContents();
	3192	+ }
2369	3193	} else
2370	3194	if (source == genUVItem)
2371	3195	{
..	..	@@ -2377,7 +3201,7 @@
2377	3201	} else
2378	3202	if (source == genNormalsMESHItem)
2379	3203	{
2380		- GenNormals(true); // TODO
	3204	+ GenNormalsMESH();
2381	3205	} else
2382	3206	if (source == genNormalsORGANItem)
2383	3207	{
..	..	@@ -2442,6 +3266,22 @@
2442	3266	if (source == unmarkleavesItem)
2443	3267	{
2444	3268	MarkLeaves(false);
	3269	+ } else
	3270	+ if (source == rewindleavesItem)
	3271	+ {
	3272	+ RewindLeaves(true);
	3273	+ } else
	3274	+ if (source == unrewindleavesItem)
	3275	+ {
	3276	+ RewindLeaves(false);
	3277	+ } else
	3278	+ if (source == randomleavesItem)
	3279	+ {
	3280	+ RandomLeaves(true);
	3281	+ } else
	3282	+ if (source == unrandomleavesItem)
	3283	+ {
	3284	+ RandomLeaves(false);
2445	3285	} else
2446	3286	if (source == flipVItem)
2447	3287	{
..	..	@@ -2527,9 +3367,13 @@
2527	3367	{
2528	3368	SmoothMesh();
2529	3369	} else
2530		- if (source == transformgeometryItem)
	3370	+ if (source == transformGeometryItem)
2531	3371	{
2532	3372	TransformGeometry();
	3373	+ } else
	3374	+ if (source == transformChildrenItem)
	3375	+ {
	3376	+ TransformChildren();
2533	3377	} else
2534	3378	if (source == resetTransformItem)
2535	3379	{
..	..	@@ -2537,7 +3381,11 @@
2537	3381	} else
2538	3382	if (source == resetCentroidItem)
2539	3383	{
2540		- ResetCentroid();
	3384	+ ResetCentroid(true);
	3385	+ } else
	3386	+ if (source == resetCentroidXZItem)
	3387	+ {
	3388	+ ResetCentroid(false);
2541	3389	} else
2542	3390	if (source == resetParentItem)
2543	3391	{
..	..	@@ -2642,7 +3490,7 @@
2642	3490	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2643	3491	{
2644	3492	obj = (Object3D)e.nextElement();
2645		- obj.SetBumpTexture(null);
	3493	+ obj.ResetBumpTexture();
2646	3494	}
2647	3495
2648	3496	refreshContents();
..	..	@@ -2658,6 +3506,31 @@
2658	3506
2659	3507	refreshContents();
2660	3508	} else
	3509	+ if (source == embedTexturesItem)
	3510	+ {
	3511	+ Object3D obj;
	3512	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3513	+ {
	3514	+ obj = (Object3D)e.nextElement();
	3515	+ obj.EmbedTextures(true);
	3516	+ }
	3517	+
	3518	+ refreshContents();
	3519	+ } else
	3520	+ if (source == deEmbedTexturesItem)
	3521	+ {
	3522	+ Object3D obj;
	3523	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3524	+ {
	3525	+ obj = (Object3D)e.nextElement();
	3526	+ obj.EmbedTextures(false);
	3527	+ }
	3528	+
	3529	+ CameraPane.texturepigment.clear();
	3530	+ CameraPane.texturebump.clear();
	3531	+
	3532	+ refreshContents();
	3533	+ } else
2661	3534	if (source == flashSelectionButton)
2662	3535	{
2663	3536	CameraPane.flash = true;
..	..	@@ -2669,6 +3542,10 @@
2669	3542	if (source == twoButton)
2670	3543	{
2671	3544	radio.layout = twoButton;
	3545	+
	3546	+ if (CameraPane.FULLSCREEN)
	3547	+ fullscreenLayout = radio.layout;
	3548	+
2672	3549	// bug
2673	3550	//gridPanel.setDividerLocation(1.0);
2674	3551	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2701,10 +3578,31 @@
2701	3578	bigThree.ClearUI();
2702	3579	bigThree.add(centralPanel);
2703	3580	bigThree.FlushUI();
	3581	+
	3582	+ cameraView.requestFocusInWindow();
	3583	+
	3584	+// refreshContents(true);
	3585	+//
	3586	+// try
	3587	+// {
	3588	+// java.awt.Robot bot = new java.awt.Robot();
	3589	+// int mask = InputEvent.BUTTON1_MASK;
	3590	+// bot.mouseMove(100, 100);
	3591	+// bot.mousePress(mask);
	3592	+// bot.mouseRelease(mask);
	3593	+// }
	3594	+// catch (Exception e)
	3595	+// {
	3596	+//
	3597	+// }
	3598	+
2704	3599	} else
2705	3600	if (source == threeButton)
2706	3601	{
2707	3602	radio.layout = threeButton;
	3603	+
	3604	+ if (CameraPane.FULLSCREEN)
	3605	+ fullscreenLayout = radio.layout;
2708	3606
2709	3607	// bigThree.remove(scenePanel);
2710	3608	// bigThree.remove(centralPanel);
..	..	@@ -2734,13 +3632,18 @@
2734	3632	// centralPanel.setVisible(true);
2735	3633	// XYZPanel.setVisible(true);
2736	3634	bigThree.ClearUI();
	3635	+ bigThree.add(scenePanel);
2737	3636	bigThree.add(centralPanel);
2738		- bigThree.add(XYZPanel);
2739	3637	bigThree.FlushUI();
	3638	+
	3639	+ cameraView.requestFocusInWindow();
2740	3640	} else
2741	3641	if (source == fourButton)
2742	3642	{
2743	3643	radio.layout = fourButton;
	3644	+
	3645	+ if (CameraPane.FULLSCREEN)
	3646	+ fullscreenLayout = radio.layout;
2744	3647
2745	3648	// bigThree.remove(scenePanel);
2746	3649	// bigThree.remove(centralPanel);
..	..	@@ -2772,10 +3675,15 @@
2772	3675	bigThree.ClearUI();
2773	3676	bigThree.add(scenePanel);
2774	3677	bigThree.FlushUI();
	3678	+
	3679	+ cameraView.requestFocusInWindow();
2775	3680	} else
2776	3681	if (source == sixButton)
2777	3682	{
2778	3683	radio.layout = sixButton;
	3684	+
	3685	+ if (CameraPane.FULLSCREEN)
	3686	+ fullscreenLayout = radio.layout;
2779	3687
2780	3688	// bigThree.remove(scenePanel);
2781	3689	// bigThree.remove(centralPanel);
..	..	@@ -2805,13 +3713,18 @@
2805	3713	// centralPanel.setVisible(true);
2806	3714	// XYZPanel.setVisible(false);
2807	3715	bigThree.ClearUI();
2808		- bigThree.add(scenePanel);
2809	3716	bigThree.add(centralPanel);
	3717	+ bigThree.add(scenePanel);
2810	3718	bigThree.FlushUI();
	3719	+
	3720	+ cameraView.requestFocusInWindow();
2811	3721	} else
2812	3722	if (source == sevenButton)
2813	3723	{
2814	3724	radio.layout = sevenButton;
	3725	+
	3726	+ if (CameraPane.FULLSCREEN)
	3727	+ fullscreenLayout = radio.layout;
2815	3728
2816	3729	// bigThree.remove(scenePanel);
2817	3730	// bigThree.remove(centralPanel);
..	..	@@ -2845,6 +3758,8 @@
2845	3758	bigThree.add(centralPanel);
2846	3759	bigThree.add(XYZPanel);
2847	3760	bigThree.FlushUI();
	3761	+
	3762	+ cameraView.requestFocusInWindow();
2848	3763	} else
2849	3764	if (source == rootButton)
2850	3765	{
..	..	@@ -2856,6 +3771,7 @@
2856	3771	EditObject(obj);
2857	3772	}
2858	3773
	3774	+ cameraView.requestFocusInWindow();
2859	3775	refreshContents(true);
2860	3776	} else
2861	3777	if (source == closeButton)
..	..	@@ -2865,22 +3781,37 @@
2865	3781	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2866	3782	{
2867	3783	ab = (cRadio)e.nextElement();
2868		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3784	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2869	3785	{
	3786	+ // Patch to avoid bug with transparency.
	3787	+ if (!ab.hadMaterial)
	3788	+ {
	3789	+ ab.object.material = null;
	3790	+ }
	3791	+
2870	3792	buttonGroup.remove(ab);
2871	3793	radioPanel.remove(ab);
2872	3794
2873		- ab.GetObject().editWindow = null;
	3795	+ //ab.GetObject().editWindow = null;
	3796	+ ab.GetObject().manipWindow = null;
2874	3797	// ab.GetObject().objectUI = null; // ?????????
2875	3798
2876	3799	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2877	3800	break;
2878	3801	}
2879	3802	}
	3803	+
	3804	+ cameraView.requestFocusInWindow();
2880	3805	refreshContents(true);
2881	3806	} else
2882	3807	if (source == editItem \|\| source == editButton)
2883	3808	{
	3809	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3810	+ {
	3811	+ Object3D child = (Object3D)e.nextElement();
	3812	+ child.pinned = true;
	3813	+ }
	3814	+
2884	3815	EditSelection(false);
2885	3816	} else
2886	3817	if (source == uneditButton)
..	..	@@ -2890,12 +3821,13 @@
2890	3821	Object3D child = (Object3D)e.nextElement();
2891	3822	if(child.editWindow != null)
2892	3823	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3824	+ child.pinned = false;
2893	3825	child.CloseUI();
2894	3826	listUI.remove(child);
2895	3827
2896		- child.editWindow = null; // ???????????
	3828	+ //child.editWindow = null; // ???????????
2897	3829	}
2898		- objEditor.ctrlPanel.validate();
	3830	+ objEditor.ctrlPanel.FlushUI();
2899	3831	//objEditor.jTree.clearSelection();
2900	3832	//objEditor.ResetSliders();
2901	3833	refreshContents(true);
..	..	@@ -2906,6 +3838,7 @@
2906	3838	//copy.ClearUI();
2907	3839	for (Object3D obj : listUI)
2908	3840	{
	3841	+ obj.pinned = false;
2909	3842	obj.CloseUI();
2910	3843	}
2911	3844	listUI.clear();
..	..	@@ -2915,7 +3848,7 @@
2915	3848	{
2916	3849	assert(copy == group);
2917	3850
2918		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3851	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2919	3852
2920	3853	for (Object3D obj : listUI)
2921	3854	{
..	..	@@ -2964,6 +3897,9 @@
2964	3897	}
2965	3898
2966	3899	copy = group;
	3900	+
	3901	+ SetUndoStates();
	3902	+
2967	3903	//Globals.theRenderer.object = group;
2968	3904	if(!useclient)
2969	3905	{
..	..	@@ -2979,20 +3915,46 @@
2979	3915	frontView.object = group;
2980	3916	sideView.object = group;
2981	3917	}
2982		- group.editWindow = this;
	3918	+
	3919	+// fix "+" issue
	3920	+ //group.editWindow = this;
	3921	+ group.manipWindow = this;
	3922	+
2983	3923	/*
2984	3924	currentLayout = radio.layout;
2985	3925	if (currentLayout == null)
2986	3926	currentLayout = sevenButton;
2987	3927	*/
2988	3928	radio.layout.doClick();
	3929	+
	3930	+ ClearUnpinned();
	3931	+ //Grafreed.Assert(group != null);
	3932	+ //Grafreed.Assert(group.selection != null);
	3933	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	3934	+ if (group.selection == null \|\| group.selection.size() == 1)
	3935	+ EditSelection(false);
2989	3936	keepparent = group.parent;
2990	3937	// PARENT = NULL or not???
2991	3938	//group.parent = null; // ROOT
2992	3939	//group.attributes = -1;
2993	3940	ResetModel();
	3941	+
	3942	+ cameraView.requestFocusInWindow();
2994	3943	refreshContents(true);
2995		- }
	3944	+ } else if (event.getSource() == editCameraItem)
	3945	+ {
	3946	+ cameraView.ProtectCamera();
	3947	+ cameraView.repaint();
	3948	+ return;
	3949	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3950	+ {
	3951	+ cameraView.RevertCamera();
	3952	+ cameraView.repaint();
	3953	+ return;
	3954	+ // } else if (event.getSource() == textureButton)
	3955	+ // {
	3956	+ // return; // true;
	3957	+ }
2996	3958	else
2997	3959	{
2998	3960	//return super.action(event, arg);
..	..	@@ -3001,7 +3963,6 @@
3001	3963	}
3002	3964
3003	3965	boolean useclient = false;
3004		- cRadio radio;
3005	3966
3006	3967	void ToggleRoot()
3007	3968	{
..	..	@@ -3053,6 +4014,28 @@
3053	4014	refreshContents();
3054	4015	}
3055	4016
	4017	+ void TransformChildren()
	4018	+ {
	4019	+ Object3D obj;
	4020	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4021	+ {
	4022	+ obj = (Object3D)e.nextElement();
	4023	+ obj.KeepTextureMatrices();
	4024	+ obj.TransformChildren();
	4025	+ obj.RestoreTextureMatrices();
	4026	+
	4027	+// if (obj.parent == null)
	4028	+// {
	4029	+// System.out.println("NULL PARENT!");
	4030	+// new Exception().printStackTrace();
	4031	+// }
	4032	+// else
	4033	+// TouchTransform(obj);
	4034	+// //obj.parent.Touch();
	4035	+ }
	4036	+
	4037	+ refreshContents();
	4038	+ }
3056	4039
3057	4040	void ResetTransform()
3058	4041	{
..	..	@@ -3165,7 +4148,7 @@
3165	4148	refreshContents();
3166	4149	}
3167	4150
3168		- void ResetCentroid()
	4151	+ void ResetCentroid(boolean full)
3169	4152	{
3170	4153	Object3D obj;
3171	4154	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3180,12 +4163,16 @@
3180	4163	LA.matIdentity(Object3D.mat);
3181	4164	obj.getBounds(minima, maxima, false);
3182	4165	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3183		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	4166	+ if (full)
	4167	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3184	4168	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3185	4169	obj.TransformMesh(Object3D.mat);
	4170	+
3186	4171	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3187		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	4172	+ if (full)
	4173	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3188	4174	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	4175	+
3189	4176	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3190	4177	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3191	4178	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3214,7 +4201,8 @@
3214	4201
3215	4202	int size = obj.MemorySize();
3216	4203
3217		- System.err.println((size/1024) + " KB is the size of " + obj);
	4204	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4205	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3218	4206	}
3219	4207	}
3220	4208	catch (Exception e)
..	..	@@ -3251,9 +4239,9 @@
3251	4239	obj = (Object3D)e.nextElement();
3252	4240
3253	4241	System.out.println("Object is: " + obj);
3254		- GrafreeD.AnalyzeObject(obj);
	4242	+ Grafreed.AnalyzeObject(obj);
3255	4243	System.out.println("Boundary rep: " + obj.bRep);
3256		- GrafreeD.AnalyzeObject(obj.bRep);
	4244	+ Grafreed.AnalyzeObject(obj.bRep);
3257	4245
3258	4246	// System.err.println((size/1024) + " KB is the size of " + obj);
3259	4247	}
..	..	@@ -3295,6 +4283,13 @@
3295	4283	void GenNormals(boolean crease)
3296	4284	{
3297	4285	group.GenNormalsS(crease);
	4286	+
	4287	+ refreshContents();
	4288	+ }
	4289	+
	4290	+ void GenNormalsMESH()
	4291	+ {
	4292	+ group.GenNormalsMeshS();
3298	4293
3299	4294	refreshContents();
3300	4295	}
..	..	@@ -3467,8 +4462,8 @@
3467	4462
3468	4463	void ParseVertices()
3469	4464	{
3470		- boolean epsequal = GrafreeD.epsequal;
3471		- GrafreeD.epsequal = true;
	4465	+ boolean epsequal = Grafreed.epsequal;
	4466	+ Grafreed.epsequal = true;
3472	4467
3473	4468	for (int i=0; i<group.selection.size(); i++)
3474	4469	{
..	..	@@ -3493,7 +4488,7 @@
3493	4488	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3494	4489	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3495	4490
3496		- g.add(GrafreeD.clipboard);
	4491	+ g.add(Grafreed.clipboard);
3497	4492
3498	4493	buffer.add(g);
3499	4494	}
..	..	@@ -3508,7 +4503,7 @@
3508	4503	makeSomething(buffer, i==group.selection.size()-1);
3509	4504	}
3510	4505
3511		- GrafreeD.epsequal = epsequal;
	4506	+ Grafreed.epsequal = epsequal;
3512	4507
3513	4508	refreshContents();
3514	4509	}
..	..	@@ -3526,7 +4521,16 @@
3526	4521	String pigment = Object3D.GetPigment(tex);
3527	4522	//String bump = Object3D.GetBump(tex);
3528	4523
3529		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4524	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4525	+
	4526	+ try
	4527	+ {
	4528	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
	4529	+ }
	4530	+ catch (Exception e)
	4531	+ {
	4532	+ System.err.println("FAIL: " + node);
	4533	+ }
3530	4534
3531	4535	double s = v.s;
3532	4536
..	..	@@ -3614,11 +4618,11 @@
3614	4618
3615	4619	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3616	4620
3617		- boolean random = CameraPane.RANDOM;
3618		- CameraPane.RANDOM = false; // parse all random nodes
	4621	+ boolean random = CameraPane.SWITCH;
	4622	+ CameraPane.SWITCH = false; // parse all random nodes
3619	4623	lowres.linkVerticesThis(null);
3620	4624	lowres.linkVerticesThis(sn);
3621		- CameraPane.RANDOM = random;
	4625	+ CameraPane.SWITCH = random;
3622	4626
3623	4627	System.err.flush();
3624	4628
..	..	@@ -3658,7 +4662,7 @@
3658	4662	return;
3659	4663
3660	4664	Object3D poses = group.selection.get(0);
3661		- Object3D ref = GrafreeD.clipboard.get(0);
	4665	+ Object3D ref = Grafreed.clipboard.get(0);
3662	4666
3663	4667	Object3D newgroup = new Object3D("Po:" + poses.name);
3664	4668
..	..	@@ -3852,9 +4856,9 @@
3852	4856
3853	4857	void ClipMesh()
3854	4858	{
3855		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4859	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3856	4860	{
3857		- Object3D content = GrafreeD.clipboard.get(0);
	4861	+ Object3D content = Grafreed.clipboard.get(0);
3858	4862
3859	4863	if (content instanceof cGroup && ((cGroup)content).transientlink )
3860	4864	content = ((cGroup)content).get(0);
..	..	@@ -3863,7 +4867,7 @@
3863	4867	// {
3864	4868	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3865	4869	// }
3866		- group.selection.ClipMesh(GrafreeD.clipboard);
	4870	+ group.selection.ClipMesh(Grafreed.clipboard);
3867	4871	}
3868	4872	// group.selection.ClipMesh(GrafreeD.clipboard);
3869	4873	System.out.println("DONE.");
..	..	@@ -3910,6 +4914,18 @@
3910	4914	void MarkLeaves(boolean hide)
3911	4915	{
3912	4916	group.selection.MarkLeaves(hide);
	4917	+ refreshContents();
	4918	+ }
	4919	+
	4920	+ void RewindLeaves(boolean hide)
	4921	+ {
	4922	+ group.selection.RewindLeaves(hide);
	4923	+ refreshContents();
	4924	+ }
	4925	+
	4926	+ void RandomLeaves(boolean hide)
	4927	+ {
	4928	+ group.selection.RandomLeaves(hide);
3913	4929	refreshContents();
3914	4930	}
3915	4931
..	..	@@ -3984,28 +5000,25 @@
3984	5000	// }
3985	5001	// }
3986	5002
3987		- static boolean allparams = true;
3988		-
3989		- static Vector<Object3D> listUI = new Vector<Object3D>();
3990		-
3991	5003	void EditSelection(boolean newWindow)
3992	5004	{
	5005	+ if (group.selection == null)
	5006	+ {
	5007	+ EditElement(group, newWindow); // ? new
	5008	+ return;
	5009	+ }
	5010	+
3993	5011	// aConstraints.gridy = 0;
3994	5012	for (int i=0; i<group.selection.size(); i++)
3995	5013	{
3996	5014	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
3997	5015	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3998		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5016	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3999	5017
4000	5018	Object3D elem = (Object3D)group.selection.elementAt(i);
4001		- if(elem != group)
	5019	+ if(elem != group \|\| !newWindow)
4002	5020	{
4003		- // if (!(elem instanceof Composite))
4004		- // newWindow = false;
4005		- listUI.add(elem);
4006		- elem.openEditWindow(this, newWindow); //, false);
4007		- System.out.println("edit : " + elem);
4008		- elem.editWindow.refreshContents(true); // ? new
	5021	+ EditElement(elem, newWindow); // ? new
4009	5022	}
4010	5023	}
4011	5024	}
..	..	@@ -4080,7 +5093,8 @@
4080	5093	//new Exception().printStackTrace();
4081	5094
4082	5095	freezemodel = true;
4083		-
	5096	+ ClearUnpinned();
	5097	+
4084	5098	/**/
4085	5099	//switch (event.id)
4086	5100	{
..	..	@@ -4088,7 +5102,6 @@
4088	5102	//case 702: // Event.LIST_DESELECT
4089	5103	group.deselectAll();
4090	5104	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4091		- objEditor.ClearInfo(); // .GetMaterial());
4092	5105	if (tps != null)
4093	5106	{
4094	5107	for (int i=0; i < tps.length; i++)
..	..	@@ -4097,10 +5110,8 @@
4097	5110
4098	5111	//if (child.parent != null)
4099	5112	//child.parent.addSelectee(child);
	5113	+ objEditor.SetMaterial(child);
4100	5114	group.addSelectee(child);
4101		- objEditor.SetMaterial(child); // .GetMaterial());
4102		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4103		- System.err.println("info : " + child.GetPath());
4104	5115	}
4105	5116	}
4106	5117	// else
..	..	@@ -4110,20 +5121,28 @@
4110	5121	// System.err.println("info : " + group.GetPath());
4111	5122	// }
4112	5123
4113		- objEditor.SetText(); // jan 2014
4114		-
4115		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	5124	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4116	5125	CameraPane.flash = true;
4117	5126
4118		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5127	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4119	5128	// a camera
4120	5129	{
4121		- CameraPane.camerachangeframe = 0; // don't refuse it
4122		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5130	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5131	+ {
	5132	+ CameraPane.camerachangeframe = 0; // don't refuse it
	5133	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5134	+ }
4123	5135	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4124	5136	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4125	5137	}
4126	5138
	5139	+ if (tps != null && tps.length == 1)
	5140	+ {
	5141	+ EditSelection(false);
	5142	+ }
	5143	+
	5144	+ SetPinStates(tps != null && tps.length > 0);
	5145	+
4127	5146	refreshContents();
4128	5147	//return true;
4129	5148	}
..	..	@@ -4132,6 +5151,35 @@
4132	5151
4133	5152	freezemodel = false;
4134	5153	}
	5154	+
	5155	+ void SetPinStates(boolean enabled)
	5156	+ {
	5157	+ editButton.setEnabled(enabled);
	5158	+ uneditButton.setEnabled(enabled);
	5159	+ unselectButton.setEnabled(enabled);
	5160	+ flashSelectionButton.setEnabled(enabled);
	5161	+ }
	5162	+
	5163	+ void refreshContents(boolean cp)
	5164	+ {
	5165	+ if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5166	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5167	+ {
	5168	+ objEditor.ClearInfo(); // .GetMaterial());
	5169	+
	5170	+ for (int i=0; i < group.selection.Size(); i++)
	5171	+ {
	5172	+ Object3D child = (Object3D) group.selection.get(i);
	5173	+
	5174	+ objEditor.AddInfo(child, this, true);
	5175	+ System.err.println("info : " + child.GetPath());
	5176	+ }
	5177	+
	5178	+ objEditor.SetText(); // jan 2014
	5179	+ }
	5180	+
	5181	+ super.refreshContents(cp);
	5182	+ }
4135	5183
4136	5184	void linkSomething(Object3D thing)
4137	5185	{
..	..	@@ -4203,16 +5251,19 @@
4203	5251	{
4204	5252	if (group.selection.isEmpty())
4205	5253	return;
4206		- GrafreeD.clipboardIsTempGroup = false;
	5254	+
	5255	+ Grafreed.clipboardIsTempGroup = false;
4207	5256	Composite tGroup = null;
4208	5257	if (group.selection.size() > 0) // 1)
4209	5258	{
4210	5259	tGroup = new cGroup();
4211		- GrafreeD.clipboardIsTempGroup = true;
	5260	+ Grafreed.clipboardIsTempGroup = true;
4212	5261	}
4213	5262
4214	5263	if (cut)
4215	5264	{
	5265	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5266	+// Save();
4216	5267	//int indices[] = jList.getSelectedIndices();
4217	5268	//for (int i = indices.length - 1; i >= 0; i--)
4218	5269	//jList.remove(indices[i]);
..	..	@@ -4248,16 +5299,16 @@
4248	5299	//System.out.println("cut " + child);
4249	5300	//System.out.println("parent = " + child.parent);
4250	5301	// tmp.addChild(child);
4251		- if (GrafreeD.clipboardIsTempGroup)
	5302	+ if (Grafreed.clipboardIsTempGroup)
4252	5303	tGroup.add/Child/(tmp);
4253	5304	else
4254		- GrafreeD.clipboard = tmp;
	5305	+ Grafreed.clipboard = tmp;
4255	5306	}
4256	5307	else
4257		- if (GrafreeD.clipboardIsTempGroup)
	5308	+ if (Grafreed.clipboardIsTempGroup)
4258	5309	tGroup.add/Child/(child);
4259	5310	else
4260		- GrafreeD.clipboard = child;
	5311	+ Grafreed.clipboard = child;
4261	5312	}
4262	5313
4263	5314	//ResetModel();
..	..	@@ -4289,21 +5340,23 @@
4289	5340	//System.out.println("cut " + elem);
4290	5341	//System.out.println("parent = " + elem.parent);
4291	5342	// tmp.addChild(elem);
4292		- if (GrafreeD.clipboardIsTempGroup)
	5343	+ if (Grafreed.clipboardIsTempGroup)
4293	5344	tGroup.add/Child/(tmp);
4294	5345	else
4295		- GrafreeD.clipboard = tmp;
	5346	+ Grafreed.clipboard = tmp;
4296	5347	}
4297	5348	else
4298		- if (GrafreeD.clipboardIsTempGroup)
	5349	+ if (Grafreed.clipboardIsTempGroup)
4299	5350	tGroup.add/Child/(child);
4300	5351	else
4301		- GrafreeD.clipboard = child;
	5352	+ Grafreed.clipboard = child;
4302	5353	}
4303	5354
4304	5355	}
4305		- if (GrafreeD.clipboardIsTempGroup)
4306		- GrafreeD.clipboard = tGroup;
	5356	+
	5357	+ if (Grafreed.clipboardIsTempGroup)
	5358	+ Grafreed.clipboard = tGroup;
	5359	+
4307	5360	if (cut)
4308	5361	{
4309	5362	ResetModel();
..	..	@@ -4313,11 +5366,15 @@
4313	5366
4314	5367	void paste(boolean expand)
4315	5368	{
	5369	+ if (Globals.REPLACEONMAKE)
	5370	+ Save();
	5371	+ boolean keep = Globals.REPLACEONMAKE;
	5372	+ Globals.REPLACEONMAKE = false;
4316	5373	// if (GrafreeD.clipboard == null)
4317	5374	// return;
4318	5375	boolean first = true;
4319	5376
4320		- if (GrafreeD.clipboardIsTempGroup)
	5377	+ if (Grafreed.clipboardIsTempGroup)
4321	5378	{
4322	5379	Composite temp;
4323	5380
..	..	@@ -4328,7 +5385,7 @@
4328	5385	temp = (Composite)Applet3D.clipboard.deepCopy();
4329	5386	*/
4330	5387	Object3D elem;
4331		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5388	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4332	5389	{
4333	5390	Object3D child = (Object3D)e.nextElement();
4334	5391
..	..	@@ -4362,21 +5419,22 @@
4362	5419	//Object3D cb = Applet3D.clipboard;
4363	5420	//temp.addChild(cb);
4364	5421	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4365		- assert(GrafreeD.clipboard.parent == null);
4366		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4367		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4368		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4369		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	5422	+ assert(Grafreed.clipboard.parent == null);
	5423	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5424	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5425	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5426	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4370	5427	else
4371		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4372		- GrafreeD.clipboard.get(0).parent = keepparent;
	5428	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5429	+ Grafreed.clipboard.get(0).parent = keepparent;
4373	5430	}
4374	5431
	5432	+ Globals.REPLACEONMAKE = keep;
4375	5433	ResetModel();
4376	5434	refreshContents();
4377	5435	}
4378	5436
4379		- void pasteInto(boolean copyit)
	5437	+ void pasteInto(boolean copyit, boolean clone)
4380	5438	{
4381	5439	// if (GrafreeD.clipboard == null)
4382	5440	// return;
..	..	@@ -4405,15 +5463,22 @@
4405	5463	if (copyit)
4406	5464	{
4407	5465	// paste(false);
4408		- CloneClipboard(false); // sept 2014
	5466	+ if (clone)
	5467	+ {
	5468	+ CloneClipboard(false); // sept 2014
	5469	+ }
	5470	+ else
	5471	+ {
	5472	+ paste(false);
	5473	+ }
4409	5474	}
4410	5475	else
4411	5476	{
4412	5477	boolean first = true;
4413	5478
4414		- if (GrafreeD.clipboardIsTempGroup)
	5479	+ if (Grafreed.clipboardIsTempGroup)
4415	5480	{
4416		- Composite temp = (Composite)GrafreeD.clipboard;
	5481	+ Composite temp = (Composite)Grafreed.clipboard;
4417	5482	Object3D copy;
4418	5483	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4419	5484	{
..	..	@@ -4423,7 +5488,7 @@
4423	5488	}
4424	5489	} else
4425	5490	{
4426		- linkSomething(GrafreeD.clipboard); //.get(0));
	5491	+ linkSomething(Grafreed.clipboard); //.get(0));
4427	5492	}
4428	5493	}
4429	5494	}
..	..	@@ -4500,6 +5565,10 @@
4500	5565
4501	5566	void group(Object3D csg, boolean grab)
4502	5567	{
	5568	+ if (Globals.REPLACEONMAKE)
	5569	+ Save();
	5570	+ boolean keep = Globals.REPLACEONMAKE;
	5571	+ Globals.REPLACEONMAKE = false;
4503	5572	if (//false) // why??
4504	5573	!group.selection.isEmpty())
4505	5574	{
..	..	@@ -4613,10 +5682,15 @@
4613	5682	//node.add(csg);
4614	5683	//makeSomething(node);
4615	5684	makeSomething(csg);
	5685	+ Globals.REPLACEONMAKE = keep;
4616	5686	}
4617	5687
4618	5688	void Ungroup(Object3D g)
4619	5689	{
	5690	+ if (Globals.REPLACEONMAKE)
	5691	+ Save();
	5692	+ boolean keep = Globals.REPLACEONMAKE;
	5693	+ Globals.REPLACEONMAKE = false;
4620	5694	if (g instanceof HiddenObject)
4621	5695	{
4622	5696	HiddenObject h = (HiddenObject) g;
..	..	@@ -4633,6 +5707,7 @@
4633	5707	objEditor.makeSomething(g.get(i), false);
4634	5708	}
4635	5709	}
	5710	+ Globals.REPLACEONMAKE = keep;
4636	5711	}
4637	5712
4638	5713	void ungroup()
..	..	@@ -4828,21 +5903,6 @@
4828	5903	}
4829	5904	*/
4830	5905
4831		- void ImportGFD()
4832		- {
4833		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4834		- browser.show();
4835		- String filename = browser.getFile();
4836		- if (filename != null && filename.length() > 0)
4837		- {
4838		- String fullname = browser.getDirectory() + filename;
4839		-
4840		- //Object3D readobj =
4841		- objEditor.ReadGFD(fullname, objEditor);
4842		- //makeSomething(readobj);
4843		- }
4844		- }
4845		-
4846	5906	/*
4847	5907	public void Callback(Object obj)
4848	5908	{
..	..	@@ -4866,26 +5926,9 @@
4866	5926	}
4867	5927	*/
4868	5928
4869		- void ImportVRMLX3D()
4870		- {
4871		- if (GrafreeD.standAlone)
4872		- {
4873		- /**/
4874		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4875		- browser.show();
4876		- String filename = browser.getFile();
4877		- if (filename != null && filename.length() > 0)
4878		- {
4879		- String fullname = browser.getDirectory() + filename;
4880		- LoadVRMLX3D(fullname);
4881		- }
4882		- /**/
4883		- }
4884		- }
4885		-
4886	5929	String GetFile(String dialogName)
4887	5930	{
4888		- if (GrafreeD.standAlone)
	5931	+ if (Grafreed.standAlone)
4889	5932	{
4890	5933	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4891	5934	browser.show();
..	..	@@ -4949,10 +5992,49 @@
4949	5992	cButton flashSelectionButton;
4950	5993	cButton editButton;
4951	5994	cButton uneditButton;
	5995	+ JCheckBox allParamsButton;
4952	5996	cButton clearpanelButton;
4953		- cButton allParamsButton;
4954	5997	cButton unselectButton;
4955	5998
	5999	+ cButton restoreCameraButton;
	6000	+
	6001	+ cButton saveButton;
	6002	+ cButton oneStepButton;
	6003	+
	6004	+ cButton groupButton;
	6005	+ cButton ungroupButton;
	6006	+ cButton compositeButton;
	6007	+ cButton switchButton;
	6008	+ cButton loopButton;
	6009	+ cButton textureButton;
	6010	+
	6011	+ cButton skybox1Button;
	6012	+ cButton skybox2Button;
	6013	+ cButton skybox3Button;
	6014	+ cButton skybox4Button;
	6015	+ cButton skybox5Button;
	6016	+ cButton skybox6Button;
	6017	+ cButton skybox7Button;
	6018	+
	6019	+ cButton skybox11Button;
	6020	+ cButton skybox12Button;
	6021	+ cButton skybox13Button;
	6022	+ cButton skybox14Button;
	6023	+ cButton skybox15Button;
	6024	+ cButton skybox16Button;
	6025	+ cButton skybox17Button;
	6026	+
	6027	+ cButton gridButton;
	6028	+ cButton boxButton;
	6029	+ cButton sphereButton;
	6030	+ cButton coneButton;
	6031	+ cButton torusButton;
	6032	+ cButton superButton;
	6033	+ cButton kleinButton;
	6034	+ cButton particlesButton;
	6035	+ cButton overlayButton;
	6036	+ cButton lightButton;
	6037	+
4956	6038	cButton screenfitButton;
4957	6039	cButton screenfitpointButton;
4958	6040	cButton snapobjectButton;
..	..	@@ -4964,14 +6046,6 @@
4964	6046
4965	6047	cButton setsupportButton;
4966	6048
4967		- cButton twoButton;
4968		- cButton sixButton;
4969		- cButton threeButton;
4970		- cButton sevenButton;
4971		- cButton fourButton; // full panel
4972		- cButton oneButton; // full XYZ
4973		- //cButton currentLayout;
4974		-
4975	6049	//
4976	6050	//Composite
4977	6051	Object3D // to do !!
..	..	@@ -4981,9 +6055,11 @@
4981	6055	//JTree jTree;
4982	6056	private MenuItem lookAtItem;
4983	6057	private MenuItem lookFromItem;
4984		- private MenuItem switchItem;
	6058	+ private MenuItem switchViewItem;
4985	6059	private MenuItem cutItem;
4986		- private MenuItem duplicateItem;
	6060	+ private MenuItem undoItem;
	6061	+ private MenuItem redoItem;
	6062	+ private JMenuItem duplicateItem;
4987	6063	private MenuItem cloneItem;
4988	6064	private MenuItem cloneSupportItem;
4989	6065	private MenuItem overwriteGeoItem;
..	..	@@ -4996,7 +6072,7 @@
4996	6072	private MenuItem linkverticesItem;
4997	6073	private MenuItem relinkverticesItem;
4998	6074	private MenuItem setMasterItem;
4999		- private MenuItem resetMeshItem;
	6075	+ private MenuItem resetAllItem;
5000	6076	private MenuItem stepAllItem;
5001	6077	private MenuItem revertMeshItem;
5002	6078	private MenuItem poseMeshItem;
..	..	@@ -5007,10 +6083,11 @@
5007	6083	private MenuItem mergeGeometriesItem;
5008	6084	private MenuItem copyItem;
5009	6085	private MenuItem pasteItem;
	6086	+ private MenuItem pasteIntoItem;
5010	6087	private MenuItem pasteLinkItem;
5011	6088	private MenuItem pasteCloneItem;
5012	6089	private MenuItem pasteExpandItem;
5013		- private MenuItem clearItem;
	6090	+ private MenuItem deleteItem;
5014	6091	private MenuItem clearAllItem;
5015	6092	private MenuItem genUVItem;
5016	6093	private MenuItem genNormalsMESHItem;
..	..	@@ -5045,6 +6122,10 @@
5045	6122	private MenuItem showleavesItem;
5046	6123	private MenuItem markleavesItem;
5047	6124	private MenuItem unmarkleavesItem;
	6125	+ private MenuItem rewindleavesItem;
	6126	+ private MenuItem unrewindleavesItem;
	6127	+ private MenuItem randomleavesItem;
	6128	+ private MenuItem unrandomleavesItem;
5048	6129
5049	6130	private MenuItem flipVItem;
5050	6131	private MenuItem unflipVItem;
..	..	@@ -5056,15 +6137,17 @@
5056	6137	private MenuItem panoTexturesItem;
5057	6138
5058	6139	private MenuItem resetCentroidItem;
5059		- private MenuItem transformgeometryItem;
	6140	+ private MenuItem resetCentroidXZItem;
5060	6141	private MenuItem resetTransformItem;
	6142	+ private MenuItem transformGeometryItem;
	6143	+ private MenuItem transformChildrenItem;
5061	6144	private MenuItem hideItem;
5062	6145	private MenuItem grabItem;
5063	6146	private MenuItem backItem;
5064	6147	private MenuItem frontItem;
5065	6148	private MenuItem cameraItem;
5066	6149	private MenuItem compositeItem;
5067		- private MenuItem randomItem;
	6150	+ private MenuItem switchItem;
5068	6151	private MenuItem physicsItem;
5069	6152	private MenuItem frameselectorItem;
5070	6153	private MenuItem scriptNodeItem;
..	..	@@ -5088,6 +6171,8 @@
5088	6171	private MenuItem attachBumpItem;
5089	6172	private MenuItem detachBumpItem;
5090	6173	private MenuItem pigmentBumpItem;
	6174	+ private MenuItem embedTexturesItem;
	6175	+ private MenuItem deEmbedTexturesItem;
5091	6176
5092	6177	private MenuItem particleItem;
5093	6178	private MenuItem ragdollItem;
..	..	@@ -5104,7 +6189,7 @@
5104	6189	private MenuItem blobItem;
5105	6190	private MenuItem latheItem;
5106	6191	private MenuItem bezierItem;
5107		- private MenuItem checkerItem;
	6192	+ private MenuItem overlayItem;
5108	6193	private MenuItem meshItem;
5109	6194	// private MenuItem meshGroupItem;
5110	6195	private MenuItem springItem;
..	..	@@ -5126,11 +6211,6 @@
5126	6211	private MenuItem doubleItem;
5127	6212	private MenuItem tripleItem;
5128	6213
5129		- private MenuItem importGFDItem;
5130		- private MenuItem importVRMLX3DItem;
5131		- private MenuItem import3DSItem;
5132		- private MenuItem importOBJItem;
5133		-
5134	6214	private MenuItem computeAOItem;
5135	6215	private MenuItem recompileItem;
5136	6216	private MenuItem editScriptItem;
..	..	@@ -5140,4 +6220,8 @@
5140	6220	private MenuItem analyzeItem;
5141	6221	private MenuItem dumpItem;
5142	6222	//boolean freezemodel = false;
	6223	+
	6224	+ Menu cameraMenu;
	6225	+ MenuItem editCameraItem;
	6226	+ MenuItem restoreCameraItem;
5143	6227	}