~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -23,6 +23,302 @@
23	23	DragGestureListener, DragSourceListener, DropTargetListener,
24	24	ItemListener // ListSelectionListener
25	25	{
	26	+
	27	+ public void AddSkyboxButton(String f, String s, cGridBag row)
	28	+ {
	29	+ cButton skyboxButton;
	30	+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
	31	+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
	32	+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
	33	+ skyboxButton.setToolTipText(s);
	34	+ skyboxButton.addActionListener(new ActionListener()
	35	+ {
	36	+ @Override
	37	+ public void actionPerformed(ActionEvent e)
	38	+ {
	39	+ ChangeSkybox(path);
	40	+ }
	41	+ });
	42	+ }
	43	+
	44	+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
	45	+ {
	46	+ cGridBag tab0 = new cGridBag().setVertical(true);
	47	+
	48	+ tab0.setName("Urban");
	49	+ skyboxpanel.add(tab0);
	50	+
	51	+ cGridBag row0 = new cGridBag();
	52	+ cGridBag row1 = new cGridBag();
	53	+ cGridBag row2 = new cGridBag();
	54	+ cGridBag row3 = new cGridBag();
	55	+ cGridBag row4 = new cGridBag();
	56	+ cGridBag row5 = new cGridBag();
	57	+ cGridBag row6 = new cGridBag();
	58	+
	59	+ AddSkyboxButton("default", "rgb", row0);
	60	+ //AddSkyboxButton("default", "cornell", row0);
	61	+ AddSkyboxButton("penguins", "dust", row0);
	62	+ AddSkyboxButton("penguins", "tropic", row0);
	63	+ AddSkyboxButton("penguins", "yonder", row0);
	64	+
	65	+ AddSkyboxButton("default", "uffizi", row1);
	66	+ AddSkyboxButton("bridge", "Bridge", row1);
	67	+ AddSkyboxButton("bridge", "Bridge2", row1);
	68	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	69	+
	70	+ AddSkyboxButton("urban", "Parliament", row2);
	71	+ AddSkyboxButton("urban", "Roundabout", row2);
	72	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	73	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	74	+
	75	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	76	+ AddSkyboxButton("urban", "UnionSquare", row3);
	77	+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
	78	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	79	+
	80	+ AddSkyboxButton("park", "Buddha", row4);
	81	+ AddSkyboxButton("park", "CNTower2", row4);
	82	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	83	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	84	+
	85	+ AddSkyboxButton("park", "Park", row5);
	86	+ AddSkyboxButton("park", "Pond", row5);
	87	+ AddSkyboxButton("park", "Skansen", row5);
	88	+ AddSkyboxButton("park", "Skansen2", row5);
	89	+
	90	+ AddSkyboxButton("park", "Skansen3", row6);
	91	+ AddSkyboxButton("park", "Skansen4", row6);
	92	+ AddSkyboxButton("park", "Skansen5", row6);
	93	+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
	94	+
	95	+ tab0.add(row0);
	96	+ tab0.add(row1);
	97	+ tab0.add(row2);
	98	+ tab0.add(row3);
	99	+ tab0.add(row4);
	100	+ tab0.add(row5);
	101	+ tab0.add(row6);
	102	+
	103	+ for (int i=5; --i>=0;)
	104	+ {
	105	+ //oe.toolboxPanel.Return();
	106	+ //tab0.add(new cGridBag());
	107	+ }
	108	+ }
	109	+
	110	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	111	+ {
	112	+ cGridBag tab0 = new cGridBag().setVertical(true);
	113	+
	114	+ tab0.setName("Nature");
	115	+ skyboxpanel.add(tab0);
	116	+
	117	+ cGridBag row0 = new cGridBag();
	118	+ cGridBag row1 = new cGridBag();
	119	+ cGridBag row2 = new cGridBag();
	120	+ cGridBag row3 = new cGridBag();
	121	+ cGridBag row4 = new cGridBag();
	122	+ cGridBag row5 = new cGridBag();
	123	+ cGridBag row6 = new cGridBag();
	124	+
	125	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	126	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	127	+ AddSkyboxButton("beach", "PalmTrees", row0);
	128	+ AddSkyboxButton("beach", "Tenerife", row0);
	129	+
	130	+ AddSkyboxButton("beach", "Tenerife2", row1);
	131	+ AddSkyboxButton("beach", "Tenerife3", row1);
	132	+ AddSkyboxButton("field", "FishPond", row1);
	133	+ AddSkyboxButton("field", "Footballfield", row1);
	134	+
	135	+ AddSkyboxButton("field", "Meadow", row2);
	136	+ AddSkyboxButton("field", "Sorsele", row2);
	137	+ AddSkyboxButton("field", "Sorsele2", row2);
	138	+ AddSkyboxButton("field", "Sorsele3", row2);
	139	+
	140	+ AddSkyboxButton("forest", "Brudslojan", row3);
	141	+ AddSkyboxButton("forest", "Langholmen2", row3);
	142	+ AddSkyboxButton("forest", "Plants", row3);
	143	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	144	+
	145	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	146	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	147	+ AddSkyboxButton("mountain", "Teide", row4);
	148	+ AddSkyboxButton("park", "Tantolunden4", row4);
	149	+
	150	+ AddSkyboxButton("park", "Stairs", row5);
	151	+ AddSkyboxButton("default", "skycube", row6);
	152	+ AddSkyboxButton("rocky", "Langholmen", row5);
	153	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	154	+
	155	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	156	+ AddSkyboxButton("default", "CloudyHills", row6);
	157	+ AddSkyboxButton("daz", "Autumn", row6);
	158	+ AddSkyboxButton("daz", "MountainTrail", row6);
	159	+ /*
	160	+Autumn
	161	+Greenlands
	162	+MountainTrail
	163	+Oasis
	164	+TheRock
	165	+TopOfTheWorld
	166	+Winter
	167	+ */
	168	+
	169	+ tab0.add(row0);
	170	+ tab0.add(row1);
	171	+ tab0.add(row2);
	172	+ tab0.add(row3);
	173	+ tab0.add(row4);
	174	+ tab0.add(row5);
	175	+ tab0.add(row6);
	176	+
	177	+ for (int i=5; --i>=0;)
	178	+ {
	179	+ //oe.toolboxPanel.Return();
	180	+ //tab0.add(new cGridBag());
	181	+ }
	182	+ }
	183	+
	184	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	185	+ {
	186	+ cGridBag tab0 = new cGridBag().setVertical(true);
	187	+
	188	+ tab0.setName("Night");
	189	+ skyboxpanel.add(tab0);
	190	+
	191	+ cGridBag row0 = new cGridBag();
	192	+ cGridBag row1 = new cGridBag();
	193	+ cGridBag row2 = new cGridBag();
	194	+ cGridBag row3 = new cGridBag();
	195	+ cGridBag row4 = new cGridBag();
	196	+ cGridBag row5 = new cGridBag();
	197	+ cGridBag row6 = new cGridBag();
	198	+
	199	+ AddSkyboxButton("night", "NightPath", row0);
	200	+ AddSkyboxButton("night", "PondNight", row0);
	201	+ AddSkyboxButton("night", "Powerlines", row0);
	202	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	203	+
	204	+ AddSkyboxButton("urban", "CNTower", row1);
	205	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	206	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	207	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
	208	+
	209	+ AddSkyboxButton("penguins", "kenon_star", row2);
	210	+ AddSkyboxButton("persson", "corona", row2);
	211	+ AddSkyboxButton("persson", "spaceskybox", row2);
	212	+ AddSkyboxButton("indoors", "Vasa", row2);
	213	+
	214	+ AddSkyboxButton("winter", "Backyard", row3);
	215	+ AddSkyboxButton("winter", "Creek", row3);
	216	+ AddSkyboxButton("winter", "FootballField3", row3);
	217	+ AddSkyboxButton("winter", "Forest", row3);
	218	+
	219	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	220	+ AddSkyboxButton("winter", "House", row4);
	221	+ AddSkyboxButton("winter", "IceLake", row4);
	222	+ AddSkyboxButton("winter", "IceRiver", row4);
	223	+
	224	+ AddSkyboxButton("winter", "Park3", row5);
	225	+ AddSkyboxButton("winter", "PondWinter", row5);
	226	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	227	+ AddSkyboxButton("winter", "Vindelalven", row5);
	228	+
	229	+ AddSkyboxButton("daz", "TheRock", row6);
	230	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	231	+ AddSkyboxButton("daz", "Winter", row6);
	232	+ AddSkyboxButton("mountain", "Ryfjallet", row6);
	233	+
	234	+ tab0.add(row0);
	235	+ tab0.add(row1);
	236	+ tab0.add(row2);
	237	+ tab0.add(row3);
	238	+ tab0.add(row4);
	239	+ tab0.add(row5);
	240	+ tab0.add(row6);
	241	+
	242	+ for (int i=5; --i>=0;)
	243	+ {
	244	+ //oe.toolboxPanel.Return();
	245	+ //tab0.add(new cGridBag());
	246	+ }
	247	+ }
	248	+
	249	+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
	250	+ {
	251	+ cGridBag tab0 = new cGridBag().setVertical(true);
	252	+
	253	+ tab0.setName("Others");
	254	+ skyboxpanel.add(tab0);
	255	+
	256	+ cGridBag row0 = new cGridBag();
	257	+ cGridBag row1 = new cGridBag();
	258	+ cGridBag row2 = new cGridBag();
	259	+ cGridBag row3 = new cGridBag();
	260	+ cGridBag row4 = new cGridBag();
	261	+ cGridBag row5 = new cGridBag();
	262	+ cGridBag row6 = new cGridBag();
	263	+
	264	+ AddSkyboxButton("mayhem", "afterrain", row0);
	265	+ AddSkyboxButton("mayhem", "aqua4", row0);
	266	+ AddSkyboxButton("mayhem", "aqua9", row0);
	267	+ AddSkyboxButton("mayhem", "flame", row0);
	268	+
	269	+ AddSkyboxButton("mayhem", "h2s", row1);
	270	+ AddSkyboxButton("mayhem", "prehistoric", row1);
	271	+ AddSkyboxButton("mayhem", "scorched", row1);
	272	+ AddSkyboxButton("penguins", "desertdawn", row1);
	273	+
	274	+ AddSkyboxButton("persson", "Citadella", row2);
	275	+ AddSkyboxButton("persson", "Citadella2", row2);
	276	+ AddSkyboxButton("persson", "clouds1", row2);
	277	+ AddSkyboxButton("penguins", "wrath", row2);
	278	+
	279	+ AddSkyboxButton("persson", "FishermansBastion", row3);
	280	+ AddSkyboxButton("persson", "HeroesSquare", row3);
	281	+ AddSkyboxButton("indoors", "DallasW", row3);
	282	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
	283	+
	284	+ AddSkyboxButton("persson", "LancellottiChapel", row4);
	285	+ AddSkyboxButton("persson", "PereaBeach1", row4);
	286	+ AddSkyboxButton("persson", "PereaBeach2", row4);
	287	+ AddSkyboxButton("persson", "redeclipse", row4);
	288	+
	289	+ AddSkyboxButton("daz", "Greenlands", row5);
	290	+ AddSkyboxButton("daz", "Oasis", row5);
	291	+ AddSkyboxButton("elyvisions", "arch3", row5);
	292	+ AddSkyboxButton("elyvisions", "calm_sea", row5);
	293	+
	294	+ AddSkyboxButton("elyvisions", "rainbow", row6);
	295	+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
	296	+ AddSkyboxButton("elyvisions", "heaven", row6);
	297	+ AddSkyboxButton("elyvisions", "hot", row6);
	298	+
	299	+ tab0.add(row0);
	300	+ tab0.add(row1);
	301	+ tab0.add(row2);
	302	+ tab0.add(row3);
	303	+ tab0.add(row4);
	304	+ tab0.add(row5);
	305	+ tab0.add(row6);
	306	+
	307	+ for (int i=5; --i>=0;)
	308	+ {
	309	+ //oe.toolboxPanel.Return();
	310	+ //tab0.add(new cGridBag());
	311	+ }
	312	+ }
	313	+
	314	+ public void ChangeSkybox(String name)
	315	+ {
	316	+ //cameraView.envyoff = false;
	317	+ group.skyboxname = name;
	318	+ group.skyboxext = "jpg";
	319	+ cameraView.repaint();
	320	+ }
	321	+
26	322	//ObjEditor objEditor;
27	323	public void closeUI2()
28	324	{
..	..	@@ -60,6 +356,12 @@
60	356	this.copy = this.group = group;
61	357	//selectees = this.group.selectees;
62	358
	359	+ if (copy.versionlist == null)
	360	+ {
	361	+ copy.versionlist = new Object3D[100];
	362	+ copy.versionindex = -1;
	363	+ }
	364	+
63	365	if(ui)
64	366	SetupUI(objEditor);
65	367	}
..	..	@@ -74,16 +376,28 @@
74	376	this.copy = this.group = copy;
75	377	//selectees = this.group.selectees;
76	378
77		- SetupMenu2(objEditor);
	379	+ SetupMenu2(this); //objEditor);
78	380	SetupUI2(objEditor);
79	381	objEditor.SetupUI(true);
80	382	SetupViews(objEditor);
81	383
82	384	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	385	+
	386	+ if (copy.versionlist == null)
	387	+ {
	388	+ copy.versionlist = new Object3D[100];
	389	+ copy.versionindex = -1;
	390	+
	391	+ Save(true);
	392	+ }
83	393	}
84	394
85	395	void CloneSelection(boolean supports)
86	396	{
	397	+ if (Globals.REPLACEONMAKE)
	398	+ Save();
	399	+ boolean keep = Globals.REPLACEONMAKE;
	400	+ Globals.REPLACEONMAKE = false;
87	401	// Object3D keep = GrafreeD.clipboard;
88	402	//Object3D obj;
89	403	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,18 +408,19 @@
94	408
95	409	makeSomething(clone, i==group.selection.size()-1);
96	410	}
	411	+ Globals.REPLACEONMAKE = keep;
