~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -23,6 +23,237 @@
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 + "/" + s + ".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("default", "uffizi", row0);
	62	+ AddSkyboxButton("default", "CloudyHills", row0);
	63	+
	64	+ AddSkyboxButton("default", "skycube", row1);
	65	+ AddSkyboxButton("bridge", "Bridge", row1);
	66	+ AddSkyboxButton("bridge", "Bridge2", row1);
	67	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	68	+
	69	+ AddSkyboxButton("urban", "Parliament", row2);
	70	+ AddSkyboxButton("urban", "Roundabout", row2);
	71	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	72	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	73	+
	74	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	75	+ AddSkyboxButton("urban", "UnionSquare", row3);
	76	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	77	+ AddSkyboxButton("park", "Buddha", row3);
	78	+
	79	+ AddSkyboxButton("park", "CNTower2", row4);
	80	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	81	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	82	+ AddSkyboxButton("park", "Park", row4);
	83	+
	84	+ AddSkyboxButton("park", "Pond", row5);
	85	+ AddSkyboxButton("park", "Skansen", row5);
	86	+ AddSkyboxButton("park", "Skansen2", row5);
	87	+ AddSkyboxButton("park", "Skansen3", row5);
	88	+
	89	+ AddSkyboxButton("park", "Skansen4", row6);
	90	+ AddSkyboxButton("park", "Skansen5", row6);
	91	+ AddSkyboxButton("park", "Stairs", row6);
	92	+ AddSkyboxButton("park", "Tantolunden4", row6);
	93	+
	94	+ tab0.add(row0);
	95	+ tab0.add(row1);
	96	+ tab0.add(row2);
	97	+ tab0.add(row3);
	98	+ tab0.add(row4);
	99	+ tab0.add(row5);
	100	+ tab0.add(row6);
	101	+
	102	+ for (int i=5; --i>=0;)
	103	+ {
	104	+ //oe.toolboxPanel.Return();
	105	+ //tab0.add(new cGridBag());
	106	+ }
	107	+ }
	108	+
	109	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	110	+ {
	111	+ cGridBag tab0 = new cGridBag().setVertical(true);
	112	+
	113	+ tab0.setName("Nature");
	114	+ skyboxpanel.add(tab0);
	115	+
	116	+ cGridBag row0 = new cGridBag();
	117	+ cGridBag row1 = new cGridBag();
	118	+ cGridBag row2 = new cGridBag();
	119	+ cGridBag row3 = new cGridBag();
	120	+ cGridBag row4 = new cGridBag();
	121	+ cGridBag row5 = new cGridBag();
	122	+ cGridBag row6 = new cGridBag();
	123	+
	124	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	125	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	126	+ AddSkyboxButton("beach", "PalmTrees", row0);
	127	+ AddSkyboxButton("beach", "Tenerife", row0);
	128	+
	129	+ AddSkyboxButton("beach", "Tenerife2", row1);
	130	+ AddSkyboxButton("beach", "Tenerife3", row1);
	131	+ AddSkyboxButton("field", "FishPond", row1);
	132	+ AddSkyboxButton("field", "Footballfield", row1);
	133	+
	134	+ AddSkyboxButton("field", "Meadow", row2);
	135	+ AddSkyboxButton("field", "Sorsele", row2);
	136	+ AddSkyboxButton("field", "Sorsele2", row2);
	137	+ AddSkyboxButton("field", "Sorsele3", row2);
	138	+
	139	+ AddSkyboxButton("forest", "Brudslojan", row3);
	140	+ AddSkyboxButton("forest", "Langholmen2", row3);
	141	+ AddSkyboxButton("forest", "Plants", row3);
	142	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	143	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	144	+
	145	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	146	+ AddSkyboxButton("mountain", "Ryfjallet", row4);
	147	+ AddSkyboxButton("mountain", "Teide", row4);
	148	+
	149	+ AddSkyboxButton("rocky", "Langholmen", row5);
	150	+ AddSkyboxButton("rocky", "Riddarfjarden", row5);
	151	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	152	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	153	+ /*
	154	+Kastellholmen
	155	+Langholmen
	156	+Riddarfjarden
	157	+Skinnarviksberget
	158	+Tanto
	159	+Tantolunden2
	160	+Tantolunden6
	161	+ */
	162	+
	163	+ tab0.add(row0);
	164	+ tab0.add(row1);
	165	+ tab0.add(row2);
	166	+ tab0.add(row3);
	167	+ tab0.add(row4);
	168	+ tab0.add(row5);
	169	+ tab0.add(row6);
	170	+
	171	+ for (int i=5; --i>=0;)
	172	+ {
	173	+ //oe.toolboxPanel.Return();
	174	+ //tab0.add(new cGridBag());
	175	+ }
	176	+ }
	177	+
	178	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	179	+ {
	180	+ cGridBag tab0 = new cGridBag().setVertical(true);
	181	+
	182	+ tab0.setName("Night");
	183	+ skyboxpanel.add(tab0);
	184	+
	185	+ cGridBag row0 = new cGridBag();
	186	+ cGridBag row1 = new cGridBag();
	187	+ cGridBag row2 = new cGridBag();
	188	+ cGridBag row3 = new cGridBag();
	189	+ cGridBag row4 = new cGridBag();
	190	+ cGridBag row5 = new cGridBag();
	191	+ cGridBag row6 = new cGridBag();
	192	+
	193	+ AddSkyboxButton("night", "NightPath", row0);
	194	+ AddSkyboxButton("night", "PondNight", row0);
	195	+ AddSkyboxButton("night", "Powerlines", row0);
	196	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	197	+
	198	+ AddSkyboxButton("urban", "CNTower", row1);
	199	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	200	+ AddSkyboxButton("indoors", "DallasW", row1);
	201	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row1);
	202	+
	203	+ AddSkyboxButton("indoors", "Vasa", row2);
	204	+ AddSkyboxButton("winter", "Backyard", row2);
	205	+ AddSkyboxButton("winter", "Creek", row2);
	206	+ AddSkyboxButton("winter", "FootballField3", row2);
	207	+
	208	+ AddSkyboxButton("winter", "Forest", row3);
	209	+ AddSkyboxButton("winter", "HornstullsStrand2", row3);
	210	+ AddSkyboxButton("winter", "House", row3);
	211	+ AddSkyboxButton("winter", "IceLake", row3);
	212	+
	213	+ AddSkyboxButton("winter", "IceRiver", row4);
	214	+ AddSkyboxButton("winter", "Park3", row4);
	215	+ AddSkyboxButton("winter", "PondWinter", row4);
	216	+
	217	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	218	+ AddSkyboxButton("winter", "Vindelalven", row5);
	219	+ /*
	220	+Backyard
	221	+Creek
	222	+FootballField3
	223	+Forest
	224	+HornstullsStrand2
	225	+House
	226	+IceLake
	227	+IceRiver
	228	+Park3
	229	+PondWinter
	230	+Tantolunden5
	231	+Vindelalven *
	232	+ */
	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 ChangeSkybox(String name)
	250	+ {
	251	+ cameraView.envyoff = false;
	252	+ cameraView.skyboxname = name;
	253	+ cameraView.skyboxext = "jpg";
	254	+ cameraView.repaint();
	255	+ }
	256	+
26	257	//ObjEditor objEditor;
27	258	public void closeUI2()
28	259	{
..	..	@@ -60,6 +291,12 @@
60	291	this.copy = this.group = group;
61	292	//selectees = this.group.selectees;
62	293
	294	+ if (copy.versions == null)
	295	+ {
	296	+ copy.versions = new byte[100][];
	297	+ copy.versionindex = -1;
	298	+ }
	299	+
63	300	if(ui)
64	301	SetupUI(objEditor);
65	302	}
..	..	@@ -74,16 +311,28 @@
74	311	this.copy = this.group = copy;
75	312	//selectees = this.group.selectees;
76	313
77		- SetupMenu2(objEditor);
	314	+ SetupMenu2(this); //objEditor);
78	315	SetupUI2(objEditor);
79	316	objEditor.SetupUI(true);
80	317	SetupViews(objEditor);
81	318
82	319	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	320	+
	321	+ if (copy.versions == null)
	322	+ {
	323	+ copy.versions = new byte[100][];
	324	+ copy.versionindex = -1;
	325	+
	326	+ Save(true);
	327	+ }
83	328	}
84	329
85	330	void CloneSelection(boolean supports)
86	331	{
	332	+ if (Globals.REPLACEONMAKE)
	333	+ Save();
	334	+ boolean keep = Globals.REPLACEONMAKE;
	335	+ Globals.REPLACEONMAKE = false;
87	336	// Object3D keep = GrafreeD.clipboard;
88	337	//Object3D obj;
89	338	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,18 +343,19 @@
94	343
95	344	makeSomething(clone, i==group.selection.size()-1);
96	345	}
	346	+ Globals.REPLACEONMAKE = keep;
97	347	}
98	348
99	349	void CloneClipboard(boolean supports)
100	350	{
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));
	351	+ assert(Grafreed.clipboard.parent == null);
	352	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	353	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	354	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	355	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
106	356	else
107		- makeSomething(CloneObject(GrafreeD.clipboard, false));
108		- GrafreeD.clipboard.get(0).parent = keepparent;
	357	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	358	+ Grafreed.clipboard.get(0).parent = keepparent;
109	359	}
110	360
111	361	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -119,7 +369,7 @@
119	369	// obj.support = null;
120	370	if (!supports)
121	371	obj.SaveSupports();
122		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	372	+ Object3D clone = (Object3D)Grafreed.clone(obj);
123	373	obj.parent = parent;
124	374	// obj.support = support;
125	375	// clone.support = support; // aout 2013
..	..	@@ -148,30 +398,29 @@
148	398
149	399	//JTextField nameField;
150	400
151		- void SetupMenu2(ObjEditor oe)
	401	+ void SetupMenu2(GroupEditor oe)
152	402	{
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);
	403	+ oe.jTree = new cTree();
	404	+
164	405	Menu menu;
165	406	oe.menuBar.add(menu = new Menu("Edit"));
166	407	//editItem = menu.add(new MenuItem("Edit"));
167	408	//editItem.addActionListener(this);
168		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	409	+
	410	+// undoItem = menu.add(new MenuItem("Undo"));
	411	+// undoItem.addActionListener(this);
	412	+// redoItem = menu.add(new MenuItem("Redo"));
	413	+// redoItem.addActionListener(this);
	414	+// menu.add("-");
	415	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
169	416	duplicateItem.addActionListener(this);
170		- menu.add("-");
171	417	cloneItem = menu.add(new MenuItem("Clone"));
172	418	cloneItem.addActionListener(this);
	419	+ if (Globals.ADVANCED)
	420	+ {
173	421	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
174	422	cloneSupportItem.addActionListener(this);
	423	+ }
175	424	menu.add("-");
176	425	cutItem = menu.add(new MenuItem("Cut"));
177	426	cutItem.addActionListener(this);
..	..	@@ -179,27 +428,123 @@
179	428	copyItem.addActionListener(this);
180	429	pasteItem = menu.add(new MenuItem("Paste"));
181	430	pasteItem.addActionListener(this);
	431	+
	432	+ menu.add("-");
	433	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	434	+ pasteIntoItem.addActionListener(this);
182	435	pasteLinkItem = menu.add(new MenuItem("Paste link"));
183	436	pasteLinkItem.addActionListener(this);
184	437	pasteCloneItem = menu.add(new MenuItem("Paste clone"));
185	438	pasteCloneItem.addActionListener(this);
186	439	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
187	440	// pasteExpandItem.addActionListener(this);
188		- clearItem = menu.add(new MenuItem("Clear"));
189		- clearItem.addActionListener(this);
	441	+ menu.add("-");
	442	+ deleteItem = menu.add(new MenuItem("Delete"));
	443	+ deleteItem.addActionListener(this);
	444	+
	445	+ if (Globals.ADVANCED)
	446	+ {
	447	+ // Deletes the cameras...
190	448	clearAllItem = menu.add(new MenuItem("Clear All"));
191	449	clearAllItem.addActionListener(this);
	450	+ }
	451	+
	452	+ menuBar.add(cameraMenu = new Menu("View"));
	453	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	454	+ //zBufferItem.addActionListener(this);
	455	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	456	+ //normalLensItem.addActionListener(this);
	457	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	458	+ restoreCameraItem.addActionListener(this);
	459	+
	460	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	461	+// toggleFullScreenItem.addItemListener(this);
	462	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	463	+// cameraMenu.add("-");
	464	+//
	465	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	466	+// toggleTextureItem.addItemListener(this);
	467	+// toggleTextureItem.setState(CameraPane.textureon);
	468	+//
	469	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	470	+// toggleSwitchItem.addItemListener(this);
	471	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	472	+
	473	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	474	+ toggleHandleItem.addItemListener(this);
	475	+ toggleHandleItem.setState(CameraPane.HANDLES);
	476	+
	477	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	478	+ togglePaintItem.addItemListener(this);
	479	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	480	+
	481	+ if (Globals.ADVANCED)
	482	+ {
	483	+ cameraMenu.add("-");
	484	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	485	+ toggleLiveItem.addItemListener(this);
	486	+ toggleLiveItem.setState(Globals.isLIVE());
192	487
	488	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	489	+ stepItem.addActionListener(this);
	490	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	491	+ // toggleDLItem.addItemListener(this);
	492	+ // toggleDLItem.setState(false);
	493	+
	494	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	495	+ toggleRenderItem.addItemListener(this);
	496	+ toggleRenderItem.setState(!CameraPane.frozen);
	497	+
	498	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	499	+ toggleDebugItem.addItemListener(this);
	500	+ toggleDebugItem.setState(Globals.DEBUG);
	501	+
	502	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	503	+ toggleFrustumItem.addItemListener(this);
	504	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	505	+
	506	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	507	+ toggleFootContactItem.addItemListener(this);
	508	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	509	+
	510	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	511	+ toggleTimelineItem.addItemListener(this);
	512	+ }
	513	+
	514	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	515	+// toggleRootItem.addItemListener(this);
	516	+// toggleRootItem.setState(false);
	517	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	518	+// animationItem.addItemListener(this);
	519	+// animationItem.setState(CameraPane.ANIMATION);
	520	+ cameraMenu.add("-");
	521	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	522	+ editCameraItem.addActionListener(this);
	523	+
	524	+ if (Globals.ADVANCED)
	525	+ {
	526	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	527	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	528	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	529	+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	530	+ oe.cameraMenu.add("-");
	531	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	532	+ openWindowItem.addActionListener(this);
	533	+ editLeafItem.addActionListener(this);
	534	+ lookAtItem.addActionListener(this);
	535	+ //lookFromItem.addActinoListener(this);
	536	+ //switchViewItem.addActionListener(this);
	537	+ }
	538	+
