~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -16,6 +16,7 @@
16	16	//import buoy.widget.BFileChooser;
17	17
18	18	class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
	19	+ Grafreed.iResourceCallBack,
19	20	ObjectUI,
20	21	Runnable,
21	22	ActionListener,
..	..	@@ -23,6 +24,314 @@
23	24	DragGestureListener, DragSourceListener, DropTargetListener,
24	25	ItemListener // ListSelectionListener
25	26	{
	27	+
	28	+ public void AddSkyboxButton(String f, String s, cGridBag row)
	29	+ {
	30	+ cButton skyboxButton;
	31	+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
	32	+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
	33	+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
	34	+ skyboxButton.setToolTipText(s);
	35	+ skyboxButton.addActionListener(new ActionListener()
	36	+ {
	37	+ @Override
	38	+ public void actionPerformed(ActionEvent e)
	39	+ {
	40	+ ChangeSkybox(path);
	41	+ }
	42	+ });
	43	+ }
	44	+
	45	+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
	46	+ {
	47	+ cGridBag tab0 = new cGridBag().setVertical(true);
	48	+
	49	+ tab0.setName("Urban");
	50	+ skyboxpanel.add(tab0);
	51	+
	52	+ cGridBag row0 = new cGridBag();
	53	+ cGridBag row1 = new cGridBag();
	54	+ cGridBag row2 = new cGridBag();
	55	+ cGridBag row3 = new cGridBag();
	56	+ cGridBag row4 = new cGridBag();
	57	+ cGridBag row5 = new cGridBag();
	58	+ cGridBag row6 = new cGridBag();
	59	+
	60	+ AddSkyboxButton("default", "rgb", row0);
	61	+ //AddSkyboxButton("default", "cornell", row0);
	62	+ AddSkyboxButton("penguins", "dust", row0);
	63	+ AddSkyboxButton("penguins", "tropic", row0);
	64	+ AddSkyboxButton("penguins", "yonder", row0);
	65	+
	66	+ AddSkyboxButton("default", "uffizi", row1);
	67	+ AddSkyboxButton("bridge", "Bridge", row1);
	68	+ AddSkyboxButton("bridge", "Bridge2", row1);
	69	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	70	+
	71	+ AddSkyboxButton("urban", "Parliament", row2);
	72	+ AddSkyboxButton("urban", "Roundabout", row2);
	73	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	74	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	75	+
	76	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	77	+ AddSkyboxButton("urban", "UnionSquare", row3);
	78	+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
	79	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	80	+
	81	+ AddSkyboxButton("park", "Buddha", row4);
	82	+ AddSkyboxButton("park", "CNTower2", row4);
	83	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	84	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	85	+
	86	+ AddSkyboxButton("park", "Park", row5);
	87	+ AddSkyboxButton("park", "Pond", row5);
	88	+ AddSkyboxButton("park", "Skansen", row5);
	89	+ AddSkyboxButton("park", "Skansen2", row5);
	90	+
	91	+ AddSkyboxButton("park", "Skansen3", row6);
	92	+ AddSkyboxButton("park", "Skansen4", row6);
	93	+ AddSkyboxButton("park", "Skansen5", row6);
	94	+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
	95	+
	96	+ tab0.add(row0);
	97	+ tab0.add(row1);
	98	+ tab0.add(row2);
	99	+ tab0.add(row3);
	100	+ tab0.add(row4);
	101	+ tab0.add(row5);
	102	+ tab0.add(row6);
	103	+
	104	+ for (int i=5; --i>=0;)
	105	+ {
	106	+ //oe.toolboxPanel.Return();
	107	+ //tab0.add(new cGridBag());
	108	+ }
	109	+ }
	110	+
	111	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	112	+ {
	113	+ cGridBag tab0 = new cGridBag().setVertical(true);
	114	+
	115	+ tab0.setName("Nature");
	116	+ skyboxpanel.add(tab0);
	117	+
	118	+ cGridBag row0 = new cGridBag();
	119	+ cGridBag row1 = new cGridBag();
	120	+ cGridBag row2 = new cGridBag();
	121	+ cGridBag row3 = new cGridBag();
	122	+ cGridBag row4 = new cGridBag();
	123	+ cGridBag row5 = new cGridBag();
	124	+ cGridBag row6 = new cGridBag();
	125	+
	126	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	127	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	128	+ AddSkyboxButton("beach", "PalmTrees", row0);
	129	+ AddSkyboxButton("beach", "Tenerife", row0);
	130	+
	131	+ AddSkyboxButton("beach", "Tenerife2", row1);
	132	+ AddSkyboxButton("beach", "Tenerife3", row1);
	133	+ AddSkyboxButton("field", "FishPond", row1);
	134	+ AddSkyboxButton("field", "Footballfield", row1);
	135	+
	136	+ AddSkyboxButton("field", "Meadow", row2);
	137	+ AddSkyboxButton("field", "Sorsele", row2);
	138	+ AddSkyboxButton("field", "Sorsele2", row2);
	139	+ AddSkyboxButton("field", "Sorsele3", row2);
	140	+
	141	+ AddSkyboxButton("forest", "Brudslojan", row3);
	142	+ AddSkyboxButton("forest", "Langholmen2", row3);
	143	+ AddSkyboxButton("forest", "Plants", row3);
	144	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	145	+
	146	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	147	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	148	+ AddSkyboxButton("mountain", "Teide", row4);
	149	+ AddSkyboxButton("park", "Tantolunden4", row4);
	150	+
	151	+ AddSkyboxButton("park", "Stairs", row5);
	152	+ AddSkyboxButton("default", "skycube", row6);
	153	+ AddSkyboxButton("rocky", "Langholmen", row5);
	154	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	155	+
	156	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	157	+ AddSkyboxButton("default", "CloudyHills", row6);
	158	+ AddSkyboxButton("daz", "Autumn", row6);
	159	+ AddSkyboxButton("daz", "MountainTrail", row6);
	160	+ /*
	161	+Autumn
	162	+Greenlands
	163	+MountainTrail
	164	+Oasis
	165	+TheRock
	166	+TopOfTheWorld
	167	+Winter
	168	+ */
	169	+
	170	+ tab0.add(row0);
	171	+ tab0.add(row1);
	172	+ tab0.add(row2);
	173	+ tab0.add(row3);
	174	+ tab0.add(row4);
	175	+ tab0.add(row5);
	176	+ tab0.add(row6);
	177	+
	178	+ for (int i=5; --i>=0;)
	179	+ {
	180	+ //oe.toolboxPanel.Return();
	181	+ //tab0.add(new cGridBag());
	182	+ }
	183	+ }
	184	+
	185	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	186	+ {
	187	+ cGridBag tab0 = new cGridBag().setVertical(true);
	188	+
	189	+ tab0.setName("Night");
	190	+ skyboxpanel.add(tab0);
	191	+
	192	+ cGridBag row0 = new cGridBag();
	193	+ cGridBag row1 = new cGridBag();
	194	+ cGridBag row2 = new cGridBag();
	195	+ cGridBag row3 = new cGridBag();
	196	+ cGridBag row4 = new cGridBag();
	197	+ cGridBag row5 = new cGridBag();
	198	+ cGridBag row6 = new cGridBag();
	199	+
	200	+ AddSkyboxButton("night", "NightPath", row0);
	201	+ AddSkyboxButton("night", "PondNight", row0);
	202	+ AddSkyboxButton("night", "Powerlines", row0);
	203	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	204	+
	205	+ AddSkyboxButton("urban", "CNTower", row1);
	206	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	207	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	208	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
	209	+
	210	+ AddSkyboxButton("penguins", "kenon_star", row2);
	211	+ AddSkyboxButton("persson", "corona", row2);
	212	+ AddSkyboxButton("persson", "spaceskybox", row2);
	213	+ AddSkyboxButton("indoors", "Vasa", row2);
	214	+
	215	+ AddSkyboxButton("winter", "Backyard", row3);
	216	+ AddSkyboxButton("winter", "Creek", row3);
	217	+ AddSkyboxButton("winter", "FootballField3", row3);
	218	+ AddSkyboxButton("winter", "Forest", row3);
	219	+
	220	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	221	+ AddSkyboxButton("winter", "House", row4);
	222	+ AddSkyboxButton("winter", "IceLake", row4);
	223	+ AddSkyboxButton("winter", "IceRiver", row4);
	224	+
	225	+ AddSkyboxButton("winter", "Park3", row5);
	226	+ AddSkyboxButton("winter", "PondWinter", row5);
	227	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	228	+ AddSkyboxButton("winter", "Vindelalven", row5);
	229	+
	230	+ AddSkyboxButton("daz", "TheRock", row6);
	231	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	232	+ AddSkyboxButton("daz", "Winter", row6);
	233	+ AddSkyboxButton("mountain", "Ryfjallet", row6);
	234	+
	235	+ tab0.add(row0);
	236	+ tab0.add(row1);
	237	+ tab0.add(row2);
	238	+ tab0.add(row3);
	239	+ tab0.add(row4);
	240	+ tab0.add(row5);
	241	+ tab0.add(row6);
	242	+
	243	+ for (int i=5; --i>=0;)
	244	+ {
	245	+ //oe.toolboxPanel.Return();
	246	+ //tab0.add(new cGridBag());
	247	+ }
	248	+ }
	249	+
	250	+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
	251	+ {
	252	+ cGridBag tab0 = new cGridBag().setVertical(true);
	253	+
	254	+ tab0.setName("Others");
	255	+ skyboxpanel.add(tab0);
	256	+
	257	+ cGridBag row0 = new cGridBag();
	258	+ cGridBag row1 = new cGridBag();
	259	+ cGridBag row2 = new cGridBag();
	260	+ cGridBag row3 = new cGridBag();
	261	+ cGridBag row4 = new cGridBag();
	262	+ cGridBag row5 = new cGridBag();
	263	+ cGridBag row6 = new cGridBag();
	264	+
	265	+ AddSkyboxButton("mayhem", "afterrain", row0);
	266	+ AddSkyboxButton("mayhem", "aqua4", row0);
	267	+ AddSkyboxButton("mayhem", "aqua9", row0);
	268	+ AddSkyboxButton("mayhem", "flame", row0);
	269	+
	270	+ AddSkyboxButton("mayhem", "h2s", row1);
	271	+ AddSkyboxButton("mayhem", "prehistoric", row1);
	272	+ AddSkyboxButton("mayhem", "scorched", row1);
	273	+ AddSkyboxButton("penguins", "desertdawn", row1);
	274	+
	275	+ AddSkyboxButton("persson", "Citadella", row2);
	276	+ AddSkyboxButton("persson", "Citadella2", row2);
	277	+ AddSkyboxButton("persson", "clouds1", row2);
	278	+ AddSkyboxButton("penguins", "wrath", row2);
	279	+
	280	+ AddSkyboxButton("persson", "FishermansBastion", row3);
	281	+ AddSkyboxButton("persson", "HeroesSquare", row3);
	282	+ AddSkyboxButton("indoors", "DallasW", row3);
	283	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
	284	+
	285	+ AddSkyboxButton("persson", "LancellottiChapel", row4);
	286	+ AddSkyboxButton("persson", "PereaBeach1", row4);
	287	+ AddSkyboxButton("persson", "PereaBeach2", row4);
	288	+ AddSkyboxButton("persson", "redeclipse", row4);
	289	+
	290	+ AddSkyboxButton("daz", "Greenlands", row5);
	291	+ AddSkyboxButton("daz", "Oasis", row5);
	292	+ AddSkyboxButton("elyvisions", "arch3", row5);
	293	+ AddSkyboxButton("elyvisions", "calm_sea", row5);
	294	+
	295	+ AddSkyboxButton("elyvisions", "rainbow", row6);
	296	+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
	297	+ AddSkyboxButton("elyvisions", "heaven", row6);
	298	+ AddSkyboxButton("elyvisions", "hot", row6);
	299	+
	300	+ tab0.add(row0);
	301	+ tab0.add(row1);
	302	+ tab0.add(row2);
	303	+ tab0.add(row3);
	304	+ tab0.add(row4);
	305	+ tab0.add(row5);
	306	+ tab0.add(row6);
	307	+
	308	+ for (int i=5; --i>=0;)
	309	+ {
	310	+ //oe.toolboxPanel.Return();
	311	+ //tab0.add(new cGridBag());
	312	+ }
	313	+ }
	314	+
	315	+ public void CallBack(String[] path)
	316	+ {
	317	+ for (int i = 0; i < path.length; i++)
	318	+ {
	319	+ System.out.print(path[i] + "/");
	320	+ }
	321	+
	322	+ System.out.println();
	323	+ }
	324	+
	325	+ public void ChangeSkybox(String skybox)
	326	+ {
	327	+ //cameraView.envyoff = false;
	328	+ group.skyboxname = skybox;
	329	+ group.skyboxext = "jpg";
	330	+ cameraView.repaint();
	331	+
	332	+ Grafreed.ParseResources("textures", this);
	333	+ }
	334	+
26	335	//ObjEditor objEditor;
27	336	public void closeUI2()
28	337	{
..	..	@@ -60,6 +369,12 @@
60	369	this.copy = this.group = group;
61	370	//selectees = this.group.selectees;
62	371
	372	+ if (copy.versionlist == null)
	373	+ {
	374	+ copy.versionlist = new Object3D[100];
	375	+ copy.versionindex = -1;
	376	+ }
	377	+
63	378	if(ui)
64	379	SetupUI(objEditor);
65	380	}
..	..	@@ -74,16 +389,28 @@
74	389	this.copy = this.group = copy;
75	390	//selectees = this.group.selectees;
76	391
77		- SetupMenu2(objEditor);
	392	+ SetupMenu2(this); //objEditor);
78	393	SetupUI2(objEditor);
79	394	objEditor.SetupUI(true);
80	395	SetupViews(objEditor);
81	396
82	397	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	398	+
	399	+ if (copy.versionlist == null)
	400	+ {
	401	+ copy.versionlist = new Object3D[100];
	402	+ copy.versionindex = -1;
	403	+
	404	+ Save(true);
	405	+ }
83	406	}
84	407
85	408	void CloneSelection(boolean supports)
86	409	{
	410	+ if (Globals.REPLACEONMAKE)
	411	+ Save();
	412	+ boolean keep = Globals.REPLACEONMAKE;
	413	+ Globals.REPLACEONMAKE = false;
87	414	// Object3D keep = GrafreeD.clipboard;
88	415	//Object3D obj;
89	416	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,18 +421,19 @@
94	421
95	422	makeSomething(clone, i==group.selection.size()-1);
96	423	}
	424	+ Globals.REPLACEONMAKE = keep;