97	412	}
98	413
99	414	void CloneClipboard(boolean supports)
100	415	{
101		- assert(GrafreeD.clipboard.parent == null);
102		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
103		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
104		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
105		- makeSomething(CloneObject(GrafreeD.clipboard.get(0), false));
	416	+ assert(Grafreed.clipboard.parent == null);
	417	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	418	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	419	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	420	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
106	421	else
107		- makeSomething(CloneObject(GrafreeD.clipboard, false));
108		- GrafreeD.clipboard.get(0).parent = keepparent;
	422	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	423	+ Grafreed.clipboard.get(0).parent = keepparent;
109	424	}
110	425
111	426	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -119,7 +434,7 @@
119	434	// obj.support = null;
120	435	if (!supports)
121	436	obj.SaveSupports();
122		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	437	+ Object3D clone = (Object3D)Grafreed.clone(obj);
123	438	obj.parent = parent;
124	439	// obj.support = support;
125	440	// clone.support = support; // aout 2013
..	..	@@ -148,28 +463,21 @@
148	463
149	464	//JTextField nameField;
150	465
151		- void SetupMenu2(ObjEditor oe)
	466	+ void SetupMenu2(GroupEditor oe)
152	467	{
153		- if (Globals.ADVANCED)
154		- {
155		- oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
156		- //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
157		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
158		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
159		- oe.cameraMenu.add("-");
160		- openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
161		- openWindowItem.addActionListener(this);
162		- editLeafItem.addActionListener(this);
163		- lookAtItem.addActionListener(this);
164		- //lookFromItem.addActinoListener(this);
165		- //switchItem.addActionListener(this);
166		- }
167		-
	468	+ oe.jTree = new cTree();
	469	+
168	470	Menu menu;
169	471	oe.menuBar.add(menu = new Menu("Edit"));
170	472	//editItem = menu.add(new MenuItem("Edit"));
171	473	//editItem.addActionListener(this);
172		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	474	+
	475	+// undoItem = menu.add(new MenuItem("Undo"));
	476	+// undoItem.addActionListener(this);
	477	+// redoItem = menu.add(new MenuItem("Redo"));
	478	+// redoItem.addActionListener(this);
	479	+// menu.add("-");
	480	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
173	481	duplicateItem.addActionListener(this);
174	482	cloneItem = menu.add(new MenuItem("Clone"));
175	483	cloneItem.addActionListener(this);
..	..	@@ -185,7 +493,6 @@
185	493	copyItem.addActionListener(this);
186	494	pasteItem = menu.add(new MenuItem("Paste"));
187	495	pasteItem.addActionListener(this);
188		- menu.add("-");
189	496
190	497	menu.add("-");
191	498	pasteIntoItem = menu.add(new MenuItem("Paste into"));
..	..	@@ -197,8 +504,8 @@
197	504	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
198	505	// pasteExpandItem.addActionListener(this);
199	506	menu.add("-");
200		- clearItem = menu.add(new MenuItem("Clear"));
201		- clearItem.addActionListener(this);
	507	+ deleteItem = menu.add(new MenuItem("Delete"));
	508	+ deleteItem.addActionListener(this);
202	509
203	510	if (Globals.ADVANCED)
204	511	{
..	..	@@ -206,14 +513,97 @@
206	513	clearAllItem = menu.add(new MenuItem("Clear All"));
207	514	clearAllItem.addActionListener(this);
208	515	}
	516	+
	517	+ menuBar.add(cameraMenu = new Menu("View"));
	518	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	519	+ //zBufferItem.addActionListener(this);
	520	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	521	+ //normalLensItem.addActionListener(this);
	522	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	523	+ restoreCameraItem.addActionListener(this);
	524	+
	525	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	526	+// toggleFullScreenItem.addItemListener(this);
	527	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	528	+// cameraMenu.add("-");
	529	+//
	530	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	531	+// toggleTextureItem.addItemListener(this);
	532	+// toggleTextureItem.setState(CameraPane.textureon);
	533	+//
	534	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	535	+// toggleSwitchItem.addItemListener(this);
	536	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	537	+
	538	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	539	+ toggleHandleItem.addItemListener(this);
	540	+ toggleHandleItem.setState(CameraPane.HANDLES);
	541	+
	542	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	543	+ togglePaintItem.addItemListener(this);
	544	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	545	+
	546	+ if (Globals.ADVANCED)
	547	+ {
	548	+ cameraMenu.add("-");
	549	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	550	+ toggleLiveItem.addItemListener(this);
	551	+ toggleLiveItem.setState(Globals.isLIVE());
209	552
	553	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	554	+ stepItem.addActionListener(this);
	555	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	556	+ // toggleDLItem.addItemListener(this);
	557	+ // toggleDLItem.setState(false);
	558	+
	559	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	560	+ toggleRenderItem.addItemListener(this);
	561	+ toggleRenderItem.setState(!CameraPane.frozen);
	562	+
	563	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	564	+ toggleDebugItem.addItemListener(this);
	565	+ toggleDebugItem.setState(Globals.DEBUG);
	566	+
	567	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	568	+ toggleFrustumItem.addItemListener(this);
	569	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	570	+
	571	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	572	+ toggleFootContactItem.addItemListener(this);
	573	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	574	+
	575	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	576	+ toggleTimelineItem.addItemListener(this);
	577	+ }
	578	+
	579	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	580	+// toggleRootItem.addItemListener(this);
	581	+// toggleRootItem.setState(false);
	582	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	583	+// animationItem.addItemListener(this);
	584	+// animationItem.setState(CameraPane.ANIMATION);
	585	+ cameraMenu.add("-");
	586	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	587	+ editCameraItem.addActionListener(this);
	588	+
	589	+ if (Globals.ADVANCED)
	590	+ {
	591	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	592	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	593	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	594	+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	595	+ oe.cameraMenu.add("-");
	596	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	597	+ openWindowItem.addActionListener(this);
	598	+ editLeafItem.addActionListener(this);
	599	+ lookAtItem.addActionListener(this);
	600	+ //lookFromItem.addActinoListener(this);
	601	+ //switchViewItem.addActionListener(this);
	602	+ }
	603	+
210	604	oe.menuBar.add(menu = new Menu("Setting"));
211	605	if (Globals.ADVANCED)
212	606	{
213		- resetMeshItem = menu.add(new MenuItem("Reset All"));
214		- resetMeshItem.addActionListener(this);
215		- stepAllItem = menu.add(new MenuItem("Step All"));
216		- stepAllItem.addActionListener(this);
217	607	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
218	608	revertMeshItem.addActionListener(this);
219	609	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
..	..	@@ -253,21 +643,29 @@
253	643	}
254	644
255	645	oe.menuBar.add(menu = new Menu("Group"));
256		- grabItem = menu.add(new MenuItem("Grab"));
257		- grabItem.addActionListener(this);
	646	+// grabItem = menu.add(new MenuItem("Grab"));
	647	+// grabItem.addActionListener(this);
258	648	backItem = menu.add(new MenuItem("Back"));
259	649	backItem.addActionListener(this);
260	650	frontItem = menu.add(new MenuItem("Front"));
261	651	frontItem.addActionListener(this);
262		- compositeItem = menu.add(new MenuItem("Composite"));
263		- compositeItem.addActionListener(this);
	652	+// compositeItem = menu.add(new MenuItem("Composite"));
	653	+// compositeItem.addActionListener(this);
	654	+
	655	+ if (Globals.ADVANCED)
	656	+ {
264	657	hideItem = menu.add(new MenuItem("Hidden Group"));
265	658	hideItem.addActionListener(this);
	659	+ }
266	660	ungroupItem = menu.add(new MenuItem("Ungroup"));
267	661	ungroupItem.addActionListener(this);
268		- menu.add("-");
269		- randomItem = menu.add(new MenuItem("Switch node"));
270		- randomItem.addActionListener(this);
	662	+
	663	+// menu.add("-");
	664	+//
	665	+// switchItem = menu.add(new MenuItem("Switch node"));
	666	+// switchItem.addActionListener(this);
	667	+ if (Globals.ADVANCED)
	668	+ {
271	669	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
272	670	switchGeoItem.addActionListener(this);
273	671	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -275,8 +673,6 @@
275	673	morphItem = menu.add(new MenuItem("Morph Group"));
276	674	morphItem.addActionListener(this);
277	675
278		- if (Globals.ADVANCED)
279		- {
280	676	menu.add("-");
281	677	physicsItem = menu.add(new MenuItem("Physics"));
282	678	physicsItem.addActionListener(this);
..	..	@@ -284,30 +680,29 @@
284	680	frameselectorItem.addActionListener(this);
285	681	scriptNodeItem = menu.add(new MenuItem("Script Node"));
286	682	scriptNodeItem.addActionListener(this);
287		- cameraItem = menu.add(new MenuItem("Camera"));
288		- cameraItem.addActionListener(this);
289	683	}
290	684
291	685	oe.menuBar.add(menu = new Menu("Object"));
292		- textureItem = menu.add(new MenuItem("Texture"));
293		- textureItem.addActionListener(this);
	686	+// textureItem = menu.add(new MenuItem("Texture"));
	687	+// textureItem.addActionListener(this);
294	688	billboardItem = menu.add(new MenuItem("Billboard"));
295	689	billboardItem.addActionListener(this);
296	690	csgItem = menu.add(new MenuItem("CSG"));
297	691	csgItem.addActionListener(this);
298		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	692	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
299	693	shadowXItem.addActionListener(this);
300		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	694	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
301	695	shadowYItem.addActionListener(this);
302		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	696	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
303	697	shadowZItem.addActionListener(this);
	698	+ attributeItem = menu.add(new MenuItem("Attribute"));
	699	+ attributeItem.addActionListener(this);
	700	+
304	701	if (Globals.ADVANCED)
305	702	{
306	703	menu.add("-");
307	704	linkerItem = menu.add(new MenuItem("Linker"));
308	705	linkerItem.addActionListener(this);
309		- attributeItem = menu.add(new MenuItem("Attribute"));
310		- attributeItem.addActionListener(this);
311	706	templateItem = menu.add(new MenuItem("Template"));
312	707	templateItem.addActionListener(this);
313	708	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -318,8 +713,12 @@
318	713	resetTransformItem.addActionListener(this);
319	714	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
320	715	resetCentroidItem.addActionListener(this);
321		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
322		- transformgeometryItem.addActionListener(this);
	716	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	717	+ resetCentroidXZItem.addActionListener(this);
	718	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	719	+ transformGeometryItem.addActionListener(this);
	720	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	721	+ transformChildrenItem.addActionListener(this);
323	722
324	723	oe.menuBar.add(menu = new Menu("Geometry"));
325	724	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -332,7 +731,7 @@
332	731	genNormalsMESHItem.addActionListener(this);
333	732	if (Globals.ADVANCED)
334	733	{
335		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	734	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
336	735	genNormalsMINEItem.addActionListener(this);
337	736	}
338	737	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -368,6 +767,10 @@
368	767	oe.menuBar.add(menu = new Menu("Attributes"));
369	768	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
370	769	clearMaterialsItem.addActionListener(this);
	770	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	771	+ resetAllItem.addActionListener(this);
	772	+ stepAllItem = menu.add(new MenuItem("Step All"));
	773	+ stepAllItem.addActionListener(this);
371	774	menu.add("-");
372	775	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
373	776	liveleavesItem.addActionListener(this);
..	..	@@ -388,6 +791,14 @@
388	791	markleavesItem.addActionListener(this);
389	792	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
390	793	unmarkleavesItem.addActionListener(this);
	794	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	795	+ rewindleavesItem.addActionListener(this);
	796	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	797	+ unrewindleavesItem.addActionListener(this);
	798	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	799	+ randomleavesItem.addActionListener(this);
	800	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	801	+ unrandomleavesItem.addActionListener(this);
391	802	menu.add("-");
392	803	flipVItem = menu.add(new MenuItem("Flip V"));
393	804	flipVItem.addActionListener(this);
..	..	@@ -413,50 +824,56 @@
413	824	attachBumpItem.addActionListener(this);
414	825	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
415	826	pigmentBumpItem.addActionListener(this);
	827	+ //embedTexturesItem
416	828	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
417	829	detachPigmentItem.addActionListener(this);
418	830	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
419	831	detachBumpItem.addActionListener(this);
	832	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	833	+ embedTexturesItem.addActionListener(this);
	834	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	835	+ deEmbedTexturesItem.addActionListener(this);
420	836	menu.add("-");
421	837	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
422	838	sortbysizeItem.addActionListener(this);
423	839	sortbynameItem = menu.add(new MenuItem("Sort by name"));
424	840	sortbynameItem.addActionListener(this);
	841	+ menu.add("-");
	842	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	843	+ shareGeometriesItem.addActionListener(this);
	844	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	845	+ mergeGeometriesItem.addActionListener(this);
425	846	if (Globals.ADVANCED)
426	847	{
427		- menu.add("-");
	848	+ // Pretty much the same as duplicate and clone.
428	849	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
429	850	extractGeometriesItem.addActionListener(this);
430	851	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
431	852	cloneGeometriesItem.addActionListener(this);
432		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
433		- shareGeometriesItem.addActionListener(this);
434		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
435		- mergeGeometriesItem.addActionListener(this);
436	853	}
437	854
438	855	oe.menuBar.add(menu = new Menu("Insert"));
439	856	buildCreateMenu(menu);
440	857
441		- oe.menuBar.add(menu = new Menu("Include"));
442		- importOBJItem = menu.add(new MenuItem("OBJ file..."));
443		- importOBJItem.addActionListener(this);
444		- menu.add("-");
445		- import3DSItem = menu.add(new MenuItem("3DS file..."));
446		- import3DSItem.addActionListener(this);
447		- menu.add("-");
448		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
449		- importVRMLX3DItem.addActionListener(this);
450		- menu.add("-");
451		- importGFDItem = menu.add(new MenuItem("GrafreeD file..."));
452		- importGFDItem.addActionListener(this);
453		-
454	858	oe.menuBar.add(menu = new Menu("Tools"));
455	859	buildToolsMenu(menu);
456	860	}
457	861
	862	+
458	863	void SetupUI2(ObjEditor oe)
459	864	{
	865	+ // June 2019
	866	+ if (oe == null)
	867	+ {
	868	+ //super.SetupUI2(this);
	869	+ //return;
	870	+ }
	871	+
	872	+ if (copy != group)
	873	+ {
	874	+ //super.SetupUI2(this);
	875	+ }
	876	+
460	877	//new Exception().printStackTrace();
461	878
462	879	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -485,97 +902,242 @@
485	902	oe.radioPanel.add(dummyButton);
486	903	oe.buttonGroup.add(dummyButton);
487	904	*/
	905	+ cGridBag copyOptionsPanel = new cGridBag();
	906	+
	907	+ copyOptionsPanel.preferredHeight = 2;
	908	+
488	909	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
489	910
490		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
491		- liveCB.setToolTipText("Enabled animation");
	911	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	912	+ //minButton.setToolTipText("Minimize window");
	913	+ //minButton.addActionListener(this);
	914	+
	915	+ if (Globals.ADVANCED)
	916	+ {
	917	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	918	+ maxButton.setToolTipText("Maximize window");
	919	+ maxButton.addActionListener(this);
	920	+ }
	921	+
	922	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	923	+ fullButton.setToolTipText("Full-screen window");
	924	+ fullButton.addActionListener(this);
	925	+
	926	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	927	+ screenfitButton.setToolTipText("Screen fit");
	928	+ screenfitButton.addActionListener(this);
	929	+
	930	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	931	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	932	+ restoreCameraButton.addActionListener(this);
	933	+
	934	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	935	+ saveVersionButton.setToolTipText("Duplicate current version");
	936	+ saveVersionButton.addActionListener(this);
	937	+
	938	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	939	+ deleteVersionButton.setToolTipText("Delete current version");
	940	+ deleteVersionButton.addActionListener(this);
	941	+
	942	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	943	+ previousVersionButton.setToolTipText("Previous version");
	944	+ previousVersionButton.addActionListener(this);
	945	+ previousVersionButton.setEnabled(false);
	946	+
	947	+ cGridBag updown = new cGridBag().setVertical(true);
	948	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	949	+ restoreButton.setToolTipText("Undo (restore current version)");
	950	+ restoreButton.addActionListener(this);
	951	+ //restoreButton.setEnabled(false);
	952	+
	953	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	954	+ replaceButton.setToolTipText("Save (replace current version)");
	955	+ replaceButton.addActionListener(this);
	956	+ //replaceButton.setEnabled(false);
	957	+
	958	+ copyOptionsPanel.add(updown);
	959	+
	960	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	961	+ nextVersionButton.setToolTipText("Next version");
	962	+ nextVersionButton.addActionListener(this);
	963	+ nextVersionButton.setEnabled(false);
	964	+
	965	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	966	+ liveCB.setToolTipText("Enable animation");
492	967	liveCB.addItemListener(this);
493	968
494		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	969	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
495	970	oneStepButton.setToolTipText("Animate one step forward");
496	971	oneStepButton.addActionListener(this);
497	972
498		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	973	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
499	974	fastCB.setToolTipText("Fast mode");
500	975	fastCB.addItemListener(this);
501	976
502		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
503		- trackCB.setToolTipText("Enable tracking");
504		- trackCB.addItemListener(this);
505		-
506		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
507		- screenfitButton.setToolTipText("Screen fit");
508		- screenfitButton.addActionListener(this);
	977	+ //oe.toolboxPanel.Return();
	978	+
	979	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	980	+// trackCB.setToolTipText("Enable tracking");
	981	+// trackCB.addItemListener(this);
509	982
510	983	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
511	984	// screenfitpointButton.addActionListener(this);
512	985
513	986	if (Globals.ADVANCED)
514	987	{
515		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	988	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
516	989	snapobjectButton.addActionListener(this);
517	990	snapobjectButton.setToolTipText("Snap Object");
	991	+
	992	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	993	+ fourButton.addActionListener(this);
	994	+ fourButton.setToolTipText("Show control panel only");
518	995	}
519	996
520		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
521		- flashSelectionButton.setToolTipText("Show selection");
522		- flashSelectionButton.addActionListener(this);
	997	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
523	998
524		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
525		-
526		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
527		- twoButton.setToolTipText("Show center view only");
	999	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1000	+ twoButton.setToolTipText("Show 3D view only");
528	1001	twoButton.addActionListener(this);
529		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
530		- fourButton.addActionListener(this);
531		- fourButton.setToolTipText("Show left panel only");
532		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
533		- sixButton.setToolTipText("2-column layout left");
534		- sixButton.addActionListener(this);
535		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
536		- threeButton.setToolTipText("2-column layout right");
	1002	+ this.fullscreenLayout = twoButton;
	1003	+
	1004	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1005	+ threeButton.setToolTipText("Show controls and 3D view");
537	1006	threeButton.addActionListener(this);
538		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
539		- sevenButton.setToolTipText("3-column layout");
540		- sevenButton.addActionListener(this);
	1007	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1008	+ sixButton.setToolTipText("Show 3D view and controls");
	1009	+ sixButton.addActionListener(this);
	1010	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1011	+// sevenButton.setToolTipText("3-column layout");
	1012	+// sevenButton.addActionListener(this);
541	1013	//
542	1014
543		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
544		- rootButton.setToolTipText("Edit selection in new tab");
	1015	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1016	+ rootButton.setToolTipText("Open selection in new tab");
545	1017	rootButton.addActionListener(this);
546	1018
547		- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1019	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
548	1020	closeButton.setToolTipText("Close tab");
549	1021	closeButton.addActionListener(this);
550	1022	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
551	1023	//clearButton.addActionListener(this);
552		-
553		- cGridBag commandsPanel = new cGridBag();
	1024	+
	1025	+ cGridBag row1 = new cGridBag();
554	1026
555		- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
556		- editButton.setToolTipText("Edit selection");
	1027	+ // INSERT
	1028	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1029	+ gridButton.setToolTipText("Create grid");
	1030	+ gridButton.addActionListener(this);
	1031	+
	1032	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1033	+ boxButton.setToolTipText("Create box");
	1034	+ boxButton.addActionListener(this);
	1035	+
	1036	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1037	+ sphereButton.setToolTipText("Create sphere");
	1038	+ sphereButton.addActionListener(this);
	1039	+
	1040	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1041	+ coneButton.setToolTipText("Create cone");
	1042	+ coneButton.addActionListener(this);
	1043	+
	1044	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1045	+ torusButton.setToolTipText("Create torus");
	1046	+ torusButton.addActionListener(this);
	1047	+
	1048	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1049	+ superButton.setToolTipText("Create superellipsoid");
	1050	+ superButton.addActionListener(this);
	1051	+
	1052	+ if (Globals.ADVANCED)
	1053	+ {
	1054	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1055	+ kleinButton.setToolTipText("Create Klein bottle");
	1056	+ kleinButton.addActionListener(this);
	1057	+ }
	1058	+
	1059	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1060	+ particlesButton.setToolTipText("Create particle system");
	1061	+ particlesButton.addActionListener(this);
	1062	+
	1063	+ oe.toolboxPanel.add(row1);
	1064	+
	1065	+ cGridBag row2 = new cGridBag();
	1066	+
	1067	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1068	+ groupButton.setToolTipText("Create group");
	1069	+ groupButton.addActionListener(this);
	1070	+
	1071	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1072	+ compositeButton.setToolTipText("Create composite");
	1073	+ compositeButton.addActionListener(this);
	1074	+
	1075	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1076	+ switchButton.setToolTipText("Create item switcher");
	1077	+ switchButton.addActionListener(this);
	1078	+
	1079	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1080	+ loopButton.setToolTipText("Create loop");
	1081	+ loopButton.addActionListener(this);
	1082	+
	1083	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1084	+ textureButton.setToolTipText("Create texture");
	1085	+ textureButton.addActionListener(this);
	1086	+
	1087	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1088	+ overlayButton.setToolTipText("Create overlay");
	1089	+ overlayButton.addActionListener(this);
	1090	+
	1091	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1092	+ lightButton.setToolTipText("Create light");
	1093	+ lightButton.addActionListener(this);
	1094	+
	1095	+ oe.toolboxPanel.add(row2);
	1096	+
	1097	+ // ENVYMAPS
	1098	+ cGridBag skyboxpane = new cGridBag();
	1099	+ skyboxpane.preferredHeight = 100;
	1100	+
	1101	+ oe.toolboxPanel.add(skyboxpane);
	1102	+
	1103	+ JTabbedPane skyboxpanel = new JTabbedPane();
	1104	+ skyboxpane.add(skyboxpanel);
	1105	+
	1106	+ AddSkyboxTab0(skyboxpanel);
	1107	+ AddSkyboxTab1(skyboxpanel);
	1108	+ AddSkyboxTab2(skyboxpanel);
	1109	+ AddSkyboxTab3(skyboxpanel);
	1110	+
	1111	+ // EDIT panel
	1112	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1113	+ editButton.setToolTipText("Pin selection controls");
557	1114	editButton.addActionListener(this);
558	1115
559		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
560		- uneditButton.setToolTipText("Unedit selection");
	1116	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1117	+ uneditButton.setToolTipText("Unpin and remove selection controls");
561	1118	uneditButton.addActionListener(this);
562	1119
563		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
564		- allParamsButton.setToolTipText("Edit all params");
	1120	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1121	+ allParamsButton.setToolTipText("Show all controle");
565	1122	allParamsButton.addActionListener(this);
566	1123
567		- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1124	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
568	1125	clearPanelButton.setToolTipText("Clear edit panel");
569	1126	clearPanelButton.addActionListener(this);
570	1127
571		- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1128	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
572	1129	unselectButton.setToolTipText("Unselect");
573	1130	unselectButton.addActionListener(this);
574	1131
575		- commandsPanel.preferredHeight = 1;
	1132	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1133	+ flashSelectionButton.setToolTipText("Highlight selection");
	1134	+ flashSelectionButton.addActionListener(this);
576	1135
577		- oe.treePanel.add(commandsPanel);
578		- oe.treePanel.Return();
	1136	+ editCommandsPanel.preferredHeight = 1;
	1137	+
	1138	+ SetPinStates(false);
	1139	+// oe.treePanel.add(commandsPanel);
	1140	+// oe.treePanel.Return();
579	1141
580	1142	// oe.aConstraints.gridx += 1;
581	1143	// oe.aConstraints.weighty = 0;
..	..	@@ -592,32 +1154,20 @@
592	1154
593	1155	JScrollPane jSP;
594	1156	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
595		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1157	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
596	1158	ResetModel();
597	1159
598	1160	oe.treePanel.add(jSPPanel);
599	1161	oe.treePanel.Return();
600	1162
601		- cGridBag copyOptionsPanel = new cGridBag();
602		-
603		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
604		- colorCB.setToolTipText("Copy color when dropped");
605		- colorCB.addItemListener(this);
606		-
607		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
608		- materialCB.setToolTipText("Copy material when dropped");
609		- materialCB.addItemListener(this);
610		-
611		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
612		- textureCB.setToolTipText("Copy texture when dropped");
613		- textureCB.addItemListener(this);
614		-
615		- copyOptionsPanel.preferredHeight = 1;
616	1163	oe.treePanel.add(copyOptionsPanel);
617	1164	oe.treePanel.Return();
	1165	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1166	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1167	+ sliderPane.preferredHeight = 1;
618	1168
619		-// mainPanel.setDividerLocation(0.5); //1.0);
620		-// mainPanel.setResizeWeight(0.5);
	1169	+// mainPanel.setDividerLocation(0.1); //1.0);
	1170	+ mainPanel.setResizeWeight(0.4);
621	1171
622	1172	//jList.addListSelectionListener(this);
623	1173	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -625,7 +1175,7 @@
625	1175	//jTree.setEditable(true);
626	1176	oe.jTree.setDragEnabled(true);
627	1177	//jTree.setPreferredSize(new Dimension(10,10));
628		- jSP.setPreferredSize(new Dimension(100,200));
	1178	+ //jSP.setPreferredSize(new Dimension(100,200));
629	1179
630	1180	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
631	1181
..	..	@@ -637,29 +1187,49 @@
637	1187	dgr.addDragGestureListener(this);
638	1188	}catch(Exception e) {}
639	1189	*/
640		- radio.layout = sevenButton;
	1190	+ radio.layout = threeButton; // sixButton;
641	1191	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
642	1192	}
643	1193
644	1194	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
645	1195	{
	1196	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1197	+ colorCB.setToolTipText("Copy color when dropped");
	1198	+ colorCB.addItemListener(this);
	1199	+
	1200	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1201	+ materialCB.setToolTipText("Copy material when dropped");
	1202	+ materialCB.addItemListener(this);
	1203	+
	1204	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1205	+ textureCB.setToolTipText("Copy texture when dropped");
	1206	+ textureCB.addItemListener(this);
	1207	+
	1208	+ panel.Return();
	1209	+
646	1210	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
647	1211	boxCB.setToolTipText("Display bounding boxes");
648	1212	boxCB.addItemListener(this);
649	1213
650	1214	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
651		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1215	+ zoomBoxCB.setToolTipText("Display only for wheel");
652	1216	zoomBoxCB.addItemListener(this);
653	1217
654		- if (Globals.ADVANCED)
	1218	+ if (true) // Globals.ADVANCED)
655	1219	{
656		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
657		- supportCB.setToolTipText("Enable rigging");
658		- supportCB.addItemListener(this);
	1220	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1221	+// supportCB.setToolTipText("Enable rigging");
	1222	+// supportCB.addItemListener(this);
	1223	+
	1224	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1225	+ freezeCB.setToolTipText("Fast moving camera");
	1226	+ freezeCB.addItemListener(this);
659	1227
660	1228	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
661	1229	// localCB.addItemListener(this);
662	1230
	1231	+ panel.Return();
	1232	+
663	1233	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
664	1234	crowdCB.setToolTipText("Used for crowds");
665	1235	crowdCB.addItemListener(this);
..	..	@@ -668,14 +1238,19 @@
668	1238	smoothCB.setToolTipText("Snapping delay");
669	1239	smoothCB.addItemListener(this);
670	1240
671		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
672		- slowCB.setToolTipText("Smooth interpolation");
673		- slowCB.addItemListener(this);
	1241	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1242	+// slowCB.setToolTipText("Smooth interpolation");
	1243	+// slowCB.addItemListener(this);
	1244	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1245	+ minshaderCB.setToolTipText("Minimal fast shader");
	1246	+ minshaderCB.addItemListener(this);
674	1247
675	1248	// constraints.gridy += 1;
676	1249	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
677	1250	// speakerMocapCB.addItemListener(this);
678	1251
	1252	+ panel.Return();
	1253	+
679	1254	if (false)
680	1255	{
681	1256	// handled in scripts
..	..	@@ -690,42 +1265,85 @@
690	1265	//constraints.gridy += 1;
691	1266	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
692	1267	smoothfocusCB.addItemListener(this);
	1268	+ panel.Return();
693	1269	}
694	1270
695	1271	//constraints.gridx += 1;
696	1272	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
697	1273	// debugCB.addItemListener(this);
698	1274
	1275	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1276	+ trackCB.setToolTipText("Enable tracking target");
	1277	+ trackCB.addItemListener(this);
	1278	+
699	1279	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1280	+ oeilCB.setToolTipText("Move camera when tracking");
700	1281	oeilCB.addItemListener(this);
701	1282
	1283	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1284	+ shadowCB.setToolTipText("When live compute shadows");
	1285	+ shadowCB.addItemListener(this);
	1286	+
	1287	+ panel.Return();
	1288	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1289	+ toggleTextureCB.setToolTipText("Load textures");
	1290	+ toggleTextureCB.addItemListener(this);
	1291	+
	1292	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1293	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1294	+ toggleSwitchCB.addItemListener(this);
	1295	+
	1296	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1297	+ autokeepCB.setToolTipText("On structure change");
	1298	+ autokeepCB.addItemListener(this);
	1299	+
	1300	+ panel.Return();
	1301	+ if (Globals.ADVANCED)
	1302	+ {
702	1303	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
703	1304	lookAtCB.setToolTipText("Look-at target");
704	1305	lookAtCB.addItemListener(this);
	1306	+ }
705	1307
706	1308	}
707	1309
708	1310	cGridBag fill = new cGridBag();
709		-
710	1311	fill.preferredHeight = 200;
	1312	+ cGridBag fill2 = new cGridBag();
	1313	+ fill2.preferredHeight = 200;
	1314	+ cGridBag fill3 = new cGridBag();
	1315	+ fill3.preferredHeight = 200;
711	1316
712	1317	panel.add(fill);
	1318	+ panel.add(fill2);
	1319	+ panel.add(fill3);
713	1320
714	1321	}
715	1322
716	1323	void EditObject(Object3D obj)
717	1324	{
718	1325	cRadio radioButton = new cRadio(obj.name);
	1326	+
	1327	+ // June 2019. Patch to avoid bug with transparency.
	1328	+ radioButton.hadMaterial = obj.material != null;
	1329	+ if (!radioButton.hadMaterial)
	1330	+ {
	1331	+ obj.material = new cMaterial();
	1332	+ }
	1333	+
719	1334	radioButton.SetObject(obj);
720		- radioButton.layout = sevenButton;
	1335	+ radioButton.layout = threeButton; // sixButton;
721	1336	radioButton.SetCamera(cameraView.renderCamera, false);
722	1337	radioButton.addActionListener(this);
723	1338	radioPanel.add(radioButton);
724	1339	buttonGroup.add(radioButton);
725	1340	radioButton.doClick();
726	1341	}
	1342	+
727	1343	void SetupViews(ObjEditor oe)
728	1344	{
	1345	+ theFrame = this;
	1346	+
729	1347	oe.SetupViews();
730	1348
731	1349	System.out.println("SetupViews");
..	..	@@ -734,23 +1352,30 @@
734	1352	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
735	1353	}
736	1354
737		- JCheckBox liveCB;
738		- JCheckBox supportCB;
739		- JCheckBox localCB;
740		- JCheckBox crowdCB;
741		- JCheckBox smoothCB;
742		- JCheckBox fastCB;
743		- JCheckBox slowCB;
744		- JCheckBox boxCB;
745		- JCheckBox zoomBoxCB;
746		- JCheckBox trackCB;
747		- JCheckBox smoothfocusCB;
	1355	+ cToggleButton liveCB;
	1356	+ cCheckBox supportCB;
	1357	+ cCheckBox localCB;
	1358	+ cCheckBox crowdCB;
	1359	+ cCheckBox smoothCB;
	1360	+ cCheckBox minshaderCB;
	1361	+
	1362	+ cToggleButton fastCB;
	1363	+ cCheckBox slowCB;
	1364	+ cCheckBox boxCB;
	1365	+ cCheckBox zoomBoxCB;
	1366	+ cCheckBox freezeCB;
	1367	+ //cToggleButton trackCB;
	1368	+ cCheckBox trackCB;
	1369	+ cCheckBox smoothfocusCB;
748	1370	// JCheckBox speakerMocapCB;
749		- JCheckBox speakerCameraCB;
750		- JCheckBox speakerFocusCB;
751		- JCheckBox debugCB;
752		- JCheckBox oeilCB;
753		- JCheckBox lookAtCB;
	1371	+ cCheckBox speakerCameraCB;
	1372	+ cCheckBox speakerFocusCB;
	1373	+ cCheckBox debugCB;
	1374	+
	1375	+ cCheckBox oeilCB;
	1376	+ cCheckBox shadowCB;
	1377	+ cCheckBox autokeepCB;
	1378	+ cCheckBox lookAtCB;
754	1379
755	1380	// static int COLOR = 1;
756	1381	// static int MATERIAL = 2;
..	..	@@ -758,9 +1383,9 @@
758	1383
759	1384	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
760	1385
761		- JCheckBox colorCB;
762		- JCheckBox materialCB;
763		- JCheckBox textureCB;
	1386	+ cCheckBox colorCB;
	1387	+ cCheckBox materialCB;
	1388	+ cCheckBox textureCB;
764	1389
765	1390	public void itemStateChanged(ItemEvent e)
766	1391	{
..	..	@@ -788,6 +1413,7 @@
788	1413	} else if(e.getSource() == liveCB)
789	1414	{
790	1415	cameraView.ToggleLive();
	1416	+ refreshContents(false);
791	1417	}
792	1418	else if(e.getSource() == supportCB)
793	1419	{
..	..	@@ -803,6 +1429,12 @@
803	1429	{
804	1430	cameraView.ToggleInertia();
805	1431	cameraView.repaint();
	1432	+ }
	1433	+ else if(e.getSource() == minshaderCB)
	1434	+ {
	1435	+ Globals.MINSHADER ^= true;
	1436	+ cameraView.programInitialized = false;
	1437	+ cameraView.repaint();
806	1438	}
807	1439	else if(e.getSource() == localCB)
808	1440	{
..	..	@@ -852,6 +1484,18 @@
852	1484	{
853	1485	cameraView.ToggleOeil();
854	1486	}
	1487	+ else if(e.getSource() == shadowCB)
	1488	+ {
	1489	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1490	+ }
	1491	+ else if(e.getSource() == freezeCB)
	1492	+ {
	1493	+ Globals.FREEZEONMOVE ^= true;
	1494	+ }
	1495	+ else if(e.getSource() == autokeepCB)
	1496	+ {
	1497	+ Globals.REPLACEONMAKE ^= true;
	1498	+ }
855	1499	else if(e.getSource() == lookAtCB)
856	1500	{
857	1501	cameraView.ToggleLookAt();
..	..	@@ -868,7 +1512,8 @@
868	1512
869	1513	/**/
870	1514	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
871		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1515	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1516	+ TreePath path = objEditor.jTree.getSelectionPath();
872	1517	if ((path == null) \|\| (path.getPathCount() <= 1)) {
873	1518	// We can't move the root node or an empty selection
874	1519	return;
..	..	@@ -931,8 +1576,6 @@
931	1576	}
932	1577	}
933	1578
934		- String string = (String) object;
935		-
936	1579	System.out.println("Transfer = " + object + "; drop : " + target);
937	1580	// if( object instanceof java.io.File[])
938	1581	// {
..	..	@@ -940,7 +1583,11 @@
940	1583	// objEditor.DropFile((java.io.File[]) object, true);
941	1584	// return;
942	1585	// }
943		- if (string.charAt(0) == '/')
	1586	+
	1587	+ String string = object.toString();
	1588	+
	1589	+ // File path for Mac and Windows
	1590	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
944	1591	{
945	1592	// file(s)
946	1593	String[] names = string.split("\n");
..	..	@@ -967,7 +1614,7 @@
967	1614
968	1615	flashIt = false;
969	1616	CameraPane pane = (CameraPane) target;
970		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1617	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
971	1618	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
972	1619
973	1620	if (group.selection.size() == 1)
..	..	@@ -983,23 +1630,33 @@
983	1630
984	1631	assert target == objEditor.jTree;
985	1632	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1633	+ Object3D destinationLeaf;
986	1634	try {
987		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1635	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
988	1636	} catch (Exception e) {
989	1637	System.out.println("destinationPath : " + destinationPath);
990	1638	return;
991	1639	}
992	1640
993		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1641	+ for (int i=group.selection.size(); --i>=0;)
994	1642	{
	1643	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1644	+
	1645	+ // Cannot move into itself
	1646	+ if (child == destinationLeaf)
	1647	+ return;
	1648	+ }
	1649	+
	1650	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1651	+// {
995	1652	loadClipboard(true);
996	1653	objEditor.jTree.setSelectionPath(destinationPath);
997	1654	pasteInto(false, false);
998		- } else {
999		- loadClipboard(false);
1000		- objEditor.jTree.setSelectionPath(destinationPath);
1001		- pasteInto(false, false); // true); // ???
1002		- }
	1655	+// } else {
	1656	+// loadClipboard(false);
	1657	+// objEditor.jTree.setSelectionPath(destinationPath);
	1658	+// pasteInto(false, false); // true); // ???
	1659	+// }
1003	1660	}
1004	1661	public void dropActionChanged(DropTargetDragEvent dtde)
1005	1662	// Called if the user has modified the current drop gesture
..	..	@@ -1104,22 +1761,30 @@
1104	1761	{
1105	1762	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1106	1763	//heightFieldItem.addActionListener(this);
1107		- gridItem = menu.add(new MenuItem("Grid"));
1108		- gridItem.addActionListener(this);
1109		- rectoidItem = menu.add(new MenuItem("Box"));
1110		- rectoidItem.addActionListener(this);
1111		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1112		- ellipsoidItem.addActionListener(this);
1113		- coneItem = menu.add(new MenuItem("Cone"));
1114		- coneItem.addActionListener(this);
1115		- torusItem = menu.add(new MenuItem("Torus"));
1116		- torusItem.addActionListener(this);
1117		- superItem = menu.add(new MenuItem("Superellipsoid"));
1118		- superItem.addActionListener(this);
	1764	+// gridItem = menu.add(new MenuItem("Grid"));
	1765	+// gridItem.addActionListener(this);
	1766	+// rectoidItem = menu.add(new MenuItem("Box"));
	1767	+// rectoidItem.addActionListener(this);
	1768	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1769	+// ellipsoidItem.addActionListener(this);
	1770	+// coneItem = menu.add(new MenuItem("Cone"));
	1771	+// coneItem.addActionListener(this);
	1772	+// torusItem = menu.add(new MenuItem("Torus"));
	1773	+// torusItem.addActionListener(this);
	1774	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1775	+// superItem.addActionListener(this);
	1776	+
	1777	+ cameraItem = menu.add(new MenuItem("Camera"));
	1778	+ cameraItem.addActionListener(this);
	1779	+
	1780	+ if (!Globals.ADVANCED)
	1781	+ {
1119	1782	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1120	1783	kleinItem.addActionListener(this);
1121		- particleItem = menu.add(new MenuItem("Particle system"));
1122		- particleItem.addActionListener(this);
	1784	+ }
	1785	+
	1786	+// particleItem = menu.add(new MenuItem("Particle system"));
	1787	+// particleItem.addActionListener(this);
1123	1788	if (Globals.ADVANCED)
1124	1789	{
1125	1790	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1145,15 +1810,15 @@
1145	1810	}
1146	1811	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1147	1812	bezierItem.addActionListener(this);
1148		- overlayItem = menu.add(new MenuItem("Overlay"));
1149		- overlayItem.addActionListener(this);
1150		- lightItem = menu.add(new MenuItem("Light"));
1151		- lightItem.addActionListener(this);
	1813	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1814	+// overlayItem.addActionListener(this);
	1815	+// lightItem = menu.add(new MenuItem("Light"));
	1816	+// lightItem.addActionListener(this);
1152	1817	menu.add("-");
1153	1818	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1154	1819	//superLoopItem.addActionListener(this);
1155		- loopItem = menu.add(new MenuItem("Loop"));
1156		- loopItem.addActionListener(this);
	1820	+// loopItem = menu.add(new MenuItem("Loop"));
	1821	+// loopItem.addActionListener(this);
1157	1822	doubleItem = menu.add(new MenuItem("Fork"));
1158	1823	doubleItem.addActionListener(this);
1159	1824	if (Globals.ADVANCED)
..	..	@@ -1169,6 +1834,9 @@
1169	1834	animationItem.addItemListener(this);
1170	1835	animationItem.setState(Globals.ANIMATION);
1171	1836
	1837	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1838	+ archiveItem.addActionListener(this);
	1839	+
1172	1840	menu.add("-");
1173	1841	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1174	1842	parseverticesItem.addActionListener(this);
..	..	@@ -1181,6 +1849,8 @@
1181	1849	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1182	1850	reduce34MorphItem.addActionListener(this);
1183	1851	menu.add("-");
	1852	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1853	+ memoryItem.addActionListener(this);
1184	1854	menu.add(computeAOItem = new MenuItem("Compute AO"));
1185	1855	computeAOItem.addActionListener(this);
1186	1856
..	..	@@ -1189,11 +1859,9 @@
1189	1859	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1190	1860	mirrorItem.addActionListener(this);
1191	1861	menu.add("-");
1192		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1193		- memoryItem.addActionListener(this);
1194	1862	menu.add(analyzeItem = new MenuItem("Analyze"));
1195	1863	analyzeItem.addActionListener(this);
1196		- menu.add(dumpItem = new MenuItem("Dump"));
	1864	+ menu.add(dumpItem = new MenuItem("Print"));
1197	1865	dumpItem.addActionListener(this);
1198	1866	// menu.add(pathItem = new MenuItem("From-to path"));
1199	1867	// pathItem.addActionListener(this);
..	..	@@ -1334,9 +2002,34 @@
1334	2002	shadow.material = new cMaterial(obj.material);
1335	2003	shadow.material.diffuse = 0.0001f;
1336	2004	shadow.material.specular = 0.0001f;
	2005	+ //shadow.projectedVertices[1].x = 300;
1337	2006
1338	2007	makeSomething(shadow);
1339	2008	}
	2009	+
	2010	+ private void ClearUnpinned()
	2011	+ {
	2012	+ //for (Object3D obj : listUI)
	2013	+ for (int i=listUI.size(); --i>=0;)
	2014	+ {
	2015	+ Object3D obj = listUI.elementAt(i);
	2016	+ if (!obj.pinned)
	2017	+ {
	2018	+ obj.CloseUI();
	2019	+ listUI.remove(i);
	2020	+ }
	2021	+ }
	2022	+ }
	2023	+
	2024	+ private void EditElement(Object3D elem, boolean newWindow)
	2025	+ {
	2026	+ // if (!(elem instanceof Composite))
	2027	+ // newWindow = false;
	2028	+ listUI.add(elem);
	2029	+ elem.openEditWindow(this, newWindow); //, false);
	2030	+ System.out.println("edit : " + elem);
	2031	+ elem.editWindow.refreshContents(true); // ? new
	2032	+ }
1340	2033
1341	2034	/**
1342	2035	* applyExample
..	..	@@ -1540,9 +2233,9 @@
1540	2233
1541	2234	void Overwrite(int mask)
1542	2235	{
1543		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2236	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1544	2237	{
1545		- Object3D content = GrafreeD.clipboard.get(0);
	2238	+ Object3D content = Grafreed.clipboard.get(0);
1546	2239
1547	2240	if (content instanceof cGroup && ((cGroup)content).transientlink )
1548	2241	content = ((cGroup)content).get(0);
..	..	@@ -1581,7 +2274,7 @@
1581	2274	{
1582	2275	ScreenFit();
1583	2276	} else
1584		- if (source == switchItem)
	2277	+ if (source == switchViewItem)
1585	2278	{
1586	2279	cVector v1 = new cVector();
1587	2280	cVector v2 = new cVector();
..	..	@@ -1590,11 +2283,11 @@
1590	2283	objEditor.cameraView.renderCamera.setAim(v2, v1);
1591	2284	objEditor.cameraView.repaint();
1592	2285	} else
1593		- if (source == rectoidItem)
	2286	+ if (source == rectoidItem \|\| source == boxButton)
1594	2287	{
1595	2288	makeSomething(new Box());
1596	2289	} else
1597		- if (source == particleItem)
	2290	+ if (source == particleItem \|\| source == particlesButton)
1598	2291	{
1599	2292	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1600	2293	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1673,27 +2366,27 @@
1673	2366
1674	2367	makeSomething(obj);
1675	2368	} else
1676		- if (source == gridItem)
	2369	+ if (source == gridItem \|\| source == gridButton)
1677	2370	{
1678	2371	makeSomething(new Grid());
1679	2372	} else
1680		- if (source == ellipsoidItem)
	2373	+ if (source == ellipsoidItem \|\| source == sphereButton)
1681	2374	{
1682	2375	makeSomething(new Sphere());
1683	2376	} else
1684		- if (source == coneItem)
	2377	+ if (source == coneItem \|\| source == coneButton)
1685	2378	{
1686	2379	makeSomething(new Cone());
1687	2380	} else
1688		- if (source == torusItem)
	2381	+ if (source == torusItem \|\| source == torusButton)
1689	2382	{
1690	2383	makeSomething(new Torus());
1691	2384	} else
1692		- if (source == superItem)
	2385	+ if (source == superItem \|\| source == superButton)
1693	2386	{
1694	2387	makeSomething(new Superellipsoid());
1695	2388	} else
1696		- if (source == kleinItem)
	2389	+ if (source == kleinItem \|\| source == kleinButton)
1697	2390	{
1698	2391	makeSomething(new Klein());
1699	2392	} else
..	..	@@ -1713,7 +2406,7 @@
1713	2406	{
1714	2407	makeSomething(new BezierSurface());
1715	2408	} else
1716		- if (source == overlayItem)
	2409	+ if (source == overlayItem \|\| source == overlayButton)
1717	2410	{
1718	2411	/*
1719	2412	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1761,10 +2454,27 @@
1761	2454	s.setup();
1762	2455	makeSomething(s);
1763	2456	} else
1764		- if (source == lightItem)
	2457	+ if (source == lightItem \|\| source == lightButton)
1765	2458	{
1766	2459	makeSomething(new Light());
1767	2460	} else
	2461	+// if (source == skybox1Button \|\|
	2462	+// source == skybox2Button \|\|
	2463	+// source == skybox3Button \|\|
	2464	+// source == skybox4Button \|\|
	2465	+// source == skybox5Button \|\|
	2466	+// source == skybox6Button \|\|
	2467	+// source == skybox7Button \|\|
	2468	+// source == skybox11Button \|\|
	2469	+// source == skybox12Button \|\|
	2470	+// source == skybox13Button \|\|
	2471	+// source == skybox14Button \|\|
	2472	+// source == skybox15Button \|\|
	2473	+// source == skybox16Button \|\|
	2474	+// source == skybox17Button)
	2475	+// {
	2476	+// ChangeSkybox(source);
	2477	+// } else
1768	2478	if (source == csgItem)
1769	2479	{
1770	2480	group(new CSG());
..	..	@@ -1811,30 +2521,30 @@
1811	2521
1812	2522	group(g);
1813	2523	} else
1814		- if (source == loopItem)
	2524	+ if (source == loopItem \|\| source == loopButton)
1815	2525	{
1816	2526	Composite csg = new GroupLeaf();
1817	2527	csg.count = 5;
1818	2528	group(csg);
1819		- Composite child = new cGroup();
	2529	+ Composite child = new cGroup("Branch");
1820	2530	csg.addChild(child);
1821	2531	child.addChild(csg);
1822	2532	} else
1823	2533	if (source == doubleItem)
1824	2534	{
1825		- Composite csg = new GroupLeaf();
	2535	+ Composite csg = new GroupLeaf("Fork");
1826	2536	csg.count = 5;
1827	2537	group(csg);
1828		- Composite child = new cGroup();
	2538	+ Composite child = new cGroup("Branch A");
1829	2539	csg.addChild(child);
1830	2540	child.addChild(csg);
1831		- child = new cGroup();
	2541	+ child = new cGroup("Branch B");
1832	2542	csg.addChild(child);
1833	2543	child.addChild(csg);
1834	2544	} else
1835	2545	if (source == tripleItem)
1836	2546	{
1837		- Composite csg = new GroupLeaf();
	2547	+ Composite csg = new GroupLeaf("Trident");
1838	2548	csg.count = 4;
1839	2549	group(csg);
1840	2550	Composite child = new cGroup();
..	..	@@ -1847,35 +2557,10 @@
1847	2557	csg.addChild(child);
1848	2558	child.addChild(csg);
1849	2559	} else
1850		-
1851		- if (source == importGFDItem)
1852		- {
1853		- ImportGFD();
1854		- } else
1855		- if (source == importVRMLX3DItem)
1856		- {
1857		- ImportVRMLX3D();
1858		- } else
1859		- if (source == import3DSItem)
1860		- {
1861		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1862		- } else
1863		- if (source == importOBJItem)
1864		- {
1865		- //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1866		- FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
1867		- browser.setVisible(true);
1868		- String filename = browser.getFile();
1869		- if (filename != null && filename.length() > 0)
1870		- {
1871		- String fullname = browser.getDirectory() + filename;
1872		- makeSomething(ReadOBJ(fullname), true);
1873		- }
1874		- } else
1875	2560	if (source == computeAOItem)
1876	2561	{
1877	2562	Globals.drawMode = CameraPane.OCCLUSION;
1878		- Globals.theRenderer.repaint();
	2563	+ cameraView.repaint();
1879	2564	} else
1880	2565	if (source == recompileItem)
1881	2566	{
..	..	@@ -1890,7 +2575,7 @@
1890	2575	if (source == invariantsItem)
1891	2576	{
1892	2577	System.out.println("Invariants:");
1893		- GrafreeD.grafreeD.universe.invariants();
	2578	+ Grafreed.grafreed.universe.invariants();
1894	2579	} else
1895	2580	if (source == memoryItem)
1896	2581	{
..	..	@@ -1909,6 +2594,53 @@
1909	2594	{
1910	2595	DumpObject();
1911	2596	} else
	2597	+ if (source == minButton)
	2598	+ {
	2599	+ Minimize();
	2600	+ } else
	2601	+ if (source == maxButton)
	2602	+ {
	2603	+ Maximize();
	2604	+ } else
	2605	+ if (source == fullButton)
	2606	+ {
	2607	+ ToggleFullScreen();
	2608	+ } else
	2609	+ if (source == previousVersionButton)
	2610	+ {
	2611	+ // Go to previous version
	2612	+ //if (!Undo())
	2613	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2614	+ PreviousVersion();
	2615	+ } else
	2616	+ if (source == restoreButton)
	2617	+ {
	2618	+ // Restore current version
	2619	+ Restore();
	2620	+ //restoreButton.setEnabled(false);
	2621	+ } else
	2622	+ if (source == replaceButton)
	2623	+ {
	2624	+ // Overwrite current version
	2625	+ Replace();
	2626	+ //replaceButton.setEnabled(false);
	2627	+ } else
	2628	+ if (source == nextVersionButton)
	2629	+ {
	2630	+ // Go to next version
	2631	+ NextVersion();
	2632	+ } else
	2633	+ if (source == saveVersionButton)
	2634	+ {
	2635	+ // Save a new version
	2636	+ if (!Save(true))
	2637	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2638	+ } else
	2639	+ if (source == deleteVersionButton)
	2640	+ {
	2641	+ // Delete a new version
	2642	+ DeleteVersion();
	2643	+ } else
1912	2644	if (source == oneStepButton)
1913	2645	{
1914	2646	Globals.ONESTEP = true;
..	..	@@ -1916,17 +2648,14 @@
1916	2648	} else
1917	2649	if (source == screenfitButton)
1918	2650	{
1919		- //Reload(lastConverter, lastFilename, true);
1920	2651	ScreenFit();
1921	2652	} else
1922	2653	if (source == screenfitpointButton)
1923	2654	{
1924		- //Reload(lastConverter, lastFilename, true);
1925	2655	ScreenFitPoint();
1926	2656	} else
1927	2657	if (source == snapobjectButton)
1928	2658	{
1929		- //Reload(lastConverter, lastFilename, true);
1930	2659	SnapObject();
1931	2660	} else
1932	2661	// if (event.getSource() == recompileButton)
..	..	@@ -1963,12 +2692,20 @@
1963	2692	{
1964	2693	loadClipboard(true);
1965	2694	} else
	2695	+ if (source == undoItem)
	2696	+ {
	2697	+ PreviousVersion();
	2698	+ } else
	2699	+ if (source == redoItem)
	2700	+ {
	2701	+ NextVersion();
	2702	+ } else
1966	2703	if (source == duplicateItem)
1967	2704	{
1968		- Object3D keep = GrafreeD.clipboard;
	2705	+ Object3D keep = Grafreed.clipboard;
1969	2706	loadClipboard(false);
1970	2707	paste(false);
1971		- GrafreeD.clipboard = keep;
	2708	+ Grafreed.clipboard = keep;
1972	2709	} else
1973	2710	if (source == cloneItem)
1974	2711	{
..	..	@@ -2188,9 +2925,9 @@
2188	2925	// group.selection.get(0).setMasterThis(content); // should be identity
2189	2926	// refreshContents();
2190	2927	// }
2191		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2928	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2192	2929	{
2193		- Object3D content = GrafreeD.clipboard.get(0);
	2930	+ Object3D content = Grafreed.clipboard.get(0);
2194	2931
2195	2932	if (content instanceof cGroup && ((cGroup)content).transientlink )
2196	2933	content = ((cGroup)content).get(0);
..	..	@@ -2240,9 +2977,9 @@
2240	2977	} else
2241	2978	if (source == setMasterItem)
2242	2979	{
2243		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2980	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2244	2981	{
2245		- Object3D content = GrafreeD.clipboard.get(0);
	2982	+ Object3D content = Grafreed.clipboard.get(0);
2246	2983
2247	2984	if (content instanceof cGroup && ((cGroup)content).transientlink )
2248	2985	content = ((cGroup)content).get(0);
..	..	@@ -2255,9 +2992,9 @@
2255	2992	{
2256	2993	if (group.selection.size() == 1)
2257	2994	{
2258		- if (GrafreeD.clipboard.size() == 1)
	2995	+ if (Grafreed.clipboard.size() == 1)
2259	2996	{
2260		- Object3D content = GrafreeD.clipboard.get(0);
	2997	+ Object3D content = Grafreed.clipboard.get(0);
2261	2998
2262	2999	if (content instanceof cGroup && ((cGroup)content).transientlink )
2263	3000	content = ((cGroup)content).get(0);
..	..	@@ -2274,7 +3011,7 @@
2274	3011	{
2275	3012	RevertMeshes();
2276	3013	} else
2277		- if (source == resetMeshItem)
	3014	+ if (source == resetAllItem)
2278	3015	{
2279	3016	ResetAll();
2280	3017	} else
..	..	@@ -2282,7 +3019,7 @@
2282	3019	{
2283	3020	StepAll();
2284	3021	} else
2285		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3022	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2286	3023	{
2287	3024	//int indices[] = jList.getSelectedIndices();
2288	3025	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2294,9 +3031,9 @@
2294	3031	{
2295	3032	ClearSelection(true);
2296	3033	} else
2297		- if (source == grabItem)
	3034	+ if (source == grabItem \|\| source == groupButton)
2298	3035	{
2299		- group(new cGroup(), true);
	3036	+ group(new cGroup(), false); // true);
2300	3037	} else
2301	3038	if (source == hideItem)
2302	3039	{
..	..	@@ -2314,11 +3051,11 @@
2314	3051	{
2315	3052	makeSomething(new Camera());
2316	3053	} else
2317		- if (source == compositeItem)
	3054	+ if (source == compositeItem \|\| source == compositeButton)
2318	3055	{
2319	3056	group(new Composite());
2320	3057	} else
2321		- if (source == randomItem)
	3058	+ if (source == switchItem \|\| source == switchButton)
2322	3059	{
2323	3060	RandomNode random = new RandomNode();
2324	3061	group(random);
..	..	@@ -2420,7 +3157,7 @@
2420	3157	{
2421	3158	group(new cLinker());
2422	3159	} else
2423		- if (source == textureItem)
	3160	+ if (source == textureItem \|\| source == textureButton)
2424	3161	{
2425	3162	group(new TextureNode());
2426	3163	} else
..	..	@@ -2440,17 +3177,30 @@
2440	3177	{
2441	3178	CastShadow(2);
2442	3179	} else
2443		- if (source == ungroupItem)
	3180	+ if (source == ungroupItem \|\| source == ungroupButton)
2444	3181	{
2445		- //ungroup();
	3182	+ boolean hasRoot = false;
	3183	+
2446	3184	for (int i=0; i<group.selection.size(); i++)
2447	3185	{
2448		- Ungroup(group.selection.get(i));
	3186	+ if (group.selection.get(i) == group)
	3187	+ {
	3188	+ hasRoot = true;
	3189	+ break;
	3190	+ }
2449	3191	}
2450	3192
2451		- ClearSelection(false);
2452		-
2453		- refreshContents();
	3193	+ if (!hasRoot)
	3194	+ {
	3195	+ for (int i=0; i<group.selection.size(); i++)
	3196	+ {
	3197	+ Ungroup(group.selection.get(i));
	3198	+ }
	3199	+
	3200	+ ClearSelection(false);
	3201	+
	3202	+ refreshContents();
	3203	+ }
2454	3204	} else
2455	3205	if (source == genUVItem)
2456	3206	{
..	..	@@ -2462,7 +3212,7 @@
2462	3212	} else
2463	3213	if (source == genNormalsMESHItem)
2464	3214	{
2465		- GenNormals(true); // TODO
	3215	+ GenNormalsMESH();
2466	3216	} else
2467	3217	if (source == genNormalsORGANItem)
2468	3218	{
..	..	@@ -2527,6 +3277,22 @@
2527	3277	if (source == unmarkleavesItem)
2528	3278	{
2529	3279	MarkLeaves(false);
	3280	+ } else
	3281	+ if (source == rewindleavesItem)
	3282	+ {
	3283	+ RewindLeaves(true);
	3284	+ } else
	3285	+ if (source == unrewindleavesItem)
	3286	+ {
	3287	+ RewindLeaves(false);
	3288	+ } else
	3289	+ if (source == randomleavesItem)
	3290	+ {
	3291	+ RandomLeaves(true);
	3292	+ } else
	3293	+ if (source == unrandomleavesItem)
	3294	+ {
	3295	+ RandomLeaves(false);
2530	3296	} else
2531	3297	if (source == flipVItem)
2532	3298	{
..	..	@@ -2612,9 +3378,13 @@
2612	3378	{
2613	3379	SmoothMesh();
2614	3380	} else
2615		- if (source == transformgeometryItem)
	3381	+ if (source == transformGeometryItem)
2616	3382	{
2617	3383	TransformGeometry();
	3384	+ } else
	3385	+ if (source == transformChildrenItem)
	3386	+ {
	3387	+ TransformChildren();
2618	3388	} else
2619	3389	if (source == resetTransformItem)
2620	3390	{
..	..	@@ -2622,7 +3392,11 @@
2622	3392	} else
2623	3393	if (source == resetCentroidItem)
2624	3394	{
2625		- ResetCentroid();
	3395	+ ResetCentroid(true);
	3396	+ } else
	3397	+ if (source == resetCentroidXZItem)
	3398	+ {
	3399	+ ResetCentroid(false);
2626	3400	} else
2627	3401	if (source == resetParentItem)
2628	3402	{
..	..	@@ -2727,7 +3501,7 @@
2727	3501	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2728	3502	{
2729	3503	obj = (Object3D)e.nextElement();
2730		- obj.SetBumpTexture(null);
	3504	+ obj.ResetBumpTexture();
2731	3505	}
2732	3506
2733	3507	refreshContents();
..	..	@@ -2743,6 +3517,31 @@
2743	3517
2744	3518	refreshContents();
2745	3519	} else
	3520	+ if (source == embedTexturesItem)
	3521	+ {
	3522	+ Object3D obj;
	3523	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3524	+ {
	3525	+ obj = (Object3D)e.nextElement();
	3526	+ obj.EmbedTextures(true);
	3527	+ }
	3528	+
	3529	+ refreshContents();
	3530	+ } else
	3531	+ if (source == deEmbedTexturesItem)
	3532	+ {
	3533	+ Object3D obj;
	3534	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3535	+ {
	3536	+ obj = (Object3D)e.nextElement();
	3537	+ obj.EmbedTextures(false);
	3538	+ }
	3539	+
	3540	+ CameraPane.texturepigment.clear();
	3541	+ CameraPane.texturebump.clear();
	3542	+
	3543	+ refreshContents();
	3544	+ } else
2746	3545	if (source == flashSelectionButton)
2747	3546	{
2748	3547	CameraPane.flash = true;
..	..	@@ -2754,6 +3553,10 @@
2754	3553	if (source == twoButton)
2755	3554	{
2756	3555	radio.layout = twoButton;
	3556	+
	3557	+ if (CameraPane.FULLSCREEN)
	3558	+ fullscreenLayout = radio.layout;
	3559	+
2757	3560	// bug
2758	3561	//gridPanel.setDividerLocation(1.0);
2759	3562	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2786,10 +3589,31 @@
2786	3589	bigThree.ClearUI();
2787	3590	bigThree.add(centralPanel);
2788	3591	bigThree.FlushUI();
	3592	+
	3593	+ cameraView.requestFocusInWindow();
	3594	+
	3595	+// refreshContents(true);
	3596	+//
	3597	+// try
	3598	+// {
	3599	+// java.awt.Robot bot = new java.awt.Robot();
	3600	+// int mask = InputEvent.BUTTON1_MASK;
	3601	+// bot.mouseMove(100, 100);
	3602	+// bot.mousePress(mask);
	3603	+// bot.mouseRelease(mask);
	3604	+// }
	3605	+// catch (Exception e)
	3606	+// {
	3607	+//
	3608	+// }
	3609	+
2789	3610	} else
2790	3611	if (source == threeButton)
2791	3612	{
2792	3613	radio.layout = threeButton;
	3614	+
	3615	+ if (CameraPane.FULLSCREEN)
	3616	+ fullscreenLayout = radio.layout;
2793	3617
2794	3618	// bigThree.remove(scenePanel);
2795	3619	// bigThree.remove(centralPanel);
..	..	@@ -2819,13 +3643,18 @@
2819	3643	// centralPanel.setVisible(true);
2820	3644	// XYZPanel.setVisible(true);
2821	3645	bigThree.ClearUI();
	3646	+ bigThree.add(scenePanel);
2822	3647	bigThree.add(centralPanel);
2823		- bigThree.add(XYZPanel);
2824	3648	bigThree.FlushUI();
	3649	+
	3650	+ cameraView.requestFocusInWindow();
2825	3651	} else
2826	3652	if (source == fourButton)
2827	3653	{
2828	3654	radio.layout = fourButton;
	3655	+
	3656	+ if (CameraPane.FULLSCREEN)
	3657	+ fullscreenLayout = radio.layout;
2829	3658
2830	3659	// bigThree.remove(scenePanel);
2831	3660	// bigThree.remove(centralPanel);
..	..	@@ -2857,10 +3686,15 @@
2857	3686	bigThree.ClearUI();
2858	3687	bigThree.add(scenePanel);
2859	3688	bigThree.FlushUI();
	3689	+
	3690	+ cameraView.requestFocusInWindow();
2860	3691	} else
2861	3692	if (source == sixButton)
2862	3693	{
2863	3694	radio.layout = sixButton;
	3695	+
	3696	+ if (CameraPane.FULLSCREEN)
	3697	+ fullscreenLayout = radio.layout;
2864	3698
2865	3699	// bigThree.remove(scenePanel);
2866	3700	// bigThree.remove(centralPanel);
..	..	@@ -2890,13 +3724,18 @@
2890	3724	// centralPanel.setVisible(true);
2891	3725	// XYZPanel.setVisible(false);
2892	3726	bigThree.ClearUI();
2893		- bigThree.add(scenePanel);
2894	3727	bigThree.add(centralPanel);
	3728	+ bigThree.add(scenePanel);
2895	3729	bigThree.FlushUI();
	3730	+
	3731	+ cameraView.requestFocusInWindow();
2896	3732	} else
2897	3733	if (source == sevenButton)
2898	3734	{
2899	3735	radio.layout = sevenButton;
	3736	+
	3737	+ if (CameraPane.FULLSCREEN)
	3738	+ fullscreenLayout = radio.layout;
2900	3739
2901	3740	// bigThree.remove(scenePanel);
2902	3741	// bigThree.remove(centralPanel);
..	..	@@ -2930,6 +3769,8 @@
2930	3769	bigThree.add(centralPanel);
2931	3770	bigThree.add(XYZPanel);
2932	3771	bigThree.FlushUI();
	3772	+
	3773	+ cameraView.requestFocusInWindow();
2933	3774	} else
2934	3775	if (source == rootButton)
2935	3776	{
..	..	@@ -2941,6 +3782,7 @@
2941	3782	EditObject(obj);
2942	3783	}
2943	3784
	3785	+ cameraView.requestFocusInWindow();
2944	3786	refreshContents(true);
2945	3787	} else
2946	3788	if (source == closeButton)
..	..	@@ -2950,22 +3792,37 @@
2950	3792	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2951	3793	{
2952	3794	ab = (cRadio)e.nextElement();
2953		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3795	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2954	3796	{
	3797	+ // Patch to avoid bug with transparency.
	3798	+ if (!ab.hadMaterial)
	3799	+ {
	3800	+ ab.object.material = null;
	3801	+ }
	3802	+
2955	3803	buttonGroup.remove(ab);
2956	3804	radioPanel.remove(ab);
2957	3805
2958		- ab.GetObject().editWindow = null;
	3806	+ //ab.GetObject().editWindow = null;
	3807	+ ab.GetObject().manipWindow = null;
2959	3808	// ab.GetObject().objectUI = null; // ?????????
2960	3809
2961	3810	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2962	3811	break;
2963	3812	}
2964	3813	}
	3814	+
	3815	+ cameraView.requestFocusInWindow();
2965	3816	refreshContents(true);
2966	3817	} else
2967	3818	if (source == editItem \|\| source == editButton)
2968	3819	{
	3820	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3821	+ {
	3822	+ Object3D child = (Object3D)e.nextElement();
	3823	+ child.pinned = true;
	3824	+ }
	3825	+
2969	3826	EditSelection(false);
2970	3827	} else
2971	3828	if (source == uneditButton)
..	..	@@ -2974,11 +3831,12 @@
2974	3831	{
2975	3832	Object3D child = (Object3D)e.nextElement();
2976	3833	if(child.editWindow != null)
2977		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3834	+ child.pinned = false;
2978	3835	child.CloseUI();
2979	3836	listUI.remove(child);
	3837	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2980	3838
2981		- child.editWindow = null; // ???????????
	3839	+ //child.editWindow = null; // ???????????
2982	3840	}
2983	3841	objEditor.ctrlPanel.FlushUI();
2984	3842	//objEditor.jTree.clearSelection();
..	..	@@ -2991,16 +3849,18 @@
2991	3849	//copy.ClearUI();
2992	3850	for (Object3D obj : listUI)
2993	3851	{
	3852	+ obj.pinned = false;
2994	3853	obj.CloseUI();
2995	3854	}
2996	3855	listUI.clear();
	3856	+ SetPinStates(group.selection.size() > 0);
2997	3857	refreshContents(true);
2998	3858	} else
2999	3859	if (source == allParamsButton)
3000	3860	{
3001	3861	assert(copy == group);
3002	3862
3003		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3863	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3004	3864
3005	3865	for (Object3D obj : listUI)
3006	3866	{
..	..	@@ -3049,6 +3909,9 @@
3049	3909	}
3050	3910
3051	3911	copy = group;
	3912	+
	3913	+ SetUndoStates();
	3914	+
3052	3915	//Globals.theRenderer.object = group;
3053	3916	if(!useclient)
3054	3917	{
..	..	@@ -3064,20 +3927,49 @@
3064	3927	frontView.object = group;
3065	3928	sideView.object = group;
3066	3929	}
3067		- group.editWindow = this;
	3930	+
	3931	+// fix "+" issue
	3932	+ //group.editWindow = this;
	3933	+ group.manipWindow = this;
	3934	+
3068	3935	/*
3069	3936	currentLayout = radio.layout;
3070	3937	if (currentLayout == null)
3071	3938	currentLayout = sevenButton;
3072	3939	*/
3073	3940	radio.layout.doClick();
	3941	+
	3942	+ ClearUnpinned();
	3943	+
	3944	+ //Grafreed.Assert(group != null);
	3945	+ //Grafreed.Assert(group.selection != null);
	3946	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	3947	+ if (group.selection == null \|\| group.selection.size() == 1)
	3948	+ EditSelection(false);
3074	3949	keepparent = group.parent;
3075	3950	// PARENT = NULL or not???
3076	3951	//group.parent = null; // ROOT
3077	3952	//group.attributes = -1;
3078	3953	ResetModel();
	3954	+
	3955	+ cameraView.requestFocusInWindow();
3079	3956	refreshContents(true);
3080		- }
	3957	+ } else if (event.getSource() == editCameraItem)
	3958	+ {
	3959	+ cameraView.ProtectCamera();
	3960	+ cameraView.requestFocusInWindow();
	3961	+ cameraView.repaint();
	3962	+ return;
	3963	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3964	+ {
	3965	+ cameraView.RevertCamera();
	3966	+ cameraView.requestFocusInWindow();
	3967	+ cameraView.repaint();
	3968	+ return;
	3969	+ // } else if (event.getSource() == textureButton)
	3970	+ // {
	3971	+ // return; // true;
	3972	+ }
3081	3973	else
3082	3974	{
3083	3975	//return super.action(event, arg);
..	..	@@ -3086,7 +3978,6 @@
3086	3978	}
3087	3979
3088	3980	boolean useclient = false;
3089		- cRadio radio;
3090	3981
3091	3982	void ToggleRoot()
3092	3983	{
..	..	@@ -3138,6 +4029,28 @@
3138	4029	refreshContents();
3139	4030	}
3140	4031
	4032	+ void TransformChildren()
	4033	+ {
	4034	+ Object3D obj;
	4035	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4036	+ {
	4037	+ obj = (Object3D)e.nextElement();
	4038	+ obj.KeepTextureMatrices();
	4039	+ obj.TransformChildren();
	4040	+ obj.RestoreTextureMatrices();
	4041	+
	4042	+// if (obj.parent == null)
	4043	+// {
	4044	+// System.out.println("NULL PARENT!");
	4045	+// new Exception().printStackTrace();
	4046	+// }
	4047	+// else
	4048	+// TouchTransform(obj);
	4049	+// //obj.parent.Touch();
	4050	+ }
	4051	+
	4052	+ refreshContents();
	4053	+ }
3141	4054
3142	4055	void ResetTransform()
3143	4056	{
..	..	@@ -3250,7 +4163,7 @@
3250	4163	refreshContents();
3251	4164	}
3252	4165
3253		- void ResetCentroid()
	4166	+ void ResetCentroid(boolean full)
3254	4167	{
3255	4168	Object3D obj;
3256	4169	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3265,12 +4178,16 @@
3265	4178	LA.matIdentity(Object3D.mat);
3266	4179	obj.getBounds(minima, maxima, false);
3267	4180	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3268		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	4181	+ if (full)
	4182	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3269	4183	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3270	4184	obj.TransformMesh(Object3D.mat);
	4185	+
3271	4186	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3272		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	4187	+ if (full)
	4188	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3273	4189	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	4190	+
3274	4191	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3275	4192	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3276	4193	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3299,7 +4216,8 @@
3299	4216
3300	4217	int size = obj.MemorySize();
3301	4218
3302		- System.err.println((size/1024) + " KB is the size of " + obj);
	4219	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4220	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3303	4221	}
3304	4222	}
3305	4223	catch (Exception e)
..	..	@@ -3336,9 +4254,9 @@
3336	4254	obj = (Object3D)e.nextElement();
3337	4255
3338	4256	System.out.println("Object is: " + obj);
3339		- GrafreeD.AnalyzeObject(obj);
	4257	+ Grafreed.AnalyzeObject(obj);