193	539	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);
	540	+ if (Globals.ADVANCED)
	541	+ {
198	542	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
199	543	revertMeshItem.addActionListener(this);
200	544	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
201	545	resetreferencesItem.addActionListener(this);
202	546	menu.add("-");
	547	+ }
203	548	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
204	549	overwriteGeoItem.addActionListener(this);
205	550	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -211,79 +556,104 @@
211	556	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
212	557	overwriteUVItem.addActionListener(this);
213	558	menu.add("-");
	559	+ if (Globals.ADVANCED)
	560	+ {
214	561	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
215	562	generateMeshItem.addActionListener(this);
216	563	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
217	564	poseMeshItem.addActionListener(this);
218	565	menu.add("-");
	566	+ }
219	567	resetsupportItem = menu.add(new MenuItem("Reset support"));
220	568	resetsupportItem.addActionListener(this);
221	569	linkverticesItem = menu.add(new MenuItem("Link to Support"));
222	570	linkverticesItem.addActionListener(this);
223	571	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
224	572	relinkverticesItem.addActionListener(this);
	573	+
	574	+ if (Globals.ADVANCED)
	575	+ {
225	576	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
226	577	setMasterItem.addActionListener(this);
	578	+ }
227	579
228	580	oe.menuBar.add(menu = new Menu("Group"));
229		- grabItem = menu.add(new MenuItem("Grab"));
230		- grabItem.addActionListener(this);
	581	+// grabItem = menu.add(new MenuItem("Grab"));
	582	+// grabItem.addActionListener(this);
231	583	backItem = menu.add(new MenuItem("Back"));
232	584	backItem.addActionListener(this);
233	585	frontItem = menu.add(new MenuItem("Front"));
234	586	frontItem.addActionListener(this);
235		- compositeItem = menu.add(new MenuItem("Composite"));
236		- compositeItem.addActionListener(this);
237		- hideItem = menu.add(new MenuItem("Hide"));
	587	+// compositeItem = menu.add(new MenuItem("Composite"));
	588	+// compositeItem.addActionListener(this);
	589	+
	590	+ if (Globals.ADVANCED)
	591	+ {
	592	+ hideItem = menu.add(new MenuItem("Hidden Group"));
238	593	hideItem.addActionListener(this);
	594	+ }
239	595	ungroupItem = menu.add(new MenuItem("Ungroup"));
240	596	ungroupItem.addActionListener(this);
241		- menu.add("-");
242		- randomItem = menu.add(new MenuItem("Switch node"));
243		- randomItem.addActionListener(this);
	597	+
	598	+// menu.add("-");
	599	+//
	600	+// switchItem = menu.add(new MenuItem("Switch node"));
	601	+// switchItem.addActionListener(this);
	602	+ if (Globals.ADVANCED)
	603	+ {
244	604	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
245	605	switchGeoItem.addActionListener(this);
246	606	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
247	607	switchTransfoItem.addActionListener(this);
	608	+ morphItem = menu.add(new MenuItem("Morph Group"));
	609	+ morphItem.addActionListener(this);
	610	+
	611	+ menu.add("-");
248	612	physicsItem = menu.add(new MenuItem("Physics"));
249	613	physicsItem.addActionListener(this);
250	614	frameselectorItem = menu.add(new MenuItem("Frame Selector"));
251	615	frameselectorItem.addActionListener(this);
252		- morphItem = menu.add(new MenuItem("Morph"));
253		- morphItem.addActionListener(this);
254	616	scriptNodeItem = menu.add(new MenuItem("Script Node"));
255	617	scriptNodeItem.addActionListener(this);
256		- cameraItem = menu.add(new MenuItem("Camera"));
257		- cameraItem.addActionListener(this);
	618	+ }
258	619
259	620	oe.menuBar.add(menu = new Menu("Object"));
260		- textureItem = menu.add(new MenuItem("Texture"));
261		- textureItem.addActionListener(this);
	621	+// textureItem = menu.add(new MenuItem("Texture"));
	622	+// textureItem.addActionListener(this);
262	623	billboardItem = menu.add(new MenuItem("Billboard"));
263	624	billboardItem.addActionListener(this);
264	625	csgItem = menu.add(new MenuItem("CSG"));
265	626	csgItem.addActionListener(this);
266		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	627	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
267	628	shadowXItem.addActionListener(this);
268		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	629	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
269	630	shadowYItem.addActionListener(this);
270		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	631	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
271	632	shadowZItem.addActionListener(this);
	633	+ attributeItem = menu.add(new MenuItem("Attribute"));
	634	+ attributeItem.addActionListener(this);
	635	+
	636	+ if (Globals.ADVANCED)
	637	+ {
	638	+ menu.add("-");
272	639	linkerItem = menu.add(new MenuItem("Linker"));
273	640	linkerItem.addActionListener(this);
274	641	templateItem = menu.add(new MenuItem("Template"));
275	642	templateItem.addActionListener(this);
276		- attributeItem = menu.add(new MenuItem("Attribute"));
277		- attributeItem.addActionListener(this);
278	643	pointflowItem = menu.add(new MenuItem("Point Flow"));
279	644	pointflowItem.addActionListener(this);
	645	+ }
280	646	menu.add("-");
281	647	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
282	648	resetTransformItem.addActionListener(this);
283	649	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
284	650	resetCentroidItem.addActionListener(this);
285		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
286		- transformgeometryItem.addActionListener(this);
	651	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	652	+ resetCentroidXZItem.addActionListener(this);
	653	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	654	+ transformGeometryItem.addActionListener(this);
	655	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	656	+ transformChildrenItem.addActionListener(this);
287	657
288	658	oe.menuBar.add(menu = new Menu("Geometry"));
289	659	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -294,8 +664,11 @@
294	664	genNormalsCADItem.addActionListener(this);
295	665	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
296	666	genNormalsMESHItem.addActionListener(this);
297		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	667	+ if (Globals.ADVANCED)
	668	+ {
	669	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
298	670	genNormalsMINEItem.addActionListener(this);
	671	+ }
299	672	stripifyItem = menu.add(new MenuItem("Stripify"));
300	673	stripifyItem.addActionListener(this);
301	674	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -317,23 +690,34 @@
317	690	reduce34MeshItem.addActionListener(this);
318	691	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
319	692	increaseMeshItem.addActionListener(this);
320		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
321		- smoothMeshItem.addActionListener(this);
322	693	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
323	694	clipMeshItem.addActionListener(this);
	695	+
	696	+ if (Globals.ADVANCED)
	697	+ {
	698	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	699	+ smoothMeshItem.addActionListener(this);
	700	+ }
324	701
325	702	oe.menuBar.add(menu = new Menu("Attributes"));
326	703	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
327	704	clearMaterialsItem.addActionListener(this);
	705	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	706	+ resetAllItem.addActionListener(this);
	707	+ stepAllItem = menu.add(new MenuItem("Step All"));
	708	+ stepAllItem.addActionListener(this);
328	709	menu.add("-");
329	710	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
330	711	liveleavesItem.addActionListener(this);
331	712	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
332	713	unliveleavesItem.addActionListener(this);
	714	+ if (Globals.ADVANCED)
	715	+ {
333	716	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
334	717	supportleavesItem.addActionListener(this);
335	718	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
336	719	unsupportleavesItem.addActionListener(this);
	720	+ }
337	721	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
338	722	hideleavesItem.addActionListener(this);
339	723	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -342,6 +726,14 @@
342	726	markleavesItem.addActionListener(this);
343	727	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
344	728	unmarkleavesItem.addActionListener(this);
	729	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	730	+ rewindleavesItem.addActionListener(this);
	731	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	732	+ unrewindleavesItem.addActionListener(this);
	733	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	734	+ randomleavesItem.addActionListener(this);
	735	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	736	+ unrandomleavesItem.addActionListener(this);
345	737	menu.add("-");
346	738	flipVItem = menu.add(new MenuItem("Flip V"));
347	739	flipVItem.addActionListener(this);
..	..	@@ -367,45 +759,56 @@
367	759	attachBumpItem.addActionListener(this);
368	760	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
369	761	pigmentBumpItem.addActionListener(this);
	762	+ //embedTexturesItem
370	763	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
371	764	detachPigmentItem.addActionListener(this);
372	765	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
373	766	detachBumpItem.addActionListener(this);
	767	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	768	+ embedTexturesItem.addActionListener(this);
	769	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	770	+ deEmbedTexturesItem.addActionListener(this);
374	771	menu.add("-");
375	772	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
376	773	sortbysizeItem.addActionListener(this);
377	774	sortbynameItem = menu.add(new MenuItem("Sort by name"));
378	775	sortbynameItem.addActionListener(this);
379	776	menu.add("-");
	777	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	778	+ shareGeometriesItem.addActionListener(this);
	779	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	780	+ mergeGeometriesItem.addActionListener(this);
	781	+ if (Globals.ADVANCED)
	782	+ {
	783	+ // Pretty much the same as duplicate and clone.
380	784	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
381	785	extractGeometriesItem.addActionListener(this);
382	786	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
383	787	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);
	788	+ }
388	789
389	790	oe.menuBar.add(menu = new Menu("Insert"));
390	791	buildCreateMenu(menu);
391	792
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	793	oe.menuBar.add(menu = new Menu("Tools"));
404	794	buildToolsMenu(menu);
405	795	}
406	796
	797	+
407	798	void SetupUI2(ObjEditor oe)
408	799	{
	800	+ // June 2019
	801	+ if (oe == null)
	802	+ {
	803	+ //super.SetupUI2(this);
	804	+ //return;
	805	+ }
	806	+
	807	+ if (copy != group)
	808	+ {
	809	+ //super.SetupUI2(this);
	810	+ }
	811	+
409	812	//new Exception().printStackTrace();
410	813
411	814	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -434,93 +837,237 @@
434	837	oe.radioPanel.add(dummyButton);
435	838	oe.buttonGroup.add(dummyButton);
436	839	*/
	840	+ cGridBag copyOptionsPanel = new cGridBag();
	841	+
	842	+ copyOptionsPanel.preferredHeight = 2;
	843	+
437	844	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
438	845
439		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
440		- liveCB.setToolTipText("Enabled animation");
	846	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	847	+ //minButton.setToolTipText("Minimize window");
	848	+ //minButton.addActionListener(this);
	849	+
	850	+ if (Globals.ADVANCED)
	851	+ {
	852	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	853	+ maxButton.setToolTipText("Maximize window");
	854	+ maxButton.addActionListener(this);
	855	+ }
	856	+
	857	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	858	+ fullButton.setToolTipText("Full-screen window");
	859	+ fullButton.addActionListener(this);
	860	+
	861	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	862	+ screenfitButton.setToolTipText("Screen fit");
	863	+ screenfitButton.addActionListener(this);
	864	+
	865	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	866	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	867	+ restoreCameraButton.addActionListener(this);
	868	+
	869	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	870	+ saveButton.setToolTipText("New version");
	871	+ saveButton.addActionListener(this);
	872	+
	873	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	874	+ undoButton.setToolTipText("Previous version");
	875	+ undoButton.addActionListener(this);
	876	+ undoButton.setEnabled(false);
	877	+
	878	+ cGridBag updown = new cGridBag().setVertical(true);
	879	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	880	+ restoreButton.setToolTipText("Restore current");
	881	+ restoreButton.addActionListener(this);
	882	+ restoreButton.setEnabled(false);
	883	+
	884	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	885	+ replaceButton.setToolTipText("Replace current");
	886	+ replaceButton.addActionListener(this);
	887	+ replaceButton.setEnabled(false);
	888	+
	889	+ copyOptionsPanel.add(updown);
	890	+
	891	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	892	+ redoButton.setToolTipText("Next version");
	893	+ redoButton.addActionListener(this);
	894	+ redoButton.setEnabled(false);
	895	+
	896	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	897	+ liveCB.setToolTipText("Enable animation");
441	898	liveCB.addItemListener(this);
442	899
443		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	900	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	901	+ oneStepButton.setToolTipText("Animate one step forward");
	902	+ oneStepButton.addActionListener(this);
	903	+
	904	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
444	905	fastCB.setToolTipText("Fast mode");
445	906	fastCB.addItemListener(this);
446	907
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);
452		- screenfitButton.setToolTipText("Screen fit");
453		- screenfitButton.addActionListener(this);
	908	+ //oe.toolboxPanel.Return();
	909	+
	910	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	911	+// trackCB.setToolTipText("Enable tracking");
	912	+// trackCB.addItemListener(this);
454	913
455	914	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
456	915	// screenfitpointButton.addActionListener(this);
457	916
458	917	if (Globals.ADVANCED)
459	918	{
460		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	919	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
461	920	snapobjectButton.addActionListener(this);
462	921	snapobjectButton.setToolTipText("Snap Object");
	922	+
	923	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	924	+ fourButton.addActionListener(this);
	925	+ fourButton.setToolTipText("Show control panel only");
463	926	}
464	927
465		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
466		- flashSelectionButton.setToolTipText("Show selection");
467		- flashSelectionButton.addActionListener(this);
	928	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
468	929
469		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
470		-
471		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
472		- twoButton.setToolTipText("Show center view only");
	930	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	931	+ twoButton.setToolTipText("Show 3D view only");