97	425	}
98	426
99	427	void CloneClipboard(boolean supports)
100	428	{
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));
	429	+ assert(Grafreed.clipboard.parent == null);
	430	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	431	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	432	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	433	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
106	434	else
107		- makeSomething(CloneObject(GrafreeD.clipboard, false));
108		- GrafreeD.clipboard.get(0).parent = keepparent;
	435	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	436	+ Grafreed.clipboard.get(0).parent = keepparent;
109	437	}
110	438
111	439	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -119,7 +447,7 @@
119	447	// obj.support = null;
120	448	if (!supports)
121	449	obj.SaveSupports();
122		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	450	+ Object3D clone = (Object3D)Grafreed.clone(obj);
123	451	obj.parent = parent;
124	452	// obj.support = support;
125	453	// clone.support = support; // aout 2013
..	..	@@ -148,28 +476,21 @@
148	476
149	477	//JTextField nameField;
150	478
151		- void SetupMenu2(ObjEditor oe)
	479	+ void SetupMenu2(GroupEditor oe)
152	480	{
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		-
	481	+ oe.jTree = new cTree();
	482	+
168	483	Menu menu;
169	484	oe.menuBar.add(menu = new Menu("Edit"));
170	485	//editItem = menu.add(new MenuItem("Edit"));
171	486	//editItem.addActionListener(this);
172		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	487	+
	488	+// undoItem = menu.add(new MenuItem("Undo"));
	489	+// undoItem.addActionListener(this);
	490	+// redoItem = menu.add(new MenuItem("Redo"));
	491	+// redoItem.addActionListener(this);
	492	+// menu.add("-");
	493	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
173	494	duplicateItem.addActionListener(this);
174	495	cloneItem = menu.add(new MenuItem("Clone"));
175	496	cloneItem.addActionListener(this);
..	..	@@ -185,7 +506,6 @@
185	506	copyItem.addActionListener(this);
186	507	pasteItem = menu.add(new MenuItem("Paste"));
187	508	pasteItem.addActionListener(this);
188		- menu.add("-");
189	509
190	510	menu.add("-");
191	511	pasteIntoItem = menu.add(new MenuItem("Paste into"));
..	..	@@ -197,8 +517,8 @@
197	517	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
198	518	// pasteExpandItem.addActionListener(this);
199	519	menu.add("-");
200		- clearItem = menu.add(new MenuItem("Clear"));
201		- clearItem.addActionListener(this);
	520	+ deleteItem = menu.add(new MenuItem("Delete"));
	521	+ deleteItem.addActionListener(this);
202	522
203	523	if (Globals.ADVANCED)
204	524	{
..	..	@@ -206,14 +526,97 @@
206	526	clearAllItem = menu.add(new MenuItem("Clear All"));
207	527	clearAllItem.addActionListener(this);
208	528	}
	529	+
	530	+ menuBar.add(cameraMenu = new Menu("View"));
	531	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	532	+ //zBufferItem.addActionListener(this);
	533	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	534	+ //normalLensItem.addActionListener(this);
	535	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	536	+ restoreCameraItem.addActionListener(this);
	537	+
	538	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	539	+// toggleFullScreenItem.addItemListener(this);
	540	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	541	+// cameraMenu.add("-");
	542	+//
	543	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	544	+// toggleTextureItem.addItemListener(this);
	545	+// toggleTextureItem.setState(CameraPane.textureon);
	546	+//
	547	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	548	+// toggleSwitchItem.addItemListener(this);
	549	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	550	+
	551	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	552	+ toggleHandleItem.addItemListener(this);
	553	+ toggleHandleItem.setState(CameraPane.HANDLES);
	554	+
	555	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	556	+ togglePaintItem.addItemListener(this);
	557	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	558	+
	559	+ if (Globals.ADVANCED)
	560	+ {
	561	+ cameraMenu.add("-");
	562	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	563	+ toggleLiveItem.addItemListener(this);
	564	+ toggleLiveItem.setState(Globals.isLIVE());
209	565
	566	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	567	+ stepItem.addActionListener(this);
	568	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	569	+ // toggleDLItem.addItemListener(this);
	570	+ // toggleDLItem.setState(false);
	571	+
	572	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	573	+ toggleRenderItem.addItemListener(this);
	574	+ toggleRenderItem.setState(!CameraPane.frozen);
	575	+
	576	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	577	+ toggleDebugItem.addItemListener(this);
	578	+ toggleDebugItem.setState(Globals.DEBUG);
	579	+
	580	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	581	+ toggleFrustumItem.addItemListener(this);
	582	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	583	+
	584	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	585	+ toggleFootContactItem.addItemListener(this);
	586	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	587	+
	588	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	589	+ toggleTimelineItem.addItemListener(this);
	590	+ }
	591	+
	592	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	593	+// toggleRootItem.addItemListener(this);
	594	+// toggleRootItem.setState(false);
	595	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	596	+// animationItem.addItemListener(this);
	597	+// animationItem.setState(CameraPane.ANIMATION);
	598	+ cameraMenu.add("-");
	599	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	600	+ editCameraItem.addActionListener(this);
	601	+
	602	+ if (Globals.ADVANCED)
	603	+ {
	604	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	605	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	606	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	607	+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	608	+ oe.cameraMenu.add("-");
	609	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	610	+ openWindowItem.addActionListener(this);
	611	+ editLeafItem.addActionListener(this);
	612	+ lookAtItem.addActionListener(this);
	613	+ //lookFromItem.addActinoListener(this);
	614	+ //switchViewItem.addActionListener(this);
	615	+ }
	616	+
210	617	oe.menuBar.add(menu = new Menu("Setting"));
211	618	if (Globals.ADVANCED)
212	619	{
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	620	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
218	621	revertMeshItem.addActionListener(this);
219	622	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
..	..	@@ -253,21 +656,29 @@
253	656	}
254	657
255	658	oe.menuBar.add(menu = new Menu("Group"));
256		- grabItem = menu.add(new MenuItem("Grab"));
257		- grabItem.addActionListener(this);
	659	+// grabItem = menu.add(new MenuItem("Grab"));
	660	+// grabItem.addActionListener(this);
258	661	backItem = menu.add(new MenuItem("Back"));
259	662	backItem.addActionListener(this);
260	663	frontItem = menu.add(new MenuItem("Front"));
261	664	frontItem.addActionListener(this);
262		- compositeItem = menu.add(new MenuItem("Composite"));
263		- compositeItem.addActionListener(this);
	665	+// compositeItem = menu.add(new MenuItem("Composite"));
	666	+// compositeItem.addActionListener(this);
	667	+
	668	+ if (Globals.ADVANCED)
	669	+ {
264	670	hideItem = menu.add(new MenuItem("Hidden Group"));
265	671	hideItem.addActionListener(this);
	672	+ }
266	673	ungroupItem = menu.add(new MenuItem("Ungroup"));
267	674	ungroupItem.addActionListener(this);
268		- menu.add("-");
269		- randomItem = menu.add(new MenuItem("Switch node"));
270		- randomItem.addActionListener(this);
	675	+
	676	+// menu.add("-");
	677	+//
	678	+// switchItem = menu.add(new MenuItem("Switch node"));
	679	+// switchItem.addActionListener(this);
	680	+ if (Globals.ADVANCED)
	681	+ {
271	682	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
272	683	switchGeoItem.addActionListener(this);
273	684	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -275,8 +686,6 @@
275	686	morphItem = menu.add(new MenuItem("Morph Group"));
276	687	morphItem.addActionListener(this);
277	688
278		- if (Globals.ADVANCED)
279		- {
280	689	menu.add("-");
281	690	physicsItem = menu.add(new MenuItem("Physics"));
282	691	physicsItem.addActionListener(this);
..	..	@@ -284,30 +693,29 @@
284	693	frameselectorItem.addActionListener(this);
285	694	scriptNodeItem = menu.add(new MenuItem("Script Node"));
286	695	scriptNodeItem.addActionListener(this);
287		- cameraItem = menu.add(new MenuItem("Camera"));
288		- cameraItem.addActionListener(this);
289	696	}
290	697
291	698	oe.menuBar.add(menu = new Menu("Object"));
292		- textureItem = menu.add(new MenuItem("Texture"));
293		- textureItem.addActionListener(this);
	699	+// textureItem = menu.add(new MenuItem("Texture"));
	700	+// textureItem.addActionListener(this);
294	701	billboardItem = menu.add(new MenuItem("Billboard"));
295	702	billboardItem.addActionListener(this);
296	703	csgItem = menu.add(new MenuItem("CSG"));
297	704	csgItem.addActionListener(this);
298		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	705	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
299	706	shadowXItem.addActionListener(this);
300		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	707	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
301	708	shadowYItem.addActionListener(this);
302		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	709	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
303	710	shadowZItem.addActionListener(this);
	711	+ attributeItem = menu.add(new MenuItem("Attribute"));
	712	+ attributeItem.addActionListener(this);
	713	+
304	714	if (Globals.ADVANCED)
305	715	{
306	716	menu.add("-");
307	717	linkerItem = menu.add(new MenuItem("Linker"));
308	718	linkerItem.addActionListener(this);
309		- attributeItem = menu.add(new MenuItem("Attribute"));
310		- attributeItem.addActionListener(this);
311	719	templateItem = menu.add(new MenuItem("Template"));
312	720	templateItem.addActionListener(this);
313	721	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -318,8 +726,12 @@
318	726	resetTransformItem.addActionListener(this);
319	727	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
320	728	resetCentroidItem.addActionListener(this);
321		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
322		- transformgeometryItem.addActionListener(this);
	729	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	730	+ resetCentroidXZItem.addActionListener(this);
	731	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	732	+ transformGeometryItem.addActionListener(this);
	733	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	734	+ transformChildrenItem.addActionListener(this);
323	735
324	736	oe.menuBar.add(menu = new Menu("Geometry"));
325	737	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -332,7 +744,7 @@
332	744	genNormalsMESHItem.addActionListener(this);
333	745	if (Globals.ADVANCED)
334	746	{
335		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	747	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
336	748	genNormalsMINEItem.addActionListener(this);
337	749	}
338	750	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -368,6 +780,10 @@
368	780	oe.menuBar.add(menu = new Menu("Attributes"));
369	781	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
370	782	clearMaterialsItem.addActionListener(this);
	783	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	784	+ resetAllItem.addActionListener(this);
	785	+ stepAllItem = menu.add(new MenuItem("Step All"));
	786	+ stepAllItem.addActionListener(this);
371	787	menu.add("-");
372	788	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
373	789	liveleavesItem.addActionListener(this);
..	..	@@ -388,6 +804,14 @@
388	804	markleavesItem.addActionListener(this);
389	805	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
390	806	unmarkleavesItem.addActionListener(this);
	807	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	808	+ rewindleavesItem.addActionListener(this);
	809	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	810	+ unrewindleavesItem.addActionListener(this);
	811	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	812	+ randomleavesItem.addActionListener(this);
	813	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	814	+ unrandomleavesItem.addActionListener(this);
391	815	menu.add("-");
392	816	flipVItem = menu.add(new MenuItem("Flip V"));
393	817	flipVItem.addActionListener(this);
..	..	@@ -413,50 +837,56 @@
413	837	attachBumpItem.addActionListener(this);
414	838	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
415	839	pigmentBumpItem.addActionListener(this);
	840	+ //embedTexturesItem
416	841	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
417	842	detachPigmentItem.addActionListener(this);
418	843	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
419	844	detachBumpItem.addActionListener(this);
	845	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	846	+ embedTexturesItem.addActionListener(this);
	847	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	848	+ deEmbedTexturesItem.addActionListener(this);
420	849	menu.add("-");
421	850	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
422	851	sortbysizeItem.addActionListener(this);
423	852	sortbynameItem = menu.add(new MenuItem("Sort by name"));
424	853	sortbynameItem.addActionListener(this);
	854	+ menu.add("-");
	855	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	856	+ shareGeometriesItem.addActionListener(this);
	857	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	858	+ mergeGeometriesItem.addActionListener(this);
425	859	if (Globals.ADVANCED)
426	860	{
427		- menu.add("-");
	861	+ // Pretty much the same as duplicate and clone.
428	862	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
429	863	extractGeometriesItem.addActionListener(this);
430	864	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
431	865	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	866	}
437	867
438	868	oe.menuBar.add(menu = new Menu("Insert"));
439	869	buildCreateMenu(menu);
440	870
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	871	oe.menuBar.add(menu = new Menu("Tools"));
455	872	buildToolsMenu(menu);
456	873	}
457	874
	875	+
458	876	void SetupUI2(ObjEditor oe)
459	877	{
	878	+ // June 2019
	879	+ if (oe == null)
	880	+ {
	881	+ //super.SetupUI2(this);
	882	+ //return;
	883	+ }
	884	+
	885	+ if (copy != group)
	886	+ {
	887	+ //super.SetupUI2(this);
	888	+ }
	889	+
460	890	//new Exception().printStackTrace();
461	891
462	892	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -485,97 +915,242 @@
485	915	oe.radioPanel.add(dummyButton);
486	916	oe.buttonGroup.add(dummyButton);
487	917	*/
	918	+ cGridBag copyOptionsPanel = new cGridBag();
	919	+
	920	+ copyOptionsPanel.preferredHeight = 2;
	921	+
488	922	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
489	923
490		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
491		- liveCB.setToolTipText("Enabled animation");
	924	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	925	+ //minButton.setToolTipText("Minimize window");
	926	+ //minButton.addActionListener(this);
	927	+
	928	+ if (Globals.ADVANCED)
	929	+ {
	930	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	931	+ maxButton.setToolTipText("Maximize window");
	932	+ maxButton.addActionListener(this);
	933	+ }
	934	+
	935	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	936	+ fullButton.setToolTipText("Full-screen window");
	937	+ fullButton.addActionListener(this);
	938	+
	939	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	940	+ screenfitButton.setToolTipText("Screen fit");
	941	+ screenfitButton.addActionListener(this);
	942	+
	943	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	944	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	945	+ restoreCameraButton.addActionListener(this);
	946	+
	947	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	948	+ saveVersionButton.setToolTipText("Duplicate current version");
	949	+ saveVersionButton.addActionListener(this);
	950	+
	951	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	952	+ deleteVersionButton.setToolTipText("Delete current version");
	953	+ deleteVersionButton.addActionListener(this);
	954	+
	955	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	956	+ previousVersionButton.setToolTipText("Previous version");
	957	+ previousVersionButton.addActionListener(this);
	958	+ previousVersionButton.setEnabled(false);
	959	+
	960	+ cGridBag updown = new cGridBag().setVertical(true);
	961	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	962	+ restoreButton.setToolTipText("Undo (restore current version)");
	963	+ restoreButton.addActionListener(this);
	964	+ //restoreButton.setEnabled(false);
	965	+
	966	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	967	+ replaceButton.setToolTipText("Save (replace current version)");
	968	+ replaceButton.addActionListener(this);
	969	+ //replaceButton.setEnabled(false);
	970	+
	971	+ copyOptionsPanel.add(updown);
	972	+
	973	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	974	+ nextVersionButton.setToolTipText("Next version");
	975	+ nextVersionButton.addActionListener(this);
	976	+ nextVersionButton.setEnabled(false);
	977	+
	978	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	979	+ liveCB.setToolTipText("Enable animation");
492	980	liveCB.addItemListener(this);
493	981
494		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	982	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
495	983	oneStepButton.setToolTipText("Animate one step forward");
496	984	oneStepButton.addActionListener(this);
497	985
498		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	986	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
499	987	fastCB.setToolTipText("Fast mode");
500	988	fastCB.addItemListener(this);
501	989
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);
	990	+ //oe.toolboxPanel.Return();
	991	+
	992	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	993	+// trackCB.setToolTipText("Enable tracking");
	994	+// trackCB.addItemListener(this);
509	995
510	996	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
511	997	// screenfitpointButton.addActionListener(this);
512	998
513	999	if (Globals.ADVANCED)
514	1000	{
515		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1001	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
516	1002	snapobjectButton.addActionListener(this);
517	1003	snapobjectButton.setToolTipText("Snap Object");
	1004	+
	1005	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1006	+ fourButton.addActionListener(this);
	1007	+ fourButton.setToolTipText("Show control panel only");
518	1008	}
519	1009
520		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
521		- flashSelectionButton.setToolTipText("Show selection");
522		- flashSelectionButton.addActionListener(this);
	1010	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
523	1011
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");
	1012	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1013	+ twoButton.setToolTipText("Show 3D view only");
528	1014	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");
	1015	+ this.fullscreenLayout = twoButton;
	1016	+
	1017	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1018	+ threeButton.setToolTipText("Show controls and 3D view");
537	1019	threeButton.addActionListener(this);
538		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
539		- sevenButton.setToolTipText("3-column layout");
540		- sevenButton.addActionListener(this);
	1020	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1021	+ sixButton.setToolTipText("Show 3D view and controls");
	1022	+ sixButton.addActionListener(this);
	1023	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1024	+// sevenButton.setToolTipText("3-column layout");
	1025	+// sevenButton.addActionListener(this);
541	1026	//
542	1027
543		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
544		- rootButton.setToolTipText("Edit selection in new tab");
	1028	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1029	+ rootButton.setToolTipText("Open selection in new tab");
545	1030	rootButton.addActionListener(this);
546	1031
547		- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1032	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
548	1033	closeButton.setToolTipText("Close tab");
549	1034	closeButton.addActionListener(this);
550	1035	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
551	1036	//clearButton.addActionListener(this);
552		-
553		- cGridBag commandsPanel = new cGridBag();
	1037	+
	1038	+ cGridBag row1 = new cGridBag();
554	1039
555		- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
556		- editButton.setToolTipText("Edit selection");
	1040	+ // INSERT
	1041	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1042	+ gridButton.setToolTipText("Create grid");
	1043	+ gridButton.addActionListener(this);
	1044	+
	1045	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1046	+ boxButton.setToolTipText("Create box");
	1047	+ boxButton.addActionListener(this);
	1048	+
	1049	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1050	+ sphereButton.setToolTipText("Create sphere");
	1051	+ sphereButton.addActionListener(this);
	1052	+
	1053	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1054	+ coneButton.setToolTipText("Create cone");
	1055	+ coneButton.addActionListener(this);
	1056	+
	1057	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1058	+ torusButton.setToolTipText("Create torus");
	1059	+ torusButton.addActionListener(this);
	1060	+
	1061	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1062	+ superButton.setToolTipText("Create superellipsoid");
	1063	+ superButton.addActionListener(this);
	1064	+
	1065	+ if (Globals.ADVANCED)
	1066	+ {
	1067	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1068	+ kleinButton.setToolTipText("Create Klein bottle");
	1069	+ kleinButton.addActionListener(this);
	1070	+ }
	1071	+
	1072	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1073	+ particlesButton.setToolTipText("Create particle system");
	1074	+ particlesButton.addActionListener(this);
	1075	+
	1076	+ oe.toolboxPanel.add(row1);
	1077	+
	1078	+ cGridBag row2 = new cGridBag();
	1079	+
	1080	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1081	+ groupButton.setToolTipText("Create group");
	1082	+ groupButton.addActionListener(this);
	1083	+
	1084	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1085	+ compositeButton.setToolTipText("Create composite");
	1086	+ compositeButton.addActionListener(this);
	1087	+
	1088	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1089	+ switchButton.setToolTipText("Create item switcher");
	1090	+ switchButton.addActionListener(this);
	1091	+
	1092	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1093	+ loopButton.setToolTipText("Create loop");
	1094	+ loopButton.addActionListener(this);
	1095	+
	1096	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1097	+ textureButton.setToolTipText("Create texture");
	1098	+ textureButton.addActionListener(this);
	1099	+
	1100	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1101	+ overlayButton.setToolTipText("Create overlay");
	1102	+ overlayButton.addActionListener(this);
	1103	+
	1104	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1105	+ lightButton.setToolTipText("Create light");
	1106	+ lightButton.addActionListener(this);
	1107	+
	1108	+ oe.toolboxPanel.add(row2);
	1109	+
	1110	+ // ENVYMAPS
	1111	+ cGridBag skyboxpane = new cGridBag();
	1112	+ skyboxpane.preferredHeight = 100;
	1113	+
	1114	+ oe.toolboxPanel.add(skyboxpane);
	1115	+
	1116	+ JTabbedPane skyboxpanel = new JTabbedPane();
	1117	+ skyboxpane.add(skyboxpanel);
	1118	+
	1119	+ AddSkyboxTab0(skyboxpanel);
	1120	+ AddSkyboxTab1(skyboxpanel);
	1121	+ AddSkyboxTab2(skyboxpanel);
	1122	+ AddSkyboxTab3(skyboxpanel);
	1123	+
	1124	+ // EDIT panel
	1125	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1126	+ editButton.setToolTipText("Pin selection controls");
557	1127	editButton.addActionListener(this);
558	1128
559		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
560		- uneditButton.setToolTipText("Unedit selection");
	1129	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1130	+ uneditButton.setToolTipText("Unpin and remove selection controls");
561	1131	uneditButton.addActionListener(this);
562	1132
563		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
564		- allParamsButton.setToolTipText("Edit all params");
	1133	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1134	+ allParamsButton.setToolTipText("Show all controle");
565	1135	allParamsButton.addActionListener(this);
566	1136
567		- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1137	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
568	1138	clearPanelButton.setToolTipText("Clear edit panel");
569	1139	clearPanelButton.addActionListener(this);
570	1140
571		- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1141	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
572	1142	unselectButton.setToolTipText("Unselect");
573	1143	unselectButton.addActionListener(this);
574	1144
575		- commandsPanel.preferredHeight = 1;
	1145	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1146	+ flashSelectionButton.setToolTipText("Highlight selection");
	1147	+ flashSelectionButton.addActionListener(this);
576	1148
577		- oe.treePanel.add(commandsPanel);
578		- oe.treePanel.Return();
	1149	+ editCommandsPanel.preferredHeight = 1;
	1150	+
	1151	+ SetPinStates(false);
	1152	+// oe.treePanel.add(commandsPanel);
	1153	+// oe.treePanel.Return();
579	1154
580	1155	// oe.aConstraints.gridx += 1;
581	1156	// oe.aConstraints.weighty = 0;
..	..	@@ -592,32 +1167,20 @@
592	1167
593	1168	JScrollPane jSP;
594	1169	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
595		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1170	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
596	1171	ResetModel();
597	1172
598	1173	oe.treePanel.add(jSPPanel);
599	1174	oe.treePanel.Return();
600	1175
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	1176	oe.treePanel.add(copyOptionsPanel);
617	1177	oe.treePanel.Return();
	1178	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1179	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1180	+ sliderPane.preferredHeight = 1;
618	1181
619		-// mainPanel.setDividerLocation(0.5); //1.0);
620		-// mainPanel.setResizeWeight(0.5);
	1182	+// mainPanel.setDividerLocation(0.1); //1.0);
	1183	+ mainPanel.setResizeWeight(0.4);
621	1184
622	1185	//jList.addListSelectionListener(this);
623	1186	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -625,7 +1188,7 @@
625	1188	//jTree.setEditable(true);
626	1189	oe.jTree.setDragEnabled(true);
627	1190	//jTree.setPreferredSize(new Dimension(10,10));
628		- jSP.setPreferredSize(new Dimension(100,200));
	1191	+ //jSP.setPreferredSize(new Dimension(100,200));
629	1192
630	1193	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
631	1194
..	..	@@ -637,29 +1200,49 @@
637	1200	dgr.addDragGestureListener(this);
638	1201	}catch(Exception e) {}
639	1202	*/
640		- radio.layout = sevenButton;
	1203	+ radio.layout = threeButton; // sixButton;
641	1204	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
642	1205	}
643	1206
644	1207	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
645	1208	{
	1209	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1210	+ colorCB.setToolTipText("Copy color when dropped");
	1211	+ colorCB.addItemListener(this);
	1212	+
	1213	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1214	+ materialCB.setToolTipText("Copy material when dropped");
	1215	+ materialCB.addItemListener(this);
	1216	+
	1217	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1218	+ textureCB.setToolTipText("Copy texture when dropped");
	1219	+ textureCB.addItemListener(this);
	1220	+
	1221	+ panel.Return();
	1222	+
646	1223	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
647	1224	boxCB.setToolTipText("Display bounding boxes");
648	1225	boxCB.addItemListener(this);
649	1226
650	1227	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
651		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1228	+ zoomBoxCB.setToolTipText("Display only for wheel");
652	1229	zoomBoxCB.addItemListener(this);
653	1230
654		- if (Globals.ADVANCED)
	1231	+ if (true) // Globals.ADVANCED)
655	1232	{
656		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
657		- supportCB.setToolTipText("Enable rigging");
658		- supportCB.addItemListener(this);
	1233	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1234	+// supportCB.setToolTipText("Enable rigging");
	1235	+// supportCB.addItemListener(this);
	1236	+
	1237	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1238	+ freezeCB.setToolTipText("Fast moving camera");
	1239	+ freezeCB.addItemListener(this);
659	1240
660	1241	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
661	1242	// localCB.addItemListener(this);
662	1243
	1244	+ panel.Return();
	1245	+
663	1246	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
664	1247	crowdCB.setToolTipText("Used for crowds");
665	1248	crowdCB.addItemListener(this);
..	..	@@ -668,14 +1251,19 @@
668	1251	smoothCB.setToolTipText("Snapping delay");
669	1252	smoothCB.addItemListener(this);
670	1253
671		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
672		- slowCB.setToolTipText("Smooth interpolation");
673		- slowCB.addItemListener(this);
	1254	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1255	+// slowCB.setToolTipText("Smooth interpolation");
	1256	+// slowCB.addItemListener(this);
	1257	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1258	+ minshaderCB.setToolTipText("Minimal fast shader");
	1259	+ minshaderCB.addItemListener(this);
674	1260
675	1261	// constraints.gridy += 1;
676	1262	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
677	1263	// speakerMocapCB.addItemListener(this);
678	1264
	1265	+ panel.Return();
	1266	+
679	1267	if (false)
680	1268	{
681	1269	// handled in scripts
..	..	@@ -690,42 +1278,85 @@
690	1278	//constraints.gridy += 1;
691	1279	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
692	1280	smoothfocusCB.addItemListener(this);
	1281	+ panel.Return();
693	1282	}
694	1283
695	1284	//constraints.gridx += 1;
696	1285	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
697	1286	// debugCB.addItemListener(this);
698	1287
	1288	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1289	+ trackCB.setToolTipText("Enable tracking target");
	1290	+ trackCB.addItemListener(this);
	1291	+
699	1292	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1293	+ oeilCB.setToolTipText("Move camera when tracking");
700	1294	oeilCB.addItemListener(this);
701	1295
	1296	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1297	+ shadowCB.setToolTipText("When live compute shadows");
	1298	+ shadowCB.addItemListener(this);
	1299	+
	1300	+ panel.Return();
	1301	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1302	+ toggleTextureCB.setToolTipText("Load textures");
	1303	+ toggleTextureCB.addItemListener(this);
	1304	+
	1305	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1306	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1307	+ toggleSwitchCB.addItemListener(this);
	1308	+
	1309	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1310	+ autokeepCB.setToolTipText("On structure change");
	1311	+ autokeepCB.addItemListener(this);
	1312	+
	1313	+ panel.Return();
	1314	+ if (Globals.ADVANCED)
	1315	+ {
702	1316	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
703	1317	lookAtCB.setToolTipText("Look-at target");
704	1318	lookAtCB.addItemListener(this);
	1319	+ }
705	1320
706	1321	}
707	1322
708	1323	cGridBag fill = new cGridBag();
709		-
710	1324	fill.preferredHeight = 200;
	1325	+ cGridBag fill2 = new cGridBag();
	1326	+ fill2.preferredHeight = 200;
	1327	+ cGridBag fill3 = new cGridBag();
	1328	+ fill3.preferredHeight = 200;
711	1329
712	1330	panel.add(fill);
	1331	+ panel.add(fill2);
	1332	+ panel.add(fill3);
713	1333
714	1334	}
715	1335
716	1336	void EditObject(Object3D obj)
717	1337	{
718	1338	cRadio radioButton = new cRadio(obj.name);
	1339	+
	1340	+ // June 2019. Patch to avoid bug with transparency.
	1341	+ radioButton.hadMaterial = obj.material != null;
	1342	+ if (!radioButton.hadMaterial)
	1343	+ {
	1344	+ obj.material = new cMaterial();
	1345	+ }
	1346	+
719	1347	radioButton.SetObject(obj);
720		- radioButton.layout = sevenButton;
	1348	+ radioButton.layout = threeButton; // sixButton;
721	1349	radioButton.SetCamera(cameraView.renderCamera, false);
722	1350	radioButton.addActionListener(this);
723	1351	radioPanel.add(radioButton);
724	1352	buttonGroup.add(radioButton);
725	1353	radioButton.doClick();
726	1354	}
	1355	+