3340	4258	System.out.println("Boundary rep: " + obj.bRep);
3341		- GrafreeD.AnalyzeObject(obj.bRep);
	4259	+ Grafreed.AnalyzeObject(obj.bRep);
3342	4260
3343	4261	// System.err.println((size/1024) + " KB is the size of " + obj);
3344	4262	}
..	..	@@ -3380,6 +4298,13 @@
3380	4298	void GenNormals(boolean crease)
3381	4299	{
3382	4300	group.GenNormalsS(crease);
	4301	+
	4302	+ refreshContents();
	4303	+ }
	4304	+
	4305	+ void GenNormalsMESH()
	4306	+ {
	4307	+ group.GenNormalsMeshS();
3383	4308
3384	4309	refreshContents();
3385	4310	}
..	..	@@ -3552,8 +4477,8 @@
3552	4477
3553	4478	void ParseVertices()
3554	4479	{
3555		- boolean epsequal = GrafreeD.epsequal;
3556		- GrafreeD.epsequal = true;
	4480	+ boolean epsequal = Grafreed.epsequal;
	4481	+ Grafreed.epsequal = true;
3557	4482
3558	4483	for (int i=0; i<group.selection.size(); i++)
3559	4484	{
..	..	@@ -3578,7 +4503,7 @@
3578	4503	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3579	4504	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3580	4505
3581		- g.add(GrafreeD.clipboard);
	4506	+ g.add(Grafreed.clipboard);
3582	4507
3583	4508	buffer.add(g);
3584	4509	}
..	..	@@ -3593,7 +4518,7 @@
3593	4518	makeSomething(buffer, i==group.selection.size()-1);
3594	4519	}
3595	4520
3596		- GrafreeD.epsequal = epsequal;
	4521	+ Grafreed.epsequal = epsequal;