473	932	twoButton.addActionListener(this);
474		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
475		- fourButton.addActionListener(this);
476		- fourButton.setToolTipText("Show left panel only");
477		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
478		- sixButton.setToolTipText("2-column layout left");
479		- sixButton.addActionListener(this);
480		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
481		- threeButton.setToolTipText("2-column layout right");
	933	+ this.fullscreenLayout = twoButton;
	934	+
	935	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	936	+ threeButton.setToolTipText("Show controls and 3D view");
482	937	threeButton.addActionListener(this);
483		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
484		- sevenButton.setToolTipText("3-column layout");
485		- sevenButton.addActionListener(this);
	938	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	939	+ sixButton.setToolTipText("Show 3D view and controls");
	940	+ sixButton.addActionListener(this);
	941	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	942	+// sevenButton.setToolTipText("3-column layout");
	943	+// sevenButton.addActionListener(this);
486	944	//
487	945
488		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
489		- rootButton.setToolTipText("Edit selection in new tab");
	946	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	947	+ rootButton.setToolTipText("Open selection in new tab");
490	948	rootButton.addActionListener(this);
491	949
492		- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	950	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
493	951	closeButton.setToolTipText("Close tab");
494	952	closeButton.addActionListener(this);
495	953	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
496	954	//clearButton.addActionListener(this);
497		-
498		- cGridBag commandsPanel = new cGridBag();
	955	+
	956	+ cGridBag row1 = new cGridBag();
499	957
500		- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
501		- editButton.setToolTipText("Edit selection");
	958	+ // INSERT
	959	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	960	+ gridButton.setToolTipText("Create grid");
	961	+ gridButton.addActionListener(this);
	962	+
	963	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	964	+ boxButton.setToolTipText("Create box");
	965	+ boxButton.addActionListener(this);
	966	+
	967	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	968	+ sphereButton.setToolTipText("Create sphere");
	969	+ sphereButton.addActionListener(this);
	970	+
	971	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	972	+ coneButton.setToolTipText("Create cone");
	973	+ coneButton.addActionListener(this);
	974	+
	975	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	976	+ torusButton.setToolTipText("Create torus");
	977	+ torusButton.addActionListener(this);
	978	+
	979	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	980	+ superButton.setToolTipText("Create superellipsoid");
	981	+ superButton.addActionListener(this);
	982	+
	983	+ if (Globals.ADVANCED)
	984	+ {
	985	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	986	+ kleinButton.setToolTipText("Create Klein bottle");
	987	+ kleinButton.addActionListener(this);
	988	+ }
	989	+
	990	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	991	+ particlesButton.setToolTipText("Create particle system");
	992	+ particlesButton.addActionListener(this);
	993	+
	994	+ oe.toolboxPanel.add(row1);
	995	+
	996	+ cGridBag row2 = new cGridBag();
	997	+
	998	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	999	+ groupButton.setToolTipText("Create group");
	1000	+ groupButton.addActionListener(this);
	1001	+
	1002	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1003	+ compositeButton.setToolTipText("Create composite");
	1004	+ compositeButton.addActionListener(this);
	1005	+
	1006	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1007	+ switchButton.setToolTipText("Create item switcher");
	1008	+ switchButton.addActionListener(this);
	1009	+
	1010	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1011	+ loopButton.setToolTipText("Create loop");
	1012	+ loopButton.addActionListener(this);
	1013	+
	1014	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1015	+ textureButton.setToolTipText("Create texture");
	1016	+ textureButton.addActionListener(this);
	1017	+
	1018	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1019	+ overlayButton.setToolTipText("Create overlay");
	1020	+ overlayButton.addActionListener(this);
	1021	+
	1022	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1023	+ lightButton.setToolTipText("Create light");
	1024	+ lightButton.addActionListener(this);
	1025	+
	1026	+ oe.toolboxPanel.add(row2);
	1027	+
	1028	+ // ENVYMAPS
	1029	+ cGridBag skyboxpane = new cGridBag();
	1030	+ skyboxpane.preferredHeight = 100;
	1031	+
	1032	+ oe.toolboxPanel.add(skyboxpane);
	1033	+
	1034	+ JTabbedPane skyboxpanel = new JTabbedPane();
	1035	+ skyboxpane.add(skyboxpanel);
	1036	+
	1037	+ AddSkyboxTab0(skyboxpanel);
	1038	+ AddSkyboxTab1(skyboxpanel);
	1039	+ AddSkyboxTab2(skyboxpanel);
	1040	+
	1041	+ // EDIT panel
	1042	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1043	+ editButton.setToolTipText("Pin selection controls");
502	1044	editButton.addActionListener(this);
503	1045
504		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
505		- uneditButton.setToolTipText("Unedit selection");
	1046	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1047	+ uneditButton.setToolTipText("Remove selection controls");
506	1048	uneditButton.addActionListener(this);
507	1049
508		- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1050	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1051	+ allParamsButton.setToolTipText("Show all controle");
	1052	+ allParamsButton.addActionListener(this);
	1053	+
	1054	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
509	1055	clearPanelButton.setToolTipText("Clear edit panel");
510	1056	clearPanelButton.addActionListener(this);
511	1057
512		- commandsPanel.add(allParamsButton = new cButton("A", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
513		- allParamsButton.setToolTipText("All params??");
514		- allParamsButton.addActionListener(this);
515		-
516		- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1058	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
517	1059	unselectButton.setToolTipText("Unselect");
518	1060	unselectButton.addActionListener(this);
519	1061
520		- commandsPanel.preferredHeight = 1;
	1062	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1063	+ flashSelectionButton.setToolTipText("Highlight selection");
	1064	+ flashSelectionButton.addActionListener(this);
521	1065
522		- oe.treePanel.add(commandsPanel);
523		- oe.treePanel.Return();
	1066	+ editCommandsPanel.preferredHeight = 1;
	1067	+
	1068	+ SetPinStates(false);
	1069	+// oe.treePanel.add(commandsPanel);
	1070	+// oe.treePanel.Return();
524	1071
525	1072	// oe.aConstraints.gridx += 1;
526	1073	// oe.aConstraints.weighty = 0;
..	..	@@ -537,32 +1084,20 @@
537	1084
538	1085	JScrollPane jSP;
539	1086	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
540		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1087	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
541	1088	ResetModel();
542	1089
543	1090	oe.treePanel.add(jSPPanel);
544	1091	oe.treePanel.Return();
545	1092
546		- cGridBag copyOptionsPanel = new cGridBag();
547		-
548		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
549		- colorCB.setToolTipText("Copy color when dropped");
550		- colorCB.addItemListener(this);
551		-
552		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
553		- materialCB.setToolTipText("Copy material when dropped");
554		- materialCB.addItemListener(this);
555		-
556		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
557		- textureCB.setToolTipText("Copy texture when dropped");
558		- textureCB.addItemListener(this);
559		-
560		- copyOptionsPanel.preferredHeight = 1;
561	1093	oe.treePanel.add(copyOptionsPanel);
562	1094	oe.treePanel.Return();
	1095	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1096	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1097	+ sliderPane.preferredHeight = 1;
563	1098
564		-// mainPanel.setDividerLocation(0.5); //1.0);
565		-// mainPanel.setResizeWeight(0.5);
	1099	+// mainPanel.setDividerLocation(0.1); //1.0);
	1100	+ mainPanel.setResizeWeight(0.4);
566	1101
567	1102	//jList.addListSelectionListener(this);
568	1103	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -570,7 +1105,7 @@
570	1105	//jTree.setEditable(true);
571	1106	oe.jTree.setDragEnabled(true);
572	1107	//jTree.setPreferredSize(new Dimension(10,10));
573		- jSP.setPreferredSize(new Dimension(100,200));
	1108	+ //jSP.setPreferredSize(new Dimension(100,200));
574	1109
575	1110	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
576	1111
..	..	@@ -582,19 +1117,49 @@
582	1117	dgr.addDragGestureListener(this);
583	1118	}catch(Exception e) {}
584	1119	*/
585		- radio.layout = sevenButton;
	1120	+ radio.layout = sixButton; // sevenButton;
586	1121	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
587	1122	}
588	1123
589	1124	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
590	1125	{
591		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
592		- supportCB.setToolTipText("Enabled rigging");
593		- supportCB.addItemListener(this);
	1126	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1127	+ colorCB.setToolTipText("Copy color when dropped");
	1128	+ colorCB.addItemListener(this);
	1129	+
	1130	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1131	+ materialCB.setToolTipText("Copy material when dropped");
	1132	+ materialCB.addItemListener(this);
	1133	+
	1134	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1135	+ textureCB.setToolTipText("Copy texture when dropped");
	1136	+ textureCB.addItemListener(this);
	1137	+
	1138	+ panel.Return();
	1139	+
	1140	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	1141	+ boxCB.setToolTipText("Display bounding boxes");
	1142	+ boxCB.addItemListener(this);
	1143	+
	1144	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	1145	+ zoomBoxCB.setToolTipText("Display only for wheel");
	1146	+ zoomBoxCB.addItemListener(this);
	1147	+
	1148	+ if (true) // Globals.ADVANCED)
	1149	+ {
	1150	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1151	+// supportCB.setToolTipText("Enable rigging");
	1152	+// supportCB.addItemListener(this);
	1153	+
	1154	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1155	+ freezeCB.setToolTipText("Fast moving camera");
	1156	+ freezeCB.addItemListener(this);
594	1157
595	1158	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
596	1159	// localCB.addItemListener(this);
597	1160
	1161	+ panel.Return();
	1162	+
598	1163	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
599	1164	crowdCB.setToolTipText("Used for crowds");
600	1165	crowdCB.addItemListener(this);
..	..	@@ -607,18 +1172,12 @@
607	1172	slowCB.setToolTipText("Smooth interpolation");
608	1173	slowCB.addItemListener(this);
609	1174
610		- panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
611		- boxCB.setToolTipText("Display bounding boxes");
612		- boxCB.addItemListener(this);
613		-
614		- panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
615		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
616		- zoomBoxCB.addItemListener(this);
617		-
618	1175	// constraints.gridy += 1;
619	1176	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
620	1177	// speakerMocapCB.addItemListener(this);
621	1178
	1179	+ panel.Return();
	1180	+
622	1181	if (false)
623	1182	{
624	1183	// handled in scripts
..	..	@@ -633,40 +1192,85 @@
633	1192	//constraints.gridy += 1;
634	1193	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
635	1194	smoothfocusCB.addItemListener(this);
	1195	+ panel.Return();
636	1196	}
637	1197
638	1198	//constraints.gridx += 1;
639	1199	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
640	1200	// debugCB.addItemListener(this);
641	1201
	1202	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1203	+ trackCB.setToolTipText("Enable tracking target");
	1204	+ trackCB.addItemListener(this);
	1205	+
642	1206	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1207	+ oeilCB.setToolTipText("Move camera when tracking");
643	1208	oeilCB.addItemListener(this);
644	1209
	1210	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1211	+ shadowCB.setToolTipText("When live compute shadows");
	1212	+ shadowCB.addItemListener(this);
	1213	+
	1214	+ panel.Return();
	1215	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1216	+ toggleTextureCB.setToolTipText("Load textures");
	1217	+ toggleTextureCB.addItemListener(this);
	1218	+
	1219	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1220	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1221	+ toggleSwitchCB.addItemListener(this);
	1222	+
	1223	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1224	+ autokeepCB.setToolTipText("On structure change");
	1225	+ autokeepCB.addItemListener(this);
	1226	+
	1227	+ panel.Return();
	1228	+ if (Globals.ADVANCED)
	1229	+ {
645	1230	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
646	1231	lookAtCB.setToolTipText("Look-at target");
647	1232	lookAtCB.addItemListener(this);
	1233	+ }
	1234	+
	1235	+ }
648	1236
649	1237	cGridBag fill = new cGridBag();
650		-
651	1238	fill.preferredHeight = 200;
	1239	+ cGridBag fill2 = new cGridBag();
	1240	+ fill2.preferredHeight = 200;
	1241	+ cGridBag fill3 = new cGridBag();
	1242	+ fill3.preferredHeight = 200;
652	1243
653	1244	panel.add(fill);
	1245	+ panel.add(fill2);
	1246	+ panel.add(fill3);
654	1247
655	1248	}
656	1249
657	1250	void EditObject(Object3D obj)
658	1251	{
659	1252	cRadio radioButton = new cRadio(obj.name);
	1253	+
	1254	+ // June 2019. Patch to avoid bug with transparency.
	1255	+ radioButton.hadMaterial = obj.material != null;
	1256	+ if (!radioButton.hadMaterial)
	1257	+ {
	1258	+ obj.material = new cMaterial();
	1259	+ }
	1260	+
660	1261	radioButton.SetObject(obj);
661		- radioButton.layout = sevenButton;
	1262	+ radioButton.layout = sixButton; // sevenButton;
662	1263	radioButton.SetCamera(cameraView.renderCamera, false);
663	1264	radioButton.addActionListener(this);
664	1265	radioPanel.add(radioButton);
665	1266	buttonGroup.add(radioButton);
666	1267	radioButton.doClick();
667	1268	}
	1269	+
668	1270	void SetupViews(ObjEditor oe)
669	1271	{
	1272	+ theFrame = this;
	1273	+
670	1274	oe.SetupViews();
671	1275
672	1276	System.out.println("SetupViews");
..	..	@@ -675,23 +1279,28 @@
675	1279	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
676	1280	}
677	1281
678		- JCheckBox liveCB;
679		- JCheckBox supportCB;
680		- JCheckBox localCB;
681		- JCheckBox crowdCB;
682		- JCheckBox smoothCB;
683		- JCheckBox fastCB;
684		- JCheckBox slowCB;
685		- JCheckBox boxCB;
686		- JCheckBox zoomBoxCB;
687		- JCheckBox trackCB;
688		- JCheckBox smoothfocusCB;
	1282	+ cToggleButton liveCB;
	1283	+ cCheckBox supportCB;
	1284	+ cCheckBox localCB;
	1285	+ cCheckBox crowdCB;
	1286	+ cCheckBox smoothCB;
	1287	+ cToggleButton fastCB;
	1288	+ cCheckBox slowCB;
	1289	+ cCheckBox boxCB;
	1290	+ cCheckBox zoomBoxCB;
	1291	+ cCheckBox freezeCB;
	1292	+ //cToggleButton trackCB;
	1293	+ cCheckBox trackCB;
	1294	+ cCheckBox smoothfocusCB;