727	1356	void SetupViews(ObjEditor oe)
728	1357	{
	1358	+ theFrame = this;
	1359	+
729	1360	oe.SetupViews();
730	1361
731	1362	System.out.println("SetupViews");
..	..	@@ -734,23 +1365,30 @@
734	1365	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
735	1366	}
736	1367
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;
	1368	+ cToggleButton liveCB;
	1369	+ cCheckBox supportCB;
	1370	+ cCheckBox localCB;
	1371	+ cCheckBox crowdCB;
	1372	+ cCheckBox smoothCB;
	1373	+ cCheckBox minshaderCB;
	1374	+
	1375	+ cToggleButton fastCB;
	1376	+ cCheckBox slowCB;
	1377	+ cCheckBox boxCB;
	1378	+ cCheckBox zoomBoxCB;
	1379	+ cCheckBox freezeCB;
	1380	+ //cToggleButton trackCB;
	1381	+ cCheckBox trackCB;
	1382	+ cCheckBox smoothfocusCB;
748	1383	// JCheckBox speakerMocapCB;
749		- JCheckBox speakerCameraCB;
750		- JCheckBox speakerFocusCB;
751		- JCheckBox debugCB;
752		- JCheckBox oeilCB;
753		- JCheckBox lookAtCB;
	1384	+ cCheckBox speakerCameraCB;
	1385	+ cCheckBox speakerFocusCB;
	1386	+ cCheckBox debugCB;
	1387	+
	1388	+ cCheckBox oeilCB;
	1389	+ cCheckBox shadowCB;
	1390	+ cCheckBox autokeepCB;
	1391	+ cCheckBox lookAtCB;