3597	4522
3598	4523	refreshContents();
3599	4524	}
..	..	@@ -3611,7 +4536,16 @@
3611	4536	String pigment = Object3D.GetPigment(tex);
3612	4537	//String bump = Object3D.GetBump(tex);
3613	4538
3614		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4539	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4540	+
	4541	+ try
	4542	+ {
	4543	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
	4544	+ }
	4545	+ catch (Exception e)
	4546	+ {
	4547	+ System.err.println("FAIL: " + node);
	4548	+ }
3615	4549
3616	4550	double s = v.s;
3617	4551
..	..	@@ -3743,7 +4677,7 @@
3743	4677	return;
3744	4678
3745	4679	Object3D poses = group.selection.get(0);
3746		- Object3D ref = GrafreeD.clipboard.get(0);
	4680	+ Object3D ref = Grafreed.clipboard.get(0);
3747	4681
3748	4682	Object3D newgroup = new Object3D("Po:" + poses.name);
3749	4683
..	..	@@ -3937,9 +4871,9 @@
3937	4871
3938	4872	void ClipMesh()
3939	4873	{
3940		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4874	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3941	4875	{
3942		- Object3D content = GrafreeD.clipboard.get(0);
	4876	+ Object3D content = Grafreed.clipboard.get(0);
3943	4877
3944	4878	if (content instanceof cGroup && ((cGroup)content).transientlink )
3945	4879	content = ((cGroup)content).get(0);
..	..	@@ -3948,7 +4882,7 @@
3948	4882	// {
3949	4883	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3950	4884	// }
3951		- group.selection.ClipMesh(GrafreeD.clipboard);
	4885	+ group.selection.ClipMesh(Grafreed.clipboard);
3952	4886	}
3953	4887	// group.selection.ClipMesh(GrafreeD.clipboard);
3954	4888	System.out.println("DONE.");
..	..	@@ -3995,6 +4929,18 @@
3995	4929	void MarkLeaves(boolean hide)
3996	4930	{
3997	4931	group.selection.MarkLeaves(hide);
	4932	+ refreshContents();
	4933	+ }
	4934	+
	4935	+ void RewindLeaves(boolean hide)
	4936	+ {
	4937	+ group.selection.RewindLeaves(hide);
	4938	+ refreshContents();
	4939	+ }
	4940	+
	4941	+ void RandomLeaves(boolean hide)
	4942	+ {
	4943	+ group.selection.RandomLeaves(hide);
3998	4944	refreshContents();
3999	4945	}
4000	4946
..	..	@@ -4069,28 +5015,25 @@
4069	5015	// }
4070	5016	// }
4071	5017
4072		- static boolean allparams = true;
4073		-
4074		- static Vector<Object3D> listUI = new Vector<Object3D>();
4075		-
4076	5018	void EditSelection(boolean newWindow)
4077	5019	{
	5020	+ if (group.selection == null)
	5021	+ {
	5022	+ EditElement(group, newWindow); // ? new
	5023	+ return;
	5024	+ }
	5025	+
4078	5026	// aConstraints.gridy = 0;
4079	5027	for (int i=0; i<group.selection.size(); i++)
4080	5028	{
4081	5029	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4082	5030	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4083		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5031	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4084	5032
4085	5033	Object3D elem = (Object3D)group.selection.elementAt(i);
4086		- if(elem != group)
	5034	+ if(elem != group \|\| !newWindow)
4087	5035	{
4088		- // if (!(elem instanceof Composite))
4089		- // newWindow = false;
4090		- listUI.add(elem);
4091		- elem.openEditWindow(this, newWindow); //, false);
4092		- System.out.println("edit : " + elem);
4093		- elem.editWindow.refreshContents(true); // ? new
	5036	+ EditElement(elem, newWindow); // ? new
4094	5037	}
4095	5038	}
4096	5039	}
..	..	@@ -4153,9 +5096,7 @@
4153	5096
4154	5097	freezemodel = false;
4155	5098	}
4156		-
4157		- boolean flashIt = true;
4158		-
	5099	+