689	1295	// JCheckBox speakerMocapCB;
690		- JCheckBox speakerCameraCB;
691		- JCheckBox speakerFocusCB;
692		- JCheckBox debugCB;
693		- JCheckBox oeilCB;
694		- JCheckBox lookAtCB;
	1296	+ cCheckBox speakerCameraCB;
	1297	+ cCheckBox speakerFocusCB;
	1298	+ cCheckBox debugCB;
	1299	+
	1300	+ cCheckBox oeilCB;
	1301	+ cCheckBox shadowCB;
	1302	+ cCheckBox autokeepCB;
	1303	+ cCheckBox lookAtCB;
695	1304
696	1305	// static int COLOR = 1;
697	1306	// static int MATERIAL = 2;
..	..	@@ -699,9 +1308,9 @@
699	1308
700	1309	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
701	1310
702		- JCheckBox colorCB;
703		- JCheckBox materialCB;
704		- JCheckBox textureCB;
	1311	+ cCheckBox colorCB;
	1312	+ cCheckBox materialCB;
	1313	+ cCheckBox textureCB;
705	1314
706	1315	public void itemStateChanged(ItemEvent e)
707	1316	{
..	..	@@ -729,6 +1338,7 @@
729	1338	} else if(e.getSource() == liveCB)
730	1339	{
731	1340	cameraView.ToggleLive();
	1341	+ refreshContents(false);
732	1342	}
733	1343	else if(e.getSource() == supportCB)
734	1344	{
..	..	@@ -793,6 +1403,18 @@
793	1403	{
794	1404	cameraView.ToggleOeil();
795	1405	}
	1406	+ else if(e.getSource() == shadowCB)
	1407	+ {
	1408	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1409	+ }
	1410	+ else if(e.getSource() == freezeCB)
	1411	+ {
	1412	+ Globals.FREEZEONMOVE ^= true;
	1413	+ }
	1414	+ else if(e.getSource() == autokeepCB)
	1415	+ {
	1416	+ Globals.REPLACEONMAKE ^= true;
	1417	+ }
796	1418	else if(e.getSource() == lookAtCB)
797	1419	{
798	1420	cameraView.ToggleLookAt();
..	..	@@ -809,7 +1431,8 @@
809	1431
810	1432	/**/
811	1433	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
812		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1434	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1435	+ TreePath path = objEditor.jTree.getSelectionPath();
813	1436	if ((path == null) \|\| (path.getPathCount() <= 1)) {
814	1437	// We can't move the root node or an empty selection
815	1438	return;
..	..	@@ -872,8 +1495,6 @@
872	1495	}
873	1496	}
874	1497
875		- String string = (String) object;
876		-
877	1498	System.out.println("Transfer = " + object + "; drop : " + target);
878	1499	// if( object instanceof java.io.File[])
879	1500	// {
..	..	@@ -881,7 +1502,11 @@
881	1502	// objEditor.DropFile((java.io.File[]) object, true);
882	1503	// return;
883	1504	// }
884		- if (string.charAt(0) == '/')
	1505	+
	1506	+ String string = object.toString();
	1507	+
	1508	+ // File path for Mac and Windows
	1509	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
885	1510	{
886	1511	// file(s)
887	1512	String[] names = string.split("\n");
..	..	@@ -908,7 +1533,7 @@
908	1533
909	1534	flashIt = false;
910	1535	CameraPane pane = (CameraPane) target;
911		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1536	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
912	1537	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
913	1538
914	1539	if (group.selection.size() == 1)
..	..	@@ -924,23 +1549,33 @@
924	1549
925	1550	assert target == objEditor.jTree;
926	1551	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1552	+ Object3D destinationLeaf;
927	1553	try {
928		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1554	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
929	1555	} catch (Exception e) {
930	1556	System.out.println("destinationPath : " + destinationPath);
931	1557	return;
932	1558	}
933	1559
934		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1560	+ for (int i=group.selection.size(); --i>=0;)
935	1561	{
	1562	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1563	+
	1564	+ // Cannot move into itself
	1565	+ if (child == destinationLeaf)
	1566	+ return;
	1567	+ }
	1568	+
	1569	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1570	+// {
936	1571	loadClipboard(true);
937	1572	objEditor.jTree.setSelectionPath(destinationPath);
938		- pasteInto(false);
939		- } else {
940		- loadClipboard(false);
941		- objEditor.jTree.setSelectionPath(destinationPath);
942		- pasteInto(false); // true); // ???
943		- }
	1573	+ pasteInto(false, false);
	1574	+// } else {
	1575	+// loadClipboard(false);
	1576	+// objEditor.jTree.setSelectionPath(destinationPath);
	1577	+// pasteInto(false, false); // true); // ???
	1578	+// }
944	1579	}
945	1580	public void dropActionChanged(DropTargetDragEvent dtde)
946	1581	// Called if the user has modified the current drop gesture
..	..	@@ -1045,54 +1680,71 @@
1045	1680	{
1046	1681	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1047	1682	//heightFieldItem.addActionListener(this);
1048		- gridItem = menu.add(new MenuItem("Grid"));
1049		- gridItem.addActionListener(this);
1050		- rectoidItem = menu.add(new MenuItem("Box"));
1051		- rectoidItem.addActionListener(this);
1052		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1053		- ellipsoidItem.addActionListener(this);
1054		- coneItem = menu.add(new MenuItem("Cone"));
1055		- coneItem.addActionListener(this);
1056		- torusItem = menu.add(new MenuItem("Torus"));
1057		- torusItem.addActionListener(this);
1058		- superItem = menu.add(new MenuItem("Superellipsoid"));
1059		- superItem.addActionListener(this);
	1683	+// gridItem = menu.add(new MenuItem("Grid"));
	1684	+// gridItem.addActionListener(this);
	1685	+// rectoidItem = menu.add(new MenuItem("Box"));
	1686	+// rectoidItem.addActionListener(this);
	1687	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1688	+// ellipsoidItem.addActionListener(this);
	1689	+// coneItem = menu.add(new MenuItem("Cone"));
	1690	+// coneItem.addActionListener(this);
	1691	+// torusItem = menu.add(new MenuItem("Torus"));
	1692	+// torusItem.addActionListener(this);
	1693	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1694	+// superItem.addActionListener(this);
	1695	+
	1696	+ cameraItem = menu.add(new MenuItem("Camera"));
	1697	+ cameraItem.addActionListener(this);
	1698	+
	1699	+ if (!Globals.ADVANCED)
	1700	+ {
1060	1701	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1061	1702	kleinItem.addActionListener(this);
1062		- particleItem = menu.add(new MenuItem("Particle system"));
1063		- particleItem.addActionListener(this);
	1703	+ }
	1704	+
	1705	+// particleItem = menu.add(new MenuItem("Particle system"));
	1706	+// particleItem.addActionListener(this);
	1707	+ if (Globals.ADVANCED)
	1708	+ {
1064	1709	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1065	1710	ragdollItem.addActionListener(this);
1066	1711	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1067	1712	ragdoll2Item.addActionListener(this);
	1713	+ }
1068	1714	menu.add("-");
1069		- meshItem = menu.add(new MenuItem("Mesh"));
	1715	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1070	1716	meshItem.addActionListener(this);
1071	1717	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1072	1718	// meshGroupItem.addActionListener(this);
	1719	+ if (Globals.ADVANCED)
	1720	+ {
1073	1721	springItem = menu.add(new MenuItem("Spring"));
1074	1722	springItem.addActionListener(this);
1075	1723	flagItem = menu.add(new MenuItem("Flag"));
1076	1724	flagItem.addActionListener(this);
1077		- bezierItem = menu.add(new MenuItem("Patch"));
1078		- bezierItem.addActionListener(this);
1079		- checkerItem = menu.add(new MenuItem("Checker"));
1080		- checkerItem.addActionListener(this);
1081	1725	blobItem = menu.add(new MenuItem("Blob"));
1082	1726	blobItem.addActionListener(this);
1083	1727	latheItem = menu.add(new MenuItem("Lathe"));
1084	1728	latheItem.addActionListener(this);
1085		- lightItem = menu.add(new MenuItem("Light"));
1086		- lightItem.addActionListener(this);
	1729	+ }
	1730	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1731	+ bezierItem.addActionListener(this);
	1732	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1733	+// overlayItem.addActionListener(this);
	1734	+// lightItem = menu.add(new MenuItem("Light"));
	1735	+// lightItem.addActionListener(this);
1087	1736	menu.add("-");
1088	1737	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1089	1738	//superLoopItem.addActionListener(this);
1090		- loopItem = menu.add(new MenuItem("Loop"));
1091		- loopItem.addActionListener(this);
	1739	+// loopItem = menu.add(new MenuItem("Loop"));
	1740	+// loopItem.addActionListener(this);
1092	1741	doubleItem = menu.add(new MenuItem("Fork"));
1093	1742	doubleItem.addActionListener(this);
	1743	+ if (Globals.ADVANCED)
	1744	+ {
1094	1745	tripleItem = menu.add(new MenuItem("Trident"));
1095	1746	tripleItem.addActionListener(this);
	1747	+ }
1096	1748	}
1097	1749
1098	1750	void buildToolsMenu(Menu menu)
..	..	@@ -1101,29 +1753,34 @@
1101	1753	animationItem.addItemListener(this);
1102	1754	animationItem.setState(Globals.ANIMATION);
1103	1755
	1756	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1757	+ archiveItem.addActionListener(this);
	1758	+
1104	1759	menu.add("-");
1105	1760	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1106	1761	parseverticesItem.addActionListener(this);
1107	1762	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1108	1763	textureFieldItem.addActionListener(this);
1109		- alignItem = menu.add(new MenuItem("Align"));
	1764	+ alignItem = menu.add(new MenuItem("Align Objects"));
1110	1765	alignItem.addActionListener(this);
1111		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1112		- mirrorItem.addActionListener(this);
1113	1766	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1114	1767	reduceMorphItem.addActionListener(this);
1115	1768	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1116	1769	reduce34MorphItem.addActionListener(this);
1117		-
1118		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1119		- computeAOItem.addActionListener(this);
1120	1770	menu.add("-");
1121		-
1122	1771	menu.add(memoryItem = new MenuItem("Memory Usage"));
1123	1772	memoryItem.addActionListener(this);
	1773	+ menu.add(computeAOItem = new MenuItem("Compute AO"));
	1774	+ computeAOItem.addActionListener(this);
	1775	+
	1776	+ if (Globals.ADVANCED)
	1777	+ {
	1778	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1779	+ mirrorItem.addActionListener(this);
	1780	+ menu.add("-");
1124	1781	menu.add(analyzeItem = new MenuItem("Analyze"));
1125	1782	analyzeItem.addActionListener(this);
1126		- menu.add(dumpItem = new MenuItem("Dump"));
	1783	+ menu.add(dumpItem = new MenuItem("Print"));
1127	1784	dumpItem.addActionListener(this);
1128	1785	// menu.add(pathItem = new MenuItem("From-to path"));
1129	1786	// pathItem.addActionListener(this);
..	..	@@ -1141,6 +1798,7 @@
1141	1798	menu.add("-");
1142	1799	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1143	1800	editScriptItem.addActionListener(this);
	1801	+ }
1144	1802	}
1145	1803
1146	1804	void ScreenFit()
..	..	@@ -1263,9 +1921,34 @@
1263	1921	shadow.material = new cMaterial(obj.material);
1264	1922	shadow.material.diffuse = 0.0001f;
1265	1923	shadow.material.specular = 0.0001f;
	1924	+ //shadow.projectedVertices[1].x = 300;
1266	1925
1267	1926	makeSomething(shadow);
1268	1927	}
	1928	+
	1929	+ private void ClearUnpinned()
	1930	+ {
	1931	+ //for (Object3D obj : listUI)
	1932	+ for (int i=listUI.size(); --i>=0;)
	1933	+ {
	1934	+ Object3D obj = listUI.elementAt(i);
	1935	+ if (!obj.pinned)
	1936	+ {
	1937	+ obj.CloseUI();
	1938	+ listUI.remove(i);
	1939	+ }
	1940	+ }
	1941	+ }
	1942	+
	1943	+ private void EditElement(Object3D elem, boolean newWindow)
	1944	+ {
	1945	+ // if (!(elem instanceof Composite))
	1946	+ // newWindow = false;
	1947	+ listUI.add(elem);
	1948	+ elem.openEditWindow(this, newWindow); //, false);
	1949	+ System.out.println("edit : " + elem);
	1950	+ elem.editWindow.refreshContents(true); // ? new
	1951	+ }