754	1392
755	1393	// static int COLOR = 1;
756	1394	// static int MATERIAL = 2;
..	..	@@ -758,9 +1396,9 @@
758	1396
759	1397	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
760	1398
761		- JCheckBox colorCB;
762		- JCheckBox materialCB;
763		- JCheckBox textureCB;
	1399	+ cCheckBox colorCB;
	1400	+ cCheckBox materialCB;
	1401	+ cCheckBox textureCB;
764	1402
765	1403	public void itemStateChanged(ItemEvent e)
766	1404	{
..	..	@@ -788,6 +1426,7 @@
788	1426	} else if(e.getSource() == liveCB)
789	1427	{
790	1428	cameraView.ToggleLive();
	1429	+ refreshContents(false);
791	1430	}
792	1431	else if(e.getSource() == supportCB)
793	1432	{
..	..	@@ -803,6 +1442,12 @@
803	1442	{
804	1443	cameraView.ToggleInertia();
805	1444	cameraView.repaint();
	1445	+ }
	1446	+ else if(e.getSource() == minshaderCB)
	1447	+ {
	1448	+ Globals.MINSHADER ^= true;
	1449	+ cameraView.programInitialized = false;
	1450	+ cameraView.repaint();
806	1451	}
807	1452	else if(e.getSource() == localCB)
808	1453	{
..	..	@@ -852,6 +1497,18 @@
852	1497	{
853	1498	cameraView.ToggleOeil();
854	1499	}
	1500	+ else if(e.getSource() == shadowCB)
	1501	+ {
	1502	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1503	+ }
	1504	+ else if(e.getSource() == freezeCB)
	1505	+ {
	1506	+ Globals.FREEZEONMOVE ^= true;
	1507	+ }
	1508	+ else if(e.getSource() == autokeepCB)
	1509	+ {
	1510	+ Globals.REPLACEONMAKE ^= true;
	1511	+ }
855	1512	else if(e.getSource() == lookAtCB)
856	1513	{
857	1514	cameraView.ToggleLookAt();
..	..	@@ -868,7 +1525,8 @@
868	1525
869	1526	/**/
870	1527	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
871		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1528	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1529	+ TreePath path = objEditor.jTree.getSelectionPath();
872	1530	if ((path == null) \|\| (path.getPathCount() <= 1)) {
873	1531	// We can't move the root node or an empty selection
874	1532	return;
..	..	@@ -931,8 +1589,6 @@
931	1589	}
932	1590	}
933	1591
934		- String string = (String) object;
935		-
936	1592	System.out.println("Transfer = " + object + "; drop : " + target);
937	1593	// if( object instanceof java.io.File[])
938	1594	// {
..	..	@@ -940,7 +1596,11 @@
940	1596	// objEditor.DropFile((java.io.File[]) object, true);
941	1597	// return;
942	1598	// }
943		- if (string.charAt(0) == '/')
	1599	+
	1600	+ String string = object.toString();
	1601	+
	1602	+ // File path for Mac and Windows
	1603	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
944	1604	{
945	1605	// file(s)
946	1606	String[] names = string.split("\n");
..	..	@@ -967,7 +1627,7 @@
967	1627
968	1628	flashIt = false;
969	1629	CameraPane pane = (CameraPane) target;
970		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1630	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
971	1631	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
972	1632
973	1633	if (group.selection.size() == 1)
..	..	@@ -983,23 +1643,33 @@
983	1643
984	1644	assert target == objEditor.jTree;
985	1645	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1646	+ Object3D destinationLeaf;
986	1647	try {
987		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1648	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
988	1649	} catch (Exception e) {
989	1650	System.out.println("destinationPath : " + destinationPath);
990	1651	return;
991	1652	}
992	1653
993		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1654	+ for (int i=group.selection.size(); --i>=0;)
994	1655	{
	1656	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1657	+
	1658	+ // Cannot move into itself
	1659	+ if (child == destinationLeaf)
	1660	+ return;
	1661	+ }
	1662	+
	1663	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1664	+// {
995	1665	loadClipboard(true);
996	1666	objEditor.jTree.setSelectionPath(destinationPath);
997	1667	pasteInto(false, false);
998		- } else {
999		- loadClipboard(false);
1000		- objEditor.jTree.setSelectionPath(destinationPath);
1001		- pasteInto(false, false); // true); // ???
1002		- }
	1668	+// } else {
	1669	+// loadClipboard(false);
	1670	+// objEditor.jTree.setSelectionPath(destinationPath);
	1671	+// pasteInto(false, false); // true); // ???
	1672	+// }
1003	1673	}
1004	1674	public void dropActionChanged(DropTargetDragEvent dtde)
1005	1675	// Called if the user has modified the current drop gesture
..	..	@@ -1104,22 +1774,30 @@
1104	1774	{
1105	1775	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1106	1776	//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);
	1777	+// gridItem = menu.add(new MenuItem("Grid"));
	1778	+// gridItem.addActionListener(this);
	1779	+// rectoidItem = menu.add(new MenuItem("Box"));
	1780	+// rectoidItem.addActionListener(this);
	1781	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1782	+// ellipsoidItem.addActionListener(this);
	1783	+// coneItem = menu.add(new MenuItem("Cone"));
	1784	+// coneItem.addActionListener(this);
	1785	+// torusItem = menu.add(new MenuItem("Torus"));
	1786	+// torusItem.addActionListener(this);
	1787	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1788	+// superItem.addActionListener(this);
	1789	+
	1790	+ cameraItem = menu.add(new MenuItem("Camera"));
	1791	+ cameraItem.addActionListener(this);
	1792	+
	1793	+ if (!Globals.ADVANCED)
	1794	+ {
1119	1795	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1120	1796	kleinItem.addActionListener(this);
1121		- particleItem = menu.add(new MenuItem("Particle system"));
1122		- particleItem.addActionListener(this);
	1797	+ }
	1798	+
	1799	+// particleItem = menu.add(new MenuItem("Particle system"));
	1800	+// particleItem.addActionListener(this);
1123	1801	if (Globals.ADVANCED)
1124	1802	{
1125	1803	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1145,15 +1823,15 @@
1145	1823	}
1146	1824	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1147	1825	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);
	1826	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1827	+// overlayItem.addActionListener(this);
	1828	+// lightItem = menu.add(new MenuItem("Light"));
	1829	+// lightItem.addActionListener(this);
1152	1830	menu.add("-");
1153	1831	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1154	1832	//superLoopItem.addActionListener(this);
1155		- loopItem = menu.add(new MenuItem("Loop"));
1156		- loopItem.addActionListener(this);
	1833	+// loopItem = menu.add(new MenuItem("Loop"));
	1834	+// loopItem.addActionListener(this);
1157	1835	doubleItem = menu.add(new MenuItem("Fork"));
1158	1836	doubleItem.addActionListener(this);
1159	1837	if (Globals.ADVANCED)
..	..	@@ -1169,6 +1847,9 @@
1169	1847	animationItem.addItemListener(this);
1170	1848	animationItem.setState(Globals.ANIMATION);
1171	1849
	1850	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1851	+ archiveItem.addActionListener(this);
	1852	+
1172	1853	menu.add("-");
1173	1854	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1174	1855	parseverticesItem.addActionListener(this);
..	..	@@ -1181,6 +1862,8 @@
1181	1862	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1182	1863	reduce34MorphItem.addActionListener(this);
1183	1864	menu.add("-");
	1865	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1866	+ memoryItem.addActionListener(this);
1184	1867	menu.add(computeAOItem = new MenuItem("Compute AO"));
1185	1868	computeAOItem.addActionListener(this);
1186	1869
..	..	@@ -1189,11 +1872,9 @@
1189	1872	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1190	1873	mirrorItem.addActionListener(this);
1191	1874	menu.add("-");
1192		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1193		- memoryItem.addActionListener(this);
1194	1875	menu.add(analyzeItem = new MenuItem("Analyze"));
1195	1876	analyzeItem.addActionListener(this);
1196		- menu.add(dumpItem = new MenuItem("Dump"));
	1877	+ menu.add(dumpItem = new MenuItem("Print"));
1197	1878	dumpItem.addActionListener(this);
1198	1879	// menu.add(pathItem = new MenuItem("From-to path"));
1199	1880	// pathItem.addActionListener(this);
..	..	@@ -1334,9 +2015,34 @@
1334	2015	shadow.material = new cMaterial(obj.material);
1335	2016	shadow.material.diffuse = 0.0001f;
1336	2017	shadow.material.specular = 0.0001f;
	2018	+ //shadow.projectedVertices[1].x = 300;
1337	2019
1338	2020	makeSomething(shadow);
1339	2021	}
	2022	+
	2023	+ private void ClearUnpinned()
	2024	+ {
	2025	+ //for (Object3D obj : listUI)
	2026	+ for (int i=listUI.size(); --i>=0;)
	2027	+ {
	2028	+ Object3D obj = listUI.elementAt(i);
	2029	+ if (!obj.pinned)
	2030	+ {
	2031	+ obj.CloseUI();
	2032	+ listUI.remove(i);
	2033	+ }
	2034	+ }
	2035	+ }
	2036	+
	2037	+ private void EditElement(Object3D elem, boolean newWindow)
	2038	+ {
	2039	+ // if (!(elem instanceof Composite))
	2040	+ // newWindow = false;
	2041	+ listUI.add(elem);
	2042	+ elem.openEditWindow(this, newWindow); //, false);
	2043	+ System.out.println("edit : " + elem);
	2044	+ elem.editWindow.refreshContents(true); // ? new
	2045	+ }