4159	5100	public void valueChanged(TreeSelectionEvent e)
4160	5101	//public boolean handleEvent(Event event)
4161	5102	{
..	..	@@ -4165,7 +5106,8 @@
4165	5106	//new Exception().printStackTrace();
4166	5107
4167	5108	freezemodel = true;
4168		-
	5109	+ ClearUnpinned();
	5110	+
4169	5111	/**/
4170	5112	//switch (event.id)
4171	5113	{
..	..	@@ -4173,7 +5115,6 @@
4173	5115	//case 702: // Event.LIST_DESELECT
4174	5116	group.deselectAll();
4175	5117	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4176		- objEditor.ClearInfo(); // .GetMaterial());
4177	5118	if (tps != null)
4178	5119	{
4179	5120	for (int i=0; i < tps.length; i++)
..	..	@@ -4182,10 +5123,8 @@
4182	5123
4183	5124	//if (child.parent != null)
4184	5125	//child.parent.addSelectee(child);
	5126	+ objEditor.SetMaterial(child);
4185	5127	group.addSelectee(child);
4186		- objEditor.SetMaterial(child); // .GetMaterial());
4187		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4188		- System.err.println("info : " + child.GetPath());
4189	5128	}
4190	5129	}
4191	5130	// else
..	..	@@ -4195,20 +5134,28 @@
4195	5134	// System.err.println("info : " + group.GetPath());
4196	5135	// }
4197	5136
4198		- objEditor.SetText(); // jan 2014
4199		-
4200		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	5137	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4201	5138	CameraPane.flash = true;
4202	5139
4203		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5140	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4204	5141	// a camera
4205	5142	{
4206		- CameraPane.camerachangeframe = 0; // don't refuse it
4207		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5143	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5144	+ {
	5145	+ CameraPane.camerachangeframe = 0; // don't refuse it
	5146	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5147	+ }
4208	5148	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4209	5149	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4210	5150	}
4211	5151
	5152	+ if (tps != null && tps.length == 1)
	5153	+ {
	5154	+ EditSelection(false);
	5155	+ }
	5156	+
	5157	+ SetPinStates(tps != null && tps.length > 0);
	5158	+
4212	5159	refreshContents();
4213	5160	//return true;
4214	5161	}
..	..	@@ -4217,6 +5164,37 @@
4217	5164
4218	5165	freezemodel = false;
4219	5166	}
	5167	+
	5168	+ void SetPinStates(boolean enabled)
	5169	+ {
	5170	+ editButton.setEnabled(enabled);
	5171	+ uneditButton.setEnabled(enabled);
	5172	+ unselectButton.setEnabled(enabled);
	5173	+ flashSelectionButton.setEnabled(enabled);
	5174	+
	5175	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5176	+ }
	5177	+
	5178	+ void refreshContents(boolean cp)
	5179	+ {
	5180	+ if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5181	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5182	+ {
	5183	+ objEditor.ClearInfo(); // .GetMaterial());
	5184	+
	5185	+ for (int i=0; i < group.selection.Size(); i++)
	5186	+ {
	5187	+ Object3D child = (Object3D) group.selection.get(i);
	5188	+
	5189	+ objEditor.AddInfo(child, this, true);
	5190	+ System.err.println("info : " + child.GetPath());
	5191	+ }
	5192	+
	5193	+ objEditor.SetText(); // jan 2014
	5194	+ }
	5195	+
	5196	+ super.refreshContents(cp);
	5197	+ }