1269	1952
1270	1953	/**
1271	1954	* applyExample
..	..	@@ -1469,9 +2152,9 @@
1469	2152
1470	2153	void Overwrite(int mask)
1471	2154	{
1472		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2155	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1473	2156	{
1474		- Object3D content = GrafreeD.clipboard.get(0);
	2157	+ Object3D content = Grafreed.clipboard.get(0);
1475	2158
1476	2159	if (content instanceof cGroup && ((cGroup)content).transientlink )
1477	2160	content = ((cGroup)content).get(0);
..	..	@@ -1510,7 +2193,7 @@
1510	2193	{
1511	2194	ScreenFit();
1512	2195	} else
1513		- if (source == switchItem)
	2196	+ if (source == switchViewItem)
1514	2197	{
1515	2198	cVector v1 = new cVector();
1516	2199	cVector v2 = new cVector();
..	..	@@ -1519,11 +2202,11 @@
1519	2202	objEditor.cameraView.renderCamera.setAim(v2, v1);
1520	2203	objEditor.cameraView.repaint();
1521	2204	} else
1522		- if (source == rectoidItem)
	2205	+ if (source == rectoidItem \|\| source == boxButton)
1523	2206	{
1524	2207	makeSomething(new Box());
1525	2208	} else
1526		- if (source == particleItem)
	2209	+ if (source == particleItem \|\| source == particlesButton)
1527	2210	{
1528	2211	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1529	2212	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1602,27 +2285,27 @@
1602	2285
1603	2286	makeSomething(obj);
1604	2287	} else
1605		- if (source == gridItem)
	2288	+ if (source == gridItem \|\| source == gridButton)
1606	2289	{
1607	2290	makeSomething(new Grid());
1608	2291	} else
1609		- if (source == ellipsoidItem)
	2292	+ if (source == ellipsoidItem \|\| source == sphereButton)
1610	2293	{
1611	2294	makeSomething(new Sphere());
1612	2295	} else
1613		- if (source == coneItem)
	2296	+ if (source == coneItem \|\| source == coneButton)
1614	2297	{
1615	2298	makeSomething(new Cone());
1616	2299	} else
1617		- if (source == torusItem)
	2300	+ if (source == torusItem \|\| source == torusButton)
1618	2301	{
1619	2302	makeSomething(new Torus());
1620	2303	} else
1621		- if (source == superItem)
	2304	+ if (source == superItem \|\| source == superButton)
1622	2305	{
1623	2306	makeSomething(new Superellipsoid());
1624	2307	} else
1625		- if (source == kleinItem)
	2308	+ if (source == kleinItem \|\| source == kleinButton)
1626	2309	{
1627	2310	makeSomething(new Klein());
1628	2311	} else
..	..	@@ -1642,7 +2325,7 @@
1642	2325	{
1643	2326	makeSomething(new BezierSurface());
1644	2327	} else
1645		- if (source == checkerItem)
	2328	+ if (source == overlayItem \|\| source == overlayButton)
1646	2329	{
1647	2330	/*
1648	2331	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1690,10 +2373,27 @@
1690	2373	s.setup();
1691	2374	makeSomething(s);
1692	2375	} else
1693		- if (source == lightItem)
	2376	+ if (source == lightItem \|\| source == lightButton)
1694	2377	{
1695	2378	makeSomething(new Light());
1696	2379	} else
	2380	+// if (source == skybox1Button \|\|
	2381	+// source == skybox2Button \|\|
	2382	+// source == skybox3Button \|\|
	2383	+// source == skybox4Button \|\|
	2384	+// source == skybox5Button \|\|
	2385	+// source == skybox6Button \|\|
	2386	+// source == skybox7Button \|\|
	2387	+// source == skybox11Button \|\|
	2388	+// source == skybox12Button \|\|
	2389	+// source == skybox13Button \|\|
	2390	+// source == skybox14Button \|\|
	2391	+// source == skybox15Button \|\|
	2392	+// source == skybox16Button \|\|
	2393	+// source == skybox17Button)
	2394	+// {
	2395	+// ChangeSkybox(source);
	2396	+// } else
1697	2397	if (source == csgItem)
1698	2398	{
1699	2399	group(new CSG());
..	..	@@ -1740,30 +2440,30 @@
1740	2440
1741	2441	group(g);
1742	2442	} else
1743		- if (source == loopItem)
	2443	+ if (source == loopItem \|\| source == loopButton)
1744	2444	{
1745	2445	Composite csg = new GroupLeaf();
1746	2446	csg.count = 5;
1747	2447	group(csg);
1748		- Composite child = new cGroup();
	2448	+ Composite child = new cGroup("Branch");
1749	2449	csg.addChild(child);
1750	2450	child.addChild(csg);
1751	2451	} else
1752	2452	if (source == doubleItem)
1753	2453	{
1754		- Composite csg = new GroupLeaf();
	2454	+ Composite csg = new GroupLeaf("Fork");
1755	2455	csg.count = 5;
1756	2456	group(csg);
1757		- Composite child = new cGroup();
	2457	+ Composite child = new cGroup("Branch A");
1758	2458	csg.addChild(child);
1759	2459	child.addChild(csg);
1760		- child = new cGroup();
	2460	+ child = new cGroup("Branch B");
1761	2461	csg.addChild(child);
1762	2462	child.addChild(csg);
1763	2463	} else
1764	2464	if (source == tripleItem)
1765	2465	{
1766		- Composite csg = new GroupLeaf();
	2466	+ Composite csg = new GroupLeaf("Trident");
1767	2467	csg.count = 4;
1768	2468	group(csg);
1769	2469	Composite child = new cGroup();
..	..	@@ -1776,27 +2476,10 @@
1776	2476	csg.addChild(child);
1777	2477	child.addChild(csg);
1778	2478	} else
1779		-
1780		- if (source == importGFDItem)
1781		- {
1782		- ImportGFD();
1783		- } else
1784		- if (source == importVRMLX3DItem)
1785		- {
1786		- ImportVRMLX3D();
1787		- } else
1788		- if (source == import3DSItem)
1789		- {
1790		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1791		- } else
1792		- if (source == importOBJItem)
1793		- {
1794		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1795		- } else
1796	2479	if (source == computeAOItem)
1797	2480	{
1798	2481	Globals.drawMode = CameraPane.OCCLUSION;
1799		- Globals.theRenderer.repaint();
	2482	+ cameraView.repaint();
1800	2483	} else
1801	2484	if (source == recompileItem)
1802	2485	{
..	..	@@ -1811,7 +2494,7 @@
1811	2494	if (source == invariantsItem)
1812	2495	{
1813	2496	System.out.println("Invariants:");
1814		- GrafreeD.grafreeD.universe.invariants();
	2497	+ Grafreed.grafreeD.universe.invariants();
1815	2498	} else
1816	2499	if (source == memoryItem)
1817	2500	{
..	..	@@ -1830,19 +2513,61 @@
1830	2513	{
1831	2514	DumpObject();
1832	2515	} else
	2516	+ if (source == minButton)
	2517	+ {
	2518	+ Minimize();
	2519	+ } else
	2520	+ if (source == maxButton)
	2521	+ {
	2522	+ Maximize();
	2523	+ } else
	2524	+ if (source == fullButton)
	2525	+ {
	2526	+ ToggleFullScreen();
	2527	+ } else
	2528	+ if (source == undoButton)
	2529	+ {
	2530	+ // Go to previous version
	2531	+ //if (!Undo())
	2532	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2533	+ Undo();
	2534	+ } else
	2535	+ if (source == restoreButton)
	2536	+ {
	2537	+ // Restore current version
	2538	+ Restore();
	2539	+ } else
	2540	+ if (source == replaceButton)
	2541	+ {
	2542	+ // Overwrite current version
	2543	+ Replace();
	2544	+ } else
	2545	+ if (source == redoButton)
	2546	+ {
	2547	+ // Go to next version
	2548	+ Redo();
	2549	+ } else
	2550	+ if (source == saveButton)
	2551	+ {
	2552	+ // Save a new version
	2553	+ if (!Save(true))
	2554	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2555	+ } else
	2556	+ if (source == oneStepButton)
	2557	+ {
	2558	+ Globals.ONESTEP = true;
	2559	+ cameraView.repaint();
	2560	+ } else
1833	2561	if (source == screenfitButton)
1834	2562	{
1835		- //Reload(lastConverter, lastFilename, true);
1836	2563	ScreenFit();
1837	2564	} else
1838	2565	if (source == screenfitpointButton)
1839	2566	{
1840		- //Reload(lastConverter, lastFilename, true);
1841	2567	ScreenFitPoint();
1842	2568	} else
1843	2569	if (source == snapobjectButton)
1844	2570	{
1845		- //Reload(lastConverter, lastFilename, true);
1846	2571	SnapObject();
1847	2572	} else
1848	2573	// if (event.getSource() == recompileButton)
..	..	@@ -1879,12 +2604,20 @@
1879	2604	{
1880	2605	loadClipboard(true);
1881	2606	} else
	2607	+ if (source == undoItem)
	2608	+ {
	2609	+ Undo();
	2610	+ } else
	2611	+ if (source == redoItem)
	2612	+ {
	2613	+ Redo();
	2614	+ } else
1882	2615	if (source == duplicateItem)
1883	2616	{
1884		- Object3D keep = GrafreeD.clipboard;
	2617	+ Object3D keep = Grafreed.clipboard;
1885	2618	loadClipboard(false);
1886	2619	paste(false);
1887		- GrafreeD.clipboard = keep;
	2620	+ Grafreed.clipboard = keep;
1888	2621	} else
1889	2622	if (source == cloneItem)
1890	2623	{
..	..	@@ -1902,13 +2635,17 @@
1902	2635	{
1903	2636	paste(false);
1904	2637	} else
	2638	+ if (source == pasteIntoItem)
	2639	+ {
	2640	+ pasteInto(true, false);
	2641	+ } else
1905	2642	if (source == pasteLinkItem)
1906	2643	{
1907		- pasteInto(false);
	2644	+ pasteInto(false, false);
1908	2645	} else
1909	2646	if (source == pasteCloneItem)
1910	2647	{
1911		- pasteInto(true);
	2648	+ pasteInto(true, true);
1912	2649	} else
1913	2650	if (source == pasteExpandItem)
1914	2651	{
..	..	@@ -2100,9 +2837,9 @@
2100	2837	// group.selection.get(0).setMasterThis(content); // should be identity
2101	2838	// refreshContents();
2102	2839	// }
2103		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2840	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2104	2841	{
2105		- Object3D content = GrafreeD.clipboard.get(0);
	2842	+ Object3D content = Grafreed.clipboard.get(0);
2106	2843
2107	2844	if (content instanceof cGroup && ((cGroup)content).transientlink )
2108	2845	content = ((cGroup)content).get(0);
..	..	@@ -2110,11 +2847,11 @@
2110	2847	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2111	2848	for (int i=0; i<group.selection.size(); i++)
2112	2849	{
2113		- boolean random = CameraPane.RANDOM;
2114		- CameraPane.RANDOM = false; // parse all random nodes
	2850	+ boolean random = CameraPane.SWITCH;
	2851	+ CameraPane.SWITCH = false; // parse all random nodes
2115	2852	group.selection.get(i).linkVerticesThis(content);
2116	2853	// group.selection.get(i).setMasterThis(content); // should be identity
2117		- CameraPane.RANDOM = random;
	2854	+ CameraPane.SWITCH = random;
2118	2855	}
2119	2856	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2120	2857	refreshContents();
..	..	@@ -2124,20 +2861,20 @@
2124	2861	{
2125	2862	for (int i=0; i<group.selection.size(); i++)
2126	2863	{
2127		- boolean random = CameraPane.RANDOM;
2128		- CameraPane.RANDOM = false; // parse all random nodes
	2864	+ boolean random = CameraPane.SWITCH;
	2865	+ CameraPane.SWITCH = false; // parse all random nodes
2129	2866	group.selection.get(i).linkVerticesThis(null);
2130		- CameraPane.RANDOM = random;
	2867	+ CameraPane.SWITCH = random;
2131	2868	}
2132	2869
2133	2870	refreshContents();
2134	2871	} else
2135	2872	if (source == relinkverticesItem)
2136	2873	{
2137		- boolean random = CameraPane.RANDOM;
2138		- CameraPane.RANDOM = false; // parse all random nodes
	2874	+ boolean random = CameraPane.SWITCH;
	2875	+ CameraPane.SWITCH = false; // parse all random nodes
2139	2876	group.selection.RelinkToSupport();
2140		- CameraPane.RANDOM = random;
	2877	+ CameraPane.SWITCH = random;
2141	2878
2142	2879	refreshContents();
2143	2880	} else
..	..	@@ -2152,9 +2889,9 @@
2152	2889	} else
2153	2890	if (source == setMasterItem)
2154	2891	{
2155		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2892	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2156	2893	{
2157		- Object3D content = GrafreeD.clipboard.get(0);
	2894	+ Object3D content = Grafreed.clipboard.get(0);
2158	2895
2159	2896	if (content instanceof cGroup && ((cGroup)content).transientlink )
2160	2897	content = ((cGroup)content).get(0);
..	..	@@ -2167,9 +2904,9 @@
2167	2904	{
2168	2905	if (group.selection.size() == 1)
2169	2906	{
2170		- if (GrafreeD.clipboard.size() == 1)
	2907	+ if (Grafreed.clipboard.size() == 1)
2171	2908	{
2172		- Object3D content = GrafreeD.clipboard.get(0);
	2909	+ Object3D content = Grafreed.clipboard.get(0);
2173	2910
2174	2911	if (content instanceof cGroup && ((cGroup)content).transientlink )
2175	2912	content = ((cGroup)content).get(0);
..	..	@@ -2186,7 +2923,7 @@
2186	2923	{
2187	2924	RevertMeshes();
2188	2925	} else
2189		- if (source == resetMeshItem)
	2926	+ if (source == resetAllItem)
2190	2927	{
2191	2928	ResetAll();
2192	2929	} else
..	..	@@ -2194,7 +2931,7 @@
2194	2931	{
2195	2932	StepAll();
2196	2933	} else
2197		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	2934	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2198	2935	{
2199	2936	//int indices[] = jList.getSelectedIndices();
2200	2937	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2206,9 +2943,9 @@
2206	2943	{
2207	2944	ClearSelection(true);
2208	2945	} else
2209		- if (source == grabItem)
	2946	+ if (source == grabItem \|\| source == groupButton)
2210	2947	{
2211		- group(new cGroup(), true);
	2948	+ group(new cGroup(), false); // true);
2212	2949	} else
2213	2950	if (source == hideItem)
2214	2951	{
..	..	@@ -2226,11 +2963,11 @@
2226	2963	{
2227	2964	makeSomething(new Camera());
2228	2965	} else
2229		- if (source == compositeItem)
	2966	+ if (source == compositeItem \|\| source == compositeButton)
2230	2967	{
2231	2968	group(new Composite());
2232	2969	} else
2233		- if (source == randomItem)
	2970	+ if (source == switchItem \|\| source == switchButton)
2234	2971	{
2235	2972	RandomNode random = new RandomNode();
2236	2973	group(random);
..	..	@@ -2332,7 +3069,7 @@
2332	3069	{
2333	3070	group(new cLinker());
2334	3071	} else
2335		- if (source == textureItem)
	3072	+ if (source == textureItem \|\| source == textureButton)
2336	3073	{
2337	3074	group(new TextureNode());
2338	3075	} else
..	..	@@ -2352,17 +3089,30 @@
2352	3089	{
2353	3090	CastShadow(2);
2354	3091	} else
2355		- if (source == ungroupItem)
	3092	+ if (source == ungroupItem \|\| source == ungroupButton)
2356	3093	{
2357		- //ungroup();
	3094	+ boolean hasRoot = false;
	3095	+
2358	3096	for (int i=0; i<group.selection.size(); i++)
2359	3097	{
2360		- Ungroup(group.selection.get(i));
	3098	+ if (group.selection.get(i) == group)
	3099	+ {
	3100	+ hasRoot = true;
	3101	+ break;
	3102	+ }
2361	3103	}
2362	3104
2363		- ClearSelection(false);
2364		-
2365		- refreshContents();
	3105	+ if (!hasRoot)
	3106	+ {
	3107	+ for (int i=0; i<group.selection.size(); i++)
	3108	+ {
	3109	+ Ungroup(group.selection.get(i));
	3110	+ }
	3111	+
	3112	+ ClearSelection(false);
	3113	+
	3114	+ refreshContents();
	3115	+ }
2366	3116	} else
2367	3117	if (source == genUVItem)
2368	3118	{
..	..	@@ -2374,7 +3124,7 @@
2374	3124	} else
2375	3125	if (source == genNormalsMESHItem)
2376	3126	{
2377		- GenNormals(true); // TODO
	3127	+ GenNormalsMESH();
2378	3128	} else
2379	3129	if (source == genNormalsORGANItem)
2380	3130	{
..	..	@@ -2439,6 +3189,22 @@
2439	3189	if (source == unmarkleavesItem)
2440	3190	{
2441	3191	MarkLeaves(false);
	3192	+ } else
	3193	+ if (source == rewindleavesItem)
	3194	+ {
	3195	+ RewindLeaves(true);
	3196	+ } else
	3197	+ if (source == unrewindleavesItem)
	3198	+ {
	3199	+ RewindLeaves(false);
	3200	+ } else
	3201	+ if (source == randomleavesItem)
	3202	+ {
	3203	+ RandomLeaves(true);
	3204	+ } else
	3205	+ if (source == unrandomleavesItem)
	3206	+ {
	3207	+ RandomLeaves(false);
2442	3208	} else
2443	3209	if (source == flipVItem)
2444	3210	{
..	..	@@ -2524,9 +3290,13 @@
2524	3290	{
2525	3291	SmoothMesh();
2526	3292	} else
2527		- if (source == transformgeometryItem)
	3293	+ if (source == transformGeometryItem)
2528	3294	{
2529	3295	TransformGeometry();
	3296	+ } else
	3297	+ if (source == transformChildrenItem)
	3298	+ {
	3299	+ TransformChildren();
2530	3300	} else
2531	3301	if (source == resetTransformItem)
2532	3302	{
..	..	@@ -2534,7 +3304,11 @@
2534	3304	} else
2535	3305	if (source == resetCentroidItem)
2536	3306	{
2537		- ResetCentroid();
	3307	+ ResetCentroid(true);
	3308	+ } else
	3309	+ if (source == resetCentroidXZItem)
	3310	+ {
	3311	+ ResetCentroid(false);
2538	3312	} else
2539	3313	if (source == resetParentItem)
2540	3314	{
..	..	@@ -2639,7 +3413,7 @@
2639	3413	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2640	3414	{
2641	3415	obj = (Object3D)e.nextElement();
2642		- obj.SetBumpTexture(null);
	3416	+ obj.ResetBumpTexture();
2643	3417	}
2644	3418
2645	3419	refreshContents();
..	..	@@ -2655,6 +3429,31 @@
2655	3429
2656	3430	refreshContents();
2657	3431	} else
	3432	+ if (source == embedTexturesItem)
	3433	+ {
	3434	+ Object3D obj;
	3435	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3436	+ {
	3437	+ obj = (Object3D)e.nextElement();
	3438	+ obj.EmbedTextures(true);
	3439	+ }
	3440	+
	3441	+ refreshContents();
	3442	+ } else
	3443	+ if (source == deEmbedTexturesItem)
	3444	+ {
	3445	+ Object3D obj;
	3446	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3447	+ {
	3448	+ obj = (Object3D)e.nextElement();
	3449	+ obj.EmbedTextures(false);
	3450	+ }
	3451	+
	3452	+ CameraPane.texturepigment.clear();
	3453	+ CameraPane.texturebump.clear();
	3454	+
	3455	+ refreshContents();
	3456	+ } else
2658	3457	if (source == flashSelectionButton)
2659	3458	{
2660	3459	CameraPane.flash = true;
..	..	@@ -2666,6 +3465,10 @@
2666	3465	if (source == twoButton)
2667	3466	{
2668	3467	radio.layout = twoButton;
	3468	+
	3469	+ if (CameraPane.FULLSCREEN)
	3470	+ fullscreenLayout = radio.layout;
	3471	+
2669	3472	// bug
2670	3473	//gridPanel.setDividerLocation(1.0);
2671	3474	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2698,10 +3501,31 @@
2698	3501	bigThree.ClearUI();
2699	3502	bigThree.add(centralPanel);
2700	3503	bigThree.FlushUI();
	3504	+
	3505	+ cameraView.requestFocusInWindow();
	3506	+
	3507	+// refreshContents(true);
	3508	+//
	3509	+// try
	3510	+// {
	3511	+// java.awt.Robot bot = new java.awt.Robot();
	3512	+// int mask = InputEvent.BUTTON1_MASK;
	3513	+// bot.mouseMove(100, 100);
	3514	+// bot.mousePress(mask);
	3515	+// bot.mouseRelease(mask);
	3516	+// }
	3517	+// catch (Exception e)
	3518	+// {
	3519	+//
	3520	+// }
	3521	+
2701	3522	} else
2702	3523	if (source == threeButton)
2703	3524	{
2704	3525	radio.layout = threeButton;
	3526	+
	3527	+ if (CameraPane.FULLSCREEN)
	3528	+ fullscreenLayout = radio.layout;
2705	3529
2706	3530	// bigThree.remove(scenePanel);
2707	3531	// bigThree.remove(centralPanel);
..	..	@@ -2731,13 +3555,18 @@
2731	3555	// centralPanel.setVisible(true);
2732	3556	// XYZPanel.setVisible(true);
2733	3557	bigThree.ClearUI();
	3558	+ bigThree.add(scenePanel);
2734	3559	bigThree.add(centralPanel);
2735		- bigThree.add(XYZPanel);
2736	3560	bigThree.FlushUI();
	3561	+
	3562	+ cameraView.requestFocusInWindow();
2737	3563	} else
2738	3564	if (source == fourButton)
2739	3565	{
2740	3566	radio.layout = fourButton;
	3567	+
	3568	+ if (CameraPane.FULLSCREEN)
	3569	+ fullscreenLayout = radio.layout;
2741	3570
2742	3571	// bigThree.remove(scenePanel);
2743	3572	// bigThree.remove(centralPanel);
..	..	@@ -2769,10 +3598,15 @@
2769	3598	bigThree.ClearUI();
2770	3599	bigThree.add(scenePanel);
2771	3600	bigThree.FlushUI();
	3601	+
	3602	+ cameraView.requestFocusInWindow();
2772	3603	} else
2773	3604	if (source == sixButton)
2774	3605	{
2775	3606	radio.layout = sixButton;
	3607	+
	3608	+ if (CameraPane.FULLSCREEN)
	3609	+ fullscreenLayout = radio.layout;
2776	3610
2777	3611	// bigThree.remove(scenePanel);
2778	3612	// bigThree.remove(centralPanel);
..	..	@@ -2802,13 +3636,18 @@
2802	3636	// centralPanel.setVisible(true);
2803	3637	// XYZPanel.setVisible(false);
2804	3638	bigThree.ClearUI();
2805		- bigThree.add(scenePanel);
2806	3639	bigThree.add(centralPanel);
	3640	+ bigThree.add(scenePanel);
2807	3641	bigThree.FlushUI();
	3642	+
	3643	+ cameraView.requestFocusInWindow();
2808	3644	} else
2809	3645	if (source == sevenButton)
2810	3646	{
2811	3647	radio.layout = sevenButton;
	3648	+
	3649	+ if (CameraPane.FULLSCREEN)
	3650	+ fullscreenLayout = radio.layout;
2812	3651
2813	3652	// bigThree.remove(scenePanel);
2814	3653	// bigThree.remove(centralPanel);
..	..	@@ -2842,6 +3681,8 @@
2842	3681	bigThree.add(centralPanel);
2843	3682	bigThree.add(XYZPanel);
2844	3683	bigThree.FlushUI();
	3684	+
	3685	+ cameraView.requestFocusInWindow();
2845	3686	} else
2846	3687	if (source == rootButton)
2847	3688	{
..	..	@@ -2853,6 +3694,7 @@
2853	3694	EditObject(obj);
2854	3695	}
2855	3696
	3697	+ cameraView.requestFocusInWindow();
2856	3698	refreshContents(true);
2857	3699	} else
2858	3700	if (source == closeButton)
..	..	@@ -2862,22 +3704,37 @@
2862	3704	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2863	3705	{
2864	3706	ab = (cRadio)e.nextElement();
2865		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3707	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2866	3708	{
	3709	+ // Patch to avoid bug with transparency.
	3710	+ if (!ab.hadMaterial)
	3711	+ {
	3712	+ ab.object.material = null;
	3713	+ }
	3714	+
2867	3715	buttonGroup.remove(ab);
2868	3716	radioPanel.remove(ab);
2869	3717
2870		- ab.GetObject().editWindow = null;
	3718	+ //ab.GetObject().editWindow = null;
	3719	+ ab.GetObject().manipWindow = null;
2871	3720	// ab.GetObject().objectUI = null; // ?????????
2872	3721
2873	3722	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2874	3723	break;
2875	3724	}
2876	3725	}
	3726	+
	3727	+ cameraView.requestFocusInWindow();
2877	3728	refreshContents(true);
2878	3729	} else
2879	3730	if (source == editItem \|\| source == editButton)
2880	3731	{
	3732	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3733	+ {
	3734	+ Object3D child = (Object3D)e.nextElement();
	3735	+ child.pinned = true;
	3736	+ }
	3737	+
2881	3738	EditSelection(false);
2882	3739	} else
2883	3740	if (source == uneditButton)
..	..	@@ -2887,12 +3744,13 @@
2887	3744	Object3D child = (Object3D)e.nextElement();
2888	3745	if(child.editWindow != null)
2889	3746	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3747	+ child.pinned = false;
2890	3748	child.CloseUI();
2891	3749	listUI.remove(child);
2892	3750
2893		- child.editWindow = null; // ???????????
	3751	+ //child.editWindow = null; // ???????????
2894	3752	}
2895		- objEditor.ctrlPanel.validate();
	3753	+ objEditor.ctrlPanel.FlushUI();
2896	3754	//objEditor.jTree.clearSelection();
2897	3755	//objEditor.ResetSliders();
2898	3756	refreshContents(true);
..	..	@@ -2903,6 +3761,7 @@
2903	3761	//copy.ClearUI();
2904	3762	for (Object3D obj : listUI)
2905	3763	{
	3764	+ obj.pinned = false;
2906	3765	obj.CloseUI();
2907	3766	}
2908	3767	listUI.clear();
..	..	@@ -2912,7 +3771,7 @@
2912	3771	{
2913	3772	assert(copy == group);
2914	3773
2915		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3774	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2916	3775
2917	3776	for (Object3D obj : listUI)
2918	3777	{
..	..	@@ -2961,6 +3820,9 @@
2961	3820	}
2962	3821
2963	3822	copy = group;
	3823	+
	3824	+ SetUndoStates();
	3825	+
2964	3826	//Globals.theRenderer.object = group;
2965	3827	if(!useclient)
2966	3828	{
..	..	@@ -2976,20 +3838,46 @@
2976	3838	frontView.object = group;
2977	3839	sideView.object = group;
2978	3840	}
2979		- group.editWindow = this;
	3841	+
	3842	+// fix "+" issue
	3843	+ //group.editWindow = this;
	3844	+ group.manipWindow = this;
	3845	+
2980	3846	/*
2981	3847	currentLayout = radio.layout;
2982	3848	if (currentLayout == null)
2983	3849	currentLayout = sevenButton;
2984	3850	*/
2985	3851	radio.layout.doClick();
	3852	+
	3853	+ ClearUnpinned();
	3854	+ //Grafreed.Assert(group != null);
	3855	+ //Grafreed.Assert(group.selection != null);
	3856	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	3857	+ if (group.selection == null \|\| group.selection.size() == 1)
	3858	+ EditSelection(false);