1340	2046
1341	2047	/**
1342	2048	* applyExample
..	..	@@ -1540,9 +2246,9 @@
1540	2246
1541	2247	void Overwrite(int mask)
1542	2248	{
1543		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2249	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1544	2250	{
1545		- Object3D content = GrafreeD.clipboard.get(0);
	2251	+ Object3D content = Grafreed.clipboard.get(0);
1546	2252
1547	2253	if (content instanceof cGroup && ((cGroup)content).transientlink )
1548	2254	content = ((cGroup)content).get(0);
..	..	@@ -1581,7 +2287,7 @@
1581	2287	{
1582	2288	ScreenFit();
1583	2289	} else
1584		- if (source == switchItem)
	2290	+ if (source == switchViewItem)
1585	2291	{
1586	2292	cVector v1 = new cVector();
1587	2293	cVector v2 = new cVector();
..	..	@@ -1590,11 +2296,11 @@
1590	2296	objEditor.cameraView.renderCamera.setAim(v2, v1);
1591	2297	objEditor.cameraView.repaint();
1592	2298	} else
1593		- if (source == rectoidItem)
	2299	+ if (source == rectoidItem \|\| source == boxButton)
1594	2300	{
1595	2301	makeSomething(new Box());
1596	2302	} else
1597		- if (source == particleItem)
	2303	+ if (source == particleItem \|\| source == particlesButton)
1598	2304	{
1599	2305	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1600	2306	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1673,27 +2379,27 @@
1673	2379
1674	2380	makeSomething(obj);
1675	2381	} else
1676		- if (source == gridItem)
	2382	+ if (source == gridItem \|\| source == gridButton)
1677	2383	{
1678	2384	makeSomething(new Grid());
1679	2385	} else
1680		- if (source == ellipsoidItem)
	2386	+ if (source == ellipsoidItem \|\| source == sphereButton)
1681	2387	{
1682	2388	makeSomething(new Sphere());
1683	2389	} else
1684		- if (source == coneItem)
	2390	+ if (source == coneItem \|\| source == coneButton)
1685	2391	{
1686	2392	makeSomething(new Cone());
1687	2393	} else
1688		- if (source == torusItem)
	2394	+ if (source == torusItem \|\| source == torusButton)
1689	2395	{
1690	2396	makeSomething(new Torus());
1691	2397	} else
1692		- if (source == superItem)
	2398	+ if (source == superItem \|\| source == superButton)
1693	2399	{
1694	2400	makeSomething(new Superellipsoid());
1695	2401	} else
1696		- if (source == kleinItem)
	2402	+ if (source == kleinItem \|\| source == kleinButton)
1697	2403	{
1698	2404	makeSomething(new Klein());
1699	2405	} else
..	..	@@ -1713,7 +2419,7 @@
1713	2419	{
1714	2420	makeSomething(new BezierSurface());
1715	2421	} else
1716		- if (source == overlayItem)
	2422	+ if (source == overlayItem \|\| source == overlayButton)
1717	2423	{
1718	2424	/*
1719	2425	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1761,10 +2467,27 @@
1761	2467	s.setup();
1762	2468	makeSomething(s);
1763	2469	} else
1764		- if (source == lightItem)
	2470	+ if (source == lightItem \|\| source == lightButton)
1765	2471	{
1766	2472	makeSomething(new Light());
1767	2473	} else
	2474	+// if (source == skybox1Button \|\|
	2475	+// source == skybox2Button \|\|
	2476	+// source == skybox3Button \|\|
	2477	+// source == skybox4Button \|\|
	2478	+// source == skybox5Button \|\|
	2479	+// source == skybox6Button \|\|
	2480	+// source == skybox7Button \|\|
	2481	+// source == skybox11Button \|\|
	2482	+// source == skybox12Button \|\|
	2483	+// source == skybox13Button \|\|
	2484	+// source == skybox14Button \|\|
	2485	+// source == skybox15Button \|\|
	2486	+// source == skybox16Button \|\|
	2487	+// source == skybox17Button)
	2488	+// {
	2489	+// ChangeSkybox(source);
	2490	+// } else
1768	2491	if (source == csgItem)
1769	2492	{
1770	2493	group(new CSG());
..	..	@@ -1811,30 +2534,30 @@
1811	2534
1812	2535	group(g);
1813	2536	} else
1814		- if (source == loopItem)
	2537	+ if (source == loopItem \|\| source == loopButton)
1815	2538	{
1816	2539	Composite csg = new GroupLeaf();
1817	2540	csg.count = 5;
1818	2541	group(csg);
1819		- Composite child = new cGroup();
	2542	+ Composite child = new cGroup("Branch");
1820	2543	csg.addChild(child);
1821	2544	child.addChild(csg);
1822	2545	} else
1823	2546	if (source == doubleItem)
1824	2547	{
1825		- Composite csg = new GroupLeaf();
	2548	+ Composite csg = new GroupLeaf("Fork");
1826	2549	csg.count = 5;
1827	2550	group(csg);
1828		- Composite child = new cGroup();
	2551	+ Composite child = new cGroup("Branch A");
1829	2552	csg.addChild(child);
1830	2553	child.addChild(csg);
1831		- child = new cGroup();
	2554	+ child = new cGroup("Branch B");
1832	2555	csg.addChild(child);
1833	2556	child.addChild(csg);
1834	2557	} else
1835	2558	if (source == tripleItem)
1836	2559	{
1837		- Composite csg = new GroupLeaf();
	2560	+ Composite csg = new GroupLeaf("Trident");
1838	2561	csg.count = 4;
1839	2562	group(csg);
1840	2563	Composite child = new cGroup();
..	..	@@ -1847,35 +2570,10 @@
1847	2570	csg.addChild(child);
1848	2571	child.addChild(csg);
1849	2572	} 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	2573	if (source == computeAOItem)
1876	2574	{
1877	2575	Globals.drawMode = CameraPane.OCCLUSION;
1878		- Globals.theRenderer.repaint();
	2576	+ cameraView.repaint();
1879	2577	} else
1880	2578	if (source == recompileItem)
1881	2579	{
..	..	@@ -1890,7 +2588,7 @@
1890	2588	if (source == invariantsItem)
1891	2589	{
1892	2590	System.out.println("Invariants:");
1893		- GrafreeD.grafreeD.universe.invariants();
	2591	+ Grafreed.grafreed.universe.invariants();
1894	2592	} else
1895	2593	if (source == memoryItem)
1896	2594	{
..	..	@@ -1909,6 +2607,53 @@
1909	2607	{
1910	2608	DumpObject();
1911	2609	} else
	2610	+ if (source == minButton)
	2611	+ {
	2612	+ Minimize();
	2613	+ } else
	2614	+ if (source == maxButton)
	2615	+ {
	2616	+ Maximize();
	2617	+ } else
	2618	+ if (source == fullButton)
	2619	+ {
	2620	+ ToggleFullScreen();
	2621	+ } else
	2622	+ if (source == previousVersionButton)
	2623	+ {
	2624	+ // Go to previous version
	2625	+ //if (!Undo())
	2626	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2627	+ PreviousVersion();
	2628	+ } else
	2629	+ if (source == restoreButton)
	2630	+ {
	2631	+ // Restore current version
	2632	+ Restore();
	2633	+ //restoreButton.setEnabled(false);
	2634	+ } else
	2635	+ if (source == replaceButton)
	2636	+ {
	2637	+ // Overwrite current version
	2638	+ Replace();
	2639	+ //replaceButton.setEnabled(false);
	2640	+ } else
	2641	+ if (source == nextVersionButton)
	2642	+ {
	2643	+ // Go to next version
	2644	+ NextVersion();
	2645	+ } else
	2646	+ if (source == saveVersionButton)
	2647	+ {
	2648	+ // Save a new version
	2649	+ if (!Save(true))
	2650	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2651	+ } else
	2652	+ if (source == deleteVersionButton)
	2653	+ {
	2654	+ // Delete a new version
	2655	+ DeleteVersion();
	2656	+ } else
1912	2657	if (source == oneStepButton)
1913	2658	{
1914	2659	Globals.ONESTEP = true;
..	..	@@ -1916,17 +2661,14 @@
1916	2661	} else
1917	2662	if (source == screenfitButton)
1918	2663	{
1919		- //Reload(lastConverter, lastFilename, true);
1920	2664	ScreenFit();
1921	2665	} else
1922	2666	if (source == screenfitpointButton)
1923	2667	{
1924		- //Reload(lastConverter, lastFilename, true);
1925	2668	ScreenFitPoint();
1926	2669	} else
1927	2670	if (source == snapobjectButton)
1928	2671	{
1929		- //Reload(lastConverter, lastFilename, true);
1930	2672	SnapObject();
1931	2673	} else
1932	2674	// if (event.getSource() == recompileButton)
..	..	@@ -1963,12 +2705,20 @@
1963	2705	{
1964	2706	loadClipboard(true);
1965	2707	} else
	2708	+ if (source == undoItem)
	2709	+ {
	2710	+ PreviousVersion();
	2711	+ } else
	2712	+ if (source == redoItem)
	2713	+ {
	2714	+ NextVersion();
	2715	+ } else
1966	2716	if (source == duplicateItem)
1967	2717	{
1968		- Object3D keep = GrafreeD.clipboard;
	2718	+ Object3D keep = Grafreed.clipboard;
1969	2719	loadClipboard(false);
1970	2720	paste(false);
1971		- GrafreeD.clipboard = keep;
	2721	+ Grafreed.clipboard = keep;
1972	2722	} else
1973	2723	if (source == cloneItem)
1974	2724	{
..	..	@@ -2188,9 +2938,9 @@
2188	2938	// group.selection.get(0).setMasterThis(content); // should be identity
2189	2939	// refreshContents();
2190	2940	// }
2191		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2941	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2192	2942	{
2193		- Object3D content = GrafreeD.clipboard.get(0);
	2943	+ Object3D content = Grafreed.clipboard.get(0);
2194	2944
2195	2945	if (content instanceof cGroup && ((cGroup)content).transientlink )
2196	2946	content = ((cGroup)content).get(0);
..	..	@@ -2240,9 +2990,9 @@
2240	2990	} else
2241	2991	if (source == setMasterItem)
2242	2992	{
2243		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2993	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2244	2994	{
2245		- Object3D content = GrafreeD.clipboard.get(0);
	2995	+ Object3D content = Grafreed.clipboard.get(0);
2246	2996
2247	2997	if (content instanceof cGroup && ((cGroup)content).transientlink )
2248	2998	content = ((cGroup)content).get(0);
..	..	@@ -2255,9 +3005,9 @@
2255	3005	{
2256	3006	if (group.selection.size() == 1)
2257	3007	{
2258		- if (GrafreeD.clipboard.size() == 1)
	3008	+ if (Grafreed.clipboard.size() == 1)
2259	3009	{
2260		- Object3D content = GrafreeD.clipboard.get(0);
	3010	+ Object3D content = Grafreed.clipboard.get(0);
2261	3011
2262	3012	if (content instanceof cGroup && ((cGroup)content).transientlink )
2263	3013	content = ((cGroup)content).get(0);
..	..	@@ -2274,7 +3024,7 @@
2274	3024	{
2275	3025	RevertMeshes();
2276	3026	} else
2277		- if (source == resetMeshItem)
	3027	+ if (source == resetAllItem)
2278	3028	{
2279	3029	ResetAll();
2280	3030	} else
..	..	@@ -2282,7 +3032,7 @@
2282	3032	{
2283	3033	StepAll();
2284	3034	} else
2285		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3035	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2286	3036	{
2287	3037	//int indices[] = jList.getSelectedIndices();
2288	3038	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2294,9 +3044,9 @@
2294	3044	{
2295	3045	ClearSelection(true);
2296	3046	} else
2297		- if (source == grabItem)
	3047	+ if (source == grabItem \|\| source == groupButton)
2298	3048	{
2299		- group(new cGroup(), true);
	3049	+ group(new cGroup(), false); // true);
2300	3050	} else
2301	3051	if (source == hideItem)
2302	3052	{
..	..	@@ -2314,11 +3064,11 @@
2314	3064	{
2315	3065	makeSomething(new Camera());
2316	3066	} else
2317		- if (source == compositeItem)
	3067	+ if (source == compositeItem \|\| source == compositeButton)
2318	3068	{
2319	3069	group(new Composite());
2320	3070	} else
2321		- if (source == randomItem)
	3071	+ if (source == switchItem \|\| source == switchButton)
2322	3072	{
2323	3073	RandomNode random = new RandomNode();
2324	3074	group(random);
..	..	@@ -2420,7 +3170,7 @@
2420	3170	{
2421	3171	group(new cLinker());
2422	3172	} else
2423		- if (source == textureItem)
	3173	+ if (source == textureItem \|\| source == textureButton)
2424	3174	{
2425	3175	group(new TextureNode());
2426	3176	} else
..	..	@@ -2440,17 +3190,30 @@
2440	3190	{
2441	3191	CastShadow(2);
2442	3192	} else
2443		- if (source == ungroupItem)
	3193	+ if (source == ungroupItem \|\| source == ungroupButton)
2444	3194	{
2445		- //ungroup();
	3195	+ boolean hasRoot = false;
	3196	+
2446	3197	for (int i=0; i<group.selection.size(); i++)
2447	3198	{
2448		- Ungroup(group.selection.get(i));
	3199	+ if (group.selection.get(i) == group)
	3200	+ {
	3201	+ hasRoot = true;
	3202	+ break;
	3203	+ }
2449	3204	}
2450	3205
2451		- ClearSelection(false);
2452		-
2453		- refreshContents();
	3206	+ if (!hasRoot)
	3207	+ {
	3208	+ for (int i=0; i<group.selection.size(); i++)
	3209	+ {
	3210	+ Ungroup(group.selection.get(i));
	3211	+ }
	3212	+
	3213	+ ClearSelection(false);
	3214	+
	3215	+ refreshContents();
	3216	+ }
2454	3217	} else
2455	3218	if (source == genUVItem)
2456	3219	{
..	..	@@ -2462,7 +3225,7 @@
2462	3225	} else
2463	3226	if (source == genNormalsMESHItem)
2464	3227	{
2465		- GenNormals(true); // TODO
	3228	+ GenNormalsMESH();
2466	3229	} else
2467	3230	if (source == genNormalsORGANItem)
2468	3231	{
..	..	@@ -2527,6 +3290,22 @@
2527	3290	if (source == unmarkleavesItem)
2528	3291	{
2529	3292	MarkLeaves(false);
	3293	+ } else
	3294	+ if (source == rewindleavesItem)
	3295	+ {
	3296	+ RewindLeaves(true);
	3297	+ } else
	3298	+ if (source == unrewindleavesItem)
	3299	+ {
	3300	+ RewindLeaves(false);
	3301	+ } else
	3302	+ if (source == randomleavesItem)
	3303	+ {
	3304	+ RandomLeaves(true);
	3305	+ } else
	3306	+ if (source == unrandomleavesItem)
	3307	+ {
	3308	+ RandomLeaves(false);
2530	3309	} else
2531	3310	if (source == flipVItem)
2532	3311	{
..	..	@@ -2612,9 +3391,13 @@
2612	3391	{
2613	3392	SmoothMesh();
2614	3393	} else
2615		- if (source == transformgeometryItem)
	3394	+ if (source == transformGeometryItem)
2616	3395	{
2617	3396	TransformGeometry();
	3397	+ } else
	3398	+ if (source == transformChildrenItem)
	3399	+ {
	3400	+ TransformChildren();
2618	3401	} else
2619	3402	if (source == resetTransformItem)
2620	3403	{
..	..	@@ -2622,7 +3405,11 @@
2622	3405	} else
2623	3406	if (source == resetCentroidItem)
2624	3407	{
2625		- ResetCentroid();
	3408	+ ResetCentroid(true);
	3409	+ } else
	3410	+ if (source == resetCentroidXZItem)
	3411	+ {
	3412	+ ResetCentroid(false);
2626	3413	} else
2627	3414	if (source == resetParentItem)
2628	3415	{
..	..	@@ -2727,7 +3514,7 @@
2727	3514	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2728	3515	{
2729	3516	obj = (Object3D)e.nextElement();
2730		- obj.SetBumpTexture(null);
	3517	+ obj.ResetBumpTexture();
2731	3518	}
2732	3519
2733	3520	refreshContents();
..	..	@@ -2743,6 +3530,31 @@
2743	3530
2744	3531	refreshContents();
2745	3532	} else
	3533	+ if (source == embedTexturesItem)
	3534	+ {
	3535	+ Object3D obj;
	3536	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3537	+ {
	3538	+ obj = (Object3D)e.nextElement();
	3539	+ obj.EmbedTextures(true);
	3540	+ }
	3541	+
	3542	+ refreshContents();
	3543	+ } else
	3544	+ if (source == deEmbedTexturesItem)
	3545	+ {
	3546	+ Object3D obj;
	3547	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3548	+ {
	3549	+ obj = (Object3D)e.nextElement();
	3550	+ obj.EmbedTextures(false);
	3551	+ }
	3552	+
	3553	+ CameraPane.texturepigment.clear();
	3554	+ CameraPane.texturebump.clear();
	3555	+
	3556	+ refreshContents();
	3557	+ } else
2746	3558	if (source == flashSelectionButton)
2747	3559	{
2748	3560	CameraPane.flash = true;
..	..	@@ -2754,6 +3566,10 @@
2754	3566	if (source == twoButton)
2755	3567	{
2756	3568	radio.layout = twoButton;
	3569	+
	3570	+ if (CameraPane.FULLSCREEN)
	3571	+ fullscreenLayout = radio.layout;
	3572	+
2757	3573	// bug
2758	3574	//gridPanel.setDividerLocation(1.0);
2759	3575	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2786,10 +3602,31 @@
2786	3602	bigThree.ClearUI();
2787	3603	bigThree.add(centralPanel);
2788	3604	bigThree.FlushUI();
	3605	+
	3606	+ cameraView.requestFocusInWindow();
	3607	+
	3608	+// refreshContents(true);
	3609	+//
	3610	+// try
	3611	+// {
	3612	+// java.awt.Robot bot = new java.awt.Robot();
	3613	+// int mask = InputEvent.BUTTON1_MASK;
	3614	+// bot.mouseMove(100, 100);
	3615	+// bot.mousePress(mask);
	3616	+// bot.mouseRelease(mask);
	3617	+// }
	3618	+// catch (Exception e)
	3619	+// {
	3620	+//
	3621	+// }
	3622	+
2789	3623	} else
2790	3624	if (source == threeButton)
2791	3625	{
2792	3626	radio.layout = threeButton;
	3627	+
	3628	+ if (CameraPane.FULLSCREEN)
	3629	+ fullscreenLayout = radio.layout;
2793	3630
2794	3631	// bigThree.remove(scenePanel);
2795	3632	// bigThree.remove(centralPanel);
..	..	@@ -2819,13 +3656,18 @@
2819	3656	// centralPanel.setVisible(true);
2820	3657	// XYZPanel.setVisible(true);
2821	3658	bigThree.ClearUI();
	3659	+ bigThree.add(scenePanel);
2822	3660	bigThree.add(centralPanel);
2823		- bigThree.add(XYZPanel);
2824	3661	bigThree.FlushUI();
	3662	+
	3663	+ cameraView.requestFocusInWindow();
2825	3664	} else
2826	3665	if (source == fourButton)
2827	3666	{
2828	3667	radio.layout = fourButton;
	3668	+
	3669	+ if (CameraPane.FULLSCREEN)
	3670	+ fullscreenLayout = radio.layout;
2829	3671
2830	3672	// bigThree.remove(scenePanel);
2831	3673	// bigThree.remove(centralPanel);
..	..	@@ -2857,10 +3699,15 @@
2857	3699	bigThree.ClearUI();
2858	3700	bigThree.add(scenePanel);
2859	3701	bigThree.FlushUI();
	3702	+
	3703	+ cameraView.requestFocusInWindow();
2860	3704	} else
2861	3705	if (source == sixButton)
2862	3706	{
2863	3707	radio.layout = sixButton;
	3708	+
	3709	+ if (CameraPane.FULLSCREEN)
	3710	+ fullscreenLayout = radio.layout;
2864	3711
2865	3712	// bigThree.remove(scenePanel);
2866	3713	// bigThree.remove(centralPanel);
..	..	@@ -2890,13 +3737,18 @@
2890	3737	// centralPanel.setVisible(true);
2891	3738	// XYZPanel.setVisible(false);
2892	3739	bigThree.ClearUI();
2893		- bigThree.add(scenePanel);
2894	3740	bigThree.add(centralPanel);
	3741	+ bigThree.add(scenePanel);
2895	3742	bigThree.FlushUI();
	3743	+
	3744	+ cameraView.requestFocusInWindow();
2896	3745	} else
2897	3746	if (source == sevenButton)
2898	3747	{
2899	3748	radio.layout = sevenButton;
	3749	+
	3750	+ if (CameraPane.FULLSCREEN)
	3751	+ fullscreenLayout = radio.layout;
2900	3752
2901	3753	// bigThree.remove(scenePanel);
2902	3754	// bigThree.remove(centralPanel);
..	..	@@ -2930,6 +3782,8 @@
2930	3782	bigThree.add(centralPanel);
2931	3783	bigThree.add(XYZPanel);
2932	3784	bigThree.FlushUI();
	3785	+
	3786	+ cameraView.requestFocusInWindow();
2933	3787	} else
2934	3788	if (source == rootButton)
2935	3789	{
..	..	@@ -2941,6 +3795,7 @@
2941	3795	EditObject(obj);
2942	3796	}
2943	3797
	3798	+ cameraView.requestFocusInWindow();
2944	3799	refreshContents(true);
2945	3800	} else
2946	3801	if (source == closeButton)
..	..	@@ -2950,22 +3805,37 @@
2950	3805	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2951	3806	{
2952	3807	ab = (cRadio)e.nextElement();
2953		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3808	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2954	3809	{
	3810	+ // Patch to avoid bug with transparency.
	3811	+ if (!ab.hadMaterial)
	3812	+ {
	3813	+ ab.object.material = null;
	3814	+ }
	3815	+
2955	3816	buttonGroup.remove(ab);
2956	3817	radioPanel.remove(ab);
2957	3818
2958		- ab.GetObject().editWindow = null;
	3819	+ //ab.GetObject().editWindow = null;
	3820	+ ab.GetObject().manipWindow = null;
2959	3821	// ab.GetObject().objectUI = null; // ?????????
2960	3822
2961	3823	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2962	3824	break;
2963	3825	}
2964	3826	}
	3827	+
	3828	+ cameraView.requestFocusInWindow();
2965	3829	refreshContents(true);
2966	3830	} else
2967	3831	if (source == editItem \|\| source == editButton)
2968	3832	{
	3833	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3834	+ {
	3835	+ Object3D child = (Object3D)e.nextElement();
	3836	+ child.pinned = true;
	3837	+ }
	3838	+
2969	3839	EditSelection(false);
2970	3840	} else
2971	3841	if (source == uneditButton)
..	..	@@ -2974,11 +3844,12 @@
2974	3844	{
2975	3845	Object3D child = (Object3D)e.nextElement();
2976	3846	if(child.editWindow != null)
2977		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3847	+ child.pinned = false;
2978	3848	child.CloseUI();
2979	3849	listUI.remove(child);
	3850	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2980	3851
2981		- child.editWindow = null; // ???????????
	3852	+ //child.editWindow = null; // ???????????
2982	3853	}
2983	3854	objEditor.ctrlPanel.FlushUI();
2984	3855	//objEditor.jTree.clearSelection();
..	..	@@ -2991,16 +3862,18 @@
2991	3862	//copy.ClearUI();
2992	3863	for (Object3D obj : listUI)
2993	3864	{
	3865	+ obj.pinned = false;
2994	3866	obj.CloseUI();
2995	3867	}
2996	3868	listUI.clear();
	3869	+ SetPinStates(group.selection.size() > 0);
2997	3870	refreshContents(true);
2998	3871	} else
2999	3872	if (source == allParamsButton)
3000	3873	{
3001	3874	assert(copy == group);
3002	3875
3003		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3876	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3004	3877
3005	3878	for (Object3D obj : listUI)
3006	3879	{
..	..	@@ -3049,6 +3922,9 @@
3049	3922	}
3050	3923
3051	3924	copy = group;
	3925	+
	3926	+ SetUndoStates();
	3927	+
3052	3928	//Globals.theRenderer.object = group;
3053	3929	if(!useclient)
3054	3930	{
..	..	@@ -3064,20 +3940,49 @@
3064	3940	frontView.object = group;
3065	3941	sideView.object = group;
3066	3942	}
3067		- group.editWindow = this;
	3943	+
	3944	+// fix "+" issue
	3945	+ //group.editWindow = this;
	3946	+ group.manipWindow = this;
	3947	+
3068	3948	/*
3069	3949	currentLayout = radio.layout;
3070	3950	if (currentLayout == null)
3071	3951	currentLayout = sevenButton;
3072	3952	*/
3073	3953	radio.layout.doClick();
	3954	+
	3955	+ ClearUnpinned();
	3956	+
	3957	+ //Grafreed.Assert(group != null);
	3958	+ //Grafreed.Assert(group.selection != null);
	3959	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	3960	+ if (group.selection == null \|\| group.selection.size() == 1)
	3961	+ EditSelection(false);