4220	5198
4221	5199	void linkSomething(Object3D thing)
4222	5200	{
..	..	@@ -4288,16 +5266,19 @@
4288	5266	{
4289	5267	if (group.selection.isEmpty())
4290	5268	return;
4291		- GrafreeD.clipboardIsTempGroup = false;
	5269	+
	5270	+ Grafreed.clipboardIsTempGroup = false;
4292	5271	Composite tGroup = null;
4293	5272	if (group.selection.size() > 0) // 1)
4294	5273	{
4295	5274	tGroup = new cGroup();
4296		- GrafreeD.clipboardIsTempGroup = true;
	5275	+ Grafreed.clipboardIsTempGroup = true;
4297	5276	}
4298	5277
4299	5278	if (cut)
4300	5279	{
	5280	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5281	+// Save();
4301	5282	//int indices[] = jList.getSelectedIndices();
4302	5283	//for (int i = indices.length - 1; i >= 0; i--)
4303	5284	//jList.remove(indices[i]);
..	..	@@ -4333,16 +5314,16 @@
4333	5314	//System.out.println("cut " + child);
4334	5315	//System.out.println("parent = " + child.parent);
4335	5316	// tmp.addChild(child);
4336		- if (GrafreeD.clipboardIsTempGroup)
	5317	+ if (Grafreed.clipboardIsTempGroup)
4337	5318	tGroup.add/Child/(tmp);
4338	5319	else
4339		- GrafreeD.clipboard = tmp;
	5320	+ Grafreed.clipboard = tmp;
4340	5321	}
4341	5322	else
4342		- if (GrafreeD.clipboardIsTempGroup)
	5323	+ if (Grafreed.clipboardIsTempGroup)
4343	5324	tGroup.add/Child/(child);
4344	5325	else
4345		- GrafreeD.clipboard = child;
	5326	+ Grafreed.clipboard = child;
4346	5327	}
4347	5328
4348	5329	//ResetModel();
..	..	@@ -4374,21 +5355,23 @@
4374	5355	//System.out.println("cut " + elem);
4375	5356	//System.out.println("parent = " + elem.parent);
4376	5357	// tmp.addChild(elem);
4377		- if (GrafreeD.clipboardIsTempGroup)
	5358	+ if (Grafreed.clipboardIsTempGroup)
4378	5359	tGroup.add/Child/(tmp);
4379	5360	else
4380		- GrafreeD.clipboard = tmp;
	5361	+ Grafreed.clipboard = tmp;
4381	5362	}
4382	5363	else
4383		- if (GrafreeD.clipboardIsTempGroup)
	5364	+ if (Grafreed.clipboardIsTempGroup)