2986	3859	keepparent = group.parent;
2987	3860	// PARENT = NULL or not???
2988	3861	//group.parent = null; // ROOT
2989	3862	//group.attributes = -1;
2990	3863	ResetModel();
	3864	+
	3865	+ cameraView.requestFocusInWindow();
2991	3866	refreshContents(true);
2992		- }
	3867	+ } else if (event.getSource() == editCameraItem)
	3868	+ {
	3869	+ cameraView.ProtectCamera();
	3870	+ cameraView.repaint();
	3871	+ return;
	3872	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3873	+ {
	3874	+ cameraView.RevertCamera();
	3875	+ cameraView.repaint();
	3876	+ return;
	3877	+ // } else if (event.getSource() == textureButton)
	3878	+ // {
	3879	+ // return; // true;
	3880	+ }
2993	3881	else
2994	3882	{
2995	3883	//return super.action(event, arg);
..	..	@@ -2998,7 +3886,6 @@
2998	3886	}
2999	3887
3000	3888	boolean useclient = false;
3001		- cRadio radio;
3002	3889
3003	3890	void ToggleRoot()
3004	3891	{
..	..	@@ -3050,6 +3937,28 @@
3050	3937	refreshContents();
3051	3938	}
3052	3939
	3940	+ void TransformChildren()
	3941	+ {
	3942	+ Object3D obj;
	3943	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3944	+ {
	3945	+ obj = (Object3D)e.nextElement();
	3946	+ obj.KeepTextureMatrices();
	3947	+ obj.TransformChildren();
	3948	+ obj.RestoreTextureMatrices();
	3949	+
	3950	+// if (obj.parent == null)
	3951	+// {
	3952	+// System.out.println("NULL PARENT!");
	3953	+// new Exception().printStackTrace();
	3954	+// }
	3955	+// else
	3956	+// TouchTransform(obj);
	3957	+// //obj.parent.Touch();
	3958	+ }
	3959	+
	3960	+ refreshContents();
	3961	+ }
3053	3962
3054	3963	void ResetTransform()
3055	3964	{
..	..	@@ -3162,7 +4071,7 @@
3162	4071	refreshContents();
3163	4072	}
3164	4073
3165		- void ResetCentroid()
	4074	+ void ResetCentroid(boolean full)
3166	4075	{
3167	4076	Object3D obj;
3168	4077	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3177,12 +4086,16 @@
3177	4086	LA.matIdentity(Object3D.mat);
3178	4087	obj.getBounds(minima, maxima, false);
3179	4088	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3180		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	4089	+ if (full)
	4090	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3181	4091	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3182	4092	obj.TransformMesh(Object3D.mat);
	4093	+
3183	4094	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3184		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	4095	+ if (full)
	4096	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3185	4097	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	4098	+
3186	4099	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3187	4100	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3188	4101	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3211,7 +4124,8 @@
3211	4124
3212	4125	int size = obj.MemorySize();
3213	4126
3214		- System.err.println((size/1024) + " KB is the size of " + obj);
	4127	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4128	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3215	4129	}
3216	4130	}
3217	4131	catch (Exception e)
..	..	@@ -3248,9 +4162,9 @@
3248	4162	obj = (Object3D)e.nextElement();
3249	4163
3250	4164	System.out.println("Object is: " + obj);
3251		- GrafreeD.AnalyzeObject(obj);
	4165	+ Grafreed.AnalyzeObject(obj);