3074	3962	keepparent = group.parent;
3075	3963	// PARENT = NULL or not???
3076	3964	//group.parent = null; // ROOT
3077	3965	//group.attributes = -1;
3078	3966	ResetModel();
	3967	+
	3968	+ cameraView.requestFocusInWindow();
3079	3969	refreshContents(true);
3080		- }
	3970	+ } else if (event.getSource() == editCameraItem)
	3971	+ {
	3972	+ cameraView.ProtectCamera();
	3973	+ cameraView.requestFocusInWindow();
	3974	+ cameraView.repaint();
	3975	+ return;
	3976	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3977	+ {
	3978	+ cameraView.RevertCamera();
	3979	+ cameraView.requestFocusInWindow();
	3980	+ cameraView.repaint();
	3981	+ return;
	3982	+ // } else if (event.getSource() == textureButton)
	3983	+ // {
	3984	+ // return; // true;
	3985	+ }
3081	3986	else
3082	3987	{
3083	3988	//return super.action(event, arg);
..	..	@@ -3086,7 +3991,6 @@
3086	3991	}
3087	3992
3088	3993	boolean useclient = false;
3089		- cRadio radio;
3090	3994
3091	3995	void ToggleRoot()
3092	3996	{
..	..	@@ -3138,6 +4042,28 @@
3138	4042	refreshContents();
3139	4043	}
3140	4044
	4045	+ void TransformChildren()
	4046	+ {
	4047	+ Object3D obj;
	4048	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4049	+ {
	4050	+ obj = (Object3D)e.nextElement();
	4051	+ obj.KeepTextureMatrices();
	4052	+ obj.TransformChildren();
	4053	+ obj.RestoreTextureMatrices();
	4054	+
	4055	+// if (obj.parent == null)
	4056	+// {
	4057	+// System.out.println("NULL PARENT!");
	4058	+// new Exception().printStackTrace();
	4059	+// }
	4060	+// else
	4061	+// TouchTransform(obj);
	4062	+// //obj.parent.Touch();
	4063	+ }
	4064	+
	4065	+ refreshContents();
	4066	+ }
3141	4067
3142	4068	void ResetTransform()
3143	4069	{
..	..	@@ -3250,7 +4176,7 @@
3250	4176	refreshContents();
3251	4177	}
3252	4178
3253		- void ResetCentroid()
	4179	+ void ResetCentroid(boolean full)
3254	4180	{
3255	4181	Object3D obj;
3256	4182	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3265,12 +4191,16 @@
3265	4191	LA.matIdentity(Object3D.mat);
3266	4192	obj.getBounds(minima, maxima, false);
3267	4193	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3268		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	4194	+ if (full)
	4195	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3269	4196	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3270	4197	obj.TransformMesh(Object3D.mat);
	4198	+
3271	4199	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3272		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	4200	+ if (full)
	4201	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3273	4202	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	4203	+
3274	4204	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3275	4205	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3276	4206	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3299,7 +4229,8 @@
3299	4229
3300	4230	int size = obj.MemorySize();
3301	4231
3302		- System.err.println((size/1024) + " KB is the size of " + obj);
	4232	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4233	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3303	4234	}
3304	4235	}
3305	4236	catch (Exception e)
..	..	@@ -3336,9 +4267,9 @@
3336	4267	obj = (Object3D)e.nextElement();
3337	4268
3338	4269	System.out.println("Object is: " + obj);
3339		- GrafreeD.AnalyzeObject(obj);
	4270	+ Grafreed.AnalyzeObject(obj);