4384	5365	tGroup.add/Child/(child);
4385	5366	else
4386		- GrafreeD.clipboard = child;
	5367	+ Grafreed.clipboard = child;
4387	5368	}
4388	5369
4389	5370	}
4390		- if (GrafreeD.clipboardIsTempGroup)
4391		- GrafreeD.clipboard = tGroup;
	5371	+
	5372	+ if (Grafreed.clipboardIsTempGroup)
	5373	+ Grafreed.clipboard = tGroup;
	5374	+
4392	5375	if (cut)
4393	5376	{
4394	5377	ResetModel();
..	..	@@ -4398,11 +5381,15 @@
4398	5381
4399	5382	void paste(boolean expand)
4400	5383	{
	5384	+ if (Globals.REPLACEONMAKE)
	5385	+ Save();
	5386	+ boolean keep = Globals.REPLACEONMAKE;
	5387	+ Globals.REPLACEONMAKE = false;
4401	5388	// if (GrafreeD.clipboard == null)
4402	5389	// return;
4403	5390	boolean first = true;
4404	5391
4405		- if (GrafreeD.clipboardIsTempGroup)
	5392	+ if (Grafreed.clipboardIsTempGroup)
4406	5393	{
4407	5394	Composite temp;
4408	5395
..	..	@@ -4413,7 +5400,7 @@
4413	5400	temp = (Composite)Applet3D.clipboard.deepCopy();
4414	5401	*/
4415	5402	Object3D elem;
4416		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5403	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4417	5404	{
4418	5405	Object3D child = (Object3D)e.nextElement();
4419	5406
..	..	@@ -4447,16 +5434,17 @@
4447	5434	//Object3D cb = Applet3D.clipboard;
4448	5435	//temp.addChild(cb);
4449	5436	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4450		- assert(GrafreeD.clipboard.parent == null);
4451		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4452		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4453		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4454		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	5437	+ assert(Grafreed.clipboard.parent == null);
	5438	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5439	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5440	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5441	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4455	5442	else
4456		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4457		- GrafreeD.clipboard.get(0).parent = keepparent;
	5443	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5444	+ Grafreed.clipboard.get(0).parent = keepparent;
4458	5445	}
4459	5446
	5447	+ Globals.REPLACEONMAKE = keep;
4460	5448	ResetModel();
4461	5449	refreshContents();
4462	5450	}
..	..	@@ -4503,9 +5491,9 @@
4503	5491	{
4504	5492	boolean first = true;
4505	5493
4506		- if (GrafreeD.clipboardIsTempGroup)
	5494	+ if (Grafreed.clipboardIsTempGroup)
4507	5495	{
4508		- Composite temp = (Composite)GrafreeD.clipboard;
	5496	+ Composite temp = (Composite)Grafreed.clipboard;
4509	5497	Object3D copy;
4510	5498	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4511	5499	{
..	..	@@ -4515,7 +5503,7 @@
4515	5503	}
4516	5504	} else
4517	5505	{
4518		- linkSomething(GrafreeD.clipboard); //.get(0));
	5506	+ linkSomething(Grafreed.clipboard); //.get(0));
4519	5507	}
4520	5508	}
4521	5509	}
..	..	@@ -4592,6 +5580,10 @@
4592	5580
4593	5581	void group(Object3D csg, boolean grab)
4594	5582	{
	5583	+ if (Globals.REPLACEONMAKE)
	5584	+ Save();
	5585	+ boolean keep = Globals.REPLACEONMAKE;
	5586	+ Globals.REPLACEONMAKE = false;
4595	5587	if (//false) // why??
4596	5588	!group.selection.isEmpty())
4597	5589	{
..	..	@@ -4705,10 +5697,15 @@
4705	5697	//node.add(csg);
4706	5698	//makeSomething(node);
4707	5699	makeSomething(csg);
	5700	+ Globals.REPLACEONMAKE = keep;
4708	5701	}
4709	5702
4710	5703	void Ungroup(Object3D g)
4711	5704	{
	5705	+ if (Globals.REPLACEONMAKE)
	5706	+ Save();
	5707	+ boolean keep = Globals.REPLACEONMAKE;
	5708	+ Globals.REPLACEONMAKE = false;
4712	5709	if (g instanceof HiddenObject)
4713	5710	{
4714	5711	HiddenObject h = (HiddenObject) g;
..	..	@@ -4725,6 +5722,7 @@
4725	5722	objEditor.makeSomething(g.get(i), false);
4726	5723	}
4727	5724	}
	5725	+ Globals.REPLACEONMAKE = keep;
4728	5726	}
4729	5727
4730	5728	void ungroup()
..	..	@@ -4920,21 +5918,6 @@
4920	5918	}
4921	5919	*/
4922	5920
4923		- void ImportGFD()
4924		- {
4925		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4926		- browser.show();
4927		- String filename = browser.getFile();
4928		- if (filename != null && filename.length() > 0)
4929		- {
4930		- String fullname = browser.getDirectory() + filename;
4931		-
4932		- //Object3D readobj =
4933		- objEditor.ReadGFD(fullname, objEditor);
4934		- //makeSomething(readobj);
4935		- }
4936		- }
4937		-
4938	5921	/*
4939	5922	public void Callback(Object obj)
4940	5923	{
..	..	@@ -4958,26 +5941,9 @@
4958	5941	}
4959	5942	*/
4960	5943
4961		- void ImportVRMLX3D()
4962		- {
4963		- if (GrafreeD.standAlone)
4964		- {
4965		- /**/
4966		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4967		- browser.show();
4968		- String filename = browser.getFile();
4969		- if (filename != null && filename.length() > 0)
4970		- {
4971		- String fullname = browser.getDirectory() + filename;
4972		- LoadVRMLX3D(fullname);
4973		- }
4974		- /**/
4975		- }
4976		- }
4977		-
4978	5944	String GetFile(String dialogName)
4979	5945	{
4980		- if (GrafreeD.standAlone)
	5946	+ if (Grafreed.standAlone)
4981	5947	{
4982	5948	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4983	5949	browser.show();
..	..	@@ -5045,7 +6011,43 @@
5045	6011	cButton clearpanelButton;
5046	6012	cButton unselectButton;
5047	6013
	6014	+ cButton restoreCameraButton;
	6015	+
5048	6016	cButton oneStepButton;
	6017	+
	6018	+ cButton groupButton;
	6019	+ cButton ungroupButton;
	6020	+ cButton compositeButton;
	6021	+ cButton switchButton;
	6022	+ cButton loopButton;
	6023	+ cButton textureButton;
	6024	+
	6025	+ cButton skybox1Button;
	6026	+ cButton skybox2Button;
	6027	+ cButton skybox3Button;
	6028	+ cButton skybox4Button;
	6029	+ cButton skybox5Button;
	6030	+ cButton skybox6Button;
	6031	+ cButton skybox7Button;
	6032	+
	6033	+ cButton skybox11Button;
	6034	+ cButton skybox12Button;
	6035	+ cButton skybox13Button;
	6036	+ cButton skybox14Button;
	6037	+ cButton skybox15Button;
	6038	+ cButton skybox16Button;
	6039	+ cButton skybox17Button;
	6040	+
	6041	+ cButton gridButton;
	6042	+ cButton boxButton;
	6043	+ cButton sphereButton;
	6044	+ cButton coneButton;
	6045	+ cButton torusButton;
	6046	+ cButton superButton;
	6047	+ cButton kleinButton;
	6048	+ cButton particlesButton;
	6049	+ cButton overlayButton;
	6050	+ cButton lightButton;
5049	6051
5050	6052	cButton screenfitButton;
5051	6053	cButton screenfitpointButton;
..	..	@@ -5058,14 +6060,6 @@
5058	6060
5059	6061	cButton setsupportButton;
5060	6062
5061		- cButton twoButton;
5062		- cButton sixButton;
5063		- cButton threeButton;
5064		- cButton sevenButton;
5065		- cButton fourButton; // full panel
5066		- cButton oneButton; // full XYZ
5067		- //cButton currentLayout;
5068		-
5069	6063	//
5070	6064	//Composite
5071	6065	Object3D // to do !!
..	..	@@ -5075,9 +6069,11 @@
5075	6069	//JTree jTree;
5076	6070	private MenuItem lookAtItem;
5077	6071	private MenuItem lookFromItem;
5078		- private MenuItem switchItem;
	6072	+ private MenuItem switchViewItem;
5079	6073	private MenuItem cutItem;
5080		- private MenuItem duplicateItem;
	6074	+ private MenuItem undoItem;
	6075	+ private MenuItem redoItem;
	6076	+ private JMenuItem duplicateItem;
5081	6077	private MenuItem cloneItem;
5082	6078	private MenuItem cloneSupportItem;
5083	6079	private MenuItem overwriteGeoItem;
..	..	@@ -5090,7 +6086,7 @@
5090	6086	private MenuItem linkverticesItem;
5091	6087	private MenuItem relinkverticesItem;
5092	6088	private MenuItem setMasterItem;
5093		- private MenuItem resetMeshItem;
	6089	+ private MenuItem resetAllItem;
5094	6090	private MenuItem stepAllItem;
5095	6091	private MenuItem revertMeshItem;
5096	6092	private MenuItem poseMeshItem;
..	..	@@ -5105,7 +6101,7 @@
5105	6101	private MenuItem pasteLinkItem;
5106	6102	private MenuItem pasteCloneItem;
5107	6103	private MenuItem pasteExpandItem;
5108		- private MenuItem clearItem;
	6104	+ private MenuItem deleteItem;
5109	6105	private MenuItem clearAllItem;
5110	6106	private MenuItem genUVItem;
5111	6107	private MenuItem genNormalsMESHItem;
..	..	@@ -5140,6 +6136,10 @@
5140	6136	private MenuItem showleavesItem;
5141	6137	private MenuItem markleavesItem;
5142	6138	private MenuItem unmarkleavesItem;
	6139	+ private MenuItem rewindleavesItem;
	6140	+ private MenuItem unrewindleavesItem;
	6141	+ private MenuItem randomleavesItem;
	6142	+ private MenuItem unrandomleavesItem;
5143	6143
5144	6144	private MenuItem flipVItem;
5145	6145	private MenuItem unflipVItem;
..	..	@@ -5151,15 +6151,17 @@
5151	6151	private MenuItem panoTexturesItem;
5152	6152
5153	6153	private MenuItem resetCentroidItem;
5154		- private MenuItem transformgeometryItem;
	6154	+ private MenuItem resetCentroidXZItem;
5155	6155	private MenuItem resetTransformItem;
	6156	+ private MenuItem transformGeometryItem;
	6157	+ private MenuItem transformChildrenItem;
5156	6158	private MenuItem hideItem;
5157	6159	private MenuItem grabItem;
5158	6160	private MenuItem backItem;
5159	6161	private MenuItem frontItem;
5160	6162	private MenuItem cameraItem;
5161	6163	private MenuItem compositeItem;
5162		- private MenuItem randomItem;
	6164	+ private MenuItem switchItem;
5163	6165	private MenuItem physicsItem;
5164	6166	private MenuItem frameselectorItem;
5165	6167	private MenuItem scriptNodeItem;
..	..	@@ -5183,6 +6185,8 @@
5183	6185	private MenuItem attachBumpItem;
5184	6186	private MenuItem detachBumpItem;
5185	6187	private MenuItem pigmentBumpItem;
	6188	+ private MenuItem embedTexturesItem;
	6189	+ private MenuItem deEmbedTexturesItem;
5186	6190
5187	6191	private MenuItem particleItem;
5188	6192	private MenuItem ragdollItem;
..	..	@@ -5221,11 +6225,6 @@
5221	6225	private MenuItem doubleItem;
5222	6226	private MenuItem tripleItem;
5223	6227
5224		- private MenuItem importGFDItem;
5225		- private MenuItem importVRMLX3DItem;
5226		- private MenuItem import3DSItem;
5227		- private MenuItem importOBJItem;
5228		-
5229	6228	private MenuItem computeAOItem;
5230	6229	private MenuItem recompileItem;
5231	6230	private MenuItem editScriptItem;
..	..	@@ -5235,4 +6234,8 @@
5235	6234	private MenuItem analyzeItem;
5236	6235	private MenuItem dumpItem;
5237	6236	//boolean freezemodel = false;
	6237	+
	6238	+ Menu cameraMenu;
	6239	+ MenuItem editCameraItem;
	6240	+ MenuItem restoreCameraItem;
5238	6241	}