3252	4166	System.out.println("Boundary rep: " + obj.bRep);
3253		- GrafreeD.AnalyzeObject(obj.bRep);
	4167	+ Grafreed.AnalyzeObject(obj.bRep);
3254	4168
3255	4169	// System.err.println((size/1024) + " KB is the size of " + obj);
3256	4170	}
..	..	@@ -3292,6 +4206,13 @@
3292	4206	void GenNormals(boolean crease)
3293	4207	{
3294	4208	group.GenNormalsS(crease);
	4209	+
	4210	+ refreshContents();
	4211	+ }
	4212	+
	4213	+ void GenNormalsMESH()
	4214	+ {
	4215	+ group.GenNormalsMeshS();
3295	4216
3296	4217	refreshContents();
3297	4218	}
..	..	@@ -3464,8 +4385,8 @@
3464	4385
3465	4386	void ParseVertices()
3466	4387	{
3467		- boolean epsequal = GrafreeD.epsequal;
3468		- GrafreeD.epsequal = true;
	4388	+ boolean epsequal = Grafreed.epsequal;
	4389	+ Grafreed.epsequal = true;
3469	4390
3470	4391	for (int i=0; i<group.selection.size(); i++)
3471	4392	{
..	..	@@ -3490,7 +4411,7 @@
3490	4411	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3491	4412	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3492	4413
3493		- g.add(GrafreeD.clipboard);
	4414	+ g.add(Grafreed.clipboard);
3494	4415
3495	4416	buffer.add(g);
3496	4417	}
..	..	@@ -3505,7 +4426,7 @@
3505	4426	makeSomething(buffer, i==group.selection.size()-1);
3506	4427	}
3507	4428
3508		- GrafreeD.epsequal = epsequal;
	4429	+ Grafreed.epsequal = epsequal;
3509	4430
3510	4431	refreshContents();
3511	4432	}
..	..	@@ -3523,7 +4444,16 @@
3523	4444	String pigment = Object3D.GetPigment(tex);
3524	4445	//String bump = Object3D.GetBump(tex);
3525	4446
3526		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4447	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4448	+
	4449	+ try
	4450	+ {
	4451	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
	4452	+ }
	4453	+ catch (Exception e)
	4454	+ {
	4455	+ System.err.println("FAIL: " + node);
	4456	+ }
3527	4457
3528	4458	double s = v.s;
3529	4459
..	..	@@ -3611,11 +4541,11 @@
3611	4541
3612	4542	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3613	4543
3614		- boolean random = CameraPane.RANDOM;
3615		- CameraPane.RANDOM = false; // parse all random nodes
	4544	+ boolean random = CameraPane.SWITCH;
	4545	+ CameraPane.SWITCH = false; // parse all random nodes
3616	4546	lowres.linkVerticesThis(null);
3617	4547	lowres.linkVerticesThis(sn);
3618		- CameraPane.RANDOM = random;
	4548	+ CameraPane.SWITCH = random;
3619	4549
3620	4550	System.err.flush();
3621	4551
..	..	@@ -3655,7 +4585,7 @@
3655	4585	return;
3656	4586
3657	4587	Object3D poses = group.selection.get(0);
3658		- Object3D ref = GrafreeD.clipboard.get(0);
	4588	+ Object3D ref = Grafreed.clipboard.get(0);
3659	4589
3660	4590	Object3D newgroup = new Object3D("Po:" + poses.name);
3661	4591
..	..	@@ -3849,9 +4779,9 @@
3849	4779
3850	4780	void ClipMesh()
3851	4781	{
3852		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4782	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3853	4783	{
3854		- Object3D content = GrafreeD.clipboard.get(0);
	4784	+ Object3D content = Grafreed.clipboard.get(0);
3855	4785
3856	4786	if (content instanceof cGroup && ((cGroup)content).transientlink )
3857	4787	content = ((cGroup)content).get(0);
..	..	@@ -3860,7 +4790,7 @@
3860	4790	// {
3861	4791	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3862	4792	// }
3863		- group.selection.ClipMesh(GrafreeD.clipboard);
	4793	+ group.selection.ClipMesh(Grafreed.clipboard);
3864	4794	}
3865	4795	// group.selection.ClipMesh(GrafreeD.clipboard);
3866	4796	System.out.println("DONE.");
..	..	@@ -3907,6 +4837,18 @@
3907	4837	void MarkLeaves(boolean hide)
3908	4838	{
3909	4839	group.selection.MarkLeaves(hide);
	4840	+ refreshContents();
	4841	+ }
	4842	+
	4843	+ void RewindLeaves(boolean hide)
	4844	+ {
	4845	+ group.selection.RewindLeaves(hide);
	4846	+ refreshContents();
	4847	+ }
	4848	+
	4849	+ void RandomLeaves(boolean hide)
	4850	+ {
	4851	+ group.selection.RandomLeaves(hide);
3910	4852	refreshContents();
3911	4853	}
3912	4854
..	..	@@ -3981,28 +4923,25 @@
3981	4923	// }
3982	4924	// }
3983	4925
3984		- static boolean allparams = true;
3985		-
3986		- static Vector<Object3D> listUI = new Vector<Object3D>();
3987		-
3988	4926	void EditSelection(boolean newWindow)
3989	4927	{
	4928	+ if (group.selection == null)
	4929	+ {
	4930	+ EditElement(group, newWindow); // ? new
	4931	+ return;
	4932	+ }
	4933	+
3990	4934	// aConstraints.gridy = 0;
3991	4935	for (int i=0; i<group.selection.size(); i++)
3992	4936	{
3993	4937	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
3994	4938	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3995		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4939	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3996	4940
3997	4941	Object3D elem = (Object3D)group.selection.elementAt(i);
3998		- if(elem != group)
	4942	+ if(elem != group \|\| !newWindow)
3999	4943	{
4000		- // if (!(elem instanceof Composite))
4001		- // newWindow = false;
4002		- listUI.add(elem);
4003		- elem.openEditWindow(this, newWindow); //, false);
4004		- System.out.println("edit : " + elem);
4005		- elem.editWindow.refreshContents(true); // ? new
	4944	+ EditElement(elem, newWindow); // ? new
4006	4945	}
4007	4946	}
4008	4947	}
..	..	@@ -4077,7 +5016,8 @@
4077	5016	//new Exception().printStackTrace();
4078	5017
4079	5018	freezemodel = true;
4080		-
	5019	+ ClearUnpinned();
	5020	+
4081	5021	/**/
4082	5022	//switch (event.id)
4083	5023	{
..	..	@@ -4085,7 +5025,6 @@
4085	5025	//case 702: // Event.LIST_DESELECT
4086	5026	group.deselectAll();
4087	5027	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4088		- objEditor.ClearInfo(); // .GetMaterial());
4089	5028	if (tps != null)
4090	5029	{
4091	5030	for (int i=0; i < tps.length; i++)
..	..	@@ -4094,10 +5033,8 @@
4094	5033
4095	5034	//if (child.parent != null)
4096	5035	//child.parent.addSelectee(child);
	5036	+ objEditor.SetMaterial(child);
4097	5037	group.addSelectee(child);
4098		- objEditor.SetMaterial(child); // .GetMaterial());
4099		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4100		- System.err.println("info : " + child.GetPath());
4101	5038	}
4102	5039	}
4103	5040	// else
..	..	@@ -4107,20 +5044,28 @@
4107	5044	// System.err.println("info : " + group.GetPath());
4108	5045	// }
4109	5046
4110		- objEditor.SetText(); // jan 2014
4111		-
4112		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	5047	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4113	5048	CameraPane.flash = true;
4114	5049
4115		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5050	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4116	5051	// a camera
4117	5052	{
4118		- CameraPane.camerachangeframe = 0; // don't refuse it
4119		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5053	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5054	+ {
	5055	+ CameraPane.camerachangeframe = 0; // don't refuse it
	5056	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5057	+ }
4120	5058	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4121	5059	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4122	5060	}
4123	5061
	5062	+ if (tps != null && tps.length == 1)
	5063	+ {
	5064	+ EditSelection(false);
	5065	+ }
	5066	+
	5067	+ SetPinStates(tps != null && tps.length > 0);
	5068	+
4124	5069	refreshContents();
4125	5070	//return true;
4126	5071	}
..	..	@@ -4129,6 +5074,35 @@
4129	5074
4130	5075	freezemodel = false;
4131	5076	}
	5077	+
	5078	+ void SetPinStates(boolean enabled)
	5079	+ {
	5080	+ editButton.setEnabled(enabled);
	5081	+ uneditButton.setEnabled(enabled);
	5082	+ unselectButton.setEnabled(enabled);
	5083	+ flashSelectionButton.setEnabled(enabled);
	5084	+ }
	5085	+
	5086	+ void refreshContents(boolean cp)
	5087	+ {
	5088	+ if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5089	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5090	+ {
	5091	+ objEditor.ClearInfo(); // .GetMaterial());
	5092	+
	5093	+ for (int i=0; i < group.selection.Size(); i++)
	5094	+ {
	5095	+ Object3D child = (Object3D) group.selection.get(i);
	5096	+
	5097	+ objEditor.AddInfo(child, this, true);
	5098	+ System.err.println("info : " + child.GetPath());
	5099	+ }
	5100	+
	5101	+ objEditor.SetText(); // jan 2014
	5102	+ }
	5103	+
	5104	+ super.refreshContents(cp);
	5105	+ }
4132	5106
4133	5107	void linkSomething(Object3D thing)
4134	5108	{
..	..	@@ -4200,16 +5174,19 @@
4200	5174	{
4201	5175	if (group.selection.isEmpty())
4202	5176	return;
4203		- GrafreeD.clipboardIsTempGroup = false;
	5177	+
	5178	+ Grafreed.clipboardIsTempGroup = false;
4204	5179	Composite tGroup = null;
4205	5180	if (group.selection.size() > 0) // 1)
4206	5181	{
4207	5182	tGroup = new cGroup();
4208		- GrafreeD.clipboardIsTempGroup = true;
	5183	+ Grafreed.clipboardIsTempGroup = true;
4209	5184	}
4210	5185
4211	5186	if (cut)
4212	5187	{
	5188	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5189	+// Save();
4213	5190	//int indices[] = jList.getSelectedIndices();
4214	5191	//for (int i = indices.length - 1; i >= 0; i--)
4215	5192	//jList.remove(indices[i]);
..	..	@@ -4245,16 +5222,16 @@
4245	5222	//System.out.println("cut " + child);
4246	5223	//System.out.println("parent = " + child.parent);
4247	5224	// tmp.addChild(child);
4248		- if (GrafreeD.clipboardIsTempGroup)
	5225	+ if (Grafreed.clipboardIsTempGroup)
4249	5226	tGroup.add/Child/(tmp);
4250	5227	else
4251		- GrafreeD.clipboard = tmp;
	5228	+ Grafreed.clipboard = tmp;
4252	5229	}
4253	5230	else
4254		- if (GrafreeD.clipboardIsTempGroup)
	5231	+ if (Grafreed.clipboardIsTempGroup)
4255	5232	tGroup.add/Child/(child);
4256	5233	else
4257		- GrafreeD.clipboard = child;
	5234	+ Grafreed.clipboard = child;
4258	5235	}
4259	5236
4260	5237	//ResetModel();
..	..	@@ -4286,21 +5263,23 @@
4286	5263	//System.out.println("cut " + elem);
4287	5264	//System.out.println("parent = " + elem.parent);
4288	5265	// tmp.addChild(elem);
4289		- if (GrafreeD.clipboardIsTempGroup)
	5266	+ if (Grafreed.clipboardIsTempGroup)
4290	5267	tGroup.add/Child/(tmp);
4291	5268	else
4292		- GrafreeD.clipboard = tmp;
	5269	+ Grafreed.clipboard = tmp;
4293	5270	}
4294	5271	else
4295		- if (GrafreeD.clipboardIsTempGroup)
	5272	+ if (Grafreed.clipboardIsTempGroup)