3340	4271	System.out.println("Boundary rep: " + obj.bRep);
3341		- GrafreeD.AnalyzeObject(obj.bRep);
	4272	+ Grafreed.AnalyzeObject(obj.bRep);
3342	4273
3343	4274	// System.err.println((size/1024) + " KB is the size of " + obj);
3344	4275	}
..	..	@@ -3380,6 +4311,13 @@
3380	4311	void GenNormals(boolean crease)
3381	4312	{
3382	4313	group.GenNormalsS(crease);
	4314	+
	4315	+ refreshContents();
	4316	+ }
	4317	+
	4318	+ void GenNormalsMESH()
	4319	+ {
	4320	+ group.GenNormalsMeshS();
3383	4321
3384	4322	refreshContents();
3385	4323	}
..	..	@@ -3552,8 +4490,8 @@
3552	4490
3553	4491	void ParseVertices()
3554	4492	{
3555		- boolean epsequal = GrafreeD.epsequal;
3556		- GrafreeD.epsequal = true;
	4493	+ boolean epsequal = Grafreed.epsequal;
	4494	+ Grafreed.epsequal = true;
3557	4495
3558	4496	for (int i=0; i<group.selection.size(); i++)
3559	4497	{
..	..	@@ -3578,7 +4516,7 @@
3578	4516	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3579	4517	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3580	4518
3581		- g.add(GrafreeD.clipboard);
	4519	+ g.add(Grafreed.clipboard);
3582	4520
3583	4521	buffer.add(g);
3584	4522	}
..	..	@@ -3593,7 +4531,7 @@
3593	4531	makeSomething(buffer, i==group.selection.size()-1);
3594	4532	}
3595	4533
3596		- GrafreeD.epsequal = epsequal;
	4534	+ Grafreed.epsequal = epsequal;
3597	4535
3598	4536	refreshContents();
3599	4537	}
..	..	@@ -3611,7 +4549,16 @@
3611	4549	String pigment = Object3D.GetPigment(tex);
3612	4550	//String bump = Object3D.GetBump(tex);
3613	4551
3614		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4552	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4553	+
	4554	+ try
	4555	+ {
	4556	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
	4557	+ }
	4558	+ catch (Exception e)
	4559	+ {
	4560	+ System.err.println("FAIL: " + node);
	4561	+ }
3615	4562
3616	4563	double s = v.s;
3617	4564
..	..	@@ -3743,7 +4690,7 @@
3743	4690	return;
3744	4691
3745	4692	Object3D poses = group.selection.get(0);
3746		- Object3D ref = GrafreeD.clipboard.get(0);
	4693	+ Object3D ref = Grafreed.clipboard.get(0);
3747	4694
3748	4695	Object3D newgroup = new Object3D("Po:" + poses.name);
3749	4696
..	..	@@ -3937,9 +4884,9 @@
3937	4884
3938	4885	void ClipMesh()
3939	4886	{
3940		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4887	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3941	4888	{
3942		- Object3D content = GrafreeD.clipboard.get(0);
	4889	+ Object3D content = Grafreed.clipboard.get(0);
3943	4890
3944	4891	if (content instanceof cGroup && ((cGroup)content).transientlink )
3945	4892	content = ((cGroup)content).get(0);
..	..	@@ -3948,7 +4895,7 @@
3948	4895	// {
3949	4896	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3950	4897	// }
3951		- group.selection.ClipMesh(GrafreeD.clipboard);
	4898	+ group.selection.ClipMesh(Grafreed.clipboard);
3952	4899	}
3953	4900	// group.selection.ClipMesh(GrafreeD.clipboard);
3954	4901	System.out.println("DONE.");
..	..	@@ -3995,6 +4942,18 @@
3995	4942	void MarkLeaves(boolean hide)
3996	4943	{
3997	4944	group.selection.MarkLeaves(hide);
	4945	+ refreshContents();
	4946	+ }
	4947	+
	4948	+ void RewindLeaves(boolean hide)
	4949	+ {
	4950	+ group.selection.RewindLeaves(hide);
	4951	+ refreshContents();
	4952	+ }
	4953	+
	4954	+ void RandomLeaves(boolean hide)
	4955	+ {
	4956	+ group.selection.RandomLeaves(hide);
3998	4957	refreshContents();
3999	4958	}
4000	4959
..	..	@@ -4069,28 +5028,25 @@
4069	5028	// }
4070	5029	// }
4071	5030
4072		- static boolean allparams = true;
4073		-
4074		- static Vector<Object3D> listUI = new Vector<Object3D>();
4075		-
4076	5031	void EditSelection(boolean newWindow)
4077	5032	{
	5033	+ if (group.selection == null)
	5034	+ {
	5035	+ EditElement(group, newWindow); // ? new
	5036	+ return;
	5037	+ }
	5038	+
4078	5039	// aConstraints.gridy = 0;
4079	5040	for (int i=0; i<group.selection.size(); i++)
4080	5041	{
4081	5042	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4082	5043	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4083		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5044	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4084	5045
4085	5046	Object3D elem = (Object3D)group.selection.elementAt(i);
4086		- if(elem != group)
	5047	+ if(elem != group \|\| !newWindow)
4087	5048	{
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
	5049	+ EditElement(elem, newWindow); // ? new
4094	5050	}
4095	5051	}
4096	5052	}
..	..	@@ -4153,9 +5109,7 @@
4153	5109
4154	5110	freezemodel = false;
4155	5111	}
4156		-
4157		- boolean flashIt = true;
4158		-
	5112	+
4159	5113	public void valueChanged(TreeSelectionEvent e)
4160	5114	//public boolean handleEvent(Event event)
4161	5115	{
..	..	@@ -4165,7 +5119,8 @@
4165	5119	//new Exception().printStackTrace();
4166	5120
4167	5121	freezemodel = true;
4168		-
	5122	+ ClearUnpinned();
	5123	+
4169	5124	/**/
4170	5125	//switch (event.id)
4171	5126	{
..	..	@@ -4173,7 +5128,6 @@
4173	5128	//case 702: // Event.LIST_DESELECT
4174	5129	group.deselectAll();
4175	5130	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4176		- objEditor.ClearInfo(); // .GetMaterial());
4177	5131	if (tps != null)
4178	5132	{
4179	5133	for (int i=0; i < tps.length; i++)
..	..	@@ -4182,10 +5136,8 @@
4182	5136
4183	5137	//if (child.parent != null)
4184	5138	//child.parent.addSelectee(child);
	5139	+ objEditor.SetMaterial(child);
4185	5140	group.addSelectee(child);
4186		- objEditor.SetMaterial(child); // .GetMaterial());
4187		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4188		- System.err.println("info : " + child.GetPath());
4189	5141	}
4190	5142	}
4191	5143	// else
..	..	@@ -4195,20 +5147,28 @@
4195	5147	// System.err.println("info : " + group.GetPath());
4196	5148	// }
4197	5149
4198		- objEditor.SetText(); // jan 2014
4199		-
4200		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	5150	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4201	5151	CameraPane.flash = true;
4202	5152
4203		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5153	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4204	5154	// a camera
4205	5155	{
4206		- CameraPane.camerachangeframe = 0; // don't refuse it
4207		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5156	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5157	+ {
	5158	+ CameraPane.camerachangeframe = 0; // don't refuse it
	5159	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5160	+ }
4208	5161	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4209	5162	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4210	5163	}
4211	5164
	5165	+ if (tps != null && tps.length == 1)
	5166	+ {
	5167	+ EditSelection(false);
	5168	+ }
	5169	+
	5170	+ SetPinStates(tps != null && tps.length > 0);
	5171	+
4212	5172	refreshContents();
4213	5173	//return true;
4214	5174	}
..	..	@@ -4217,6 +5177,37 @@
4217	5177
4218	5178	freezemodel = false;
4219	5179	}
	5180	+
	5181	+ void SetPinStates(boolean enabled)
	5182	+ {
	5183	+ editButton.setEnabled(enabled);
	5184	+ uneditButton.setEnabled(enabled);
	5185	+ unselectButton.setEnabled(enabled);
	5186	+ flashSelectionButton.setEnabled(enabled);
	5187	+
	5188	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5189	+ }
	5190	+
	5191	+ void refreshContents(boolean cp)
	5192	+ {
	5193	+ if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5194	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5195	+ {
	5196	+ objEditor.ClearInfo(); // .GetMaterial());
	5197	+
	5198	+ for (int i=0; i < group.selection.Size(); i++)
	5199	+ {
	5200	+ Object3D child = (Object3D) group.selection.get(i);
	5201	+
	5202	+ objEditor.AddInfo(child, this, true);
	5203	+ System.err.println("info : " + child.GetPath());
	5204	+ }
	5205	+
	5206	+ objEditor.SetText(); // jan 2014
	5207	+ }
	5208	+
	5209	+ super.refreshContents(cp);
	5210	+ }