4296	5273	tGroup.add/Child/(child);
4297	5274	else
4298		- GrafreeD.clipboard = child;
	5275	+ Grafreed.clipboard = child;
4299	5276	}
4300	5277
4301	5278	}
4302		- if (GrafreeD.clipboardIsTempGroup)
4303		- GrafreeD.clipboard = tGroup;
	5279	+
	5280	+ if (Grafreed.clipboardIsTempGroup)
	5281	+ Grafreed.clipboard = tGroup;
	5282	+
4304	5283	if (cut)
4305	5284	{
4306	5285	ResetModel();
..	..	@@ -4310,11 +5289,15 @@
4310	5289
4311	5290	void paste(boolean expand)
4312	5291	{
	5292	+ if (Globals.REPLACEONMAKE)
	5293	+ Save();
	5294	+ boolean keep = Globals.REPLACEONMAKE;
	5295	+ Globals.REPLACEONMAKE = false;
4313	5296	// if (GrafreeD.clipboard == null)
4314	5297	// return;
4315	5298	boolean first = true;
4316	5299
4317		- if (GrafreeD.clipboardIsTempGroup)
	5300	+ if (Grafreed.clipboardIsTempGroup)
4318	5301	{
4319	5302	Composite temp;
4320	5303
..	..	@@ -4325,7 +5308,7 @@
4325	5308	temp = (Composite)Applet3D.clipboard.deepCopy();
4326	5309	*/
4327	5310	Object3D elem;
4328		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5311	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4329	5312	{
4330	5313	Object3D child = (Object3D)e.nextElement();
4331	5314
..	..	@@ -4359,21 +5342,22 @@
4359	5342	//Object3D cb = Applet3D.clipboard;
4360	5343	//temp.addChild(cb);
4361	5344	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4362		- assert(GrafreeD.clipboard.parent == null);
4363		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4364		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4365		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4366		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	5345	+ assert(Grafreed.clipboard.parent == null);
	5346	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5347	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5348	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5349	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4367	5350	else
4368		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4369		- GrafreeD.clipboard.get(0).parent = keepparent;
	5351	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5352	+ Grafreed.clipboard.get(0).parent = keepparent;
4370	5353	}
4371	5354
	5355	+ Globals.REPLACEONMAKE = keep;
4372	5356	ResetModel();
4373	5357	refreshContents();
4374	5358	}
4375	5359
4376		- void pasteInto(boolean copyit)
	5360	+ void pasteInto(boolean copyit, boolean clone)
4377	5361	{
4378	5362	// if (GrafreeD.clipboard == null)
4379	5363	// return;
..	..	@@ -4402,15 +5386,22 @@
4402	5386	if (copyit)
4403	5387	{
4404	5388	// paste(false);
4405		- CloneClipboard(false); // sept 2014
	5389	+ if (clone)
	5390	+ {
	5391	+ CloneClipboard(false); // sept 2014
	5392	+ }
	5393	+ else
	5394	+ {
	5395	+ paste(false);
	5396	+ }
4406	5397	}
4407	5398	else
4408	5399	{
4409	5400	boolean first = true;
4410	5401
4411		- if (GrafreeD.clipboardIsTempGroup)
	5402	+ if (Grafreed.clipboardIsTempGroup)
4412	5403	{
4413		- Composite temp = (Composite)GrafreeD.clipboard;
	5404	+ Composite temp = (Composite)Grafreed.clipboard;
4414	5405	Object3D copy;
4415	5406	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4416	5407	{
..	..	@@ -4420,7 +5411,7 @@
4420	5411	}
4421	5412	} else
4422	5413	{
4423		- linkSomething(GrafreeD.clipboard); //.get(0));
	5414	+ linkSomething(Grafreed.clipboard); //.get(0));
4424	5415	}
4425	5416	}
4426	5417	}
..	..	@@ -4497,6 +5488,10 @@
4497	5488
4498	5489	void group(Object3D csg, boolean grab)
4499	5490	{
	5491	+ if (Globals.REPLACEONMAKE)
	5492	+ Save();
	5493	+ boolean keep = Globals.REPLACEONMAKE;
	5494	+ Globals.REPLACEONMAKE = false;
4500	5495	if (//false) // why??
4501	5496	!group.selection.isEmpty())
4502	5497	{
..	..	@@ -4610,10 +5605,15 @@
4610	5605	//node.add(csg);
4611	5606	//makeSomething(node);
4612	5607	makeSomething(csg);
	5608	+ Globals.REPLACEONMAKE = keep;
4613	5609	}
4614	5610
4615	5611	void Ungroup(Object3D g)
4616	5612	{
	5613	+ if (Globals.REPLACEONMAKE)
	5614	+ Save();
	5615	+ boolean keep = Globals.REPLACEONMAKE;
	5616	+ Globals.REPLACEONMAKE = false;
4617	5617	if (g instanceof HiddenObject)
4618	5618	{
4619	5619	HiddenObject h = (HiddenObject) g;
..	..	@@ -4630,6 +5630,7 @@
4630	5630	objEditor.makeSomething(g.get(i), false);
4631	5631	}
4632	5632	}
	5633	+ Globals.REPLACEONMAKE = keep;
4633	5634	}
4634	5635
4635	5636	void ungroup()
..	..	@@ -4825,21 +5826,6 @@
4825	5826	}
4826	5827	*/
4827	5828
4828		- void ImportGFD()
4829		- {
4830		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4831		- browser.show();
4832		- String filename = browser.getFile();
4833		- if (filename != null && filename.length() > 0)
4834		- {
4835		- String fullname = browser.getDirectory() + filename;
4836		-
4837		- //Object3D readobj =
4838		- objEditor.ReadGFD(fullname, objEditor);
4839		- //makeSomething(readobj);
4840		- }
4841		- }
4842		-
4843	5829	/*
4844	5830	public void Callback(Object obj)
4845	5831	{
..	..	@@ -4863,26 +5849,9 @@
4863	5849	}
4864	5850	*/
4865	5851
4866		- void ImportVRMLX3D()
4867		- {
4868		- if (GrafreeD.standAlone)
4869		- {
4870		- /**/
4871		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4872		- browser.show();
4873		- String filename = browser.getFile();
4874		- if (filename != null && filename.length() > 0)
4875		- {
4876		- String fullname = browser.getDirectory() + filename;
4877		- LoadVRMLX3D(fullname);
4878		- }
4879		- /**/
4880		- }
4881		- }
4882		-
4883	5852	String GetFile(String dialogName)
4884	5853	{
4885		- if (GrafreeD.standAlone)
	5854	+ if (Grafreed.standAlone)
4886	5855	{
4887	5856	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4888	5857	browser.show();
..	..	@@ -4946,10 +5915,49 @@
4946	5915	cButton flashSelectionButton;
4947	5916	cButton editButton;
4948	5917	cButton uneditButton;
	5918	+ JCheckBox allParamsButton;
4949	5919	cButton clearpanelButton;
4950		- cButton allParamsButton;
4951	5920	cButton unselectButton;
4952	5921
	5922	+ cButton restoreCameraButton;
	5923	+
	5924	+ cButton saveButton;
	5925	+ cButton oneStepButton;
	5926	+
	5927	+ cButton groupButton;
	5928	+ cButton ungroupButton;
	5929	+ cButton compositeButton;
	5930	+ cButton switchButton;
	5931	+ cButton loopButton;
	5932	+ cButton textureButton;
	5933	+
	5934	+ cButton skybox1Button;
	5935	+ cButton skybox2Button;
	5936	+ cButton skybox3Button;
	5937	+ cButton skybox4Button;
	5938	+ cButton skybox5Button;
	5939	+ cButton skybox6Button;
	5940	+ cButton skybox7Button;
	5941	+
	5942	+ cButton skybox11Button;
	5943	+ cButton skybox12Button;
	5944	+ cButton skybox13Button;
	5945	+ cButton skybox14Button;
	5946	+ cButton skybox15Button;
	5947	+ cButton skybox16Button;
	5948	+ cButton skybox17Button;
	5949	+
	5950	+ cButton gridButton;
	5951	+ cButton boxButton;
	5952	+ cButton sphereButton;
	5953	+ cButton coneButton;
	5954	+ cButton torusButton;
	5955	+ cButton superButton;
	5956	+ cButton kleinButton;
	5957	+ cButton particlesButton;
	5958	+ cButton overlayButton;
	5959	+ cButton lightButton;
	5960	+
4953	5961	cButton screenfitButton;
4954	5962	cButton screenfitpointButton;
4955	5963	cButton snapobjectButton;
..	..	@@ -4961,14 +5969,6 @@
4961	5969
4962	5970	cButton setsupportButton;
4963	5971
4964		- cButton twoButton;
4965		- cButton sixButton;
4966		- cButton threeButton;
4967		- cButton sevenButton;
4968		- cButton fourButton; // full panel
4969		- cButton oneButton; // full XYZ
4970		- //cButton currentLayout;
4971		-
4972	5972	//
4973	5973	//Composite
4974	5974	Object3D // to do !!
..	..	@@ -4978,9 +5978,11 @@
4978	5978	//JTree jTree;
4979	5979	private MenuItem lookAtItem;
4980	5980	private MenuItem lookFromItem;
4981		- private MenuItem switchItem;
	5981	+ private MenuItem switchViewItem;
4982	5982	private MenuItem cutItem;
4983		- private MenuItem duplicateItem;
	5983	+ private MenuItem undoItem;
	5984	+ private MenuItem redoItem;
	5985	+ private JMenuItem duplicateItem;
4984	5986	private MenuItem cloneItem;
4985	5987	private MenuItem cloneSupportItem;
4986	5988	private MenuItem overwriteGeoItem;
..	..	@@ -4993,7 +5995,7 @@
4993	5995	private MenuItem linkverticesItem;
4994	5996	private MenuItem relinkverticesItem;
4995	5997	private MenuItem setMasterItem;
4996		- private MenuItem resetMeshItem;
	5998	+ private MenuItem resetAllItem;
4997	5999	private MenuItem stepAllItem;
4998	6000	private MenuItem revertMeshItem;
4999	6001	private MenuItem poseMeshItem;
..	..	@@ -5004,10 +6006,11 @@
5004	6006	private MenuItem mergeGeometriesItem;
5005	6007	private MenuItem copyItem;
5006	6008	private MenuItem pasteItem;
	6009	+ private MenuItem pasteIntoItem;
5007	6010	private MenuItem pasteLinkItem;
5008	6011	private MenuItem pasteCloneItem;
5009	6012	private MenuItem pasteExpandItem;
5010		- private MenuItem clearItem;
	6013	+ private MenuItem deleteItem;
5011	6014	private MenuItem clearAllItem;
5012	6015	private MenuItem genUVItem;
5013	6016	private MenuItem genNormalsMESHItem;
..	..	@@ -5042,6 +6045,10 @@
5042	6045	private MenuItem showleavesItem;
5043	6046	private MenuItem markleavesItem;
5044	6047	private MenuItem unmarkleavesItem;
	6048	+ private MenuItem rewindleavesItem;
	6049	+ private MenuItem unrewindleavesItem;
	6050	+ private MenuItem randomleavesItem;
	6051	+ private MenuItem unrandomleavesItem;
5045	6052
5046	6053	private MenuItem flipVItem;
5047	6054	private MenuItem unflipVItem;
..	..	@@ -5053,15 +6060,17 @@
5053	6060	private MenuItem panoTexturesItem;
5054	6061
5055	6062	private MenuItem resetCentroidItem;
5056		- private MenuItem transformgeometryItem;
	6063	+ private MenuItem resetCentroidXZItem;
5057	6064	private MenuItem resetTransformItem;
	6065	+ private MenuItem transformGeometryItem;
	6066	+ private MenuItem transformChildrenItem;
5058	6067	private MenuItem hideItem;
5059	6068	private MenuItem grabItem;
5060	6069	private MenuItem backItem;
5061	6070	private MenuItem frontItem;
5062	6071	private MenuItem cameraItem;
5063	6072	private MenuItem compositeItem;
5064		- private MenuItem randomItem;
	6073	+ private MenuItem switchItem;
5065	6074	private MenuItem physicsItem;
5066	6075	private MenuItem frameselectorItem;
5067	6076	private MenuItem scriptNodeItem;
..	..	@@ -5085,6 +6094,8 @@
5085	6094	private MenuItem attachBumpItem;
5086	6095	private MenuItem detachBumpItem;
5087	6096	private MenuItem pigmentBumpItem;
	6097	+ private MenuItem embedTexturesItem;
	6098	+ private MenuItem deEmbedTexturesItem;
5088	6099
5089	6100	private MenuItem particleItem;
5090	6101	private MenuItem ragdollItem;
..	..	@@ -5101,7 +6112,7 @@
5101	6112	private MenuItem blobItem;
5102	6113	private MenuItem latheItem;
5103	6114	private MenuItem bezierItem;
5104		- private MenuItem checkerItem;
	6115	+ private MenuItem overlayItem;
5105	6116	private MenuItem meshItem;
5106	6117	// private MenuItem meshGroupItem;
5107	6118	private MenuItem springItem;
..	..	@@ -5123,11 +6134,6 @@
5123	6134	private MenuItem doubleItem;
5124	6135	private MenuItem tripleItem;
5125	6136
5126		- private MenuItem importGFDItem;
5127		- private MenuItem importVRMLX3DItem;
5128		- private MenuItem import3DSItem;
5129		- private MenuItem importOBJItem;
5130		-
5131	6137	private MenuItem computeAOItem;
5132	6138	private MenuItem recompileItem;
5133	6139	private MenuItem editScriptItem;
..	..	@@ -5137,4 +6143,8 @@
5137	6143	private MenuItem analyzeItem;
5138	6144	private MenuItem dumpItem;
5139	6145	//boolean freezemodel = false;
	6146	+
	6147	+ Menu cameraMenu;
	6148	+ MenuItem editCameraItem;
	6149	+ MenuItem restoreCameraItem;
5140	6150	}