4220	5211
4221	5212	void linkSomething(Object3D thing)
4222	5213	{
..	..	@@ -4288,16 +5279,19 @@
4288	5279	{
4289	5280	if (group.selection.isEmpty())
4290	5281	return;
4291		- GrafreeD.clipboardIsTempGroup = false;
	5282	+
	5283	+ Grafreed.clipboardIsTempGroup = false;
4292	5284	Composite tGroup = null;
4293	5285	if (group.selection.size() > 0) // 1)
4294	5286	{
4295	5287	tGroup = new cGroup();
4296		- GrafreeD.clipboardIsTempGroup = true;
	5288	+ Grafreed.clipboardIsTempGroup = true;
4297	5289	}
4298	5290
4299	5291	if (cut)
4300	5292	{
	5293	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5294	+// Save();
4301	5295	//int indices[] = jList.getSelectedIndices();
4302	5296	//for (int i = indices.length - 1; i >= 0; i--)
4303	5297	//jList.remove(indices[i]);
..	..	@@ -4333,16 +5327,16 @@
4333	5327	//System.out.println("cut " + child);
4334	5328	//System.out.println("parent = " + child.parent);
4335	5329	// tmp.addChild(child);
4336		- if (GrafreeD.clipboardIsTempGroup)
	5330	+ if (Grafreed.clipboardIsTempGroup)
4337	5331	tGroup.add/Child/(tmp);
4338	5332	else
4339		- GrafreeD.clipboard = tmp;
	5333	+ Grafreed.clipboard = tmp;
4340	5334	}
4341	5335	else
4342		- if (GrafreeD.clipboardIsTempGroup)
	5336	+ if (Grafreed.clipboardIsTempGroup)
4343	5337	tGroup.add/Child/(child);
4344	5338	else
4345		- GrafreeD.clipboard = child;
	5339	+ Grafreed.clipboard = child;
4346	5340	}
4347	5341
4348	5342	//ResetModel();
..	..	@@ -4374,21 +5368,23 @@
4374	5368	//System.out.println("cut " + elem);
4375	5369	//System.out.println("parent = " + elem.parent);
4376	5370	// tmp.addChild(elem);
4377		- if (GrafreeD.clipboardIsTempGroup)
	5371	+ if (Grafreed.clipboardIsTempGroup)
4378	5372	tGroup.add/Child/(tmp);
4379	5373	else
4380		- GrafreeD.clipboard = tmp;
	5374	+ Grafreed.clipboard = tmp;
4381	5375	}
4382	5376	else
4383		- if (GrafreeD.clipboardIsTempGroup)
	5377	+ if (Grafreed.clipboardIsTempGroup)
4384	5378	tGroup.add/Child/(child);
4385	5379	else
4386		- GrafreeD.clipboard = child;
	5380	+ Grafreed.clipboard = child;
4387	5381	}
4388	5382
4389	5383	}
4390		- if (GrafreeD.clipboardIsTempGroup)
4391		- GrafreeD.clipboard = tGroup;
	5384	+
	5385	+ if (Grafreed.clipboardIsTempGroup)
	5386	+ Grafreed.clipboard = tGroup;
	5387	+
4392	5388	if (cut)
4393	5389	{
4394	5390	ResetModel();
..	..	@@ -4398,11 +5394,15 @@
4398	5394
4399	5395	void paste(boolean expand)
4400	5396	{
	5397	+ if (Globals.REPLACEONMAKE)
	5398	+ Save();
	5399	+ boolean keep = Globals.REPLACEONMAKE;
	5400	+ Globals.REPLACEONMAKE = false;
4401	5401	// if (GrafreeD.clipboard == null)
4402	5402	// return;
4403	5403	boolean first = true;
4404	5404
4405		- if (GrafreeD.clipboardIsTempGroup)
	5405	+ if (Grafreed.clipboardIsTempGroup)
4406	5406	{
4407	5407	Composite temp;
4408	5408
..	..	@@ -4413,7 +5413,7 @@
4413	5413	temp = (Composite)Applet3D.clipboard.deepCopy();
4414	5414	*/
4415	5415	Object3D elem;
4416		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5416	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4417	5417	{
4418	5418	Object3D child = (Object3D)e.nextElement();
4419	5419
..	..	@@ -4447,16 +5447,17 @@
4447	5447	//Object3D cb = Applet3D.clipboard;
4448	5448	//temp.addChild(cb);
4449	5449	//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());
	5450	+ assert(Grafreed.clipboard.parent == null);
	5451	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5452	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5453	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5454	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4455	5455	else
4456		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4457		- GrafreeD.clipboard.get(0).parent = keepparent;
	5456	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5457	+ Grafreed.clipboard.get(0).parent = keepparent;
4458	5458	}
4459	5459
	5460	+ Globals.REPLACEONMAKE = keep;
4460	5461	ResetModel();
4461	5462	refreshContents();
4462	5463	}
..	..	@@ -4503,9 +5504,9 @@
4503	5504	{
4504	5505	boolean first = true;
4505	5506
4506		- if (GrafreeD.clipboardIsTempGroup)
	5507	+ if (Grafreed.clipboardIsTempGroup)
4507	5508	{
4508		- Composite temp = (Composite)GrafreeD.clipboard;
	5509	+ Composite temp = (Composite)Grafreed.clipboard;
4509	5510	Object3D copy;
4510	5511	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4511	5512	{
..	..	@@ -4515,7 +5516,7 @@
4515	5516	}
4516	5517	} else
4517	5518	{
4518		- linkSomething(GrafreeD.clipboard); //.get(0));
	5519	+ linkSomething(Grafreed.clipboard); //.get(0));
4519	5520	}
4520	5521	}
4521	5522	}
..	..	@@ -4592,6 +5593,10 @@
4592	5593
4593	5594	void group(Object3D csg, boolean grab)
4594	5595	{
	5596	+ if (Globals.REPLACEONMAKE)
	5597	+ Save();
	5598	+ boolean keep = Globals.REPLACEONMAKE;
	5599	+ Globals.REPLACEONMAKE = false;
4595	5600	if (//false) // why??
4596	5601	!group.selection.isEmpty())
4597	5602	{
..	..	@@ -4705,10 +5710,15 @@
4705	5710	//node.add(csg);
4706	5711	//makeSomething(node);
4707	5712	makeSomething(csg);
	5713	+ Globals.REPLACEONMAKE = keep;
4708	5714	}
4709	5715
4710	5716	void Ungroup(Object3D g)
4711	5717	{
	5718	+ if (Globals.REPLACEONMAKE)
	5719	+ Save();
	5720	+ boolean keep = Globals.REPLACEONMAKE;
	5721	+ Globals.REPLACEONMAKE = false;
4712	5722	if (g instanceof HiddenObject)
4713	5723	{
4714	5724	HiddenObject h = (HiddenObject) g;
..	..	@@ -4725,6 +5735,7 @@
4725	5735	objEditor.makeSomething(g.get(i), false);
4726	5736	}
4727	5737	}
	5738	+ Globals.REPLACEONMAKE = keep;
4728	5739	}
4729	5740
4730	5741	void ungroup()
..	..	@@ -4920,21 +5931,6 @@
4920	5931	}
4921	5932	*/
4922	5933
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	5934	/*
4939	5935	public void Callback(Object obj)
4940	5936	{
..	..	@@ -4958,26 +5954,9 @@
4958	5954	}
4959	5955	*/
4960	5956
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	5957	String GetFile(String dialogName)
4979	5958	{
4980		- if (GrafreeD.standAlone)
	5959	+ if (Grafreed.standAlone)
4981	5960	{
4982	5961	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4983	5962	browser.show();
..	..	@@ -5045,7 +6024,43 @@
5045	6024	cButton clearpanelButton;
5046	6025	cButton unselectButton;
5047	6026
	6027	+ cButton restoreCameraButton;
	6028	+
5048	6029	cButton oneStepButton;
	6030	+
	6031	+ cButton groupButton;
	6032	+ cButton ungroupButton;
	6033	+ cButton compositeButton;
	6034	+ cButton switchButton;
	6035	+ cButton loopButton;
	6036	+ cButton textureButton;
	6037	+
	6038	+ cButton skybox1Button;
	6039	+ cButton skybox2Button;
	6040	+ cButton skybox3Button;
	6041	+ cButton skybox4Button;
	6042	+ cButton skybox5Button;
	6043	+ cButton skybox6Button;
	6044	+ cButton skybox7Button;
	6045	+
	6046	+ cButton skybox11Button;
	6047	+ cButton skybox12Button;
	6048	+ cButton skybox13Button;
	6049	+ cButton skybox14Button;
	6050	+ cButton skybox15Button;
	6051	+ cButton skybox16Button;
	6052	+ cButton skybox17Button;
	6053	+
	6054	+ cButton gridButton;
	6055	+ cButton boxButton;
	6056	+ cButton sphereButton;
	6057	+ cButton coneButton;
	6058	+ cButton torusButton;
	6059	+ cButton superButton;
	6060	+ cButton kleinButton;
	6061	+ cButton particlesButton;
	6062	+ cButton overlayButton;
	6063	+ cButton lightButton;
5049	6064
5050	6065	cButton screenfitButton;
5051	6066	cButton screenfitpointButton;
..	..	@@ -5058,14 +6073,6 @@
5058	6073
5059	6074	cButton setsupportButton;
5060	6075
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	6076	//
5070	6077	//Composite
5071	6078	Object3D // to do !!
..	..	@@ -5075,9 +6082,11 @@
5075	6082	//JTree jTree;
5076	6083	private MenuItem lookAtItem;
5077	6084	private MenuItem lookFromItem;
5078		- private MenuItem switchItem;
	6085	+ private MenuItem switchViewItem;
5079	6086	private MenuItem cutItem;
5080		- private MenuItem duplicateItem;
	6087	+ private MenuItem undoItem;
	6088	+ private MenuItem redoItem;
	6089	+ private JMenuItem duplicateItem;
5081	6090	private MenuItem cloneItem;
5082	6091	private MenuItem cloneSupportItem;
5083	6092	private MenuItem overwriteGeoItem;
..	..	@@ -5090,7 +6099,7 @@
5090	6099	private MenuItem linkverticesItem;
5091	6100	private MenuItem relinkverticesItem;
5092	6101	private MenuItem setMasterItem;
5093		- private MenuItem resetMeshItem;
	6102	+ private MenuItem resetAllItem;
5094	6103	private MenuItem stepAllItem;
5095	6104	private MenuItem revertMeshItem;
5096	6105	private MenuItem poseMeshItem;
..	..	@@ -5105,7 +6114,7 @@
5105	6114	private MenuItem pasteLinkItem;
5106	6115	private MenuItem pasteCloneItem;
5107	6116	private MenuItem pasteExpandItem;
5108		- private MenuItem clearItem;
	6117	+ private MenuItem deleteItem;
5109	6118	private MenuItem clearAllItem;
5110	6119	private MenuItem genUVItem;
5111	6120	private MenuItem genNormalsMESHItem;
..	..	@@ -5140,6 +6149,10 @@
5140	6149	private MenuItem showleavesItem;
5141	6150	private MenuItem markleavesItem;
5142	6151	private MenuItem unmarkleavesItem;
	6152	+ private MenuItem rewindleavesItem;
	6153	+ private MenuItem unrewindleavesItem;
	6154	+ private MenuItem randomleavesItem;
	6155	+ private MenuItem unrandomleavesItem;
5143	6156
5144	6157	private MenuItem flipVItem;
5145	6158	private MenuItem unflipVItem;
..	..	@@ -5151,15 +6164,17 @@
5151	6164	private MenuItem panoTexturesItem;
5152	6165
5153	6166	private MenuItem resetCentroidItem;
5154		- private MenuItem transformgeometryItem;
	6167	+ private MenuItem resetCentroidXZItem;
5155	6168	private MenuItem resetTransformItem;
	6169	+ private MenuItem transformGeometryItem;
	6170	+ private MenuItem transformChildrenItem;
5156	6171	private MenuItem hideItem;
5157	6172	private MenuItem grabItem;
5158	6173	private MenuItem backItem;
5159	6174	private MenuItem frontItem;
5160	6175	private MenuItem cameraItem;
5161	6176	private MenuItem compositeItem;
5162		- private MenuItem randomItem;
	6177	+ private MenuItem switchItem;
5163	6178	private MenuItem physicsItem;
5164	6179	private MenuItem frameselectorItem;
5165	6180	private MenuItem scriptNodeItem;
..	..	@@ -5183,6 +6198,8 @@
5183	6198	private MenuItem attachBumpItem;
5184	6199	private MenuItem detachBumpItem;
5185	6200	private MenuItem pigmentBumpItem;
	6201	+ private MenuItem embedTexturesItem;
	6202	+ private MenuItem deEmbedTexturesItem;
5186	6203
5187	6204	private MenuItem particleItem;
5188	6205	private MenuItem ragdollItem;
..	..	@@ -5221,11 +6238,6 @@
5221	6238	private MenuItem doubleItem;
5222	6239	private MenuItem tripleItem;
5223	6240
5224		- private MenuItem importGFDItem;
5225		- private MenuItem importVRMLX3DItem;
5226		- private MenuItem import3DSItem;
5227		- private MenuItem importOBJItem;
5228		-
5229	6241	private MenuItem computeAOItem;
5230	6242	private MenuItem recompileItem;
5231	6243	private MenuItem editScriptItem;
..	..	@@ -5235,4 +6247,8 @@
5235	6247	private MenuItem analyzeItem;
5236	6248	private MenuItem dumpItem;
5237	6249	//boolean freezemodel = false;
	6250	+
	6251	+ Menu cameraMenu;
	6252	+ MenuItem editCameraItem;
	6253	+ MenuItem restoreCameraItem;
5238	6254	}